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/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'] }) } } 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.', ''), 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) } 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] }