From db83fbc8dc95105d81f7bee4f076339a3837d9ac Mon Sep 17 00:00:00 2001
From: yufei_wang <2267742828@qq.com>
Date: Wed, 11 Sep 2024 09:27:55 +0800
Subject: [PATCH 1/4] =?UTF-8?q?HL-5886=E3=80=81=E4=BB=A5=E5=8F=8Abug?=
=?UTF-8?q?=EF=BC=9A=E5=8D=95=E4=BB=B72=E4=BD=8D=E5=B0=8F=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../strategy/arrivalInspectionStrategy/AddForm.vue | 2 +-
.../strategySetting/strategy/batchStrategy/AddForm.vue | 2 +-
.../strategySetting/strategy/downShelfStrategy/AddForm.vue | 2 +-
.../strategySetting/strategy/inspectStrategy/AddForm.vue | 2 +-
.../strategy/purchaseReceiptStrategy/AddForm.vue | 2 +-
.../strategy/storageCapacityStrategy/AddForm.vue | 2 +-
.../strategySetting/strategy/upShelfStrategy/AddForm.vue | 2 +-
.../strategy/utensilCapacityStrategy/AddForm.vue | 2 +-
.../strategy/warehouseStorageStrategy/AddForm.vue | 2 +-
.../scrap/scrapRequestMain/scrapRequestMain.data.ts | 4 ++--
10 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/src/views/wms/basicDataManage/strategySetting/strategy/arrivalInspectionStrategy/AddForm.vue b/src/views/wms/basicDataManage/strategySetting/strategy/arrivalInspectionStrategy/AddForm.vue
index 300bd0569..8e981a2a4 100644
--- a/src/views/wms/basicDataManage/strategySetting/strategy/arrivalInspectionStrategy/AddForm.vue
+++ b/src/views/wms/basicDataManage/strategySetting/strategy/arrivalInspectionStrategy/AddForm.vue
@@ -40,7 +40,7 @@
-
+
diff --git a/src/views/wms/basicDataManage/strategySetting/strategy/batchStrategy/AddForm.vue b/src/views/wms/basicDataManage/strategySetting/strategy/batchStrategy/AddForm.vue
index a6c88002f..e437aa9e5 100644
--- a/src/views/wms/basicDataManage/strategySetting/strategy/batchStrategy/AddForm.vue
+++ b/src/views/wms/basicDataManage/strategySetting/strategy/batchStrategy/AddForm.vue
@@ -40,7 +40,7 @@
-
+
diff --git a/src/views/wms/basicDataManage/strategySetting/strategy/downShelfStrategy/AddForm.vue b/src/views/wms/basicDataManage/strategySetting/strategy/downShelfStrategy/AddForm.vue
index a536f57b2..61142765c 100644
--- a/src/views/wms/basicDataManage/strategySetting/strategy/downShelfStrategy/AddForm.vue
+++ b/src/views/wms/basicDataManage/strategySetting/strategy/downShelfStrategy/AddForm.vue
@@ -41,7 +41,7 @@
-
+
diff --git a/src/views/wms/basicDataManage/strategySetting/strategy/inspectStrategy/AddForm.vue b/src/views/wms/basicDataManage/strategySetting/strategy/inspectStrategy/AddForm.vue
index b5ac08e0c..9c639d625 100644
--- a/src/views/wms/basicDataManage/strategySetting/strategy/inspectStrategy/AddForm.vue
+++ b/src/views/wms/basicDataManage/strategySetting/strategy/inspectStrategy/AddForm.vue
@@ -41,7 +41,7 @@
-
+
diff --git a/src/views/wms/basicDataManage/strategySetting/strategy/purchaseReceiptStrategy/AddForm.vue b/src/views/wms/basicDataManage/strategySetting/strategy/purchaseReceiptStrategy/AddForm.vue
index 715b5cff3..b410bb411 100644
--- a/src/views/wms/basicDataManage/strategySetting/strategy/purchaseReceiptStrategy/AddForm.vue
+++ b/src/views/wms/basicDataManage/strategySetting/strategy/purchaseReceiptStrategy/AddForm.vue
@@ -41,7 +41,7 @@
-
+
diff --git a/src/views/wms/basicDataManage/strategySetting/strategy/storageCapacityStrategy/AddForm.vue b/src/views/wms/basicDataManage/strategySetting/strategy/storageCapacityStrategy/AddForm.vue
index 5a2c0726a..d77a57f89 100644
--- a/src/views/wms/basicDataManage/strategySetting/strategy/storageCapacityStrategy/AddForm.vue
+++ b/src/views/wms/basicDataManage/strategySetting/strategy/storageCapacityStrategy/AddForm.vue
@@ -40,7 +40,7 @@
-
+
diff --git a/src/views/wms/basicDataManage/strategySetting/strategy/upShelfStrategy/AddForm.vue b/src/views/wms/basicDataManage/strategySetting/strategy/upShelfStrategy/AddForm.vue
index baf6aadca..634a6dd7d 100644
--- a/src/views/wms/basicDataManage/strategySetting/strategy/upShelfStrategy/AddForm.vue
+++ b/src/views/wms/basicDataManage/strategySetting/strategy/upShelfStrategy/AddForm.vue
@@ -40,7 +40,7 @@
-
+
diff --git a/src/views/wms/basicDataManage/strategySetting/strategy/utensilCapacityStrategy/AddForm.vue b/src/views/wms/basicDataManage/strategySetting/strategy/utensilCapacityStrategy/AddForm.vue
index 01ab5f540..1506c05c4 100644
--- a/src/views/wms/basicDataManage/strategySetting/strategy/utensilCapacityStrategy/AddForm.vue
+++ b/src/views/wms/basicDataManage/strategySetting/strategy/utensilCapacityStrategy/AddForm.vue
@@ -40,7 +40,7 @@
-
+
diff --git a/src/views/wms/basicDataManage/strategySetting/strategy/warehouseStorageStrategy/AddForm.vue b/src/views/wms/basicDataManage/strategySetting/strategy/warehouseStorageStrategy/AddForm.vue
index 595dd95e9..fa2c9900b 100644
--- a/src/views/wms/basicDataManage/strategySetting/strategy/warehouseStorageStrategy/AddForm.vue
+++ b/src/views/wms/basicDataManage/strategySetting/strategy/warehouseStorageStrategy/AddForm.vue
@@ -40,7 +40,7 @@
-
+
diff --git a/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/scrapRequestMain.data.ts b/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/scrapRequestMain.data.ts
index 72cc661b5..c27383f36 100644
--- a/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/scrapRequestMain.data.ts
+++ b/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/scrapRequestMain.data.ts
@@ -1079,14 +1079,14 @@ export const ScrapRequestDetail = useCrudSchemas(reactive([
componentProps: {
disabled: true,
min: 0,
- precision: 6
+ precision: 2,
},
},
tableForm: {
disabled: true,
type: 'InputNumber',
min: 0,
- precision: 6
+ precision: 2,
}
},
{
From 77541fbd676ce10c8e6ac0a42db6ffa02aefa166 Mon Sep 17 00:00:00 2001
From: zhaoyiran
Date: Wed, 11 Sep 2024 09:37:08 +0800
Subject: [PATCH 2/4] =?UTF-8?q?HL-5915=E8=AE=B0=E5=BD=95=E7=89=B9=E6=80=A7?=
=?UTF-8?q?=E4=B9=9F=E7=BC=96=E7=A0=81=E4=B8=8D=E5=AF=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/qms/inspectionJob/addForm.vue | 2 +-
src/views/qms/inspectionRecord/addForm.vue | 2 +-
src/views/qms/inspectionRecord/detail.vue | 2 +-
src/views/qms/inspectionRecordFirst/addForm.vue | 2 +-
src/views/qms/inspectionRecordFirst/detail.vue | 2 +-
5 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/views/qms/inspectionJob/addForm.vue b/src/views/qms/inspectionJob/addForm.vue
index 7fcdee9ed..79484f230 100644
--- a/src/views/qms/inspectionJob/addForm.vue
+++ b/src/views/qms/inspectionJob/addForm.vue
@@ -120,7 +120,7 @@
diff --git a/src/views/qms/inspectionRecord/addForm.vue b/src/views/qms/inspectionRecord/addForm.vue
index 037c9456b..7b267390b 100644
--- a/src/views/qms/inspectionRecord/addForm.vue
+++ b/src/views/qms/inspectionRecord/addForm.vue
@@ -119,7 +119,7 @@
diff --git a/src/views/qms/inspectionRecord/detail.vue b/src/views/qms/inspectionRecord/detail.vue
index a297b37d4..107b2b1f7 100644
--- a/src/views/qms/inspectionRecord/detail.vue
+++ b/src/views/qms/inspectionRecord/detail.vue
@@ -39,7 +39,7 @@
diff --git a/src/views/qms/inspectionRecordFirst/addForm.vue b/src/views/qms/inspectionRecordFirst/addForm.vue
index 4f4777f9a..bd88637f5 100644
--- a/src/views/qms/inspectionRecordFirst/addForm.vue
+++ b/src/views/qms/inspectionRecordFirst/addForm.vue
@@ -187,7 +187,7 @@
diff --git a/src/views/qms/inspectionRecordFirst/detail.vue b/src/views/qms/inspectionRecordFirst/detail.vue
index a297b37d4..107b2b1f7 100644
--- a/src/views/qms/inspectionRecordFirst/detail.vue
+++ b/src/views/qms/inspectionRecordFirst/detail.vue
@@ -39,7 +39,7 @@
From bebd1750f9b45f87e3030958a4e33fe5380bba81 Mon Sep 17 00:00:00 2001
From: yufei_wang <2267742828@qq.com>
Date: Wed, 11 Sep 2024 10:00:08 +0800
Subject: [PATCH 3/4] =?UTF-8?q?=E7=AD=96=E7=95=A5=E9=BB=98=E8=AE=A4?=
=?UTF-8?q?=E8=A7=84=E5=88=99=EF=BC=8C=E9=99=A4=E4=BA=86=E9=85=8D=E7=BD=AE?=
=?UTF-8?q?=E9=83=BD=E4=B8=8D=E5=8F=AF=E7=BC=96=E8=BE=91+=E9=9A=90?=
=?UTF-8?q?=E8=97=8F=E5=AF=BC=E5=87=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../arrivalInspectionStrategy/AddForm.vue | 18 ++++++++---------
.../strategy/batchStrategy/AddForm.vue | 18 ++++++++---------
.../strategy/downShelfStrategy/AddForm.vue | 4 ++--
.../strategy/inspectStrategy/AddForm.vue | 18 ++++++++---------
.../purchaseReceiptStrategy/AddForm.vue | 20 +++++++++----------
.../storageCapacityStrategy/AddForm.vue | 18 ++++++++---------
.../supplieDeliveryStrategy/AddForm.vue | 18 ++++++++---------
.../strategy/upShelfStrategy/AddForm.vue | 20 +++++++++----------
.../utensilCapacityStrategy/AddForm.vue | 18 ++++++++---------
.../warehouseStorageStrategy/AddForm.vue | 18 ++++++++---------
.../rawMaterialConsumptionInfo/index.vue | 2 +-
11 files changed, 86 insertions(+), 86 deletions(-)
diff --git a/src/views/wms/basicDataManage/strategySetting/strategy/arrivalInspectionStrategy/AddForm.vue b/src/views/wms/basicDataManage/strategySetting/strategy/arrivalInspectionStrategy/AddForm.vue
index 8e981a2a4..1ffac1115 100644
--- a/src/views/wms/basicDataManage/strategySetting/strategy/arrivalInspectionStrategy/AddForm.vue
+++ b/src/views/wms/basicDataManage/strategySetting/strategy/arrivalInspectionStrategy/AddForm.vue
@@ -25,12 +25,12 @@
-
+
-
+
@@ -288,17 +288,17 @@ const open = async (type: string, strategyCode: string, id?: number) => {
formData.value.description = data.description
formData.value.priority = data.priority
formData.value.status = data.status == 0 ? true : false
- if (formData.value.priority == 0) {
- Butttondata.value = [
- defaultButtons.formSaveBtn({disabled:true}), // 保存
- defaultButtons.formCloseBtn(null) // 关闭
- ]
- } else {
+ // if (formData.value.priority == 0) {
+ // Butttondata.value = [
+ // defaultButtons.formSaveBtn({disabled:true}), // 保存
+ // defaultButtons.formCloseBtn(null) // 关闭
+ // ]
+ // } else {
Butttondata.value = [
defaultButtons.formSaveBtn(null), // 保存
defaultButtons.formCloseBtn(null) // 关闭
]
- }
+ // }
if (data.condition) {
formData.value.condition = JSON.parse(data.condition)
formData.value.condition.forEach((item, index) => {
diff --git a/src/views/wms/basicDataManage/strategySetting/strategy/batchStrategy/AddForm.vue b/src/views/wms/basicDataManage/strategySetting/strategy/batchStrategy/AddForm.vue
index e437aa9e5..637179326 100644
--- a/src/views/wms/basicDataManage/strategySetting/strategy/batchStrategy/AddForm.vue
+++ b/src/views/wms/basicDataManage/strategySetting/strategy/batchStrategy/AddForm.vue
@@ -25,12 +25,12 @@
-
+
-
+
@@ -419,17 +419,17 @@ const open = async (type: string, strategyCode: string, id?: number) => {
formData.value.description = data.description
formData.value.priority = data.priority
formData.value.status = data.status == 0 ? true : false
- if (formData.value.priority == 0) {
- Butttondata.value = [
- defaultButtons.formSaveBtn({ disabled: true }), // 保存
- defaultButtons.formCloseBtn(null) // 关闭
- ]
- } else {
+ // if (formData.value.priority == 0) {
+ // Butttondata.value = [
+ // defaultButtons.formSaveBtn({ disabled: true }), // 保存
+ // defaultButtons.formCloseBtn(null) // 关闭
+ // ]
+ // } else {
Butttondata.value = [
defaultButtons.formSaveBtn(null), // 保存
defaultButtons.formCloseBtn(null) // 关闭
]
- }
+ // }
if (data.condition) {
formData.value.condition = JSON.parse(data.condition)
formData.value.condition.forEach((item, index) => {
diff --git a/src/views/wms/basicDataManage/strategySetting/strategy/downShelfStrategy/AddForm.vue b/src/views/wms/basicDataManage/strategySetting/strategy/downShelfStrategy/AddForm.vue
index 61142765c..df646c487 100644
--- a/src/views/wms/basicDataManage/strategySetting/strategy/downShelfStrategy/AddForm.vue
+++ b/src/views/wms/basicDataManage/strategySetting/strategy/downShelfStrategy/AddForm.vue
@@ -26,12 +26,12 @@
-
+
-
+
diff --git a/src/views/wms/basicDataManage/strategySetting/strategy/inspectStrategy/AddForm.vue b/src/views/wms/basicDataManage/strategySetting/strategy/inspectStrategy/AddForm.vue
index 9c639d625..d6c9f9571 100644
--- a/src/views/wms/basicDataManage/strategySetting/strategy/inspectStrategy/AddForm.vue
+++ b/src/views/wms/basicDataManage/strategySetting/strategy/inspectStrategy/AddForm.vue
@@ -26,12 +26,12 @@
-
+
-
+
@@ -427,17 +427,17 @@ const open = async (type: string, strategyCode: string, id?: number) => {
formData.value.description = data.description
formData.value.priority = data.priority
formData.value.status = data.status == 0 ? true : false
- if (formData.value.priority == 0) {
- Butttondata.value = [
- defaultButtons.formSaveBtn({ disabled: true }), // 保存
- defaultButtons.formCloseBtn(null) // 关闭
- ]
- } else {
+ // if (formData.value.priority == 0) {
+ // Butttondata.value = [
+ // defaultButtons.formSaveBtn({ disabled: true }), // 保存
+ // defaultButtons.formCloseBtn(null) // 关闭
+ // ]
+ // } else {
Butttondata.value = [
defaultButtons.formSaveBtn(null), // 保存
defaultButtons.formCloseBtn(null) // 关闭
]
- }
+ // }
if (data.condition) {
formData.value.condition = JSON.parse(data.condition)
}
diff --git a/src/views/wms/basicDataManage/strategySetting/strategy/purchaseReceiptStrategy/AddForm.vue b/src/views/wms/basicDataManage/strategySetting/strategy/purchaseReceiptStrategy/AddForm.vue
index b410bb411..f2ef687a7 100644
--- a/src/views/wms/basicDataManage/strategySetting/strategy/purchaseReceiptStrategy/AddForm.vue
+++ b/src/views/wms/basicDataManage/strategySetting/strategy/purchaseReceiptStrategy/AddForm.vue
@@ -26,12 +26,12 @@
-
+
-
+
@@ -323,18 +323,18 @@ const open = async (type: string, strategyCode: string, id?: number) => {
formData.value.description = data.description
formData.value.priority = data.priority
formData.value.status = data.status == 0 ? true : false
- if (formData.value.priority == 0) {
- Butttondata.value = [
- defaultButtons.formSaveBtn({disabled:true}), // 保存
- defaultButtons.formCloseBtn(null) // 关闭
- ]
- console.log(Butttondata)
- } else {
+ // if (formData.value.priority == 0) {
+ // Butttondata.value = [
+ // defaultButtons.formSaveBtn({disabled:true}), // 保存
+ // defaultButtons.formCloseBtn(null) // 关闭
+ // ]
+ // console.log(Butttondata)
+ // } else {
Butttondata.value = [
defaultButtons.formSaveBtn(null), // 保存
defaultButtons.formCloseBtn(null) // 关闭
]
- }
+ // }
if (data.condition) {
formData.value.condition = JSON.parse(data.condition)
formData.value.condition.forEach((item, index) => {
diff --git a/src/views/wms/basicDataManage/strategySetting/strategy/storageCapacityStrategy/AddForm.vue b/src/views/wms/basicDataManage/strategySetting/strategy/storageCapacityStrategy/AddForm.vue
index d77a57f89..001628d81 100644
--- a/src/views/wms/basicDataManage/strategySetting/strategy/storageCapacityStrategy/AddForm.vue
+++ b/src/views/wms/basicDataManage/strategySetting/strategy/storageCapacityStrategy/AddForm.vue
@@ -25,12 +25,12 @@
-
+
-
+
@@ -465,17 +465,17 @@ const open = async (type: string, strategyCode: string, id?: number) => {
formData.value.description = data.description
formData.value.priority = data.priority
formData.value.status = data.status == 0 ? true : false
- if (formData.value.priority == 0) {
- Butttondata.value = [
- defaultButtons.formSaveBtn({disabled:true}), // 保存
- defaultButtons.formCloseBtn(null) // 关闭
- ]
- } else {
+ // if (formData.value.priority == 0) {
+ // Butttondata.value = [
+ // defaultButtons.formSaveBtn({disabled:true}), // 保存
+ // defaultButtons.formCloseBtn(null) // 关闭
+ // ]
+ // } else {
Butttondata.value = [
defaultButtons.formSaveBtn(null), // 保存
defaultButtons.formCloseBtn(null) // 关闭
]
- }
+ // }
if (data.condition) {
formData.value.condition = JSON.parse(data.condition)
formData.value.condition.forEach((item, index) => {
diff --git a/src/views/wms/basicDataManage/strategySetting/strategy/supplieDeliveryStrategy/AddForm.vue b/src/views/wms/basicDataManage/strategySetting/strategy/supplieDeliveryStrategy/AddForm.vue
index bc92c9ffe..9b3696516 100644
--- a/src/views/wms/basicDataManage/strategySetting/strategy/supplieDeliveryStrategy/AddForm.vue
+++ b/src/views/wms/basicDataManage/strategySetting/strategy/supplieDeliveryStrategy/AddForm.vue
@@ -26,12 +26,12 @@
-
+
-
+
@@ -459,17 +459,17 @@ const open = async (type: string, strategyCode: string, id?: number) => {
formData.value.description = data.description
formData.value.priority = data.priority
formData.value.status = data.status == 0 ? true : false
- if (formData.value.priority == 0) {
- Butttondata.value = [
- defaultButtons.formSaveBtn({ disabled: true }), // 保存
- defaultButtons.formCloseBtn(null) // 关闭
- ]
- } else {
+ // if (formData.value.priority == 0) {
+ // Butttondata.value = [
+ // defaultButtons.formSaveBtn({ disabled: true }), // 保存
+ // defaultButtons.formCloseBtn(null) // 关闭
+ // ]
+ // } else {
Butttondata.value = [
defaultButtons.formSaveBtn(null), // 保存
defaultButtons.formCloseBtn(null) // 关闭
]
- }
+ // }
if (data.condition) {
formData.value.condition = JSON.parse(data.condition)
formData.value.condition.forEach((item, index) => {
diff --git a/src/views/wms/basicDataManage/strategySetting/strategy/upShelfStrategy/AddForm.vue b/src/views/wms/basicDataManage/strategySetting/strategy/upShelfStrategy/AddForm.vue
index 634a6dd7d..c2451e493 100644
--- a/src/views/wms/basicDataManage/strategySetting/strategy/upShelfStrategy/AddForm.vue
+++ b/src/views/wms/basicDataManage/strategySetting/strategy/upShelfStrategy/AddForm.vue
@@ -25,12 +25,12 @@
-
+
-
+
@@ -1093,18 +1093,18 @@ const open = async (type: string, strategyCode: string, id?: number) => {
formData.value.description = data.description
formData.value.priority = data.priority
formData.value.status = data.status == 0 ? true : false
- if (formData.value.priority == 0) {
- Butttondata.value = [
- defaultButtons.formSaveBtn({disabled:true}), // 保存
- defaultButtons.formCloseBtn(null) // 关闭
- ]
- console.log(Butttondata)
- } else {
+ // if (formData.value.priority == 0) {
+ // Butttondata.value = [
+ // defaultButtons.formSaveBtn({disabled:true}), // 保存
+ // defaultButtons.formCloseBtn(null) // 关闭
+ // ]
+ // console.log(Butttondata)
+ // } else {
Butttondata.value = [
defaultButtons.formSaveBtn(null), // 保存
defaultButtons.formCloseBtn(null) // 关闭
]
- }
+ // }
if (data.condition) {
formData.value.condition = JSON.parse(data.condition)
formData.value.condition.forEach((item, index) => {
diff --git a/src/views/wms/basicDataManage/strategySetting/strategy/utensilCapacityStrategy/AddForm.vue b/src/views/wms/basicDataManage/strategySetting/strategy/utensilCapacityStrategy/AddForm.vue
index 1506c05c4..ba7de67b1 100644
--- a/src/views/wms/basicDataManage/strategySetting/strategy/utensilCapacityStrategy/AddForm.vue
+++ b/src/views/wms/basicDataManage/strategySetting/strategy/utensilCapacityStrategy/AddForm.vue
@@ -25,12 +25,12 @@
-
+
-
+
@@ -329,17 +329,17 @@ const open = async (type: string, strategyCode: string, id?: number) => {
formData.value.description = data.description
formData.value.priority = data.priority
formData.value.status = data.status == 0 ? true : false
- if (formData.value.priority == 0) {
- Butttondata.value = [
- defaultButtons.formSaveBtn({ disabled: true }), // 保存
- defaultButtons.formCloseBtn(null) // 关闭
- ]
- } else {
+ // if (formData.value.priority == 0) {
+ // Butttondata.value = [
+ // defaultButtons.formSaveBtn({ disabled: true }), // 保存
+ // defaultButtons.formCloseBtn(null) // 关闭
+ // ]
+ // } else {
Butttondata.value = [
defaultButtons.formSaveBtn(null), // 保存
defaultButtons.formCloseBtn(null) // 关闭
]
- }
+ // }
if (data.condition) {
formData.value.condition = JSON.parse(data.condition)
formData.value.condition.forEach((item, index) => {
diff --git a/src/views/wms/basicDataManage/strategySetting/strategy/warehouseStorageStrategy/AddForm.vue b/src/views/wms/basicDataManage/strategySetting/strategy/warehouseStorageStrategy/AddForm.vue
index fa2c9900b..9b81cd1cf 100644
--- a/src/views/wms/basicDataManage/strategySetting/strategy/warehouseStorageStrategy/AddForm.vue
+++ b/src/views/wms/basicDataManage/strategySetting/strategy/warehouseStorageStrategy/AddForm.vue
@@ -25,12 +25,12 @@
-
+
-
+
@@ -418,17 +418,17 @@ const open = async (type: string, strategyCode: string, id?: number) => {
formData.value.description = data.description
formData.value.priority = data.priority
formData.value.status = data.status == 0 ? true : false
- if (formData.value.priority == 0) {
- Butttondata.value = [
- defaultButtons.formSaveBtn({disabled:true}), // 保存
- defaultButtons.formCloseBtn(null) // 关闭
- ]
- } else {
+ // if (formData.value.priority == 0) {
+ // Butttondata.value = [
+ // defaultButtons.formSaveBtn({disabled:true}), // 保存
+ // defaultButtons.formCloseBtn(null) // 关闭
+ // ]
+ // } else {
Butttondata.value = [
defaultButtons.formSaveBtn(null), // 保存
defaultButtons.formCloseBtn(null) // 关闭
]
- }
+ // }
if (data.condition) {
formData.value.condition = JSON.parse(data.condition)
formData.value.condition.forEach((item, index) => {
diff --git a/src/views/wms/productionManage/productreceiptAssemble/rawMaterialConsumptionInfo/index.vue b/src/views/wms/productionManage/productreceiptAssemble/rawMaterialConsumptionInfo/index.vue
index 1a98248be..35c411919 100644
--- a/src/views/wms/productionManage/productreceiptAssemble/rawMaterialConsumptionInfo/index.vue
+++ b/src/views/wms/productionManage/productreceiptAssemble/rawMaterialConsumptionInfo/index.vue
@@ -77,7 +77,7 @@ const { getList, setSearchParams } = tableMethods
// 列表头部按钮
const HeadButttondata = [
- defaultButtons.defaultImportBtn(null), // 导入
+ // defaultButtons.defaultImportBtn(null), // 导入
defaultButtons.defaultExportBtn(null), // 导出
defaultButtons.defaultFreshBtn(null), // 刷新
defaultButtons.defaultFilterBtn(null), // 筛选
From 22aaf3d2be9338353b17e011bad74e86a396e07f Mon Sep 17 00:00:00 2001
From: yufei_wang <2267742828@qq.com>
Date: Wed, 11 Sep 2024 10:06:04 +0800
Subject: [PATCH 4/4] =?UTF-8?q?=E6=8A=A5=E5=BA=9F=E5=87=BA=E5=BA=93?=
=?UTF-8?q?=E7=94=B3=E8=AF=B7=E4=BF=9D=E7=95=99=E4=B8=A4=E4=BD=8D=E5=B0=8F?=
=?UTF-8?q?=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../wms/inventoryjobManage/scrap/scrapRequestMain/index.vue | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/index.vue b/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/index.vue
index 1220f6e91..8065b3e74 100644
--- a/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/index.vue
+++ b/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/index.vue
@@ -653,6 +653,11 @@ const submitForm = async (formType, submitData) => {
data.id = data.masterId
}
data.subList = tableData.value // 拼接子表数据参数
+ data.subList.forEach(item=>{
+ item.qty = Number(item.qty).toFixed(2)
+ item.singlePrice = Number(item.singlePrice).toFixed(2)
+ item.amount = Number(item.amount).toFixed(2)
+ })
try {
if (formType === 'create') {
console.log('【报废出库子列表】', data.subList)