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 @@
-
+
+
+
+
@@ -99,7 +102,7 @@
随访人员
+ @click="$refs.showRight.open(),follw_people_obj={credent:1},follow_people_index=-1">新增随访人员
@@ -173,8 +176,11 @@
:localdata="credentList">
-
+
+
+
+
@@ -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,