From ce78b2c164289e60428e0f3cf4448003cb59d302 Mon Sep 17 00:00:00 2001
From: weiz <736250432@qq.com>
Date: Sat, 6 Apr 2024 13:42:15 +0800
Subject: [PATCH] update

---
 src/views/cost_approved_projects/detail.js | 46 ++++++--------
 src/views/cost_approved_projects/index.vue | 70 ++++++++--------------
 src/views/cost_projects/edit.vue           | 29 ++++-----
 3 files changed, 52 insertions(+), 93 deletions(-)

diff --git a/src/views/cost_approved_projects/detail.js b/src/views/cost_approved_projects/detail.js
index 70937c2..cf7ad1f 100644
--- a/src/views/cost_approved_projects/detail.js
+++ b/src/views/cost_approved_projects/detail.js
@@ -7,7 +7,7 @@ const detailConfig = {
         },
         {
             label: "合同编号",
-            value: "contract_num"
+            value: "contract_code"
         },
         {
             label: "合同类型",
@@ -15,11 +15,11 @@ const detailConfig = {
         },
         {
             label: "甲方签约单位",
-            value: "part_a"
+            value: "part_a_name"
         },
         {
             label: "甲方联系人",
-            value: "part_a_contract"
+            value: "part_a_contact"
         },
         {
             label: "业主地址",
@@ -31,7 +31,7 @@ const detailConfig = {
         },
         {
             label: "乙方签约人",
-            value: "part_b_signatory",
+            value: "part_b_signatory_name",
         },
         {
             label: "业务性质",
@@ -59,15 +59,15 @@ const detailConfig = {
         },
         {
             label: "签订金额(元)",
-            value: "money",
+            value: "signed_amount",
         },
         {
             label: "合同服务工期",
-            value: "contract_service",
+            value: "service_duration",
         },
         {
             label: "合同签订费率",
-            value: "rate",
+            value: "signed_rate",
         },
 
         {
@@ -82,49 +82,37 @@ const detailConfig = {
 
         {
             label: "合同履约金",
-            value: "performance",
+            value: "performance_money",
         },
 
         {
             label: "履约金到期时间",
-            value: "due_time",
+            value: "performance_money_expiration_time",
         },
 
         {
             label: "合同付款方式",
-            value: "payment",
+            value: "payment_method",
         },
-
         {
             label: "合同主要内容",
             value: "content",
         },
-
-        {
-            label: "创建人",
-            value: "founder",
-        },
-
-        {
-            label: "创建日期",
-            value: "create_date",
-        },
-
         {
             label: "签订部门",
-            value: "dept",
+            value: "signed_dept_name",
         },
         {
             label: "签订负责人",
-            value: "signing_person",
+            value: "signed_head_name",
         },
         {
             label: "项目总监/经理",
-            value: "project_director",
+            value: "project_manager_name",
         },
         {
             label: "实施方式",
-            value: "way_text",
+            value: "implement_method_text",
         },
         {
             label: "盖章名称",
@@ -132,7 +120,7 @@ const detailConfig = {
         },
         {
             label: "是否限制",
-            value: "limit_text",
+            value: "is_limit_text",
         },
         {
             label: "限制次数",
@@ -148,7 +136,7 @@ const detailConfig = {
         },
         {
             label: "盖章人",
-            value: "sealer",
+            value: "seal_user_name",
         },
         {
             label: "骑缝盖章",
@@ -160,7 +148,7 @@ const detailConfig = {
         },
         {
             label: "邮寄编号",
-            value: "number",
+            value: "mailing_number",
         },
         {
             label: "附件",
diff --git a/src/views/cost_approved_projects/index.vue b/src/views/cost_approved_projects/index.vue
index 3dec554..60adde3 100644
--- a/src/views/cost_approved_projects/index.vue
+++ b/src/views/cost_approved_projects/index.vue
@@ -9,39 +9,42 @@
                         </el-form-item>
                     </el-col>
                     <el-col :span="6">
-                        <el-form-item label="合同编号" prop="contract_num">
-                            <el-input v-model="queryParams.contract_num" clearable placeholder="请输入合同编号" />
+                        <el-form-item label="合同编号" prop="contract_code">
+                            <el-input v-model="queryParams.contract_code" clearable placeholder="请输入合同编号" />
                         </el-form-item>
                     </el-col>
                     <el-col :span="6">
-                        <el-form-item label="甲方签约单位" prop="part_a">
+                        <el-form-item label="甲方单位" prop="part_a">
                             <el-input v-model="queryParams.part_a" clearable placeholder="请输入甲方签约单位" />
                         </el-form-item>
                     </el-col>
                     <el-col :span="6">
-                        <el-form-item label="乙方签约单位" prop="part_b">
+                        <el-form-item label="乙方单位" prop="part_b">
                             <el-input v-model="queryParams.part_b" clearable placeholder="请输入乙方签约单位" />
                         </el-form-item>
                     </el-col>
                     <el-col :span="6">
                         <el-form-item label="业务性质" prop="business_nature">
-                            <el-select class="flex-1" v-model="queryParams.business_nature" clearable placeholder="请选择业务性质">
-                                <el-option v-for="(item, index) in dictData.cost_consultation_business_nature" :key="index"
-                                    :label="item.name" :value="parseInt(item.value)" />
+                            <el-select class="flex-1" v-model="queryParams.business_nature" clearable
+                                placeholder="请选择业务性质">
+                                <el-option v-for="(item, index) in dictData.cost_consultation_business_nature"
+                                    :key="index" :label="item.name" :value="parseInt(item.value)" />
                             </el-select>
                         </el-form-item>
                     </el-col>
                     <el-col :span="6">
                         <el-form-item label="行业性质" prop="industry_nature">
-                            <el-select class="flex-1" v-model="queryParams.industry_nature" clearable placeholder="请选择行业性质">
-                                <el-option v-for="(item, index) in dictData.cost_consultation_industry_nature" :key="index"
-                                    :label="item.name" :value="parseInt(item.value)" />
+                            <el-select class="flex-1" v-model="queryParams.industry_nature" clearable
+                                placeholder="请选择行业性质">
+                                <el-option v-for="(item, index) in dictData.cost_consultation_industry_nature"
+                                    :key="index" :label="item.name" :value="parseInt(item.value)" />
                             </el-select>
                         </el-form-item>
                     </el-col>
                     <el-col :span="6">
                         <el-form-item label="资金来源" prop="fund_sources">
-                            <el-select class="flex-1" v-model="queryParams.fund_sources" clearable placeholder="请选择资金来源">
+                            <el-select class="flex-1" v-model="queryParams.fund_sources" clearable
+                                placeholder="请选择资金来源">
                                 <el-option v-for="(item, index) in dictData.cost_consultation_fund_sources" :key="index"
                                     :label="item.name" :value="parseInt(item.value)" />
                             </el-select>
@@ -67,49 +70,26 @@
             </el-form>
         </el-card>
         <el-card class="!border-none" v-loading="pager.loading" shadow="never">
-            <el-button v-perms="['cost_project.cost_approved_project/add']" type="primary" @click="handleAdd">
-                <template #icon>
-                    <icon name="el-icon-Plus" />
-                </template>
-                新增
-            </el-button>
-            <el-button v-perms="['cost_project.cost_approved_project/delete']" :disabled="!selectData.length"
-                @click="handleDelete(selectData)">
-                删除
-            </el-button>
             <div class="mt-4">
                 <el-table border :data="pager.lists" @selection-change="handleSelectionChange">
                     <el-table-column type="selection" width="55" />
-                    <el-table-column label="合同编号" prop="contract_num" show-overflow-tooltip width="200" />
+                    <el-table-column label="合同编号" prop="contract_code" show-overflow-tooltip width="200" />
                     <el-table-column label="合同名称" prop="contract_name" show-overflow-tooltip />
-                    <el-table-column label="甲方签约单位" prop="part_a" show-overflow-tooltip />
-                    <el-table-column label="乙方签约单位" prop="part_b" show-overflow-tooltip />
-                    <el-table-column label="合同计划开始日期" prop="start_date" show-overflow-tooltip />
-                    <el-table-column label="合同计划结束日期" prop="end_date" show-overflow-tooltip />
-                    <el-table-column label="工程总投资" prop="project_money" show-overflow-tooltip />
+                    <el-table-column label="甲方单位" prop="part_a" show-overflow-tooltip />
+                    <el-table-column label="乙方单位" prop="part_b" show-overflow-tooltip />
+                    <el-table-column label="工程投资" prop="project_money" show-overflow-tooltip />
                     <el-table-column label="签订金额" prop="money" show-overflow-tooltip />
+                    <el-table-column label="签订部门" prop="signed_dept_name" show-overflow-tooltip />
+                    <el-table-column label="监管部门" prop="supervise_dept_name" show-overflow-tooltip />
+                    <el-table-column label="项目经理" prop="project_manager_name" show-overflow-tooltip />
                     <el-table-column label="业务性质" prop="business_nature_text" show-overflow-tooltip />
-                    <el-table-column label="行业性质" prop="industry_nature" show-overflow-tooltip>
-                        <template #default="{ row }">
-                            <dict-value :options="dictData.cost_consultation_industry_nature"
-                                :value="row.industry_nature" />
-                        </template>
-                    </el-table-column>
-                    <el-table-column label="签订部门" prop="dept" show-overflow-tooltip />
+                    <el-table-column label="行业性质" prop="industry_nature_text" show-overflow-tooltip />
                     <el-table-column label="资金来源" prop="fund_sources_text" show-overflow-tooltip />
                     <el-table-column label="建设区域" prop="const_area_text" show-overflow-tooltip />
-                    <el-table-column label="项目总监/经理" prop="project_director" show-overflow-tooltip />
-                    <el-table-column label="监管部门" prop="regulators" show-overflow-tooltip />
+                    <el-table-column label="计划开始日期" prop="start_date" show-overflow-tooltip />
+                    <el-table-column label="计划结束日期" prop="end_date" show-overflow-tooltip />
                     <el-table-column label="操作" fixed="right" width="200" align="center">
                         <template #default="{ row }">
-                            <el-button v-perms="['cost_project.cost_approved_project/edit']" type="primary" link
-                                @click="handleEdit(row)">
-                                编辑
-                            </el-button>
-                            <el-button v-perms="['cost_project.cost_approved_project/delete']" type="danger" link
-                                @click="handleDelete(row.id)">
-                                删除
-                            </el-button>
                             <el-button v-perms="['cost_project.cost_approved_project/detail']" link
                                 @click="handleDetail(row.id)">
                                 详情
@@ -155,7 +135,7 @@ const showDetail = ref(false)
 // 查询条件
 const queryParams = reactive({
     contract_name: '',
-    contract_num: '',
+    contract_code: '',
     part_a: '',
     part_b: '',
     business_nature: '',
diff --git a/src/views/cost_projects/edit.vue b/src/views/cost_projects/edit.vue
index 5c4f738..1b17a89 100644
--- a/src/views/cost_projects/edit.vue
+++ b/src/views/cost_projects/edit.vue
@@ -1,6 +1,7 @@
 <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">
@@ -31,7 +32,8 @@
                     </el-col>
                     <el-col :span="8">
                         <el-form-item label="行业" prop="industry">
-                            <el-select v-model="formData.industry" clearable placeholder="请选择行业" class="flex-1" disabled>
+                            <el-select v-model="formData.industry" clearable placeholder="请选择行业" class="flex-1"
+                                disabled>
                                 <el-option v-for="(
                     item, index
                   ) in dictData.cost_consultation_industry_nature" :key="index" :label="item.name"
@@ -41,8 +43,8 @@
                     </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="parseInt(item.province_code)" />
                             </el-select>
@@ -53,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="parseInt(item.city_code)" />
+                                <el-option v-for="(item, index) in datas.cityOptions" :key="index"
+                                    :label="item.city_name" :value="parseInt(item.city_code)" />
                             </el-select>
                         </el-form-item>
                     </el-col>
@@ -84,21 +86,10 @@
                             <el-input v-model="formData.jhgq" clearable placeholder="请输入计划工期（天）" type="number" />
                         </el-form-item>
                     </el-col>
-                    <el-col :span="8">
-                        <el-form-item label="组织" :rules="[
-                            { required: true, message: '不可为空', trigger: 'blur' },
-                        ]">
-                            <el-select class="flex-1" v-model="formData.org_id" clearable placeholder="请选择组织"
-                                @change="deptrmt">
-                                <el-option v-for="(item, index) in list1" :key="index" :label="item.name"
-                                    :value="item.id" />
-                            </el-select>
-                        </el-form-item>
-                    </el-col>
                 </el-row>
                 <el-row>
                     <el-col :span="8">
-                        <el-form-item label="部门" prop="depar" :rules="[
+                        <el-form-item label="项目所属部门" prop="depar" :rules="[
                             { required: true, message: '不可为空', trigger: 'blur' },
                         ]">
                             <el-select class="flex-1" v-model="formData.depar" clearable placeholder="请选择部门">
@@ -198,7 +189,7 @@
                     </el-form-item>
                 </el-col>
                 <el-dialog v-model="showDialog" title="选择项目" width="70%">
-                    <dialogTable :config="cost_approved_projects" @customEvent="customEvent" :query="{ status: 1 }">
+                    <dialogTable :config="cost_approved_projects" @customEvent="customEvent" :query="{ status: 0 }">
                     </dialogTable>
                 </el-dialog>
                 <div v-if="showDialog1">