待接单支持转派，转派指派建单查询人员根据分组查询

components/IncidentListFilter.vue

@@ -5,34 +5,34 @@
         <text class="name">院区</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>
-      
+
       <view class="area" @click="clickPageRouter('area')">
         <text class="name">楼栋</text>
         <text class="value ellipsis">{{searchData.area ? searchData.area.buildingName : ''}}</text>
       </view>
-      
+
       <view class="category">
         <text class="name">故障现象</text>
         <text class="value flex-1">
 					<uni-data-picker @change="categoryChange" v-model="searchData.categoryValue" :localdata="pageData.categoryList" popup-title="请选择故障信息" :map="{text:'category',value:'id'}">
-						
+
 					</uni-data-picker>
 				</text>
       </view>
-      
+
       <view class="acceptDate" @click="changeIsShowDate()">
         <text class="name">登记时间</text>
         <text class="value ellipsis" v-if="searchData.acceptDate.length">{{searchData.acceptDate[0] || ''}}至{{searchData.acceptDate[1] || ''}}</text>
@@ -61,7 +61,7 @@
       <view class="hospital">
         <text class="name">楼栋</text>
       </view>
-      
+
       <scroll-view scroll-y class="areas">
         <view class="areas_item" v-for="area in pageData.areaList" :key="area.id" @click="clickArea(area)">{{area.buildingName}}</view>
       </scroll-view>
@@ -77,7 +77,7 @@
       <view class="hospital">
         <text class="name">故障现象</text>
       </view>
-      
+
       <scroll-view scroll-y class="categorys">
         <view class="categorys_item" v-for="category in pageData.categoryList" :key="category.id" @click="clickCategory(category)">{{category.category}}</view>
       </scroll-view>
@@ -90,7 +90,7 @@
   </view> -->
   <view class="mask" @touchmove.stop.prevent></view>
   <view class="line" @touchmove.stop.prevent></view>
-  
+
 </template>
 
 <script setup>
@@ -102,7 +102,7 @@
   import { api_area, getFetchDataList, api_incidentcategory } from "@/http/api.js"
   import { defaultColor } from '@/static/js/theme.js'
   import { transform } from '@/utils/index.js'
-	
+
   const emit = defineEmits(['cancelEmit', 'confirmEmit']);
   const { evt } = defineProps({
     evt: {
@@ -111,23 +111,23 @@
     },
   });
   const loginUserStore = useLoginUserStore();
-  
+
   // 主题颜色
   const primaryColor = ref(defaultColor)
-  
+
   // 登记时间
   const isShowDate = ref(false)
-  
+
   const start = ref(format(startOfYear(add(new Date(), { years: -5})), 'yyyy-MM-dd'));
   const end = ref(format(endOfYear(add(new Date(), { years: 0})), 'yyyy-MM-dd'));
-  
+
   const tabs = reactive([
     // { name: '全部事件', value: 'all' },
     { name: '待我处理', value: 'todoingAll' },
     { name: '与我关联', value: 'owns' },
     { name: '由我解决', value: 'resolve' },
   ])
-  
+
   // 页面数据
   const pageData = reactive({
     pageRouter: 'default',
@@ -135,10 +135,10 @@
     categoryList: [],
 		deptList:[]
   });
-  
+
 	// 是否开启跨科查看
 	const showDept = ref(false);
-	
+
   const searchData = reactive({
     hospital: {},
     selected: 'todoingAll',
@@ -148,35 +148,35 @@
     acceptDate: [],
 		deptValue: {}
   })
-  
+
   // 显示登记时间
   function showDatechange(){
     isShowDate.value = !isShowDate.value;
   }
-  
+
   // 登记时间确定
   function bindDateChange(e){
     console.log(e);
     searchData.acceptDate = e;
   }
-  
+
   // 点击tab
   function clickTab(tab){
     searchData.selected = tab.value;
   }
-  
+
   // 点击区域
   function clickArea(area){
     pageData.pageRouter = 'default';
     searchData.area = area;
   }
-  
+
   // 点击故障现象
   function clickCategory(category){
     pageData.pageRouter = 'default';
     searchData.category = category;
   }
-  
+
   // 清空
   function clear(){
     setHospital();
@@ -188,17 +188,17 @@
 		searchData.deptValue = {};
     console.log(searchData.acceptDate)
   }
-  
+
   // 取消
   function cancel(){
     emit('cancelEmit')
   }
-  
+
   // 确认
   function confirm(){
     emit('confirmEmit', searchData);
   }
-  
+
   // 设置院区
   function setHospital(){
     if (loginUserStore.loginUser.user.duty) {
@@ -215,24 +215,24 @@
       };
     }
   }
-  
+
 	// 选择维修科室
 	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]
 	}
-	
+
   // 获取楼栋列表
   function getAreaList(){
     uni.showLoading({
       title: "加载中",
       mask: true,
     });
-    
+
     // let postData = {
     //   idx: 0,
     //   sum: 9999,
@@ -252,7 +252,7 @@
     //     });
     //   }
     // })
-		
+
 		let postData = {
 		  idx: 0,
 		  sum: 9999,
@@ -272,14 +272,14 @@
 		    pageData.areaList = [{ id: 0, area: '全部' }, ...list];
 		  });
   }
-  
+
   // 获取故障现象列表
   function getCategoryList(){
     uni.showLoading({
       title: "加载中",
       mask: true,
     });
-    
+
     let postData = {
     		hasThird:true,
     		category: {
@@ -291,7 +291,7 @@
     // }else if(loginUserStore.loginUser.user.branch){
     //   postData.incidentcategory.selectType = 'one';
     // }
-    
+
     // api_incidentcategory(postData).then(res => {
     //   uni.hideLoading();
     //   if(res.status == 200){
@@ -304,8 +304,8 @@
     //     });
     //   }
     // })
-		
-		
+
+
 		 api_incidentcategory(postData).then(res => {
 		   uni.hideLoading();
 		   if(res.status == 200){
@@ -320,7 +320,7 @@
 		   }
 		 })
   }
-  
+
   // 页面路由跳转
   function clickPageRouter(type){
     pageData.pageRouter = type;
@@ -330,18 +330,23 @@
       break;
     }
   }
-  
+
   // 显示登记时间
   function changeIsShowDate(type){
     isShowDate.value = true;
   }
-  
+
   onLoad((option) => {
 		getCategoryList()
     // searchData.hospital = evt.hospital;
     for (let i = 0; i < loginUserStore.loginUser.menu.length; i++) {
-      if (loginUserStore.loginUser.menu[i].link == "all") {
-        tabs.splice(0, 0 , { name: '全部事件', value: 'all' });
+      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")) || []; //菜单
@@ -403,7 +408,7 @@
   display: flex;
   flex-direction: column;
   justify-content: space-between;
-  
+
   .container_form{
     height: 100%;
     display: flex;
@@ -411,7 +416,7 @@
     flex: 1;
     min-height: 0;
   }
-  
+
   .hospital{
     display: flex;
     justify-content: space-between;
@@ -428,7 +433,7 @@
       color: #5DAAB6;
     }
   }
-  
+
   .areas{
     flex: 1;
     min-height: 0;
@@ -439,7 +444,7 @@
       border-bottom: 1rpx solid #DEDEDE;
     }
   }
-  
+
   .categorys{
     flex: 1;
     min-height: 0;
@@ -450,7 +455,7 @@
       border-bottom: 1rpx solid #DEDEDE;
     }
   }
-  
+
   .tabs{
     margin-top: 16rpx;
     background-color: #FBFBFB;
@@ -484,7 +489,7 @@
       }
     }
   }
-  
+
   .area,
   .category,
   .acceptDate{
@@ -503,7 +508,7 @@
 			flex: 3;
 		}
   }
