From 2aac079b7c0108ca30793a40f38033c260df7b3a Mon Sep 17 00:00:00 2001 From: wcy <761646706@qq.com> Date: Fri, 11 Oct 2024 09:41:51 +0800 Subject: [PATCH 1/7] =?UTF-8?q?=E5=89=8D=E7=AB=AF=E9=85=8D=E4=BB=B6?= =?UTF-8?q?=E7=AE=A1=E7=90=86=E5=AD=97=E6=AE=B5=E6=8F=90=E7=A4=BA=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/warehouseManage/machinery/parts/index.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/warehouseManage/machinery/parts/index.vue b/src/views/warehouseManage/machinery/parts/index.vue index e89b1c9..137ddcc 100644 --- a/src/views/warehouseManage/machinery/parts/index.vue +++ b/src/views/warehouseManage/machinery/parts/index.vue @@ -363,7 +363,7 @@ export default { paName: [ { required: true, - message: '部门名称不能为空', + message: '名称不能为空', trigger: 'blur', }, ], From 8688bb6b094ce99007c7d4b0a4d4cf3cc5850875 Mon Sep 17 00:00:00 2001 From: wcy <761646706@qq.com> Date: Fri, 11 Oct 2024 13:33:05 +0800 Subject: [PATCH 2/7] =?UTF-8?q?=E5=89=8D=E7=AB=AF=E7=B1=BB=E5=9E=8B?= =?UTF-8?q?=E7=AE=A1=E7=90=86=E5=8E=BB=E9=99=A4=E6=88=90=E5=A5=97=E7=AE=A1?= =?UTF-8?q?=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../warehouseManage/machinery/type/index.vue | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/src/views/warehouseManage/machinery/type/index.vue b/src/views/warehouseManage/machinery/type/index.vue index b6243c4..d46cdb0 100644 --- a/src/views/warehouseManage/machinery/type/index.vue +++ b/src/views/warehouseManage/machinery/type/index.vue @@ -213,13 +213,13 @@ > 数量管理 - - 成套管理 - + + + + + + + 数量管理 - 成套管理 + + + From 5be6b345cf75fe5740468a66604b0b97edc8002d Mon Sep 17 00:00:00 2001 From: wcy <761646706@qq.com> Date: Fri, 11 Oct 2024 13:36:07 +0800 Subject: [PATCH 3/7] =?UTF-8?q?=E5=89=8D=E7=AB=AF=E7=B1=BB=E5=9E=8B?= =?UTF-8?q?=E7=AE=A1=E7=90=86=E5=8E=BB=E9=99=A4=E4=B8=A2=E5=A4=B1=E8=B5=94?= =?UTF-8?q?=E5=81=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/warehouseManage/machinery/type/index.vue | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/views/warehouseManage/machinery/type/index.vue b/src/views/warehouseManage/machinery/type/index.vue index d46cdb0..eb68c4b 100644 --- a/src/views/warehouseManage/machinery/type/index.vue +++ b/src/views/warehouseManage/machinery/type/index.vue @@ -182,13 +182,13 @@ prop="buyPrice" show-overflow-tooltip /> - + + + + + + + Date: Fri, 11 Oct 2024 13:45:33 +0800 Subject: [PATCH 4/7] =?UTF-8?q?=E5=89=8D=E7=AB=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../newPurchase/toolsAcceptance/component/home.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/warehouseManage/newPurchase/toolsAcceptance/component/home.vue b/src/views/warehouseManage/newPurchase/toolsAcceptance/component/home.vue index 2624366..d59066a 100644 --- a/src/views/warehouseManage/newPurchase/toolsAcceptance/component/home.vue +++ b/src/views/warehouseManage/newPurchase/toolsAcceptance/component/home.vue @@ -371,7 +371,7 @@ /> From 33642c1af1b8b4ebdedf5b81b9f6c57046a99618 Mon Sep 17 00:00:00 2001 From: wcy <761646706@qq.com> Date: Fri, 11 Oct 2024 13:48:49 +0800 Subject: [PATCH 5/7] =?UTF-8?q?=E5=89=8D=E7=AB=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../toolsAcceptance/component/home.vue | 35 ++++++++++--------- 1 file changed, 18 insertions(+), 17 deletions(-) diff --git a/src/views/warehouseManage/newPurchase/toolsAcceptance/component/home.vue b/src/views/warehouseManage/newPurchase/toolsAcceptance/component/home.vue index d59066a..d8944d3 100644 --- a/src/views/warehouseManage/newPurchase/toolsAcceptance/component/home.vue +++ b/src/views/warehouseManage/newPurchase/toolsAcceptance/component/home.vue @@ -370,32 +370,32 @@ prop="purchaseNum" /> - + + + + + - + + + + + - - + + + + + +
Date: Fri, 11 Oct 2024 14:33:23 +0800 Subject: [PATCH 6/7] =?UTF-8?q?=E5=89=8D=E7=AB=AF=E9=A2=86=E6=96=99?= =?UTF-8?q?=E7=94=B3=E8=AF=B7=E6=8A=B1=E6=9D=86=E5=A2=9E=E5=8A=A0=E5=BC=B9?= =?UTF-8?q?=E6=A1=86=E5=86=85=E5=AE=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../picking/apply/component/AddPicking1.vue | 31 +++++++++++++++---- 1 file changed, 25 insertions(+), 6 deletions(-) diff --git a/src/views/claimAndreturn/picking/apply/component/AddPicking1.vue b/src/views/claimAndreturn/picking/apply/component/AddPicking1.vue index 7483784..13acc98 100644 --- a/src/views/claimAndreturn/picking/apply/component/AddPicking1.vue +++ b/src/views/claimAndreturn/picking/apply/component/AddPicking1.vue @@ -219,11 +219,16 @@ label="设备所属" prop="deviceAscription" /> - + + + + @@ -232,7 +237,21 @@ align="center" label="抱杆设备名称" /> - + + + + + @@ -237,16 +237,17 @@ align="center" label="抱杆设备名称" /> + @@ -497,6 +498,7 @@ export default { unitCn: '', //显示的设备 单位 remark: '', //单条备注 preNum: 1, //预领数量 + deviceNum: '', }, // queryRules: { @@ -816,6 +818,7 @@ export default { template.guigeCn = item.typeModelName template.remark = item.remark template.preNum = item.preNum + template.deviceNum = item.deviceNum template.status = item.status template.parenntId = item.parenntId template.num = item.num