From fd9e8623debbb38824f0292a3b53d88d37eb4def Mon Sep 17 00:00:00 2001
From: zmj <1493694146@qq.com>
Date: Fri, 3 May 2024 14:59:57 +0800
Subject: [PATCH] add

---
 .env.development                              |  2 +-
 src/views/apply_with_seal/edit.vue            | 23 +++++++++++------
 .../edit.vue                                  | 22 +++++++++++++++-
 src/views/cost_projects/edit.vue              | 18 +++++++------
 src/views/data_reception/edit.vue             | 25 +++++++++++++++++--
 .../jianli_project_progress_report/edit.vue   | 17 ++++++++-----
 src/views/project_change_visa/edit.vue        | 12 +++++++--
 src/views/project_commission/edit.vue         | 19 +++++++++++---
 src/views/project_rectification/edit.vue      | 12 ++++++---
 .../task_handling_three_level_review/edit.vue | 21 ++++++++++------
 10 files changed, 129 insertions(+), 42 deletions(-)

diff --git a/.env.development b/.env.development
index 7aa79be..2a54d74 100644
--- a/.env.development
+++ b/.env.development
@@ -1,5 +1,5 @@
 NODE_ENV = 'development'
 
-VITE_APP_BASE_URL = 'http://ccc.cn/'
+VITE_APP_BASE_URL = 'https://ceshi-engineering.lihaink.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/apply_with_seal/edit.vue b/src/views/apply_with_seal/edit.vue
index 87b2c2b..23f80f3 100644
--- a/src/views/apply_with_seal/edit.vue
+++ b/src/views/apply_with_seal/edit.vue
@@ -109,7 +109,7 @@
                     </el-col>
                     <el-col :span="8">
                         <el-form-item label="申请人" prop="applicant">
-                            <el-input v-model="formData.applicant" clearable placeholder="请输入申请人" />
+                            <el-input v-model="formData.applicant_name" @click="userclick('applicant')" clearable placeholder="请输入申请人" />
                         </el-form-item>
                     </el-col>
                     <el-col :span="8">
@@ -121,7 +121,7 @@
                     </el-col>
                     <el-col :span="8">
                         <el-form-item label="盖章人" prop="stampman">
-                            <el-input v-model="formData.stampman" clearable placeholder="请输入盖章人"
+                            <el-input v-model="formData.stampman_name" clearable placeholder="请输入盖章人"
                                 @click="userclick('stampman')" />
                         </el-form-item>
                     </el-col>
@@ -134,7 +134,7 @@
                     </el-col>
                     <el-col :span="8">
                         <el-form-item label="实际借章人" prop="sjborrower">
-                            <el-input v-model="formData.sjborrower" clearable placeholder="请输入实际借章人" />
+                            <el-input v-model="formData.sjborrower_name"  @click="userclick('sjborrower')" clearable placeholder="请输入实际借章人" />
                         </el-form-item>
                     </el-col>
                     <el-col :span="8">
@@ -146,7 +146,7 @@
                     </el-col>
                     <el-col :span="8">
                         <el-form-item label="实际归还人" prop="returnee">
-                            <el-input v-model="formData.returnee" clearable placeholder="请输入实际归还人" />
+                            <el-input v-model="formData.returnee_name" @click="userclick('returnee')" clearable placeholder="请输入实际归还人" />
                         </el-form-item>
                     </el-col>
                     <el-col :span="8">
