From 83801c01c5ce170a00a647ec5ecb749e78e74b96 Mon Sep 17 00:00:00 2001
From: lijingjia <lijj_xl@163.com>
Date: Thu, 7 Nov 2024 22:48:00 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=98=E8=B4=B9=E5=AE=A1=E6=A0=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/CostEntry/feeTable.vue         |  5 +++
 src/components/CostEntry/index.vue            | 28 ++++++++++++++-
 src/components/Form/src/BasicForm.vue         |  3 +-
 src/views/baseinfo/infoclient/columns.tsx     | 14 +++++++-
 src/views/fee/exchangeRate/columns.tsx        | 36 +++++++++++++++++--
 .../paymentSettlement/detail/index.vue        | 14 +++++++-
 .../operation/paidApply/detail/index.vue      |  2 +-
 src/views/operation/paidApply/index.vue       | 21 ++++-------
 8 files changed, 102 insertions(+), 21 deletions(-)

diff --git a/src/components/CostEntry/feeTable.vue b/src/components/CostEntry/feeTable.vue
index fb7121e2..50ac85e3 100644
--- a/src/components/CostEntry/feeTable.vue
+++ b/src/components/CostEntry/feeTable.vue
@@ -562,6 +562,11 @@ import { Item } from 'ant-design-vue/lib/menu'
         // }
       }
     },
+    afterSelectionEnd: function (isStance, col) {
+      // if (col == 4 || col == 5 || col == 6) {
+      //   hotTb.value.hotInstance.getActiveEditor().beginEditing()
+      // }
+    },
     columns: columns,
     // 此行直接复制，必须(非商用)
     licenseKey: 'non-commercial-and-evaluation',
diff --git a/src/components/CostEntry/index.vue b/src/components/CostEntry/index.vue
index 05d879e3..8ae8b3c3 100644
--- a/src/components/CostEntry/index.vue
+++ b/src/components/CostEntry/index.vue
@@ -52,15 +52,23 @@
   </div>
 </template>
 <script lang="ts" setup>
-  import { defineProps, ref, watch, defineExpose } from 'vue'
+  import { defineProps, ref, watch, defineExpose, defineAsyncComponent } from 'vue'
   // 主单信息组件
   import MainInfo from './mainInfo.vue'
   // 应收表格组件
   import FeeTable from './feeTable.vue'
+  // 审批组件
+  const ApproveBtns = defineAsyncComponent(() => import("/@/components/ApproveBtns/index.vue"))
+  import { useMultipleTabStore } from '/@/store/modules/multipleTab'
+  import { SetTaskStatus } from '/@/views/operation/seaexport/api/BookingLedger.js'
   // 表格统计组件
   import FeeStatistic from './feeStatistic.vue'
   import { useMessage } from '/@/hooks/web/useMessage'
+  import { useRoute, useRouter } from 'vue-router'
+  const route = useRoute()
+  const router = useRouter()
   const { createMessage } = useMessage()
+  const tabStore = useMultipleTabStore()
   import { ApplyBusinessAudit } from './api'
   const props = defineProps({
     details: { type: [Object, Array] },
@@ -106,9 +114,27 @@
       ApplyBusinessAudit({ businessId: props.details.id, businessType: 1, taskTypeName: 'BILL_RECV_AUDIT' }).then(res => {
         createMessage.success(res.message)
         refresh()
+        // 整票审核驳回的时候触发完成任务
+        if (route.query.status) {
+          completeTask()
+        }
       }, 1000)
     })
   }
