From 7d237e0c44926486dbe418bfd2abb83320aa47f0 Mon Sep 17 00:00:00 2001
From: lijingjia <lijj_xl@163.com>
Date: Fri, 27 Sep 2024 19:06:24 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AF=A6=E6=83=85=E8=A1=A8=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../CostEntry/components/applyModify.tsx      |  6 ++--
 .../CostEntry/components/applyModify.vue      | 19 ++++++------
 src/components/CostEntry/feeTable.vue         |  2 +-
 .../approve/paid/components/calcTable.vue     |  3 +-
 .../paymentSettlement/detail/columns.tsx      |  3 +-
 .../detail/components/applyInfo.vue           | 28 +++++++-----------
 .../detail/components/businessTable.vue       | 29 +++++++++++++++----
 .../paymentSettlement/detail/index.vue        | 22 ++++++++++----
 .../invoiceIssue/detail/invoiceFile.vue       |  8 ++---
 .../operation/paidApply/detail/columns.tsx    |  2 +-
 .../paidApply/detail/components/applyInfo.vue | 26 +++++------------
 .../operation/paidApply/detail/index.vue      |  1 -
 12 files changed, 81 insertions(+), 68 deletions(-)

diff --git a/src/components/CostEntry/components/applyModify.tsx b/src/components/CostEntry/components/applyModify.tsx
index 4c9bdc16..842f814a 100644
--- a/src/components/CostEntry/components/applyModify.tsx
+++ b/src/components/CostEntry/components/applyModify.tsx
@@ -91,7 +91,7 @@ export const formSchema: FormSchema[] = [
             const { data } = res
             data.forEach(item => {
               item['label'] = item.shortName
-              item['value'] = item.codeName
+              item['value'] = item.id
             })
             companyDict.value = data
           })
