From 053c570284b45db50e1e0517154bd31d161c5f52 Mon Sep 17 00:00:00 2001
From: mkm <727897186@qq.com>
Date: Fri, 26 Apr 2024 21:57:37 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.development                        |  2 +-
 src/views/consult_project/edit.vue      | 10 +++++-----
 src/views/consult_project/index.vue     | 13 ++++++-------
 src/views/manage_project/index.vue      |  6 +++---
 src/views/supervision_project/edit.vue  |  5 ++---
 src/views/supervision_project/index.vue | 10 +++++-----
 6 files changed, 22 insertions(+), 24 deletions(-)

diff --git a/.env.development b/.env.development
index 2a54d74..7aa79be 100644
--- a/.env.development
+++ b/.env.development
@@ -1,5 +1,5 @@
 NODE_ENV = 'development'
 
-VITE_APP_BASE_URL = 'https://ceshi-engineering.lihaink.cn/'
+VITE_APP_BASE_URL = 'http://ccc.cn/'
 # VITE_APP_BASE_URL = 'http://www.eng.local/'
 # VITE_APP_BASE_URL = 'http://192.168.1.5:9090/'
\ No newline at end of file
diff --git a/src/views/consult_project/edit.vue b/src/views/consult_project/edit.vue
index 83c6150..fd0cc39 100644
--- a/src/views/consult_project/edit.vue
+++ b/src/views/consult_project/edit.vue
@@ -25,20 +25,20 @@
             <el-form-item label="性质" prop="nature">
               <el-select class="flex-1" v-model="formData.nature" clearable placeholder="请选择性质">
                 <el-option v-for="(item, index) in dictData.supervision_project_nature" :key="index"
-                           :label="item.name" :value="parseInt(item.value)"/>
+                           :label="item.name" :value="item.value"/>
               </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="8">
             <el-form-item label="委托单位">
-              <el-input v-model="formData.company" clearable placeholder="请输入委托单位" @click="showDialog1 = true"/>
+              <el-input v-model="formData.company_name" clearable placeholder="请输入委托单位" @click="showDialog1 = true"/>
             </el-form-item>
           </el-col>
           <el-col :span="8">
             <el-form-item label="建设区域" prop="build_area">
               <el-select class="flex-1" v-model="formData.build_area" clearable placeholder="请选择建设区域">
                 <el-option v-for="(item, index) in dictData.const_area" :key="index" :label="item.name"
-                           :value="parseInt(item.value)"/>
+                           :value="item.value"/>
               </el-select>
             </el-form-item>
           </el-col>
@@ -69,7 +69,7 @@
           </el-col>
           <el-col :span="8">
             <el-form-item label="关联合同">
-              <el-input v-model="formData.contract_name" clearable placeholder="请输入关联合同"/>
+              <el-input v-model="formData.contract_name" clearable placeholder="请输入关联合同" disabled/>
             </el-form-item>
           </el-col>
           <el-col :span="8">
@@ -135,7 +135,7 @@
           </el-col>
           <el-col :span="8">
             <el-form-item label="委托联系人">
-              <el-input v-model="formData.consult_user_name" clearable placeholder="请输入委托联系人" @click="userclick('consult_user')"/>
+              <el-input v-model="formData.consult_user" clearable placeholder="请输入委托联系人" />
             </el-form-item>
           </el-col>
           <el-col :span="8">
diff --git a/src/views/consult_project/index.vue b/src/views/consult_project/index.vue
index 5ab3f11..9f83e0a 100644
--- a/src/views/consult_project/index.vue
+++ b/src/views/consult_project/index.vue
@@ -38,17 +38,17 @@
                         show-overflow-tooltip />
                     <el-table-column :render-header="pager.calcWidth" label="项目编号" prop="project_code"
                         show-overflow-tooltip />
-                    <el-table-column :render-header="pager.calcWidth" label="委托单位" prop="company" show-overflow-tooltip />
+                    <el-table-column :render-header="pager.calcWidth" label="委托单位" prop="company_name" show-overflow-tooltip />
                     <el-table-column :render-header="pager.calcWidth" label="总投资（元）" prop="total_investment"
                         show-overflow-tooltip />
-                    <el-table-column :render-header="pager.calcWidth" label="关联合同" prop="contract" show-overflow-tooltip />
+                    <el-table-column :render-header="pager.calcWidth" label="关联合同" prop="contract_name" show-overflow-tooltip />
                     <el-table-column :render-header="pager.calcWidth" label="工程状态" prop="engineering_status_text"
                         show-overflow-tooltip />
                     <el-table-column :render-header="pager.calcWidth" label="咨询类型" prop="consult_type_text"
                         show-overflow-tooltip />
-                    <el-table-column label="监管部门" prop="supervision_department" show-overflow-tooltip />
-                    <el-table-column label="实施部门" prop="implementation_department" show-overflow-tooltip />
-                    <el-table-column label="项目负责人员" prop="project_manager" show-overflow-tooltip />
+                    <el-table-column label="监管部门" prop="supervision_department_name" show-overflow-tooltip />
+                    <el-table-column label="实施部门" prop="implementation_department_name" show-overflow-tooltip />
+                    <el-table-column label="项目负责人员" prop="project_manager_name" show-overflow-tooltip />
                     <el-table-column label="操作" width="170" fixed="right" align="center">
                         <template #default="{ row }">
                             <el-button v-perms="['consult_basic.consult_project/edit']" type="primary" link
