浏览代码

解决冲突

maotao 1 月之前
父节点
当前提交
811601b03b

+ 2 - 2
components/IncidentAttachment.vue

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

+ 10 - 10
pages/incidentDetail/incidentDetail.vue

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

+ 6 - 6
pages/incidentList/incidentList.vue

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

+ 69 - 69
pages/myRepair/myRepair.vue

@@ -14,7 +14,7 @@
14
 		      <view class="body_item_head ellipsis-multiline">
14
 		      <view class="body_item_head ellipsis-multiline">
15
 		        {{data.description}}
15
 		        {{data.description}}
16
 		      </view>
16
 		      </view>
17
-		
17
+
18
 		      <view class="body_item_content">
18
 		      <view class="body_item_content">
19
 						<view class="body_item_content_p" v-if="data.place || data.houseNumber">
19
 						<view class="body_item_content_p" v-if="data.place || data.houseNumber">
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>
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
 						  <text class="name ellipsis">维修说明:{{data.overtimeRemark}}</text>
30
 						  <text class="name ellipsis">维修说明:{{data.overtimeRemark}}</text>
31
 						</view>
31
 						</view>
32
 		      </view>
32
 		      </view>
33
-		
33
+
34
 		      <view class="body_item_foot">
34
 		      <view class="body_item_foot">
35
 		        <view class="foot_info">
35
 		        <view class="foot_info">
36
 		          <view class="name">维修人员:{{data.assigneeName || '暂无'}}</view>
36
 		          <view class="name">维修人员:{{data.assigneeName || '暂无'}}</view>
@@ -87,7 +87,7 @@
87
 				</view>
87
 				</view>
88
 			</uni-popup>
88
 			</uni-popup>
89
 		</view>
89
 		</view>
90
-		
90
+
91
 		<view v-if="tabsIndex0==1">
91
 		<view v-if="tabsIndex0==1">
92
 			<view class="home_item" v-if="isDept.valueconfig==1">
92
 			<view class="home_item" v-if="isDept.valueconfig==1">
93
 				<view class="title">科室报修</view>
93
 				<view class="title">科室报修</view>
@@ -166,7 +166,7 @@
166
 						<view class="bottom_list_item" v-if="deptRepair.valueconfig==1" @click="selectDepartment">
166
 						<view class="bottom_list_item" v-if="deptRepair.valueconfig==1" @click="selectDepartment">
167
 	<!-- 					  <view class="name"><text class="required newicon newicon-bitian"></text>科室名称</view>
167
 	<!-- 					  <view class="name"><text class="required newicon newicon-bitian"></text>科室名称</view>
168
 							<uni-data-picker class="value" placeholder="请选择报修科室"
168
 							<uni-data-picker class="value" placeholder="请选择报修科室"
169
-								v-model="dataForm.dept" :localdata="deptData" 
169
+								v-model="dataForm.dept" :localdata="deptData"
170
 								:clear-icon="false" :class="{formRed: isSubmit && !dataForm.dept}">
170
 								:clear-icon="false" :class="{formRed: isSubmit && !dataForm.dept}">
171
 							</uni-data-picker> -->
171
 							</uni-data-picker> -->
172
 							<text class="newicon newicon-youjiantou icon"></text>
172
 							<text class="newicon newicon-youjiantou icon"></text>
@@ -235,16 +235,16 @@
235
 	import { repositoryListSearchStore } from '@/stores/repositorySearch'
235
 	import { repositoryListSearchStore } from '@/stores/repositorySearch'
236
 	import { useSetTabbar } from '@/share/useSetTabbar.js'
236
 	import { useSetTabbar } from '@/share/useSetTabbar.js'
237
 	useSetTitle();
237
 	useSetTitle();
238
-	
238
+
239
 	// 数据
239
 	// 数据
240
 	const incidentListSearchStore = useIncidentListSearchStore();
240
 	const incidentListSearchStore = useIncidentListSearchStore();
241
 	const { formatDate }  = filterFormatDate();
241
 	const { formatDate }  = filterFormatDate();
242
 	const { priorityStyle }  = computedPriorityStyle();
242
 	const { priorityStyle }  = computedPriorityStyle();
243
 	const { stateStyle }  = computedStateStyle();
