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 1/4] =?UTF-8?q?YT-1506=E5=AE=A2=E6=88=B7=E5=AF=B9=E8=B4=A6?= =?UTF-8?q?=E5=8D=95-=E6=A8=A1=E5=85=B7=E5=88=86=E6=91=8A=E5=AF=B9?= =?UTF-8?q?=E8=B4=A6=E5=8D=95=EF=BC=8C=E5=88=86=E6=91=8A=E4=B8=AD=E5=BA=94?= =?UTF-8?q?=E8=83=BD=E4=BF=AE=E6=94=B9=E9=87=91=E9=A2=9D=EF=BC=8C=E4=B8=8D?= =?UTF-8?q?=E6=98=AF=E5=88=86=E6=91=8A=E7=8A=B6=E6=80=81=E4=B8=8D=E8=83=BD?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=EF=BC=8C=E7=8E=B0=E5=88=86=E6=91=8A=E4=B8=AD?= =?UTF-8?q?=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 2/4] =?UTF-8?q?YT-1540=E8=A1=A5=E7=BB=99=E5=93=81=E7=94=9F?= =?UTF-8?q?=E4=BA=A7=E8=AE=A1=E5=88=92=E3=80=81=E5=8F=B7=E5=8F=A3=E5=93=81?= =?UTF-8?q?=E7=94=9F=E4=BA=A7=E8=AE=A1=E5=88=92=EF=BC=8C=E5=88=87=E6=8D=A2?= =?UTF-8?q?=E8=BD=A6=E9=97=B4=E3=80=81=E7=94=9F=E4=BA=A7=E7=BA=BF=E6=97=B6?= =?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 --- .../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 3/4] =?UTF-8?q?YT-1541=E5=8F=91=E6=96=99=E7=94=B3=E8=AF=B7?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E3=80=81=E5=A4=87=E6=96=99=E8=AE=A1=E5=88=92?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=EF=BC=8C=E5=88=87=E6=8D=A2=E8=BD=A6=E9=97=B4?= =?UTF-8?q?=E4=BB=A3=E7=A0=81=E3=80=81=E7=94=9F=E4=BA=A7=E7=BA=BF=E4=BB=A3?= =?UTF-8?q?=E7=A0=81=E3=80=81=E5=B7=A5=E4=BD=8D=E4=BB=A3=E7=A0=81=EF=BC=8C?= =?UTF-8?q?=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 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 4/4] =?UTF-8?q?YT-1533=E5=88=9B=E5=BB=BA=E5=BC=80=E7=A5=A8?= =?UTF-8?q?=E7=94=B3=E8=AF=B7=EF=BC=8C=E5=90=AB=E7=A8=8E=E9=87=91=E9=A2=9D?= =?UTF-8?q?=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'] }) } }