From 6457ceb58e843f1e8a0210d68c527361d2536eeb Mon Sep 17 00:00:00 2001
From: lijingjia <lijj_xl@163.com>
Date: Thu, 20 Jun 2024 20:06:47 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=BB=98=E8=B4=B9=E7=94=B3=E8=AF=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/common/index.ts                       |  19 +-
 src/components/CostEntry/actionBar.vue        |   2 +-
 src/components/CostEntry/feeTable.vue         |  51 +--
 src/components/CostEntry/index.vue            |   8 +-
 src/store/modules/configOptions.ts            |   7 +
 src/store/modules/options.ts                  |   2 +
 src/views/approve/fee/api.ts                  |  27 +-
 .../approve/fee/components/AlterNewValue.vue  |  90 +++++
 .../approve/fee/components/Statistic.vue      | 334 ++++++++++++++++++
 src/views/approve/fee/components/feeTable.vue |  78 ++--
 src/views/approve/fee/index.vue               |   3 +-
 src/views/operation/paidApply/api.ts          |  37 ++
 src/views/operation/paidApply/columns.tsx     | 306 ++++++++++++++++
 .../paidApply/components/tableActionBar.vue   | 208 +++++++++++
 src/views/operation/paidApply/index.vue       | 111 ++++++
 .../operation/seaexport/detail/index.vue      |   2 +-
 src/views/operation/seaexport/index copy.vue  |   4 +-
 src/views/operation/seaexport/index.vue       |   4 +-
 18 files changed, 1231 insertions(+), 62 deletions(-)
 create mode 100644 src/views/approve/fee/components/AlterNewValue.vue
 create mode 100644 src/views/approve/fee/components/Statistic.vue
 create mode 100644 src/views/operation/paidApply/api.ts
 create mode 100644 src/views/operation/paidApply/columns.tsx
 create mode 100644 src/views/operation/paidApply/components/tableActionBar.vue
 create mode 100644 src/views/operation/paidApply/index.vue

diff --git a/src/api/common/index.ts b/src/api/common/index.ts
index d11585e2..17eff369 100644
--- a/src/api/common/index.ts
+++ b/src/api/common/index.ts
@@ -79,6 +79,10 @@ enum Api {
   GetServiceSelectList = '/mainApi/ClientCommon/GetServiceSelectList',
   // 船名下拉数据
   GetVesselSelectList = '/mainApi/ClientCommon/GetVesselSelectList',
+  // 根据往来单位取出关联的费用对象
+  GetClientSelectInfoByCode = '/mainApi/ClientCommon/GetClientSelectInfoByCode',
+  // 根据箱型获取数量信息
+  GetUnitSelectInfo = '/mainApi/ClientCommon/GetUnitSelectInfo',
 }
 
 // 船名下拉数据列表
@@ -406,7 +410,20 @@ export function changePassword(data: any) {
     data,
   })
 }
-
+export function GetClientSelectInfoByCode(data: any) {
+  return request<DataResult>({
+    url: Api.GetClientSelectInfoByCode,
+    method: 'post',
+    data,
+  })
+}
+export function GetUnitSelectInfo(data: any) {
+  return request<DataResult>({
+    url: Api.GetUnitSelectInfo,
+    method: 'post',
+    data,
+  })
+}
 // 往来单位下拉列表集合
 export function GetMultiClientList() {
   return request({
diff --git a/src/components/CostEntry/actionBar.vue b/src/components/CostEntry/actionBar.vue
index 32860051..75bf961b 100644
--- a/src/components/CostEntry/actionBar.vue
+++ b/src/components/CostEntry/actionBar.vue
@@ -123,7 +123,7 @@
     <!-- 申请修改弹窗 -->
     <ApplyModify ref="applyModify" @register="registerModal" @refresh="refresh"></ApplyModify>
     <!-- 申请删除 -->
-     <!-- 引入弹窗 -->
+    <!-- 引入弹窗 -->
     <a-modal 
       v-model:visible="visible"
       v-if="visible"
diff --git a/src/components/CostEntry/feeTable.vue b/src/components/CostEntry/feeTable.vue
index d6cefb88..aa477f76 100644
--- a/src/components/CostEntry/feeTable.vue
+++ b/src/components/CostEntry/feeTable.vue
@@ -46,7 +46,7 @@
     provide,
   } from 'vue'
   // 下拉框数据接口
-  import { GetFeeCurrencySelectList, GetFeeCodeSelectList } from '/@/api/common'
+  import { GetFeeCurrencySelectList, GetFeeCodeSelectList, GetClientSelectInfoByCode, GetUnitSelectInfo } from '/@/api/common'
   import { HotTable } from '@handsontable/vue3'
   import { registerAllModules } from 'handsontable/registry'
   import 'handsontable/dist/handsontable.full.min.css'
@@ -83,7 +83,9 @@
       default: '',
     },
     // 业务数据
-    details: { type: [Object, Array] }
+    details: { type: [Object, Array] },
+    // 业务类型
+    type: { type: [String, Number] }
   })
   const emits = defineEmits(['broInsert'])
   // 费用名称字典
@@ -503,8 +505,12 @@
             if (item) dict = item[0]
             list.value[changes[0][0]]['customerType'] = dict?.value
             list.value[changes[0][0]]['customerTypeText'] = changes[0][3].split('-')[1]
-            list.value[changes[0][0]]['customerCode'] = ''
-            list.value[changes[0][0]]['customerName'] = ''
+            // 调用接口取费用对象
+            console.log(props.details)
+            GetClientSelectInfoByCode({ code: dict?.value, businessId: props.id, businessType: props.type }).then(res => {
+              list.value[changes[0][0]]['customerCode'] = res.data.clientId
+              list.value[changes[0][0]]['customerName'] = res.data.clientName
+            })
           })
         }
         // 修改单位
@@ -515,24 +521,27 @@
           if (item) dict = item[0]
           list.value[changes[0][0]]['unit'] = dict?.value
           list.value[changes[0][0]]['unitText'] = changes[0][3].split('-')[1]
+          GetUnitSelectInfo({ code: dict?.value, businessId: props.id, businessType: props.type }).then(res => {
+            list.value[changes[0][0]]['quantity'] = res.data.quantity
+          })
           // 业务数据有件数，修改单位，带出件数
