From 9ab5feb38bf6db6d02b9403dd61bee5ab49a79c9 Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Tue, 09 Jan 2024 19:50:19 +0800
Subject: [PATCH] Merge branch 'master' of http://s16s652780.51mypc.cn:49896/r/jczz_app
---
subPackage/workbench/views/bailReportDetail.vue | 27 +++++++++++++++++++++++----
1 files changed, 23 insertions(+), 4 deletions(-)
diff --git a/subPackage/workbench/views/bailReportDetail.vue b/subPackage/workbench/views/bailReportDetail.vue
index 4d96ef3..8be5701 100644
--- a/subPackage/workbench/views/bailReportDetail.vue
+++ b/subPackage/workbench/views/bailReportDetail.vue
@@ -22,7 +22,7 @@
<u-form-item label="审核结果" prop="confirmFlag" borderBottom>
<u-input v-model="confirmFlag" disabled disabledColor="#ffffff" border="none" placeholder="请输入"
placeholderClass="f-28 c-99" inputAlign="right"></u-input>
- <u-icon slot="right" name="arrow-right"></u-icon>
+ <!-- <u-icon slot="right" name="arrow-right"></u-icon> -->
</u-form-item>
<u-form-item label="备注" borderBottom v-if="info.confirmNotion">
<u--input type="textarea" v-model="info.confirmNotion" :disabled="true" disabledColor="#ffffff"
@@ -41,7 +41,7 @@
</u-form>
</view>
- <view v-if="status == 2 && roleType == 2">
+ <view v-if="status == 2">
<u-subsection :list="tabList" :current="tabIndex" button-color="#017BFC" @change="changeTab"></u-subsection>
<u-form labelPosition="left" :model="goOutInfo" ref="form" labelWidth="100"
:labelStyle="{fontSize:'28rpx'}">
@@ -269,7 +269,7 @@
},
showPickerDate() {
- if (this.roleType == 2 && this.status != 1) return;
+ if (this.roleType == 1 && this.status != 1) return;
this.showSelectDate = true;
},
cancelPickerDate() {
@@ -353,12 +353,17 @@
this.info.confirmFlag = data.confirmFlag;
this.info.confirmUserName = data.confirmUserName;
this.info.confirmUserTelephone = data.confirmUserTelephone;
+ for (let i in this.goOutInfo) {
+ this.goOutInfo[i] = data[i];
+ }
+ this.startImageUrls = this.$setImageUrl(data.startImageUrls, 2);
+ this.reachImageUrls = this.$setImageUrl(data.reachImageUrls, 2);
+ this.returnImageUrls = this.$setImageUrl(data.returnImageUrls, 2);
}
this.basicData.forEach(item => {
item.value = data[item.name]
})
this.locationImageUrls = this.$setImageUrl(data.locationImageUrls);
-
})
},
@@ -397,6 +402,20 @@
submit(val) {
if (this.roleType == 1) {
+ if (!this.info.confirmUserName) {
+ uni.showToast({
+ title: "请输入审核人员姓名",
+ icon: "none"
+ })
+ return
+ }
+ if (!this.info.confirmUserTelephone) {
+ uni.showToast({
+ title: "请输入审核人员手机号",
+ icon: "none"
+ })
+ return;
+ }
this.info.confirmFlag = val.type;
this.info.confirmNotion = val.remark;
this.submitRequest(this.info);
--
Gitblit v1.9.3