From 5e290bc9b8c18e1e9c91c4552533731fb4219cfd Mon Sep 17 00:00:00 2001
From: lion <120344285@qq.com>
Date: Thu, 6 Jul 2023 10:36:54 +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     | 25 ++++++++++++++-----------
 pages/visit/addrecord.vue | 19 ++++++++++++++-----
 pages/visit/detail.vue    | 24 +++++++++++++-----------
 3 files changed, 41 insertions(+), 27 deletions(-)

diff --git a/pages/bd/bddetail.vue b/pages/bd/bddetail.vue
index 0c07f87..e777c7e 100644
--- a/pages/bd/bddetail.vue
+++ b/pages/bd/bddetail.vue
@@ -36,7 +36,7 @@
 				<template v-if="info.type!='3'">
 					<view class="dbtext">随访人员</view>
 					<view class="dbitem sfyritem">
-						<template v-if="info.follw_people.length>0">
+						<template v-if="info.follw_people && info.follw_people.length>0">
 							<view class="dbinfo justify-left" v-for="people in info.follw_people">
 								<view>
 									<view>
@@ -61,7 +61,7 @@
 				<template>
 					<view class="dbtext">到访车辆</view>
 					<view class="dbitem sfyritem">
-						<view class="dbinfo dbcars" v-if="info.cars.length>0">
+						<view class="dbinfo dbcars" v-if="info.cars && info.cars.length>0">
 							<view class="onechild" v-for="item in info.cars">
 								车牌：<text>{{item?item:'无'}}</text>
 							</view>
@@ -98,17 +98,20 @@
 						</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>
+				<block v-if="info.visit_area.name=='生产区'">
+					<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>
-				</view>
+				</block>
+				
 				<template v-if="info.accept_admin_sign">
 					<view class="dbtext">签字</view>
 					<view class="dbitem sfyritem">
diff --git a/pages/visit/addrecord.vue b/pages/visit/addrecord.vue
index 02bf6b0..0e7ae51 100644
--- a/pages/visit/addrecord.vue
+++ b/pages/visit/addrecord.vue
@@ -175,8 +175,8 @@
 				<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">
+			<view class="formtext" v-if="visitAreaText=='生产区'">陪同人信息</view>
+			<uni-forms-item label="陪同人" required name="accompanyName" v-if="visitAreaText=='生产区'">
 				<uni-easyinput @clear="clearAccept('accompany')" disabled v-model="form.accompanyName"
 					@tap="adminListShowOpen('accompany')" placeholder="请选择联系人员" />
 			</uni-forms-item>
@@ -521,16 +521,25 @@
 				if (this.acceptType == 'accept') {
 					this.form.accept_admin_id = e.id
 					this.form.accpet_department_id = e.department_id
-					this.form.acceptName = e.name
+					this.form.acceptName = e.name
+					if(this.visitAreaText=='非生产区'){
+						this.form.accompany_id = e.id
+						this.form.accompanyName = e.name
+					}
 				} 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
+					this.form.goodsName = e.name
+					if(this.visitAreaText=='非生产区'){
+						this.form.accompany_id = e.id
+						this.form.accompanyName = e.name
+					}
 				}else{
 					this.form.accompany_id = e.id
 					this.form.accompanyName = e.name
-				}
+				}
+				
 				this.adminListShow = false
 			},
 			setCars(e) {
diff --git a/pages/visit/detail.vue b/pages/visit/detail.vue
index 06e3204..93f23d5 100644
--- a/pages/visit/detail.vue
+++ b/pages/visit/detail.vue
@@ -37,7 +37,7 @@
 				<template v-if="info.type!='3'">
 					<view class="dbtext">随访人员</view>
 					<view class="dbitem sfyritem">
-						<template v-if="info.follw_people.length>0">
+						<template v-if="info.follw_people && info.follw_people.length>0">
 							<view class="dbinfo justify-left" v-for="people in info.follw_people">
 								<view>
 									<view>
@@ -62,7 +62,7 @@
 				<template>
 					<view class="dbtext">到访车辆</view>
 					<view class="dbitem sfyritem">
-						<view class="dbinfo dbcars" v-if="info.cars.length>0">
+						<view class="dbinfo dbcars" v-if="info.cars && info.cars.length>0">
 							<view class="onechild" v-for="item in info.cars">
 								车牌：<text>{{item?item:'无'}}</text>
 							</view>
@@ -99,17 +99,19 @@
 						</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>
+				<block v-if="info.visit_area.name=='生产区'">
+					<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>
-				</view>
+				</block>
 				<template v-if="info.accept_admin_sign">
 					<view class="dbtext">签字</view>
 					<view class="dbitem sfyritem">