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 @@ diff --git a/src/views/wms/basicDataManage/strategySetting/strategy/arrivalInspectionStrategy/AddForm.vue b/src/views/wms/basicDataManage/strategySetting/strategy/arrivalInspectionStrategy/AddForm.vue index 300bd0569..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 @@ - + - + @@ -40,7 +40,7 @@ - + @@ -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 a6c88002f..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 @@ - + - + @@ -40,7 +40,7 @@ - + @@ -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 a536f57b2..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 @@ - + - + @@ -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..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 @@ - + - + @@ -41,7 +41,7 @@ - + @@ -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 715b5cff3..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 @@ - + - + @@ -41,7 +41,7 @@ - + @@ -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 5a2c0726a..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 @@ - + - + @@ -40,7 +40,7 @@ - + @@ -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 baf6aadca..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 @@ - + - + @@ -40,7 +40,7 @@ - + @@ -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 01ab5f540..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 @@ - + - + @@ -40,7 +40,7 @@ - + @@ -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 595dd95e9..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 @@ - + - + @@ -40,7 +40,7 @@ - + @@ -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/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) diff --git a/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/scrapRequestMain.data.ts b/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/scrapRequestMain.data.ts index 8a3b46c33..b3d819578 100644 --- a/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/scrapRequestMain.data.ts +++ b/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/scrapRequestMain.data.ts @@ -1080,14 +1080,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, } }, { 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), // 筛选