-          const text = list.value[changes[0][0]]['unitText']
-          if (text == '单票') {
-            list.value[changes[0][0]]['quantity'] = 1
-          } else if (text == '件数') {
-            list.value[changes[0][0]]['quantity'] = props.details.pkgs
-          } else if (text == '重量') {
-            list.value[changes[0][0]]['quantity'] = props.details.kgs
-          } else if (text == '尺码') {
-            list.value[changes[0][0]]['quantity'] = props.details.cbm
-          } else if (text == '计费吨') {
-            let r = props.details.kgs
-            const k = (props.details.pkgs || 0) / 1000
-            if (k > r) {
-              r = k
-            }
-            list.value[changes[0][0]]['quantity'] = r
-          }
+          // const text = list.value[changes[0][0]]['unitText']
+          // if (text == '单票') {
+          //   list.value[changes[0][0]]['quantity'] = 1
+          // } else if (text == '件数') {
+          //   list.value[changes[0][0]]['quantity'] = props.details.pkgs
+          // } else if (text == '重量') {
+          //   list.value[changes[0][0]]['quantity'] = props.details.kgs
+          // } else if (text == '尺码') {
+          //   list.value[changes[0][0]]['quantity'] = props.details.cbm
+          // } else if (text == '计费吨') {
+          //   let r = props.details.kgs
+          //   const k = (props.details.pkgs || 0) / 1000
+          //   if (k > r) {
+          //     r = k
+          //   }
+          //   list.value[changes[0][0]]['quantity'] = r
+          
         }
         // 修改币别
         if (changes[0][1] === 'currencyName') {
diff --git a/src/components/CostEntry/index.vue b/src/components/CostEntry/index.vue
index a8922183..6d81e23b 100644
--- a/src/components/CostEntry/index.vue
+++ b/src/components/CostEntry/index.vue
@@ -8,9 +8,9 @@
     <!-- 主单信息组件 -->
     <MainInfo :data="details"></MainInfo>
     <!-- 应收表格 -->
-    <FeeTable tbType="receive" :broData="broPayData" :id="data.id" :details="details" @broInsert="broReceive"></FeeTable>
+    <FeeTable tbType="receive" :type="type" :broData="broPayData" :id="data.id" :details="details" @broInsert="broReceive"></FeeTable>
     <!-- 应付表格 -->
-    <FeeTable tbType="pay" :broData="broReceiveData" :id="data.id" :details="details" @broInsert="broPay"></FeeTable>
+    <FeeTable tbType="pay" :broData="broReceiveData" :type="type" :id="data.id" :details="details" @broInsert="broPay"></FeeTable>
     <FeeStatistic :id="data.id" />
   </div>
 </template>
@@ -23,7 +23,9 @@
   // 表格统计组件
   import FeeStatistic from './feeStatistic.vue'
   const props = defineProps({
-    details: { type: [Object, Array] }
+    details: { type: [Object, Array] },
+    // 业务类型
+    type: { type: [String, Number] }
   })
   const data = ref(null)
   // data.value = props.details
diff --git a/src/store/modules/configOptions.ts b/src/store/modules/configOptions.ts
index c6634562..ba2f290b 100644
--- a/src/store/modules/configOptions.ts
+++ b/src/store/modules/configOptions.ts
@@ -19,6 +19,7 @@ import {
   GetServiceSelectList,
   GetPackageSelectList,
 } from '/@/views/operation/seaexport/api/BookingLedger'
+import { getList } from '/@/views/flowcenter/flowInstances/api'
 import { GetFeeCurrencySelectList } from '/@/api/common/index'
 export default {
   // 业务来源
@@ -111,4 +112,10 @@ export default {
       return res.data
     })
   },
+  // 用户
+  GetUserList: () => {
+    return getList().then((res) => {
+      return res.data
+    })
+  },
 }
diff --git a/src/store/modules/options.ts b/src/store/modules/options.ts
index 74aacae6..ddebac63 100644
--- a/src/store/modules/options.ts
+++ b/src/store/modules/options.ts
@@ -40,6 +40,8 @@ export const useOptionsStore = defineStore({
     GetPackageSelectList: null,
     // 币别
     GetFeeCurrencySelectList: null,
+    // 用户表
+    GetUserList: null
   }),
   getters: {
     // 通过code获取下拉字典（code)就是接口尾部单词
diff --git a/src/views/approve/fee/api.ts b/src/views/approve/fee/api.ts
index 39ea2a92..f65de710 100644
--- a/src/views/approve/fee/api.ts
+++ b/src/views/approve/fee/api.ts
@@ -6,7 +6,9 @@ enum Api {
   AuditByBiz = '/feeApi/FeeAudit/AuditByBiz',
   Audit = '/feeApi/FeeAudit/Audit',
   SetInvoiceEnabled = '/feeApi/FeeRecord/SetInvoiceEnabled',
-  GetFees = '/feeApi/FeeAudit/GetFees'
+  GetFees = '/feeApi/FeeAudit/GetFees',
+  GetModifyValue = '/feeApi/FeeRecord/GetModifyValue',
+  GetStat = '/feeApi/FeeAudit/GetStat'
 }
 
 // 业务列表
@@ -54,9 +56,20 @@ export function GetFees(data: PageRequest) {
   })
 }
 
