xg

CallCenterWeb.UI/RMYY/src/views/faultRepairManagement/repairList/index.vue

@@ -443,7 +443,7 @@
     <el-dialog :visible.sync="dialogdept" title="转基建">
       <el-form ref="redeploydeptForm" :model="redeploydeptForm" :rules="rules" label-width="100px">
         <el-form-item label="科室" prop="ToDept">
-          <select-dept-tree :deptparam="deptidArr1" v-model="redeploydeptForm.ToDept" @post-deptid="getDeptid1" />
+          <select-gzbx-dept-tree :deptparam="deptidArr1" v-model="redeploydeptForm.ToDept" @post-deptid="getDeptid1" />
         </el-form-item>
         <el-form-item label="人员" prop="ToUserCode">
           <el-select v-model="redeploydeptForm.ToUserCode" clearable filterable placeholder="请选择人员"
@@ -565,7 +565,8 @@
   } from "@/api/commonAPI";
   import fieldDATA from "@/utils/fieldsData.js";
   import selectOrderTypeTwo from "@/components/context/commonSelect/selectOrderTypeTwo.vue";
-  import addDefinedList from "@/components/context/addDefinedList";
+  import addDefinedList from "@/components/context/addDefinedList";
+  import selectGzbxDeptTree from "@/components/context/commonSelect/selectGzbxDeptTree.vue";
   import {
     getMaintenancerList,
     postTaskOrders,
@@ -596,7 +597,8 @@
     name: "RepairList",
     components: {
       Pagination,
-      selectOrderTypeTwo,
+      selectOrderTypeTwo,
+      selectGzbxDeptTree
     },
     data() {
       return {
@@ -874,7 +876,12 @@
             deptid: id, // 字典管理的工单标识
           };
           GetPerson(params).then((res) => {
-            this.deptUserArr = res.rows;
+            this.deptUserArr = res.rows;
+            if(this.dialogdept == true){//转基建默认第一个
+              if(this.deptUserArr.length>0){
+                this.redeploydeptForm.ToUserCode = this.deptUserArr[0]
+              }
+            }
           });
           resolve();
         });
@@ -1254,46 +1261,46 @@
         this.dialogdept = true;
         this.redeploydeptForm.WorkOrderCode = code;
         //清空
