Merge remote-tracking branch 'remotes/origin/intex_online20250427' into intex

src/views/wms/deliversettlementManage/customerSaleInvoiceRecordMain/customerSaleInvoiceRecordMain.data.ts

@@ -280,25 +280,65 @@ export const CustomerSaleInvoiceMain = useCrudSchemas(reactive<CrudSchema[]>([
         type: 'InputNumber',
         precision: 2,
       }
-    }, {
+  },
-      label: '模具未税尾差',
+  // {
-      field: 'allocationDifferenceBeforeTax',
+  //     label: '模具未税尾差',
+  //     field: 'allocationDifferenceBeforeTax',
+  //     formatter: accountantFormart,
+  //     table: {
+  //       width: 160
+  //     },
+  //     form: {
+  //       component: 'InputNumber',
+  //       componentProps: {
+  //         precision: 2,
+  //         disabled: true,
+  //       }
+  //     },
+  //     tableForm: {
+  //       type: 'InputNumber',
+  //       precision: 2,
+  //     }
+  //   },
+   {
+      label: '已分摊模具未税金额',
+      field: 'alreadyMoldUntaxedAmount',
       formatter: accountantFormart,
       table: {
         width: 160
       },
       form: {
-        component: 'InputNumber',
         componentProps: {
-          precision: 2,
           disabled: true,
         }
       },
-      tableForm: {
+    },
-        type: 'InputNumber',
+    {
-        precision: 2,
+      label: '已分摊模具税额',
+      field: 'alreadyMoldTaxAmount',
+      formatter: accountantFormart,
+      table: {
+        width: 160
+      },
+      form: {
+        componentProps: {
+          disabled: true,
+        }
+      },
+    },
+    {
+      label: '模具未税差异',
+      field: 'moldTaxAmountDiff',
+      formatter: accountantFormart,
+      table: {
+        width: 160
+      },
+      form: {
+        componentProps: {
+          disabled: true,
         }
       },
+    },
   {
     label: '金税票号',
     field: 'goldenTaxInvoiceNumber',

src/views/wms/deliversettlementManage/customerSaleInvoiceRequestMain/CustomerSaleInvoiceBasicForm.vue

@@ -42,7 +42,9 @@
           taxAmountDiff = 0,
           rebateTax = 0,
           moldUntaxedAmount=0,
-          materialsUntaxedAmount=0
+          materialsUntaxedAmount=0,
+          alreadyMoldUntaxedAmount=0
+          
         } = formModel
         // 2、系统税额：每条数据的合同价格X可开票数量，计算结果取两位小数之后*税率的计算结果，再保留2位。所有子表数据再求和
         if (formType == 'update') {
@@ -62,9 +64,8 @@
           let moldTaxAmount = Number(Number(moldUntaxedAmount) * Number(taxRate) * 0.01).toFixed(2)
           // 6、主数据材料税额 materialsTaxAmount = 材料未税金额*税率/100 保留两位小数
           let materialsTaxAmount = Number(Number(materialsUntaxedAmount) * Number(taxRate) * 0.01).toFixed(2)
-          //  所有明细行模具分摊单价*数量保留两位小数之后累加
+          // 8、主数据模具税额 alreadyMoldTaxAmount = （已分摊品番数量*分摊单价）保留两位小数*税率）保留两位小数后汇总求和
-        let allAmount = tableData.reduce((prev, item) =>prev + Number((Number(item['allocationPrice'])*Number(item['qty'])).toFixed(2)),0).toFixed(2)
+          let alreadyMoldTaxAmount = tableData.reduce((prev, item) => prev + Number((Number(item['allocationPrice']) * Number(item['qty']) * Number(taxRate) * 0.01).toFixed(2)), 0).toFixed(2)
-
           formRef.value.setValues({
             // 主数据税额 
             taxAmount:mainTaxAmount,
@@ -78,9 +79,8 @@
             materialsTaxAmount: materialsTaxAmount,
             // 主数据-材料含税金额= 材料未税金额+材料税额
             materialsTaxTotal: (Number(materialsUntaxedAmount) + Number(materialsTaxAmount)).toFixed(2),
-            
+            // 主数据已分摊模具税额
-            // 主数据模具未税尾差 allocationDifferenceBeforeTax : 模具未税金额 减去 系统明细中品番数量*模具单价 保留两位小数后汇总金额
+            alreadyMoldTaxAmount: alreadyMoldTaxAmount,
-            // allocationDifferenceBeforeTax: (Number(moldUntaxedAmount) - Number(allAmount)).toFixed(2),
           })
         }
       }
@@ -100,8 +100,10 @@
         let materialsUntaxedAmount = tableData.reduce((prev, item) =>prev + Number((Number(item['price'])*Number(item['qty'])).toFixed(2)),0).toFixed(2)
         // 6、主数据材料税额 materialsTaxAmount = 材料未税金额*税率/100 保留两位小数
         let materialsTaxAmount = Number(Number(materialsUntaxedAmount) * Number(taxRate) * 0.01).toFixed(2)
-        //  所有明细行模具分摊单价*数量保留两位小数之后累加
+        //  7、已分摊模具未税金额=（已分摊品番数量*分摊单价）保留两位小数 后汇总弄求和 
-        let allAmount = tableData.reduce((prev, item) =>prev + Number((Number(item['allocationPrice'])*Number(item['qty'])).toFixed(2)),0).toFixed(2)
+        let alreadyMoldUntaxedAmount = tableData.reduce((prev, item) =>prev + Number((Number(item['allocationPrice'])*Number(item['qty'])).toFixed(2)),0).toFixed(2)
+        // 8、主数据模具税额 alreadyMoldTaxAmount = （已分摊品番数量*分摊单价）保留两位小数*税率）保留两位小数后汇总求和
+        let alreadyMoldTaxAmount = tableData.reduce((prev, item) => prev + Number((Number((Number(item['allocationPrice']) * Number(item['qty'])).toFixed(2)) * Number(taxRate) * 0.01).toFixed(2)), 0).toFixed(2)
           
         const sumObject = {
           // 主数据未税金额
@@ -122,8 +124,13 @@
           materialsTaxAmount: materialsTaxAmount,
           // 主数据-材料含税金额= 材料未税金额+材料税额
           materialsTaxTotal: (Number(materialsUntaxedAmount) + Number(materialsTaxAmount)).toFixed(2),
-          // 主数据模具未税尾差 allocationDifferenceBeforeTax : 模具未税金额 减去 系统明细中品番数量*模具单价 保留两位小数后汇总金额
+          
-          allocationDifferenceBeforeTax: (Number(moldUntaxedAmount) - Number(allAmount)).toFixed(2),
+          // 主数据已分摊模具未税金额
+          alreadyMoldUntaxedAmount: alreadyMoldUntaxedAmount,
+          // 主数据已分摊模具税额
+          alreadyMoldTaxAmount: alreadyMoldTaxAmount,
+          //  主数据模具未税差异=已分摊模具未税金额-模具分摊未税金额
+          moldTaxAmountDiff: (Number(alreadyMoldUntaxedAmount) - Number(moldUntaxedAmount)).toFixed(2),
         }
         formRef.value.setValues(sumObject)
       }