-  
+
   .container_foot{
     .clear{
       padding: 24rpx;

pages/assign/assign.vue

@@ -15,7 +15,7 @@
 						<view class="title-fl-sb">
 							解决方案：
 							<view @click="importRep('reissue','direct')" class="import-rep">引入知识库({{dataInfo.introduceCount}})</view>
-						</view>	
+						</view>
 					</view>
 					<uni-easyinput class="value" type="textarea" v-model="dataInfo.handleDescription" placeholder="请输入解决方案" :class="{formRed: isSubmit && !dataInfo.handleDescription.trim()}" />
         </view>
@@ -30,7 +30,7 @@
           <view class="title select"><text class="required newicon newicon-bitian"></text>处理方式：</view>
           <!-- <uni-data-select class="value" v-model="dataInfo.handleCategory" :localdata="dataInfo.handleCategoryList" :clear="false" placeholder="请选择处理方式" :class="{formRed: isSubmit && !dataInfo.handleCategory}"></uni-data-select> -->
 					<uni-data-picker class="value" placeholder="请选择处理方式"
-						:localdata="dataInfo.handleCategoryList" v-model="dataInfo.handleCategory" 
+						:localdata="dataInfo.handleCategoryList" v-model="dataInfo.handleCategory"
 						:clear-icon="false" :class="{formRed: isSubmit && !dataInfo.handleCategory}">
 					</uni-data-picker>
 				</view>
@@ -38,7 +38,7 @@
           <view class="title select"><text class="required newicon newicon-bitian"></text>处理结果：</view>
           <!-- <uni-data-select class="value" v-model="dataInfo.closecode" :localdata="dataInfo.closecodeList" :clear="false" placeholder="请选择处理结果" :class="{formRed: isSubmit && !dataInfo.closecode}"></uni-data-select> -->
 					<uni-data-picker class="value" placeholder="请选择处理结果"
-						:localdata="dataInfo.closecodeList" v-model="dataInfo.closecode" 
+						:localdata="dataInfo.closecodeList" v-model="dataInfo.closecode"
 						:clear-icon="false" :class="{formRed: isSubmit && !dataInfo.closecode}">
 					</uni-data-picker>
 				</view>
@@ -62,7 +62,7 @@
           </view>
         </view>
       </template>
-      
+
       <!-- 补单 -->
       <template v-if="dataInfo.tabActiveValue === 'supplement' && dataInfo.supplementFlag">
         <view class="form_item">
@@ -80,12 +80,12 @@
         <view class="form_item">
           <view class="title select"><text class="required newicon newicon-bitian"></text>处理人：</view>
         	<uni-data-picker class="value" placeholder="请选择处理人"
-        		:localdata="dataInfo.userList" v-model="dataInfo.handlingPersonnelUserId" 
+        		:localdata="dataInfo.userList" v-model="dataInfo.handlingPersonnelUserId"
         		:clear-icon="false" :class="{formRed: isSubmit && !dataInfo.handlingPersonnelUserId}">
         	</uni-data-picker>
         </view>
       </template>
-      
+
       <!-- 补单-下一步 -->
       <template v-if="dataInfo.tabActiveValue === 'supplement' && !dataInfo.supplementFlag">
         <view class="form_item column" v-if="HandleData.simpleness != 1">
@@ -94,7 +94,7 @@
 						<view class="title-fl-sb">
 							解决方案：
 							<view @click="importRep('reissue','reissue')" class="import-rep">引入知识库({{dataInfo.introduceCount}})</view>
-						</view>	
+						</view>
 					</view>
           <uni-easyinput class="value" type="textarea" v-model="dataInfo.handleDescription" placeholder="请输入解决方案" :class="{formRed: isSubmit && !dataInfo.handleDescription.trim()}" />
         </view>
@@ -108,14 +108,14 @@
         <view class="form_item">
           <view class="title select"><text class="required newicon newicon-bitian"></text>处理方式：</view>
         	<uni-data-picker class="value" placeholder="请选择处理方式"
-        		:localdata="dataInfo.handleCategoryList" v-model="dataInfo.handleCategory" 
+        		:localdata="dataInfo.handleCategoryList" v-model="dataInfo.handleCategory"
         		:clear-icon="false" :class="{formRed: isSubmit && !dataInfo.handleCategory}">
         	</uni-data-picker>
         </view>
         <view class="form_item" v-if="HandleData.simpleness != 1">
           <view class="title select"><text class="required newicon newicon-bitian"></text>处理结果：</view>
         	<uni-data-picker class="value" placeholder="请选择处理结果"
-        		:localdata="dataInfo.closecodeList" v-model="dataInfo.closecode" 
+        		:localdata="dataInfo.closecodeList" v-model="dataInfo.closecode"
         		:clear-icon="false" :class="{formRed: isSubmit && !dataInfo.closecode}">
         	</uni-data-picker>
         </view>
@@ -139,14 +139,14 @@
           </view>
         </view>
       </template>
-      
+
       <!-- 派单 -->
       <template v-if="dataInfo.tabActiveValue === 'assign'">
         <view class="form_item">
           <view class="title select"><text class="required newicon newicon-bitian"></text>工作组：</view>
           <!-- <uni-data-select class="value" v-model="dataInfo.groupId" :localdata="dataInfo.groupList" :clear="false" placeholder="请选择工作组" @change="changeGroup" :class="{formRed: isSubmit && !dataInfo.groupId}"></uni-data-select> -->
 					<uni-data-picker class="value" placeholder="请选择工作组"
-						:localdata="dataInfo.groupList" v-model="dataInfo.groupId" 
+						:localdata="dataInfo.groupList" v-model="dataInfo.groupId"
 						:clear-icon="false" @change="changeGroup" :class="{formRed: isSubmit && !dataInfo.groupId}">
 					</uni-data-picker>
 				</view>
@@ -158,7 +158,7 @@
           <view class="title select"><text class="required newicon newicon-bitian"></text>转派对象：</view>
           <!-- <uni-data-select class="value" v-model="dataInfo.userId" :localdata="dataInfo.userList" :clear="false" placeholder="请选择转派对象" :class="{formRed: isSubmit && dataInfo.groupId && dataInfo.isAssignUser == 1 && !dataInfo.userId}"></uni-data-select> -->
 					<uni-data-picker class="value" placeholder="请选择转派对象"
-						:localdata="dataInfo.userList" v-model="dataInfo.userId" 
+						:localdata="dataInfo.userList" v-model="dataInfo.userId"
 						:clear-icon="false" :class="{formRed: isSubmit && dataInfo.groupId && dataInfo.isAssignUser == 1 && !dataInfo.userId}">
 					</uni-data-picker>
 				</view>
@@ -206,7 +206,7 @@
   import { useLoginUserStore } from '@/stores/loginUser'
   import { useHandlerStore } from '@/stores/handler'
   import { useIncidentBuildStore } from '@/stores/incidentBuild'
-  
+
   useSetTitle();
   const loginUserStore = useLoginUserStore();
   const handlerStore = useHandlerStore();
@@ -214,30 +214,30 @@
   const { makePhoneCall }  = useMakePhoneCall();
   const { uploadFile }  = useUploadFile();
   const { goBack }  = useGoBack();
-  
+
   // 主题颜色
   const primaryColor = ref(defaultColor)
-  
+
 	// 知识库id
 	const solutionId = ref(null)
-	
+
 	// 楼层id
 	const floorId = ref(null)
-	
+
 	// 是否简单处理
 	const HandleData = reactive({
 		simpleness:null
 	})
-	
+
 	// 协同人员
 	const synergeticArr = ref(null)
-	
+
 	const dicData = ref(null)
-	
+
 	const dutyList = ref(null)
-	
+
 	const userTypes = ref(null)
-	
+
   // 数据
   const dataInfo = reactive({
     tabs: [
@@ -282,23 +282,23 @@
     handlingPersonnelUserId: undefined,//补单-处理人
 		// introduceCount :0 //引入次数
   })
-  
+
   // 是否提交
   const isSubmit = ref(false)
-  
+
   // 处理图片
   const handlerImgRef = ref(null)
-  
+
   // 上传报修图片
   function handlerImgSuccessNew(){
     let requestList = [];
-    
+
     // 报修图片
     dataInfo.incidentData.repairImgList.forEach(v => {
       let repairOrderImg$ = repairOrderImg(v);
       requestList.push(repairOrderImg$);
     })
-    
+
     Promise.all(requestList).then(resList => {
       uni.hideLoading();
       console.log(resList);
@@ -315,13 +315,13 @@
       }, 1500)
     })
   }
-  
+
 	// 返回引用知识库
 	function goBackView(){
 		handlerStore.setHandlerData(dataInfo, 'assign', 'assign');
 		goBack()
 	}
-	
+
   // 上传处理图片成功
   function handlerImgSuccess(e){
     dataInfo.handlerImgList.forEach(v => {
@@ -329,19 +329,19 @@
     })
     console.log(dataInfo.handlerImgList);
     let requestList = [];
-    
+
     // 处理图片
     dataInfo.handlerImgList.forEach(v => {
       let handlerOrderImg$ = handlerOrderImg(v);
       requestList.push(handlerOrderImg$);
     })
-    
+
     // 报修图片
     dataInfo.incidentData.repairImgList.forEach(v => {
       let repairOrderImg$ = repairOrderImg(v);
       requestList.push(repairOrderImg$);
     })
-    
+
     Promise.all(requestList).then(resList => {
       uni.hideLoading();
       console.log(resList);
@@ -358,7 +358,7 @@
       }, 1500)
     })
   }