243
 	const { stateStyle }  = computedStateStyle();
244
 	const { currentLogOverTime }  = computedCurrentLogOverTime();
244
 	const { currentLogOverTime }  = computedCurrentLogOverTime();
245
-	
245
+
246
 	const { setTabbar }  = useSetTabbar();
246
 	const { setTabbar }  = useSetTabbar();
247
-	
247
+
248
 	// 主题颜色
248
 	// 主题颜色
249
 	const primaryColor = ref(defaultColor)
249
 	const primaryColor = ref(defaultColor)
250
 	const popup = ref(null);//弹框
250
 	const popup = ref(null);//弹框
@@ -259,7 +259,7 @@
259
 	const rate = ref(3);//星级
259
 	const rate = ref(3);//星级
260
 	const wxdegreeremark = ref(null);//评价内容
260
 	const wxdegreeremark = ref(null);//评价内容
261
 	const repairIncident = ref(null);
261
 	const repairIncident = ref(null);
262
-	
262
+
263
 	// 数据
263
 	// 数据
264
 	const dataInfo = reactive({
264
 	const dataInfo = reactive({
265
 	  tabs: [{id: 0, name: '我的报修', value: 'all', num: ''},],
265
 	  tabs: [{id: 0, name: '我的报修', value: 'all', num: ''},],
@@ -279,7 +279,7 @@
279
 	    acceptDate: [],
279
 	    acceptDate: [],
280
 	  },//筛选框数据
280
 	  },//筛选框数据
281
 	})
281
 	})
282
-	
282
+
283
 	const isDept = ref({})
283
 	const isDept = ref({})
284
 	const isRepair = ref({})
284
 	const isRepair = ref({})
285
 	const isPublic = ref({})
285
 	const isPublic = ref({})
@@ -289,22 +289,22 @@
289
 	const tabsIndex1 = ref(0)
289
 	const tabsIndex1 = ref(0)
290
 	const tabsIndex2 = ref(0)
290
 	const tabsIndex2 = ref(0)
291
 	const repositorySearchStore = repositoryListSearchStore();
291
 	const repositorySearchStore = repositoryListSearchStore();
292
-	
293
-	
292
+
293
+
294
 	const loginUserStore = useLoginUserStore();
294
 	const loginUserStore = useLoginUserStore();
295
 	const incidentNumStore = useIncidentNumStore();
295
 	const incidentNumStore = useIncidentNumStore();
296
 	const { makePhoneCall }  = useMakePhoneCall();
296
 	const { makePhoneCall }  = useMakePhoneCall();
297
 
297
 
298
 	const deptRepair = ref(null)
298
 	const deptRepair = ref(null)
299
-	
299
+
300
 	const deptData = ref([])
300
 	const deptData = ref([])
301
-	
301
+
302
 	const branchData = ref([])
302
 	const branchData = ref([])
303
-	
303
+
304
 	const commonDeptName = ref(null)
304
 	const commonDeptName = ref(null)
305
-	
305
+
306
 	const commonDeptData = ref(null)
306
 	const commonDeptData = ref(null)
307
-	
307
+
308
 	const dataForm = reactive({
308
 	const dataForm = reactive({
309
 		name:loginUserStore.loginUser.user.name,
309
 		name:loginUserStore.loginUser.user.name,
310
 		account:loginUserStore.loginUser.user.account,
310
 		account:loginUserStore.loginUser.user.account,
@@ -316,23 +316,23 @@
316
 		commonDeptData:'',
316
 		commonDeptData:'',
317
 		dataType:false
317
 		dataType:false
318
 	})
318
 	})
319
-	
319
+
320
 	const operationType = ref(null)
320
 	const operationType = ref(null)
321
-	
321
+
322
 	const userTypes = ref(null)
322
 	const userTypes = ref(null)
323
-	
323
+
324
 	const userData = reactive(loginUserStore.loginUser.user)
324
 	const userData = reactive(loginUserStore.loginUser.user)
325
-	
325
+
326
 	const commonDeptDTO = ref([])
326
 	const commonDeptDTO = ref([])
327
-	
327
+
328
 	// 是否提交
328
 	// 是否提交
329
 	const isSubmit = ref(false)
329
 	const isSubmit = ref(false)
