From a4f134781bf0c6c17e129b12a43f03486fa5a0fc Mon Sep 17 00:00:00 2001
From: wangyufei <2267742828@qq.com>
Date: Fri, 28 Jun 2024 08:33:06 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8F=91=E7=A5=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../wms/supplierinvoiceRequestMain/index.ts   |   4 +-
 src/components/BasicForm/src/BasicForm.vue    |   2 +-
 .../supplierinvoiceRecordMain.data.ts         |  55 ++-
 .../supplierinvoiceRequestMain/index.vue      | 254 ++++++--------
 .../supplierinvoiceRequestMain.data.ts        | 330 +++++++++++++-----
 5 files changed, 408 insertions(+), 237 deletions(-)

diff --git a/src/api/wms/supplierinvoiceRequestMain/index.ts b/src/api/wms/supplierinvoiceRequestMain/index.ts
index ec37ab88c..5358945de 100644
--- a/src/api/wms/supplierinvoiceRequestMain/index.ts
+++ b/src/api/wms/supplierinvoiceRequestMain/index.ts
@@ -89,8 +89,8 @@ export const invoiceSentOutSupplierinvoiceRequestMain = async (id: number) => {
 }
 
 // 财务--审批通过供应商发货申请主
-export const financeappSupplierinvoiceRequestMain = async (id: number) => {
-  return await request.post({ url: `/wms/supplierinvoice-request-main/financeApp?id=` + id })
+export const financeappSupplierinvoiceRequestMain = async (data) => {
+  return await request.post({ url: `/wms/supplierinvoice-request-main/financeApp`, data })
 }
 // 财务--驳回供应商发货申请主
 export const financerejSupplierinvoiceRequestMain = async (data) => {
diff --git a/src/components/BasicForm/src/BasicForm.vue b/src/components/BasicForm/src/BasicForm.vue
index 2df16c7e7..933b07128 100644
--- a/src/components/BasicForm/src/BasicForm.vue
+++ b/src/components/BasicForm/src/BasicForm.vue
@@ -494,7 +494,7 @@ watch(()=>props.tableData,() => {
 })
 watch(()=>unref(formRef)?.formModel,() => {
   if(props?.sumFormDataByForm&&unref(formRef)?.formModel){
-    props?.sumFormDataByForm(formRef,unref(formRef)?.formModel,props.tableData)
+    props?.sumFormDataByForm(formRef,unref(formRef)?.formModel,props.tableData,formType.value)
   }
 },{
   deep:true
diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/supplierinvoiceRecordMain.data.ts b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/supplierinvoiceRecordMain.data.ts
index 175285f38..028abb8dc 100644
--- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/supplierinvoiceRecordMain.data.ts
+++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/supplierinvoiceRecordMain.data.ts
@@ -318,7 +318,7 @@ export const SupplierinvoiceRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     sortTableDefault:10
   },
   {
-    label: '过账时间',
+    label: '过账日期',
     field: 'postingDate',
     formatter: dateFormatter,
     detail: {
@@ -329,7 +329,17 @@ export const SupplierinvoiceRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     sort: 'custom',
     table: {
       width: 180
-    }
+    },
+    isSearch: true,
+    search: {
+      value:[],
+      component: 'DatePicker',
+      componentProps: {
+        valueFormat: 'YYYY-MM-DD',
+        type: 'daterange',
+        defaultTime: [new Date('1 '), new Date('1 ')]
+      }
+    },
   },
   {
     label: '财务凭证号',
@@ -593,6 +603,47 @@ export const SupplierinvoiceRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     },
     isForm: false,
   },
+  {
+    label: '凭证描述',
+    field: 'voucherNumberRemark',
+    isTable:true,
+    isTableForm:false,
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    isForm: false,
+  },
+  {
+    label: '未税差额',
+    field: 'beforeTaxDiffAmount',
+    formatter: accountantFormart,
+    table: {
+      width: 150
+    },
+    isForm:false,
+    isTableForm:false
+  },
+  {
+    label: '税额差异',
+    field: 'taxAmountDiff',
+    formatter: accountantFormart,
+    table: {
+      width: 150
+    },
+    isForm:false,
+    isTableForm:false
+  },
+  {
+    label: '价税合计差额',
+    field: 'totalTaxDiffAmount',
+    formatter: accountantFormart,
+    table: {
+      width: 150
+    },
+    isForm:false,
+    isTableForm:false
+  },
 ]))
 
 //表单校验
diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue
index 21d03a373..cfdfb6c81 100644
--- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue
+++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue
@@ -32,7 +32,7 @@
         </el-button>
       </template>
       <template #differencePrice="{row}">
