分院区派单

src/views/incidentList.vue

@@ -550,12 +550,12 @@ export default {
     this.getData();
 
     localStorage.removeItem("modelData");
-    localStorage.removeItem("category");
-    localStorage.removeItem("categoryVal");
+    // localStorage.removeItem("category");
+    // localStorage.removeItem("categoryVal");
     localStorage.removeItem("referenceInfo");
     localStorage.removeItem("order");
     localStorage.removeItem("model");
-    localStorage.removeItem("selectedCategoryTxt");
+    // localStorage.removeItem("selectedCategoryTxt");
   }
 };
 </script>

src/views/indes.vue

@@ -406,12 +406,12 @@ export default {
       0,
       that.candidateGroups.length - 1
     );
-    localStorage.removeItem("category");
-    localStorage.removeItem("categoryVal");
-    localStorage.removeItem("selectedCategoryTxt");
+    // localStorage.removeItem("category");
+    // localStorage.removeItem("categoryVal");
+    // localStorage.removeItem("selectedCategoryTxt");
     localStorage.removeItem("model");
     localStorage.removeItem("modelData");
-    localStorage.removeItem("place");
+    // localStorage.removeItem("place");
     localStorage.removeItem("referenceInfo");
     localStorage.removeItem("solution");
     localStorage.removeItem("order");

src/views/newIncident.vue

@@ -217,7 +217,8 @@ const solution = {
       initVal: JSON.parse(localStorage.getItem("solution")) || [0, 0, 0],
       allPlace: {}, //存放请求到的所有区域地点
       sleectHouseNumber: {}, //区域地点
-      initSjList: [] //原始事件列表
+      initSjList: [], //原始事件列表
+      initAreaList: [], //原始区域列表
     };
   },
   render(createElement) {
@@ -764,12 +765,12 @@ export default {
     }
   },
   methods: {
-    // 切换处理方式liaomingming
+    // 切换处理方式
     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];
-      console.log(this.order,sj);
+      console.log(this.order, sj);
       this.isShowDes = !(this.order == 1 && sj && sj.hasSimple == 1);
     },
     //扫资产
@@ -1020,7 +1021,9 @@ export default {
       that.modelData.incident.description = that.model.description;
       // that.modelData.incident.emergency = { id: that.model.emergency };
       // that.modelData.incident.influence = { id: that.model.influence };
-      that.modelData.incident.priority = { id: that.model.priority };
+      if(that.model.priority){
+        that.modelData.incident.priority = { id: that.model.priority };
+      }
       that.modelData.incident.alarmType = false;
       if (that.order == 1) {
         // 直接处理
@@ -1156,16 +1159,16 @@ export default {
         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);
-      }
+      // 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() {
@@ -1248,10 +1251,10 @@ export default {
           }
         })
         .show();
-      localStorage.removeItem("category");
+      // localStorage.removeItem("category");
       localStorage.removeItem("model");
       localStorage.removeItem("modelData");
-      localStorage.removeItem("placeIndex");
+      // localStorage.removeItem("placeIndex");
       localStorage.removeItem("referenceInfo");
       localStorage.removeItem("solution");
       localStorage.removeItem("order");
@@ -1411,6 +1414,8 @@ export default {
     },
     // 选择事件分类
     selectCategoryHandler(selectedVal, selectedIndex, selectedTxt) {
+      // console.log(this.initSjList, "事件分类列表");
+      // console.log(this.model.category.slice(-1)[0], "事件分类");
       var selected = [];
       selectedTxt.forEach(function(v, i) {
         if (v != "") {
@@ -1420,40 +1425,86 @@ 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));
+      // 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.id;
-      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 = "";
+      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 = "";
+        }
       }
+
       console.log(this.order, sj.hasSimple);
       if (this.order == 1 && sj.hasSimple == 1) {
         // 直接处理 && 简单处理
-        // liaomingming
         this.isShowDes = false;
-      }else{
+      } else {
         this.isShowDes = true;
       }
     },