330
-	
330
+
331
 	// 数据
331
 	// 数据
332
 	const dataConfigInfo = reactive({
332
 	const dataConfigInfo = reactive({
333
 	  num: 0,
333
 	  num: 0,
334
 	})
334
 	})
335
-	
335
+
336
 	function tabsClick0(){
336
 	function tabsClick0(){
337
 		tabsIndex0.value=1
337
 		tabsIndex0.value=1
338
 		tabsIndex1.value=0
338
 		tabsIndex1.value=0
@@ -340,7 +340,7 @@
340
 		getCount()
340
 		getCount()
341
 		repositorySearchStore.clearRepositoryListSearchData()
341
 		repositorySearchStore.clearRepositoryListSearchData()
342
 	}
342
 	}
343
-	
343
+
344
 	function tabsClick1(){
344
 	function tabsClick1(){
345
 		tabsIndex0.value=0
345
 		tabsIndex0.value=0
346
 		tabsIndex2.value=0
346
 		tabsIndex2.value=0
@@ -349,7 +349,7 @@
349
 		dataInfo.stateValue = 0
349
 		dataInfo.stateValue = 0
350
 		getTabs();
350
 		getTabs();
351
 	}
351
 	}
352
-	
352
+
353
 	function tabsClick2(){
353
 	function tabsClick2(){
354
 		tabsIndex2.value=1
354
 		tabsIndex2.value=1
355
 		tabsIndex1.value=0
355
 		tabsIndex1.value=0
@@ -357,14 +357,14 @@
357
 		getUserInfo()
357
 		getUserInfo()
358
 		repositorySearchStore.clearRepositoryListSearchData()
358
 		repositorySearchStore.clearRepositoryListSearchData()
359
 	}
359
 	}
360
-	
360
+
361
 	// 工单详情
361
 	// 工单详情
362
 	function toIncidentDetail(data){
362
 	function toIncidentDetail(data){
363
 	  uni.navigateTo({
363
 	  uni.navigateTo({
364
 	    url: `/pages/repair/repairsDetail?incidentId=${data.id}`
364
 	    url: `/pages/repair/repairsDetail?incidentId=${data.id}`
365
 	  })
365
 	  })
366
 	}
366
 	}
367
-	
367
+
368
 	// 获取tab选项
368
 	// 获取tab选项
369
 	function getTabs(){
369
 	function getTabs(){
370
 	  uni.showLoading({
370
 	  uni.showLoading({
@@ -392,7 +392,7 @@
392
 			]
392
 			]
393
 		}
393
 		}
394
 	}
394
 	}
395
-	
395
+
396
 	// 点击tab
396
 	// 点击tab
397
 	function clickTab(tabId){
397
 	function clickTab(tabId){
398
 	  dataInfo.tabActiveId = tabId;
398
 	  dataInfo.tabActiveId = tabId;
@@ -403,31 +403,31 @@
403
 		dataInfo.idx=0
403
 		dataInfo.idx=0
404
 	  getList(0);
404
 	  getList(0);
405
 	}
405
 	}
406
-	
406
+
407
 	// 点击筛选
407
 	// 点击筛选
408
 	function filterClick(){
408
 	function filterClick(){
409
 	  dataInfo.isFilter = true;
409
 	  dataInfo.isFilter = true;
410
 	}
410
 	}
411
-	
411
+
412
 	// 确认筛选
412
 	// 确认筛选
413
 	function conformFilter(evtFilter){
413
 	function conformFilter(evtFilter){
414
 	  dataInfo.stateValue = evtFilter.category;
414
 	  dataInfo.stateValue = evtFilter.category;
415
 	  dataInfo.isFilter = false;
415
 	  dataInfo.isFilter = false;
416
 	  getList(0);
416
 	  getList(0);
417
 	}
417
 	}
418
-	
418
+
419
 	// 关闭筛选
419
 	// 关闭筛选
420
 	function cancelFilter(){
420
 	function cancelFilter(){
421
 	  dataInfo.isFilter = false;
421
 	  dataInfo.isFilter = false;
422
 	}
422
 	}
423
-	
423
+
424
 	// 点击图片和录音
424
 	// 点击图片和录音
