Selaa lähdekoodia

知道了改为返回

seimin 2 viikkoa sitten
vanhempi
commit
f5bf1c16d2

+ 2 - 2
components/IncidentAttachment.vue

@@ -13,7 +13,7 @@
13 13
     </view>
14 14
     <view class="container_foot">
15 15
       <view class="foot_btns">
16
-        <view class="know" @click="know">知道了</view>
16
+        <view class="know" @click="know">返回</view>
17 17
       </view>
18 18
     </view>
19 19
   </view>
@@ -116,7 +116,7 @@
116 116
 					}
117 117
 				})
118 118
 			}
119
-			
119
+
120 120
     });
121 121
   }
122 122
 

+ 1 - 1
components/RequireAttachment.vue

@@ -10,7 +10,7 @@
10 10
     </view>
11 11
     <view class="container_foot">
12 12
       <view class="foot_btns">
13
-        <view class="know" @click="know">知道了</view>
13
+        <view class="know" @click="know">返回</view>
14 14
       </view>
15 15
     </view>
16 16
   </view>

+ 10 - 10
pages/incidentDetail/incidentDetail.vue

@@ -187,7 +187,7 @@
187 187
           </view>
188 188
         </view>
189 189
       </template>
190
-      
190
+
191 191
       <!-- 评价信息 -->
192 192
       <template v-if="dataInfo.tabActiveValue === '4'">
193 193
         <view class="detail_head">
@@ -258,10 +258,10 @@
258 258
 
259 259
   // 主题颜色
260 260
   const primaryColor = ref(defaultColor)
261
-	
261
+
262 262
 	const videoUrl = ref(null)
263 263
 	const popup = ref(null)
264
-	
264
+
265 265
   // 数据
266 266
   const dataInfo = reactive({
267 267
     tabs: [
@@ -293,7 +293,7 @@
293 293
     dataInfo.isAttachment = true;
294 294
   }
295 295
 
296
-  // 知道了录音
296
+  // 返回录音
297 297
   function knowAttachment(){
298 298
     dataInfo.isAttachment = false;
299 299
   }
@@ -417,18 +417,18 @@
417 417
       }
418 418
     })
419 419
   }
420
-	
420
+
421 421
 	function videoView(item){
422 422
 		videoUrl.value = item.thumbFilePath
423 423
 		setTimeout(_=>{
424 424
 			popup.value.open()
425 425
 		},100)
426 426
 	}
427
-	
427
+
428 428
 	function closePop(){
429 429
 		popup.value.close()
430 430
 	}
431
-	
431
+
432 432
   // 获取报修图片
433 433
   function getRepairImgs(){
434 434
     uni.showLoading({
@@ -451,7 +451,7 @@
451 451
 		  })
452 452
 			dataInfo.repairVideo = res.data
453 453
 		})
454
-		
454
+
455 455
 		api_listAttachment('wechatIncidentRecord', dataInfo.incidentId).then(res => {
456 456
 		  uni.hideLoading();
457 457
 		  res.data = res.data || [];
@@ -478,14 +478,14 @@
478 478
       dataInfo.handlerImgs = res.data;
479 479
     })
480 480
   }
481
-  
481
+
482 482
   // 返回事件列表
483 483
   function viewIncidentList(){
484 484
     uni.reLaunch({
485 485
       url: `/pages/incidentList/incidentList`
486 486
     })
487 487
   }
488
-  
488
+
489 489
   // 查看巡检单
