From 3d087ee39d26559acff14e001ecc5069b2aba281 Mon Sep 17 00:00:00 2001
From: lion <120344285@qq.com>
Date: Fri, 28 Apr 2023 12:49:12 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=A1=E6=A0=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/bd/bddetail.vue     | 11 +++++----
 pages/visit/addrecord.vue | 48 ++++++++++++++++++++++++++++++++-------
 2 files changed, 46 insertions(+), 13 deletions(-)

diff --git a/pages/bd/bddetail.vue b/pages/bd/bddetail.vue
index 689fdff..f11a8c4 100644
--- a/pages/bd/bddetail.vue
+++ b/pages/bd/bddetail.vue
@@ -245,11 +245,12 @@
 									that.isCheck = true
 									return
 								}else{
-									that.checkLevel.map(item1=>{
-										if(item.level==item1.id){
-											that.checkText = item1.value
-										}
-									})
+									that.checkText = "请等待"+item.audit_admin.name+"审核"
+									// that.checkLevel.map(item1=>{
+									// 	if(item.level==item1.id){
+									// 		that.checkText = item1.value
+									// 	}
+									// })
 									that.isCheck = false
 									return
 								}
diff --git a/pages/visit/addrecord.vue b/pages/visit/addrecord.vue
index 75a2390..331dedc 100644
--- a/pages/visit/addrecord.vue
+++ b/pages/visit/addrecord.vue
@@ -57,8 +57,11 @@
 				<uni-data-select v-model="form.credent" :localdata="credentList">
 				</uni-data-select>
 			</uni-forms-item>
-			<uni-forms-item label="证件号码" required name="idcard">
+			<uni-forms-item label="证件号码" required name="idcard" v-if="form.credent==1">
 				<uni-easyinput type="idcard" v-model="form.idcard" placeholder="请输入证件号码" />
+			</uni-forms-item>
+			<uni-forms-item label="护照号码" required name="passcard" v-if="form.credent==2">
+				<uni-easyinput type="text" v-model="form.passcard" placeholder="请输入证件号码" />
 			</uni-forms-item>
 			<uni-forms-item label="单位名称" required name="company_name">
 				<uni-easyinput v-model="form.company_name" placeholder="请输入单位名称" />
@@ -99,7 +102,7 @@
 				<view class="formtext" style="display: flex;justify-content: space-between;">
 					<text>随访人员</text>
 					<button style="background-color: #044ed7;" type="primary" size="mini"
-						@click="$refs.showRight.open(),follw_people_obj={},follow_people_index=-1">新增随访人员</button>
+						@click="$refs.showRight.open(),follw_people_obj={credent:1},follow_people_index=-1">新增随访人员</button>
 				</view>
 				<!-- 随访人员表格 -->
 				<template>
@@ -173,8 +176,11 @@
 						:localdata="credentList">
 					</uni-data-select>
 				</uni-forms-item>
-				<uni-forms-item label="证件号码" required name='idcard'>
+				<uni-forms-item label="证件号码" required name='idcard' v-if="follw_people_obj.credent==1">
 					<uni-easyinput type="idcard" v-model="follw_people_obj.idcard" placeholder="请输入证件号码" />
+				</uni-forms-item>
+				<uni-forms-item label="护照号码" required name='passcard' v-if="follw_people_obj.credent==2">
+					<uni-easyinput type="text" v-model="follw_people_obj.passcard" placeholder="请输入证件号码" />
 				</uni-forms-item>
 			</uni-forms>
 			<view class="uni-group" style="text-align: right;">
@@ -228,7 +234,8 @@
 					name: "",
 					mobile: "",
 					credent: 1,
-					idcard: "",
+					idcard: "",
+					passcard:"",
 					company_name: "",
 					cars: [],
 					follw_people: [],
@@ -302,6 +309,15 @@
 							pattern: '^[1-9]\\d{5}(18|19|20)\\d{2}((0[1-9])|(1[0-2]))(([0-2][1-9])|10|20|30|31)\\d{3}[0-9Xx]',
 							errorMessage: '身份证格式错误'
 						}]
+					},
+					passcard:{
+						rules: [{
+							required: true,
+							errorMessage: '护照号码不能为空'
+						}, {
+							pattern: '/^([a-zA-z]|[0-9]){5,17}$/',
+							errorMessage: '护照格式错误'
+						}]
 					},
 					company_name: {
 						rules: [{
@@ -358,6 +374,15 @@
 							pattern: '^[1-9]\\d{5}(18|19|20)\\d{2}((0[1-9])|(1[0-2]))(([0-2][1-9])|10|20|30|31)\\d{3}[0-9Xx]',
 							errorMessage: '身份证格式错误'
 						}]
+					},
+					passcard:{
+						rules: [{
+							required: true,
+							errorMessage: '护照号码不能为空'
+						}, {
+							pattern: '/^([a-zA-z]|[0-9]){5,17}$/',
+							errorMessage: '护照格式错误'
+						}]
 					}
 				},
 				// 单选数据源
@@ -607,7 +632,10 @@
 				this.$refs.showRight.close()
 			},
 			pushFollowPeople() {
-				console.log('this.follw_people_obj', this.follw_people_obj)
+				console.log('this.follw_people_obj', this.follw_people_obj)
+				if(this.follw_people_obj.credent==2){
+					this.follw_people_obj.idcard = this.follw_people_obj.passcard
+				}
 				this.$refs['peopleform'].validate().then(res => {
 					if (this.follow_people_index > -1) {
 						this.form.follw_people[this.follow_people_index] = this.follw_people_obj
@@ -625,8 +653,12 @@
 			},
 			// 去学习
 			saveFormgoStudy() {
-				console.log("form", this.form)
-				this.$refs['formdata'].validate().then(res => {
+				if(this.form.credent==2){
+					this.form.idcard = this.form.passcard
+				}
+				this.$refs['formdata'].validate().then(res => {
+					console.log("form", this.form)
+					// return
 					if (this.isCall === 'call') {
 						this.submitForm()
 						return
@@ -676,7 +708,7 @@
 				this.util.request({
 					api: '/api/mobile/visit/visit-save',
 					method: "POST",
-					data: that.formData,
+					data: that.form,
 					utilSuccess: function(res) {
 						uni.showToast({
 							title: res.msg,