425
 	function attachmentClick(incidentData){
425
 	function attachmentClick(incidentData){
426
 	  dataInfo.incidentData = incidentData;
426
 	  dataInfo.incidentData = incidentData;
427
 	  dataInfo.isAttachment = true;
427
 	  dataInfo.isAttachment = true;
428
 	}
428
 	}
429
-	
430
-	// 知道了图片和录音
429
+
430
+	// 返回图片和录音
431
 	function knowAttachment(){
431
 	function knowAttachment(){
432
 	  dataInfo.isAttachment = false;
432
 	  dataInfo.isAttachment = false;
433
 	}
433
 	}
@@ -493,13 +493,13 @@
493
 			degreeDictionary.value = res
493
 			degreeDictionary.value = res
494
 		})
494
 		})
495
 	}
495
 	}
496
-	
496
+
497
 	function closePop(){
497
 	function closePop(){
498
 		rate.value = 3
498
 		rate.value = 3
499
 		wxdegreeremark.value = null
499
 		wxdegreeremark.value = null
500
 		popup.value.close()
500
 		popup.value.close()
501
 	}
501
 	}
502
-	
502
+
503
 	function submit(){
503
 	function submit(){
504
 		if(!rate.value){
504
 		if(!rate.value){
505
 			uni.showToast({
505
 			uni.showToast({
@@ -551,8 +551,8 @@
551
 		})
551
 		})
552
 		closePop()
552
 		closePop()
553
 	}
553
 	}
554
-	
555
-	
554
+
555
+
556
 	// 获取列表信息
556
 	// 获取列表信息
557
 	function getList(idx){
557
 	function getList(idx){
558
 	  uni.showLoading({
558
 	  uni.showLoading({
@@ -602,7 +602,7 @@
602
 	  })
602
 	  })
603
 	  // getCount(postData.incident);
603
 	  // getCount(postData.incident);
604
 	}
604
 	}
605
-	
605
+
606
 	// 获取列表数量
606
 	// 获取列表数量
607
 	// function getCount(incident = {}){
607
 	// function getCount(incident = {}){
608
 	//   let postData = {
608
 	//   let postData = {
@@ -612,7 +612,7 @@
612
 	//   dataInfo.tabs.forEach(v => {
612
 	//   dataInfo.tabs.forEach(v => {
613
 	//       postData.incidentList.push({...incident, ...{statusId: v.id || undefined}});
613
 	//       postData.incidentList.push({...incident, ...{statusId: v.id || undefined}});
614
 	//   })
614
 	//   })
615
-	
615
+
616
 	//   api_incident_count(postData).then(res => {
616
 	//   api_incident_count(postData).then(res => {
617
 	//     if(res.state == 200){
617
 	//     if(res.state == 200){
618
 	//       let myData = res.data || [];
618
 	//       let myData = res.data || [];
@@ -627,15 +627,15 @@
627
 	//     }
627
 	//     }
628
 	//   })
628
 	//   })
629
 	// }
629
 	// }
630
-	
631
-	
630
+
631
+
632
 	// 知识库
632
 	// 知识库
633
 	function repository(){
633
 	function repository(){
634
 		uni.navigateTo({
634
 		uni.navigateTo({
635
 		  url: `/pages/repository/repository?type=view&entranceType=repairs`
635
 		  url: `/pages/repository/repository?type=view&entranceType=repairs`
636
 		})
636
 		})
637
 	}
637
 	}
638
-	
638
+
639
 	// 报修列表
639
 	// 报修列表
640
 	function repairsView(type,value){
640
 	function repairsView(type,value){
641
 		tabsIndex0.value = 0
641
 		tabsIndex0.value = 0
@@ -647,7 +647,7 @@
647
 		repositorySearchStore.setRepositoryListSearchData(dataInfo.evtFilter)
647
 		repositorySearchStore.setRepositoryListSearchData(dataInfo.evtFilter)
648
 		getTabs()
648
 		getTabs()
649
 	}
649
 	}
650
-	
650
+
651
 	// 获取报修数量
651
 	// 获取报修数量
652
 	function getCount(){
652
 	function getCount(){
653
 		uni.showLoading({
653
 		uni.showLoading({
@@ -659,7 +659,7 @@
659
 			repairData.value = res.data
659
 			repairData.value = res.data
660
 		})
660
 		})
661
 	}
661
 	}
662
-	
662
+
663
 	// 快速报修
663
 	// 快速报修
664
 	function addRepairs(){
664
 	function addRepairs(){
665
 		if(isDept.value.valueconfig==0 && isPublic.value.valueconfig==0){
665
 		if(isDept.value.valueconfig==0 && isPublic.value.valueconfig==0){
@@ -674,7 +674,7 @@
674
 		  url: '/pages/repair/rapidRep'
674
 		  url: '/pages/repair/rapidRep'
675
 		})
675
 		})
676
 	}
676
 	}
