From 8f960309c161e51fb5d3a063908c93e42d2b8c96 Mon Sep 17 00:00:00 2001 From: zhaoyiran Date: Sat, 12 Oct 2024 13:39:59 +0800 Subject: [PATCH 01/54] =?UTF-8?q?YT-329=E9=9A=94=E7=A6=BB=E6=94=B6?= =?UTF-8?q?=E8=B4=A7=E4=BB=BB=E5=8A=A1=EF=BC=8C=E5=AF=BC=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/wms/productreceiptJobMain/index.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/api/wms/productreceiptJobMain/index.ts b/src/api/wms/productreceiptJobMain/index.ts index 3464939cc..e18fece95 100644 --- a/src/api/wms/productreceiptJobMain/index.ts +++ b/src/api/wms/productreceiptJobMain/index.ts @@ -101,12 +101,12 @@ export const deleteProductreceiptJobMain = async (id: number) => { // 导出制品收货任务主 Excel export const exportProductreceiptJobMain = async (params) => { - params.type = 'predict' + params.type = 'scrap' if (params.isSearch) { const cmd = { 'column':'type', 'action':'==', - 'value':'predict' + 'value':'scrap' } params.filters.push(cmd) const data = {...params} From a7a2738e5579e16e9f664c04f0738400a826774b Mon Sep 17 00:00:00 2001 From: zhang_li <2235006734@qqq.com> Date: Sat, 12 Oct 2024 13:57:47 +0800 Subject: [PATCH 02/54] =?UTF-8?q?=E7=89=A9=E6=96=99=E5=BA=93=E5=8C=BA?= =?UTF-8?q?=E9=85=8D=E7=BD=AE=E7=AE=A1=E7=90=86=EF=BC=8C=E5=BA=93=E5=8C=BA?= =?UTF-8?q?=E7=AE=A1=E7=90=86=E7=AE=A1=E7=90=86=E7=B2=BE=E5=BA=A6=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../factoryModeling/areabasic/index.vue | 74 +++++++++++++------ .../itemManage/itemarea/index.vue | 68 +++++++++++------ 2 files changed, 99 insertions(+), 43 deletions(-) diff --git a/src/views/wms/basicDataManage/factoryModeling/areabasic/index.vue b/src/views/wms/basicDataManage/factoryModeling/areabasic/index.vue index 6b96d6994..1d5168097 100644 --- a/src/views/wms/basicDataManage/factoryModeling/areabasic/index.vue +++ b/src/views/wms/basicDataManage/factoryModeling/areabasic/index.vue @@ -49,6 +49,7 @@ @searchTableSuccess="searchTableSuccess" :isBusiness="false" @onBlur="onBlur" + @onChange="onChange" /> @@ -189,29 +190,37 @@ const handleDisable = async (id: number) => { /** 添加/修改操作 */ const basicFormRef = ref() const openForm = (type: string, row?: any) => { - if(type == "update"){ - Area.allSchemas.formSchema.forEach((item) => { - if (item.field == 'code') { - item.componentProps.disabled = true - } - if (item.field == 'warehouseCode') { - item.componentProps.disabled = true - item.componentProps.isSearchList = false - } - }) - - }else { - Area.allSchemas.formSchema.forEach((item) => { - if (item.field == 'code') { - item.componentProps.disabled = false - } - if (item.field == 'warehouseCode') { - item.componentProps.disabled = false - item.componentProps.isSearchList = true - } - }) - } basicFormRef.value.open(type, row) + nextTick(() => { + if (type == "update") { + Area.allSchemas.formSchema.forEach((item) => { + if (item.field == 'code') { + item.componentProps.disabled = true + }else if (item.field == 'warehouseCode') { + item.componentProps.disabled = true + item.componentProps.isSearchList = false + } else if (item.field == 'manageMode') { + if (row.type == 'WIP') { + item.componentProps.options = manageModeOptions.value + } else { + item.componentProps.options =manageModeOptions.value?.filter(item=>item.value!='BY_QUANTITY') + } + } + }) + }else { + Area.allSchemas.formSchema.forEach((item) => { + if (item.field == 'code') { + item.componentProps.disabled = false + }else if (item.field == 'warehouseCode') { + item.componentProps.disabled = false + item.componentProps.isSearchList = true + }else if (item.field == 'manageMode') { + item.componentProps.options = manageModeOptions.value?.filter(item=>item.value!='BY_QUANTITY') + basicFormRef.value.formRef.formModel.manageMode = item.componentProps.options[0].value + } + }) + } + }) } // form表单提交 @@ -320,6 +329,27 @@ const searchFormClick = (searchData) => { const onBlur = (field, e)=>{ } +const manageModeOptions = ref(JSON.parse(JSON.stringify(Area.allSchemas.formSchema.find(item=>item.field == 'manageMode').componentProps.options))) + +const onChange = (field, e)=>{ + if (field == 'type') { + if (e == 'WIP') { + Area.allSchemas.formSchema.forEach((item) => { + if (item.field == 'manageMode') { + item.componentProps.options = manageModeOptions.value + basicFormRef.value.formRef.formModel.manageMode = item.componentProps.options[0].value + } + }) + } else { + Area.allSchemas.formSchema.forEach((item) => { + if (item.field == 'manageMode') { + item.componentProps.options = manageModeOptions.value?.filter(item=>item.value!='BY_QUANTITY') + basicFormRef.value.formRef.formModel.manageMode = item.componentProps.options[0].value + } + }) + } + } +} /** 初始化 **/ onMounted(async() => { diff --git a/src/views/wms/basicDataManage/itemManage/itemarea/index.vue b/src/views/wms/basicDataManage/itemManage/itemarea/index.vue index 3ef652edc..b69d0aafe 100644 --- a/src/views/wms/basicDataManage/itemManage/itemarea/index.vue +++ b/src/views/wms/basicDataManage/itemManage/itemarea/index.vue @@ -118,6 +118,7 @@ const isShowButton = ref(true) const updataTableColumns = (val) => { tableColumns.value = val } +const manageModeOptions = ref(JSON.parse(JSON.stringify(Itemarea.allSchemas.formSchema.find(item=>item.field == 'manageMode').componentProps.options))) // 查询页面返回 const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => { @@ -147,6 +148,21 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => setV['areaCode'] = val[0]['code'] setV['areaType'] = val[0]['type'] setV['manageMode'] = val[0]['manageMode'] + if (val[0]['type'] == 'WIP') { + Itemarea.allSchemas.formSchema.forEach((item) => { + if (item.field == 'manageMode') { + item.componentProps.options = manageModeOptions.value + setV['manageMode'] = item.componentProps.options[0].value + } + }) + } else { + Itemarea.allSchemas.formSchema.forEach((item) => { + if (item.field == 'manageMode') { + item.componentProps.options = manageModeOptions.value?.filter(item=>item.value!='BY_QUANTITY') + setV['manageMode'] = item.componentProps.options[0].value + } + }) + } }else if(formField == 'inPackUnit') { setV['inPackUnit'] = val[0]['packUnit'] @@ -305,28 +321,38 @@ const handleDisable = async (id: number) => { /** 添加/修改操作 */ const formRef = ref() const openForm =async (type: string, row?: number) => { - if(type == "update"){ - Itemarea.allSchemas.formSchema.forEach((item) => { - if (item.field == 'areaCode') { - item.componentProps.isSearchList = false, - item.componentProps.disabled = true - } - if (item.field == 'itemCode') { - item.componentProps.isSearchList = false, - item.componentProps.disabled = true - }}) - }else { - Itemarea.allSchemas.formSchema.forEach((item) => { - if (item.field == 'areaCode') { - item.componentProps.isSearchList = true - } - if (item.field == 'itemCode') { - item.componentProps.isSearchList = true - } - }) - } - tableData.value = [] // 重置明细数据 formRef.value.open(type, row) + nextTick(() => { + if(type == "update"){ + Itemarea.allSchemas.formSchema.forEach((item) => { + if (item.field == 'areaCode') { + item.componentProps.isSearchList = false, + item.componentProps.disabled = true + }else if (item.field == 'itemCode') { + item.componentProps.isSearchList = false, + item.componentProps.disabled = true + } else if (item.field == 'manageMode') { + if (row.areaType == 'WIP') { + item.componentProps.options = manageModeOptions.value + } else { + item.componentProps.options =manageModeOptions.value?.filter(item=>item.value!='BY_QUANTITY') + } + } + }) + }else { + Itemarea.allSchemas.formSchema.forEach((item) => { + if (item.field == 'areaCode') { + item.componentProps.isSearchList = true + }else if (item.field == 'itemCode') { + item.componentProps.isSearchList = true + }else if (item.field == 'manageMode') { + item.componentProps.options = manageModeOptions.value?.filter(item=>item.value!='BY_QUANTITY') + formRef.value.formRef.formModel.manageMode = item.componentProps.options[0].value + } + }) + } + }) + tableData.value = [] // 重置明细数据 } /** From d7d60a9b0e0b3dc21c493b85a2bbcbcc74706322 Mon Sep 17 00:00:00 2001 From: zhaoyiran Date: Sat, 12 Oct 2024 14:18:13 +0800 Subject: [PATCH 03/54] =?UTF-8?q?YT-318,YT-330=E5=8E=BB=E6=8E=89=E7=8F=AD?= =?UTF-8?q?=E6=AC=A1=E5=90=8D=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../productdismantleRequestMain/index.vue | 6 ------ .../productdismantleRequestMain.data.ts | 15 +-------------- .../productionMainAssemble/index.vue | 5 ----- .../productionMainAssemble.data.ts | 15 +-------------- .../productionMainAssembleSparePart/index.vue | 4 ---- .../productionMainAssembleSparePart.data.ts | 15 +-------------- 6 files changed, 3 insertions(+), 57 deletions(-) diff --git a/src/views/wms/productionManage/productdismantle/productdismantleRequestMain/index.vue b/src/views/wms/productionManage/productdismantle/productdismantleRequestMain/index.vue index 0af9bf0bb..284817860 100644 --- a/src/views/wms/productionManage/productdismantle/productdismantleRequestMain/index.vue +++ b/src/views/wms/productionManage/productdismantle/productdismantleRequestMain/index.vue @@ -303,12 +303,6 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => setV[formField] = val[0][searchField] formRef.setValues(setV) } - const setV = {} - if (formField == 'shift') { - setV['shift'] = val[0]['code'] - setV['shiftName'] = val[0]['name'] - } - formRef.setValues(setV) }) } // 查询页面返回——详情 diff --git a/src/views/wms/productionManage/productdismantle/productdismantleRequestMain/productdismantleRequestMain.data.ts b/src/views/wms/productionManage/productdismantle/productdismantleRequestMain/productdismantleRequestMain.data.ts index f0fbc0d12..254c327f5 100644 --- a/src/views/wms/productionManage/productdismantle/productdismantleRequestMain/productdismantleRequestMain.data.ts +++ b/src/views/wms/productionManage/productdismantle/productdismantleRequestMain/productdismantleRequestMain.data.ts @@ -129,7 +129,7 @@ export const ProductdismantleRequestMain = useCrudSchemas(reactive } }, { - label: '班次代码', + label: '班次', field: 'shift', sort: 'custom', table: { @@ -161,19 +161,6 @@ export const ProductdismantleRequestMain = useCrudSchemas(reactive } } }, - { - label: '班次名称', - field: 'shiftName', - sort: 'custom', - form: { - componentProps: { - disabled: true - } - }, - table: { - width: 150 - }, - }, { label: '从仓库代码', field: 'fromWarehouseCode', diff --git a/src/views/wms/productionManage/productionplan/productionMainAssemble/index.vue b/src/views/wms/productionManage/productionplan/productionMainAssemble/index.vue index 5f9217311..a5335ec3c 100644 --- a/src/views/wms/productionManage/productionplan/productionMainAssemble/index.vue +++ b/src/views/wms/productionManage/productionplan/productionMainAssemble/index.vue @@ -170,11 +170,6 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => }else{ setV[formField] = val[0][searchField] } - // const setV = {} - if (formField == 'shift') { - setV['shift'] = val[0]['code'] - setV['shiftName'] = val[0]['name'] - } formRef.setValues(setV) } }) diff --git a/src/views/wms/productionManage/productionplan/productionMainAssemble/productionMainAssemble.data.ts b/src/views/wms/productionManage/productionplan/productionMainAssemble/productionMainAssemble.data.ts index e354b35f0..7b43f9b8d 100644 --- a/src/views/wms/productionManage/productionplan/productionMainAssemble/productionMainAssemble.data.ts +++ b/src/views/wms/productionManage/productionplan/productionMainAssemble/productionMainAssemble.data.ts @@ -199,7 +199,7 @@ export const ProductionMain = useCrudSchemas(reactive([ } }, { - label: '班次代码', + label: '班次', field: 'shift', sort: 'custom', table: { @@ -231,19 +231,6 @@ export const ProductionMain = useCrudSchemas(reactive([ } } }, - { - label: '班次名称', - field: 'shiftName', - sort: 'custom', - form: { - componentProps: { - disabled: true - } - }, - table: { - width: 150 - }, - }, // { // label: '物料代码', // field: 'detailItemCode', diff --git a/src/views/wms/productionManage/productionplan/productionMainAssembleSparePart/index.vue b/src/views/wms/productionManage/productionplan/productionMainAssembleSparePart/index.vue index e99505438..5f1d7a00b 100644 --- a/src/views/wms/productionManage/productionplan/productionMainAssembleSparePart/index.vue +++ b/src/views/wms/productionManage/productionplan/productionMainAssembleSparePart/index.vue @@ -162,10 +162,6 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => }else{ setV[formField] = val[0][searchField] } - if (formField == 'shift') { - setV['shift'] = val[0]['code'] - setV['shiftName'] = val[0]['name'] - } formRef.setValues(setV) } }) diff --git a/src/views/wms/productionManage/productionplan/productionMainAssembleSparePart/productionMainAssembleSparePart.data.ts b/src/views/wms/productionManage/productionplan/productionMainAssembleSparePart/productionMainAssembleSparePart.data.ts index a0c6fce70..ce8b1db9e 100644 --- a/src/views/wms/productionManage/productionplan/productionMainAssembleSparePart/productionMainAssembleSparePart.data.ts +++ b/src/views/wms/productionManage/productionplan/productionMainAssembleSparePart/productionMainAssembleSparePart.data.ts @@ -203,7 +203,7 @@ export const ProductionMain = useCrudSchemas(reactive([ } }, { - label: '班次代码', + label: '班次', field: 'shift', sort: 'custom', table: { @@ -235,19 +235,6 @@ export const ProductionMain = useCrudSchemas(reactive([ } } }, - { - label: '班次名称', - field: 'shiftName', - sort: 'custom', - form: { - componentProps: { - disabled: true - } - }, - table: { - width: 150 - }, - }, // { // label: '物料代码', // field: 'detailItemCode', From 6a7df5a967b18ce38b541479d3cf5ab29780b1d5 Mon Sep 17 00:00:00 2001 From: "YEJIAXING-PC\\lenovo" <591141169@qq.com> Date: Sat, 12 Oct 2024 17:13:52 +0800 Subject: [PATCH 04/54] =?UTF-8?q?=E9=87=87=E8=B4=AD=E6=94=B6=E8=B4=A7?= =?UTF-8?q?=E8=AE=B0=E5=BD=95=E5=8F=91=E9=80=81=E5=88=B0=E8=B4=A7=E6=A3=80?= =?UTF-8?q?=E9=AA=8C=E7=94=B3=E8=AF=B7=E5=8A=9F=E8=83=BD=E5=8E=BB=E6=8E=89?= =?UTF-8?q?=20=20YT-349?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../productreceiptscrapRequestMain.data.ts | 136 +++++++++--------- .../purchasereceiptJobMain/index.vue | 12 +- .../purchasereceiptRecordMTypeMain/index.vue | 12 +- .../purchasereceiptRecordMain/index.vue | 24 ++-- .../purchasereceiptRecordRefuseMain/index.vue | 9 +- .../purchasereceiptRequestMain/index.vue | 9 +- 6 files changed, 104 insertions(+), 98 deletions(-) diff --git a/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRequestMain/productreceiptscrapRequestMain.data.ts b/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRequestMain/productreceiptscrapRequestMain.data.ts index fd3e49d1e..143740125 100644 --- a/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRequestMain/productreceiptscrapRequestMain.data.ts +++ b/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRequestMain/productreceiptscrapRequestMain.data.ts @@ -625,74 +625,74 @@ export const ProductreceiptRequestMainRules = reactive({ * @returns {Array} 制品收货申请子表 */ export const ProductreceiptRequestDetail = useCrudSchemas(reactive([ - { - label: '生产线代码', - field: 'productionLineCode', - sort: 'custom', - table: { - width: 150 - }, - isTableForm: false, - tableForm:{ - disabled:true, - multiple: true, - // isInpuFocusShow: true, - searchListPlaceholder: '请选择生产线代码', - searchField: 'code', - searchTitle: '生产线信息', - searchAllSchemas: Productionline.allSchemas, - searchPage: ProductionlineApi.getProductionlinePage, - searchCondition: [{ - key: 'available', - value: 'TRUE', - isMainValue: false - },{ - key: 'workshopCode', - value: 'workshopCode', - message: '请填写车间代码！', - isMainValue: true - }], - verificationPage: ProductionlineApi.getProductionlineByCodes, // 校验数去焦点输入是否正确的方法 - isShowTableFormSearch: true, - verificationParams: [{ - key: 'code', - action: '==', - value: '', - isMainValue: false, - isSearch: true, - isFormModel: true, - }], // 失去焦点校验参数 - }, - form: { - // labelMessage: '信息提示说明！！！', - componentProps: { - isSearchList: true, - searchListPlaceholder: '请选择生产线代码', - searchField: 'code', - searchTitle: '生产线信息', - searchAllSchemas: Productionline.allSchemas, - searchPage: ProductionlineApi.getProductionlinePage, - searchCondition: [{ - key: 'available', - value: 'TRUE', - isMainValue: false - },{ - key: 'workshopCode', - value: 'workshopCode', - message: '请填写车间代码！', - isMainValue: true - }], - verificationParams: [{ - key: 'code', - action: '==', - value: '', - isMainValue: false, - isSearch: true, - isFormModel: true, - }], // 失去焦点校验参数 - } - } - }, + // { + // label: '生产线代码', + // field: 'productionLineCode', + // sort: 'custom', + // table: { + // width: 150 + // }, + // isTableForm: false, + // tableForm:{ + // disabled:true, + // multiple: true, + // // isInpuFocusShow: true, + // searchListPlaceholder: '请选择生产线代码', + // searchField: 'code', + // searchTitle: '生产线信息', + // searchAllSchemas: Productionline.allSchemas, + // searchPage: ProductionlineApi.getProductionlinePage, + // searchCondition: [{ + // key: 'available', + // value: 'TRUE', + // isMainValue: false + // },{ + // key: 'workshopCode', + // value: 'workshopCode', + // message: '请填写车间代码！', + // isMainValue: true + // }], + // verificationPage: ProductionlineApi.getProductionlineByCodes, // 校验数去焦点输入是否正确的方法 + // isShowTableFormSearch: true, + // verificationParams: [{ + // key: 'code', + // action: '==', + // value: '', + // isMainValue: false, + // isSearch: true, + // isFormModel: true, + // }], // 失去焦点校验参数 + // }, + // form: { + // // labelMessage: '信息提示说明！！！', + // componentProps: { + // isSearchList: true, + // searchListPlaceholder: '请选择生产线代码', + // searchField: 'code', + // searchTitle: '生产线信息', + // searchAllSchemas: Productionline.allSchemas, + // searchPage: ProductionlineApi.getProductionlinePage, + // searchCondition: [{ + // key: 'available', + // value: 'TRUE', + // isMainValue: false + // },{ + // key: 'workshopCode', + // value: 'workshopCode', + // message: '请填写车间代码！', + // isMainValue: true + // }], + // verificationParams: [{ + // key: 'code', + // action: '==', + // value: '', + // isMainValue: false, + // isSearch: true, + // isFormModel: true, + // }], // 失去焦点校验参数 + // } + // } + // }, { label: '工位代码', field: 'workStationCode', diff --git a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptJobMain/index.vue b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptJobMain/index.vue index 82a8384bd..2e1e4d1fe 100644 --- a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptJobMain/index.vue +++ b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptJobMain/index.vue @@ -239,7 +239,7 @@ const butttondata = (row,$index) => { hasPermi: 'wms:purchasereceipt-job-main:refusal', link: true // 文本展现按钮 }, - defaultButtons.mainListPlanCheckQualityReportBtn({hide:isShowSourceTypeButton(row)}), // 查看质检报告 + // defaultButtons.mainListPlanCheckQualityReportBtn({hide:isShowSourceTypeButton(row)}), // 查看质检报告 ] } @@ -258,10 +258,12 @@ const buttonTableClick = async (val, row) => { console.log('列表-操作按钮事件-承接') await PurchasereceiptJobMainApi.acceptPurchasereceiptJobMain(row.masterId) buttonBaseClick('refresh',null) - } else if(val == 'mainPlanCheckQualityReport'){ - // 查看质检报告 - checkQualityReport(row) - } else if(val == 'mainJobRefusal'){ + } + // else if(val == 'mainPlanCheckQualityReport'){ + // // 查看质检报告 + // checkQualityReport(row) + // } + else if(val == 'mainJobRefusal'){ // handleRefusal(row.masterId) resonSubmit(row) } diff --git a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMTypeMain/index.vue b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMTypeMain/index.vue index 0f08e0c3f..4a01ed300 100644 --- a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMTypeMain/index.vue +++ b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMTypeMain/index.vue @@ -181,16 +181,16 @@ const isShowSourceTypeButton = (row) => { // 列表-操作按钮 const butttondata = (row,$index) => { - const findIndex = row['masterId']?tableObject.tableList.findIndex(item=>item['masterId'] == row['masterId']):-1 - if(findIndex>-1&&findIndex<$index){ - return [defaultButtons.mainListPrintInspectionBtn({hide:routeName.value.includes('SCP')})] - } + // const findIndex = row['masterId']?tableObject.tableList.findIndex(item=>item['masterId'] == row['masterId']):-1 + // if(findIndex>-1&&findIndex<$index){ + // return [defaultButtons.mainListPrintInspectionBtn({hide:routeName.value.includes('SCP')})] + // } return [ defaultButtons.mainInspectRequestBtn({hasPermi:'wms:purchasereceipt-record-main:createInspectRequest',hide:row.inspectRequestFlag == "FALSE" }),// 生成到货检验申请 defaultButtons.mainPutawayRequestBtn({hasPermi:'wms:purchasereceipt-record-main:createPutawayRequest',hide:row.putawayRequestFlag == "FALSE" }),// 生成采购上架申请 //defaultButtons.mainListPlanCheckQualityReportBtn({hide:row.orderTypeM == "2"}), // 查看质检报告 - defaultButtons.mainListPlanCheckQualityReportBtn({hide:isShowSourceTypeButton(row)}), // 查看质检报告 - defaultButtons.mainListPrintInspectionBtn({hide:routeName.value.includes('SCP')}) + // defaultButtons.mainListPlanCheckQualityReportBtn({hide:isShowSourceTypeButton(row)}), // 查看质检报告 + // defaultButtons.mainListPrintInspectionBtn({hide:routeName.value.includes('SCP')}) ] } diff --git a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMain/index.vue b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMain/index.vue index e5f926a9b..7195d526a 100644 --- a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMain/index.vue +++ b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMain/index.vue @@ -181,17 +181,17 @@ const isShowSourceTypeButton = (row) => { // 列表-操作按钮 const butttondata = (row,$index) => { - const findIndex = row['masterId']?tableObject.tableList.findIndex(item=>item['masterId'] == row['masterId']):-1 - if(findIndex>-1&&findIndex<$index){ - return [defaultButtons.mainListPrintInspectionBtn({hide:routeName.value.includes('SCP')})] - } + // const findIndex = row['masterId']?tableObject.tableList.findIndex(item=>item['masterId'] == row['masterId']):-1 + // if(findIndex>-1&&findIndex<$index){ + // return [defaultButtons.mainListPrintInspectionBtn({hide:routeName.value.includes('SCP')})] + // } return [ - defaultButtons.mainInspectRequestBtn({hasPermi:'wms:purchasereceipt-record-main:createInspectRequest',hide:row.inspectRequestFlag == "FALSE" }),// 生成到货检验申请 + // defaultButtons.mainInspectRequestBtn({hasPermi:'wms:purchasereceipt-record-main:createInspectRequest',hide:row.inspectRequestFlag == "FALSE" }),// 生成到货检验申请 defaultButtons.mainPutawayRequestBtn({hasPermi:'wms:purchasereceipt-record-main:createPutawayRequest',hide:row.putawayRequestFlag == "FALSE" }),// 生成采购上架申请 defaultButtons.mainPurchasereturnRecordBtn({hasPermi:'wms:purchasereceipt-record-main:createPurchasereturnRecord',hide:row.purchasereturnRecordFlag == "FALSE" }),// 生成采购退后记录申请 //defaultButtons.mainListPlanCheckQualityReportBtn({hide:row.orderTypeM == "2"}), // 查看质检报告 - defaultButtons.mainListPlanCheckQualityReportBtn({hide:isShowSourceTypeButton(row)}), // 查看质检报告 - defaultButtons.mainListPrintInspectionBtn({hide:routeName.value.includes('SCP')}) + // defaultButtons.mainListPlanCheckQualityReportBtn({hide:isShowSourceTypeButton(row)}), // 查看质检报告 + // defaultButtons.mainListPrintInspectionBtn({hide:routeName.value.includes('SCP')}) ] } @@ -203,10 +203,12 @@ const buttonTableClick = async (val, row) => { handleCreateInspectRequest(row.number) }else if(val == 'purchasereturnRecord'){//生成采购退后记录申请 handleCreatePurchasereturnRecord(row.number) - }else if(val == 'mainPlanCheckQualityReport'){ - // 查看质检报告 - checkQualityReport(row) - }else if (val == 'printInspection'){ + } + // else if(val == 'mainPlanCheckQualityReport'){ + // // 查看质检报告 + // checkQualityReport(row) + // } + else if (val == 'printInspection'){ handlePrint(row) } } diff --git a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordRefuseMain/index.vue b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordRefuseMain/index.vue index 9e8c619ed..08a5d6413 100644 --- a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordRefuseMain/index.vue +++ b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordRefuseMain/index.vue @@ -176,7 +176,7 @@ const butttondata = (row,$index) => { return [ defaultButtons.mainInspectRequestBtn({hasPermi:'wms:purchasereceipt-record-main:createInspectRequest',hide:row.inspectRequestFlag == "FALSE" }),// 生成到货检验申请 defaultButtons.mainPutawayRequestBtn({hasPermi:'wms:purchasereceipt-record-main:createPutawayRequest',hide:row.putawayRequestFlag == "FALSE" }),// 生成采购上架申请 - defaultButtons.mainListPlanCheckQualityReportBtn({}), // 查看质检报告 + // defaultButtons.mainListPlanCheckQualityReportBtn({}), // 查看质检报告 ] } @@ -186,10 +186,11 @@ const buttonTableClick = async (val, row) => { handleCreatePutawayRequest(row.number) }else if(val == 'inspectRequest'){//生成到货检验申请 handleCreateInspectRequest(row.number) - }else if(val == 'mainPlanCheckQualityReport'){ - // 查看质检报告 - checkQualityReport(row) } + // else if(val == 'mainPlanCheckQualityReport'){ + // // 查看质检报告 + // checkQualityReport(row) + // } } // 查看质检报告 const showQualityReport = ref(false) diff --git a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/index.vue b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/index.vue index caadd7bdd..75c48c672 100644 --- a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/index.vue +++ b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/index.vue @@ -415,7 +415,7 @@ const butttondata = (row,$index) => { defaultButtons.mainListPointBtn({ hide: isASNShowMainButton(row, ['3','6','8']) }), // 标签打印 defaultButtons.mainListHandleBtn({hide:isShowMainButton(row,['3']),hasPermi:'wms:purchasereceipt-request-main:handle'}), // 处理 defaultButtons.mainListCloseBtn({hide:isShowMainButton(row,['1','2','3','4','6']),hasPermi:'wms:purchasereceipt-request-main:close'}), // 关闭 - defaultButtons.mainListPlanCheckQualityReportBtn({hide:isShowSourceTypeButton(row)}), // 查看质检报告 + // defaultButtons.mainListPlanCheckQualityReportBtn({hide:isShowSourceTypeButton(row)}), // 查看质检报告 ] } @@ -460,10 +460,11 @@ const buttonTableClick = async (val, row) => { }else if (val == 'point') { // 标签打印 labelPrint(row) - }else if(val == 'mainPlanCheckQualityReport'){ - // 查看质检报告 - checkQualityReport(row) } + // else if(val == 'mainPlanCheckQualityReport'){ + // // 查看质检报告 + // checkQualityReport(row) + // } } // 生成标签选择 const onChangeLabel =(field,e,row, index) => { From 39cfa68b99ccbfe9c87d0a22ca277f8082c43068 Mon Sep 17 00:00:00 2001 From: bjang03 <259278618@qq.com> Date: Mon, 14 Oct 2024 10:48:24 +0800 Subject: [PATCH 05/54] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=86=8D=E6=AC=A1?= =?UTF-8?q?=E8=BE=93=E5=85=A5=E6=96=B0=E5=AF=86=E7=A0=81=E6=8F=90=E7=A4=BA?= =?UTF-8?q?=E6=96=87=E5=AD=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/login/components/LoginForm.vue | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/src/views/login/components/LoginForm.vue b/src/views/login/components/LoginForm.vue index 04b15d7ba..af7eee2bd 100644 --- a/src/views/login/components/LoginForm.vue +++ b/src/views/login/components/LoginForm.vue @@ -259,10 +259,21 @@ console.log('登陆res',res) const differenceDays = await PassWordApi.validateResetTime(res.userId) + debugger switch (differenceDays){ case null: break - case 0 || 1: + case 0: + await ElMessageBox.alert( + '密码到期，请立即修改', + '重要提示', + { + dangerouslyUseHTMLString: true, + } + ) + router.push({path:"/updatePasswordNewTips",query:{username:loginData.loginForm.username}}) + return + case 1: await ElMessageBox.alert( '密码到期，请立即修改', '重要提示', @@ -272,15 +283,6 @@ ) router.push({path:"/updatePasswordNewTips",query:{username:loginData.loginForm.username}}) return - // case 1: - // await ElMessageBox.alert( - // '密码过期，请联系管理员修改', - // '重要提示', - // { - // dangerouslyUseHTMLString: true, - // } - // ) - // return default: await ElMessageBox.alert( '密码'+differenceDays+'到期，请尽快修改。', From 7ee8ff68606c55d78d30f79e432169dc4479a94c Mon Sep 17 00:00:00 2001 From: zhang_li <2235006734@qqq.com> Date: Mon, 14 Oct 2024 15:45:11 +0800 Subject: [PATCH 06/54] =?UTF-8?q?=E5=BA=93=E5=AD=98=E8=BD=AC=E7=A7=BB?= =?UTF-8?q?=E6=89=B9=E6=AC=A1=E9=9C=80=E6=B1=82=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/TableForm/src/TableForm.vue | 47 ++++-- .../inventorymoveRequestMainMOVE/index.vue | 135 ++++++++++++++---- .../inventorymoveRequestMain.data.ts | 21 ++- 3 files changed, 156 insertions(+), 47 deletions(-) diff --git a/src/components/TableForm/src/TableForm.vue b/src/components/TableForm/src/TableForm.vue index eec0dcf8c..4cb4f8d1c 100644 --- a/src/components/TableForm/src/TableForm.vue +++ b/src/components/TableForm/src/TableForm.vue @@ -86,7 +86,7 @@ > @@ -123,11 +123,11 @@ > - + - + - + - + - + - + - + - + item.isShowTableFormSearch) // 传递给父类 @@ -627,11 +626,21 @@ const handleTableSelect = (row, column, event) => { // 某个item是否禁用 const itemIsDisabled = (colum, row) => { - return ( - Boolean(colum.tableForm?.disabled) || - Boolean(row.disabled) || - Boolean(row['disabled_' + colum.field]) - ) + console.log(row['disabled_' + colum.field]) + if (row['disabled_' + colum.field] === true || row['disabled_' + colum.field] === false) { + return Boolean(row['disabled_' + colum.field]) + } + else if (!row['disabled_' + colum.field] && (colum.tableForm?.disabled === true || colum.tableForm?.disabled === false)) { + return Boolean(colum.tableForm?.disabled) + }else { + return Boolean(row.disabled) + } + + // return ( + // Boolean(colum.tableForm?.disabled) || + // Boolean(row.disabled) || + // Boolean(row['disabled_' + colum.field]) + // ) } // const { t } = useI18n() // 国际化 @@ -762,6 +771,14 @@ const isFullscreen = ref(false) const reloadFullscreen = (fullscreen)=>{ isFullscreen.value = fullscreen } +// 显示输入框类型 +const getFormItemType = (row, headerItem) => { + if (headerItem.field&&row[headerItem.field + 'FormItemType'] != undefined) { + return row[headerItem.field + 'FormItemType'] + } else { + return headerItem?.tableForm?.type ? headerItem?.tableForm?.type :'' + } +} // setup 语法糖 抛出方法 defineExpose({ TableBaseComponents_Ref, diff --git a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMainMOVE/index.vue b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMainMOVE/index.vue index 08cf1488b..d12d63457 100644 --- a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMainMOVE/index.vue +++ b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMainMOVE/index.vue @@ -106,7 +106,6 @@ routeName.value = route.name const tableColumns = ref([...InventorymoveRequestMain.allSchemas.tableColumns,...InventorymoveRequestDetail.allSchemas.tableMainColumns]) const businessType = ref() -console.log(99 , routeName.value) const fromInventoryStatus = ref() const toInventoryStatus = ref() const importFileName = ref() @@ -123,7 +122,6 @@ if ( routeName.value == 'InventorymoveRequestMain') { businessType.value = 'Move' importFileName.value = '库存移动申请' } -console.log(99 , businessType.value) @@ -299,7 +297,6 @@ const getDefaultToLocationCode = async ()=>{ } }) let res = await LocationApi.selectBusinessTypeToLocation(params) - console.log('res',res) if(res&&res.list.length>0){ tableData.value.forEach(item=>{ if(!item['toLocationCode']){ @@ -308,9 +305,11 @@ const getDefaultToLocationCode = async ()=>{ }) } } +let fromManagementPrecision = ref('') +let toManagementPrecision = ref('') // 查询页面返回 const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => { - nextTick(() => { + nextTick(async() => { if (type == 'tableForm') { if(formField == 'fromPackingNumber'){ val = val.filter(item=>!tableData.value.find(item1=>item1['itemCode']==item['itemCode']&&item1['fromBatch']==item['batch']&&item1['fromPackingNumber']==item['packingNumber']&&item1['fromLocationCode']==item['locationCode']&&item1['fromInventoryStatus']==item['inventoryStatus'])) @@ -328,6 +327,28 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => newRow['toInventoryStatus'] = item['inventoryStatus']//库存移动申请 tableData.value.push(newRow) }) + }else if (formField == 'toLocationCode') { + row[formField] = val[0][searchField] + await ruleApi.getManagementPrecision({ + itemCodes: [row['itemCode']], + locationCode:row['fromLocationCode'] + }).then((res) => { + fromManagementPrecision.value = res[0].ManagementPrecision + }) + await ruleApi.getManagementPrecision({ + itemCodes: [row['itemCode']], + locationCode: val[0][searchField] + }).then((res) => { + toManagementPrecision.value = res[0].ManagementPrecision + }) + if (fromManagementPrecision.value == 'BY_QUANTITY' && toManagementPrecision.value == 'BY_BATCH') { + row['fromBatchFormItemType'] = 'FormDate' + row['disabled_fromBatch'] = false + } else { + row['fromBatchFormItemType'] = '' + row['disabled_fromBatch'] = true + row['fromBatch'] ='' + } } else { row[formField] = val[0][searchField] } @@ -354,8 +375,8 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => }) } // 查询页面返回——详情 -const searchTableSuccessDetail = (formField, searchField, val, formRef ) => { - nextTick(() => { +const searchTableSuccessDetail = (formField, searchField, val, formRef) => { + nextTick(async() => { const setV = {} if(formField == 'fromPackingNumber') { setV['fromPackingNumber'] = val[0]['packingNumber'] @@ -366,7 +387,37 @@ const searchTableSuccessDetail = (formField, searchField, val, formRef ) => { setV['fromLocationCode'] = val[0]['locationCode'] setV['uom'] = val[0]['uom'] setV['toInventoryStatus'] = val[0]['inventoryStatus'] //库存移动申请InventorymoveRequestMain - + } else if (formField == 'toLocationCode') { + setV[formField] = val[0][searchField] + await ruleApi.getManagementPrecision({ + itemCodes: [formRef.formModel.itemCode], + locationCode:formRef.formModel.fromLocationCode + }).then((res) => { + fromManagementPrecision.value = res[0].ManagementPrecision + }) + await ruleApi.getManagementPrecision({ + itemCodes: [formRef.formModel.itemCode], + locationCode: val[0][searchField] + }).then((res) => { + toManagementPrecision.value = res[0].ManagementPrecision + }) + if (fromManagementPrecision.value == 'BY_QUANTITY' && toManagementPrecision.value == 'BY_BATCH') { + const obj =ref(InventorymoveRequestDetail.allSchemas.formSchema.find(item => (item.field == 'fromBatch'))) + obj.value.component= 'DatePicker' + obj.value.componentProps.disabled= false + obj.value.componentProps.type= 'date' + obj.value.componentProps.valueFormat= 'YYYYMMDD' + obj.value.componentProps.format = 'YYYYMMDD' + InventorymoveRequestDetailRules.fromBatch[0].required = true + } else { + const obj =ref(InventorymoveRequestDetail.allSchemas.formSchema.find(item => (item.field == 'fromBatch'))) + obj.value.component= 'Input' + obj.value.componentProps={ + disabled : true + } + setV['fromBatch'] ='' + InventorymoveRequestDetailRules.fromBatch[0].required = false + } } else { setV[formField] = val[0][searchField] } @@ -457,7 +508,6 @@ const buttonTableClick = async (val, row) => { buttonBaseClick('refresh',null) }).catch(err => { tableObject.loading = false - console.log(err) }) } else if (val == 'mainReAdd') { // 重新添加 await message.confirm('确认要重新添加吗？') @@ -468,7 +518,6 @@ const buttonTableClick = async (val, row) => { buttonBaseClick('refresh',null) }).catch(err => { tableObject.loading = false - console.log(err) }) } else if (val == 'mainSubmit') { // 提交审批 await message.confirm('确认要提交审批吗？') @@ -479,7 +528,6 @@ const buttonTableClick = async (val, row) => { buttonBaseClick('refresh',null) }).catch(err => { tableObject.loading = false - console.log(err) }) } else if (val == 'mainTurnDown') { // 驳回 await message.confirm('确认要驳回吗？') @@ -490,7 +538,6 @@ const buttonTableClick = async (val, row) => { buttonBaseClick('refresh',null) }).catch(err => { tableObject.loading = false - console.log(err) }) } else if (val == 'mainApprove') { // 审批通过 await message.confirm('确认要审批通过吗？') @@ -501,7 +548,6 @@ const buttonTableClick = async (val, row) => { buttonBaseClick('refresh',null) }).catch(err => { tableObject.loading = false - console.log(err) }) } else if (val == 'mainHandle') { // 处理 await message.confirm('确认要处理吗？') @@ -512,7 +558,6 @@ const buttonTableClick = async (val, row) => { buttonBaseClick('refresh',null) }).catch(err => { tableObject.loading = false - console.log(err) }) } else if (val == 'edit') { // 编辑 openForm('update', row) @@ -531,20 +576,50 @@ const openForm =async (type: string, row?: number) => { /** * 详情 新增/编辑事件 */ -const detailOpenForm = (type, row) => { - if(InventorymoveRequestDetail.allSchemas.formSchema.find(item => (item.field == 'fromPackingNumber'))?.componentProps?.searchCondition.find(item => (item.key == 'warehouseCode')) == undefined){ - InventorymoveRequestDetail.allSchemas.formSchema.find(item => (item.field == 'fromPackingNumber'))?.componentProps?.searchCondition.push({ - key: 'warehouseCode', - value: fromWarehouseCodeMain.value, - isMainValue: false - }) - } else { - InventorymoveRequestDetail.allSchemas.formSchema.find(item => (item.field == 'fromPackingNumber'))?.componentProps?.searchCondition.find(item => { - if (item.key == 'warehouseCode') { - item.value = fromWarehouseCodeMain.value - } - }) +const detailOpenForm =async (type, row) => { + if(InventorymoveRequestDetail.allSchemas.formSchema.find(item => (item.field == 'fromPackingNumber'))?.componentProps?.searchCondition.find(item => (item.key == 'warehouseCode')) == undefined){ + InventorymoveRequestDetail.allSchemas.formSchema.find(item => (item.field == 'fromPackingNumber'))?.componentProps?.searchCondition.push({ + key: 'warehouseCode', + value: fromWarehouseCodeMain.value, + isMainValue: false + }) + } else { + InventorymoveRequestDetail.allSchemas.formSchema.find(item => (item.field == 'fromPackingNumber'))?.componentProps?.searchCondition.find(item => { + if (item.key == 'warehouseCode') { + item.value = fromWarehouseCodeMain.value } + }) + } + if (type == 'update') { + await ruleApi.getManagementPrecision({ + itemCodes: [row['itemCode']], + locationCode:row['fromLocationCode'] + }).then((res) => { + fromManagementPrecision.value = res[0].ManagementPrecision + }) + await ruleApi.getManagementPrecision({ + itemCodes: [row['itemCode']], + locationCode: row['toLocationCode'] + }).then((res) => { + toManagementPrecision.value = res[0].ManagementPrecision + }) + if (fromManagementPrecision.value == 'BY_QUANTITY' && toManagementPrecision.value == 'BY_BATCH') { + const obj =ref(InventorymoveRequestDetail.allSchemas.formSchema.find(item => (item.field == 'fromBatch'))) + obj.value.component= 'DatePicker' + obj.value.componentProps.disabled= false + obj.value.componentProps.type= 'date' + obj.value.componentProps.valueFormat= 'YYYYMMDD' + obj.value.componentProps.format= 'YYYYMMDD' + InventorymoveRequestDetailRules.fromBatch[0].required = true + } else { + const obj =ref(InventorymoveRequestDetail.allSchemas.formSchema.find(item => (item.field == 'fromBatch'))) + obj.value.component= 'Input' + obj.value.componentProps={ + disabled : true + } + InventorymoveRequestDetailRules.fromBatch[0].required = false + } + } } const fromWarehouseCodeMain = ref() @@ -629,11 +704,16 @@ const submitForm = async (formType, submitData) => { message.warning('从库位和到库位不能相同') return } + let batchList = tableData.value.filter(item=>item.fromBatchFormItemType&&item.fromBatchFormItemType == 'FormDate') + let noBatch = batchList.some(item => !item.fromBatch) + if(noBatch){ + message.warning('请选择从批次') + return + } data.subList = tableData.value // 拼接子表数据参数 let isExist = false tableData.value.forEach(item => { let rs = tableData.value.filter(filterItem => (filterItem.fromPackingNumber&&filterItem.fromPackingNumber == item.fromPackingNumber) ) - console.log(rs,5666); if(rs.length > 1) isExist = true }) if (isExist) { @@ -643,7 +723,6 @@ const submitForm = async (formType, submitData) => { } flag.value = false data.subList.forEach(item => { - console.log(556565,item); if(fromInventoryStatus.value){ //item.fromInventoryStatus = fromInventoryStatus.value item.toInventoryStatus = toInventoryStatus.value diff --git a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMainMOVE/inventorymoveRequestMain.data.ts b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMainMOVE/inventorymoveRequestMain.data.ts index c06a05d67..bf6454003 100644 --- a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMainMOVE/inventorymoveRequestMain.data.ts +++ b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMainMOVE/inventorymoveRequestMain.data.ts @@ -566,7 +566,7 @@ export const InventorymoveRequestDetail = useCrudSchemas(reactive( componentProps: { style: {width: '100%'}, type: 'date', - dateFormat: 'YYYY-MM-DD', + format: 'YYYY-MM-DD', valueFormat: 'x', } }, @@ -583,14 +583,24 @@ export const InventorymoveRequestDetail = useCrudSchemas(reactive( table: { width: 150 }, + isTable:false, tableForm: { - disabled: true + disabled: true, + placeholder: '请选择从批次', + valueFormat: 'YYYYMMDD', + format: 'YYYYMMDD', }, form: { + component: 'Input', componentProps: { - disabled: true + disabled:true + // style: { width: '100%' }, + // type: 'date', + // placeholder: '请选择从批次', + // format: 'YYYYMMDD', + // valueFormat: 'YYYYMMDD', } - } + }, }, { label: '到批次', @@ -963,6 +973,9 @@ export const InventorymoveRequestDetailRules = reactive({ fromLocationCode: [ { required: true, message: '请选择从库位代码', trigger: 'change' } ], + fromBatch: [ + { required: false, message: '请选择批次码', trigger: 'change' } + ], // fromPackingNumber: [ // { required: true, message: '请选择从包装号', trigger: 'change' } // ], From 8a1294c82d6b2188baeeea803495faad29fb3ae5 Mon Sep 17 00:00:00 2001 From: zhang_li <2235006734@qqq.com> Date: Mon, 14 Oct 2024 17:10:23 +0800 Subject: [PATCH 07/54] =?UTF-8?q?=E4=BF=AE=E5=A4=8DtableForm=20bug,?= =?UTF-8?q?=E6=A8=A1=E5=85=B7=E5=88=86=E6=91=8A=E8=AF=A6=E6=83=85=E6=8C=89?= =?UTF-8?q?=E9=92=AE=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/TableForm/src/TableForm.vue | 2 +- .../customerStatementMain.data.ts | 16 +++++++------- .../customerStatement/index.vue | 22 ++++++++++++++----- .../inventorymoveRequestMainMOVE/index.vue | 1 - 4 files changed, 25 insertions(+), 16 deletions(-) diff --git a/src/components/TableForm/src/TableForm.vue b/src/components/TableForm/src/TableForm.vue index 4cb4f8d1c..61bcb3632 100644 --- a/src/components/TableForm/src/TableForm.vue +++ b/src/components/TableForm/src/TableForm.vue @@ -86,7 +86,7 @@ > diff --git a/src/views/wms/deliversettlementManage/moldAllocation/customerStatement/customerStatementMain.data.ts b/src/views/wms/deliversettlementManage/moldAllocation/customerStatement/customerStatementMain.data.ts index 5c6f89abe..73dca29a8 100644 --- a/src/views/wms/deliversettlementManage/moldAllocation/customerStatement/customerStatementMain.data.ts +++ b/src/views/wms/deliversettlementManage/moldAllocation/customerStatement/customerStatementMain.data.ts @@ -283,25 +283,25 @@ export const CustomerStatementReconciliation = useCrudSchemas(reactive {{ row.qty }} + + +