修改指派组失败

pages/assign/assign.vue

@@ -915,13 +915,15 @@
     
 		postData.incident.place = {}
 		postData.incident.place.id = floorId.value
-    if(dataInfo.userId){
-      // 派人
-      postData.incident.assignee = dataInfo.userId;
-    } else {
-      // 派组
-      postData.incident.candidateGroups = dataInfo.groupId;
-    }
+		if(dataInfo.userId){
+		  // 派人
+		  postData.incident.assignee = dataInfo.userId;
+			delete postData.incident.candidateGroups
+		} else {
+		  // 派组
+		  postData.incident.candidateGroups = dataInfo.groupId;
+			delete postData.incident.assignee
+		}
     
     return api_incidentTask('accept', postData);
   }

pages/changeUser/changeUser.vue

@@ -474,14 +474,16 @@
       incident: dataInfo.incidentData,
     }
     
-    if(dataInfo.userId){
-      // 派人
-      postData.incident.assignee = dataInfo.userId;
-    } else {
-      // 派组
-      postData.incident.candidateGroups = dataInfo.groupId;
-    }
-    
+		if(dataInfo.userId){
+		  // 派人
+		  postData.incident.assignee = dataInfo.userId;
+			delete postData.incident.candidateGroups
+		} else {
+		  // 派组
+		  postData.incident.candidateGroups = dataInfo.groupId;
+			delete postData.incident.assignee
+		}
+		
     api_incidentTask(dataInfo.tabActiveValue, postData).then(res => {
       uni.hideLoading();
       if(res.state == 200){
@@ -550,9 +552,11 @@
     if(dataInfo.userId){
       // 派人
       postData.incident.assignee = dataInfo.userId;
+			delete postData.incident.candidateGroups
     } else {
       // 派组
       postData.incident.candidateGroups = dataInfo.groupId;
+			delete postData.incident.assignee
     }
     
     postData.incident.duty = { id: dataInfo.dutyId };

pages/repair/home.vue

@@ -192,6 +192,8 @@
 	})
 	
 	onShow((option) => {
+		uni.setStorageSync('repairData','')
+		uni.setStorageSync('rapidRepNext','')
 		getCount()
 	})
 	

pages/repair/rapidRep.vue

@@ -157,7 +157,9 @@
   // 上一步或者返回列表
   function goBackOrToList(){
 		uni.setStorageSync('repairData','')
-    goBack();
+		uni.switchTab({
+		  url: `/pages/repair/home`
+		})
   }
 	
 	function itemCandidate(item){

pages/repair/rapidRepNext.vue

@@ -15,13 +15,20 @@
 						:clear-icon="false" :class="{formRed: isSubmit && !dataInfo.branch}">
 					</uni-data-picker>
 				</view>
-        <view class="form_item">
+<!--        <view class="form_item">
           <view class="title select"><text class="required newicon newicon-bitian"></text>报修科室：</view>
         	<uni-data-picker class="value" placeholder="请选择报修科室" 
         		v-model="dataInfo.department" :localdata="dataInfo.repairTypeList"
         		:clear-icon="false" :class="{formRed: isSubmit && !dataInfo.department}">
         	</uni-data-picker>
-        </view>
+        </view> -->
+				<view class="form_item">
+				  <view class="title select"><text class="required newicon newicon-bitian"></text>报修科室：</view>
+				  <view class="value category" @click="selectDepartment">
+				    <text class="categoryName ellipsis-multiline">{{dataInfo.departmentName}}</text>
+				    <text class="newicon newicon-weibiaoti2010104"></text>
+				  </view>
+				</view>
 				<view class="candidate" v-if="itemUser">
 					<view class="candidate-item" v-for="(item, index) in itemUser.commonDeptDTO" :key="item" @click="itemCandidate(item)">{{item.dept}}</view>
 				</view>
@@ -164,7 +171,8 @@
 		repairTypeList:[],//科室数据
 		buildingTypeList:[],//楼栋数据
 		placeTypeList:[],//楼层数据
-    department:'',//报修科室
+    department:'',//报修科室id
+		departmentName:'',//报修科室
 		address:'',//详细地址
 		contacts:'',//联系人
 		contactsInformation:'',//手机
@@ -197,7 +205,9 @@
   // 上一步或者返回列表
   function goBackOrToList(){
 		uni.setStorageSync('rapidRepNext',JSON.stringify(dataInfo))
-    goBack();
+		uni.navigateTo({
+		  url: `/pages/repair/rapidRep`
+		})
   }
   
   // 重置
@@ -280,18 +290,31 @@
   
   // 获取事件详情
   function getIncidentDetail(){
+		let user = loginUserStore.loginUser.user
     if(uni.getStorageSync('rapidRepNext')){
     	let data = JSON.parse(uni.getStorageSync('rapidRepNext'))
     	if(data){
     		dataInfo.department = data.department//报修科室
+				dataInfo.departmentName = data.departmentName//报修科室
     		dataInfo.address = data.address//详细地址
     		dataInfo.contacts = data.contacts//联系人
     		dataInfo.contactsInformation = data.contactsInformation//手机
-				dataInfo.branch = data.branch//院区
+				dataInfo.branch = Number(data.branch)//院区
     		dataInfo.areaId = data.areaId//楼栋
-				getRepairTypes()
+				// getRepairTypes()
     	}
-    }
+    }else if(user){
+			if(user.currentHospital.parent){
+				dataInfo.branch = user.currentHospital.parent.id
+			}else{
+				dataInfo.branch = user.currentHospital.id
+			}
+			dataInfo.contacts = user.name
+			dataInfo.contactsInformation = user.phone
+			dataInfo.department = user.dept.id
+			dataInfo.departmentName = user.dept.dept
+			// getRepairTypes()
+		}
 		if(uni.getStorageSync('repairData')){
 			let data = JSON.parse(uni.getStorageSync('repairData'))
 			if(data){
@@ -323,18 +346,7 @@
 			dataInfo.tabActiveValue = 'overtime'
 			getbuildingList()
 		}
-		let user = loginUserStore.loginUser.user
-		if(user){
-			if(user.currentHospital.parent){
-				dataInfo.branch = user.currentHospital.parent.id
-			}else{
-				dataInfo.branch = user.currentHospital.id
-			}
-			dataInfo.contacts = user.name
-			dataInfo.contactsInformation = user.phone
-			dataInfo.department = user.dept.id
-			getRepairTypes()
-		}
+
 		
 		let postData = {
 		  "key": 'repair_incident_type',
@@ -358,7 +370,9 @@
 	
 	// 科内报修选择院区
 	function doingDeptChange(){
-		getRepairTypes()
+		dataInfo.department = ''
+		dataInfo.departmentName = ''
+		// getRepairTypes()
 	}
 	
 	// 公区报修选择院区
@@ -366,6 +380,14 @@
 		getbuildingList()
 	}
 	
+	// 跳转到搜索报修科室
+	function selectDepartment(){
+		uni.setStorageSync('rapidRepNext',JSON.stringify(dataInfo))
+	  uni.navigateTo({
+	    url: `/pages/searchDept/searchDept?type=repair&branchId=${dataInfo.branch}`
+	  })
+	}
+	
   // 获取报修科室列表
   function getRepairTypes(){
     uni.showLoading({

pages/searchDept/searchDept.vue

@@ -39,6 +39,11 @@
   // placeHolder
   const placeHolder = ref('');
   
+	const entranceType = ref(null);
+	
+	// 院区id
+	const branchId = ref(null);
+	
   // 数据
   const dataInfo = reactive({
     list: [],//工单列表
@@ -73,18 +78,26 @@
       idx: dataInfo.idx,
       sum: 20,
       department: {
-				hospital:'',
+				hospital:{
+					id:''
+				},
         // branch: dataInfo.incidentData.branch,
         // searchType: 'quickStart',
         // selectType: 'pinyin_qs',
         dept: dataInfo.keyWord,
       }
     }
-    if(loginUserStore.loginUser.user.currentHospital.parent){
-    	postData.department.hospital = loginUserStore.loginUser.user.currentHospital.parent.id
-    }else{
-    	postData.department.hospital = loginUserStore.loginUser.user.currentHospital.id
-    }
+		if(entranceType.value=='repair'){
+			if(branchId.value){
+				postData.department.hospital.id = branchId.value
+			}
+		}else{
+			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();
       uni.stopPullDownRefresh();
@@ -107,14 +120,44 @@
   
   // 点击
   function clickItem(data){
-    dataInfo.incidentData.department = data;
-    incidentBuildStore.setIncidentBuildData(dataInfo.incidentData, incidentBuildStore.incidentBuild.type, incidentBuildStore.incidentBuild.sign);
-    uni.navigateTo({
-      url: '/pages/buildIncident/buildIncident'
-    })
+		if(entranceType.value=='repair'){
+			let query = {
+				department:null,
+				departmentName:null,
+				branch:branchId.value
+			}
+			let rapidRepNextData = uni.getStorageSync('rapidRepNext')
+			if(rapidRepNextData){
+				let parseData = JSON.parse(rapidRepNextData)
+				query.department = data.id//报修科室
+				query.departmentName = data.dept//报修科室
+				let repairData = {
+					...parseData,
+					...query
+				}
+				uni.setStorageSync('rapidRepNext',JSON.stringify(repairData))
+			}else{
+				query.department = data.id//报修科室
+				query.departmentName = data.dept//报修科室
+				uni.setStorageSync('rapidRepNext',JSON.stringify(query))
+			}
+			uni.navigateTo({
+			  url: '/pages/repair/rapidRepNext'
+			})
+		}else{
+			dataInfo.incidentData.department = data;
+			incidentBuildStore.setIncidentBuildData(dataInfo.incidentData, incidentBuildStore.incidentBuild.type, incidentBuildStore.incidentBuild.sign);
+			uni.navigateTo({
+			  url: '/pages/buildIncident/buildIncident'
+			})
+		}
   }
   
   onLoad((option) => {
+		if(option.type){
+			entranceType.value = option.type
+			branchId.value = option.branchId
+		}
     if(incidentBuildStore.incidentBuild.data){
       dataInfo.incidentData = incidentBuildStore.incidentBuild.data;
     }