From ff16f39ff610810008cdc307ec3577f90a4be220 Mon Sep 17 00:00:00 2001 From: songguoqiang <765017469@qq.com> Date: Thu, 5 Dec 2024 14:55:40 +0800 Subject: [PATCH 001/213] =?UTF-8?q?YT-1524=EF=BC=9ASPARC=E8=AE=A2=E5=8D=95?= =?UTF-8?q?=E5=AF=BC=E5=85=A5=E5=90=8E=E7=94=9F=E6=88=90=E7=9A=84=E8=A6=81?= =?UTF-8?q?=E8=B4=A7=E8=AE=A1=E5=88=92=E6=B2=A1=E6=9C=89=E6=98=BE=E7=A4=BA?= =?UTF-8?q?SPARC=E8=AE=A2=E5=8D=95=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../purchasePlanMain/purchasePlanMain.data.ts | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/purchasePlanMain.data.ts b/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/purchasePlanMain.data.ts index 2261ef305..6df67790c 100644 --- a/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/purchasePlanMain.data.ts +++ b/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/purchasePlanMain.data.ts @@ -56,6 +56,19 @@ export const PurchasePlanMain = useCrudSchemas( } } }, + { + label: 'SPARC订单号', + field: 'orderCode', + sort: 'custom', + isForm: false, + table: { + width: 180, + fixed: 'left' + }, + sortTableDefault: 1, + sortSearchDefault: 4, + isSearch: true + }, { label: '供应商代码', field: 'supplierCode', From 19a7142849cdd96d53b5994e22d035009511af19 Mon Sep 17 00:00:00 2001 From: zhang_li <2235006734@qqq.com> Date: Thu, 5 Dec 2024 15:09:05 +0800 Subject: [PATCH 002/213] =?UTF-8?q?YT-1506=E5=AE=A2=E6=88=B7=E5=AF=B9?= =?UTF-8?q?=E8=B4=A6=E5=8D=95-=E6=A8=A1=E5=85=B7=E5=88=86=E6=91=8A?= =?UTF-8?q?=E5=AF=B9=E8=B4=A6=E5=8D=95=EF=BC=8C=E5=88=86=E6=91=8A=E4=B8=AD?= =?UTF-8?q?=E5=BA=94=E8=83=BD=E4=BF=AE=E6=94=B9=E9=87=91=E9=A2=9D=EF=BC=8C?= =?UTF-8?q?=E4=B8=8D=E6=98=AF=E5=88=86=E6=91=8A=E7=8A=B6=E6=80=81=E4=B8=8D?= =?UTF-8?q?=E8=83=BD=E4=BF=AE=E6=94=B9=EF=BC=8C=E7=8E=B0=E5=88=86=E6=91=8A?= =?UTF-8?q?=E4=B8=AD=E4=B8=8D=E8=83=BD=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/Detail/src/Detail.vue | 6 +++--- src/components/Table/src/Table.vue | 3 --- .../moldAllocation/customerStatement/index.vue | 5 +++-- 3 files changed, 6 insertions(+), 8 deletions(-) diff --git a/src/components/Detail/src/Detail.vue b/src/components/Detail/src/Detail.vue index 6392c5519..5d2bbb3d6 100644 --- a/src/components/Detail/src/Detail.vue +++ b/src/components/Detail/src/Detail.vue @@ -887,7 +887,7 @@ const openDetail = async (row: any, titleName: any, titleValue: any, tableName: } } } -const updateList = ()=>{ +const updateList =async ()=>{ // 刷新 if (tableObjectRef.value.params.filters && tableObjectRef.value.params.filters.length > 0) { @@ -895,7 +895,7 @@ const updateList = ()=>{ filters: tableObjectRef.value.params.filters }) } else { - tableMethodsRef.value.getList() + await tableMethodsRef.value.getList() } } @@ -1100,7 +1100,7 @@ const submitForm = async (formType, data) => { const submitUpdateList = async ()=>{ formRef.value.dialogVisible = false // 刷新当前列表 - updateList() + await updateList() updateKey.value += 1 } diff --git a/src/components/Table/src/Table.vue b/src/components/Table/src/Table.vue index 76b9efa80..d65bb32e7 100644 --- a/src/components/Table/src/Table.vue +++ b/src/components/Table/src/Table.vue @@ -104,7 +104,6 @@ export default defineComponent({ const setColumn = (columnProps: TableSetPropsType[], columnsChildren?: TableColumn[]) => { let { columns } = unref(getProps) - console.log(888,props.isShowPackNumber) if (!wsCache.get('ShowPackingNumber')&&!props.isShowPackNumber) { if (columns) { columns = columns.filter(item => item.field != 'packingNumber' && item.field != 'fromPackingNumber'&& item.field != 'toPackingNumber') @@ -175,7 +174,6 @@ export default defineComponent({ //清空选择 const clearSelection = ()=>{ - console.log('clearSelection') elTableRef.value!.clearSelection() } @@ -348,7 +346,6 @@ export default defineComponent({ border } = unref(getProps) - console.log(999,props.isShowPackNumber) if (!wsCache.get('ShowPackingNumber') && !props.isShowPackNumber) { if (columns) { columns = columns.filter(item => item.field != 'packingNumber' && item.field != 'fromPackingNumber'&& item.field != 'toPackingNumber') diff --git a/src/views/wms/deliversettlementManage/moldAllocation/customerStatement/index.vue b/src/views/wms/deliversettlementManage/moldAllocation/customerStatement/index.vue index a27c86eb2..37bd6b683 100644 --- a/src/views/wms/deliversettlementManage/moldAllocation/customerStatement/index.vue +++ b/src/views/wms/deliversettlementManage/moldAllocation/customerStatement/index.vue @@ -797,13 +797,14 @@ const openDetailForm = (row) => { const handleDetailSubmitForm = async (formType, data) => { await CustomerStatementDetailApi.updateAdjustmentAmount(data.id,data.masterId,data.adjustmentAmount) message.success(t('common.updateSuccess')) - detailRef.value.submitUpdateList() + await detailRef.value.submitUpdateList() const amount = ref(0) detailRef.value.tableObjectRef.tableList.forEach(item => { amount.value = amount.value + item.adjustmentAmount }) + console.log(22,amount.value) // 确认分摊金额 - if (amount.value == 0) { + if (amount.value != 0) { otherHeadButttonData.value = [ { label: t(`ts.导出`).replace('ts.', ''), From 842631d596f71c4ee622f93d3bcf04757c5e012b Mon Sep 17 00:00:00 2001 From: zhang_li <2235006734@qqq.com> Date: Thu, 5 Dec 2024 15:12:33 +0800 Subject: [PATCH 003/213] =?UTF-8?q?YT-1540=E8=A1=A5=E7=BB=99=E5=93=81?= =?UTF-8?q?=E7=94=9F=E4=BA=A7=E8=AE=A1=E5=88=92=E3=80=81=E5=8F=B7=E5=8F=A3?= =?UTF-8?q?=E5=93=81=E7=94=9F=E4=BA=A7=E8=AE=A1=E5=88=92=EF=BC=8C=E5=88=87?= =?UTF-8?q?=E6=8D=A2=E8=BD=A6=E9=97=B4=E3=80=81=E7=94=9F=E4=BA=A7=E7=BA=BF?= =?UTF-8?q?=E6=97=B6=EF=BC=8C=E5=BA=94=E6=B8=85=E7=A9=BA=E6=98=8E=E7=BB=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../productionplan/productionMainAssemble/index.vue | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/src/views/wms/productionManage/productionplan/productionMainAssemble/index.vue b/src/views/wms/productionManage/productionplan/productionMainAssemble/index.vue index cf2699d27..6a2163d8d 100644 --- a/src/views/wms/productionManage/productionplan/productionMainAssemble/index.vue +++ b/src/views/wms/productionManage/productionplan/productionMainAssemble/index.vue @@ -161,13 +161,10 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => if(formField == 'workshop'){ setV['workshop'] = val[0]['code'] setV['productionLine'] = '' - if(tableData.value){ - tableData.value.forEach(item => { - item.itemCode ='' - item.bomVersion = '' - item.uom = '' - }) - } + tableData.value =[] + }else if(formField == 'productionLine'){ + setV['productionLine'] = val[0]['code'] + tableData.value =[] }else{ setV[formField] = val[0][searchField] } From 4305e4177ed8d2c80213459eabac97418441c5a8 Mon Sep 17 00:00:00 2001 From: zhang_li <2235006734@qqq.com> Date: Thu, 5 Dec 2024 15:18:23 +0800 Subject: [PATCH 004/213] =?UTF-8?q?YT-1541=E5=8F=91=E6=96=99=E7=94=B3?= =?UTF-8?q?=E8=AF=B7=E6=96=B0=E5=A2=9E=E3=80=81=E5=A4=87=E6=96=99=E8=AE=A1?= =?UTF-8?q?=E5=88=92=E6=96=B0=E5=A2=9E=EF=BC=8C=E5=88=87=E6=8D=A2=E8=BD=A6?= =?UTF-8?q?=E9=97=B4=E4=BB=A3=E7=A0=81=E3=80=81=E7=94=9F=E4=BA=A7=E7=BA=BF?= =?UTF-8?q?=E4=BB=A3=E7=A0=81=E3=80=81=E5=B7=A5=E4=BD=8D=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=EF=BC=8C=E5=BA=94=E6=B8=85=E7=A9=BA=E6=98=8E=E7=BB=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../preparetoissueplan/preparetoissueMain/index.vue | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/views/wms/issueManage/preparetoissueplan/preparetoissueMain/index.vue b/src/views/wms/issueManage/preparetoissueplan/preparetoissueMain/index.vue index 8d256fec5..7eaebfacd 100644 --- a/src/views/wms/issueManage/preparetoissueplan/preparetoissueMain/index.vue +++ b/src/views/wms/issueManage/preparetoissueplan/preparetoissueMain/index.vue @@ -207,6 +207,14 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => console.log(err) message.error('错误') }) + } + if (formField == 'workshop') { + //车间代码 + tableData.value =[] + } + if (formField == 'prodLine') { + //车间代码 + tableData.value =[] } formRef.setValues(setV) } From 02dfdf937cddf4c5ea6a3a4ebfe8f4a51b6a85b8 Mon Sep 17 00:00:00 2001 From: zhang_li <2235006734@qqq.com> Date: Thu, 5 Dec 2024 15:41:14 +0800 Subject: [PATCH 005/213] =?UTF-8?q?=E5=8A=A0loading?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../purchasereceiptRequestMain/index.vue | 44 +++++++++++-------- 1 file changed, 26 insertions(+), 18 deletions(-) diff --git a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/index.vue b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/index.vue index b8829a5e9..f35557a6b 100644 --- a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/index.vue +++ b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/index.vue @@ -584,7 +584,7 @@ const searchTableSuccess1 = async (formField, searchField, val, formRef, type, r let array = []//存储可采购数据 let array1 = []//存储可制造数据 let packingNumbers = [] - val.forEach((item,index) => { + val.forEach((item,index) => { packingNumbers.push(item.number) if (item.itemType == '可采购') { @@ -594,23 +594,31 @@ const searchTableSuccess1 = async (formField, searchField, val, formRef, type, r array1.push(item) } }) - if (array.length>0) { - await PackageApi.getPrintingLableId({packingNumbers:array.map(item1=>item1.number)}).then(res => { - console.log(res) - window.open(BASE_URL + '/jmreport/view/1016234988731322368?token=' + getAccessToken()+'&id=' + res) - }).catch(err => { - console.log(err) - message.error('创建标签失败') - }) - } - if (array1.length > 0) { - await PackageApi.batchPrintingLable(array1.map(item1=>item1.number).join(',')).then(res => { - console.log(res) - window.open(src.value + '&asn_number=' + res) - }).catch(err => { - console.log(err) - message.error('创建标签失败') - }) + console.log( searchTableRef.value) + tableObject.loading = true + try { + if (array.length>0) { + await PackageApi.getPrintingLableId({packingNumbers:array.map(item1=>item1.number)}).then(res => { + console.log(res) + window.open(BASE_URL + '/jmreport/view/1016234988731322368?token=' + getAccessToken()+'&id=' + res) + }).catch(err => { + console.log(err) + message.error('创建标签失败') + tableObject.loading = false + }) + } + if (array1.length > 0) { + await PackageApi.batchPrintingLable(array1.map(item1=>item1.number).join(',')).then(res => { + console.log(res) + window.open(src.value + '&asn_number=' + res) + }).catch(err => { + console.log(err) + message.error('创建标签失败') + tableObject.loading = false + }) + } + } finally { + tableObject.loading = false } } From a55555c47b1ffa75862b5638a60aa461cd2528ee Mon Sep 17 00:00:00 2001 From: zhang_li <2235006734@qqq.com> Date: Thu, 5 Dec 2024 15:47:31 +0800 Subject: [PATCH 006/213] =?UTF-8?q?YT-1533=E5=88=9B=E5=BB=BA=E5=BC=80?= =?UTF-8?q?=E7=A5=A8=E7=94=B3=E8=AF=B7=EF=BC=8C=E5=90=AB=E7=A8=8E=E9=87=91?= =?UTF-8?q?=E9=A2=9D=E4=B8=8D=E6=AD=A3=E7=A1=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CustomerSaleInvoiceBasicForm.vue | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/views/wms/deliversettlementManage/customerSaleInvoiceRequestMain/CustomerSaleInvoiceBasicForm.vue b/src/views/wms/deliversettlementManage/customerSaleInvoiceRequestMain/CustomerSaleInvoiceBasicForm.vue index e1c5026cd..f18f93699 100644 --- a/src/views/wms/deliversettlementManage/customerSaleInvoiceRequestMain/CustomerSaleInvoiceBasicForm.vue +++ b/src/views/wms/deliversettlementManage/customerSaleInvoiceRequestMain/CustomerSaleInvoiceBasicForm.vue @@ -135,6 +135,8 @@ const onChange = (field, cur, formRef)=>{ // 税额：taxAmount 未税价格*税率/100,四舍五入保留2位小数 tableData.value.forEach(item=>{ item['taxAmount'] = (item['beforeTaxAmount'] * cur)/100 //含税金额 + // 含税金额 = 未税价格+税额,四舍五入保留2位小数 + item['afterTaxAmount'] = item['beforeTaxAmount'] + item['taxAmount'] }) } } From edabc739e150edc866a60d209c86375f2407b682 Mon Sep 17 00:00:00 2001 From: zhang_li <2235006734@qqq.com> Date: Thu, 5 Dec 2024 16:04:56 +0800 Subject: [PATCH 007/213] =?UTF-8?q?=E5=90=88=E8=AE=A1=E5=8D=95=E4=BB=B7?= =?UTF-8?q?=E5=B0=8F=E6=95=B0=E4=BD=8D=E6=95=B0,=E4=BB=B7=E7=A8=8E?= =?UTF-8?q?=E5=90=88=E8=AE=A1=E9=87=91=E9=A2=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CustomerSaleInvoiceBasicForm.vue | 2 +- .../customerSaleInvoiceRequestMain.data.ts | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/views/wms/deliversettlementManage/customerSaleInvoiceRequestMain/CustomerSaleInvoiceBasicForm.vue b/src/views/wms/deliversettlementManage/customerSaleInvoiceRequestMain/CustomerSaleInvoiceBasicForm.vue index f18f93699..13c428949 100644 --- a/src/views/wms/deliversettlementManage/customerSaleInvoiceRequestMain/CustomerSaleInvoiceBasicForm.vue +++ b/src/views/wms/deliversettlementManage/customerSaleInvoiceRequestMain/CustomerSaleInvoiceBasicForm.vue @@ -77,7 +77,7 @@ // 主数据税额 taxAmount:mainTaxAmount, // 主数据价税合计金额：mainAdTaxAmount =未税金额+税额 - adTaxAmount:mainBeforeTaxAmount+mainTaxAmount + adTaxAmount:(parseFloat(mainBeforeTaxAmount) + mainTaxAmount).toFixed(2) } formRef.value.setValues(sumObject) } diff --git a/src/views/wms/deliversettlementManage/customerSaleInvoiceRequestMain/customerSaleInvoiceRequestMain.data.ts b/src/views/wms/deliversettlementManage/customerSaleInvoiceRequestMain/customerSaleInvoiceRequestMain.data.ts index 87d32b5a1..40678adff 100644 --- a/src/views/wms/deliversettlementManage/customerSaleInvoiceRequestMain/customerSaleInvoiceRequestMain.data.ts +++ b/src/views/wms/deliversettlementManage/customerSaleInvoiceRequestMain/customerSaleInvoiceRequestMain.data.ts @@ -447,12 +447,14 @@ export const CustomerSaleInvoiceDetail = useCrudSchemas(reactive([ form: { component: 'InputNumber', componentProps: { - disabled: true + disabled: true, + precision: 5 } }, tableForm: { disabled: true, type: 'InputNumber', + precision: 5 } }, { From a08aa64e3e790d98971627a40bbb035ec44382d1 Mon Sep 17 00:00:00 2001 From: zhang_li <2235006734@qqq.com> Date: Thu, 5 Dec 2024 16:26:18 +0800 Subject: [PATCH 008/213] =?UTF-8?q?YT-1561=E5=88=B6=E5=93=81=E5=9B=9E?= =?UTF-8?q?=E6=94=B6=E7=94=B3=E8=AF=B7=EF=BC=8C=E6=96=B0=E5=A2=9E=E5=BA=94?= =?UTF-8?q?=E6=8E=A7=E5=88=B6=E7=94=9F=E4=BA=A7=E7=BA=BF=E4=B8=8E=E7=89=A9?= =?UTF-8?q?=E6=96=99=E5=85=B3=E7=B3=BB=EF=BC=8C=E9=80=89=E6=8B=A9=E7=94=9F?= =?UTF-8?q?=E4=BA=A7=E7=BA=BF=E4=BB=A3=E7=A0=81=E5=BA=94=E5=B8=A6=E5=87=BA?= =?UTF-8?q?=E5=AF=B9=E5=BA=94=E7=94=9F=E4=BA=A7=E7=BA=BF=E7=9A=84=E7=89=A9?= =?UTF-8?q?=E6=96=99=EF=BC=8C=E5=B9=B6=E5=88=87=E6=8D=A2=E7=94=9F=E4=BA=A7?= =?UTF-8?q?=E7=BA=BF=E6=97=B6=E5=BA=94=E6=B8=85=E7=A9=BA=E6=98=8E=E7=BB=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../productredress/productredressRequestMain/index.vue | 2 ++ .../productredressRequestMain/productredressRequestMain.data.ts | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/views/wms/productionManage/productredress/productredressRequestMain/index.vue b/src/views/wms/productionManage/productredress/productredressRequestMain/index.vue index ebe38e028..3a24bbdb5 100644 --- a/src/views/wms/productionManage/productredress/productredressRequestMain/index.vue +++ b/src/views/wms/productionManage/productredress/productredressRequestMain/index.vue @@ -177,9 +177,11 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => //车间代码 setV['productionLineCode'] = '' setV['workStationCode'] = '' + tableData.value = [] }else if('productionLineCode'==formField){ //生产线 setV['workStationCode'] = '' + tableData.value = [] } formRef.setValues(setV) } diff --git a/src/views/wms/productionManage/productredress/productredressRequestMain/productredressRequestMain.data.ts b/src/views/wms/productionManage/productredress/productredressRequestMain/productredressRequestMain.data.ts index 04f368239..bd45c88da 100644 --- a/src/views/wms/productionManage/productredress/productredressRequestMain/productredressRequestMain.data.ts +++ b/src/views/wms/productionManage/productredress/productredressRequestMain/productredressRequestMain.data.ts @@ -591,7 +591,7 @@ export const ProductredressRequestDetail = useCrudSchemas(reactive isFormModel:true, // filters中添加筛选的数据--取于formModel required:true, // 前置添加必有，和isFormModel结合使用 message: '请选择生产线代码！', // 前置添加没填的提示语 - isOptional:true, // isMainValue=true情况，添加参数可选可空的判断 + isOptional:false, // isMainValue=true情况，添加参数可选可空的判断 } From 565e9aba31bb7b045bc1cd9360963c339c77c7ae Mon Sep 17 00:00:00 2001 From: zhang_li <2235006734@qqq.com> Date: Fri, 6 Dec 2024 10:04:54 +0800 Subject: [PATCH 009/213] =?UTF-8?q?YT-1570=E5=88=9B=E5=BB=BA=E5=BC=80?= =?UTF-8?q?=E7=A5=A8=EF=BC=8C=E7=A8=8E=E9=A2=9D=E5=BA=94=E4=BF=9D=E7=95=99?= =?UTF-8?q?2=E4=B8=BA=E5=B0=8F=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CustomerSaleInvoiceBasicForm.vue | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/views/wms/deliversettlementManage/customerSaleInvoiceRequestMain/CustomerSaleInvoiceBasicForm.vue b/src/views/wms/deliversettlementManage/customerSaleInvoiceRequestMain/CustomerSaleInvoiceBasicForm.vue index f18f93699..cde80c589 100644 --- a/src/views/wms/deliversettlementManage/customerSaleInvoiceRequestMain/CustomerSaleInvoiceBasicForm.vue +++ b/src/views/wms/deliversettlementManage/customerSaleInvoiceRequestMain/CustomerSaleInvoiceBasicForm.vue @@ -54,12 +54,12 @@ updateOriginFormModel(formModel) } // 2.主数据税额 mainTaxAmount = 未税金额*税率/100 保留两位小数 - let mainTaxAmount = Number(Number(beforeTaxAmount*taxRate*0.01).toFixed(2)) + let mainTaxAmount = Number(beforeTaxAmount*taxRate*0.01).toFixed(2) formRef.value.setValues({ // 主数据税额 taxAmount:mainTaxAmount, // 主数据价税合计金额：mainAdTaxAmount =未税金额+税额 - adTaxAmount:beforeTaxAmount+taxAmount + adTaxAmount:beforeTaxAmount+parseFloat(taxAmount) }) } } @@ -70,14 +70,14 @@ // 1、主数据未税金额 mainBeforeTaxAmount : 所有明细行未税金额的和 let mainBeforeTaxAmount = tableData.reduce((prev, item) =>prev + Number(item['beforeTaxAmount'].toFixed(2)),0).toFixed(2) // 2.主数据税额 mainTaxAmount = 未税金额*税率/100 保留两位小数 - let mainTaxAmount = Number(Number(mainBeforeTaxAmount*taxRate*0.01).toFixed(2)) + let mainTaxAmount = Number(mainBeforeTaxAmount * taxRate * 0.01).toFixed(2) const sumObject = { // 主数据未税金额 beforeTaxAmount:mainBeforeTaxAmount, // 主数据税额 taxAmount:mainTaxAmount, // 主数据价税合计金额：mainAdTaxAmount =未税金额+税额 - adTaxAmount:mainBeforeTaxAmount+mainTaxAmount + adTaxAmount:(Number(mainBeforeTaxAmount)+Number(mainTaxAmount)).toFixed(2) } formRef.value.setValues(sumObject) } @@ -150,7 +150,7 @@ const inputNumberChange = (field, index, row, val) => { row['allocationPrice'] = row['beforeTaxAmount']/row['qty'] - row['price'] // 合计单价 = 销售单价 + 模具分摊单价 - row['sumPrice'] = row['price'] + row['allocationPrice'] + row['sumPrice'] = (row['price'] + row['allocationPrice']).toFixed(5) // 税额：taxAmount 未税价格*税率/100,四舍五入保留2位小数 row['taxAmount'] = (row['beforeTaxAmount'] * formRef.value.formRef.formModel['taxRate'])/100 //含税金额 @@ -279,9 +279,9 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => // 初始化计算子表 const initTableDataPrice = ()=>{ tableData.value.forEach(item=>{ - item['sumPrice'] = item['price'] + item['allocationPrice'] + item['sumPrice'] = (item['price'] + item['allocationPrice']).toFixed(5) // 未税金额 默认等于数量*合计单价，可修改，必填，最多可输入2位小数 - item['beforeTaxAmount'] = item['sumPrice']*item['qty'] + item['beforeTaxAmount'] = Number(item['sumPrice'])*item['qty'] // 税额：taxAmount 未税价格*税率/100,四舍五入保留2位小数 item['taxAmount'] = (item['beforeTaxAmount'] * formRef.value.formRef.formModel['taxRate'])/100 //含税金额 From 0b4adfee95f5728e387471ae89966fba6d89fd0b Mon Sep 17 00:00:00 2001 From: zhang_li <2235006734@qqq.com> Date: Fri, 6 Dec 2024 10:14:17 +0800 Subject: [PATCH 010/213] =?UTF-8?q?YT-1573=E9=94=80=E5=94=AE=E5=BC=80?= =?UTF-8?q?=E7=A5=A8=E7=94=B3=E8=AF=B7=EF=BC=8C=E7=BC=96=E8=BE=91=EF=BC=8C?= =?UTF-8?q?=E4=BB=B7=E7=A8=8E=E9=87=91=E9=A2=9D=E5=BA=94=E4=BF=9D=E7=95=99?= =?UTF-8?q?2=E4=B8=BA=E5=B0=8F=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CustomerSaleInvoiceBasicForm.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/wms/deliversettlementManage/customerSaleInvoiceRequestMain/CustomerSaleInvoiceBasicForm.vue b/src/views/wms/deliversettlementManage/customerSaleInvoiceRequestMain/CustomerSaleInvoiceBasicForm.vue index cde80c589..ef3d5c664 100644 --- a/src/views/wms/deliversettlementManage/customerSaleInvoiceRequestMain/CustomerSaleInvoiceBasicForm.vue +++ b/src/views/wms/deliversettlementManage/customerSaleInvoiceRequestMain/CustomerSaleInvoiceBasicForm.vue @@ -59,7 +59,7 @@ // 主数据税额 taxAmount:mainTaxAmount, // 主数据价税合计金额：mainAdTaxAmount =未税金额+税额 - adTaxAmount:beforeTaxAmount+parseFloat(taxAmount) + adTaxAmount:(beforeTaxAmount+parseFloat(taxAmount)).toFixed(2) }) } } From 13740c1cd259b627051d1500582ea463eda8bcd1 Mon Sep 17 00:00:00 2001 From: "YEJIAXING-PC\\lenovo" <591141169@qq.com> Date: Fri, 6 Dec 2024 10:48:14 +0800 Subject: [PATCH 011/213] =?UTF-8?q?=E5=BA=93=E5=AD=98=E5=88=9D=E5=A7=8B?= =?UTF-8?q?=E5=8C=96=E6=89=B9=E9=87=8F=E6=89=93=E5=8D=B0=E6=A0=87=E7=AD=BE?= =?UTF-8?q?=E6=89=93=E5=8D=B0=E7=9A=84=E9=83=BD=E6=98=AF=E5=88=B6=E9=80=A0?= =?UTF-8?q?=E4=BB=B6=E6=A0=87=E7=AD=BE=EF=BC=88=E9=87=87=E8=B4=AD=E4=BB=B6?= =?UTF-8?q?=E5=BA=94=E6=89=93=E5=8D=B0=E9=87=87=E8=B4=AD=E4=BB=B6=E6=A0=87?= =?UTF-8?q?=E7=AD=BE=E4=B8=94=E5=A6=82=E6=9E=9C=E5=90=8C=E6=97=B6=E9=80=89?= =?UTF-8?q?=E6=8B=A9=E4=BA=86=E5=88=B6=E9=80=A0=E4=BB=B6=E5=92=8C=E9=87=87?= =?UTF-8?q?=E8=B4=AD=E4=BB=B6=E8=A6=81=E5=88=86=E5=88=AB=E6=89=93=E5=8D=B0?= =?UTF-8?q?=EF=BC=89YT-1448?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/wms/inventoryinitRecordDetail/index.ts | 5 +++++ .../inventoryinitial/inventoryinitRecordMain/index.vue | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/src/api/wms/inventoryinitRecordDetail/index.ts b/src/api/wms/inventoryinitRecordDetail/index.ts index fe2d27f22..ad5e93142 100644 --- a/src/api/wms/inventoryinitRecordDetail/index.ts +++ b/src/api/wms/inventoryinitRecordDetail/index.ts @@ -77,4 +77,9 @@ export const importTemplate = () => { // 批量打印 export const printLabelBatchByIdSelection = async (data: any) => { return await request.post({ url: `/wms/inventoryinit-record-main/printLabelBatchById` ,data}) +} + +// 批量打印 +export const printLabelBatchByIdSelectionForYT = async (data: any) => { + return await request.post({ url: `/wms/inventoryinit-record-main/printLabelBatchByIdForYT` ,data}) } \ No newline at end of file diff --git a/src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRecordMain/index.vue b/src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRecordMain/index.vue index 21de35179..c7bc2a687 100644 --- a/src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRecordMain/index.vue +++ b/src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRecordMain/index.vue @@ -211,7 +211,7 @@ const handleSelectionPoint = async ()=>{ text: 'loading...', background: 'rgba(0, 0, 0, 0.7)' }) - InventoryinitRecordDetailApi.printLabelBatchByIdSelection(rows.join(",")).then(res => { + InventoryinitRecordDetailApi.printLabelBatchByIdSelectionForYT(rows.join(",")).then(res => { console.log('批量打印res',res); getLoading?.close() if(res.zzLabel){ @@ -221,7 +221,7 @@ const handleSelectionPoint = async ()=>{ } if (res.cgLabel) { //采购标签 - const src = ref(BASE_URL + '/jmreport/view/922729953438072832?token=' + getAccessToken()) + const src = ref(BASE_URL + '/jmreport/view/1022349139354537984?token=' + getAccessToken()) window.open(src.value+'&asn_number='+res.cgLabel) } if(!res.cgLabel&&!res.zzLabel){ From e8044e1e6dcb7dc8405f1899cb7ae02aa4b1d62b Mon Sep 17 00:00:00 2001 From: zhang_li <2235006734@qqq.com> Date: Fri, 6 Dec 2024 11:54:48 +0800 Subject: [PATCH 012/213] =?UTF-8?q?YT-1582=E5=AE=A2=E6=88=B7=E6=A8=A1?= =?UTF-8?q?=E5=85=B7=E5=88=86=E6=91=8A=E5=AF=B9=E8=B4=A6=E9=A2=84=E6=B5=8B?= =?UTF-8?q?=EF=BC=8C=E6=98=8E=E7=BB=86=E9=87=91=E9=A2=9D=E5=BA=94=E4=BF=9D?= =?UTF-8?q?=E7=95=99=E5=B0=8F=E6=95=B0=E5=90=8E5=E4=BD=8D=EF=BC=8C?= =?UTF-8?q?=E5=A6=82=E5=9B=BE=EF=BC=9B=E5=AE=A2=E6=88=B7=E6=A8=A1=E5=85=B7?= =?UTF-8?q?=E5=88=86=E6=91=8A=E5=AF=B9=E8=B4=A6=E5=8D=95=EF=BC=8C=E6=98=8E?= =?UTF-8?q?=E7=BB=86=E7=9A=84=E6=A8=A1=E5=85=B7=E5=88=86=E6=91=8A=E9=87=91?= =?UTF-8?q?=E9=A2=9D=E5=BA=94=E4=BF=9D=E7=95=99=E5=90=8E5=E4=BD=8D?= =?UTF-8?q?=EF=BC=9B=E5=AE=A2=E6=88=B7=E5=AF=B9=E8=B4=A6=E5=8D=95=E7=9A=84?= =?UTF-8?q?=E6=A8=A1=E5=85=B7=E5=88=86=E6=91=8A=E5=AF=B9=E8=B4=A6=E5=8D=95?= =?UTF-8?q?=EF=BC=8C=E5=88=86=E6=91=8A=E9=87=91=E9=A2=9D=E3=80=81=E8=B0=83?= =?UTF-8?q?=E6=95=B4=E9=87=91=E9=A2=9D=E4=BF=9D=E7=95=99=E5=90=8E5?= =?UTF-8?q?=E4=BD=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/Detail/src/Detail.vue | 6 +++++- .../index.vue | 19 +++++++++++++++++-- 2 files changed, 22 insertions(+), 3 deletions(-) diff --git a/src/components/Detail/src/Detail.vue b/src/components/Detail/src/Detail.vue index 5d2bbb3d6..46553fe3b 100644 --- a/src/components/Detail/src/Detail.vue +++ b/src/components/Detail/src/Detail.vue @@ -1134,7 +1134,8 @@ const emit = defineEmits([ 'formFormDateChange', 'buttonBaseClick', 'handleMainFefresh', - 'handleSubmitForm' + 'handleSubmitForm', + 'changeDetailList' ]) /** 删除按钮操作 */ const handleDelete = async (id: number) => { @@ -1269,6 +1270,9 @@ watch( tableMethodsRef.value = tableMethods const { getList } = tableMethods await getList() + + emit('changeDetailList',props.apiPage) + } ) watch( diff --git a/src/views/wms/deliversettlementManage/moldAllocation/customerToolApportStatementForecastMain/index.vue b/src/views/wms/deliversettlementManage/moldAllocation/customerToolApportStatementForecastMain/index.vue index 169fe976a..657b2bf8b 100644 --- a/src/views/wms/deliversettlementManage/moldAllocation/customerToolApportStatementForecastMain/index.vue +++ b/src/views/wms/deliversettlementManage/moldAllocation/customerToolApportStatementForecastMain/index.vue @@ -74,6 +74,7 @@ @changeTabs="changeTabs" :tableObjectExtend="tableObjectExtend" @buttonBaseClick="detailButtonBaseClick" + @changeDetailList="changeDetailList" > +
@@ -88,7 +89,9 @@ onBeforeUnmount(() => {
+ +
\ No newline at end of file + diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingSupplierMain/index.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingSupplierMain/index.vue index 49eb20d07..6c2afd24a 100644 --- a/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingSupplierMain/index.vue +++ b/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingSupplierMain/index.vue @@ -180,6 +180,7 @@ const buttonBaseClick = async (val, item) => { const searchClick = async (data)=>{ data.flag = 1 + data.status = 2 console.log('searchClick',data) await setSearchParamsHead(data) // updateDateTableColumns() @@ -290,4 +291,4 @@ onMounted(async () => { color:var(--el-color-success); font-weight:700; } - \ No newline at end of file + From 6ab81674c19258c63f67564b6e2555f5eb4014c9 Mon Sep 17 00:00:00 2001 From: zhaoyiran Date: Wed, 11 Dec 2024 15:16:18 +0800 Subject: [PATCH 046/213] =?UTF-8?q?YT-1623=E4=BF=AE=E6=94=B9=E6=8F=90?= =?UTF-8?q?=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/system/post/PostForm.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/system/post/PostForm.vue b/src/views/system/post/PostForm.vue index 714b8d296..7931adf38 100644 --- a/src/views/system/post/PostForm.vue +++ b/src/views/system/post/PostForm.vue @@ -78,7 +78,7 @@ const formRules = reactive({ { required: false, message: '岗位内容不能为空', trigger: 'blur' }, { max: 500, message: '不得超过500个字符', trigger: 'blur' } ], - sort:[{ validator:validateMaxInteger, message: '请输入正确整数', trigger: 'change'}] + sort:[{ validator:validateMaxInteger, message: '岗位顺序范围0~65535', trigger: 'change'}] }) const formRef = ref() // 表单 Ref From 9ceb824af890c382493753928859bcee21dab3d5 Mon Sep 17 00:00:00 2001 From: zhang_li <2235006734@qqq.com> Date: Wed, 11 Dec 2024 16:20:54 +0800 Subject: [PATCH 047/213] =?UTF-8?q?=E5=8D=95=E4=BD=8D=E8=BD=AC=E6=8D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Descriptions/src/Descriptions.vue | 15 + src/types/descriptions.d.ts | 1 + .../purchasereceiptRecordMain.data.ts | 2 +- .../purchasereceiptRecordMain.data.ts | 2 +- .../purchasereceiptJobMain.data.ts | 2 +- .../purchasereceiptRecordMain.data.ts | 2 +- .../purchasereceiptRequestMain.data.ts | 2 +- .../purchasereceiptRecordMain.data.ts | 2 +- .../purchasereceiptJobMain.data.ts | 2 +- .../purchasereceiptRecordMain.data.ts | 2 +- .../purchasereceiptRequestMain.data.ts | 2 +- .../purchaseMain/purchaseMain.data.ts | 616 +++---- .../purchasePlanMain/purchasePlanMain.data.ts | 757 ++++---- .../supplierdeliverRecordMain/index.vue | 1 + .../supplierdeliverRecordMain.data.ts | 302 ++- .../supplierdeliverRequestMain/index.vue | 16 +- .../supplierdeliverRequestMain/labelForm.vue | 30 +- .../supplierdeliverRequestMain.data.ts | 1621 ++++++++--------- .../purchasereceiptJobMain.data.ts | 2 +- .../purchasereceiptRecordMain.data.ts | 2 +- .../purchasereceiptRequestMain.data.ts | 2 +- 21 files changed, 1699 insertions(+), 1684 deletions(-) diff --git a/src/components/Descriptions/src/Descriptions.vue b/src/components/Descriptions/src/Descriptions.vue index ca9f37c87..98488d09a 100644 --- a/src/components/Descriptions/src/Descriptions.vue +++ b/src/components/Descriptions/src/Descriptions.vue @@ -38,6 +38,7 @@ const props = defineProps({ default: () => ({}) } }) +const schema = ref(props.schema) const { getPrefixCls } = useDesign() @@ -82,6 +83,20 @@ const showAll = () =>{ isShow.value = !isShow.value } + +// 默认排序 +const updateSort = (val) => { + console.log(999,val) + val.forEach(item=>{ + if(!item.sortDetailDefault){ + item.sortDetailDefault = 999 // 默认999 + } + }) + val.sort((column1,column2)=>{ + return column1.sortDetailDefault - column2.sortDetailDefault + }) +} +updateSort(schema.value) diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRecordMain/index.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRecordMain/index.vue index 6754f0406..22d7869cc 100644 --- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRecordMain/index.vue +++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRecordMain/index.vue @@ -42,7 +42,7 @@ diff --git a/src/views/wms/supplierManage/purchaseClaim/purchaseClaimRecord/index.vue b/src/views/wms/supplierManage/purchaseClaim/purchaseClaimRecord/index.vue index 6b1f47fce..e92dca74d 100644 --- a/src/views/wms/supplierManage/purchaseClaim/purchaseClaimRecord/index.vue +++ b/src/views/wms/supplierManage/purchaseClaim/purchaseClaimRecord/index.vue @@ -40,7 +40,7 @@ diff --git a/src/views/wms/supplierManage/supplierApbalance/supplierApbalanceMain/index.vue b/src/views/wms/supplierManage/supplierApbalance/supplierApbalanceMain/index.vue index 459b3230b..cabf4f58c 100644 --- a/src/views/wms/supplierManage/supplierApbalance/supplierApbalanceMain/index.vue +++ b/src/views/wms/supplierManage/supplierApbalance/supplierApbalanceMain/index.vue @@ -33,7 +33,10 @@ diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/index.vue b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/index.vue index 8b9b6d9a1..cf8c8e0a3 100644 --- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/index.vue +++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/index.vue @@ -39,7 +39,10 @@ {{ row.differencePrice }} diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue index fc058e78a..030de7e73 100644 --- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue +++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue @@ -47,7 +47,7 @@ }} From a90161a7897d212fc9bce3425a123d186497748f Mon Sep 17 00:00:00 2001 From: zhang_li <2235006734@qqq.com> Date: Fri, 13 Dec 2024 16:17:52 +0800 Subject: [PATCH 075/213] =?UTF-8?q?=E9=A1=BA=E5=BA=8F=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/Table/src/Table.vue | 2 +- .../supplierdeliverRequestMain.data.ts | 35 ++++++++++++++++++- 2 files changed, 35 insertions(+), 2 deletions(-) diff --git a/src/components/Table/src/Table.vue b/src/components/Table/src/Table.vue index d65bb32e7..0f44e08bb 100644 --- a/src/components/Table/src/Table.vue +++ b/src/components/Table/src/Table.vue @@ -352,7 +352,7 @@ export default defineComponent({ } } //默认排序 - // updateSort(columns) + updateSort(columns) return [...[renderTableExpand()], ...[renderTableSelection()]].concat( (columnsChildren || columns).map((v) => { const zhName = v.label || '';//中文名称 diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts index 578e91c21..4a2e5ba04 100644 --- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts +++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts @@ -661,6 +661,37 @@ export const SupplierdeliverRequestMain = useCrudSchemas(reactive( // } // } // }, + { + label: '到货时间', + field: 'arriveTime', + formatter: dateFormatter2, + detail: { + dateFormat: 'YYYY-MM-DD hh:mm:ss' + }, + sort: 'custom', + hiddenInMain: true, + table: { + width: 180 + }, + isForm: false, + isTable: false, + form: { + component: 'DatePicker', + componentProps: { + style: { width: '100%' }, + type: 'date', + dateFormat: 'YYYY-MM-DD', + valueFormat: 'x', + } + }, + + isTableForm: false, + tableForm: { + type: 'FormDate', + dateFormat: 'YYYY-MM-DD', + valueFormat: 'x', + } + }, { label: '操作', field: 'action', @@ -927,7 +958,7 @@ export const SupplierdeliverRequestDetail = useCrudSchemas(reactive Date: Fri, 13 Dec 2024 17:13:10 +0800 Subject: [PATCH 076/213] =?UTF-8?q?YT-1666=E4=BE=9B=E5=BA=94=E5=95=86?= =?UTF-8?q?=E5=8F=91=E8=B4=A7=E7=94=B3=E8=AF=B7=EF=BC=8C=E7=94=9F=E6=88=90?= =?UTF-8?q?=E6=A0=87=E7=AD=BE=EF=BC=8C=E5=8F=91=E8=B4=A7=E6=A0=87=E5=8C=85?= =?UTF-8?q?=E6=95=B0=E9=87=8F=E6=B2=A1=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../supplierdeliver/supplierdeliverRequestMain/index.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue index ff07da0b7..32cf5acde 100644 --- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue +++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue @@ -748,7 +748,7 @@ const getGenerateLabelList = async (row) => { } if (item.convertRate==0 || item.convertRate == 1) { item.balanceQty = item.qty - item.purchaseStdQty = row.packQty + item.purchaseStdQty = item.packQty } else { item.balanceQty = parseFloat(Decimal(item.qty).mul(Decimal(item.convertRate)).toNumber().toFixed(5)) item.purchaseStdQty = parseFloat(Decimal(parseFloat(item.packQty)).div(Decimal(parseFloat(item.convertRate))).toNumber()) From 6ae0aabb12dee86dc13ccc110e5b1c45d09612ba Mon Sep 17 00:00:00 2001 From: songguoqiang <765017469@qq.com> Date: Fri, 13 Dec 2024 17:45:22 +0800 Subject: [PATCH 077/213] =?UTF-8?q?=E6=89=B9=E6=AC=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../supplierdeliverRequestMain.data.ts | 28 +++++++++---------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts index 4a2e5ba04..fd5101ebe 100644 --- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts +++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts @@ -947,6 +947,20 @@ export const SupplierdeliverRequestDetail = useCrudSchemas(reactive Date: Fri, 13 Dec 2024 22:44:33 +0800 Subject: [PATCH 078/213] =?UTF-8?q?=E5=BA=93=E5=AD=98=E4=BD=99=E9=A2=9D?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../wms/supplierdeliverRecordDetail/index.ts | 12 +++++++++++ .../purchasePackage/purchasePackage.data.ts | 2 +- .../inventoryManage/balance/balance.data.ts | 20 +++++++++++++++++++ 3 files changed, 33 insertions(+), 1 deletion(-) diff --git a/src/api/wms/supplierdeliverRecordDetail/index.ts b/src/api/wms/supplierdeliverRecordDetail/index.ts index 2efc8aa17..7ddd52e08 100644 --- a/src/api/wms/supplierdeliverRecordDetail/index.ts +++ b/src/api/wms/supplierdeliverRecordDetail/index.ts @@ -95,4 +95,16 @@ export const queryChildPickingNumber = async (params) => { } else { return await request.get({ url: `/wms/supplierdeliver-record-detail/queryChildPickingNumberPage`, params }) } +} + +// 查询供应商发货记录 +// 查询供应商发货记录子列表 +export const getSupplierdeliverRecordDetailPageWMS = async (params) => { + if (params.isSearch) { + delete params.isSearch + const data = {...params} + return await request.post({ url: '/wms/supplierdeliver-record-detail/seniorWMS', data }) + } else { + return await request.get({ url: `/wms/supplierdeliver-record-detail/pageWMS`, params }) + } } \ No newline at end of file diff --git a/src/views/wms/basicDataManage/labelManage/purchasePackage/purchasePackage.data.ts b/src/views/wms/basicDataManage/labelManage/purchasePackage/purchasePackage.data.ts index a179c6b71..e6641c733 100644 --- a/src/views/wms/basicDataManage/labelManage/purchasePackage/purchasePackage.data.ts +++ b/src/views/wms/basicDataManage/labelManage/purchasePackage/purchasePackage.data.ts @@ -636,7 +636,7 @@ export const PackageInventory = useCrudSchemas(reactive([ searchField: 'asnNumber', searchTitle: '发货信息', searchAllSchemas: allSchemas.value, - searchPage: SupplierdeliverRecordDetailApi.getSupplierdeliverRecordDetailPage, + searchPage: SupplierdeliverRecordDetailApi.getSupplierdeliverRecordDetailPageWMS, searchCondition: [ { key: 'supplierCode', diff --git a/src/views/wms/inventoryManage/balance/balance.data.ts b/src/views/wms/inventoryManage/balance/balance.data.ts index bbdfff2e7..57e7551dc 100644 --- a/src/views/wms/inventoryManage/balance/balance.data.ts +++ b/src/views/wms/inventoryManage/balance/balance.data.ts @@ -30,6 +30,15 @@ export const Balance = useCrudSchemas( }, isSearch: true }, + { + label: '背番', + field: 'backNumber', + sort: 'custom', + table: { + width: 150 + }, + isSearch: true + }, { label: '物料描述1', field: 'itemDesc1', @@ -431,6 +440,17 @@ export const Balance = useCrudSchemas( width: 150 } }, + { + label: '供应商代码', + field: 'supplierCode', + sort: 'custom', + table: { + width: 150 + }, + isForm: false, + isTable: false, + isSearch: true + }, { label: '创建时间', field: 'createTime', From 27920d5a6a044fbb316b4692505db04841dfce82 Mon Sep 17 00:00:00 2001 From: "YEJIAXING-PC\\lenovo" <591141169@qq.com> Date: Fri, 13 Dec 2024 22:59:26 +0800 Subject: [PATCH 079/213] =?UTF-8?q?=E5=BA=93=E5=AD=98=E4=BD=99=E9=A2=9D?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/wms/inventoryManage/balance/balance.data.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/src/views/wms/inventoryManage/balance/balance.data.ts b/src/views/wms/inventoryManage/balance/balance.data.ts index 57e7551dc..0a0ee9d66 100644 --- a/src/views/wms/inventoryManage/balance/balance.data.ts +++ b/src/views/wms/inventoryManage/balance/balance.data.ts @@ -37,6 +37,7 @@ export const Balance = useCrudSchemas( table: { width: 150 }, + hiddenSearchHigh: true,// 高级筛选中隐藏 isSearch: true }, { From 62d58e68e009a14c6d48d64b69bc088d9e9bf38d Mon Sep 17 00:00:00 2001 From: zhang_li <2235006734@qqq.com> Date: Sat, 14 Dec 2024 08:51:20 +0800 Subject: [PATCH 080/213] =?UTF-8?q?YT-1665=E8=A6=81=E8=B4=A7=E8=AE=A1?= =?UTF-8?q?=E5=88=92=E5=88=9B=E5=BB=BA=E4=BE=9B=E5=BA=94=E5=95=86=E5=8F=91?= =?UTF-8?q?=E8=B4=A7=E7=94=B3=E8=AF=B7=E6=97=B6=EF=BC=8C=E7=9B=AE=E5=89=8D?= =?UTF-8?q?=E2=80=98=E7=94=B3=E8=AF=B7=E5=8F=91=E8=B4=A7=E6=95=B0=E9=87=8F?= =?UTF-8?q?=E2=80=99=E5=8F=AF=E4=BF=AE=E6=94=B9=EF=BC=8C=E6=93=8D=E4=BD=9C?= =?UTF-8?q?=E5=88=97=E6=98=BE=E7=A4=BA=E2=80=98=E5=88=A0=E9=99=A4=E2=80=99?= =?UTF-8?q?=E6=8C=89=E9=92=AE=EF=BC=9B=E6=94=B9=E4=B8=BA=E2=80=98=E7=94=B3?= =?UTF-8?q?=E8=AF=B7=E5=8F=91=E8=B4=A7=E6=95=B0=E9=87=8F=E2=80=99=E5=8F=AA?= =?UTF-8?q?=E8=AF=BB=EF=BC=8C=E4=B8=8D=E6=98=BE=E7=A4=BA=E2=80=98=E5=88=A0?= =?UTF-8?q?=E9=99=A4=E2=80=99=E6=8C=89=E9=92=AE=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../supplierdeliverRequestMain/supplierdeliverBasicForm.vue | 3 ++- .../supplierdeliverRequestMain.data.ts | 6 ++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverBasicForm.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverBasicForm.vue index 25801304a..7051eea7d 100644 --- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverBasicForm.vue +++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverBasicForm.vue @@ -17,7 +17,8 @@ :isBusiness="true" @handleAddTable="handleAddTable" @handleDeleteTable="handleDeleteTable" - :isShowReduceButtonSelection="true" + :isShowReduceButtonSelection="false" + :isShowReduceButton="false" @tableSelectionDelete="tableSelectionDelete" @searchTableSuccess="searchTableSuccess" @submitForm="submitForm" diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts index fd5101ebe..83a4c317b 100644 --- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts +++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts @@ -1012,13 +1012,15 @@ export const SupplierdeliverRequestDetail = useCrudSchemas(reactive Date: Sat, 14 Dec 2024 09:51:47 +0800 Subject: [PATCH 081/213] =?UTF-8?q?YT-1667=E3=80=90=E9=87=87=E8=B4=AD?= =?UTF-8?q?=E6=8D=A2=E8=B4=A7=E7=94=B3=E8=AF=B7=E3=80=91=E3=80=90=E9=87=87?= =?UTF-8?q?=E8=B4=AD=E6=8D=A2=E8=B4=A7=E8=AE=B0=E5=BD=95=E3=80=91=E5=88=97?= =?UTF-8?q?=E8=A1=A8=E6=95=B0=E6=8D=AE=E5=8F=8A=E5=AF=BC=E5=87=BA=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2=E5=BA=94=E8=AF=A5=E6=98=BE=E7=A4=BA=E5=88=9B=E5=BB=BA?= =?UTF-8?q?=E8=80=85=E3=80=81=E5=88=9B=E5=BB=BA=E6=97=B6=E9=97=B4=E3=80=81?= =?UTF-8?q?=E6=9C=80=E5=90=8E=E6=9B=B4=E6=96=B0=E8=80=85=E3=80=81=E6=9C=80?= =?UTF-8?q?=E5=90=8E=E6=9B=B4=E6=96=B0=E6=97=B6=E9=97=B4=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../purchaseBarterRecordMain.data.ts | 18 +++++++++++------- .../purchaseBarterRequestMain.data.ts | 15 ++++++++------- 2 files changed, 19 insertions(+), 14 deletions(-) diff --git a/src/views/wms/purchasereceiptManage/purchaseBarter/purchaseBarterRecord/purchaseBarterRecordMain.data.ts b/src/views/wms/purchasereceiptManage/purchaseBarter/purchaseBarterRecord/purchaseBarterRecordMain.data.ts index 0d5105240..7d114bc29 100644 --- a/src/views/wms/purchasereceiptManage/purchaseBarter/purchaseBarterRecord/purchaseBarterRecordMain.data.ts +++ b/src/views/wms/purchasereceiptManage/purchaseBarter/purchaseBarterRecord/purchaseBarterRecordMain.data.ts @@ -65,7 +65,7 @@ export const PurchaseBarterRecordMain = useCrudSchemas(reactive([ } }, isSearch: true, - isTable:false, + isTable: true, search: { component: 'DatePicker', componentProps: { @@ -73,7 +73,8 @@ export const PurchaseBarterRecordMain = useCrudSchemas(reactive([ type: 'daterange', defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')] } - } + }, + sortTableDefault: 1000, }, { label: '创建者', @@ -82,7 +83,8 @@ export const PurchaseBarterRecordMain = useCrudSchemas(reactive([ width: 130 }, isForm: false, - isTable: false, + isTable: true, + sortTableDefault: 1000, }, { label: '最后更新时间', @@ -90,7 +92,7 @@ export const PurchaseBarterRecordMain = useCrudSchemas(reactive([ sort: 'custom', isDetail: true, isForm: false, - isTable: false, + isTable: true, formatter: dateFormatter, detail: { dateFormat: 'YYYY-MM-DD HH:mm:ss' @@ -106,17 +108,19 @@ export const PurchaseBarterRecordMain = useCrudSchemas(reactive([ dateFormat: 'YYYY-MM-DD HH:mm:ss', valueFormat: 'x' } - } + }, + sortTableDefault: 1000, }, { label: '最后更新者', field: 'updater', isDetail: true, isForm: false, - isTable: false, + isTable: true, table: { width: 150 - } + }, + sortTableDefault: 1000, }, ])) diff --git a/src/views/wms/purchasereceiptManage/purchaseBarter/purchaseBarterRequest/purchaseBarterRequestMain.data.ts b/src/views/wms/purchasereceiptManage/purchaseBarter/purchaseBarterRequest/purchaseBarterRequestMain.data.ts index a65a0fff4..65a8fab59 100644 --- a/src/views/wms/purchasereceiptManage/purchaseBarter/purchaseBarterRequest/purchaseBarterRequestMain.data.ts +++ b/src/views/wms/purchasereceiptManage/purchaseBarter/purchaseBarterRequest/purchaseBarterRequestMain.data.ts @@ -96,7 +96,7 @@ export const PurchaseBarterRequestMain = useCrudSchemas(reactive([ } }, isSearch: true, - isTable: false, + search: { component: 'DatePicker', componentProps: { @@ -104,7 +104,8 @@ export const PurchaseBarterRequestMain = useCrudSchemas(reactive([ type: 'daterange', defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')] } - } + }, + sortTableDefault: 1000, }, { label: '创建者', @@ -113,7 +114,7 @@ export const PurchaseBarterRequestMain = useCrudSchemas(reactive([ width: 130 }, isForm: false, - isTable: false, + sortTableDefault: 1000, }, { label: '最后更新时间', @@ -121,7 +122,6 @@ export const PurchaseBarterRequestMain = useCrudSchemas(reactive([ sort: 'custom', isDetail: true, isForm: false, - isTable: false, formatter: dateFormatter, detail: { dateFormat: 'YYYY-MM-DD HH:mm:ss' @@ -137,17 +137,18 @@ export const PurchaseBarterRequestMain = useCrudSchemas(reactive([ dateFormat: 'YYYY-MM-DD HH:mm:ss', valueFormat: 'x' } - } + }, + sortTableDefault: 1000, }, { label: '最后更新者', field: 'updater', isDetail: true, isForm: false, - isTable: false, table: { width: 150 - } + }, + sortTableDefault:1000, }, { label: '操作', From 9aa8a3b70f921bf47e1781486fa6e04df52d529a Mon Sep 17 00:00:00 2001 From: zhang_li <2235006734@qqq.com> Date: Sat, 14 Dec 2024 11:24:43 +0800 Subject: [PATCH 082/213] YT-1671YT-1671 --- .../purchaseMain/purchaseMain.data.ts | 36 +++++++++---------- 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/purchaseMain/purchaseMain.data.ts b/src/views/wms/purchasereceiptManage/supplierdeliver/purchaseMain/purchaseMain.data.ts index 560a34031..4d048092e 100644 --- a/src/views/wms/purchasereceiptManage/supplierdeliver/purchaseMain/purchaseMain.data.ts +++ b/src/views/wms/purchasereceiptManage/supplierdeliver/purchaseMain/purchaseMain.data.ts @@ -715,24 +715,24 @@ export const PurchaseDetail = useCrudSchemas(reactive([ // isForm: false, // isTable: false, // }, - // { - // label: t('ts.已计划数量'), - // field: 'plannedPurchaseQty', - // table: { - // width: 150 - // }, - // hiddenInMain:true, - // form: { - // component: 'InputNumber', - // componentProps: { - // min: 1, - // precision: 6 - // }, - // value: 1 - // }, - // isTableForm: false, - // isForm: false, - // }, + { + label: t('ts.已计划数量'), + field: 'plannedPurchaseQty', + table: { + width: 150 + }, + hiddenInMain:true, + form: { + component: 'InputNumber', + componentProps: { + min: 1, + precision: 6 + }, + value: 1 + }, + isTableForm: false, + isForm: false, + }, { label: t('ts.已发货数量'), field: 'shippedPurchaseQty', From 4c63a9b83572cd0cdd6b7e6015c1e22b0d7c7e76 Mon Sep 17 00:00:00 2001 From: zhang_li <2235006734@qqq.com> Date: Sat, 14 Dec 2024 11:30:42 +0800 Subject: [PATCH 083/213] =?UTF-8?q?YT-1670=E9=87=87=E8=B4=AD=E8=AE=A2?= =?UTF-8?q?=E5=8D=95=E5=88=97=E8=A1=A8=E5=92=8C=E6=98=8E=E7=BB=86=E8=A6=81?= =?UTF-8?q?=E6=98=BE=E7=A4=BA=E9=BB=98=E8=AE=A4=E6=94=B6=E8=B4=A7=E5=BA=93?= =?UTF-8?q?=E5=8C=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../purchaseMain/purchaseMain.data.ts | 40 +++++++++---------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/purchaseMain/purchaseMain.data.ts b/src/views/wms/purchasereceiptManage/supplierdeliver/purchaseMain/purchaseMain.data.ts index 4d048092e..a119b2923 100644 --- a/src/views/wms/purchasereceiptManage/supplierdeliver/purchaseMain/purchaseMain.data.ts +++ b/src/views/wms/purchasereceiptManage/supplierdeliver/purchaseMain/purchaseMain.data.ts @@ -686,6 +686,20 @@ export const PurchaseDetail = useCrudSchemas(reactive([ }, }, + + // { + // label: 'ERP库位', + // field: 'erpLocationCode', + // dictType : DICT_TYPE.ERP_LOCATION, + // dictClass: 'string', + // table: { + // width: 150 + // }, + // hiddenInMain:true, + // isTableForm: false, + // isForm: false, + // isTable: false, + // }, { label: '默认收货库区', field: 'defaultAreaCode', @@ -697,26 +711,12 @@ export const PurchaseDetail = useCrudSchemas(reactive([ disabled: true } }, - hiddenInMain: true, isTableForm: false, isForm: false, - isTable: false, + isTable: true, }, - // { - // label: 'ERP库位', - // field: 'erpLocationCode', - // dictType : DICT_TYPE.ERP_LOCATION, - // dictClass: 'string', - // table: { - // width: 150 - // }, - // hiddenInMain:true, - // isTableForm: false, - // isForm: false, - // isTable: false, - // }, { - label: t('ts.已计划数量'), + label: '已计划采购数量', field: 'plannedPurchaseQty', table: { width: 150 @@ -734,7 +734,7 @@ export const PurchaseDetail = useCrudSchemas(reactive([ isForm: false, }, { - label: t('ts.已发货数量'), + label: '已发货采购数量', field: 'shippedPurchaseQty', table: { width: 150 @@ -752,7 +752,7 @@ export const PurchaseDetail = useCrudSchemas(reactive([ isForm: false, }, { - label: t('ts.已收货数量'), + label: '已收货采购数量', field: 'receivedPurchaseQty', table: { width: 150 @@ -770,7 +770,7 @@ export const PurchaseDetail = useCrudSchemas(reactive([ isForm: false }, { - label: t('ts.已退货数量'), + label:'已退货采购数量', field: 'returnedPurchaseQty', table: { width: 150 @@ -788,7 +788,7 @@ export const PurchaseDetail = useCrudSchemas(reactive([ isForm: false }, { - label: t('ts.已上架数量'), + label: "已上架采购数量", field: 'putawayPurchaseQty', table: { width: 150 From 250721d8b18c54c0d26e3c4bd54920531b15a73d Mon Sep 17 00:00:00 2001 From: zhang_li <2235006734@qqq.com> Date: Sat, 14 Dec 2024 11:39:40 +0800 Subject: [PATCH 084/213] =?UTF-8?q?YT-1669WMS=E4=B8=AD=E9=87=87=E8=B4=AD?= =?UTF-8?q?=E8=AE=A2=E5=8D=95=E8=8F=9C=E5=8D=95=E6=B2=A1=E6=9C=89=E6=8C=89?= =?UTF-8?q?=E7=85=A7=E9=9C=80=E6=B1=82=E8=BF=9B=E8=A1=8C=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../purchaseMainWms/purchaseMain.data.ts | 746 +++++++++--------- 1 file changed, 367 insertions(+), 379 deletions(-) diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/purchaseMainWms/purchaseMain.data.ts b/src/views/wms/purchasereceiptManage/supplierdeliver/purchaseMainWms/purchaseMain.data.ts index e3cf86b8e..b5d8f8c55 100644 --- a/src/views/wms/purchasereceiptManage/supplierdeliver/purchaseMainWms/purchaseMain.data.ts +++ b/src/views/wms/purchasereceiptManage/supplierdeliver/purchaseMainWms/purchaseMain.data.ts @@ -1,5 +1,5 @@ import type { CrudSchema } from '@/hooks/web/useCrudSchemas' -import { dateFormatter,dateFormatter2 } from '@/utils/formatTime' +import { dateFormatter, dateFormatter2 } from '@/utils/formatTime' import * as SupplierApi from '@/api/wms/supplier' import { Supplier } from '@/views/wms/basicDataManage/supplierManage/supplier/supplier.data' import * as SupplieritemApi from '@/api/wms/supplieritem' @@ -17,11 +17,33 @@ export const PurchaseMain = useCrudSchemas(reactive([ sort: 'custom', isSearch: true, isForm: false, + sortTableDefault: 1, table: { width: 180, fixed: 'left' }, }, + { + label: '状态', + field: 'status', + dictType: DICT_TYPE.PURCHASE_ORDER_STATUS, + dictClass: 'string', + isTable: true, + isForm: false, + isSearch: true, + sortSearchDefault: 1000, + sortTableDefault: 2, + sort: 'custom', + table: { + width: 150 + }, + form: { + value: '1', + componentProps: { + disabled: true + } + } + }, { label: '供应商代码', field: 'supplierCode', @@ -54,54 +76,50 @@ export const PurchaseMain = useCrudSchemas(reactive([ isFormModel: true }], // 失去焦点校验参数 } - } - }, - { - label: '订单类型', - field: 'type', - dictType: DICT_TYPE.PURCHASE_ORDER_TYPE, - dictClass: 'string', - isTable: true, - isSearch: true, - sort: 'custom', - table: { - width: 150 }, + sortTableDefault: 3, }, { - label: '行类型', - field: 'poLineType', + label: '供应商名称', + field: 'supplierName', + dictClass: 'string', isTable: true, - isSearch: true, + isSearch: false, + isForm: false, sort: 'custom', + sortTableDefault: 4, table: { width: 150 }, }, { - label: '状态', - field: 'status', - dictType: DICT_TYPE.PURCHASE_ORDER_STATUS, + label: '订单类型', + field: 'type', + dictType: DICT_TYPE.PURCHASE_ORDER_TYPE, dictClass: 'string', isTable: true, - isForm:false, isSearch: true, - sortSearchDefault:1000, sort: 'custom', + sortTableDefault: 5, table: { width: 150 }, - form: { - value: '1', - componentProps: { - disabled: true - } - } }, + // { + // label: '行类型', + // field: 'poLineType', + // isTable: false, + // isSearch: true, + // sort: 'custom', + // table: { + // width: 150 + // }, + // }, + { label: '订单日期', field: 'orderDate', - isTable: true, + isTable: false, formatter: dateFormatter2, detail: { dateFormat: 'YYYY-MM-DD' @@ -110,10 +128,11 @@ export const PurchaseMain = useCrudSchemas(reactive([ table: { width: 180 }, + sortTableDefault: 6, form: { component: 'DatePicker', componentProps: { - style: {width: '100%'}, + style: { width: '100%' }, type: 'date', dateFormat: 'YYYY-MM-DD', valueFormat: 'x', @@ -127,23 +146,33 @@ export const PurchaseMain = useCrudSchemas(reactive([ isTable: false, isForm: false, formatter: dateFormatter2, - detail:{ + detail: { dateFormat: 'YYYY-MM-DD' }, sort: 'custom', table: { width: 180 }, + sortTableDefault: 7, form: { component: 'DatePicker', componentProps: { - style: {width: '100%'}, + style: { width: '100%' }, type: 'date', dateFormat: 'YYYY-MM-DD', valueFormat: 'x', } }, }, + { + label: '版本', + field: 'version', + sort: 'custom', + isTable: false, + table: { + width: 150 + }, + }, { label: '税率', field: 'taxRate', @@ -151,10 +180,11 @@ export const PurchaseMain = useCrudSchemas(reactive([ table: { width: 150 }, + isTable: false, form: { component: 'InputNumber', componentProps: { - style: {width:'100%'}, + style: { width: '100%' }, min: 0, max: 1, precision: 6, @@ -162,52 +192,41 @@ export const PurchaseMain = useCrudSchemas(reactive([ } }, { - label: '订单备注', - field: 'poRmks', + label: '支付周期', + field: 'paymentCycle', sort: 'custom', - isTable:true, - isForm:false, + isTable: false, + isForm: false, table: { width: 150 }, }, - { - label: '管理编号', - field: 'poContract', + label: '联系人姓名', + field: 'contactName', sort: 'custom', - isTable:true, - isForm:false, + isTable: false, table: { width: 150 }, }, { - label: '版本', - field: 'version', + label: '联系人电话', + field: 'contactPhone', sort: 'custom', - isTable:false, + isTable: false, table: { width: 150 }, }, { - label: '当前阶段', - field: 'currentStage', + label: '联系人电子邮件', + field: 'contactEmail', sort: 'custom', + isTable: false, table: { width: 150 }, - form: { - component: 'InputNumber', - componentProps: { - style: {width:'100%'}, - min: 0 - } - }, - isTableForm: false, - isForm: false, - isTable:false, }, { label: '是否寄存订单', @@ -219,7 +238,7 @@ export const PurchaseMain = useCrudSchemas(reactive([ table: { width: 150 }, - isForm:false, + isForm: false, form: { component: 'Switch', value: 'TRUE', @@ -230,54 +249,27 @@ export const PurchaseMain = useCrudSchemas(reactive([ }, }, { - label: '是否可用', - field: 'available', - dictType: DICT_TYPE.TRUE_FALSE, - dictClass: 'string', - isTable: false, - sort: 'custom', - table: { - width: 150 - }, - isForm:false, - form: { - component: 'Switch', - value: 'TRUE', - componentProps: { - inactiveValue: 'FALSE', - activeValue: 'TRUE', - disabled: true - } - }, - }, - { - label: '联系人姓名', - field: 'contactName', - sort: 'custom', - isTable:false, - table: { - width: 150 - }, - }, - { - label: '联系人电话', - field: 'contactPhone', + label: '订单备注', + field: 'poRmks', sort: 'custom', - isTable:false, + isTable: false, + isForm: false, table: { width: 150 }, }, + { - label: '联系人电子邮件', - field: 'contactEmail', + label: '管理编号', + field: 'poContract', sort: 'custom', - isTable:false, + isTable: true, + isForm: false, table: { width: 150 }, }, - + { label: '业务类型', field: 'businessType', @@ -294,20 +286,52 @@ export const PurchaseMain = useCrudSchemas(reactive([ } } }, + + { + label: '数据来源区分', + field: 'dataSource', + sort: 'custom', + table: { + width: 150 + }, + isForm: false, + isTable: false, + form: { + } + }, + // { + // label: '当前阶段', + // field: 'currentStage', + // sort: 'custom', + // table: { + // width: 150 + // }, + // form: { + // component: 'InputNumber', + // componentProps: { + // style: {width:'100%'}, + // min: 0 + // } + // }, + // isTableForm: false, + // isForm: false, + // isTable:false, + // }, { label: '创建者', field: 'creator', sort: 'custom', isForm: false, - isTable:false, + isTable: true, table: { width: 150 }, + sortTableDefault: 1000, }, { label: '创建时间', field: 'createTime', - isTable:false, + isTable: true, formatter: dateFormatter, detail: { dateFormat: 'YYYY-MM-DD HH:mm:ss' @@ -320,7 +344,7 @@ export const PurchaseMain = useCrudSchemas(reactive([ form: { component: 'DatePicker', componentProps: { - style: {width:'100%'}, + style: { width: '100%' }, type: 'datetime', dateFormat: 'YYYY-MM-DD HH:mm:ss', valueFormat: 'x', @@ -335,48 +359,17 @@ export const PurchaseMain = useCrudSchemas(reactive([ defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')] } }, + sortTableDefault: 1000, }, - { - label: '最后更新者', - field: 'updater', - sort: 'custom', - isForm: false, - isTable:false, - table: { - width: 150 - }, - }, - { - label: '最后更新时间', - field: 'updateTime', - isTable: false, - formatter: dateFormatter, - detail: { - dateFormat: 'YYYY-MM-DD HH:mm:ss' - }, - sort: 'custom', - isForm: false, - table: { - width: 180 - }, - form: { - component: 'DatePicker', - componentProps: { - style: {width:'100%'}, - type: 'datetime', - dateFormat: 'YYYY-MM-DD HH:mm:ss', - valueFormat: 'x', - } - }, - }, - { - label: '备注', - field: 'remark', - isTable: false, - table: { - width: 150 - }, - }, + + // { + // label: '备注', + // field: 'remark', + // isTable: false, + // table: { + // width: 150 + // }, + // }, { label: '操作', field: 'action', @@ -394,7 +387,7 @@ export const PurchaseMainRules = reactive({ supplierCode: [ { required: true, message: '请输入供应商代码', trigger: 'change' } ], - type: [ + type: [ { required: true, message: '请选择订单类型', trigger: 'change' } ], status: [ @@ -403,27 +396,27 @@ export const PurchaseMainRules = reactive({ orderDate: [ { required: true, message: '请输入订单日期', trigger: 'change' } ], - taxRate: [ + taxRate: [ { required: true, message: '请输入税率', trigger: 'blur' } ], - version: [ + version: [ { max: 50, message: '不得超过50个字符', trigger: 'blur' } ], - contactName: [ + contactName: [ { max: 50, message: '不得超过50个字符', trigger: 'blur' } ], - contactPhone: [ + contactPhone: [ { max: 50, message: '不得超过50个字符', trigger: 'blur' }, - { validator:validateHanset, message: '请输入正确的手机号', trigger: 'blur'} + { validator: validateHanset, message: '请输入正确的手机号', trigger: 'blur' } ], - contactEmail: [ + contactEmail: [ { max: 50, message: '不得超过50个字符', trigger: 'blur' }, - { validator:validateEmail, message: '请输入正确的邮箱格式', trigger: 'blur'} + { validator: validateEmail, message: '请输入正确的邮箱格式', trigger: 'blur' } ], - remark: [ + remark: [ { max: 50, message: '不得超过50个字符', trigger: 'blur' } ], - available: [ + available: [ { required: true, message: '请选择是否可用', trigger: 'change' } ], }) @@ -432,41 +425,27 @@ export const PurchaseMainRules = reactive({ * @returns {Array} 采购订单子表 */ export const PurchaseDetail = useCrudSchemas(reactive([ - { - label: '单据号', - field: 'number', - isTableForm: false, - hiddenInMain:true, - table: { - width: 180 - }, - form: { - componentProps: { - disabled: true - } - } - }, { label: '行号', field: 'lineNumber', table: { width: 150 }, - tableForm:{ - disabled:true, + tableForm: { + disabled: true, isSearchList: true, // 开启查询弹窗 } }, { - label: '物料代码', + label: '品番', field: 'itemCode', isSearch: true, table: { width: 150 }, - tableForm:{ - disabled:true, - multiple:true,//多选 + tableForm: { + disabled: true, + multiple: true,//多选 isInpuFocusShow: true, searchListPlaceholder: '请选择供应商物料', searchField: 'itemCode', @@ -474,16 +453,16 @@ export const PurchaseDetail = useCrudSchemas(reactive([ searchAllSchemas: Supplieritem.allSchemas, searchPage: SupplieritemApi.selectItembasicTypeToSupplieritem, searchCondition: [{ - key:'supplierCode', - value:'supplierCode', + key: 'supplierCode', + value: 'supplierCode', message: '请填写供应商代码！', isMainValue: true - },{ + }, { key: 'available', value: 'TRUE', isMainValue: false - }], - verificationPage: SupplieritemApi.getSupplierItemListByCodes, // tableForm下方输入框校验失去焦点之后是否正确的方法 + }], + verificationPage: SupplieritemApi.getSupplierItemListByCodes, // tableForm下方输入框校验失去焦点之后是否正确的方法 isShowTableFormSearch: true, //tableForm下方是否出现输入框 isRepeat: true,//tableForm下方输入框是否可以重复添加该条数据 // 失去焦点校验参数 @@ -504,16 +483,16 @@ export const PurchaseDetail = useCrudSchemas(reactive([ searchField: 'itemCode', searchTitle: '供应商物料信息', searchAllSchemas: Supplieritem.allSchemas, - searchPage: SupplieritemApi.selectItembasicTypeToSupplieritem, - searchCondition: [{ - key:'supplierCode', - value:'supplierCode', - message: '请填写供应商代码！', - isMainValue: true - },{ - key: 'available', - value: 'TRUE', - isMainValue: false + searchPage: SupplieritemApi.selectItembasicTypeToSupplieritem, + searchCondition: [{ + key: 'supplierCode', + value: 'supplierCode', + message: '请填写供应商代码！', + isMainValue: true + }, { + key: 'available', + value: 'TRUE', + isMainValue: false }], // 失去焦点校验参数 verificationParams: [{ @@ -527,29 +506,18 @@ export const PurchaseDetail = useCrudSchemas(reactive([ } } }, - { - label: '计量单位', - field: 'uom', - sort: 'custom', - dictType: DICT_TYPE.UOM, - dictClass: 'string', + { + label: '行类型', + field: 'poLineType', isTable: true, - isTableForm:true, - form:{ - componentProps: { - disabled:true - } - }, - tableForm:{ - disabled: true, - type:'Select', - }, + isSearch: false, + sort: 'custom', table: { width: 150 }, - }, + }, { - label: '订单数量', + label: '采购订单数量', field: 'orderQty', table: { width: 150 @@ -557,68 +525,86 @@ export const PurchaseDetail = useCrudSchemas(reactive([ form: { component: 'InputNumber', componentProps: { - disabled:false, + disabled: false, min: 1, precision: 6 } }, tableForm: { - disabled:false, - hidden:false, + disabled: false, + hidden: false, type: 'InputNumber', min: 1, precision: 6 }, }, { - label: '默认收货库区', - field: 'defaultAreaCode', + label: '采购标包数量', + field: 'purchaseStdQty', table: { width: 150 }, - isTableForm: false, - isForm: false, - isTable: true, + form: { + component: 'InputNumber', + componentProps: { + disabled: false, + min: 1, + precision: 6 + } + }, + hiddenInMain: true, + tableForm: { + disabled: false, + hidden: false, + type: 'InputNumber', + min: 1, + precision: 6 + }, }, { - label: '库区描述', - field: 'areaDescription', + label: '采购计量单位', + field: 'purchaseStdUom', + sort: 'custom', + dictType: DICT_TYPE.UOM, + dictClass: 'string', + isTable: true, + isTableForm: true, + form: { + componentProps: { + disabled: true + } + }, + tableForm: { + disabled: true, + type: 'Select', + }, table: { width: 150 }, - isTableForm: false, - isForm: false, - isTable: true, }, - // { - // label: 'ERP库位', - // field: 'erpLocationCode', - // dictType : DICT_TYPE.ERP_LOCATION, - // dictClass: 'string', - // table: { - // width: 150 - // }, - // hiddenInMain:true, - // isTableForm: false, - // isForm: false, - // }, { - label: '项目代码', - field: 'projectCode', + label: '转换率', + field: 'convertRate', + form: { + component: 'InputNumber', + componentProps: { + min: 0 + } + }, + hiddenInMain: true, table: { width: 150 }, - hiddenInMain:true, isTableForm: false, isForm: false, }, { - label: '包装数量', - field: 'packQty', - hiddenInMain:true, + label: t('ts.单价'), + field: 'singlePrice', table: { width: 150 }, + hiddenInMain: true, form: { component: 'InputNumber', componentProps: { @@ -627,25 +613,29 @@ export const PurchaseDetail = useCrudSchemas(reactive([ } }, isTableForm: false, - isForm: false, + isForm: false }, { - label: '包装规格', - hiddenInMain:true, - field: 'packUnit', - // dictType: DICT_TYPE.PACK_UNIT, - // dictClass: 'string', - isTable: true, + label: '金额', + field: 'amount', table: { width: 150 }, + hiddenInMain: true, + form: { + component: 'InputNumber', + componentProps: { + min: 1, + precision: 6 + } + }, isTableForm: false, - isForm: false, + isForm: false }, { - label: '供应商计量数量', - field: 'supplierQty', - hiddenInMain:true, + label: '库存标包数量', + field: 'packQty', + hiddenInMain: true, table: { width: 150 }, @@ -659,13 +649,14 @@ export const PurchaseDetail = useCrudSchemas(reactive([ isTableForm: false, isForm: false, }, + { - label: '供应商计量单位', - field: 'supplierUom', - dictType: DICT_TYPE.UOM, - dictClass: 'string', + label: '库存标包规格', + hiddenInMain: true, + field: 'packUnit', + // dictType: DICT_TYPE.PACK_UNIT, + // dictClass: 'string', isTable: true, - hiddenInMain:true, table: { width: 150 }, @@ -673,46 +664,64 @@ export const PurchaseDetail = useCrudSchemas(reactive([ isForm: false, }, { - label: '转换率', - field: 'convertRate', + label: '库存计量单位', + field: 'uom', + sort: 'custom', + dictType: DICT_TYPE.UOM, + dictClass: 'string', + isTable: true, + isTableForm: true, + hiddenInMain: true, form: { - component: 'InputNumber', componentProps: { - min: 0 + disabled: true } }, - hiddenInMain:true, - table: { + tableForm: { + disabled: true, + type: 'Select', + }, + table: { width: 150 }, - isTableForm: false, - isForm: false, }, + + // { - // label: t('ts.已计划数量'), - // field: 'plannedQty', + // label: 'ERP库位', + // field: 'erpLocationCode', + // dictType : DICT_TYPE.ERP_LOCATION, + // dictClass: 'string', // table: { // width: 150 // }, // hiddenInMain:true, - // form: { - // component: 'InputNumber', - // componentProps: { - // min: 1, - // precision: 6 - // }, - // value: 1 - // }, // isTableForm: false, // isForm: false, + // isTable: false, // }, { - label: t('ts.已发货数量'), - field: 'shippedQty', + label: '默认收货库区', + field: 'defaultAreaCode', + table: { + width: 150 + }, + form: { + componentProps: { + disabled: true + } + }, + isTableForm: false, + isForm: false, + isTable: true, + }, + { + label: '已计划采购数量', + field: 'plannedPurchaseQty', table: { width: 150 }, - hiddenInMain:true, + hiddenInMain: true, form: { component: 'InputNumber', componentProps: { @@ -725,30 +734,30 @@ export const PurchaseDetail = useCrudSchemas(reactive([ isForm: false, }, { - label: t('ts.已收货数量'), - field: 'receivedQty', + label: '已发货采购数量', + field: 'shippedPurchaseQty', table: { width: 150 }, - hiddenInMain:true, + hiddenInMain: true, form: { component: 'InputNumber', - value: 0, componentProps: { min: 1, precision: 6 - } + }, + value: 1 }, isTableForm: false, - isForm: false + isForm: false, }, { - label: t('ts.已退货数量'), - field: 'returnedQty', + label: '已收货采购数量', + field: 'receivedPurchaseQty', table: { width: 150 }, - hiddenInMain:true, + hiddenInMain: true, form: { component: 'InputNumber', value: 0, @@ -761,15 +770,15 @@ export const PurchaseDetail = useCrudSchemas(reactive([ isForm: false }, { - label: t('ts.已上架数量'), - field: 'putawayQty', + label: '已退货采购数量', + field: 'returnedPurchaseQty', table: { width: 150 }, - hiddenInMain:true, + hiddenInMain: true, form: { component: 'InputNumber', - value: 1, + value: 0, componentProps: { min: 1, precision: 6 @@ -779,14 +788,15 @@ export const PurchaseDetail = useCrudSchemas(reactive([ isForm: false }, { - label: t('ts.单价'), - field: 'singlePrice', + label: "已上架采购数量", + field: 'putawayPurchaseQty', table: { width: 150 }, - hiddenInMain:true, + hiddenInMain: true, form: { component: 'InputNumber', + value: 1, componentProps: { min: 1, precision: 6 @@ -795,115 +805,102 @@ export const PurchaseDetail = useCrudSchemas(reactive([ isTableForm: false, isForm: false }, + + { - label: '金额', - field: 'amount', + label: '库区描述', + field: 'areaDescription', table: { width: 150 }, - hiddenInMain:true, + hiddenInMain: true, form: { - component: 'InputNumber', componentProps: { - min: 1, - precision: 6 + disabled: true } }, isTableForm: false, - isForm: false + isForm: false, + isTable: false, }, + { - label: '是否可用', - field: 'available', - dictType: DICT_TYPE.TRUE_FALSE, - dictClass: 'string', - isTable: true, + label: '项目代码', + field: 'projectCode', table: { width: 150 }, - hiddenInMain:true, - tableForm:{ - type:'Select', - default: 'TRUE', - inactiveValue: 'FALSE', - activeValue: 'TRUE' + hiddenInMain: true, + isTableForm: false, + isForm: false, + isTable: false, + }, + + { + label: '供应商计量数量', + field: 'supplierQty', + hiddenInMain: true, + table: { + width: 150 }, form: { - component: 'Switch', - value: 'TRUE', + component: 'InputNumber', componentProps: { - inactiveValue: 'FALSE', - activeValue: 'TRUE' + min: 1, + precision: 6 } - } + }, + isTableForm: false, + isForm: false, + isTable: false, + }, + { + label: '供应商计量单位', + field: 'supplierUom', + dictType: DICT_TYPE.UOM, + dictClass: 'string', + isTable: false, + hiddenInMain: true, + table: { + width: 150 + }, + isTableForm: false, + isForm: false, }, + { label: '超收百分比', field: 'overReceivingPercent', table: { width: 150 }, - hiddenInMain:true, + hiddenInMain: true, form: { component: 'InputNumber', componentProps: { min: 0 } }, - isTable:false, - isTableForm:false, + isTable: false, + isTableForm: false, tableForm: { type: 'InputNumber', min: 0 } }, - { - label: '创建时间', - field: 'createTime', - isTable: true, - isTableForm: false, - formatter: dateFormatter, - detail: { - dateFormat: 'YYYY-MM-DD HH:mm:ss' - }, - table: { - width: 180 - }, - hiddenInMain:false, - isForm: false, - form: { - component: 'DatePicker', - componentProps: { - style: {width:'100%'}, - type: 'datetime', - dateFormat: 'YYYY-MM-DD HH:mm:ss', - valueFormat: 'x', - } - } - }, - { - label: '创建者', - field: 'creator', - isTableForm: false, - table: { - width: 150 - }, - hiddenInMain:false, - isForm: false, - }, // { - // label: '最后更新时间', - // field: 'updateTime', - // isTableForm: false, + // label: '创建时间', + // field: 'createTime', // isTable: true, - // hiddenInMain:false, + // isTableForm: false, // formatter: dateFormatter, // detail: { // dateFormat: 'YYYY-MM-DD HH:mm:ss' // }, // table: { - // width: 150 + // width: 180 // }, + // hiddenInMain:false, // isForm: false, // form: { // component: 'DatePicker', @@ -916,54 +913,45 @@ export const PurchaseDetail = useCrudSchemas(reactive([ // } // }, // { - // label: '最后更新者', - // field: 'updater', + // label: '创建者', + // field: 'creator', // isTableForm: false, // table: { // width: 150 // }, // hiddenInMain:false, // isForm: false, - // // form: { - // // component: 'DatePicker', - // // componentProps: { - // // style: {width:'100%'}, - // // type: 'datetime', - // // dateFormat: 'YYYY-MM-DD HH:mm:ss', - // // valueFormat: 'x', - // // } - // // } // }, { label: '备注', - hiddenInMain:true, + hiddenInMain: true, field: 'remark', table: { width: 150 }, + isTable: false, }, { label: '操作', - hiddenInMain:true, + hiddenInMain: true, field: 'action', isDetail: false, - isForm: false , - isTable: false , + isForm: false, table: { width: 150, fixed: 'right' }, - isTableForm:false, + isTableForm: false, } ])) //表单校验 export const PurchaseDetailRules = reactive({ lineNumber: [ - { required: true, message: '请输入行号', trigger: 'blur' }, + { required: true, message: '请输入行号', trigger: 'blur' }, // { max: 50, message: '不得超过50个字符', trigger: 'blur' } ], - packQty: [ + packQty: [ { required: true, message: '请输入包装数量', trigger: 'blur' } ], packUnit: [ @@ -972,40 +960,40 @@ export const PurchaseDetailRules = reactive({ convertRate: [ { required: true, message: '请输入转换率', trigger: 'blur' } ], - taxRate: [ + taxRate: [ { required: true, message: '请输入税率', trigger: 'blur' } ], - shippedQty: [ + shippedQty: [ { required: true, message: '请输入已发货数量', trigger: 'blur' } ], - receivedQty: [ + receivedQty: [ { required: true, message: '请输入已收货数量', trigger: 'blur' } ], - returnedQty: [ + returnedQty: [ { required: true, message: '请输入已退货数量', trigger: 'blur' } ], - putawayQty: [ + putawayQty: [ { required: true, message: '请输入已上架数量', trigger: 'blur' } ], - overReceivingPercent: [ + overReceivingPercent: [ { required: true, message: '请输入超收百分比', trigger: 'blur' } ], - orderQty: [ + orderQty: [ { required: true, message: '请输入订单数量', trigger: 'blur' } ], // uom: [ // { required: true, message: '请选择计量单位', trigger: 'change' } // ], - available: [ + available: [ { required: true, message: '请选择是否可用', trigger: 'change' } ], - nuumber: [ + nuumber: [ { required: true, message: '请输入单据号', trigger: 'blur' } ], - itemCode: [ + itemCode: [ { required: true, message: '请选择物料代码', trigger: 'change' } ], - remark: [ + remark: [ { max: 50, message: '不得超过50个字符', trigger: 'blur' } ], }) From 45c35e9da1a205593e20c8ba068450ec22211e36 Mon Sep 17 00:00:00 2001 From: zhang_li <2235006734@qqq.com> Date: Sat, 14 Dec 2024 11:54:08 +0800 Subject: [PATCH 085/213] =?UTF-8?q?YT-1678=E4=BE=9B=E5=BA=94=E5=95=86?= =?UTF-8?q?=E5=8F=91=E8=B4=A7=E8=AE=B0=E5=BD=95=EF=BC=8C=E4=B8=BB=E8=A1=A8?= =?UTF-8?q?=E7=8A=B6=E6=80=81=E5=BA=94=E6=98=BE=E7=A4=BA=EF=BC=8C=E5=88=9B?= =?UTF-8?q?=E5=BB=BA=E6=97=B6=E9=97=B4=E3=80=81=E5=88=9B=E5=BB=BA=E8=80=85?= =?UTF-8?q?=E5=BA=94=E4=B8=8D=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../supplierdeliverRecordMain.data.ts | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRecordMain/supplierdeliverRecordMain.data.ts b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRecordMain/supplierdeliverRecordMain.data.ts index 3d1210f6d..4c71a64cb 100644 --- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRecordMain/supplierdeliverRecordMain.data.ts +++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRecordMain/supplierdeliverRecordMain.data.ts @@ -350,6 +350,7 @@ export const SupplierdeliverRecordMain = useCrudSchemas(reactive([ } }, sortTableDefault: 1000, + isTable: false, }, { label: '创建者', @@ -359,6 +360,7 @@ export const SupplierdeliverRecordMain = useCrudSchemas(reactive([ width: 150 }, sortTableDefault: 1000, + isTable: false, }, { label: '是否可用', @@ -370,7 +372,7 @@ export const SupplierdeliverRecordMain = useCrudSchemas(reactive([ table: { width: 150 }, - isDetail: false + isDetail: false, }, { label: '操作', From 501c12db83eba6d7ba330f6e2dad0711b6b0531d Mon Sep 17 00:00:00 2001 From: zhang_li <2235006734@qqq.com> Date: Sat, 14 Dec 2024 12:01:05 +0800 Subject: [PATCH 086/213] =?UTF-8?q?YT-1679=E4=BE=9B=E5=BA=94=E5=95=86?= =?UTF-8?q?=E5=8F=91=E8=B4=A7=E8=AE=B0=E5=BD=95=EF=BC=8C=E5=BA=93=E5=AD=98?= =?UTF-8?q?=E8=AE=B0=E5=BD=95=E5=8D=95=E4=BD=8D=E5=BA=94=E6=98=AF=E5=BA=93?= =?UTF-8?q?=E5=AD=98=E8=AE=A1=E9=87=8F=E5=8D=95=E4=BD=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../supplierdeliverRecordMain/supplierdeliverRecordMain.data.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRecordMain/supplierdeliverRecordMain.data.ts b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRecordMain/supplierdeliverRecordMain.data.ts index 4c71a64cb..f4d120f08 100644 --- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRecordMain/supplierdeliverRecordMain.data.ts +++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRecordMain/supplierdeliverRecordMain.data.ts @@ -520,7 +520,7 @@ export const SupplierdeliverRecordDetail = useCrudSchemas(reactive } }, { - label: '库存记录单位', + label: '库存记量单位', field: 'uom', dictType: DICT_TYPE.UOM, dictClass: 'string', From 81384835f6725f62ed74a245265a2224c347cf32 Mon Sep 17 00:00:00 2001 From: zhang_li <2235006734@qqq.com> Date: Sat, 14 Dec 2024 13:50:27 +0800 Subject: [PATCH 087/213] =?UTF-8?q?YT-1659=E4=BE=9B=E5=BA=94=E5=95=86?= =?UTF-8?q?=E5=8F=91=E8=B4=A7=E7=94=B3=E8=AF=B7=EF=BC=8C=E5=AD=90=E8=A1=A8?= =?UTF-8?q?=E5=AD=97=E6=AE=B5=E6=98=BE=E7=A4=BA=E3=80=81=E5=8F=8A=E9=A1=BA?= =?UTF-8?q?=E5=BA=8F=E6=98=BE=E7=A4=BA=E5=BA=94=E4=B8=8E=E9=9C=80=E6=B1=82?= =?UTF-8?q?=E6=98=BE=E7=A4=BA=E4=B8=80=E8=87=B4=EF=BC=8C=E7=8E=B0=E4=B8=8D?= =?UTF-8?q?=E4=B8=80=E8=87=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../supplierdeliverRequestMain/index.vue | 8 +++- .../supplierdeliverRequestMain.data.ts | 38 +++++++++++++++++-- .../supplierinvoiceInvoiced/index.vue | 2 +- 3 files changed, 41 insertions(+), 7 deletions(-) diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue index 32cf5acde..08a41d8de 100644 --- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue +++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue @@ -123,7 +123,11 @@ :apiPage="SupplierdeliverRequestDetailApi.getSupplierdeliverRequestDetailPage" :apiDelete="SupplierdeliverRequestDetailApi.deleteSupplierdeliverRequestDetail" @searchTableSuccessDetail="searchTableSuccessDetail" - /> + > + + { .get(CACHE_KEY.DEPT) .find((account) => account.id == row.departmentCode)?.name if (departmentCode) row.departmentCode = JSON.parse(JSON.stringify(departmentCode)) - annexInspectionDetail.value.hiddenDelete = row.status==8 //HL-5838质检明细-删除按钮只有status=8隐藏，其他都展示 + annexInspectionDetail.value.hiddenDelete = row.status == 8 //HL-5838质检明细-删除按钮只有status=8隐藏，其他都展示 detailRef.value.openDetail(row, titleName, titleValue, 'requestSupplierdeliverMain') } /** 上传履历表 */ diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts index 83a4c317b..c3618b8be 100644 --- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts +++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts @@ -13,6 +13,14 @@ import { cloneDeep } from 'lodash-es' import {validateInteger} from '@/utils/validator' const { t } = useI18n() // 国际化 +const valueFilter = [{ + label: '是', + value:'1' +}, { + label: '否', + value: '0' + }] + let PurchasePlanDetailSchemas = cloneDeep(PurchasePlanDetail.allSchemas) if(PurchasePlanDetailSchemas?.tableColumns){ @@ -417,6 +425,9 @@ export const SupplierdeliverRequestMain = useCrudSchemas(reactive( isForm: false, isTableForm: false, isTable: false, + table: { + + }, detail: { dictType: 'primary', valueFilter: (value) => { @@ -1313,7 +1324,25 @@ export const SupplierdeliverRequestDetail = useCrudSchemas(reactive { + // return valueFilter.find((account) => account.value == cellValue)?.label + // }, + sortTableDefault: 10000, + form: { + component: 'Switch', + value: 'TRUE', + componentProps: { + inactiveValue: 'FALSE', + activeValue: 'TRUE' + } + } + }, { label: '创建时间', field: 'createTime', @@ -1322,7 +1351,7 @@ export const SupplierdeliverRequestDetail = useCrudSchemas(reactive From 0bb4080a32b8ff8d1262edeb09eb51fc8a9b00ab Mon Sep 17 00:00:00 2001 From: zhang_li <2235006734@qqq.com> Date: Sat, 14 Dec 2024 14:05:08 +0800 Subject: [PATCH 088/213] =?UTF-8?q?=E4=BE=9B=E5=BA=94=E5=95=86=E5=8F=91?= =?UTF-8?q?=E8=B4=A7=E7=94=B3=E8=AF=B7=E5=8E=BB=E6=8E=89=E9=BB=98=E8=AE=A4?= =?UTF-8?q?=E6=98=BE=E7=A4=BA=E7=AC=AC=E4=B8=80=E6=9D=A1=E8=A7=84=E6=A0=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../supplierdeliverRequestMain/index.vue | 60 +++++++++---------- .../supplierdeliverRequestMain.data.ts | 3 + 2 files changed, 33 insertions(+), 30 deletions(-) diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue index 08a41d8de..b6672a658 100644 --- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue +++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue @@ -727,29 +727,29 @@ const getGenerateLabelList = async (row) => { item.packUnitInitOptions = item.boxPackaging item.secondPackUnitInitOptions = item.palletPackaging || [] - let obj = item?.boxPackaging[0] - if (obj) { - item.packUnit = obj.packUnit - item.packQty = obj.packQty - if (!item.packQty) { - // 如果没有数量可以输入 - SupplierdeliverRequestDetailLabel.allSchemas.tableFormColumns.forEach(item => { - if (item.field == 'packQty') { - item.tableForm.disabled = false - } - }) - } else { - // 有数量不可以输入 - SupplierdeliverRequestDetailLabel.allSchemas.tableFormColumns.forEach(item => { - if (item.field == 'packQty') { - item.tableForm.disabled = true - } - }) - } - } else { - item.packUnit = '' - item.packQty = '' - } + // let obj = item?.boxPackaging[0] + // if (obj) { + // item.packUnit = obj.packUnit + // item.packQty = obj.packQty + // if (!item.packQty) { + // // 如果没有数量可以输入 + // SupplierdeliverRequestDetailLabel.allSchemas.tableFormColumns.forEach(item => { + // if (item.field == 'packQty') { + // item.tableForm.disabled = false + // } + // }) + // } else { + // // 有数量不可以输入 + // SupplierdeliverRequestDetailLabel.allSchemas.tableFormColumns.forEach(item => { + // if (item.field == 'packQty') { + // item.tableForm.disabled = true + // } + // }) + // } + // } else { + // item.packUnit = '' + // item.packQty = '' + // } if (item.convertRate==0 || item.convertRate == 1) { item.balanceQty = item.qty item.purchaseStdQty = item.packQty @@ -757,13 +757,13 @@ const getGenerateLabelList = async (row) => { item.balanceQty = parseFloat(Decimal(item.qty).mul(Decimal(item.convertRate)).toNumber().toFixed(5)) item.purchaseStdQty = parseFloat(Decimal(parseFloat(item.packQty)).div(Decimal(parseFloat(item.convertRate))).toNumber()) } - // 有托规格显示托规格，没有显示第一条规格 - item.secondPackUnit = obj?.parentPackUnit - ? obj.parentPackUnit - : item?.secondPackUnitInitOptions[0]?.packUnit - item.secondPackQty = obj?.parentPackUnit - ? obj.parentPackQty - : item?.secondPackUnitInitOptions[0]?.packQty + // // 有托规格显示托规格，没有显示第一条规格 + // item.secondPackUnit = obj?.parentPackUnit + // ? obj.parentPackUnit + // : item?.secondPackUnitInitOptions[0]?.packUnit + // item.secondPackQty = obj?.parentPackUnit + // ? obj.parentPackQty + // : item?.secondPackUnitInitOptions[0]?.packQty }) }) } diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts index c3618b8be..d956c8356 100644 --- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts +++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts @@ -1333,6 +1333,9 @@ export const SupplierdeliverRequestDetail = useCrudSchemas(reactive { // return valueFilter.find((account) => account.value == cellValue)?.label // }, + table: { + width:150 + }, sortTableDefault: 10000, form: { component: 'Switch', From 5c4b3fa4cc5c48a44ca216e1b1a6dd1e39a29bd5 Mon Sep 17 00:00:00 2001 From: zhang_li <2235006734@qqq.com> Date: Sat, 14 Dec 2024 14:12:25 +0800 Subject: [PATCH 089/213] =?UTF-8?q?YT-1686=E8=A6=81=E8=B4=A7=E8=AE=A1?= =?UTF-8?q?=E5=88=92=E6=98=8E=E7=BB=86=E5=8F=97=E5=85=A5=E5=9C=B0=E4=B8=8D?= =?UTF-8?q?=E6=98=BE=E7=A4=BA=EF=BC=8C=E9=BB=98=E8=AE=A4=E6=94=B6=E8=B4=A7?= =?UTF-8?q?=E5=BA=93=E5=8C=BA=E6=98=BE=E7=A4=BA=E9=A1=BA=E5=BA=8F=E4=B8=8D?= =?UTF-8?q?=E6=AD=A3=E7=A1=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../supplierdeliver/purchasePlanMain/purchasePlanMain.data.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/purchasePlanMain.data.ts b/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/purchasePlanMain.data.ts index 873c67df2..1cedbca94 100644 --- a/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/purchasePlanMain.data.ts +++ b/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/purchasePlanMain.data.ts @@ -799,6 +799,7 @@ export const PurchasePlanDetail = useCrudSchemas( isForm: true, isTable: true, hiddenInMain: true, + sortTableDefault: 1000, }, { label: '受入号', From 8372f0ffa619102f2a54d906f1e90dd0cd29aa9b Mon Sep 17 00:00:00 2001 From: songguoqiang <765017469@qq.com> Date: Sat, 14 Dec 2024 14:55:07 +0800 Subject: [PATCH 090/213] =?UTF-8?q?YT-1682=EF=BC=9A=E8=A6=81=E8=B4=A7?= =?UTF-8?q?=E8=AE=A1=E5=88=92=E6=98=8E=E7=BB=86=E5=B7=B2=E5=8F=91=E8=B4=A7?= =?UTF-8?q?=E6=95=B0=E9=87=8F=E5=92=8C=E6=94=B6=E8=B4=A7=E6=95=B0=E9=87=8F?= =?UTF-8?q?=E5=90=8D=E7=A7=B0=E6=98=BE=E7=A4=BA=E4=B8=8D=E6=AD=A3=E7=A1=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../supplierdeliver/purchasePlanMain/purchasePlanMain.data.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/purchasePlanMain.data.ts b/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/purchasePlanMain.data.ts index 1cedbca94..6305da7ea 100644 --- a/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/purchasePlanMain.data.ts +++ b/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/purchasePlanMain.data.ts @@ -936,7 +936,7 @@ export const PurchasePlanDetail = useCrudSchemas( } }, { - label: '已发货数量', + label: '已发采购数量', field: 'shippedQty', sort: 'custom', table: { @@ -948,7 +948,7 @@ export const PurchasePlanDetail = useCrudSchemas( hiddenInMain: true, }, { - label: '收货数量', + label: '已收采购数量', field: 'receivedQty', sort: 'custom', table: { From 57dec795c73e103e9f0e864601ec587034f1fc1c Mon Sep 17 00:00:00 2001 From: zhang_li <2235006734@qqq.com> Date: Sat, 14 Dec 2024 15:23:43 +0800 Subject: [PATCH 091/213] =?UTF-8?q?YT-1651WMS26.=E4=BE=BF=E6=AC=A1?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/locales/en-US.ts | 2 +- src/locales/zh-CN.ts | 2 +- .../purchasePlanMain/index.vue | 3 ++- .../purchasePlanMain/purchasePlanMain.data.ts | 20 ++++++++++------ .../supplierdeliverRecordMain.data.ts | 15 ++++++++++++ .../supplierdeliverBasicForm.vue | 2 ++ .../supplierdeliverRequestMain.data.ts | 23 +++++++++++++++++++ 7 files changed, 57 insertions(+), 10 deletions(-) diff --git a/src/locales/en-US.ts b/src/locales/en-US.ts index 29c4bc725..bc8fa1baa 100644 --- a/src/locales/en-US.ts +++ b/src/locales/en-US.ts @@ -1024,7 +1024,7 @@ export default { 审批通过:'Approve', 要货预测主:'Demand forecast master data', 要货预测主导入模版:'Demand forecast master data leads into the template', - 创建供应商发货申请:'Create a supplier shipping request', + 创建发货申请:'Create a shipping request', '是否重新打开所选中数据？':'Do you want to reopen the selected data?', '请先上传自检报告!':'Please upload the self-test report first!', '提交审批成功!':'Submitted for approval!', diff --git a/src/locales/zh-CN.ts b/src/locales/zh-CN.ts index d899399f8..308e02305 100644 --- a/src/locales/zh-CN.ts +++ b/src/locales/zh-CN.ts @@ -1029,7 +1029,7 @@ export default { 审批通过:'审批通过', 要货预测主:'要货预测主', 要货预测主导入模版:'要货预测主导入模版', - 创建供应商发货申请:'创建供应商发货申请', + 创建发货申请:'创建发货申请', '是否重新打开所选中数据？':'是否重新打开所选中数据？', '请先上传自检报告!':'请先上传自检报告!', '提交审批成功!':'提交审批成功!', diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue index 4be71a753..5a5676cdc 100644 --- a/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue +++ b/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue @@ -470,7 +470,7 @@ const isShowMainButton1 = (row, val) => { defaultButtons.mainListEditBtn({ hide: isShowMainButton1(row, ['1','3','5']), hasPermi: 'wms:purchase-plan-main:edit' }), // 编辑 // defaultButtons.mainListDeleteBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:purchase-plan-main:delete'}), // 删除 { - label: t('ts.创建供应商发货申请'), + label: t('ts.创建发货申请'), name: 'supplierdeliver', hide: isShowMainButton(row, ['4']), type: 'primary', @@ -506,6 +506,7 @@ const isShowMainButton1 = (row, val) => { } else if (val == 'supplierdeliver') { // 创建供应商发货申请 supplierdeliverFormRef.value.openFormByCreate({ number:row.number, //要货单号 + deliNo:row.deliNo, //便次 poNumber:row.poNumber, //采购订单号 supplierCode:row.supplierCode, //供应商代码 endTime:row.endTime, //结束时间 diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/purchasePlanMain.data.ts b/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/purchasePlanMain.data.ts index 6305da7ea..161e0294c 100644 --- a/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/purchasePlanMain.data.ts +++ b/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/purchasePlanMain.data.ts @@ -8,7 +8,7 @@ import { PurchaseDetail, PurchaseMain } from '../purchaseMain/purchaseMain.data' import { getPurchaseDetailPagePoNumber } from '@/api/wms/purchaseDetail' import * as ItembasicApi from '@/api/wms/itembasic' import { Itembasic } from '@/views/wms/basicDataManage/itemManage/itembasic/itembasic.data' -import { validatePositiveNumber0 } from "@/utils/validator"; +import { validatePositiveNumber0, validateInteger } from "@/utils/validator"; const { t } = useI18n() // 国际化 /** @@ -340,14 +340,18 @@ export const PurchasePlanMain = useCrudSchemas( label: '便次', field: 'deliNo', sort: 'custom', - isTable: false, - isForm: false, sortTableDefault: 13, table: { width: 150 }, + form: { + component: 'InputNumber', + componentProps: { + min: 1, + }, + } }, - + { label: '预测版本', @@ -577,7 +581,11 @@ export const PurchasePlanMainRules = reactive({ status: [{ required: true, message: '请选择状态', trigger: 'change' }], number: [{ required: true, message: '请输入单据号', trigger: 'blur' }], businessType: [{ required: true, message: '请输入业务类型', trigger: 'blur' }], - remark: [{ max: 50, message: '不得超过50个字符', trigger: 'blur' }] + remark: [{ max: 50, message: '不得超过50个字符', trigger: 'blur' }], + deliNo: [ + { required: true, message: '请输入便次', trigger: 'blur' }, + { validator: validateInteger, message: '请输入正确的正整数', trigger: ['change', 'blur'] }, + ], }) /** @@ -954,8 +962,6 @@ export const PurchasePlanDetail = useCrudSchemas( table: { width: 150 }, - - hiddenInMain: true, isTableForm: false, isForm: false, isTable: true, diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRecordMain/supplierdeliverRecordMain.data.ts b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRecordMain/supplierdeliverRecordMain.data.ts index f4d120f08..53f178584 100644 --- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRecordMain/supplierdeliverRecordMain.data.ts +++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRecordMain/supplierdeliverRecordMain.data.ts @@ -32,6 +32,21 @@ export const SupplierdeliverRecordMain = useCrudSchemas(reactive([ width: 180 }, }, + { + label: '便次', + field: 'deliNo', + sort: 'custom', + table: { + width: 150 + }, + form: { + component: 'InputNumber', + componentProps: { + min: 1, + disabled: true + }, + }, + }, { label: '申请单号', field: 'requestNumber', diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverBasicForm.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverBasicForm.vue index 7051eea7d..83a967479 100644 --- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverBasicForm.vue +++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverBasicForm.vue @@ -109,6 +109,7 @@ const openFormByCreate = async ( data ) => { setV['supplierCode'] = data['supplierCode'] // 供应商代码 setV['poNumber'] = data['poNumber'] //采购订单 setV['ppNumber'] = data['number'] // 要货单号 + setV['deliNo'] = data['deliNo'] // 要货单号 searchPage: SupplierApi.getSupplierPage //新增--选择完要货计划，自动展示明细 getSearchTableData(data['number'],'ppNumber','number',0) @@ -254,6 +255,7 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row) => //新增--选择完要货计划，自动展示明细 setV['poNumber'] = val[0]['poNumber'] //采购订单 + setV['deliNo'] = val[0]['deliNo'] getSearchTableData(val[0]['number'],formField,searchField,0) // 设置计划到货时间 diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts index d956c8356..bad3ebbd7 100644 --- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts +++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts @@ -220,6 +220,26 @@ export const SupplierdeliverRequestMain = useCrudSchemas(reactive( sortDetailDefault: 4, } }, + { + label: '便次', + field: 'deliNo', + sort: 'custom', + sortTableDefault: 4, + table: { + width: 150 + }, + form: { + component: 'InputNumber', + componentProps: { + min: 1, + disabled: true + }, + }, + detail: { + sortDetailDefault: 4, + } + }, + { label: '要求到货时间', field: 'arriveTime', @@ -1337,6 +1357,9 @@ export const SupplierdeliverRequestDetail = useCrudSchemas(reactive Date: Sat, 14 Dec 2024 16:18:39 +0800 Subject: [PATCH 092/213] =?UTF-8?q?=E4=BE=9B=E5=BA=94=E5=95=86=E5=8F=91?= =?UTF-8?q?=E7=A5=A8=E6=B7=BB=E5=8A=A0=E5=8F=91=E7=A5=A8=E6=80=BB=E9=A2=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../supplierinvoiceRecordMain.data.ts | 22 +++++++--- .../supplierinvoiceRequestMain/index.vue | 10 +++-- .../supplierinvoiceRequestMain.data.ts | 41 ++++++++++++++++++- 3 files changed, 64 insertions(+), 9 deletions(-) diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/supplierinvoiceRecordMain.data.ts b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/supplierinvoiceRecordMain.data.ts index cec35d9fd..53edc52cb 100644 --- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/supplierinvoiceRecordMain.data.ts +++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/supplierinvoiceRecordMain.data.ts @@ -16,6 +16,7 @@ export const SupplierinvoiceRecordMain = useCrudSchemas(reactive([ }, isSearch: false }, + { label: '发票申请单号', field:'requestNumber', @@ -286,9 +287,6 @@ export const SupplierinvoiceRecordMain = useCrudSchemas(reactive([ component: 'InputNumber', } }, - - - { label: '索赔金额', field: 'claimAmount', @@ -747,6 +745,15 @@ export const SupplierinvoiceRecordMain = useCrudSchemas(reactive([ // width: 150 // }, // }, + { + label: '发票总额', + field: 'invoiceAmountMain', + formatter: accountantFormart, + table: { + width: 160 + }, + sortTableDefault: 12, + }, { label: '索赔总额', field: 'claimAmount', @@ -1350,9 +1357,14 @@ export const SupplierinvoiceRecordDetailMain = useCrudSchemas(reactive { claimDetailsList.value = await PurchaseClaimRequestDetailApi.getPurchaseClaimRequestDetailList(supplierCode) formRef.value.formRef.formModel.claimAmount = claimDetailsList.value.map(item => item.claimAmount).reduce((prev, item) => prev + item).toFixed(5) - + formRef.value.formRef.formModel.invoiceAmountMain = (Number(formRef.value.formRef.formModel.amount) -Number(formRef.value.formModel.claimAmount)).toFixed(2) // 发票总额：供应商维护未税金额-索赔总额 } // 编辑的时候获取索赔明细 const claimDetailsForUpdate = async (supplierCode,id) => { diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts index 8c0eb4cc9..9bc43307c 100644 --- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts +++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts @@ -270,6 +270,26 @@ export const SupplierinvoiceRequestMain = useCrudSchemas(reactive( precision: 2, } }, + { + label: '发票总额', + field: 'invoiceAmountMain', + formatter: accountantFormart, + sortTableDefault: 3, + table: { + width: 160 + }, + form: { + component: 'InputNumber', + componentProps: { + precision: 2, + disabled: true, + } + }, + tableForm: { + type: 'InputNumber', + precision: 2, + }, + }, { label: '税率(%)', field: 'taxRate', @@ -1591,7 +1611,26 @@ export const SupplierinvoiceRequestDetailMain = useCrudSchemas(reactive Date: Sun, 15 Dec 2024 09:04:52 +0800 Subject: [PATCH 093/213] =?UTF-8?q?YT-1695=E4=BE=9B=E5=BA=94=E5=95=86?= =?UTF-8?q?=E5=8F=91=E8=B4=A7=E8=AE=B0=E5=BD=95=EF=BC=8C=E5=BA=93=E5=AD=98?= =?UTF-8?q?=E8=AE=A1=E9=87=8F=E5=8D=95=E4=BD=8D=EF=BC=8C=E8=AE=A1=E5=AD=97?= =?UTF-8?q?=E9=94=99=E4=BA=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../supplierdeliverRecordMain/supplierdeliverRecordMain.data.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRecordMain/supplierdeliverRecordMain.data.ts b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRecordMain/supplierdeliverRecordMain.data.ts index 53f178584..32c24212a 100644 --- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRecordMain/supplierdeliverRecordMain.data.ts +++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRecordMain/supplierdeliverRecordMain.data.ts @@ -535,7 +535,7 @@ export const SupplierdeliverRecordDetail = useCrudSchemas(reactive } }, { - label: '库存记量单位', + label: '库存计量单位', field: 'uom', dictType: DICT_TYPE.UOM, dictClass: 'string', From 1cb004009061775cc5eebc3a5fbf6efa9118f798 Mon Sep 17 00:00:00 2001 From: zhang_li <2235006734@qqq.com> Date: Sun, 15 Dec 2024 09:22:09 +0800 Subject: [PATCH 094/213] =?UTF-8?q?YT-1700=E4=BE=9B=E5=BA=94=E5=95=86?= =?UTF-8?q?=E5=8F=91=E8=B4=A7=E7=94=B3=E8=AF=B7=E4=B8=BB=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=EF=BC=8C=E6=98=BE=E7=A4=BA=E4=B8=A4=E4=B8=AA=E5=88=9B=E5=BB=BA?= =?UTF-8?q?=E8=80=85=E3=80=81=E5=88=9B=E5=BB=BA=E6=97=B6=E9=97=B4=EF=BC=8C?= =?UTF-8?q?=E5=BA=94=E5=8E=BB=E6=8E=89=E4=B8=80=E4=B8=AA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../supplierdeliverRequestMain.data.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts index bad3ebbd7..ba977e0fc 100644 --- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts +++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts @@ -467,7 +467,7 @@ export const SupplierdeliverRequestMain = useCrudSchemas(reactive( dateFormat: 'YYYY-MM-DD HH:mm:ss' }, sort: 'custom', - isTable:true, + isTable:false, table: { width: 180 }, @@ -497,7 +497,7 @@ export const SupplierdeliverRequestMain = useCrudSchemas(reactive( label: '创建者', field: 'creator', sort: 'custom', - isTable: true, + isTable: false, sortSearchDefault: 1000, sortTableDefault: 1000, table: { From 33b8928a585e09585c4ac5685ae66164be691f10 Mon Sep 17 00:00:00 2001 From: zhang_li <2235006734@qqq.com> Date: Sun, 15 Dec 2024 09:48:21 +0800 Subject: [PATCH 095/213] =?UTF-8?q?YT-1689=E9=87=87=E8=B4=AD=E4=BB=B6?= =?UTF-8?q?=E6=A0=87=E7=AD=BE=E4=B8=AD=E5=8C=85=E8=A3=85=E6=98=8E=E7=BB=86?= =?UTF-8?q?=E6=B2=A1=E6=8C=89=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 --- .../itempackage/itempackage.data.ts | 13 ++++++--- .../inventoryManage/package/package.data.ts | 28 +++++++++---------- 2 files changed, 22 insertions(+), 19 deletions(-) diff --git a/src/views/wms/basicDataManage/itemManage/itempackage/itempackage.data.ts b/src/views/wms/basicDataManage/itemManage/itempackage/itempackage.data.ts index dc96e4d5a..dd4201e32 100644 --- a/src/views/wms/basicDataManage/itemManage/itempackage/itempackage.data.ts +++ b/src/views/wms/basicDataManage/itemManage/itempackage/itempackage.data.ts @@ -446,8 +446,8 @@ export const PurchasePackaging = useCrudSchemas(reactive([ sort: 'custom', }, { - label: '替代计量单位', - field: 'altUom', + label: '采购计量单位', + field: 'purchaseUom', sort: 'custom', dictType: DICT_TYPE.UOM, dictClass: 'string', @@ -458,8 +458,13 @@ export const PurchasePackaging = useCrudSchemas(reactive([ }, }, { - label: '替代数量', - field: 'altQty', + label: '采购数量', + field: 'purchaseQty', + sort: 'custom', + }, + { + label: '采购标包数量', + field: 'purchaseStdQty', sort: 'custom', }, { diff --git a/src/views/wms/inventoryManage/package/package.data.ts b/src/views/wms/inventoryManage/package/package.data.ts index a8d1f6955..73b5f726c 100644 --- a/src/views/wms/inventoryManage/package/package.data.ts +++ b/src/views/wms/inventoryManage/package/package.data.ts @@ -252,28 +252,26 @@ export const Package = useCrudSchemas(reactive([ }, }, { - label: '替代计量单位', - field: 'altUom', + label: '采购计量单位', + field: 'purchaseUom', sort: 'custom', dictType: DICT_TYPE.UOM, - dictClass: 'string', // 默认都是字符串类型其他暂不考虑 - form: { - component: 'SelectV2', - componentProps: { - disabled: true - } - }, + dictClass: 'string', + isSearch: true, + isTable: true, table: { - width: 150, + width: 120 }, }, { - label: '替代数量', - field: 'altQty', + label: '采购数量', + field: 'purchaseQty', + sort: 'custom', + }, + { + label: '采购标包数量', + field: 'purchaseStdQty', sort: 'custom', - table: { - width: 150, - }, }, { label: '转换率', From 91e5a96e74e916576f47ecd94047ad0651019831 Mon Sep 17 00:00:00 2001 From: songguoqiang <765017469@qq.com> Date: Sun, 15 Dec 2024 10:31:59 +0800 Subject: [PATCH 096/213] =?UTF-8?q?=E5=8C=85=E8=A3=85=E5=88=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/wms/inventoryManage/package/package.data.ts | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/views/wms/inventoryManage/package/package.data.ts b/src/views/wms/inventoryManage/package/package.data.ts index 73b5f726c..af30eb325 100644 --- a/src/views/wms/inventoryManage/package/package.data.ts +++ b/src/views/wms/inventoryManage/package/package.data.ts @@ -266,11 +266,17 @@ export const Package = useCrudSchemas(reactive([ { label: '采购数量', field: 'purchaseQty', + table: { + width: 120 + }, sort: 'custom', }, { label: '采购标包数量', field: 'purchaseStdQty', + table: { + width: 120 + }, sort: 'custom', }, { From 840551130809812a6d54e35093251d2e46c20738 Mon Sep 17 00:00:00 2001 From: zhang_li <2235006734@qqq.com> Date: Sun, 15 Dec 2024 10:46:32 +0800 Subject: [PATCH 097/213] =?UTF-8?q?YT-1650=E9=87=87=E8=B4=AD=E6=94=B6?= =?UTF-8?q?=E8=B4=A7=E7=AE=A1=E7=90=86=E4=B9=8B=E5=89=8D=E6=93=8D=E4=BD=9C?= =?UTF-8?q?=E6=8C=89=E9=92=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../customerManage/customer/index.vue | 2 +- .../customerDeliveryForecast/index.vue | 2 +- .../customerManage/customerdock/index.vue | 2 +- .../customerManage/customeritem/index.vue | 2 +- .../basicDataManage/customerManage/project/index.vue | 2 +- .../customerManage/saleprice/index.vue | 2 +- .../documentSetting/businesstype/index.vue | 2 +- .../documentSetting/documentsetting/index.vue | 2 +- .../documentSetting/jobsetting/index.vue | 2 +- .../documentSetting/plansetting/index.vue | 2 +- .../documentSetting/recordsetting/index.vue | 2 +- .../documentSetting/requestsetting/index.vue | 2 +- .../basicDataManage/documentSetting/switch/index.vue | 2 +- .../documentSetting/transactiontype/index.vue | 2 +- .../factoryModeling/areabasic/index.vue | 2 +- .../basicDataManage/factoryModeling/dock/index.vue | 2 +- .../factoryModeling/enterprise/index.vue | 2 +- .../factoryModeling/location/index.vue | 2 +- .../factoryModeling/locationgroup/index.vue | 2 +- .../factoryModeling/process/index.vue | 2 +- .../factoryModeling/productionline/index.vue | 2 +- .../factoryModeling/warehouse/index.vue | 2 +- .../factoryModeling/workshop/index.vue | 2 +- .../factoryModeling/workstation/index.vue | 2 +- .../wms/basicDataManage/itemManage/bom/index.vue | 2 +- .../itemManage/itemSyntheticRelation/index.vue | 2 +- .../basicDataManage/itemManage/itembasic/index.vue | 2 +- .../basicDataManage/itemManage/itempackage/index.vue | 2 +- .../itemManage/itemwarehouse/index.vue | 2 +- .../basicDataManage/itemManage/packageunit/index.vue | 2 +- .../productionitemcodeSpareitemcode/index.vue | 2 +- .../itemManage/productionlineitem/index.vue | 2 +- .../itemManage/stdcostprice/index.vue | 2 +- .../basicDataManage/labelManage/barbasic/index.vue | 2 +- .../basicDataManage/labelManage/barcode/index.vue | 2 +- .../labelManage/callmaterials/index.vue | 2 +- .../basicDataManage/labelManage/labeltype/index.vue | 2 +- .../labelManage/locationLabel/index.vue | 2 +- .../labelManage/manufacturePackage/index.vue | 2 +- .../labelManage/purchasePackage/index.vue | 2 +- .../labelManage/utensilPackage/index.vue | 2 +- .../basicDataManage/orderManage/carrier/index.vue | 2 +- .../wms/basicDataManage/orderManage/owner/index.vue | 2 +- .../wms/basicDataManage/orderManage/shift/index.vue | 2 +- .../wms/basicDataManage/orderManage/team/index.vue | 2 +- .../strategySetting/condition/index.vue | 2 +- .../strategySetting/configuration/index.vue | 2 +- .../strategySetting/configurationsetting/index.vue | 2 +- .../strategySetting/paramsetting/index.vue | 2 +- .../basicDataManage/strategySetting/rule/index.vue | 2 +- src/views/wms/basicDataManage/subject/mstr/index.vue | 2 +- .../basicDataManage/subject/qadCostcentre/index.vue | 2 +- .../wms/basicDataManage/subject/qadProject/index.vue | 2 +- .../basicDataManage/subject/subjectAccount/index.vue | 2 +- .../supplierManage/purchaseprice/index.vue | 2 +- .../supplierManage/supplier/index.vue | 2 +- .../supplierManage/supplierCycle/index.vue | 2 +- .../supplierManage/supplieritem/index.vue | 2 +- .../systemSetting/accountcalendar/index.vue | 2 +- .../systemSetting/currencyexchange/index.vue | 2 +- .../systemSetting/supplierUser/index.vue | 12 +++++++----- .../systemSetting/systemcalendar/index.vue | 2 +- src/views/wms/buttMesManage/mesBarCode/index.vue | 2 +- .../amvPurchasereceiptRecordMain/index.vue | 2 +- .../bsPurchasereceiptRecordMain/index.vue | 2 +- .../developPurchasereceiptJobMain/index.vue | 2 +- .../developPurchasereceiptRecordMain/index.vue | 2 +- .../developPurchasereceiptRequestMain/index.vue | 2 +- .../purchasereceiptRequestMain.data.ts | 2 +- .../jisPurchasereceiptRecordMain/index.vue | 2 +- .../jisPurchasereceiptRequestMain/index.vue | 2 +- .../purchasereceiptRequestMain.data.ts | 2 +- .../purchaseBarter/purchaseBarterRecord/index.vue | 2 +- .../purchaseBarter/purchaseBarterRequest/index.vue | 2 +- .../purchasereceipt/purchasereceiptJobMain/index.vue | 2 +- .../purchasereceiptRequestMain/index.vue | 2 +- .../purchasereceiptRequestMain.data.ts | 2 +- .../purchasereturn/purchasereturnJobMain/index.vue | 2 +- .../purchasereturnJobMain.data.ts | 2 +- .../purchasereturnRequestMain/index.vue | 2 +- .../putaway/putawayJobMain/index.vue | 2 +- .../putaway/putawayRecordMain/index.vue | 2 +- .../putaway/putawayRequestMain/index.vue | 2 +- .../supplierdeliver/purchaseMainWms/index.vue | 2 +- .../toolPurchasereceiptJobMain/index.vue | 2 +- .../toolPurchasereceiptRecordMain/index.vue | 2 +- .../toolPurchasereceiptRequestMain/index.vue | 2 +- .../purchasereceiptRequestMain.data.ts | 2 +- 88 files changed, 94 insertions(+), 92 deletions(-) diff --git a/src/views/wms/basicDataManage/customerManage/customer/index.vue b/src/views/wms/basicDataManage/customerManage/customer/index.vue index 99931fae0..23e6dc927 100644 --- a/src/views/wms/basicDataManage/customerManage/customer/index.vue +++ b/src/views/wms/basicDataManage/customerManage/customer/index.vue @@ -33,7 +33,7 @@ diff --git a/src/views/wms/basicDataManage/customerManage/customerDeliveryForecast/index.vue b/src/views/wms/basicDataManage/customerManage/customerDeliveryForecast/index.vue index 39689c7a3..478e13d55 100644 --- a/src/views/wms/basicDataManage/customerManage/customerDeliveryForecast/index.vue +++ b/src/views/wms/basicDataManage/customerManage/customerDeliveryForecast/index.vue @@ -33,7 +33,7 @@ diff --git a/src/views/wms/basicDataManage/customerManage/customerdock/index.vue b/src/views/wms/basicDataManage/customerManage/customerdock/index.vue index d5fae481d..2b60e8e49 100644 --- a/src/views/wms/basicDataManage/customerManage/customerdock/index.vue +++ b/src/views/wms/basicDataManage/customerManage/customerdock/index.vue @@ -33,7 +33,7 @@ diff --git a/src/views/wms/basicDataManage/customerManage/customeritem/index.vue b/src/views/wms/basicDataManage/customerManage/customeritem/index.vue index 9cdb2c851..06068794e 100644 --- a/src/views/wms/basicDataManage/customerManage/customeritem/index.vue +++ b/src/views/wms/basicDataManage/customerManage/customeritem/index.vue @@ -33,7 +33,7 @@ diff --git a/src/views/wms/basicDataManage/customerManage/project/index.vue b/src/views/wms/basicDataManage/customerManage/project/index.vue index 9acfffa27..383c476b9 100644 --- a/src/views/wms/basicDataManage/customerManage/project/index.vue +++ b/src/views/wms/basicDataManage/customerManage/project/index.vue @@ -33,7 +33,7 @@ diff --git a/src/views/wms/basicDataManage/customerManage/saleprice/index.vue b/src/views/wms/basicDataManage/customerManage/saleprice/index.vue index 1d22026fe..983f7bcf0 100644 --- a/src/views/wms/basicDataManage/customerManage/saleprice/index.vue +++ b/src/views/wms/basicDataManage/customerManage/saleprice/index.vue @@ -33,7 +33,7 @@ diff --git a/src/views/wms/basicDataManage/documentSetting/businesstype/index.vue b/src/views/wms/basicDataManage/documentSetting/businesstype/index.vue index 2607dfb9e..ed6634899 100644 --- a/src/views/wms/basicDataManage/documentSetting/businesstype/index.vue +++ b/src/views/wms/basicDataManage/documentSetting/businesstype/index.vue @@ -37,7 +37,7 @@ diff --git a/src/views/wms/basicDataManage/documentSetting/documentsetting/index.vue b/src/views/wms/basicDataManage/documentSetting/documentsetting/index.vue index d6c1d0d28..acbd73aca 100644 --- a/src/views/wms/basicDataManage/documentSetting/documentsetting/index.vue +++ b/src/views/wms/basicDataManage/documentSetting/documentsetting/index.vue @@ -33,7 +33,7 @@ diff --git a/src/views/wms/basicDataManage/documentSetting/jobsetting/index.vue b/src/views/wms/basicDataManage/documentSetting/jobsetting/index.vue index 6818d5e66..2c6d8c869 100644 --- a/src/views/wms/basicDataManage/documentSetting/jobsetting/index.vue +++ b/src/views/wms/basicDataManage/documentSetting/jobsetting/index.vue @@ -33,7 +33,7 @@ diff --git a/src/views/wms/basicDataManage/documentSetting/plansetting/index.vue b/src/views/wms/basicDataManage/documentSetting/plansetting/index.vue index 80f505ba0..e540b4a2c 100644 --- a/src/views/wms/basicDataManage/documentSetting/plansetting/index.vue +++ b/src/views/wms/basicDataManage/documentSetting/plansetting/index.vue @@ -33,7 +33,7 @@ diff --git a/src/views/wms/basicDataManage/documentSetting/recordsetting/index.vue b/src/views/wms/basicDataManage/documentSetting/recordsetting/index.vue index 4835f48cd..daf2e8b05 100644 --- a/src/views/wms/basicDataManage/documentSetting/recordsetting/index.vue +++ b/src/views/wms/basicDataManage/documentSetting/recordsetting/index.vue @@ -33,7 +33,7 @@ diff --git a/src/views/wms/basicDataManage/documentSetting/requestsetting/index.vue b/src/views/wms/basicDataManage/documentSetting/requestsetting/index.vue index 1a870feeb..b5d282b2b 100644 --- a/src/views/wms/basicDataManage/documentSetting/requestsetting/index.vue +++ b/src/views/wms/basicDataManage/documentSetting/requestsetting/index.vue @@ -33,7 +33,7 @@ diff --git a/src/views/wms/basicDataManage/documentSetting/switch/index.vue b/src/views/wms/basicDataManage/documentSetting/switch/index.vue index 9085a6238..677298f35 100644 --- a/src/views/wms/basicDataManage/documentSetting/switch/index.vue +++ b/src/views/wms/basicDataManage/documentSetting/switch/index.vue @@ -33,7 +33,7 @@ diff --git a/src/views/wms/basicDataManage/documentSetting/transactiontype/index.vue b/src/views/wms/basicDataManage/documentSetting/transactiontype/index.vue index 2db81a820..33d87e0d2 100644 --- a/src/views/wms/basicDataManage/documentSetting/transactiontype/index.vue +++ b/src/views/wms/basicDataManage/documentSetting/transactiontype/index.vue @@ -33,7 +33,7 @@ diff --git a/src/views/wms/basicDataManage/factoryModeling/areabasic/index.vue b/src/views/wms/basicDataManage/factoryModeling/areabasic/index.vue index 531ead548..0a6270e46 100644 --- a/src/views/wms/basicDataManage/factoryModeling/areabasic/index.vue +++ b/src/views/wms/basicDataManage/factoryModeling/areabasic/index.vue @@ -33,7 +33,7 @@ diff --git a/src/views/wms/basicDataManage/factoryModeling/dock/index.vue b/src/views/wms/basicDataManage/factoryModeling/dock/index.vue index 99fd42e3b..f82461fb0 100644 --- a/src/views/wms/basicDataManage/factoryModeling/dock/index.vue +++ b/src/views/wms/basicDataManage/factoryModeling/dock/index.vue @@ -33,7 +33,7 @@ diff --git a/src/views/wms/basicDataManage/factoryModeling/enterprise/index.vue b/src/views/wms/basicDataManage/factoryModeling/enterprise/index.vue index 057d48313..5ab359f21 100644 --- a/src/views/wms/basicDataManage/factoryModeling/enterprise/index.vue +++ b/src/views/wms/basicDataManage/factoryModeling/enterprise/index.vue @@ -32,7 +32,7 @@ diff --git a/src/views/wms/basicDataManage/factoryModeling/location/index.vue b/src/views/wms/basicDataManage/factoryModeling/location/index.vue index 664be1170..e73dffa17 100644 --- a/src/views/wms/basicDataManage/factoryModeling/location/index.vue +++ b/src/views/wms/basicDataManage/factoryModeling/location/index.vue @@ -33,7 +33,7 @@ diff --git a/src/views/wms/basicDataManage/factoryModeling/locationgroup/index.vue b/src/views/wms/basicDataManage/factoryModeling/locationgroup/index.vue index 1366d6bab..56f96e4b4 100644 --- a/src/views/wms/basicDataManage/factoryModeling/locationgroup/index.vue +++ b/src/views/wms/basicDataManage/factoryModeling/locationgroup/index.vue @@ -33,7 +33,7 @@ diff --git a/src/views/wms/basicDataManage/factoryModeling/process/index.vue b/src/views/wms/basicDataManage/factoryModeling/process/index.vue index 23f6304b9..d666e96aa 100644 --- a/src/views/wms/basicDataManage/factoryModeling/process/index.vue +++ b/src/views/wms/basicDataManage/factoryModeling/process/index.vue @@ -33,7 +33,7 @@ diff --git a/src/views/wms/basicDataManage/factoryModeling/productionline/index.vue b/src/views/wms/basicDataManage/factoryModeling/productionline/index.vue index c20790388..f3ad30ae8 100644 --- a/src/views/wms/basicDataManage/factoryModeling/productionline/index.vue +++ b/src/views/wms/basicDataManage/factoryModeling/productionline/index.vue @@ -33,7 +33,7 @@ diff --git a/src/views/wms/basicDataManage/factoryModeling/warehouse/index.vue b/src/views/wms/basicDataManage/factoryModeling/warehouse/index.vue index 32af2cdf2..e25bd0986 100644 --- a/src/views/wms/basicDataManage/factoryModeling/warehouse/index.vue +++ b/src/views/wms/basicDataManage/factoryModeling/warehouse/index.vue @@ -33,7 +33,7 @@ diff --git a/src/views/wms/basicDataManage/factoryModeling/workshop/index.vue b/src/views/wms/basicDataManage/factoryModeling/workshop/index.vue index 55c1e18af..373bd5d8c 100644 --- a/src/views/wms/basicDataManage/factoryModeling/workshop/index.vue +++ b/src/views/wms/basicDataManage/factoryModeling/workshop/index.vue @@ -33,7 +33,7 @@ diff --git a/src/views/wms/basicDataManage/factoryModeling/workstation/index.vue b/src/views/wms/basicDataManage/factoryModeling/workstation/index.vue index b5506d157..c5e13b718 100644 --- a/src/views/wms/basicDataManage/factoryModeling/workstation/index.vue +++ b/src/views/wms/basicDataManage/factoryModeling/workstation/index.vue @@ -33,7 +33,7 @@ diff --git a/src/views/wms/basicDataManage/itemManage/bom/index.vue b/src/views/wms/basicDataManage/itemManage/bom/index.vue index 7cca4e859..1d7fcac23 100644 --- a/src/views/wms/basicDataManage/itemManage/bom/index.vue +++ b/src/views/wms/basicDataManage/itemManage/bom/index.vue @@ -33,7 +33,7 @@ diff --git a/src/views/wms/basicDataManage/itemManage/itemSyntheticRelation/index.vue b/src/views/wms/basicDataManage/itemManage/itemSyntheticRelation/index.vue index fdb7a3aa2..5de98af6c 100644 --- a/src/views/wms/basicDataManage/itemManage/itemSyntheticRelation/index.vue +++ b/src/views/wms/basicDataManage/itemManage/itemSyntheticRelation/index.vue @@ -33,7 +33,7 @@ diff --git a/src/views/wms/basicDataManage/itemManage/itembasic/index.vue b/src/views/wms/basicDataManage/itemManage/itembasic/index.vue index 078117066..396a37136 100644 --- a/src/views/wms/basicDataManage/itemManage/itembasic/index.vue +++ b/src/views/wms/basicDataManage/itemManage/itembasic/index.vue @@ -27,7 +27,7 @@ diff --git a/src/views/wms/basicDataManage/itemManage/itemwarehouse/index.vue b/src/views/wms/basicDataManage/itemManage/itemwarehouse/index.vue index 608621e1d..e3e02af26 100644 --- a/src/views/wms/basicDataManage/itemManage/itemwarehouse/index.vue +++ b/src/views/wms/basicDataManage/itemManage/itemwarehouse/index.vue @@ -33,7 +33,7 @@ diff --git a/src/views/wms/basicDataManage/itemManage/packageunit/index.vue b/src/views/wms/basicDataManage/itemManage/packageunit/index.vue index 78500a628..65f00a549 100644 --- a/src/views/wms/basicDataManage/itemManage/packageunit/index.vue +++ b/src/views/wms/basicDataManage/itemManage/packageunit/index.vue @@ -34,7 +34,7 @@ diff --git a/src/views/wms/basicDataManage/itemManage/productionitemcodeSpareitemcode/index.vue b/src/views/wms/basicDataManage/itemManage/productionitemcodeSpareitemcode/index.vue index a7c8168e6..4c68724e1 100644 --- a/src/views/wms/basicDataManage/itemManage/productionitemcodeSpareitemcode/index.vue +++ b/src/views/wms/basicDataManage/itemManage/productionitemcodeSpareitemcode/index.vue @@ -33,7 +33,7 @@ diff --git a/src/views/wms/basicDataManage/itemManage/productionlineitem/index.vue b/src/views/wms/basicDataManage/itemManage/productionlineitem/index.vue index 5314a421e..ba64bab4d 100644 --- a/src/views/wms/basicDataManage/itemManage/productionlineitem/index.vue +++ b/src/views/wms/basicDataManage/itemManage/productionlineitem/index.vue @@ -33,7 +33,7 @@ diff --git a/src/views/wms/basicDataManage/itemManage/stdcostprice/index.vue b/src/views/wms/basicDataManage/itemManage/stdcostprice/index.vue index d1035afbe..79262bcb8 100644 --- a/src/views/wms/basicDataManage/itemManage/stdcostprice/index.vue +++ b/src/views/wms/basicDataManage/itemManage/stdcostprice/index.vue @@ -33,7 +33,7 @@ diff --git a/src/views/wms/basicDataManage/labelManage/barbasic/index.vue b/src/views/wms/basicDataManage/labelManage/barbasic/index.vue index 139231a87..ad001b090 100644 --- a/src/views/wms/basicDataManage/labelManage/barbasic/index.vue +++ b/src/views/wms/basicDataManage/labelManage/barbasic/index.vue @@ -33,7 +33,7 @@ diff --git a/src/views/wms/basicDataManage/labelManage/barcode/index.vue b/src/views/wms/basicDataManage/labelManage/barcode/index.vue index 0228c7de1..aa099d59a 100644 --- a/src/views/wms/basicDataManage/labelManage/barcode/index.vue +++ b/src/views/wms/basicDataManage/labelManage/barcode/index.vue @@ -33,7 +33,7 @@ diff --git a/src/views/wms/basicDataManage/labelManage/callmaterials/index.vue b/src/views/wms/basicDataManage/labelManage/callmaterials/index.vue index d698ae13b..923bb7977 100644 --- a/src/views/wms/basicDataManage/labelManage/callmaterials/index.vue +++ b/src/views/wms/basicDataManage/labelManage/callmaterials/index.vue @@ -34,7 +34,7 @@ diff --git a/src/views/wms/basicDataManage/labelManage/labeltype/index.vue b/src/views/wms/basicDataManage/labelManage/labeltype/index.vue index 11b4ad08b..607c7ab09 100644 --- a/src/views/wms/basicDataManage/labelManage/labeltype/index.vue +++ b/src/views/wms/basicDataManage/labelManage/labeltype/index.vue @@ -33,7 +33,7 @@ diff --git a/src/views/wms/basicDataManage/labelManage/locationLabel/index.vue b/src/views/wms/basicDataManage/labelManage/locationLabel/index.vue index daa86d07c..04a8228b2 100644 --- a/src/views/wms/basicDataManage/labelManage/locationLabel/index.vue +++ b/src/views/wms/basicDataManage/labelManage/locationLabel/index.vue @@ -34,7 +34,7 @@ diff --git a/src/views/wms/basicDataManage/labelManage/manufacturePackage/index.vue b/src/views/wms/basicDataManage/labelManage/manufacturePackage/index.vue index 496b188be..92f4cda52 100644 --- a/src/views/wms/basicDataManage/labelManage/manufacturePackage/index.vue +++ b/src/views/wms/basicDataManage/labelManage/manufacturePackage/index.vue @@ -33,7 +33,7 @@ diff --git a/src/views/wms/basicDataManage/labelManage/purchasePackage/index.vue b/src/views/wms/basicDataManage/labelManage/purchasePackage/index.vue index 27b812a0d..5f725a426 100644 --- a/src/views/wms/basicDataManage/labelManage/purchasePackage/index.vue +++ b/src/views/wms/basicDataManage/labelManage/purchasePackage/index.vue @@ -33,7 +33,7 @@ diff --git a/src/views/wms/basicDataManage/labelManage/utensilPackage/index.vue b/src/views/wms/basicDataManage/labelManage/utensilPackage/index.vue index 919eb3347..662ba7dd2 100644 --- a/src/views/wms/basicDataManage/labelManage/utensilPackage/index.vue +++ b/src/views/wms/basicDataManage/labelManage/utensilPackage/index.vue @@ -33,7 +33,7 @@ diff --git a/src/views/wms/basicDataManage/orderManage/carrier/index.vue b/src/views/wms/basicDataManage/orderManage/carrier/index.vue index ef2c07c70..a5d9d2b0a 100644 --- a/src/views/wms/basicDataManage/orderManage/carrier/index.vue +++ b/src/views/wms/basicDataManage/orderManage/carrier/index.vue @@ -33,7 +33,7 @@ diff --git a/src/views/wms/basicDataManage/orderManage/owner/index.vue b/src/views/wms/basicDataManage/orderManage/owner/index.vue index 17168e7cd..eac4d43f1 100644 --- a/src/views/wms/basicDataManage/orderManage/owner/index.vue +++ b/src/views/wms/basicDataManage/orderManage/owner/index.vue @@ -33,7 +33,7 @@ diff --git a/src/views/wms/basicDataManage/orderManage/shift/index.vue b/src/views/wms/basicDataManage/orderManage/shift/index.vue index f8d72f261..0989c2905 100644 --- a/src/views/wms/basicDataManage/orderManage/shift/index.vue +++ b/src/views/wms/basicDataManage/orderManage/shift/index.vue @@ -33,7 +33,7 @@ diff --git a/src/views/wms/basicDataManage/orderManage/team/index.vue b/src/views/wms/basicDataManage/orderManage/team/index.vue index 1b13768ce..b424a794a 100644 --- a/src/views/wms/basicDataManage/orderManage/team/index.vue +++ b/src/views/wms/basicDataManage/orderManage/team/index.vue @@ -33,7 +33,7 @@ diff --git a/src/views/wms/basicDataManage/strategySetting/condition/index.vue b/src/views/wms/basicDataManage/strategySetting/condition/index.vue index fe01c9e46..7f1168c6b 100644 --- a/src/views/wms/basicDataManage/strategySetting/condition/index.vue +++ b/src/views/wms/basicDataManage/strategySetting/condition/index.vue @@ -33,7 +33,7 @@ diff --git a/src/views/wms/basicDataManage/strategySetting/configuration/index.vue b/src/views/wms/basicDataManage/strategySetting/configuration/index.vue index 4207641fd..6d1bd428e 100644 --- a/src/views/wms/basicDataManage/strategySetting/configuration/index.vue +++ b/src/views/wms/basicDataManage/strategySetting/configuration/index.vue @@ -33,7 +33,7 @@ diff --git a/src/views/wms/basicDataManage/strategySetting/configurationsetting/index.vue b/src/views/wms/basicDataManage/strategySetting/configurationsetting/index.vue index 97c9e7e17..9724e7454 100644 --- a/src/views/wms/basicDataManage/strategySetting/configurationsetting/index.vue +++ b/src/views/wms/basicDataManage/strategySetting/configurationsetting/index.vue @@ -37,7 +37,7 @@ diff --git a/src/views/wms/basicDataManage/strategySetting/paramsetting/index.vue b/src/views/wms/basicDataManage/strategySetting/paramsetting/index.vue index f4de1748c..b9d91f582 100644 --- a/src/views/wms/basicDataManage/strategySetting/paramsetting/index.vue +++ b/src/views/wms/basicDataManage/strategySetting/paramsetting/index.vue @@ -33,7 +33,7 @@ diff --git a/src/views/wms/basicDataManage/strategySetting/rule/index.vue b/src/views/wms/basicDataManage/strategySetting/rule/index.vue index 6ed2a8dcc..1619ba5ae 100644 --- a/src/views/wms/basicDataManage/strategySetting/rule/index.vue +++ b/src/views/wms/basicDataManage/strategySetting/rule/index.vue @@ -37,7 +37,7 @@ diff --git a/src/views/wms/basicDataManage/subject/mstr/index.vue b/src/views/wms/basicDataManage/subject/mstr/index.vue index 64df63efc..bfb1e30ff 100644 --- a/src/views/wms/basicDataManage/subject/mstr/index.vue +++ b/src/views/wms/basicDataManage/subject/mstr/index.vue @@ -33,7 +33,7 @@ diff --git a/src/views/wms/basicDataManage/subject/qadCostcentre/index.vue b/src/views/wms/basicDataManage/subject/qadCostcentre/index.vue index 2a5af579d..92e016ed8 100644 --- a/src/views/wms/basicDataManage/subject/qadCostcentre/index.vue +++ b/src/views/wms/basicDataManage/subject/qadCostcentre/index.vue @@ -33,7 +33,7 @@ diff --git a/src/views/wms/basicDataManage/subject/qadProject/index.vue b/src/views/wms/basicDataManage/subject/qadProject/index.vue index 32539d6a4..471483e68 100644 --- a/src/views/wms/basicDataManage/subject/qadProject/index.vue +++ b/src/views/wms/basicDataManage/subject/qadProject/index.vue @@ -33,7 +33,7 @@ diff --git a/src/views/wms/basicDataManage/subject/subjectAccount/index.vue b/src/views/wms/basicDataManage/subject/subjectAccount/index.vue index 906898ae0..5ee057e3d 100644 --- a/src/views/wms/basicDataManage/subject/subjectAccount/index.vue +++ b/src/views/wms/basicDataManage/subject/subjectAccount/index.vue @@ -33,7 +33,7 @@ diff --git a/src/views/wms/basicDataManage/supplierManage/purchaseprice/index.vue b/src/views/wms/basicDataManage/supplierManage/purchaseprice/index.vue index 1976de2c4..3adc162e9 100644 --- a/src/views/wms/basicDataManage/supplierManage/purchaseprice/index.vue +++ b/src/views/wms/basicDataManage/supplierManage/purchaseprice/index.vue @@ -33,7 +33,7 @@ diff --git a/src/views/wms/basicDataManage/supplierManage/supplier/index.vue b/src/views/wms/basicDataManage/supplierManage/supplier/index.vue index 39522d698..8f2faf30c 100644 --- a/src/views/wms/basicDataManage/supplierManage/supplier/index.vue +++ b/src/views/wms/basicDataManage/supplierManage/supplier/index.vue @@ -33,7 +33,7 @@ diff --git a/src/views/wms/basicDataManage/supplierManage/supplierCycle/index.vue b/src/views/wms/basicDataManage/supplierManage/supplierCycle/index.vue index 951cc7519..50cb8cde4 100644 --- a/src/views/wms/basicDataManage/supplierManage/supplierCycle/index.vue +++ b/src/views/wms/basicDataManage/supplierManage/supplierCycle/index.vue @@ -49,7 +49,7 @@ diff --git a/src/views/wms/basicDataManage/supplierManage/supplieritem/index.vue b/src/views/wms/basicDataManage/supplierManage/supplieritem/index.vue index 9dc9b43fb..844d05b9d 100644 --- a/src/views/wms/basicDataManage/supplierManage/supplieritem/index.vue +++ b/src/views/wms/basicDataManage/supplierManage/supplieritem/index.vue @@ -33,7 +33,7 @@ diff --git a/src/views/wms/basicDataManage/systemSetting/accountcalendar/index.vue b/src/views/wms/basicDataManage/systemSetting/accountcalendar/index.vue index eb0a90c30..eba409151 100644 --- a/src/views/wms/basicDataManage/systemSetting/accountcalendar/index.vue +++ b/src/views/wms/basicDataManage/systemSetting/accountcalendar/index.vue @@ -33,7 +33,7 @@ diff --git a/src/views/wms/basicDataManage/systemSetting/currencyexchange/index.vue b/src/views/wms/basicDataManage/systemSetting/currencyexchange/index.vue index 7539af6cf..d953505bd 100644 --- a/src/views/wms/basicDataManage/systemSetting/currencyexchange/index.vue +++ b/src/views/wms/basicDataManage/systemSetting/currencyexchange/index.vue @@ -33,7 +33,7 @@ diff --git a/src/views/wms/basicDataManage/systemSetting/supplierUser/index.vue b/src/views/wms/basicDataManage/systemSetting/supplierUser/index.vue index 2e8298e25..d8e50c08a 100644 --- a/src/views/wms/basicDataManage/systemSetting/supplierUser/index.vue +++ b/src/views/wms/basicDataManage/systemSetting/supplierUser/index.vue @@ -32,7 +32,7 @@ {{ row.id }} - diff --git a/src/views/wms/purchasereceiptManage/amvpurchasereceipt/amvPurchasereceiptRecordMain/index.vue b/src/views/wms/purchasereceiptManage/amvpurchasereceipt/amvPurchasereceiptRecordMain/index.vue index b2aab24a8..02d14668c 100644 --- a/src/views/wms/purchasereceiptManage/amvpurchasereceipt/amvPurchasereceiptRecordMain/index.vue +++ b/src/views/wms/purchasereceiptManage/amvpurchasereceipt/amvPurchasereceiptRecordMain/index.vue @@ -42,7 +42,7 @@ diff --git a/src/views/wms/purchasereceiptManage/developpurchasereceipt/developPurchasereceiptRequestMain/purchasereceiptRequestMain.data.ts b/src/views/wms/purchasereceiptManage/developpurchasereceipt/developPurchasereceiptRequestMain/purchasereceiptRequestMain.data.ts index 0f880d9d8..4093efc95 100644 --- a/src/views/wms/purchasereceiptManage/developpurchasereceipt/developPurchasereceiptRequestMain/purchasereceiptRequestMain.data.ts +++ b/src/views/wms/purchasereceiptManage/developpurchasereceipt/developPurchasereceiptRequestMain/purchasereceiptRequestMain.data.ts @@ -574,7 +574,7 @@ export const PurchasereceiptRequestMain = useCrudSchemas(reactive( isDetail: false, isForm: false, table: { - width: 400, + width: 250, fixed: 'right' }, } diff --git a/src/views/wms/purchasereceiptManage/jispurchasereceipt/jisPurchasereceiptRecordMain/index.vue b/src/views/wms/purchasereceiptManage/jispurchasereceipt/jisPurchasereceiptRecordMain/index.vue index e6dd1d9cd..b50ef114d 100644 --- a/src/views/wms/purchasereceiptManage/jispurchasereceipt/jisPurchasereceiptRecordMain/index.vue +++ b/src/views/wms/purchasereceiptManage/jispurchasereceipt/jisPurchasereceiptRecordMain/index.vue @@ -42,7 +42,7 @@ diff --git a/src/views/wms/purchasereceiptManage/jispurchasereceipt/jisPurchasereceiptRequestMain/purchasereceiptRequestMain.data.ts b/src/views/wms/purchasereceiptManage/jispurchasereceipt/jisPurchasereceiptRequestMain/purchasereceiptRequestMain.data.ts index 0f880d9d8..4093efc95 100644 --- a/src/views/wms/purchasereceiptManage/jispurchasereceipt/jisPurchasereceiptRequestMain/purchasereceiptRequestMain.data.ts +++ b/src/views/wms/purchasereceiptManage/jispurchasereceipt/jisPurchasereceiptRequestMain/purchasereceiptRequestMain.data.ts @@ -574,7 +574,7 @@ export const PurchasereceiptRequestMain = useCrudSchemas(reactive( isDetail: false, isForm: false, table: { - width: 400, + width: 250, fixed: 'right' }, } diff --git a/src/views/wms/purchasereceiptManage/purchaseBarter/purchaseBarterRecord/index.vue b/src/views/wms/purchasereceiptManage/purchaseBarter/purchaseBarterRecord/index.vue index b3c3c1724..51cc1081a 100644 --- a/src/views/wms/purchasereceiptManage/purchaseBarter/purchaseBarterRecord/index.vue +++ b/src/views/wms/purchasereceiptManage/purchaseBarter/purchaseBarterRecord/index.vue @@ -34,7 +34,7 @@ diff --git a/src/views/wms/purchasereceiptManage/purchaseBarter/purchaseBarterRequest/index.vue b/src/views/wms/purchasereceiptManage/purchaseBarter/purchaseBarterRequest/index.vue index c470ac062..fb1691de2 100644 --- a/src/views/wms/purchasereceiptManage/purchaseBarter/purchaseBarterRequest/index.vue +++ b/src/views/wms/purchasereceiptManage/purchaseBarter/purchaseBarterRequest/index.vue @@ -34,7 +34,7 @@ diff --git a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptJobMain/index.vue b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptJobMain/index.vue index 62ff3af95..9429f85e2 100644 --- a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptJobMain/index.vue +++ b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptJobMain/index.vue @@ -42,7 +42,7 @@ diff --git a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/purchasereceiptRequestMain.data.ts b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/purchasereceiptRequestMain.data.ts index 2f24ec276..9de876502 100644 --- a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/purchasereceiptRequestMain.data.ts +++ b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/purchasereceiptRequestMain.data.ts @@ -575,7 +575,7 @@ export const PurchasereceiptRequestMain = useCrudSchemas(reactive( isDetail: false, isForm: false, table: { - width: 400, + width: 250, fixed: 'right' }, } diff --git a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnJobMain/index.vue b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnJobMain/index.vue index eb6f0d841..55a205daa 100644 --- a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnJobMain/index.vue +++ b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnJobMain/index.vue @@ -34,7 +34,7 @@ diff --git a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnJobMain/purchasereturnJobMain.data.ts b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnJobMain/purchasereturnJobMain.data.ts index af7e7444e..8596e7454 100644 --- a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnJobMain/purchasereturnJobMain.data.ts +++ b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnJobMain/purchasereturnJobMain.data.ts @@ -653,7 +653,7 @@ export const PurchasereturnJobMain = useCrudSchemas( isDetail: false, isForm: false, table: { - width: 120, + width: 200, fixed: 'right' } } diff --git a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/index.vue b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/index.vue index 02e56721a..31d3ca616 100644 --- a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/index.vue +++ b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/index.vue @@ -42,7 +42,7 @@ diff --git a/src/views/wms/purchasereceiptManage/putaway/putawayRecordMain/index.vue b/src/views/wms/purchasereceiptManage/putaway/putawayRecordMain/index.vue index 333dc6252..7df79ab40 100644 --- a/src/views/wms/purchasereceiptManage/putaway/putawayRecordMain/index.vue +++ b/src/views/wms/purchasereceiptManage/putaway/putawayRecordMain/index.vue @@ -34,7 +34,7 @@ diff --git a/src/views/wms/purchasereceiptManage/putaway/putawayRequestMain/index.vue b/src/views/wms/purchasereceiptManage/putaway/putawayRequestMain/index.vue index 761f37e8f..65e05a548 100644 --- a/src/views/wms/purchasereceiptManage/putaway/putawayRequestMain/index.vue +++ b/src/views/wms/purchasereceiptManage/putaway/putawayRequestMain/index.vue @@ -34,7 +34,7 @@ diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/purchaseMainWms/index.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/purchaseMainWms/index.vue index fe8028ee6..04a135b84 100644 --- a/src/views/wms/purchasereceiptManage/supplierdeliver/purchaseMainWms/index.vue +++ b/src/views/wms/purchasereceiptManage/supplierdeliver/purchaseMainWms/index.vue @@ -37,7 +37,7 @@ diff --git a/src/views/wms/purchasereceiptManage/toolpurchasereceipt/toolPurchasereceiptJobMain/index.vue b/src/views/wms/purchasereceiptManage/toolpurchasereceipt/toolPurchasereceiptJobMain/index.vue index 29c8049ae..eff2eb80b 100644 --- a/src/views/wms/purchasereceiptManage/toolpurchasereceipt/toolPurchasereceiptJobMain/index.vue +++ b/src/views/wms/purchasereceiptManage/toolpurchasereceipt/toolPurchasereceiptJobMain/index.vue @@ -42,7 +42,7 @@ diff --git a/src/views/wms/purchasereceiptManage/toolpurchasereceipt/toolPurchasereceiptRequestMain/purchasereceiptRequestMain.data.ts b/src/views/wms/purchasereceiptManage/toolpurchasereceipt/toolPurchasereceiptRequestMain/purchasereceiptRequestMain.data.ts index 0f880d9d8..4093efc95 100644 --- a/src/views/wms/purchasereceiptManage/toolpurchasereceipt/toolPurchasereceiptRequestMain/purchasereceiptRequestMain.data.ts +++ b/src/views/wms/purchasereceiptManage/toolpurchasereceipt/toolPurchasereceiptRequestMain/purchasereceiptRequestMain.data.ts @@ -574,7 +574,7 @@ export const PurchasereceiptRequestMain = useCrudSchemas(reactive( isDetail: false, isForm: false, table: { - width: 400, + width: 250, fixed: 'right' }, } From f56bbea99cee0d1eb18557c08eeb250d29036294 Mon Sep 17 00:00:00 2001 From: zhang_li <2235006734@qqq.com> Date: Sun, 15 Dec 2024 11:12:31 +0800 Subject: [PATCH 098/213] =?UTF-8?q?=E5=8F=91=E8=BF=90=E7=BB=93=E7=AE=97?= =?UTF-8?q?=E4=B9=8B=E5=89=8D=E7=9A=84=E6=8C=89=E9=92=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../customerSaleInvoiceRequestMain/index.vue | 2 +- .../deliversettlementManage/deliver/deliverJobMain/index.vue | 2 +- .../deliversettlementManage/deliver/deliverRecordMain/index.vue | 2 +- .../deliver/deliverRequestMain/deliverRequestMain.data.ts | 2 +- .../deliver/deliverRequestMain/index.vue | 2 +- .../deliverplan/deliverPlanMain/index.vue | 2 +- .../wms/deliversettlementManage/deliverplan/saleMain/index.vue | 2 +- .../directSupplyPinRecordMain/deliverRecordMain/index.vue | 2 +- .../ftSuppliesRecordMain/deliverRecordMain/index.vue | 2 +- .../inducedProduct/deliverRecordMain/index.vue | 2 +- .../moldAllocation/customerStatement/index.vue | 2 +- .../moldAllocation/customerStatementShareRecord/index.vue | 2 +- .../customerToolApportStatementForecastMain/index.vue | 2 +- .../deliversettlementManage/saleShipmentMainRecord/index.vue | 2 +- .../deliversettlementManage/saleShipmentMainRequest/index.vue | 2 +- .../ssSuppliesRecordMain/deliverRecordMain/index.vue | 2 +- .../deliversettlementManage/stockup/stockupMainJob/index.vue | 2 +- .../deliversettlementManage/stockup/stockupMainRecord/index.vue | 2 +- .../stockup/stockupMainRequest/index.vue | 2 +- .../tjdtSuppliesRecordMain/deliverRecordMain/index.vue | 2 +- src/views/wms/issueManage/issue/issueJobMain/index.vue | 2 +- .../wms/issueManage/issue/issueJobMain/issueJobMain.data.ts | 2 +- src/views/wms/issueManage/issue/issueRecordMain/index.vue | 2 +- src/views/wms/issueManage/issue/issueRequestMain/index.vue | 2 +- .../onlinesettlement/onlinesettlementRecordMain/index.vue | 2 +- .../onlinesettlement/onlinesettlementRequestMain/index.vue | 2 +- .../productionreceipt/productionreceiptJobMain/index.vue | 2 +- .../productionreceipt/productionreceiptRecordMain/index.vue | 2 +- .../productionreturn/productionreturnJobMain/index.vue | 2 +- .../productionreturn/productionreturnRecordMain/index.vue | 2 +- .../productionreturn/productionreturnRecordMainHold/index.vue | 2 +- .../productionreturn/productionreturnRequestMain/index.vue | 2 +- .../productionreturn/productionreturnRequestMainNo/index.vue | 2 +- .../productionManage/productionplan/productionMain/index.vue | 2 +- .../productionplan/productionMainAssemble/index.vue | 2 +- .../productionplan/productionMainAssembleSparePart/index.vue | 2 +- .../productionplan/productionMainPredictSparePart/index.vue | 2 +- .../productionManage/productionplan/qadproductionplan/index.vue | 2 +- .../productreceipt/productreceiptJobMain/index.vue | 2 +- .../productreceipt/productreceiptRecordMain/index.vue | 2 +- .../productreceiptRecordMain/productreceiptRecordMain.data.ts | 2 +- .../productreceipt/productreceiptRequestMain/index.vue | 2 +- .../mesRawMaterialConsumptionInfo/index.vue | 2 +- .../productreceiptAssembleJobMain/index.vue | 2 +- .../productreceiptAssembleRecordMain/index.vue | 2 +- .../productreceiptAssembleRecordMain.data.ts | 2 +- .../productreceiptAssembleRequestMain/index.vue | 2 +- .../productreceiptAssembleRequestMain.data.ts | 2 +- .../productredress/productredressJobMain/index.vue | 2 +- .../productredress/productredressRecordMain/index.vue | 2 +- .../productredress/productredressRequestMain/index.vue | 2 +- 51 files changed, 51 insertions(+), 51 deletions(-) diff --git a/src/views/wms/deliversettlementManage/customerSaleInvoiceRequestMain/index.vue b/src/views/wms/deliversettlementManage/customerSaleInvoiceRequestMain/index.vue index 7a89b4eb2..c327618fc 100644 --- a/src/views/wms/deliversettlementManage/customerSaleInvoiceRequestMain/index.vue +++ b/src/views/wms/deliversettlementManage/customerSaleInvoiceRequestMain/index.vue @@ -33,7 +33,7 @@ diff --git a/src/views/wms/deliversettlementManage/deliver/deliverJobMain/index.vue b/src/views/wms/deliversettlementManage/deliver/deliverJobMain/index.vue index 25d4c3990..eb33043b3 100644 --- a/src/views/wms/deliversettlementManage/deliver/deliverJobMain/index.vue +++ b/src/views/wms/deliversettlementManage/deliver/deliverJobMain/index.vue @@ -34,7 +34,7 @@ diff --git a/src/views/wms/deliversettlementManage/deliver/deliverRecordMain/index.vue b/src/views/wms/deliversettlementManage/deliver/deliverRecordMain/index.vue index a5ae5a1bc..a498edadb 100644 --- a/src/views/wms/deliversettlementManage/deliver/deliverRecordMain/index.vue +++ b/src/views/wms/deliversettlementManage/deliver/deliverRecordMain/index.vue @@ -34,7 +34,7 @@ diff --git a/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/deliverRequestMain.data.ts b/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/deliverRequestMain.data.ts index e26dc5738..2a3e0f2d3 100644 --- a/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/deliverRequestMain.data.ts +++ b/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/deliverRequestMain.data.ts @@ -674,7 +674,7 @@ export const DeliverRequestMain = useCrudSchemas( isDetail: false, isForm: false, table: { - width: 300, + width: 250, fixed: 'right' } } diff --git a/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/index.vue b/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/index.vue index dd94e3f2a..fc8e9579e 100644 --- a/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/index.vue +++ b/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/index.vue @@ -36,7 +36,7 @@ diff --git a/src/views/wms/deliversettlementManage/deliverplan/deliverPlanMain/index.vue b/src/views/wms/deliversettlementManage/deliverplan/deliverPlanMain/index.vue index 78cbad88b..50c6cfa46 100644 --- a/src/views/wms/deliversettlementManage/deliverplan/deliverPlanMain/index.vue +++ b/src/views/wms/deliversettlementManage/deliverplan/deliverPlanMain/index.vue @@ -34,7 +34,7 @@ diff --git a/src/views/wms/deliversettlementManage/deliverplan/saleMain/index.vue b/src/views/wms/deliversettlementManage/deliverplan/saleMain/index.vue index de7788fe2..2bb07ae55 100644 --- a/src/views/wms/deliversettlementManage/deliverplan/saleMain/index.vue +++ b/src/views/wms/deliversettlementManage/deliverplan/saleMain/index.vue @@ -33,7 +33,7 @@ diff --git a/src/views/wms/deliversettlementManage/directSupplyPinRecordMain/deliverRecordMain/index.vue b/src/views/wms/deliversettlementManage/directSupplyPinRecordMain/deliverRecordMain/index.vue index 22f2846e5..0441b0036 100644 --- a/src/views/wms/deliversettlementManage/directSupplyPinRecordMain/deliverRecordMain/index.vue +++ b/src/views/wms/deliversettlementManage/directSupplyPinRecordMain/deliverRecordMain/index.vue @@ -36,7 +36,7 @@ diff --git a/src/views/wms/deliversettlementManage/ftSuppliesRecordMain/deliverRecordMain/index.vue b/src/views/wms/deliversettlementManage/ftSuppliesRecordMain/deliverRecordMain/index.vue index 3a6653aa8..c93269583 100644 --- a/src/views/wms/deliversettlementManage/ftSuppliesRecordMain/deliverRecordMain/index.vue +++ b/src/views/wms/deliversettlementManage/ftSuppliesRecordMain/deliverRecordMain/index.vue @@ -32,7 +32,7 @@ diff --git a/src/views/wms/deliversettlementManage/inducedProduct/deliverRecordMain/index.vue b/src/views/wms/deliversettlementManage/inducedProduct/deliverRecordMain/index.vue index 19d3fa775..2d6d12c7b 100644 --- a/src/views/wms/deliversettlementManage/inducedProduct/deliverRecordMain/index.vue +++ b/src/views/wms/deliversettlementManage/inducedProduct/deliverRecordMain/index.vue @@ -34,7 +34,7 @@ diff --git a/src/views/wms/deliversettlementManage/moldAllocation/customerStatement/index.vue b/src/views/wms/deliversettlementManage/moldAllocation/customerStatement/index.vue index 9f6877b72..4bd82c649 100644 --- a/src/views/wms/deliversettlementManage/moldAllocation/customerStatement/index.vue +++ b/src/views/wms/deliversettlementManage/moldAllocation/customerStatement/index.vue @@ -37,7 +37,7 @@ diff --git a/src/views/wms/deliversettlementManage/saleShipmentMainRecord/index.vue b/src/views/wms/deliversettlementManage/saleShipmentMainRecord/index.vue index 61506a1e2..927298f00 100644 --- a/src/views/wms/deliversettlementManage/saleShipmentMainRecord/index.vue +++ b/src/views/wms/deliversettlementManage/saleShipmentMainRecord/index.vue @@ -34,7 +34,7 @@ diff --git a/src/views/wms/deliversettlementManage/saleShipmentMainRequest/index.vue b/src/views/wms/deliversettlementManage/saleShipmentMainRequest/index.vue index 7f8cff2c0..6ddbe3d19 100644 --- a/src/views/wms/deliversettlementManage/saleShipmentMainRequest/index.vue +++ b/src/views/wms/deliversettlementManage/saleShipmentMainRequest/index.vue @@ -34,7 +34,7 @@ diff --git a/src/views/wms/deliversettlementManage/ssSuppliesRecordMain/deliverRecordMain/index.vue b/src/views/wms/deliversettlementManage/ssSuppliesRecordMain/deliverRecordMain/index.vue index 726229bd0..55d7364b5 100644 --- a/src/views/wms/deliversettlementManage/ssSuppliesRecordMain/deliverRecordMain/index.vue +++ b/src/views/wms/deliversettlementManage/ssSuppliesRecordMain/deliverRecordMain/index.vue @@ -32,7 +32,7 @@ diff --git a/src/views/wms/deliversettlementManage/stockup/stockupMainJob/index.vue b/src/views/wms/deliversettlementManage/stockup/stockupMainJob/index.vue index e27f39d42..5022a75cf 100644 --- a/src/views/wms/deliversettlementManage/stockup/stockupMainJob/index.vue +++ b/src/views/wms/deliversettlementManage/stockup/stockupMainJob/index.vue @@ -34,7 +34,7 @@ diff --git a/src/views/wms/deliversettlementManage/stockup/stockupMainRecord/index.vue b/src/views/wms/deliversettlementManage/stockup/stockupMainRecord/index.vue index fec5b97f8..034448d7c 100644 --- a/src/views/wms/deliversettlementManage/stockup/stockupMainRecord/index.vue +++ b/src/views/wms/deliversettlementManage/stockup/stockupMainRecord/index.vue @@ -34,7 +34,7 @@ diff --git a/src/views/wms/deliversettlementManage/stockup/stockupMainRequest/index.vue b/src/views/wms/deliversettlementManage/stockup/stockupMainRequest/index.vue index 7707a7642..c67708289 100644 --- a/src/views/wms/deliversettlementManage/stockup/stockupMainRequest/index.vue +++ b/src/views/wms/deliversettlementManage/stockup/stockupMainRequest/index.vue @@ -35,7 +35,7 @@ diff --git a/src/views/wms/deliversettlementManage/tjdtSuppliesRecordMain/deliverRecordMain/index.vue b/src/views/wms/deliversettlementManage/tjdtSuppliesRecordMain/deliverRecordMain/index.vue index 3fc3dd5e0..0cbcab91e 100644 --- a/src/views/wms/deliversettlementManage/tjdtSuppliesRecordMain/deliverRecordMain/index.vue +++ b/src/views/wms/deliversettlementManage/tjdtSuppliesRecordMain/deliverRecordMain/index.vue @@ -32,7 +32,7 @@ diff --git a/src/views/wms/issueManage/issue/issueJobMain/index.vue b/src/views/wms/issueManage/issue/issueJobMain/index.vue index 722dce117..229f3a99a 100644 --- a/src/views/wms/issueManage/issue/issueJobMain/index.vue +++ b/src/views/wms/issueManage/issue/issueJobMain/index.vue @@ -34,7 +34,7 @@ diff --git a/src/views/wms/issueManage/issue/issueJobMain/issueJobMain.data.ts b/src/views/wms/issueManage/issue/issueJobMain/issueJobMain.data.ts index b2b49b0dc..639b76967 100644 --- a/src/views/wms/issueManage/issue/issueJobMain/issueJobMain.data.ts +++ b/src/views/wms/issueManage/issue/issueJobMain/issueJobMain.data.ts @@ -637,7 +637,7 @@ export const IssueJobMain = useCrudSchemas( isDetail: false, isForm: false, table: { - width: 120, + width: 200, fixed: 'right' } } diff --git a/src/views/wms/issueManage/issue/issueRecordMain/index.vue b/src/views/wms/issueManage/issue/issueRecordMain/index.vue index 31130ca53..530f99d33 100644 --- a/src/views/wms/issueManage/issue/issueRecordMain/index.vue +++ b/src/views/wms/issueManage/issue/issueRecordMain/index.vue @@ -34,7 +34,7 @@ diff --git a/src/views/wms/issueManage/issue/issueRequestMain/index.vue b/src/views/wms/issueManage/issue/issueRequestMain/index.vue index c2246c291..73a6e4b00 100644 --- a/src/views/wms/issueManage/issue/issueRequestMain/index.vue +++ b/src/views/wms/issueManage/issue/issueRequestMain/index.vue @@ -34,7 +34,7 @@ diff --git a/src/views/wms/issueManage/onlinesettlement/onlinesettlementRecordMain/index.vue b/src/views/wms/issueManage/onlinesettlement/onlinesettlementRecordMain/index.vue index 54e593df5..95fb5dd4b 100644 --- a/src/views/wms/issueManage/onlinesettlement/onlinesettlementRecordMain/index.vue +++ b/src/views/wms/issueManage/onlinesettlement/onlinesettlementRecordMain/index.vue @@ -33,7 +33,7 @@ diff --git a/src/views/wms/issueManage/onlinesettlement/onlinesettlementRequestMain/index.vue b/src/views/wms/issueManage/onlinesettlement/onlinesettlementRequestMain/index.vue index 1c93ba061..dfa03ebfa 100644 --- a/src/views/wms/issueManage/onlinesettlement/onlinesettlementRequestMain/index.vue +++ b/src/views/wms/issueManage/onlinesettlement/onlinesettlementRequestMain/index.vue @@ -33,7 +33,7 @@ diff --git a/src/views/wms/issueManage/productionreceipt/productionreceiptJobMain/index.vue b/src/views/wms/issueManage/productionreceipt/productionreceiptJobMain/index.vue index d505694c4..3527d32cd 100644 --- a/src/views/wms/issueManage/productionreceipt/productionreceiptJobMain/index.vue +++ b/src/views/wms/issueManage/productionreceipt/productionreceiptJobMain/index.vue @@ -34,7 +34,7 @@ diff --git a/src/views/wms/issueManage/productionreceipt/productionreceiptRecordMain/index.vue b/src/views/wms/issueManage/productionreceipt/productionreceiptRecordMain/index.vue index 6abc52371..98c48efbe 100644 --- a/src/views/wms/issueManage/productionreceipt/productionreceiptRecordMain/index.vue +++ b/src/views/wms/issueManage/productionreceipt/productionreceiptRecordMain/index.vue @@ -34,7 +34,7 @@ diff --git a/src/views/wms/issueManage/productionreturn/productionreturnJobMain/index.vue b/src/views/wms/issueManage/productionreturn/productionreturnJobMain/index.vue index 3296a5f13..506ec34c1 100644 --- a/src/views/wms/issueManage/productionreturn/productionreturnJobMain/index.vue +++ b/src/views/wms/issueManage/productionreturn/productionreturnJobMain/index.vue @@ -34,7 +34,7 @@ diff --git a/src/views/wms/issueManage/productionreturn/productionreturnRecordMain/index.vue b/src/views/wms/issueManage/productionreturn/productionreturnRecordMain/index.vue index 87c75fc7c..3ce510117 100644 --- a/src/views/wms/issueManage/productionreturn/productionreturnRecordMain/index.vue +++ b/src/views/wms/issueManage/productionreturn/productionreturnRecordMain/index.vue @@ -34,7 +34,7 @@ diff --git a/src/views/wms/issueManage/productionreturn/productionreturnRecordMainHold/index.vue b/src/views/wms/issueManage/productionreturn/productionreturnRecordMainHold/index.vue index 773bc2f08..1f84ee174 100644 --- a/src/views/wms/issueManage/productionreturn/productionreturnRecordMainHold/index.vue +++ b/src/views/wms/issueManage/productionreturn/productionreturnRecordMainHold/index.vue @@ -34,7 +34,7 @@ diff --git a/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/index.vue b/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/index.vue index f6d305d7f..ffe2c8c6f 100644 --- a/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/index.vue +++ b/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/index.vue @@ -34,7 +34,7 @@ diff --git a/src/views/wms/issueManage/productionreturn/productionreturnRequestMainNo/index.vue b/src/views/wms/issueManage/productionreturn/productionreturnRequestMainNo/index.vue index bb512fad1..bfd8fbd42 100644 --- a/src/views/wms/issueManage/productionreturn/productionreturnRequestMainNo/index.vue +++ b/src/views/wms/issueManage/productionreturn/productionreturnRequestMainNo/index.vue @@ -34,7 +34,7 @@ diff --git a/src/views/wms/productionManage/productionplan/productionMain/index.vue b/src/views/wms/productionManage/productionplan/productionMain/index.vue index 04e3b9276..7e06ebd26 100644 --- a/src/views/wms/productionManage/productionplan/productionMain/index.vue +++ b/src/views/wms/productionManage/productionplan/productionMain/index.vue @@ -34,7 +34,7 @@ diff --git a/src/views/wms/productionManage/productionplan/productionMainAssemble/index.vue b/src/views/wms/productionManage/productionplan/productionMainAssemble/index.vue index dea878132..1cbb188f7 100644 --- a/src/views/wms/productionManage/productionplan/productionMainAssemble/index.vue +++ b/src/views/wms/productionManage/productionplan/productionMainAssemble/index.vue @@ -34,7 +34,7 @@ diff --git a/src/views/wms/productionManage/productionplan/productionMainAssembleSparePart/index.vue b/src/views/wms/productionManage/productionplan/productionMainAssembleSparePart/index.vue index 5f1d7a00b..79286db72 100644 --- a/src/views/wms/productionManage/productionplan/productionMainAssembleSparePart/index.vue +++ b/src/views/wms/productionManage/productionplan/productionMainAssembleSparePart/index.vue @@ -34,7 +34,7 @@ diff --git a/src/views/wms/productionManage/productionplan/productionMainPredictSparePart/index.vue b/src/views/wms/productionManage/productionplan/productionMainPredictSparePart/index.vue index a75670988..f20ed9e58 100644 --- a/src/views/wms/productionManage/productionplan/productionMainPredictSparePart/index.vue +++ b/src/views/wms/productionManage/productionplan/productionMainPredictSparePart/index.vue @@ -34,7 +34,7 @@ diff --git a/src/views/wms/productionManage/productionplan/qadproductionplan/index.vue b/src/views/wms/productionManage/productionplan/qadproductionplan/index.vue index adcda4b32..0faff37ec 100644 --- a/src/views/wms/productionManage/productionplan/qadproductionplan/index.vue +++ b/src/views/wms/productionManage/productionplan/qadproductionplan/index.vue @@ -33,7 +33,7 @@ diff --git a/src/views/wms/productionManage/productreceipt/productreceiptJobMain/index.vue b/src/views/wms/productionManage/productreceipt/productreceiptJobMain/index.vue index bc10aba3e..feb410a26 100644 --- a/src/views/wms/productionManage/productreceipt/productreceiptJobMain/index.vue +++ b/src/views/wms/productionManage/productreceipt/productreceiptJobMain/index.vue @@ -34,7 +34,7 @@ diff --git a/src/views/wms/productionManage/productreceipt/productreceiptRecordMain/index.vue b/src/views/wms/productionManage/productreceipt/productreceiptRecordMain/index.vue index 375776ab8..66dcb8660 100644 --- a/src/views/wms/productionManage/productreceipt/productreceiptRecordMain/index.vue +++ b/src/views/wms/productionManage/productreceipt/productreceiptRecordMain/index.vue @@ -45,7 +45,7 @@ diff --git a/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRecordMain/index.vue b/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRecordMain/index.vue index aaabd87ad..00d7fe4a8 100644 --- a/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRecordMain/index.vue +++ b/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRecordMain/index.vue @@ -37,7 +37,7 @@ diff --git a/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRecordMain/productreceiptAssembleRecordMain.data.ts b/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRecordMain/productreceiptAssembleRecordMain.data.ts index e3b004cc2..3dc878720 100644 --- a/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRecordMain/productreceiptAssembleRecordMain.data.ts +++ b/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRecordMain/productreceiptAssembleRecordMain.data.ts @@ -797,7 +797,7 @@ export const ProductreceiptRecordDetail = useCrudSchemas(reactive( isDetail: false, isForm: false , table: { - width: 410, + width: 250, fixed: 'right' }, hiddenInMain: false, diff --git a/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/index.vue b/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/index.vue index 40a025e5c..57b72ec43 100644 --- a/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/index.vue +++ b/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/index.vue @@ -34,7 +34,7 @@ diff --git a/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/productreceiptAssembleRequestMain.data.ts b/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/productreceiptAssembleRequestMain.data.ts index 9a7df4d64..904cfccf6 100644 --- a/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/productreceiptAssembleRequestMain.data.ts +++ b/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/productreceiptAssembleRequestMain.data.ts @@ -603,7 +603,7 @@ export const ProductreceiptRequestMain = useCrudSchemas(reactive([ isDetail: false, isForm: false, table: { - width: 300, + width:250, fixed: 'right' }, } diff --git a/src/views/wms/productionManage/productredress/productredressJobMain/index.vue b/src/views/wms/productionManage/productredress/productredressJobMain/index.vue index e44e29c50..dc45f95ee 100644 --- a/src/views/wms/productionManage/productredress/productredressJobMain/index.vue +++ b/src/views/wms/productionManage/productredress/productredressJobMain/index.vue @@ -34,7 +34,7 @@ diff --git a/src/views/wms/productionManage/productredress/productredressRecordMain/index.vue b/src/views/wms/productionManage/productredress/productredressRecordMain/index.vue index 1964bdc01..8e3c3e7aa 100644 --- a/src/views/wms/productionManage/productredress/productredressRecordMain/index.vue +++ b/src/views/wms/productionManage/productredress/productredressRecordMain/index.vue @@ -34,7 +34,7 @@ diff --git a/src/views/wms/productionManage/productredress/productredressRequestMain/index.vue b/src/views/wms/productionManage/productredress/productredressRequestMain/index.vue index 3a24bbdb5..05a72536b 100644 --- a/src/views/wms/productionManage/productredress/productredressRequestMain/index.vue +++ b/src/views/wms/productionManage/productredress/productredressRequestMain/index.vue @@ -34,7 +34,7 @@ From 589f1e89dd35359f47dcdacc274da7638edf4280 Mon Sep 17 00:00:00 2001 From: zhang_li <2235006734@qqq.com> Date: Sun, 15 Dec 2024 11:19:55 +0800 Subject: [PATCH 099/213] =?UTF-8?q?=E7=89=A9=E6=96=99=E9=9A=94=E7=A6=BB?= =?UTF-8?q?=E4=B9=8B=E5=89=8D=E6=8C=89=E9=92=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/wms/inventoryManage/balance/index.vue | 2 +- src/views/wms/inventoryManage/container/index.vue | 2 +- .../inventoryManage/containerinit/containerBindRecord/index.vue | 2 +- .../wms/inventoryManage/containerinit/containerRepair/index.vue | 2 +- .../containerinit/containerUnbindRecord/index.vue | 2 +- .../inventoryManage/containerinit/containerinitadd/index.vue | 2 +- .../inventoryManage/containerinit/containerinitrecord/index.vue | 2 +- src/views/wms/inventoryManage/expectin/index.vue | 2 +- src/views/wms/inventoryManage/expectout/index.vue | 2 +- src/views/wms/inventoryManage/package/index.vue | 2 +- .../inventoryinitial/inventoryinitRecordMain/index.vue | 2 +- .../inventoryinitial/inventoryinitRequestMain/index.vue | 2 +- .../inventoryjobManage/packageManage/packagemergeMain/index.vue | 2 +- .../packageManage/packageoverMain/packageoverJobMain/index.vue | 2 +- .../packageoverMain/packageoverRecordMain/index.vue | 2 +- .../packageoverMain/packageoverRequestMain/index.vue | 2 +- .../packageoverMain/packageoverRetrospect/index.vue | 2 +- .../inventoryjobManage/packageManage/packagesplitMain/index.vue | 2 +- src/views/wms/inventoryjobManage/scrap/scrapJobMain/index.vue | 2 +- .../wms/inventoryjobManage/scrap/scrapRecordMain/index.vue | 2 +- .../wms/inventoryjobManage/scrap/scrapRequestMain/index.vue | 2 +- .../sparepartReturn/sparepartReturnRecordMain/index.vue | 2 +- .../sparepartReturn/sparepartReturnRequestMain/index.vue | 2 +- .../sparepartsrequisitionJobMain/index.vue | 2 +- .../sparepartsrequisitionRecordMain/index.vue | 2 +- .../sparepartsrequisitionRequestMain/index.vue | 2 +- .../transferissue/transferissueJobMain/index.vue | 2 +- .../transferissue/transferissueRecordMain/index.vue | 2 +- .../transferissue/transferissueRequestMain/index.vue | 2 +- .../transferreceipt/transferreceiptJobMain/index.vue | 2 +- .../transferreceipt/transferreceiptRecordMain/index.vue | 2 +- .../transferreceipt/transferreceiptRequestMain/index.vue | 2 +- .../unplannedissue/unplannedissueJobMain/index.vue | 2 +- .../unplannedissue/unplannedissueRecordMain/index.vue | 2 +- .../unplannedissue/unplannedissueRequestMain/index.vue | 2 +- .../unplannedreceipt/unplannedreceiptJobMain/index.vue | 2 +- .../unplannedreceipt/unplannedreceiptRecordMain/index.vue | 2 +- .../unplannedreceipt/unplannedreceiptRequestMain/index.vue | 2 +- 38 files changed, 38 insertions(+), 38 deletions(-) diff --git a/src/views/wms/inventoryManage/balance/index.vue b/src/views/wms/inventoryManage/balance/index.vue index 3468d18f6..2cced6ae4 100644 --- a/src/views/wms/inventoryManage/balance/index.vue +++ b/src/views/wms/inventoryManage/balance/index.vue @@ -41,7 +41,7 @@ diff --git a/src/views/wms/inventoryManage/container/index.vue b/src/views/wms/inventoryManage/container/index.vue index 6102a66ba..13efc7aaf 100644 --- a/src/views/wms/inventoryManage/container/index.vue +++ b/src/views/wms/inventoryManage/container/index.vue @@ -33,7 +33,7 @@ diff --git a/src/views/wms/inventoryManage/containerinit/containerBindRecord/index.vue b/src/views/wms/inventoryManage/containerinit/containerBindRecord/index.vue index 004f6afb9..e162116dc 100644 --- a/src/views/wms/inventoryManage/containerinit/containerBindRecord/index.vue +++ b/src/views/wms/inventoryManage/containerinit/containerBindRecord/index.vue @@ -33,7 +33,7 @@ diff --git a/src/views/wms/inventoryManage/containerinit/containerRepair/index.vue b/src/views/wms/inventoryManage/containerinit/containerRepair/index.vue index 17161c99c..c29f9aa8b 100644 --- a/src/views/wms/inventoryManage/containerinit/containerRepair/index.vue +++ b/src/views/wms/inventoryManage/containerinit/containerRepair/index.vue @@ -33,7 +33,7 @@ diff --git a/src/views/wms/inventoryManage/containerinit/containerUnbindRecord/index.vue b/src/views/wms/inventoryManage/containerinit/containerUnbindRecord/index.vue index e25e285eb..e48c69351 100644 --- a/src/views/wms/inventoryManage/containerinit/containerUnbindRecord/index.vue +++ b/src/views/wms/inventoryManage/containerinit/containerUnbindRecord/index.vue @@ -33,7 +33,7 @@ diff --git a/src/views/wms/inventoryManage/containerinit/containerinitadd/index.vue b/src/views/wms/inventoryManage/containerinit/containerinitadd/index.vue index 020a5d083..e032221ca 100644 --- a/src/views/wms/inventoryManage/containerinit/containerinitadd/index.vue +++ b/src/views/wms/inventoryManage/containerinit/containerinitadd/index.vue @@ -33,7 +33,7 @@ diff --git a/src/views/wms/inventoryManage/containerinit/containerinitrecord/index.vue b/src/views/wms/inventoryManage/containerinit/containerinitrecord/index.vue index 7c0826168..4932c0387 100644 --- a/src/views/wms/inventoryManage/containerinit/containerinitrecord/index.vue +++ b/src/views/wms/inventoryManage/containerinit/containerinitrecord/index.vue @@ -33,7 +33,7 @@ diff --git a/src/views/wms/inventoryManage/expectin/index.vue b/src/views/wms/inventoryManage/expectin/index.vue index f372f35b3..b4203d770 100644 --- a/src/views/wms/inventoryManage/expectin/index.vue +++ b/src/views/wms/inventoryManage/expectin/index.vue @@ -36,7 +36,7 @@ diff --git a/src/views/wms/inventoryManage/expectout/index.vue b/src/views/wms/inventoryManage/expectout/index.vue index 73df20786..5e764a4b7 100644 --- a/src/views/wms/inventoryManage/expectout/index.vue +++ b/src/views/wms/inventoryManage/expectout/index.vue @@ -37,7 +37,7 @@ diff --git a/src/views/wms/inventoryManage/package/index.vue b/src/views/wms/inventoryManage/package/index.vue index 4499c4263..aff656946 100644 --- a/src/views/wms/inventoryManage/package/index.vue +++ b/src/views/wms/inventoryManage/package/index.vue @@ -35,7 +35,7 @@ diff --git a/src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRecordMain/index.vue b/src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRecordMain/index.vue index c7bc2a687..288900b56 100644 --- a/src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRecordMain/index.vue +++ b/src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRecordMain/index.vue @@ -36,7 +36,7 @@ diff --git a/src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRequestMain/index.vue b/src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRequestMain/index.vue index 71d4d6103..f1835de26 100644 --- a/src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRequestMain/index.vue +++ b/src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRequestMain/index.vue @@ -34,7 +34,7 @@ diff --git a/src/views/wms/inventoryjobManage/packageManage/packagemergeMain/index.vue b/src/views/wms/inventoryjobManage/packageManage/packagemergeMain/index.vue index 95bc2f273..0f378beb1 100644 --- a/src/views/wms/inventoryjobManage/packageManage/packagemergeMain/index.vue +++ b/src/views/wms/inventoryjobManage/packageManage/packagemergeMain/index.vue @@ -33,7 +33,7 @@ diff --git a/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverJobMain/index.vue b/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverJobMain/index.vue index bff991355..5c1ba1bbc 100644 --- a/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverJobMain/index.vue +++ b/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverJobMain/index.vue @@ -34,7 +34,7 @@ diff --git a/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRecordMain/index.vue b/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRecordMain/index.vue index e54e6a66c..768fbedec 100644 --- a/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRecordMain/index.vue +++ b/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRecordMain/index.vue @@ -34,7 +34,7 @@ diff --git a/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRequestMain/index.vue b/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRequestMain/index.vue index 6e7ae6876..09fbd3265 100644 --- a/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRequestMain/index.vue +++ b/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRequestMain/index.vue @@ -34,7 +34,7 @@ diff --git a/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRetrospect/index.vue b/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRetrospect/index.vue index 398c6d52c..28a39295d 100644 --- a/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRetrospect/index.vue +++ b/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRetrospect/index.vue @@ -33,7 +33,7 @@ diff --git a/src/views/wms/inventoryjobManage/packageManage/packagesplitMain/index.vue b/src/views/wms/inventoryjobManage/packageManage/packagesplitMain/index.vue index cb9b89898..9cebc76d2 100644 --- a/src/views/wms/inventoryjobManage/packageManage/packagesplitMain/index.vue +++ b/src/views/wms/inventoryjobManage/packageManage/packagesplitMain/index.vue @@ -33,7 +33,7 @@ diff --git a/src/views/wms/inventoryjobManage/scrap/scrapJobMain/index.vue b/src/views/wms/inventoryjobManage/scrap/scrapJobMain/index.vue index 6c3d5aa35..5e789b321 100644 --- a/src/views/wms/inventoryjobManage/scrap/scrapJobMain/index.vue +++ b/src/views/wms/inventoryjobManage/scrap/scrapJobMain/index.vue @@ -34,7 +34,7 @@ diff --git a/src/views/wms/inventoryjobManage/scrap/scrapRecordMain/index.vue b/src/views/wms/inventoryjobManage/scrap/scrapRecordMain/index.vue index c76298be3..63c6188e8 100644 --- a/src/views/wms/inventoryjobManage/scrap/scrapRecordMain/index.vue +++ b/src/views/wms/inventoryjobManage/scrap/scrapRecordMain/index.vue @@ -34,7 +34,7 @@ diff --git a/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/index.vue b/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/index.vue index 9cb319fb5..0ffdcee0b 100644 --- a/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/index.vue +++ b/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/index.vue @@ -42,7 +42,7 @@ diff --git a/src/views/wms/inventoryjobManage/sparepartReturn/sparepartReturnRequestMain/index.vue b/src/views/wms/inventoryjobManage/sparepartReturn/sparepartReturnRequestMain/index.vue index 23097f9f1..ad9d0e556 100644 --- a/src/views/wms/inventoryjobManage/sparepartReturn/sparepartReturnRequestMain/index.vue +++ b/src/views/wms/inventoryjobManage/sparepartReturn/sparepartReturnRequestMain/index.vue @@ -34,7 +34,7 @@ diff --git a/src/views/wms/inventoryjobManage/sparepartsrequisition/sparepartsrequisitionJobMain/index.vue b/src/views/wms/inventoryjobManage/sparepartsrequisition/sparepartsrequisitionJobMain/index.vue index 401b48728..6a94e8f05 100644 --- a/src/views/wms/inventoryjobManage/sparepartsrequisition/sparepartsrequisitionJobMain/index.vue +++ b/src/views/wms/inventoryjobManage/sparepartsrequisition/sparepartsrequisitionJobMain/index.vue @@ -34,7 +34,7 @@ diff --git a/src/views/wms/inventoryjobManage/sparepartsrequisition/sparepartsrequisitionRecordMain/index.vue b/src/views/wms/inventoryjobManage/sparepartsrequisition/sparepartsrequisitionRecordMain/index.vue index a1fb6bb8a..238057ac3 100644 --- a/src/views/wms/inventoryjobManage/sparepartsrequisition/sparepartsrequisitionRecordMain/index.vue +++ b/src/views/wms/inventoryjobManage/sparepartsrequisition/sparepartsrequisitionRecordMain/index.vue @@ -34,7 +34,7 @@ diff --git a/src/views/wms/inventoryjobManage/sparepartsrequisition/sparepartsrequisitionRequestMain/index.vue b/src/views/wms/inventoryjobManage/sparepartsrequisition/sparepartsrequisitionRequestMain/index.vue index 8715bded9..7429b6541 100644 --- a/src/views/wms/inventoryjobManage/sparepartsrequisition/sparepartsrequisitionRequestMain/index.vue +++ b/src/views/wms/inventoryjobManage/sparepartsrequisition/sparepartsrequisitionRequestMain/index.vue @@ -34,7 +34,7 @@ diff --git a/src/views/wms/inventoryjobManage/transferissue/transferissueJobMain/index.vue b/src/views/wms/inventoryjobManage/transferissue/transferissueJobMain/index.vue index cb0876240..0c74f5ea5 100644 --- a/src/views/wms/inventoryjobManage/transferissue/transferissueJobMain/index.vue +++ b/src/views/wms/inventoryjobManage/transferissue/transferissueJobMain/index.vue @@ -34,7 +34,7 @@ diff --git a/src/views/wms/inventoryjobManage/transferissue/transferissueRecordMain/index.vue b/src/views/wms/inventoryjobManage/transferissue/transferissueRecordMain/index.vue index db4a3e3d7..974fb298c 100644 --- a/src/views/wms/inventoryjobManage/transferissue/transferissueRecordMain/index.vue +++ b/src/views/wms/inventoryjobManage/transferissue/transferissueRecordMain/index.vue @@ -34,7 +34,7 @@ diff --git a/src/views/wms/inventoryjobManage/transferissue/transferissueRequestMain/index.vue b/src/views/wms/inventoryjobManage/transferissue/transferissueRequestMain/index.vue index 5e5e6debe..7758fed45 100644 --- a/src/views/wms/inventoryjobManage/transferissue/transferissueRequestMain/index.vue +++ b/src/views/wms/inventoryjobManage/transferissue/transferissueRequestMain/index.vue @@ -34,7 +34,7 @@ diff --git a/src/views/wms/inventoryjobManage/transferreceipt/transferreceiptJobMain/index.vue b/src/views/wms/inventoryjobManage/transferreceipt/transferreceiptJobMain/index.vue index 924ce6e1c..60111b5c6 100644 --- a/src/views/wms/inventoryjobManage/transferreceipt/transferreceiptJobMain/index.vue +++ b/src/views/wms/inventoryjobManage/transferreceipt/transferreceiptJobMain/index.vue @@ -34,7 +34,7 @@ diff --git a/src/views/wms/inventoryjobManage/transferreceipt/transferreceiptRecordMain/index.vue b/src/views/wms/inventoryjobManage/transferreceipt/transferreceiptRecordMain/index.vue index ee7aee182..84ff278bf 100644 --- a/src/views/wms/inventoryjobManage/transferreceipt/transferreceiptRecordMain/index.vue +++ b/src/views/wms/inventoryjobManage/transferreceipt/transferreceiptRecordMain/index.vue @@ -34,7 +34,7 @@ diff --git a/src/views/wms/inventoryjobManage/transferreceipt/transferreceiptRequestMain/index.vue b/src/views/wms/inventoryjobManage/transferreceipt/transferreceiptRequestMain/index.vue index baffa33d7..47941d63c 100644 --- a/src/views/wms/inventoryjobManage/transferreceipt/transferreceiptRequestMain/index.vue +++ b/src/views/wms/inventoryjobManage/transferreceipt/transferreceiptRequestMain/index.vue @@ -34,7 +34,7 @@ diff --git a/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueJobMain/index.vue b/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueJobMain/index.vue index 86cbdaee2..d0ad6a1fe 100644 --- a/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueJobMain/index.vue +++ b/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueJobMain/index.vue @@ -34,7 +34,7 @@ diff --git a/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRecordMain/index.vue b/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRecordMain/index.vue index 82cfb8735..4c66d9303 100644 --- a/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRecordMain/index.vue +++ b/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRecordMain/index.vue @@ -34,7 +34,7 @@ diff --git a/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRequestMain/index.vue b/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRequestMain/index.vue index 6ca14b654..26728daa6 100644 --- a/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRequestMain/index.vue +++ b/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRequestMain/index.vue @@ -34,7 +34,7 @@ diff --git a/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptJobMain/index.vue b/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptJobMain/index.vue index 3eeb8277c..f47f3e371 100644 --- a/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptJobMain/index.vue +++ b/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptJobMain/index.vue @@ -34,7 +34,7 @@ diff --git a/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRecordMain/index.vue b/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRecordMain/index.vue index 04eab44c5..d2e77787a 100644 --- a/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRecordMain/index.vue +++ b/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRecordMain/index.vue @@ -34,7 +34,7 @@ diff --git a/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/index.vue b/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/index.vue index 0ba1b936f..525dae1ab 100644 --- a/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/index.vue +++ b/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/index.vue @@ -42,7 +42,7 @@ diff --git a/src/views/wms/countManage/count/countRequestMain/countRequestMain.data.ts b/src/views/wms/countManage/count/countRequestMain/countRequestMain.data.ts index 22219509a..b1dc3df32 100644 --- a/src/views/wms/countManage/count/countRequestMain/countRequestMain.data.ts +++ b/src/views/wms/countManage/count/countRequestMain/countRequestMain.data.ts @@ -322,7 +322,7 @@ export const CountRequestMain = useCrudSchemas(([ isDetail: false, isForm: false, table: { - width: 300, + width: 250, fixed: 'right' }, } diff --git a/src/views/wms/countManage/count/countRequestMain/index.vue b/src/views/wms/countManage/count/countRequestMain/index.vue index 9c4a60078..b785e34a2 100644 --- a/src/views/wms/countManage/count/countRequestMain/index.vue +++ b/src/views/wms/countManage/count/countRequestMain/index.vue @@ -37,7 +37,7 @@ diff --git a/src/views/wms/countManage/countadjust/countadjustRequestMain/countadjustRequestMain.data.ts b/src/views/wms/countManage/countadjust/countadjustRequestMain/countadjustRequestMain.data.ts index d3918e677..c7d3922d4 100644 --- a/src/views/wms/countManage/countadjust/countadjustRequestMain/countadjustRequestMain.data.ts +++ b/src/views/wms/countManage/countadjust/countadjustRequestMain/countadjustRequestMain.data.ts @@ -310,7 +310,7 @@ export const CountadjustRequestMain = useCrudSchemas(([ isDetail: false, isForm: false, table: { - width: 300, + width: 250, fixed: 'right' }, } diff --git a/src/views/wms/countManage/countadjust/countadjustRequestMain/index.vue b/src/views/wms/countManage/countadjust/countadjustRequestMain/index.vue index 3fc7452a7..b8ac83533 100644 --- a/src/views/wms/countManage/countadjust/countadjustRequestMain/index.vue +++ b/src/views/wms/countManage/countadjust/countadjustRequestMain/index.vue @@ -33,7 +33,7 @@ diff --git a/src/views/wms/issueManage/preparetoissueplan/preparetoissueMain/index.vue b/src/views/wms/issueManage/preparetoissueplan/preparetoissueMain/index.vue index af71f72e0..98d0f12ef 100644 --- a/src/views/wms/issueManage/preparetoissueplan/preparetoissueMain/index.vue +++ b/src/views/wms/issueManage/preparetoissueplan/preparetoissueMain/index.vue @@ -34,7 +34,7 @@ diff --git a/src/views/wms/moveManage/inventorychange/inventorychangeRecordMain/index.vue b/src/views/wms/moveManage/inventorychange/inventorychangeRecordMain/index.vue index 3f44d4305..3d16165cc 100644 --- a/src/views/wms/moveManage/inventorychange/inventorychangeRecordMain/index.vue +++ b/src/views/wms/moveManage/inventorychange/inventorychangeRecordMain/index.vue @@ -34,7 +34,7 @@ diff --git a/src/views/wms/moveManage/inventorychange/inventorychangeRequestMain/index.vue b/src/views/wms/moveManage/inventorychange/inventorychangeRequestMain/index.vue index 267b3907d..3b7a349fa 100644 --- a/src/views/wms/moveManage/inventorychange/inventorychangeRequestMain/index.vue +++ b/src/views/wms/moveManage/inventorychange/inventorychangeRequestMain/index.vue @@ -42,7 +42,7 @@ diff --git a/src/views/wms/moveManage/inventorymove/inventorymoveRecordMain/index.vue b/src/views/wms/moveManage/inventorymove/inventorymoveRecordMain/index.vue index 137a5524a..466e56ba4 100644 --- a/src/views/wms/moveManage/inventorymove/inventorymoveRecordMain/index.vue +++ b/src/views/wms/moveManage/inventorymove/inventorymoveRecordMain/index.vue @@ -34,7 +34,7 @@ diff --git a/src/views/wms/moveManage/inventorymove/inventorymoveRecordMainNew/index.vue b/src/views/wms/moveManage/inventorymove/inventorymoveRecordMainNew/index.vue index b849ca2e1..cf3a5cf56 100644 --- a/src/views/wms/moveManage/inventorymove/inventorymoveRecordMainNew/index.vue +++ b/src/views/wms/moveManage/inventorymove/inventorymoveRecordMainNew/index.vue @@ -34,7 +34,7 @@ diff --git a/src/views/wms/moveManage/inventorymove/inventorymoveRecordMainOKHOLD/index.vue b/src/views/wms/moveManage/inventorymove/inventorymoveRecordMainOKHOLD/index.vue index 317389888..4fdeef3b6 100644 --- a/src/views/wms/moveManage/inventorymove/inventorymoveRecordMainOKHOLD/index.vue +++ b/src/views/wms/moveManage/inventorymove/inventorymoveRecordMainOKHOLD/index.vue @@ -34,7 +34,7 @@ diff --git a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/index.vue b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/index.vue index cc6f1027c..caf7fd443 100644 --- a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/index.vue +++ b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/index.vue @@ -34,7 +34,7 @@ diff --git a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/inventorymoveRequestMain.data.ts b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/inventorymoveRequestMain.data.ts index ec54143ec..10c6948e8 100644 --- a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/inventorymoveRequestMain.data.ts +++ b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/inventorymoveRequestMain.data.ts @@ -459,7 +459,7 @@ export const InventorymoveRequestMain = useCrudSchemas(reactive([ isDetail: false, isForm: false, table: { - width: 300, + width: 250, fixed: 'right' }, } diff --git a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMainHOLDWIP/index.vue b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMainHOLDWIP/index.vue index 4b4450b94..f1b5bf9aa 100644 --- a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMainHOLDWIP/index.vue +++ b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMainHOLDWIP/index.vue @@ -34,7 +34,7 @@ diff --git a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMainMOVE/index.vue b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMainMOVE/index.vue index 8e13ddb3c..b98e2a26d 100644 --- a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMainMOVE/index.vue +++ b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMainMOVE/index.vue @@ -34,7 +34,7 @@ diff --git a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMainOKHOLD/index.vue b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMainOKHOLD/index.vue index 85eb0367d..5a20483af 100644 --- a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMainOKHOLD/index.vue +++ b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMainOKHOLD/index.vue @@ -34,7 +34,7 @@ diff --git a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMainOKHOLD/inventorymoveRequestMain.data.ts b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMainOKHOLD/inventorymoveRequestMain.data.ts index 5cfc9a2b0..5120760cb 100644 --- a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMainOKHOLD/inventorymoveRequestMain.data.ts +++ b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMainOKHOLD/inventorymoveRequestMain.data.ts @@ -495,7 +495,7 @@ export const InventorymoveRequestMain = useCrudSchemas(reactive([ isDetail: false, isForm: false, table: { - width: 300, + width: 250, fixed: 'right' }, } From d01e6224f22b215feaae3cc69bae9ddb61985271 Mon Sep 17 00:00:00 2001 From: zhaoyiran Date: Mon, 16 Dec 2024 09:21:42 +0800 Subject: [PATCH 120/213] =?UTF-8?q?YT-1696=E5=8F=B7=E5=8F=A3=E7=94=9F?= =?UTF-8?q?=E4=BA=A7=E8=AE=A1=E5=88=92=EF=BC=8C=E6=8F=90=E4=BA=A4=E5=AE=A1?= =?UTF-8?q?=E6=89=B9=E6=8A=A5=E5=BC=82=E5=B8=B8=EF=BC=8C=E5=BC=80=E5=85=B3?= =?UTF-8?q?=E5=85=A8=E9=83=A8=E6=89=93=E5=BC=80=E6=97=B6=EF=BC=8C=E5=A4=87?= =?UTF-8?q?=E6=96=99=E8=AE=A1=E5=88=92=E9=82=A3=E6=8A=A5=E9=94=99=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../productionMainAssemble/index.vue | 24 ++++++++++++++----- 1 file changed, 18 insertions(+), 6 deletions(-) diff --git a/src/views/wms/productionManage/productionplan/productionMainAssemble/index.vue b/src/views/wms/productionManage/productionplan/productionMainAssemble/index.vue index 1cbb188f7..c31de0a6e 100644 --- a/src/views/wms/productionManage/productionplan/productionMainAssemble/index.vue +++ b/src/views/wms/productionManage/productionplan/productionMainAssemble/index.vue @@ -422,12 +422,19 @@ const buttonTableClick = async (val, row) => { if (row.available == 'FALSE') return message.warning('当前数据：【不可用】') await message.confirm('确认要生成备料计划吗？') tableObject.loading = true - await ProductionMainApi.generatePreparetoissue(row.number).then((PreparetoissueRes) => { + await ProductionMainApi.generatePreparetoissue(row.number).then((res) => { message.success(t('common.createSuccess')) tableObject.loading = false buttonBaseClick('refresh',null) // 生成发料申请 - ProductionMainApi.generateIssueRequest(PreparetoissueRes.number) + if (Array.isArray(res) && res.length > 0) { + res.forEach(item => { + // 已发布 + if(item.status == '6'){ + ProductionMainApi.generateIssueRequest(item.number) + } + }); + } }).catch(err => { tableObject.loading = false console.log(err) @@ -602,11 +609,16 @@ const autoCreatePlanRequest = async (row)=>{ try { if(planSwitch.value) { - // /generatePreparetoissue?number - let PreparetoissueRes = await ProductionMainApi.generatePreparetoissue(row.number) + let res = await ProductionMainApi.generatePreparetoissue(row.number) // 生成发料申请 - // generateIssueRequest - ProductionMainApi.generateIssueRequest(PreparetoissueRes.number) + if (Array.isArray(res) && res.length > 0) { + res.forEach(item => { + // 已发布 + if(item.status == '6'){ + ProductionMainApi.generateIssueRequest(item.number) + } + }); + } } } finally { try { From acc061ae6f3e6bb13198b979b9d8af0c5e25ee57 Mon Sep 17 00:00:00 2001 From: zhang_li <2235006734@qqq.com> Date: Mon, 16 Dec 2024 09:21:48 +0800 Subject: [PATCH 121/213] =?UTF-8?q?=E6=8C=89=E9=92=AEbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/wms/supplierManage/invoicingcalendar/index.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/wms/supplierManage/invoicingcalendar/index.vue b/src/views/wms/supplierManage/invoicingcalendar/index.vue index ae2c85c2c..2aa65919b 100644 --- a/src/views/wms/supplierManage/invoicingcalendar/index.vue +++ b/src/views/wms/supplierManage/invoicingcalendar/index.vue @@ -34,7 +34,7 @@ From 120f8a8722ea2d2fea6daa9e7e908a819ae38ef3 Mon Sep 17 00:00:00 2001 From: zhaoyiran Date: Mon, 16 Dec 2024 09:43:30 +0800 Subject: [PATCH 122/213] =?UTF-8?q?YT-1708=E5=8F=B7=E5=8F=A3=E7=94=9F?= =?UTF-8?q?=E4=BA=A7=E8=AE=A1=E5=88=92=EF=BC=8C=E6=96=B0=E5=A2=9E=E7=9A=84?= =?UTF-8?q?=E8=AE=A1=E5=88=92=EF=BC=8C=E6=8F=90=E4=BA=A4=E4=B8=80=E7=9B=B4?= =?UTF-8?q?loding?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../productionplan/productionMainAssemble/index.vue | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/views/wms/productionManage/productionplan/productionMainAssemble/index.vue b/src/views/wms/productionManage/productionplan/productionMainAssemble/index.vue index c31de0a6e..7cee42437 100644 --- a/src/views/wms/productionManage/productionplan/productionMainAssemble/index.vue +++ b/src/views/wms/productionManage/productionplan/productionMainAssemble/index.vue @@ -350,6 +350,9 @@ const buttonTableClick = async (val, row) => { }).catch(err => { tableObject.loading = false console.log(err) + }).finally(() =>{ + tableObject.loading = false + getList() }) } else if (val == 'mainPlanTur') { // 驳回 await message.confirm('确认要驳回吗？') From ec0b1173be5d3b3ad0ffb34250b41bd7e95734c0 Mon Sep 17 00:00:00 2001 From: "YEJIAXING-PC\\lenovo" <591141169@qq.com> Date: Mon, 16 Dec 2024 11:14:02 +0800 Subject: [PATCH 123/213] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=A0=87=E7=AD=BE?= =?UTF-8?q?=E4=B8=AD=E7=9A=84=E6=89=93=E5=8D=B0=E4=BA=BA=EF=BC=8C=E6=89=93?= =?UTF-8?q?=E5=8D=B0=E6=97=B6=E9=97=B4=EF=BC=8C=E6=89=93=E5=8D=B0=E6=AC=A1?= =?UTF-8?q?=E6=95=B0=EF=BC=8C=E9=9A=90=E8=97=8F=E6=8E=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../itemManage/itembasic/itembasic.data.ts | 12 ++- .../itempackage/itempackage.data.ts | 14 +-- .../locationLabel/locationLabel.data.ts | 98 +++++++++---------- .../manufacturePackage.data.ts | 98 +++++++++---------- .../purchasePackage/purchasePackage.data.ts | 98 +++++++++---------- .../utensilPackage/utensilPackage.data.ts | 98 +++++++++---------- 6 files changed, 212 insertions(+), 206 deletions(-) diff --git a/src/views/wms/basicDataManage/itemManage/itembasic/itembasic.data.ts b/src/views/wms/basicDataManage/itemManage/itembasic/itembasic.data.ts index 77a7a04e0..ecbcb2c0e 100644 --- a/src/views/wms/basicDataManage/itemManage/itembasic/itembasic.data.ts +++ b/src/views/wms/basicDataManage/itemManage/itembasic/itembasic.data.ts @@ -352,6 +352,15 @@ export const Itembasic = useCrudSchemas(reactive([ width: 180 }, }, + { + label: 'ERP默认收货库位', + field: 'defaultErpLocationCode', + sort: 'custom', + isTable: true, + table: { + width: 100 + } , + }, { label: '创建者', field: 'creator', @@ -522,9 +531,6 @@ export const Itembasic = useCrudSchemas(reactive([ }, }, - - - { label: '产品类', field: 'prodCla', diff --git a/src/views/wms/basicDataManage/itemManage/itempackage/itempackage.data.ts b/src/views/wms/basicDataManage/itemManage/itempackage/itempackage.data.ts index 290ca2697..41a420590 100644 --- a/src/views/wms/basicDataManage/itemManage/itempackage/itempackage.data.ts +++ b/src/views/wms/basicDataManage/itemManage/itempackage/itempackage.data.ts @@ -446,7 +446,7 @@ export const PurchasePackaging = useCrudSchemas(reactive([ sort: 'custom', }, { - label: '替代计量单位', + label: '采购计量单位', field: 'purchaseUom', sort: 'custom', dictType: DICT_TYPE.UOM, @@ -458,15 +458,15 @@ export const PurchasePackaging = useCrudSchemas(reactive([ }, }, { - label: '替代数量', + label: '采购数量', field: 'purchaseQty', sort: 'custom', }, - // { - // label: '采购标包数量', - // field: 'purchaseStdQty', - // sort: 'custom', - // }, + { + label: '采购标包数量', + field: 'purchaseStdQty', + sort: 'custom', + }, { label: '转换率', field: 'convertRate', diff --git a/src/views/wms/basicDataManage/labelManage/locationLabel/locationLabel.data.ts b/src/views/wms/basicDataManage/labelManage/locationLabel/locationLabel.data.ts index 54145b1d0..533068257 100644 --- a/src/views/wms/basicDataManage/labelManage/locationLabel/locationLabel.data.ts +++ b/src/views/wms/basicDataManage/labelManage/locationLabel/locationLabel.data.ts @@ -61,55 +61,55 @@ export const Package = useCrudSchemas(reactive([ width: 380, } }, - { - label: '打印次数', - field: 'printTimes', - sort: 'custom', - form: { - component: 'InputNumber', - componentProps: { - min: 0 - }, - value: 0 - }, - table: { - width: 180 - } - }, - { - label: '最后打印时间', - field: 'lastPrintTime', - sort: 'custom', - formatter: dateFormatter, - form: { - component: 'DatePicker', - componentProps: { - style: {width:'100%'}, - type: 'datetime', - dateFormat: 'YYYY-MM-DD HH:mm:ss', - valueFormat: 'x', - } - }, - table: { - width: 180 - } - }, - { - label: '最后打印人ID', - field: 'lastPrintUserId', - sort: 'custom', - table: { - width: 180 - } - }, - { - label: '最后打印人用户名', - field: 'lastPrintUserName', - sort: 'custom', - table: { - width: 170, - } - }, + // { + // label: '打印次数', + // field: 'printTimes', + // sort: 'custom', + // form: { + // component: 'InputNumber', + // componentProps: { + // min: 0 + // }, + // value: 0 + // }, + // table: { + // width: 180 + // } + // }, + // { + // label: '最后打印时间', + // field: 'lastPrintTime', + // sort: 'custom', + // formatter: dateFormatter, + // form: { + // component: 'DatePicker', + // componentProps: { + // style: {width:'100%'}, + // type: 'datetime', + // dateFormat: 'YYYY-MM-DD HH:mm:ss', + // valueFormat: 'x', + // } + // }, + // table: { + // width: 180 + // } + // }, + // { + // label: '最后打印人ID', + // field: 'lastPrintUserId', + // sort: 'custom', + // table: { + // width: 180 + // } + // }, + // { + // label: '最后打印人用户名', + // field: 'lastPrintUserName', + // sort: 'custom', + // table: { + // width: 170, + // } + // }, { label: '是否可用', field: 'available', diff --git a/src/views/wms/basicDataManage/labelManage/manufacturePackage/manufacturePackage.data.ts b/src/views/wms/basicDataManage/labelManage/manufacturePackage/manufacturePackage.data.ts index dd51b272c..63073c4ab 100644 --- a/src/views/wms/basicDataManage/labelManage/manufacturePackage/manufacturePackage.data.ts +++ b/src/views/wms/basicDataManage/labelManage/manufacturePackage/manufacturePackage.data.ts @@ -75,55 +75,55 @@ export const Package = useCrudSchemas(reactive([ width: 380, } }, - { - label: '打印次数', - field: 'printTimes', - sort: 'custom', - form: { - component: 'InputNumber', - componentProps: { - min: 0 - }, - value: 0 - }, - table: { - width: 180 - } - }, - { - label: '最后打印时间', - field: 'lastPrintTime', - sort: 'custom', - formatter: dateFormatter, - form: { - component: 'DatePicker', - componentProps: { - style: {width:'100%'}, - type: 'datetime', - dateFormat: 'YYYY-MM-DD HH:mm:ss', - valueFormat: 'x', - } - }, - table: { - width: 180 - } - }, - { - label: '最后打印人ID', - field: 'lastPrintUserId', - sort: 'custom', - table: { - width: 180 - } - }, - { - label: '最后打印人用户名', - field: 'lastPrintUserName', - sort: 'custom', - table: { - width: 180, - } - }, + // { + // label: '打印次数', + // field: 'printTimes', + // sort: 'custom', + // form: { + // component: 'InputNumber', + // componentProps: { + // min: 0 + // }, + // value: 0 + // }, + // table: { + // width: 180 + // } + // }, + // { + // label: '最后打印时间', + // field: 'lastPrintTime', + // sort: 'custom', + // formatter: dateFormatter, + // form: { + // component: 'DatePicker', + // componentProps: { + // style: {width:'100%'}, + // type: 'datetime', + // dateFormat: 'YYYY-MM-DD HH:mm:ss', + // valueFormat: 'x', + // } + // }, + // table: { + // width: 180 + // } + // }, + // { + // label: '最后打印人ID', + // field: 'lastPrintUserId', + // sort: 'custom', + // table: { + // width: 180 + // } + // }, + // { + // label: '最后打印人用户名', + // field: 'lastPrintUserName', + // sort: 'custom', + // table: { + // width: 180, + // } + // }, { label: '是否可用', field: 'available', diff --git a/src/views/wms/basicDataManage/labelManage/purchasePackage/purchasePackage.data.ts b/src/views/wms/basicDataManage/labelManage/purchasePackage/purchasePackage.data.ts index e6641c733..44190d067 100644 --- a/src/views/wms/basicDataManage/labelManage/purchasePackage/purchasePackage.data.ts +++ b/src/views/wms/basicDataManage/labelManage/purchasePackage/purchasePackage.data.ts @@ -98,55 +98,55 @@ export const Package = useCrudSchemas(reactive([ width: 380, } }, - { - label: '打印次数', - field: 'printTimes', - sort: 'custom', - form: { - component: 'InputNumber', - componentProps: { - min: 0 - }, - value: 0 - }, - table: { - width: 180 - } - }, - { - label: '最后打印时间', - field: 'lastPrintTime', - sort: 'custom', - formatter: dateFormatter, - form: { - component: 'DatePicker', - componentProps: { - style: { width: '100%' }, - type: 'datetime', - dateFormat: 'YYYY-MM-DD HH:mm:ss', - valueFormat: 'x', - } - }, - table: { - width: 180 - } - }, - { - label: '最后打印人ID', - field: 'lastPrintUserId', - sort: 'custom', - table: { - width: 180 - } - }, - { - label: '最后打印人用户名', - field: 'lastPrintUserName', - sort: 'custom', - table: { - width: 180, - } - }, + // { + // label: '打印次数', + // field: 'printTimes', + // sort: 'custom', + // form: { + // component: 'InputNumber', + // componentProps: { + // min: 0 + // }, + // value: 0 + // }, + // table: { + // width: 180 + // } + // }, + // { + // label: '最后打印时间', + // field: 'lastPrintTime', + // sort: 'custom', + // formatter: dateFormatter, + // form: { + // component: 'DatePicker', + // componentProps: { + // style: { width: '100%' }, + // type: 'datetime', + // dateFormat: 'YYYY-MM-DD HH:mm:ss', + // valueFormat: 'x', + // } + // }, + // table: { + // width: 180 + // } + // }, + // { + // label: '最后打印人ID', + // field: 'lastPrintUserId', + // sort: 'custom', + // table: { + // width: 180 + // } + // }, + // { + // label: '最后打印人用户名', + // field: 'lastPrintUserName', + // sort: 'custom', + // table: { + // width: 180, + // } + // }, { label: '是否可用', field: 'available', diff --git a/src/views/wms/basicDataManage/labelManage/utensilPackage/utensilPackage.data.ts b/src/views/wms/basicDataManage/labelManage/utensilPackage/utensilPackage.data.ts index 94b32ddc0..b2368b840 100644 --- a/src/views/wms/basicDataManage/labelManage/utensilPackage/utensilPackage.data.ts +++ b/src/views/wms/basicDataManage/labelManage/utensilPackage/utensilPackage.data.ts @@ -76,55 +76,55 @@ export const Package = useCrudSchemas(reactive([ width: 380, } }, - { - label: '打印次数', - field: 'printTimes', - sort: 'custom', - form: { - component: 'InputNumber', - componentProps: { - min: 0 - }, - value: 0 - }, - table: { - width: 180 - } - }, - { - label: '最后打印时间', - field: 'lastPrintTime', - sort: 'custom', - formatter: dateFormatter, - form: { - component: 'DatePicker', - componentProps: { - style: {width:'100%'}, - type: 'datetime', - dateFormat: 'YYYY-MM-DD HH:mm:ss', - valueFormat: 'x', - } - }, - table: { - width: 180 - } - }, - { - label: '最后打印人ID', - field: 'lastPrintUserId', - sort: 'custom', - table: { - width: 180 - } - }, - { - label: '最后打印人用户名', - field: 'lastPrintUserName', - sort: 'custom', - table: { - width: 180, - } - }, + // { + // label: '打印次数', + // field: 'printTimes', + // sort: 'custom', + // form: { + // component: 'InputNumber', + // componentProps: { + // min: 0 + // }, + // value: 0 + // }, + // table: { + // width: 180 + // } + // }, + // { + // label: '最后打印时间', + // field: 'lastPrintTime', + // sort: 'custom', + // formatter: dateFormatter, + // form: { + // component: 'DatePicker', + // componentProps: { + // style: {width:'100%'}, + // type: 'datetime', + // dateFormat: 'YYYY-MM-DD HH:mm:ss', + // valueFormat: 'x', + // } + // }, + // table: { + // width: 180 + // } + // }, + // { + // label: '最后打印人ID', + // field: 'lastPrintUserId', + // sort: 'custom', + // table: { + // width: 180 + // } + // }, + // { + // label: '最后打印人用户名', + // field: 'lastPrintUserName', + // sort: 'custom', + // table: { + // width: 180, + // } + // }, { label: '是否可用', field: 'available', From 19354b12352099f044c2c83f4ab3f1768c130ce8 Mon Sep 17 00:00:00 2001 From: zhaoyiran Date: Mon, 16 Dec 2024 11:27:40 +0800 Subject: [PATCH 124/213] =?UTF-8?q?=E8=A1=A5=E7=BB=99=E5=93=81=E7=94=9F?= =?UTF-8?q?=E4=BA=A7=E8=AE=A1=E5=88=92=E6=8F=90=E4=BA=A4=E4=B8=80=E7=9B=B4?= =?UTF-8?q?loading?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../productionManage/productionplan/productionMain/index.vue | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/views/wms/productionManage/productionplan/productionMain/index.vue b/src/views/wms/productionManage/productionplan/productionMain/index.vue index 7e06ebd26..c0dd437d6 100644 --- a/src/views/wms/productionManage/productionplan/productionMain/index.vue +++ b/src/views/wms/productionManage/productionplan/productionMain/index.vue @@ -350,6 +350,9 @@ const buttonTableClick = async (val, row) => { }).catch(err => { tableObject.loading = false console.log(err) + }).finally(() =>{ + tableObject.loading = false + getList() }) } else if (val == 'mainPlanTur') { // 驳回 await message.confirm('确认要驳回吗？') From 4cef12cdafb24beb10e099395c8d6890a416454b Mon Sep 17 00:00:00 2001 From: songguoqiang <765017469@qq.com> Date: Mon, 16 Dec 2024 14:18:47 +0800 Subject: [PATCH 125/213] =?UTF-8?q?YT-1717:=E4=BE=9B=E5=BA=94=E5=95=86?= =?UTF-8?q?=E5=8F=91=E8=B4=A7=E7=94=B3=E8=AF=B7=E6=89=93=E5=8D=B0=E6=A0=87?= =?UTF-8?q?=E7=AD=BE=E9=A1=B5=E9=9D=A2=E7=BC=BA=E5=B0=91=E5=8C=85=E8=A3=85?= =?UTF-8?q?=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../supplierdeliverRequestMain.data.ts | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts index 5deb8958c..0651aa38f 100644 --- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts +++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts @@ -1890,6 +1890,14 @@ export const SupplierdeliverRequestPackage = useCrudSchemas(reactive Date: Mon, 16 Dec 2024 14:50:48 +0800 Subject: [PATCH 126/213] =?UTF-8?q?WMS=E9=87=87=E8=B4=AD=E6=94=B6=E8=B4=A7?= =?UTF-8?q?=E8=83=8C=E7=95=AA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../purchasereceiptRecordMain.data.ts | 21 +++++++--- .../purchasereceiptRecordMain.data.ts | 13 +++--- .../purchasereceiptJobMain.data.ts | 15 ++++++- .../purchasereceiptRecordMain.data.ts | 15 ++++++- .../purchasereceiptRequestMain.data.ts | 15 ++++++- .../purchasereceiptRecordMain.data.ts | 11 ++--- .../purchasereceiptRequestMain.data.ts | 15 ++++++- .../purchasereceiptJobMain.data.ts | 15 ++++++- .../purchasereceiptRecordMain.data.ts | 40 ++++++++++++------- .../purchasereceiptRequestMain.data.ts | 15 ++++++- .../purchasereceiptJobMain.data.ts | 15 ++++++- .../purchasereceiptRecordMain.data.ts | 21 +++++++--- .../purchasereceiptRequestMain.data.ts | 15 ++++++- 13 files changed, 175 insertions(+), 51 deletions(-) diff --git a/src/views/wms/purchasereceiptManage/amvpurchasereceipt/amvPurchasereceiptRecordMain/purchasereceiptRecordMain.data.ts b/src/views/wms/purchasereceiptManage/amvpurchasereceipt/amvPurchasereceiptRecordMain/purchasereceiptRecordMain.data.ts index 6577c20d8..0ae88cc20 100644 --- a/src/views/wms/purchasereceiptManage/amvpurchasereceipt/amvPurchasereceiptRecordMain/purchasereceiptRecordMain.data.ts +++ b/src/views/wms/purchasereceiptManage/amvpurchasereceipt/amvPurchasereceiptRecordMain/purchasereceiptRecordMain.data.ts @@ -614,7 +614,7 @@ export const PurchasereceiptRecordDetail = useCrudSchemas(reactive }, }, { - label: '物料代码', + label: '品番', field: 'itemCode', sort: 'custom', table: { @@ -660,7 +660,7 @@ export const PurchasereceiptRecordDetail = useCrudSchemas(reactive }, }, { - label: '物料名称', + label: '品名', field: 'itemName', sort: 'custom', table: { @@ -669,15 +669,26 @@ export const PurchasereceiptRecordDetail = useCrudSchemas(reactive sortTableDefault:10, }, { - label: '物料描述1', + label: '背番', field: 'itemDesc1', sort: 'custom', table: { width: 150 }, - sortTableDefault:11, - hiddenInMain:true + sortTableDefault: 10, + isTableForm: false, + isForm: false }, + // { + // label: '物料描述1', + // field: 'itemDesc1', + // sort: 'custom', + // table: { + // width: 150 + // }, + // sortTableDefault:11, + // hiddenInMain:true + // }, { label: '物料描述2', field: 'itemDesc2', diff --git a/src/views/wms/purchasereceiptManage/bspurchasereceipt/bsPurchasereceiptRecordMain/purchasereceiptRecordMain.data.ts b/src/views/wms/purchasereceiptManage/bspurchasereceipt/bsPurchasereceiptRecordMain/purchasereceiptRecordMain.data.ts index 3cb60fdd1..61cb2eda9 100644 --- a/src/views/wms/purchasereceiptManage/bspurchasereceipt/bsPurchasereceiptRecordMain/purchasereceiptRecordMain.data.ts +++ b/src/views/wms/purchasereceiptManage/bspurchasereceipt/bsPurchasereceiptRecordMain/purchasereceiptRecordMain.data.ts @@ -614,7 +614,7 @@ export const PurchasereceiptRecordDetail = useCrudSchemas(reactive }, }, { - label: '物料代码', + label: '品番', field: 'itemCode', sort: 'custom', table: { @@ -660,7 +660,7 @@ export const PurchasereceiptRecordDetail = useCrudSchemas(reactive }, }, { - label: '物料名称', + label: '品名', field: 'itemName', sort: 'custom', table: { @@ -669,14 +669,15 @@ export const PurchasereceiptRecordDetail = useCrudSchemas(reactive sortTableDefault:10, }, { - label: '物料描述1', + label: '背番', field: 'itemDesc1', sort: 'custom', table: { width: 150 - }, - sortTableDefault:11, - hiddenInMain:true + }, + sortTableDefault: 10, + isTableForm: false, + isForm: false }, { label: '物料描述2', diff --git a/src/views/wms/purchasereceiptManage/developpurchasereceipt/developPurchasereceiptJobMain/purchasereceiptJobMain.data.ts b/src/views/wms/purchasereceiptManage/developpurchasereceipt/developPurchasereceiptJobMain/purchasereceiptJobMain.data.ts index d418e93e9..15014d8c3 100644 --- a/src/views/wms/purchasereceiptManage/developpurchasereceipt/developPurchasereceiptJobMain/purchasereceiptJobMain.data.ts +++ b/src/views/wms/purchasereceiptManage/developpurchasereceipt/developPurchasereceiptJobMain/purchasereceiptJobMain.data.ts @@ -972,7 +972,7 @@ export const PurchasereceiptJobDetail = useCrudSchemas( sortTableDefault: 1008 }, { - label: '物料代码', + label: '品番', field: 'itemCode', sort: 'custom', table: { @@ -982,7 +982,7 @@ export const PurchasereceiptJobDetail = useCrudSchemas( isSearch: true }, { - label: '物料名称', + label: '品名', field: 'itemName', sort: 'custom', table: { @@ -990,6 +990,17 @@ export const PurchasereceiptJobDetail = useCrudSchemas( }, sortTableDefault: 7 }, + { + label: '背番', + field: 'itemDesc1', + sort: 'custom', + table: { + width: 150 + }, + sortTableDefault: 7, + isTableForm: false, + isForm: false + }, { label: '物料类型', field: 'itemType', diff --git a/src/views/wms/purchasereceiptManage/developpurchasereceipt/developPurchasereceiptRecordMain/purchasereceiptRecordMain.data.ts b/src/views/wms/purchasereceiptManage/developpurchasereceipt/developPurchasereceiptRecordMain/purchasereceiptRecordMain.data.ts index 33bbd3263..4a9620b54 100644 --- a/src/views/wms/purchasereceiptManage/developpurchasereceipt/developPurchasereceiptRecordMain/purchasereceiptRecordMain.data.ts +++ b/src/views/wms/purchasereceiptManage/developpurchasereceipt/developPurchasereceiptRecordMain/purchasereceiptRecordMain.data.ts @@ -614,7 +614,7 @@ export const PurchasereceiptRecordDetail = useCrudSchemas(reactive }, }, { - label: '物料代码', + label: '品番', field: 'itemCode', sort: 'custom', table: { @@ -660,7 +660,7 @@ export const PurchasereceiptRecordDetail = useCrudSchemas(reactive }, }, { - label: '物料名称', + label: '品名', field: 'itemName', sort: 'custom', table: { @@ -668,6 +668,17 @@ export const PurchasereceiptRecordDetail = useCrudSchemas(reactive }, sortTableDefault:10, }, + { + label: '背番', + field: 'itemDesc1', + sort: 'custom', + table: { + width: 150 + }, + sortTableDefault: 10, + isTableForm: false, + isForm: false + }, { label: '物料描述1', field: 'itemDesc1', diff --git a/src/views/wms/purchasereceiptManage/developpurchasereceipt/developPurchasereceiptRequestMain/purchasereceiptRequestMain.data.ts b/src/views/wms/purchasereceiptManage/developpurchasereceipt/developPurchasereceiptRequestMain/purchasereceiptRequestMain.data.ts index 4093efc95..d769fe1e8 100644 --- a/src/views/wms/purchasereceiptManage/developpurchasereceipt/developPurchasereceiptRequestMain/purchasereceiptRequestMain.data.ts +++ b/src/views/wms/purchasereceiptManage/developpurchasereceipt/developPurchasereceiptRequestMain/purchasereceiptRequestMain.data.ts @@ -748,7 +748,7 @@ export const PurchasereceiptRequestDetail = useCrudSchemas(reactive }, }, { - label: '物料代码', + label: '品番', field: 'itemCode', sort: 'custom', table: { @@ -660,7 +660,7 @@ export const PurchasereceiptRecordDetail = useCrudSchemas(reactive }, }, { - label: '物料名称', + label: '品名', field: 'itemName', sort: 'custom', table: { @@ -669,14 +669,15 @@ export const PurchasereceiptRecordDetail = useCrudSchemas(reactive sortTableDefault:10, }, { - label: '物料描述1', + label: '背番', field: 'itemDesc1', sort: 'custom', table: { width: 150 }, - sortTableDefault:11, - hiddenInMain:true + sortTableDefault: 10, + isTableForm: false, + isForm: false }, { label: '物料描述2', diff --git a/src/views/wms/purchasereceiptManage/jispurchasereceipt/jisPurchasereceiptRequestMain/purchasereceiptRequestMain.data.ts b/src/views/wms/purchasereceiptManage/jispurchasereceipt/jisPurchasereceiptRequestMain/purchasereceiptRequestMain.data.ts index 4093efc95..d769fe1e8 100644 --- a/src/views/wms/purchasereceiptManage/jispurchasereceipt/jisPurchasereceiptRequestMain/purchasereceiptRequestMain.data.ts +++ b/src/views/wms/purchasereceiptManage/jispurchasereceipt/jisPurchasereceiptRequestMain/purchasereceiptRequestMain.data.ts @@ -748,7 +748,7 @@ export const PurchasereceiptRequestDetail = useCrudSchemas(reactive disabled: true }, }, - { - label: '物料代码', - field: 'itemCode', - sort: 'custom', - table: { - width: 150 - }, - sortTableDefault:10, - isSearch: true - }, + { label: '是否已发送检验申请', field: 'inspectRequestFlag', @@ -660,7 +651,17 @@ export const PurchasereceiptRecordDetail = useCrudSchemas(reactive }, }, { - label: '物料名称', + label: '品番', + field: 'itemCode', + sort: 'custom', + table: { + width: 150 + }, + sortTableDefault: 10, + isSearch: true + }, + { + label: '品名', field: 'itemName', sort: 'custom', table: { @@ -669,15 +670,26 @@ export const PurchasereceiptRecordDetail = useCrudSchemas(reactive sortTableDefault:10, }, { - label: '物料描述1', + label: '背番', field: 'itemDesc1', sort: 'custom', table: { width: 150 }, - sortTableDefault:11, - hiddenInMain:true + sortTableDefault: 10, + isTableForm: false, + isForm: false }, + // { + // label: '物料描述1', + // field: 'itemDesc1', + // sort: 'custom', + // table: { + // width: 150 + // }, + // sortTableDefault:11, + // hiddenInMain:true + // }, { label: '物料描述2', field: 'itemDesc2', diff --git a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/purchasereceiptRequestMain.data.ts b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/purchasereceiptRequestMain.data.ts index 9de876502..60d477a41 100644 --- a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/purchasereceiptRequestMain.data.ts +++ b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/purchasereceiptRequestMain.data.ts @@ -749,7 +749,7 @@ export const PurchasereceiptRequestDetail = useCrudSchemas(reactive }, }, { - label: '物料代码', + label: '品番', field: 'itemCode', sort: 'custom', table: { @@ -660,7 +660,7 @@ export const PurchasereceiptRecordDetail = useCrudSchemas(reactive }, }, { - label: '物料名称', + label: '品名', field: 'itemName', sort: 'custom', table: { @@ -669,15 +669,26 @@ export const PurchasereceiptRecordDetail = useCrudSchemas(reactive sortTableDefault:10, }, { - label: '物料描述1', + label: '背番', field: 'itemDesc1', sort: 'custom', table: { width: 150 }, - sortTableDefault:11, - hiddenInMain:true + sortTableDefault: 10, + isTableForm: false, + isForm: false }, + // { + // label: '物料描述1', + // field: 'itemDesc1', + // sort: 'custom', + // table: { + // width: 150 + // }, + // sortTableDefault:11, + // hiddenInMain:true + // }, { label: '物料描述2', field: 'itemDesc2', diff --git a/src/views/wms/purchasereceiptManage/toolpurchasereceipt/toolPurchasereceiptRequestMain/purchasereceiptRequestMain.data.ts b/src/views/wms/purchasereceiptManage/toolpurchasereceipt/toolPurchasereceiptRequestMain/purchasereceiptRequestMain.data.ts index 4093efc95..d769fe1e8 100644 --- a/src/views/wms/purchasereceiptManage/toolpurchasereceipt/toolPurchasereceiptRequestMain/purchasereceiptRequestMain.data.ts +++ b/src/views/wms/purchasereceiptManage/toolpurchasereceipt/toolPurchasereceiptRequestMain/purchasereceiptRequestMain.data.ts @@ -748,7 +748,7 @@ export const PurchasereceiptRequestDetail = useCrudSchemas(reactive Date: Mon, 16 Dec 2024 16:17:18 +0800 Subject: [PATCH 127/213] =?UTF-8?q?YT-1722=E4=BE=9B=E5=BA=94=E5=95=86?= =?UTF-8?q?=E5=8F=91=E8=B4=A7=E7=94=B3=E8=AF=B7-=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=EF=BC=8C=E9=80=89=E6=8B=A9=E8=A6=81=E8=B4=A7=E8=AE=A1=E5=88=92?= =?UTF-8?q?=E6=97=B6=EF=BC=8C=E5=BC=B9=E5=87=BA=E7=9A=84=E8=A6=81=E8=B4=A7?= =?UTF-8?q?=E8=AE=A1=E5=88=92=E5=88=97=E8=A1=A8=E4=B8=AD=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E3=80=90=E8=A6=81=E8=B4=A7=E8=AE=A1=E5=88=92=E3=80=91=E5=8D=95?= =?UTF-8?q?=E5=8F=B7=E5=88=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../supplierdeliverRequestMain.data.ts | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts index 0651aa38f..f076d3111 100644 --- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts +++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts @@ -34,6 +34,15 @@ if(PurchasePlanDetailSchemas?.tableColumns){ formatter: dateFormatter2, sortTableDefault:2 }); + PurchasePlanDetailSchemas.tableColumns.splice(1, 0, { + label: '要货计划单号', + field: 'number', + table: { + width: 180 + }, + width: 180, + sortTableDefault:1 + }); } From 01caa25e1b35e2564e4159091323f0ab6e11b5a8 Mon Sep 17 00:00:00 2001 From: songguoqiang <765017469@qq.com> Date: Mon, 16 Dec 2024 16:20:36 +0800 Subject: [PATCH 128/213] =?UTF-8?q?YT-1718=EF=BC=9A=E4=BE=9B=E5=BA=94?= =?UTF-8?q?=E5=95=86=E5=BC=80=E7=A5=A812-16=E5=8F=98=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../supplierinvoiceRecordMain.data.ts | 16 ++++++++++++++++ .../supplierinvoiceRequestMain/index.vue | 2 +- .../supplierinvoiceRequestMain.data.ts | 16 ++++++++++++++++ 3 files changed, 33 insertions(+), 1 deletion(-) diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/supplierinvoiceRecordMain.data.ts b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/supplierinvoiceRecordMain.data.ts index 53edc52cb..d96edb212 100644 --- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/supplierinvoiceRecordMain.data.ts +++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/supplierinvoiceRecordMain.data.ts @@ -1615,6 +1615,22 @@ export const SupplierinvoiceRecordDetail = useCrudSchemas(reactive isDetail: false, isTable: true, }, + { + label: '采购计量单位', + field: 'purchaseStdUom', + dictType: DICT_TYPE.UOM, + dictClass: 'string', + table: { + width: 150 + }, + isForm:false, + isTableForm:true, + isDetail: false, + isTable: true, + tableForm:{ + disabled:true + } + }, { label: '物料名称', field: 'itemName', diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue index a88ac0031..97663905e 100644 --- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue +++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue @@ -602,7 +602,7 @@ const searchTableSuccess = (formField, searchField, val, searchFormRef, type, ro newRow['invoicableQuantity'] = item['invoicableQuantity'] newRow['itemCode'] = item['itemCode'] newRow['itemName'] = item['itemName'] - + newRow['purchaseStdUom'] = item['purchaseStdUom'] newRow['deliveryDate'] = item['prhRcpDate'] newRow['arrivalQty'] = item['prhRcvd'] newRow['id'] = item['id'] diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts index 9bc43307c..80cf33539 100644 --- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts +++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts @@ -1991,6 +1991,22 @@ export const SupplierinvoiceRequestDetail = useCrudSchemas(reactive Date: Mon, 16 Dec 2024 16:39:52 +0800 Subject: [PATCH 129/213] =?UTF-8?q?YT-1719=E7=94=9F=E6=88=90=E5=A4=87?= =?UTF-8?q?=E6=96=99=E8=AE=A1=E5=88=92?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../productionMain/productionMain.data.ts | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/views/wms/productionManage/productionplan/productionMain/productionMain.data.ts b/src/views/wms/productionManage/productionplan/productionMain/productionMain.data.ts index ad36bcc6a..f8da1134e 100644 --- a/src/views/wms/productionManage/productionplan/productionMain/productionMain.data.ts +++ b/src/views/wms/productionManage/productionplan/productionMain/productionMain.data.ts @@ -475,6 +475,16 @@ export const ProductionMain = useCrudSchemas(reactive([ isTable: false, isForm: false, }, + { + label: '备注', + field: 'remark', + sort: 'custom', + table: { + width: 350 + }, + isTable: false, + isForm: false, + }, // { // label: '开始时间', // field: 'beginTime', From fa80fb21413a4bb3b6f7ddf779d928519133f2b0 Mon Sep 17 00:00:00 2001 From: zhaoyiran Date: Mon, 16 Dec 2024 16:45:26 +0800 Subject: [PATCH 130/213] =?UTF-8?q?YT-1719=E7=94=9F=E6=88=90=E5=A4=87?= =?UTF-8?q?=E6=96=99=E8=AE=A1=E5=88=92?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../productionMain/productionMain.data.ts | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/views/wms/productionManage/productionplan/productionMain/productionMain.data.ts b/src/views/wms/productionManage/productionplan/productionMain/productionMain.data.ts index ad36bcc6a..f8da1134e 100644 --- a/src/views/wms/productionManage/productionplan/productionMain/productionMain.data.ts +++ b/src/views/wms/productionManage/productionplan/productionMain/productionMain.data.ts @@ -475,6 +475,16 @@ export const ProductionMain = useCrudSchemas(reactive([ isTable: false, isForm: false, }, + { + label: '备注', + field: 'remark', + sort: 'custom', + table: { + width: 350 + }, + isTable: false, + isForm: false, + }, // { // label: '开始时间', // field: 'beginTime', From ea139a1b5cfdf0357658d58c9c34090ad1ddf7c0 Mon Sep 17 00:00:00 2001 From: zhaoyiran Date: Mon, 16 Dec 2024 17:57:11 +0800 Subject: [PATCH 131/213] YT-1719 --- .../productionMain/productionMain.data.ts | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/src/views/wms/productionManage/productionplan/productionMain/productionMain.data.ts b/src/views/wms/productionManage/productionplan/productionMain/productionMain.data.ts index f8da1134e..2fce5f7ce 100644 --- a/src/views/wms/productionManage/productionplan/productionMain/productionMain.data.ts +++ b/src/views/wms/productionManage/productionplan/productionMain/productionMain.data.ts @@ -462,6 +462,8 @@ export const ProductionMain = useCrudSchemas(reactive([ table: { width: 150 }, + dictType: DICT_TYPE.TRUE_FALSE, + dictClass: 'string', isTable: false, isForm: false, }, @@ -475,16 +477,6 @@ export const ProductionMain = useCrudSchemas(reactive([ isTable: false, isForm: false, }, - { - label: '备注', - field: 'remark', - sort: 'custom', - table: { - width: 350 - }, - isTable: false, - isForm: false, - }, // { // label: '开始时间', // field: 'beginTime', From ff41fb7b69110dc171f92af022fe42c45ea5081e Mon Sep 17 00:00:00 2001 From: songguoqiang <765017469@qq.com> Date: Mon, 16 Dec 2024 18:35:51 +0800 Subject: [PATCH 132/213] =?UTF-8?q?YT-1718=EF=BC=9A=E4=BE=9B=E5=BA=94?= =?UTF-8?q?=E5=95=86=E5=BC=80=E7=A5=A812-16=E5=8F=98=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../supplierinvoiceRecordMain/supplierinvoiceRecordMain.data.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/supplierinvoiceRecordMain.data.ts b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/supplierinvoiceRecordMain.data.ts index d96edb212..8ac1671fc 100644 --- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/supplierinvoiceRecordMain.data.ts +++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/supplierinvoiceRecordMain.data.ts @@ -1620,6 +1620,7 @@ export const SupplierinvoiceRecordDetail = useCrudSchemas(reactive field: 'purchaseStdUom', dictType: DICT_TYPE.UOM, dictClass: 'string', + sortTableDefault:6, table: { width: 150 }, From 59043f7d5b8b878b7d1faa2bbb99d0428ab55a11 Mon Sep 17 00:00:00 2001 From: songguoqiang <765017469@qq.com> Date: Mon, 16 Dec 2024 19:17:47 +0800 Subject: [PATCH 133/213] =?UTF-8?q?YT-1720:=E8=A1=A5=E7=BB=99=E5=93=81?= =?UTF-8?q?=E6=94=B6=E8=B4=A7=E7=94=B3=E8=AF=B7=E6=89=93=E5=8D=B0=E6=A0=87?= =?UTF-8?q?=E7=AD=BE=E9=A1=B5=E9=9D=A2=E7=BC=BA=E5=B0=91=E5=8C=85=E8=A3=85?= =?UTF-8?q?=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../supplierdeliverRequestMain.data.ts | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts index f076d3111..6d162b5f3 100644 --- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts +++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts @@ -1977,6 +1977,14 @@ export const SupplierdeliverRequestPackage2 = useCrudSchemas(reactive Date: Tue, 17 Dec 2024 11:59:43 +0800 Subject: [PATCH 134/213] =?UTF-8?q?YT-1723:=E9=87=87=E8=B4=AD=E6=94=B6?= =?UTF-8?q?=E8=B4=A7=E8=AE=B0=E5=BD=95=EF=BC=88=E9=87=87=E8=B4=AD=E6=94=B6?= =?UTF-8?q?=E8=B4=A7=EF=BC=88WMS&SCP=EF=BC=89=EF=BC=8C=E5=8F=B7=E8=AF=95?= =?UTF-8?q?=E5=93=81=E6=94=B6=E8=B4=A7=EF=BC=8C=E5=8D=8F=E5=AE=9A=E5=93=81?= =?UTF-8?q?=E6=94=B6=E8=B4=A7=EF=BC=8C=E9=A1=BA=E5=BC=95=E6=94=B6=E8=B4=A7?= =?UTF-8?q?=EF=BC=8CAMV=E6=94=B6=E8=B4=A7=EF=BC=8C=E7=9B=B4=E7=BA=B3?= =?UTF-8?q?=E5=93=81=E6=94=B6=E8=B4=A7=EF=BC=89=E6=93=8D=E4=BD=9C=E5=88=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../purchasereceiptRecordMain.data.ts | 2 +- .../purchasereceiptRecordMain.data.ts | 2 +- .../purchasereceiptRecordMain.data.ts | 2 +- .../purchasereceiptRecordMain.data.ts | 2 +- .../purchasereceiptRecordMain/purchasereceiptRecordMain.data.ts | 2 +- .../purchasereceiptRecordMain.data.ts | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/views/wms/purchasereceiptManage/amvpurchasereceipt/amvPurchasereceiptRecordMain/purchasereceiptRecordMain.data.ts b/src/views/wms/purchasereceiptManage/amvpurchasereceipt/amvPurchasereceiptRecordMain/purchasereceiptRecordMain.data.ts index 0ae88cc20..c1b82267f 100644 --- a/src/views/wms/purchasereceiptManage/amvpurchasereceipt/amvPurchasereceiptRecordMain/purchasereceiptRecordMain.data.ts +++ b/src/views/wms/purchasereceiptManage/amvpurchasereceipt/amvPurchasereceiptRecordMain/purchasereceiptRecordMain.data.ts @@ -396,7 +396,7 @@ export const PurchasereceiptRecordMain = useCrudSchemas(reactive([ isDetail: false, isForm: false, table: { - width: 400, + width: 300, fixed: 'right' }, }, diff --git a/src/views/wms/purchasereceiptManage/bspurchasereceipt/bsPurchasereceiptRecordMain/purchasereceiptRecordMain.data.ts b/src/views/wms/purchasereceiptManage/bspurchasereceipt/bsPurchasereceiptRecordMain/purchasereceiptRecordMain.data.ts index 61cb2eda9..0b7ac3bb1 100644 --- a/src/views/wms/purchasereceiptManage/bspurchasereceipt/bsPurchasereceiptRecordMain/purchasereceiptRecordMain.data.ts +++ b/src/views/wms/purchasereceiptManage/bspurchasereceipt/bsPurchasereceiptRecordMain/purchasereceiptRecordMain.data.ts @@ -396,7 +396,7 @@ export const PurchasereceiptRecordMain = useCrudSchemas(reactive([ isDetail: false, isForm: false, table: { - width: 400, + width: 300, fixed: 'right' }, }, diff --git a/src/views/wms/purchasereceiptManage/developpurchasereceipt/developPurchasereceiptRecordMain/purchasereceiptRecordMain.data.ts b/src/views/wms/purchasereceiptManage/developpurchasereceipt/developPurchasereceiptRecordMain/purchasereceiptRecordMain.data.ts index 4a9620b54..6bcfbacf7 100644 --- a/src/views/wms/purchasereceiptManage/developpurchasereceipt/developPurchasereceiptRecordMain/purchasereceiptRecordMain.data.ts +++ b/src/views/wms/purchasereceiptManage/developpurchasereceipt/developPurchasereceiptRecordMain/purchasereceiptRecordMain.data.ts @@ -396,7 +396,7 @@ export const PurchasereceiptRecordMain = useCrudSchemas(reactive([ isDetail: false, isForm: false, table: { - width: 400, + width: 300, fixed: 'right' }, }, diff --git a/src/views/wms/purchasereceiptManage/jispurchasereceipt/jisPurchasereceiptRecordMain/purchasereceiptRecordMain.data.ts b/src/views/wms/purchasereceiptManage/jispurchasereceipt/jisPurchasereceiptRecordMain/purchasereceiptRecordMain.data.ts index d2f83e8b9..8204d5616 100644 --- a/src/views/wms/purchasereceiptManage/jispurchasereceipt/jisPurchasereceiptRecordMain/purchasereceiptRecordMain.data.ts +++ b/src/views/wms/purchasereceiptManage/jispurchasereceipt/jisPurchasereceiptRecordMain/purchasereceiptRecordMain.data.ts @@ -396,7 +396,7 @@ export const PurchasereceiptRecordMain = useCrudSchemas(reactive([ isDetail: false, isForm: false, table: { - width: 400, + width: 300, fixed: 'right' }, }, diff --git a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMain/purchasereceiptRecordMain.data.ts b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMain/purchasereceiptRecordMain.data.ts index b80402187..e89f88ecd 100644 --- a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMain/purchasereceiptRecordMain.data.ts +++ b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMain/purchasereceiptRecordMain.data.ts @@ -396,7 +396,7 @@ export const PurchasereceiptRecordMain = useCrudSchemas(reactive([ isDetail: false, isForm: false, table: { - width: 400, + width: 300, fixed: 'right' }, }, diff --git a/src/views/wms/purchasereceiptManage/toolpurchasereceipt/toolPurchasereceiptRecordMain/purchasereceiptRecordMain.data.ts b/src/views/wms/purchasereceiptManage/toolpurchasereceipt/toolPurchasereceiptRecordMain/purchasereceiptRecordMain.data.ts index 5cbd156d3..1d778d264 100644 --- a/src/views/wms/purchasereceiptManage/toolpurchasereceipt/toolPurchasereceiptRecordMain/purchasereceiptRecordMain.data.ts +++ b/src/views/wms/purchasereceiptManage/toolpurchasereceipt/toolPurchasereceiptRecordMain/purchasereceiptRecordMain.data.ts @@ -396,7 +396,7 @@ export const PurchasereceiptRecordMain = useCrudSchemas(reactive([ isDetail: false, isForm: false, table: { - width: 400, + width: 300, fixed: 'right' }, }, From 6d38cec09f52f17e26dfed2d151323128d94c8ca Mon Sep 17 00:00:00 2001 From: songguoqiang Date: Tue, 17 Dec 2024 14:05:12 +0800 Subject: [PATCH 135/213] =?UTF-8?q?YT-1718:=E4=BE=9B=E5=BA=94=E5=95=86?= =?UTF-8?q?=E5=BC=80=E7=A5=A812-16=E5=8F=98=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../supplierinvoiceInvoiced.data.ts | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/src/views/wms/supplierManage/supplierinvoiceInvoiced/supplierinvoiceInvoiced.data.ts b/src/views/wms/supplierManage/supplierinvoiceInvoiced/supplierinvoiceInvoiced.data.ts index 51a203719..7bfad2398 100644 --- a/src/views/wms/supplierManage/supplierinvoiceInvoiced/supplierinvoiceInvoiced.data.ts +++ b/src/views/wms/supplierManage/supplierinvoiceInvoiced/supplierinvoiceInvoiced.data.ts @@ -212,9 +212,19 @@ export const SupplierinvoiceInvoiced = useCrudSchemas(reactive([ width: 150 }, }, + // { + // label: '计量单位', + // field: 'uom', + // dictType: DICT_TYPE.UOM, + // dictClass: 'string', + // sort: 'custom', + // table: { + // width: 150 + // }, + // }, { - label: '计量单位', - field: 'uom', + label: '采购计量单位', + field: 'purchaseStdUom', dictType: DICT_TYPE.UOM, dictClass: 'string', sort: 'custom', From 11e21b8043fe543d62b386bf74384324c1522e96 Mon Sep 17 00:00:00 2001 From: "YEJIAXING-PC\\lenovo" <591141169@qq.com> Date: Tue, 17 Dec 2024 16:39:44 +0800 Subject: [PATCH 136/213] =?UTF-8?q?=E4=BE=9B=E5=BA=94=E5=95=86=E5=8F=91?= =?UTF-8?q?=E8=B4=A7=E6=A0=87=E7=AD=BE=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/wms/package/index.ts | 5 +++ .../supplierdeliverRequestMain/index.vue | 35 +++++++------------ 2 files changed, 18 insertions(+), 22 deletions(-) diff --git a/src/api/wms/package/index.ts b/src/api/wms/package/index.ts index 4315e8f91..52fa6a9c2 100644 --- a/src/api/wms/package/index.ts +++ b/src/api/wms/package/index.ts @@ -122,6 +122,11 @@ export const batchPrintingLables = async (data: any) => { return await request.post({ url: `/wms/package/batchPrintingLables`, data }) } +// 批量打印标签英泰多选 +export const batchPrintingLablesForYT = async (data: any) => { + return await request.post({ url: `/wms/package/batchPrintingLablesForYT`, data }) +} + // 打印标签获取包装列表 export const getLabel = async (id: number) => { return await request.get({ url: `/wms/package/getLabel?id=` + id }) diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue index af153e6b3..6c0084ce3 100644 --- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue +++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue @@ -1234,7 +1234,6 @@ const labelPrint = async (row) => { // 打印全部 const printAllClick = () => {} - // 批量打印--供应商发货申请 const searchTableSuccess1 = async (formField, searchField, val, formRef, type, row) => { // let rows:any = [] @@ -1245,31 +1244,23 @@ const searchTableSuccess1 = async (formField, searchField, val, formRef, type, r message.warning(t('ts.请先选择要打印的数据')) return } - // window.open(src.value + '&asn_number=' + val.map(item1=>item1.number).join(',')) - let array = []//存储可采购数据 - let arrayTool = []//存储可采购协定品数据 let array1 = [] val.forEach((item,index) => { - if (item.itemBasicType =='TOOL') { - arrayTool.push(item) - array1 = arrayTool - } else { - array.push(item) - array1 = array + array1.push(item) + }) + await PackageApi.batchPrintingLablesForYT(array1) + .then(res => { + if(res.xdpLabel){ + //协定品标签 + window.open(src1.value + '&asn_number=' + res.xdpLabel) } + if (res.cgLabel) { + //采购标签 + window.open(src.value + '&asn_number=' + res.cgLabel) + } + }).catch(err => { + message.error(t('ts.创建标签失败')) }) - await PackageApi.batchPrintingLable(array1.map((item1) => item1.number).join(',')) - .then((res) => { - if (array.length > 0) { - window.open(src.value + '&asn_number=' + res) - } - if (arrayTool.length > 0) { - window.open(src1.value + '&asn_number=' + res) - } - }) - .catch((err) => { - message.error(t('ts.创建标签失败')) - }) } const print = async () => { From 6f01fc26951c6809f7425a91549cf5f71bd14dfe Mon Sep 17 00:00:00 2001 From: songguoqiang Date: Tue, 17 Dec 2024 19:13:46 +0800 Subject: [PATCH 137/213] =?UTF-8?q?YT-1662=EF=BC=9AWMS=E3=80=81SCP?= =?UTF-8?q?=E3=80=81PDA=E6=89=80=E6=9C=89=E7=95=8C=E9=9D=A2=E6=9C=89?= =?UTF-8?q?=E5=93=81=E7=95=AA=E5=AD=97=E6=AE=B5=E7=9A=84=E4=BD=8D=E7=BD=AE?= =?UTF-8?q?=EF=BC=8C=E9=83=BD=E8=A6=81=E6=98=BE=E7=A4=BA=E8=83=8C=E7=95=AA?= =?UTF-8?q?=EF=BC=8C=E5=90=8C=E6=97=B6WMS=E3=80=81SCP=E4=B9=9F=E8=A6=81?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=83=8C=E7=95=AA=E7=9A=84=E7=AD=9B=E9=80=89?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../supplierdeliver/purchaseMain/purchaseMain.data.ts | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/purchaseMain/purchaseMain.data.ts b/src/views/wms/purchasereceiptManage/supplierdeliver/purchaseMain/purchaseMain.data.ts index a119b2923..5e0bf682d 100644 --- a/src/views/wms/purchasereceiptManage/supplierdeliver/purchaseMain/purchaseMain.data.ts +++ b/src/views/wms/purchasereceiptManage/supplierdeliver/purchaseMain/purchaseMain.data.ts @@ -506,6 +506,17 @@ export const PurchaseDetail = useCrudSchemas(reactive([ } } }, + { + label: '背番', + field: 'backNumber', + table: { + width: 150 + }, + isSearch:true, + tableForm:{ + disabled:true, + } + }, { label: '行类型', field: 'poLineType', From 0c85857f463c5711d0cf5e96f26019131ae0800a Mon Sep 17 00:00:00 2001 From: songguoqiang Date: Tue, 17 Dec 2024 19:27:11 +0800 Subject: [PATCH 138/213] =?UTF-8?q?YT-1662=EF=BC=9A=E4=BE=9B=E5=BA=94?= =?UTF-8?q?=E5=95=86=E7=89=A9=E6=96=99=E6=B7=BB=E5=8A=A0back=5Fnumber=20?= =?UTF-8?q?=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../supplieritem/supplieritem.data.ts | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/src/views/wms/basicDataManage/supplierManage/supplieritem/supplieritem.data.ts b/src/views/wms/basicDataManage/supplierManage/supplieritem/supplieritem.data.ts index 784cb3b88..cf589dc8c 100644 --- a/src/views/wms/basicDataManage/supplierManage/supplieritem/supplieritem.data.ts +++ b/src/views/wms/basicDataManage/supplierManage/supplieritem/supplieritem.data.ts @@ -70,7 +70,7 @@ export const Supplieritem = useCrudSchemas(reactive([ } }, { - label: '物料代码', + label: '品番', field: 'itemCode', sort: 'custom', isSearch: true, @@ -104,7 +104,18 @@ export const Supplieritem = useCrudSchemas(reactive([ } }, { - label: '物料名称', + label: '背番', + field: 'backNumber', + table: { + width: 150 + }, + isSearch:true, + tableForm:{ + disabled:true, + } + }, + { + label: '品名', field: 'itemName', isForm:true, form:{ From 8de4a9b741b43821c15b1ff7678e906e2c1d3695 Mon Sep 17 00:00:00 2001 From: zhang_li <2235006734@qqq.com> Date: Wed, 18 Dec 2024 11:10:21 +0800 Subject: [PATCH 139/213] =?UTF-8?q?YT-1724=E7=BC=96=E8=BE=91=E5=BA=93?= =?UTF-8?q?=E4=BD=8D=E5=AD=98=E5=82=A8=E7=AD=96=E7=95=A5=EF=BC=8C=E9=BC=A0?= =?UTF-8?q?=E6=A0=87=E5=AE=9A=E4=BD=8D=E5=88=B0=E8=A7=84=E5=88=99=E6=9D=A1?= =?UTF-8?q?=E4=BB=B6=E5=A4=84=EF=BC=8C=E5=85=89=E6=A0=87=E7=A6=BB=E5=BC=80?= =?UTF-8?q?=E5=BC=B9=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../arrivalInspectionStrategy/AddForm.vue | 5 ----- .../strategy/batchStrategy/AddForm.vue | 15 ++++++++++----- .../strategy/deliverStrategy/AddForm.vue | 6 ++---- .../strategy/downShelfStrategy/AddForm.vue | 5 ----- .../strategy/repairMaterialStrategy/AddForm.vue | 5 +++-- .../strategy/storageCapacityStrategy/AddForm.vue | 16 ++++++++-------- .../strategy/upShelfStrategy/AddForm.vue | 4 +--- .../warehouseStorageStrategy/AddForm.vue | 5 ----- 8 files changed, 24 insertions(+), 37 deletions(-) diff --git a/src/views/wms/basicDataManage/strategySetting/strategy/arrivalInspectionStrategy/AddForm.vue b/src/views/wms/basicDataManage/strategySetting/strategy/arrivalInspectionStrategy/AddForm.vue index f75ecb889..171db4c5a 100644 --- a/src/views/wms/basicDataManage/strategySetting/strategy/arrivalInspectionStrategy/AddForm.vue +++ b/src/views/wms/basicDataManage/strategySetting/strategy/arrivalInspectionStrategy/AddForm.vue @@ -300,11 +300,6 @@ const open = async (type: string, strategyCode: string, id?: number) => { // } if (data.condition) { formData.value.condition = JSON.parse(data.condition) - formData.value.condition.forEach((item, index) => { - if (item.Operator == 'IN' || item.Operator == 'NOT IN') { - item.Value = item.Value.split(',') - } - }) } if (data.configuration) { formData.value.configuration = JSON.parse(data.configuration) diff --git a/src/views/wms/basicDataManage/strategySetting/strategy/batchStrategy/AddForm.vue b/src/views/wms/basicDataManage/strategySetting/strategy/batchStrategy/AddForm.vue index c39fed41c..48cfd7904 100644 --- a/src/views/wms/basicDataManage/strategySetting/strategy/batchStrategy/AddForm.vue +++ b/src/views/wms/basicDataManage/strategySetting/strategy/batchStrategy/AddForm.vue @@ -442,8 +442,8 @@ const open = async (type: string, strategyCode: string, id?: number) => { if (data.condition) { formData.value.condition = JSON.parse(data.condition) formData.value.condition.forEach((item, index) => { - if (item.Operator == 'IN' || item.Operator == 'NOT IN') { - item.Value = item.Value.split(',') + if (item.ParamCode == 'ItemType'||item.ParamCode == 'AbcClass' ||item.ParamCode == 'ItemGroup' ||item.ParamCode == 'ItemStatus' ) { + item.Value = item.Value.split(',') } }) } @@ -733,9 +733,14 @@ const searchTableSuccess = (formField, searchField, val, type, row) => { if(searchTableModule.value == 'condition'){ // module: config 配置 condition 条件 - // 仓库 库区 库位 库位组 - let conditionObj = formData.value.condition.find(item=>['ItemCode','WarehouseCode','AreaCode','LocationGroupCode','LocationCode'].includes(item['ParamCode'])) - conditionObj['Value'] = val.map(item=>(item['code'])).join(',') + // 供应商客户 + if (formField == 'SupplierCode' || formField == 'CustomerCode') { + let conditionObj = formData.value.condition.find(item => ['SupplierCode', 'CustomerCode'].includes(item['ParamCode'])) + conditionObj['Value'] = val.map(item=>(item['code'])).join(',') + } else if (formField == 'ItemCode') { + let conditionObjItem = formData.value.condition.find(item => [ 'ItemCode'].includes(item['ParamCode'])) + conditionObjItem['Value'] = val.map(item=>(item['code'])).join(',') + } }else{ // 配置 // 仓库 库区 库位 库位组 diff --git a/src/views/wms/basicDataManage/strategySetting/strategy/deliverStrategy/AddForm.vue b/src/views/wms/basicDataManage/strategySetting/strategy/deliverStrategy/AddForm.vue index 4b78e4c9d..d46dd2be8 100644 --- a/src/views/wms/basicDataManage/strategySetting/strategy/deliverStrategy/AddForm.vue +++ b/src/views/wms/basicDataManage/strategySetting/strategy/deliverStrategy/AddForm.vue @@ -983,6 +983,7 @@ const searchWarehouse = ()=>{ } const searchTableSuccess = (formField, searchField, val, type, row) => { + console.log(77,formField) if(formField=='Productionline'){ let transactionType = formData.value.condition.find(item=>item['ParamCode']=='Productionline') if(transactionType){ @@ -1067,10 +1068,7 @@ const open = async (type: string, strategyCode: string, id?: number) => { if (data.condition) { formData.value.condition = JSON.parse(data.condition) formData.value.condition.forEach((item, index) => { - if ((item.Operator == 'IN' || item.Operator == 'NOT IN')&& Array.isArray(item.Value)) { - item.Value = item.Value.split(',') - } - if (item.ParamCode == 'ItemType'||item.ParamCode == 'AbcClass' ||item.ParamCode == 'ItemGroup' ||item.ParamCode == 'ItemStatus' || item.ParamCode == 'CustomerCode' ) { + if (item.ParamCode == 'ItemType'||item.ParamCode == 'AbcClass' ||item.ParamCode == 'ItemGroup' ||item.ParamCode == 'ItemStatus' ) { console.log(item.Value) item.Value = item.Value.split(',') } diff --git a/src/views/wms/basicDataManage/strategySetting/strategy/downShelfStrategy/AddForm.vue b/src/views/wms/basicDataManage/strategySetting/strategy/downShelfStrategy/AddForm.vue index 81056e690..aecd1cbbb 100644 --- a/src/views/wms/basicDataManage/strategySetting/strategy/downShelfStrategy/AddForm.vue +++ b/src/views/wms/basicDataManage/strategySetting/strategy/downShelfStrategy/AddForm.vue @@ -807,11 +807,6 @@ const open = async (type: string, strategyCode: string, id?: number) => { if (data.condition) { formData.value.condition = JSON.parse(data.condition) formData.value.condition.forEach((item, index) => { - console.log(item) - if ((item.Operator == 'IN' || item.Operator == 'NOT IN')&& Array.isArray(item.Value)) { - console.log(item.Value) - item.Value = item.Value.split(',') - } if (item.ParamCode == 'ItemType'||item.ParamCode == 'AbcClass' ||item.ParamCode == 'ItemGroup' ||item.ParamCode == 'ItemStatus') { console.log(item.Value) item.Value = item.Value.split(',') diff --git a/src/views/wms/basicDataManage/strategySetting/strategy/repairMaterialStrategy/AddForm.vue b/src/views/wms/basicDataManage/strategySetting/strategy/repairMaterialStrategy/AddForm.vue index 871342dee..b542c19c3 100644 --- a/src/views/wms/basicDataManage/strategySetting/strategy/repairMaterialStrategy/AddForm.vue +++ b/src/views/wms/basicDataManage/strategySetting/strategy/repairMaterialStrategy/AddForm.vue @@ -474,11 +474,12 @@ const open = async (type: string, strategyCode: string, id?: number) => { if (data.condition) { formData.value.condition = JSON.parse(data.condition) formData.value.condition.forEach((item, index) => { - if (item.Operator == 'IN' || item.Operator == 'NOT IN') { + if (item.ParamCode == 'ItemType'||item.ParamCode == 'AbcClass' ||item.ParamCode == 'ItemGroup' ||item.ParamCode == 'ItemStatus' ) { + console.log(item.Value) item.Value = item.Value.split(',') } }) - console.log(formData.value.condition) + // console.log(formData.value.condition) } if (data.configuration) { formData.value.configuration = JSON.parse(data.configuration) diff --git a/src/views/wms/basicDataManage/strategySetting/strategy/storageCapacityStrategy/AddForm.vue b/src/views/wms/basicDataManage/strategySetting/strategy/storageCapacityStrategy/AddForm.vue index 7ebeee92e..bf8534f94 100644 --- a/src/views/wms/basicDataManage/strategySetting/strategy/storageCapacityStrategy/AddForm.vue +++ b/src/views/wms/basicDataManage/strategySetting/strategy/storageCapacityStrategy/AddForm.vue @@ -466,11 +466,6 @@ const open = async (type: string, strategyCode: string, id?: number) => { // } if (data.condition) { formData.value.condition = JSON.parse(data.condition) - formData.value.condition.forEach((item, index) => { - if (item.Operator == 'IN' || item.Operator == 'NOT IN') { - item.Value = item.Value.split(',') - } - }) } if (data.configuration) { formData.value.configuration = JSON.parse(data.configuration) @@ -747,12 +742,17 @@ const blurWarehouse = async ({module='config',type})=>{ } } const searchTableSuccess = (formField, searchField, val, type, row) => { - + console.log(formField) if(searchTableModule.value == 'condition'){ // module: config 配置 condition 条件 // 仓库 库区 库位 库位组 - let conditionObj = formData.value.condition.find(item=>['ItemCode','WarehouseCode','AreaCode','LocationGroupCode','LocationCode'].includes(item['ParamCode'])) - conditionObj['Value'] = val.map(item=>(item['code'])).join(',') + if (formField == 'WarehouseCode' || formField == 'AreaCode' ||formField == 'LocationGroupCode' ||formField == 'LocationCode' ) { + let conditionObj = formData.value.condition.find(item => ['WarehouseCode', 'AreaCode', 'LocationGroupCode', 'LocationCode'].includes(item['ParamCode'])) + conditionObj['Value'] = val.map(item=>(item['code'])).join(',') + } else if (formField == 'ItemCode') { + let conditionObjItem = formData.value.condition.find(item => [ 'ItemCode'].includes(item['ParamCode'])) + conditionObjItem['Value'] = val.map(item=>(item['code'])).join(',') + } }else{ // 配置 // 仓库 库区 库位 库位组 diff --git a/src/views/wms/basicDataManage/strategySetting/strategy/upShelfStrategy/AddForm.vue b/src/views/wms/basicDataManage/strategySetting/strategy/upShelfStrategy/AddForm.vue index aba846a01..74261b5d3 100644 --- a/src/views/wms/basicDataManage/strategySetting/strategy/upShelfStrategy/AddForm.vue +++ b/src/views/wms/basicDataManage/strategySetting/strategy/upShelfStrategy/AddForm.vue @@ -1251,13 +1251,11 @@ const open = async (type: string, strategyCode: string, id?: number) => { if (data.condition) { formData.value.condition = JSON.parse(data.condition) formData.value.condition.forEach((item, index) => { - if ((item.Operator == 'IN' || item.Operator == 'NOT IN')&& !Array.isArray(item.Value)) { - if (item.ParamCode != 'WarehouseCode' && item.ParamCode != 'AreaCode' && item.ParamCode != 'LocationGroupCode' && item.ParamCode != 'LocationCode') { + if (item.ParamCode != 'WarehouseCode' && item.ParamCode != 'AreaCode' && item.ParamCode != 'LocationGroupCode' && item.ParamCode != 'LocationCode') { if (item.Value) { item.Value = item.Value.split(',') } } - } }) } if (data.configuration) { diff --git a/src/views/wms/basicDataManage/strategySetting/strategy/warehouseStorageStrategy/AddForm.vue b/src/views/wms/basicDataManage/strategySetting/strategy/warehouseStorageStrategy/AddForm.vue index c226515df..f42ea124d 100644 --- a/src/views/wms/basicDataManage/strategySetting/strategy/warehouseStorageStrategy/AddForm.vue +++ b/src/views/wms/basicDataManage/strategySetting/strategy/warehouseStorageStrategy/AddForm.vue @@ -411,11 +411,6 @@ const open = async (type: string, strategyCode: string, id?: number) => { // } if (data.condition) { formData.value.condition = JSON.parse(data.condition) - formData.value.condition.forEach((item, index) => { - if (item.Operator == 'IN' || item.Operator == 'NOT IN') { - item.Value = item.Value.split(',') - } - }) } if (data.configuration) { formData.value.configuration = JSON.parse(data.configuration) From 630737f1d6054a3a505784037bb007f88bdd51f8 Mon Sep 17 00:00:00 2001 From: zhang_li <2235006734@qqq.com> Date: Wed, 18 Dec 2024 16:21:28 +0800 Subject: [PATCH 140/213] =?UTF-8?q?YT-1722=E4=BE=9B=E5=BA=94=E5=95=86?= =?UTF-8?q?=E5=8F=91=E8=B4=A7=E7=94=B3=E8=AF=B7-=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=EF=BC=8C=E9=80=89=E6=8B=A9=E8=A6=81=E8=B4=A7=E8=AE=A1=E5=88=92?= =?UTF-8?q?=E6=97=B6=EF=BC=8C=E5=BC=B9=E5=87=BA=E7=9A=84=E8=A6=81=E8=B4=A7?= =?UTF-8?q?=E8=AE=A1=E5=88=92=E5=88=97=E8=A1=A8=E4=B8=AD=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E3=80=90=E8=A6=81=E8=B4=A7=E8=AE=A1=E5=88=92=E3=80=91=E5=8D=95?= =?UTF-8?q?=E5=8F=B7=E5=88=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../supplierdeliverRequestMain.data.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts index 6d162b5f3..25f0a9f00 100644 --- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts +++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts @@ -38,9 +38,9 @@ if(PurchasePlanDetailSchemas?.tableColumns){ label: '要货计划单号', field: 'number', table: { - width: 180 + width: 230 }, - width: 180, + width: 230, sortTableDefault:1 }); } From 7ef43568c2e5657f18323cac363cbf0982f6b6e7 Mon Sep 17 00:00:00 2001 From: zhang_li <2235006734@qqq.com> Date: Thu, 19 Dec 2024 10:08:59 +0800 Subject: [PATCH 141/213] YT-1725 --- src/api/wms/supplierinvoiceInvoiced/index.ts | 5 +- src/components/SearchHigh/src/SearchHigh.vue | 12 ++++- .../supplierinvoiceInvoiced/index.vue | 46 ++++++++++++++++--- 3 files changed, 53 insertions(+), 10 deletions(-) diff --git a/src/api/wms/supplierinvoiceInvoiced/index.ts b/src/api/wms/supplierinvoiceInvoiced/index.ts index 9be7c7d15..85baf8e41 100644 --- a/src/api/wms/supplierinvoiceInvoiced/index.ts +++ b/src/api/wms/supplierinvoiceInvoiced/index.ts @@ -58,7 +58,10 @@ export const deleteSupplierinvoiceInvoiced = async (id: number) => { export const exportSupplierinvoiceInvoiced = async (params) => { return await request.download({ url: `/wms/supplierinvoice-invoiced/export-excel`, params }) } - +// 导出待开票 Excel +export const exportSupplierinvoiceInvoicedWork = async (params) => { + return await request.download({ url: `/wms/supplierinvoice-invoiced/export-excel-work`, params }) +} // 下载用户导入模板 export const importTemplate = () => { return request.download({ url: '/wms/supplierinvoice-invoiced/get-import-template' }) diff --git a/src/components/SearchHigh/src/SearchHigh.vue b/src/components/SearchHigh/src/SearchHigh.vue index 7cbf987b0..6d18766ab 100644 --- a/src/components/SearchHigh/src/SearchHigh.vue +++ b/src/components/SearchHigh/src/SearchHigh.vue @@ -116,7 +116,8 @@ const props = defineProps({ const message = useMessage() // 消息弹窗 const route = useRoute() // 路由信息 const popoverVisible = ref(false) -const searchOption_high = ref(props.allSchemas?.tableColumns.filter(item => (item.field != "action"&&!item.hiddenSearchHigh))) +const searchOption_high = ref(props.allSchemas?.tableColumns.filter(item => (item.field != "action" && !item.hiddenSearchHigh))) +console.log(988,searchOption_high.value) const moreListData = ref({ filters:[] }) @@ -390,7 +391,14 @@ const remoteMethod = (query, array) => { options.value = userListAll.value } } - +watch( + () =>props.allSchemas, + () => { + searchOption_high.value = props.allSchemas?.tableColumns.filter(item => (item.field != "action" && !item.hiddenSearchHigh)) + },{ + deep: true + } +) defineExpose({ popoverVisible }) diff --git a/src/views/wms/supplierManage/supplierinvoiceInvoiced/index.vue b/src/views/wms/supplierManage/supplierinvoiceInvoiced/index.vue index 312b8cce1..d79a50b74 100644 --- a/src/views/wms/supplierManage/supplierinvoiceInvoiced/index.vue +++ b/src/views/wms/supplierManage/supplierinvoiceInvoiced/index.vue @@ -1,7 +1,7 @@ - + diff --git a/src/views/qms/inspectionJob/inspectionJobMain.data.ts b/src/views/qms/inspectionJob/inspectionJobMain.data.ts index 2dbdc478f..c65a7b66a 100644 --- a/src/views/qms/inspectionJob/inspectionJobMain.data.ts +++ b/src/views/qms/inspectionJob/inspectionJobMain.data.ts @@ -109,7 +109,7 @@ export const InspectionJobMain = useCrudSchemas( } }, { - label: '物料名称', + label: '品名', field: 'itemName', sort: 'custom', isSearch: false, diff --git a/src/views/qms/inspectionQ1/inspectionQ1.data.ts b/src/views/qms/inspectionQ1/inspectionQ1.data.ts index 1faeb77f9..2b59ef60f 100644 --- a/src/views/qms/inspectionQ1/inspectionQ1.data.ts +++ b/src/views/qms/inspectionQ1/inspectionQ1.data.ts @@ -27,7 +27,7 @@ const validateNumber = (rule: any, value: any, callback: any) => { } // 表单校验 export const Q1Rules = reactive({ - itemCode: [{ required: true, message: '请选择物料代码', trigger: 'change' }], + itemCode: [{ required: true, message: '请选择品番', trigger: 'change' }], customerCode: [{ required: true, message: '请选择客户代码', trigger: 'change' }], qty: [{ required: true, message: '请输入数量', trigger: 'change' }, { validator:validateNumber, message: '数量必须是数值类型', trigger: 'change'} @@ -57,7 +57,7 @@ export const Q1 = useCrudSchemas( } }, { - label: '物料代码', + label: '品番', field: 'itemCode', sort: 'custom', table: { @@ -69,7 +69,7 @@ export const Q1 = useCrudSchemas( componentProps: { enterSearch: true, isSearchList: true, // 开启查询弹窗 - searchListPlaceholder: '请选择物料代码', // 输入框占位文本 + searchListPlaceholder: '请选择品番', // 输入框占位文本 searchField: 'itemCode', // 查询弹窗赋值字段 searchTitle: '客户物料信息', // 查询弹窗标题 searchAllSchemas: Customeritem.allSchemas, // 查询弹窗所需类 @@ -95,7 +95,7 @@ export const Q1 = useCrudSchemas( } }, { - label: '物料名称', + label: '品名', field: 'itemName', sort: 'custom', dictClass: 'string', diff --git a/src/views/qms/inspectionQ2/index.vue b/src/views/qms/inspectionQ2/index.vue index acdb4c3f6..3a2f02894 100644 --- a/src/views/qms/inspectionQ2/index.vue +++ b/src/views/qms/inspectionQ2/index.vue @@ -69,7 +69,7 @@ >