From 6e82fc67bbd12674197710b70d8837164a704eb4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=91=E5=9D=A4?= <yuankun1102@126.com>
Date: Fri, 9 May 2025 15:48:33 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E6=96=B0=E5=A2=9E=E8=B5=84=E9=87=91?=
 =?UTF-8?q?=E6=88=90=E6=9C=AC=E8=AE=BE=E7=BD=AE=E5=BC=80=E5=8F=91=E5=AE=8C?=
 =?UTF-8?q?=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/crm/capitalcost/index.ts              | 97 +++++++++----------
 src/views/crm/capitalcost/CapitalCostForm.vue | 13 ++-
 src/views/crm/capitalcost/index.vue           | 16 +--
 3 files changed, 59 insertions(+), 67 deletions(-)

diff --git a/src/api/crm/capitalcost/index.ts b/src/api/crm/capitalcost/index.ts
index a9fb2e3e6..3894fd3e2 100644
--- a/src/api/crm/capitalcost/index.ts
+++ b/src/api/crm/capitalcost/index.ts
@@ -1,49 +1,48 @@
-import request from '@/config/axios'
-
-// 资金成本 VO
-export interface CapitalCostVO {
-  id: number // 主键
-  projectCode: string // 项目编码
-  paymentTerm: string // 结算账期
-  creditMethod: number // 授信方式
-  applicableProjects: number // 适用项目，全部产品、机票
-  creditCalcCycle: number // 授信额度计算周期
-  ticketIssuanceCycle: number // 出票周期
-  settlementCycle: number // 结算周期
-  usageDays: number // 实际资金使用天数
-  annualInterestRate: number // 年利率
-  remark: string // 备注
-}
-
-// 资金成本 API
-export const CapitalCostApi = {
-  // 查询资金成本分页
-  getCapitalCostPage: async (params: any) => {
-    return await request.get({ url: `/crm/capital-cost/page`, params })
-  },
-
-  // 查询资金成本详情
-  getCapitalCost: async (id: number) => {
-    return await request.get({ url: `/crm/capital-cost/get?id=` + id })
-  },
-
-  // 新增资金成本
-  createCapitalCost: async (data: CapitalCostVO) => {
-    return await request.post({ url: `/crm/capital-cost/create`, data })
-  },
-
-  // 修改资金成本
-  updateCapitalCost: async (data: CapitalCostVO) => {
-    return await request.put({ url: `/crm/capital-cost/update`, data })
-  },
-
-  // 删除资金成本
-  deleteCapitalCost: async (id: number) => {
-    return await request.delete({ url: `/crm/capital-cost/delete?id=` + id })
-  },
-
-  // 导出资金成本 Excel
-  exportCapitalCost: async (params) => {
-    return await request.download({ url: `/crm/capital-cost/export-excel`, params })
-  },
-}
\ No newline at end of file
+import request from '@/config/axios'
+
+// 资金成本 VO
+export interface CapitalCostVO {
+  id: number // 主键
+  projectCode: string // 项目编码
+  paymentTerm: string // 结算账期
+  creditMethod: number // 授信方式
+  applicableProjects: number // 适用项目，全部产品、机票
+  creditCalcCycle: number // 授信额度计算周期
+  ticketIssuanceCycle: number // 出票周期
+  settlementCycle: number // 结算周期
+  usageDays: number // 实际资金使用天数
+  annualInterestRate: number // 年利率
+}
+
+// 资金成本 API
+export const CapitalCostApi = {
+  // 查询资金成本分页
+  getCapitalCostPage: async (params: any) => {
+    return await request.get({ url: `/crm/capital-cost/page`, params })
+  },
+
+  // 查询资金成本详情
+  getCapitalCost: async (id: number) => {
+    return await request.get({ url: `/crm/capital-cost/get?id=` + id })
+  },
+
+  // 新增资金成本
+  createCapitalCost: async (data: CapitalCostVO) => {
+    return await request.post({ url: `/crm/capital-cost/create`, data })
+  },
+
+  // 修改资金成本
+  updateCapitalCost: async (data: CapitalCostVO) => {
+    return await request.put({ url: `/crm/capital-cost/update`, data })
+  },
+
+  // 删除资金成本
+  deleteCapitalCost: async (id: number) => {
+    return await request.delete({ url: `/crm/capital-cost/delete?id=` + id })
+  },
+
+  // 导出资金成本 Excel
+  exportCapitalCost: async (params) => {
+    return await request.download({ url: `/crm/capital-cost/export-excel`, params })
+  },
+}
diff --git a/src/views/crm/capitalcost/CapitalCostForm.vue b/src/views/crm/capitalcost/CapitalCostForm.vue
index 5bc826f85..165578c61 100644
--- a/src/views/crm/capitalcost/CapitalCostForm.vue
+++ b/src/views/crm/capitalcost/CapitalCostForm.vue
@@ -4,7 +4,7 @@
       ref="formRef"
       :model="formData"
       :rules="formRules"
-      label-width="130px"
+      label-width="100px"
       v-loading="formLoading"
     >
       <el-form-item label="项目编码" prop="projectCode">
@@ -13,7 +13,7 @@
       <el-form-item label="结算账期" prop="paymentTerm">
         <el-select v-model="formData.paymentTerm" placeholder="请选择结算账期">
           <el-option
