From a2299a6d4a6f99e9c11132138f5d3e9ec68f03ea Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 06 六月 2025 19:19:34 +0800
Subject: [PATCH] 开发更新
---
h5/pages/workOrder/edit.vue | 207 ++++++++++++++++++++++++++++++++++++---------------
1 files changed, 145 insertions(+), 62 deletions(-)
diff --git a/h5/pages/workOrder/edit.vue b/h5/pages/workOrder/edit.vue
index add269c..653c56c 100644
--- a/h5/pages/workOrder/edit.vue
+++ b/h5/pages/workOrder/edit.vue
@@ -12,14 +12,26 @@
<view class="item">
<view class="la"><text class="red">*</text>閫夋嫨鍖哄煙</view>
<view class="line sel_wrap" @click="showModal1 = true">
- <view class="left" :class="param.projectName ? '' : 'placeholder9'">{{ param.projectName ? `${param.projectName} ${param.buildingName || ''} ${param.areaType == 0 ? param.roomName || '' : param.floorName || ''}` : '璇烽�夋嫨' }}</view>
+ <view class="left" :class="param.projectName ? '' : 'placeholder9'">
+ {{ param.projectName ? `${param.projectName} ${param.buildingName || ''} ${param.areaType == 0 ? param.roomNum || '' : param.floorName || ''}` : '璇烽�夋嫨' }}
+ </view>
<u-icon name="arrow-right" color="#999999" size="15"></u-icon>
</view>
</view>
<view class="item">
+ <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>
+ <u-icon name="arrow-right" color="#999999" size="15"></u-icon>
+ </view>
+ </view>
+ <view class="item" v-if="param.areaType == 0">
<view class="la">涓婇棬鏃堕棿</view>
<view class="line sel_wrap" @click="showTime = true">
- <view class="left" :class="param.getDate ? '' : 'placeholder9'">{{ param.getDate ? param.getDate : '璇烽�夋嫨' }}</view>
+ <view class="left" :class="param.getDate ? '' : 'placeholder9'">{{ param.getDate ? param.getDate : '璇烽�夋嫨' }}
+ </view>
<u-icon name="arrow-right" color="#999999" size="15"></u-icon>
</view>
</view>
@@ -38,9 +50,10 @@
</view>
<view class="upload_file" v-for="(item, i) in fileList" :key="i">
<u-icon class="close" size="20" name="close-circle-fill" color="red"
- @click="fileDel('dealBeforeFileList', i)"></u-icon>
+ @click="fileDel('fileList', i)"></u-icon>
<image v-if="item.type == 0" :src="item.fileurlFull" mode="widthFix"></image>
- <video v-if="item.type == 1" :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>
@@ -63,11 +76,14 @@
:columns="buildingList"></u-picker>
<u-picker :show="showModal3" keyName="name" @cancel="showModal3 = false" @confirm='confirm3'
:columns="floorList"></u-picker>
- <u-picker :show="showModal4" keyName="name" @cancel="showModal4 = false" @confirm='confirm4'
+ <u-picker :show="showModal4" keyName="roomNum" @cancel="showModal4 = false" @confirm='confirm4'
:columns="roomList"></u-picker>
<!-- -->
- <u-datetime-picker :minDate="new Date().getTime()" :show="showTime" @confirm="confirmDate"
+ <u-datetime-picker :minDate="new Date().getTime()" :show="showTime" @confirm="confirmDate"
@cancel="showTime = false" mode="datetime"></u-datetime-picker>
+
+ <u-picker :show="showCate1" keyName="name" ref="uPicker" @change="changeHandler" @cancel="showCate1 = false"
+ @confirm='confirmCate1' :columns="cateList1"></u-picker>
</view>
</template>
@@ -77,14 +93,18 @@
ywProjectPost,
ywBuildingPost,
ywFloorPost,
- ywRoomPost,
- ywWorkorderCreate
+ ywRoomPost,
+ ywWorkorderCreate,
+ getCategoryPost
} from '@/api'
import dayjs from 'dayjs';
export default {
data() {
return {
- param: {},
+ param: {
+ areaName: '瀹ゅ唴瑁呬慨',
+ areaType: 0
+ },
showUpload: false,
fileList: [],
@@ -92,11 +112,13 @@
showModal1: false,
showModal2: false,
showModal3: false,
- showModal4: false,
+ showModal4: false,
showTime: false,
+ showCate1: false,
+ showCate2: false,
areaType: [
[{
- name: '瀹ゅ唴瑁呬慨',
+ name: '瀹ゅ唴缁翠慨',
id: 0
},
{
@@ -105,6 +127,8 @@
}
]
],
+ cateList1: [],
+ cateList2: [],
projectList: [],
buildingList: [],
floorList: [],
@@ -113,29 +137,65 @@
},
onLoad() {
this.getProject()
+ this.getCate()
},
- methods: {
- onSubmit() {
- const { param, fileList } = this
- ywWorkorderCreate({
- ...param,
- // roomId: '',
- fileList
- }).then(res => {
- this.showToast('鎻愪氦鎴愬姛')
- uni.redirectTo({
- url: '/pages/workOrder/list'
- })
- })
+ methods: {
+ onSubmit() {
+ const {
+ param,
+ fileList
+ } = 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 => {
+ if (res && res.code == 200) {
+ this.showToast('鎻愪氦鎴愬姛')
+ uni.redirectTo({
+ url: '/pages/workOrder/list'
+ })
+ }
+ })
},
- confirm0(e) {
+ changeHandler(e) {
+ const {
+ columnIndex,
+ value,
+ values, // values涓哄綋鍓嶅彉鍖栧垪鐨勬暟缁勫唴瀹�
+ index,
+ // 寰俊灏忕▼搴忔棤娉曞皢picker瀹炰緥浼犲嚭鏉ワ紝鍙兘閫氳繃ref鎿嶄綔
+ picker = this.$refs.uPicker
+ } = e
+ // 褰撶涓�鍒楀�煎彂鐢熷彉鍖栨椂锛屽彉鍖栫浜屽垪(鍚庝竴鍒�)瀵瑰簲鐨勯�夐」
+ console.log(index);
+ console.log(index);
+ if (columnIndex === 0) {
+ // picker涓洪�夋嫨鍣╰his瀹炰緥锛屽彉鍖栫浜屽垪瀵瑰簲鐨勯�夐」
+ picker.setColumnValues(1, this.cateList1[0][index].childCategoryList)
+ }
+ },
+ 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
+ }
+
+ },
+ confirm0(e) {
const item = e.value[0]
this.$set(this.param, 'areaType', item.id)
this.$set(this.param, 'areaName', item.name)
- this.showModal0 = false
- this.param = {
- areaType: item.id,
- areaName: item.name,
+ this.showModal0 = false
+ this.param = {
+ areaType: item.id,
+ areaName: item.name,
}
},
confirm1(e) {
@@ -151,29 +211,47 @@
this.showModal2 = false
this.$set(this.param, 'buildingName', item.name)
this.$set(this.param, 'buildingId', item.id)
- if (this.areaType == 0) {
- this.getRoom(item.id)
+ if (this.param.areaType == 0) {
+ this.getRoom(item.id)
this.showModal4 = true
} else {
- this.getFloor(item.id)
+ this.getFloor(item.id)
this.showModal3 = true
}
- },
- confirm3(e) {
- const item = e.value[0]
- this.showModal3 = false
- this.$set(this.param, 'floorName', item.name)
- this.$set(this.param, 'floorId', item.id)
- },
- confirm4(e) {
- const item = e.value[0]
- this.showModal4 = false
- this.$set(this.param, 'roomName', item.name)
- this.$set(this.param, 'roomId', item.id)
- },
- confirmDate(e) {
- this.$set(this.param, 'getDate', dayjs(e.value).format('YYYY-MM-DD HH:mm:ss'));
- this.showTime = false
+ },
+ confirm3(e) {
+ const item = e.value[0]
+ this.showModal3 = false
+ this.$set(this.param, 'floorName', item.name)
+ this.$set(this.param, 'floorId', item.id)
+ },
+ confirm4(e) {
+ const item = e.value[0]
+ this.showModal4 = false
+ this.$set(this.param, 'roomNum', item.roomNum)
+ this.$set(this.param, 'roomId', item.id)
+ },
+ confirmDate(e) {
+ this.$set(this.param, 'getDate', dayjs(e.value).format('YYYY-MM-DD HH:mm:ss'));
+ this.showTime = false
+ },
+ getCate() {
+ getCategoryPost({
+ capacity: 9999,
+ page: 1,
+ model: {
+ type: 3
+ }
+ }).then(res => {
+
+ let temp = res.data.records || []
+ if (temp && temp.length > 0) {
+ this.cateList1 = [temp, temp[0].childCategoryList || []]
+ } else {
+ this.cateList1 = [temp, []]
+ }
+ console.log(this.cateList1);
+ })
},
getProject() {
ywProjectPost().then(res => {
@@ -358,6 +436,9 @@
right: -20rpx;
top: -20rpx;
z-index: 9999;
+ background-color: #fff;
+ border-radius: 50%;
+ overflow: hidden;
}
image {
@@ -375,11 +456,12 @@
}
.sub_btn {
- position: fixed;
- bottom: 68rpx;
- left: 40rpx;
+ // position: fixed;
+ // bottom: 68rpx;
+ // left: 40rpx;
width: 670rpx;
height: 88rpx;
+ margin-top: 80rpx;
background: $primaryColor;
box-shadow: 0rpx 8rpx 20rpx 0rpx rgba(0, 104, 255, 0.3);
border-radius: 44rpx;
@@ -389,16 +471,17 @@
font-weight: 500;
font-size: 32rpx;
color: #FFFFFF;
- }
- .sel_upload_wrap {
- width: 100%;
- border-top: 1px solid #666666;
- box-shadow: 0 1 1 #333333;
-
- .btn {
- height: 90rpx;
- line-height: 90rpx;
- text-align: center;
- }
+ }
+
+ .sel_upload_wrap {
+ width: 100%;
+ border-top: 1px solid #666666;
+ box-shadow: 0 1 1 #333333;
+
+ .btn {
+ height: 90rpx;
+ line-height: 90rpx;
+ text-align: center;
+ }
}
</style>
\ No newline at end of file
--
Gitblit v1.9.3