677
-	
677
+
678
 	// 扫资产报修
678
 	// 扫资产报修
679
 	function scanCodes(){
679
 	function scanCodes(){
680
 		uni.showLoading({
680
 		uni.showLoading({
@@ -700,8 +700,8 @@
700
 			});
700
 			});
701
 		})
701
 		})
702
 	}
702
 	}
703
-	
704
-	
703
+
704
+
705
 	// 保存
705
 	// 保存
706
 	function addInfo(){
706
 	function addInfo(){
707
 		if(!dataForm.branch){
707
 		if(!dataForm.branch){
@@ -711,7 +711,7 @@
711
 			});
711
 			});
712
 			return
712
 			return
713
 		}
713
 		}
714
-		
714
+
715
 		if(!dataForm.dept){
715
 		if(!dataForm.dept){
716
 			uni.showToast({
716
 			uni.showToast({
717
 			  icon: 'none',
717
 			  icon: 'none',
@@ -719,7 +719,7 @@
719
 			});
719
 			});
720
 			return
720
 			return
721
 		}
721
 		}
722
-		
722
+
723
 		uni.showLoading({
723
 		uni.showLoading({
724
 		  title: "加载中",
724
 		  title: "加载中",
725
 		  mask: true,
725
 		  mask: true,
@@ -767,7 +767,7 @@
767
 			}
767
 			}
768
 		})
768
 		})
769
 	}
769
 	}
770
-	
770
+
771
 	// 选择院区
771
 	// 选择院区
772
 	function branchChange(){
772
 	function branchChange(){
773
 		dataForm.dept = null
773
 		dataForm.dept = null
@@ -778,7 +778,7 @@
778
 		commonDeptData.value = null
778
 		commonDeptData.value = null
779
 		// getRepairTypes()
779
 		// getRepairTypes()
780
 	}
780
 	}
781
-	
781
+
782
 	// 跳转到科室
782
 	// 跳转到科室
783
 	function selectDepartment(){
783
 	function selectDepartment(){
784
 		if(commonDeptName.value){
784
 		if(commonDeptName.value){
@@ -791,7 +791,7 @@
791
 	    url: `/pages/searchDept/searchDept?type=config&branchId=${dataForm.branch}`
791
 	    url: `/pages/searchDept/searchDept?type=config&branchId=${dataForm.branch}`
792
 	  })
792
 	  })
793
 	}
793
 	}
794
-	
794
+
795
 	// 获取科室列表
795
 	// 获取科室列表
796
 	function getRepairTypes(){
796
 	function getRepairTypes(){
797
 	  uni.showLoading({
797
 	  uni.showLoading({
@@ -814,7 +814,7 @@
814
 	    }));
814
 	    }));
815
 	  })
815
 	  })
816
 	}
816
 	}
817
-	
817
+
818
 	// 获取院区列表
818
 	// 获取院区列表
819
 	function getBranch(){
819
 	function getBranch(){
820
 		let arr = loginUserStore.loginUser.hospital.filter(i=>i.parent==undefined)
820
 		let arr = loginUserStore.loginUser.hospital.filter(i=>i.parent==undefined)
@@ -823,11 +823,11 @@
823
 		  value: v.id,
823
 		  value: v.id,
824
 		}));
824
 		}));
825
 	}
825
 	}
826
-	
826
+
827
 	// 选择常用科室
827
 	// 选择常用科室
