From 816358b165e73c48d3cf24c56196fdc9cf89ec05 Mon Sep 17 00:00:00 2001 From: zhang_li <2235006734@qqq.com> Date: Fri, 6 Dec 2024 16:43:10 +0800 Subject: [PATCH] =?UTF-8?q?YT-1572=E9=94=80=E5=94=AE=E5=BC=80=E7=A5=A8?= =?UTF-8?q?=E9=87=91=E9=A2=9D=EF=BC=8C=E6=98=8E=E7=BB=86=E7=A8=8E=E9=A2=9D?= =?UTF-8?q?=E3=80=81=E5=90=AB=E7=A8=8E=E9=87=91=E9=A2=9D=EF=BC=8C=E5=BA=94?= =?UTF-8?q?=E4=BF=9D=E7=95=992=E4=BD=8D=E5=B0=8F=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../customerSaleInvoiceRequestMain/index.vue | 31 ++++++++-------- .../productreceiptRequestMain/index.vue | 1 - .../index.vue | 35 ++++++++++--------- 3 files changed, 35 insertions(+), 32 deletions(-) diff --git a/src/views/wms/deliversettlementManage/customerSaleInvoiceRequestMain/index.vue b/src/views/wms/deliversettlementManage/customerSaleInvoiceRequestMain/index.vue index 3ec82785a..7a89b4eb2 100644 --- a/src/views/wms/deliversettlementManage/customerSaleInvoiceRequestMain/index.vue +++ b/src/views/wms/deliversettlementManage/customerSaleInvoiceRequestMain/index.vue @@ -57,21 +57,8 @@ :detailButtonIsShowDelete="false" :detailButtonIsShowAdd="false" :otherHeadButttonData = "[defaultButtons.defaultExportBtn({hasPermi:`wms:customer-sale-invoice-request-main:export` })]" - :sumFormDataByForm=" - (formRef, formModel) => {console.log('formModel====',formModel) - const { beforeTaxAmount = 0, taxAmount = 0 , qty=0,price,allocationPrice,taxRate=1} = formModel - formRef.value.setValues({ - // 含税金额 = 未税价格+税额,四舍五入保留2位小数 - afterTaxAmount: Number((Number(beforeTaxAmount) + Number(taxAmount)).toFixed(2)), - // 模具分摊单价 默认从模具分摊对账单带出，未税金额修改后重新计算，等于未税金额/数量-销售单价 - allocationPrice: Number(Number(Number(beforeTaxAmount)/Number(qty)) - Number(price)), - // 合计单价 = 销售单价 + 模具分摊单价 - sumPrice:Number(Number(price)+Number(allocationPrice)), - // 税额：taxAmount 未税价格*税率/100,四舍五入保留2位小数 - taxAmount: Number((Number(beforeTaxAmount) * Number(taxRate)))/100 //含税金额 - }) - } - " + @detailBasicFormOnChange="detailBasicFormOnChange" + @buttonBaseClick="detailButtonBaseClick" @searchTableSuccessDetail="searchTableSuccessDetail" > @@ -356,6 +343,20 @@ const onSearchChange = (field, value)=>{ } } } +const detailBasicFormOnChange = (field, cur, formRef1) => { + console.log( formRef1.value.formModel) + const { beforeTaxAmount = 0, taxAmount = 0, qty = 0, price, allocationPrice, taxRate = 1 } = formRef1.value.formModel + formRef1.value.setValues({ + // 含税金额 = 未税价格+税额,四舍五入保留2位小数 + afterTaxAmount: Number((Number(beforeTaxAmount) + Number(taxAmount)).toFixed(2)), + // 模具分摊单价 默认从模具分摊对账单带出，未税金额修改后重新计算，等于未税金额/数量-销售单价 + allocationPrice: Number(Number(Number(beforeTaxAmount)/Number(qty)) - Number(price)), + // 合计单价 = 销售单价 + 模具分摊单价 + sumPrice:Number(Number(price)+Number(allocationPrice)), + // 税额：taxAmount 未税价格*税率/100,四舍五入保留2位小数 + taxAmount: Number((Number(beforeTaxAmount) * Number(taxRate)))/100 //含税金额 + }) +} const searchClick = async (data)=>{ console.log('查询',data) setSearchParams({...data,customerCode:data.customerCode.filter(item=>item!='ALL'),status:data.status.filter(item=>item!='')}) diff --git a/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/index.vue b/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/index.vue index a3a18d68f..53efb5458 100644 --- a/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/index.vue +++ b/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/index.vue @@ -581,7 +581,6 @@ const buttonTableClick = async (val, row) => { // 打开创建标签页面 // dialogVisible.value = true formLabelRef.value.open('create', row) - tableObject.loading = false detatableData.tableList.map((item) => { // 查询物料类型 原料 只能选择 供应商代码 半成品成品其他 只能选择 生产线 ItembasicApi.getItembasicPage({ diff --git a/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/index.vue b/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/index.vue index 3ab14a670..40a025e5c 100644 --- a/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/index.vue +++ b/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/index.vue @@ -445,6 +445,8 @@ const buttonTableClick = async (val, row) => { } else if (val == 'cjbq') { // 创建标签 // 判断 是否已创建标签 + tableObject.loading = true + try { let isCreateLabel = false await PackageApi.getPackagePage({ requestNumber: row.number @@ -524,7 +526,9 @@ const buttonTableClick = async (val, row) => { } }) }) - + }finally { + tableObject.loading = false + } } else if (val == 'mainHandle') { // 处理 tableObject.loading = true // 判断 是否已创建标签 @@ -725,22 +729,21 @@ const submitFormLabel = async (formType, submitData) => { if(data.masterId){ data.id = data.masterId } - try { - console.log("aaaaa",data); - data.subList=detatableData.tableList - console.log("bbbbb",data); - await ProductreceiptRequestMainApi.productCreateLabel(data).then(res => { - isCreateLabel.value = true - message.success('创建标签成功') - }).catch(err => { - isCreateLabel.value = false - console.log(err) - message.error('创建标签失败') - }) - } finally { + + formLabelRef.value.formLoading = true + data.subList=detatableData.tableList + await ProductreceiptRequestMainApi.productCreateLabel(data).then(res => { + isCreateLabel.value = true + message.success('创建标签成功') formLabelRef.value.formLoading = false formLabelRef.value.dialogVisible = false - } + }).catch(err => { + isCreateLabel.value = false + console.log(err) + formLabelRef.value.formLoading = false + message.error('创建标签失败') + }) + } // 查看 Bom 按钮回调事件 @@ -815,7 +818,7 @@ const labelPrint = async (row) => { // 获得表格的各种操作 const { getList:getListPrint } = tableMethods - getListPrint() + await getListPrint() tableObject.loading = false const tableColumns = SupplierdeliverRequestPackage2.allSchemas.tableFormColumns tableColumns.forEach((item) => {