From 42cb218207a7f6ae216fca9baf73eaaed3250e29 Mon Sep 17 00:00:00 2001 From: wangyufei <2267742828@qq.com> Date: Thu, 18 Jul 2024 19:37:34 +0800 Subject: [PATCH 01/18] =?UTF-8?q?=E5=BF=85=E5=A1=AB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../strategy/upShelfStrategy/AddForm.vue | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/src/views/wms/basicDataManage/strategySetting/strategy/upShelfStrategy/AddForm.vue b/src/views/wms/basicDataManage/strategySetting/strategy/upShelfStrategy/AddForm.vue index df5e5630c..ca8fa801d 100644 --- a/src/views/wms/basicDataManage/strategySetting/strategy/upShelfStrategy/AddForm.vue +++ b/src/views/wms/basicDataManage/strategySetting/strategy/upShelfStrategy/AddForm.vue @@ -305,7 +305,8 @@ - * + { ::v-deep .err-120 .el-form-item__error { padding-left: 120px !important; } + +.peizhi { + color: var(--el-color-danger); + margin-right:4px; +} From 11582be20b286b767da1d21f2a1dacf7671da84f Mon Sep 17 00:00:00 2001 From: TengXF <302828528@qq.com> Date: Thu, 18 Jul 2024 19:53:27 +0800 Subject: [PATCH 02/18] =?UTF-8?q?=E5=8F=98=E6=9B=B4=E8=AE=B0=E5=BD=95?= =?UTF-8?q?=EF=BC=8C=E9=A9=BC=E5=B3=B0=E8=BD=AC=E4=B8=8B=E5=88=92=E7=BA=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/wms/remark/index.ts | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/src/api/wms/remark/index.ts b/src/api/wms/remark/index.ts index 7a1ac3642..3ee317540 100644 --- a/src/api/wms/remark/index.ts +++ b/src/api/wms/remark/index.ts @@ -10,5 +10,18 @@ export const createRemark= async (data) => { } // 查询变更记录列表 export const getChangeRecordPage = async (params) => { + params = handleParams(params); return await request.get({ url: `/infra/trends/list`, params }) } +const handleParams = (params) => { + if (params.tableName && params.tableName.trim() !== "") { + // 检查是否包含大写字母 + if (/[A-Z]/.test(params.tableName)) { + params.tableName = toSnakeCase(params.tableName); + } + } + return params; +} +const toSnakeCase = (str) => { + return str.replace(/[A-Z]/g, letter => `_${letter.toLowerCase()}`); +} From 0e8799909b62ab98ae34f6181a229b2ee31fce42 Mon Sep 17 00:00:00 2001 From: wangyufei <2267742828@qq.com> Date: Fri, 19 Jul 2024 11:02:53 +0800 Subject: [PATCH 03/18] =?UTF-8?q?=E6=A3=80=E9=AA=8C=E4=BB=BB=E5=8A=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../inspectionJob/inspectionJobMain.data.ts | 77 +++++++++++++++++++ .../supplierinvoiceRequestMain.data.ts | 26 +++++-- 2 files changed, 97 insertions(+), 6 deletions(-) diff --git a/src/views/qms/inspectionJob/inspectionJobMain.data.ts b/src/views/qms/inspectionJob/inspectionJobMain.data.ts index 9358b43cb..4132cc3db 100644 --- a/src/views/qms/inspectionJob/inspectionJobMain.data.ts +++ b/src/views/qms/inspectionJob/inspectionJobMain.data.ts @@ -270,6 +270,18 @@ export const InspectionJobMain = useCrudSchemas( width: 150 } }, + { + label: '承接人', + field: 'completeUser', + sort: 'custom', + dictType: DICT_TYPE.TRUE_FALSE, + dictClass: 'string', // 默认都是字符串类型其他暂不考虑 + isTable: false, + isDetail: false, + isSearch: true, + isTableForm: false, + isForm: false, + }, // { // label: '检验批来源', // field: 'inspectionBatchSource', @@ -439,6 +451,71 @@ export const InspectionJobMain = useCrudSchemas( // } // } // }, + { + label: '承接人', + field: 'acceptUserName', + table: { + width: 130 + }, + isForm: false, + isTable: false, + isDetail: true + }, + { + label: '承接时间', + field: 'acceptTime', + isForm: false, + table: { + width: 180 + }, + isTable: false, + isDetail: true, + formatter: dateFormatter, + detail: { + dateFormat: 'YYYY-MM-DD HH:mm:ss' + }, + form: { + component: 'DatePicker', + componentProps: { + style: { width: '100%' }, + type: 'datetime', + dateFormat: 'YYYY-MM-DD HH:mm:ss', + valueFormat: 'x' + } + } + }, + + { + label: '完成人', + field: 'completeUserName', + table: { + width: 130 + }, + isForm: false, + isTable: true, + isDetail:true + }, + { + label: '完成时间', + field: 'completeTime', + isForm: false, + table: { + width: 180 + }, + formatter: dateFormatter, + detail: { + dateFormat: 'YYYY-MM-DD HH:mm:ss' + }, + form: { + component: 'DatePicker', + componentProps: { + style: { width: '100%' }, + type: 'datetime', + dateFormat: 'YYYY-MM-DD HH:mm:ss', + valueFormat: 'x' + } + } + }, { label: '创建时间', field: 'createTime', diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts index 796782b5c..17fe92209 100644 --- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts +++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts @@ -1473,7 +1473,7 @@ export const SupplierinvoiceRequestDetailMain = useCrudSchemas(reactive { +const priceFormart = (row, column, cellValue) => { cellValue= Number(cellValue).toFixed(2) cellValue = cellValue + '' || '' @@ -1487,6 +1487,20 @@ const singlePriceFormart = (row, column, cellValue) => { return x1+x2 } +const singlePriceFormart = (row, column, cellValue) => { + cellValue= Number(cellValue).toFixed(4) + cellValue = cellValue + '' || '' + + let x = cellValue.split('.') + let x1 = x[0] + let x2 = x.length > 1 ? '.' + x[1] : '' + const reg = /(\d+)(\d{3})/ + while(reg.test(x1)){ + x1 = x1.replace(reg, '$1,$2') + } + return x1+x2 +} + function validateTaxRate(rule, value, callback) { if (value>0) { callback() @@ -1695,13 +1709,13 @@ export const SupplierinvoiceRequestDetail = useCrudSchemas(reactive Date: Fri, 19 Jul 2024 11:47:53 +0800 Subject: [PATCH 04/18] =?UTF-8?q?=E7=AE=B1=E6=95=B0=E9=87=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../supplierdeliver/supplierdeliverRequestMain/labelForm.vue | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/labelForm.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/labelForm.vue index 8f6ab2391..f33789f86 100644 --- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/labelForm.vue +++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/labelForm.vue @@ -258,7 +258,8 @@ const expandChange = (row: any, expandedRows: any[]) => { if (row.lastNumber) { // 最后一条信息直接展示余数的信息 if (i == row.allTuoQty - 1) { - row.packageList[i].xNumber = Math.ceil(row.lastNumber / parseFloat(row.packQty)) + row.packageList[i].xNumber = row.otherNumber + // row.packageList[i].xNumber = Math.ceil(row.lastNumber / parseFloat(row.packQty)) row.packageList[i].qtyOne = row.lastNumber } else { // 其他数据展示一托的全部箱数和全部数量 From 764a540aabe415636580a9cc068124611c4fa4a2 Mon Sep 17 00:00:00 2001 From: wangyufei <2267742828@qq.com> Date: Fri, 19 Jul 2024 11:54:14 +0800 Subject: [PATCH 05/18] =?UTF-8?q?=E5=9B=9E=E6=BB=9A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../supplierdeliver/supplierdeliverRequestMain/labelForm.vue | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/labelForm.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/labelForm.vue index f33789f86..8f6ab2391 100644 --- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/labelForm.vue +++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/labelForm.vue @@ -258,8 +258,7 @@ const expandChange = (row: any, expandedRows: any[]) => { if (row.lastNumber) { // 最后一条信息直接展示余数的信息 if (i == row.allTuoQty - 1) { - row.packageList[i].xNumber = row.otherNumber - // row.packageList[i].xNumber = Math.ceil(row.lastNumber / parseFloat(row.packQty)) + row.packageList[i].xNumber = Math.ceil(row.lastNumber / parseFloat(row.packQty)) row.packageList[i].qtyOne = row.lastNumber } else { // 其他数据展示一托的全部箱数和全部数量 From e2d59bdc8035655ffcfb073173fcf5e26f21ea54 Mon Sep 17 00:00:00 2001 From: wangyufei <2267742828@qq.com> Date: Fri, 19 Jul 2024 13:38:28 +0800 Subject: [PATCH 06/18] =?UTF-8?q?=E4=B8=8A=E6=9E=B6=E7=AD=96=E7=95=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../strategy/upShelfStrategy/AddForm.vue | 20 ++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/src/views/wms/basicDataManage/strategySetting/strategy/upShelfStrategy/AddForm.vue b/src/views/wms/basicDataManage/strategySetting/strategy/upShelfStrategy/AddForm.vue index ca8fa801d..5630a8f98 100644 --- a/src/views/wms/basicDataManage/strategySetting/strategy/upShelfStrategy/AddForm.vue +++ b/src/views/wms/basicDataManage/strategySetting/strategy/upShelfStrategy/AddForm.vue @@ -596,7 +596,7 @@ const rules = ref({ name: [{ required: true, message: '请输入名字', trigger: 'blur' },{ max: 50, message: '不得超过50个字符', trigger: 'blur' }], description: [{ required: true, message: '请输入描述', trigger: 'blur' },{ max: 50, message: '不得超过50个字符', trigger: 'blur' }], priority: [{ required: true, message: '请输入优先级', trigger: 'blur' }], - warehouse: [{ required: true, message: '请选择规则配置', trigger: 'blur' }], + // warehouse: [{ required: true, message: '请选择规则配置', trigger: 'blur' }], }) @@ -866,6 +866,24 @@ defineExpose({ open }) // 提供 open 方法，用于打开弹窗 /** 提交表单 */ const emit = defineEmits(['success']) // 定义 success 事件，用于操作成功后的回调 const submitForm = async () => { + if(warehouseType.value == 'WarehouseCode' && !formData.value.configuration.WarehouseCode){ + // 仓库 + message.error('请选择仓库') + return + // formData.configuration.WarehouseCode + }else if(warehouseType.value == 'AreaCode'&& !formData.value.configuration.AreaCode){ + // 库区 + message.error('请选择库区') + return + }else if(warehouseType.value == 'LocationGroupCode'&&!formData.value.configuration.LocationGroupCode){ + // 库位组 + message.error('请选择库位组') + return + }else if(warehouseType.value == 'LocationCode'&&!formData.value.configuration.LocationCode){ + // 库位 + message.error('请选择库位') + return + } // 校验表单 if (!formRef) return const valid = await formRef.value.validate() From 9c767ecac2264e8c6c055c84f3dedb794c18d143 Mon Sep 17 00:00:00 2001 From: wangyufei <2267742828@qq.com> Date: Fri, 19 Jul 2024 13:42:49 +0800 Subject: [PATCH 07/18] =?UTF-8?q?=E6=A3=80=E9=AA=8C=E6=96=B9=E6=A1=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/qms/inspectionScheme/addForm.vue | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/views/qms/inspectionScheme/addForm.vue b/src/views/qms/inspectionScheme/addForm.vue index 19d1b72c1..82c271524 100644 --- a/src/views/qms/inspectionScheme/addForm.vue +++ b/src/views/qms/inspectionScheme/addForm.vue @@ -8,7 +8,7 @@ :vLoading="formLoading" >
- + @@ -833,7 +833,7 @@ const open = async (type: string, row?: any, masterParmas?: any, titleName?: any } let arr = [] list.forEach((item, index) => { - editableTabsValue.value = index + 1 + // editableTabsValue.value = index + 1 item.name = index + 1 console.log(item.inspectionCharacteristicsBaseVO) @@ -886,6 +886,7 @@ const open = async (type: string, row?: any, masterParmas?: any, titleName?: any } arr.push(obj) }) + editableTabsValue.value = 1 data.value.process = arr console.log(111, data.value) }else{ From 61f88c1a4efb1c3cfae7d7f2684d312c1344bed6 Mon Sep 17 00:00:00 2001 From: wangyufei <2267742828@qq.com> Date: Fri, 19 Jul 2024 13:55:15 +0800 Subject: [PATCH 08/18] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=89=B9=E9=87=8F?= =?UTF-8?q?=E5=88=A0=E9=99=A4=EF=BC=8C=E5=9B=9E=E8=BD=A6=E6=B7=BB=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../productionreturnRequestMainNo/index.vue | 7 ++++++- .../productionreturnRequestMainNo.data.ts | 13 ++++++++++++- 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/src/views/wms/issueManage/productionreturn/productionreturnRequestMainNo/index.vue b/src/views/wms/issueManage/productionreturn/productionreturnRequestMainNo/index.vue index 1738c8fb9..660783b9f 100644 --- a/src/views/wms/issueManage/productionreturn/productionreturnRequestMainNo/index.vue +++ b/src/views/wms/issueManage/productionreturn/productionreturnRequestMainNo/index.vue @@ -42,8 +42,10 @@ { const handleDeleteTable = (item, index) => { tableData.value.splice(index, 1) } +const tableSelectionDelete = (selection) => { + tableData.value = tableData.value.filter(item => !selection.includes(item)) +} // 主子数据 提交 const submitForm = async (formType, submitData) => { diff --git a/src/views/wms/issueManage/productionreturn/productionreturnRequestMainNo/productionreturnRequestMainNo.data.ts b/src/views/wms/issueManage/productionreturn/productionreturnRequestMainNo/productionreturnRequestMainNo.data.ts index eed4bc467..8cb210b04 100644 --- a/src/views/wms/issueManage/productionreturn/productionreturnRequestMainNo/productionreturnRequestMainNo.data.ts +++ b/src/views/wms/issueManage/productionreturn/productionreturnRequestMainNo/productionreturnRequestMainNo.data.ts @@ -127,7 +127,18 @@ export const ProductionreturnRequestDetail = useCrudSchemas(reactive Date: Fri, 19 Jul 2024 14:08:37 +0800 Subject: [PATCH 09/18] =?UTF-8?q?=E9=BB=98=E8=AE=A4=E9=80=89=E4=B8=AD?= =?UTF-8?q?=E7=AC=AC=E4=B8=80=E6=9D=A1tab?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/qms/inspectionScheme/addForm.vue | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/views/qms/inspectionScheme/addForm.vue b/src/views/qms/inspectionScheme/addForm.vue index 82c271524..7493373c8 100644 --- a/src/views/qms/inspectionScheme/addForm.vue +++ b/src/views/qms/inspectionScheme/addForm.vue @@ -900,7 +900,7 @@ const open = async (type: string, row?: any, masterParmas?: any, titleName?: any rules.value['inspectionCharacteristicsBaseVO.quantifyLowlimit'][0].required = false rules.value['inspectionCharacteristicsBaseVO.quantifyTarget'][0].required = false list.forEach((item, index) => { - editableTabsValue.value = index + 1 + // editableTabsValue.value = index + 1 item.name = index + 1 // rules.value['inspectionCharacteristicsBaseVO.quantifyCapping'][0].required = true // 编辑判断上限下限目标值是否必填 @@ -920,6 +920,7 @@ const open = async (type: string, row?: any, masterParmas?: any, titleName?: any isShowField.value += 1 //设置isShowField > 0显示aql和检验水平字段 } }) + editableTabsValue.value = 1 // 显示aql和检验水平字段的时候添加必填规则 if (isShowField.value > 0) { rules.value.aql[0].required = true From 747fdc0481531530744023994c231dde4d669d0d Mon Sep 17 00:00:00 2001 From: zhaoxuebing <1291173720@qq.com> Date: Fri, 19 Jul 2024 14:17:35 +0800 Subject: [PATCH 10/18] =?UTF-8?q?HL-4138=E9=97=AE=E9=A2=98=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../unplannedissue/unplannedissueRequestMain/index.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRequestMain/index.vue b/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRequestMain/index.vue index 3049ec147..55b13a0a2 100644 --- a/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRequestMain/index.vue +++ b/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRequestMain/index.vue @@ -114,8 +114,8 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => if (type == 'tableForm') { // 明细查询页赋值 if(formField === 'itemCode'){ - let newRow = JSON.parse(JSON.stringify(tableFormKeys)) val.forEach(item=>{ + let newRow = JSON.parse(JSON.stringify(tableFormKeys)) newRow[formField] =item[searchField] newRow['packingNumber'] = item['packingNumber'] newRow['containerNumber'] = item['containerNumber'] From f336cc9c3777e23e23e7d11ecf49e3f9a2d4083d Mon Sep 17 00:00:00 2001 From: wangyufei <2267742828@qq.com> Date: Fri, 19 Jul 2024 14:50:36 +0800 Subject: [PATCH 11/18] =?UTF-8?q?=E4=BE=9B=E5=BA=94=E5=95=86=E5=8F=91?= =?UTF-8?q?=E7=A5=A8=E7=94=B3=E8=AF=B74=E4=BD=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../supplierinvoiceRequestMain/index.vue | 10 +++++----- .../supplierinvoiceRequestMain.data.ts | 19 +++---------------- .../index.vue | 4 ++-- ...pplierinvoiceRequestMainDifference.data.ts | 10 +++++----- 4 files changed, 15 insertions(+), 28 deletions(-) diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue index d828ff12d..d35930ccd 100644 --- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue +++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue @@ -32,7 +32,7 @@ @@ -98,7 +98,7 @@ :sumFormDataByForm ="(formRef,formModel)=>{ const {singlePrice=0,purchasePrice=0} = formModel formRef.value.setValues({ - differencePrice:Number((Number(singlePrice)-Number(purchasePrice)).toFixed(2)) + differencePrice:Number((Number(singlePrice)-Number(purchasePrice)).toFixed(4)) }) }" :isBasic="false" diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMainDifference/supplierinvoiceRequestMainDifference.data.ts b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMainDifference/supplierinvoiceRequestMainDifference.data.ts index 4317d424b..bba1657b1 100644 --- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMainDifference/supplierinvoiceRequestMainDifference.data.ts +++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMainDifference/supplierinvoiceRequestMainDifference.data.ts @@ -1497,7 +1497,7 @@ export const SupplierinvoiceRequestDetailMain = useCrudSchemas(reactive { - cellValue= Number(cellValue).toFixed(2) + cellValue= Number(cellValue).toFixed(4) cellValue = cellValue + '' || '' let x = cellValue.split('.') @@ -1739,14 +1739,14 @@ export const SupplierinvoiceRequestDetail = useCrudSchemas(reactive Date: Fri, 19 Jul 2024 15:13:32 +0800 Subject: [PATCH 12/18] =?UTF-8?q?=E8=B4=A8=E6=A3=80=E6=8A=A5=E5=91=8A?= =?UTF-8?q?=EF=BC=8C=E5=8D=95=E4=BD=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../purchasereceipt/purchasereceiptReport/index.vue | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptReport/index.vue b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptReport/index.vue index 81ed6e386..7a452dd16 100644 --- a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptReport/index.vue +++ b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptReport/index.vue @@ -27,6 +27,9 @@