-// export function getThermometryWarningCount() {
-//   return request<DataResult>({
-//     url: Api.getThermometryWarningCount,
-//     method: 'get',
-//   })
-// }
+// 根据费用id查询修改后的新值
+export function GetModifyValue(params) {
+  return request<DataResult>({
+    url: Api.GetModifyValue,
+    method: 'get',
+    params
+  })
+}
+
+// 根据业务id查询关联的统计
+export function GetStat(data: PageRequest) {
+  return request<DataResult>({
+    url: Api.GetStat,
+    method: 'post',
+    data
+  })
+}
\ No newline at end of file
diff --git a/src/views/approve/fee/components/AlterNewValue.vue b/src/views/approve/fee/components/AlterNewValue.vue
new file mode 100644
index 00000000..4ae87cc8
--- /dev/null
+++ b/src/views/approve/fee/components/AlterNewValue.vue
@@ -0,0 +1,90 @@
+<!--
+ * @Description: 审核审批 -> 修改后的新值
+ * @Author: lijj
+ * @Date: 2024-06-13 17:08:08
+-->
+<template>
+  <div class="ds-approve-alter-new-value">
+    <a-spin :spinning="loading">
+      <a-form layout="vertical" class="ds-form-detail">
+        <a-row :gutter="15">
+          <a-col v-for="item in list" :span="item.span" :key='item.value'>
+            <a-form-item
+              :label="item.label"
+            >
+              <div>
+                <span v-if="item.field != 'isAdvancedPay'">
+                  {{ detailData[item.field] || '-' }}
+                </span>
+                <span v-else>
+                  {{ detailData[item.field] ? '是' : '否' }}
+                </span>
+              </div>
+            </a-form-item>
+          </a-col>
+        </a-row>
+      </a-form>
+    </a-spin>
+  </div>
+</template>
+<script lang="ts" setup>
+  import { onMounted, ref, reactive, defineProps, watch, defineEmits } from 'vue'
+  import { GetModifyValue } from '../api'
+  const props = defineProps({
+    // 勾选中的id
+    id: {
+      type: String
+    },
+    selectRow: {
+      type: Object
+    }
+  })
+  const list = [
+    { label: '费用名称', field: 'feeName', span: 5 },
+    { label: '费用对象', field: 'customerName', span: 5 },
+    { label: '核算单位', field: 'saleOrg', span: 5 },
+    { label: '单位标准', field: 'unitText', span: 5 },
+    { label: '不含税单价', field: 'noTaxPrice', span: 5 },
+    { label: '税率', field: 'taxRate', span: 5 },
+    { label: '含税单价', field: 'unitPrice', span: 5 },
+    { label: '计费数量', field: 'quantity', span: 5 },
+    { label: '不含税金额', field: 'noTaxAmount', span: 5 },
+    { label: '含税金额', field: 'amount', span: 5 },
+    { label: '币别', field: 'currency', span: 5 },
+    { label: '汇率', field: 'exchangeRate', span: 5 },
+    { label: '财务税率', field: 'accTaxRate', span: 5 },
+    { label: '是否垫付', field: 'isAdvancedPay', span: 5 },
+    { label: '修改原因', field: 'reason', span: 5 },
+    { label: '责任人', field: 'manager', span: 5 },
+    { label: '备注', field: 'remark', span: 5 },
+    { label: '申请人', field: 'updateBy', span: 5 },
+    { label: '申请时间', field: 'updateTime', span: 5 },
+    { label: '更改前利润', field: 'updateTime', span: 5 },
+    { label: '更改后利润', field: 'updateTime', span: 5 },
+    { label: '利润差额', field: 'updateTime', span: 5 },
+  ]
+  const detailData = ref({})
+  const loading = ref(false)
+  const init =() => {
+    if (props.id) {
+      loading.value = true
+      GetModifyValue({ id: props.id }).then(res => {
+        loading.value = false
+        detailData.value = res.data
+      })
+    }
+  }
+  onMounted(() => {
+    init()
+  })
+</script>
+
+<style lang="less">
+.ds-approve-alter-new-value {
+  background: #ffffff;
+  height: 100%;
+  padding: 5px 10px;
+  border: 1px solid #d1d1d1;
+}
+</style>
+  
\ No newline at end of file
diff --git a/src/views/approve/fee/components/Statistic.vue b/src/views/approve/fee/components/Statistic.vue
new file mode 100644
index 00000000..508f5de6
--- /dev/null
+++ b/src/views/approve/fee/components/Statistic.vue
@@ -0,0 +1,334 @@
+<!--
+ * @Description: 审批统计组件
+ * @Author: lijj
+ * @Date: 2024-05-07 15:19:07
+-->
+<template>
+  <div class="fee-statistic">
+    <a-collapse>
+      <a-collapse-panel>
+        <template v-slot:header>
+          <p>
+            <span class="title">利润合计：</span>
+            <span class="title">RMB应收: </span>
+            <span class="count" :class="{ warnText: statisticData.receivableCNY < 0 }">{{ statisticData.receivableCNY }}</span>
+            <span class="title">RMB应付: </span>
+            <span class="count" :class="{ warnText: statisticData.payableCNY < 0 }">{{ statisticData.payableCNY }}</span>
+            <span class="title">RMB利润: </span>
+            <span class="count" :class="{ warnText: statisticData.profitCNY < 0 }">{{ statisticData.profitCNY }}</span>
+            <span class="line"></span>
+            <span class="title">USD应收: </span>
+            <span class="count" :class="{ warnText: statisticData.receivableUSD < 0 }">{{ statisticData.receivableUSD }}</span>
+            <span class="title">USD应付: </span>
+            <span class="count" :class="{ warnText: statisticData.payableUSD < 0 }">{{ statisticData.payableUSD }}</span>
+            <span class="title">USD利润: </span>
+            <span class="count" :class="{ warnText: statisticData.profitUSD < 0 }">{{ statisticData.profitUSD }}</span>
+            <span class="line"></span>
+            <span class="title">合计应收: </span>
+            <span class="count" :class="{ warnText: statisticData.receivableTotal < 0 }">{{ statisticData.receivableTotal }}</span>
+            <span class="title">合计应付: </span>
+            <span class="count" :class="{ warnText: statisticData.payableTotal < 0 }">{{ statisticData.payableTotal }}</span>
+            <span class="title">合计利润: </span>
+            <span class="count" :class="{ warnText: statisticData.profitTotal < 0 }">{{ statisticData.profitTotal }}</span>
+            <span class="title">利润率: </span>
+            <span class="count" :class="{ warnText: statisticData.profitUSD < 0 }">{{ statisticData.profitUSD }}%</span>
+          </p>
+        </template>
+        <a-tabs v-model:activeKey="activeKey">
+          <a-tab-pane key="1" tab="客户合计">
+            <a-table
+              :columns="customerColumns"
+              :data-source="customerData"
+              :pagination="false"
+              bordered
+            />
+          </a-tab-pane>
+          <a-tab-pane key="2" tab="币别合计" force-render>
+            <a-table
+              :columns="currencyColumns"
+              :data-source="currencyData"
+              :pagination="false"
+              bordered
+            />
+          </a-tab-pane>
+          <a-tab-pane key="3" tab="票合计" force-render>
+            <a-table
+              :columns="billColumns"
+              :data-source="billData"
+              :pagination="false"
+              bordered
+            />
+          </a-tab-pane>
+        </a-tabs>
+      </a-collapse-panel>
+    </a-collapse>
+  </div>
+</template>
+
+<script lang="ts" setup>
+  import { onMounted, ref, defineProps, watch } from 'vue'
+  import { GetStat } from '../api'
+  const props = defineProps({
+    // 业务id
+    id: {
+      type: Array
+    }
+  })
+  // 币别列
+  const currencyColumns = [
+    {
+      title: '总计',
+      dataIndex: 'currency',
+      width: 100
+    },
+    {
+      title: '应收不含税',
+      dataIndex: 'noTaxReceivableTotal',
+      width: 150
+    },
+    {
+      title: '应收含税',
+      dataIndex: 'receivableTotal',
+      width: 150
+    },
+    {
+      title: '应付不含税',
+      dataIndex: 'noTaxPayableTotal',
+      width: 150
+    },
+    {
+      title: '应付含税',
+      dataIndex: 'payableTotal',
+      width: 150
+    },
+    {
+      title: '利润不含税',
+      dataIndex: 'noTaxProfitTotal',
+      width: 150
+    },
+    {
+      title: '利润含税',
+      dataIndex: 'profitTotal',
+      width: 150
+    }
+  ]
+  // 客户列
+  const customerColumns = [
+    {
+      title: '结算对象',
+      dataIndex: 'customerName',
+      width: 150
+    },
+    {
+      title: 'RMB应收',
+      dataIndex: 'receivableCNY',
+      width: 150
+    },
+    {
+      title: 'RMB应付',
+      dataIndex: 'payableCNY',
+      width: 150
+    },
+    {
+      title: 'RMB利润',
+      dataIndex: 'profitCNY',
+      width: 150
+    },
+    {
+      title: 'USD应收',
+      dataIndex: 'receivableUSD',
+      width: 150
+    },
+    {
+      title: 'USD应付',
+      dataIndex: 'payableUSD',
+      width: 150
+    },
+    {
+      title: 'USD利润',
+      dataIndex: 'profitUSD',
+      width: 150
+    },
+    {
+      title: '其他币别应收',
+      dataIndex: 'receivableOther',
+      width: 150
+    },
+    {
+      title: '其他币别应付',
+      dataIndex: 'payableOther',
+      width: 150
+    },
+    {
+      title: '其他币别利润',
+      dataIndex: 'profitOther',
+      width: 150
+    },
+    {
+      title: '合计应收',
+      dataIndex: 'receivableTotal',
+      width: 150
+    },
+    {
+      title: '合计应付',
+      dataIndex: 'payableTotal',
+      width: 150
+    },
+    {
+      title: '合计利润',
+      dataIndex: 'profitTotal',
+      width: 150
+    }
+  ]
+  // 票列
+  const billColumns = [
+    {
+      title: '描述',
+      dataIndex: 'billNO',
+      width: 150
+    },
+    {
+      title: 'RMB应收',
+      dataIndex: 'receivableCNY',
+      width: 150
+    },
+    {
+      title: 'RMB应付',
+      dataIndex: 'payableCNY',
+      width: 150
+    },
+    {
+      title: 'RMB利润',
+      dataIndex: 'profitCNY',
+      width: 150
+    },
+    {
+      title: 'USD应收',
+      dataIndex: 'receivableUSD',
+      width: 150
+    },
+    {
+      title: 'USD应付',
+      dataIndex: 'payableUSD',
+      width: 150
+    },
+    {
+      title: 'USD利润',
+      dataIndex: 'profitUSD',
+      width: 150
+    },
+    {
+      title: '其他币别应收',
+      dataIndex: 'receivableOther',
+      width: 150
+    },
+    {
+      title: '其他币别应付',
+      dataIndex: 'payableOther',
+      width: 150
+    },
+    {
+      title: '其他币别利润',
+      dataIndex: 'profitOther',
+      width: 150
+    },
+    {
+      title: '合计应收',
+      dataIndex: 'receivableTotal',
+      width: 150
+    },
+    {
+      title: '合计应付',
+      dataIndex: 'payableTotal',
+      width: 150
+    },
+    {
+      title: '合计利润',
+      dataIndex: 'profitTotal',
+      width: 150
+    }
+  ]
+  // 数据
+  const statisticData = ref({})
+  // 标签页
+  const activeKey = ref('1')
+  // 币别合计数据
+  const currencyData = ref([])
+  // 客户数据
+  const customerData = ref([])
+  // 票数据
+  const billData = ref([])
+  const init = (id) => {
+    console.log(id)
+    if (id.length) {
+      const postData = {
+        id: id[id.length - 1].id,
+        businessType: id[id.length - 1].businessType
+      }
+      GetStat(postData).then(res => {
+        const { data } = res
+        statisticData.value = data
+        currencyData.value = data.byCurrency
+        customerData.value = data.byCustomer
+        billData.value = data.byBusiness
+      })
+    }
+  }
+  watch(
+    () => props.id,
+    (id) => {
+      console.log(id)
+    init(id)
+  })
+</script>
+
+<style lang="scss">
+  .fee-statistic {
+    position: fixed;
+    bottom: 0;
+    background: #ffffff;
+    z-index: 199;
+    .title {
+      font-size: 12px;
+      font-weight: 600;
+      color: #04408c;
+      margin-left: 10px;
+    }
+    .count {
+      color: rgb(0, 128, 0);
+      font-weight: 600;
+      font-size: 12px;
+    }
+    .warnText {
+      color: red;
+    }
+    .line {
+      display: inline-block;
+      height: 10px;
+      width: 2px!important;
+      background: #04408c;
+      margin: 0 5px 0 15px;
+    }
+    .ant-collapse > .ant-collapse-item > .ant-collapse-header {
+      padding: 5px 15px;
+      p {
+        margin-bottom: 0;
+      }
+    }
+    .ant-collapse-content-box {
+      padding-top: 0;
+    }
+    .ant-table-cell {
+      padding: 5px 10px!important;
+    }
+    .ant-tabs-nav {
+      margin-bottom: 0;
+    }
+    .ant-table-wrapper {
+      padding-left: 0;
+    }
+    .ant-tabs-tab {
+      padding: 8px;
+    }
+  }
+</style>
\ No newline at end of file
diff --git a/src/views/approve/fee/components/feeTable.vue b/src/views/approve/fee/components/feeTable.vue
index 5393ddd4..970e0620 100644
--- a/src/views/approve/fee/components/feeTable.vue
+++ b/src/views/approve/fee/components/feeTable.vue
@@ -5,29 +5,40 @@
 -->
 <template>
   <div class="ds-approve-fee-table">