490 490
   function viewInspectionDetail(inspectionTaskId){
491 491
     uni.navigateTo({

+ 6 - 6
pages/incidentList/incidentList.vue

@@ -206,7 +206,7 @@
206 206
     dataInfo.isAttachment = true;
207 207
   }
208 208
 
209
-  // 知道了图片和录音
209
+  // 返回图片和录音
210 210
   function knowAttachment(){
211 211
     dataInfo.isAttachment = false;
212 212
   }
@@ -217,7 +217,7 @@
217 217
     dataInfo.isRequireAttachment = true;
218 218
   }
219 219
 
220
-  // 知道了报修录音
220
+  // 返回报修录音
221 221
   function knowRequireAttachment(){
222 222
     dataInfo.isRequireAttachment = false;
223 223
   }
@@ -325,7 +325,7 @@
325 325
 		// 		delete postData.incident.hosId;
326 326
 		// 	}
327 327
 		// }
328
-		
328
+
329 329
 		if(postData.incident.queryTask != 'todoingAll'){
330 330
 			if(showDept.value){
331 331
 				if(dataInfo.evtFilter.dept && dataInfo.evtFilter.dept.value){
@@ -477,15 +477,15 @@
477 477
     }
478 478
     onLoadFn();
479 479
   })
480
-	
480
+
481 481
 	onUnload(() => {
482 482
     dataInfo.isFilter = false;
483 483
   })
484
-	
484
+
485 485
 	onHide(() => {
486 486
 	  dataInfo.isFilter = false;
487 487
 	})
488
-	
488
+
489 489
   onTabItemTap(e => {
490 490
     // onLoadFn();
491 491
   })

+ 71 - 71
pages/myRepair/myRepair.vue

@@ -14,7 +14,7 @@
14 14
 		      <view class="body_item_head ellipsis-multiline">
15 15
 		        {{data.description}}
16 16
 		      </view>
17
-		
17
+
18 18
 		      <view class="body_item_content">
19 19
 						<view class="body_item_content_p" v-if="data.place || data.houseNumber">
20 20
 						  <text class="name ellipsis">详细地址:{{data.place ? data.place.building.buildingName : ''}}{{data.place ? data.place.floorName : ''}}<text v-if="data.place && data.place.floorName">层</text> {{data.houseNumber}}</text>
@@ -30,7 +30,7 @@
30 30
 						  <text class="name ellipsis">维修说明:{{data.overtimeRemark}}</text>
31 31
 						</view>
32 32
 		      </view>
33
-		
33
+
34 34
 		      <view class="body_item_foot">
35 35
 		        <view class="foot_info">
36 36
 		          <view class="name">维修人员:{{data.assigneeName || '暂无'}}</view>
@@ -75,7 +75,7 @@
75 75
 				</view>
76 76
 			</uni-popup>
77 77
 		</view>
78
-		
78
+
79 79
 		<view v-if="tabsIndex0==1">
80 80
 			<view class="home_item" v-if="isDept.valueconfig==1">
81 81
 				<view class="title">科室报修</view>
@@ -154,7 +154,7 @@
154 154
 						<view class="bottom_list_item" v-if="deptRepair.valueconfig==1" @click="selectDepartment">
155 155
 	<!-- 					  <view class="name"><text class="required newicon newicon-bitian"></text>科室名称</view>
156 156
 							<uni-data-picker class="value" placeholder="请选择报修科室"
157
-								v-model="dataForm.dept" :localdata="deptData" 
157
+								v-model="dataForm.dept" :localdata="deptData"
158 158
 								:clear-icon="false" :class="{formRed: isSubmit && !dataForm.dept}">
159 159
 							</uni-data-picker> -->
160 160
 							<text class="newicon newicon-youjiantou icon"></text>
@@ -223,29 +223,29 @@
223 223
 	import { repositoryListSearchStore } from '@/stores/repositorySearch'
224 224
 	import { useSetTabbar } from '@/share/useSetTabbar.js'
225 225
 	useSetTitle();
226
-	
226
+
227 227
 	// 数据
228 228
 	const incidentListSearchStore = useIncidentListSearchStore();
229 229
 	const { formatDate }  = filterFormatDate();
230 230
 	const { priorityStyle }  = computedPriorityStyle();
231 231
 	const { stateStyle }  = computedStateStyle();
232 232
 	const { currentLogOverTime }  = computedCurrentLogOverTime();
233
-	
233
+
234 234
 	const { setTabbar }  = useSetTabbar();
235
-	
235
+
236 236
 	// 主题颜色
237 237
 	const primaryColor = ref(defaultColor)
238 238
 	const popup = ref(null);//弹框
239 239
 	const assignFlag = ref(false);//指派权限
240 240
 	const qiangdan = ref(false);//接单权限
241 241
 	const publicRepair = ref({});//公共报修
242
-	
242
+
243 243
 	const degreeDictionary = ref(null); //星级字典
244 244
 	const rowData = ref(null); //选择的数据
245 245
 	const rate = ref(3);//星级
246 246
 	const wxdegreeremark = ref(null);//评价内容
247 247
 	const repairIncident = ref(null);
248
-	
248
+
249 249
 	// 数据
250 250
 	const dataInfo = reactive({
251 251
 	  tabs: [{id: 0, name: '我的报修', value: 'all', num: ''},],
@@ -265,7 +265,7 @@
265 265
 	    acceptDate: [],
266 266
 	  },//筛选框数据
267 267
 	})
