From 39dad0a9240e319a768e289738be06093076964d Mon Sep 17 00:00:00 2001
From: zmj <1493694146@qq.com>
Date: Mon, 15 Apr 2024 17:20:00 +0800
Subject: [PATCH] add

---
 .../bid_margin_recovery_search/index.vue      | 14 +++--
 src/views/financial_bid_margin/detail.js      |  9 ++--
 src/views/financial_bid_margin/edit.vue       | 50 ++++++++---------
 src/views/financial_bid_margin/index.vue      | 18 ++++---
 .../financial_bid_margin_recovery/detail.js   |  8 +--
 .../financial_bid_margin_recovery/edit.vue    | 54 ++++++++++---------
 .../financial_bid_margin_recovery/index.vue   | 17 ++++--
 .../index.vue                                 | 10 ++--
 src/views/performance_money_list/index.vue    |  2 +-
 .../index.vue                                 |  6 +--
 .../edit.vue                                  |  2 +-
 src/views/zjzx_invoice/edit.vue               | 24 +++++----
 src/views/zjzx_invoice/index.vue              |  5 +-
 src/views/zjzx_refund/edit.vue                | 40 ++++++++------
 src/views/zjzx_settlement/edit.vue            | 42 ++++++++-------
 src/views/zjzx_settlement/index.vue           |  6 ++-
 16 files changed, 164 insertions(+), 143 deletions(-)

diff --git a/src/views/bid_margin_recovery_search/index.vue b/src/views/bid_margin_recovery_search/index.vue
index c19f4e9..5990039 100644
--- a/src/views/bid_margin_recovery_search/index.vue
+++ b/src/views/bid_margin_recovery_search/index.vue
@@ -24,14 +24,12 @@
                 <el-table border :data="pager.lists" @selection-change="handleSelectionChange">
                     <el-table-column type="selection" width="55" />
                     <el-table-column label="序号" type="index" width="55" />
-                    <el-table-column label="项目名称" prop="project_name" />
-                    <el-table-column label="甲方单位" prop="" />
-                    <el-table-column label="经办人" prop="" />
-                    <el-table-column label="投标保证金" prop="" show-overflow-tooltip />
-                    <el-table-column label="预计归还日期" prop="" show-overflow-tooltip />
-                    <el-table-column label="缴纳截止日期" prop="end_date" show-overflow-tooltip />
-                    <el-table-column label="回收金额" prop="recovery_amount" show-overflow-tooltip />
-                    <el-table-column label="转为履约金金额" prop="" show-overflow-tooltip />
+                    <el-table-column label="项目名称" :render-header="pager.calcWidth" prop="project_name" />
+                    <el-table-column label="业主名称" prop="part_a_name" />
+                    <el-table-column label="回收金额" prop="recovery_amount" />
+                    <el-table-column label="支付金额" prop="pay_amount" />
+                    <el-table-column label="回收人员" prop="create_user" />
+                    <el-table-column label="回收日期" prop="create_time" show-overflow-tooltip />
                 </el-table>
             </div>
             <div class="flex justify-end mt-4">
