修改科室搜索

pages/assign/assign.vue

@@ -915,6 +915,7 @@
     
 		postData.incident.place = {}
 		postData.incident.place.id = floorId.value
+		postData.incident.candidateGroupId = dataInfo.groupId;
 		if(dataInfo.userId){
 		  // 派人
 		  postData.incident.assignee = dataInfo.userId;

pages/changeUser/changeUser.vue

@@ -473,7 +473,7 @@
     let postData = {
       incident: dataInfo.incidentData,
     }
-    
+    postData.incident.candidateGroupId = dataInfo.groupId;
 		if(dataInfo.userId){
 		  // 派人
 		  postData.incident.assignee = dataInfo.userId;
@@ -548,7 +548,7 @@
     let postData = {
       incident: dataInfo.incidentData,
     }
-    
+    postData.incident.candidateGroupId = dataInfo.groupId;
     if(dataInfo.userId){
       // 派人
       postData.incident.assignee = dataInfo.userId;

pages/repair/config.vue

@@ -6,11 +6,11 @@
         <view class="bottom_list">
           <view class="bottom_list_item">
             <view class="name"><text class="required newicon newicon-bitian"></text>工号</view>
-            <view class="value no-mar">{{loginUserStore.loginUser.user.account}}</view>
+            <view class="value no-mar">{{dataForm.account}}</view>
           </view>
 					<view class="bottom_list_item">
 					  <view class="name"><text class="required newicon newicon-bitian"></text>姓名</view>
-					  <view class="value no-mar">{{loginUserStore.loginUser.user.name}}</view>
+					  <view class="value no-mar">{{dataForm.name}}</view>
 					</view>
 					<view class="bottom_list_item">
 					  <view class="name"><text class="required newicon newicon-bitian"></text>院区名称</view>
@@ -20,13 +20,20 @@
 						</uni-data-picker>
 						<text class="newicon newicon-youjiantou icon"></text>
 					</view>
-					<view class="bottom_list_item" v-if="deptRepair.valueconfig==1">
-					  <view class="name"><text class="required newicon newicon-bitian"></text>科室名称</view>
+					<view class="bottom_list_item" v-if="deptRepair.valueconfig==1" @click="selectDepartment">
+<!-- 					  <view class="name"><text class="required newicon newicon-bitian"></text>科室名称</view>
 						<uni-data-picker class="value" placeholder="请选择报修科室"
 							v-model="dataForm.dept" :localdata="deptData" 
 							:clear-icon="false" :class="{formRed: isSubmit && !dataForm.dept}">
-						</uni-data-picker>
+						</uni-data-picker> -->
 						<text class="newicon newicon-youjiantou icon"></text>
+						<!-- <view class="form_item"> -->
+						  <view class="title select"><text class="required newicon newicon-bitian"></text>报修科室：</view>
+						  <view class="value category">
+						    <text class="categoryName ellipsis-multiline">{{dataForm.departmentName}}</text>
+						    <!-- <text class="newicon newicon-weibiaoti2010104"></text> -->
+						  </view>
+						<!-- </view> -->
 					</view>
 					<view class="bottom_list_item" v-if="deptRepair.valueconfig==1" @click="deptSelect">
 					  <view class="name">常用科室</view>
@@ -35,7 +42,7 @@
 					</view>
           <view class="bottom_list_item">
             <view class="name"><text class="required newicon newicon-bitian"></text>联系电话</view>
-            <view class="value no-mar" @click="makePhoneCall(loginUserStore.loginUser.user.phone)">{{loginUserStore.loginUser.user.phone}}</view>
+            <view class="value no-mar" @click="makePhoneCall(dataForm.phone)">{{dataForm.phone}}</view>
           </view>
         </view>
       </view>
@@ -79,10 +86,19 @@
 	const commonDeptData = ref(null)
 	
 	const dataForm = reactive({
+		name:loginUserStore.loginUser.user.name,
+		account:loginUserStore.loginUser.user.account,
+		phone:loginUserStore.loginUser.user.phone,
 	  dept: '',
-		branch:''
+		departmentName:'',
+		branch:'',
+		commonDeptName:'',
+		commonDeptData:'',
+		dataType:false
 	})
 	
+	const operationType = ref(null)
+	
 	const userTypes = ref(null)
 	
 	const userData = reactive(loginUserStore.loginUser.user)
@@ -165,9 +181,25 @@
 	// 选择院区
 	function branchChange(){
 		dataForm.dept = null
+		dataForm.departmentName = null
+		dataForm.commonDeptName = null
+		dataForm.commonDeptData = null
 		commonDeptName.value = null
 		commonDeptData.value = null
-		getRepairTypes()
+		// getRepairTypes()
+	}
+	
+	// 跳转到科室
+	function selectDepartment(){
+		if(commonDeptName.value){
+			dataForm.dataType = true
+		}else{
+			dataForm.dataType = false
+		}
+		uni.setStorageSync('configData',JSON.stringify(dataForm))
+	  uni.navigateTo({
+	    url: `/pages/searchDept/searchDept?type=config&branchId=${dataForm.branch}`
+	  })
 	}
 	
 	// 获取科室列表
@@ -205,8 +237,8 @@
 	// 选择常用科室
 	function deptSelect(){
 		uni.setStorageSync('configData',JSON.stringify(dataForm))
-		let data = commonDeptData.value ? 
-		commonDeptData.value : loginUserStore.loginUser.user.commonDept
+		let data = commonDeptData.value 
+		// ? commonDeptData.value : loginUserStore.loginUser.user.commonDept
 		if(!data){
 			data = 'none'
 		}
@@ -245,7 +277,24 @@
 		api_user(postData).then(res => {
 		  if(res.status == 200){
 		    let item = res.list.find(i=>i.id==user.id)
-		    if(item){
+				let data = uni.getStorageSync('configData')
+				if(operationType.value=='selectDept'){
+					if(data){
+						data = JSON.parse(data)
+						dataForm.name = data.name
+						dataForm.account = data.account
+						dataForm.phone = data.phone
+						dataForm.dept = data.dept
+						dataForm.departmentName = data.departmentName
+						dataForm.branch = Number(data.branch)
+						dataForm.commonDeptName = data.commonDeptName
+						dataForm.commonDeptData = data.commonDeptData
+						if(data.dataType){
+							commonDeptData.value = data.commonDeptData
+							commonDeptName.value = data.commonDeptName
+						}
+					}	
+				}else if(item){
 					if(item.hospital.parent){
 						dataForm.branch = item.hospital.parent.id
 					}else{
@@ -253,8 +302,9 @@
 					}
 					if(item.dept){
 						dataForm.dept = item.dept.id
+						dataForm.departmentName = item.dept.dept
 					}
-					getRepairTypes()
+					// getRepairTypes()
 					let id = []
 					let name = []
 					if(item.commonDeptDTO){
@@ -264,6 +314,8 @@
 						}
 						commonDeptData.value = id.join(',')
 						commonDeptName.value = name.join('/')
+						dataForm.commonDeptName = commonDeptName.value
+						dataForm.commonDeptData = commonDeptData.value
 					}
 		    }else{
 					// let data = uni.getStorageSync('configData')
@@ -279,6 +331,7 @@
 						}
 						if(user.dept){
 							dataForm.dept = user.dept.id
+							dataForm.departmentName = user.dept.dept
 						}
 					// }
 					if(user.commonDeptDTO){
@@ -288,8 +341,10 @@
 						}
 						commonDeptData.value = user.commonDept
 						commonDeptName.value = name.join('/')
+						dataForm.commonDeptName = commonDeptName.value
+						dataForm.commonDeptData = commonDeptData.value
 					}
-					getRepairTypes()
+					// getRepairTypes()
 				}
 		  }else{
 		    uni.showToast({
@@ -311,24 +366,33 @@
 		if(dataInfo.num==0){
 			getUserInfo()
 		}
+		for(let i = 0; i<5; i++){
+			setTabbar(i)
+		}
 	})
 			
   onLoad((option) => {
 		userTypes.value = JSON.parse(uni.getStorageSync('groupData')) 
 		onLoadFn();
 		dataInfo.num = 1
+		if(option && option.type){
+			operationType.value = option.type
+		}
 		if(option.data){
 			let data = JSON.parse(option.data)
 			commonDeptData.value = data.data.join(',')
 			commonDeptName.value = data.name.join('/')
 			commonDeptDTO.value = data.name
+			dataForm.commonDeptData = data.data.join(',')
+			dataForm.commonDeptName = data.name.join('/')
 			let data2 = uni.getStorageSync('configData')
 			if(data2){
 				data2 = JSON.parse(data2)
 				dataForm.dept = data2.dept
+				dataForm.departmentName = data2.departmentName
 				dataForm.branch = data2.branch
 			}
-			getRepairTypes()
+			// getRepairTypes()
 		}else{
 			getUserInfo()
 		}

pages/repair/deptSelect.vue

@@ -57,7 +57,21 @@
 	
 	// 上一步或者返回列表
 	function goBackOrToList(){
-	  goBack();
+		if(entranceType.value=='home'){
+			let configNewData = uni.getStorageSync('configData')
+			if(configNewData){
+				let parseData = JSON.parse(configNewData)
+				if(parseData.commonDeptName){
+					parseData.dataType = true
+				}
+				uni.setStorageSync('configData',JSON.stringify(parseData))
+			}
+			uni.reLaunch({
+			  url: '/pages/repair/config?type=selectDept'
+			})
+		}else{
+			goBack();
+		}
 	}
 	
 	function checkboxChange (e) {
@@ -138,6 +152,12 @@
 		}
 		console.log(888,entranceType.value)
 		if(entranceType.value=='home'){
+			let configNewData = uni.getStorageSync('configData')
+			if(configNewData){
+				let parseData = JSON.parse(configNewData)
+				parseData.dataType = true
+				uni.setStorageSync('configData',JSON.stringify(parseData))
+			}
 			uni.reLaunch({
 			  url: '/pages/repair/config?data='+JSON.stringify(data)
 			})

pages/repair/rapidRepNext.vue

@@ -236,6 +236,7 @@
 		// let arr = loginUserStore.loginUser.user.commonDept.split(',')
 		// console.log(66,arr)
 		dataInfo.department = item.id
+		dataInfo.departmentName = item.dept
 	}
 	
 	function itemAddres(item){
@@ -256,7 +257,19 @@
 		}
 		api_user(postData).then(res => {
 		  if(res.status == 200){
+				let user = loginUserStore.loginUser.user
+				if(uni.getStorageSync('rapidRepNext')){
+					let data = JSON.parse(uni.getStorageSync('rapidRepNext'))
+					if(data){
+						dataInfo.departmentName = data.departmentName 
+						dataInfo.department = data.department
+					}
+				}else{
+					dataInfo.departmentName = res.list[0].dept.dept
+					dataInfo.department = res.list[0].dept.id
+				}
 		    itemUser.value = res.list.find(i=>i.id==user.id)
+				
 		  }else{
 		    uni.showToast({
 		      icon: 'none',

pages/searchDept/searchDept.vue

@@ -12,7 +12,7 @@
       <text class="newicon newicon-zanwu"></text>
     </view>
     <view class="foot_common_btns">
-      <button @click="goBack" type="default" class="primaryButton btn">返回</button>
+      <button @click="goBackPage" type="default" class="primaryButton btn">返回</button>
     </view>
   </view>
 </template>
@@ -87,7 +87,7 @@
         dept: dataInfo.keyWord,
       }
     }
-		if(entranceType.value=='repair'){
+		if(entranceType.value=='repair' || entranceType.value=='config'){
 			if(branchId.value){
 				postData.department.hospital.id = branchId.value
 			}
@@ -118,6 +118,17 @@
     })
   }
   
+	function goBackPage(){
+		// goBack()
+		if(entranceType.value=='config'){
+			uni.reLaunch({
+			  url: `/pages/repair/config?type=selectDept`
+			})
+		}else{
+			goBack()
+		}
+	}
+	
   // 点击
   function clickItem(data){
 		if(entranceType.value=='repair'){
@@ -144,6 +155,31 @@
 			uni.navigateTo({
 			  url: '/pages/repair/rapidRepNext'
 			})
+		}else if(entranceType.value=='config'){
+			let query = {
+				dept:null,
+				departmentName:null,
+				branch:branchId.value
+			}
+			let configNewData = uni.getStorageSync('configData')
+			if(configNewData){
+				let parseData = JSON.parse(configNewData)
+				query.dept = data.id//报修科室
+				query.departmentName = data.dept//报修科室
+				// parseData.dataType = true
+				let configData = {
+					...parseData,
+					...query
+				}
+				uni.setStorageSync('configData',JSON.stringify(configData))
+				uni.reLaunch({
+				  url: `/pages/repair/config?type=selectDept`
+				})
+			}else{
+				query.dept = data.id//报修科室
+				query.departmentName = data.dept//报修科室
+				uni.setStorageSync('configData',JSON.stringify(query))
+			}
 		}else{
 			dataInfo.incidentData.department = data;
 			incidentBuildStore.setIncidentBuildData(dataInfo.incidentData, incidentBuildStore.incidentBuild.type, incidentBuildStore.incidentBuild.sign);