268
-	
268
+
269 269
 	const isDept = ref({})
270 270
 	const isRepair = ref({})
271 271
 	const isPublic = ref({})
@@ -275,22 +275,22 @@
275 275
 	const tabsIndex1 = ref(0)
276 276
 	const tabsIndex2 = ref(0)
277 277
 	const repositorySearchStore = repositoryListSearchStore();
278
-	
279
-	
278
+
279
+
280 280
 	const loginUserStore = useLoginUserStore();
281 281
 	const incidentNumStore = useIncidentNumStore();
282 282
 	const { makePhoneCall }  = useMakePhoneCall();
283 283
 
284 284
 	const deptRepair = ref(null)
285
-	
285
+
286 286
 	const deptData = ref([])
287
-	
287
+
288 288
 	const branchData = ref([])
289
-	
289
+
290 290
 	const commonDeptName = ref(null)
291
-	
291
+
292 292
 	const commonDeptData = ref(null)
293
-	
293
+
294 294
 	const dataForm = reactive({
295 295
 		name:loginUserStore.loginUser.user.name,
296 296
 		account:loginUserStore.loginUser.user.account,
@@ -302,23 +302,23 @@
302 302
 		commonDeptData:'',
303 303
 		dataType:false
304 304
 	})
305
-	
305
+
306 306
 	const operationType = ref(null)
307
-	
307
+
308 308
 	const userTypes = ref(null)
309
-	
309
+
310 310
 	const userData = reactive(loginUserStore.loginUser.user)
311
-	
311
+
312 312
 	const commonDeptDTO = ref([])
313
-	
313
+
314 314
 	// 是否提交
315 315
 	const isSubmit = ref(false)
316
-	
316
+
317 317
 	// 数据
318 318
 	const dataConfigInfo = reactive({
319 319
 	  num: 0,
320 320
 	})
321
-	
321
+
322 322
 	function tabsClick0(){
323 323
 		tabsIndex0.value=1
324 324
 		tabsIndex1.value=0
@@ -326,7 +326,7 @@
326 326
 		getCount()
327 327
 		repositorySearchStore.clearRepositoryListSearchData()
328 328
 	}
329
-	
329
+
330 330
 	function tabsClick1(){
331 331
 		tabsIndex0.value=0
332 332
 		tabsIndex2.value=0
@@ -335,7 +335,7 @@
335 335
 		dataInfo.stateValue = 0
336 336
 		getTabs();
337 337
 	}
338
-	
338
+
339 339
 	function tabsClick2(){
340 340
 		tabsIndex2.value=1
341 341
 		tabsIndex1.value=0
@@ -343,14 +343,14 @@
343 343
 		getUserInfo()
344 344
 		repositorySearchStore.clearRepositoryListSearchData()
345 345
 	}
346
-	
346
+
347 347
 	// 工单详情
348 348
 	function toIncidentDetail(data){
349 349
 	  uni.navigateTo({
350 350
 	    url: `/pages/repair/repairsDetail?incidentId=${data.id}`
351 351
 	  })
352 352
 	}
353
-	
353
+
354 354
 	// 获取tab选项
355 355
 	function getTabs(){
356 356
 	  uni.showLoading({
@@ -378,7 +378,7 @@
378 378
 			]
379 379
 		}
380 380
 	}
381
-	
381
+
382 382
 	// 点击tab
383 383
 	function clickTab(tabId){
384 384
 	  dataInfo.tabActiveId = tabId;
@@ -389,35 +389,35 @@
389 389
 		dataInfo.idx=0
390 390
 	  getList(0);
391 391
 	}
392
-	
392
+
393 393
 	// 点击筛选
394 394
 	function filterClick(){
395 395
 	  dataInfo.isFilter = true;
396 396
 	}
397
-	
397
+
398 398
 	// 确认筛选
399 399
 	function conformFilter(evtFilter){
400 400
 	  dataInfo.stateValue = evtFilter.category;
401 401
 	  dataInfo.isFilter = false;
402 402
 	  getList(0);
403 403
 	}
404
-	
404
+
405 405
 	// 关闭筛选
406 406
 	function cancelFilter(){
407 407
 	  dataInfo.isFilter = false;
408 408
 	}
409
-	
409
+
410 410
 	// 点击图片和录音