@@ -209,6 +209,7 @@ const formData = reactive({
     org_id: "",
     depar: '',
     stampman: '',
+    stampman_name: '',
     project_id: '',
     project_name: '',
     project_director: '',
@@ -217,11 +218,14 @@ const formData = reactive({
     borrow: '',
     returndate: '',
     applicant: '',
+    applicant_name: '',
     date: '',
     sjborrow: '',
     sjborrower: '',
+    sjborrower_name: '',
     sjreturn: '',
     returnee: '',
+    returnee_name: '',
     annex: [],
     projectInfo: {}
 
@@ -234,22 +238,27 @@ const customEvent = (e: any) => {
     showDialog.value = false
 }
 
-const tableKey = ref('')
+let keys;
+
 //打开弹窗
 const userclick = async (key) => {
-    tableKey.value = key
+    keys=key
     showDialog3.value = true
     await nextTick()
     personnel.value.open()
 
 }
+
+
 //确认
 const submituser = (e: any) => {
-    formData[tableKey.value] = e.name
+    formData[keys] = e.id
+    formData[keys+'_name'] = e.name
     showDialog3.value = false
 }
 
 
+
 const chekcDate = (rule: any, value: any, callback: any) => {
     if (new Date(formData.returndate) < new Date(formData.borrow)) {
         callback(new Error('印章借用日期不能早于结束借用日期'))
diff --git a/src/views/approval_issuance_achievement_documents/edit.vue b/src/views/approval_issuance_achievement_documents/edit.vue
index b5cf049..83b5d69 100644
--- a/src/views/approval_issuance_achievement_documents/edit.vue
+++ b/src/views/approval_issuance_achievement_documents/edit.vue
@@ -28,7 +28,7 @@
                     </el-date-picker>
                 </el-form-item>
                 <el-form-item label="登记人" prop="person">
-                    <el-input v-model="formData.person" clearable placeholder="请输入登记人" />
+                    <el-input v-model="formData.person_name" @click="userclick" clearable placeholder="请输入登记人" />
                 </el-form-item>
                 <el-form-item label="备注" prop="tips">
                     <el-input v-model="formData.tips" clearable placeholder="请输入备注" type="textarea" />
@@ -49,6 +49,10 @@
                     <dialogTable :config="cost_project" :query="{ task_allocation: 1 }" @customEvent="customEvent">
                     </dialogTable>
                 </el-dialog>
+                <div v-if="showDialog3">
+                    <personnelselector ref="personnel" @confirm="submituser" type="1">
+                    </personnelselector>
+                </div>
             </el-form>
         </popup>
     </div>
@@ -71,6 +75,8 @@ const formRef = shallowRef<FormInstance>()
 const popupRef = shallowRef<InstanceType<typeof Popup>>()
 const mode = ref('add')
 const showDialog = ref(false)
+const showDialog3 = ref(false)
+const personnel = ref<any>()
 
 
 // 弹窗标题
@@ -91,6 +97,7 @@ const formData = reactive({
     number: '',
     apptime: '',
     person: '',
+    person_name: "",
     tips: '',
     fd_1: '',
     fd_2: '',
@@ -105,6 +112,19 @@ const customEvent = (e) => {
     showDialog.value = false
 }
 
+//打开弹窗
+const userclick = async () => {
+    showDialog3.value = true
+    await nextTick()
+    personnel.value.open()
+
+}
+//确认
+const submituser = (e: any) => {
+    formData.person_name = e.name
+    formData.person = e.id
+    showDialog3.value = false
+}
 // 表单验证
 const formRules = reactive<any>({
 
diff --git a/src/views/cost_projects/edit.vue b/src/views/cost_projects/edit.vue
index 463d39b..4a8d119 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">
@@ -45,8 +46,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="(item.province_code)" />
                             </el-select>
@@ -56,8 +57,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>
@@ -93,8 +94,8 @@
 
                     <el-col :span="8">
                         <el-form-item label="项目所属部门" prop="depar" :rules="[
-                            { required: true, message: '不可为空', trigger: 'blur' },
-                        ]">
+            { required: true, message: '不可为空', trigger: 'blur' },
+        ]">
                             <el-select class="flex-1" v-model="formData.depar" clearable placeholder="请选择部门">
                                 <el-option v-for="(item, index) in deptList" :key="index" :label="item.name"
                                     :value="item.id" />
@@ -169,7 +170,8 @@
                         <el-form-item label="项目规模及概括" prop="generalize" label-width="120px">
                             <!-- <el-input v-model="formData.generalize" clearable placeholder="请输入项目规模及概括" disabled
                                 type="textarea" /> -->
-                            <el-input v-model="formData.generalize" clearable placeholder="请输入项目规模及概括" type="textarea" />
+                            <el-input v-model="formData.generalize" clearable placeholder="请输入项目规模及概括"
+                                type="textarea" />
                         </el-form-item>
                     </el-col>
 
diff --git a/src/views/data_reception/edit.vue b/src/views/data_reception/edit.vue
index d86e723..c7358b6 100644
--- a/src/views/data_reception/edit.vue
+++ b/src/views/data_reception/edit.vue
@@ -31,7 +31,8 @@
                     </el-col>
                     <el-col :span="8">
                         <el-form-item label="登记人" prop="person">
-                            <el-input v-model="formData.person" clearable placeholder="请输入登记人" />
+                            <el-input @click="userclick" v-model="formData.person_name" clearable
+                                placeholder="请输入登记人" />
                         </el-form-item>
                     </el-col>
                     <el-col :span="8">
@@ -95,6 +96,10 @@
                     <dialogTable :config="cost_project" :query="{ task_allocation: 1 }" @customEvent="customEvent">
                     </dialogTable>
                 </el-dialog>
+                <div v-if="showDialog3">
+                    <personnelselector ref="personnel" @confirm="submituser" type="1">
+                    </personnelselector>
+                </div>
             </el-form>
         </popup>
     </div>
@@ -117,7 +122,8 @@ const formRef = shallowRef<FormInstance>()
 const popupRef = shallowRef<InstanceType<typeof Popup>>()
 const mode = ref('add')
 const showDialog = ref(false)
-
+const showDialog3 = ref(false)
+const personnel = ref<any>()
 
 // 弹窗标题
 const popupTitle = computed(() => {
@@ -134,6 +140,7 @@ const formData = reactive({
     project_num: "",
     apptime: '',
     person: '',
+    person_name: '',
     number: '',
     position: '',
     tips: '',
@@ -148,6 +155,20 @@ const formData = reactive({
 
 })
 
+//打开弹窗
+const userclick = async () => {
+    showDialog3.value = true
+    await nextTick()
+    personnel.value.open()
+
+}
+//确认
+const submituser = (e: any) => {
+    formData.person_name = e.name
+    formData.person = e.id
+    showDialog3.value = false
+}
+
 const customEvent = (e) => {
     formData.project_id = e.id
     formData.project_name = e.project_name
diff --git a/src/views/jianli_project_progress_report/edit.vue b/src/views/jianli_project_progress_report/edit.vue
index 2652f2d..fe4c204 100644
--- a/src/views/jianli_project_progress_report/edit.vue
+++ b/src/views/jianli_project_progress_report/edit.vue
@@ -21,13 +21,13 @@
                     </el-col>
                     <el-col :span="8">
                         <el-form-item label="项目负责人" prop="xm_master">
-                            <el-input v-model="formData.xm_master" clearable placeholder="请输入项目负责人" />
+                            <el-input v-model="formData.xm_master" readonly  clearable placeholder="请输入项目负责人" />
                         </el-form-item>
                     </el-col>
 
                     <el-col :span="8">
                         <el-form-item label="部门负责人" prop="bm_master">
-                            <el-input v-model="formData.bm_master" clearable placeholder="请选择部门负责人" @click="userclick()" />
+                            <el-input v-model="formData.bm_master" clearable placeholder="请选择部门负责人" @click="userclick('bm_master')" />
                         </el-form-item>
                     </el-col>
                     <el-col :span="8">
@@ -76,7 +76,7 @@
 
                     <el-col :span="8">
                         <el-form-item label="登记人" prop="djr">
-                            <el-input v-model="formData.djr" clearable placeholder="请输入登记人" />
+                            <el-input v-model="formData.djr_name" @click="userclick('djr')" clearable placeholder="请输入登记人" />
                         </el-form-item>
                     </el-col>
                     <el-col :span="8">
@@ -151,8 +151,10 @@ const formData = reactive({
     project_name: '',
     project_num: '',
     bm_master: '',
+    bm_master_name: '',
     wt_unit: '',
     xm_master: '',
+    xm_master_name: '',
     start_date: '',
     end_date: '',
     duration: '',
@@ -160,6 +162,7 @@ const formData = reactive({
     done_progress: '',
     bjd_progress: '',
     djr: '',
+    djr_name: '',
     apptime: '',
     jdms: '',
     datas: '',
@@ -181,9 +184,11 @@ const customEvent = (e: any) => {
     formData.xm_master = e.principal_name
     showDialog.value = false
 }
+let keys;
 
 //打开弹窗
-const userclick = async () => {
+const userclick = async (key) => {
+    keys=key
     showDialog3.value = true
     await nextTick()
     personnel.value.open()
@@ -193,8 +198,8 @@ const userclick = async () => {
 
 //确认
 const submituser = (e: any) => {
-    formData['bm_master'] = e.name
-    // formData.project_change_visa_content[tableIndex.value][tableKey.value + '_id'] = e.id
+    formData[keys] = e.id
+    formData[keys+'_name'] = e.name
     showDialog3.value = false
 }
 
diff --git a/src/views/project_change_visa/edit.vue b/src/views/project_change_visa/edit.vue
index 8737add..065a993 100644
--- a/src/views/project_change_visa/edit.vue
+++ b/src/views/project_change_visa/edit.vue
@@ -23,7 +23,7 @@
                     </el-col>
                     <el-col :span="8">
                         <el-form-item label="登记人" prop="djr">
-                            <el-input v-model="formData.djr" clearable placeholder="请输入登记人" />
+                            <el-input v-model="formData.djr_name" @click="userclick('djr')" clearable placeholder="请输入登记人" />
                         </el-form-item>
                     </el-col>
                     <el-col :span="8">
@@ -165,6 +165,7 @@ const formData = reactive({
     project_num: '',
     projectInfo: {},
     djr: '',
+    djr_name: '',
     djrq: '',
     project_change_visa_content: [
     ]
@@ -196,8 +197,15 @@ const userclick = async (e: any, key) => {
 
 //确认
 const submituser = (e: any) => {
-    formData.project_change_visa_content[tableIndex.value][tableKey.value] = e.name
+    if(tableIndex.value=='djr'){
+        
+        formData.djr=e.id
+        formData.djr_name=e.name
+
+    }else{
+        formData.project_change_visa_content[tableIndex.value][tableKey.value] = e.name
     formData.project_change_visa_content[tableIndex.value][tableKey.value + '_id'] = e.id
+    }
     showDialog3.value = false
 }
 
diff --git a/src/views/project_commission/edit.vue b/src/views/project_commission/edit.vue
index f1780de..ff064fe 100644
--- a/src/views/project_commission/edit.vue
+++ b/src/views/project_commission/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">
@@ -61,7 +62,8 @@
                 <el-row>
                     <el-col :span="8">
                         <el-form-item label="已支付总额" prop="total_pay_amount">
-                            <el-input v-model="formData.total_pay_amount" clearable placeholder="请输入已支付总额" type="number" />
+                            <el-input v-model="formData.total_pay_amount" clearable placeholder="请输入已支付总额"
+                                type="number" />
                         </el-form-item>
                     </el-col>
                     <el-col :span="8">
@@ -71,7 +73,8 @@
                     </el-col>
                     <el-col :span="8">
                         <el-form-item label="登记人" prop="djr">
-                            <el-input v-model="formData.djr" clearable placeholder="请输入登记人" />
+                            <el-input v-model="formData.djr_name" @click="userclick('djr')" clearable
+                                placeholder="请输入登记人" />
                         </el-form-item>
                     </el-col>
                 </el-row>
@@ -237,6 +240,7 @@ const formData = reactive({
     total_pay_amount: '',
     bczfze: '',
     djr: '',
+    djr_name: "",
     apptime: '',
     total_invoice_amount: "",
     remark: '',
@@ -309,6 +313,8 @@ const tableIndex = ref(0)
 const tableKey = ref('')
 //打开弹窗
 const userclick = async (e: any, key) => {
+
+
     tableIndex.value = e
     tableKey.value = key
     showDialog3.value = true
@@ -319,8 +325,15 @@ const userclick = async (e: any, key) => {
 
 //确认
 const submituser = (e: any) => {
+if( tableIndex.value=='djr'){
+    formData.djr_name=e.name
+    formData.djr=e.id
+}else{
     formData.project_commission_detail[tableIndex.value][tableKey.value] = e.name
     formData.project_commission_detail[tableIndex.value][tableKey.value + '_id'] = e.id
+}
+
+  
     showDialog3.value = false
 }
 
diff --git a/src/views/project_rectification/edit.vue b/src/views/project_rectification/edit.vue
index 1d1400a..8c61fdc 100644
--- a/src/views/project_rectification/edit.vue
+++ b/src/views/project_rectification/edit.vue
@@ -18,17 +18,17 @@
                     <el-input v-model="formData.wt_unit" clearable placeholder="请输入委托单位" />
                 </el-form-item>
                 <el-form-item label="项目负责人" prop="xm_master">
-                    <el-input v-model="formData.xm_master" clearable placeholder="请输入项目负责人" />
+                    <el-input v-model="formData.xm_master_name" @click="userclick('xm_master')" clearable placeholder="请输入项目负责人" />
                 </el-form-item>
                 <el-form-item label="咨询类型" prop="zx_type">
                     <el-input v-model="formData.zx_type" clearable placeholder="请输入咨询类型" />
                 </el-form-item>
                 <el-form-item label="项目整改人" prop="zg_master">
-                    <el-input v-model="formData.zg_master" clearable placeholder="点击选择"
+                    <el-input v-model="formData.zg_master_name" clearable placeholder="点击选择"
                         @click="userclick('zg_master')" />
                 </el-form-item>
                 <el-form-item label="登记人" prop="dj_person">
-                    <el-input v-model="formData.dj_person" clearable placeholder="请输入登记人" />
+                    <el-input  @click="userclick('dj_person')" v-model="formData.dj_person_name" clearable placeholder="请输入登记人" />
                 </el-form-item>
                 <el-form-item label="登记日期" prop="apptime">
                     <el-date-picker class="flex-1 !flex" v-model="formData.apptime" clearable type="date"
@@ -95,9 +95,12 @@ const formData = reactive({
     project_num: '',
     wt_unit: '',
     xm_master: '',
+    xm_master_name: '',
     zx_type: '',
     zg_master: '',
+    zg_master_name: '',
     dj_person: '',
+    dj_person_name: '',
     apptime: '',
     problem: '',
     deal_desc: '',
@@ -132,7 +135,8 @@ const userclick = async (key) => {
 
 //确认
 const submituser = (e: any) => {
-    formData[tableKey.value] = e.name
+    formData[tableKey.value+'_name'] = e.name
+    formData[tableKey.value] = e.id
     showDialog3.value = false
 }
 
diff --git a/src/views/task_handling_three_level_review/edit.vue b/src/views/task_handling_three_level_review/edit.vue
index 671f0f2..f649d0d 100644
--- a/src/views/task_handling_three_level_review/edit.vue
+++ b/src/views/task_handling_three_level_review/edit.vue
@@ -1,6 +1,7 @@
 <template>
     <div class="edit-popup">
-        <popup ref="popupRef" :title="popupTitle" :async="true" width="80%" @confirm="handleSubmit" @close="handleClose">
+        <popup ref="popupRef" :title="popupTitle" :async="true" width="80%" @confirm="handleSubmit"
+            @close="handleClose">
             <el-form ref="formRef" :model="formData" label-width="160px" :rules="formRules">
                 <el-row>
                     <el-col :span="8">
@@ -64,27 +65,30 @@
                 <el-row>
                     <el-col :span="8">
                         <el-form-item label="项目负责人" prop="head">
-                            <el-input v-model="formData.head" clearable placeholder="请输入项目负责人" />
+                            <el-input @click="userclick('head')" v-model="formData.head_name" clearable
+                                placeholder="请输入项目负责人" />
                         </el-form-item>
                     </el-col>
                     <el-col :span="8">
                         <el-form-item label="审核流程" prop="examine">
                             <el-select class="flex-1" v-model="formData.examine" clearable placeholder="请选择审核流程">
-                                <el-option v-for="(item, index) in dictData.review_process " :key="index" :label="item.name"
-                                    :value="parseInt(item.value)" />
+                                <el-option v-for="(item, index) in dictData.review_process " :key="index"
+                                    :label="item.name" :value="parseInt(item.value)" />
                             </el-select>
                         </el-form-item>
                     </el-col>
                     <el-col :span="8">
                         <el-form-item label="一级审核人" prop="one">
-                            <el-input v-model="formData.one" clearable placeholder="请输入一级审核人" @click="userclick('one')" />
+                            <el-input v-model="formData.one" clearable placeholder="请输入一级审核人"
+                                @click="userclick('one')" />
                         </el-form-item>
                     </el-col>
                 </el-row>
                 <el-row>
                     <el-col :span="8">
                         <el-form-item label="二级审核人" prop="two">
-                            <el-input v-model="formData.two" clearable placeholder="请输入二级审核人" @click="userclick('two')" />
+                            <el-input v-model="formData.two" clearable placeholder="请输入二级审核人"
+                                @click="userclick('two')" />
                         </el-form-item>
                     </el-col>
                     <el-col :span="8">
@@ -145,8 +149,8 @@
                     <el-col :span="8">
                         <el-form-item label="造价依据" prop="according">
                             <el-select class="flex-1" v-model="formData.according" clearable placeholder="请选择造价依据">
-                                <el-option v-for="(item, index) in dictData.cost_sentence  " :key="index" :label="item.name"
-                                    :value="parseInt(item.value)" />
+                                <el-option v-for="(item, index) in dictData.cost_sentence  " :key="index"
+                                    :label="item.name" :value="parseInt(item.value)" />
                             </el-select>
                         </el-form-item>
                     </el-col>
@@ -293,6 +297,7 @@ const formData = reactive({
     zType: '',
     engineer: '',
     head: '',
+    head_name: '',
     examine: '',
     one: '',
     two: '',