工单优化

components/IncidentListFilter.vue

@@ -146,6 +146,7 @@
     category: {},
 		categoryValue:{},
     acceptDate: [],
+		dept: {},
 		deptValue: {}
   })
 
@@ -185,8 +186,8 @@
     searchData.category = {};
     searchData.acceptDate = [];
 		searchData.categoryValue = {};
+		searchData.dept = {};
 		searchData.deptValue = {};
-    console.log(searchData.acceptDate)
   }
 
   // 取消
@@ -218,7 +219,7 @@
 
 	// 选择维修科室
 	function deptChange(val){
-		searchData.deptValue = val.detail.value[val.detail.value.length-1]
+		searchData.dept = val.detail.value[val.detail.value.length-1]
 	}
 
 	// 选择故障现象
@@ -339,16 +340,6 @@
   onLoad((option) => {
 		getCategoryList()
     // searchData.hospital = evt.hospital;
-    for (let i = 0; i < loginUserStore.loginUser.menu.length; i++) {
-      if(loginUserStore.loginUser.menu[i].link === 'incidentManagement'){
-        let currentMenu = loginUserStore.loginUser.menu[i].children;
-        for (let j = 0; j < currentMenu; j++) {
-            if (currentMenu[j].link == "all") {
-              tabs.splice(0, 0 , { name: '全部事件', value: 'all' });
-            }
-        }
-      }
-    }
 		let menu = JSON.parse(uni.getStorageSync("menuList")) || []; //菜单
 		console.log(9555,menu)
 		showDept.value = false
@@ -359,6 +350,8 @@
 						el.childrens.forEach(item =>{
 							if(item.link=='strideLook'){
 								showDept.value = true
+							}else if(item.link=='all'){
+								tabs.splice(0, 0 , { name: '全部事件', value: 'all' });
 							}
 						})
 					}
@@ -374,8 +367,10 @@
 		searchData.categoryValue = evt.categoryValue;
     searchData.acceptDate = evt.acceptDate;
 		if(showDept.value){
-			searchData.deptValue = evt.deptValue?evt.deptValue.value:'';
+			searchData.deptValue = evt.deptValue;
+			searchData.dept = evt.dept;
 		}
+		console.log(2222,evt)
   })
 </script>
 

pages/assign/assign.vue

