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] =?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.', ''),