From f511f6e5675a3241aa07f20658f087649801a144 Mon Sep 17 00:00:00 2001
From: lion <120344285@qq.com>
Date: Mon, 3 Jul 2023 14:25:56 +0800
Subject: [PATCH] =?UTF-8?q?=E9=99=AA=E5=90=8C=E4=BA=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/visit/component/addCommon.vue | 67 +++++++++++++++++--------
 src/views/visit/component/showVisit.vue | 67 ++++++++++++++++---------
 2 files changed, 90 insertions(+), 44 deletions(-)

diff --git a/src/views/visit/component/addCommon.vue b/src/views/visit/component/addCommon.vue
index 298a23e..03feb31 100644
--- a/src/views/visit/component/addCommon.vue
+++ b/src/views/visit/component/addCommon.vue
@@ -261,39 +261,48 @@
             </div>
           </div>
         </div>
-      </template>
-      <template v-slot:visitorinfos>
+      </template>
+
+      <template v-slot:visitorinfos v-if="visitType==1||visitType==2">
         <div class="xy-table-item">
           <div class="xy-table-item-content" style="width:400px">
             被访人信息：
           </div>
         </div>
       </template>
-      <!-- <template v-slot:accpet_department_id>
-        <div class="xy-table-item">
-          <div class="xy-table-item-label">
-            <span style="color: red;font-weight: 600;padding-right: 4px;"></span>部门：
-          </div>
-          <div class="xy-table-item-content">
-            <el-select v-model="form.accpet_department_id" placeholder="请选择" style="width:100%">
-              <el-option v-for="item in departmentList" :key="item.value" :label="item.label" :value="item.value">
-              </el-option>
-            </el-select>
-          </div>
-        </div>
-      </template> -->
+
       <template v-slot:accept_admin_id v-if="visitType==1||visitType==2">
         <div class="xy-table-item">
           <div class="xy-table-item-label">
             <span style="color: red;font-weight: 600;padding-right: 4px;">*</span>人员：
           </div>
           <div class="xy-table-item-content">
-            <el-select filterable v-model="form.accept_admin_id" @change='changeAdmin' placeholder="请选择" style="width:100%">
+            <el-select filterable v-model="form.accept_admin_id" @change='changeAdmin1' placeholder="请选择" style="width:100%">
               <el-option v-for="item in adminList" :key="item.id"  :label="item.name" :value="item.id">
               </el-option>
             </el-select>
           </div>
         </div>
+      </template>
+      <template v-slot:visitorinfos1 v-if="visitType==1||visitType==2">
+        <div class="xy-table-item">
+          <div class="xy-table-item-content" style="width:400px">
+            陪同人信息：
+          </div>
+        </div>
+      </template>
+      <template v-slot:accompany_id v-if="visitType==1||visitType==2">
+        <div class="xy-table-item">
+          <div class="xy-table-item-label">
+            <span style="color: red;font-weight: 600;padding-right: 4px;">*</span>人员：
+          </div>
+          <div class="xy-table-item-content">
+            <el-select filterable v-model="form.accompany_id" @change='changeAdmin' placeholder="请选择" style="width:100%">
+              <el-option v-for="item in adminList" :key="item.id"  :label="item.name" :value="item.id">
+              </el-option>
+            </el-select>
+          </div>
+        </div>
       </template>
       <template v-slot:accept_goods_admin_id v-if="visitType==3">
         <div class="xy-table-item">
@@ -365,9 +374,11 @@
           follw_people: [],
           long_time: 0,
           longrange: "",
-          visitorinfos: "",
-          accpet_department_id: "",
-          accept_admin_id: "",
+          visitorinfos: "",
+          accpet_department_id: "",
+          accept_admin_id: "",
+          visitorinfos1:'',
+          accompany_id:'',
           accept_goods_admin_id: ""
         },
         followList:[],
@@ -516,9 +527,13 @@
             required: true,
             message: '请输入车牌号'
           }],
