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 @@
+ 陪同人员
+
+
+
+ 部门:{{info.accompany.department.name}}
+
+
+ 人员:{{info.accompany.name}}
+
+
+
签字
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 @@
{{item.audit_status_text}}
-
+
访问时间:{{item.date}}
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 @@
-
- 被访人信息
-
-
-
+
+ 被访人信息
+
+
+
+ 陪同人信息
+
+
+
+ 收货人信息
+
@@ -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 @@
+ 陪同人员
+
+
+
+ 部门:{{info.accompany.department.name}}
+
+
+ 人员:{{info.accompany.name}}
+
+
+
签字