411 411
 	function attachmentClick(incidentData){
412 412
 	  dataInfo.incidentData = incidentData;
413 413
 	  dataInfo.isAttachment = true;
414 414
 	}
415
-	
416
-	// 知道了图片和录音
415
+
416
+	// 返回图片和录音
417 417
 	function knowAttachment(){
418 418
 	  dataInfo.isAttachment = false;
419 419
 	}
420
-	
420
+
421 421
 	// 评价
422 422
 	function handler(type, data){
423 423
 		rowData.value = data
@@ -431,13 +431,13 @@
431 431
 			degreeDictionary.value = res
432 432
 		})
433 433
 	}
434
-	
434
+
435 435
 	function closePop(){
436 436
 		rate.value = 3
437 437
 		wxdegreeremark.value = null
438 438
 		popup.value.close()
439 439
 	}
440
-	
440
+
441 441
 	function submit(){
442 442
 		if(!rate.value){
443 443
 			uni.showToast({
@@ -489,8 +489,8 @@
489 489
 		})
490 490
 		closePop()
491 491
 	}
492
-	
493
-	
492
+
493
+
494 494
 	// 获取列表信息
495 495
 	function getList(idx){
496 496
 	  uni.showLoading({
@@ -540,7 +540,7 @@
540 540
 	  })
541 541
 	  // getCount(postData.incident);
542 542
 	}
543
-	
543
+
544 544
 	// 获取列表数量
545 545
 	// function getCount(incident = {}){
546 546
 	//   let postData = {
@@ -550,7 +550,7 @@
550 550
 	//   dataInfo.tabs.forEach(v => {
551 551
 	//       postData.incidentList.push({...incident, ...{statusId: v.id || undefined}});
552 552
 	//   })
553
-	
553
+
554 554
 	//   api_incident_count(postData).then(res => {
555 555
 	//     if(res.state == 200){
556 556
 	//       let myData = res.data || [];
@@ -565,15 +565,15 @@
565 565
 	//     }
566 566
 	//   })
567 567
 	// }
568
-	
569
-	
568
+
569
+
570 570
 	// 知识库
571 571
 	function repository(){
572 572
 		uni.navigateTo({
573 573
 		  url: `/pages/repository/repository?type=view&entranceType=repairs`
574 574
 		})
575 575
 	}
576
-	
576
+
577 577
 	// 报修列表
578 578
 	function repairsView(type,value){
579 579
 		tabsIndex0.value = 0
@@ -585,7 +585,7 @@
585 585
 		repositorySearchStore.setRepositoryListSearchData(dataInfo.evtFilter)
586 586
 		getTabs()
587 587
 	}
588
-	
588
+
589 589
 	// 获取报修数量
590 590
 	function getCount(){
591 591
 		uni.showLoading({
@@ -597,7 +597,7 @@
597 597
 			repairData.value = res.data
598 598
 		})
599 599
 	}
600
-	
600
+
601 601
 	// 快速报修
602 602
 	function addRepairs(){
603 603
 		if(isDept.value.valueconfig==0 && isPublic.value.valueconfig==0){
@@ -612,7 +612,7 @@
612 612
 		  url: '/pages/repair/rapidRep'
613 613
 		})
614 614
 	}
615
-	
615
+
616 616
 	// 扫资产报修
617 617
 	function scanCodes(){
618 618
 		uni.showLoading({
@@ -638,8 +638,8 @@
638 638
 			});
639 639
 		})
640 640
 	}
641
-	
642
-	
641
+
642
+
643 643
 	// 保存
644 644
 	function addInfo(){
645 645
 		if(!dataForm.branch){
@@ -649,7 +649,7 @@
649 649
 			});
650 650
 			return
651 651
 		}
652
-		
652
+
653 653
 		if(!dataForm.dept){
654 654
 			uni.showToast({
655 655
 			  icon: 'none',
@@ -657,7 +657,7 @@
657 657
 			});
658 658
 			return
659 659
 		}
660
-		
660
+
661 661
 		uni.showLoading({
662 662
 		  title: "加载中",
663 663
 		  mask: true,
@@ -705,7 +705,7 @@
705 705
 			}
706 706
 		})
707 707
 	}
708
-	
708
+
709 709
 	// 选择院区
710 710
 	function branchChange(){
711 711
 		dataForm.dept = null
@@ -716,7 +716,7 @@
716 716
 		commonDeptData.value = null
717 717
 		// getRepairTypes()
718 718
 	}