-  
+
   // 上传处理图片失败
   function handlerImgFail(e){
     dataInfo.handlerImgList.forEach(v => {
@@ -366,19 +366,19 @@
     })
     console.log(dataInfo.handlerImgList);
   }
-  
+
   // 选择上传图片
   function handlerImgSelect(e){
     dataInfo.handlerImgList = dataInfo.handlerImgList.concat(e.tempFiles);
     console.log(dataInfo.handlerImgList);
   }
-  
+
   // 删除上传图片
   function handlerImgDelete(e){
     dataInfo.handlerImgList = dataInfo.handlerImgList.filter(v => e.tempFile.uuid != v.uuid);
     console.log(dataInfo.handlerImgList);
   }
-  
+
   // 添加协同人员
   function synergeticAdd(sign = 'assign'){
     handlerStore.setHandlerData(dataInfo, 'assign', sign);
@@ -386,7 +386,7 @@
       url: `/pages/synergeticAdd/synergeticAdd?incidentId=${dataInfo.incidentId}`
     })
   }
-  
+
   // 选择故障现象
   function selectCategory(sign = 'assign'){
     handlerStore.setHandlerData(dataInfo, 'assign', sign);
@@ -394,7 +394,7 @@
       url: `/pages/categoryOne/categoryOne?incidentId=${dataInfo.incidentId}`
     })
   }
-  
+
   // 点击修改数量
   function numberClick(data, type){
     if(type === 'editConsumable'){
@@ -402,31 +402,31 @@
     }else if(type === 'editWorkHourManagement'){
       dataInfo.evtNumber = data.workHourNum2;
     }
-    
+
     dataInfo.isNumber = true;
     dataInfo.selectData = data;
     dataInfo.selectType = type;
   }
-  
+
   // 确认修改数量
   function conformNumber(evtNumber){
     dataInfo.evtNumber = evtNumber;
     dataInfo.isNumber = false;
     addSummaryDoc();
   }
-  
+
   // 移除数量
   function removeNumber(evtNumber){
     dataInfo.evtNumber = evtNumber;
     dataInfo.isNumber = false;
     removeSummaryDoc();
   }
-  
+
   // 关闭修改数量
   function cancelNumber(){
     dataInfo.isNumber = false;
   }
-  
+
   // 修改耗材/工时
   function addSummaryDoc(){
     uni.showLoading({
@@ -469,7 +469,7 @@
       }
     })
   }
-  
+
   // 移除耗材/工时
   function removeSummaryDoc(){
     uni.showLoading({
@@ -512,7 +512,7 @@
       }
     })
   }
-  
+
   // 重置
   function reset(){
     dataInfo.userList = [];//处理人列表
@@ -540,7 +540,7 @@
     dataInfo.category = {};//故障现象
     dataInfo.synergetic = [];//协同人员
   }
-  
+
   // 初始化表单
   function initForm(){
     if(dataInfo.tabActiveValue === 'direct'){
@@ -554,7 +554,7 @@
       getGroups();
     }
   }
-  
+
   // 点击tab
   function clickTab(tabValue){
     if(dataInfo.tabActiveValue == tabValue){
@@ -569,7 +569,7 @@
 		}
     initForm();
   }
-  
+
   // 选择工作组
   function changeGroup(){
     dataInfo.userId = undefined;
@@ -583,7 +583,7 @@
 			getUsers('');
 		});
   }
-	
+
   function getDicGu(){
 		let postData = {
 			"key": 'usertype',
@@ -594,19 +594,19 @@
 			getUsers('har');
 		});
 	}
-	
+
   // 选择是否转派到人
   function changeIsAssignUser(){
     dataInfo.userId = undefined;
   }
-  
+
   // 获取工作组列表
   function getGroups(){
     uni.showLoading({
       title: "加载中",
       mask: true,
     });
-    
+
     let postData = {
       "idx": 0,
       "sum": 9999,
@@ -631,7 +631,7 @@
       }
     })
   }
