From b96a095c7a6ba16676843829429146b971017849 Mon Sep 17 00:00:00 2001
From: haoxuan <haoxuan>
Date: 星期四, 07 三月 2024 18:07:40 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.5.5:10010/r/silk/silk-web
---
src/common/untils/dialog.js | 51 ++++
src/router/product/index.js | 12 +
src/views/productManage/productRegisterForm/index.vue | 6
src/main.js | 1
src/views/productManage/productRegisterForm/components/addProductDialog.vue | 187 +++++++++++++++++
src/views/productManage/productRegisterForm/addProductRegisterPage.vue | 390 +++++++++++++++++++++++++++++++++++
6 files changed, 645 insertions(+), 2 deletions(-)
diff --git a/src/common/untils/dialog.js b/src/common/untils/dialog.js
new file mode 100644
index 0000000..e0e29fe
--- /dev/null
+++ b/src/common/untils/dialog.js
@@ -0,0 +1,51 @@
+import Vue from "vue"
+
+// v-dialogDrag: 寮圭獥鎷栨嫿
+Vue.directive("dialogDrag", {
+ bind(el, binding, vnode, oldVnode) {
+ console.log(binding, vnode, oldVnode)
+ const dialogHeaderEl = el.querySelector(".el-dialog__header")
+ const dragDom = el.querySelector(".el-dialog")
+ dialogHeaderEl.style.cursor = "move"
+
+ // 鑾峰彇鍘熸湁灞炴�� ie dom鍏冪礌.currentStyle 鐏嫄璋锋瓕 window.getComputedStyle(dom鍏冪礌, null);
+ const sty = dragDom.currentStyle || window.getComputedStyle(dragDom, null)
+
+ dialogHeaderEl.onmousedown = (e) => {
+ // 榧犳爣鎸変笅锛岃绠楀綋鍓嶅厓绱犺窛绂诲彲瑙嗗尯鐨勮窛绂�
+ const disX = e.clientX - dialogHeaderEl.offsetLeft
+ const disY = e.clientY - dialogHeaderEl.offsetTop
+
+ // 鑾峰彇鍒扮殑鍊煎甫px 姝ｅ垯鍖归厤鏇挎崲
+ let styL, styT
+
+ // 娉ㄦ剰鍦╥e涓� 绗竴娆¤幏鍙栧埌鐨勫�间负缁勪欢鑷甫50% 绉诲姩涔嬪悗璧嬪�间负px
+ if (sty.left.includes("%")) {
+ styL = +document.body.clientWidth * (+sty.left.replace(/\\%/g, "") / 100)
+ styT = +document.body.clientHeight * (+sty.top.replace(/\\%/g, "") / 100)
+ } else {
+ styL = +sty.left.replace(/\px/g, "")
+ styT = +sty.top.replace(/\px/g, "")
+ }
+
+ document.onmousemove = function (e) {
+ // 閫氳繃浜嬩欢濮旀墭锛岃绠楃Щ鍔ㄧ殑璺濈
+ const l = e.clientX - disX
+ const t = e.clientY - disY
+
+ // 绉诲姩褰撳墠鍏冪礌
+ dragDom.style.left = `${l + styL}px`
+ dragDom.style.top = `${t + styT}px`
+
+ // 灏嗘鏃剁殑浣嶇疆浼犲嚭鍘�
+ // binding.value({x:e.pageX,y:e.pageY})
+ }
+
+ document.onmouseup = function (e) {
+ console.log(e)
+ document.onmousemove = null
+ document.onmouseup = null
+ }
+ }
+ }
+})
diff --git a/src/main.js b/src/main.js
index 8acc4e8..2b0bb22 100644
--- a/src/main.js
+++ b/src/main.js
@@ -6,6 +6,7 @@
import "element-ui/lib/theme-chalk/index.css"
import "@/assets/style/index.scss"
import "@/components"
+import "@/common/untils/dialog"
Vue.use(ElementUI)
// 淇敼榛樿鐐瑰嚮閬僵灞備负涓嶅叧闂�
diff --git a/src/router/product/index.js b/src/router/product/index.js
index 07d5802..047b313 100644
--- a/src/router/product/index.js
+++ b/src/router/product/index.js
@@ -3,7 +3,9 @@
const silkRegisterForm = (resolve) => require(["@/views/productManage/silkRegisterForm/index"], resolve) // 绾ゅ害鐧昏琛�
const silkInspectForm = (resolve) => require(["@/views/productManage/silkInspectForm/index"], resolve) // 绾ゅ害妫�楠岃〃
const silkRegisterAddPage = (resolve) => require(["@/views/productManage/silkRegisterForm/addPage"], resolve) // 绾ゅ害鐧昏琛紝妫�楠岃〃 鏂板
-const productRegisterForm = (resolve) => require(["@/views/productManage/productRegisterForm/index"], resolve) // 浜ч噺鐧昏琛�
+const productRegisterForm = (resolve) => require(["@/views/productManage/productRegisterForm/index"], resolve) // 浜ч噺鐧昏琛紝 鏂板
+const addProductRegisterPage = (resolve) =>
+ require(["@/views/productManage/productRegisterForm/addProductRegisterPage"], resolve) // 鏂板浜ч噺鐧昏琛�
const appconfig = [
{
@@ -37,6 +39,14 @@
meta: {
title: "浜ч噺鐧昏琛�"
}
+ },
+ {
+ path: "/productManage/productRegisterForm/addProductRegisterPage",
+ name: "addProductRegisterPage",
+ component: addProductRegisterPage,
+ meta: {
+ title: "鏂板浜ч噺鐧昏琛�"
+ }
}
]
diff --git a/src/views/productManage/productRegisterForm/addProductRegisterPage.vue b/src/views/productManage/productRegisterForm/addProductRegisterPage.vue
new file mode 100644
index 0000000..4957b7f
--- /dev/null
+++ b/src/views/productManage/productRegisterForm/addProductRegisterPage.vue
@@ -0,0 +1,390 @@
+<template>
+ <div class="add-product-page">
+ <div class="top-view">
+ <div class="t-left">
+ <el-button type="primary" size="small">鏀惧純</el-button>
+ <el-button type="primary" size="small">淇濆瓨</el-button>
+ <el-divider direction="vertical"></el-divider>
+ <el-button type="primary" size="small">閫�鍑�</el-button>
+ </div>
+ <div class="t-right">
+ <div class="t-right-circle" :class="isDeviceConnectStatus ? 't-r-bg-green ' : 't-r-bg-red '"></div>
+ <div :class="isDeviceConnectStatus ? 't-right-green' : 't-right-red'">璁￠噺浠櫒杩炴帴姝ｅ父</div>
+ </div>
+ </div>
+ <div class="body-card">
+ <div class="body-top">
+ <div class="b-t-left">
+ <el-form
+ :model="ruleForm"
+ :rules="rules"
+ ref="ruleForm"
+ label-width="80px"
+ label-position="right"
+ class="demo-ruleForm"
+ >
+ <el-row>
+ <el-col :span="3">
+ <el-form-item label="缂栧彿" prop="number">
+ <el-input v-model="ruleForm.number" size="small"></el-input>
+ </el-form-item>
+ <el-form-item label="鐢熶骇鐢ㄦ椂" prop="productTime">
+ <el-input v-model="ruleForm.productTime" size="small"></el-input>
+ </el-form-item>
+ </el-col>
+ <el-col :span="3">
+ <el-form-item label="鐢熶骇鏃ユ湡" prop="productDate">
+ <el-date-picker
+ type="date"
+ placeholder="閫夋嫨鏃ユ湡"
+ v-model="ruleForm.productDate"
+ size="small"
+ style="width: 100%"
+ ></el-date-picker>
+ </el-form-item>
+ <el-form-item label="鍥炴暟" prop="numTimes">
+ <el-input v-model="ruleForm.numTimes" size="small"></el-input>
+ </el-form-item>
+ </el-col>
+ <el-col :span="3">
+ <el-form-item label="搴勫彛" prop="lots">
+ <el-select v-model="ruleForm.lots" placeholder="璇烽�夋嫨搴勫彛" size="small">
+ <el-option label="搴勫彛涓�" value="搴勫彛涓�"></el-option>
+ <el-option label="搴勫彛浜�" value="搴勫彛浜�"></el-option>
+ </el-select>
+ </el-form-item>
+ <el-form-item label="钀戒笣鑼ч噺" prop="silkCocoonCount">
+ <el-input v-model="ruleForm.silkCocoonCount" size="small"></el-input>
+ </el-form-item>
+ </el-col>
+ <el-col :span="3">
+ <el-form-item label="杞﹂棿" prop="workshop">
+ <el-select v-model="ruleForm.workshop" placeholder="璇烽�夋嫨杞﹂棿" size="small">
+ <el-option label="杞﹂棿涓�" value="杞﹂棿涓�"></el-option>
+ <el-option label="杞﹂棿浜�" value="杞﹂棿浜�"></el-option>
+ <el-option label="杞﹂棿涓�" value="杞﹂棿涓�"></el-option>
+ <el-option label="杞﹂棿鍥�" value="杞﹂棿鍥�"></el-option>
+ </el-select>
+ </el-form-item>
+ <el-form-item label="姣忔《鑼ч噺" prop="barrelCocoonCount">
+ <div style="display: flex">
+ <el-input v-model="ruleForm.silkCocoonCount" size="small"></el-input>
+ <span>鍏�</span>
+ </div>
+ </el-form-item>
+ </el-col>
+ <el-col :span="3">
+ <el-form-item label="缁勫埆" prop="group">
+ <el-select v-model="ruleForm.group" placeholder="璇烽�夋嫨缁勫埆" size="small">
+ <el-option
+ v-for="item in groupOptions"
+ :key="item.id"
+ :label="item.value"
+ :value="item.id"
+ ></el-option>
+ </el-select>
+ </el-form-item>
+ <el-form-item label="瀹為檯杞﹂��" prop="actualSpeed">
+ <el-input v-model="ruleForm.actualSpeed" size="small"></el-input>
+ </el-form-item>
+ </el-col>
+ <el-col :span="3">
+ <el-form-item label="瑙勬牸" prop="spec">
+ <el-input v-model="ruleForm.spec" size="small"></el-input>
+ </el-form-item>
+ <el-form-item label="涔欑彮鏃堕棿" prop="bShiftTime">
+ <el-input v-model="ruleForm.bShiftTime" size="small"></el-input>
+ </el-form-item>
+ </el-col>
+ <el-col :span="3">
+ <el-form-item label="鏄惁缁撳簞" prop="end">
+ <el-input v-model="ruleForm.spec" size="small"></el-input>
+ </el-form-item>
+ <el-form-item label="鐢茬彮鏃堕棿" prop="aShiftTime">
+ <el-input v-model="ruleForm.aShiftTime" size="small"></el-input>
+ </el-form-item>
+ </el-col>
+ <el-col :span="3">
+ <el-form-item label="绛夌骇" prop="grade">
+ <el-input v-model="ruleForm.grade" size="small"></el-input>
+ </el-form-item>
+ <el-form-item label="杞︾粍缂姌" prop="reelingDiscount">
+ <el-input v-model="ruleForm.reelingDiscount" size="small"></el-input>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row>
+ <el-col :span="16">
+ <el-form-item label="钀戒笣妗舵暟:" prop="doffBarrelage">
+ <div class="doff-barrelage-card">
+ <div class="d-b-common">
+ <el-input v-model="ruleForm.oneInput" size="small" class="d-b-c-input"></el-input>
+ <el-checkbox v-model="ruleForm.isOneDoff"></el-checkbox>
+ </div>
+ <div class="d-b-common">
+ <el-input v-model="ruleForm.twoInput" size="small" class="d-b-c-input"></el-input>
+ <el-checkbox v-model="ruleForm.isTwoDoff"></el-checkbox>
+ </div>
+ <div class="d-b-common">
+ <el-input v-model="ruleForm.threeInput" size="small" class="d-b-c-input"></el-input>
+ <el-checkbox v-model="ruleForm.isThreeDoff"></el-checkbox>
+ </div>
+ </div>
+ </el-form-item>
+ <el-form-item label="鍙峰甫棰滆壊:" prop="numBandColor">
+ <div class="doff-barrelage-card">
+ <div class="d-b-common">
+ <div class="n-m-c-label">绗竴鍥�</div>
+ <el-input v-model="ruleForm.oneInput" size="small" class="d-b-c-input"></el-input>
+ </div>
+ <div class="d-b-common">
+ <div class="n-m-c-label">绗簩鍥�</div>
+ <el-input v-model="ruleForm.twoInput" size="small" class="d-b-c-input"></el-input>
+ </div>
+ <div class="d-b-common">
+ <div class="n-m-c-label">绗笁鍥�</div>
+ <el-input v-model="ruleForm.threeInput" size="small" class="d-b-c-input"></el-input>
+ </div>
+ </div>
+ </el-form-item>
+ </el-col>
+ <el-col :span="4">
+ <el-form-item label="鐞嗚涓濋噺" prop="theorySilkCount">
+ <el-input v-model="ruleForm.theorySilkCount" size="small"></el-input>
+ </el-form-item>
+ <el-form-item label="鎬讳骇閲�" prop="totalOutput">
+ <div style="display: flex">
+ <el-input v-model="ruleForm.totalOutput" size="small"></el-input>
+ <span>kg</span>
+ </div>
+ </el-form-item>
+ </el-col>
+ <el-col :span="4">
+ <el-form-item label="鍙版椂浜ч噺" prop="platformTimeOutput">
+ <el-input v-model="ruleForm.platformTimeOutput" size="small"></el-input>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ </el-form>
+ </div>
+ <div class="b-t-right">
+ <div class="b-t-r-icon" :class="isDeviceConnectStatus ? 'c-p' : 'c-n'" @click="deviceConnectClick">
+ <i class="el-icon-d-arrow-left"></i>
+ </div>
+ </div>
+ </div>
+ <div class="body-table">
+ <div class="b-t-unit">鍗曚綅锛氬厠</div>
+ <el-table :data="tableData" style="width: 100%" border>
+ <el-table-column prop="carNum" label="杞﹀彿" width="99" align="center"> </el-table-column>
+ <el-table-column label="绗竴鍥�" align="center">
+ <el-table-column prop="fist1" label="1" width="60" align="center"> </el-table-column>
+ <el-table-column prop="fist2" label="2" width="60" align="center"> </el-table-column>
+ <el-table-column prop="fist3" label="3" width="60" align="center"> </el-table-column>
+ <el-table-column prop="fist4" label="4" width="60" align="center"> </el-table-column>
+ </el-table-column>
+ <el-table-column label="绗簩鍥�" align="center">
+ <el-table-column prop="two1" label="1" width="60" align="center"> </el-table-column>
+ <el-table-column prop="two2" label="2" width="60" align="center"> </el-table-column>
+ <el-table-column prop="two3" label="3" width="60" align="center"> </el-table-column>
+ <el-table-column prop="two4" label="4" width="60" align="center"> </el-table-column>
+ </el-table-column>
+ <el-table-column label="绗笁鍥�" align="center">
+ <el-table-column prop="three1" label="1" width="60" align="center"> </el-table-column>
+ <el-table-column prop="three2" label="2" width="60" align="center"> </el-table-column>
+ <el-table-column prop="three3" label="3" width="60" align="center"> </el-table-column>
+ <el-table-column prop="three4" label="4" width="60" align="center"> </el-table-column>
+ </el-table-column>
+ <el-table-column prop="date" label="鍙颁骇閲�" align="center"> </el-table-column>
+ <el-table-column prop="date" label="涓汉浜ч噺" width="60" align="center"> </el-table-column>
+ <el-table-column prop="date" label="鍙版椂浜ч噺" width="60" align="center"> </el-table-column>
+ <el-table-column prop="date" label="涓汉缂姌" width="60" align="center"> </el-table-column>
+ <el-table-column prop="date" label="涓�鍥炰骇閲�" width="60" align="center"> </el-table-column>
+ <el-table-column prop="date" label="涓�鍥炲彴浜�" width="60" align="center"> </el-table-column>
+ <el-table-column prop="date" label="涓�鍥炵极鎶�" width="60" align="center"> </el-table-column>
+ <el-table-column prop="date" label="浜屽洖浜ч噺" width="60" align="center"> </el-table-column>
+ <el-table-column prop="date" label="浜屽洖鍙颁骇" width="60" align="center"> </el-table-column>
+ <el-table-column prop="date" label="浜屽洖缂姌" width="60" align="center"> </el-table-column>
+ <el-table-column prop="date" label="涓夊洖浜ч噺" width="60" align="center"> </el-table-column>
+ <el-table-column prop="date" label="涓夊洖鍙颁骇" width="60" align="center"> </el-table-column>
+ <el-table-column prop="date" label="涓夊洖缂姌" width="60" align="center"> </el-table-column>
+ </el-table>
+ </div>
+ </div>
+ <!-- 浠櫒杩炴帴姝ｅ父寮圭獥 -->
+ <addProductDialog ref="addProductDialog" />
+ </div>
+</template>
+
+<script>
+import addProductDialog from "./components/addProductDialog"
+export default {
+ name: "addProductRegisterPage",
+ props: {},
+ mixins: [],
+ components: { addProductDialog },
+ computed: {},
+ data() {
+ return {
+ isDeviceConnectStatus: false,
+ ruleForm: {
+ number: "",
+ productTime: "",
+ productDate: "",
+ numTimes: "",
+ lots: "搴勫彛涓�",
+ silkCocoonCount: "",
+ workshop: "杞﹂棿涓�",
+ barrelCocoonCount: "",
+ group: 1,
+ actualSpeed: "",
+ spec: "",
+ bShiftTime: "",
+ aShiftTime: "",
+ end: false,
+ reelingDiscount: "",
+ grade: "",
+ oneInput: "",
+ isOneDoff: false,
+ twoInput: "",
+ isTwoDoff: false,
+ threeInput: "",
+ isThreeDoff: false,
+ theorySilkCount: "",
+ totalOutput: "",
+ platformTimeOutput: ""
+ },
+ rules: {
+ number: [{ required: true, message: "璇疯緭鍏ョ紪鍙�", trigger: "blur" }],
+ productDate: [{ required: true, message: "璇烽�夋嫨鐢熶骇鏃ユ湡", trigger: "change" }],
+ workshop: [{ type: "date", required: true, message: "璇烽�夋嫨杞﹂棿", trigger: "change" }]
+ },
+ groupOptions: [
+ { id: 1, value: 1 },
+ { id: 2, value: 2 },
+ { id: 3, value: 3 },
+ { id: 4, value: 4 },
+ { id: 5, value: 5 },
+ { id: 6, value: 6 },
+ { id: 7, value: 7 },
+ { id: 8, value: 8 },
+ { id: 9, value: 9 }
+ ],
+ tableData: []
+ }
+ },
+ created() {},
+ methods: {
+ // 浠櫒杩炴帴寮圭獥
+ deviceConnectClick() {
+ console.log("dddd")
+ if (this.isDeviceConnectStatus) {
+ this.$refs.addProductDialog.editDialogVisible = true
+ }
+ }
+ }
+}
+</script>
+
+<!-- Add "scoped" attribute to limit CSS to this component only -->
+<style lang="scss" scoped>
+.add-product-page {
+ height: 100%;
+ .top-view {
+ margin: 20px 30px;
+ height: 52px;
+ display: flex;
+ align-items: center;
+ justify-content: space-between;
+ padding: 0 20px 0 20px;
+ border-radius: 12px;
+ background-color: #fff;
+ .t-right {
+ display: flex;
+ font-size: 14px;
+ // color: #ff0000;
+ .t-right-circle {
+ width: 18px;
+ height: 18px;
+ border-radius: 9px;
+ // background: #ff0000;
+ margin-right: 10px;
+ }
+ }
+ }
+ .body-card {
+ margin: 0 30px;
+ background-color: #fff;
+ padding: 10px 15px;
+ height: calc(100% - 180px);
+ border-radius: 4px;
+ .body-top {
+ display: flex;
+ .b-t-left {
+ width: 95%;
+ padding-top: 15px;
+ .doff-barrelage-card {
+ display: flex;
+ .d-b-common {
+ width: 33.3%;
+ display: flex;
+ justify-content: center;
+ .d-b-c-input {
+ width: 50%;
+ margin-right: 10px;
+ }
+ .n-m-c-label {
+ color: #606266;
+ margin-right: 10px;
+ }
+ }
+ }
+ }
+ .b-t-right {
+ width: 60px;
+ .b-t-r-icon {
+ width: 50px;
+ height: 50px;
+ border-radius: 25px;
+ border: 1px solid #1890ff;
+ color: #1890ff;
+ font-size: 30px;
+ line-height: 50px;
+ text-align: center;
+ margin-top: 15px;
+ margin-left: 30px;
+ }
+ }
+ }
+ .body-table {
+ position: relative;
+ .b-t-unit {
+ position: absolute;
+ top: -25px;
+ right: 20px;
+ }
+ }
+ }
+}
+.t-right-red {
+ color: #ff0000;
+}
+.t-right-green {
+ color: #00ff00;
+}
+.t-r-bg-red {
+ background: #ff0000;
+}
+.t-r-bg-green {
+ background: #00ff00;
+}
+.c-p {
+ cursor: pointer;
+}
+.c-n {
+ cursor: no-drop;
+}
+
+::v-deep {
+}
+</style>
diff --git a/src/views/productManage/productRegisterForm/components/addProductDialog.vue b/src/views/productManage/productRegisterForm/components/addProductDialog.vue
new file mode 100644
index 0000000..7dca258
--- /dev/null
+++ b/src/views/productManage/productRegisterForm/components/addProductDialog.vue
@@ -0,0 +1,187 @@
+<template>
+ <el-dialog
+ v-dialogDrag
+ :close-on-click-modal="false"
+ :visible.sync="editDialogVisible"
+ width="533px"
+ class="add-event-dialog"
+ @close="handleClose"
+ >
+ <div class="dialog-content-box">
+ <el-form
+ :model="proForm"
+ :rules="rules"
+ ref="ruleForm"
+ label-width="60px"
+ label-position="right"
+ class="demo-ruleForm"
+ >
+ <el-row>
+ <el-col :span="11">
+ <el-form-item label="鏃ユ湡" prop="date">
+ <el-date-picker
+ type="date"
+ placeholder="骞�/鏈�/鏃�"
+ v-model="proForm.date"
+ size="small"
+ style="width: 100%"
+ ></el-date-picker>
+ </el-form-item>
+ </el-col>
+ <el-col :span="9">
+ <el-form-item label="缁勫埆" prop="group">
+ <el-select v-model="proForm.group" placeholder="璇烽�夋嫨缁勫埆" size="small">
+ <el-option v-for="item in groupOptions" :key="item.id" :label="item.value" :value="item.id"></el-option>
+ </el-select>
+ </el-form-item>
+ </el-col>
+ <el-col :span="11">
+ <el-form-item label="杞﹂棿" prop="workshop">
+ <el-select v-model="proForm.workshop" placeholder="璇烽�夋嫨杞﹂棿" size="small">
+ <el-option label="杞﹂棿涓�" value="杞﹂棿涓�"></el-option>
+ <el-option label="杞﹂棿浜�" value="杞﹂棿浜�"></el-option>
+ <el-option label="杞﹂棿涓�" value="杞﹂棿涓�"></el-option>
+ <el-option label="杞﹂棿鍥�" value="杞﹂棿鍥�"></el-option>
+ </el-select>
+ </el-form-item>
+ </el-col>
+ <el-col :span="9">
+ <el-form-item label="瑙勬牸" prop="spec">
+ <el-input v-model="proForm.spec" size="small"></el-input>
+ </el-form-item>
+ </el-col>
+ <el-col :span="20">
+ <el-form-item label="搴勫彛" prop="lots">
+ <el-select v-model="proForm.lots" placeholder="璇烽�夋嫨搴勫彛" size="small" style="width: 100%">
+ <el-option label="搴勫彛涓�" value="搴勫彛涓�"></el-option>
+ <el-option label="搴勫彛浜�" value="搴勫彛浜�"></el-option>
+ </el-select>
+ </el-form-item>
+ </el-col>
+ <el-col :span="4">
+ <el-form-item label="" label-width="20px">
+ <el-button type="primary" size="small">鍒囨崲</el-button>
+ </el-form-item>
+ </el-col>
+ <el-col :span="20">
+ <el-form-item prop="tareWeight" label-width="80px">
+ <span slot="label">
+ <span class="formLabel">鐨噸</span>
+ </span>
+ <el-input v-model="proForm.tareWeight" size="small"></el-input>
+ </el-form-item>
+ </el-col>
+ <el-col :span="20">
+ <el-form-item prop="netWeight" label-width="80px">
+ <span slot="label">
+ <span class="formLabel">鍑�閲�</span>
+ </span>
+ <el-input v-model="proForm.netWeight" size="small"></el-input>
+ </el-form-item>
+ </el-col>
+ <el-col :span="20">
+ <el-form-item prop="carNum" label-width="80px">
+ <span slot="label">
+ <span class="formLabel">杞﹀彿</span>
+ </span>
+ <el-input v-model="proForm.carNum" size="small"></el-input>
+ </el-form-item>
+ </el-col>
+ <el-col :span="20">
+ <el-form-item prop="numTimes" label-width="80px">
+ <span slot="label">
+ <span class="formLabel">鍥炴暟</span>
+ </span>
+ <el-input v-model="proForm.numTimes" size="small"></el-input>
+ </el-form-item>
+ </el-col>
+ <el-col :span="20">
+ <el-form-item prop="pieces" label-width="80px">
+ <span slot="label">
+ <span class="formLabel">鐗囨暟</span>
+ </span>
+ <el-input v-model="proForm.pieces" size="small"></el-input>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ </el-form>
+ </div>
+ <div slot="footer" class="dialog-footer">
+ <el-button @click="handleClose" size="mini">鍙栨秷</el-button>
+ <el-button type="primary" @click="onSubmit('form')" size="mini">纭畾</el-button>
+ </div>
+ </el-dialog>
+</template>
+<script>
+export default {
+ props: {},
+ components: {},
+ data() {
+ return {
+ editDialogVisible: false,
+ proForm: {},
+ rules: {
+ date: [{ required: true, message: "璇烽�夋嫨鏃ユ湡", trigger: "change" }],
+ number: [{ required: true, message: "璇疯緭鍏ョ紪鍙�", trigger: "blur" }],
+ workshop: [{ type: "date", required: true, message: "璇烽�夋嫨杞﹂棿", trigger: "change" }]
+ },
+ groupOptions: [
+ { id: 1, value: 1 },
+ { id: 2, value: 2 },
+ { id: 3, value: 3 },
+ { id: 4, value: 4 },
+ { id: 5, value: 5 },
+ { id: 6, value: 6 },
+ { id: 7, value: 7 },
+ { id: 8, value: 8 },
+ { id: 9, value: 9 }
+ ]
+ }
+ },
+ created() {},
+ methods: {
+ handleClose() {
+ this.editDialogVisible = false
+ },
+ // 纭畾
+ onSubmit(form) {
+ console.log(form)
+ }
+ }
+}
+</script>
+<style lang="scss" scoped>
+.add-event-dialog {
+ .formLabel {
+ font-size: 20px;
+ font-weight: 700;
+ color: #333;
+ }
+ .dialog-footer {
+ background-color: #fff;
+ }
+}
+::v-deep {
+ .el-dialog__header {
+ border-bottom: 0px solid #e5e5e5;
+ }
+ .el-dialog__body {
+ padding: 0px 20px 10px;
+ }
+ .el-form-item__label {
+ font-size: 16px;
+ color: #333;
+ font-weight: 700;
+ }
+}
+</style>
+<style>
+.add-event-dialog .el-dialog {
+ position: absolute;
+ right: 40px;
+ top: 40px;
+}
+/* .add-event-dialog .el-dialog__header {
+ display: none;
+} */
+</style>
diff --git a/src/views/productManage/productRegisterForm/index.vue b/src/views/productManage/productRegisterForm/index.vue
index 1770ad9..a9a9bec 100644
--- a/src/views/productManage/productRegisterForm/index.vue
+++ b/src/views/productManage/productRegisterForm/index.vue
@@ -90,7 +90,9 @@
console.log(searchText)
},
// 鏂板
- addBtnClick() {},
+ addBtnClick() {
+ this.$router.push({ name: "addProductRegisterPage" })
+ },
// 鏌ョ湅
viewClick(row) {
console.log(row)
@@ -110,6 +112,7 @@
<!-- Add "scoped" attribute to limit CSS to this component only -->
<style lang="scss" scoped>
.productRegisterForm-container {
+ height: 100%;
.filter-card {
margin: 20px 30px;
height: 80px;
@@ -123,6 +126,7 @@
margin: 0 30px;
background-color: #fff;
padding: 10px 15px;
+ height: calc(100% - 180px);
}
}
</style>
--
Gitblit v1.8.0