diff --git a/src/project/pingchang/AppCheckpointRegistration/ChangeUser.vue b/src/project/pingchang/AppCheckpointRegistration/ChangeUser.vue new file mode 100644 index 00000000..2db78769 --- /dev/null +++ b/src/project/pingchang/AppCheckpointRegistration/ChangeUser.vue @@ -0,0 +1,260 @@ + + + + + diff --git a/src/project/pingchang/AppCheckpointRegistration/ManagementContent.vue b/src/project/pingchang/AppCheckpointRegistration/ManagementContent.vue index 1e244dcb..15cdb0b3 100644 --- a/src/project/pingchang/AppCheckpointRegistration/ManagementContent.vue +++ b/src/project/pingchang/AppCheckpointRegistration/ManagementContent.vue @@ -98,7 +98,7 @@ -
+
*移交对象 @@ -215,19 +215,19 @@ export default { // return this.$u.toast('请选择管控方式') // } - if(this.form.handleType == 6 && this.form.handoverObject === '') { + if([2, 6].includes(this.form.handleType) && this.form.handoverObject === '') { return this.$u.toast('请选择移交对象') } - if(this.form.handleType == 6 && this.form.handoverMethod === '') { + if([2, 6].includes(this.form.handleType) && this.form.handoverMethod === '') { return this.$u.toast('请选择移交方式') } - if(this.form.handleType == 6 && !this.form.handoverPersonName) { + if([2, 6].includes(this.form.handleType) && !this.form.handoverPersonName) { return this.$u.toast('请输入交接人姓名') } // if(this.form.handleType == 6 && this.form.handoverPersonPhone && !/^1[0-9]{10,10}$/.test(this.form.handoverPersonPhone)) { // return this.$u.toast("请输入正确的手机号码"); // } - if(this.form.handleType == 6 && !this.form.fileList.length) { + if([2, 6].includes(this.form.handleType) && !this.form.fileList.length) { return this.$u.toast('请上传交接图片') } diff --git a/src/project/pingchang/AppCheckpointRegistration/ManagementHistory.vue b/src/project/pingchang/AppCheckpointRegistration/ManagementHistory.vue index 7f3d99c3..6db79d98 100644 --- a/src/project/pingchang/AppCheckpointRegistration/ManagementHistory.vue +++ b/src/project/pingchang/AppCheckpointRegistration/ManagementHistory.vue @@ -111,7 +111,7 @@
@@ -177,6 +177,10 @@ export default { current: img }) }, + + toChangeUser() { //放行居家隔离 转交人员 + uni.navigateTo({url: './ChangeUser?delta=4'}) + } }, } diff --git a/src/project/pingchang/AppCheckpointRegistration/UserInfo.vue b/src/project/pingchang/AppCheckpointRegistration/UserInfo.vue index ba83a093..065cc059 100644 --- a/src/project/pingchang/AppCheckpointRegistration/UserInfo.vue +++ b/src/project/pingchang/AppCheckpointRegistration/UserInfo.vue @@ -222,6 +222,7 @@
+
@@ -274,6 +275,10 @@ export default { toContent() { var haveHomeQuarantineBtn = this.info.haveHomeQuarantineBtn ? 1 : 0 uni.navigateTo({url: `./ManagementContent?id=${this.id}&idNumber=${this.info.idNumber}&haveHomeQuarantineBtn=${haveHomeQuarantineBtn}`}) + }, + toChangeUser() { + uni.setStorageSync('checkPointContent', this.info) + uni.navigateTo({url: './ChangeUser?delta=1'}) } }, }