From 8782f2034d113bdc7583f3d5feeeed97f5e2193d Mon Sep 17 00:00:00 2001
From: lion <120344285@qq.com>
Date: Fri, 18 Jul 2025 16:39:13 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=98=E6=AC=BE=E8=AE=B0=E5=BD=95=20?=
 =?UTF-8?q?=E4=BA=8B=E5=8A=A1=E7=B1=BB=E5=9E=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../contract/components/contractSign.vue      | 10 ++--
 src/views/contract/contractList.vue           |  1 -
 .../contract/paymentRegistrationList.vue      | 51 ++++++++++++++++---
 3 files changed, 49 insertions(+), 13 deletions(-)

diff --git a/src/views/contract/components/contractSign.vue b/src/views/contract/components/contractSign.vue
index 10bf1e2..b3e84ee 100644
--- a/src/views/contract/components/contractSign.vue
+++ b/src/views/contract/components/contractSign.vue
@@ -13,7 +13,7 @@
       <template v-slot:number>
         <div class="xy-table-item">
           <div class="xy-table-item-label">
-            <span style="color: red;font-weight: 600;padding-right: 4px;">*</span>合同编号
+            <span style="color: red;font-weight: 600;padding-right: 4px;"></span>合同编号
           </div>
           <div class="xy-table-item-content">
             <el-input v-model="form.number" placeholder="请填写合同编号" style="width: 300px;" />
@@ -457,10 +457,10 @@
 
         },
         rules: {
-          number: [{
-            required: true,
-            message: '必填'
-          }],
+          // number: [{
+          //   required: true,
+          //   message: '必填'
+          // }],
           date: [{
             required: true,
             message: '必填'
diff --git a/src/views/contract/contractList.vue b/src/views/contract/contractList.vue
index c66bff0..51294e2 100644
--- a/src/views/contract/contractList.vue
+++ b/src/views/contract/contractList.vue
@@ -267,7 +267,6 @@
               <template
                 v-if="(scope.row.has_charge && scope.row.req_status === 3 && scope.row.join_status === 1) || (scope.row.join_status === 1 && ((scope.row.invite_status === 3)||((scope.row.purchase_way ? scope.row.purchase_way.remark === 'false' : false) && scope.row.purchase_status === 3)) || ( scope.row.is_substitute && scope.row.join_status === 1) ) && (!scope.row.contract_category || scope.row.join_status === 1)"
               >
-
                 <Button class="slot-btns-item" size="small" type="primary" @click="signProcess(scope.row)">合同会签
                 </Button>
               </template>
diff --git a/src/views/contract/paymentRegistrationList.vue b/src/views/contract/paymentRegistrationList.vue
index c3c9889..bf5e06d 100644
--- a/src/views/contract/paymentRegistrationList.vue
+++ b/src/views/contract/paymentRegistrationList.vue
@@ -168,9 +168,9 @@
     <printPaymentForm ref="printPaymentForm" />
 
     <el-dialog :visible.sync="showOtherPaymentsDialog" title="同一支出记录下的其他付款记录" width="742px">
-      <el-table 
-        :data="otherPayments" 
-        height="400" 
+      <el-table
+        :data="otherPayments"
+        height="400"
         border
         :show-summary="true"
         :summary-method="getOtherPaymentsSummary"
@@ -236,7 +236,9 @@ import printReimbursementSimple from './components/printReimbursementSimple'
 import printMeetingSettlement from './components/printMeetingSettlement'
 import printFundApproval from './components/printFundApproval'
 import printPaymentForm from './components/printPaymentForm'
-
+import {
+  getContractCategoryTemplateBaseConfig
+} from '@/api/businessConfig/businessConfig'
 export default {
   components: {
     printRegistration,
@@ -333,6 +335,13 @@ export default {
             )
           }
         },
+        {
+          label: '事务类型',
+          width: 120,
+          prop: 'contract.work_type',
+          align: 'center',
+          formatter: (row) => this.categoryIdNameMap?.[row.contract?.work_type] || ''
+        },
         {
           label: '付款申请金额(元)',
           prop: 'apply_money',
@@ -444,7 +453,8 @@ export default {
         3: '质保金'
       },
       postPaymentFormDialogVisible: false,
-      currentPostPaymentForm: null
+      currentPostPaymentForm: null,
+      categoryIdNameMap:'',
     }
   },
   mounted() {
@@ -459,8 +469,35 @@ export default {
     const type = parseInt(this.$route.path.split('_')[1])
     this.type = this.is_auth = type
     this.getMoneyWay()
+    this.getCategoryOptions();
   },
   methods: {
+    // 获取分类配置
+    async getCategoryOptions() {
+      try {
+        // 获取分类配置
+        const res = await getContractCategoryTemplateBaseConfig()
+        if (res.errcode !== undefined) {
+          this.$message.error(res.errmsg || '获取分类配置失败')
+          return
+        }
+        this.categoryIdNameMap = this.parseIdNameMap(res.map)
+        console.log("this.categoryIdNameMap",this.categoryIdNameMap)
+      } catch (error) {
+        console.error('获取分类配置失败:', error)
+        this.$message.error('获取分类配置失败')
+      }
+    },
+    // 递归解析所有id-name映射
+    parseIdNameMap(list, map = {}) {
+      list.forEach(item => {
+        map[item.id] = item.name || item.value;
+        if (item.children && item.children.length) {
+          this.parseIdNameMap(item.children, map);
+        }
+      });
+      return map;
+    },
     parseTime(time) {
       return parseTime(new Date(time), '{y}-{m}-{d}')
     },
@@ -613,10 +650,10 @@ export default {
           if (this.selectDate) url += '&date=' + this.selectDate
           if (this.keywords) url += '&keyword=' + this.keywords
           if (typeof this.status !== 'undefined') {
-            url += '&status=' + this.status 
+            url += '&status=' + this.status
           }
           if (this.select.plan_id) {
-            url += '&act_plan_link_id=' + this.select.plan_id 
+            url += '&act_plan_link_id=' + this.select.plan_id
           }
           url += '&is_export=' + 1
           url = location.host + url