-    <BasicTable
-      class="ds-fee-child-table"
-      @register="registerTable"
-      :scroll="{ 'x': '100%', 'y': fheight + 'px'}"
-      @selection-change="selectHandle"
-    >
-      <template #toolbar>
-        <FeeActionBar
-          :ids="feeIds"
-          :feeStatus="feeStatus"
-          :profit="profit"
-          :data="data"
-          @refresh="reload"
-          @checkProfit="checkProfit"
-        ></FeeActionBar>
-      </template>
-      <template v-slot:bodyCell="{ column, record }">
-        <template v-if="column.dataIndex == 'feeStatusText'">
-          <span v-if="record.feeStatus != 1" class="ds-green-status">● {{ record.feeStatusText }}</span>
-          <span v-else class="ds-orange-status">● {{ record.feeStatusText }}</span>
+    <data class="ds-table" :style="{ width: tbWidth + '%' }">
+      <BasicTable
+        class="ds-fee-child-table"
+        @register="registerTable"
+        :scroll="{ 'x': '100%', 'y': fheight + 'px'}"
+        @selection-change="selectHandle"
+      >
+        <template #toolbar>
+          <FeeActionBar
+            :ids="feeIds"
+            :feeStatus="feeStatus"
+            :profit="profit"
+            :data="data"
+            @refresh="reload"
+            @checkProfit="checkProfit"
+          ></FeeActionBar>
         </template>
-      </template>
-    </BasicTable>
+        <template v-slot:bodyCell="{ column, record }">
+          <template v-if="column.dataIndex == 'feeStatusText'">
+            <span v-if="record.feeStatus != 1" class="ds-green-status">● {{ record.feeStatusText }}</span>
+            <span v-else class="ds-orange-status">● {{ record.feeStatusText }}</span>
+          </template>
+        </template>
+      </BasicTable>
+    </data>
+    <data class="ds-form">
+      <!-- 修改后的新值组件 -->
+      <AlterNewValue
+        :selectRow="selectRow"
+        :style="{ 'height': '100%', 'overflow': 'auto' }"
+        v-if="tbWidth == 70"
+        :id="feeIds[feeIds.length - 1]"
+      />
+    </data>
   </div>
 </template>
 <script lang="ts" setup>
@@ -36,6 +47,7 @@
   import { useMessage } from '/@/hooks/web/useMessage'
   import { GetFees } from '../api'
   import FeeActionBar from './feeActionBar.vue'
+  import AlterNewValue from './AlterNewValue.vue'
   import { formatTableData } from '/@/hooks/web/common'
   import emitter from '/@/utils/Bus'
   const { notification } = useMessage()
@@ -68,6 +80,8 @@
     return emit('checkProfit')
   }
   const data = ref([])
