付费审核

src/views/approve/paid/index.vue

@@ -94,8 +94,8 @@
   import FeeTable from './components/feeTable.vue'
   import MainActionBar from './components/mainActionBar.vue'
   import calcTable from './components/calcTable.vue'
-  import { formatTableData } from '/@/hooks/web/common'
-  const { notification } = useMessage()
+  import { useRoute } from 'vue-router'
+  const route = useRoute()
   // 主窗口loading
   const loading = ref(false)
   // 选中的业务id
@@ -113,7 +113,7 @@
       })
     },
     beforeFetch: (p) => {
-      console.log(p)
+      if (route.query.id) p['id'] = route.query.id
       return formatParams(p, null, ['status'])
     },
     columns,

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

@@ -23,8 +23,8 @@
               <template #overlay>
                 <a-menu>
                   <a-menu-item @click="addInfos">全部申请金额</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-item @click="addInfos('RMB')">仅RMB申请金额</a-menu-item>
+                  <a-menu-item @click="addInfos('USD')">仅USD申请金额</a-menu-item>
                 </a-menu>
               </template>
               <a-button class="ml15" type="link">
@@ -94,12 +94,14 @@
     }
   })
   const loading = ref(false)
+  // 子表使用的币别
+  const childCurrency = ref('')
   const [registerTable, { reload, getForm, getSelectRowKeys, getPaginationRef, getSelectRows, setSelectedRows, getDataSource }] = useTable({
     api: async (p) => {
       const res = await GetApplicationList(p)
       if (res?.data?.length) {
         state.historyRowKeys = [res.data[0].id]
-        feeTabel.value.init(res.data[0].id)
+        feeTabel.value.init(res.data[0].id, childCurrency.value)
       }
       setSelectedRows([res.data[0]])
       return new Promise((resolve) => {
@@ -107,6 +109,11 @@
       })
     },
     beforeFetch: (p) => {
+      if (p.currency) {
+        childCurrency.value = p.currency
+        p.currency = null
+      }
+      console.log(p)
       return formatParams(p)
     },
     columns: businessColumns,
@@ -164,7 +171,7 @@
     state.historyRowKeys = [record?.id]
     setSelectedRows([record])
     // 初始化费用表格数据
-    feeTabel.value.init(record.id)
+    feeTabel.value.init(record.id, childCurrency.value)
   }
   const feeData = () => {
     return feeTabel.value.selectfeeData
@@ -303,24 +310,26 @@
           item.businessType = 1
           item.customerName = row.customerName
         }
-        if (type == 'rmb') {
+        if (type == 'RMB') {
           item.settlementUSD = 0
           item.settlementOther = 0
         }
-        if (type == 'usd') {
+        if (type == 'USD') {
           item.settlementRMB = 0
           item.settlementOther = 0
         }
       })
     })
+
     // 过滤出所有跟业务币别不一致的币别
     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)
+    exchangeRate.value.init(currency, currencyList, type)
   }
 
   onMounted(async () => {

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

@@ -23,6 +23,8 @@
   import { BasicTable, useTable } from '/@/components/Table'
   // 付费申请id, 根据id查费用详细信息
   const aid = ref('')
+  // 币别
+  const childCurrency = ref(null)
   const [registerTable, { reload }] = useTable({
     api: async (p) => {
       const res = await GetApplicationDetailsByDetail(p)
@@ -31,7 +33,7 @@
       })
     },
     beforeFetch: () => {
-      return { id: aid.value }
+      return { id: aid.value, currency: childCurrency.value }
     },
     columns: feeColumns,
     pagination: false,
@@ -44,8 +46,9 @@
     immediate: false,
     id: '2'
   })
-  const init = (id) => {
+  const init = (id, currency) => {
     aid.value = id
+    childCurrency.value = currency
     reload()
   }
   const loading = ref(false)

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

@@ -56,14 +56,13 @@
   // 要转换的币别集合
   const c2 = ref([])
   const init = (currency, list, type) => {
-    if (list.length == 0) {
+    // 转换汇率数据是空或者转换币别等于结算币别直接审核
+    if (list.length == 0 || type  === currency) {
       handleOk()
       return
     }
     visible.value = true
     c1.value = currency
-    console.log(currency)
-    console.log(list)
     c2.value = list
     ctype.value = type
     c2.value.forEach(item => {

src/views/taskmanage/index.vue

@@ -1270,6 +1270,17 @@ function handleEdit(data) {
         },
       })
       break
+    // 付费申请审核
+    case 'APPLICATION_PAYMENT_AUDIT':
+      go({
+        path: '/approve-paid',
+        query: {
+          id: data.ouT_BS_NO,
+          source: data.tasK_USER_STATUS,
+          taskId: data.id,
+          tabName: data.tasK_TYPE_NAME
+        },
+      })
     default:
       break
   }