@@ -100,9 +100,9 @@ export const formSchema: FormSchema[] = [
     }
   },
   {
-    field: 'costomerCode',
+    field: 'customerId',
     label: '结算对象',
-    defaultValue: '',
+    defaultValue: null,
     component: 'Select',
     colProps: { span: 5 },
     componentProps: ({ formModel }) => {
diff --git a/src/components/CostEntry/components/applyModify.vue b/src/components/CostEntry/components/applyModify.vue
index 63b30fbc..6b458d6e 100644
--- a/src/components/CostEntry/components/applyModify.vue
+++ b/src/components/CostEntry/components/applyModify.vue
@@ -57,7 +57,7 @@
   const emits = defineEmits(['refresh', 'register'])
   const list = [
     { label: '费用名称', field: 'feeName', span: 5 },
-    { label: '费用对象', field: 'customerName', span: 5 },
+    { label: '结算对象', field: 'customerName', span: 5 },
     // { label: '核算单位', field: 'customerNo', span: 4, value: '1' },
     { label: '单位标准', field: 'unitText', span: 5 },
     { label: '不含税单价', field: 'noTaxPrice', span: 5 },
@@ -80,6 +80,7 @@
     })
   const [registerModal, { setModalProps, closeModal, updateFormField }] = useModalInner(async (data) => {
     detailData.value = JSON.parse(JSON.stringify(data.record))
+    console.log(data.record)
     setFieldsValue({
       ...data.record,
       beforeValue: JSON.parse(JSON.stringify(beforeValue.value)),
@@ -96,14 +97,14 @@
     formData.feeRecordId = values.id
     formData.id = 0
     formData.BusinessType = 1
-    const res: API.DataResult = await ApplyModification([formData])
-    setModalProps({ confirmLoading: false, loading: false })
-    if (res.succeeded) {
-      createMessage.success(res.message)
-      emits('refresh')
-    } else {
-      createMessage.error(res.message)
-    }
+    ApplyModification([formData]).then(res => {
+      if (res.succeeded) {
+        createMessage.success(res.message)
+        emits('refresh')
+      }
+    }).catch(() => {
+      setModalProps({ confirmLoading: false, loading: false })
+    })
     closeModal()
   }
   onMounted(() => {
diff --git a/src/components/CostEntry/feeTable.vue b/src/components/CostEntry/feeTable.vue
index 43c820dd..43bb8942 100644
--- a/src/components/CostEntry/feeTable.vue
+++ b/src/components/CostEntry/feeTable.vue
@@ -246,7 +246,7 @@
       source: async (query, process) => {
         if (unitDict.value && unitDict.value.length) {
           const dict = unitDict.value.map((item) => {
-            return item.value + '-' + item.name
+            return item.name + '-' + item.value
           })
           process(dict)
         }
diff --git a/src/views/approve/paid/components/calcTable.vue b/src/views/approve/paid/components/calcTable.vue
index 62911ec6..dbafc18b 100644
--- a/src/views/approve/paid/components/calcTable.vue
+++ b/src/views/approve/paid/components/calcTable.vue
@@ -63,8 +63,7 @@
     showTableSetting: false,
     bordered: false,
     showIndexColumn: true,
-    canResize: true,
-    resizeHeightOffset: 1,
+    canResize: false,
     // rowSelection: { type: 'checkbox' },
     immediate: false
   })
diff --git a/src/views/finance/paymentSettlement/detail/columns.tsx b/src/views/finance/paymentSettlement/detail/columns.tsx
index 16806d38..aeb8058a 100644
--- a/src/views/finance/paymentSettlement/detail/columns.tsx
+++ b/src/views/finance/paymentSettlement/detail/columns.tsx
@@ -302,7 +302,8 @@ export const formSchema: FormSchema[] = [
     dynamicDisabled: false,
     colProps: { span: 4 },
     componentProps: {
-      allowClear: true
+      allowClear: true,
+      valueFormat: 'YYYY-MM-DD'
     }
   },
   {
diff --git a/src/views/finance/paymentSettlement/detail/components/applyInfo.vue b/src/views/finance/paymentSettlement/detail/components/applyInfo.vue
index c6f7ea1c..e98d52ae 100644
--- a/src/views/finance/paymentSettlement/detail/components/applyInfo.vue
+++ b/src/views/finance/paymentSettlement/detail/components/applyInfo.vue
@@ -28,10 +28,10 @@
                 删除
               </a-button>
             </a-popconfirm>
-            <!-- <a-button style="margin-left: 100px;" type="link" @click="exportExcel">
+            <a-button v-if="id" type="link" @click="openFile">
               <span class="iconfont icon-fujian" :style="{ fontSize: '12px' }"></span>
-              导出
-            </a-button> -->
+              附件
+            </a-button>
           </div>
         </div>
       </template>
@@ -46,21 +46,7 @@
         </div>
       </template>
     </BasicTable>
-    <!-- <a-tabs v-model:activeKey="activeKey">
-      <a-tab-pane key="2" tab="费用明细">
-        <div>
-          
-        </div>
-      </a-tab-pane>
-      <a-tab-pane key="3" tab="附件上传" force-render>
-        <div style="width: 400px;">
-          <DsFile
-            ref="dsFile"
-            :id='route?.query?.id'
-          />
-        </div>
-      </a-tab-pane>
-    </a-tabs> -->
+    <invoiceFile ref="invoiceFileRef"></invoiceFile>
   </div>
 </template>
 <script lang="ts" setup>
@@ -70,6 +56,7 @@
   // 引入附近上传组件
   import DsFile from "/@/components/File/index.vue"
   import { Divider } from 'ant-design-vue'
+  import invoiceFile from '/@/views/operation/invoiceIssue/detail/invoiceFile.vue'
   import { DeleteDetail } from '../../api'
   import { exportExcelByData } from '/@/hooks/web/common'
   import { useMessage } from '/@/hooks/web/useMessage'
@@ -139,6 +126,11 @@
   const exportExcel = () => {
     exportExcelByData(props.feeData, getColumns(), '费用明细')
   }
+  // 附件上传
+  const invoiceFileRef = ref(null)
+  const openFile = () => {
+    invoiceFileRef.value.init(props.id)
+  }
   // 取消删除
   const cancelDel = () => {
     deleteFlag.value = false
diff --git a/src/views/finance/paymentSettlement/detail/components/businessTable.vue b/src/views/finance/paymentSettlement/detail/components/businessTable.vue
index 5c9b3b61..91f19e76 100644
--- a/src/views/finance/paymentSettlement/detail/components/businessTable.vue
+++ b/src/views/finance/paymentSettlement/detail/components/businessTable.vue
@@ -18,10 +18,21 @@
         <template #toolbar>
           <div class="flex" style="width: 100%;">
             <h4 style="width: 80px;">结算明细</h4>
-            <a-button class="ml15" type="link" @click="addInfos">
-              <span class="iconfont icon-zengjiatianjiajiajian" :style="{ fontSize: '12px' }"></span>
-              添加到结算明细
-            </a-button>
+
+            <a-dropdown>
+              <template #overlay>
+                <a-menu>
+                  <a-menu-item @click="addInfos">全部申请金额</a-menu-item>
+                  <a-menu-item @click="addInfos('rmb')">仅RMB申请金额</a-menu-item>
+                  <a-menu-item @click="addInfos('usd')">仅USD申请金额</a-menu-item>
+                </a-menu>
+              </template>
+              <a-button class="ml15" type="link">
+                <span class="iconfont icon-zengjiatianjiajiajian" :style="{ fontSize: '12px' }"></span>
+                添加申请费用明细
+                <span class="iconfont icon-30jiantouxiangxiafill"></span>
+              </a-button>
+            </a-dropdown>
             <BasicForm
               class="currency-form"
               @register="registerForm"
@@ -239,7 +250,7 @@
   // 提交的数据
   const bPostData = ref({})
   // 按业务添加费用申请
-  const addInfos = async () => {
+  const addInfos = async (type) => {
     const selectRows = getSelectRows()
     // 主单是否有币别
     const currency = getFieldsValue().currency
@@ -298,6 +309,14 @@
             item.settlementRMB = row.settlementRMB
             item.settlementUSD = row.settlementUSD
           }
+          if (type == 'rmb') {
+            item.settlementUSD = 0
+            item.settlementOther = 0
+          }
+          if (type == 'usd') {
+            item.settlementRMB = 0
+            item.settlementOther = 0
+          }
         })
       })
       // 过滤出所有跟业务币别不一致的币别
diff --git a/src/views/finance/paymentSettlement/detail/index.vue b/src/views/finance/paymentSettlement/detail/index.vue
index 9a099342..7c2a8a91 100644
--- a/src/views/finance/paymentSettlement/detail/index.vue
+++ b/src/views/finance/paymentSettlement/detail/index.vue
@@ -45,7 +45,7 @@
       </div>
       <div class="ds-detail-box">
         <!-- 表单区域 -->
-        <div class="form-area">
+        <div class="form-area mt15">
           <BasicForm @register="registerForm" />
         </div>
         <!-- 申请明细 -->
@@ -82,15 +82,14 @@
 </template>
 <script lang="ts" setup>
   import { ref, onMounted } from 'vue'
-  import { BasicTable, useTable, TableAction } from '/@/components/Table'
   import ApplyInfo from './components/applyInfo.vue'
   import { Divider } from 'ant-design-vue'
-  import { Get, Save } from '../api'
-  import { formatParams } from '/@/hooks/web/common'
+  import { Get, Save, Delete } from '../api'
   // 业务表格
   import BusinessTable from './components/businessTable.vue'
   import { BasicForm, useForm } from '/@/components/Form'
   import { formSchema } from './columns'
+  import { closePage } from '/@/hooks/web/common'
   import { useMessage } from '/@/hooks/web/useMessage'
   const { createMessage } = useMessage()
   import { useRoute } from 'vue-router'
@@ -114,7 +113,20 @@
   }
   // 删除
   function deleteRow() {
-
+    const postData = {
+      ids: [id.value]
+    }
+    loading.value = true
+    Delete(postData).then(res => {
+      if (res.succeeded) {
+        createMessage.success('删除成功！')
+        closePage()
+      }
+      loading.value = false
+    }).catch(() => {
+      loading.value = false
+      createMessage.warning('网络异常，请重试！')
+    })
   }
   // 新建
   const create = () => {
diff --git a/src/views/operation/invoiceIssue/detail/invoiceFile.vue b/src/views/operation/invoiceIssue/detail/invoiceFile.vue
index 0d9715f7..db7e03bb 100644
--- a/src/views/operation/invoiceIssue/detail/invoiceFile.vue
+++ b/src/views/operation/invoiceIssue/detail/invoiceFile.vue
@@ -100,17 +100,17 @@ function fileSuccess() {
 function addFile() {
     dsFile.value.init()
 }
-function init() {
-    getfileList()
+function init(id) {
+    getfileList(id)
     openFileFlag.value = true
 }
 const fileSrc = ref('')
 const fileFlag = ref(false)
 const fileData = ref([]) as any
 const fileloading = ref(false)
-const getfileList = () => {
+const getfileList = (id) => {
     fileloading.value = true
-    GetOpFileList({ id: route.query.id }).then(res => {
+    GetOpFileList({ id: route.query.id || id }).then(res => {
         fileloading.value = false
         res.data.forEach(item => {
             if (item.createTime) {
diff --git a/src/views/operation/paidApply/detail/columns.tsx b/src/views/operation/paidApply/detail/columns.tsx
index 34f62eb3..0bcfd2d5 100644
--- a/src/views/operation/paidApply/detail/columns.tsx
+++ b/src/views/operation/paidApply/detail/columns.tsx
@@ -565,7 +565,7 @@ export const searchFormSchema: FormSchema[] = [
         showName: 'shortName',
         valueField: 'id',
         resultField: 'data',
-        immediate: false
+        immediate: true
       }
     }
   },
diff --git a/src/views/operation/paidApply/detail/components/applyInfo.vue b/src/views/operation/paidApply/detail/components/applyInfo.vue
index 25b83d28..2b23da81 100644
--- a/src/views/operation/paidApply/detail/components/applyInfo.vue
+++ b/src/views/operation/paidApply/detail/components/applyInfo.vue
@@ -28,7 +28,7 @@
                 删除
               </a-button>
             </a-popconfirm>
-            <a-button type="link" @click="exportExcel">
+            <a-button type="link" @click="openFile">
               <span class="iconfont icon-fujian" :style="{ fontSize: '12px' }"></span>
               附件
             </a-button>
@@ -57,29 +57,14 @@
         </div>
       </template>
     </BasicTable>
-    <!-- <a-tabs v-model:activeKey="activeKey">
-      <a-tab-pane key="2" tab="费用明细">
-        <div>
-          
-        </div>
-      </a-tab-pane>
-      <a-tab-pane key="3" tab="附件上传" force-render>
-        <div style="width: 400px;">
-          <DsFile
-            ref="dsFile"
-            :id='route?.query?.id'
-          />
-        </div>
-      </a-tab-pane>
-    </a-tabs> -->
+    <invoiceFile ref="invoiceFileRef"></invoiceFile>
   </div>
 </template>
 <script lang="ts" setup>
   import { onMounted, ref, defineEmits, defineProps, watch, defineExpose } from 'vue'
   import { BasicTable, useTable } from '/@/components/Table'
   import { columns } from './applyInfoColumns'
-  // 引入附近上传组件
-  import DsFile from "/@/components/File/index.vue"
+  import invoiceFile from '/@/views/operation/invoiceIssue/detail/invoiceFile.vue'
   import { DeleteDetail } from '../../api'
   import { exportExcelByData } from '/@/hooks/web/common'
   import { useMessage } from '/@/hooks/web/useMessage'
@@ -148,6 +133,11 @@
   const exportExcel = () => {
     exportExcelByData(props.feeData, getColumns(), '费用明细')
   }
+  // 附件上传
+  const invoiceFileRef = ref(null)
+  const openFile = () => {
+    invoiceFileRef.value.init(props.id)
+  }
   // 取消删除
   const cancelDel = () => {
     deleteFlag.value = false
diff --git a/src/views/operation/paidApply/detail/index.vue b/src/views/operation/paidApply/detail/index.vue
index 4a33872f..92f6a59c 100644
--- a/src/views/operation/paidApply/detail/index.vue
+++ b/src/views/operation/paidApply/detail/index.vue
@@ -127,7 +127,6 @@
   const save = async (feeInfo) => {
     const postData = await validate()
     console.log(postData)
-    return
     if (feeInfo && feeInfo.length) {
       postData['details'] = [...feeData.value, ...feeInfo]
     } else {