微信端新建事件

src/views/newIncident.vue

@@ -26,20 +26,9 @@
       @submit="submitHandler"
     >
       <cube-form-group>
-        <cube-form-item
-          :field="fields[20]"
-          v-if="valConfig == 2"
-          class="btn_plcaeholde btn_local"
-        >
-          <!-- <cube-button @click="showPlacePicker()">{{selectedPlaceTxt?selectedPlaceTxt:'请输入故障地点'}}</cube-button> -->
-          <input
-            type="text"
-            class="inp_local"
-            placeholder="请输入报修科室"
-            v-model="deptInpVal"
-            @input="changeDeptList()"
-            @click="showDeptPicker()"
-          />
+        <cube-form-item :field="fields[24]" class="btn_plcaeholde" v-if="valConfig == 2"></cube-form-item>
+        <cube-form-item :field="fields[20]" v-if="valConfig == 2" class="btn_plcaeholde btn_local">
+          <input type="text" class="inp_local" placeholder="请选择报修科室" v-model="model.requester" @click="toSearchDept()" />
         </cube-form-item>
         <cube-form-item
           v-if="valConfig == 1"
@@ -56,18 +45,6 @@
           }}</cube-button>
         </cube-form-item>
         <cube-form-item :field="fields[23]" v-if="ifRoom == 1"></cube-form-item>
-        <!-- 故障地点： -->
-        <!-- <cube-form-item :field="fields[19]" class="btn_plcaeholde btn_local"> -->
-        <!-- <cube-button @click="showPlacePicker()">{{selectedPlaceTxt?selectedPlaceTxt:'请输入故障地点'}}</cube-button> -->
-        <!-- <input
-            type="text"
-            class="inp_local"
-            placeholder="请输入故障地点"
-            v-model="inpLocalVal"
-            @input="changeLocalList()"
-            @click="showPlacePicker()"
-          />
-        </cube-form-item> -->
         <cube-form-item :field="fields[3]"></cube-form-item>
         <cube-form-item :field="fields[4]" class="btn_plcaeholde">
           <cube-button @click="showCategoryPicker()">{{
@@ -78,17 +55,6 @@
           :field="fields[5]"
           class="btn_plcaeholde"
         ></cube-form-item>
-        <!-- <cube-form-item :field="fields[6]" class="btn_plcaeholde incidentTitle">
-          <div class="titleRefer">
-            <textarea
-              class="titleTxtArea fl"
-              placeholder="请输入事件主题"
-              v-model="incidentTitle"
-              @input="inpTitle()"
-            ></textarea>
-            <span class="abtn fl" @click="referKnowledge()">引入知识库</span>
-          </div>
-        </cube-form-item>-->
         <cube-form-item :field="fields[7]"></cube-form-item>
         <div class="label formLabel">
           报修图片
@@ -347,21 +313,24 @@ export default {
       }, //上传的model
       timer: null,
       incidentTitle: "", //事件主题
-      referenceInfo: {}, //引用信息
       placeSelectData: [], //区域地点下拉框选项
       inpLocalVal: "", //故障地点输入框
       faultLocationList: [], //区域地点拼接下拉框选项
-      deptInpVal: "", //报修科室输入框
       deptList: [], //报修科室下拉选项
       deptRes: "", //下拉框科室信息
+
+      branchList: [], //院区下拉列表
+      // branchRes: [], //院区下拉列表（完整）
+
       model: {
+        duty: null,
+        branch: "",
         contactsInformation: "",
         placeValue: [],
         address: "", //故障地点
         requester: "", //报修科室
         houseNumber: "", //详细地址
         description: "", //故障描述
-        // bxcode: "",
         assetId: "", //资产
         category: [],
         source: "", //事件来源
@@ -381,7 +350,6 @@ export default {
       },
       selectedCategoryTxt: "", //故障现象选中展示
       selectedPlaceTxt: "", //区域地点选中展示
-      // showPrompting:false,
       promptingConent: "",
       promptingStatus: "",
       order: 1, //处理方式  1：直接处理，2:派单
@@ -457,10 +425,10 @@ export default {
           label: "故障现象:",
           rules: {
             required: true
+          },
+          messages: {
+            required: "请选择故障现象"
           }
-          // messages: {
-          //   required: "请选择故障现象"
-          // }
         },
         {
           type: "select",
@@ -736,40 +704,30 @@ export default {
           rules: {
             required: false
           }
-        }
+        },
+        {
+          type: "select",
+          modelKey: "branch",
+          label: "院区:",
+          props: {
+            options: this.branchList,
+            title: "请选择院区",
+            placeholder: "请选择院区"
+          },
+          rules: {
+            required: true
+          }
+        },
       ]
     };
   },
