增加院区字段

src/components/EventInformation/index.vue

@@ -109,6 +109,12 @@
         <span class="fr">{{ model.incident.overdueTime }}</span>
       </p>
       <p>
+        <span class="fl">校区</span>
+        <span class="fr">{{
+          model.incident.branch ? model.incident.branch.hosName : "--"
+        }}</span>
+      </p>
+      <p>
         <span class="fl">区域</span>
         <span class="fr">{{
           model.incident.place ? model.incident.place.area.area : "--"

src/components/form/form-item.vue

@@ -299,6 +299,7 @@
     align-items: center
     word-wrap: break-word
     word-break: break-word
+    flex-shrink: 0
   .cube-form-item_required
     .cube-form-label
       &::before

src/views/incidentList.vue

@@ -79,7 +79,7 @@
                   <span
                     v-if="item.place"
                     style="width:70%;white-space:nowrap;overflow:hidden;text-overflow:ellipsis;"
-                    >{{ item.place.area.area }} {{ item.place.place }}
+                    >{{ item.branch?item.branch.hosName:'' }} {{ item.place.area.area }} {{ item.place.place }}
                     {{ item.houseNumber }}</span
                   >
                   <span>{{ item.acceptDate | timeFormat("MM-dd HH:mm") }}</span>

src/views/newIncident.vue

@@ -52,7 +52,7 @@
         <cube-form-item :field="fields[1]"></cube-form-item>
         <cube-form-item :field="fields[2]" class="btn_plcaeholde">
           <cube-button @click="showPlacePicker()">{{
-            selectedPlaceTxt ? selectedPlaceTxt : "请选择区域地点"
+            selectedPlaceTxt ? selectedPlaceTxt : "请选择校区区域地点"
           }}</cube-button>
         </cube-form-item>
         <cube-form-item :field="fields[23]" v-if="ifRoom == 1"></cube-form-item>
@@ -215,11 +215,11 @@ const solution = {
       selected: [],
       selectData: [],
       initVal: JSON.parse(localStorage.getItem("solution")) || [0, 0, 0],
-      allPlace: {}, //存放请求到的所有区域地点
-      sleectHouseNumber: {}, //区域地点
+      allPlace: {}, //存放请求到的所有校区区域地点
+      sleectHouseNumber: {}, //校区区域地点
       initSjList: [], //原始事件列表
-      initAreaList: [], //原始区域列表
-      selectedIndex: [0, 0],
+      // initAreaList: [], //原始区域列表
+      selectedIndex: [0, 0, 0],
       selectedIndexCate: [0, 0, 0]
     };
   },
@@ -351,9 +351,9 @@ export default {
       incidentTitle: "", //事件主题
       referenceInfo: {}, //引用信息
       roomSelectData: [], //房间下拉框选项
-      placeSelectData: [], //区域地点下拉框选项
+      placeSelectData: [], //校区区域地点下拉框选项
       inpLocalVal: "", //故障地点输入框
-      faultLocationList: [], //区域地点拼接下拉框选项
+      faultLocationList: [], //校区区域地点拼接下拉框选项
       deptInpVal: "", //报修科室输入框
       deptList: [], //报修科室下拉选项
       deptRes: "", //下拉框科室信息
@@ -383,7 +383,7 @@ export default {
         room: "" //房间号
       },
       selectedCategoryTxt: "", //事件分类选中展示
-      selectedPlaceTxt: "", //区域地点选中展示
+      selectedPlaceTxt: "", //校区区域地点选中展示
       // showPrompting:false,
       promptingConent: "",
       promptingStatus: "",
@@ -434,12 +434,12 @@ export default {
         {
           component: "button",
           modelKey: "placeValue",
-          label: "区域地点:",
+          label: "校区区域地点:",
           rules: {
             required: false
           },
           messages: {
-            required: "请选择区域地点"
+            required: "请选择校区区域地点"
           }
         },
         {
@@ -1003,15 +1003,20 @@ export default {
         }
       });
       solutionType = a2;
-      if (that.model.placeValue.length == 2) {
-        that.model.areaId =
-          that.model.placeValue[that.model.placeValue.length - 2];
-        that.model.placeId =
-          that.model.placeValue[that.model.placeValue.length - 1];
-      } else if (that.model.placeValue.length == 1) {
-        that.model.areaId =
-          that.model.placeValue[that.model.placeValue.length - 1];
-        that.model.placeId = "";
+      // if (that.model.placeValue.length == 2) {
+      //   that.model.areaId =
+      //     that.model.placeValue[that.model.placeValue.length - 2];
+      //   that.model.placeId =
+      //     that.model.placeValue[that.model.placeValue.length - 1];
+      // } else if (that.model.placeValue.length == 1) {
+      //   that.model.areaId =
+      //     that.model.placeValue[that.model.placeValue.length - 1];
+      //   that.model.placeId = "";
+      // }
+      if (that.model.placeValue.length === 3){
+          that.model.branchId = that.model.placeValue[0];
+          that.model.areaId = that.model.placeValue[1];
+          that.model.placeId = that.model.placeValue[2];
       }
 
       // that.modelData.incident.houseNumber = that.model.address[0];
@@ -1026,8 +1031,9 @@ export default {
       if (that.wxIncidentWithCmdb == 1) {
         that.modelData.incident.assetId = that.model.assetId;
       }
-      that.modelData.incident.area = { id: that.model.areaId };
-      that.modelData.incident.place = { id: that.model.placeId };
+      that.modelData.incident.branch = that.model.branchId?{ id: that.model.branchId }:undefined;
+      that.modelData.incident.area = that.model.areaId?{ id: that.model.areaId }:undefined;
+      that.modelData.incident.place = that.model.placeId?{ id: that.model.placeId }:undefined;
       that.modelData.incident.category = {
         id: category[category.length - 1]
       };
@@ -1197,6 +1203,7 @@ export default {
         that.selectHouseNumber,
         "2020年4月25日14:09:29"
       );
+      // debugger;//测试
       //服务台生成事件
       if (this.$route.params.data && this.$route.params.data.id) {
         that.modelData.flow = this.$route.params.data.id;
@@ -1467,36 +1474,25 @@ export default {
         }
       } else if (sj.branchType == 1) {
         // 分院区
-        // liaomingming
-        let areaId = this.model.placeValue[0]; //区域id
-        console.log(this.initAreaList);
-        if (areaId) {
+        let branchId = this.model.placeValue[0]; //校区id
+        if (branchId) {
           // 选择了区域
-          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 = "";
-            }
+          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;
@@ -1678,7 +1674,7 @@ export default {
           that.loadShow = false;
         });
     },
-    // 区域地点
+    // 校区区域地点
     showPlacePicker() {
       this.placePicker.show();
     },
@@ -1704,14 +1700,12 @@ 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) {
             // 分院区开关打开的情况下
-            let areaId = this.model.placeValue[0]; //区域id
-            let areaObj = this.initAreaList.find(v => v.id == areaId);
-            let branchId = areaObj.branch;
+            let branchId = this.model.placeValue[0]; //校区id
             let branchUserGroup =
               categoryObj.branchUserGroups.find(v => v.branchId == branchId) ||
               {};
@@ -1787,29 +1781,28 @@ export default {
         this.model.requester = "";
       }
     },
-    getAreaData() {
-      this.$http
-        .post("/service/user/data/fetchDataList/area", {
-          idx: 0,
-          sum: 1000,
-          area: {
-            wechatArea: true
-          }
-        })
-        .then(res => {
-          this.initAreaList = JSON.parse(JSON.stringify(res.data.list));
-          var data = res.data.list;
-          for (var i = 0; i < data.length; i++) {
-            this.placeSelectData.push({
-              text: data[i].area,
-              value: data[i].id,
-              children: []
-            });
-          }
-        });
-    },
+    // getAreaData() {
+    //   this.$http
+    //     .post("/service/user/data/fetchDataList/area", {
+    //       idx: 0,
+    //       sum: 1000,
+    //       area: {
+    //         wechatArea: true
+    //       }
+    //     })
+    //     .then(res => {
+    //       this.initAreaList = JSON.parse(JSON.stringify(res.data.list));
+    //       var data = res.data.list;
+    //       for (var i = 0; i < data.length; i++) {
+    //         this.placeSelectData.push({
+    //           text: data[i].area,
+    //           value: data[i].id,
+    //           children: []
+    //         });
+    //       }
+    //     });
+    // },
     getPlaceData() {
-      var that = this;
       this.$http
         .post("/service/user/data/fetchDataList/place", {
           idx: 0,
@@ -1818,44 +1811,90 @@ export default {
             wechatAreaId: ""
           }
         })
-        .then(function(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({
-                  text: data[i].place,
-                  value: data[i].id
-                });
-              }
+        .then((res) => {
+          let 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({
+          //         text: data[i].place,
+          //         value: data[i].id
+          //       });
+          //     }
+          //   }
+          // }
+          // -------------------------start
+          console.log(data, 'data');
+          this.placeSelectData = [];
+          const collectionBranch = {};
+          data.forEach((v) => {
+            if(collectionBranch[v.area.branch]){
+              collectionBranch[v.area.branch].push(v);
+            }else{
+              this.placeSelectData.push({text:v.area.branchName, value: v.area.branch, children: []})
+              collectionBranch[v.area.branch] = [v];
             }
-          }
+          })
+
+          this.placeSelectData.forEach(v => {
+            let areaByPlace = collectionBranch[v.value];
+            let areaCollection = {};
+            let areaArr = [];
+            areaByPlace.forEach(vv => {
+              if(areaCollection[vv.area.id]){
+                areaCollection[vv.area.id].push({text:vv.place, value: vv.id});
+              }else{
+                areaArr.push({text:vv.area.area, value: vv.area.id, children: []})
+                areaCollection[vv.area.id] = [{text:vv.place, value: vv.id}];
+              }
+            })
+            areaArr.forEach(vv => {
+              vv.children = areaCollection[vv.value];
+            })
+            v.children = areaArr;
+          })
+
+          console.log(collectionBranch,'collectionBranch集合');
+          console.log(this.placeSelectData,'地点');
+          // this.placePicker = this.$createCascadePicker({
+          //   title: "校区区域地点选择",
+          //   data: this.placeSelectData,
+          //   selectedIndex: [0, 0, 0],
+          //   onSelect: this.selectPlaceHandler
+          // });
+          // -------------------------end
+          var branchIndex = 0;
           var areaIndex = 0;
           var placeIndex = 0;
-          that.placeSelectData.forEach(function(v, i) {
-            if (that.model.placeValue[0] == v.value) {
+          this.placeSelectData.forEach((v, i) => {
+            if (this.model.placeValue[0] == v.value) {
+              branchIndex = i;
+            }
+          });
+          this.placeSelectData[branchIndex].children.forEach((v, i) => {
+            if (this.model.placeValue[1] == v.value) {
               areaIndex = i;
             }
           });
-          that.placeSelectData[areaIndex].children.forEach(function(v, i) {
-            if (that.model.placeValue[1] == v.value) {
+          this.placeSelectData[branchIndex].children[areaIndex].children.forEach((v, i) => {
+            if (this.model.placeValue[2] == v.value) {
               placeIndex = i;
             }
           });
-          that.selectedIndex = [areaIndex, placeIndex];
-          that.placePicker = that.$createCascadePicker({
-            title: "区域地点选择",
-            data: that.placeSelectData,
-            selectedIndex: that.selectedIndex,
-            onSelect: that.selectPlaceHandler
+          this.selectedIndex = [branchIndex, areaIndex, placeIndex];
+          this.placePicker = this.$createCascadePicker({
+            title: "校区区域地点选择",
+            data: this.placeSelectData,
+            selectedIndex: this.selectedIndex,
+            onSelect: this.selectPlaceHandler
           });
           if (
-            that.ifRoom == 1 &&
-            that.$route.params.data &&
-            that.$route.params.data.room
+            this.ifRoom == 1 &&
+            this.$route.params.data &&
+            this.$route.params.data.room
           ) {
             // 初始化房间号
-            that.getRoomData(that.$route.params.data.place.id);
+            this.getRoomData(this.$route.params.data.place.id);
           }
         });
     },
@@ -1890,7 +1929,7 @@ export default {
           console.log(that.faultLocationList);
 
           that.placePicker = that.$createCascadePicker({
-            title: "区域地点选择",
+            title: "校区区域地点选择",
             data: that.faultLocationList,
             onSelect: that.selectPlaceHandler
           });
@@ -1971,7 +2010,7 @@ export default {
     this.getsjnum();
     // 事件分类
     this.getIncidentcategory();
-    this.getAreaData();
+    // this.getAreaData();
     this.getPlaceData();
     // 获取故障地点
     // this.getFaultLocation();
@@ -2005,7 +2044,7 @@ export default {
   }
 };
 </script>
-<style>
+<style scoped>
 .newIncident .cube-form-group {
   border-bottom: 0.02rem solid rgb(245, 245, 245);
 }
@@ -2019,11 +2058,9 @@ export default {
   color: inherit;
   background: none;
   border: none;
+  white-space: normal;
 }
 
-.btn_local {
-  /* z-index: 101; */
-}
 .inp_local {
   outline: none;
   width: 100%;