719
-	
719
+
720 720
 	// 跳转到科室
721 721
 	function selectDepartment(){
722 722
 		if(commonDeptName.value){
@@ -729,7 +729,7 @@
729 729
 	    url: `/pages/searchDept/searchDept?type=config&branchId=${dataForm.branch}`
730 730
 	  })
731 731
 	}
732
-	
732
+
733 733
 	// 获取科室列表
734 734
 	function getRepairTypes(){
735 735
 	  uni.showLoading({
@@ -752,7 +752,7 @@
752 752
 	    }));
753 753
 	  })
754 754
 	}
755
-	
755
+
756 756
 	// 获取院区列表
757 757
 	function getBranch(){
758 758
 		let arr = loginUserStore.loginUser.hospital.filter(i=>i.parent==undefined)
@@ -761,11 +761,11 @@
761 761
 		  value: v.id,
762 762
 		}));
763 763
 	}
764
-	
764
+
765 765
 	// 选择常用科室
766 766
 	function deptSelect(){
767 767
 		uni.setStorageSync('configData',JSON.stringify(dataForm))
768
-		let data = commonDeptData.value 
768
+		let data = commonDeptData.value
769 769
 		// ? commonDeptData.value : loginUserStore.loginUser.user.commonDept
770 770
 		if(!data){
771 771
 			data = 'none'
@@ -775,7 +775,7 @@
775 775
 		  url: `/pages/repair/deptSelect?data=${JSON.stringify(data)}&commonDeptName=${commonDeptName.value}&deptId=${deptId}&type=home`
776 776
 		})
777 777
 	}
778
-	
778
+
779 779
 	function getUserInfo(){
780 780
 		let user = loginUserStore.loginUser.user
781 781
 		let userId = null
@@ -814,7 +814,7 @@
814 814
 							commonDeptData.value = data.commonDeptData
815 815
 							commonDeptName.value = data.commonDeptName
816 816
 						}
817
-					}	
817
+					}
818 818
 				}else if(item){
819 819
 					if(item.hospital.parent){
820 820
 						dataForm.branch = item.hospital.parent.id
@@ -875,7 +875,7 @@
875 875
 		  }
876 876
 		})
877 877
 	}
878
-	
878
+
879 879
 	// 获取配置项
880 880
 	function getConfig(option){
881 881
 		api_systemConfiguration({
@@ -923,12 +923,12 @@
923 923
 			}
924 924
 		})
925 925
 	}
926
-	
926
+
927 927
 	onHide(opt=>{
928 928
 		dataConfigInfo.num = 0
929 929
 		dataForm.branch = null
930 930
 	})
931
-	
931
+
932 932
 	onLoad((option) => {
933 933
 		console.log(777,option)
934 934
 		getConfig(option)
@@ -937,9 +937,9 @@
937 937
 		if(option && option.configType){
938 938
 			operationType.value = option.configType
939 939
 		}
940
-		
940
+
941 941
 	})
942
-	
942
+
943 943
 	onReachBottom(() => {
944 944
 		if(tabsIndex1.value==1){
945 945
 			dataInfo.idx += 1;
@@ -948,11 +948,11 @@
948 948
 			}
949 949
 		}
950 950
 	})
951
-	
951
+
952 952
 	onPullDownRefresh(_=>{
953 953
 		// uni.stopPullDownRefresh();
954 954
 	})
955
-	
955
+
956 956
 	onShow((option) => {
957 957
 		userTypes.value = JSON.parse(uni.getStorageSync('groupData'))
958 958
 		if(dataConfigInfo.num==0){
@@ -960,7 +960,7 @@
960 960
 		}
961 961
 		repositorySearchStore.clearRepositoryListSearchData()
962 962
 	})
963
-	
963
+
964 964
 
965 965
 </script>
966 966
 
@@ -1232,9 +1232,9 @@
1232 1232
 				}
1233 1233
 			}
1234 1234
 		}
1235
-		
1235
+
1236 1236
 	}
1237
-	
1237
+
1238 1238
 	.home{
1239 1239
 		// height: 100vh;
1240 1240
 		// padding: 20rpx;
@@ -1420,7 +1420,7 @@
1420 1420
 	        }
1421 1421
 	      }
1422 1422
 	    }
