报修类别

src/views/newIncident.vue

@@ -205,7 +205,9 @@ const solution = {
       initVal: JSON.parse(localStorage.getItem("solution")) || [0, 0, 0],
       allPlace: {}, //存放请求到的所有区域地点
       sleectHouseNumber: {}, //区域地点
-      initSjList: [] //原始事件列表
+      initSjList: [], //原始事件列表
+      selectedIndex:[0,0],
+      selectedIndexCate:[0,0,0],
     };
   },
   render(createElement) {
@@ -1005,86 +1007,73 @@ export default {
       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);
+    // 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 }
-      });
-    },
+    //   this.$router.push({
+    //     name: "ReferenceList",
+    //     params: { data: that.model.title }
+    //   });
+    // },
     // 获取页面数据
     getMessage() {
       var that = this;
 
       if (that.$route.params.data) {
         var inspecInfo = that.$route.params.data;
-        // 巡检生成事件
-        console.log(that.$route.params.abnormal);
-        that.model.contacts = inspecInfo.processUser.name;
-        that.model.contactsInformation = inspecInfo.processUser.phone
-          ? inspecInfo.processUser.phone
+        // 生成事件
+        that.model.contacts = inspecInfo.requester.name;
+        that.model.contactsInformation = inspecInfo.requester.mphone
+          ? inspecInfo.requester.mphone
           : "";
-        that.order = 2;
-        that.model.handleUserOrGroup = true;
-        that.model.source = 1552; //巡检生成事件来源默认为其他
-        // 处理人
-        if (inspecInfo.handlerUser) {
-          that.model.handlerUser = inspecInfo.handlerUser.id;
-        }
-        // that.modelData.incident.handlingPersonnelUser = {
-        //   id: that.model.handlerUser
-        // };
+        // that.order = 2;
+        // that.model.handleUserOrGroup = true;
+        that.model.source = 1549;
+        that.model.description = inspecInfo.incidentDescription;//caca
+        that.model.houseNumber = inspecInfo.address;//caca
+
+        if (inspecInfo.place) {
+          if (inspecInfo.place.id) {
+            that.model.placeValue[0] = inspecInfo.place.area.id;
+            that.model.placeValue[1] = inspecInfo.place.id;
+            that.selectedPlaceTxt = inspecInfo.place.area.area + ' ' + inspecInfo.place.place;
 
-        if (that.$route.params.abnormal) {
-          that.model.description = that.modelData.incident.description =
-            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;
+        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.model.placeValue[1] = that.loginUser.place.id;
         }
-      }
-
-      if (localStorage.getItem("model")) {
-        that.model = JSON.parse(localStorage.getItem("model"));
-        that.incidentTitle = that.model.title;
-      }
-      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("model")) {
+        //   that.model = JSON.parse(localStorage.getItem("model"));
+        //   that.incidentTitle = that.model.title;
+        // }
+        // 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);
       }
     },
     // 提交
@@ -1240,11 +1229,7 @@ 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));
+      this.selectedIndexCate = selectedIndex;
       // ----------------------回显其他数据---------------------
       console.log(selectedVal, "seimin");
       let reverseArr = selectedVal.filter(Boolean).reverse(); //数组翻转，取第一项不为空的
@@ -1313,14 +1298,43 @@ export default {
               });
             }
           });
-
-          that.selectData = tree;
+          var idCate = [0,0,0];
+          that.selectData = tree;//dada
+          //报修转事件,回显一级分类
+          var inspecInfo1 = that.$route.params.data;
+          if(inspecInfo1&&inspecInfo1.category){
+            that.selectData.forEach(function(v,i){
+              if(v.value == inspecInfo1.category.id){
+                idCate = [v.value,0,0];
+                that.selectedIndexCate = [i,0,0];
+                that.selectedCategoryTxt = v.text;
+              }
+            })
+            var sj = that.initSjList.find(function(v){
+              return v.id == inspecInfo1.category.id
+            })
+            console.log(sj);
+            if (sj.userOrGroupType === 1) {
+              //派人
+              that.order = 2;
+              that.model.handleUserOrGroup = true;
+              that.model.handlerUser = sj.handleUser.id;
+            } else if (sj.userOrGroupType === 2) {
+              //派组
+              that.order = 2;
+              that.model.handleUserOrGroup = false;
+              that.model.candidateGroups = sj.group.id;
+            } else {
+              that.order = 1;
+              that.model.handleUserOrGroup = false;
+              that.model.handlerUser = "";
+              that.model.candidateGroups = "";
+            }
+          }
           that.categoryPicker = that.$createCascadePicker({
             title: "事件分类选择",
             data: that.selectData,
-            selectedIndex: localStorage.getItem("category")
-              ? JSON.parse(localStorage.getItem("category")).index
-              : [0, 0, 0],
+            selectedIndex: that.selectedIndexCate,
             onSelect: that.selectCategoryHandler
           });
         });
@@ -1330,6 +1344,7 @@ export default {
       this.placePicker.show();
     },
     selectPlaceHandler(selectedVal, selectedIndex, selectedTxt) {
+      console.log(this.placeSelectData);
       console.log(selectedVal, selectedIndex, selectedTxt);
       // this.inpLocalVal = this.model.address = selectedTxt; //seimin
       // console.log(this.allPlace, "allPlace");
@@ -1342,11 +1357,7 @@ export default {
       // console.log(this.selectHouseNumber, 2222);
       this.model.placeValue = selectedVal;
       this.selectedPlaceTxt = selectedTxt.join(" ");
-      var place = {
-        index: selectedIndex,
-        txt: this.model.houseNumber
-      };
-      localStorage.setItem("place", JSON.stringify(place));
+      this.selectedIndex = selectedIndex;
     },
     // 报修科室
     showDeptPicker() {
@@ -1370,12 +1381,6 @@ export default {
       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() {
@@ -1385,12 +1390,6 @@ export default {
         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() {
       var that = this;
@@ -1435,13 +1434,23 @@ export default {
               }
             }
           }
-
+          var areaIndex = 0;
+          var placeIndex = 0;
+          that.placeSelectData.forEach(function(v,i){
+            if(that.model.placeValue[0] == v.value){
+              areaIndex = i;
+            }
+          })
+          that.placeSelectData[areaIndex].children.forEach(function(v,i){
+            if(that.model.placeValue[1] == v.value){
+              placeIndex = i;
+            }
+          })
+          that.selectedIndex = [areaIndex, placeIndex]
           that.placePicker = that.$createCascadePicker({
             title: "区域地点选择",
             data: that.placeSelectData,
-            selectedIndex: localStorage.getItem("place")
-              ? JSON.parse(localStorage.getItem("place")).index
-              : [0, 0],
+            selectedIndex: that.selectedIndex,
             onSelect: that.selectPlaceHandler
           });
         });
@@ -1478,9 +1487,6 @@ export default {
           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;

src/views/wxChartDetail.vue

@@ -32,6 +32,10 @@
                 ></span
               >
             </p>
+            <p v-if="model.category">
+              <span>报修类别:</span>
+              <span>{{ model.category.category }}</span>
+            </p>
             <p>
               <span>报修地址:</span>
               <span
@@ -81,7 +85,9 @@
               <span>{{ model.rejectRemark || "" }}</span>
             </p>
           </div>
-          <HandlerLog :data="model.incident.handlerLogs"></HandlerLog>
+          <template v-if="model.incident">
+            <HandlerLog :data="model.incident.handlerLogs"></HandlerLog>
+          </template>
         </div>
         <div v-if="model.incidentState.value == 0" class="btnBox">
           <cube-button @click="showPicker()">操作</cube-button>