-  watch: {
-    // "model.category": {
-    //   deep: true,
-    //   handler: function(n, o) {
-    //     this.model.houseNumber = houseNumber;
-    //     console.log(this.model.houseNumber);
-    //   }
-    // }
-    "model.room": {
-      handler(newV) {
-        if (newV) {
-          this.fields.forEach(item => {
-            if (item.modelKey == "room") {
-              this.model.houseNumber = item.props.options.find(
-                v => v.value == newV
-              ).text;
-            }
-          });
-        } else {
-          this.model.houseNumber = "";
-        }
-      }
-    }
-  },
+
   methods: {
     // 切换处理方式
     changeHandleTypes() {
       let reverseArr = this.model.category.filter(Boolean).reverse(); //数组翻转，取第一项不为空的
       let sjId = reverseArr[0]; //事件Id baba
-      let sj = this.initSjList.filter(v => v.id == sjId)[0];
+      let sj = this.initSjList ? this.initSjList.filter(v => v.id == sjId)[0] : null;
       console.log(this.order, sj);
       this.isShowDes = !(this.order == 1 && sj && sj.hasSimple == 1);
     },
@@ -918,15 +876,22 @@ export default {
     // 获取处理人
     getHandlerUser() {
       var that = this;
+      let postData = {
+        idx: 0,
+        sum: 1000,
+        user: {
+          roledata: { rolecode: "first-line support" },
+          selectType: "1"
+        }
+      };
+      // 当前所属院区或责任科室
+      if(this.loginUser.duty){
+        postData.user = { duty: this.loginUser.duty };
+      }else if(this.loginUser.branch){
+        postData.user = { branch: this.loginUser.branch }
+      }
       this.$http
-        .post("service/user/data/fetchDataList/user", {
-          idx: 0,
-          sum: 1000,
-          user: {
-            roledata: { rolecode: "first-line support" },
-            selectType: "1"
-          }
-        })
+        .post("service/user/data/fetchDataList/user", postData)
         .then(function(res) {
           res.data.list.forEach(function(v, i) {
             that.handlerUserArr.push({
@@ -993,7 +958,10 @@ export default {
         // that.modelData.incident.account = that.loginUser.account;
         // that.modelData.requestershow = that.loginUser;
       } else if (that.valConfig == 2) {
-        that.modelData.incident.department = that.model.requester;
+        that.modelData.incident.branch = that.model.branch;
+        if(that.$route.query.id){
+          that.modelData.incident.department = {id: +that.$route.query.id};
+        }
       }
       if (that.wxIncidentWithCmdb == 1) {
         that.modelData.incident.assetId = that.model.assetId;
@@ -1014,7 +982,7 @@ export default {
         that.modelData.incident.room = { id: that.model.room };
       }
       that.modelData.incident.acceptUser = that.loginUser;
-      that.modelData.incident.requester = {};
+      // that.modelData.incident.requester = {};
       that.modelData.incident.handlingPersonnelUser = { id: that.loginUser.id };
       that.modelData.incident.source = { id: that.model.source };
       that.modelData.incident.title = that.model.title;
@@ -1084,20 +1052,6 @@ export default {
       that.model.fileUrl = "url";
       that.loadShow = true;
     },
-    // 事件主题引入知识库
-    referKnowledge() {
-      var that = this;
-      if (!that.model.title) return;
-      that.setLocalStroageData();
-      localStorage.setItem("modelData", JSON.stringify(that.modelData));
-      localStorage.setItem("model", JSON.stringify(that.model));
-      localStorage.setItem("order", that.order);
-
-      this.$router.push({
-        name: "ReferenceList",
-        params: { data: that.model.title }
-      });
-    },
     // 获取页面数据
     getMessage() {
       var that = this;
@@ -1129,19 +1083,19 @@ export default {
             that.$route.params.abnormal;
         }
       } else {
-        that.name = that.loginUser.name;
-        that.model.contactsInformation = that.loginUser.phone;
-        that.model.contacts = that.loginUser.name;
-        that.model.houseNumber = that.loginUser.houseNumber;
-      }
-      if (that.loginUser.place && that.loginUser.place.length) {
-        if (that.loginUser.place.id) {
-          if (that.loginUser.place.area) {
-            that.model.placeValue[0] = that.loginUser.place.area.id;
-          }
-          that.model.placeValue[1] = that.loginUser.place.id;
-        }
+        // that.name = that.loginUser.name;
+        // that.model.contactsInformation = that.loginUser.phone;
+        // that.model.contacts = that.loginUser.name;
+        // that.model.houseNumber = that.loginUser.houseNumber;
       }
+      // if (that.loginUser.place && that.loginUser.place.length) {
+      //   if (that.loginUser.place.id) {
+      //     if (that.loginUser.place.area) {
+      //       that.model.placeValue[0] = that.loginUser.place.area.id;
+      //     }
+      //     that.model.placeValue[1] = that.loginUser.place.id;
+      //   }
+      // }
 
       if (localStorage.getItem("model")) {
         that.model = JSON.parse(localStorage.getItem("model"));
@@ -1150,30 +1104,29 @@ export default {
       if (localStorage.getItem("modelData")) {
         that.modelData = JSON.parse(localStorage.getItem("modelData"));
       }
-      if (localStorage.getItem("referenceInfo")) {
-        that.referenceInfo = JSON.parse(localStorage.getItem("referenceInfo"));
-        that.incidentTitle = that.model.title = that.referenceInfo.title;
-        that.model.handleDescription = that.referenceInfo.content;
-      }
       if (localStorage.getItem("order")) {
         that.order = localStorage.getItem("order") - 0;
       }
-
-      // if (localStorage.getItem("category")) {
-      //   that.selectedCategoryTxt = JSON.parse(
-      //     localStorage.getItem("category")
-      //   ).txt;
-      //   console.log(that.selectedCategoryTxt);
-      // }
-      // if (localStorage.getItem("place")) {
-      //   that.selectedPlaceTxt = JSON.parse(localStorage.getItem("place")).txt;
-      //   console.log(that.selectedPlaceTxt);
-      // }
     },
     // 提交
     submitHandler() {
       $("#fade").fadeOut();
       var that = this;
+      if (that.valConfig == 2) {
+        if(that.model.duty){
+          that.modelData.incident.duty = that.model.duty
+        }else{
+          let categoryId = this.model.category.slice(-1)[0];
+          let category = this.initSjList.find(v => v.id == categoryId);
+          this.$createDialog({
+            type: "alert",
+            title: "校验失败",
+            content: "故障现象【"+ category.category +"】没有设置责任科室!",
+            icon: "cubeic-wrong"
+          }).show();
+          return;
+        }
+      }
       that.setLocalStroageData();
       if (that.selectHouseNumber && that.selectHouseNumber.place) {
         that.modelData.incident.place = that.selectHouseNumber;
@@ -1251,11 +1204,8 @@ export default {
           }
         })
         .show();
-      // localStorage.removeItem("category");
       localStorage.removeItem("model");
       localStorage.removeItem("modelData");
-      // localStorage.removeItem("placeIndex");
-      localStorage.removeItem("referenceInfo");
       localStorage.removeItem("solution");
       localStorage.removeItem("order");
       setTimeout(function() {
@@ -1343,22 +1293,12 @@ export default {
         });
     },
     validateHandler(result) {
-      // this.submitHandler()
       console.log(result);
       this.resule = result;
       var that = this;
 
       that.validity = result.validity;
       that.valid = result.valid;
-      // if (that.vali == true) {
-      //   $("#fade").fadeIn();
-      //   that.promptingConent = "提交失败,请填写必填信息!";
-      //   that.promptingStatus = false;
-      //   setTimeout(function() {
-      //     $("#fade").fadeOut();
-      //   }, 2000);
-      // }
-      // that.vali = false;
     },
 
     dateSelectHandler(selectedVal) {
@@ -1425,98 +1365,112 @@ export default {
       this.selectedCategoryTxt = this.model.title = this.model.description = this.incidentTitle =
         selected[selected.length - 1];
       this.model.category = selectedVal;
-      // var category = {
-      //   index: selectedIndex,
-      //   txt: this.selectedCategoryTxt
-      // };
-      // localStorage.setItem("category", JSON.stringify(category));
-      // ----------------------回显其他数据---------------------
-      console.log(selectedVal, "seimin");
-      let reverseArr = selectedVal.filter(Boolean).reverse(); //数组翻转，取第一项不为空的
-      let sjId = reverseArr[0]; //事件Id baba
-      let sj = this.initSjList.filter(v => v.id == sjId)[0];
-      console.log(sj);
-      this.model.priority = sj.priority?sj.priority.id:null;
-      if (sj.branchType == 0) {
-        if (sj.userOrGroupType === 1) {
-          //派人
-          this.order = 2;
-          this.model.handleUserOrGroup = true;
-          this.model.handlerUser = sj.handleUser ? sj.handleUser.id : "";
-        } else if (sj.userOrGroupType === 2) {
-          //派组
-          this.order = 2;
-          this.model.handleUserOrGroup = false;
-          this.model.candidateGroups = sj.group ? sj.group.id : "";
-        } else {
-          this.order = 1;
-          this.model.handleUserOrGroup = false;
-          this.model.handlerUser = "";
-          this.model.candidateGroups = "";
-        }
-      } else if (sj.branchType == 1) {
-        // 分院区
-        // liaomingming
-        let areaId = this.model.placeValue[0]; //区域id
-        console.log(this.initAreaList);
-        if (areaId) {
-          // 选择了区域
-          let areaObj = this.initAreaList.find(v => v.id == areaId);
-          if (areaObj) {
-            let branchId = areaObj.branch;
-            let branchUserGroup =
-              sj.branchUserGroups.find(v => v.branchId == branchId) || {};
-            if (branchUserGroup.branchUserOrGroupType == 1) {
-              //派人
-              this.order = 2;
-              this.model.handleUserOrGroup = true;
-              this.model.handlerUser = branchUserGroup.userId
-                ? branchUserGroup.userId
-                : undefined;
-            } else if (branchUserGroup.branchUserOrGroupType === 2) {
-              //派组
-              this.order = 2;
-              this.model.handleUserOrGroup = false;
-              this.model.candidateGroups = branchUserGroup.groupId
-                ? branchUserGroup.groupId
-                : undefined;
-            } else {
-              this.order = 1;
-              this.model.handleUserOrGroup = false;
-              this.model.handlerUser = "";
-              this.model.candidateGroups = "";
-            }
-          } else {
-            this.order = 1;
-            this.model.handleUserOrGroup = false;
-            this.model.handlerUser = "";
-            this.model.candidateGroups = "";
-          }
-        } else {
-          this.order = 1;
-          this.model.handleUserOrGroup = false;
-          this.model.handlerUser = "";
-          this.model.candidateGroups = "";
+
+      if(this.model.category.length){
+        let category = this.initSjList.find(v => v.id == this.model.category.slice(-1)[0]);
+        if(category && category.priority){
+          // 回显优先级
+          this.model.priority = category.priority.id;
         }
+        // 选择了院区，科室，故障现象，责任科室
+        this.showUserOrGroup();
+        // 处理责任科室数据
+        this.handlerDuty();
       }
 
-      console.log(this.order, sj.hasSimple);
-      if (this.order == 1 && sj.hasSimple == 1) {
-        // 直接处理 && 简单处理
-        this.isShowDes = false;
-      } else {
-        this.isShowDes = true;
-      }
+      // ----------------------回显其他数据---------------------
+      // console.log(selectedVal, "seimin");
+      // let reverseArr = selectedVal.filter(Boolean).reverse(); //数组翻转，取第一项不为空的
+      // let sjId = reverseArr[0]; //事件Id
+      // let sj = this.initSjList.filter(v => v.id == sjId)[0];
+      // console.log(sj);
+      // this.model.priority = sj.priority?sj.priority.id:null;
+      // if (sj.branchType == 0) {
+      //   if (sj.userOrGroupType === 1) {
+      //     //派人
+      //     this.order = 2;
+      //     this.model.handleUserOrGroup = true;
+      //     this.model.handlerUser = sj.handleUser ? sj.handleUser.id : "";
+      //   } else if (sj.userOrGroupType === 2) {
+      //     //派组
+      //     this.order = 2;
+      //     this.model.handleUserOrGroup = false;
+      //     this.model.candidateGroups = sj.group ? sj.group.id : "";
+      //   } else {
+      //     this.order = 1;
+      //     this.model.handleUserOrGroup = false;
+      //     this.model.handlerUser = "";
+      //     this.model.candidateGroups = "";
+      //   }
+      // } else if (sj.branchType == 1) {
+      //   // 分院区
+      //   let areaId = this.model.placeValue[0]; //区域id
+      //   console.log(this.initAreaList);
+      //   if (areaId) {
+      //     // 选择了区域
+      //     let areaObj = this.initAreaList.find(v => v.id == areaId);
+      //     if (areaObj) {
+      //       let branchId = areaObj.branch;
+      //       let branchUserGroup =
+      //         sj.branchUserGroups.find(v => v.branchId == branchId) || {};
+      //       if (branchUserGroup.branchUserOrGroupType == 1) {
+      //         //派人
+      //         this.order = 2;
+      //         this.model.handleUserOrGroup = true;
+      //         this.model.handlerUser = branchUserGroup.userId
+      //           ? branchUserGroup.userId
+      //           : undefined;
+      //       } else if (branchUserGroup.branchUserOrGroupType === 2) {
+      //         //派组
+      //         this.order = 2;
+      //         this.model.handleUserOrGroup = false;
+      //         this.model.candidateGroups = branchUserGroup.groupId
+      //           ? branchUserGroup.groupId
+      //           : undefined;
+      //       } else {
+      //         this.order = 1;
+      //         this.model.handleUserOrGroup = false;
+      //         this.model.handlerUser = "";
+      //         this.model.candidateGroups = "";
+      //       }
+      //     } else {
+      //       this.order = 1;
+      //       this.model.handleUserOrGroup = false;
+      //       this.model.handlerUser = "";
+      //       this.model.candidateGroups = "";
+      //     }
+      //   } else {
+      //     this.order = 1;
+      //     this.model.handleUserOrGroup = false;
+      //     this.model.handlerUser = "";
+      //     this.model.candidateGroups = "";
+      //   }
+      // }
+      // console.log(this.order, sj.hasSimple);
+      // if (this.order == 1 && sj.hasSimple == 1) {
+      //   // 直接处理 && 简单处理
+      //   this.isShowDes = false;
+      // } else {
+      //   this.isShowDes = true;
+      // }
+      // ----------------------回显其他数据---------------------
     },
     // 故障现象
     getIncidentcategory() {
       this.loadShow = true;
       var that = this;
+      let postData = {
+        idx: 0,
+        sum: 9999,
+      };
+      // 当前所属院区或责任科室
+      if(this.loginUser.duty){
+        postData.incidentcategory = { duty: this.loginUser.duty.id };
+      }else if(this.loginUser.branch){
+        postData.incidentcategory = { branch: this.loginUser.branch.id }
+      }
       this.$http
-        .post("service/bpm/data/fetchDataList/incidentcategory", {
-          idx: 0,
-          sum: 9999
-        })
+        .post("service/bpm/data/fetchDataList/incidentcategory", postData)
         .then(function(res) {
           that.initSjList = JSON.parse(JSON.stringify(res.data.list));
           var list = res.data.list;
@@ -1558,9 +1512,6 @@ export default {
           that.categoryPicker = that.$createCascadePicker({
             title: "故障现象选择",
             data: that.selectData,
-            // selectedIndex: localStorage.getItem("category")
-            //   ? JSON.parse(localStorage.getItem("category")).index
-            //   : [0, 0, 0],
             selectedIndex:[0, 0, 0],
             onSelect: that.selectCategoryHandler
           });
@@ -1606,7 +1557,7 @@ export default {
       // --------------------start---------------------
       let categoryId = this.model.category.slice(-1)[0];
       if (categoryId) {
-        // 选择了故障现象 liaomingming
+        // 选择了故障现象
         let categoryObj = this.initSjList.find(v => v.id == categoryId);
         if (categoryObj) {
           if (categoryObj.branchType == 1) {
@@ -1656,63 +1607,18 @@ export default {
         this.model.candidateGroups = "";
       }
       // --------------------end---------------------
-      // var place = {
-      //   index: selectedIndex,
-      //   txt: this.model.houseNumber
-      // };
-      // localStorage.setItem("place", JSON.stringify(place));
     },
-    // 报修科室
-    showDeptPicker() {
-      this.deptPicker.show();
+    // 跳转到报修科室搜索页面
+    toSearchDept() {
+      this.$router.push(`/searchDept?type=searchDept`);
     },
-    // 选中报修科室
-    selectDeptHandler(selectedVal, selectedIndex, selectedTxt) {
-      console.log(selectedVal, selectedIndex, selectedTxt);
-      this.deptInpVal = selectedTxt;
-      this.model.requester = this.deptRes[selectedIndex];
-      console.log(this.deptRes[selectedIndex]);
-      this.inpLocalVal = this.model.address = this.deptRes[selectedIndex].place
-        .area
-        ? this.deptRes[selectedIndex].place.area.area
-          ? this.deptRes[selectedIndex].place.place
-            ? this.deptRes[selectedIndex].place.area.area +
-              this.deptRes[selectedIndex].place.place
-            : this.deptRes[selectedIndex].place.area.area
-          : this.deptRes[selectedIndex].place.area
-        : this.deptRes[selectedIndex].place.place;
-      if (this.deptRes[selectedIndex].phone) {
-        this.model.contactsInformation = this.deptRes[selectedIndex].phone;
-      }
-      // this.model.houseNumber = this.selectedPlaceTxt = selectedTxt.join(" ");
-      // var place = {
-      //   index: selectedIndex,
-      //   txt: this.model.houseNumber
-      // };
-      // localStorage.setItem("place", JSON.stringify(place));
-    },
-    // 取消选中报修科室
-    cancelDeptHandler() {
-      if (this.model.requester) {
-        this.deptInpVal = this.model.requester.dept;
-      } else if (!this.model.requester) {
-        this.deptInpVal = "";
-        this.model.requester = "";
-      }
-      // this.model.houseNumber = this.selectedPlaceTxt = selectedTxt.join(" ");
-      // var place = {
-      //   index: selectedIndex,
-      //   txt: this.model.houseNumber
-      // };
-      // localStorage.setItem("place", JSON.stringify(place));
-    },
-    getAreaData() {
+    getAreaData(branchId) {
       this.$http
         .post("service/user/data/fetchDataList/area", {
           idx: 0,
-          sum: 1000,
+          sum: 9999,
           area: {
-            wechatArea: true
+            branch: branchId,
           }
         })
         .then(res => {
@@ -1725,24 +1631,25 @@ export default {
               children: []
             });
           }
+
+          this.getPlaceData(branchId);
         });
     },
-    getPlaceData() {
-      var that = this;
+    getPlaceData(branchId) {
       this.$http
         .post("service/user/data/fetchDataList/place", {
           idx: 0,
-          sum: 1000,
+          sum: 9999,
           area: {
-            wechatAreaId: ""
+            branch: branchId,
           }
         })
-        .then(function(res) {
+        .then((res) => {
           var data = res.data.list;
           for (var i = 0; i < data.length; i++) {
-            for (var j = 0; j < that.placeSelectData.length; j++) {
-              if (data[i].area.id == that.placeSelectData[j].value) {
-                that.placeSelectData[j].children.push({
+            for (var j = 0; j < this.placeSelectData.length; j++) {
+              if (data[i].area.id == this.placeSelectData[j].value) {
+                this.placeSelectData[j].children.push({
                   text: data[i].place,
                   value: data[i].id
                 });
@@ -1750,109 +1657,93 @@ export default {
             }
           }
 
-          that.placePicker = that.$createCascadePicker({
+          console.log(this.initAreaList, data);
+          console.log(this.placeSelectData);
+
+          this.placePicker = this.$createCascadePicker({
             title: "区域地点选择",
-            data: that.placeSelectData,
-            // selectedIndex: localStorage.getItem("place")
-            //   ? JSON.parse(localStorage.getItem("place")).index
-            //   : [0, 0],
+            data: this.placeSelectData,
             selectedIndex: [0, 0],
-            onSelect: that.selectPlaceHandler
+            onSelect: this.selectPlaceHandler
           });
         });
     },
-    // 故障地点
-    getFaultLocation(type) {
-      var that = this;
+    // 获取院区列表
+    getBranchList() {
       this.$http
-        .post("service/apply/bpm/searchFaultLocation", {
-          searchKey: this.inpLocalVal || ""
+        .post("service/user/data/fetchDataList/branch", {
+          idx: 0,
+          sum: 9999,
         })
-        .then(function(res) {
-          var data = res.data.result;
-          that.allPlace = JSON.parse(JSON.stringify(res.data.result));
-          if (type == 1) {
-            that.faultLocationList.length = 0;
-            that.$set(that.faultLocationList, true, []);
-            that.faultLocationList;
-          }
-          for (var i = 0; i < data.length; i++) {
-            that.faultLocationList.push({
-              text: data[i].area
-                ? data[i].area.area
-                  ? data[i].place
-                    ? data[i].area.area + data[i].place
-                    : data[i].area.area
-                  : data[i].area
-                : data[i].place,
-              value: data[i].id
+        .then((res) => {
+          res.data.list.forEach((v) => {
+            this.branchList.push({
+              text: v.hosName,
+              value: v.id
             });
-          }
-          console.log(that.faultLocationList);
-
-          that.placePicker = that.$createCascadePicker({
-            title: "区域地点选择",
-            data: that.faultLocationList,
-            // selectedIndex: localStorage.getItem("place")
-            //   ? JSON.parse(localStorage.getItem("place")).index
-            //   : [0, 0],
-            onSelect: that.selectPlaceHandler
           });
-          // that.fields[19].props.options = that.faultLocationList;
+          this.fields[24].props.options = this.branchList;
         });
     },
-    // 故障地点输入框节流阀
-    changeLocalList() {
-      var that = this;
-      this.model.address = this.inpLocalVal;
-      console.log(this.inpLocalVal);
-      clearTimeout(that.timer);
-      that.timer = setTimeout(() => {
-        this.getFaultLocation(1);
-      }, 600);
+    // 回显处理人或组
+    showUserOrGroup(){
+      this.order = 2;
+      this.model.handleUserOrGroup = true;
+      this.model.handlerUser = this.loginUser.id;
     },
-    // 报修科室
-    getDept(type) {
-      var that = this;
-      this.$http
-        .post("service/user/data/fetchDataList/department", {
-          idx: 0,
-          sum: 50,
-          department: { dept: that.deptInpVal || "" }
-        })
-        .then(function(res) {
-          var data = res.data.list;
-          if (type == 1) {
-            that.deptList.length = 0;
-            that.$set(that.deptList, true, []);
-            that.deptList;
-          }
-          that.deptRes = res.data.list;
-          for (var i = 0; i < data.length; i++) {
-            that.deptList.push({
-              text: data[i].dept,
-              value: data[i].id
-            });
-          }
+    // 处理顶部责任科室数据
+    handlerDuty(){
+      console.log(this.model.category)
+      if(!this.model.category.length){
+        return;
+      }
+      let categoryId = this.model.category.slice(-1)[0];
+      let category = this.initSjList.find(v => v.id == categoryId);
 
-          that.deptPicker = that.$createCascadePicker({
-            title: "报修科室选择",
-            data: that.deptList,
-            onSelect: that.selectDeptHandler,
-            onCancel: that.cancelDeptHandler
+      if(category.branchType == 1){
+        // 分院区
+        if(this.model.branch){
+          var dutyConfig = category.branchUserGroups.find(v=>v.branchId == this.model.branch);
+          if(dutyConfig && dutyConfig.dutyId && dutyConfig.dutyName){
+            this.model.duty = {id:dutyConfig.dutyId,dept:dutyConfig.dutyName};
+          }else{
+            this.model.duty = null;
+          }
+        }else{
+          this.model.duty = null;
+        }
+      }else{
+        // 不分院区
+        this.model.duty = category.dutyDepartment;
+      }
+    },
+  },
+  watch: {
+    "model.room": {
+      handler(newV) {
+        if (newV) {
+          this.fields.forEach(item => {
+            if (item.modelKey == "room") {
+              this.model.houseNumber = item.props.options.find(
+                v => v.value == newV
+              ).text;
+            }
           });
-        });
+        } else {
+          this.model.houseNumber = "";
+        }
+      }
+    },
+    'model.branch': {
+      handler(newVal, oldVal){
+        console.log(newVal, oldVal);
+        this.showUserOrGroup();
+        newVal && this.getAreaData(newVal);
+        this.handlerDuty();
+      }
     },
-    changeDeptList() {
-      var that = this;
-      clearTimeout(that.timer);
-      that.timer = setTimeout(() => {
-        this.getDept(1);
-      }, 600);
-    }
   },
   created() {
-    console.log(this.$route.params.data);
     //获取事件来源
     this.getSource();
     // 优先级
@@ -1869,18 +1760,32 @@ export default {
     this.getHandlerUser();
     // 处理组
     this.getCandidateGroups();
-    // this.getbxcode();
     this.getMessage();
     // 事件单号
     this.getsjnum();
     // 故障现象
     this.getIncidentcategory();
-    this.getAreaData();
-    this.getPlaceData();
-    // 获取故障地点
-    // this.getFaultLocation();
     if (this.valConfig == 2) {
-      this.getDept();
+      // 获取院区列表
+      this.getBranchList();
+
+      // 回显选择的报修科室
+      if(this.$route.query.id && this.$route.query.dept){
+        this.model.requester = this.$route.query.dept;
+        // 回显科室信息
+        this.showUserOrGroup();
+        if(this.$route.query.areaId && this.$route.query.placeId && this.$route.query.areaName && this.$route.query.placeName){
+          this.model.placeValue = [+this.$route.query.areaId, +this.$route.query.placeId];
+          this.selectedPlaceTxt = this.$route.query.areaName + ' ' + this.$route.query.placeName;
+        }else{
+          this.model.placeValue = [];
+          this.selectedPlaceTxt = '';
+        }
+        this.model.contactsInformation = this.$route.query.phone;
+      }
+
+      // 回显院区
+      this.model.branch = this.loginUser.duty ? this.loginUser.duty.branch : this.loginUser.branch.id;
     }
   },
   beforeRouteLeave(to, from, next) {
@@ -1902,14 +1807,14 @@ export default {
     CubePage,
     CubeButtonGroup,
     DatePicker,
-    // JsonView
     CubeExtendPopup,
     LoadIng,
     PrompTing
   }
 };
 </script>
-<style>
+
+<style lang="less" scoped>
 .newIncident .cube-form-group {
   border-bottom: 0.02rem solid rgb(245, 245, 245);
 }
@@ -1924,10 +1829,6 @@ export default {
   background: none;
   border: none;
 }
-
-.btn_local {
-  /* z-index: 101; */
-}
 .inp_local {
   outline: none;
   width: 100%;
@@ -1953,8 +1854,6 @@ export default {
 .cube-picker-wheel-item {
   text-overflow: ellipsis;
 }
-</style>
-<style lang="less" scoped>
 .zc {
   display: flex;
   position: relative;

src/views/searchDept.vue

@@ -5,7 +5,7 @@
         class="mSearch-input-box"
         :mode="2"
         button="inside"
-        placeholder="输入关键字"
+        placeholder="请输入科室名称"
         @search="doSearch(false)"
         @input="changeInp"
         @confirm="doSearch(false)"
@@ -61,8 +61,6 @@ export default {
   },
   data() {
     return {
-      other: {},
-      model: {},
       reFresh: "",
       keyword: "",
       oldKeywordList: [],
@@ -81,20 +79,10 @@ export default {
     }
   },
   mounted() {
-    if(this.$route.query.model){
-      let other = JSON.parse(this.$route.query.other);
-      this.model = JSON.parse(this.$route.query.model);
-      this.other = other;
-    }
+    // this.$route.query.type
     this.init();
   },
   methods: {
-    // ...mapMutations('other', [
-    //   "changeSearchDeptResult",
-    //   "changeSeiminModel",
-    //   "changeSearchDeptResultList",
-    // ]),
-    // ...mapMutations("login", ["changeLoginInfo"]),
     init() {
       this.loadOldKeyword();
     },
@@ -124,20 +112,18 @@ export default {
       let postData = {
         idx: 0,
         sum: 9999,
-        incidentcategory: {
-          category: keyword,
+        department: {
+          dept: keyword,
           selectType: "pinyin_qs",
-          hierarchyQuery: "three"
         }
       };
       this.toast = this.$createToast({
-        time: 0,
         mask: true,
         txt: "正在加载中"
       });
       this.toast.show();
       this.$http
-        .post("service/user/data/fetchDataList/incidentcategory", postData)
+        .post("service/user/data/fetchDataList/department", postData)
         .then(res => {
           res = res.data;
           this.toast.hide();
@@ -176,13 +162,13 @@ export default {
         //定义高亮#9f9f9f
         var html = "";
         // 科室名称
-        html = row.mutiCategory.replace(
+        html = row.dept.replace(
           keyword,
           "<span style='color: #9f9f9f;'>" + keyword + "</span>"
         );
         html = "<div>" + html + "</div>";
         var tmpObj = {
-          keyword: row.mutiCategory,
+          keyword: row.dept,
           htmlStr: html
         };
         keywordArr.push(tmpObj);
@@ -221,20 +207,10 @@ export default {
       this.keyword = keyword;
       this.saveKeyword(keyword); //保存为历史
       let arr = this.deptList.filter(item => {
-        return item.mutiCategory === keyword;
+        return item.dept === keyword;
       });
       if (arr.length) {
-        // model
-        this.model.category = arr[0];
-        // this.$router.push(`/newIncident?id=${arr[0].id}&model=${JSON.stringify(this.model)}&other=${JSON.stringify(this.other)}`);
-        this.$router.push({
-          name: 'NewIncident',
-          params: {
-            id: arr[0].id,
-            model: this.model,
-            other: this.other,
-          },
-        })
+        this.$router.push(`/newIncident?id=${arr[0].id}&dept=${arr[0].dept}&phone=${arr[0].phone || ''}&areaId=${arr[0].place ? arr[0].place.area.id : ''}&areaName=${arr[0].place ? arr[0].place.area.area : ''}&placeId=${arr[0].place ? arr[0].place.id : ''}&placeName=${arr[0].place ? arr[0].place.place : ''}`);
       }
     },
     //保存关键字到历史记录
@@ -262,10 +238,6 @@ export default {
 };
 </script>
 <style lang="less" scoped>
-view {
-  display: block;
-}
-
 .search-box {
   background-color: rgb(242, 242, 242);
   padding: 0.15rem 2.5%;
@@ -406,7 +378,7 @@ view {
   color: #6b6b6b;
 }
 
-.keyword-box .keyword-block .keyword > view {
+.keyword-box .keyword-block .keyword > div {
   display: flex;
   justify-content: center;
   align-items: center;