-        this.deptidArr1 = []
-        this.redeploydeptForm.ToDept = ""
-        this.redeploydeptForm.ToUserCode = ""
-        //获取配置信息
-        if (this.$store.getters.workTypeMap[parseInt(type)]) {
-          const autoData = JSON.parse(
-            this.$store.getters.workTypeMap[parseInt(type)].autoDept || "[]"
-          );
-          const applyHos = this.$store.getters.deptmap[parseInt(applyid)].ids[0];
-          this.applyHos = applyHos
-          console.log(autoData,applyHos,'autoDataapplyHos')
-          if (!autoData || autoData[0] == null) {
-            // 没有配置信息['4005','89']['1','6']
-            this.deptidArr1 = ['1','6']
-            this.redeploydeptForm.ToDept = this.deptidArr1[this.deptidArr1.length-1]
-            this.getDeptman(this.deptidArr1[this.deptidArr1.length-1]);
-            return;
-          }
-          var hosall = [];
-          for (var i = 0; i < autoData.length; i++) {
-            hosall.push(autoData[i].autoyq);
-          }
-          for (var i = 0; i < autoData.length; i++) {
-            if (autoData[i].autoyq == applyHos) {
-              //有院区
-              this.deptidArr1 =
-                this.$store.getters.deptmap[parseInt(autoData[i].autodept)].ids;
-              this.redeploydeptForm.ToDept = autoData[i].autodept;
-              this.getDeptman(autoData[i].autodept);
-              this.redeploydeptForm.ToUserCode = autoData[i].autousercode;
-            } else if (autoData[i].autoyq == "0" && hosall.indexOf(applyHos) < 0) {
-              //全部
-              this.deptidArr1 =
-                this.$store.getters.deptmap[parseInt(autoData[i].autodept)].ids;
-              this.redeploydeptForm.ToDept = autoData[i].autodept;
-              this.getDeptman(autoData[i].autodept);
-              this.redeploydeptForm.ToUserCode = autoData[i].autousercode;
-            }
-          }
-        }
+        // this.deptidArr1 = []
+        // this.redeploydeptForm.ToDept = ""
+        // this.redeploydeptForm.ToUserCode = ""
+        // //获取配置信息
+        // if (this.$store.getters.workTypeMap[parseInt(type)]) {
+        //   const autoData = JSON.parse(
+        //     this.$store.getters.workTypeMap[parseInt(type)].autoDept || "[]"
+        //   );
+        //   const applyHos = this.$store.getters.deptmap[parseInt(applyid)].ids[0];
+        //   this.applyHos = applyHos
+        //   console.log(autoData,applyHos,'autoDataapplyHos')
+        //   if (!autoData || autoData[0] == null) {
+        //     // 没有配置信息['4005','89']['1','6']
+        //     this.deptidArr1 = ['1','6']
+        //     this.redeploydeptForm.ToDept = this.deptidArr1[this.deptidArr1.length-1]
+        //     this.getDeptman(this.deptidArr1[this.deptidArr1.length-1]);
+        //     return;
+        //   }
+        //   var hosall = [];
+        //   for (var i = 0; i < autoData.length; i++) {
+        //     hosall.push(autoData[i].autoyq);
+        //   }
+        //   for (var i = 0; i < autoData.length; i++) {
+        //     if (autoData[i].autoyq == applyHos) {
+        //       //有院区
+        //       this.deptidArr1 =
+        //         this.$store.getters.deptmap[parseInt(autoData[i].autodept)].ids;
+        //       this.redeploydeptForm.ToDept = autoData[i].autodept;
+        //       this.getDeptman(autoData[i].autodept);
+        //       this.redeploydeptForm.ToUserCode = autoData[i].autousercode;
+        //     } else if (autoData[i].autoyq == "0" && hosall.indexOf(applyHos) < 0) {
+        //       //全部
+        //       this.deptidArr1 =
+        //         this.$store.getters.deptmap[parseInt(autoData[i].autodept)].ids;
+        //       this.redeploydeptForm.ToDept = autoData[i].autodept;
+        //       this.getDeptman(autoData[i].autodept);
+        //       this.redeploydeptForm.ToUserCode = autoData[i].autousercode;
+        //     }
+        //   }
+        // }
       },
       redeployZuzhang(code) {
         this.getReason("ZUZHANG");

CallCenterWeb.UI/RMYYAPP/pages/myTask/repairList/addRepair/pageData.js

@@ -45,6 +45,15 @@ export default {
 			}
 		})
 	},
+	getDetRepair(fn){
+		let deptDataTree
+		http.get("Department/GetTreeListNew").then((res)=>{
+			if(res.state.toLowerCase() ==="success"){
+				deptDataTree = filterDepartTreeDatas(res.data,0,-1,'')
+				fn(deptDataTree,res.data)
+			}
+		})
+	},
 	//标本信息
 	getBB(str,fn){
 		let bbdata = []

CallCenterWeb.UI/RMYYAPP/pages/myTask/repairList/repairDetail/tranferDetail/tranferDetail.vue

@@ -47,6 +47,15 @@
 		onLoad(option) {
 			this.getHosptallist() // 院区
 			this.getFontSizeValue = uni.getStorageSync('fontSizeValue')+'rem'
+			this.state = option.state
+			this.workorderid = option.wid
+			console.log(option.state)
+			if(option.state == 'trunWork'){
+				pageData.getDetRepair((res,list) => {
+					this.tranformDepartList = res
+				})
+				return
+			}
 			pageData.getDet((res,list) => {
 				this.tranformDepartList = res
 				//默认-清空
@@ -100,9 +109,7 @@
 						}
 					}
 				})
-			})		
-			this.state = option.state
-			this.workorderid = option.wid			
+			})						
 		},
 		methods: {
 			getTextByCode(code){
@@ -144,9 +151,15 @@
 					pageData.getApplicant(e.value.split('_')[1], (res,data,candidates) => {
 						this.tranforPeopleList = res
 						this.candidates = candidates
+						//转基建默认第一个
+						if(this.state == 'trunWork'){
+							console.log(this.tranforPeopleList,'this.tranforPeopleList')
+							this.tranforPeopleName = this.getTextByCode(this.tranforPeopleList[0].value)
+							this.tranforPeople = this.tranforPeopleName
+						}
 					})
 				}
-				
+			    
 			},
 			departSearchTrue(e){
 				this.tranformDepart = e.value