@@ -1277,8 +1277,8 @@
     let shijianliebiao_supplement = false;//故障处理权限
     for (let i = 0; i < loginUserStore.loginUser.menu.length; i++) {
       if(loginUserStore.loginUser.menu[i].link === 'incidentManagement'){
-        let currentMenu = loginUserStore.loginUser.menu[i].children;
-        for (let j = 0; j < currentMenu; j++) {
+        let currentMenu = loginUserStore.loginUser.menu[i].childrens;
+        for (let j = 0; j < currentMenu.length; j++) {
             if (currentMenu[j].link == "replenishment") {
               shijianliebiao_supplement = true
             }

pages/changeUser/changeUser.vue

@@ -200,8 +200,8 @@
         let assignFlag = false;//指派权限
         for (let i = 0; i < loginUserStore.loginUser.menu.length; i++) {
           if(loginUserStore.loginUser.menu[i].link === 'incidentManagement'){
-            let currentMenu = loginUserStore.loginUser.menu[i].children;
-            for (let j = 0; j < currentMenu; j++) {
+            let currentMenu = loginUserStore.loginUser.menu[i].childrens;
+            for (let j = 0; j < currentMenu.length; j++) {
                 if (currentMenu[j].link == "assign") {
                     assignFlag = true
                 }

pages/handler/handler.vue

@@ -584,8 +584,8 @@
           let chuli = false;//故障处理权限
           for (let i = 0; i < loginUserStore.loginUser.menu.length; i++) {
             if(loginUserStore.loginUser.menu[i].link === 'incidentManagement'){
-              let currentMenu = loginUserStore.loginUser.menu[i].children;
-              for (let j = 0; j < currentMenu; j++) {
+              let currentMenu = loginUserStore.loginUser.menu[i].childrens;
+              for (let j = 0; j < currentMenu.length; j++) {
                 if (currentMenu[j].link == "handle") {
                   chuli = true
                 }

pages/incidentList/incidentList.vue

@@ -16,7 +16,7 @@
 
         <view class="body_item_content">
           <view class="body_item_content_p">
-            <text class="name ellipsis" v-if="data.repairIncidentType.value === 'dept'">报修科室：{{data.department.dept}}</text>
+            <text class="name ellipsis" v-if="data.repairIncidentType.value === 'dept'">报修科室：{{data.department?data.department.dept:''}}</text>
             <text class="name ellipsis" v-if="data.repairIncidentType.value === 'public'">报修类型：{{data.repairIncidentType.name}}</text>
             <view class="status" :style="stateStyle(data.state)">{{data.state ? data.state.name : ''}}</view>
           </view>
@@ -104,7 +104,7 @@
 
   const assignFlag = ref(false);//指派权限
   const qiangdan = ref(false);//接单权限
-
+	const showDept = ref(false);//跨科权限
   // 判断是否显示接单按钮
   const computedReceive = computed(() => (data) => {
     let inUser = data.handlingPersonnelUser && data.handlingPersonnelUser.id == loginUserStore.loginUser.user.id;
@@ -145,6 +145,7 @@
       area: {id: 0, area: '全部'},
       category: {id: 0, category: '全部'},
       acceptDate: [],
+			dept: {text: '全部', value: 0},
     },//筛选框数据
   })
 
@@ -305,23 +306,50 @@
 		let hospital = loginUserStore.loginUser.user.currentHospital?
 		loginUserStore.loginUser.user.currentHospital:
 		loginUserStore.loginUser.hospital[0]
-    if(postData.incident.queryTask === 'all' || postData.incident.queryTask === 'callback'){
-			if(hospital.type && hospital.type.value == 6){ // 当前是责任科室
-        postData.incident.duty = hospital;
-      }else{ // 当前是院区
-				postData.incident.hosId = hospital.id;
-			}
-    }else{
-      delete postData.incident.duty;
-      delete postData.incident.hosId;
-    }
-
-		if(postData.incident.queryTask!='todo' && postData.incident.queryTask!='doing' && postData.incident.queryTask!='storage'){
-			if(dataInfo.evtFilter.deptValue && dataInfo.evtFilter.deptValue.value){
-				let infoPermission = loginUserStore.loginUser.infoPermission
-				let itemDept = infoPermission.dutyList.find(i=>i.id == dataInfo.evtFilter.deptValue.value)
-				postData.incident.duty = itemDept;
-				delete postData.incident.hosId;
+   //  if(postData.incident.queryTask === 'all' || postData.incident.queryTask === 'callback'){
+			// if(hospital.type && hospital.type.value == 6){ // 当前是责任科室
+   //      postData.incident.duty = hospital;
+   //    }else{ // 当前是院区
+			// 	postData.incident.hosId = hospital.id;
+			// }
+   //  }else{
+   //    delete postData.incident.duty;
+   //    delete postData.incident.hosId;
+   //  }
+
+		// if(postData.incident.queryTask!='todo' && postData.incident.queryTask!='doing' && postData.incident.queryTask!='storage'){
+		// 	if(dataInfo.evtFilter.deptValue && dataInfo.evtFilter.deptValue.value){
+		// 		let infoPermission = loginUserStore.loginUser.infoPermission
+		// 		let itemDept = infoPermission.dutyList.find(i=>i.id == dataInfo.evtFilter.deptValue.value)
+		// 		postData.incident.duty = itemDept;
+		// 		delete postData.incident.hosId;
+		// 	}
+		// }
+		
+		if(postData.incident.queryTask != 'todoingAll'){
+			if(showDept.value){
+				if(dataInfo.evtFilter.deptValue && dataInfo.evtFilter.deptValue.value){
+					let infoPermission = loginUserStore.loginUser.infoPermission
+					let itemDept = infoPermission.dutyList.find(i=>i.id == dataInfo.evtFilter.deptValue.value)
+					postData.incident.duty = itemDept;
+					delete postData.incident.hosId;
+				}else{
+					if(hospital.type && hospital.type.value == 6){ // 当前是责任科室
+						 postData.incident.duty = hospital;
+						 delete postData.incident.hosId
+					 }else{ // 当前是院区
+						postData.incident.hosId = hospital.id;
+						delete postData.incident.duty
+					}
+				}
+			}else{
+				if(hospital.type && hospital.type.value == 6){ // 当前是责任科室
+					 postData.incident.duty = hospital;
+					 delete postData.incident.hosId
+				 }else{ // 当前是院区
+					postData.incident.hosId = hospital.id;
+					delete postData.incident.duty
+				}
 			}
 		}
 
@@ -353,6 +381,7 @@
       uni.hideLoading();
       uni.stopPullDownRefresh();
       if(res.status == 200){
+				console.log(6666,incidentListSearchStore.incidentListSearch.data)
         let list = res.list || [];
         if(list.length){
           dataInfo.hasMore = true;
@@ -399,25 +428,38 @@
   // 初始化
   function onLoadFn(){
     // 我的-数量跳转
+		let storeData = incidentListSearchStore.incidentListSearch.data
+		let hospital = loginUserStore.loginUser.user.currentHospital
     if(incidentNumStore.incidentNum.data){
+			console.log(111)
       dataInfo.evtFilter.selected = incidentNumStore.incidentNum.data.queryTask;
       dataInfo.tabActiveId = incidentNumStore.incidentNum.data.statusId;
       incidentNumStore.clearIncidentNumData();
-    }else if(incidentListSearchStore.incidentListSearch.data){
-      // 缓存的搜索条件
-      Object.assign(dataInfo, incidentListSearchStore.incidentListSearch.data);
-    }
+    }else if(storeData){
+			console.log(222)
+			Object.assign(dataInfo, storeData);
+    }else{
+			console.log(333)
+			// 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
+			// }
+		}
 
     for (let i = 0; i < loginUserStore.loginUser.menu.length; i++) {
       if(loginUserStore.loginUser.menu[i].link === 'incidentManagement'){
-        let currentMenu = loginUserStore.loginUser.menu[i].children;
-        for (let j = 0; j < currentMenu; j++) {
+        let currentMenu = loginUserStore.loginUser.menu[i].childrens;
+        for (let j = 0; j < currentMenu.length; j++) {
           if (currentMenu[j].link == "assign") {
             assignFlag.value = true;
           }
           if (currentMenu[j].link == "receive") {
             qiangdan.value = true
           }
+					if (currentMenu[j].link == "strideLook") {
+					  showDept.value = true
+					}
         }
       }
     }