-        <span :class="{'red-text':row.differencePrice!=0}">{{ Number(row.differencePrice).toFixed(5) }}</span>
+        <span :class="{'red-text':row.differencePrice!=0}">{{ Number(row.differencePrice).toFixed(2) }}</span>
       </template>
       <template #action="{ row,$index }">
         <ButtonBase :Butttondata="butttondata(row,$index)" @button-base-click="buttonTableClick($event,row)" />
@@ -53,19 +53,37 @@
     :tableAllSchemas="SupplierinvoiceRequestDetail.allSchemas" 
     :tableFormRules="SupplierinvoiceRequestDetailRules"
     :tableData="tableData" 
-    :sumFormDataByForm ="(formRef,formModel)=>{
-      const {taxRate=0,amount=0,taxAmount=0,adjustingTaxAmount=0} = formModel 
+    :sumFormDataByForm ="(formRef,formModel,tableData,formType)=>{
+      const {taxRate=0,amount=0,taxAmount=0,beforeTaxAmount=0,totalTaxAmount=0,discountAmount1=0,beforeTaxDiffAmount=0,taxAmountDiff=0} = formModel 
+      // 2、系统税额：每条数据的合同价格X可开票数量，计算结果取两位小数之后*税率的计算结果，再保留2位。所有子表数据再求和
+      let taxAmount_ = 0.00
+      if(formType=='update'){ // 编辑
+        taxAmount_ = taxAmount
+      }else if(formType=='create'){ // 新增
+        taxAmount_ = tableData.reduce((prev, item) => prev + Number(Number(taxRate*0.01*Number(Number(item['singlePrice']*item['invoicableQuantity']).toFixed(2))).toFixed(2)),0)
+      }
+      console.log('sumFormDataByForm',tableData)
+      console.log('taxAmount_',taxAmount_)
+
+      if(tableData)
       formRef.value.setValues({
-        taxAmount:taxRate*amount*0.01,
-        afterTaxAmount:amount+taxAmount
+        taxAmount:taxAmount_, 
+        afterTaxAmount:amount+taxAmount, // 3、系统价税合计：系统未税金额+系统税额
+        adTaxAmount:beforeTaxAmount+totalTaxAmount, //6、价税合计金额：未税金额+税额
+        beforeTaxDiffAmount:beforeTaxAmount-amount-discountAmount1,//未税差额：未税金额-系统未税金额-折扣金额
+        taxAmountDiff:totalTaxAmount-taxAmount,// 税额差异：税额-系统税额
+        totalTaxDiffAmount:beforeTaxDiffAmount+taxAmountDiff // 价税合计差额=未税差额+税额差异
       })
     }"
+    
     :sumFormDataByTableCustom ="(formRef,formModel,tableData)=>{
+        // 1、系统未税金额： 合同价格X可开票数量。每条数据的合同价格X可开票数量，计算结果取两位小数之后，求和
         const sumObject = {
-          amount:tableData.reduce((prev, item) => prev + (item['singlePrice']*item['invoicableQuantity']),0)
+          amount:tableData.reduce((prev, item) => prev + Number(Number(item['singlePrice']*item['invoicableQuantity']).toFixed(2)),0)
         }
         formRef.value.setValues(sumObject)
     }"
+    
     :apiUpdate="SupplierinvoiceRequestMainApi.updateSupplierinvoiceRequestMain"
     :apiCreate="SupplierinvoiceRequestMainApi.createSupplierinvoiceRequestMain" 
     :isBusiness="true"
@@ -76,16 +94,26 @@
     @searchTableSuccess="searchTableSuccess"
     @submitForm="submitForm"
   >      
-  <template #foorter>
+  <!-- <template #foorter>
     <div style="text-align: left">
       {{ basicFormFooter }}
     </div>
-  </template>
+  </template> -->
     <template v-slot="{row}">
-      <el-input :disabled="true" :class="{'is-red': row['singlePrice'] - row['purchasePrice'] > 0}" :modelValue="((row['singlePrice']) - (row['purchasePrice'])).toFixed(6)"/>
+      <el-input :disabled="true" :class="{'is-red': row['singlePrice'] - row['purchasePrice'] > 0}" :modelValue="((row['singlePrice']) - (row['purchasePrice'])).toFixed(2)"/>
     </template>
   </BasicForm>
 
+  <!-- 财务通过窗口 finance_mainPlanSub -->
+  <BasicForm 
+    ref="formFinanceRef" 
+    :rules="SupplierinvoiceRequestFinanceRules"
+    :formAllSchemas="SupplierinvoiceRequestFinance.allSchemas" 
+    :isBusiness="false"
+    :footButttondata="undefined"
+    @success="submitFormFinance" 
+  />
+
   <!-- 详情 -->
   <Detail
     ref="detailRef" 