diff --git a/src/views/financial_bid_margin/detail.js b/src/views/financial_bid_margin/detail.js
index 3286f9b..9c7eb84 100644
--- a/src/views/financial_bid_margin/detail.js
+++ b/src/views/financial_bid_margin/detail.js
@@ -2,13 +2,10 @@ const detailConfig = {
     title: "财务管理--投标保证金申请",
     config: [
         {
-            label: "投标信息id",
-            value: ""
-        },
-        {
-            label: "业务机会id",
-            value: ""
+            label: "合同名称",
+            value: "project_name"
         },
+
         {
             label: "甲方单位",
             value: "part_a_name"
diff --git a/src/views/financial_bid_margin/edit.vue b/src/views/financial_bid_margin/edit.vue
index 4c2af2e..be3e2c0 100644
--- a/src/views/financial_bid_margin/edit.vue
+++ b/src/views/financial_bid_margin/edit.vue
@@ -1,22 +1,21 @@
 <template>
     <div class="edit-popup">
-        <popup ref="popupRef" :title="popupTitle" :async="true" width="80vw" @confirm="handleSubmit"
-            @close="handleClose">
+        <popup ref="popupRef" :title="popupTitle" :async="true" width="80vw" @confirm="handleSubmit" @close="handleClose">
             <el-form ref="formRef" :model="formData" label-width="120px" :rules="formRules">
 
                 <el-row>
                     <el-col :span="8">
-                        <el-form-item label="投标信息id" prop="bid_info_id">
-                            <el-input v-model="formData.business_opportunity.project_name" clearable
-                                placeholder="点击选择投标信息" readonly @click="showDialog = true" />
+                        <el-form-item label="项目名称" prop="bid_info_id">
+                            <el-input v-model="formData.project_name" clearable placeholder="点击选择投标信息" readonly
+                                @click="showDialog = true" />
                         </el-form-item>
                     </el-col>
-                    <el-col :span="8">
+                    <!-- <el-col :span="8">
                         <el-form-item label="业务机会id" prop="business_opportunity_id">
                             <el-input v-model="formData.business_opportunity_name" clearable placeholder="点击选择业务机会"
                                 @click="showDialog1 = true" readonly />
                         </el-form-item>
-                    </el-col>
+                    </el-col> -->
                     <el-col :span="8">
                         <el-form-item label="甲方单位" prop="part_a">
                             <!-- <el-input v-model="formData.part_a" clearable placeholder="请输入甲方单位" /> -->
@@ -31,14 +30,13 @@
                     </el-col>
                     <el-col :span="8">
                         <el-form-item label="收款账号" prop="collection_account">
-                            <el-input v-model="formData.collection_account" clearable placeholder="请输入收款账号"
-                                type='number' />
+                            <el-input v-model="formData.collection_account" clearable placeholder="请输入收款账号" type='number' />
                         </el-form-item>
                     </el-col>
                     <el-col :span="8">
                         <el-form-item label="开户省份" prop="province">
-                            <el-select v-model="formData.province" clearable placeholder="请选择省"
-                                @change="province_change" class="flex-1">
+                            <el-select v-model="formData.province" clearable placeholder="请选择省" @change="province_change"
+                                class="flex-1">
                                 <el-option v-for="(item, index) in datas.provinceOptions" :key="index"
                                     :label="item.province_name" :value="(item.province_code)" />
                             </el-select>
@@ -47,8 +45,8 @@
                     <el-col :span="8">
                         <el-form-item label="开户城市" prop="city">
                             <el-select v-model="formData.city" clearable placeholder="请选择市" class="flex-1">
-                                <el-option v-for="(item, index) in datas.cityOptions" :key="index"
-                                    :label="item.city_name" :value="(item.city_code)" />
+                                <el-option v-for="(item, index) in datas.cityOptions" :key="index" :label="item.city_name"
+                                    :value="(item.city_code)" />
                             </el-select>
                         </el-form-item>
                     </el-col>
@@ -84,8 +82,8 @@
                     <el-col :span="8">
                         <el-form-item label="支付方式" prop="pay_type">
                             <el-select v-model="formData.pay_type" class=" flex-1">
-                                <el-option v-for="item in dictData.financial_pay_type" :key="item.value"
-                                    :label="item.name" :value="parseInt(item.value)"></el-option>
+                                <el-option v-for="item in dictData.financial_pay_type" :key="item.value" :label="item.name"
+                                    :value="parseInt(item.value)"></el-option>
                             </el-select>
                         </el-form-item>
                     </el-col>
@@ -123,11 +121,10 @@
                 <dialogTable :config="marketing_bid_info" @customEvent="customEvent">
                 </dialogTable>
             </el-dialog>
-            <el-dialog v-model="showDialog1" title="选择业务机会" width="70%">
-                <dialogTable :config="marketing_business_opportunity" @customEvent="customEvent1"
-                    :query="{ status: 0 }">
+            <!-- <el-dialog v-model="showDialog1" title="选择业务机会" width="70%">
+                <dialogTable :config="marketing_business_opportunity" @customEvent="customEvent1" :query="{ status: 0 }">
                 </dialogTable>
-            </el-dialog>
+            </el-dialog> -->
             <el-dialog v-model="showDialog2" title="选择甲方签订单位" width="70%">
                 <dialogTable :config="marketing_custom" @customEvent="customEvent2">
                 </dialogTable>
@@ -183,6 +180,7 @@ const formData = reactive({
     business_opportunity_name: "",
     part_a: '',
     part_a_name: '',
+    project_name: "",
     collection_company: '',
     collection_account: '',
     province: '',
@@ -218,15 +216,17 @@ const submituser = (e: any) => {
 
 const customEvent = (e) => {
     formData.bid_info_id = e.id
-    formData.business_opportunity = e.business_opportunity
+    formData.project_name = e.business_opportunity?.project_name
+    formData.business_opportunity_id = e.business_opportunity.id
     showDialog.value = false
 }
 
-const customEvent1 = (e) => {
-    formData.business_opportunity_id = e.id
-    formData.business_opportunity_name = e.project_name
-    showDialog1.value = false
-}
+// const customEvent1 = (e) => {
+//     formData.business_opportunity_id = e.id
+//     // formData.business_opportunity_name = e.project_name
+//     formData.business_opportunity_id = e.business_opportunity.id
+//     showDialog1.value = false
+// }
 
 
 const customEvent2 = (e) => {
diff --git a/src/views/financial_bid_margin/index.vue b/src/views/financial_bid_margin/index.vue
index 212cde9..ea2781c 100644
--- a/src/views/financial_bid_margin/index.vue
+++ b/src/views/financial_bid_margin/index.vue
@@ -11,8 +11,8 @@
                     <el-input class="w-[280px]" v-model="queryParams.part_a" clearable placeholder="请输入甲方单位" />
                 </el-form-item> -->
                 <el-form-item label="缴纳截止日期" prop="end_date">
-                    <el-date-picker class="flex-1 !flex" v-model="queryParams.end_date" clearable
-                        value-format="YYYY-MM-DD" placeholder="选择缴纳截止日期">
+                    <el-date-picker class="flex-1 !flex" v-model="queryParams.end_date" clearable value-format="YYYY-MM-DD"
+                        placeholder="选择缴纳截止日期">
                     </el-date-picker>
                 </el-form-item>
                 <el-form-item label="预计归还日期" prop="expected_return_date">
@@ -40,14 +40,18 @@
             <div class="mt-4">
                 <el-table :data="pager.lists" @selection-change="handleSelectionChange">
                     <el-table-column type="selection" width="55" />
-                    <el-table-column label="项目名称" prop="bid_info_id" show-overflow-tooltip />
+                    <el-table-column label="项目名称" prop="project_name" show-overflow-tooltip />
                     <el-table-column label="甲方单位" prop="part_a_name" show-overflow-tooltip />
-                    <el-table-column label="投标保证金" prop="" show-overflow-tooltip />
-                    <el-table-column label="实际支付金额" prop="" show-overflow-tooltip />
-                    <el-table-column label="投标负责人" prop="" show-overflow-tooltip />
+                    <el-table-column label="收款单位" prop="collection_company" show-overflow-tooltip />
+                    <el-table-column label="收款账号" prop="collection_account" show-overflow-tooltip />
+                    <el-table-column label="投标保证金" prop="bid_margin" show-overflow-tooltip />
+                    <el-table-column label="开户省份" prop="province_name" show-overflow-tooltip />
+                    <el-table-column label="开户城市" prop="city_name" show-overflow-tooltip />
+                    <el-table-column label="投标保证金" prop="bid_margin" show-overflow-tooltip />
+                    <el-table-column label="支付方式" prop="pay_type_text" show-overflow-tooltip />
                     <el-table-column label="缴纳截止日期" prop="end_date" show-overflow-tooltip />
                     <el-table-column label="预计归还日期" prop="expected_return_date" show-overflow-tooltip />
-                    <el-table-column label="流程状态" prop="" show-overflow-tooltip />
+                    <!-- <el-table-column label="流程状态" prop="" show-overflow-tooltip /> -->
                     <el-table-column label="操作" width="170" fixed="right">
                         <template #default="{ row }">
                             <el-button v-perms="['financial.financial_bid_margin/edit']" type="primary" link
diff --git a/src/views/financial_bid_margin_recovery/detail.js b/src/views/financial_bid_margin_recovery/detail.js
index f547405..c8e7f31 100644
--- a/src/views/financial_bid_margin_recovery/detail.js
+++ b/src/views/financial_bid_margin_recovery/detail.js
@@ -2,12 +2,8 @@ const detailConfig = {
     title: "财务管理--投标保证金回收",
     config: [
         {
-            label: "投标信息id",
-            value: ""
-        },
-        {
-            label: "业务机会id",
-            value: ""
+            label: "合同名称",
+            value: "project_name"
         },
         {
             label: "甲方单位",
diff --git a/src/views/financial_bid_margin_recovery/edit.vue b/src/views/financial_bid_margin_recovery/edit.vue
index c4f4068..6e6f317 100644
--- a/src/views/financial_bid_margin_recovery/edit.vue
+++ b/src/views/financial_bid_margin_recovery/edit.vue
@@ -1,22 +1,27 @@
 <template>
     <div class="edit-popup">
-        <popup ref="popupRef" :title="popupTitle" :async="true" width="80vw" @confirm="handleSubmit"
-            @close="handleClose">
+        <popup ref="popupRef" :title="popupTitle" :async="true" width="80vw" @confirm="handleSubmit" @close="handleClose">
             <el-form ref="formRef" :model="formData" label-width="120px" :rules="formRules">
 
                 <el-row>
-                    <el-col :span="8">
+                    <!-- <el-col :span="8">
                         <el-form-item label="投标信息id" prop="bid_info_id">
                             <el-input v-model="formData.business_opportunity.project_name" clearable
                                 placeholder="点击选择投标信息" readonly @click="showDialog = true" />
                         </el-form-item>
-                    </el-col>
+                    </el-col> -->
                     <el-col :span="8">
+                        <el-form-item label="项目名称" prop="bid_info_id">
+                            <el-input v-model="formData.project_name" clearable placeholder="点击选择投标信息" readonly
+                                @click="showDialog = true" />
+                        </el-form-item>
+                    </el-col>
+                    <!-- <el-col :span="8">
                         <el-form-item label="业务机会id" prop="business_opportunity_id">
                             <el-input v-model="formData.business_opportunity_name" clearable placeholder="点击选择业务机会"
                                 @click="showDialog1 = true" readonly />
                         </el-form-item>
-                    </el-col>
+                    </el-col> -->
                     <el-col :span="8">
                         <el-form-item label="甲方单位" prop="part_a">
                             <el-input v-model="formData.part_a_name" clearable placeholder="点击选择甲方签约单位"
@@ -35,14 +40,13 @@
                     </el-col>
                     <el-col :span="8">
                         <el-form-item label="收款账号" prop="collection_account">
-                            <el-input v-model="formData.collection_account" clearable placeholder="请输入收款账号"
-                                type='number' />
+                            <el-input v-model="formData.collection_account" clearable placeholder="请输入收款账号" type='number' />
                         </el-form-item>
                     </el-col>
                     <el-col :span="8">
                         <el-form-item label="开户省份" prop="province">
-                            <el-select v-model="formData.province" clearable placeholder="请选择省"
-                                @change="province_change" class="flex-1">
+                            <el-select v-model="formData.province" clearable placeholder="请选择省" @change="province_change"
+                                class="flex-1">
                                 <el-option v-for="(item, index) in datas.provinceOptions" :key="index"
                                     :label="item.province_name" :value="(item.province_code)" />
                             </el-select>
@@ -51,8 +55,8 @@
                     <el-col :span="8">
                         <el-form-item label="开户城市" prop="city">
                             <el-select v-model="formData.city" clearable placeholder="请选择市" class="flex-1">
-                                <el-option v-for="(item, index) in datas.cityOptions" :key="index"
-                                    :label="item.city_name" :value="(item.city_code)" />
+                                <el-option v-for="(item, index) in datas.cityOptions" :key="index" :label="item.city_name"
+                                    :value="(item.city_code)" />
                             </el-select>
                         </el-form-item>
                     </el-col>
@@ -88,8 +92,8 @@
                     <el-col :span="8">
                         <el-form-item label="支付方式" prop="pay_type">
                             <el-select v-model="formData.pay_type" class=" flex-1">
-                                <el-option v-for="item in dictData.financial_pay_type" :key="item.value"
-                                    :label="item.name" :value="parseInt(item.value)"></el-option>
+                                <el-option v-for="item in dictData.financial_pay_type" :key="item.value" :label="item.name"
+                                    :value="parseInt(item.value)"></el-option>
                             </el-select>
                         </el-form-item>
                     </el-col>
@@ -143,8 +147,7 @@
                     </el-col>
                     <el-col :span="8">
                         <el-form-item label="回收金额" prop="recovery_amount">
-                            <el-input v-model="formData.recovery_amount" clearable placeholder="请输入回收金额"
-                                type="number" />
+                            <el-input v-model="formData.recovery_amount" clearable placeholder="请输入回收金额" type="number" />
                         </el-form-item>
                     </el-col>
                     <el-col :span="8">
@@ -171,11 +174,10 @@
                 <dialogTable :config="marketing_bid_info" @customEvent="customEvent">
                 </dialogTable>
             </el-dialog>
-            <el-dialog v-model="showDialog1" title="选择业务机会" width="70%">
-                <dialogTable :config="marketing_business_opportunity" @customEvent="customEvent1"
-                    :query="{ status: 0 }">
+            <!-- <el-dialog v-model="showDialog1" title="选择业务机会" width="70%">
+                <dialogTable :config="marketing_business_opportunity" @customEvent="customEvent1" :query="{ status: 0 }">
                 </dialogTable>
-            </el-dialog>
+            </el-dialog> -->
             <el-dialog v-model="showDialog2" title="选择甲方签订单位" width="70%">
                 <dialogTable :config="marketing_custom" @customEvent="customEvent2">
                 </dialogTable>
@@ -230,6 +232,7 @@ const formData = reactive({
     business_opportunity_name: "",
     part_a: '',
     part_a_name: '',
+    project_name: "",
     collection_company: '',
     collection_account: '',
     province: '',
@@ -273,15 +276,16 @@ const submituser = (e: any) => {
 
 const customEvent = (e) => {
     formData.bid_info_id = e.id
-    formData.business_opportunity = e.business_opportunity
+    formData.project_name = e.business_opportunity?.project_name
+    formData.business_opportunity_id = e.business_opportunity.id
     showDialog.value = false
 }
 
-const customEvent1 = (e) => {
-    formData.business_opportunity_id = e.id
-    formData.business_opportunity_name = e.project_name
-    showDialog1.value = false
-}
+// const customEvent1 = (e) => {
+//     formData.business_opportunity_id = e.id
+//     formData.business_opportunity_name = e.project_name
+//     showDialog1.value = false
+// }
 
 
 const customEvent2 = (e) => {
diff --git a/src/views/financial_bid_margin_recovery/index.vue b/src/views/financial_bid_margin_recovery/index.vue
index 97a632d..414394c 100644
--- a/src/views/financial_bid_margin_recovery/index.vue
+++ b/src/views/financial_bid_margin_recovery/index.vue
@@ -29,15 +29,22 @@
             <div class="mt-4">
                 <el-table :data="pager.lists" @selection-change="handleSelectionChange">
                     <el-table-column type="selection" width="55" />
-                    <el-table-column label="项目名称" prop="bid_info_id" show-overflow-tooltip />
+                    <el-table-column label="项目名称" prop="project_name" show-overflow-tooltip />
                     <el-table-column label="甲方单位" prop="part_a_name" show-overflow-tooltip />
                     <el-table-column label="经办人" prop="agent_name" show-overflow-tooltip />
-                    <el-table-column label="投标保证金" prop="" show-overflow-tooltip />
+                    <el-table-column label="配合单位" prop="cooperate_company" show-overflow-tooltip />
+                    <el-table-column label="收款单位" prop="collection_company" show-overflow-tooltip />
+                    <el-table-column label="收款账号" prop="collection_account" show-overflow-tooltip />
+                    <el-table-column label="投标保证金" prop="bid_margin" show-overflow-tooltip />
+                    <el-table-column label="支付方式" prop="pay_type_text" show-overflow-tooltip />
+                    <el-table-column label="支付金额" prop="pay_amount" show-overflow-tooltip />
+                    <el-table-column label="回收金额" prop="recovery_amount" show-overflow-tooltip />
+                    <!-- <el-table-column label="投标保证金" prop="" show-overflow-tooltip /> -->
                     <el-table-column label="缴纳截止日期" prop="end_date" show-overflow-tooltip />
                     <el-table-column label="预计归还日期" prop="expected_return_date" show-overflow-tooltip />
-                    <el-table-column label="回收金额" prop="recovery_amount" show-overflow-tooltip />
-                    <el-table-column label="转为履约金金额" prop="" show-overflow-tooltip />
-                    <el-table-column label="未回收金额" prop="" show-overflow-tooltip />
+                    <!-- <el-table-column label="回收金额" prop="recovery_amount" show-overflow-tooltip /> -->
+                    <!-- <el-table-column label="转为履约金金额" prop="" show-overflow-tooltip /> -->
+                    <!-- <el-table-column label="未回收金额" prop="" show-overflow-tooltip /> -->
                     <el-table-column label="操作" width="170" fixed="right">
                         <template #default="{ row }">
                             <el-button v-perms="['financial.financial_bid_margin_recovery/edit']" type="primary" link
diff --git a/src/views/financial_performance_money_apply/index.vue b/src/views/financial_performance_money_apply/index.vue
index 5966612..247922b 100644
--- a/src/views/financial_performance_money_apply/index.vue
+++ b/src/views/financial_performance_money_apply/index.vue
@@ -39,14 +39,14 @@
                     <el-table-column label="支付日期" prop="pay_date" show-overflow-tooltip />
                     <el-table-column label="申请人" prop="create_user" show-overflow-tooltip />
                     <el-table-column label="申请日期" prop="create_time" show-overflow-tooltip />
-                    <el-table-column label="操作" width="120" fixed="right">
+                    <el-table-column label="操作" width="170" fixed="right">
                         <template #default="{ row }">
-                            <el-button v-perms="['financial.financial_performance_money_apply/edit']" type="primary"
-                                link @click="handleEdit(row)">
+                            <el-button v-perms="['financial.financial_performance_money_apply/edit']" type="primary" link
+                                @click="handleEdit(row)">
                                 编辑
                             </el-button>
-                            <el-button v-perms="['financial.financial_performance_money_apply/delete']" type="danger"
-                                link @click="handleDelete(row.id)">
+                            <el-button v-perms="['financial.financial_performance_money_apply/delete']" type="danger" link
+                                @click="handleDelete(row.id)">
                                 删除
                             </el-button>
                             <el-button v-perms="['financial.financial_performance_money_apply/detail']" link
diff --git a/src/views/performance_money_list/index.vue b/src/views/performance_money_list/index.vue
index a8fa738..e13fe8c 100644
--- a/src/views/performance_money_list/index.vue
+++ b/src/views/performance_money_list/index.vue
@@ -33,7 +33,7 @@
                     <el-table-column label="甲方单位" prop="part_a" />
                     <el-table-column label="履约金金额" prop="performance_money" show-overflow-tooltip />
                     <el-table-column label="申请状态" prop="apply_status" show-overflow-tooltip />
-                    <el-table-column label="支付状态" prop="" show-overflow-tooltip />
+                    <!-- <el-table-column label="支付状态" prop="" show-overflow-tooltip /> -->
                     <el-table-column label="回收状态" prop="recovery_status" show-overflow-tooltip />
 
                 </el-table>
diff --git a/src/views/performance_money_recovery_search/index.vue b/src/views/performance_money_recovery_search/index.vue
index 3b5927f..f1e0cb2 100644
--- a/src/views/performance_money_recovery_search/index.vue
+++ b/src/views/performance_money_recovery_search/index.vue
@@ -22,14 +22,14 @@
                 <el-table border :data="pager.lists" @selection-change="handleSelectionChange">
                     <el-table-column type="selection" width="55" />
                     <el-table-column label="序号" type="index" width="55" />
-                    <el-table-column label="回收单据" prop="contract_code" />
+                    <el-table-column label="回收单据" prop="contract_name" />
                     <el-table-column label="合同名称" prop="contract_name" />
                     <el-table-column label="履约金到期时间" prop="performance_money_expiration_time" />
                     <el-table-column label="履约金金额" prop="performance_money" show-overflow-tooltip />
                     <el-table-column label="回收金额" prop="recovery_amount" show-overflow-tooltip />
                     <el-table-column label="回收日期" prop="recovery_date" show-overflow-tooltip />
-                    <el-table-column label="录入人" prop="applier" show-overflow-tooltip />
-                    <el-table-column label="录入日期" prop="" show-overflow-tooltip />
+                    <el-table-column label="录入人" prop="create_user" show-overflow-tooltip />
+                    <el-table-column label="录入日期" prop="create_time" show-overflow-tooltip />
                 </el-table>
             </div>
             <div class="flex justify-end mt-4">
diff --git a/src/views/supervision_high_risk_security_monitoring/edit.vue b/src/views/supervision_high_risk_security_monitoring/edit.vue
index 54eb098..84505f6 100644
--- a/src/views/supervision_high_risk_security_monitoring/edit.vue
+++ b/src/views/supervision_high_risk_security_monitoring/edit.vue
@@ -212,7 +212,7 @@ const customEvent = (e) => {
 
 const chekcDate = (rule: any, value: any, callback: any) => {
     if (new Date(formData.check_time) < new Date(formData.actual_construction_time)) {
-        callback(new Error('检查时间时间不能早于实际开工时间'))
+        callback(new Error('检查时间时间不能早于实际施工时间'))
     } else {
         callback()
     }
diff --git a/src/views/zjzx_invoice/edit.vue b/src/views/zjzx_invoice/edit.vue
index 83c83c1..8042dac 100644
--- a/src/views/zjzx_invoice/edit.vue
+++ b/src/views/zjzx_invoice/edit.vue
@@ -20,11 +20,11 @@
                             <el-input v-model="formData.contract_name" readonly clearable disabled placeholder="系统自动获取" />
                         </el-form-item>
                     </el-col>
-                    <!-- <el-col :span="8">
+                    <el-col :span="8">
                         <el-form-item label="合同类型">
                             <el-input v-model="formData.contract_type" readonly clearable disabled placeholder="系统自动获取" />
                         </el-form-item>
-                    </el-col> -->
+                    </el-col>
                     <el-col :span="8">
                         <el-form-item label="甲方签约单位">
                             <el-input v-model="formData.part_a" readonly clearable disabled placeholder="系统自动获取" />
@@ -190,14 +190,18 @@ const customEvent = (e) => {
     formData.project_id = e.id
     formData.project_name = e.project_name
     showDialog.value = false
-    let list = ['project_num', 'contract_name', 'part_a', 'part_b', 'total_invoice_amount', 'total_refund_amount']
-    list.forEach(item => {
-        formData[item] = e[item]
-    })
-    console.log(formData, 'formDATAT')
-    // formData.contract_type = e.contract.contract_type_text
-    // formData.sign_money = e.contract.money
-    // formData.sign_time = e.contract.create_time
+    console.log(e)
+
+
+    formData.project_num = e.project_num
+    formData.contract_name = e.contract_name
+    // formData.contract_type=e.
+    formData.part_a = e.aunit_name
+    // formData.part_b=e.
+    // formData.sign_money=e.
+    // formData.sign_time=e.
+    formData.total_invoice_amount = e.total_invoice_amount
+    formData.total_refund_amount = e.total_refund_amount
 
 }
 
diff --git a/src/views/zjzx_invoice/index.vue b/src/views/zjzx_invoice/index.vue
index 2383cb5..f57659e 100644
--- a/src/views/zjzx_invoice/index.vue
+++ b/src/views/zjzx_invoice/index.vue
@@ -49,11 +49,12 @@
                         show-overflow-tooltip />
                     <el-table-column :render-header="pager.calcWidth" label="甲方单位" prop="part_a" show-overflow-tooltip />
                     <el-table-column :render-header="pager.calcWidth" label="乙方单位" prop="part_b" show-overflow-tooltip />
-                    <el-table-column label="签约金额" prop="sign_money" show-overflow-tooltip />
+                    <el-table-column label="签约金额" prop="sign_money" :render-header="pager.calcWidth"
+                        show-overflow-tooltip />
                     <el-table-column :render-header="pager.calcWidth" label="签约时间" prop="sign_time" show-overflow-tooltip />
                     <el-table-column :render-header="pager.calcWidth" label="发票类型" prop="invoice_type_text"
                         show-overflow-tooltip />
-                    <el-table-column label="是否到账" prop="is_refund" show-overflow-tooltip />
+                    <el-table-column label="是否到账" :render-header="pager.calcWidth" prop="is_refund" show-overflow-tooltip />
                     <el-table-column label="开票申请金额" prop="apply_amount" show-overflow-tooltip
                         :render-header="pager.calcWidth" />
                     <el-table-column label="到账金额" prop="refund_amount" show-overflow-tooltip />
diff --git a/src/views/zjzx_refund/edit.vue b/src/views/zjzx_refund/edit.vue
index 80e1507..56a8f65 100644
--- a/src/views/zjzx_refund/edit.vue
+++ b/src/views/zjzx_refund/edit.vue
@@ -11,57 +11,57 @@
                     </el-col>
                     <el-col :span="8">
                         <el-form-item label="项目编号">
-                            <el-input v-model="formData.project_num" disabled />
+                            <el-input placeholder="系统自动获取" v-model="formData.project_num" disabled />
                         </el-form-item>
                     </el-col>
 
                     <el-col :span="8">
                         <el-form-item label="合同名称">
-                            <el-input v-model="formData.contract_name" disabled />
+                            <el-input placeholder="系统自动获取" v-model="formData.contract_name" disabled />
                         </el-form-item>
                     </el-col>
                     <el-col :span="8">
                         <el-form-item label="合同类型">
-                            <el-input v-model="formData.contract_type" disabled />
+                            <el-input placeholder="系统自动获取" v-model="formData.contract_type" disabled />
                         </el-form-item>
                     </el-col>
                     <el-col :span="8">
                         <el-form-item label="甲方签约单位">
-                            <el-input v-model="formData.part_a" disabled />
+                            <el-input placeholder="系统自动获取" v-model="formData.part_a" disabled />
                         </el-form-item>
                     </el-col>
                     <el-col :span="8">
                         <el-form-item label="乙方签约单位">
-                            <el-input v-model="formData.part_b" disabled />
+                            <el-input placeholder="系统自动获取" v-model="formData.part_b" disabled />
                         </el-form-item>
                     </el-col>
 
                     <el-col :span="8">
                         <el-form-item label="签约金额">
-                            <el-input v-model="formData.sign_money" disabled />
+                            <el-input placeholder="系统自动获取" v-model="formData.sign_money" disabled />
                         </el-form-item>
                     </el-col>
 
                     <el-col :span="8">
                         <el-form-item label="签订时间">
-                            <el-input v-model="formData.sign_time" disabled />
+                            <el-input placeholder="系统自动获取" v-model="formData.sign_time" disabled />
                         </el-form-item>
                     </el-col>
 
                     <el-col :span="8">
                         <el-form-item label="开票申请金额">
-                            <el-input v-model="formData.apply_amount" disabled />
+                            <el-input placeholder="系统自动获取" v-model="formData.apply_amount" disabled />
                         </el-form-item>
                     </el-col>
 
                     <el-col :span="8">
                         <el-form-item label="累计已开票">
-                            <el-input v-model="formData.total_invoice_amount" disabled />
+                            <el-input placeholder="系统自动获取" v-model="formData.total_invoice_amount" disabled />
                         </el-form-item>
                     </el-col>
                     <el-col :span="8">
                         <el-form-item label="累计已到账">
-                            <el-input v-model="formData.total_refund_amount" disabled />
+                            <el-input placeholder="系统自动获取" v-model="formData.total_refund_amount" disabled />
                         </el-form-item>
                     </el-col>
                     <el-col :span="8">
@@ -162,13 +162,19 @@ const customEvent = (e) => {
     showDialog.value = false
     formData.invoice_id = ''
     formData.invoice_code = ''
-    let list = ['project_num', 'contract_name', 'part_a', 'part_b', 'total_invoice_amount', 'total_refund_amount']
-    list.forEach(item => {
-        formData[item] = e[item] ?? (e.contract)[item]
-    })
-    formData.contract_type = e.contract.contract_type_text
-    formData.sign_money = e.contract.money
-    formData.sign_time = e.contract.create_time
+    console.log(e)
+    formData.part_a = 'sdasdasd'
+    formData.project_num = e.project_num
+    formData.contract_name = e.contract_name
+    // formData.contract_type = e.
+    formData.part_a = e.aunit_name
+    // formData.part_b = e.
+    // formData.sign_money = e.
+    // formData.sign_time = e.
+    // formData.apply_amount = e.
+    formData.total_invoice_amount = e.total_invoice_amount
+    formData.total_refund_amount = e.total_refund_amount
+
 }
 
 const customEvent1 = (e) => {
diff --git a/src/views/zjzx_settlement/edit.vue b/src/views/zjzx_settlement/edit.vue
index a7f5db9..e1ecab0 100644
--- a/src/views/zjzx_settlement/edit.vue
+++ b/src/views/zjzx_settlement/edit.vue
@@ -1,7 +1,6 @@
 <template>
     <div class="edit-popup">
-        <popup ref="popupRef" :title="popupTitle" :async="true" width="80vw" @confirm="handleSubmit"
-            @close="handleClose">
+        <popup ref="popupRef" :title="popupTitle" :async="true" width="80vw" @confirm="handleSubmit" @close="handleClose">
             <el-form ref="formRef" :model="formData" label-width="90px" :rules="formRules">
                 <el-row>
                     <el-col :span="8">
@@ -13,49 +12,49 @@
 
                     <el-col :span="8">
                         <el-form-item label="项目编号">
-                            <el-input v-model="formData.project_num" disabled clearable />
+                            <el-input placeholder="系统自动获取" v-model="formData.project_num" disabled clearable />
                         </el-form-item>
                     </el-col>
                     <el-col :span="8">
                         <el-form-item label="合同名称">
-                            <el-input v-model="formData.contract_name" disabled clearable />
+                            <el-input placeholder="系统自动获取" v-model="formData.contract_name" disabled clearable />
                         </el-form-item>
                     </el-col>
                     <el-col :span="8">
                         <el-form-item label="合同类型">
-                            <el-input v-model="formData.contract_type" disabled clearable />
+                            <el-input placeholder="系统自动获取" v-model="formData.contract_type" disabled clearable />
                         </el-form-item>
                     </el-col>
                     <el-col :span="8">
                         <el-form-item label="甲方单位">
-                            <el-input v-model="formData.part_a" disabled clearable />
+                            <el-input placeholder="系统自动获取" v-model="formData.part_a" disabled clearable />
                         </el-form-item>
                     </el-col>
                     <el-col :span="8">
                         <el-form-item label="乙方单位">
-                            <el-input v-model="formData.part_b" disabled clearable />
+                            <el-input placeholder="系统自动获取" v-model="formData.part_b" disabled clearable />
                         </el-form-item>
                     </el-col>
                     <el-col :span="8">
                         <el-form-item label="签订金额">
-                            <el-input v-model="formData.sign_money" disabled clearable />
+                            <el-input placeholder="系统自动获取" v-model="formData.sign_money" disabled clearable />
                         </el-form-item>
                     </el-col>
                     <el-col :span="8">
                         <el-form-item label="签订时间">
-                            <el-input v-model="formData.sign_time" disabled clearable />
+                            <el-input placeholder="系统自动获取" v-model="formData.sign_time" disabled clearable />
                         </el-form-item>
                     </el-col>
 
                     <el-col :span="8">
                         <el-form-item label="累计已开票">
-                            <el-input v-model="formData.total_invoice_amount" disabled clearable />
+                            <el-input placeholder="系统自动获取" v-model="formData.total_invoice_amount" disabled clearable />
                         </el-form-item>
                     </el-col>
 
                     <el-col :span="8">
                         <el-form-item label="累计已到账">
-                            <el-input v-model="formData.total_refund_amount" disabled clearable />
+                            <el-input placeholder="系统自动获取" v-model="formData.total_refund_amount" disabled clearable />
                         </el-form-item>
                     </el-col>
 
@@ -66,8 +65,8 @@
                     </el-col>
                     <el-col :span="8">
                         <el-form-item label="结算日期" prop="date">
-                            <el-date-picker class="flex-1 !flex" v-model="formData.date" clearable
-                                value-format="YYYY-MM-DD" placeholder="选择到账日期">
+                            <el-date-picker class="flex-1 !flex" v-model="formData.date" clearable value-format="YYYY-MM-DD"
+                                placeholder="选择到账日期">
                             </el-date-picker>
                         </el-form-item>
                     </el-col>
@@ -143,14 +142,17 @@ const formData = reactive({
 })
 
 const customEvent = (e) => {
-    let list = ['project_num', , 'project_name', 'contract_name', 'part_a', 'part_b', 'total_invoice_amount', 'total_refund_amount']
-    list.forEach(item => {
-        formData[item] = e[item]
-    })
-    // formData.contract_type = e.contract.contract_type_text
+
     formData.project_id = e.id
-    // formData.sign_money = e.contract.money
-    // formData.sign_time = e.contract.create_time
+    formData.project_num = e.project_num
+    formData.contract_name = e.contract_name
+    // formData.contract_type = e.contract_type
+    formData.part_a = e.aunit_name
+    // formData.part_b = e.
+    // formData.sign_money = e.
+    // formData.sign_time = e.
+    formData.total_invoice_amount = e.total_invoice_amount
+    formData.total_refund_amount = e.total_refund_amount
     showDialog.value = false
 
 
diff --git a/src/views/zjzx_settlement/index.vue b/src/views/zjzx_settlement/index.vue
index dd27af9..a0ebc4e 100644
--- a/src/views/zjzx_settlement/index.vue
+++ b/src/views/zjzx_settlement/index.vue
@@ -42,8 +42,10 @@
                     <el-table-column label="签约金额" prop="sign_money" show-overflow-tooltip />
                     <el-table-column label="签约时间" prop="sign_time" show-overflow-tooltip />
                     <el-table-column :render-header="pager.calcWidth" label="结算日期" prop="date" show-overflow-tooltip />
-                    <el-table-column label="已开票金额" prop="total_invoice_amount" show-overflow-tooltip />
-                    <el-table-column label="已回款金额" prop="total_refund_amount" show-overflow-tooltip />
+                    <el-table-column label="已开票金额" :render-header="pager.calcWidth" prop="total_invoice_amount"
+                        show-overflow-tooltip />
+                    <el-table-column label="已回款金额" :render-header="pager.calcWidth" prop="total_refund_amount"
+                        show-overflow-tooltip />
                     <el-table-column label="操作" width="170" fixed="right" align="center">
                         <template #default="{ row }">
                             <el-button v-perms="['zjzx_finance.zjzx_settlement/edit']" type="primary" link