+  // 完成任务
+  const completeTask = () => {
+    const postData = {
+      businessId: route.query.id,
+      businessType: 1,
+      taskTypeName: route.query.status,
+      taskStatus: 2,
+      autoCreateNext: true
+    }
+    SetTaskStatus(postData).then(res => {
+      const { fullPath } = route //获取当前路径
+      tabStore.closeTabByKey(fullPath, router)
+    })
+  }
   const getUnitList = () => {
     rtb.value.getUnitList()
     ptb.value.getUnitList()
diff --git a/src/components/Form/src/BasicForm.vue b/src/components/Form/src/BasicForm.vue
index f07696bb..7642e976 100644
--- a/src/components/Form/src/BasicForm.vue
+++ b/src/components/Form/src/BasicForm.vue
@@ -30,7 +30,8 @@
         <!-- 只读 -->
         <a-col :span="schema?.colProps?.span || 24" v-if="getReadonlyColItemVisible(schema)">
           <div class="ds-form-onlyread">
-            <span class="label">{{ schema.label }}：</span> {{ formModel[schema.field] || '-' }}
+            <span class="label">{{ schema.label }}：</span>
+            <span>{{ formModel[schema.field] || '-' }}</span>
             <span
               v-if="!schema.dynamicDisabled"
               class="iconfont icon-bianji1"
diff --git a/src/views/baseinfo/infoclient/columns.tsx b/src/views/baseinfo/infoclient/columns.tsx
index 94c67df8..cae6f3f5 100644
--- a/src/views/baseinfo/infoclient/columns.tsx
+++ b/src/views/baseinfo/infoclient/columns.tsx
@@ -1573,6 +1573,12 @@ export const Tablecolumns: BasicColumn[] = [
     align: 'left',
     width: 120,
   },
+  {
+    title: '银行账号',
+    dataIndex: 'bankAccountNo',
+    align: 'left',
+    width: 120,
+  },
   {
     title: '银行SWIFT',
     dataIndex: 'bankAddress',
@@ -1730,6 +1736,12 @@ export const CADformSchema: FormSchema[] = [
     component: 'Input',
     colProps: { span: 6 },
   },
+  {
+    field: 'bankAccountNo',
+    label: '银行账号',
+    component: 'Input',
+    colProps: { span: 6 },
+  },
   {
     field: 'swift',
     label: '银行SWIFT',
@@ -1772,7 +1784,7 @@ export const CADformSchema: FormSchema[] = [
     field: 'bankAddress',
     label: '银行地址',
     component: 'Input',
-    colProps: { span: 12 },
+    colProps: { span: 6 },
   },
   {
     field: 'bankAgentName',
diff --git a/src/views/fee/exchangeRate/columns.tsx b/src/views/fee/exchangeRate/columns.tsx
index 5c7763e8..2c019877 100644
--- a/src/views/fee/exchangeRate/columns.tsx
+++ b/src/views/fee/exchangeRate/columns.tsx
@@ -43,6 +43,16 @@ export const columns: BasicColumn[] = [
     dataIndex: 'customValue',
     width: 120,
   },
+  {
+    title: '核算汇率',
+    dataIndex: 'calculateValue',
+    width: 120,
+  },
+  {
+    title: '发票汇率',
+    dataIndex: 'invoiceValue',
+    width: 120,
+  },
   {
     title: '本币位',
     dataIndex: 'localCurrency',
@@ -191,8 +201,30 @@ export const formSchema: FormSchema[] = [
     colProps: { span: 12 },
     componentProps: {
       min: 0,
-      precision: 6,
-    },
+      precision: 6
+    }
+  },
+  {
+    field: 'calculateValue',
+    label: '核算汇率',
+    defaultValue: '',
+    component: 'InputNumber',
+    colProps: { span: 12 },
+    componentProps: {
+      min: 0,
+      precision: 6
+    }
+  },
+  {
+    field: 'invoiceValue',
+    label: '发票汇率',
+    defaultValue: '',
+    component: 'InputNumber',
+    colProps: { span: 12 },
+    componentProps: {
+      min: 0,
+      precision: 6
+    }
   },
   {
     field: 'localCurrency',
diff --git a/src/views/finance/paymentSettlement/detail/index.vue b/src/views/finance/paymentSettlement/detail/index.vue
index 2cd216d3..7043f076 100644
--- a/src/views/finance/paymentSettlement/detail/index.vue
+++ b/src/views/finance/paymentSettlement/detail/index.vue
@@ -94,6 +94,7 @@
   import { BasicForm, useForm } from '/@/components/Form'
   import { formSchema } from './columns'
   import { closePage } from '/@/hooks/web/common'
+  import { numberThousandFormat } from '/@/utils/commonUtil'
   import { useMessage } from '/@/hooks/web/useMessage'
   const { createMessage } = useMessage()
   import { useRoute } from 'vue-router'
@@ -154,7 +155,7 @@
     const postData = {
       description: '按申请单增加添加费用明细',
       settlement: getFieldsValue(),
-      documents: applyInfo.value.getSelectRows()
+      documents: applyInfo.value.getDataSource()
     }
     loading.value = true
     Save(postData).then(async (res) => {
@@ -174,9 +175,20 @@
     if (id.value) {
       // 详情页
       Get({ id: id.value }).then(res => {
+        if (res?.data?.amount) res.data.amount = numberThousandFormat(res.data.amount, 2)
         setFieldsValue({
           ...res.data
         })
+        if (res.data.settlementDetails && res.data.settlementDetails.length) {
+          res.data.settlementDetails.forEach(item => {
+            item.rmbApplyAmount = numberThousandFormat(item.rmbApplyAmount, 2)
+            item.rmbStlRestAmount = numberThousandFormat(item.rmbStlRestAmount, 2)
+            item.rmbStlAmount = numberThousandFormat(item.rmbStlAmount, 2)
+            item.usdApplyAmount = numberThousandFormat(item.usdApplyAmount, 2)
+            item.usdStlRestAmount = numberThousandFormat(item.usdStlRestAmount, 2)
+            item.usdStlAmount = numberThousandFormat(item.usdStlAmount, 2)
+          })
+        }
         feeData.value = res.data.settlementDetails
       })
     } else {
diff --git a/src/views/operation/paidApply/detail/index.vue b/src/views/operation/paidApply/detail/index.vue
index e31168da..ff72ef6b 100644
--- a/src/views/operation/paidApply/detail/index.vue
+++ b/src/views/operation/paidApply/detail/index.vue
@@ -126,7 +126,7 @@
   const status = ref(0)
   // 保存
   const save = async (feeInfo) => {
-    const postData = await validate()
+    const postData = await getFieldsValue()
     if (feeInfo && feeInfo.length) {
       postData['details'] = [...feeData.value, ...feeInfo]
     } else {
diff --git a/src/views/operation/paidApply/index.vue b/src/views/operation/paidApply/index.vue
index 09317a14..168dea26 100644
--- a/src/views/operation/paidApply/index.vue
+++ b/src/views/operation/paidApply/index.vue
@@ -10,23 +10,16 @@
         <TableActionBar :selectRow="getSelectRows" :reload="reload" @exportFile="exportFile"></TableActionBar>
       </template>
       <template v-slot:bodyCell="{ column, record }">
-        <!-- <template v-if="column.dataIndex == 'applicationNO'">
+        <template v-if="column.dataIndex == 'applicationNO'">
           <span style="cursor: pointer"><span><span @click="copyNo($event, record.applicationNO)" class="iconfont icon-fuzhi11"></span>{{ record.applicationNO }}</span></span>
         </template>
-        <template v-if="column.dataIndex == 'statusText'">
-          <span v-if="record.status == 0" class="ds-blue-tag">
-            {{ record.statusText }}</span>
-          <span v-else-if="record.status == 1" class="ds-green-tag">{{
-            record.statusText
-          }}</span>
-          <span v-else-if="/^2|3|4|5|6$/.test(record.status)" class="ds-orange-tag">{{
-            record.statusText
-          }}</span>
-          <span v-else-if="/^7|8$/.test(record.status)" class="ds-red-tag">{{
-            record.statusText
-          }}</span>
+         <template v-if="column.dataIndex == 'statusText'">
+          <span v-if="record.status == 0" class="ds-blue-tag">{{ record.statusText }}</span>
+          <span v-else-if="record.status == 1" class="ds-green-tag">{{ record.statusText }}</span>
+          <span v-else-if="/^2|3|4|5|6$/.test(record.status)" class="ds-orange-tag">{{ record.statusText }}</span>
+          <span v-else-if="/^7|8$/.test(record.status)" class="ds-red-tag">{{ record.statusText }}</span>
           <span v-else class="ds-purple-tag">{{ record.statusText }}</span>
-        </template> -->
+        </template>
         <template v-if="column.key === 'action'">
           <TableAction :actions="[
             {