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/8] =?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/8] =?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/8] =?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/8] =?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) From f283188eb8cb43198c9c559a37c1ba0b473155bb Mon Sep 17 00:00:00 2001 From: zhaoxuebing <1291173720@qq.com> Date: Wed, 11 Sep 2024 10:08:19 +0800 Subject: [PATCH 5/8] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../inventoryjobManage/scrap/scrapJobMain/scrapJobMain.data.ts | 3 +++ .../scrap/scrapRecordMain/scrapRecordMain.data.ts | 3 +++ .../scrap/scrapRequestMain/scrapRequestMain.data.ts | 1 + 3 files changed, 7 insertions(+) diff --git a/src/views/wms/inventoryjobManage/scrap/scrapJobMain/scrapJobMain.data.ts b/src/views/wms/inventoryjobManage/scrap/scrapJobMain/scrapJobMain.data.ts index 19b121e50..f8927ec2b 100644 --- a/src/views/wms/inventoryjobManage/scrap/scrapJobMain/scrapJobMain.data.ts +++ b/src/views/wms/inventoryjobManage/scrap/scrapJobMain/scrapJobMain.data.ts @@ -78,6 +78,9 @@ export const ScrapJobMain = useCrudSchemas( disabled: true } }, + isForm:false, + isTable:false, + isTableForm:false, }, { label: '领用原因代码', diff --git a/src/views/wms/inventoryjobManage/scrap/scrapRecordMain/scrapRecordMain.data.ts b/src/views/wms/inventoryjobManage/scrap/scrapRecordMain/scrapRecordMain.data.ts index 23c449522..8ebbb5ad0 100644 --- a/src/views/wms/inventoryjobManage/scrap/scrapRecordMain/scrapRecordMain.data.ts +++ b/src/views/wms/inventoryjobManage/scrap/scrapRecordMain/scrapRecordMain.data.ts @@ -87,6 +87,9 @@ export const ScrapRecordMain = useCrudSchemas( disabled: true } }, + isForm:false, + isTable:false, + isTableForm:false, }, { label: '领用原因代码', diff --git a/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/scrapRequestMain.data.ts b/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/scrapRequestMain.data.ts index 72cc661b5..8a3b46c33 100644 --- a/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/scrapRequestMain.data.ts +++ b/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/scrapRequestMain.data.ts @@ -155,6 +155,7 @@ export const ScrapRequestMain = useCrudSchemas( }, isForm:false, isTable:false, + isTableForm:false, form: { componentProps: { disabled: true From ad7c6910b3096fe306c2ff6053512e53e14a26d2 Mon Sep 17 00:00:00 2001 From: yufei_wang <2267742828@qq.com> Date: Wed, 11 Sep 2024 10:20:29 +0800 Subject: [PATCH 6/8] =?UTF-8?q?=E6=B6=88=E8=80=97QAD=E5=9B=9E=E4=BC=A0?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E7=AE=A1=E7=90=86--=E5=85=A8=E9=83=A8?= =?UTF-8?q?=E7=8A=B6=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../agvManage/backflushDetailbQad/backflushDetailbQad.data.ts | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/views/wms/agvManage/backflushDetailbQad/backflushDetailbQad.data.ts b/src/views/wms/agvManage/backflushDetailbQad/backflushDetailbQad.data.ts index 976b4c7b4..14b82105e 100644 --- a/src/views/wms/agvManage/backflushDetailbQad/backflushDetailbQad.data.ts +++ b/src/views/wms/agvManage/backflushDetailbQad/backflushDetailbQad.data.ts @@ -60,6 +60,9 @@ export const BackflushDetailbQad = useCrudSchemas(reactive([ component: 'Select', componentProps: { options: [{ + value: '', + label: '全部' + },{ value: 0, label: '未执行' }, From ccffc67fa8e317c788115e1da5b56b2ca4eab3f8 Mon Sep 17 00:00:00 2001 From: zhaoxuebing <1291173720@qq.com> Date: Wed, 11 Sep 2024 10:22:27 +0800 Subject: [PATCH 7/8] =?UTF-8?q?=E5=AF=BC=E5=87=BA=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../scrap/scrapJobMain/scrapJobMain.data.ts | 7 +++++-- .../scrap/scrapRecordMain/scrapRecordMain.data.ts | 7 +++++-- .../scrap/scrapRequestMain/scrapRequestMain.data.ts | 2 +- 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/src/views/wms/inventoryjobManage/scrap/scrapJobMain/scrapJobMain.data.ts b/src/views/wms/inventoryjobManage/scrap/scrapJobMain/scrapJobMain.data.ts index f8927ec2b..38ceaab30 100644 --- a/src/views/wms/inventoryjobManage/scrap/scrapJobMain/scrapJobMain.data.ts +++ b/src/views/wms/inventoryjobManage/scrap/scrapJobMain/scrapJobMain.data.ts @@ -334,11 +334,14 @@ export const ScrapJobMain = useCrudSchemas( field: 'fromAreaTypes', dictType: DICT_TYPE.AREA_TYPE, dictClass: 'string', - isTable: true, sort: 'custom', table: { width: 150 - } + }, + isTable: false, + isSearch: false, + isForm: false, + isTableForm: false, }, { label: '到库区类型范围', diff --git a/src/views/wms/inventoryjobManage/scrap/scrapRecordMain/scrapRecordMain.data.ts b/src/views/wms/inventoryjobManage/scrap/scrapRecordMain/scrapRecordMain.data.ts index 8ebbb5ad0..69cbd2449 100644 --- a/src/views/wms/inventoryjobManage/scrap/scrapRecordMain/scrapRecordMain.data.ts +++ b/src/views/wms/inventoryjobManage/scrap/scrapRecordMain/scrapRecordMain.data.ts @@ -337,11 +337,14 @@ export const ScrapRecordMain = useCrudSchemas( field: 'fromAreaTypes', dictType: DICT_TYPE.AREA_TYPE, dictClass: 'string', - isTable: true, sort: 'custom', table: { width: 150 - } + }, + isTable: false, + isSearch: false, + isForm: false, + isTableForm: false, }, { label: '从库区代码范围', diff --git a/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/scrapRequestMain.data.ts b/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/scrapRequestMain.data.ts index b3d819578..df22df976 100644 --- a/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/scrapRequestMain.data.ts +++ b/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/scrapRequestMain.data.ts @@ -587,11 +587,11 @@ export const ScrapRequestMain = useCrudSchemas( field: 'fromAreaTypes', dictType: DICT_TYPE.AREA_TYPE, dictClass: 'string', - isTable: true, sort: 'custom', table: { width: 150 }, + isTable: false, isSearch: false, isForm: false, isTableForm: false, From e1303691fe61d049ebb33175fe2592894bc8f402 Mon Sep 17 00:00:00 2001 From: yufei_wang <2267742828@qq.com> Date: Wed, 11 Sep 2024 10:47:16 +0800 Subject: [PATCH 8/8] =?UTF-8?q?=E5=8E=BB=E6=8E=89=EF=BC=9A=20=20=20=20mess?= =?UTF-8?q?age.error('=E4=BC=98=E5=85=88=E7=BA=A7=E4=B8=8D=E5=8F=AF?= =?UTF-8?q?=E4=BB=A5=E4=B8=BA0')?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../strategy/arrivalInspectionStrategy/AddForm.vue | 8 ++++---- .../strategySetting/strategy/batchStrategy/AddForm.vue | 8 ++++---- .../strategy/downShelfStrategy/AddForm.vue | 8 ++++---- .../strategySetting/strategy/inspectStrategy/AddForm.vue | 8 ++++---- .../strategy/manageAccuracyStrategy/AddForm.vue | 8 ++++---- .../strategy/purchaseReceiptStrategy/AddForm.vue | 8 ++++---- .../strategy/repairMaterialStrategy/AddForm.vue | 8 ++++---- .../strategy/storageCapacityStrategy/AddForm.vue | 8 ++++---- .../strategy/supplieDeliveryStrategy/AddForm.vue | 8 ++++---- .../strategySetting/strategy/upShelfStrategy/AddForm.vue | 8 ++++---- .../strategy/utensilCapacityStrategy/AddForm.vue | 8 ++++---- .../strategy/warehouseStorageStrategy/AddForm.vue | 8 ++++---- 12 files changed, 48 insertions(+), 48 deletions(-) diff --git a/src/views/wms/basicDataManage/strategySetting/strategy/arrivalInspectionStrategy/AddForm.vue b/src/views/wms/basicDataManage/strategySetting/strategy/arrivalInspectionStrategy/AddForm.vue index 1ffac1115..5861f5455 100644 --- a/src/views/wms/basicDataManage/strategySetting/strategy/arrivalInspectionStrategy/AddForm.vue +++ b/src/views/wms/basicDataManage/strategySetting/strategy/arrivalInspectionStrategy/AddForm.vue @@ -332,10 +332,10 @@ const submitForm = async () => { if (!formRef) return const valid = await formRef.value.validate() if (!valid) return - if(formData.value.priority == 0){ - message.error('优先级不可以为0') - return - } + // if(formData.value.priority == 0){ + // message.error('优先级不可以为0') + // return + // } let list = Object.values(formData.value.configuration) let onlyOne = list.filter((item) => { return item == 'TRUE' diff --git a/src/views/wms/basicDataManage/strategySetting/strategy/batchStrategy/AddForm.vue b/src/views/wms/basicDataManage/strategySetting/strategy/batchStrategy/AddForm.vue index 637179326..3669803a3 100644 --- a/src/views/wms/basicDataManage/strategySetting/strategy/batchStrategy/AddForm.vue +++ b/src/views/wms/basicDataManage/strategySetting/strategy/batchStrategy/AddForm.vue @@ -471,10 +471,10 @@ const submitForm = async () => { if (!formRef) return const valid = await formRef.value.validate() if (!valid) return - if (formData.value.priority == 0) { - message.error('优先级不可以为0') - return - } + // if (formData.value.priority == 0) { + // message.error('优先级不可以为0') + // return + // } if (hasSameData( formData.value.configuration.ManagementPrecision)) { message.error('规则配置数据重复，请重新填写') return; diff --git a/src/views/wms/basicDataManage/strategySetting/strategy/downShelfStrategy/AddForm.vue b/src/views/wms/basicDataManage/strategySetting/strategy/downShelfStrategy/AddForm.vue index df646c487..bd3342a71 100644 --- a/src/views/wms/basicDataManage/strategySetting/strategy/downShelfStrategy/AddForm.vue +++ b/src/views/wms/basicDataManage/strategySetting/strategy/downShelfStrategy/AddForm.vue @@ -1227,10 +1227,10 @@ const submitForm = async () => { if (!formRef) return const valid = await formRef.value.validate() if (!valid) return - if (formData.value.priority == 0) { - message.error('优先级不可以为0') - return - } + // if (formData.value.priority == 0) { + // message.error('优先级不可以为0') + // return + // } // 提交请求 formLoading.value = true try { diff --git a/src/views/wms/basicDataManage/strategySetting/strategy/inspectStrategy/AddForm.vue b/src/views/wms/basicDataManage/strategySetting/strategy/inspectStrategy/AddForm.vue index d6c9f9571..ed3a6efcf 100644 --- a/src/views/wms/basicDataManage/strategySetting/strategy/inspectStrategy/AddForm.vue +++ b/src/views/wms/basicDataManage/strategySetting/strategy/inspectStrategy/AddForm.vue @@ -477,10 +477,10 @@ const submitForm = async () => { if (!formRef) return const valid = await formRef.value.validate() if (!valid) return - if (formData.value.priority == 0) { - message.error('优先级不可以为0') - return - } + // if (formData.value.priority == 0) { + // message.error('优先级不可以为0') + // return + // } if (hasSameData(formData.value.configuration.AqlList)) { message.error('抽检规则数据范围重叠，请重新填写') return diff --git a/src/views/wms/basicDataManage/strategySetting/strategy/manageAccuracyStrategy/AddForm.vue b/src/views/wms/basicDataManage/strategySetting/strategy/manageAccuracyStrategy/AddForm.vue index bf650795a..23d8aed20 100644 --- a/src/views/wms/basicDataManage/strategySetting/strategy/manageAccuracyStrategy/AddForm.vue +++ b/src/views/wms/basicDataManage/strategySetting/strategy/manageAccuracyStrategy/AddForm.vue @@ -566,10 +566,10 @@ const submitForm = async () => { const valid = await formRef.value.validate() if (!valid) return - if (formData.value.priority == 0) { - message.error('优先级不可以为0') - return - } + // if (formData.value.priority == 0) { + // message.error('优先级不可以为0') + // return + // } // 提交请求 formLoading.value = true try { diff --git a/src/views/wms/basicDataManage/strategySetting/strategy/purchaseReceiptStrategy/AddForm.vue b/src/views/wms/basicDataManage/strategySetting/strategy/purchaseReceiptStrategy/AddForm.vue index f2ef687a7..348c9a4a5 100644 --- a/src/views/wms/basicDataManage/strategySetting/strategy/purchaseReceiptStrategy/AddForm.vue +++ b/src/views/wms/basicDataManage/strategySetting/strategy/purchaseReceiptStrategy/AddForm.vue @@ -368,10 +368,10 @@ const submitForm = async () => { if (!formRef) return const valid = await formRef.value.validate() if (!valid) return - if(formData.value.priority == 0){ - message.error('优先级不可以为0') - return - } + // if(formData.value.priority == 0){ + // message.error('优先级不可以为0') + // return + // } let list = Object.values(formData.value.configuration) let onlyOne = list.filter((item) => { return item == 'TRUE' diff --git a/src/views/wms/basicDataManage/strategySetting/strategy/repairMaterialStrategy/AddForm.vue b/src/views/wms/basicDataManage/strategySetting/strategy/repairMaterialStrategy/AddForm.vue index 425e9de1b..fe388bd81 100644 --- a/src/views/wms/basicDataManage/strategySetting/strategy/repairMaterialStrategy/AddForm.vue +++ b/src/views/wms/basicDataManage/strategySetting/strategy/repairMaterialStrategy/AddForm.vue @@ -508,10 +508,10 @@ const submitForm = async () => { if (!formRef) return const valid = await formRef.value.validate() if (!valid) return - if (formData.value.priority == 0) { - message.error('优先级不可以为0') - return - } + // if (formData.value.priority == 0) { + // message.error('优先级不可以为0') + // return + // } // 提交请求 formLoading.value = true try { diff --git a/src/views/wms/basicDataManage/strategySetting/strategy/storageCapacityStrategy/AddForm.vue b/src/views/wms/basicDataManage/strategySetting/strategy/storageCapacityStrategy/AddForm.vue index 001628d81..8fd7d3a29 100644 --- a/src/views/wms/basicDataManage/strategySetting/strategy/storageCapacityStrategy/AddForm.vue +++ b/src/views/wms/basicDataManage/strategySetting/strategy/storageCapacityStrategy/AddForm.vue @@ -517,10 +517,10 @@ const submitForm = async () => { if (!formRef) return const valid = await formRef.value.validate() if (!valid) return - if(formData.value.priority == 0){ - message.error('优先级不可以为0') - return - } + // if(formData.value.priority == 0){ + // message.error('优先级不可以为0') + // return + // } // 提交请求 formLoading.value = true try { diff --git a/src/views/wms/basicDataManage/strategySetting/strategy/supplieDeliveryStrategy/AddForm.vue b/src/views/wms/basicDataManage/strategySetting/strategy/supplieDeliveryStrategy/AddForm.vue index 9b3696516..a8b02516b 100644 --- a/src/views/wms/basicDataManage/strategySetting/strategy/supplieDeliveryStrategy/AddForm.vue +++ b/src/views/wms/basicDataManage/strategySetting/strategy/supplieDeliveryStrategy/AddForm.vue @@ -504,10 +504,10 @@ const submitForm = async () => { const valid = await formRef.value.validate() if (!valid) return - if (formData.value.priority == 0) { - message.error('优先级不可以为0') - return - } + // if (formData.value.priority == 0) { + // message.error('优先级不可以为0') + // return + // } // 提交请求 formLoading.value = true try { diff --git a/src/views/wms/basicDataManage/strategySetting/strategy/upShelfStrategy/AddForm.vue b/src/views/wms/basicDataManage/strategySetting/strategy/upShelfStrategy/AddForm.vue index c2451e493..f021c1c7e 100644 --- a/src/views/wms/basicDataManage/strategySetting/strategy/upShelfStrategy/AddForm.vue +++ b/src/views/wms/basicDataManage/strategySetting/strategy/upShelfStrategy/AddForm.vue @@ -1195,10 +1195,10 @@ const submitForm = async () => { if (!formRef) return const valid = await formRef.value.validate() if (!valid) return - if(formData.value.priority == 0){ - message.error('优先级不可以为0') - return - } + // if(formData.value.priority == 0){ + // message.error('优先级不可以为0') + // return + // } // 提交请求 formLoading.value = true try { diff --git a/src/views/wms/basicDataManage/strategySetting/strategy/utensilCapacityStrategy/AddForm.vue b/src/views/wms/basicDataManage/strategySetting/strategy/utensilCapacityStrategy/AddForm.vue index ba7de67b1..69c21648d 100644 --- a/src/views/wms/basicDataManage/strategySetting/strategy/utensilCapacityStrategy/AddForm.vue +++ b/src/views/wms/basicDataManage/strategySetting/strategy/utensilCapacityStrategy/AddForm.vue @@ -370,10 +370,10 @@ const submitForm = async () => { if (!formRef) return const valid = await formRef.value.validate() if (!valid) return - if (formData.value.priority == 0) { - message.error('优先级不可以为0') - return - } + // if (formData.value.priority == 0) { + // message.error('优先级不可以为0') + // return + // } // 提交请求 formLoading.value = true try { diff --git a/src/views/wms/basicDataManage/strategySetting/strategy/warehouseStorageStrategy/AddForm.vue b/src/views/wms/basicDataManage/strategySetting/strategy/warehouseStorageStrategy/AddForm.vue index 9b81cd1cf..91918d625 100644 --- a/src/views/wms/basicDataManage/strategySetting/strategy/warehouseStorageStrategy/AddForm.vue +++ b/src/views/wms/basicDataManage/strategySetting/strategy/warehouseStorageStrategy/AddForm.vue @@ -470,10 +470,10 @@ const submitForm = async () => { if (!formRef) return const valid = await formRef.value.validate() if (!valid) return - if(formData.value.priority == 0){ - message.error('优先级不可以为0') - return - } + // if(formData.value.priority == 0){ + // message.error('优先级不可以为0') + // return + // } // 提交请求 formLoading.value = true try {