diff --git a/pages/bd/bddetail.vue b/pages/bd/bddetail.vue
index fd462ce..5566726 100644
--- a/pages/bd/bddetail.vue
+++ b/pages/bd/bddetail.vue
@@ -8,127 +8,203 @@
{{info.audit_status_text}}
- 访问时间:{{info.date}}
+ 访问时间:{{info.date}}
{{info.visit_time.start_time}}至{{info.visit_time.end_time}}
-
+
施工时段:{{info.work_start_time}}至{{info.work_end_time}}
-
-
- 被访人:{{info.accept_admin.name}}
- 部门:{{info.accept_admin.department.name}}
- 访问区域:{{info.visit_area.name}}
-
-
- 拜访人:{{info.name}}
- 电话:{{info.mobile}}
- 事由:{{info.reason}}
- 车牌:{{info.plate}}
-
-
-
- 长期访客申请:{{info.long_time==0?'否':'是'}}
- 长期访问时间:{{info.start_date}} 至 {{info.end_date}}
-
-
+
+
+ 被访人:{{info.accept_admin.name}}
+ 部门:{{info.accept_admin.department.name}}
+ 访问区域:{{info.visit_area.name}}
+
+
+ 拜访人:{{info.name}}
+ 电话:{{info.mobile}}
+ 事由:{{info.reason}}
+ 车牌:{{info.plate}}
+
+
+
+ 长期访客申请:{{info.long_time==0?'否':'是'}}
+ 长期访问时间:{{info.start_date}} 至 {{info.end_date}}
+
+
+
+
+
+ 随访人员
+
+
+
+
+
+ 随访人:{{people.name}}
+
+ 证件类型:{{people.credent_name}}
+ 证件号:{{people.idcard}}
+
+
+ 电话:{{people.mobile}}
+
+
+
+
+
+ 无
+
+
+
+
+
+
+ 到访车辆
+
+
+
+ 车牌:{{info.cars}}
+
+
+
+
+
+ 收货人
+
+
+
+ 部门:{{info.accept_goods_admin.department.name}}
+
+
+ 人员:{{info.accept_goods_admin.name}}
+
+
+
+
+ 被访人员
+
+
+
+ 部门:{{info.accept_admin.department.name}}
+
+
+ 人员:{{info.accept_admin.name}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{check_admin_name}}
+
+
+
+
+
+
+
+
-
- 随访人员
-
-
-
-
-
- 随访人:{{people.name}}
-
- 证件类型:{{people.credent_name}}
- 证件号:{{people.idcard}}
-
-
- 电话:{{people.mobile}}
-
-
-
-
-
- 无
-
-
-
-
-
-
- 到访车辆
-
-
-
- 车牌:{{info.cars}}
-
-
-
-
-
-
- 收货人
-
-
-
- 部门:{{info.accept_goods_admin.department.name}}
-
-
- 人员:{{info.accept_goods_admin.name}}
-
-
-
-
- 被访人员
-
-
-
- 部门:{{info.accept_admin.department.name}}
-
-
- 人员:{{info.accept_admin.name}}
-
-
-
+
-
+
-
diff --git a/pages/bd/mine.vue b/pages/bd/mine.vue
index c6d38f5..aeb9d58 100644
--- a/pages/bd/mine.vue
+++ b/pages/bd/mine.vue
@@ -187,7 +187,6 @@
method: "POST",
requestType: 'bd',
utilSuccess: function(res) {
- console.log(res)
that.userName = res.name
that.userEmail = res.email
uni.showToast({
@@ -196,9 +195,10 @@
icon: 'none'
})
},
- utilFail: function(res) {
+ utilFail: function(res) {
+ console.log("resss",res)
uni.showToast({
- title: res.errmsg,
+ title: res,
duration: 2000,
icon: 'none'
})
diff --git a/pages/bd/record.vue b/pages/bd/record.vue
index 38d1496..7b7354d 100644
--- a/pages/bd/record.vue
+++ b/pages/bd/record.vue
@@ -77,12 +77,20 @@
page: 1,
page_size: 5,
total: 0,
- audit_status: 0
+ audit_status: '',
+ my_self:0,
+ my_audit:0,
+ my_accept_admin:0
},
- isEmpty:false,
+ isEmpty:false,
+ recordType:""
}
},
- onLoad() {
+ onLoad(options) {
+ this.recordType = options.type
+ this.select.my_audit = this.recordType=='mycheck'?1:0
+ this.select.my_self = this.recordType=='call'?1:0
+ this.select.my_accept_admin = this.recordType=='myrecord'?1:0
this.loadList()
},
onPullDownRefresh() {
@@ -126,10 +134,11 @@
api: '/api/admin/visit/index',
method: "get",
requestType: "bd",
- data: {
+ data: {
+ ...this.select,
page: this.select.page,
- page_size: this.select.page_size,
- audit_status: this.select.audit_status
+ // page_size: this.select.page_size,
+ // audit_status: this.select.audit_status
},
utilSuccess: function(res) {
if(res.total==0){
diff --git a/pages/visit/addrecord.vue b/pages/visit/addrecord.vue
index 2d89a50..a7f463c 100644
--- a/pages/visit/addrecord.vue
+++ b/pages/visit/addrecord.vue
@@ -234,16 +234,16 @@
value: '是'
}],
adminList: [],
- isCall:'',
+ isCall:'', // 是否待邀约
goStudy:'去学习'
}
},
onLoad(options) {
this.form.type = options.type
- this.isCall = options.iscall
+ this.isCall = options.iscall?options.iscall:''
this.goStudy = this.isCall=='call'?'提交':'去学习'
- this.form.audit_status = 1
+ this.form.audit_status = this.isCall=='call'?1:0
this.getVisitArea()
this.getVisitTime()
this.getReason()
@@ -369,8 +369,9 @@
submitForm() {
let that = this
this.util.request({
- api: '/api/mobile/visit/visit-save',
+ api: '/api/admin/visit/save',
method: "POST",
+ requestType:'bd',
data: that.form,
utilSuccess: function(res) {
uni.showToast({
@@ -378,9 +379,9 @@
duration: 2000,
icon: 'none'
})
- uni.removeStorageSync('formData')
+ // uni.removeStorageSync('formData')
uni.navigateTo({
- url:'/pages/visit/successform'
+ url:'/pages/visit/successform?iscall=call'
})
},
utilFail: function(res) {
diff --git a/pages/visit/detail.vue b/pages/visit/detail.vue
index fc95ca8..43ba95a 100644
--- a/pages/visit/detail.vue
+++ b/pages/visit/detail.vue
@@ -1,4 +1,5 @@
+
@@ -8,126 +9,198 @@
{{info.audit_status_text}}
- 访问时间:{{info.date}}
+ 访问时间:{{info.date}}
{{info.visit_time.start_time}}至{{info.visit_time.end_time}}
-
+
施工时段:{{info.work_start_time}}至{{info.work_end_time}}
-
-
- 被访人:{{info.accept_admin.name}}
- 部门:{{info.accept_admin.department.name}}
- 访问区域:{{info.visit_area.name}}
-
-
- 拜访人:{{info.name}}
- 电话:{{info.mobile}}
- 事由:{{info.reason}}
- 车牌:{{info.plate}}
-
-
-
- 长期访客申请:{{info.long_time==0?'否':'是'}}
- 长期访问时间:{{info.start_date}} 至 {{info.end_date}}
-
-
+
+
+ 被访人:{{info.accept_admin.name}}
+ 部门:{{info.accept_admin.department.name}}
+ 访问区域:{{info.visit_area.name}}
+
+
+ 拜访人:{{info.name}}
+ 电话:{{info.mobile}}
+ 事由:{{info.reason}}
+ 车牌:{{info.plate}}
+
+
+
+ 长期访客申请:{{info.long_time==0?'否':'是'}}
+ 长期访问时间:{{info.start_date}} 至 {{info.end_date}}
+
+
-
- 随访人员
-
-
-
-
-
- 随访人:{{people.name}}
-
- 证件类型:{{people.credent_name}}
- 证件号:{{people.idcard}}
-
-
- 电话:{{people.mobile}}
-
-
-
-
-
- 无
-
-
-
-
-
-
- 到访车辆
-
-
-
- 车牌:{{info.cars}}
-
-
-
-
-
-
- 收货人
-
-
-
- 部门:{{info.accept_goods_admin.department.name}}
-
-
- 人员:{{info.accept_goods_admin.name}}
-
-
-
-
- 被访人员
-
-
-
- 部门:{{info.accept_admin.department.name}}
-
-
- 人员:{{info.accept_admin.name}}
-
-
-
+
+ 随访人员
+
+
+
+
+
+ 随访人:{{people.name}}
+
+ 证件类型:{{people.credent==1?'身份证':'护照'}}
+ 证件号:{{people.idcard}}
+
+
+ 电话:{{people.mobile}}
+
+
+
+
+
+ 无
+
+
+
+
+
+
+ 到访车辆
+
+
+
+ 车牌:{{info.cars}}
+
+
+
+
+
+
+ 收货人
+
+
+
+ 部门:{{info.accept_goods_admin.department.name}}
+
+
+ 人员:{{info.accept_goods_admin.name}}
+
+
+
+
+ 被访人员
+
+
+
+ 部门:{{info.accept_admin.department.name}}
+
+
+ 人员:{{info.accept_admin.name}}
+
+
+
+
+
+
+
+
+
+
-
+
+
+
+
+
+ 核销码:{{info.code}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 是否确认取消此次拜访?
+
+
+
+
+
+
+
-
diff --git a/pages/visit/successform.vue b/pages/visit/successform.vue
index e2b5967..bc0d396 100644
--- a/pages/visit/successform.vue
+++ b/pages/visit/successform.vue
@@ -2,8 +2,8 @@
- 提交成功,等待审核
- 审核通过后,系统将在第一时间通知你
+ 提交成功{{!iscall?',等待审核':''}}
+ 审核通过后,系统将在第一时间通知你
@@ -15,16 +15,22 @@
export default {
data() {
return {
- succ: require('../../static/img/success.png')
+ succ: require('../../static/img/success.png'),
+ iscall:false
+
}
},
- onLoad() {
-
+ onLoad(options) {
+ this.iscall=options.iscall?true:false
},
methods: {
- toHistory() {
+ toHistory() {
+ let url = '/pages/visit/visithistory'
+ if(this.iscall){
+ url = '/pages/bd/record?type=call'
+ }
uni.navigateTo({
- url: '/pages/visit/visithistory'
+ url: url
})
}
}
diff --git a/utils/util.js b/utils/util.js
index 08ec418..e4516e1 100755
--- a/utils/util.js
+++ b/utils/util.js
@@ -210,10 +210,17 @@ const request = options => {
}
}
} else {
-
if (res.data.hasOwnProperty("errcode")) {
- if (options.utilFail != undefined) {
- options.utilFail(res.data.errmsg || '接口发生未知错误');
+ if (options.utilFail != undefined) {
+ options.utilFail(res.data.errmsg || '接口发生未知错误');
+ // setTimeout(function(){
+ // if(res.data.errcode==40001){
+ // uni.clearStorageSync();
+ // uni.navigateTo({
+ // url: '/pages/index/index'
+ // });
+ // }
+ // },1000)
} else {
options.utilFail(res.data.errmsg);
}