Merge branch 'dev' of http://60.209.125.238:20010/lijingjia/ds-wms-client-web into dev

src/views/ContainerManagement/BuyCtn/TenantAuditStepModal.vue

@@ -327,7 +327,7 @@
     }
   }
   async function Cancel() {
-    await handleSave(false)
+    // await handleSave(false)
     let type: boolean = true
     let ApiData: any = {
       id: rowId.value,

src/views/ContainerManagement/CtnScrap/TenantAuditStepModal.vue

@@ -51,6 +51,7 @@
           </div>
         </div>
         <div class="SearchBox">
+          <span style="font-weight: bold; margin: 20px 8px 0px 0px">待取业务</span>
           <BasicForm class="Form" @register="registerSearchBoxForm" />
           <div class="ButtonBox">
             <a-button size="default" @click="handleReset"> 重置 </a-button>
@@ -338,7 +339,7 @@
     }
   }
   async function Cancel() {
-    await handleSave(false)
+    // await handleSave(false)
     let type: boolean = true
     let ApiData: any = {
       id: rowId.value,

src/views/ContainerManagement/RentIn/TenantAuditStepModal.vue

@@ -51,6 +51,7 @@
           </div>
         </div>
         <div class="SearchBox" v-if="TotTableType">
+          <span style="font-weight: bold; margin: 20px 8px 0px 0px">待取业务</span>
           <BasicForm class="Form" @register="registerSearchBoxForm" />
           <div class="ButtonBox">
             <a-button size="default" @click="handleReset"> 重置 </a-button>
@@ -340,7 +341,7 @@
     }
   }
   async function Cancel() {
-    await handleSave(false)
+    // await handleSave(false)
     let type: boolean = true
     let ApiData: any = {
       id: rowId.value,

src/views/ContainerManagement/RentOneWay/TenantAuditStepModal.vue

@@ -51,6 +51,7 @@
           </div>
         </div>
         <div class="SearchBox">
+          <span style="font-weight: bold; margin: 20px 8px 0px 0px">待取业务</span>
           <BasicForm class="Form" @register="registerSearchBoxForm" />
           <div class="ButtonBox">
             <a-button size="default" @click="handleReset"> 重置 </a-button>
@@ -327,7 +328,7 @@
     }
   }
   async function Cancel() {
-    await handleSave(false)
+    // await handleSave(false)
     let type: boolean = true
     let ApiData: any = {
       id: rowId.value,
@@ -995,7 +996,10 @@
     })
     GetViewListDetail(JSON.stringify(ApiData))
   }
