From 02cb47bef10bafc3a591f160f0b286df529c704a Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期五, 12 四月 2024 15:10:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/1.0.1' into 1.0.1
---
wx/pages/new_report/new_report.vue | 11 +++++++++--
1 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/wx/pages/new_report/new_report.vue b/wx/pages/new_report/new_report.vue
index 08f04f3..a913e29 100644
--- a/wx/pages/new_report/new_report.vue
+++ b/wx/pages/new_report/new_report.vue
@@ -34,10 +34,10 @@
<view class="box_list">
<view class="box_list_Label">浜嬫晠淇℃伅</view>
<view class="box_list_from">
- <u-form-item label="灏辫瘖鍖荤枟鏈烘瀯锛�" prop="hospital" borderBottom>
+ <u-form-item label="灏辫瘖鍖荤枟鏈烘瀯锛�" prop="hospital" borderBottom v-if="!id">
<u--input v-model="model.hospital" placeholder="璇疯緭鍏ュ氨璇婂尰鐤楁満鏋勫悕绉�" border="none"></u--input>
</u-form-item>
- <u-form-item label="浜嬫晠鏃堕棿锛�" prop="happenTime" borderBottom required @click="show1 = true">
+ <u-form-item label="浜嬫晠鏃堕棿锛�" prop="happenTime" borderBottom required v-if="!id" @click="show1 = true">
<u--input v-model="model.happenTime" disabled disabledColor="#ffffff" placeholder="璇烽�夋嫨浜嬫晠鍙戠敓鏃堕棿" border="none"></u--input>
<u-icon slot="right" name="arrow-right"></u-icon>
</u-form-item>
@@ -205,6 +205,9 @@
onLoad(option) {
this.id = option.id
if (this.id) {
+ uni.setNavigationBarTitle({
+ title: '缂栬緫鎶ユ'
+ })
this.getDetails()
this.getArea()
this.getUser()
@@ -275,6 +278,7 @@
.then(res => {
if (res.code === 200) {
uni.showToast({ title: '鎻愪氦鎴愬姛', icon: 'success' })
+ uni.$emit('update')
setTimeout(() => {
uni.navigateBack({ delta: 1 });
}, 1500)
@@ -305,6 +309,9 @@
memberId: this.model.memberId
}).then(res => {
if (res.code === 200) {
+ res.data.forEach(item => {
+ item.solutionName = '(' + item.startTime.substring(5, 10).replace('-', '.') + '-' + item.endTime.substring(5, 10).replace('-', '.') + ')' + item.solutionName
+ })
this.columns3 = [res.data]
this.show5 = true
}
--
Gitblit v1.9.3