11

pages/mypage/compents/wtcl/index.vue

@@ -114,7 +114,7 @@
 						end:this.etm?moment(this.etm).format('YYYY-MM-DD 23:59:59'):''
 					},
 					"isHandle": 1,
-					"inspectUserId": uni.getStorageSync('value').userId
+					"handleUserId": uni.getStorageSync('value').userId
 				}
 				uni.$http.post('/gunshiApp/xyt/inspect/detail/page', params).then(res => {
 					this.list = res.data.data.records

pages/wtcl/index.vue

@@ -22,13 +22,13 @@
 				</view>
 			</view>
 			<view class="" v-if="list.length !== 0" style="height:calc(100vh - 180px);overflow: auto;">
-				<view class="" v-for="(item,i) in list" @click="toDetail(item)" :key="i" style="margin: 10px;background-color: #fff;padding: 10px;" >
+				<view class="" v-for="item in list" style="margin: 10px;background-color: #fff;padding: 10px;" >
 					<view class="item">
 						<!-- {{item.title}} -->
 						<view class="title">
 							{{item.taskTitle}}
 						</view>
-						<view class="titleRight" >
+						<view class="titleRight" @click="toDetail(item)">
 							<view class="border">
 								{{item.isHandle==0?'待处理':'已处理'}}
 							</view>
@@ -57,12 +57,8 @@
 
 		</view>
 		<u-datetime-picker :show="showTime" v-model="stm" mode="date" @confirm="showTime=false"
-		:minDate="minDate"
-		               :maxDate="maxDate"
 			@cancel="showTime=false"></u-datetime-picker>
 		<u-datetime-picker :show="showTime1" v-model="etm" mode="date" @confirm="showTime1=false"
-		:minDate="minDate"
-		               :maxDate="maxDate"
 			@cancel="showTime1=false"></u-datetime-picker>
 	</view>
 </template>
@@ -116,9 +112,10 @@
 					"isHandle": 0,
 					"handleUserId": uni.getStorageSync('value').userId
 				}
-				uni.$http.post('/gunshiApp/xyt/inspect/detail/page', params).then(res => {
-					this.list=res.data.data.records
-				})
+				console.log(params,'dsd');
+				// uni.$http.post('/gunshiApp/xyt/inspect/detail/page', params).then(res => {
+				// 	this.list=res.data.data.records
+				// })
 			},
 			confirm(e) {
 				console.log(e);

pages/xcrw/detail/dbForm.vue

@@ -278,34 +278,58 @@
 					uni.removeStorageSync('timer')
 				}
 				let tigger = true
+				let arr =[]
 				//判断是否符合提交条件
 				this.listData.forEach(item => {
 					item.ab = item.children.filter(i => {
 						if (i.isNormal == 0) {
 							if (i.inspectPics?.length && i.problemDesc) {
 								tigger = true
+								arr.push(true)
 							} else {
 								tigger = false
+								arr.push(false)
 								uni.$showMsg('请填写现场问题描述和上传现场照片');
 							}
 							if (i.isHandle == 1) {
 								if (i.handlePics?.length && i.handleDesc) {
 									tigger = true
+									arr.push(true)
 								} else {
 									tigger = false
+									arr.push(false)
 									uni.$showMsg('请填写处理问题描述和上传处理照片');
 								}
 							} else if (i.isHandle == 0) {
-								tigger = true
+								console.log(i.handleUserId,'i.handleUserId');
+								if(i.handleUserId){
+									tigger = true
+									arr.push(true)
+								}else{
+									tigger = false
+									arr.push(false)
+									uni.$showMsg('请选择责任人');
+								}
+								
+							}else{
+								tigger = false
+								arr.push(false)
+								uni.$showMsg('请选择处理状态');
 							}
 						} else if (i.isNormal == 1) {
 							tigger = true
+							arr.push(true)
+						}else if(!i.isNormal){
+							tigger=false
+							arr.push(false)
+							uni.$showMsg('请选择正常异常状态');
 						}
 					})
 					return item
 				})
-				console.log(tigger, 'arr');
-				if (tigger) {
+				
+				if (arr.every(item=>item)) {
+					console.log(tigger, arr,this.listData)
 					this.uploadContent(status)
 				}else{