828
 	function deptSelect(){
828
 	function deptSelect(){
829
 		uni.setStorageSync('configData',JSON.stringify(dataForm))
829
 		uni.setStorageSync('configData',JSON.stringify(dataForm))
830
-		let data = commonDeptData.value 
830
+		let data = commonDeptData.value
831
 		// ? commonDeptData.value : loginUserStore.loginUser.user.commonDept
831
 		// ? commonDeptData.value : loginUserStore.loginUser.user.commonDept
832
 		if(!data){
832
 		if(!data){
833
 			data = 'none'
833
 			data = 'none'
@@ -837,7 +837,7 @@
837
 		  url: `/pages/repair/deptSelect?data=${JSON.stringify(data)}&commonDeptName=${commonDeptName.value}&deptId=${deptId}&type=home`
837
 		  url: `/pages/repair/deptSelect?data=${JSON.stringify(data)}&commonDeptName=${commonDeptName.value}&deptId=${deptId}&type=home`
838
 		})
838
 		})
839
 	}
839
 	}
840
-	
840
+
841
 	function getUserInfo(){
841
 	function getUserInfo(){
842
 		let user = loginUserStore.loginUser.user
842
 		let user = loginUserStore.loginUser.user
843
 		let userId = null
843
 		let userId = null
@@ -876,7 +876,7 @@
876
 							commonDeptData.value = data.commonDeptData
876
 							commonDeptData.value = data.commonDeptData
877
 							commonDeptName.value = data.commonDeptName
877
 							commonDeptName.value = data.commonDeptName
878
 						}
878
 						}
879
-					}	
879
+					}
880
 				}else if(item){
880
 				}else if(item){
881
 					if(item.hospital.parent){
881
 					if(item.hospital.parent){
882
 						dataForm.branch = item.hospital.parent.id
882
 						dataForm.branch = item.hospital.parent.id
@@ -937,7 +937,7 @@
937
 		  }
937
 		  }
938
 		})
938
 		})
939
 	}
939
 	}
940
-	
940
+
941
 	// 获取配置项
941
 	// 获取配置项
942
 	function getConfig(option){
942
 	function getConfig(option){
943
 		api_systemConfiguration({
943
 		api_systemConfiguration({
@@ -985,12 +985,12 @@
985
 			}
985
 			}
986
 		})
986
 		})
987
 	}
987
 	}
988
-	
988
+
989
 	onHide(opt=>{
989
 	onHide(opt=>{
990
 		dataConfigInfo.num = 0
990
 		dataConfigInfo.num = 0
991
 		dataForm.branch = null
991
 		dataForm.branch = null
992
 	})
992
 	})
993
-	
993
+
994
 	onLoad((option) => {
994
 	onLoad((option) => {
995
 		console.log(777,option)
995
 		console.log(777,option)
996
 		getConfig(option)
996
 		getConfig(option)
@@ -999,9 +999,9 @@
999
 		if(option && option.configType){
999
 		if(option && option.configType){
1000
 			operationType.value = option.configType
1000
 			operationType.value = option.configType
1001
 		}
1001
 		}
1002
-		
1002
+
1003
 	})
1003
 	})
1004
-	
1004
+
1005
 	onReachBottom(() => {
1005
 	onReachBottom(() => {
1006
 		if(tabsIndex1.value==1){
1006
 		if(tabsIndex1.value==1){
1007
 			dataInfo.idx += 1;
1007
 			dataInfo.idx += 1;
@@ -1010,11 +1010,11 @@
1010
 			}
1010
 			}
1011
 		}
1011
 		}
1012
 	})
1012
 	})
1013
-	
1013
+
1014
 	onPullDownRefresh(_=>{
1014
 	onPullDownRefresh(_=>{
1015
 		// uni.stopPullDownRefresh();
1015
 		// uni.stopPullDownRefresh();
1016
 	})
1016
 	})
1017
-	
1017
+
1018
 	onShow((option) => {
1018
 	onShow((option) => {
1019
 		userTypes.value = JSON.parse(uni.getStorageSync('groupData'))
1019
 		userTypes.value = JSON.parse(uni.getStorageSync('groupData'))
1020
 		if(dataConfigInfo.num==0){
1020
 		if(dataConfigInfo.num==0){
@@ -1022,7 +1022,7 @@
1022
 		}
1022
 		}
1023
 		repositorySearchStore.clearRepositoryListSearchData()
1023
 		repositorySearchStore.clearRepositoryListSearchData()
1024
 	})
1024
 	})
