故障工单优化

components/IncidentListFilter.vue

@@ -369,8 +369,10 @@
 		if(showDept.value){
 			searchData.deptValue = evt.deptValue;
 			searchData.dept = evt.dept;
+		}else{
+			searchData.deptValue = {};
+			searchData.dept = {};
 		}
-		console.log(2222,evt)
   })
 </script>
 

pages/incidentList/incidentList.vue

@@ -72,7 +72,7 @@
   import RequireAttachment from '@/components/RequireAttachment.vue';
   import { startOfDay, endOfDay, format, add } from 'date-fns'
   import { ref, reactive, computed } from 'vue'
-  import { onLoad, onPullDownRefresh, onReachBottom, onTabItemTap } from '@dcloudio/uni-app'
+  import { onLoad, onUnload, onHide, onPullDownRefresh, onReachBottom, onTabItemTap } from '@dcloudio/uni-app'
   import { api_getDictionary, api_incident, api_incident_count, api_incidentTask } from "@/http/api.js"
   import { filterFormatDate } from '@/filters/filterFormatDate.js'
   import { computedPriorityStyle } from '@/filters/computedPriorityStyle.js'
@@ -328,9 +328,9 @@
 		
 		if(postData.incident.queryTask != 'todoingAll'){
 			if(showDept.value){
-				if(dataInfo.evtFilter.deptValue && dataInfo.evtFilter.deptValue.value){
+				if(dataInfo.evtFilter.dept && dataInfo.evtFilter.dept.value){
 					let infoPermission = loginUserStore.loginUser.infoPermission
-					let itemDept = infoPermission.dutyList.find(i=>i.id == dataInfo.evtFilter.deptValue.value)
+					let itemDept = infoPermission.dutyList.find(i=>i.id == dataInfo.evtFilter.dept.value)
 					postData.incident.duty = itemDept;
 					delete postData.incident.hosId;
 				}else{
@@ -381,7 +381,6 @@
       uni.hideLoading();
       uni.stopPullDownRefresh();
       if(res.status == 200){
-				console.log(6666,incidentListSearchStore.incidentListSearch.data)
         let list = res.list || [];
         if(list.length){
           dataInfo.hasMore = true;
@@ -436,8 +435,13 @@
       dataInfo.tabActiveId = incidentNumStore.incidentNum.data.statusId;
       incidentNumStore.clearIncidentNumData();
     }else if(storeData){
-			console.log(222)
 			Object.assign(dataInfo, storeData);
+			if(Object.keys(dataInfo.evtFilter.dept).length == 0){
+				dataInfo.evtFilter.dept.text = hospital.hosName
+				dataInfo.evtFilter.dept.value = hospital.id
+				dataInfo.evtFilter.deptValue = hospital.id
+			}
+			console.log(222,dataInfo.evtFilter)
     }else{
 			console.log(333)
 			// if(Object.keys(dataInfo.evtFilter.dept).length == 0){
@@ -471,9 +475,17 @@
     }
     onLoadFn();
   })
-
+	
+	onUnload(() => {
+    dataInfo.isFilter = false;
+  })
+	
+	onHide(() => {
+	  dataInfo.isFilter = false;
+	})
+	
   onTabItemTap(e => {
-    onLoadFn();
+    // onLoadFn();
   })
 
   onPullDownRefresh(() => {

share/useLoginSuccess.js

@@ -1,5 +1,7 @@
 import { useLoginUserStore } from '@/stores/loginUser'
+import { useIncidentListSearchStore } from '@/stores/incidentListSearch'
 const loginUserStore = useLoginUserStore()
+const incidentListSearchStore = useIncidentListSearchStore();
 export function useLoginSuccess() {
   /**
    * 登录成功后的操作
@@ -9,6 +11,7 @@ export function useLoginSuccess() {
     loginUserStore.setLoginUser(user.user);
     loginUserStore.setLoginUserMenu(user.menu);
 		loginUserStore.setInfoPermission(user.infoPermission);
+		incidentListSearchStore.clearIncidentListSearchData();
 		let loginType = uni.getStorageSync('loginType'); //1:处理 2:报修
     // 判断用户标识是否为处理人
     if (user.user.engineer === 1) {