1423
-	    
1423
+
1424 1424
 	    .bottom{
1425 1425
 	      background-color: #fff;
1426 1426
 	      margin-top: 15rpx;

+ 18 - 18
pages/repair/listHome.vue

@@ -94,7 +94,7 @@
94 94
   import { useIncidentListSearchStore } from '@/stores/incidentListSearch'
95 95
 	import { repositoryListSearchStore } from '@/stores/repositorySearch'
96 96
 	import { useSetTabbar } from '@/share/useSetTabbar.js'
97
-	
97
+
98 98
   useSetTitle();
99 99
 	const repositorySearchStore = repositoryListSearchStore();
100 100
   const loginUserStore = useLoginUserStore();
@@ -105,9 +105,9 @@
105 105
   const { stateStyle }  = computedStateStyle();
106 106
   const { currentLogOverTime }  = computedCurrentLogOverTime();
107 107
   const { makePhoneCall }  = useMakePhoneCall();
108
-	
108
+
109 109
 	const { setTabbar }  = useSetTabbar();
110
-	
110
+
111 111
   // 主题颜色
112 112
   const primaryColor = ref(defaultColor)
113 113
 	const popup = ref(null);//弹框
@@ -115,13 +115,13 @@
115 115
   const qiangdan = ref(false);//接单权限
116 116
 	const deptRepair = ref({});//科内报修
117 117
 	const publicRepair = ref({});//公共报修
118
-	
118
+
119 119
 	const degreeDictionary = ref(null); //星级字典
120 120
 	const rowData = ref(null); //选择的数据
121 121
 	const isSubmit = ref(false);
122 122
 	const rate = ref(3);//星级
123 123
 	const wxdegreeremark = ref(null);//评价内容
124
-	
124
+
125 125
   // 判断是否显示接单按钮
126 126
   const computedReceive = computed(() => (data) => {
127 127
     let inUser = data.currentLog && data.currentLog.workerId == loginUserStore.loginUser.user.id;
@@ -140,9 +140,9 @@
140 140
   const computedSynergetic = computed(() => (synergetic) => {
141 141
     return (synergetic && synergetic.length) ? synergetic.map(v => v.name).join(',') : ''
142 142
   })
143
-	
143
+
144 144
 	const repairIncident = ref(null);
145
-	
145
+
146 146
   // 数据
147 147
   const dataInfo = reactive({
148 148
     tabs: [{id: 0, name: '我的报修', value: 'all', num: ''},],
@@ -227,7 +227,7 @@
227 227
     dataInfo.isAttachment = true;
228 228
   }
229 229
 
230
-  // 知道了图片和录音
230
+  // 返回图片和录音
231 231
   function knowAttachment(){
232 232
     dataInfo.isAttachment = false;
233 233
   }
@@ -245,13 +245,13 @@
245 245
 			degreeDictionary.value = res
246 246
 		})
247 247
   }
248
-	
248
+
249 249
 	function closePop(){
250 250
 		rate.value = 3
251 251
 		wxdegreeremark.value = null
252 252
 		popup.value.close()
253 253
 	}
254
-	
254
+
255 255
 	function submit(){
256 256
 		if(!rate.value){
257 257
 			uni.showToast({
@@ -303,7 +303,7 @@
303 303
 		})
304 304
 		closePop()
305 305
 	}
306
-	
306
+
307 307
 
308 308
   // 获取列表信息
309 309
   function getList(idx){
@@ -354,7 +354,7 @@
354 354
     })
355 355
     // getCount(postData.incident);
356 356
   }
357
-	
357
+
358 358
   // 获取列表数量
359 359
   function getCount(incident = {}){
360 360
     let postData = {
@@ -384,7 +384,7 @@
384 384
   function onLoadFn(){
385 385
     getTabs();
386 386
   }
387
-	
387
+
388 388
 	// 获取配置项
389 389
 	function getConfig(){
390 390
 		api_systemConfiguration({
@@ -397,14 +397,14 @@
397 397
 			onLoadFn();
398 398
 		})
399 399
 	}
400
-	
400
+
401 401
   onLoad((option) => {
402 402
 		getConfig();
403 403
 		for(let i = 0; i<7; i++){
404 404
 			setTabbar(i)
405 405
 		}
406 406
   })
407
-	
407
+
408 408
 	onShow((option) =>{
409 409
 		let data = uni.getStorageSync('homeRepairList')
410 410
 		if(data){
@@ -419,12 +419,12 @@
419 419
 		}
420 420
 		onLoadFn();
421 421
 	})
422
-	
422
+
423 423
 	onHide(_=>{
424 424
 		uni.setStorageSync('homeRepairList','')
425 425
 		repositorySearchStore.clearRepositoryListSearchData()
426 426
 	})
427
-	
427
+
428 428
   onTabItemTap(e => {
429 429
     // onLoadFn();
430 430
   })
@@ -687,6 +687,6 @@ page{
687 687
 			}
688 688
 		}
689 689
 	}