1025
-	
1025
+
1026
 
1026
 
1027
 </script>
1027
 </script>
1028
 
1028
 
@@ -1301,9 +1301,9 @@
1301
 				}
1301
 				}
1302
 			}
1302
 			}
1303
 		}
1303
 		}
1304
-		
1304
+
1305
 	}
1305
 	}
1306
-	
1306
+
1307
 	.home{
1307
 	.home{
1308
 		// height: 100vh;
1308
 		// height: 100vh;
1309
 		// padding: 20rpx;
1309
 		// padding: 20rpx;
@@ -1489,7 +1489,7 @@
1489
 	        }
1489
 	        }
1490
 	      }
1490
 	      }
1491
 	    }
1491
 	    }
1492
-	    
1492
+
1493
 	    .bottom{
1493
 	    .bottom{
1494
 	      background-color: #fff;
1494
 	      background-color: #fff;
1495
 	      margin-top: 15rpx;
1495
 	      margin-top: 15rpx;

+ 17 - 17
pages/repair/listHome.vue

@@ -106,7 +106,7 @@
106
   import { useIncidentListSearchStore } from '@/stores/incidentListSearch'
106
   import { useIncidentListSearchStore } from '@/stores/incidentListSearch'
107
 	import { repositoryListSearchStore } from '@/stores/repositorySearch'
107
 	import { repositoryListSearchStore } from '@/stores/repositorySearch'
108
 	import { useSetTabbar } from '@/share/useSetTabbar.js'
108
 	import { useSetTabbar } from '@/share/useSetTabbar.js'
109
-	
109
+
110
   useSetTitle();
110
   useSetTitle();
111
 	const repositorySearchStore = repositoryListSearchStore();
111
 	const repositorySearchStore = repositoryListSearchStore();
112
   const loginUserStore = useLoginUserStore();
112
   const loginUserStore = useLoginUserStore();
@@ -117,9 +117,9 @@
117
   const { stateStyle }  = computedStateStyle();
117
   const { stateStyle }  = computedStateStyle();
118
   const { currentLogOverTime }  = computedCurrentLogOverTime();
118
   const { currentLogOverTime }  = computedCurrentLogOverTime();
119
   const { makePhoneCall }  = useMakePhoneCall();
119
   const { makePhoneCall }  = useMakePhoneCall();
120
-	
120
+
121
 	const { setTabbar }  = useSetTabbar();
121
 	const { setTabbar }  = useSetTabbar();
122
-	
122
+
123
   // 主题颜色
123
   // 主题颜色
124
   const primaryColor = ref(defaultColor)
124
   const primaryColor = ref(defaultColor)
125
 	const popup = ref(null);//弹框
125
 	const popup = ref(null);//弹框
@@ -135,7 +135,7 @@
135
 	const isSubmit = ref(false);
135
 	const isSubmit = ref(false);
136
 	const rate = ref(3);//星级
136
 	const rate = ref(3);//星级
137
 	const wxdegreeremark = ref(null);//评价内容
137
 	const wxdegreeremark = ref(null);//评价内容
138
-	
138
+
139
   // 判断是否显示接单按钮
139
   // 判断是否显示接单按钮
140
   const computedReceive = computed(() => (data) => {
140
   const computedReceive = computed(() => (data) => {
141
     let inUser = data.currentLog && data.currentLog.workerId == loginUserStore.loginUser.user.id;
141
     let inUser = data.currentLog && data.currentLog.workerId == loginUserStore.loginUser.user.id;
@@ -154,9 +154,9 @@
154
   const computedSynergetic = computed(() => (synergetic) => {
154
   const computedSynergetic = computed(() => (synergetic) => {
155
     return (synergetic && synergetic.length) ? synergetic.map(v => v.name).join(',') : ''
155
     return (synergetic && synergetic.length) ? synergetic.map(v => v.name).join(',') : ''
156
   })
156
   })
157
-	
157
+
158
 	const repairIncident = ref(null);
158
 	const repairIncident = ref(null);
159
-	
159
+
160
   // 数据
160
   // 数据
161
   const dataInfo = reactive({
161
   const dataInfo = reactive({
162
     tabs: [{id: 0, name: '我的报修', value: 'all', num: ''},],
162
     tabs: [{id: 0, name: '我的报修', value: 'all', num: ''},],
@@ -241,7 +241,7 @@
241
     dataInfo.isAttachment = true;
241
     dataInfo.isAttachment = true;
242
   }
242
   }
243
 
243
 
244
-  // 知道了图片和录音
244
+  // 返回图片和录音
245
   function knowAttachment(){
245
   function knowAttachment(){
246
     dataInfo.isAttachment = false;
246
     dataInfo.isAttachment = false;
247
   }
247
   }
@@ -307,13 +307,13 @@
307
 			degreeDictionary.value = res
307
 			degreeDictionary.value = res
308
 		})
308
 		})
309
   }
309
   }
310
-	
310
+
311
 	function closePop(){
311
 	function closePop(){
312
 		rate.value = 3
312
 		rate.value = 3
313
 		wxdegreeremark.value = null
313
 		wxdegreeremark.value = null
314
 		popup.value.close()
314
 		popup.value.close()
315
 	}
315
 	}
316
-	
316
+
317
 	function submit(){
317
 	function submit(){
318
 		if(!rate.value){
318
 		if(!rate.value){
319
 			uni.showToast({
319
 			uni.showToast({
@@ -365,7 +365,7 @@
365
 		})
365
 		})
366
 		closePop()
366
 		closePop()
367
 	}
367
 	}
368
-	
368
+
369
 
369
 
370
   // 获取列表信息
370
   // 获取列表信息
371
   function getList(idx){
371
   function getList(idx){
@@ -416,7 +416,7 @@
416
     })
416
     })
417
     // getCount(postData.incident);
417
     // getCount(postData.incident);
418
   }
418
   }