-  
+
   /**
    * 获取用户列表
    * @param {boolean} noGroup 是否查询组里的用户
@@ -649,7 +649,7 @@
 					rolecode:'',
 				},
 				roleCodes:'',
-        "hospital": dutyList.value.id,
+        // "hospital": dutyList.value.id,
         "groupdata": (dataInfo.groupId && !noGroup) ? { "id": dataInfo.groupId } : undefined,
         userTypeIds:String(userTypes.value.map(v => v.id)),
       }
@@ -677,7 +677,7 @@
       }
     })
   }
-  
+
   // 获取处理方式列表
   function getHandleCategorys(){
     uni.showLoading({
@@ -702,7 +702,7 @@
       }
     })
   }
-  
+
   // 获取处理结果列表
   function getClosecodes(){
     uni.showLoading({
@@ -727,26 +727,26 @@
       }
     })
   }
-  
+
   // 添加耗材
   function addConsumable(){
     uni.navigateTo({
       url: `/pages/consumableList/consumableList?incidentId=${dataInfo.incidentId}&summaryId=${dataInfo.summaryId}`
     })
   }
-  
+
   // 添加工时
   function addWorkHourManagement(){
     uni.navigateTo({
       url: `/pages/workHourManagementOne/workHourManagementOne?incidentId=${dataInfo.incidentId}&summaryId=${dataInfo.summaryId}`
     })
   }
-  
+
   // 补单-上一步
   function previous(){
     dataInfo.supplementFlag = true;
   }
-  
+
   // 补单-下一步
   function next(){
     console.log(dataInfo)
@@ -758,7 +758,7 @@
       });
       return;
     }
-    
+
     if(!dataInfo.responseHandleTime){
       uni.showToast({
       	icon: 'none',
@@ -766,7 +766,7 @@
       });
       return;
     }
-    
+
     if(!dataInfo.handleTime){
       uni.showToast({
       	icon: 'none',
@@ -774,7 +774,7 @@
       });
       return;
     }
-    
+
     if(!dataInfo.handlingPersonnelUserId){
       uni.showToast({
       	icon: 'none',
@@ -785,7 +785,7 @@
     dataInfo.supplementFlag = false;
     isSubmit.value = false;
   }
-  
+
   // 提交
   function submit(){
     isSubmit.value = true;
@@ -806,7 +806,7 @@
       submitAssign();
     }
   }
-  
+
   // 处理提交事件
   async function handlerOrder(){
     let repairIncidentTypeList = await api_getDictionary({
@@ -845,7 +845,7 @@
     postData.incident.directProcess = 1;//直接解决
     return api_incidentTask('accept', postData);
   }
-  
+
   // 补单提交事件
   async function supplementOrder(){
     let repairIncidentTypeList = await api_getDictionary({
@@ -857,7 +857,7 @@
       incident: dataInfo.incidentData,
 			solutionId: solutionId.value
     }
-    
+
     // let result = await beforeBuild();
     // if(result[0].status == 200 && result[1].status == 200){
     //   postData.incident.repairType = result[0].list.length ? result[0].list[0].valueconfig : undefined;
@@ -885,14 +885,14 @@
 			postData.incident.synergetic = null
 		}
     postData.incident.directProcess = 1;//直接解决
-    
+
     postData.incident.acceptDate = dataInfo.acceptDate;
     postData.incident.responseHandleTime = dataInfo.responseHandleTime;
     postData.incident.handleTime = dataInfo.handleTime;
     postData.incident.handlingPersonnelUser = { id: dataInfo.handlingPersonnelUserId };
     return api_incidentTask('patchOrder', postData);
   }
-  
+
   // 建单前的接口
   function beforeBuild(){
     let repairMain$ = api_systemConfiguration({
@@ -902,11 +902,11 @@
           "keyconfig": "repairMain"
         }
     })
-    
+
     let sj$ = api_sj();
     return Promise.all([repairMain$, sj$])
   }
-  
+
   // 派单提交事件
   async function assignOrder(){
     let repairIncidentTypeList = await api_getDictionary({
@@ -917,7 +917,7 @@
     let postData = {
       incident: dataInfo.incidentData,
     }
-    
+
     // let result = await beforeBuild();
     // if(result[0].status == 200 && result[1].status == 200){
     //   postData.incident.repairType = result[0].list.length ? result[0].list[0].valueconfig : undefined;
@@ -942,20 +942,20 @@
 		  postData.incident.candidateGroups = dataInfo.groupId;
 			delete postData.incident.assignee
 		}
-    
+
     return api_incidentTask('accept', postData);
   }
-  
+
   // 处理图片
   function handlerOrderImg(imgObj){
     return uploadFile(imgObj, 'incident', dataInfo.incidentId)
   }
-  
+
   // 报修图片
   function repairOrderImg(imgObj){
     return uploadFile(imgObj, 'wechatRequesterIncident', dataInfo.incidentId)
   }
-  
+
 	// 引入知识库
 	function importRep(type,tabType){
 		dataInfo.operateType = type
@@ -965,7 +965,7 @@
 		  url: `/pages/repository/repository?incidentId=${dataInfo.incidentId}`
 		})
 	}
-	
+
   // 处理提交
   function submitHandler(){
     console.log(dataInfo);
@@ -976,7 +976,7 @@
       });
       return;
     }
-    
+
     if(!dataInfo.category.id && HandleData.simpleness != 1){
       uni.showToast({
       	icon: 'none',
@@ -984,7 +984,7 @@
       });
       return;
     }
-    
+
     if(!dataInfo.handleCategory){
       uni.showToast({
       	icon: 'none',
@@ -992,7 +992,7 @@
       });
       return;
     }
-    
+
     if(!dataInfo.closecode && HandleData.simpleness != 1){
       uni.showToast({
       	icon: 'none',
@@ -1000,7 +1000,7 @@
       });
       return;
     }
-    
+
     if(!dutyList.value){
       uni.showToast({
       	icon: 'none',
@@ -1077,7 +1077,7 @@
       })
     }
   }
-  
+
   // 派单提交
   function submitAssign(){
 		console.log(444,dutyList.value)
@@ -1088,7 +1088,7 @@
       });
       return;
     }
-    
+
     if(dataInfo.isAssignUser == 1 && !dataInfo.userId){
       uni.showToast({
       	icon: 'none',
@@ -1096,7 +1096,7 @@
       });
       return;
     }
-    
+
     if(!dutyList.value){
       uni.showToast({
       	icon: 'none',
@@ -1104,12 +1104,12 @@
       });
       return;
     }
-    
+
     uni.showLoading({
       title: "加载中",
       mask: true,
     });
-    
+
     if(dataInfo.incidentData.repairImgList.length){
       // 有图片
       let assignOrder$ = assignOrder();
@@ -1155,9 +1155,9 @@
         }
       })
     }
-   
+
   }
-  
+
   // 补单提交
   function submitSupplement(){
     console.log(dataInfo);
@@ -1168,7 +1168,7 @@
       });
       return;
     }
-    
+
     if(!dataInfo.category.id && HandleData.simpleness != 1){
       uni.showToast({
       	icon: 'none',
@@ -1176,7 +1176,7 @@
       });
       return;
     }
-    
+
     if(!dataInfo.handleCategory){
       uni.showToast({
       	icon: 'none',
@@ -1184,7 +1184,7 @@
       });
       return;
     }
-    
+
     if(!dataInfo.closecode && HandleData.simpleness != 1){
       uni.showToast({
       	icon: 'none',
@@ -1192,7 +1192,7 @@
       });
       return;
     }
-    
+
     if(!dutyList.value){
       uni.showToast({
       	icon: 'none',
@@ -1203,12 +1203,12 @@
     console.log(dataInfo)
     console.log(dataInfo.handlerImgList)
     console.log(dataInfo.incidentData.repairImgList)
-    
+
     uni.showLoading({
       title: "加载中",
       mask: true,
     });
-    
+
     if(dataInfo.handlerImgList.length){
       // 有处理图片
       let supplementOrder$ = supplementOrder();
@@ -1271,23 +1271,28 @@
       })
     }
   }
-  
+
   // 菜单权限
   function menuAuthHandle(){
     let shijianliebiao_supplement = false;//故障处理权限
     for (let i = 0; i < loginUserStore.loginUser.menu.length; i++) {
-        if (loginUserStore.loginUser.menu[i].link == "replenishment") {
-          shijianliebiao_supplement = true
+      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 == "replenishment") {
+              shijianliebiao_supplement = true
+            }
         }
+      }
     }
-    
+
     // 补单
     if(shijianliebiao_supplement){
       let index = dataInfo.tabs.findIndex(v => v.value === 'assign');
       dataInfo.tabs.splice(index, 0, {id: 7, name: '补单', value: 'supplement', num: ''});
     }
   }
-  
+
 	// 获取知识库数量
 	function getIntroduceCount(categoryId){
 	  uni.showLoading({
@@ -1304,7 +1309,7 @@
 				status:{id:dicData.value?.id},
 	    }
 	  }
-	  
+
 	  api_getSolution(postData).then(res => {
 	    uni.hideLoading();
 	    if(res.status == 200){
@@ -1317,14 +1322,14 @@
 	    }
 	  })
 	}
-	
+
 	// 获取文本内容
 	function getHtml(html) {
 	  const tempDiv = document.createElement('div');
 	  tempDiv.innerHTML = html;
 	  return tempDiv.textContent || tempDiv.innerText || '';
 	}
-	
+
 	// 获取字典
 	function getDic(){
 		let postData = {
@@ -1345,7 +1350,7 @@
 			    dataInfo.tabActiveValue = 'supplement';
 			    next();
 			  }
-				
+
 				let storeData = handlerStore.handler.data
 				if(storeData.type == 'rep'){
 					dataInfo.handleDescription = null;
@@ -1360,9 +1365,9 @@
 						dataInfo.supplementFlag = false
 					}
 				}
-				
+
 			  handlerStore.clearHandlerData();
-			  
+
 			  if(dataInfo.category){
 			     dataInfo.incidentData.category = dataInfo.category;
 					 if(dataInfo.incidentData.place.floor){
@@ -1388,7 +1393,7 @@
 			  //   }else{
 			  //     // 不分院区
 					// 	// dataInfo.incidentData.hosId = loginUserStore.loginUser.user.currentHospital.id;
-						
+
 					// }
 					getDuty()
 			  }
@@ -1435,7 +1440,7 @@
 			}
 		})
 	}
-	
+
 	// 获取故障现象绑定的科室
 	function getDuty(){
 		let postData = {
@@ -1447,14 +1452,14 @@
 		  },
 		};
 		getFetchDataList("simple/data", "incidentCategoryConfig", postData).then(res => {
-			let item = res.list.find(i=>i.categoryId == dataInfo.incidentData.category.id) 
+			let item = res.list.find(i=>i.categoryId == dataInfo.incidentData.category.id)
 			dutyList.value = item.dutyDTO
 			dataInfo.incidentData.duty = dutyList.value.id
 			initForm()
 			console.log(1111,dutyList.value)
 		})
 	}
-	
+
 	// 获取是否开启汇总单
 	function getHosConfig(){
 		let postData = {
@@ -1471,7 +1476,7 @@
 				HandleData.simpleness = res.list.find(i=>i.key=='itsmSimpleHandle').value
 			});
 	}
-		
+
   onLoad((option) => {
 		getHosConfig()
     menuAuthHandle()

pages/changeUser/changeUser.vue

@@ -13,7 +13,7 @@
           <view class="title select"><text class="required newicon newicon-bitian"></text>工作组：</view>
           <!-- <uni-data-select class="value" v-model="dataInfo.groupId" :localdata="dataInfo.groupList" :clear="false" placeholder="请选择工作组" @change="changeGroup" :class="{formRed: isSubmit && !dataInfo.groupId}"></uni-data-select> -->
 					<uni-data-picker class="value" placeholder="请选择工作组"
-						:localdata="dataInfo.groupList" v-model="dataInfo.groupId" 
+						:localdata="dataInfo.groupList" v-model="dataInfo.groupId"
 						:clear-icon="false" @change="changeGroup" :class="{formRed: isSubmit && !dataInfo.groupId}">
 					</uni-data-picker>
 				</view>
@@ -25,19 +25,19 @@
           <view class="title select"><text class="required newicon newicon-bitian"></text>转派对象：</view>
           <!-- <uni-data-select class="value" v-model="dataInfo.userId" :localdata="dataInfo.userList" :clear="false" placeholder="请选择转派对象" :class="{formRed: isSubmit && dataInfo.groupId && dataInfo.isAssignUser == 1 && !dataInfo.userId}"></uni-data-select> -->
 					<uni-data-picker class="value" placeholder="请选择转派对象"
-						:localdata="dataInfo.userList" v-model="dataInfo.userId" 
+						:localdata="dataInfo.userList" v-model="dataInfo.userId"
 						:clear-icon="false" :class="{formRed: isSubmit && dataInfo.groupId && dataInfo.isAssignUser == 1 && !dataInfo.userId}">
 					</uni-data-picker>
 				</view>
       </template>
-      
+
       <!-- 指派 -->
       <template v-if="dataInfo.tabActiveValue === 'assign'">
         <view class="form_item">
           <view class="title select"><text class="required newicon newicon-bitian"></text>院区：</view>
           <!-- <uni-data-select class="value" v-model="dataInfo.branchId" :localdata="dataInfo.branchList" :clear="false" placeholder="请选择院区" @change="changeBranch" :class="{formRed: isSubmit && !dataInfo.branchId}"></uni-data-select> -->
 					<uni-data-picker class="value" placeholder="请选择院区"
-						:localdata="dataInfo.branchList" v-model="dataInfo.branchId" 
+						:localdata="dataInfo.branchList" v-model="dataInfo.branchId"
 						:clear-icon="false" @change="changeBranch" :class="{formRed: isSubmit && !dataInfo.branchId}">
 					</uni-data-picker>
 				</view>
@@ -45,7 +45,7 @@
           <view class="title select"><text class="required newicon newicon-bitian"></text>责任科室：</view>
           <!-- <uni-data-select class="value" v-model="dataInfo.dutyId" :localdata="dataInfo.dutyList" :clear="false" placeholder="请选择责任科室" @change="changeDuty" :class="{formRed: isSubmit && !dataInfo.dutyId}"></uni-data-select> -->
 					<uni-data-picker class="value" placeholder="请选择责任科室"
-						:localdata="dataInfo.dutyList" v-model="dataInfo.dutyId" 
+						:localdata="dataInfo.dutyList" v-model="dataInfo.dutyId"
 						:clear-icon="false" @change="changeDuty" :class="{formRed: isSubmit && !dataInfo.dutyId}">
 					</uni-data-picker>
 				</view>
@@ -70,7 +70,7 @@
 					</uni-data-picker>
 				</view>
       </template>
-      
+
       <!-- 退回 -->
       <template v-if="dataInfo.tabActiveValue === 'reassign'">
         <view class="form_item column">
@@ -97,15 +97,15 @@
   import { useMakePhoneCall } from '@/share/useMakePhoneCall.js'
   import { useGoBack } from '@/share/useGoBack.js'
   import { useLoginUserStore } from '@/stores/loginUser'
-  
+
   useSetTitle();
   const loginUserStore = useLoginUserStore();
   const { makePhoneCall }  = useMakePhoneCall();
   const { goBack }  = useGoBack();
-  
+
   // 主题颜色
   const primaryColor = ref(defaultColor)
-  
+
   // 数据
   const dataInfo = reactive({
     tabs: [
@@ -132,29 +132,29 @@
     ], //工作组是否转派到人选项
     reassignRemark: '',//退回原因
   })
-  
+
   // 是否提交
   const isSubmit = ref(false)
-  
+
   // 重置
   function reset(){
     dataInfo.branchId = undefined;
     dataInfo.branchList = [];
-    
+
     dataInfo.dutyId = undefined;
     dataInfo.dutyList = [];
-    
+
     dataInfo.groupId = undefined;
     dataInfo.groupList = [];
-    
+
     dataInfo.userId = undefined;
     dataInfo.userList = [];
-    
+
     dataInfo.isAssignUser = 1;
-    
+
     dataInfo.reassignRemark = '';
   }
-  
+
   // 初始化表单
   function initForm(){
     if(dataInfo.tabActiveValue === 'redeploy'){
@@ -163,7 +163,7 @@
       getBranchs();
     }
   }
-  
+
   // 点击tab
   function clickTab(tabValue){
     if(dataInfo.tabActiveValue == tabValue){
@@ -174,7 +174,7 @@
     reset();
     initForm()
   }
-  
+
   // 获取事件详情
   function getIncidentDetail(){
     uni.showLoading({
@@ -199,19 +199,39 @@
         let transferFlag = false;//转派权限
         let assignFlag = false;//指派权限
         for (let i = 0; i < loginUserStore.loginUser.menu.length; i++) {
-            if (loginUserStore.loginUser.menu[i].link == "assign") {
-                assignFlag = true
-            }
-            if (loginUserStore.loginUser.menu[i].link == "receive") {
-                transferFlag = true
+          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 == "assign") {
+                    assignFlag = true
+                }
+                if (currentMenu[j].link == "transfer") {
+                    transferFlag = true
+                }
             }
+          }
         }
-        
+
         // 转派
         if(dataInfo.incidentData.state.value == 'handler' && dataInfo.incidentData.handlingPersonnelUser && dataInfo.incidentData.handlingPersonnelUser.id == loginUserStore.loginUser.user.id && !assignFlag && transferFlag){
           dataInfo.tabs.splice(0, 0, {id: 1, name: '转派', value: 'redeploy', num: ''});
+        }else if(dataInfo.incidentData.state.value == 'pending'){
+          let inUser = dataInfo.incidentData.currentLog && dataInfo.incidentData.currentLog.workerId == loginUserStore.loginUser.user.id;
+          let inGroup = false;
+          let groupList = loginUserStore.loginUser.user.group || [];
+          groupList.forEach(item => {
+              if(dataInfo.incidentData.currentLog){
+                  if (item.id == dataInfo.incidentData.currentLog.groupId) {
+                      inGroup = true;
+                  }
+              }
+          })
+
+          if((inUser || inGroup)){
+            dataInfo.tabs.splice(0, 0, {id: 1, name: '转派', value: 'redeploy', num: ''});
+          }
         }
-        
+
         // 指派
         if((dataInfo.incidentData.state.value == 'pending' || dataInfo.incidentData.state.value == 'handler' || dataInfo.incidentData.state.value == 'reassign') && assignFlag){
           let index = dataInfo.tabs.findIndex(v => v.value === 'reassign');
@@ -221,7 +241,7 @@
             dataInfo.tabs.splice(index, 0, {id: 1, name: '指派', value: 'assign', num: ''});
           }
         }
-        
+
         // 退回
         if(dataInfo.incidentData.state.value == 'pending' || dataInfo.incidentData.state.value == 'handler'){
           if(dataInfo.tabs.length){
@@ -230,9 +250,9 @@
             dataInfo.tabs = [{id: 4, name: '退回', value: 'reassign', num: ''}];
           }
         }
-        
+
         dataInfo.tabActiveValue = dataInfo.tabs[0].value;
-        
+
         initForm()
       }else{
         uni.showToast({
@@ -242,7 +262,7 @@
       }
     })
   }
-  
+
   // 获取院区列表
   function getBranchs(){
 		let arr = loginUserStore.loginUser.hospital.filter(i=>i.parent==undefined)
@@ -260,10 +280,10 @@
 		// 	hospital:{
 		// 		selectType:"level1",
 		// 	}
-			
+
 		// 	// parent:{id:loginUserStore.loginUser.user.currentHospital.id}
   //   };
-		
+
   //   api_branch(postData).then(res => {
   //     uni.hideLoading();
   //     if(res.status == 200){
@@ -272,12 +292,12 @@
   //         text: v.hosName,
   //         value: v.id,
   //       }));
-        
+
   //       if(loginUserStore.loginUser.user.duty){
   //         // 当前的所属责任科室
   //         dataInfo.branchId = loginUserStore.loginUser.user.duty.branch;
   //         changeBranch();
-          
+
   //         dataInfo.dutyId = loginUserStore.loginUser.user.duty.id;
   //         changeDuty();
   //       }else if(loginUserStore.loginUser.user.branch){
@@ -293,7 +313,7 @@
   //     }
   //   })
   }
-  
+
   // 获取责任科室列表
   function getDutys(){
     uni.showLoading({
@@ -326,21 +346,21 @@
       }
     })
   }
-  
+
   // 获取工作组列表
   function getGroups(){
     uni.showLoading({
       title: "加载中",
       mask: true,
     });
-    
+
     let duty = undefined;
     if(dataInfo.tabActiveValue === 'redeploy'){
       duty = dataInfo.incidentData.duty.id;
     }else if(dataInfo.tabActiveValue === 'assign'){
       duty = dataInfo.dutyId;
     }
-    
+
     let postData = {
       "idx": 0,
       "sum": 9999,
@@ -365,7 +385,7 @@
       }
     })
   }
-  
+
   // 获取用户列表
   function getUsers(){
     uni.showLoading({
@@ -408,46 +428,46 @@
       }
     })
   }
-  
+
   // 选择院区
   function changeBranch(){
     dataInfo.dutyId = undefined;
     dataInfo.dutyList = [];
-    
+
     dataInfo.groupId = undefined;
     dataInfo.groupList = [];
-    
+
     dataInfo.userId = undefined;
     dataInfo.userList = [];
     getDutys();
   }
-  
+
   // 选择责任科室
   function changeDuty(){
     dataInfo.groupId = undefined;
     dataInfo.groupList = [];
-    
+
     dataInfo.userId = undefined;
     dataInfo.userList = [];
     getGroups();
   }
-  
+
   // 选择工作组
   function changeGroup(){
     dataInfo.userId = undefined;
     dataInfo.userList = [];
     getUsers();
   }
-  
+
   // 选择是否转派到人
   function changeIsAssignUser(){
     dataInfo.userId = undefined;
   }
-	
+
   // 提交
   function submit(){
     isSubmit.value = true;
-    
+
     if(dataInfo.tabActiveValue === 'redeploy'){
       submitRedeploy();
     }else if(dataInfo.tabActiveValue === 'assign'){
@@ -456,7 +476,7 @@
       submitReassign();
     }
   }
-  
+
   // 转派提交
   function submitRedeploy(){
     if(!dataInfo.groupId){
@@ -466,7 +486,7 @@
       });
       return;
     }
-    
+
     if(dataInfo.isAssignUser == 1 && !dataInfo.userId){
       uni.showToast({
       	icon: 'none',
@@ -474,12 +494,12 @@
       });
       return;
     }
-    
+
     uni.showLoading({
       title: "加载中",
       mask: true,
     });
-    
+
     let postData = {
       incident: dataInfo.incidentData,
     }
@@ -493,7 +513,7 @@
 		  postData.incident.candidateGroups = dataInfo.groupId;
 			delete postData.incident.assignee
 		}
-		
+
     api_incidentTask(dataInfo.tabActiveValue, postData).then(res => {
       uni.hideLoading();
       if(res.state == 200){
@@ -515,7 +535,7 @@
       }
     })
   }
-  
+
   // 指派提交
   function submitAssign(){
     if(!dataInfo.branchId){
@@ -525,7 +545,7 @@
       });
       return;
     }
-    
+
     if(!dataInfo.dutyId){
       uni.showToast({
       	icon: 'none',
@@ -533,7 +553,7 @@
       });
       return;
     }
-    
+
     if(!dataInfo.groupId){
       uni.showToast({
       	icon: 'none',
@@ -541,7 +561,7 @@
       });
       return;
     }
-    
+
     if(dataInfo.isAssignUser == 1 && !dataInfo.userId){
       uni.showToast({
       	icon: 'none',
@@ -549,12 +569,12 @@
       });
       return;
     }
-    
+
     uni.showLoading({
       title: "加载中",
       mask: true,
     });
-    
+
     let postData = {
       incident: dataInfo.incidentData,
     }
@@ -568,7 +588,7 @@
       postData.incident.candidateGroups = dataInfo.groupId;
 			delete postData.incident.assignee
     }
-    
+
     postData.incident.duty = { id: dataInfo.dutyId };
 		postData.incident.hosId = dataInfo.branchId
     api_incidentTask(dataInfo.tabActiveValue, postData).then(res => {
@@ -592,7 +612,7 @@
       }
     })
   }
-  
+
   // 退回提交
   function submitReassign(){
     if(!dataInfo.reassignRemark.trim()){
@@ -602,18 +622,18 @@
       });
       return;
     }
-    
+
     uni.showLoading({
       title: "加载中",
       mask: true,
     });
-    
+
     let postData = {
       incident: dataInfo.incidentData,
     }
-    
+
     postData.incident.reassignRemark = dataInfo.reassignRemark;
-    
+
     api_incidentTask(dataInfo.tabActiveValue, postData).then(res => {
       uni.hideLoading();
       if(res.state == 200){
@@ -635,7 +655,7 @@
       }
     })
   }
-  
+
   onLoad((option) => {
     dataInfo.incidentId = option.incidentId;
     getIncidentDetail();

pages/handler/handler.vue

@@ -35,7 +35,7 @@
             </view>
           </view>
         </view>
-        
+
         <!-- 工时 -->
         <view class="summaryItem">
           <view class="summaryItem_head">
@@ -62,7 +62,7 @@
             </view>
           </view>
         </view>
-        
+
         <!-- 汇总单总价 -->
         <view class="summaryItem">
           <view class="summaryItem_foot total">
@@ -72,7 +72,7 @@
           </view>
         </view>
       </template>
-      
+
       <!-- 故障处理 -->
       <template v-if="dataInfo.tabActiveValue === 'doing' && !isInSummaryOrder">
         <view class="form_item column" v-if="HandleData.simpleness != 1">
@@ -81,7 +81,7 @@
 						<view class="title-fl-sb">
 							解决方案：
 							<view @click="importRep('malfunction')" class="import-rep">引入知识库({{dataInfo.introduceCount}})</view>
-						</view>	
+						</view>
 					</view>
           <uni-easyinput id="scheme" class="value" type="textarea" v-model="dataInfo.handleDescription" placeholder="请输入解决方案" :class="{formRed: isSubmit && !dataInfo.handleDescription.trim()}" />
         </view>
@@ -132,7 +132,7 @@
           </view>
         </view>
       </template>
-      
+
       <!-- 延期处理 -->
       <template v-if="dataInfo.tabActiveValue === 'overtime'">
         <view class="form_item">
@@ -183,17 +183,17 @@
   import { useGoBack } from '@/share/useGoBack.js'
   import { useLoginUserStore } from '@/stores/loginUser'
   import { useHandlerStore } from '@/stores/handler'
-  
+
   useSetTitle();
   const loginUserStore = useLoginUserStore();
   const handlerStore = useHandlerStore();
   const { makePhoneCall }  = useMakePhoneCall();
   const { uploadFile }  = useUploadFile();
   const { goBack }  = useGoBack();
-  
+
   // 主题颜色
   const primaryColor = ref(defaultColor)
-  
+
 	// 备用机选项
 	const machineData = ref([
 		{
@@ -205,7 +205,7 @@
 			value:0
 		},
 	])
-	
+
   // 数据
   const dataInfo = reactive({
     tabs: [
@@ -242,31 +242,31 @@
 		provideBackupMachine:0,//是否提供备用机
 		returnBackupMachine:null//是否归还备用机
   })
-  
+
 	// 故障处理用是否提供备用机
 	const newProvideBackupMachine = ref(0)
-	
+
 	// 知识库id
 	const solutionId = ref(null)
-	
+
   // 是否提交
   const isSubmit = ref(false)
-	
+
 	// 是否开启汇总单
 	const SummaryData = ref(false)
-  
+
 	// 是否简单处理
 	const HandleData = reactive({
 		simpleness:null
 	})
   // 处理图片
   const handlerImgRef = ref(null)
-  
+
   // 是否进入汇总单
   const isInSummaryOrder = computed(() => {
     return dataInfo.tabActiveValue === 'doing' && SummaryData.value.value == 1 && (dataInfo.incidentData.handlingPersonnelUser.id == loginUserStore.loginUser.user.id);
   })
-  
+
   // 上一步或者返回列表
   function goBackOrToList(){
     if(dataInfo.isSummaryNext){
@@ -278,7 +278,7 @@
       })
     }
   }
-  
+
   // 上传处理图片成功
   function handlerImgSuccess(e){
     dataInfo.handlerImgList.forEach(v => {
@@ -291,7 +291,7 @@
       let handlerOrderImg$ = handlerOrderImg(v);
       requestList.push(handlerOrderImg$);
     })
-    
+
     Promise.all(requestList).then(resList => {
       uni.hideLoading();
       console.log(resList);
@@ -314,7 +314,7 @@
       }
     })
   }
-  
+
   // 上传处理图片失败
   function handlerImgFail(e){
     dataInfo.handlerImgList.forEach(v => {
@@ -322,19 +322,19 @@
     })
     console.log(dataInfo.handlerImgList);
   }
-  
+
   // 选择上传图片
   function handlerImgSelect(e){
     dataInfo.handlerImgList = dataInfo.handlerImgList.concat(e.tempFiles);
     console.log(dataInfo.handlerImgList);
   }
-  
+
   // 删除上传图片
   function handlerImgDelete(e){
     dataInfo.handlerImgList = dataInfo.handlerImgList.filter(v => e.tempFile.uuid != v.uuid);
     console.log(dataInfo.handlerImgList);
   }
-  
+
   // 添加协同人员
   function synergeticAdd(){
     handlerStore.setHandlerData(dataInfo, 'handler');
@@ -342,7 +342,7 @@
       url: `/pages/synergeticAdd/synergeticAdd?incidentId=${dataInfo.incidentId}`
     })
   }
-  
+
 	// 引入知识库
 	function importRep(type){
 		dataInfo.operateType = type
@@ -351,7 +351,7 @@
 		  url: `/pages/repository/repository`
 		})
 	}
-	
+
   // 选择故障现象
   function selectCategory(){
     handlerStore.setHandlerData(dataInfo, 'handler');
@@ -359,7 +359,7 @@
       url: `/pages/categoryOne/categoryOne?incidentId=${dataInfo.incidentId}`
     })
   }
-  
+
   // 点击修改数量
   function numberClick(data, type){
     if(type === 'editConsumable'){
@@ -367,31 +367,31 @@
     }else if(type === 'editWorkHourManagement'){
       dataInfo.evtNumber = data.workHourNum2;
     }
-    
+
     dataInfo.isNumber = true;
     dataInfo.selectData = data;
     dataInfo.selectType = type;
   }
-  
+
   // 确认修改数量
   function conformNumber(evtNumber){
     dataInfo.evtNumber = evtNumber;
     dataInfo.isNumber = false;
     addSummaryDoc();
   }
-  
+
   // 移除数量
   function removeNumber(evtNumber){
     dataInfo.evtNumber = evtNumber;
     dataInfo.isNumber = false;
     removeSummaryDoc();
   }
-  
+
   // 关闭修改数量
   function cancelNumber(){
     dataInfo.isNumber = false;
   }
-  
+
   // 修改耗材/工时
   function addSummaryDoc(){
     uni.showLoading({
@@ -434,7 +434,7 @@
       }
     })
   }
-  
+
   // 移除耗材/工时
   function removeSummaryDoc(){
     uni.showLoading({
@@ -477,7 +477,7 @@
       }
     })
   }
-  
+
   // 重置
   function reset(){
     dataInfo.repairTypeList = []; //延期原因列表
@@ -506,7 +506,7 @@
 		dataInfo.provideBackupMachine = 0
 		dataInfo.returnBackupMachine = null
   }
-  
+
   // 初始化表单
   function initForm(){
     if(dataInfo.tabActiveValue === 'doing' && isInSummaryOrder.value){
@@ -519,7 +519,7 @@
       getDeferralDays();
     }
   }
-  
+
   // 点击tab
   function clickTab(tabValue){
     if(dataInfo.tabActiveValue == tabValue){
@@ -533,7 +533,7 @@
 		newProvideBackupMachine.value = dataInfo.incidentData.provideBackupMachine
     initForm();
   }
-  
+
   // 获取事件详情
   function getIncidentDetail(){
     uni.showLoading({
@@ -564,7 +564,7 @@
 					  dataInfo.incidentData.duty.addSummary = 0;
 					}
 				}
-        
+
         // 跳转页面选择了选项并且工单ID一致
         if(handlerStore.handler.data && handlerStore.handler.data.incidentId == dataInfo.incidentId){
          if(dataInfo.handleDescription){
@@ -573,7 +573,7 @@
 					Object.assign(dataInfo, handlerStore.handler.data);
 					getIntroduceCount(dataInfo.category.id)
 
-					
+
           handlerStore.clearHandlerData();
         }else{
           handlerStore.clearHandlerData();
@@ -583,23 +583,28 @@
           getIntroduceCount(dataInfo.category.id)
           let chuli = false;//故障处理权限
           for (let i = 0; i < loginUserStore.loginUser.menu.length; i++) {
-              if (loginUserStore.loginUser.menu[i].link == "handle") {
-                chuli = true
+            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 == "handle") {
+                  chuli = true
+                }
               }
+            }
           }
-          
+
           // 故障处理
           if(dataInfo.incidentData.state.value == 'handler' && dataInfo.incidentData.handlingPersonnelUser && dataInfo.incidentData.handlingPersonnelUser.id == loginUserStore.loginUser.user.id && chuli){
             let flag = dataInfo.tabs.some(v => v.value === 'doing');
             !flag && dataInfo.tabs.splice(0, 0, {id: 5, name: '故障处理', value: 'doing', num: ''});
           }
-          
+
           // 延期处理
           if(dataInfo.incidentData.state.value == 'handler' && dataInfo.incidentData.handlingPersonnelUser && dataInfo.incidentData.handlingPersonnelUser.id == loginUserStore.loginUser.user.id){
             let flag = dataInfo.tabs.some(v => v.value === 'overtime');
             !flag && dataInfo.tabs.push({id: 6, name: '延期处理', value: 'overtime', num: ''});
           }
-          
+
           dataInfo.tabActiveValue = dataInfo.tabs[0].value;
         }
         initForm()
@@ -611,7 +616,7 @@
       }
     })
   }
-  
+
   // 获取延期原因列表
   function getRepairTypes(){
     uni.showLoading({
@@ -631,7 +636,7 @@
       }));
     })
   }
-  
+
   // 获取处理方式列表
   function getHandleCategorys(){
     uni.showLoading({
@@ -656,7 +661,7 @@
       }
     })
   }
-  
+
   // 获取处理结果列表
   function getClosecodes(){
     uni.showLoading({
@@ -681,7 +686,7 @@
       }
     })
   }
-  
+
   // 获取延期天数列表
   function getDeferralDays(){
     dataInfo.deferralDayList = generateNumberArray(1, 15).map(v => ({
@@ -693,7 +698,7 @@
 			value: 0.5,
 		})
   }
-  
+
   // 获取汇总单信息
   function getSummaryList(){
     uni.showLoading({
@@ -719,14 +724,14 @@
       }
     })
   }
-  
+
   // 添加耗材
   function addConsumable(){
     uni.navigateTo({
       url: `/pages/consumableList/consumableList?incidentId=${dataInfo.incidentId}&summaryId=${dataInfo.summaryId}`
     })
   }
-  
+
   // 添加工时
   function addWorkHourManagement(){
 		let hosId = dataInfo.incidentData.duty.id
@@ -734,7 +739,7 @@
       url: `/pages/workHourManagementOne/workHourManagementOne?incidentId=${dataInfo.incidentId}&summaryId=${dataInfo.summaryId}&hosId=${hosId}`
     })
   }
-  
+
   // 提交
   function submit(){
     isSubmit.value = true;
@@ -748,7 +753,7 @@
       submitOvertime();
     }
   }
-  
+
   // 处理提交事件
   function handlerOrder(){
 		dataInfo.incidentData.returnBackupMachine = dataInfo.returnBackupMachine
@@ -761,15 +766,15 @@
     postData.incident.closecode = {id: dataInfo.closecode};
     postData.incident.category = dataInfo.category;
     postData.incident.synergetic = dataInfo.synergetic;
-    
+
     return api_incidentTask(dataInfo.tabActiveValue, postData);
   }
-  
+
   // 处理图片
   function handlerOrderImg(imgObj){
     return uploadFile(imgObj, 'incident', dataInfo.incidentId)
   }
-  
+
   // 处理提交
   function submitHandler(){
     console.log(dataInfo);
@@ -780,7 +785,7 @@
       });
       return;
     }
-		
+
 		if(newProvideBackupMachine.value==1 && dataInfo.returnBackupMachine==null){
 		  uni.showToast({
 		  	icon: 'none',
@@ -788,7 +793,7 @@
 		  });
 		  return;
 		}
-		
+
     if(!dataInfo.category.id && HandleData.simpleness != 1){
       uni.showToast({
       	icon: 'none',
@@ -796,7 +801,7 @@
       });
       return;
     }
-    
+
     if(!dataInfo.handleCategory){
       uni.showToast({
       	icon: 'none',
@@ -804,7 +809,7 @@
       });
       return;
     }
-    
+
     if(!dataInfo.closecode && HandleData.simpleness != 1){
       uni.showToast({
       	icon: 'none',
@@ -850,7 +855,7 @@
       })
     }
   }
-  
+
   // 延期处理提交
   function submitOvertime(){
     if(!dataInfo.repairTypeId){
@@ -860,7 +865,7 @@
       });
       return;
     }
-    
+
     if(!dataInfo.deferralRemark.trim()){
       uni.showToast({
       	icon: 'none',
@@ -868,7 +873,7 @@
       });
       return;
     }
-    
+
     if(!dataInfo.deferralDayId){
       uni.showToast({
       	icon: 'none',
@@ -876,7 +881,7 @@
       });
       return;
     }
-    
+
     uni.showLoading({
       title: "加载中",
       mask: true,
@@ -885,13 +890,13 @@
     let postData = {
       incident: dataInfo.incidentData,
     }
-    
+
     postData.incident.currentLog = {
       remark: dataInfo.deferralRemark,
       extra1: dataInfo.repairTypeId,
       extra2: dataInfo.deferralDayId,
     }
-    
+
     api_incidentTask(dataInfo.tabActiveValue, postData).then(res => {
       uni.hideLoading();
       if(res.state == 200){
@@ -913,7 +918,7 @@
       }
     })
   }
-  
+
 	// 获取知识库数量
 	function getIntroduceCount(categoryId){
 		uni.showLoading({
@@ -949,14 +954,14 @@
 			 })
 		})
 	}
-	
+
 	// 获取文本内容
 	function getHtml(html) {
 	  const tempDiv = document.createElement('div');
 	  tempDiv.innerHTML = html;
 	  return tempDiv.textContent || tempDiv.innerText || '';
 	}
-	
+
 	// 获取是否开启汇总单、简易处理
 	function getHosConfig(){
 		let postData = {
@@ -975,7 +980,7 @@
 				HandleData.simpleness = res.list.find(i=>i.key=='itsmSimpleHandle').value
 			});
 	}
-	
+
   onLoad((option) => {
 		let storeData = handlerStore.handler.data
 		if(storeData && storeData.type=='rep'){

pages/incidentList/incidentList.vue

@@ -86,7 +86,7 @@
   import { useIncidentNumStore } from '@/stores/incidentNum'
   import { useIncidentListSearchStore } from '@/stores/incidentListSearch'
 	import { useHandlerStore } from '@/stores/handler'
-		
+
   useSetTitle();
   const loginUserStore = useLoginUserStore();
   const incidentNumStore = useIncidentNumStore();
@@ -98,7 +98,7 @@
   const { makePhoneCall }  = useMakePhoneCall();
   const { setTabbar }  = useSetTabbar();
 	const handlerStore = useHandlerStore();
-	
+
   // 主题颜色
   const primaryColor = ref(defaultColor)
 
@@ -108,7 +108,7 @@
   // 判断是否显示接单按钮
   const computedReceive = computed(() => (data) => {
     let inUser = data.handlingPersonnelUser && data.handlingPersonnelUser.id == loginUserStore.loginUser.user.id;
-		let inUser2 = data.currentLog.workerId == loginUserStore.loginUser.user.id; 
+		let inUser2 = data.currentLog.workerId == loginUserStore.loginUser.user.id;
 		let inGroup = false;
 		if(loginUserStore.loginUser.user&&loginUserStore.loginUser.user.group){
 			loginUserStore.loginUser.user.group.forEach(item => {
@@ -119,7 +119,7 @@
 			    }
 			})
 		}
-    
+
     return data.state.value === 'pending' && (inUser2 || inGroup) && qiangdan.value;
   })
 
@@ -209,7 +209,7 @@
   function knowAttachment(){
     dataInfo.isAttachment = false;
   }
-  
+
   // 点击报修录音
   function attachmentRequireClick(incidentData){
     dataInfo.incidentData = incidentData;
@@ -315,7 +315,7 @@
       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
@@ -324,7 +324,7 @@
 				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();
@@ -409,11 +409,16 @@
     }
 
     for (let i = 0; i < loginUserStore.loginUser.menu.length; i++) {
-      if (loginUserStore.loginUser.menu[i].link == "assign") {
-        assignFlag.value = true;
-      }
-      if (loginUserStore.loginUser.menu[i].link == "receive") {
-        qiangdan.value = true
+      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 == "assign") {
+            assignFlag.value = true;
+          }
+          if (currentMenu[j].link == "receive") {
+            qiangdan.value = true
+          }
+        }
       }
     }
     getTabs();