From 16edf83d5ddd02213b40c7fb2f7d0c9dc9e433c6 Mon Sep 17 00:00:00 2001 From: zhaoxuebing <1291173720@qq.com> Date: Thu, 5 Sep 2024 09:48:54 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E7=BC=BA=E9=99=B7:HL-5729=E9=80=80?= =?UTF-8?q?=E8=B4=A7=E4=BB=BB=E5=8A=A1=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../purchasereturnJobMain/purchasereturnJobMain.data.ts | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnJobMain/purchasereturnJobMain.data.ts b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnJobMain/purchasereturnJobMain.data.ts index eaf2e2a4e..b68f7d8cb 100644 --- a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnJobMain/purchasereturnJobMain.data.ts +++ b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnJobMain/purchasereturnJobMain.data.ts @@ -723,7 +723,8 @@ export const PurchasereturnJobDetail = useCrudSchemas(reactive([ table: { width: 150 }, - isSearch: true, + isTable:false, + isSearch: false, sortTableDefault: 10, }, { @@ -733,6 +734,8 @@ export const PurchasereturnJobDetail = useCrudSchemas(reactive([ table: { width: 150 }, + isTable:false, + isSearch: false, sortTableDefault: 10, }, { @@ -746,6 +749,7 @@ export const PurchasereturnJobDetail = useCrudSchemas(reactive([ hiddenInMain:true, isTableForm: false, isForm: false, + isTable:false, }, // { // label: '器具号', @@ -820,6 +824,7 @@ export const PurchasereturnJobDetail = useCrudSchemas(reactive([ }, sortTableDefault: 16, hiddenInMain:true, + isTable:false, }, { label: '到货主代码', @@ -830,6 +835,7 @@ export const PurchasereturnJobDetail = useCrudSchemas(reactive([ }, sortTableDefault: 16, hiddenInMain:true, + isTable:false, }, { label: '订单号', From a049b66ca9b7959ae635b5b22ba7a52d777b158e Mon Sep 17 00:00:00 2001 From: yufei_wang <2267742828@qq.com> Date: Thu, 5 Sep 2024 10:54:00 +0800 Subject: [PATCH 2/4] =?UTF-8?q?HL-5785=E5=88=B6=E5=93=81=E5=AD=90=E4=BB=B6?= =?UTF-8?q?=E6=8A=A5=E5=BA=9F=E5=AD=97=E6=AE=B5=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../productscrapRecordMain.data.ts | 82 +++++++++---------- .../productscrapRequestMain/index.vue | 3 + 2 files changed, 44 insertions(+), 41 deletions(-) diff --git a/src/views/wms/productionManage/productscrap/productscrapRecordMain/productscrapRecordMain.data.ts b/src/views/wms/productionManage/productscrap/productscrapRecordMain/productscrapRecordMain.data.ts index fc5a31ada..2261f19a7 100644 --- a/src/views/wms/productionManage/productscrap/productscrapRecordMain/productscrapRecordMain.data.ts +++ b/src/views/wms/productionManage/productscrap/productscrapRecordMain/productscrapRecordMain.data.ts @@ -100,22 +100,22 @@ export const ProductscrapRecordMain = useCrudSchemas( width: 150 } }, - { - label: '班组', - field: 'team', - sort: 'custom', - table: { - width: 150 - } - }, - { - label: '班次', - field: 'shift', - sort: 'custom', - table: { - width: 150 - } - }, + // { + // label: '班组', + // field: 'team', + // sort: 'custom', + // table: { + // width: 150 + // } + // }, + // { + // label: '班次', + // field: 'shift', + // sort: 'custom', + // table: { + // width: 150 + // } + // }, { label: '报废原因', field: 'scrappingReason', @@ -270,15 +270,15 @@ export const ProductscrapRecordMain = useCrudSchemas( }, isTable: false }, - { - label: '备注', - field: 'remark', - sort: 'custom', - table: { - width: 150 - }, - isTable: false - }, + // { + // label: '备注', + // field: 'remark', + // sort: 'custom', + // table: { + // width: 150 + // }, + // isTable: false + // }, { label: '是否已撤销', field: 'revokeFlag', @@ -729,22 +729,22 @@ export const ProductscrapRecordDetail = useCrudSchemas(reactive([ }, isTable: false, }, - { - label: '备注', - field: 'remark', - sort: 'custom', - table: { - width: 150 - }, - isSearch: true, - search: { - component: 'Input', - componentProps: { - placeholder: '请输入备注' - } - }, - isTable: true, - }, + // { + // label: '备注', + // field: 'remark', + // sort: 'custom', + // table: { + // width: 150 + // }, + // isSearch: true, + // search: { + // component: 'Input', + // componentProps: { + // placeholder: '请输入备注' + // } + // }, + // isTable: true, + // }, { label: '创建时间', field: 'createTime', diff --git a/src/views/wms/productionManage/productscrap/productscrapRequestMain/index.vue b/src/views/wms/productionManage/productscrap/productscrapRequestMain/index.vue index b92bb9d2b..51c90e5f1 100644 --- a/src/views/wms/productionManage/productscrap/productscrapRequestMain/index.vue +++ b/src/views/wms/productionManage/productscrap/productscrapRequestMain/index.vue @@ -390,6 +390,7 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => // 明细查询页赋值 if(formField == 'productionLineCode'){ row['productionLineCode'] = val[0]['code'] + tableData.value = [] }else if(formField == 'fromLocationCode'){ // val.forEach(item=>{ // const newRow = JSON.parse(JSON.stringify({...tableFormKeys,...item})) @@ -458,6 +459,8 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => //成本中心代码 //成本中心类型 setV['costCenterType'] = val[0]['costcentreType'] + }else if(formField == 'productionLineCode'){ + tableData.value = [] } formRef.setValues(setV) } From 33f76087a3a0bbae3e2fd2b6b08e6407b35723fe Mon Sep 17 00:00:00 2001 From: "YEJIAXING-PC\\lenovo" <591141169@qq.com> Date: Thu, 5 Sep 2024 11:17:20 +0800 Subject: [PATCH 3/4] =?UTF-8?q?Q2=E9=80=9A=E7=9F=A5=E5=8D=95=E5=8A=9F?= =?UTF-8?q?=E8=83=BD=E5=AE=8C=E5=96=84=20=20HL-5740?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/qms/inspectionQ2/index.vue | 127 ++++++++++++++++++++++----- 1 file changed, 104 insertions(+), 23 deletions(-) diff --git a/src/views/qms/inspectionQ2/index.vue b/src/views/qms/inspectionQ2/index.vue index 92cec2464..5dc3edbb4 100644 --- a/src/views/qms/inspectionQ2/index.vue +++ b/src/views/qms/inspectionQ2/index.vue @@ -127,17 +127,25 @@ const route = useRoute() // 路由信息 const routeName = ref() routeName.value = route.name const tableColumns = ref(Q2.allSchemas.tableColumns) + const clearSearchInput = (formField) => { if (formField == 'itemCode') { basicFormRef.value.formRef.setValues({ itemName: '', - SupplierCode: '', - SupplierName: '' + supplierCode: '', + supplierName: '', + purchaseReceiptNumber: '' + }) + Q2.allSchemas.formSchema.forEach((item) => { + if (item.field == 'supplierCode') { + item.componentProps.options = [] + } }) } if (formField == 'lightItemCode') { basicFormRef.value.formRef.setValues({ standardCostPrice: '', + lightItemName: '', lightQty: 0, claimAmount: '', otherClaimAmount: 0, @@ -147,7 +155,9 @@ const clearSearchInput = (formField) => { }) const params2 = { by: 'ASC', - filters: [{ column: 'itemCode', action: '==', value: basicFormRef.value.formRef.formModel.itemCode }], + filters: [ + { column: 'itemCode', action: '==', value: basicFormRef.value.formRef.formModel.itemCode } + ], pageNo: 1, pageSize: 500, sort: '' @@ -212,22 +222,22 @@ const searchTableSuccess = (formField, searchField, val, formRef) => { setV['summaryAmount'] = 0 setV['disbursementAmount'] = 0 setV['remainingAmount'] = 0 -  const params2 = { -        by: 'ASC', -        filters: [{ column: 'itemCode', action: '==', value: val[0].code }], -        pageNo: 1, -        pageSize: 500, -        sort: '' -      } -      params2.isSearch = true -      StdcostpriceApi.getStdcostpricePage(params2).then((res) => { -        if (res.list?.length > 0) { -          priceObj.value = res.list[0] -          formRef.setValues({ -            standardCostPrice: priceObj.value.price -          }) -        } -      }) + const params2 = { + by: 'ASC', + filters: [{ column: 'itemCode', action: '==', value: val[0].code }], + pageNo: 1, + pageSize: 500, + sort: '' + } + params2.isSearch = true + StdcostpriceApi.getStdcostpricePage(params2).then((res) => { + if (res.list?.length > 0) { + priceObj.value = res.list[0] + formRef.setValues({ + standardCostPrice: priceObj.value.price + }) + } + }) setV[formField] = val[0][searchField] formRef.setValues(setV) } @@ -245,8 +255,8 @@ const searchTableSuccess = (formField, searchField, val, formRef) => { } if (formField == 'itemCode') { - setV['SupplierCode'] = '' - setV['SupplierName'] = '' + setV['supplierCode'] = '' + setV['supplierName'] = '' setV['itemName'] = '' setV['uom'] = val[0].supplierUom @@ -293,8 +303,9 @@ const searchTableSuccess = (formField, searchField, val, formRef) => { }) } }) - - if (val[0].lightItemCode == null) { + if (basicFormRef.value.formRef.formModel.lightItemCode == null|| + basicFormRef.value.formRef.formModel.lightItemCode == '' + ) { setV['standardCostPrice'] = '' setV['lightQty'] = 0 setV['claimAmount'] = '' @@ -403,6 +414,76 @@ const onChange = (field, e) => { } }) } + + // if (field == 'itemCode') { + // basicFormRef.value.formRef.formModel.supplierCode = '' + // basicFormRef.value.formRef.formModel.supplierName = '' + // basicFormRef.value.formRef.formModel.itemName = '' + + // Q2Api.getEmail().then((res) => { + // if (res) { + // basicFormRef.value.formRef.formModel.cashierEmail =res + // } + // }) + + // const supplieritemParams = { + // by: 'ASC', + // filters: [{ column: 'itemCode', action: '==', value: basicFormRef.value.formRef.formModel.itemCode }], + // pageNo: 1, + // pageSize: 500, + // sort: '' + // } + // supplieritemParams.isSearch = true + // SupplieritemApi.getSupplieritemPage(supplieritemParams).then((res) => { + // if (res.list?.length > 0) { + // basicFormRef.value.formRef.formModel.supplierCode = res.list[0].supplierCode + // basicFormRef.value.formRef.formModel.supplierName = res.list[0].supplierName + // Q2.allSchemas.formSchema.forEach((item) => { + // if (item.field == 'supplierCode') { + // item.componentProps.options = res.list + // } + // }) + // } + // }) + // const itembasicParams = { + // by: 'ASC', + // filters: [{ column: 'code', action: '==', value: basicFormRef.value.formRef.formModel.itemCode }], + // pageNo: 1, + // pageSize: 500, + // sort: '' + // } + + // itembasicParams.isSearch = true + // ItembasicApi.getItembasicPage(itembasicParams).then((res) => { + // if (res.list?.length > 0) { + // basicFormRef.value.formRef.formModel.itemName = res.list[0].name + // } + // }) + + // if (basicFormRef.value.formRef.formModel.lightItemCode == null) { + // basicFormRef.value.formRef.formModel.standardCostPrice = '' + // basicFormRef.value.formRef.formModel.lightQty = 0 + // basicFormRef.value.formRef.formModel.claimAmount= '' + // basicFormRef.value.formRef.formModel.otherClaimAmount = 0 + // basicFormRef.value.formRef.formModel.summaryAmount= 0 + // basicFormRef.value.formRef.formModel.disbursementAmount = 0 + // basicFormRef.value.formRef.formModel.remainingAmount = 0 + // const params2 = { + // by: 'ASC', + // filters: [{ column: 'itemCode', action: '==', value: basicFormRef.value.formRef.formModel.itemCode }], + // pageNo: 1, + // pageSize: 500, + // sort: '' + // } + // params2.isSearch = true + // StdcostpriceApi.getStdcostpricePage(params2).then((res) => { + // if (res.list?.length > 0) { + // priceObj.value = res.list[0] + // basicFormRef.value.formRef.formModel.standardCostPrice = priceObj.value.price + // } + // }) + // } + // } } // 字段设置 更新主列表字段 From 3418c48f3ee5d697e0e0ecbd3ab09dd9bdf59e2f Mon Sep 17 00:00:00 2001 From: yufei_wang <2267742828@qq.com> Date: Thu, 5 Sep 2024 11:20:35 +0800 Subject: [PATCH 4/4] =?UTF-8?q?HL-5801=E5=8F=91=E6=96=99=E7=94=B3=E8=AF=B7?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=EF=BC=8C=E7=B2=98=E8=B4=B4=E7=89=A9=E6=96=99?= =?UTF-8?q?=E6=89=B9=E9=87=8F=E6=B7=BB=E5=8A=A0=EF=BC=8C=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E5=90=8E=E4=B8=8D=E8=A6=81=E6=8C=89=E7=89=A9=E6=96=99=E6=8E=92?= =?UTF-8?q?=E5=BA=8F=EF=BC=8C=E7=B2=98=E8=B4=B4=E9=A1=BA=E5=BA=8F=E6=98=AF?= =?UTF-8?q?=E4=BB=80=E4=B9=88=E5=B0=B1=E6=98=AF=E4=BB=80=E4=B9=88=EF=BC=8C?= =?UTF-8?q?=E5=8C=85=E6=8B=AC=E5=88=9B=E5=BB=BA=E7=94=B3=E8=AF=B7=E5=90=8E?= =?UTF-8?q?=EF=BC=8C=E5=AF=BC=E5=87=BA=E7=9A=84=E7=94=B3=E8=AF=B7=E4=B9=9F?= =?UTF-8?q?=E4=B8=8D=E8=A6=81=E6=94=B9=E5=8F=98=E9=A1=BA=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/wms/issueManage/issue/issueRequestMain/index.vue | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/views/wms/issueManage/issue/issueRequestMain/index.vue b/src/views/wms/issueManage/issue/issueRequestMain/index.vue index 6c84aa7c4..0aca9f690 100644 --- a/src/views/wms/issueManage/issue/issueRequestMain/index.vue +++ b/src/views/wms/issueManage/issue/issueRequestMain/index.vue @@ -487,6 +487,9 @@ const submitForm = async (formType, submitData) => { if(data.masterId){ data.id = data.masterId } + tableData.value.forEach((item,index)=>{ + item['orderNumber'] = index+1 + }) data.subList = tableData.value // 拼接子表数据参数 if(tableData.value.find(item => (item.qty <= 0))) { message.warning('数量必须大于0')