拉取代码

components/IncidentListFilter.vue

@@ -1,11 +1,20 @@
 <template>
   <view class="container" @touchmove.stop.prevent v-if="pageData.pageRouter === 'default'">
     <view class="container_form">
-      <view class="hospital">
+      <view class="hospital" v-if="!showDept">
         <text class="name">院区</text>
-        <text class="value ellipsis">{{searchData.hospital ? searchData.hospital.hosName : ''}}</text>
+        <text class="value">{{loginUserStore.loginUser.user.currentHospital.hosName}}</text>
       </view>
       
+			<view class="category" v-if="showDept">
+			  <text class="name">维修科室</text>
+			  <text class="value flex-1">
+					<uni-data-picker @change="deptChange" v-model="searchData.deptValue" :localdata="pageData.deptList" popup-title="请选择维修科室" :map="{text:'hosName',value:'id'}">
+						
+					</uni-data-picker>
+				</text>
+			</view>
+			
       <view class="tabs">
         <view class="tab" :class="{active: tab.value === searchData.selected}" v-for="tab in tabs" :key="tab.value" @click="clickTab(tab)">{{tab.name}}<text class="newicon newicon-xuanzejiaobiao"></text></view>
       </view>
@@ -124,8 +133,12 @@
     pageRouter: 'default',
     areaList: [],
     categoryList: [],
+		deptList:[]
   });
   
+	// 是否开启跨科查看
+	const showDept = ref(false);
+	
   const searchData = reactive({
     hospital: {},
     selected: 'todoingAll',
@@ -133,6 +146,7 @@
     category: {},
 		categoryValue:{},
     acceptDate: [],
+		deptValue: {}
   })
   
   // 显示登记时间
@@ -171,6 +185,7 @@
     searchData.category = {};
     searchData.acceptDate = [];
 		searchData.categoryValue = {};
+		searchData.deptValue = {};
     console.log(searchData.acceptDate)
   }
   
@@ -201,6 +216,11 @@
     }
   }
   
+	// 选择维修科室
+	function deptChange(val){
+		searchData.deptValue = val.detail.value[val.detail.value.length-1]
+	}
+	
 	// 选择故障现象
 	function categoryChange(val){
 		searchData.category = val.detail.value[val.detail.value.length-1]
@@ -324,12 +344,31 @@
         tabs.splice(0, 0 , { name: '全部事件', value: 'all' });
       }
     }
+		let menu = JSON.parse(uni.getStorageSync("menuList")) || []; //菜单
+		console.log(9555,menu)
+		showDept.value = false
+		menu.forEach((e) => {
+		  if (e.title=='故障管理') {
+		    e.childrens.forEach((el) => {
+					if(el.link=='incidentManagement'){
+						el.childrens.forEach(item =>{
+							if(item.link=='strideLook'){
+								showDept.value = true
+							}
+						})
+					}
+		    });
+		  }
+		});
+		let data = loginUserStore.loginUser.infoPermission
+		pageData.deptList = data.dutyList
     setHospital();
     searchData.selected = evt.selected;
     searchData.area = evt.area;
     searchData.category = evt.category;
 		searchData.categoryValue = evt.categoryValue;
     searchData.acceptDate = evt.acceptDate;
+		searchData.deptValue = evt.deptValue.value;
   })
 </script>
 

pages/buildIncident/buildIncident.vue

@@ -5,15 +5,15 @@
       <view class="form_item">
         <view class="title select"><text class="required newicon newicon-bitian"></text>院区：</view>
         <!-- <uni-data-select class="value" v-model="incidentData.branch" :localdata="dataInfo.branchList" :clear="false" placeholder="请选择院区" :class="{formRed: isSubmit && !incidentData.branch}" @change="changeBranch"></uni-data-select> -->