419
-	
419
+
420
   // 获取列表数量
420
   // 获取列表数量
421
   function getCount(incident = {}){
421
   function getCount(incident = {}){
422
     let postData = {
422
     let postData = {
@@ -446,7 +446,7 @@
446
   function onLoadFn(){
446
   function onLoadFn(){
447
     getTabs();
447
     getTabs();
448
   }
448
   }
449
-	
449
+
450
 	// 获取配置项
450
 	// 获取配置项
451
 	function getConfig(){
451
 	function getConfig(){
452
 		api_systemConfiguration({
452
 		api_systemConfiguration({
@@ -459,14 +459,14 @@
459
 			onLoadFn();
459
 			onLoadFn();
460
 		})
460
 		})
461
 	}
461
 	}
462
-	
462
+
463
   onLoad((option) => {
463
   onLoad((option) => {
464
 		getConfig();
464
 		getConfig();
465
 		for(let i = 0; i<7; i++){
465
 		for(let i = 0; i<7; i++){
466
 			setTabbar(i)
466
 			setTabbar(i)
467
 		}
467
 		}
468
   })
468
   })
469
-	
469
+
470
 	onShow((option) =>{
470
 	onShow((option) =>{
471
 		let data = uni.getStorageSync('homeRepairList')
471
 		let data = uni.getStorageSync('homeRepairList')
472
 		if(data){
472
 		if(data){
@@ -481,12 +481,12 @@
481
 		}
481
 		}
482
 		onLoadFn();
482
 		onLoadFn();
483
 	})
483
 	})
484
-	
484
+
485
 	onHide(_=>{
485
 	onHide(_=>{
486
 		uni.setStorageSync('homeRepairList','')
486
 		uni.setStorageSync('homeRepairList','')
487
 		repositorySearchStore.clearRepositoryListSearchData()
487
 		repositorySearchStore.clearRepositoryListSearchData()
488
 	})
488
 	})
489
-	
489
+
490
   onTabItemTap(e => {
490
   onTabItemTap(e => {
491
     // onLoadFn();
491
     // onLoadFn();
492
   })
492
   })
@@ -756,6 +756,6 @@ page{
756
 			}
756
 			}
757
 		}
757
 		}
758
 	}
758
 	}
759
-	
759
+
760
 }
760
 }
761
 </style>
761
 </style>

+ 15 - 15
pages/repair/repairsDetail.vue

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

+ 15 - 15
pages/repair/repairsList.vue

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