From f7d50135f3be6f33cf21dc8d047f20fcab824651 Mon Sep 17 00:00:00 2001
From: lion <120344285@qq.com>
Date: Thu, 30 Mar 2023 17:24:54 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BD=A6=E7=89=8C=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/bd/bddetail.vue       |  18 ++-
 pages/visit/addrecord.vue   | 235 +++++++++++++++++++++++-------------
 pages/visit/detail.vue      |  16 ++-
 pages/visit/study.vue       |   2 +-
 pages/visit/successform.vue |   3 +-
 pages/visit/testStudy.vue   |  15 ++-
 6 files changed, 190 insertions(+), 99 deletions(-)

diff --git a/pages/bd/bddetail.vue b/pages/bd/bddetail.vue
index 4e79717..674f02a 100644
--- a/pages/bd/bddetail.vue
+++ b/pages/bd/bddetail.vue
@@ -61,10 +61,15 @@
 				<template>
 					<view class="dbtext">到访车辆</view>
 					<view class="dbitem sfyritem">
-						<view class="dbinfo">
-							<view class="onechild">
-								车牌：<text>{{info.cars}}</text>
-							</view>
+						<view class="dbinfo dbcars" v-if="info.cars">
+							<view class="onechild" v-for="item in info.cars">
+								车牌：<text>{{item}}</text>
+							</view>
+						</view>
+						<view class="dbinfo dbcars" v-else>
+							<view class="onechild">
+								无
+							</view>
 						</view>
 					</view>
 				</template>
@@ -291,7 +296,10 @@
 		font-size: 40rpx;
 		padding-left: 30rpx
 	}
-
+	.dbcars>view{
+		width:100%;
+		padding-left:0
+	}
 	.sfyritem {
 		padding-bottom: 10rpx
 	}
diff --git a/pages/visit/addrecord.vue b/pages/visit/addrecord.vue
index 782ef58..79c5978 100644
--- a/pages/visit/addrecord.vue
+++ b/pages/visit/addrecord.vue
@@ -1,6 +1,16 @@
 <template>
-	<page-meta :page-style="'overflow:'+(adminListShow?'hidden':'visible')"></page-meta>
+	<page-meta :page-style="'overflow:'+(adminListShow||configshow?'hidden':'visible')"></page-meta>
 	<view class="containers">
+		<!-- 拜访须知 -->
+		<u-popup :show="configshow" class="configwrap" closeable mode="bottom" @close="closeConfig">
+			<view class="configtitle">
+				{{configInfo.name}}
+			</view>
+			<view class="configvalue">
+				{{configInfo.value}}
+			</view>
+		</u-popup>
+		
 		<view class="steps">
 			<uni-steps :options="steps" :active="stepActive" active-color="#044ed7" />
 		</view>
@@ -22,19 +32,17 @@
 				</uni-data-select>
 			</uni-forms-item>
 			<uni-forms-item label="施工开始时段" v-if="form.type==2">
-				<uni-datetime-picker type="date" :start="toadyStart" return-type="string" v-model="form.work_start_time" />
+				<uni-datetime-picker type="date" :start="toadyStart" return-type="string"
+					v-model="form.work_start_time" />
 			</uni-forms-item>
 			<uni-forms-item label="施工结束时段" v-if="form.type==2">
-				<uni-datetime-picker type="date" :start="toadyStart" return-type="string" v-model="form.work_end_time" />
+				<uni-datetime-picker type="date" :start="toadyStart" return-type="string"
+					v-model="form.work_end_time" />
+			</uni-forms-item>
+			<!-- <uni-forms-item label="车牌号" v-if="form.type==3"> -->
+			<uni-forms-item label="停车区域" required name="plate" v-if="form.type==3">
+				<uni-data-checkbox v-model="form.plate" :localdata="parkAreaList" :map="{text:'value',value:'value'}" />
 			</uni-forms-item>
-			<!-- <uni-forms-item label="车牌号" v-if="form.type==3"> -->
-				<uni-forms-item label="停车区域" required name="plate" v-if="form.type==3">
-					<uni-data-checkbox v-model="form.plate" :localdata="parkAreaList"
-						:map="{text:'value',value:'value'}" />
-				</uni-forms-item>
-				<!-- <uni-easyinput @tap="plateShow=true" disabled v-model.trim="form.plate" placeholder="请输入车牌号" />
-				<plate-input v-if="plateShow" :plate="form.plate" @export="setPlate" @close="plateShow = false" /> -->
-			<!-- </uni-forms-item> -->
 			<uni-forms-item label="备注">
 				<uni-easyinput type="textarea" v-model="form.remark" placeholder="请输入自我备注" />
 			</uni-forms-item>
@@ -56,9 +64,20 @@
 				<uni-easyinput v-model="form.company_name" placeholder="请输入单位名称" />
 			</uni-forms-item>
 			<uni-forms-item label="到访车辆">