+  // 表格宽度
+  const tbWidth = ref(100)
   // 原始数据
   const oldData = ref([])
   const [registerTable, { reload, setTableData, getDataSource, getSelectRows }] = useTable({
@@ -370,6 +384,7 @@
   const feeIds = ref()
   // 选中的费用状态
   const feeStatus = ref()
+  const selectRow = ref()
   // 选择数据
   const selectHandle = (v) => {
     let ids = []
@@ -384,6 +399,14 @@
     }
     feeStatus.value = status
     feeIds.value = ids
+    // 选中的费用修改
+    if (status[status.length - 1] == 3) {
+      // 弹出数据
+      tbWidth.value = 70
+      selectRow.value = v.rows[v.rows.length - 1]
+    } else {
+      tbWidth.value = 100
+    }
   }
   watch(
     () => props.id,
@@ -400,7 +423,11 @@
   watch(
     () => props.feeHeight,
     (v) => {
-      fheight.value = v / 2 - 70
+      if ( v < 140) {
+        fheight.value = 0
+      } else {
+        fheight.value = v / 2 - 70
+      }
       const tb = document.getElementsByClassName('ds-fee-child-table')
       for (let i = 0; i < tb.length; i++) {
         const child = tb[i].getElementsByClassName('ant-table-body')
@@ -423,6 +450,11 @@
 
 <style lang="less">
 .ds-approve-fee-table {
+  display: flex;
+  flex-direction: row;
+  .ds-form {
+    flex: 1;
+  }
   .ant-table-body {
     min-height: 162px;
   }
diff --git a/src/views/approve/fee/index.vue b/src/views/approve/fee/index.vue
index 6ce6abbd..c281930c 100644
--- a/src/views/approve/fee/index.vue
+++ b/src/views/approve/fee/index.vue
@@ -65,6 +65,7 @@
           @checkProfit="checkProfit"
         ></FeeTable>
       </div>
+      <Statistic v-show="busId.length" :id="busId"></Statistic>
     </div>
   </a-spin>
 </template>
@@ -76,6 +77,7 @@
   import { columns, searchFormSchema } from './columns'
   import { useMessage } from '/@/hooks/web/useMessage'
   import FeeTable from './components/feeTable.vue'
+  import Statistic from './components/Statistic.vue'
   import MainActionBar from './components/mainActionBar.vue'
   import { formatTableData } from '/@/hooks/web/common'
   const { notification } = useMessage()
@@ -393,7 +395,6 @@
   }
   .main-tb {
     flex: 1;
-    background: #ffffff;
     padding-bottom: 0!important;
   }
   .vben-basic-table-header__toolbar {
diff --git a/src/views/operation/paidApply/api.ts b/src/views/operation/paidApply/api.ts
new file mode 100644
index 00000000..b8fa3b86
--- /dev/null
+++ b/src/views/operation/paidApply/api.ts
@@ -0,0 +1,37 @@
+/*
+ * @Description: 费用管理 -> 币别设置接口
+ * @Author: lijj
+ * @Date: 2024-04-25 15:48:33
+ */
+
+import { request } from '/@/utils/request'
+import { DataResult, PageRequest } from '/@/api/model/baseModel'
+enum Api {
+  list = '/feeApi/PaymentApplication/GetList',
+  edit = '/feeApi/FeeCurrency/EditFeeCurrency',
+  info = '/feeApi/FeeCurrency/GetFeeCurrencyInfo'
+}
+// 列表 (Auth)
+export function GetList(data: PageRequest) {
+  return request<DataResult>({
+    url: Api.list,
+    method: 'post',
+    data
+  })
+}
+// 编辑 (Auth)
+export function editFeeCurrency(data: PageRequest) {
+  return request<DataResult>({
+    url: Api.edit,
+    method: 'post',
+    data
+  })
+}
+// 详情 (Auth)
+export function getFeeCurrencyInfo(query) {
+  return request<DataResult>({
+    url: Api.info,
+    method: 'get',
+    params: query
+  })
+}
diff --git a/src/views/operation/paidApply/columns.tsx b/src/views/operation/paidApply/columns.tsx
new file mode 100644
index 00000000..1f3ef911
--- /dev/null
+++ b/src/views/operation/paidApply/columns.tsx
@@ -0,0 +1,306 @@
+/*
+ * @Description: 币别设置tsx
+ * @Author: lijj
+ * @Date: 2024-04-25 15:48:33
+ */
+import { ref } from 'vue'
+import { BasicColumn, FormSchema } from '/@/components/Table'
+import { getOptions } from '/@/hooks/dict'
+import { getDictOption } from '/@/utils/dictUtil'
+import { useOptionsStore } from '/@/store/modules/options'
+const optionsStore = useOptionsStore()
+// 申请单状态
+const ApplyBillStatus = ref([])
+getDictOption('apply_bill_status').then((res) => {
+  ApplyBillStatus.value = res
+})
+// 结算对象下拉数据
+import { GetClientListByCode } from '/@/api/common'
+// 人员下拉
+import { getList } from '/@/views/flowcenter/flowInstances/api'
+// 费用状态
+export const FeeStatus = [ '审核通过' ,'录入状态', '提交审核', '申请修改 ', '申请删除', '撤销申请', '驳回提交', '驳回申请, 部分结算, 结算完毕']
+export const columns: BasicColumn[] = [
+  {
+    title: '申请单号',
+    dataIndex: 'applicationNO',
+    width: 150,
+    align: 'left'
+  },
+  {
+    title: '状态',
+    dataIndex: 'status',
+    width: 100,
+    align: 'left'
+  },
+  {
+    title: '结算单位',
+    dataIndex: 'customerName',
+    width: 150,
+    align: 'left'
+  },
+  {
+    title: '币别',
+    dataIndex: 'currency',
+    width: 80,
+    align: 'left'
+  },
+  {
+    title: 'RMB',
+    dataIndex: 'amountRMB',
+    width: 100,
+    align: 'left'
+  },
+  {
+    title: 'USD',
+    dataIndex: 'amountUSD',
+    width: 100,
+    align: 'left'
+  },
+  {
+    title: '其他币别',
+    dataIndex: 'amountOther',
+    width: 100,
+    align: 'left'
+  },
+  // {
+  //   title: '结算RMB',
+  //   dataIndex: 'financeSoftCode',
+  //   width: 200
+  // },
+  // {
+  //   title: '结算USD',
+  //   dataIndex: 'financeSoftCode',
+  //   width: 200
+  // },
+  // {
+  //   title: '结算其他币别',
+  //   dataIndex: 'financeSoftCode',
+  //   width: 200
+  // },
+  {
+    title: '申请日期',
+    dataIndex: 'createTime',
+    width: 120,
+    align: 'left'
+  },
+  {
+    title: '申请人',
+    dataIndex: 'createByName',
+    width: 120
+  },
+  {
+    title: '申请支付日期',
+    dataIndex: 'financeSoftCode',
+    width: 200
+  },
+  {
+    title: '最后审核日期',
+    dataIndex: 'auditTime',
+    width: 120
+  },
+  {
+    title: '最后审核人',
+    dataIndex: 'auditerName',
+    width: 120
+  },
+  {
+    title: '结算对象银行',
+    dataIndex: 'customerBank',
+    width: 150
+  },
+  {
+    title: '结算对象账户',
+    dataIndex: 'customerBAN',
+    width: 140
+  },
+  {
+    title: '备注',
+    dataIndex: 'note',
+    width: 150
+  },
+  // {
+  //   title: '已开发票',
+  //   dataIndex: 'financeSoftCode',
+  //   width: 200
+  // },
+  // {
+  //   title: '发票备注',
+  //   dataIndex: 'financeSoftCode',
+  //   width: 200
+  // },
+  // {
+  //   title: '预计结算RMBRMB',
+  //   dataIndex: 'financeSoftCode',
+  //   width: 200
+  // },
+  // {
+  //   title: '预计结算RMBUSD',
+  //   dataIndex: 'financeSoftCode',
+  //   width: 200
+  // },
+  // {
+  //   title: '预计结算其他',
+  //   dataIndex: 'financeSoftCode',
+  //   width: 200
+  // },
+  // {
+  //   title: '未申请',
+  //   dataIndex: 'financeSoftCode',
+  //   width: 200
+  // },
+  // {
+  //   title: '未申请USD',
+  //   dataIndex: 'financeSoftCode',
+  //   width: 200
+  // },
+  // {
+  //   title: '未申请其他',
+  //   dataIndex: 'financeSoftCode',
+  //   width: 200
+  // },
+  {
+    title: '委托单位',
+    dataIndex: 'client',
+    width: 120
+  },
+  ////////////////////
+  {
+    title: '申请方式',
+    dataIndex: 'financeSoftCode',
+    width: 200
+  },
+  {
+    title: '已打印',
+    dataIndex: 'financeSoftCode',
+    width: 200
+  },
+  {
+    title: '入账申请编号',
+    dataIndex: 'financeSoftCode',
+    width: 200
+  },
+  {
+    title: '驳回原因',
+    dataIndex: 'financeSoftCode',
+    width: 200
+  },
+  {
+    title: '结算方式',
+    dataIndex: 'financeSoftCode',
+    width: 200
+  },
+  {
+    title: '申请部门',
+    dataIndex: 'financeSoftCode',
+    width: 200
+  },
+  {
+    title: '打印次数',
+    dataIndex: 'financeSoftCode',
+    width: 200
+  },
+  {
+    title: '所属分部',
+    dataIndex: 'financeSoftCode',
+    width: 200
+  },
+  {
+    title: '发票日期',
+    dataIndex: 'financeSoftCode',
+    width: 200
+  },
+  {
+    title: '发票金额',
+    dataIndex: 'financeSoftCode',
+    width: 200
+  },
+  {
+    title: '收到发票',
+    dataIndex: 'financeSoftCode',
+    width: 200
+  }
+]
+
+export const searchFormSchema: FormSchema[] = [
+  {
+    field: 'billNO',
+    label: '业务编号',
+    component: 'Input',
+    colProps: { span: 4 },
+  },
+  {
+    field: 'applicationNO',
+    label: '申请单编号',
+    component: 'Input',
+    colProps: { span: 4 },
+  },
+  {
+    field: 'customerId',
+    label: '结算单位',
+    component: 'ApiSelect',
+    colProps: { span: 4 },
+    componentProps: () => {
+      return {
+        api: GetClientListByCode,
+        labelField: 'shortName',
+        valueField: 'id',
+        resultField: 'data',
+        immediate: false,
+        filterOption: (input: string, option: any) => {
+          return option.label.toLowerCase().indexOf(input.toLowerCase()) >= 0
+        }
+      }
+    }
+  },
+  {
+    field: 'billStatus',
+    label: '申请单状态',
+    component: 'Select',
+    colProps: { span: 4 },
+    componentProps: {
+      options: ApplyBillStatus,
+      allowClear: true,
+      showSearch: true,
+      filterOption: (input: string, option: any) => {
+        return option.label.toLowerCase().indexOf(input.toLowerCase()) >= 0
+      }
+    },
+  },
+  {
+    field: 'applicationNO',
+    label: '发票备注',
+    component: 'Input',
+    colProps: { span: 4 }
+  },
+  {
+    field: 'createTime',
+    label: '费用申请日期',
+    component: 'RangePicker',
+    required: false,
+    dynamicDisabled: false,
+    colProps: { span: 4 },
+    componentProps: {
+      allowClear: true
+    }
+  },
+  {
+    field: 'createBy',
+    label: '申请人',
+    component: 'ApiSelect',
+    colProps: { span: 4 },
+    componentProps: () => {
+      return {
+        api: getList,
+        labelField: 'label',
+        valueField: 'value',
+        immediate: false,
+        resultField: 'data',
+        filterOption: (input: string, option: any) => {
+          return option.label.toLowerCase().indexOf(input.toLowerCase()) >= 0
+        }
+      }
+    }
+  },
+]
+
diff --git a/src/views/operation/paidApply/components/tableActionBar.vue b/src/views/operation/paidApply/components/tableActionBar.vue
new file mode 100644
index 00000000..c01b51c3
--- /dev/null
+++ b/src/views/operation/paidApply/components/tableActionBar.vue
@@ -0,0 +1,208 @@
+<!--
+ * @Description: 付费申请操作栏
+ * @Author: lijj
+ * @Date: 2024-04-29 11:54:04
+-->
+<template>
+  <div class="ds-table-action-bar">
+    <div class="nav" @click="addBooking">
+      <i class="iconfont icon-jiahao2fill"></i>新建
+    </div>
+    <div class="nav">
+      <i class="iconfont icon-jiahao2fill"></i>入账申请加入
+    </div>
+    <div class="nav"
+    ><i class="iconfont icon-fuzhi"></i>提交审核</div
+    >
+    <div class="nav"
+    ><i class="iconfont icon-fuzhi1"></i>撤销提交</div
+    >
+      <a-popconfirm
+        title="确定删除当前选中订舱？"
+        ok-text="是"
+        cancel-text="否"
+        @confirm="removeMoreFun"
+      >
+        <div class="nav"><i class="iconfont icon-shanchu2"></i>删除</div>
+      </a-popconfirm>
+      <div class="nav"><i class="iconfont icon-xiaopiaodayin"></i>打印</div>
+  
+      <div class="nav">
+        <i class="iconfont icon-shishijifei"></i>导出Excel
+      </div>
+  </div>
+</template>
+<script lang="ts" setup>
+  import { onMounted, ref, defineProps, reactive } from 'vue'
+  import { useGo } from '/@/hooks/web/usePage'
+  import { useMessage } from '/@/hooks/web/useMessage'
+  import { useRouter } from 'vue-router'
+  import { useModal } from '/@/components/Modal'
+  const router = useRouter()
+  const { createMessage } = useMessage()
+  const go = useGo()
+  const props = defineProps({
+    selectRow: {
+      type: Function
+    },
+    reload: {
+      type: Function
+    }
+  })
+  // 新建
+  function addBooking() {
+    const addNum = Math.round(Math.random() * 1000)
+    go(`/BookingDetail?addNum=${addNum}`)
+  }
+  // 复制
+  function copyBooking() {
+    const select = props.selectRow()
+    const pkIdArr = select.map((item, index) => {
+      return item.id
+    })
+    if (pkIdArr.length === 0 || pkIdArr.length > 1) {
+      createMessage.warning('请仅选择一条数据！')
+      return false
+    }
+    go(`/BookingDetail?id=${pkIdArr[0]}&isCopy=${true}`)
+  }
+  const copyMoreFlag = ref(false)
+  const copyMoreForm = reactive({
+    number: 1,
+  })
+  // 删除
+  function removeMoreFun() {
+    const select = props.selectRow()
+    if (select.length === 0) {
+      createMessage.warning('请选择操作订单！')
+      return false
+    }
+    const removeArr = select.map((item) => {
+      return item.id
+    })
+  }
+</script>
+  
+<style lang="scss">
+.ds-table-action-bar {
+  padding: 0 10px;
+  .nav {
+  display: inline-block;
+  margin-right: 8px;
+  cursor: pointer;
+  border: 1px solid rgba(255, 255, 255, 0);
+  padding: 0 10px;
+  height: 28px;
+  line-height: 26px;
+  color: #000;
+
+  .iconfont {
+    margin-right: 6px;
+  }
+
+  &:hover {
+      border: 1px solid rgba(255, 255, 255, 0);
+      border-radius: 4px;
+  }
+
+  &:nth-of-type(1) {
+      .iconfont {
+      color: #1d8aff;
+      }
+
+      &:hover {
+      background: #fff;
+      box-shadow: 0 0 10px #eee;
+      }
+  }
+
+  &:nth-of-type(2) {
+      .iconfont {
+      color: #865ef8;
+      }
+
+      &:hover {
+      background: #fff;
+      box-shadow: 0 0 10px #eee;
+      }
+  }
+
+  &:nth-of-type(3) {
+      .iconfont {
+      color: #ff9702;
+      }
+
+      &:hover {
+      background: #fff;
+      box-shadow: 0 0 10px #eee;
+      }
+  }
+
+  &:nth-of-type(4) {
+      .iconfont {
+      color: #1d8aff;
+      }
+
+      &:hover {
+      background: #fff;
+      box-shadow: 0 0 10px #eee;
+      }
+  }
+
+  &:nth-of-type(5) {
+      .iconfont {
+      color: #ff1062;
+      }
+
+      &:hover {
+      background: #fff;
+      box-shadow: 0 0 10px #eee;
+      }
+  }
+
+  &:nth-of-type(6) {
+      .iconfont {
+      color: #1ebeca;
+      }
+
+      &:hover {
+      background: #fff;
+      box-shadow: 0 0 10px #eee;
+      }
+  }
+
+  &:nth-of-type(7) {
+      .iconfont {
+      color: #82c93d;
+      }
+
+      &:hover {
+      background: #fff;
+      box-shadow: 0 0 10px #eee;
+      }
+  }
+
+  &:nth-of-type(8) {
+      .iconfont {
+      color: #1d8aff;
+      }
+
+      &:hover {
+      background: #fff;
+      box-shadow: 0 0 10px #eee;
+      }
+  }
+
+  &:nth-of-type(9) {
+      .iconfont {
+      color: #f6826b;
+      }
+
+      &:hover {
+      background: #fff;
+      box-shadow: 0 0 10px #eee;
+      }
+  }
+  }
+}
+</style>
\ No newline at end of file
diff --git a/src/views/operation/paidApply/index.vue b/src/views/operation/paidApply/index.vue
new file mode 100644
index 00000000..d78559ab
--- /dev/null
+++ b/src/views/operation/paidApply/index.vue
@@ -0,0 +1,111 @@
+<!--
+ * @Description: 操作管理 -> 付费申请
+ * @Author: lijj
+ * @Date: 2024-06-20 11:54:04
+-->
+<template>
+  <div class="ds-pay-apply">
+    <BasicTable @register="registerTable">
+      <template #toolbar>
+        <TableActionBar :selectRow="getSelectRows" :reload="reload"></TableActionBar>
+      </template>
+      <template v-slot:bodyCell="{ column, record }">
+        <!-- 复制单号 -->
+        <template v-if="column.dataIndex == 'applicationNO'">
+          <span @click="copyNo($event, record.applicationNO)" style="cursor: pointer"><span class="iconfont icon-fuzhi" :style="{'fontSize': '12px', 'color': '#419638'}"></span> <span class="ds-green-status">{{ record.applicationNO }}</span></span>
+        </template>
+        <!-- 状态 -->
+        <template v-if="column.dataIndex == 'status'">
+          <span v-if="record.status == 0" class="ds-green-status">● {{ FeeStatus[record.status] }}</span>
+          <span v-else-if="record.status == 1" class="ds-blue-status">● {{ FeeStatus[record.status] }}</span>
+          <span v-else-if="/^2|3|4|5|6$/.test(record.status)" class="ds-orange-status">● {{ FeeStatus[record.status] }}</span>
+          <span v-else-if="/^7|8$/.test(record.status)" class="ds-red-status">● {{ FeeStatus[record.status] }}</span>
+          <span v-else class="ds-purple-status">● {{ FeeStatus[record.status] }}</span>
+        </template>
+      </template>
+    </BasicTable>
+  </div>
+</template>
+<script lang="ts" setup>
+  import { onMounted, ref } from 'vue'
+  import { BasicTable, useTable } from '/@/components/Table'
+  import TableActionBar from './components/tableActionBar.vue'
+  import { useMessage } from '/@/hooks/web/useMessage'
+  const { createMessage } = useMessage()
+  import { GetList } from './api'
+  import { columns, searchFormSchema, FeeStatus } from './columns'
+  const [registerTable, { reload, getForm, getPaginationRef, getSelectRows }] = useTable({
+    title: '',
+    api: async (p) => {
+      const res = await GetList(p)
+      return new Promise((resolve) => {
+        resolve({ data: [...res.data], total: res.count })
+      })
+    },
+    beforeFetch: () => {
+      var currentPageInfo: any = getPaginationRef()
+      var data = getForm().getFieldsValue()
+      const postParam = {
+        queryCondition: '',
+        pageCondition: {
+          pageIndex: currentPageInfo.current,
+          pageSize: currentPageInfo.pageSize,
+          sortConditions: [],
+        },
+      }
+      let condition: API.ConditionItem[] = []
+      if (!!data.UserName) {
+        condition.push({
+          FieldName: 'UserName',
+          FieldValue: data.UserName,
+          ConditionalType: 1,
+        })
+      }
+      if (!!data.UserCode) {
+        condition.push({
+          FieldName: 'UserCode',
+          FieldValue: data.UserCode,
+          ConditionalType: 1,
+        })
+      }
+      postParam.queryCondition = JSON.stringify(condition)
+      // console.log(postParam);
+      return postParam
+    },
+    columns,
+    formConfig: {
+      labelWidth: 120,
+      schemas: searchFormSchema,
+    },
+    isTreeTable: false,
+    pagination: true,
+    striped: false,
+    useSearchForm: true,
+    showTableSetting: true,
+    bordered: true,
+    showIndexColumn: true,
+    canResize: false,
+    rowSelection: { type: 'checkbox' },
+    immediate: false
+  })
+  const copyNo = (e, v) => {
+    e.stopPropagation()
+    navigator.clipboard.writeText(v)
+    createMessage.success("复制成功")
+  }
+  onMounted(() => {
+    //初始化
+    reload()
+  })
+  function handleSuccess() {
+    reload()
+  }
+</script>
+
+<style lang="less">
+.ds-pay-apply {
+  .vben-basic-table-header__toolbar {
+    justify-content: space-between;
+  }
+}
+</style>
\ No newline at end of file
diff --git a/src/views/operation/seaexport/detail/index.vue b/src/views/operation/seaexport/detail/index.vue
index 105958a5..71650586 100644
--- a/src/views/operation/seaexport/detail/index.vue
+++ b/src/views/operation/seaexport/detail/index.vue
@@ -71,7 +71,7 @@
                   ></mastetMore>
                 </a-tab-pane>
                 <a-tab-pane key="5-5" tab="应收应付费用" v-if="$route.query.id">
-                  <costEntry :details="bookingDetails"></costEntry>
+                  <costEntry :details="bookingDetails" type="1"></costEntry>
                 </a-tab-pane>
               </a-tabs>
             </a-spin>
diff --git a/src/views/operation/seaexport/index copy.vue b/src/views/operation/seaexport/index copy.vue
index be8b9598..352d58ec 100644
--- a/src/views/operation/seaexport/index copy.vue	
+++ b/src/views/operation/seaexport/index copy.vue	
@@ -2380,9 +2380,9 @@
   }
   function editColumns(row) {
     if (row.mblno) {
-      go(`/BookingDetail?id=${row.id}&type=${row.carrierid}&mblno=${row.mblno}`)
+      go(`/BookingDetail?id=${row.id}&mblno=${row.mblno}`)
     } else {
-      go(`/BookingDetail?id=${row.id}&type=${row.carrierid}&customerNo=${row.customerNo}`)
+      go(`/BookingDetail?id=${row.id}&customerNo=${row.customerNo}`)
     }
   }
   function customSortMethod() {}
diff --git a/src/views/operation/seaexport/index.vue b/src/views/operation/seaexport/index.vue
index 4a381bf2..aa7f71a8 100644
--- a/src/views/operation/seaexport/index.vue
+++ b/src/views/operation/seaexport/index.vue
@@ -352,9 +352,9 @@
   })
   function editColumns(row) {
     if (row.mblno) {
-      go(`/BookingDetail?id=${row.id}&type=${row.carrierid}&mblno=${row.mblno}`)
+      go(`/BookingDetail?id=${row.id}&mblno=${row.mblno}`)
     } else {
-      go(`/BookingDetail?id=${row.id}&type=${row.carrierid}&customerNo=${row.customerNo}`)
+      go(`/BookingDetail?id=${row.id}&customerNo=${row.customerNo}`)
     }
   }
   function FnCopy(data) {

From 8338128cec584019ce21d2b43998993d81d24fc8 Mon Sep 17 00:00:00 2001
From: lijingjia <lijj_xl@163.com>
Date: Fri, 21 Jun 2024 09:54:18 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E6=B5=B7=E8=BF=90=E5=87=BA=E5=8F=A3?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E9=AB=98=E7=BA=A7=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../operation/seaexport/detail/index.vue      |  2 +-
 src/views/operation/seaexport/index.vue       | 59 ++++++++++++++++++-
 2 files changed, 57 insertions(+), 4 deletions(-)

diff --git a/src/views/operation/seaexport/detail/index.vue b/src/views/operation/seaexport/detail/index.vue
index 71650586..436c2581 100644
--- a/src/views/operation/seaexport/detail/index.vue
+++ b/src/views/operation/seaexport/detail/index.vue
@@ -247,7 +247,7 @@
   // }
   // let { ctx: that, proxy }: any = getCurrentInstance()
   // 页面loading
-  const loading = ref(true)
+  const loading = ref(false)
   const id = ref(route.query.id)
   const isCopy = ref(route.query.isCopy || false)
   const Showtabs = ref(false)
diff --git a/src/views/operation/seaexport/index.vue b/src/views/operation/seaexport/index.vue
index aa7f71a8..e7ce9c9a 100644
--- a/src/views/operation/seaexport/index.vue
+++ b/src/views/operation/seaexport/index.vue
@@ -151,7 +151,7 @@
   import ConditionFilter from '/@/components/Condition/index.vue'
   import { onMounted, ref } from 'vue'
   import { BasicTable, useTable } from '/@/components/Table'
-  import { PageDataByBooking, UpdateUserQuerySet } from './api/BookingLedger.js'
+  import { PageDataByBooking, UpdateUserQuerySet, GetUserQuerySet } from './api/BookingLedger.js'
   import { getColumnsByClient } from '/@/views/baseinfo/formcopy/api'
   import { useModal } from '/@/components/Modal'
   import { columns, searchFormSchema, FeeStatus } from './columns'
@@ -162,8 +162,8 @@
   import { Field } from '/@/components/Render/interface'
   import { useOptionsStore } from '/@/store/modules/options'
   const optionsStore = useOptionsStore()
-  // import { usePermissionStore } from '/@/store/modules/permission'
-  // import initData from './modules/initData.js'
+  import { usePermissionStore } from '/@/store/modules/permission'
+  import initData from './modules/initData.js'
   import { useRouter, useRoute } from 'vue-router'
   const router = useRouter()
   const { notification } = useMessage()
@@ -476,12 +476,65 @@
       reload()
     }
   }
+  async function createdInit() {
+    showColumns.value = JSON.parse(JSON.stringify(initData.columns))
+    formAllData.value = JSON.parse(JSON.stringify(initData.condAllData))
+    fromTableAllData.value = JSON.parse(JSON.stringify(initData.columnsAllData))
+    tableHeight.value = document.body.clientHeight - 230
+    const res: API.DataResult = await getColumnsByClient({
+      tableViewName: 'op_sea_export',
+    })
+    const fullPath = ref(router.currentRoute.value.fullPath)
+    usePermissionStore().getWrouteList.forEach((item: Record<any, any>) => {
+      item.children[0].children?.forEach((item2: Record<any, any>) => {
+        if (fullPath.value.indexOf(item2.path) != -1) {
+          permissionId.value = item2.id
+        }
+      })
+    })
+    if (res.succeeded) {
+      console.log(res)
+
+      let data: any[] = []
+      res.data.forEach((item) => {
+        data.push({
+          id: item.dbColumnName,
+          title: item.columnDescription,
+          name: 'Select',
+          value: null,
+          props: {
+            disabled: false,
+            multiple: false,
+            // placeholder: '请选择请假事由',
+            options: [],
+          },
+          style: {
+            width: '100%',
+          },
+        })
+      })
+
+      fields.value = data
+    }
+    FnGetUserQuerySet()
+    // getConfigUser(true)
+  }
+  async function FnGetUserQuerySet() {
+    const res: API.DataResult = await GetUserQuerySet({
+      permissionId: permissionId.value,
+    })
+    if (res.succeeded) {
+      console.log(res)
+      AdvancedQueryData.value = JSON.parse(res.data.content)
+    }
+  }
   function handledbclick(record, index, event) {
     editColumns(record)
   }
   onMounted(() => {
     //初始化
     reload()
+    createdInit()
   })
 </script>