From 77946261ec663aa1fe7f6f97e550532ed879f982 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 06 六月 2025 13:47:46 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0.1' into 2.0.1
---
h5/pages/workOrder/edit.vue | 50 +++++++++++++++++++++++++++-----------------------
1 files changed, 27 insertions(+), 23 deletions(-)
diff --git a/h5/pages/workOrder/edit.vue b/h5/pages/workOrder/edit.vue
index ff72df9..653c56c 100644
--- a/h5/pages/workOrder/edit.vue
+++ b/h5/pages/workOrder/edit.vue
@@ -22,7 +22,8 @@
<view class="la"><text class="red">*</text>宸ュ崟鍒嗙被</view>
<view class="line sel_wrap" @click="showCate1 = true">
<view class="left" :class="param.cateName ? '' : 'placeholder9'">
- {{ param.cateName ? param.cateName : '璇烽�夋嫨' }}</view>
+ {{ param.cateName ? param.cateName : '璇烽�夋嫨' }}
+ </view>
<u-icon name="arrow-right" color="#999999" size="15"></u-icon>
</view>
</view>
@@ -51,7 +52,8 @@
<u-icon class="close" size="20" name="close-circle-fill" color="red"
@click="fileDel('fileList', i)"></u-icon>
<image v-if="item.type == 0" :src="item.fileurlFull" mode="widthFix"></image>
- <video v-if="item.type == 1" :show-center-play-btn="false" :src="item.fileurlFull" :controls="false"></video>
+ <video v-if="item.type == 1" :show-center-play-btn="false" :src="item.fileurlFull"
+ :controls="false"></video>
</view>
</view>
</view>
@@ -142,20 +144,22 @@
const {
param,
fileList
- } = this
- if (!param.projectId) return this.showToast('璇烽�夋嫨瀹屾暣鐨勫尯鍩�')
- if (!param.buildingId) return this.showToast('璇烽�夋嫨瀹屾暣鐨勫尯鍩�')
- if (!param.floorName && !param.roomNum) return this.showToast('璇烽�夋嫨瀹屾暣鐨勫尯鍩�')
+ } = this
+ if (!param.projectId) return this.showToast('璇烽�夋嫨瀹屾暣鐨勫尯鍩�')
+ if (!param.buildingId) return this.showToast('璇烽�夋嫨瀹屾暣鐨勫尯鍩�')
+ if (!param.floorName && !param.roomNum) return this.showToast('璇烽�夋嫨瀹屾暣鐨勫尯鍩�')
if (!param.cateName) return this.showToast('璇烽�夋嫨宸ュ崟鍒嗙被')
ywWorkorderCreate({
...param,
// roomId: '',
fileList
}).then(res => {
- this.showToast('鎻愪氦鎴愬姛')
- uni.redirectTo({
- url: '/pages/workOrder/list'
- })
+ if (res && res.code == 200) {
+ this.showToast('鎻愪氦鎴愬姛')
+ uni.redirectTo({
+ url: '/pages/workOrder/list'
+ })
+ }
})
},
changeHandler(e) {
@@ -167,8 +171,8 @@
// 寰俊灏忕▼搴忔棤娉曞皢picker瀹炰緥浼犲嚭鏉ワ紝鍙兘閫氳繃ref鎿嶄綔
picker = this.$refs.uPicker
} = e
- // 褰撶涓�鍒楀�煎彂鐢熷彉鍖栨椂锛屽彉鍖栫浜屽垪(鍚庝竴鍒�)瀵瑰簲鐨勯�夐」
- console.log(index);
+ // 褰撶涓�鍒楀�煎彂鐢熷彉鍖栨椂锛屽彉鍖栫浜屽垪(鍚庝竴鍒�)瀵瑰簲鐨勯�夐」
+ console.log(index);
console.log(index);
if (columnIndex === 0) {
// picker涓洪�夋嫨鍣╰his瀹炰緥锛屽彉鍖栫浜屽垪瀵瑰簲鐨勯�夐」
@@ -176,13 +180,13 @@
}
},
confirmCate1(e) {
- console.log(e.value[1]);
- if(e.value.length == 2){
- this.$set(this.param, 'cateId', e.value[1].id)
- this.$set(this.param, 'cateName', e.value[1].name)
- this.showCate1 = false
- }
-
+ console.log(e.value[1]);
+ if (e.value.length == 2) {
+ this.$set(this.param, 'cateId', e.value[1].id)
+ this.$set(this.param, 'cateName', e.value[1].name)
+ this.showCate1 = false
+ }
+
},
confirm0(e) {
const item = e.value[0]
@@ -431,9 +435,9 @@
position: absolute;
right: -20rpx;
top: -20rpx;
- z-index: 9999;
- background-color: #fff;
- border-radius: 50%;
+ z-index: 9999;
+ background-color: #fff;
+ border-radius: 50%;
overflow: hidden;
}
@@ -456,7 +460,7 @@
// bottom: 68rpx;
// left: 40rpx;
width: 670rpx;
- height: 88rpx;
+ height: 88rpx;
margin-top: 80rpx;
background: $primaryColor;
box-shadow: 0rpx 8rpx 20rpx 0rpx rgba(0, 104, 255, 0.3);
--
Gitblit v1.9.3