@@ -155,8 +155,7 @@ if (route.query.contractId) {
 }
 const success = () => {
   router.push({
-    path: '/management/manage_basic/manage_project',
-
+    path: '/consult/consult_basic/consult_project',
   })
 }
 const deptList = ref([])
diff --git a/src/views/manage_project/index.vue b/src/views/manage_project/index.vue
index d3b2180..c948bca 100644
--- a/src/views/manage_project/index.vue
+++ b/src/views/manage_project/index.vue
@@ -90,9 +90,9 @@
                     <el-table-column label="项目级别" prop="project_level_text" show-overflow-tooltip />
                     <el-table-column label="总投资（元）" prop="total_investment" show-overflow-tooltip width="120" />
                     <el-table-column label="工程状态" prop="engineering_status_text" show-overflow-tooltip />
-                    <el-table-column label="实施部门" prop="implementation_department" show-overflow-tooltip />
-                    <el-table-column label="监管部门" prop="supervision_department" show-overflow-tooltip />
-                    <el-table-column label="项目经理" prop="project_manager" show-overflow-tooltip />
+                    <el-table-column label="实施部门" prop="implementation_department_name" show-overflow-tooltip />
+                    <el-table-column label="监管部门" prop="supervision_department_name" show-overflow-tooltip />
+                    <el-table-column label="项目经理" prop="project_manager_name" show-overflow-tooltip />
                     <el-table-column label="操作" width="170" fixed="right">
                         <template #default="{ row }">
                             <el-button v-perms="['manage_basic.manage_project/edit']" type="primary" link
diff --git a/src/views/supervision_project/edit.vue b/src/views/supervision_project/edit.vue
index 0af92f5..e80fb25 100644
--- a/src/views/supervision_project/edit.vue
+++ b/src/views/supervision_project/edit.vue
@@ -29,8 +29,7 @@
 
                     <el-col :span="8">
                         <el-form-item label="建设单位">
-                            <el-input v-model="formData.build_unit_name" clearable placeholder="请输入建设单位"
-                                />
+                            <el-input v-model="formData.build_unit_name" clearable placeholder="请输入建设单位" @click="showDialog1 = true"/>
                         </el-form-item>
                     </el-col>
                     <el-col :span="8">
@@ -73,7 +72,7 @@
 
                     <el-col :span="8">
                         <el-form-item label="关联合同">
-                            <el-input v-model="formData.contract_name" clearable placeholder="请输入关联合同" />
+                            <el-input v-model="formData.contract_name" clearable placeholder="请输入关联合同" disabled/>
                         </el-form-item>
                     </el-col>
                     <el-col :span="8">
diff --git a/src/views/supervision_project/index.vue b/src/views/supervision_project/index.vue
index 80ebb25..38126c5 100644
--- a/src/views/supervision_project/index.vue
+++ b/src/views/supervision_project/index.vue
@@ -86,7 +86,7 @@
                         show-overflow-tooltip />
                     <el-table-column :render-header="pager.calcWidth" label="性质" prop="nature_text"
                         show-overflow-tooltip />
-                    <el-table-column :render-header="pager.calcWidth" label="建设单位" prop="build_unit"
+                    <el-table-column :render-header="pager.calcWidth" label="建设单位" prop="build_unit_name"
                         show-overflow-tooltip />
                     <el-table-column :render-header="pager.calcWidth" label="建设区域" prop="build_area_text"
                         show-overflow-tooltip />
@@ -109,15 +109,15 @@
                     <el-table-column :render-header="pager.calcWidth" label="项目要求" prop="project_requirements"
                         show-overflow-tooltip />
                     <el-table-column :render-header="pager.calcWidth" label="备注" prop="remark" show-overflow-tooltip />
-                    <el-table-column :render-header="pager.calcWidth" label="监管部门" prop="supervision_department"
+                    <el-table-column :render-header="pager.calcWidth" label="监管部门" prop="supervision_department_name"
                         show-overflow-tooltip />
-                    <el-table-column :render-header="pager.calcWidth" label="实施部门" prop="implementation_department"
+                    <el-table-column :render-header="pager.calcWidth" label="实施部门" prop="implementation_department_name"
                         show-overflow-tooltip />
-                    <el-table-column :render-header="pager.calcWidth" label="项目部" prop="project_department"
+                    <el-table-column :render-header="pager.calcWidth" label="项目部" prop="project_department_name"
                         show-overflow-tooltip />
                     <el-table-column :render-header="pager.calcWidth" label="工程状态" prop="engineering_status_text"
                         show-overflow-tooltip />
-                    <el-table-column :render-header="pager.calcWidth" label="项目负责人员" prop="project_manager"
+                    <el-table-column :render-header="pager.calcWidth" label="项目负责人员" prop="project_manager_name"
                         show-overflow-tooltip />
                     <el-table-column :render-header="pager.calcWidth" label="甲方单位" prop="part_a_unit"
                         show-overflow-tooltip />