-				<uni-easyinput disabled @tap="plateShow=true" v-model.trim="form.cars"
-					placeholder="请输入到访车辆" />
-				<plate-input v-if="plateShow" :plate="form.cars" @export="setCars" @close="plateShow = false" />
+				<view style="text-align: right;" v-if="form.type!=3">
+					<button style="background-color: #044ed7;" type="primary" size="mini"
+						@click="form.cars.push('')">新增车辆</button>
+				</view>
+
+				<view v-for='(item,index) in form.cars' class="justify-between align-center"
+					style="margin-bottom:20rpx">
+					<uni-easyinput disabled @tap="plateShow=true,carindex=index" v-model.trim="form.cars[index]"
+						placeholder="请输入到访车辆" />
+					<text v-if="form.type!=3" @click="form.cars.splice(index,1)"
+						style="color: red;margin-left:20rpx">删除</text>
+				</view>
+				<plate-input v-if="plateShow" :plate="form.cars[carindex]" @export="setCars"
+					@close="plateShow = false" />
 			</uni-forms-item>
 			<template v-if="form.type!=3">
 				<view class="formtext" style="display: flex;justify-content: space-between;">
@@ -78,15 +97,11 @@
 						</uni-tr>
 						<uni-tr style="vertical-align: middle;" v-for="(item, index) in form.follw_people" :key="index">
 							<uni-td>
-								<view class="uni-group">
-									<text @click="editFollwPeople(index)" style="color: #044ed7;margin-right:8px">修改</text>
-									<text @click="form.follw_people.splice(index,1)" style="color: red;margin-right:8px">删除</text>
-									
-									<!-- <button 
-										 class="uni-button" size="mini"
-										type="primary">修改</button> -->
-									<!-- <button class="uni-button" size="mini" type="warn"
-										@click="form.follw_people.splice(index,1)">删除</button> -->
+								<view class="uni-group">
+									<text @click="editFollwPeople(index)"
+										style="color: #044ed7;margin-right:8px">修改</text>
+									<text @click="form.follw_people.splice(index,1)"
+										style="color: red;margin-right:8px">删除</text>
 								</view>
 							</uni-td>
 							<uni-td>{{ item.name }}</uni-td>
@@ -105,7 +120,8 @@
 			</uni-forms-item>
 			<template v-if="form.long_time==1">
 				<uni-forms-item label="开始日期">
-					<uni-datetime-picker type="date" :start="toadyStart" return-type="string" v-model="form.start_date" />
+					<uni-datetime-picker type="date" :start="toadyStart" return-type="string"
+						v-model="form.start_date" />
 				</uni-forms-item>
 				<uni-forms-item label="结束日期">
 					<uni-datetime-picker type="date" :start="toadyStart" return-type="string" v-model="form.end_date" />
@@ -115,15 +131,17 @@
 			<uni-forms-item label="被访人" required name="acceptName">
 				<!-- <uni-data-select @focus="adminListShow=true" v-model="form.accept_admin_id" :localdata="adminList">
 				</uni-data-select> -->
-				<uni-easyinput @clear="clearAccept('accept')" disabled v-model="form.acceptName" @tap="adminListShowOpen('accept')" placeholder="请选择联系人员" />
+				<uni-easyinput @clear="clearAccept('accept')" disabled v-model="form.acceptName"
+					@tap="adminListShowOpen('accept')" placeholder="请选择联系人员" />
 				<qianziyu-select :show="adminListShow" type="radio" :popupTitle="'联系人员'" name="cworkStationName"
-					:dataLists="adminList" placeholder="输入被访人具体姓名搜索" @search="selectSearch"
-					@submit="submitAccept" @cancel="cancelAccept"/>
+					:dataLists="adminList" placeholder="输入被访人具体姓名或手机号搜索" @search="selectSearch" @submit="submitAccept"
+					@cancel="cancelAccept" />
 			</uni-forms-item>
 			<uni-forms-item label="收货人" v-if="form.type==3" required name="goodsName">
 				<!-- <uni-data-select v-model="form.accept_goods_admin_id" :localdata="adminList">
 				</uni-data-select> -->
-				<uni-easyinput @clear="clearAccept('goods')" disabled v-model="form.goodsName" @tap="adminListShowOpen('goods')" placeholder="请选择联系人员" />
+				<uni-easyinput @clear="clearAccept('goods')" disabled v-model="form.goodsName"
+					@tap="adminListShowOpen('goods')" placeholder="请选择联系人员" />
 			</uni-forms-item>
 		</uni-forms>
 		<button type="primary" style="background-color: #044ed7;" @click="saveFormgoStudy">{{goStudy}}</button>