@@ -137,7 +165,7 @@
     :sumFormDataByForm ="(formRef,formModel)=>{
       const {singlePrice=0,purchasePrice=0} = formModel
       formRef.value.setValues({
-        differencePrice:Number((Number(singlePrice)-Number(purchasePrice)).toFixed(6))
+        differencePrice:Number((Number(singlePrice)-Number(purchasePrice)).toFixed(2))
       })
     }"
     :isBasic="false" 
@@ -183,7 +211,10 @@
   import { SupplierinvoiceRequestMain, 
     SupplierinvoiceRequestMainRules, 
     SupplierinvoiceRequestDetail, 
-    SupplierinvoiceRequestDetailRules } from './supplierinvoiceRequestMain.data'
+    SupplierinvoiceRequestDetailRules,
+    SupplierinvoiceRequestFinance,
+    SupplierinvoiceRequestFinanceRules
+  } from './supplierinvoiceRequestMain.data'
   import * as SupplierinvoiceRequestMainApi from '@/api/wms/supplierinvoiceRequestMain'
   import * as SupplierinvoiceRequestDetailApi from '@/api/wms/supplierinvoiceRequestDetail'
   import * as defaultButtons from '@/utils/disposition/defaultButtons'
@@ -251,16 +282,16 @@ const searchTableSuccessDetail = async (formField, searchField, val, formRef,sea
   detailRef.value.updateList()
 }
 
