默认指派

CallCenterWeb.UI/RMYY/src/components/button/orderList.vue

@@ -639,7 +639,7 @@
           EvaluateContent: ''
         },
         transferForm: {
-          todept: 0,
+          todept: '',
           tousercode: ''
         },
         zhddtransferForm: {
@@ -871,60 +871,143 @@
         this.fid = row.F_ID
         this.rowdata = row
         if (name === 'zhipai') {
-          const deptid = this.$store.getters.workTypeMap[parseInt(row.F_SonType)].autoDept
-          const typeArr = this.$store.getters.workTypeMap[parseInt(row.F_SonType)].ids
-          const worktypeInfo = this.$store.getters.workTypeMap[parseInt(typeArr[1])].tag
-          const assignDeptArr = this.$store.getters.deptmap[parseInt(row.F_ProposerDept)].ids
-          console.log(deptid,worktypeInfo, assignDeptArr)
-          if (worktypeInfo != 'gzbx_jjhq') {
-            if(deptid){
-              this.transferForm.todept = deptid
-              this.deptidArr = this.$store.getters.deptmap[parseInt(deptid)].ids
-              this.getClassUser(deptid)
-            }
-          }
-          if ((worktypeInfo == 'gzbx_jjhq' && assignDeptArr[0] != '1') && (worktypeInfo == 'gzbx_jjhq' && assignDeptArr[
-              0] != '4005')) {
-            if (assignDeptArr[0] == '2') {
-              this.getDeptByCode(this.deptMents, 'fenyuanqu')
-            }
-            if (assignDeptArr[0] == '3') {
-              this.getDeptByCode(this.deptMents, 'xiyuanqu')
-            }
-            if (assignDeptArr[0] == '4004') {
-              this.getDeptByCode(this.deptMents, 'JJHQ_DYQBZZ')
+          //清空
+          this.deptidArr = []
+          this.repairman = []
+          this.transferForm.tousercode = ''
+          this.dialogStatus.dialog_zhipai = true
+          //获取指派配置
+          const autoString = this.$store.getters.workTypeMap[parseInt(row.F_SonType)].autoDept
+          if(autoString){
+            const autoData = JSON.parse(this.$store.getters.workTypeMap[parseInt(row.F_SonType)].autoDept)
+            const applyHos = this.$store.getters.deptmap[parseInt(row.F_ProposerDept)].ids[0]
+            console.log(autoData,applyHos)
+            if(!autoData){
+              return
             }
-            if (assignDeptArr[0] == '4006') {
-              this.getDeptByCode(this.deptMents, 'JJHQ_NYQBZZ')
+            //院区id遍历
+            for(var i = 0;i<autoData.length;i++){
+              if(autoData[i].autoyq == applyHos){//有院区
+                this.deptidArr = this.$store.getters.deptmap[parseInt(autoData[i].autodept)].ids
+                this.transferForm.todept = autoData[i].autodept
+                this.getClassUser(autoData[i].autodept)
+                this.transferForm.tousercode = autoData[i].autousercode
+                return;
+              }else if(autoData[i].autoyq == '0'){//全部
+                this.deptidArr = this.$store.getters.deptmap[parseInt(autoData[i].autodept)].ids
+                this.transferForm.todept = autoData[i].autodept
+                this.getClassUser(autoData[i].autodept)
+                this.transferForm.tousercode = autoData[i].autousercode
+              }
             }
-            if (assignDeptArr[0] == '4008') {
-              this.getDeptByCode(this.deptMents, 'JJHQ_BYQBZZ')
+          }
+
+          // const deptid = this.$store.getters.workTypeMap[parseInt(row.F_SonType)].autoDept
+          // const typeArr = this.$store.getters.workTypeMap[parseInt(row.F_SonType)].ids
+          // const worktypeInfo = this.$store.getters.workTypeMap[parseInt(typeArr[1])].tag
+          // const assignDeptArr = this.$store.getters.deptmap[parseInt(row.F_ProposerDept)].ids
+          // console.log(deptid,worktypeInfo, assignDeptArr)
+          // if (worktypeInfo != 'gzbx_jjhq') {
+          //   if(deptid){
+          //     this.transferForm.todept = deptid
+          //     this.deptidArr = this.$store.getters.deptmap[parseInt(deptid)].ids
+          //     this.getClassUser(deptid)
+          //   }
+          // }
+          // if ((worktypeInfo == 'gzbx_jjhq' && assignDeptArr[0] != '1') && (worktypeInfo == 'gzbx_jjhq' && assignDeptArr[
+          //     0] != '4005')) {
+          //   if (assignDeptArr[0] == '2') {
+          //     this.getDeptByCode(this.deptMents, 'fenyuanqu')
+          //   }
+          //   if (assignDeptArr[0] == '3') {
+          //     this.getDeptByCode(this.deptMents, 'xiyuanqu')
+          //   }
+          //   if (assignDeptArr[0] == '4004') {
+          //     this.getDeptByCode(this.deptMents, 'JJHQ_DYQBZZ')
+          //   }
+          //   if (assignDeptArr[0] == '4006') {
+          //     this.getDeptByCode(this.deptMents, 'JJHQ_NYQBZZ')
+          //   }
+          //   if (assignDeptArr[0] == '4008') {
+          //     this.getDeptByCode(this.deptMents, 'JJHQ_BYQBZZ')
+          //   }
+          // } else {
+          //   if(deptid){
+          //     this.transferForm.todept = deptid
+          //     this.deptidArr = this.$store.getters.deptmap[parseInt(deptid)].ids
+          //     this.getClassUser(deptid)
+          //   }
+          // }
+        }
+        if (name === 'zhdd_zhipai') {
+          this.zhdddeptidArr = []
+          this.zhddrepairman = []
+          this.zhddtransferForm.DealMan = ''
+          this.dialogStatus.dialog_zhdd_zhipai = true
+          const autoString = this.$store.getters.workTypeMap[parseInt(row.F_SonType)].autoDept
+          if(autoString){
+            const autoData = JSON.parse(this.$store.getters.workTypeMap[parseInt(row.F_SonType)].autoDept)
+            const applyHos = this.$store.getters.deptmap[parseInt(row.F_ProposerDept)].ids[0]
+            console.log(autoData,applyHos)
+            if(!autoData){
+              return
             }
-          } else {
-            if(deptid){
-              this.transferForm.todept = deptid
-              this.deptidArr = this.$store.getters.deptmap[parseInt(deptid)].ids
-              this.getClassUser(deptid)
+            for(var i = 0;i<autoData.length;i++){
+              if(autoData[i].autoyq == applyHos){//有院区
+                this.zhdddeptidArr = this.$store.getters.deptmap[parseInt(autoData[i].autodept)].ids
+                this.zhddtransferForm.DealDept = autoData[i].autodept
+                this.getzhddClassUser(autoData[i].autodept)
+                this.zhddtransferForm.DealMan = autoData[i].autousercode
+                return;
+              }else if(autoData[i].autoyq == '0'){//全部
+                this.zhdddeptidArr = this.$store.getters.deptmap[parseInt(autoData[i].autodept)].ids
+                this.zhddtransferForm.DealDept = autoData[i].autodept
+                this.getzhddClassUser(autoData[i].autodept)
+                this.zhddtransferForm.DealMan = autoData[i].autousercode
+              }
             }
           }
+          // const zhdddeptid = this.$store.getters.workTypeMap[parseInt(row.F_SonType)].autoDept
+          // const zhddtypeArr = this.$store.getters.workTypeMap[parseInt(row.F_SonType)].ids
+          // this.zhddtransferForm.DealDept = zhdddeptid
+          // if (zhdddeptid) {
+          //   this.zhdddeptidArr = this.$store.getters.deptmap[parseInt(zhdddeptid)].ids
+          //   this.getzhddClassUser(zhdddeptid)
+          // }
         }
-        if (name === 'zhdd_zhipai') {
-          const zhdddeptid = this.$store.getters.workTypeMap[parseInt(row.F_SonType)].autoDept
-          const zhddtypeArr = this.$store.getters.workTypeMap[parseInt(row.F_SonType)].ids
-          this.zhddtransferForm.DealDept = zhdddeptid
-          if (zhdddeptid) {
-            this.zhdddeptidArr = this.$store.getters.deptmap[parseInt(zhdddeptid)].ids
-            this.getzhddClassUser(zhdddeptid)
+        if(name === 'dispatch_zhuanpai'){
+          this.dispatchdeptidArr = []
+          this.dispatchrepairman = []
+          this.dispatchtransferForm.DealMan = ''
+          this.dialogStatus.dialog_dispatch_zhuanpai = true
+          const autoString = this.$store.getters.workTypeMap[parseInt(row.F_WorkOrderCategory)].autoDept
+          if(autoString){
+            const autoData = JSON.parse(this.$store.getters.workTypeMap[parseInt(row.F_WorkOrderCategory)].autoDept)
+            const applyHos = this.$store.getters.deptmap[parseInt(row.F_ApplicationDept)].ids[0]
+            console.log(autoData,applyHos)
+            if(!autoData){
+              return
+            }
+            for(var i = 0;i<autoData.length;i++){
+              if(autoData[i].autoyq == applyHos){//有院区
+                this.dispatchdeptidArr = this.$store.getters.deptmap[parseInt(autoData[i].autodept)].ids
+                this.dispatchtransferForm.DealDept = autoData[i].autodept
+                this.getdispatchRepairman(autoData[i].autodept)
+                this.dispatchtransferForm.DealMan = autoData[i].autousercode
+                return;
+              }else if(autoData[i].autoyq == '0'){//全部
+                this.dispatchdeptidArr = this.$store.getters.deptmap[parseInt(autoData[i].autodept)].ids
+                this.dispatchtransferForm.DealDept = autoData[i].autodept
+                this.getdispatchRepairman(autoData[i].autodept)
+                this.dispatchtransferForm.DealMan = autoData[i].autousercode
+              }
+            }
           }
         }
         if (name === 'haocai' || name === 'pingjia') {
           this.getHaocai()
           this.getFileUrl()
         }
-        // if (name === 'pingjia') {
-        //   this.getFileUrl()
-
-        // }
         if (name === 'fanxiu') {
           this.getReason('FXYY')
         }
@@ -966,7 +1049,7 @@
           } else {
             this.dialogStatus[`dialog_${name}`] = true
           }
-        } else {
+        } else{
           if (
             this.dialogStatus[`dialog_${name}`].type &&
             this.dialogStatus[`dialog_${name}`].type === 'confirm'

CallCenterWeb.UI/RMYY/src/components/workOrder/dispatching/addOrEditDispatch.vue

@@ -463,17 +463,19 @@
 
         //默认
         if (this.orderTypeData.F_Type2) {
-          this.autodeptid = this.$store.getters.workTypeMap[parseInt(this.orderTypeData.F_Type2)].autoDept
-          if(this.autodeptid){
-            this.deptidArr1 = this.$store.getters.deptmap[parseInt(this.autodeptid)].ids
-            this.ruleForm.DealDept = this.$store.getters.workTypeMap[parseInt(this.orderTypeData.F_Type2)].autoDept
-            this.getClassUser(this.autodeptid)
-          }else{
-            this.deptidArr1 = []
-            this.repairman1 = []
-            this.ruleForm.DealDept = ''
-            this.ruleForm.clid = ''
-          }
+          this.getAuto()
+          // this.deptidArr1 = this.$store.getters.deptmap[parseInt(autodept)].ids
+          // this.autodeptid = this.$store.getters.workTypeMap[parseInt(this.orderTypeData.F_Type2)].autoDept
+          // if(this.autodeptid){
+          //   this.deptidArr1 = this.$store.getters.deptmap[parseInt(this.autodeptid)].ids
+          //   this.ruleForm.DealDept = this.$store.getters.workTypeMap[parseInt(this.orderTypeData.F_Type2)].autoDept
+          //   this.getClassUser(this.autodeptid)
+          // }else{
+          //   this.deptidArr1 = []
+          //   this.repairman1 = []
+          //   this.ruleForm.DealDept = ''
+          //   this.ruleForm.clid = ''
+          // }
         }
       }
     },
@@ -520,6 +522,31 @@
       // this.getUserData()
     },
     methods: {
+      getAuto(){
+        this.deptidArr1 = []
+        this.repairman1 = []
+        this.ruleForm.clid = ''
+        const autoData = JSON.parse(this.$store.getters.workTypeMap[parseInt(this.orderTypeData.F_Type2)].autoDept)
+        const applyHos = this.deptidArr[0]
+        console.log(autoData,applyHos)
+        if(!autoData){
+          return
+        }
+        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.ruleForm.DealDept = autoData[i].autodept
+            this.getClassUser(autoData[i].autodept)
+            this.ruleForm.clid = autoData[i].autousercode
+            return;
+          }else if(autoData[i].autoyq == '0'){//全部
+            this.deptidArr1 = this.$store.getters.deptmap[parseInt(autoData[i].autodept)].ids
+            this.ruleForm.DealDept = autoData[i].autodept
+            this.getClassUser(autoData[i].autodept)
+            this.ruleForm.clid = autoData[i].autousercode
+          }
+        }
+      },
       changeMuter(data) {
 
       },
@@ -548,12 +575,13 @@
           const data = res.data
           this.ruleForm.ApplicationDept = data.F_DeptId
           this.deptidArr = this.$store.getters.deptmap[parseInt(data.F_DeptId)].ids
+          this.getAuto()
           this.getRepairman(data.F_DeptId, 0)
           this.ruleForm.Applicant = data.F_UserCode
           this.ruleForm.phone = data.F_Telephone
           this.ruleForm.position = data.F_Location
           // this.ruleForm.toplace = data.F_Location
-        })
+        })      
       },
       getPlace() {
         GetDicValue('SDKS').then(res => {
@@ -576,10 +604,12 @@
         console.log(val)
       },
       getDeptid(data) {
+        this.deptidArr = data
         this.ruleForm.ApplicationDept = data[data.length - 1]
         this.ruleForm.Applicant = ''
         this.getRepairman(data[data.length - 1], 0)
         this.getDeptAddress(data[data.length - 1])
+        this.getAuto()
       },
       getDeptid1(data) {
         this.ruleForm.DealDept = data[data.length - 1]

CallCenterWeb.UI/RMYY/src/components/workOrder/information/addOrEditInfOrder.vue

@@ -519,21 +519,6 @@ export default {
             ].tag;
         }
       }
-      if (this.ruleForm.F_Type2) {
-        this.autodeptid =
-          this.$store.getters.workTypeMap[
-            parseInt(this.ruleForm.F_Type2)
-          ].autoDept;
-        if (this.autodeptid) {
-          this.deptidArr1 =
-            this.$store.getters.deptmap[parseInt(this.autodeptid)].ids;
-        }
-        this.ruleForm.clbm =
-          this.$store.getters.workTypeMap[
-            parseInt(this.ruleForm.F_Type2)
-          ].autoDept;
-      }
-      this.getClassUser(this.autodeptid, this.orderTypeData.F_Type2);
       if (this.worktypeInfo3 === "ywzx_jy") {
         this.zpdptname = "建议科室";
         this.zppername = "建议人";
@@ -546,16 +531,32 @@ export default {
         this.zpdptname = "表扬科室";
         this.zppername = "表扬人";
       }
-      if (
-        this.worktypeInfo3 === "ywzx_jy" ||
-        this.worktypeInfo3 === "ywzx_ts" ||
-        this.worktypeInfo3 === "ywzx_by" ||
-        this.worktypeInfo3 === "ywzx_jtyy" ||
-        this.worktypeInfo3 === "ywzx_zjyy" ||
-        this.worktypeInfo3 === "ywzx_ysfw"
-      ) {
-        this.ruleForm.opt = "3";
+      if (this.ruleForm.F_Type2) {
+        this.getAuto()
+        // this.autodeptid =
+        //   this.$store.getters.workTypeMap[
+        //     parseInt(this.ruleForm.F_Type2)
+        //   ].autoDept;
+        // if (this.autodeptid) {
+        //   this.deptidArr1 =
+        //     this.$store.getters.deptmap[parseInt(this.autodeptid)].ids;
+        // }
+        // this.ruleForm.clbm =
+        //   this.$store.getters.workTypeMap[
+        //     parseInt(this.ruleForm.F_Type2)
+        //   ].autoDept;
       }
+      // this.getClassUser(this.autodeptid, this.orderTypeData.F_Type2);
+      // if (
+      //   this.worktypeInfo3 === "ywzx_jy" ||
+      //   this.worktypeInfo3 === "ywzx_ts" ||
+      //   this.worktypeInfo3 === "ywzx_by" ||
+      //   this.worktypeInfo3 === "ywzx_jtyy" ||
+      //   this.worktypeInfo3 === "ywzx_zjyy" ||
+      //   this.worktypeInfo3 === "ywzx_ysfw"
+      // ) {
+      //   this.ruleForm.opt = "3";
+      // }
     },
   },
   computed: {
@@ -584,6 +585,25 @@ export default {
     this.getRelations();
   },
   methods: {
+    getAuto(){
+      this.deptidArr1 = []
+      this.repairman1 = []
+      this.ruleForm.clid = ''
+      const autoData = JSON.parse(this.$store.getters.workTypeMap[parseInt(this.orderTypeData.F_Type2)].autoDept)
+      console.log(autoData)
+      if(!autoData){
+        return
+      }
+      for(var i = 0;i<autoData.length;i++){
+        if(autoData[i].autoyq == '0'){//全部
+          this.ruleForm.opt = "3";
+          this.deptidArr1 = this.$store.getters.deptmap[parseInt(autoData[i].autodept)].ids
+          this.ruleForm.clbm = autoData[i].autodept
+          this.getClassUser(autoData[i].autodept)
+          this.ruleForm.clid = autoData[i].autousercode
+        }
+      }
+    },
     getOldMsg() {
       const params = {
         pageindex: 1,
@@ -648,10 +668,9 @@ export default {
 
       return index >= 0;
     },
-    getClassUser(id, type) {
-      console.log(id, "id");
-      if (!type) return;
-      this.ruleForm.clid = "";
+    getClassUser(id) {
+      // if (!type) return;
+      // this.ruleForm.clid = "";
       const params = {
         deptid: id,
       };
@@ -662,16 +681,16 @@ export default {
           this.repairman1 = res.rows;
         });
       }
-      if (this.includeType(type, "ywzx_zjyy")) {
-        this.ruleForm.clid = this.$store.getters.serverConfig.ZJYY_CODE;
-      }
-      if (this.includeType(type, "ywzx_ysfw")) {
-        console.log("ysfw");
-        this.ruleForm.clid = this.$store.getters.serverConfig.YSFW_CODE;
-      }
-      if (this.includeType(type, "ywzx_ts,ywzx_jy,ywzx_by")) {
-        this.ruleForm.clid = this.$store.getters.serverConfig.TSJYBY_CODE;
-      }
+      // if (this.includeType(type, "ywzx_zjyy")) {
+      //   this.ruleForm.clid = this.$store.getters.serverConfig.ZJYY_CODE;
+      // }
+      // if (this.includeType(type, "ywzx_ysfw")) {
+      //   console.log("ysfw");
+      //   this.ruleForm.clid = this.$store.getters.serverConfig.YSFW_CODE;
+      // }
+      // if (this.includeType(type, "ywzx_ts,ywzx_jy,ywzx_by")) {
+      //   this.ruleForm.clid = this.$store.getters.serverConfig.TSJYBY_CODE;
+      // }
     },
     changeName(id) {
       const twoTypeInfo = this.$store.getters.workTypeMap[parseInt(id)];

CallCenterWeb.UI/RMYY/src/components/workOrder/repairbase/addRepairbase.vue

@@ -249,62 +249,65 @@
       'orderTypeData.F_Type2': function() {
         this.ruleForm.repairOrderType = this.orderTypeData.F_Type2
         this.worktypeInfo = this.$store.getters.workTypeMap[parseInt(this.orderTypeData.type2Arr[0])].tag
-        this.autodeptid = this.$store.getters.workTypeMap[parseInt(this.ruleForm.repairOrderType)].autoDept
-        console.log(this.autodeptid , 'this.autodeptid ');
-        // console.log(this.ruleForm.repairOrderType,this.worktypeInfo,this.autodeptid)
-        if(this.worktypeInfo != 'gzbx_jjhq'){
-          this.ruleForm.assignDepart = this.$store.getters.workTypeMap[parseInt(this.ruleForm.repairOrderType)].autoDept
-          this.assignArr = this.$store.getters.deptmap[parseInt(this.autodeptid)].ids
-          this.getClassUser()
-        }
-        if((this.worktypeInfo == 'gzbx_jjhq' && this.deptidArr[0] != '1') && (this.worktypeInfo == 'gzbx_jjhq' && this.deptidArr[0] != '4005')){//基建类申请人不是总院
-          console.log(123123);
-          if(this.deptidArr[0] == '2'){//2分院3西院4004东院区4006南院区4008北院区
-            this.getDeptByCode(this.deptMents,'fenyuanqu')
-          }
-          if(this.deptidArr[0] == '3'){//2分院3西院
-            this.getDeptByCode(this.deptMents,'xiyuanqu')
-          }
-          if(this.deptidArr[0] == '4004'){//4004东院区
-            this.getDeptByCode(this.deptMents,'JJHQ_DYQBZZ')
-          }
-          if(this.deptidArr[0] == '4006'){//4006南院区
-            this.getDeptByCode(this.deptMents,'JJHQ_NYQBZZ')
-          }
-          if(this.deptidArr[0] == '4008'){//4008北院区
-            this.getDeptByCode(this.deptMents,'JJHQ_BYQBZZ')
-          }
-        }else{
-          console.log(1333333123);
-          this.ruleForm.assignDepart = this.$store.getters.workTypeMap[parseInt(this.ruleForm.repairOrderType)].autoDept
-          this.assignArr = this.$store.getters.deptmap[parseInt(this.autodeptid)].ids
-          this.getClassUser()
+        // this.autodeptid = this.$store.getters.workTypeMap[parseInt(this.ruleForm.repairOrderType)].autoDept
+        //默认
+        if(this.orderTypeData.F_Type2){
+          this.getAuto()
         }
+        // console.log(this.ruleForm.repairOrderType,this.worktypeInfo,this.autodeptid)
+        // if(this.worktypeInfo != 'gzbx_jjhq'){
+        //   this.ruleForm.assignDepart = this.$store.getters.workTypeMap[parseInt(this.ruleForm.repairOrderType)].autoDept
+        //   this.assignArr = this.$store.getters.deptmap[parseInt(this.autodeptid)].ids
+        //   this.getClassUser()
+        // }
+        // if((this.worktypeInfo == 'gzbx_jjhq' && this.deptidArr[0] != '1') && (this.worktypeInfo == 'gzbx_jjhq' && this.deptidArr[0] != '4005')){//基建类申请人不是总院
+        //   console.log(123123);
+        //   if(this.deptidArr[0] == '2'){//2分院3西院4004东院区4006南院区4008北院区
+        //     this.getDeptByCode(this.deptMents,'fenyuanqu')
+        //   }
+        //   if(this.deptidArr[0] == '3'){//2分院3西院
+        //     this.getDeptByCode(this.deptMents,'xiyuanqu')
+        //   }
+        //   if(this.deptidArr[0] == '4004'){//4004东院区
+        //     this.getDeptByCode(this.deptMents,'JJHQ_DYQBZZ')
+        //   }
+        //   if(this.deptidArr[0] == '4006'){//4006南院区
+        //     this.getDeptByCode(this.deptMents,'JJHQ_NYQBZZ')
+        //   }
+        //   if(this.deptidArr[0] == '4008'){//4008北院区
+        //     this.getDeptByCode(this.deptMents,'JJHQ_BYQBZZ')
+        //   }
+        // }else{
+        //   console.log(1333333123);
+        //   this.ruleForm.assignDepart = this.$store.getters.workTypeMap[parseInt(this.ruleForm.repairOrderType)].autoDept
+        //   this.assignArr = this.$store.getters.deptmap[parseInt(this.autodeptid)].ids
+        //   this.getClassUser()
+        // }
       },
-      'deptidArr':function(){
-        if((this.worktypeInfo == 'gzbx_jjhq' && this.deptidArr[0] != '1') && (this.worktypeInfo == 'gzbx_jjhq' && this.deptidArr[0] != '4005')){//基建类申请人不是总院
-          if(this.deptidArr[0] == '2'){//2分院3西院
-            this.getDeptByCode(this.deptMents,'fenyuanqu')
-          }
-          if(this.deptidArr[0] == '3'){//2分院3西院
-            this.getDeptByCode(this.deptMents,'xiyuanqu')
-          }
-          if(this.deptidArr[0] == '4004'){//4004东院区
-            this.getDeptByCode(this.deptMents,'JJHQ_DYQBZZ')
-          }
-          if(this.deptidArr[0] == '4006'){//4006南院区
-            this.getDeptByCode(this.deptMents,'JJHQ_NYQBZZ')
-          }
-          if(this.deptidArr[0] == '4008'){//4008北院区
-            this.getDeptByCode(this.deptMents,'JJHQ_BYQBZZ')
-          }
-        }else{
-          // console.log(this.$store.getters.deptmap[parseInt(this.autodeptid)].ids,'9999')
-          this.assignArr = this.$store.getters.deptmap[parseInt(this.autodeptid)].ids
-          this.ruleForm.assignDepart = this.$store.getters.workTypeMap[parseInt(this.ruleForm.repairOrderType)].autoDept
-          this.getClassUser()
-        }
-      }
+      // 'deptidArr':function(){
+      //   if((this.worktypeInfo == 'gzbx_jjhq' && this.deptidArr[0] != '1') && (this.worktypeInfo == 'gzbx_jjhq' && this.deptidArr[0] != '4005')){//基建类申请人不是总院
+      //     if(this.deptidArr[0] == '2'){//2分院3西院
+      //       this.getDeptByCode(this.deptMents,'fenyuanqu')
+      //     }
+      //     if(this.deptidArr[0] == '3'){//2分院3西院
+      //       this.getDeptByCode(this.deptMents,'xiyuanqu')
+      //     }
+      //     if(this.deptidArr[0] == '4004'){//4004东院区
+      //       this.getDeptByCode(this.deptMents,'JJHQ_DYQBZZ')
+      //     }
+      //     if(this.deptidArr[0] == '4006'){//4006南院区
+      //       this.getDeptByCode(this.deptMents,'JJHQ_NYQBZZ')
+      //     }
+      //     if(this.deptidArr[0] == '4008'){//4008北院区
+      //       this.getDeptByCode(this.deptMents,'JJHQ_BYQBZZ')
+      //     }
+      //   }else{
+      //     // console.log(this.$store.getters.deptmap[parseInt(this.autodeptid)].ids,'9999')
+      //     this.assignArr = this.$store.getters.deptmap[parseInt(this.autodeptid)].ids
+      //     this.ruleForm.assignDepart = this.$store.getters.workTypeMap[parseInt(this.ruleForm.repairOrderType)].autoDept
+      //     this.getClassUser()
+      //   }
+      // }
     },
     computed: {
       ...mapGetters([
@@ -332,6 +335,31 @@
       }
     },
     methods: {
+      getAuto(){
+        this.assignArr = []
+        this.assignman = []
+        this.ruleForm.assignMant = ''
+        const autoData = JSON.parse(this.$store.getters.workTypeMap[parseInt(this.orderTypeData.F_Type2)].autoDept)
+        const applyHos = this.deptidArr[0]
+        console.log(autoData,applyHos)
+        if(!autoData){
+          return
+        }
+        for(var i = 0;i<autoData.length;i++){
+          if(autoData[i].autoyq == applyHos){//有院区
+            this.assignArr = this.$store.getters.deptmap[parseInt(autoData[i].autodept)].ids
+            this.ruleForm.assignDepart = autoData[i].autodept
+            this.getClassUserArr(autoData[i].autodept)
+            this.ruleForm.assignMant = autoData[i].autousercode
+            return;
+          }else if(autoData[i].autoyq == '0'){//全部
+            this.assignArr = this.$store.getters.deptmap[parseInt(autoData[i].autodept)].ids
+            this.ruleForm.assignDepart = autoData[i].autodept
+            this.getClassUserArr(autoData[i].autodept)
+            this.ruleForm.assignMant = autoData[i].autousercode
+          }
+        }
+      },
       getUserData() {
         if(!this.usercodeSearch){
           return;
@@ -343,6 +371,7 @@
           const data = res.data
           this.ruleForm.repairDeptid = data.F_DeptId
           this.deptidArr = this.$store.getters.deptmap[parseInt(data.F_DeptId)].ids
+          this.getAuto()
           this.getRepairman(data.F_DeptId, 0)
           this.ruleForm.repairmanid = data.F_UserCode
           this.ruleForm.repairmanphone = data.F_Telephone
@@ -357,13 +386,11 @@
         this.ruleForm.repairmanid = ''
         this.getRepairman(this.ruleForm.repairDeptid, 0)
         this.getDeptAddress(data[data.length - 1])
+        this.getAuto()
       },
       geAssigntDeptid(data) {
         this.ruleForm.assignDepart = data[data.length - 1]
-        // this.assignArr = data
-        // this.ruleForm.assignMant = ''
         this.getClassUserArr(data[data.length - 1])
-        // this.getRepairman(this.ruleForm.assignDepart, 1)
       },
       getDeptAddress(id){
         getTypeDetail(id).then(res=>{

CallCenterWeb.UI/RMYY/src/views/systemSetup/sysSetting/orderTypeManage/addOrEditOrderType.vue

@@ -34,7 +34,7 @@
           </el-select>
           <el-cascader ref="cascader" :span="24" v-model="item.autodept" :options="orderData" :props="defaultProps"
             style="width: 30%;" placeholder="请选择科室" filterable clearable @change="(autodept)=>handleChangeDept(autodept,index)"/>
-          <el-select v-model="item.autousercode" filterable placeholder="请选择人员" style="width: 30%">
+          <el-select v-model="item.autousercode" filterable clearable placeholder="请选择人员" style="width: 30%">
             <el-option v-for="itemper in autolist[index].personarr" :key="itemper.usercode" :label="itemper.username" :value="itemper.usercode" />
           </el-select>
           <el-button v-if="index==0" type="primary" icon="el-icon-plus" circle @click="addItem()"></el-button>
@@ -226,13 +226,17 @@
       },
       submitForm() {
         var autoarr = []
-        this.autolist.find(item=>{
-          autoarr.push({
-            autoyq: item.autoyq,
-            autodept: item.autodept,
-            autousercode: item.autousercode,
+        if(this.autolist && this.autolist[0].autoyq && this.autolist[0].autodept){
+          this.autolist.find(item=>{
+            autoarr.push({
+              autoyq: item.autoyq,
+              autodept: item.autodept,
+              autousercode: item.autousercode,
+            })
           })
-        })
+        }else{
+          autoarr = ''
+        }
         console.log(autoarr)
         // return;
         this.$refs.ruleForm.validate((valid) => {
@@ -300,7 +304,7 @@
             this.ruleForm.F_Identification = res.identification
             this.ruleForm.F_CanReplayCount = res.canreplaycount
             this.ruleForm.F_CanUrgeCount = res.canurgecount
-            if (res.autodept) {
+            if (res.autodept && JSON.parse(res.autodept)[0].autoyq) {
               this.autolist = JSON.parse(res.autodept)
               console.log(JSON.parse(res.autodept))
               for(var i = 0;i<this.autolist.length;i++){

CallCenterWeb.UI/RMYYAPP/pages/components/orderSelect/orderSelect.vue

@@ -12,7 +12,8 @@
 				WorkOrderCategory: '',
 				orderList: [],
 				identification: '',
-				dataOrderType: []
+				dataOrderType: [],
+				autoData:[]
 			}
 		},
 		props: {
@@ -55,11 +56,18 @@
 			},
 			nodeclick(data) {
 				this.order = data.value
-				console.log(this.orderList)
+				// console.log(this.orderList)
 				this.identification = this.$mHelper.getIdentification(this.orderList,data.value)
-				console.log(this.identification )
-				console.log(data, 'data')
-				this.$emit('post-select-data',data.value,data.id,data.orderType,this.identification, data.text)
+				// console.log(this.identification )
+				// console.log(data, 'data')
+				this.$http.get("GongDanType/GetModule", {mId:data.value}).then((response) => {
+					if (response.state.toLowerCase() === "success") {
+						if(response.data.autodept!=''){
+							this.autoData = JSON.parse(response.data.autodept)
+				            this.$emit('post-select-data',data.value,data.id,data.orderType,this.identification, data.text,this.autoData)
+						}
+					}
+				})
 			},
 			popupclosed() {
 				this.WorkOrderCategory = this.order

CallCenterWeb.UI/RMYYAPP/pages/login/login.vue

@@ -25,6 +25,7 @@
 	import CryptoJS from '@/static/js/crypto-js/crypto-js.js'
 	import md5 from '@/static/js/md5/md5.js'
 	import { encrypt, decrypt } from "@/utils/jsencrypt";
+	import pageData from '../myTask/repairList/addRepair/pageData.js'
 	// import JSEncrypt from '@/static/js/JSEncrypt/JSEncrypt.js'
 	export default {
 		data() {
@@ -47,6 +48,7 @@
 
 		methods: {
 			startLogin(e) {
+				this.saveDept()
 				//登录
 				if (this.isRotate) {
 					//判断是否加载中，避免重复点击请求
@@ -111,6 +113,15 @@
 				uni.navigateTo({
 					url: '/pages/register/register'
 				})
+			},
+			saveDept(){
+				pageData.getDet((res, data) => {
+					// this.departList = data
+					// this.deptDataTree = res
+					// this.assignedDepartData = res
+					window.localStorage.setItem('deptTreeData',JSON.stringify(res))
+					window.localStorage.setItem('deptAllList',JSON.stringify(data))
+				})
 			}
 			
 		}

CallCenterWeb.UI/RMYYAPP/pages/myTask/comDispatch/comDispatchDetail/comDispatchDetail.vue

@@ -124,7 +124,7 @@
 			<view>
 				<text class="operationButtonTitle">操作</text>
 				<buttonsComponents class="buttons" :order-button-data="orderButtonData" :wid="workorderid"
-					:orderType="detailContentData.F_WorkOrderCategory" :departid="departid"
+					:orderType="workOrdertype" :departid="departid" :applicationDept="applicationDept"
 					:maintenancer="$mHelper.findUserName(userCodeList,detailContentData.F_Maintenancer) " />
 			</view>
 		</view>
@@ -221,6 +221,8 @@
 				detailContentData: {}, // 详情内容
 				orderButtonData: [],
 				departid: '',
+				applicationDept:'',
+				workOrdertype:'',
 				evaluateDate: [], // 评价
 				orderProcessDate: [], // 工单流程
 				workOrderButton: [], // 工单按钮权限
@@ -262,10 +264,11 @@
 					}
 				})
 			}
-			pageData.getDet((res, data) => {
-				console.log(data)
-				this.departList = data
-			})
+			// pageData.getDet((res, data) => {
+			// 	console.log(data)
+			// 	this.departList = data
+			// })
+			this.departList = JSON.parse(window.localStorage.getItem('deptAllList'))
 			pageData.getApplicant('', (res) => {
 				this.userCodeList = res
 			})
@@ -359,6 +362,9 @@
 					if (response.state.toLowerCase() === "success") {
 						if (type == 0) {
 							this.detailContentData = response.data[0]
+							console.log(this.detailContentData.F_WorkOrderCategory,'88999')
+							this.workOrdertype = this.detailContentData.F_WorkOrderCategory
+							this.applicationDept = this.detailContentData.F_ApplicationDept
 						} else if (type == 1) {
 							this.orderProcessDate = []
 							response.data.forEach(v => {

CallCenterWeb.UI/RMYYAPP/pages/myTask/repairList/addRepair/addRepair.vue

@@ -5,22 +5,25 @@
 			<!-- 基础表单校验 -->
 			<uni-forms ref="valiForm" :rules="rules" :modelValue="valiFormData">
 				<uni-forms-item label="工单类别" required name="WorkOrderCategory">
-					<order-select :orderType="valiFormData.WorkOrderCategory" @post-select-data="postSelectData" :typeid="3000"></order-select>
-				</uni-forms-item> 
-				<uni-forms-item label="设备资产编码" required  name="epCode" v-show="showsb==true">
+					<order-select :orderType="valiFormData.WorkOrderCategory" @post-select-data="postSelectData"
+						:typeid="3000"></order-select>
+				</uni-forms-item>
+				<uni-forms-item label="设备资产编码" required name="epCode" v-show="showsb==true">
 					<uni-easyinput v-model="valiFormData.epCode" placeholder="请输入设备资产编码" />
 				</uni-forms-item>
 				<uni-forms-item label="报修内容" required name="Content">
 					<uni-easyinput type="textarea" v-model="valiFormData.Content" placeholder="请输入报修内容" />
 				</uni-forms-item>
 				<uni-forms-item label="报修科室" required name="ApplicationDept">
-					<uni-data-picker :showSearch= "showSearch" placeholder="请选择报修科室" :localdata="deptDataTree" v-model="valiFormData.ApplicationDept" @nodeclick="deptNodeclick">
+					<uni-data-picker :showSearch="showSearch" placeholder="请选择报修科室" :localdata="deptDataTree"
+						v-model="valiFormData.ApplicationDept" @nodeclick="deptNodeclick">
 					</uni-data-picker>
 				</uni-forms-item>
 				<uni-forms-item label="报修人" required name="Applicant">
-					<uni-combox :candidates="candidates" placeholder="输入选择报修人"  @input="handleBX" v-model="valiFormData.ApplicantName"></uni-combox>
+					<uni-combox :candidates="candidates" placeholder="输入选择报修人" @input="handleBX"
+						v-model="valiFormData.ApplicantName"></uni-combox>
 				</uni-forms-item>
-				<uni-forms-item label="报修电话"  name="Applicantsphone">
+				<uni-forms-item label="报修电话" name="Applicantsphone">
 					<uni-easyinput v-model="valiFormData.Applicantsphone" placeholder="请输入报修电话" />
 				</uni-forms-item>
 				<uni-forms-item label="联系电话" required name="Phone">
@@ -32,21 +35,24 @@
 				<uni-forms-item label="紧急程度" name="EmergencyTypes">
 					<uni-data-checkbox v-model="valiFormData.EmergencyTypes" :localdata="EmergencyTypesList" />
 				</uni-forms-item>
-				<uni-forms-item label="附件"  name="">
+				<uni-forms-item label="附件" name="">
 					<view class="example-body">
 						<upload @post-string-data="getImgData" :imgUrlList="imgUrlList"></upload>
 					</view>
 				</uni-forms-item>
 				<div v-show="isShowIsEnd">
-					<uni-forms-item label="下步流程"  name="IsEnd">
+					<uni-forms-item label="下步流程" name="IsEnd">
 						<uni-data-checkbox v-model="valiFormData.IsEnd" :localdata="stepData"></uni-data-checkbox>
 					</uni-forms-item>
-					<uni-forms-item label="指派部门" name="MaintenanceDept" v-show="valiFormData.IsEnd === 0" >
-						<uni-data-picker placeholder="请选择指派科室" :showSearch= "showSearch" :localdata="assignedDepartData" :readonly="readonly" v-model="valiFormData.MaintenanceDept" @nodeclick="maintenanceNodeclick">
+					<uni-forms-item label="指派部门" name="MaintenanceDept" v-show="valiFormData.IsEnd === 0">
+						<uni-data-picker placeholder="请选择指派科室" :showSearch="showSearch" :localdata="assignedDepartData"
+							:readonly="readonly" v-model="valiFormData.MaintenanceDept"
+							@nodeclick="maintenanceNodeclick">
 						</uni-data-picker>
 					</uni-forms-item>
-					<uni-forms-item label="指派人"  name="Maintenancer" v-show="valiFormData.IsEnd === 0">
-						<uni-combox :candidates="candidatesDesignate" placeholder="输入选择报修人"  @input="handleZP" v-model="valiFormData.MaintenancerName"></uni-combox>
+					<uni-forms-item label="指派人" name="Maintenancer" v-show="valiFormData.IsEnd === 0">
+						<uni-combox :candidates="candidatesDesignate" placeholder="输入选择报修人" @input="handleZP"
+							v-model="valiFormData.MaintenancerName"></uni-combox>
 					</uni-forms-item>
 				</div>
 			</uni-forms>
@@ -68,16 +74,17 @@
 
 	export default {
 		components: {
-			upload,orderSelect
+			upload,
+			orderSelect
 		},
 		data() {
 			return {
-				getFontSizeValue:'1rem',
-				showsb:false,
+				getFontSizeValue: '1rem',
+				showsb: false,
 				showSearch: true,
 				isShowIsEnd: false,
 				readonly: false,
-				disabledButton:false,
+				disabledButton: false,
 				// 校验表单数据
 				valiFormData: {
 					WorkOrderCategory: '', //工单类别
@@ -91,16 +98,16 @@
 					IsEnd: 0,
 					File: '', //	文件
 					MaintenanceDept: '', //	维修部门
-					Maintenancer: '' ,//	维修人
+					Maintenancer: '', //	维修人
 					MaintenancerName: '',
 					epCode: '',
 					EmergencyTypes: '一般'
-					
+
 				},
 				EmergencyTypesList: [{
 					text: '一般',
 					value: '一般'
-				},{
+				}, {
 					text: '紧急',
 					value: '紧急'
 				}],
@@ -120,7 +127,9 @@
 				orderApplicantData: [],
 				departList: [],
 				candidates: [],
-				candidatesDesignate:[],
+				candidatesDesignate: [],
+				hosptalList:[],
+				auto:[],
 				// 校验规则
 				rules: {
 					WorkOrderCategory: {
@@ -163,33 +172,35 @@
 			}
 		},
 		onLoad(option) {
-			this.getFontSizeValue = uni.getStorageSync('fontSizeValue')+'rem'
+			this.getHosptallist()
+			this.getFontSizeValue = uni.getStorageSync('fontSizeValue') + 'rem'
 			this.valiFormData.ApplicationDept = uni.getStorageSync("deptId")
-			pageData.getApplicant(uni.getStorageSync("deptId"), (res,data,candidates) => {
+			pageData.getApplicant(uni.getStorageSync("deptId"), (res, data, candidates) => {
 				this.candidates = candidates
 				this.ApplicantData = res
 				this.valiFormData.Applicant = uni.getStorageSync("userCode")
-				this.valiFormData.ApplicantName = this.$mHelper.findUserName(this.ApplicantData, uni.getStorageSync("userCode"))
+				this.valiFormData.ApplicantName = this.$mHelper.findUserName(this.ApplicantData, uni
+					.getStorageSync("userCode"))
 				this.orderApplicantData = data
 				const user = this.orderApplicantData.find((o) => {
 					return o.usercode === uni.getStorageSync("userCode").toString()
 				})
-				if(user) {
+				if (user) {
 					this.valiFormData.Applicantsphone = user.usertelphone
 					this.valiFormData.Phone = user.usertelphone
 				}
 			})
 			this.getLocation(uni.getStorageSync("userCode"))
 			// 维修员下步流程指派的时候只能指派给自己部门
-			if(uni.getStorageSync("roleCode") == 'GLY' || uni.getStorageSync("roleCode") == 'WXY') {
+			if (uni.getStorageSync("roleCode") == 'GLY' || uni.getStorageSync("roleCode") == 'WXY') {
 				this.isShowIsEnd = true
-				if(uni.getStorageSync("roleCode") == 'WXY') {
+				if (uni.getStorageSync("roleCode") == 'WXY') {
 					this.readonly = true
-					this.valiFormData.MaintenanceDept = uni.getStorageSync("deptId")
-					pageData.getPersonByDeptId(uni.getStorageSync("deptId"), (res,data,candidates) => {
+					// this.valiFormData.MaintenanceDept = uni.getStorageSync("deptId")
+					// pageData.getPersonByDeptId(uni.getStorageSync("deptId"), (res, data, candidates) => {
 						// this.candidates = candidates
-						this.candidatesDesignate = candidates
-						this.MaintenancerData = res
+						// this.candidatesDesignate = candidates
+						// this.MaintenancerData = res
 						// this.ApplicantData = res
 						// this.orderApplicantData = data
 						// this.valiFormData.Applicant = uni.getStorageSync("userCode")
@@ -201,45 +212,125 @@
 						// 	this.valiFormData.Phone = user.usertelphone
 						// }
 						// this.getLocation(this.valiFormData.Applicant)
-					})
+					// })
 				}
 			}
 			this.workorderid = option.wid
 			// 部门数据
-			pageData.getDet((res,data) => {
+			pageData.getDet((res, data) => {
 				this.departList = data
 				this.deptDataTree = res
-				console.log(this.departList)
 				this.assignedDepartData = res
 			})
-			if(this.workorderid) {
+			if (this.workorderid) {
 				this.getDetail()
 			}
 		},
 		watch: {
 			'departList': function() {
-				console.log(this.$mHelper.findParents(this.departList,this.valiFormData.ApplicationDept))
-				this.valiFormData.ApplicationDept = this.$mHelper.findParents(this.departList,this.valiFormData.ApplicationDept).split('/').length + '_'+ this.valiFormData.ApplicationDept
-				this.valiFormData.MaintenanceDept = this.$mHelper.findParents(this.departList,this.valiFormData.MaintenanceDept).split('/').length + '_'+ this.valiFormData.MaintenanceDept
+				console.log(this.$mHelper.findParents(this.departList, this.valiFormData.ApplicationDept))
+				this.valiFormData.ApplicationDept = this.$mHelper.findParents(this.departList, this.valiFormData
+					.ApplicationDept).split('/').length + '_' + this.valiFormData.ApplicationDept
+				// this.valiFormData.MaintenanceDept = this.$mHelper.findParents(this.departList, this.valiFormData
+				// 	.MaintenanceDept).split('/').length + '_' + this.valiFormData.MaintenanceDept
 			}
 		},
 		methods: {
+			// 获取院区数据
+			getHosptallist() {
+				const params = {
+					pageindex: 1,
+					pagesise: 10000
+				}
+				this.$http.get("Worepair/GetListyqRepairlist",params).then((res)=>{
+					if(res.state.toLowerCase() ==="success"){
+						this.hosptalList = res.rows
+					}
+				})
+			},
+			// 通过名字获取院区编号
+			getHosptalId(name) {
+				let id = 0;
+				this.hosptalList.forEach(v => {
+					if(v.T_Woname == name){
+						id = v.T_Woid
+					}
+				})
+				return id
+			},
 			// 工单类别
-			postSelectData(e,inf,orderType,biaoshi) {
-				console.log(e,inf,orderType,biaoshi)
-				if(biaoshi.indexOf('gzbx_sb') >= 0){
+			postSelectData(e, inf, orderType, biaoshi, text, auto) {
+				this.valiFormData.MaintenanceDept = ''
+				this.candidatesDesignate = []
+				this.MaintenancerData = []
+				this.valiFormData.Maintenancer = ''
+				this.valiFormData.MaintenancerName = ''
+				this.auto = auto
+				console.log(this.auto,'88888888899999999')
+				if (biaoshi.indexOf('gzbx_sb') >= 0) {
 					this.showsb = true
-				}else{
+				} else {
 					this.showsb = false
 				}
-				if(orderType == 2) {
+				if (orderType == 2) {
 					this.orderInf = inf
 				}
 				this.valiFormData.WorkOrderCategory = e
+				if(this.auto){					
+				    this.getAuto()
+				}
+			},
+			getAuto(){
+				//清空
+				this.valiFormData.MaintenanceDept = ''
+				this.candidatesDesignate = []
+				this.MaintenancerData = []
+				this.valiFormData.Maintenancer = ''
+				this.valiFormData.MaintenancerName = ''
+				//申请人院区
+				const applyHos = this.getHosptalId(this.$mHelper.findParents(this.departList,this.valiFormData.ApplicationDept.split('_')[1]).split('/')[0])
+				console.log(applyHos,'院区')
+				if(applyHos == 0){
+					return
+				}
+				//遍历
+				for (var i = 0; i < this.auto.length; i++) {
+					if (this.auto[i].autoyq == applyHos) {
+						var aotocode = this.auto[i].autousercode
+						this.valiFormData.MaintenanceDept = this.$mHelper.findParents(this.departList, this.auto[i].autodept)
+							.split('/').length + '_' + this.auto[i].autodept
+						pageData.getApplicant(this.auto[i].autodept, (res, data, candidates) => {
+							this.candidatesDesignate = candidates
+							this.MaintenancerData = res
+						    this.valiFormData.MaintenancerName = this.getTextByCode(aotocode)
+						    this.valiFormData.Maintenancer = aotocode
+						})				
+						return
+					} else if (this.auto[i].autoyq == '0') {
+						var aotocode = this.auto[i].autousercode
+						this.valiFormData.MaintenanceDept = this.$mHelper.findParents(this.departList, this.auto[i].autodept)
+							.split('/').length + '_' + this.auto[i].autodept
+						pageData.getApplicant(this.auto[i].autodept, (res, data, candidates) => {
+							this.candidatesDesignate = candidates
+							this.MaintenancerData = res
+							this.valiFormData.MaintenancerName = this.getTextByCode(aotocode)
+							this.valiFormData.Maintenancer = aotocode
+						})
+				
+					}
+				}
+			},
+			getTextByCode(code){
+				for(var i = 0;i<this.MaintenancerData.length;i++){
+					if(this.MaintenancerData[i].value == code){
+						return this.MaintenancerData[i].text
+					}
+				}
 			},
 			// 申请部门
 			deptNodeclick(e) {
-				if (e) {
+				if (e) {					
+					console.log(e)
 					this.valiFormData.ApplicationDept = e.value
 					pageData.getApplicant(e.value.split('_')[1], (res, data, candidates) => {
 						this.candidates = candidates
@@ -251,11 +342,14 @@
 					this.valiFormData.ApplicantName = ''
 					this.valiFormData.Phone = ''
 					this.getDeptLocation(e.value.split('_')[1])
+					this.getAuto()
 				}
 			},
 			//科室位置
-			getDeptLocation(id){
-				this.$http.get("Department/GetModel", {deptid:id}).then((response) => {
+			getDeptLocation(id) {
+				this.$http.get("Department/GetModel", {
+					deptid: id
+				}).then((response) => {
 					if (response.state.toLowerCase() === "success") {
 						this.valiFormData.PlaceOfRepair = response.data.F_Location
 					}
@@ -263,8 +357,8 @@
 			},
 			//指派部门
 			maintenanceNodeclick(e) {
-				if(e) {
-					this.valiFormData.MaintenanceDept= e.value
+				if (e) {
+					this.valiFormData.MaintenanceDept = e.value
 					pageData.getApplicant(e.value.split('_')[1], (res, data, candidates) => {
 						this.MaintenancerData = res
 						this.candidatesDesignate = candidates
@@ -273,20 +367,22 @@
 			},
 			//报修人
 			handleBX(res) {
-				let e = this.$mHelper.getValueByText(res,this.ApplicantData)
+				let e = this.$mHelper.getValueByText(res, this.ApplicantData)
 				this.valiFormData.Applicant = e
 				this.valiFormData.ApplicantName = res
 				const user = this.orderApplicantData.find((o) => {
 					return o.usercode === e.toString()
 				})
-				if(user) {
+				if (user) {
 					this.valiFormData.Applicantsphone = user.usertelphone
 					this.valiFormData.Phone = user.usertelphone
 				}
 			},
 			// 地址
 			getLocation(user) {
-				this.$http.get("UserAccount/GetModel", {usercode: user}).then((response) => {
+				this.$http.get("UserAccount/GetModel", {
+					usercode: user
+				}).then((response) => {
 					if (response.state.toLowerCase() === "success") {
 						this.valiFormData.PlaceOfRepair = response.data.F_Location
 					}
@@ -294,13 +390,15 @@
 			},
 			//指派人
 			handleZP(res) {
+				console.log(res)
 				this.valiFormData.MaintenancerName = res
-				this.valiFormData.Maintenancer = this.$mHelper.getValueByText(res,this.ApplicantData)
+				this.valiFormData.Maintenancer = this.$mHelper.getValueByText(res, this.MaintenancerData)
+				console.log(this.valiFormData.Maintenancer)
 			},
 			// 工单提交
 			submit(ref) {
 				this.disabledButton = true
-				if(this.clickImgState == 1) {
+				if (this.clickImgState == 1) {
 					this.valiFormData.File = this.$mHelper.getImgString(this.imgIdList)
 				}
 				// if(this.orderInf == 'gzbx_shebei' && !this.valiFormData.epCode) {
@@ -308,7 +406,7 @@
 				// 	return
 				// }
 				console.log(this.valiFormData.ApplicationDept.length)
-				
+
 				this.$refs[ref].validate().then(res => {
 					const params = {
 						WorkOrderCategory: this.valiFormData.WorkOrderCategory, // 工单类别
@@ -325,11 +423,13 @@
 						Maintenancer: this.valiFormData.Maintenancer, // 指派人
 						EmergencyTypes: this.valiFormData.EmergencyTypes
 					}
-					if(this.workorderid) {
+					if (this.workorderid) {
 						params.WorkOrderCode = this.workorderid
-						this.$mHelper.httpPost("FaultRepair/UpdateFaultRepairWorkOrder ", params, 1,res=>this.disabledButton=res)
-					}else{
-						this.$mHelper.httpPost("FaultRepair/AddFaultRepairWorkOrder", params, 1,res=>this.disabledButton=res)
+						this.$mHelper.httpPost("FaultRepair/UpdateFaultRepairWorkOrder ", params, 1, res => this
+							.disabledButton = res)
+					} else {
+						this.$mHelper.httpPost("FaultRepair/AddFaultRepairWorkOrder", params, 1, res => this
+							.disabledButton = res)
 					}
 				}).catch(err => {
 					this.disabledButton = false
@@ -339,7 +439,7 @@
 			// 上传图片
 			getImgData(data) {
 				this.clickImgState = 1
-				this.imgIdList= data
+				this.imgIdList = data
 			},
 			// 详情回显
 			getDetail() {
@@ -349,30 +449,31 @@
 				}
 				this.$http.get("FaultRepair/GetWorkOrder", params).then((response) => {
 					if (response.state.toLowerCase() === "success") {
-						this.valiFormData.WorkOrderCategory =  response.data[0].F_WorkOrderCategory // 工单类别
-						this.valiFormData.Content =  response.data[0].F_Content // 工单内容
-						if(response.data[0].F_ApplicationDept) {
-							this.valiFormData.ApplicationDept =  response.data[0].F_ApplicationDept.trim() // 申请部门
+						this.valiFormData.WorkOrderCategory = response.data[0].F_WorkOrderCategory // 工单类别
+						this.valiFormData.Content = response.data[0].F_Content // 工单内容
+						if (response.data[0].F_ApplicationDept) {
+							this.valiFormData.ApplicationDept = response.data[0].F_ApplicationDept.trim() // 申请部门
 							pageData.getApplicant(this.valiFormData.ApplicationDept, (res) => {
 								this.ApplicantData = res
-								this.valiFormData.ApplicantName = this.$mHelper.findUserName(this.ApplicantData, response.data[0].F_Applicant)
-								this.valiFormData.Applicant =  response.data[0].F_Applicant //申请人
+								this.valiFormData.ApplicantName = this.$mHelper.findUserName(this
+									.ApplicantData, response.data[0].F_Applicant)
+								this.valiFormData.Applicant = response.data[0].F_Applicant //申请人
 							})
-							
 						}
-						this.valiFormData.Applicantsphone =  response.data[0].F_Applicantsphone // 申请电话
-						this.valiFormData.Phone =  response.data[0].F_Phone // 联系电话
-						this.valiFormData.PlaceOfRepair =  response.data[0].F_PlaceOfRepair // 报修地点
-						this.valiFormData.IsEnd =  0 // 是否完结
-						this.valiFormData.File =  response.data[0].F_File // 文件
+						this.valiFormData.Applicantsphone = response.data[0].F_Applicantsphone // 申请电话
+						this.valiFormData.Phone = response.data[0].F_Phone // 联系电话
+						this.valiFormData.PlaceOfRepair = response.data[0].F_PlaceOfRepair // 报修地点
+						this.valiFormData.IsEnd = 0 // 是否完结
+						this.valiFormData.File = response.data[0].F_File // 文件
 						this.valiFormData.EmergencyTypes = response.data[0].F_EmergencyTypes
-						if(response.data[0].F_MaintenanceDept) {
-							this.valiFormData.MaintenanceDept =  response.data[0].F_MaintenanceDept//	维修部门
+						if (response.data[0].F_MaintenanceDept) {
+							this.valiFormData.MaintenanceDept = response.data[0].F_MaintenanceDept //	维修部门
 							pageData.getApplicant(this.valiFormData.MaintenanceDept, (res) => {
 								this.MaintenancerData = res
 							})
-							this.valiFormData.MaintenancerName = this.$mHelper.findUserName(this.ApplicantData, response.data[0].F_Maintenancer)
-							this.valiFormData.Maintenancer =  response.data[0].F_Maintenancer //指派人
+							this.valiFormData.MaintenancerName = this.$mHelper.findUserName(this.ApplicantData,
+								response.data[0].F_Maintenancer)
+							this.valiFormData.Maintenancer = response.data[0].F_Maintenancer //指派人
 						}
 						if (response.data[0].FileUrl) {
 							response.data[0].FileUrl.forEach((v, n) => {
@@ -381,7 +482,7 @@
 									url: v.F_FileUrl,
 									extname: v.F_FileType,
 									name: v.F_FileName.substring(19),
-									id:v.F_FileId
+									id: v.F_FileId
 								})
 							})
 						}
@@ -393,7 +494,7 @@
 			getDeparTree(tree, text) {
 				for (const i in tree) {
 					if (tree[i].text == text) {
-						
+
 						this.valiFormData.ApplicationDept = tree[i].value
 					} else if (tree[i].children) {
 						this.getDeparTree(tree[i].children, text)
@@ -407,6 +508,7 @@
 
 <style lang="scss" scoped>
 	@import '@/common/addFormDeep.scss';
+
 	.wrapper {
 		padding: 10px 15px;
 		background-color: #fff;

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

@@ -97,9 +97,10 @@
 		},
 		onLoad(option) {
 			this.getFontSizeValue = uni.getStorageSync('fontSizeValue')+'rem'
-			pageData.getDet((res,data) => {
-				this.deptDataTree = res
-			})
+			// pageData.getDet((res,data) => {
+			// 	this.deptDataTree = res
+			// })
+			this.departList = JSON.parse(window.localStorage.getItem('deptTreeData'))
 			pageData.getGongDanType(3000,(res,data) => {
 				this.dataOrderType = res
 			})

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

@@ -46,57 +46,105 @@
 		onLoad(option) {
 			this.getHosptallist() // 院区
 			this.getFontSizeValue = uni.getStorageSync('fontSizeValue')+'rem'
+			// this.tranformDepartList = JSON.parse(window.localStorage.getItem('deptTreeData'))
 			pageData.getDet((res,list) => {
 				this.tranformDepartList = res
-				console.log(this.tranformDepartList)
-				pageData.getGongDanType(this.typeid,(res, data) => {
-					if(option.zhdd){//综合调度保障中心
-						this.tranformDepart = '3_1275'
-						pageData.getApplicant('1275', (res,data,candidates) => {
-							this.tranforPeopleList = res
-							this.candidates = candidates
-						})
-						return;
-					}
-					let derpartid = ''
-					if(!option.orderType) {
-						return
-					}
-					let orderStr = this.$mHelper.getDepartidByOrderid(data,option.orderType)
-					let derpartCode = orderStr.split(',')[orderStr.split(',').length - 1]
-					if(derpartCode == 'gzbx_jjhq') {
-						let hospitalid = this.getHosptalId(this.$mHelper.findParents(list,option.departid).split('/')[0])
-						if(Number(hospitalid) == 1) { // 总院
-							derpartid = this.$mHelper.getDepartidByDepartCode(list,'HQBZ')
-							this.tranformDepart = this.$mHelper.findParents(list,derpartid).split('/').length + '_'+ derpartid
-						}else if(Number(hospitalid) == 2) { // 分院
-							derpartid = this.$mHelper.getDepartidByDepartCode(list,'fenyuanqu')
-							this.tranformDepart = this.$mHelper.findParents(list,derpartid).split('/').length + '_'+ derpartid
-						}else if(Number(hospitalid) == 3) { // 西院
-							derpartid = this.$mHelper.getDepartidByDepartCode(list,'xiyuanqu')
-							this.tranformDepart = this.$mHelper.findParents(list,derpartid).split('/').length + '_'+ derpartid
-						}else if(Number(hospitalid) == 4005) { //郑州人民医院总部
-							derpartid = this.$mHelper.getDepartidByDepartCode(list,'JJHHQBZB')
-							this.tranformDepart = this.$mHelper.findParents(list,derpartid).split('/').length + '_'+ derpartid
-						}else if(Number(hospitalid) == 4004) { // 郑州人民医院郑东院区
-							derpartid = this.$mHelper.getDepartidByDepartCode(list,'JJHQ_DYQBZZ')
-							this.tranformDepart = this.$mHelper.findParents(list,derpartid).split('/').length + '_'+ derpartid
-						}else if(Number(hospitalid) == 4006) { // 郑州人民医院南部院区
-							derpartid = this.$mHelper.getDepartidByDepartCode(list,'JJHQ_NYQBZZ')
-							this.tranformDepart = this.$mHelper.findParents(list,derpartid).split('/').length + '_'+ derpartid
-						}else if(Number(hospitalid) == 4008) { // 郑州人民医院北院区
-							derpartid = this.$mHelper.getDepartidByDepartCode(list,'JJHQ_BYQBZZ')
-							this.tranformDepart = this.$mHelper.findParents(list,derpartid).split('/').length + '_'+ derpartid
+				//默认-清空
+				this.tranforPeopleList = []
+				this.candidates = []
+				this.tranforPeople = ''
+				this.tranforPeopleName = ''
+				//院区
+				const applyHos = this.getHosptalId(this.$mHelper.findParents(this.tranformDepartList,option.departid).split('/')[0])
+				console.log(applyHos,'院区')
+				if(applyHos == 0){
+					return
+				}
+				var autoData = []
+				//获取配置
+				this.$http.get("GongDanType/GetModule", {mId:option.orderType}).then((response) => {
+					if (response.state.toLowerCase() === "success") {
+						if(response.data.autodept!=''){
+							autoData = JSON.parse(response.data.autodept)
+							if(!autoData.length){
+								return
+							}
+							//遍历
+							for (var i = 0; i < autoData.length; i++) {
+								if (autoData[i].autoyq == applyHos) {
+									var aotocode = autoData[i].autousercode
+									this.tranformDepart = this.$mHelper.findParents(this.tranformDepartList, autoData[i].autodept)
+										.split('/').length + '_' + autoData[i].autodept
+									pageData.getApplicant(autoData[i].autodept, (res, data, candidates) => {
+										this.tranforPeopleList = res
+										this.candidates = candidates
+									    this.tranforPeopleName = this.getTextByCode(aotocode)
+									    this.tranforPeople = aotocode
+									})				
+									return
+								} else if (autoData[i].autoyq == '0') {
+									var aotocode = autoData[i].autousercode
+									this.tranformDepart = this.$mHelper.findParents(this.tranformDepartList, autoData[i].autodept)
+										.split('/').length + '_' + autoData[i].autodept
+									pageData.getApplicant(autoData[i].autodept, (res, data, candidates) => {
+										this.tranforPeopleList = res
+										this.candidates = candidates
+										this.tranforPeopleName = this.getTextByCode(aotocode)
+										this.tranforPeople = aotocode
+									})							
+								}
+							}
 						}
-					}else{
-						derpartid = orderStr.split(',')[orderStr.split(',').length - 2]
-						this.tranformDepart = this.$mHelper.findParents(list,derpartid).split('/').length + '_'+ derpartid
 					}
-					pageData.getPersonByDeptId(derpartid, (res,data,candidates) => {
-						this.tranforPeopleList = res
-						this.candidates = candidates
-					})
 				})
+				// pageData.getGongDanType(this.typeid,(res, data) => {
+					// if(option.zhdd){//综合调度保障中心
+					// 	this.tranformDepart = '3_1275'
+					// 	pageData.getApplicant('1275', (res,data,candidates) => {
+					// 		this.tranforPeopleList = res
+					// 		this.candidates = candidates
+					// 	})
+					// 	return;
+					// }
+					// let derpartid = ''
+					// if(!option.orderType) {
+					// 	return
+					// }
+					// let orderStr = this.$mHelper.getDepartidByOrderid(data,option.orderType)
+					// let derpartCode = orderStr.split(',')[orderStr.split(',').length - 1]
+					// if(derpartCode == 'gzbx_jjhq') {
+					// 	let hospitalid = this.getHosptalId(this.$mHelper.findParents(list,option.departid).split('/')[0])
+					// 	if(Number(hospitalid) == 1) { // 总院
+					// 		derpartid = this.$mHelper.getDepartidByDepartCode(list,'HQBZ')
+					// 		this.tranformDepart = this.$mHelper.findParents(list,derpartid).split('/').length + '_'+ derpartid
+					// 	}else if(Number(hospitalid) == 2) { // 分院
+					// 		derpartid = this.$mHelper.getDepartidByDepartCode(list,'fenyuanqu')
+					// 		this.tranformDepart = this.$mHelper.findParents(list,derpartid).split('/').length + '_'+ derpartid
+					// 	}else if(Number(hospitalid) == 3) { // 西院
+					// 		derpartid = this.$mHelper.getDepartidByDepartCode(list,'xiyuanqu')
+					// 		this.tranformDepart = this.$mHelper.findParents(list,derpartid).split('/').length + '_'+ derpartid
+					// 	}else if(Number(hospitalid) == 4005) { //郑州人民医院总部
+					// 		derpartid = this.$mHelper.getDepartidByDepartCode(list,'JJHHQBZB')
+					// 		this.tranformDepart = this.$mHelper.findParents(list,derpartid).split('/').length + '_'+ derpartid
+					// 	}else if(Number(hospitalid) == 4004) { // 郑州人民医院郑东院区
+					// 		derpartid = this.$mHelper.getDepartidByDepartCode(list,'JJHQ_DYQBZZ')
+					// 		this.tranformDepart = this.$mHelper.findParents(list,derpartid).split('/').length + '_'+ derpartid
+					// 	}else if(Number(hospitalid) == 4006) { // 郑州人民医院南部院区
+					// 		derpartid = this.$mHelper.getDepartidByDepartCode(list,'JJHQ_NYQBZZ')
+					// 		this.tranformDepart = this.$mHelper.findParents(list,derpartid).split('/').length + '_'+ derpartid
+					// 	}else if(Number(hospitalid) == 4008) { // 郑州人民医院北院区
+					// 		derpartid = this.$mHelper.getDepartidByDepartCode(list,'JJHQ_BYQBZZ')
+					// 		this.tranformDepart = this.$mHelper.findParents(list,derpartid).split('/').length + '_'+ derpartid
+					// 	}
+					// }else{
+					// 	derpartid = orderStr.split(',')[orderStr.split(',').length - 2]
+					// 	this.tranformDepart = this.$mHelper.findParents(list,derpartid).split('/').length + '_'+ derpartid
+					// }
+					// pageData.getPersonByDeptId(derpartid, (res,data,candidates) => {
+					// 	this.tranforPeopleList = res
+					// 	this.candidates = candidates
+					// })
+				// })
 			})
 			
 			this.state = option.state
@@ -104,6 +152,13 @@
 			
 		},
 		methods: {
+			getTextByCode(code){
+				for(var i = 0;i<this.tranforPeopleList.length;i++){
+					if(this.tranforPeopleList[i].value == code){
+						return this.tranforPeopleList[i].text
+					}
+				}
+			},
 			// 获取院区数据
 			getHosptallist() {
 				const params = {
@@ -145,6 +200,8 @@
 				this.tranforPeople = e
 			},
 			submit(ref,state) {
+				// console.log(this.tranformDepart,this.tranforPeople)
+				// return
 				if(!this.tranformDepart) {
 					this.$mHelper.toast('请选择指派部门')
 					return

CallCenterWeb.UI/RMYYAPP/pages/myTask/vehicleSchedulList/components/vehiccleDetail/vehiccleDetail.vue

@@ -108,9 +108,10 @@
 			}
 		},
 		async onLoad(optioin) {
-			pageData.getDet((res, data) => {
-				this.departList = data
-			})
+			// pageData.getDet((res, data) => {
+			// 	this.departList = data
+			// })
+			this.departList = JSON.parse(window.localStorage.getItem('deptAllList'))
 			await this.getGongDanType()
 			this.getFontSizeValue = uni.getStorageSync('fontSizeValue')+'rem' 
 			this.workorderid = optioin.wid 

CallCenterWeb.UI/RMYYAPP/pages/myTask/workOrderDetail/button/button.vue

@@ -103,7 +103,7 @@
 			}
 		},
 		onLoad(option) {
-			
+			console.log(this.orderType)
 		},
 		methods: {
 			postSelectDic(e) {
@@ -120,7 +120,7 @@
 			// 工单指派
 			transferBtn() {
 				uni.navigateTo({
-					url: "/pages/myTask/repairList/repairDetail/tranferDetail/tranferDetail?wid=" + this.wid+ '&orderType='+this.orderType+'&departid='+ this.applicationDept
+					url: "/pages/myTask/repairList/repairDetail/tranferDetail/tranferDetail?wid=" + this.wid+ '&orderType=' + this.orderType +'&departid='+ this.applicationDept
 				})
 			},
 			// 工单撤回
@@ -344,7 +344,7 @@
 		   },
 		   disTrunBtn() {
 			   uni.navigateTo({
-			   	url: "/pages/myTask/repairList/repairDetail/tranferDetail/tranferDetail?wid=" + this.wid+"&zhdd=1"
+			   	url: "/pages/myTask/repairList/repairDetail/tranferDetail/tranferDetail?wid=" + this.wid+"&zhdd=1"+ '&orderType=' + this.orderType +'&departid='+ this.applicationDept
 			   })
 		   },
 			// 车辆调度 （ 按钮开始 ）

CallCenterWeb.UI/RMYYAPP/pages/myTask/workOrderDetail/workOrderDetail.vue

@@ -354,9 +354,10 @@
 					}
 				})
 			}
-			pageData.getDet((res, data) => {
-				this.departList = data
-			})
+			// pageData.getDet((res, data) => {
+			// 	this.departList = data
+			// })
+			this.departList = JSON.parse(window.localStorage.getItem('deptAllList'))
 			pageData.getApplicant('', (res) => {
 				this.userCodeList = res
 			})