+          accompany_id: [{
+            required: true,
+            message: '请选择陪同人'
+          }],
           accept_admin_id: [{
             required: true,
-            message: '请选择被访人'
+            message: '请选被访人'
           }],
           accept_goods_admin_id: [{
             required: true,
@@ -588,6 +603,8 @@
           visitorinfos: "",
           accpet_department_id: res?.accpet_department_id,
           accept_admin_id: res?.accept_admin_id,
+          visitorinfos1:'',
+          accompany_id:res?.accompany_id,
           accept_goods_admin_id: res?parseInt(res.accept_goods_admin_id):''
         }
         this.followList = res?.follw_people
@@ -633,6 +650,16 @@
         this.form.work_end_time = val[1]
       },
       changeAdmin(item){
+        if(item){
+          this.adminList.map(e=>{
+            if(e.id==item){
+              this.form.accompany_id = e.id
+            }
+          })
+
+        }
+      },
+      changeAdmin1(item){
         if(item){
           this.adminList.map(e=>{
             if(e.id==item){
diff --git a/src/views/visit/component/showVisit.vue b/src/views/visit/component/showVisit.vue
index bcc6a53..8936536 100644
--- a/src/views/visit/component/showVisit.vue
+++ b/src/views/visit/component/showVisit.vue
@@ -258,24 +258,42 @@
             </div>
           </div>
         </div>
+      </template>
+      <template v-slot:visitorinfos>
+        <div class="xy-table-item">
+          <div class="xy-table-item-content" style="width:400px">
+            被访人信息：
+          </div>
+        </div>
+      </template>
+      <template v-slot:accept_admin_id>
+        <div class="xy-table-item">
+          <div class="xy-table-item-label">
+            <span style="color: red;font-weight: 600;padding-right: 4px;"></span>人员：
+          </div>
+          <div class="xy-table-item-content">
+            {{form.accept_admin?form.accept_admin.name:''}}
+          </div>
+        </div>
+      </template>
+      <template v-slot:visitorinfos1>
+        <div class="xy-table-item">
+          <div class="xy-table-item-content" style="width:400px">
+            陪同人信息：
+          </div>
+        </div>
+      </template>
+      <template v-slot:accompany_id>
+        <div class="xy-table-item">
+          <div class="xy-table-item-label">
+            <span style="color: red;font-weight: 600;padding-right: 4px;"></span>人员：
+          </div>
+          <div class="xy-table-item-content">
+            {{form.accompany?form.accompany.name:''}}
+          </div>
+        </div>
       </template>
-      <template v-slot:visitorinfos>
-        <div class="xy-table-item">
-          <div class="xy-table-item-content" style="width:400px">
-            被访人信息：
-          </div>
-        </div>
-      </template>
-      <template v-slot:accept_admin_id>
-        <div class="xy-table-item">
-          <div class="xy-table-item-label">
-            <span style="color: red;font-weight: 600;padding-right: 4px;"></span>人员：
-          </div>
-          <div class="xy-table-item-content">
-            {{form.accept_admin?form.accept_admin.name:''}}
-          </div>
-        </div>
-      </template>
+
       <template v-slot:accept_goods_admin_id v-if="form.type==3">
         <div class="xy-table-item">
           <div class="xy-table-item-label">
@@ -290,7 +308,7 @@
       <!-- 审核 -->
       <template v-slot:checkRecord v-if="formDataType=='checkrecord'">
         <div style="width:600px">
-          审核
+          审核：
         </div>
       </template>
       <template v-slot:checkForm v-if="form.audit_status==0&&isCheck">
@@ -386,12 +404,13 @@
           cars: "",
           follw_people: [],
           long_time: 0,
-          longrange: "",
-          visitorinfos: "",
-          accpet_department_id: "",
+          longrange: "",
+          visitorinfos: "",
+          accpet_department_id: "",
           accept_admin_id: "",
+          visitorinfos1: "",
+          accompany_id:"",
           accept_goods_admin_id: "",
-
           checkRecord: '',
           checkForm: {},
           checkText: ''
@@ -408,7 +427,7 @@
         }, // 核验
         codeTypeList: [{
           id:0,
-          value:'请提醒被访人签字'
+          value:'请提醒陪同人签字'
         },{
           id: 1,
           value: '入场'
@@ -618,7 +637,7 @@
         console.log(this.codeForm)
         console.log(this.codeForm.person_no)
         if(this.codeForm.type==0){
-          this.$successMessage('请提醒被访人签字','','warning')
+          this.$successMessage('请提醒陪同人签字','','warning')
           this.isShow = false
           return
         }