@@ -153,6 +171,7 @@
 					style="background-color: #044ed7;margin-left:8px">确认</button>
 			</view>
 		</uni-drawer>
+
 	</view>
 
 </template>
@@ -175,7 +194,11 @@
 					title: '完成'
 				}],
 				stepActive: 0,
+				configshow: true,
+				configInfo: {},
+				configKey: "ptfk",
 				toadyStart: '',
+				carindex: 0,
 				plateShow: false,
 				adminListShow: false,
 				adminKeyword: '',
@@ -195,15 +218,15 @@
 					credent: 1,
 					idcard: "",
 					company_name: "",
-					cars: "",
+					cars: [''],
 					follw_people: [],
 					long_time: 0,
 					start_date: "",
 					end_date: "",
 					accpet_department_id: "",
 					accept_admin_id: "",
-					accept_goods_admin_id: "",
-					acceptName: "",
+					accept_goods_admin_id: "",
+					acceptName: "",
 					goodsName: '',
 				},
 				follw_people_obj: {
@@ -231,12 +254,12 @@
 							required: true,
 							errorMessage: '请选择前往区域'
 						}]
-					},
-					plate: {
-						rules: [{
-							required: true,
-							errorMessage: '请选择停车区域'
-						}]
+					},
+					plate: {
+						rules: [{
+							required: true,
+							errorMessage: '请选择停车区域'
+						}]
 					},
 					name: {
 						rules: [{
@@ -273,18 +296,18 @@
 							required: true,
 							errorMessage: '单位名称不能为空'
 						}]
-					},
-					acceptName:{
-						rules: [{
-							required: true,
-							errorMessage: '请选择被访人'
-						}]
-					},
-					goodsName:{
-						rules: [{
-							required: true,
-							errorMessage: '请选择收货人'
-						}]
+					},
+					acceptName: {
+						rules: [{
+							required: true,
+							errorMessage: '请选择被访人'
+						}]
+					},
+					goodsName: {
+						rules: [{
+							required: true,
+							errorMessage: '请选择收货人'
+						}]
 					}
 				},
 				peoplerules: {
@@ -322,8 +345,8 @@
 				// 单选数据源
 				visitTime: [],
 				visitArea: [],
-				reasonList: [],
-				parkAreaList:[],
+				reasonList: [],
+				parkAreaList: [],
 				credentList: [{
 						value: 1,
 						text: "身份证"
@@ -347,44 +370,51 @@
 			}
 		},
 		onLoad(options) {
+			// uni.navigateTo({
+			// 	url:'/pages/visit/testStudy?type=1'
+			// })
+			// return
 			this.toadyStart = new Date()
 			this.form.type = options.type
+			this.configKey = options.type == 1 ? 'ptfk' : (options.type == 2 ? 'sgfk' : 'wlcl')
 			this.isCall = options.iscall ? options.iscall : ''
 			this.goStudy = this.isCall == 'call' ? '提交' : '去学习'
 			this.form.audit_status = this.isCall == 'call' ? 1 : 0
+			this.getConfig()
 			this.getVisitArea()
 			this.getVisitTime()
-			this.getReason()
+			this.getReason()
 			this.getPark()
 			// this.getAdminList()
 		},
 		onReady() {},
 		methods: {
+
 			adminListShowOpen(type) {
 				this.acceptType = type
 				this.adminKeyword = ""
-				// this.getAdminList()
-				
+				// this.getAdminList()
+
 				this.adminListShow = true
 			},
-			cancelAccept() {
+			cancelAccept() {
 				console.log('123')
-				this.adminKeyword = ""
+				this.adminKeyword = ""
 				this.adminList = []
 				this.adminListShow = false
 			},
 			selectSearch(e) {
 				this.adminKeyword = e
 				this.getAdminList()
-			},
-			clearAccept(type){
-				if (type == 'accept') {
-					this.form.accept_admin_id = ''
-					this.form.acceptName = ''
-				} else {
-					this.form.accept_goods_admin_id = ''
-					this.form.goodsName = ''
-				}
+			},
+			clearAccept(type) {
+				if (type == 'accept') {
+					this.form.accept_admin_id = ''
+					this.form.acceptName = ''
+				} else {
+					this.form.accept_goods_admin_id = ''
+					this.form.goodsName = ''
+				}
 			},
 			submitAccept(e) {
 				if (this.acceptType == 'accept') {
@@ -397,15 +427,38 @@
 				this.adminListShow = false
 			},
 			setCars(e) {
-				this.form.cars = e
+				this.form.cars[this.carindex] = e
 				this.plateShow = false
-				console.log(e)
+				console.log(e, this.carindex)
 			},
-			setPlate(e) {
-				this.form.plate = e
-				this.plateShow = false
+
+			closeConfig() {
+				this.configshow = false
+			},
+			async getConfig() {
+				let that = this
+				// util.request()
+				this.util.request({
+					api: '/api/admin/config/index',
+					data: {
+						page: 1,
+						page_size: 99
+					},
+					requestType: 'bd',
+					utilSuccess: function(res) {
+						console.log(res)
+						let data = res.data
+						for (let k of data) {
+							if (k.key == that.configKey) {
+								that.configInfo = k
+							}
+						}
+					},
+					utilFail: function(res) {}
+				})
 			},
 			// 获取单选数据
+
 			async getVisitArea() {
 				let that = this
 				// util.request()
@@ -457,20 +510,20 @@
 					},
 					utilFail: function(res) {}
 				})
-			},
-			async getPark() {
-				let that = this
-				// util.request()
-				this.util.request({
-					api: '/api/admin/parameter/show',
-					data: {
-						number: 'parkArea'
-					},
-					utilSuccess: function(res) {
-						that.parkAreaList = res.detail
-					},
-					utilFail: function(res) {}
-				})
+			},
+			async getPark() {
+				let that = this
+				// util.request()
+				this.util.request({
+					api: '/api/admin/parameter/show',
+					data: {
+						number: 'parkArea'
+					},
+					utilSuccess: function(res) {
+						that.parkAreaList = res.detail
+					},
+					utilFail: function(res) {}
+				})
 			},
 			async getAdminList() {
 				let that = this
@@ -590,4 +643,18 @@
 	/deep/ .uni-drawer__content {
 		padding: 40rpx
 	}
+	.configtitle {
+		font-size: 50rpx;
+		text-align: center;
+		padding: 20rpx 0;
+	}
+	.configvalue {
+		padding: 40rpx;
+		font-size: 36rpx;
+		height: 600rpx;
+		overflow-y: auto;
+	}
+	/deep/ .u-popup__content__close .u-icon__icon{
+		color:#fff!important
+	}
 </style>
\ No newline at end of file
diff --git a/pages/visit/detail.vue b/pages/visit/detail.vue
index 686624c..fa6c811 100644
--- a/pages/visit/detail.vue
+++ b/pages/visit/detail.vue
@@ -62,10 +62,15 @@
 				<template>
 					<view class="dbtext">到访车辆</view>
 					<view class="dbitem sfyritem">
-						<view class="dbinfo">
-							<view class="onechild">
-								车牌：<text>{{info.cars}}</text>
+						<view class="dbinfo dbcars" v-if="info.cars">
+							<view class="onechild" v-for="item in info.cars">
+								车牌：<text>{{item}}</text>
 							</view>
+						</view>
+						<view class="dbinfo dbcars" v-else>
+							<view class="onechild">
+								无
+							</view>
 						</view>
 					</view>
 				</template>
@@ -268,7 +273,10 @@
 		font-size: 40rpx;
 		padding-left: 30rpx
 	}
-
+	.dbcars>view{
+		width:100%;
+		padding-left:0
+	}
 	.sfyritem {
 		padding-bottom: 10rpx
 	}
diff --git a/pages/visit/study.vue b/pages/visit/study.vue
index eeaf2df..9eded1a 100644
--- a/pages/visit/study.vue
+++ b/pages/visit/study.vue
@@ -208,7 +208,7 @@
 	}
 	.service-show .changePicVideo{
 		    position: absolute;
-		    right: 10rpx;
+		    right: 80rpx;
 		    bottom: 25rpx;
 	}
 	.service-show .changePicVideo view{
diff --git a/pages/visit/successform.vue b/pages/visit/successform.vue
index 341d7bd..4da8999 100644
--- a/pages/visit/successform.vue
+++ b/pages/visit/successform.vue
@@ -21,7 +21,8 @@
 			}
 		},
 		onLoad(options) {
-			this.iscall=options.iscall?true:false
+			this.iscall=options.iscall?true:false
+
 		},
 		methods: {
 			toHistory() {
diff --git a/pages/visit/testStudy.vue b/pages/visit/testStudy.vue
index 780f545..6e70240 100644
--- a/pages/visit/testStudy.vue
+++ b/pages/visit/testStudy.vue
@@ -143,10 +143,17 @@
 							duration: 2000,
 							icon: 'none'
 						})
-						uni.removeStorageSync('formdata')
-						uni.redirectTo({
-							url:'/pages/visit/successform'
-						})
+						// wx.requestSubscribeMessage({
+						//   tmplIds: ['IczaKkCmwf55tAAzCcxb_fbbf5L25SWrSKvaBrkIyk4'],
+						//   success (res) { 
+						// 	  console.log("res",res)
+						// 	  uni.removeStorageSync('formdata')
+						// 	  uni.redirectTo({
+						// 	  	url:'/pages/visit/successform'
+						// 	  })
+						//   }
+						// })
+						
 					},
 					utilFail: function(res) {
 						uni.showToast({