690
-	
690
+
691 691
 }
692 692
 </style>

+ 15 - 15
pages/repair/repairsDetail.vue

@@ -182,7 +182,7 @@
182 182
 			<button v-if="stateId==20413" @click="recall" type="default" class="primaryButton btn">撤销</button>
183 183
 		</view>
184 184
     <IncidentAttachment v-if="dataInfo.isAttachment" @knowEmit="knowAttachment" :incidentData="dataInfo.incidentData"></IncidentAttachment>
185
-		
185
+
186 186
 		<uni-popup ref="inputDialog" background-color="#fff" type="center" :before-close="true">
187 187
 			<view class="ch-class">撤销原因</view>
188 188
 			<view class="popup-content">
@@ -193,7 +193,7 @@
193 193
 			  <button @click="dialogInputConfirm" size="mini" type="default" class="primaryButton btn">确定</button>
194 194
 			</view>
195 195
 		</uni-popup>
196
-				
196
+
197 197
 		<uni-popup ref="popup" background-color="#fff" type="center" :before-close="true">
198 198
 			<view class="popup-content">
199 199
 				<video :src="videoUrl" controls></video>
@@ -236,7 +236,7 @@
236 236
 	const popup = ref(null)
237 237
 	const inputDialog = ref(null)
238 238
 	const stateId = ref(null)
239
-	
239
+
240 240
   // 数据
241 241
   const dataInfo = reactive({
242 242
     tabs: [
@@ -268,7 +268,7 @@
268 268
     dataInfo.isAttachment = true;
269 269
   }
270 270
 
271
-  // 知道了录音
271
+  // 返回录音
272 272
   function knowAttachment(){
273 273
     dataInfo.isAttachment = false;
274 274
   }
@@ -321,18 +321,18 @@
321 321
       }
322 322
     })
323 323
   }
324
-	
324
+
325 325
 	function videoView(item){
326 326
 		videoUrl.value = item.thumbFilePath
327 327
 		setTimeout(_=>{
328 328
 			popup.value.open()
329 329
 		},100)
330 330
 	}
331
-	
331
+
332 332
 	function closePop(){
333 333
 		popup.value.close()
334 334
 	}
335
-	
335
+
336 336
   // 预览图片
337 337
   function previewImg(index, type){
338 338
     uni.previewImage({
@@ -419,7 +419,7 @@
419 419
       })
420 420
 			dataInfo.repairImgs = res.data
421 421
     })
422
-		
422
+
423 423
 		api_listAttachment('wechatIncidentVideo', dataInfo.incidentId).then(res => {
424 424
 		  res.data = res.data || [];
425 425
 		  res.data.forEach(v => {
@@ -427,7 +427,7 @@
427 427
 		  })
428 428
 			dataInfo.repairVideo = res.data
429 429
 		})
430
-		
430
+
431 431
 		api_listAttachment('wechatIncidentRecord', dataInfo.incidentId).then(res => {
432 432
 		  uni.hideLoading();
433 433
 		  res.data = res.data || [];
@@ -454,11 +454,11 @@
454 454
       dataInfo.handlerImgs = res.data;
455 455
     })
456 456
   }
457
-	
457
+
458 458
 	function closeDialog(){
459 459
 		inputDialog.value.close()
460 460
 	}
461
-	
461
+
462 462
 	function dialogInputConfirm(){
463 463
 		if(!recallValue.value){
464 464
 			uni.showToast({
@@ -493,11 +493,11 @@
493 493
 			}
494 494
 		})
495 495
 	}
496
-	
496
+
497 497
 	function recall(){
498 498
 		inputDialog.value.open()
499 499
 	}
500
-	
500
+
501 501
 	onShow((option) =>{
502 502
 		let data = JSON.parse(uni.getStorageSync('sysData'))
503 503
 		isDept.value = data.find(i=>i.keyconfig=='deptRepair')
@@ -516,7 +516,7 @@
516 516
 			getIncidentDetail();
517 517
 		});