-const basicFormFooter = computed(()=>{
-  let formModel = formRef.value?.formRef?.formModel
-  if(formModel){
-    let price1 = formModel.amount+formModel.discountAmount+formModel.discountAmount1
-    let price2 = formModel.taxAmount+formModel.adjustingTaxAmount
-    return `合计金额：未税金额=${accountantFormart(undefined,undefined,price1)}；税额=${accountantFormart(undefined,undefined,price2)}；价税合计金额=${accountantFormart(undefined,undefined,price1+price2)}；`
-  }
-  return `合计金额`
+// const basicFormFooter = computed(()=>{
+//   let formModel = formRef.value?.formRef?.formModel
+//   if(formModel){
+//     let price1 = formModel.amount+formModel.discountAmount+formModel.discountAmount1
+//     let price2 = formModel.taxAmount+formModel.adjustingTaxAmount
+//     return `合计金额：未税金额=${accountantFormart(undefined,undefined,price1)}；税额=${accountantFormart(undefined,undefined,price2)}；价税合计金额=${accountantFormart(undefined,undefined,price1+price2)}；`
+//   }
+//   return `合计金额`
 
-})
+// })
  
   // 查询页面返回
   const searchTableSuccess = (formField, searchField, val, searchFormRef, type, row) => {
@@ -461,7 +492,7 @@ const handleImport = () => {
     } else if (val == 'invoice_sent_out') { // 发票寄出确认
       handleInvoiceSentOut(row.id)
     } else if(val == 'finance_mainPlanSub'){ // 财务审批通过
-      handleFinanceApp(row.id)
+      handleFinanceApp(row)
     } else if(val == 'finance_mainPlanTur'){ //财务审批拒绝
       resonSubmit(val, row)
       // handleFinaceTur(row.masterId)
@@ -493,73 +524,27 @@ const handleImport = () => {
         if(item.field == 'orderType'){
           item.componentProps.disabled = true
         }
-        // 根据状态判断
-        if(row.status=='1'||row.status=='6'){
-          if(item.field == 'procurementCreator'){
-            // 采购价格审批人
-            item.componentProps.disabled = false
-          }
-          if(item.field == 'taxRate'){
-            // 税率
-            item.componentProps.disabled = false
-          }
-          // 调整价差
-          if(item.field == 'discountAmount'){
-            item.componentProps.disabled = false
-          }
-          // 调整税额
-          if(item.field == 'adjustingTaxAmount'){
-            item.componentProps.disabled = false
-          }
-          // 折扣金额
-          if(item.field == 'discountAmount1'){
-            item.componentProps.disabled = false
-          }
-          // 金税票号
-          if(item.field == 'goldenTaxInvoiceNumber'){
-            item.componentProps.disabled = false
-          }
-          // 开票日期
-          if(item.field == 'invoiceTime'){
+
+        // 编辑---taxRate税率\beforeTaxAmount未税金额\totalTaxAmount税额\goldenTaxInvoiceNumber金税票号\invoiceTime发票日期
+        if(item.field == 'taxRate'||item.field == 'beforeTaxAmount'||item.field == 'totalTaxAmount'||item.field == 'goldenTaxInvoiceNumber'||item.field == 'invoiceTime'){
+          if(row.status=='1'||row.status=='3'||row.status=='6'||row.status=='7'){
             item.componentProps.disabled = false
-          }
-        }else{
-          // 采购价格审批人
-          if(item.field == 'procurementCreator'){
+          }else{
             item.componentProps.disabled = true
           }
-          // 税率
-          if(item.field == 'taxRate'){
-            item.componentProps.disabled = true
-          }
-          // 调整价差
-          if(item.field == 'discountAmount'){
-            item.componentProps.disabled = true
-          }
-          // 调整税额
-          if(item.field == 'adjustingTaxAmount'){
-            item.componentProps.disabled = true
-          }
-          // 折扣金额
-          if(item.field == 'discountAmount1'){
-            item.componentProps.disabled = true
-          }
-          // 金税票号
-          if(item.field == 'goldenTaxInvoiceNumber'){
-            item.componentProps.disabled = true
-          }
-          // 开票日期
-          if(item.field == 'invoiceTime'){
+        }
+        // 编辑---procurementCreator采购审批人、discountAmount1折扣金额
+        if(item.field == 'procurementCreator'||item.field == 'discountAmount1'){
+          if(row.status=='1'||row.status=='6'){
+            item.componentProps.disabled = false
+          }else{
             item.componentProps.disabled = true
           }
         }
-        
       })
-      
     }else{
       // 新增
       SupplierinvoiceRequestMain.allSchemas.formSchema.forEach((item) => {
-        
         // 供应商代码
         if(item.field == 'supplierCode'){
           //默认供应商代码
@@ -571,44 +556,23 @@ const handleImport = () => {
         if(item.field == 'orderType'){
           item.componentProps.disabled = false
         }
-
-        //采购价格审批人
-        if(item.field == 'procurementCreator'){
-          item.componentProps.disabled = false
-        }
-        // 税率
-        if(item.field == 'taxRate'){
-          item.componentProps.disabled = false
-        }
-        // 调整价差
-        if(item.field == 'discountAmount'){
-          item.componentProps.disabled = false
-        }
-        // 调整税额
-        if(item.field == 'adjustingTaxAmount'){
-          item.componentProps.disabled = false
-        }
-        // 折扣金额
-        if(item.field == 'discountAmount1'){
-          item.componentProps.disabled = false
-        }
-        // 金税票号
-        if(item.field == 'goldenTaxInvoiceNumber'){
-          item.componentProps.disabled = false
-        }
-        // 开票日期
-        if(item.field == 'invoiceTime'){
+        // 税率 \采购价格审批人 \未税金额 \税额\金税票号\开票日期\折扣金额
+        if(item.field == 'taxRate'||item.field == 'procurementCreator'||item.field == 'beforeTaxAmount'||item.field == 'totalTaxAmount'||item.field == 'goldenTaxInvoiceNumber'||item.field == 'invoiceTime'||item.field == 'discountAmount1'){
           item.componentProps.disabled = false
         }
       })
     }
-    
     if(row && (row.status == '3' ||  row.status == '7')){
+      SupplierinvoiceRequestMainRules.beforeTaxAmount[0].required = true //未税金额
+      SupplierinvoiceRequestMainRules.totalTaxAmount[0].required = true //税额
+      SupplierinvoiceRequestMainRules.goldenTaxInvoiceNumber[0].required = true //金税票号
       SupplierinvoiceRequestMainRules.invoiceTime[0].required = true
-      SupplierinvoiceRequestMainRules.goldenTaxInvoiceNumber[0].required = true
+
     }else{
+      SupplierinvoiceRequestMainRules.beforeTaxAmount[0].required = false //未税金额
+      SupplierinvoiceRequestMainRules.totalTaxAmount[0].required = false //税额
+      SupplierinvoiceRequestMainRules.goldenTaxInvoiceNumber[0].required = false //金税票号
       SupplierinvoiceRequestMainRules.invoiceTime[0].required = false
-      SupplierinvoiceRequestMainRules.goldenTaxInvoiceNumber[0].required = false
     }
     if(row&&row.procurementCreator) row.procurementCreator = Number(row.procurementCreator)
     // 校验是否可以开票
@@ -662,10 +626,7 @@ const handleImport = () => {
     clicKRowId.value = row.id
 
     // 合同附件
-    if(roleList.value.indexOf('purchase')>-1&&row.status=='2'){
-      detailAnnexTable.value[0].hiddenDelete = false
-      detailAnnexTable.value[0].hiddenUpload = false
-    }else if(roleList.value.indexOf('supplier_operator')>-1&&(row.status=='1' || row.status=='6')){
+    if(row.status=='1'||row.status=='2'||row.status=='6'){
       detailAnnexTable.value[0].hiddenDelete = false
       detailAnnexTable.value[0].hiddenUpload = false
     }else{
@@ -673,7 +634,7 @@ const handleImport = () => {
       detailAnnexTable.value[0].hiddenUpload = true
     }
     // 发票附件
-    if(roleList.value.indexOf('supplier_operator')>-1&&(row.status=='3'||row.status=='7')){
+    if(row.status=='3'||row.status=='7'){
       detailAnnexTable.value[1].hiddenDelete = false
       detailAnnexTable.value[1].hiddenUpload = false
     }else{
@@ -787,21 +748,35 @@ const handleImport = () => {
   }
 
 
-  /** 审批通过按钮操作 */
-  const handleFinanceApp = async (id : number) => {
-    try {
-      // 审批通过的二次确认
-      await message.confirm(t('ts.是否审批通过所选中数据？'))
-      tableObject.loading = true
-      // 发起审批通过
-      await SupplierinvoiceRequestMainApi.financeappSupplierinvoiceRequestMain(id)
-      message.success(t('ts.审批通过成功!'))
-      tableObject.loading = false
-      // 刷新列表
-      await getList()
-    } catch { }finally{
-      tableObject.loading = false
-    }
+  /** 审批通过按钮操作 finance_mainPlanSub */
+  const formFinanceRef = ref()
+  const handleFinanceApp = async (row) => {
+    formFinanceRef.value.open('update', row,null,'财务通过','财务通过')
+  }
+
+  const submitFormFinance = async (formType, submitData) => {
+    let data = {...submitData}
+    console.log('submitFormFinance',data)
+    await SupplierinvoiceRequestMainApi.financeappSupplierinvoiceRequestMain({
+      id:data.id,
+      postingDate:data.postingDate,
+      voucherNumberRemark:data.voucherNumberRemark,
+    })
+    formFinanceRef.value.dialogVisible = false
+    getList()
+    // try {
+    //   // 审批通过的二次确认
+    //   await message.confirm(t('ts.是否审批通过所选中数据？'))
+    //   tableObject.loading = true
+    //   // 发起审批通过
+    //   await SupplierinvoiceRequestMainApi.financeappSupplierinvoiceRequestMain(id)
+    //   message.success(t('ts.审批通过成功!'))
+    //   tableObject.loading = false
+    //   // 刷新列表
+    //   await getList()
+    // } catch { }finally{
+    //   tableObject.loading = false
+    // }
   }
 
   /** 驳回按钮操作 */
@@ -967,18 +942,10 @@ const handleImport = () => {
   const submitForm = async (formType, submitData) => {
     let data = {...submitData}
     tableData.value.forEach((item) => {
-      item.differencePrice = Number((Number(item?.singlePrice)-Number(item?.purchasePrice)).toFixed(6))
+      item.differencePrice = Number((Number(item?.singlePrice)-Number(item?.purchasePrice)).toFixed(2))
     })
     data.subList = tableData.value // 拼接子表数据参数
-    if(data){
-      // 未税金额\价税合计金额\税额
-      let price1 = data.amount+data.discountAmount+data.discountAmount1
-      let price2 = data.taxAmount+data.adjustingTaxAmount
-      data.beforeTaxAmount = price1
-      data.totalTaxAmount = price2
-      data.adTaxAmount = price1+price2
-    }
-    
+    console.log('data',data)
     try {
       if (formType === 'create') {
         if(data.subList.length == 0){
@@ -1108,11 +1075,12 @@ const importSuccess = () => {
     }else{
       roleList.value = []
     }
-    if(roleList.value.indexOf('supplier_operator')>-1){
-      detailButtonIsShowAddStatusArray.value = ['1','6']
-    }else{
-      detailButtonIsShowAddStatusArray.value = []
-    }
+    detailButtonIsShowAddStatusArray.value = ['1','6']
+    // if(roleList.value.indexOf('supplier_operator')>-1){
+    //   detailButtonIsShowAddStatusArray.value = ['1','6']
+    // }else{
+    //   detailButtonIsShowAddStatusArray.value = []
+    // }
   }
  
   /** 初始化 **/
diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts
index 179801fcc..b263eefc0 100644
--- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts
+++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts
@@ -203,7 +203,7 @@ export const SupplierinvoiceRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
     table: {
       width: 150
     },
-    sortTableDefault:6,
+    sortTableDefault:9,
     isSearch: true,
     form: {
       value: '1',
@@ -219,17 +219,17 @@ export const SupplierinvoiceRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
     table: {
       width: 150
     },
-    sortTableDefault:5,
+    sortTableDefault:8,
     form: {
       component: 'InputNumber',
       componentProps: {
-        precision: 6,
+        precision: 2,
         disabled: true,
       }
     },
     tableForm: {
       type: 'InputNumber',
-      precision: 6,
+      precision: 2,
     }
   },
   {
@@ -245,39 +245,39 @@ export const SupplierinvoiceRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
     },
   },
   
-  {
-    label: '未税金额',
-    field: 'beforeTaxAmount',
-    formatter: accountantFormart,
-    table: {
-      width: 150
-    },
-    sortTableDefault:3,
-    isForm:false,
-    isTableForm:false
-  },
-  {
-    label: '税额',
-    field: 'totalTaxAmount',
-    formatter: accountantFormart,
-    table: {
-      width: 150
-    },
-    sortTableDefault:3,
-    isForm:false,
-    isTableForm:false
-  },
-  {
-    label: '价税合计金额',
-    field: 'adTaxAmount',
-    formatter: accountantFormart,
-    table: {
-      width: 150
-    },
-    sortTableDefault:3,
-    isForm:false,
-    isTableForm:false
-  },
+  // {
+  //   label: '未税金额',
+  //   field: 'beforeTaxAmount',
+  //   formatter: accountantFormart,
+  //   table: {
+  //     width: 150
+  //   },
+  //   sortTableDefault:3,
+  //   isForm:false,
+  //   isTableForm:false
+  // },
+  // {
+  //   label: '税额',
+  //   field: 'totalTaxAmount',
+  //   formatter: accountantFormart,
+  //   table: {
+  //     width: 150
+  //   },
+  //   sortTableDefault:3,
+  //   isForm:false,
+  //   isTableForm:false
+  // },
+  // {
+  //   label: '价税合计金额',
+  //   field: 'adTaxAmount',
+  //   formatter: accountantFormart,
+  //   table: {
+  //     width: 150
+  //   },
+  //   sortTableDefault:3,
+  //   isForm:false,
+  //   isTableForm:false
+  // },
   {
     label: '系统税额',
     field: 'taxAmount',
@@ -285,17 +285,17 @@ export const SupplierinvoiceRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
     table: {
       width: 150
     },
-    sortTableDefault:3,
+    sortTableDefault:6,
     form: {
       component: 'InputNumber',
       componentProps: {
-        precision: 6,
+        precision: 2,
         disabled: true,
       }
     },
     tableForm: {
       type: 'InputNumber',
-      precision: 6,
+      precision: 2,
     }
   },
   {
@@ -305,18 +305,18 @@ export const SupplierinvoiceRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
     table: {
       width: 150
     },
-    sortTableDefault:3,
+    sortTableDefault:7,
     form: {
       component: 'InputNumber',
       componentProps: {
-        precision: 6,
+        precision: 2,
         disabled: true,
       }
     },
     tableForm: {
       type: 'InputNumber',
       min: 0,
-      precision: 6,
+      precision: 2,
       disabled: true,
     }
   },
@@ -335,18 +335,57 @@ export const SupplierinvoiceRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
       component: 'InputNumber',
       componentProps: {
         min: 0,
-        precision: 6,
+        precision: 2,
       }
     },
     tableForm: {
       type: 'InputNumber',
       min: 0,
-      precision: 6,
+      precision: 2,
     }
   },
+  // {
+  //   label: '调整价差',
+  //   field: 'discountAmount',
+  //   formatter: accountantFormart,
+  //   table: {
+  //     width: 150
+  //   },
+  //   isTable:false,
+  //   form: {
+  //     component: 'InputNumber',
+  //     componentProps: {
+  //       precision: 2,
+  //     }
+  //   },
+  //   tableForm: {
+  //     type: 'InputNumber',
+  //     min: 0,
+  //     precision: 2,
+  //   }
+  // },
+  // {
+  //   label: '调整税额',
+  //   field: 'adjustingTaxAmount',
+  //   table: {
+  //     width: 150
+  //   },
+  //   isTable:false,
+  //   form: {
+  //     component: 'InputNumber',
+  //     componentProps: {
+  //       precision: 2,
+  //     }
+  //   },
+  //   tableForm: {
+  //     type: 'InputNumber',
+  //     min: 0,
+  //     precision: 2,
+  //   }
+  // },
   {
-    label: '调整价差',
-    field: 'discountAmount',
+    label: '折扣金额',
+    field: 'discountAmount1',
     formatter: accountantFormart,
     table: {
       width: 150
@@ -355,53 +394,113 @@ export const SupplierinvoiceRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
     form: {
       component: 'InputNumber',
       componentProps: {
-        precision: 6,
+        precision: 2,
       }
     },
     tableForm: {
       type: 'InputNumber',
       min: 0,
-      precision: 6,
+      precision: 2,
     }
   },
   {
-    label: '调整税额',
-    field: 'adjustingTaxAmount',
+    label: '未税金额',
+    field: 'beforeTaxAmount',
+    formatter: accountantFormart,
     table: {
       width: 150
     },
-    isTable:false,
+    sortTableDefault:3,
     form: {
       component: 'InputNumber',
       componentProps: {
-        precision: 6,
+        precision: 2,
+        disabled: true,
       }
     },
-    tableForm: {
-      type: 'InputNumber',
-      min: 0,
-      precision: 6,
-    }
+    isTableForm:false,
   },
   {
-    label: '折扣金额',
-    field: 'discountAmount1',
+    label: '税额',
+    field: 'totalTaxAmount',
     formatter: accountantFormart,
     table: {
       width: 150
     },
-    isTable:false,
+    sortTableDefault:4,
     form: {
       component: 'InputNumber',
       componentProps: {
-        precision: 6,
+        precision: 2,
+        disabled: true,
+      }
+    },
+    isTableForm:false,
+  },
+  {
+    label: '价税合计金额',
+    field: 'adTaxAmount',
+    formatter: accountantFormart,
+    table: {
+      width: 150
+    },
+    sortTableDefault:5,
+    form: {
+      component: 'InputNumber',
+      componentProps: {
+        precision: 2,
+        disabled: true,
+      }
+    },
+    isTableForm:false,
+  },
+  {
+    label: '未税差额',
+    field: 'beforeTaxDiffAmount',
+    formatter: accountantFormart,
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+      componentProps: {
+        precision: 2,
+        disabled: true,
+      }
+    },
+    isTableForm:false,
+  },
+  {
+    label: '税额差异',
+    field: 'taxAmountDiff',
+    formatter: accountantFormart,
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+      componentProps: {
+        precision: 2,
+        disabled: true,
+      }
+    },
+    isTableForm:false,
+  },
+  {
+    label: '价税合计差额',
+    field: 'totalTaxDiffAmount',
+    formatter: accountantFormart,
+    table: {
+      width: 150
+    },
+    isTableForm:false,
+    form: {
+      component: 'InputNumber',
+      componentProps: {
+        precision: 2,
+        disabled: true,
       }
     },
-    tableForm: {
-      type: 'InputNumber',
-      min: 0,
-      precision: 6,
-    }
   },
   
   // {
@@ -415,13 +514,13 @@ export const SupplierinvoiceRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
   //   form: {
   //     component: 'InputNumber',
   //     componentProps: {
-  //       precision: 6,
+  //       precision: 2,
   //     }
   //   },
   //   tableForm: {
   //     type: 'InputNumber',
   //     min: 0,
-  //     precision: 6,
+  //     precision: 2,
   //   }
   // },
   {
@@ -430,7 +529,7 @@ export const SupplierinvoiceRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
     table: {
       width: 150,
     },
-    sortTableDefault:7,
+    sortTableDefault:10,
     form:{
       componentProps: {
         maxlength:23,
@@ -458,7 +557,7 @@ export const SupplierinvoiceRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
     table: {
       width: 180
     },
-    sortTableDefault:8,
+    sortTableDefault:11,
     form: {
       component: 'DatePicker',
       componentProps: {
@@ -481,7 +580,7 @@ export const SupplierinvoiceRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
     isTableForm: false,
     isForm:false,
     isSearch:false,
-    sortTableDefault:9
+    sortTableDefault:12
   },
   {
     label: '过账日期',
@@ -495,9 +594,11 @@ export const SupplierinvoiceRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
       width: 180
     },
     isTable:false,
+    isDetail:false,
     form: {
       component: 'DatePicker',
       componentProps: {
+        disabled: true,
         style: {width:'100%'},
         type: 'datetime',
         dateFormat: 'YYYY-MM-DD HH:mm:ss',
@@ -505,6 +606,7 @@ export const SupplierinvoiceRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
       }
     },
   },
+  
   {
     label: '申请时间',
     field: 'requestTime',
@@ -647,12 +749,12 @@ export const SupplierinvoiceRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
       // }
     }
   },
-
+ 
   {
     label: '采购审批时间',
     field: 'procurementCreateTime',
     isTable: true,
-    sortTableDefault:10,
+    sortTableDefault:13,
     formatter: dateFormatter,
     detail: {
       dateFormat: 'YYYY-MM-DD HH:mm:ss'
@@ -670,7 +772,7 @@ export const SupplierinvoiceRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
     table: {
       width: 150
     },
-    sortTableDefault:11,
+    sortTableDefault:14,
     isForm: false,
   },
   {
@@ -679,7 +781,7 @@ export const SupplierinvoiceRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
     table: {
       width: 180
     },
-    sortTableDefault:14,
+    sortTableDefault:16,
     isTable: true,
     isSearch: false,
     isForm: false,
@@ -691,7 +793,7 @@ export const SupplierinvoiceRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
     table: {
       width: 180
     },
-    sortTableDefault:15,
+    sortTableDefault:17,
     isTable: true,
     isSearch: false,
     isForm: false,
@@ -701,7 +803,7 @@ export const SupplierinvoiceRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
     label: '财务审批时间',
     field: 'financialCreateTime',
     isTable: true,
-    sortTableDefault:12,
+    sortTableDefault:15,
     formatter: dateFormatter,
     detail: {
       dateFormat: 'YYYY-MM-DD HH:mm:ss'
@@ -912,9 +1014,59 @@ export const SupplierinvoiceRequestMainRules = reactive({
   procurementCreator: [
     { required: true, message: '请选择采购员', trigger: 'change' }
   ],
+  beforeTaxAmount: [
+    { required: true, message: '请输入未税金额', trigger: 'change' }
+  ],
+  totalTaxAmount: [
+    { required: true, message: '请输入税额', trigger: 'change' }
+  ],
 })
 
+export const SupplierinvoiceRequestFinance = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '过账日期',
+    field: 'postingDate',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    isTable:false,
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width:'100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '凭证描述',
+    field: 'voucherNumberRemark',
+    sort: 'custom',
+    isTable:false,
+    form: {
+      component: 'Input',
+      componentProps:{
+        type: 'textarea'
+      }
+    },
+  },
+]))
 
+export const SupplierinvoiceRequestFinanceRules = reactive({
+  postingDate: [
+    { required: true, message: '请选择过账日期', trigger: 'change' }
+  ],
+  voucherNumberRemark:  [
+    { max: 50, message: '不得超过40个字符', trigger: 'blur' }
+  ],
+})
 /**
  * @returns {Array} 供应商发票申请子表
  */
@@ -1022,13 +1174,13 @@ export const SupplierinvoiceRequestDetail = useCrudSchemas(reactive<CrudSchema[]
       component: 'InputNumber',
       componentProps: {
         min: 0,
-        precision: 6,
+        precision: 2,
       }
     },
     tableForm: {
       type: 'InputNumber',
       min: 0,
-      precision: 6,
+      precision: 2,
     }
   },
   {
@@ -1042,13 +1194,13 @@ export const SupplierinvoiceRequestDetail = useCrudSchemas(reactive<CrudSchema[]
       componentProps: {
         disabled: true,
         min: 0,
-        precision: 6,
+        precision: 2,
       }
     },
     tableForm:{
       disabled: true,
       min: 0,
-      precision: 6,
+      precision: 2,
     }
   },
   {
@@ -1062,14 +1214,14 @@ export const SupplierinvoiceRequestDetail = useCrudSchemas(reactive<CrudSchema[]
       componentProps: {
         disabled: true,
         min: 0,
-        precision: 6,
+        precision: 2,
       }
     },
     tableForm:{
       type: 'slot',
       disabled: true,
       min: 0,
-      precision: 6,
+      precision: 2,
     }
   },
   {
@@ -1219,7 +1371,7 @@ export const SupplierinvoiceRequestDetail = useCrudSchemas(reactive<CrudSchema[]
   },
   
   {
-    label: '未税差额',
+    label: '未税差额',//子表数据
     field: 'untaxedDifference',
     formatter: accountantFormart,
     table: {
@@ -1228,13 +1380,13 @@ export const SupplierinvoiceRequestDetail = useCrudSchemas(reactive<CrudSchema[]
     form: {
       component: 'InputNumber',
       componentProps: {
-        precision: 6,
+        precision: 2,
       }
     },
     tableForm: {
       type: 'InputNumber',
       min: 0,
-      precision: 6,
+      precision: 2,
     }
   },
   {
@@ -1247,13 +1399,13 @@ export const SupplierinvoiceRequestDetail = useCrudSchemas(reactive<CrudSchema[]
     form: {
       component: 'InputNumber',
       componentProps: {
-        precision: 6,
+        precision: 2,
       }
     },
     tableForm: {
       type: 'InputNumber',
       min: 0,
-      precision: 6,
+      precision: 2,
     }
   },