src/views/wms/deliversettlementManage/customerSaleInvoiceRequestMain/customerSaleInvoiceRequestMain.data.ts

@@ -290,9 +290,49 @@ export const CustomerSaleInvoiceMain = useCrudSchemas(reactive<CrudSchema[]>([
         disabled: true,
       }
     },
-  }, {
+  },
-    label: '模具未税尾差',
+  // {
-    field: 'allocationDifferenceBeforeTax',
+  //   label: '模具未税尾差',
+  //   field: 'allocationDifferenceBeforeTax',
+  //   formatter: accountantFormart,
+  //   table: {
+  //     width: 160
+  //   },
+  //   form: {
+  //     componentProps: {
+  //       disabled: true,
+  //     }
+  //   },
+  // },
+  {
+    label: '已分摊模具未税金额',
+    field: 'alreadyMoldUntaxedAmount',
+    formatter: accountantFormart,
+    table: {
+      width: 160
+    },
+    form: {
+      componentProps: {
+        disabled: true,
+      }
+    },
+  },
+  {
+    label: '已分摊模具税额',
+    field: 'alreadyMoldTaxAmount',
+    formatter: accountantFormart,
+    table: {
+      width: 160
+    },
+    form: {
+      componentProps: {
+        disabled: true,
+      }
+    },
+  },
+  {
+    label: '模具未税差异',
+    field: 'moldTaxAmountDiff',
     formatter: accountantFormart,
     table: {
       width: 160

src/views/wms/deliversettlementManage/customerSaleInvoiceRequestMain/index.vue

@@ -61,6 +61,7 @@
   
     @buttonBaseClick="detailButtonBaseClick"
     @searchTableSuccessDetail="searchTableSuccessDetail"
+    @handleMainFefresh='handleMainFefresh'
   >
     <template #taxAmount="scrop">
       {{scrop.row.taxAmount.toFixed(2)}}
@@ -116,7 +117,9 @@ const { tableObject, tableMethods } = useTable({
 const updataTableColumns = (val) => {
   tableColumns.value = val
 }
-
+const handleMainFefresh=()=>{
+  getList()
+}
 // 点击子表按钮事件
 const detailButtonBaseClick = async (val, item,tableObject) => {
   if (val == 'export') {

src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue

@@ -819,15 +819,6 @@ const butttondata = (row, $index) => {
       hasPermi: 'wms:supplierinvoice-request-main:financeApp',
       link: true // 文本展现按钮
     },
-    {
-      label: t('ts.财务驳回'),
-      name: 'finance_mainPlanTur',
-      hide: isShowMainButton(row, ['4']),
-      type: 'danger',
-      color: '',
-      link: true, // 文本展现按钮
-      hasPermi: 'wms:supplierinvoice-request-main:financeRej'
-    },
     defaultButtons.mainListEditBtn({
       hasPermi: 'wms:supplierinvoice-request-main:update',
       hide: isShowMainButton(row, ['1', '3', '6', '7'])
@@ -851,6 +842,14 @@ const butttondata = (row, $index) => {
       color: '',
       link: true, // 文本展现按钮
       hasPermi: ''
+    },{
+      label: t('ts.财务驳回'),
+      name: 'finance_mainPlanTur',
+      hide: isShowMainButton(row, ['4']),
+      type: 'danger',
+      color: '',
+      link: true, // 文本展现按钮
+      hasPermi: 'wms:supplierinvoice-request-main:financeRej'
     }
     ,{
       label: t('导出对账单明细'),
@@ -860,7 +859,8 @@ const butttondata = (row, $index) => {
       color: '',
       link: true, // 文本展现按钮
       hasPermi: 'wms:supplierinvoice-request-main:export_statement_detail'
-    }
+    },
+   
   ]
 }