diff --git a/src/views/wms/deliversettlementManage/customerSaleInvoiceRequestMain/CustomerSaleInvoiceBasicForm.vue b/src/views/wms/deliversettlementManage/customerSaleInvoiceRequestMain/CustomerSaleInvoiceBasicForm.vue index acc7b60eb..af19b3c2e 100644 --- a/src/views/wms/deliversettlementManage/customerSaleInvoiceRequestMain/CustomerSaleInvoiceBasicForm.vue +++ b/src/views/wms/deliversettlementManage/customerSaleInvoiceRequestMain/CustomerSaleInvoiceBasicForm.vue @@ -101,8 +101,8 @@ moldTaxAmountDiff: Math.round((Number(alreadyMoldUntaxedAmount) - Number(allAmountNum.moldUntaxedAmount))* 100) / 100, // 主数据已分摊价税合计=已分摊模具未税金额+已分摊模具税额 alreadyMoldTaxTotal: Math.round((Number(alreadyMoldUntaxedAmount) + Number(alreadyMoldTaxAmount))* 100) / 100, - // 主数据模具税额差异 alreadyMoldTaxAmount = 模具税额 - 已分摊模具税额 - moldTaxAmountDifference: Math.round((Number(allAmountNum.moldTaxAmount) - Number(alreadyMoldTaxAmount))* 100) / 100, + // 主数据模具税额差异 alreadyMoldTaxAmount = 已分摊模具税额 - 模具税额 + moldTaxAmountDifference: Math.round((Number(alreadyMoldTaxAmount) - Number(allAmountNum.moldTaxAmount))* 100) / 100, } formRef.value.setValues(sumObject) } @@ -196,8 +196,8 @@ const onChange =async (field, cur, formRefParams)=>{ moldTaxAmountDiff: allAmountNum.moldTaxAmountDiff, // 主数据已分摊价税合计=已分摊模具未税金额+已分摊模具税额 alreadyMoldTaxTotal: allAmountNum.alreadyMoldTaxTotal, - // 主数据模具税额差异 alreadyMoldTaxAmount = 模具税额 - 已分摊模具税额 - moldTaxAmountDifference: Math.round((Number(allAmountNum.moldTaxAmount) - Number(allAmountNum.alreadyMoldTaxAmount))* 100) / 100, + // 主数据模具税额差异 alreadyMoldTaxAmount = 已分摊模具税额-模具税额 + moldTaxAmountDifference: Math.round((Number(allAmountNum.alreadyMoldTaxAmount) - Number(allAmountNum.moldTaxAmount))* 100) / 100, }) } } else if (field == 'invoiceType') { diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingMain/index.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingMain/index.vue index 1a5bfbcb1..3fc72ca61 100644 --- a/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingMain/index.vue +++ b/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingMain/index.vue @@ -438,7 +438,7 @@ const updateDemandforecaste = async ()=>{ try { let res = await DemandforecastingMainApi.updateDemandforecaste(submitData) console.log('更新结果',res) - message.success(t('同步要货预测数据需要等第一段时间才能同步完毕!')) + message.success(t('正在拉取数据,预计需要 20-30 分钟!')) getList() } finally{ //tableObject.loading = false diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/purchasePlanMain.data.ts b/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/purchasePlanMain.data.ts index 189da07ad..5572b48bf 100644 --- a/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/purchasePlanMain.data.ts +++ b/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/purchasePlanMain.data.ts @@ -792,6 +792,28 @@ export const PurchasePlanDetail = useCrudSchemas( tableForm: { disabled: true } + }, + { + label: '箱数', + field: 'boxQty', + sort: 'custom', + sortSearchDefault: 9, + sortTableDefault: 21, + table: { + width: 150 + }, + tableForm: { + type: 'InputNumber', + min: 0, + precision: 0 + }, + form: { + component: 'InputNumber', + componentProps: { + min: 0, + precision: 0 + } + } }, { label: '计划采购数量', @@ -986,28 +1008,7 @@ export const PurchasePlanDetail = useCrudSchemas( disabled: true } }, - { - label: '箱数', - field: 'boxQty', - sort: 'custom', - sortSearchDefault: 9, - sortTableDefault: 21, - table: { - width: 150 - }, - tableForm: { - type: 'InputNumber', - min: 0, - precision: 0 - }, - form: { - component: 'InputNumber', - componentProps: { - min: 0, - precision: 0 - } - } - }, + // { // label: '订单数量', diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue index 8c7c56aeb..4f881e4f6 100644 --- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue +++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue @@ -1392,7 +1392,8 @@ const handleInvoiceSentOut = async (id: number) => { } const resonSubmit = async (val, row) => { - ElMessageBox.prompt(t('ts.请输入驳回原因'), t('ts.提示'), { + ElMessageBox.prompt('请输入驳回原因:'+row.supplierName, t('ts.提示'), { + //ElMessageBox.prompt(t('ts.请输入驳回原因'), t('ts.提示'), { confirmButtonText: t('common.ok'), cancelButtonText: t('common.cancel'), inputPattern: /^[\s\S]*.*\S[\s\S]*$/, // 判断非空,且非空格