From e8a4f8fe093bada5d2727a1f7629aa169eec67c7 Mon Sep 17 00:00:00 2001
From: lion <120344285@qq.com>
Date: Mon, 3 Jul 2023 14:28:28 +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

---
 pages/bd/bddetail.vue     | 11 ++++++++++
 pages/bd/record.vue       |  2 +-
 pages/visit/addrecord.vue | 43 +++++++++++++++++++++++++++++----------
 pages/visit/detail.vue    | 11 ++++++++++
 4 files changed, 55 insertions(+), 12 deletions(-)

diff --git a/pages/bd/bddetail.vue b/pages/bd/bddetail.vue
index 5fa7494..0c07f87 100644
--- a/pages/bd/bddetail.vue
+++ b/pages/bd/bddetail.vue
@@ -98,6 +98,17 @@
 						</view>
 					</view>
 				</view>
+				<view class="dbtext">陪同人员</view>
+				<view class="dbitem sfyritem">
+					<view class="dbinfo justify-left">
+						<view>
+							部门：<text>{{info.accompany.department.name}}</text>
+						</view>
+						<view>
+							人员：<text>{{info.accompany.name}}</text>
+						</view>
+					</view>
+				</view>
 				<template v-if="info.accept_admin_sign">
 					<view class="dbtext">签字</view>
 					<view class="dbitem sfyritem">
diff --git a/pages/bd/record.vue b/pages/bd/record.vue
index b4f357e..f846869 100644
--- a/pages/bd/record.vue
+++ b/pages/bd/record.vue
@@ -16,7 +16,7 @@
 							<view class="dbstatus bm">
 								<view class="justify-start">
 									{{item.audit_status_text}}
-									<button class="signBtn" @click.stop='signPic(item.id)' type="primary" v-if="nowadminID==item.accept_admin_id&&item.audit_status==3&&!item.accept_admin_sign">签字</button>
+									<button class="signBtn" @click.stop='signPic(item.id)' type="primary" v-if="nowadminID==item.accompany_id&&item.audit_status==3&&!item.accept_admin_sign">签字</button>
 								</view>
 								<view>
 									<text style="margin-right:10px">访问时间：{{item.date}}</text>
diff --git a/pages/visit/addrecord.vue b/pages/visit/addrecord.vue
index 90637da..02bf6b0 100644
--- a/pages/visit/addrecord.vue
+++ b/pages/visit/addrecord.vue
@@ -169,18 +169,25 @@
 				<uni-forms-item label="结束日期">
 					<uni-datetime-picker type="date" :start="toadyStart" return-type="string" v-model="form.end_date" />
 				</uni-forms-item>
-			</template>
-			<view class="formtext">被访人信息</view>
-			<uni-forms-item label="被访人" required name="acceptName" v-if="form.type==1||form.type==2">
-				<uni-easyinput @clear="clearAccept('accept')" disabled v-model="form.acceptName"
-					@tap="adminListShowOpen('accept')" placeholder="请选择联系人员" />
-			</uni-forms-item>
+			</template>
+			<view class="formtext" v-if="form.type==1||form.type==2">被访人信息</view>
+			<uni-forms-item label="被访人" required name="acceptName" v-if="form.type==1||form.type==2">
+				<uni-easyinput @clear="clearAccept('accept')" disabled v-model="form.acceptName"
+					@tap="adminListShowOpen('accept')" placeholder="请选择联系人员" />
+			</uni-forms-item>
+			<view class="formtext" v-if="form.type==1||form.type==2">陪同人信息</view>
+			<uni-forms-item label="陪同人" required name="accompanyName" v-if="form.type==1||form.type==2">
+				<uni-easyinput @clear="clearAccept('accompany')" disabled v-model="form.accompanyName"
+					@tap="adminListShowOpen('accompany')" placeholder="请选择联系人员" />
+			</uni-forms-item>
+			<view class="formtext" v-if="form.type==3">收货人信息</view>
+
 			<uni-forms-item label="收货人" v-if="form.type==3" required name="goodsName">
 				<uni-easyinput @clear="clearAccept('goods')" disabled v-model="form.goodsName"
 					@tap="adminListShowOpen('goods')" placeholder="请选择联系人员" />
 			</uni-forms-item>
 			<qianziyu-select :show="adminListShow" type="radio" :popupTitle="'联系人员'" name="cworkStationName"
-				:dataLists="adminList" placeholder="输入被访人具体姓名或手机号搜索" @search="selectSearch" @submit="submitAccept"
+				:dataLists="adminList" placeholder="输入陪同人具体姓名或手机号搜索" @search="selectSearch" @submit="submitAccept"
 				@cancel="cancelAccept" />
 		</uni-forms>
 		<button type="primary" style="background-color: #044ed7;" @click="saveFormgoStudy">{{goStudy}}</button>
@@ -267,12 +274,14 @@
 					follw_people: [],
 					long_time: 0,
 					start_date: "",
-					end_date: "",
+					end_date: "",
+					accompany_id:'',
 					accpet_department_id: "",
 					accept_admin_id: "",
 					accept_goods_admin_id: "",
 					acceptName: "",
-					goodsName: '',
+					goodsName: '',
+					accompanyName:''
 				},
 				follw_people_obj: {
 					name: "",
@@ -368,6 +377,12 @@
 							required: true,
 							errorMessage: '请选择被访人'
 						}]
+					},
+					accompanyName: {
+						rules: [{
+							required: true,
+							errorMessage: '请选择陪同人'
+						}]
 					},
 					goodsName: {
 						rules: [{
@@ -493,9 +508,12 @@
 				if (type == 'accept') {
 					this.form.accept_admin_id = ''
 					this.form.acceptName = ''
-				} else {
+				} else if(type=='goods') {
 					this.form.accept_goods_admin_id = ''
 					this.form.goodsName = ''
+				}else{
+					this.form.accompany_id=''
+					this.form.accompanyName=''
 				}
 			},
 			submitAccept(e) {
@@ -504,11 +522,14 @@
 					this.form.accept_admin_id = e.id
 					this.form.accpet_department_id = e.department_id
 					this.form.acceptName = e.name
-				} else {
+				} else if(this.acceptType == 'goods'){
 					this.form.accept_goods_admin_id = e.id
 					this.form.accept_admin_id = e.id
 					this.form.accpet_department_id = e.department_id
 					this.form.goodsName = e.name
+				}else{
+					this.form.accompany_id = e.id
+					this.form.accompanyName = e.name
 				}
 				this.adminListShow = false
 			},
diff --git a/pages/visit/detail.vue b/pages/visit/detail.vue
index 3505a8e..06e3204 100644
--- a/pages/visit/detail.vue
+++ b/pages/visit/detail.vue
@@ -99,6 +99,17 @@
 						</view>
 					</view>
 				</view>
+				<view class="dbtext">陪同人员</view>
+				<view class="dbitem sfyritem">
+					<view class="dbinfo justify-left">
+						<view>
+							部门：<text>{{info.accompany.department.name}}</text>
+						</view>
+						<view>
+							人员：<text>{{info.accompany.name}}</text>
+						</view>
+					</view>
+				</view>
 				<template v-if="info.accept_admin_sign">
 					<view class="dbtext">签字</view>
 					<view class="dbitem sfyritem">