-            v-for="dict in getStrDictOptions(DICT_TYPE.PAYMENT_TERM)"
+            v-for="dict in getIntDictOptions(DICT_TYPE.PAYMENT_TERM)"
             :key="dict.value"
             :label="dict.label"
             :value="dict.value"
@@ -41,7 +41,7 @@
         </el-select>
       </el-form-item>
       <el-form-item label="计算周期" prop="creditCalcCycle">
-        <el-input v-model="formData.creditCalcCycle" placeholder="请输入授信额度计算周期" />
+        <el-input v-model="formData.creditCalcCycle" placeholder="请输入计算周期" />
       </el-form-item>
       <el-form-item label="出票周期" prop="ticketIssuanceCycle">
         <el-input v-model="formData.ticketIssuanceCycle" placeholder="请输入出票周期" />
@@ -50,7 +50,7 @@
         <el-input v-model="formData.settlementCycle" placeholder="请输入结算周期" />
       </el-form-item>
       <el-form-item label="使用天数" prop="usageDays">
-        <el-input v-model="formData.usageDays" placeholder="请输入实际资金使用天数" />
+        <el-input v-model="formData.usageDays" placeholder="请输入使用天数" />
       </el-form-item>
       <el-form-item label="年利率" prop="annualInterestRate">
         <el-input v-model="formData.annualInterestRate" placeholder="请输入年利率" />
@@ -66,7 +66,7 @@
   </Dialog>
 </template>
 <script setup lang="ts">
-import { getIntDictOptions, getStrDictOptions, DICT_TYPE } from '@/utils/dict'
+import { getIntDictOptions, DICT_TYPE } from '@/utils/dict'
 import { CapitalCostApi, CapitalCostVO } from '@/api/crm/capitalcost'
 
 /** 资金成本 表单 */
@@ -102,7 +102,6 @@ const formRules = reactive({
   settlementCycle: [{ required: true, message: '结算周期不能为空', trigger: 'blur' }],
   usageDays: [{ required: true, message: '使用天数不能为空', trigger: 'blur' }],
   annualInterestRate: [{ required: true, message: '年利率不能为空', trigger: 'blur' }],
-  // remark: [{ required: true, message: '备注不能为空', trigger: 'blur' }],
 })
 const formRef = ref() // 表单 Ref
 
@@ -165,4 +164,4 @@ const resetForm = () => {
   }
   formRef.value?.resetFields()
 }
-</script>
+</script>
\ No newline at end of file
diff --git a/src/views/crm/capitalcost/index.vue b/src/views/crm/capitalcost/index.vue
index b08ee2003..67ec02a57 100644
--- a/src/views/crm/capitalcost/index.vue
+++ b/src/views/crm/capitalcost/index.vue
@@ -25,7 +25,7 @@
           class="!w-240px"
         >
           <el-option
-            v-for="dict in getStrDictOptions(DICT_TYPE.PAYMENT_TERM)"
+            v-for="dict in getIntDictOptions(DICT_TYPE.PAYMENT_TERM)"
             :key="dict.value"
             :label="dict.label"
             :value="dict.value"
@@ -100,7 +100,7 @@
   <!-- 列表 -->
   <ContentWrap>
     <el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true">
-<!--      <el-table-column label="序号" align="center" prop="id" />-->
+      <el-table-column label="主键" align="center" prop="id" />
       <el-table-column label="项目编码" align="center" prop="projectCode" />
       <el-table-column label="结算账期" align="center" prop="paymentTerm">
         <template #default="scope">
@@ -120,7 +120,7 @@
       <el-table-column label="计算周期" align="center" prop="creditCalcCycle" />
       <el-table-column label="出票周期" align="center" prop="ticketIssuanceCycle" />
       <el-table-column label="结算周期" align="center" prop="settlementCycle" />
-      <el-table-column label="资金使用天数" align="center" prop="usageDays" />
+      <el-table-column label="使用天数" align="center" prop="usageDays" />
       <el-table-column label="年利率" align="center" prop="annualInterestRate" />
       <el-table-column label="备注" align="center" prop="remark" />
       <el-table-column
@@ -165,7 +165,7 @@
 </template>
 
 <script setup lang="ts">
-import { getIntDictOptions, getStrDictOptions, DICT_TYPE } from '@/utils/dict'
+import { getIntDictOptions, DICT_TYPE } from '@/utils/dict'
 import { dateFormatter } from '@/utils/formatTime'
 import download from '@/utils/download'
 import { CapitalCostApi, CapitalCostVO } from '@/api/crm/capitalcost'
@@ -187,12 +187,6 @@ const queryParams = reactive({
   paymentTerm: undefined,
   creditMethod: undefined,
   applicableProjects: undefined,
-  creditCalcCycle: undefined,
-  ticketIssuanceCycle: undefined,
-  settlementCycle: undefined,
-  usageDays: undefined,
-  annualInterestRate: undefined,
-  remark: undefined,
   createTime: [],
 })
 const queryFormRef = ref() // 搜索的表单
@@ -260,4 +254,4 @@ const handleExport = async () => {
 onMounted(() => {
   getList()
 })
-</script>
+</script>
\ No newline at end of file