@@ -1507,9 +1558,10 @@ export default {
           that.categoryPicker = that.$createCascadePicker({
             title: "事件分类选择",
             data: that.selectData,
-            selectedIndex: localStorage.getItem("category")
-              ? JSON.parse(localStorage.getItem("category")).index
-              : [0, 0, 0],
+            // selectedIndex: localStorage.getItem("category")
+            //   ? JSON.parse(localStorage.getItem("category")).index
+            //   : [0, 0, 0],
+            selectedIndex:[0, 0, 0],
             onSelect: that.selectCategoryHandler
           });
           that.loadShow = false;
@@ -1542,25 +1594,73 @@ export default {
     },
     selectPlaceHandler(selectedVal, selectedIndex, selectedTxt) {
       console.log(selectedVal, selectedIndex, selectedTxt);
-      // this.inpLocalVal = this.model.address = selectedTxt; //seimin
-      // console.log(this.allPlace, "allPlace");
-      // this.allPlace.forEach(item => {
-      //   if (item.id == selectedVal && item.place) {
-      //     //如果存在地点
-      //     this.selectHouseNumber = this.allPlace[selectedIndex];
-      //   }
-      // });
-      // console.log(this.selectHouseNumber, 2222);
+      console.log(selectedVal[0], "区域");
+      console.log(this.initSjList, "事件分类列表");
+      console.log(this.model.category.slice(-1)[0], "事件分类");
       if (this.ifRoom == 1) {
         this.getRoomData(selectedVal[1]);
       }
       this.model.placeValue = selectedVal;
       this.selectedPlaceTxt = selectedTxt.join(" ");
-      var place = {
-        index: selectedIndex,
-        txt: this.model.houseNumber
-      };
-      localStorage.setItem("place", JSON.stringify(place));
+      // 分院区
+      // --------------------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) {
+            // 分院区开关打开的情况下
+            let areaId = this.model.placeValue[0]; //区域id
+            let areaObj = this.initAreaList.find(v => v.id == areaId);
+            let branchId = areaObj.branch;
+            let branchUserGroup =
+              categoryObj.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 = "";
+        }
+      } else {
+        this.order = 1;
+        this.model.handleUserOrGroup = false;
+        this.model.handlerUser = "";
+        this.model.candidateGroups = "";
+      }
+      // --------------------end---------------------
+      // var place = {
+      //   index: selectedIndex,
+      //   txt: this.model.houseNumber
+      // };
+      // localStorage.setItem("place", JSON.stringify(place));
     },
     // 报修科室
     showDeptPicker() {
@@ -1607,7 +1707,6 @@ export default {
       // localStorage.setItem("place", JSON.stringify(place));
     },
     getAreaData() {
-      var that = this;
       this.$http
         .post("service/user/data/fetchDataList/area", {
           idx: 0,
@@ -1616,10 +1715,11 @@ export default {
             wechatArea: true
           }
         })
-        .then(function(res) {
+        .then(res => {
+          this.initAreaList = JSON.parse(JSON.stringify(res.data.list));
           var data = res.data.list;
           for (var i = 0; i < data.length; i++) {
-            that.placeSelectData.push({
+            this.placeSelectData.push({
               text: data[i].area,
               value: data[i].id,
               children: []
@@ -1653,9 +1753,10 @@ export default {
           that.placePicker = that.$createCascadePicker({
             title: "区域地点选择",
             data: that.placeSelectData,
-            selectedIndex: localStorage.getItem("place")
-              ? JSON.parse(localStorage.getItem("place")).index
-              : [0, 0],
+            // selectedIndex: localStorage.getItem("place")
+            //   ? JSON.parse(localStorage.getItem("place")).index
+            //   : [0, 0],
+            selectedIndex: [0, 0],
             onSelect: that.selectPlaceHandler
           });
         });

src/views/processing.vue

@@ -985,12 +985,12 @@ export default {
           ? selected[selected.length - 1]
           : "";
         this.model.category = selectedVal;
-        localStorage.setItem("category", JSON.stringify(selectedIndex));
-        localStorage.setItem("categoryVal", JSON.stringify(selectedVal));
-        localStorage.setItem(
-          "selectedCategoryTxt",
-          JSON.stringify(this.selectedCategoryTxt)
-        );
+        // localStorage.setItem("category", JSON.stringify(selectedIndex));
+        // localStorage.setItem("categoryVal", JSON.stringify(selectedVal));
+        // localStorage.setItem(
+        //   "selectedCategoryTxt",
+        //   JSON.stringify(this.selectedCategoryTxt)
+        // );
       }
     },
     // 获取处理进度
@@ -1220,11 +1220,11 @@ export default {
       if (localStorage.getItem("order")) {
         that.order = localStorage.getItem("order") - 0;
       }
-      if (localStorage.getItem("selectedCategoryTxt")) {
-        that.selectedCategoryTxt = JSON.parse(
-          localStorage.getItem("selectedCategoryTxt")
-        );
-      }
+      // if (localStorage.getItem("selectedCategoryTxt")) {
+      //   that.selectedCategoryTxt = JSON.parse(
+      //     localStorage.getItem("selectedCategoryTxt")
+      //   );
+      // }
       that.getProgressInfo();
     },
     // 事件分类
@@ -1247,12 +1247,12 @@ export default {
         ? selected[selected.length - 1]
         : "";
       this.model.category = selectedVal;
-      localStorage.setItem("category", JSON.stringify(selectedIndex));
-      localStorage.setItem("categoryVal", JSON.stringify(selectedVal));
-      localStorage.setItem(
-        "selectedCategoryTxt",
-        JSON.stringify(this.selectedCategoryTxt)
-      );
+      // localStorage.setItem("category", JSON.stringify(selectedIndex));
+      // localStorage.setItem("categoryVal", JSON.stringify(selectedVal));
+      // localStorage.setItem(
+      //   "selectedCategoryTxt",
+      //   JSON.stringify(this.selectedCategoryTxt)
+      // );
       if (this.order == 1 && sj.hasSimple == 1) {
         this.isShowDes = false;
       }else{
@@ -1304,7 +1304,8 @@ export default {
             }
           });
 
-          if (!localStorage.getItem("category")) {
+          // if (!localStorage.getItem("category")) {
+          if (true) {
             let cate = that.modelData.incident.category;
             let cateGrand =
               cate.parentCategory &&
@@ -1363,22 +1364,22 @@ export default {
               );
             }, 500);
           } else {
-            that.selectData = tree;
-            // 获取事件分类并设置
-            that.setCategory();
-            that.categoryPicker = that.$createCascadePicker({
-              title: "事件分类选择",
-              data: that.selectData,
-              selectedIndex: JSON.parse(localStorage.getItem("category")) || [
-                0,
-                0,
-                0
-              ],
-              onSelect: that.selectCategoryHandler
-            });
-            that.model.category = JSON.parse(
-              localStorage.getItem("categoryVal")
-            );
+            // that.selectData = tree;
+            // // 获取事件分类并设置
+            // that.setCategory();
+            // that.categoryPicker = that.$createCascadePicker({
+            //   title: "事件分类选择",
+            //   data: that.selectData,
+            //   selectedIndex: JSON.parse(localStorage.getItem("category")) || [
+            //     0,
+            //     0,
+            //     0
+            //   ],
+            //   onSelect: that.selectCategoryHandler
+            // });
+            // that.model.category = JSON.parse(
+            //   localStorage.getItem("categoryVal")
+            // );
           }
           that.loadShow = false;
         });
@@ -1547,7 +1548,7 @@ export default {
                   }
                 })
                 .show();
-              localStorage.removeItem("category");
+              // localStorage.removeItem("category");
               localStorage.removeItem("model");
               localStorage.removeItem("modelData");
               localStorage.removeItem("referenceInfo");
@@ -1605,7 +1606,7 @@ export default {
                   }
                 })
                 .show();
-              localStorage.removeItem("category");
+              // localStorage.removeItem("category");
               localStorage.removeItem("model");
               localStorage.removeItem("modelData");
               localStorage.removeItem("referenceInfo");