-  function ViewTableAdd() {
+  async function ViewTableAdd() {
+    if (!rowId.value) {
+      await handleSave(false)
+    }
     let ApiData: any = { id: rowId.value, ids: [] }
     Viewlist.value.forEach((e: any, i) => {
       if (e.selected) {

src/views/ContainerManagement/RentOneWayIn/TenantAuditStepModal.vue

@@ -274,7 +274,7 @@
     }
   }
   async function Cancel() {
-    await handleSave(false)
+    // await handleSave(false)
     let type: boolean = true
     let ApiData: any = {
       id: rowId.value,

src/views/ContainerManagement/RentOut/TenantAuditStepModal.vue

@@ -51,6 +51,7 @@
           </div>
         </div>
         <div class="SearchBox">
+          <span style="font-weight: bold; margin: 20px 8px 0px 0px">待取业务</span>
           <BasicForm class="Form" @register="registerSearchBoxForm" />
           <div class="ButtonBox">
             <a-button size="default" @click="handleReset"> 重置 </a-button>
@@ -358,7 +359,7 @@
     }
   }
   async function Cancel() {
-    await handleSave(false)
+    // await handleSave(false)
     let type: boolean = true
     let ApiData: any = {
       id: rowId.value,

src/views/ContainerManagement/SellCtn/TenantAuditStepModal.vue

@@ -51,6 +51,7 @@
           </div>
         </div>
         <div class="SearchBox">
+          <span style="font-weight: bold; margin: 20px 8px 0px 0px">待取业务</span>
           <BasicForm class="Form" @register="registerSearchBoxForm" />
           <div class="ButtonBox">
             <a-button size="default" @click="handleReset"> 重置 </a-button>
@@ -338,7 +339,7 @@
     }
   }
   async function Cancel() {
-    await handleSave(false)
+    // await handleSave(false)
     let type: boolean = true
     let ApiData: any = {
       id: rowId.value,

src/views/baseinfo/TaskMail/TenantAuditStepModal.vue

@@ -7,7 +7,7 @@
     @register="registerModal"
     @ok="handleSave"
   >
-    <BasicForm @register="registerForm" />
+    <BasicForm @register="registerForm" @linkageForm="linkageForm" />
     <!-- 任务邮件接收人配置 -->
     <BasicForm @register="registerReceiverForm" />
     <!-- 任务邮件发送人配置 -->
@@ -22,7 +22,7 @@
         :loading="loading"
         ghost
         style="margin-right: 0.8rem"
-        @click="closeModal"
+        @click="handlecloseModal"
         >取消</a-button
       >
       <a-button
@@ -50,17 +50,56 @@
   import { formSchema, ReceiverformSchema, SenderformSchema, CcformSchema } from './columns'
   import { ApiEdit, ApiInfo, GetPrintTemplateList } from './api'
   import { useMessage } from '/@/hooks/web/useMessage'
+  import { any } from 'node_modules/vue-types/dist'
   // 声明Emits
   const emit = defineEmits(['success', 'register'])
   const isUpdate = ref(true)
   const loading = ref(false)
   const rowId = ref('')
   const { createMessage } = useMessage()
-  const [registerForm, { resetFields, setFieldsValue, validate, updateSchema }] = useForm({
+  const [
+    registerForm,
+    {
+      resetFields,
+      setFieldsValue,
+      validate,
+      updateSchema,
+      appendSchemaByField,
+      removeSchemaByField,
+    },
+  ] = useForm({
     labelWidth: 100,
     schemas: formSchema,
     showActionButtonGroup: false,
   })
+  const DiyFieldIdS = ref<any>([])
+  function linkageForm(data) {
+    console.log(data)
+
+    // 清楚所有添加的Schema
+    if (DiyFieldIdS.value.length) {
+      DiyFieldIdS.value.forEach((item) => {
+        removeSchemaByField(item.value)
+      })
+    }
+
+    DiyFieldIdS.value.splice(0)
+    data.forEach((item) => {
+      appendSchemaByField(
+        {
+          field: item.value,
+          label: item.label,
+          component: 'Input',
+          colProps: { span: 6 },
+          componentProps: {
+            placeholder: '自定义文件名称',
+          },
+        },
+        'attachments',
+      )
+      DiyFieldIdS.value.push(item)
+    })
+  }
   const [
     registerReceiverForm,
     {
@@ -100,18 +139,43 @@
     CcResetFields()
     setModalProps({ confirmLoading: false, loading: true })
     isUpdate.value = !!data?.isUpdate
+    DiyFieldIdS.value.forEach((item) => {
+      removeSchemaByField(item.value)
+    })
+    DiyFieldIdS.value.splice(0)
     if (unref(isUpdate)) {
       // setModalProps({ confirmLoading: true });
       rowId.value = data.record.id
       const res: API.DataResult = await ApiInfo({ id: unref(rowId) })
       if (res.succeeded) {
+        let DiyFieldIdSArr: any = []
+        let DiyFieldIdSObj: any = {}
         let attachments: any = []
+        let arrRes: any = await GetPrintTemplateList({
+          queryCondition: `[]`,
+          pageCondition: {
+            pageIndex: 1,
+            pageSize: 999,
+            sortConditions: [],
+          },
+        })
         res.data.attachments.forEach((e) => {
           attachments.push(e.templateId)
+          arrRes.data.forEach((element) => {
+            if (element.id == e.templateId) {
+              DiyFieldIdSArr.push({
+                value: e.templateId,
+                label: element.templateName,
+              })
+              DiyFieldIdSObj[e.templateId] = e.fileName
+            }
+          })
         })
+        linkageForm(DiyFieldIdSArr)
         setFieldsValue({
           ...res.data,
           attachments,
+          ...DiyFieldIdSObj,
         })
         if (res.data.documentType == 0) {
           updateSchema({ field: 'name', required: true })
@@ -139,7 +203,12 @@
   })
 
   const getTitle = computed(() => (!unref(isUpdate) ? '新增邮件模板' : '编辑邮件模板'))
-
+  function handlecloseModal() {
+    DiyFieldIdS.value.forEach((item) => {
+      removeSchemaByField(item.value)
+    })
+    closeModal()
+  }
   async function handleSave(exit) {
     try {
       const values = await validate()
@@ -153,6 +222,7 @@
           sortConditions: [],
         },
       })
+      console.log(DiyFieldIdS.value)
 
       arrRes.data.forEach((item) => {
         values.attachments.forEach((e) => {
@@ -162,7 +232,7 @@
             attachments.push({
               taskMailId: values.id,
               templateId: item.id,
-              fileName: item.templateName,
+              fileName: values[item.id] ? values[item.id] : item.templateName,
             })
           }
         })
@@ -194,35 +264,61 @@
         createMessage.error(res.message)
       }
 
-      exit && closeModal()
+      exit && handlecloseModal()
     } finally {
       // loading.value = false;
       setModalProps({ confirmLoading: false, loading: false })
     }
   }
   async function refresh() {
+    DiyFieldIdS.value.forEach((item) => {
+      removeSchemaByField(item.value)
+    })
+    DiyFieldIdS.value.splice(0)
     const res: API.DataResult = await ApiInfo({ id: unref(rowId) })
+
     if (res.succeeded) {
+      let DiyFieldIdSArr: any = []
+      let DiyFieldIdSObj: any = {}
       let attachments: any = []
+      let arrRes: any = await GetPrintTemplateList({
+        queryCondition: `[]`,
+        pageCondition: {
+          pageIndex: 1,
+          pageSize: 999,
+          sortConditions: [],
+        },
+      })
       res.data.attachments.forEach((e) => {
         attachments.push(e.templateId)
+        arrRes.data.forEach((element) => {
+          if (element.id == e.templateId) {
+            DiyFieldIdSArr.push({
+              value: e.templateId,
+              label: element.templateName,
+            })
+            DiyFieldIdSObj[e.templateId] = e.fileName
+          }
+        })
       })
+      linkageForm(DiyFieldIdSArr)
       setFieldsValue({
         ...res.data,
         attachments,
+        ...DiyFieldIdSObj,
       })
       if (res.data.documentType == 0) {
         updateSchema({ field: 'name', required: true })
       } else {
         updateSchema({ field: 'name', required: false })
       }
-      await ReceiverSetFieldsValue({
+      ReceiverSetFieldsValue({
         ...res.data.receiver,
       })
-      await SenderSetFieldsValue({
+      SenderSetFieldsValue({
         ...res.data.sender,
       })
-      await CcSetFieldsValue({
+      CcSetFieldsValue({
         ...res.data.cc,
       })
     }

src/views/baseinfo/TaskMail/columns.tsx

@@ -116,8 +116,6 @@ export const formSchema: FormSchema[] = [
         valueField: 'value',
         resultField: 'data',
         onChange: (e, obj) => {
-          console.log(e)
-
           if (formActionType) {
             if (e == 0) {
               formActionType.updateSchema({ field: 'name', required: true })
@@ -148,30 +146,33 @@ export const formSchema: FormSchema[] = [
     field: 'attachments',
     component: 'ApiSelect',
     colProps: { span: 12 },
-    componentProps: {
-      api: () => {
-        return new Promise((resolve) => {
-          GetPrintTemplateList({
-            // {"FieldName":"isUseDataSource","FieldValue":${true},"ConditionalType":0}
-            queryCondition: `[]`,
-            pageCondition: {
-              pageIndex: 1,
-              pageSize: 999,
-              sortConditions: [],
-            },
-          }).then((res) => {
-            console.log(res, 111111111111111)
-            resolve(res)
+    componentProps: ({ formActionType }) => {
+      return {
+        api: () => {
+          return new Promise((resolve) => {
+            GetPrintTemplateList({
+              queryCondition: `[]`,
+              pageCondition: {
+                pageIndex: 1,
+                pageSize: 999,
+                sortConditions: [],
+              },
+            }).then((res) => {
+              resolve(res)
+            })
           })
-        })
-      },
-      labelField: 'templateName',
-      valueField: 'id',
-      resultField: 'data',
-      allowClear: true,
-      immediate: true,
-      mode: 'multiple',
-      class: 'NoLimitHeight',
+        },
+        labelField: 'templateName',
+        valueField: 'id',
+        resultField: 'data',
+        allowClear: true,
+        immediate: true,
+        mode: 'multiple',
+        class: 'NoLimitHeight',
+        onChange: (e, obj) => {
+          formActionType ? formActionType.linkageForm(obj) : null
+        },
+      }
     },
   },
   {

src/views/bookingcabin/CabinManagement/columns.tsx

@@ -522,21 +522,21 @@ export const columns: BasicColumn[] = [
     title: '装货港',
     align: 'center',
     width: 180,
-    dataIndex: 'portload',
+    dataIndex: 'portLoad',
     customCell: sharedOnCell,
   },
   {
     title: '卸货港',
     align: 'center',
     width: 180,
-    dataIndex: 'portdischarge',
+    dataIndex: 'portDischarge',
     customCell: sharedOnCell,
   },
   {
     title: '卸货港国家',
     align: 'center',
     width: 180,
-    dataIndex: 'portdischargeCountry',
+    dataIndex: 'portDischargeCountry',
     customCell: sharedOnCell,
   },
   {

src/views/operation/invoicExamine/columns.tsx

@@ -227,7 +227,7 @@ export const feeColumns: BasicColumn[] = [
   },
   {
     title: '申请金额',
-    dataIndex: 'amount',
+    dataIndex: 'applyAmount',
     width: 80,
   },
   {

src/views/operation/invoiceApply/columns.tsx

@@ -584,7 +584,7 @@ export const feeColumns: BasicColumn[] = [
   },
   {
     title: '申请金额',
-    dataIndex: 'orderAmount',
+    dataIndex: 'applyAmount',
     width: 80,
   },
   {

src/views/operation/invoiceApply/detail/InvoiceDetails.vue

@@ -260,8 +260,11 @@ function changeApply() {
                 exchangeArr.push(item)
             }
         })
-        if (exchangeArr.length > 0) {
-            const promises = exchangeArr.map(item => {
+        const filteredItems = exchangeArr.filter((item, index, self) =>
+            index === self.findIndex((t) => t.currency === item.currency)
+        );
+        if (filteredItems.length > 0) {
+            const promises = filteredItems.map(item => {
                 return new Promise((resolve) => {
                     const data = {
                         currencyFrom: 'RMB',
@@ -278,7 +281,7 @@ function changeApply() {
                 exchangeFlag.value = true
             });
         }
-        if (exchangeArr.length == 0) {
+        if (filteredItems.length == 0) {
             const arr = getSelectRowsFee()
             let total = 0
             arr.forEach(item => {

src/views/operation/invoiceIssue/api.js

@@ -168,4 +168,18 @@ export function FreeInvoiceGetFees(parameter) {
     method: 'post',
     data: parameter,
   })
+}
+export function FreeInvoiceSave(parameter) {
+  return request({
+    url: '/feeApi/FreeInvoice/Save',
+    method: 'post',
+    data: parameter,
+  })
+}
+export function GetCurrencies(parameter) {
+  return request({
+    url: '/feeApi/FreeInvoice/GetCurrencies',
+    method: 'post',
+    data: parameter,
+  })
 }

src/views/operation/invoiceIssue/columns.tsx

@@ -713,7 +713,7 @@ export const feeColumnsDetail: BasicColumn[] = [
   },
   {
     title: '申请金额',
-    dataIndex: 'orderAmount',
+    dataIndex: 'applyAmount',
     width: 80,
   },
   {
@@ -748,12 +748,12 @@ export const feeColumnsDetail: BasicColumn[] = [
   },
   {
     title: '装货港',
-    dataIndex: 'saleName',
+    dataIndex: 'saleName2',
     width: 80,
   },
   {
     title: '卸货港',
-    dataIndex: 'saleName',
+    dataIndex: 'saleName1',
     width: 80,
   },
 ]

src/views/operation/invoiceIssue/detail/applyInvoice.vue

@@ -3,7 +3,7 @@
         <a-modal width="1600px" @cancel="open = false" :visible="open" title="添加发票申请明细" :footer="null">
             <div style="padding-bottom:5px ;">
                 <div>
-                    <BasicTable class="ds-table" @row-click="handleClick" @register="registerTable" >
+                    <BasicTable class="ds-table" @row-click="handleClick" @register="registerTable">
                         <template #right>
                             <div style="width: 40%;margin-left: 10px;margin-top:10px;">
                                 <div>
@@ -14,11 +14,6 @@
                                             </div>
                                         </template>
                                         <template v-slot:bodyCell="{ column, record }">
-                                            <template v-if="column.dataIndex == 'applyAmount'">
-                                                <a-input-number @change="onSelectAmount" :precision="2" size="small"
-                                                    :controls="false" :max="record.restAmount"
-                                                    v-model:value="record.applyAmount" />
-                                            </template>
                                             <template v-if="column.dataIndex == 'feeType'">
                                                 <span v-if="record.feeType == 1">应收</span>
                                                 <span v-if="record.feeType == 2">应付</span>
@@ -62,20 +57,23 @@
                         v-model:value="item.reverseRate" />
                 </div>
             </div>
-
         </a-modal>
         <a-modal width="1600px" @cancel="freeFlag = false" :visible="freeFlag" title="添加发票申请明细" :footer="null">
             <div style="padding-bottom:5px ;">
                 <div>
                     <BasicTable class="ds-table" @row-click="handleClickFree" @register="registerTableFree">
                         <template #right>
-                            <div style="width: 40%;margin-left: 10px;margin-top:10px;">
+                            <div style="width: 40%;margin-left: 10px;">
                                 <div>
-                                    <BasicTable class="ds-table" @register="registerTable1">
+                                    <BasicTable class="ds-table" @register="registerTableFreeDetail">
                                         <template #tableTitle>
                                             <div>
                                                 <span class="bold">发票申请明细</span>
                                             </div>
+                                            <a-button type="link" @click="handleAddDetial">
+                                                <span class="iconfont icon-jia"></span>
+                                                添加到发票费用明细
+                                            </a-button>
                                         </template>
                                         <template v-slot:bodyCell="{ column, record }">
                                             <template v-if="column.dataIndex == 'applyAmount'">
@@ -97,14 +95,12 @@
                             <div>
                                 <div>
                                     <span class="bold">发票申请</span>
-                                    <a-button v-repeat type="link" @click="addDetailed()">
+                                    <a-button v-repeat type="link" @click="addDetailFree">
                                         <span class="iconfont icon-jia"></span>
                                         添加申请明细
                                     </a-button>
                                 </div>
                             </div>
-
-
                         </template>
                         <template v-slot:bodyCell="{ column, record }">
                             <template v-if="column.dataIndex == 'businessType'">
@@ -112,6 +108,21 @@
                             </template>
                         </template>
                     </BasicTable>
+                    <div class="total">
+                        <span style="margin-right: 10px;">合计:</span>
+                        <span class="total-item">
+                            <span class="text">RMB未开:</span>
+                            <span class="number">{{ rmbTotal }}</span>
+                        </span>
+                        <span class="total-item">
+                            <span class="text">USD未开:</span>
+                            <span class="number">{{ usdTotal }}</span>
+                        </span>
+                        <span class="total-item">
+                            <span class="text">其他未开:</span>
+                            <span class="number">{{ otherTotal }}</span>
+                        </span>
+                    </div>
                 </div>
             </div>
         </a-modal>
@@ -123,15 +134,75 @@
 import { formatParams } from '/@/hooks/web/common'
 import { ref, defineExpose, watch } from 'vue'
 import { BasicTable, useTable, TableAction } from '/@/components/Table'
-import { applyColums, applySearch, applyColumsDetail,freeSearch,freeColums } from '../columns'
-import { GetApplicationList, GetApplicationDetails, GetExchangeRate,FreeInvoiceGetBizList,FreeInvoiceGetFees } from '../api.js'
+import { applyColums, applySearch, applyColumsDetail, freeSearch, freeColums } from '../columns'
+import { GetApplicationList, GetApplicationDetails, GetExchangeRate, FreeInvoiceGetBizList, FreeInvoiceGetFees, GetCurrencies } from '../api.js'
 import { useMessage } from '/@/hooks/web/useMessage'
 const { createMessage } = useMessage()
 import { useRoute } from 'vue-router'
 const route = useRoute()
 const open = ref(false)
+const columnsFreeDetail = [
+    {
+        title: '结费单位',
+        dataIndex: 'customerName',
+        width: 100,
+    },
+    {
+        title: '收付',
+        dataIndex: 'feeType',
+        width: 50,
+    },
+    {
+        title: '费用名称',
+        dataIndex: 'feeName',
+        width: 80,
+    },
+    {
+        title: '金额',
+        dataIndex: 'amount',
+        width: 60,
+    },
+    {
+        title: '币别',
+        dataIndex: 'currency',
+        width: 60,
+    },
+    {
+        title: '未开票金额',
+        dataIndex: 'restAmount',
+        width: 100,
+    },
+    {
+        title: '本次开票金额',
+        dataIndex: 'applyAmount',
+        width: 100,
+    },
+    {
+        title: '原始汇率',
+        dataIndex: 'exchangeRate',
+        width: 80,
+    },
+    {
+        title: '录入人',
+        dataIndex: 'createByName',
+        width: 80,
+    },
+    {
+        title: '销项/进项',
+        dataIndex: 'name',
+        width: 80,
+    },
+    {
+        title: '录入方式',
+        dataIndex: 'inputMethod',
+        width: 80,
+    },
+
 
+]
+const queryDataFree = ref({})
 const dataSource = ref([]) as any
+const freeDetailList = ref([]) as any
 const [registerTable, { getForm, setSelectedRowKeys, getSelectRows, setProps, getRawDataSource, setLoading }] = useTable({
     api: async (p) => {
         const res: API.DataResult = await GetApplicationList(p)
@@ -176,7 +247,7 @@ const [registerTable1, { getSelectRows: getSelectRowsFee, setProps: setPropsFee,
     canResize: true,
     immediate: false,
 })
-const [registerTableFree, { getForm:getFormFree, setSelectedRowKeys:setSelectedRowKeysFree,  getSelectRows:getSelectRowsFree }] = useTable({
+const [registerTableFree, { getForm: getFormFree, setSelectedRowKeys: setSelectedRowKeysFree, getSelectRows: getSelectRowsFree, getRawDataSource: getRawDataSourceFree }] = useTable({
     api: async (p) => {
         const res: API.DataResult = await FreeInvoiceGetBizList(p)
         return new Promise((resolve) => {
@@ -184,18 +255,23 @@ const [registerTableFree, { getForm:getFormFree, setSelectedRowKeys:setSelectedR
         })
     },
     beforeFetch: (p) => {
-        return formatParams(p)
+        const data = formatParams(p)
+        data.otherQueryCondition = getFormFree().getFieldsValue().FeeRange
+        queryDataFree.value = JSON.parse(JSON.stringify(p))
+        return data
     },
     columns: freeColums,
     formConfig: {
         labelWidth: 120,
         schemas: freeSearch,
     },
+    rowSelection: {
+        onChange: onSelectChange
+    },
     useSearchForm: true,
     showIndexColumn: false,
     maxHeight: '600',
     pagination: true,
-    rowSelection: {},
     striped: true,
     bordered: true,
     indexColumnProps: {
@@ -207,44 +283,191 @@ const [registerTableFree, { getForm:getFormFree, setSelectedRowKeys:setSelectedR
 const exchangeFlag = ref(false)
 const freeFlag = ref(false)
 const loading = ref(false)
+const [registerTableFreeDetail, { getSelectRows: getSelectRowsFeeDetail, setProps: setPropsFeeDetail, setTableData: setTableDataDetail }] = useTable({
+    columns: columnsFreeDetail,
+    useSearchForm: false,
+    showIndexColumn: false,
+    maxHeight: '600',
+    pagination: false,
+    dataSource: freeDetailList.value,
+    striped: true,
+    rowKey: 'recordId',
+    rowSelection: {
+        // onChange: onSelectAmount
+    },
+    bordered: true,
+    indexColumnProps: {
+        width: 60,
+    },
+    canResize: true,
+    immediate: false,
+})
+const rmbTotal = ref(0)
+const usdTotal = ref(0)
+const otherTotal = ref(0)
+function onSelectChange(selectedRowKeys) {
+    const list = getSelectRowsFree()
+    console.log(list, selectedRowKeys)
+    rmbTotal.value = 0
+    usdTotal.value = 0
+    otherTotal.value = 0
+    list.forEach(item => {
+        rmbTotal.value += Number(item.unBilledRMB)
+        usdTotal.value += Number(item.unBilledUSD)
+        otherTotal.value += Number(item.unBilledOther)
+    })
+}
 
+function handleAddDetial() {
+    let arr = getSelectRowsFeeDetail() ? getSelectRowsFeeDetail() : []
+    if (arr.length == 0) {
+        createMessage.error('请选择费用明细')
+        return false
+    }
+    changeApply()
+}
+function changeApply() {
+    const arr = getSelectRowsFeeDetail()
+    const exchangeArr = [] as any
+    if (arr.length > 0) {
+        exchangarr.value = []
+        arr.forEach(item => {
+            if (item.currency != 'RMB') {
+                exchangeArr.push(item)
+            }
+        })
+        const filteredItems = exchangeArr.filter((item, index, self) =>
+            index === self.findIndex((t) => t.currency === item.currency)
+        );
+        if (filteredItems.length > 0) {
+            const promises = filteredItems.map(item => {
+                return new Promise((resolve) => {
+                    const data = {
+                        currencyFrom: 'RMB',
+                        currencyTo: item.currency,
+                        feeType: item.feeType
+                    }
+                    GetExchangeRate(data).then(res => {
+                        exchangarr.value.push(res.data)
+                        resolve(true);
+                    })
+                });
+            });
+            return Promise.all(promises).then(() => {
+                freeType.value = 'right'
+                exchangeFlag.value = true
+            });
+        }
+        if (filteredItems.length == 0) {
+            open.value = false
+            emits('updateListFree', arr)
+        }
+    }
+}
+const freeType = ref('')
+function addDetailFree() {
+    let arr = getSelectRowsFree() ? getSelectRowsFree() : []
+    if (arr.length == 0) {
+        createMessage.error('请选择发票')
+        return false
+    }
+    let freeList = [] as any
+    arr.forEach(item => {
+        freeList.push({
+            id: item.id,
+            businessType: item.businessType,
+            customerId: item.customerId
+        })
+    })
+    GetCurrencies(freeList).then(res => {
+        const cuArr = []
+        res.data.forEach(item => {
+            if (item != 'RMB') {
+                cuArr.push(1)
+            }
+        })
+        if (cuArr.length > 0) {
+            const promises = cuArr.map(item => {
+                return new Promise((resolve) => {
+                    const data = {
+                        currencyFrom: 'RMB',
+                        currencyTo: item,
+                    }
+                    GetExchangeRate(data).then(res => {
+                        exchangarr.value.push(res.data)
+                        resolve(true);
+                    })
+                });
+            });
+            return Promise.all(promises).then(() => {
+                freeType.value = 'left'
+                exchangeFlag.value = true
+            });
+        }
+        if (cuArr.length == 0) {
+            open.value = false
+            emits('updateListFreeLeft', arr)
+        }
+    })
+}
 
-
-
-
-const emits = defineEmits(['updateList', 'addLeft'])
+const emits = defineEmits(['updateList', 'addLeft', 'updateListFree', 'updateListFreeLeft'])
 // 确定汇率 转换外币成RMB
 function handleSureExhange() {
-    applications.value.forEach(item => {
-        if (item.currency != 'RMB') {
+    if (route.query.type == 'apply') {
+        applications.value.forEach(item => {
+            if (item.currency != 'RMB') {
+                exchangarr.value.forEach(ite => {
+                    if (item.currency == ite.currencyTo) {
+                        item.exchangeRate = ite.reverseRate
+                    }
+                })
+            } else {
+                item.exchangeRate = 1
+            }
+        })
+        const resultMap = new Map();
+        applications.value.forEach(item => {
+            const { applicationId, currency, exchangeRate } = item;
+            if (!resultMap.has(applicationId)) {
+                resultMap.set(applicationId, {
+                    applicationId,
+                    exchangeRates: []
+                });
+            }
+            const entry = resultMap.get(applicationId);
+            entry.exchangeRates.push({
+                currency,
+                exchangeRate
+            });
+        });
+        const result = Array.from(resultMap.values());
+        emits('updateList', result)
+        open.value = false
+        exchangeFlag.value = false
+    }
+    if (route.query.type == 'free') {
+        let arr = [] as any
+        if (freeType.value == 'left') {
+            arr = getSelectRowsFree()
+        } else {
+            arr = getSelectRowsFeeDetail()
+        }
+        arr.forEach(item => {
             exchangarr.value.forEach(ite => {
-                if (item.currency == ite.currencyTo) {
+                if (item.currency == item.currencyTo) {
                     item.exchangeRate = ite.reverseRate
                 }
             })
+        })
+        open.value = false
+        exchangeFlag.value = false
+        if (freeType.value == 'left') {
+            emits('updateListFreeLeft', arr)
         } else {
-            item.exchangeRate = 1
-        }
-    })
-    const resultMap = new Map();
-    applications.value.forEach(item => {
-        const { applicationId, currency, exchangeRate } = item;
-        if (!resultMap.has(applicationId)) {
-            resultMap.set(applicationId, {
-                applicationId,
-                exchangeRates: []
-            });
+            emits('updateListFree', arr)
         }
-        const entry = resultMap.get(applicationId);
-        entry.exchangeRates.push({
-            currency,
-            exchangeRate
-        });
-    });
-    const result = Array.from(resultMap.values());
-    emits('updateList', result)
-    open.value = false
-    exchangeFlag.value = false
+    }
 }
 function handleClick(record, index) {
     setSelectedRowKeys([record.id])
@@ -270,30 +493,35 @@ function handleClickFree(record, index) {
     const data = {
         id: record.id,
         businessType: record.businessType,
-        // customerId: record.customerId
+        customerId: record.customerId
     }
     loading.value = true
-    FreeInvoiceGetFees(data).then(res => {
+    FreeInvoiceGetFees([data]).then(res => {
         if (res.succeeded) {
-            
+            freeDetailList.value = res.data.items
+            freeDetailList.value.forEach(item => {
+                item.applyAmount = item.restAmount ? item.restAmount : 0
+                item.applyAmount = item.applyAmount.toFixed(2)
+            })
+            setTableDataDetail(freeDetailList.value)
         }
         loading.value = false
     })
 }
 function init(data) {
-    if(route.query.type=='apply'){
+    if (route.query.type == 'apply') {
         open.value = true
     }
-    if(route.query.type=='free'){
+    if (route.query.type == 'free') {
         freeFlag.value = true
     }
-   
+
 }
 
 const amountArr = ref([]) as any
 // 计算总共的申请金额
 function onSelectAmount() {
-    const arr = getSelectRowsFee()
+    const arr = getRawDataSourceFree()
     amountArr.value = []
     arr.forEach(item => {
         amountArr.value.push({

src/views/operation/invoiceIssue/detail/index.vue

@@ -296,7 +296,7 @@
                 </div>
             </div>
         </a-spin>
-        <applyInvoice @updateList="handleUpdate" ref="applyInvoiceRef"></applyInvoice>
+        <applyInvoice @updateListFreeLeft="updateListFreeLeft" @updateList="handleUpdate" @updateListFree="updateListFree" ref="applyInvoiceRef"></applyInvoice>
         <a-modal width="1400px" @cancel="feeFlag = false" :visible="feeFlag" title="费用明细" :footer="null">
             <BasicTable @register="registerTableFee">
                 <template v-slot:bodyCell="{ column, record }">
@@ -323,7 +323,7 @@ import invoiceFile from './invoiceFile.vue'
 import { DownOutlined } from '@ant-design/icons-vue'
 import {
     GetInvoiceCodeList, GetUserListAll, DeleteInvoiceDetail,
-    GeneralInvoiceSave, GeneralInvoiceGet,
+    GeneralInvoiceSave, GeneralInvoiceGet, FreeInvoiceSave,
     GeneralInvoiceGetList, GeneralInvoiceInitiate
 } from '../api'
 import { useMessage } from '/@/hooks/web/useMessage'
@@ -676,6 +676,29 @@ function openFile() {
 }
 const router = useRouter()
 const go = useGo()
+function updateListFreeLeft(val){
+    const data = {
+        invoice: {
+            ...form.value,
+            ...getFieldsValue()
+        },
+        bizList: val,
+    }
+    FreeInvoiceSave(data).then(res => {
+        if (res.succeeded) {
+            createMessage.success('保存成功')
+            if (!route.query.id) {
+                const { fullPath } = route //获取当前路径
+                tabStore.closeTabByKey(fullPath, router)
+                setTimeout(() => {
+                    go(`/invoiceIssueDetail?id=${res.data.id}&type=${route.query.type}`)
+                }, 50)
+            } else {
+                getDetail()
+            }
+        }
+    })
+}
 function handleUpdate(val) {
     const data = {
         invoice: {
@@ -687,7 +710,6 @@ function handleUpdate(val) {
     }
     GeneralInvoiceSave(data).then(res => {
         if (res.succeeded) {
-
             createMessage.success('保存成功')
             if (!route.query.id) {
                 const { fullPath } = route //获取当前路径
@@ -701,6 +723,36 @@ function handleUpdate(val) {
         }
     })
 }
+function updateListFree(val) {
+    val.forEach(item => {
+        item.originalCurrency = item.currency
+        item.currency = 'RMB'
+        item.originalAmount = item.applyAmount
+        item.originalProcessedAmount = item.processedAmount ? item.processedAmount : 0
+    })
+    const data = {
+        invoice: {
+            ...form.value,
+            ...getFieldsValue()
+        },
+        details: val,
+    }
+    FreeInvoiceSave(data).then(res => {
+        if (res.succeeded) {
+            createMessage.success('保存成功')
+            if (!route.query.id) {
+                const { fullPath } = route //获取当前路径
+                tabStore.closeTabByKey(fullPath, router)
+                setTimeout(() => {
+                    go(`/invoiceIssueDetail?id=${res.data.id}&type=${route.query.type}`)
+                }, 50)
+            } else {
+                getDetail()
+            }
+        }
+    })
+}
+
 // 删除行
 const deleteRow = async () => {
     const ids = [] as any
@@ -739,7 +791,7 @@ const [registerTableFee, { setTableData: setTableDataFee, }] = useTable({
     useSearchForm: false,
     showIndexColumn: false,
     pagination: false,
-    showTableSetting: true,
+    showTableSetting: false,
     striped: true,
     rowKey: 'id',
     bordered: true,

src/views/system/org/columns.tsx

@@ -421,8 +421,8 @@ export const formSchema: FormSchema[] = [
     required: true,
     componentProps: {
       options: [
-        { label: '启用', value: 1 },
-        { label: '禁用', value: 0 },
+        { label: '启用', value: 0 },
+        { label: '禁用', value: 1 },
       ],
     },
     defaultValue: 0,
@@ -653,8 +653,8 @@ export const BankformSchema: FormSchema[] = [
     required: true,
     componentProps: {
       options: [
-        { label: '启用', value: 1 },
-        { label: '禁用', value: 0 },
+        { label: '启用', value: 0 },
+        { label: '禁用', value: 1 },
       ],
     },
     defaultValue: true,