付费审核

src/views/finance/paymentSettlement/columns.tsx

@@ -113,12 +113,6 @@ export const columns: BasicColumn[] = [
     dataIndex: 'ledgerVoucherNO',
     sorter: true,
     width: 100
-  },
-  {
-    title: '结算日期',
-    dataIndex: 'settlementDate',
-    sorter: true,
-    width: 100
   }
 ]
 

src/views/finance/paymentSettlement/detail/columns.tsx

@@ -12,8 +12,9 @@ const route = useRoute()
 import { GetClientListByCode, getOrgList, GetClientBank, GetFeeCurrencySelectList } from '/@/api/common'
 import { GetOrgList, ClientCommonGetStlMode, GetClientBankList,GetOrgBankList } from '../../feeSettlement/api'
 
+
 // 业务表格列
-export const businessColumns: BasicColumn[] = [
+export const mainBusinessColumns: BasicColumn[] = [
   {
     title: '申请单号',
     dataIndex: 'applicationNO',
@@ -130,6 +131,124 @@ export const businessColumns: BasicColumn[] = [
   }
 ]
 
+// 业务表格列
+export const businessColumns: BasicColumn[] = [
+  {
+    title: '申请单号',
+    dataIndex: 'applicationNO',
+    width: 120,
+    align: 'left'
+  },
+  {
+    title: '状态',
+    dataIndex: 'statusText',
+    width: 100,
+    align: 'left'
+  },
+  {
+    title: '结算单位',
+    dataIndex: 'customerName',
+    width: 120,
+    align: 'left'
+  },
+  {
+    title: 'RMB申请金额',
+    dataIndex: 'amountRMB',
+    width: 100,
+    align: 'left'
+  },
+  {
+    title: 'RMB未结金额',
+    dataIndex: 'unSettledRMB',
+    width: 100,
+    align: 'left'
+  },
+  {
+    title: 'RMB本次结算',
+    dataIndex: 'settlementRMB',
+    width: 100,
+    align: 'left'
+  },
+  {
+    title: 'USD申请金额',
+    dataIndex: 'amountUSD',
+    width: 100,
+    align: 'left'
+  },
+  {
+    title: 'USD未结金额',
+    dataIndex: 'unSettledUSD',
+    width: 100,
+    align: 'left'
+  },
+  {
+    title: 'USD本次结算',
+    dataIndex: 'settlementUSD',
+    width: 100,
+    align: 'left'
+  },
+  {
+    title: '申请日期',
+    dataIndex: 'createTime',
+    width: 100,
+    align: 'left'
+  },
+  {
+    title: '申请人',
+    dataIndex: 'createByName',
+    width: 100,
+    align: 'left'
+  },
+  {
+    title: '申请支付日期',
+    dataIndex: 'paymentDate',
+    width: 100,
+    align: 'left'
+  },
+  {
+    title: '结算方式',
+    dataIndex: 'settlementTypeName',
+    width: 100,
+    align: 'left'
+  },
+  {
+    title: '审核实付金额',
+    dataIndex: 'payAmount',
+    width: 100,
+    align: 'left'
+  },
+  {
+    title: '审核时间',
+    dataIndex: 'auditTime',
+    width: 100,
+    align: 'left'
+  },
+  {
+    title: '审核人',
+    dataIndex: 'auditerName',
+    width: 100,
+    align: 'left'
+  },
+  {
+    title: '客户银行',
+    dataIndex: 'customerBankName',
+    width: 120,
+    align: 'left'
+  },
+  {
+    title: '银行账号',
+    dataIndex: 'customerAccount',
+    width: 120,
+    align: 'left'
+  },
+  {
+    title: '所属分部',
+    dataIndex: 'saleDeptName',
+    width: 120,
+    align: 'left'
+  }
+]
+
 // 费用表格
 export const feeColumns: BasicColumn[] = [
   {
@@ -509,7 +628,7 @@ export const formSchema: FormSchema[] = [
     field: 'relativeNO',
     label: '相关号码',
     component: 'InputNumber',
-    dynamicDisabled: true,
+    dynamicDisabled: false,
     colProps: { span: 4 }
   },
   {

src/views/finance/paymentSettlement/detail/components/applyInfo.vue

@@ -53,7 +53,7 @@
 <script lang="ts" setup>
   import { onMounted, ref, defineEmits, defineProps, watch, defineExpose } from 'vue'
   import { BasicTable, useTable } from '/@/components/Table'
-  import { businessColumns } from '../columns'
+  import { mainBusinessColumns } from '../columns'
   import { Divider } from 'ant-design-vue'
   import invoiceFile from '/@/views/operation/invoiceIssue/detail/invoiceFile.vue'
   import { DeleteDetail } from '../../api'
@@ -85,7 +85,7 @@
   })
   const [registerTable, { reload, setTableData, getSelectRows, getColumns }] = useTable({
     title: '',
-    columns: businessColumns,
+    columns: mainBusinessColumns,
     isTreeTable: false,
     pagination: false,
     striped: false,

src/views/finance/paymentSettlement/detail/components/businessTable.vue

@@ -22,7 +22,7 @@
             <a-dropdown>
               <template #overlay>
                 <a-menu>
-                  <a-menu-item @click="addInfos">全部申请金额</a-menu-item>
+                  <a-menu-item @click="addInfos('All')">全部申请金额</a-menu-item>
                   <a-menu-item @click="addInfos('RMB')">仅RMB申请金额</a-menu-item>
                   <a-menu-item @click="addInfos('USD')">仅USD申请金额</a-menu-item>
                 </a-menu>
@@ -268,7 +268,6 @@
     if (selectRows.length == 0) {
       return createMessage.warning('没有选择要添加的业务!')
     }
-    console.log(props.formData)
     // 原币申请
     const postData = {
       description: '按申请单增加添加费用明细',
@@ -289,7 +288,6 @@
     const items = await GetExchanges(postCurrency).then(res => {
       return res.data
     })
-
     items.forEach(item => {
       if (item.exchangeRates) {
         item.exchangeRates.forEach(c => {
@@ -314,16 +312,18 @@
         if (type == 'USD') {
           item.settlementRMB = null
         }
+        if (type == "All") {
+          if (item.settlementRMB == 0) item.settlementRMB = null
+          if (item.settlementUSD == 0) item.settlementUSD = null
+          console.log(item.settlementUSD)
+        }
       })
     })
-
     // 过滤出所有跟业务币别不一致的币别
     currencyList = Array.from(new Set(currencyList.map(item => item.currency))).map(currency => {
       return currencyList.find(item => item.currency === currency)
     })
     postData.documents = items
-    console.log(postData)
-    console.log(currencyList)
     bPostData.value = postData
     exchangeRate.value.init(currency, currencyList, type)
   }

src/views/operation/paidApply/detail/components/exchangeRate.vue

@@ -9,30 +9,30 @@
       <div class="mt15">
         <div v-for="(item, index) in c2" :key="'cur' + index">
           <p class="flex">
-            <span class="unit">1{{ c1 }} =</span>
+            <span class="unit">1{{ item.currency }} =</span>
             <a-input-number
-              v-model:value="item.value1"
+              v-model:value="item.value"
               :min="0.000001"
               :max="99999999"
               :step="0.000001"
-              string-mode
               :precision="6"
-              @change="calc1($event, item)"
+              string-mode
+              @change="calc2($event, item)"
             />
-            {{ item.currency }}
+            {{ c1 }}
           </p>
           <p class="flex">
-            <span class="unit">1{{ item.currency }} =</span>
+            <span class="unit">1{{ c1 }} =</span>
             <a-input-number
-              v-model:value="item.value"
+              v-model:value="item.value1"
               :min="0.000001"
               :max="99999999"
               :step="0.000001"
-              :precision="6"
               string-mode
-              @change="calc2($event, item)"
+              :precision="6"
+              @change="calc1($event, item)"
             />
-            {{ c1 }}
+            {{ item.currency }}
           </p>
         </div>
       </div>
@@ -92,7 +92,8 @@
 .ds-exchange-rate {
   .unit {
     display: inline-block;
-    width: 66px;
+    width: 72px;
+    white-space: nowrap;
   }
   .ant-input-number {
     position: relative;