-<!-- 				<uni-data-picker class="value" placeholder="请选择院区" 
+ 				<uni-data-picker class="value" placeholder="请选择院区" 
 					:localdata="dataInfo.branchList" v-model="incidentData.branch" :clear-icon="false"
 					:class="{formRed: isSubmit && !incidentData.branch}" @change="changeBranch">
-				</uni-data-picker> -->
-				<view class="value size-14">
+				</uni-data-picker>
+		<!-- 		<view class="value size-14">
 					{{loginUserStore.loginUser.user.currentHospital.parent?
 					loginUserStore.loginUser.user.currentHospital.parent.hosName:
 					loginUserStore.loginUser.user.currentHospital.hosName}}
-				</view>
+				</view> -->
 			</view>
       <view class="form_item">
         <view class="title"><text class="required newicon newicon-bitian"></text>报修科室：</view>
@@ -217,10 +217,17 @@
 
   // 获取院区列表
   function getBranchs(){
-		if(loginUserStore.loginUser.user.currentHospital.parent){
-			incidentData.branch = loginUserStore.loginUser.user.currentHospital.parent.id
-		}else{
-			incidentData.branch = loginUserStore.loginUser.user.currentHospital.id
+		let arr = loginUserStore.loginUser.hospital.filter(i=>i.parent==undefined)
+		dataInfo.branchList = arr.map(v => ({
+		  text: v.hosName,
+		  value: v.id,
+		}));
+		if(!incidentData.branch){
+			if(loginUserStore.loginUser.user.currentHospital.parent){
+				incidentData.branch = loginUserStore.loginUser.user.currentHospital.parent.id
+			}else{
+				incidentData.branch = loginUserStore.loginUser.user.currentHospital.id
+			}
 		}
    //  uni.showLoading({
    //    title: "加载中",
@@ -424,6 +431,7 @@
       incidentData.duty = incidentData.category.dutyDepartment;
     }
     incidentData.title = incidentData.category.category;
+		console.log(777,incidentData.branch)
     incidentBuildStore.setIncidentBuildData(incidentData, 'buildIncident');
     uni.navigateTo({
       url: '/pages/assign/assign'

pages/homePage/homePage.vue

@@ -17,7 +17,7 @@
   
   useSetTitle()
   const { wechatAuth } = useWechatAuth()
-  const { loginSuccess } = useLoginSuccess()
+  const { loginSuccess, transform } = useLoginSuccess()
 
   /**
    * 微信登录
@@ -125,6 +125,7 @@
 			changeGroup();
       if (res.state == 200) {
         loginSuccess(res.data);
+				transform(res.data);
       } else {
         uni.showToast({
           icon: 'none',
@@ -143,6 +144,7 @@
 			uni.setStorageSync('sysData',JSON.stringify(res.list))
 			setTimeout(_=>{
 				loginSuccess(data);
+				transform(data);
 			},500)
 		})
 	}

pages/incidentList/incidentList.vue

@@ -299,7 +299,16 @@
       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 === 'todo' || postData.incident.queryTask === 'owns' || postData.incident.queryTask === 'todoingAll'){
         if(loginUserStore.loginUser.user && loginUserStore.loginUser.user.group){
 					postData.incident.candidateGroups = loginUserStore.loginUser.user.group.map(v => v.id).toString();
@@ -393,7 +402,6 @@
     }
     getTabs();
   }
-
   onLoad((option) => {
     for(let i = 0; i<7; i++){
     	setTabbar(i)

pages/my/my.vue

@@ -63,10 +63,12 @@
   import { useIncidentNumStore } from '@/stores/incidentNum'
   import { repositoryListSearchStore } from '@/stores/repositorySearch'
   import { useSetTabbar } from '@/share/useSetTabbar.js'
+	import { useIncidentBuildStore } from '@/stores/incidentBuild'
 	
   useSetTitle();
   const loginUserStore = useLoginUserStore();
   const incidentNumStore = useIncidentNumStore();
+	const incidentBuildStore = useIncidentBuildStore();
   const { makePhoneCall }  = useMakePhoneCall();
   const repositorySearchStore = repositoryListSearchStore();
   const { setTabbar }  = useSetTabbar();
@@ -140,6 +142,7 @@
 	
   // 新建事件
   function toBuildIncident(){
+		incidentBuildStore.clearIncidentBuildData();
     uni.navigateTo({
       url: '/pages/buildIncident/buildIncident'
     })

pages/searchArea/searchArea.vue

@@ -41,6 +41,7 @@
     idx: 0,//页码
     hasMore: true,//是否有更多数据
     incidentId: undefined,//事件ID
+		incidentData: {},//事件对象
   })
   
   // 跳转地点列表
@@ -68,10 +69,14 @@
     //   dataInfo.list = [];
     // }
 		let hosId = null
-		if(loginUserStore.loginUser.user.currentHospital.parent){
-			hosId = loginUserStore.loginUser.user.currentHospital.parent.id
+		if(dataInfo.incidentData && dataInfo.incidentData.branch){
+			hosId = dataInfo.incidentData.branch
 		}else{
-			hosId = loginUserStore.loginUser.user.currentHospital.id
+			if(loginUserStore.loginUser.user.currentHospital.parent){
+				hosId = loginUserStore.loginUser.user.currentHospital.parent.id
+			}else{
+				hosId = loginUserStore.loginUser.user.currentHospital.id
+			}
 		}
     let postData = {
       idx: 0,
@@ -108,6 +113,9 @@
   
   onLoad((option) => {
     dataInfo.incidentId = option.incidentId;
+		if(incidentBuildStore.incidentBuild.data){
+		  dataInfo.incidentData = incidentBuildStore.incidentBuild.data;
+		}
     getList(0);
   })
   

pages/searchDept/searchDept.vue

@@ -94,11 +94,16 @@
 				postData.department.hospital.id = branchId.value
 			}
 		}else{
-			if(loginUserStore.loginUser.user.currentHospital.parent){
-				postData.department.hospital.id = loginUserStore.loginUser.user.currentHospital.parent.id
+			if(dataInfo.incidentData && dataInfo.incidentData.branch){
+				postData.department.hospital.id = dataInfo.incidentData.branch
 			}else{
-				postData.department.hospital.id = loginUserStore.loginUser.user.currentHospital.id
+				if(loginUserStore.loginUser.user.currentHospital.parent){
+					postData.department.hospital.id = loginUserStore.loginUser.user.currentHospital.parent.id
+				}else{
+					postData.department.hospital.id = loginUserStore.loginUser.user.currentHospital.id
+				}
 			}
+			
 		}
     api_department(postData).then(res => {
       uni.hideLoading();

pages/searchPlace/searchPlace.vue

@@ -48,6 +48,7 @@
     parentName: '',//区域名称
     place: undefined,//地点-回显
     placeObj: {},//地点列表-已选择
+		incidentData: {}
   })
   
   // 选择
@@ -118,10 +119,15 @@
     //   }
     // })
 		let hosId = null
-		if(loginUserStore.loginUser.user.currentHospital.parent){
-			hosId = loginUserStore.loginUser.user.currentHospital.parent.id
+		
+		if(dataInfo.incidentData && dataInfo.incidentData.branch){
+			hosId = dataInfo.incidentData.branch
 		}else{
-			hosId = loginUserStore.loginUser.user.currentHospital.id
+			if(loginUserStore.loginUser.user.currentHospital.parent){
+				hosId = loginUserStore.loginUser.user.currentHospital.parent.id
+			}else{
+				hosId = loginUserStore.loginUser.user.currentHospital.id
+			}
 		}
 		let postData = {
 		  idx: 0,
@@ -142,6 +148,9 @@
     dataInfo.incidentId = option.incidentId;
     dataInfo.parentId = option.parentId;
     dataInfo.parentName = option.parentName;
+		if(incidentBuildStore.incidentBuild.data){
+		  dataInfo.incidentData = incidentBuildStore.incidentBuild.data;
+		}
     getParamData();
   })
   

pages/searchUser/searchUser.vue

@@ -83,11 +83,15 @@
 				userTypeIds:String(userTypes.value.map(v => v.id))
       }
     }
-    if(loginUserStore.loginUser.user.currentHospital.parent){
-    	postData.user.hospital = loginUserStore.loginUser.user.currentHospital.parent.id
-    }else{
-    	postData.user.hospital = loginUserStore.loginUser.user.currentHospital.id
-    }
+		if(dataInfo.incidentData && dataInfo.incidentData.branch){
+			postData.user.hospital = dataInfo.incidentData.branch
+		}else{
+			if(loginUserStore.loginUser.user.currentHospital.parent){
+				postData.user.hospital = loginUserStore.loginUser.user.currentHospital.parent.id
+			}else{
+				postData.user.hospital = loginUserStore.loginUser.user.currentHospital.id
+			}
+		}
     api_user(postData).then(res => {
       uni.hideLoading();
       uni.stopPullDownRefresh();

share/useLoginSuccess.js

@@ -8,6 +8,7 @@ export function useLoginSuccess() {
 		loginUserStore.setLoginHospital(user.infoPermission.hospitals);
     loginUserStore.setLoginUser(user.user);
     loginUserStore.setLoginUserMenu(user.menu);
+		loginUserStore.setInfoPermission(user.infoPermission);
 		let loginType = uni.getStorageSync('loginType'); //1:处理 2:报修
     // 判断用户标识是否为处理人
     if (user.user.engineer === 1) {
@@ -32,8 +33,28 @@ export function useLoginSuccess() {
 			}
     }
   }
-
+	
+	// 处理树数据（parent格式转为children格式）
+	const transform = (data) =>{
+		let nodes = data.menu
+	  let parents = [];
+	  const idMapping = nodes.reduce((acc, el, i) => {
+	    acc[el.id] = i;
+	    return acc;
+	  }, {});
+	  nodes.forEach((el) => {
+	    if (el.parentid === null || el.parentid === undefined) {
+	      parents.push(el);
+	    } else {
+	      const parentEl = nodes[idMapping[el.parentid]];
+	      parentEl.childrens = [...(parentEl.childrens || []), el];
+	    }
+	  });
+		uni.setStorageSync('menuList',JSON.stringify(parents));
+	}
+	
   return {
-    loginSuccess
+    loginSuccess,
+		transform
   };
 }

share/useWechatAuth.js

@@ -1,6 +1,6 @@
 import { api_wechatAuth, api_systemConfiguration, api_getDictionary} from "@/http/api.js"
 import { useLoginSuccess } from '@/share/useLoginSuccess.js'
-const { loginSuccess } = useLoginSuccess()
+const { loginSuccess, transform } = useLoginSuccess()
 export function useWechatAuth() {
   /**
    * 微信登录2
@@ -18,6 +18,7 @@ export function useWechatAuth() {
         window.location.href = res.url;
       } else {
         loginSuccess(res.user);
+				transform(res.user);
 				api_systemConfiguration({
 					idx: 0,
 					sum: 9999,

stores/loginUser.js

@@ -9,8 +9,14 @@ export const useLoginUserStore = defineStore(
       menu: [],
 			hospital:[],
       sysName: '',
+			infoPermission:[]
     });
-
+		
+		// 设置当前登录权限数据
+		function setInfoPermission(data) {
+		  loginUser.infoPermission = data;
+		}
+		
     // 设置当前登录用户院区
     function setLoginHospital(data) {
       loginUser.hospital = data;
@@ -37,6 +43,7 @@ export const useLoginUserStore = defineStore(
 			setLoginHospital,
       setLoginUserMenu,
       setLoginUserTitle,
+			setInfoPermission
     };
   },
   {