From 88e279446a80bc3e45592939eeeede59228d580b Mon Sep 17 00:00:00 2001 From: A0010407 Date: Wed, 20 Sep 2023 15:48:28 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E8=AE=BE=E5=A4=87=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E9=99=84=E5=B1=9E=E5=B1=9E=E6=80=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/wms/equipment/index.vue | 142 +++++++++++++++++++++++++++++- 1 file changed, 141 insertions(+), 1 deletion(-) diff --git a/src/views/wms/equipment/index.vue b/src/views/wms/equipment/index.vue index 47596a2..f1b731c 100644 --- a/src/views/wms/equipment/index.vue +++ b/src/views/wms/equipment/index.vue @@ -229,6 +229,137 @@ 取 消 + + + + + 主属性 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 附属属性 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ 取 消 +
+ @@ -261,6 +392,7 @@ export default { title: "", // 是否显示弹出层 open: false, + queryOpen: false, // 查询参数 queryParams: { pageNum: 1, @@ -330,6 +462,11 @@ export default { this.open = false; this.reset(); }, + // 取消按钮 + queryCancel() { + this.queryOpen = false; + this.reset(); + }, // 表单重置 reset() { this.form = { @@ -406,9 +543,12 @@ export default { handleView(row){ this.reset(); const equipmentId = row.equipmentId || this.ids; + getWorkCenterList().then(response =>{ + console.log(this.options1); + }); getEquipment(equipmentId).then(response => { this.form = response.data; - this.open = true; + this.queryOpen = true; this.title = "查看设备信息"; this.optType = "view"; }); From 279e90bfa9e2cf184d369c791d3113fe5c362a0e Mon Sep 17 00:00:00 2001 From: A0010407 Date: Wed, 20 Sep 2023 17:36:29 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E5=9F=BA=E7=A1=80=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E9=99=84=E5=B1=9E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/wms/product/index.vue | 136 +++++++++++++++++++++++++++++++- 1 file changed, 135 insertions(+), 1 deletion(-) diff --git a/src/views/wms/product/index.vue b/src/views/wms/product/index.vue index a02e4ce..9483fac 100644 --- a/src/views/wms/product/index.vue +++ b/src/views/wms/product/index.vue @@ -73,7 +73,15 @@ - + + + @@ -286,6 +294,116 @@ 取 消 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ 确 定 + 取 消 +
+ @@ -315,6 +433,7 @@ export default { title: "", // 是否显示弹出层 open: false, + openAttached: false, // 查询参数 queryParams: { pageNum: 1, @@ -395,6 +514,11 @@ export default { this.open = false; this.reset(); }, + // 取消按钮 + cancelAttached() { + this.openAttached = false; + this.reset(); + }, // 表单重置 reset() { this.form = { @@ -475,6 +599,16 @@ export default { this.title = "修改产品信息"; }); }, + // 查询明细按钮操作 + handleView(row){ + this.reset(); + const productId = row.productId || this.ids + getProduct(productId).then(response => { + this.form = response.data; + this.openAttached = true; + this.title = "查看产品信息"; + }); + }, /** 提交按钮 */ submitForm() { this.$refs["form"].validate(valid => { From b7711569f68e92bf07791d38f5aacef9681e4124 Mon Sep 17 00:00:00 2001 From: A0010407 Date: Wed, 20 Sep 2023 17:56:07 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E5=9F=BA=E7=A1=80=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E4=BE=9B=E5=BA=94=E5=95=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/wms/supplier/index.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/views/wms/supplier/index.vue b/src/views/wms/supplier/index.vue index 23f15ab..4f97454 100644 --- a/src/views/wms/supplier/index.vue +++ b/src/views/wms/supplier/index.vue @@ -211,12 +211,12 @@ - + - + From 8066ad11e20e007e99fd6bb702f48b1d66348b7f Mon Sep 17 00:00:00 2001 From: A0010407 Date: Wed, 20 Sep 2023 18:03:39 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E7=8F=AD=E6=AC=A1=E6=A0=A1=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/wms/shifts/index.vue | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/views/wms/shifts/index.vue b/src/views/wms/shifts/index.vue index 3beb36c..f1c11fb 100644 --- a/src/views/wms/shifts/index.vue +++ b/src/views/wms/shifts/index.vue @@ -219,7 +219,13 @@ export default { form: {}, // 表单校验 rules: { - } + shiftCode: [ + { required: true, message: "班次编码", trigger: "blur" } + ], + shiftDesc: [ + { required: true, message: "班次名称", trigger: "blur" } + ] + } }; }, created() { From 0eb2ba8ce9676a425ef89c2f561811a9aac9d484 Mon Sep 17 00:00:00 2001 From: A0010407 Date: Wed, 20 Sep 2023 18:09:17 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E7=8F=AD=E7=BB=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/wms/team/index.vue | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/views/wms/team/index.vue b/src/views/wms/team/index.vue index de31698..4cdc712 100644 --- a/src/views/wms/team/index.vue +++ b/src/views/wms/team/index.vue @@ -9,9 +9,9 @@ @keyup.enter.native="handleQuery" /> - + - +