增加分院区

src/views/incidentList.vue

@@ -355,12 +355,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/newIncident.vue

@@ -218,6 +218,7 @@ const solution = {
       allPlace: {}, //存放请求到的所有区域地点
       sleectHouseNumber: {}, //区域地点
       initSjList: [], //原始事件列表
+      initAreaList: [], //原始区域列表
       selectedIndex: [0, 0],
       selectedIndexCate: [0, 0, 0]
     };
@@ -767,7 +768,7 @@ export default {
     }
   },
   methods: {
-    // 切换处理方式liaomingming
+    // 切换处理方式
     changeHandleTypes() {
       let reverseArr = this.model.category.filter(Boolean).reverse(); //数组翻转，取第一项不为空的
       let sjId = reverseArr[0]; //事件Id baba
@@ -1048,7 +1049,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) {
         // 直接处理
@@ -1265,10 +1268,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");
@@ -1296,7 +1299,6 @@ export default {
                 (this.integralMechanism == 2 &&
                   this.loginUser.userType.value == 2))
             ) {
-              //liaomingming
               this.$http
                 .post("service/common/common/getDictionary", {
                   key: "incident_integral_state",
@@ -1442,30 +1444,75 @@ export default {
       // ----------------------回显其他数据---------------------
       console.log(selectedVal, "seimin");
       let reverseArr = selectedVal.filter(Boolean).reverse(); //数组翻转，取第一项不为空的
-      let sjId = reverseArr[0]; //事件Id baba
+      let sjId = reverseArr[0]; //事件Id
       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.id;
-      } else if (sj.userOrGroupType === 2) {
-        //派组
-        this.order = 2;
-        this.model.handleUserOrGroup = false;
-        this.model.candidateGroups = 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 {
         this.isShowDes = true;
@@ -1480,7 +1527,7 @@ export default {
           idx: 0,
           sum: 1000
         })
-        .then(function(res) {
+        .then(res => {
           that.initSjList = JSON.parse(JSON.stringify(res.data.list));
           var list = res.data.list;
           var tree = [];
@@ -1517,7 +1564,7 @@ export default {
             }
           });
           var idCate = [0, 0, 0];
-          that.selectData = tree; //dada
+          that.selectData = tree;
           //报修转事件,回显一级分类
           var inspecInfo1 = that.$route.params.data;
           if (inspecInfo1 && inspecInfo1.category) {
@@ -1556,6 +1603,77 @@ export default {
             selectedIndex: that.selectedIndexCate,
             onSelect: that.selectCategoryHandler
           });
+          // ----------------------start--------------------
+          if (
+            this.$route.params.data.category &&
+            this.$route.params.data.place
+          ) {
+            // 有区域和事件分类
+            let sj = this.$route.params.data.category;
+            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.$route.params.data.place.area.id; //区域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 = "";
+              }
+            }
+          }
+          // ----------------------end--------------------
           that.loadShow = false;
         });
     },
@@ -1581,6 +1699,60 @@ export default {
       this.model.placeValue = selectedVal;
       this.selectedPlaceTxt = selectedTxt.join(" ");
       this.selectedIndex = selectedIndex;
+      // 分院区
+      // --------------------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---------------------
     },
     // 报修科室
     showDeptPicker() {
@@ -1615,7 +1787,6 @@ export default {
       }
     },
     getAreaData() {
-      var that = this;
       this.$http
         .post("/service/user/data/fetchDataList/area", {
           idx: 0,
@@ -1624,10 +1795,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: []

src/views/processing.vue

@@ -849,12 +849,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)
+        // );
       }
     },
     // 获取处理进度
@@ -1084,11 +1084,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();
     },
     // 事件分类
@@ -1108,12 +1108,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)
+      // );
     },
     getIncidentcategory() {
       var that = this;
@@ -1158,7 +1158,8 @@ export default {
             }
           });
 
-          if (!localStorage.getItem("category")) {
+          // if (!localStorage.getItem("category")) {
+          if (true) {
             let cate = that.modelData.incident.category;
             let cateGrand =
               cate.parentCategory &&
@@ -1217,20 +1218,20 @@ 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")
+            // );
           }
         });
     },
@@ -1379,7 +1380,7 @@ export default {
                   },
                 })
                 .show();
-              localStorage.removeItem("category");
+              // localStorage.removeItem("category");
               localStorage.removeItem("model");
               localStorage.removeItem("modelData");
               localStorage.removeItem("referenceInfo");
@@ -1437,7 +1438,7 @@ export default {
                   },
                 })
                 .show();
-              localStorage.removeItem("category");
+              // localStorage.removeItem("category");
               localStorage.removeItem("model");
               localStorage.removeItem("modelData");
               localStorage.removeItem("referenceInfo");

src/views/wxChartDetail.vue

@@ -179,7 +179,6 @@ export default {
           name: "NewIncident",
           params: {
             data: this.model,
-            id: this.model.id
           }
         });
       } else if (selectedVal == 1) {