518 518
 	})
519
-	
519
+
520 520
   onLoad((option) => {
521 521
     dataInfo.incidentId = option.incidentId;
522 522
 		// let data = JSON.parse(uni.getStorageSync('sysData'))
@@ -543,7 +543,7 @@
543 543
 		height: 80rpx;
544 544
 		background: #eee;
545 545
 	}
546
-	
546
+
547 547
 	>>>.uni-popup .uni-popup__wrapper{
548 548
 		padding: 20rpx 40rpx;
549 549
 		border-radius: 5px;

+ 15 - 15
pages/repair/repairsList.vue

@@ -93,7 +93,7 @@
93 93
   import { useIncidentNumStore } from '@/stores/incidentNum'
94 94
   import { useIncidentListSearchStore } from '@/stores/incidentListSearch'
95 95
 	import { repositoryListSearchStore } from '@/stores/repositorySearch'
96
-	
96
+
97 97
   useSetTitle();
98 98
 	const repositorySearchStore = repositoryListSearchStore();
99 99
   const loginUserStore = useLoginUserStore();
@@ -112,13 +112,13 @@
112 112
   const qiangdan = ref(false);//接单权限
113 113
 	const deptRepair = ref({});//科内报修
114 114
 	const publicRepair = ref({});//公共报修
115
-	
115
+
116 116
 	const degreeDictionary = ref(null); //星级字典
117 117
 	const rowData = ref(null); //选择的数据
118 118
 	const isSubmit = ref(false);
119 119
 	const rate = ref(3);//星级
120 120
 	const wxdegreeremark = ref(null);//评价内容
121
-	
121
+
122 122
   // 判断是否显示接单按钮
123 123
   const computedReceive = computed(() => (data) => {
124 124
     let inUser = data.currentLog && data.currentLog.workerId == loginUserStore.loginUser.user.id;
@@ -137,9 +137,9 @@
137 137
   const computedSynergetic = computed(() => (synergetic) => {
138 138
     return (synergetic && synergetic.length) ? synergetic.map(v => v.name).join(',') : ''
139 139
   })
140
-	
140
+
141 141
 	const repairIncident = ref(null);
142
-	
142
+
143 143
   // 数据
144 144
   const dataInfo = reactive({
145 145
     tabs: [{id: 0, name: '我的报修', value: 'all', num: ''},],
@@ -227,7 +227,7 @@
227 227
     dataInfo.isAttachment = true;
228 228
   }
229 229
 
230
-  // 知道了图片和录音
230
+  // 返回图片和录音
231 231
   function knowAttachment(){
232 232
     dataInfo.isAttachment = false;
233 233
   }
@@ -245,13 +245,13 @@
245 245
 			degreeDictionary.value = res
246 246
 		})
247 247
   }
248
-	
248
+
249 249
 	function closePop(){
250 250
 		rate.value = 3
251 251
 		wxdegreeremark.value = null
252 252
 		popup.value.close()
253 253
 	}
254
-	
254
+
255 255
 	function submit(){
256 256
 		if(!rate.value){
257 257
 			uni.showToast({
@@ -303,7 +303,7 @@
303 303
 		})
304 304
 		closePop()
305 305
 	}
306
-	
306
+
307 307
 
308 308
   // 获取列表信息
309 309
   function getList(idx){
@@ -354,7 +354,7 @@
354 354
     })
355 355
     // getCount(postData.incident);
356 356
   }
357
-	
357
+
358 358
   // 获取列表数量
359 359
   function getCount(incident = {}){
360 360
     let postData = {
@@ -392,15 +392,15 @@
392 392
 		repositorySearchStore.setRepositoryListSearchData(dataInfo.evtFilter)
393 393
     onLoadFn();
394 394
   })
395
-	
395
+
396 396
 	onShow((option) =>{
397
-		
397
+
398 398
 	})
399
-	
399
+
400 400
 	onHide(()=>{
401 401
 		repositorySearchStore.clearRepositoryListSearchData()
402 402
 	})
403
-	
403
+
404 404
   onTabItemTap(e => {
405 405
     // onLoadFn();
406 406
   })
@@ -663,6 +663,6 @@ page{
663 663
 			}
664 664
 		}
665 665
 	}
666
-	
666
+
667 667
 }
668 668
 </style>