提交

src/components/form/form.vue

@@ -342,8 +342,9 @@
           -webkit-text-stroke-width: 0.2px
           -moz-osx-font-smoothing: grayscale
     .cube-form-label
-      width: 100px
+      width: 120px
       padding-right: 10px
+      flex-shrink: 0
     .cube-checkbox-group, .cube-radio-group
       &::before, &::after
         display: none

src/router/index.js

@@ -56,7 +56,7 @@ export default new Router({
       ]
     },
     {
-      path: '/repair/:data',
+      path: '/repair/:data?',
       component: Repair,
       name: 'Repair',
       meta: { allowBack: false },

src/views/Login.vue

@@ -209,9 +209,9 @@ export default {
             "loginConfig",
             JSON.stringify({ username: this.zhanghao, password: this.mima })
           );
-          // 判断是否有区域地点或联系电话，没有则需要补充
+          // 判断是否有区域地点或联系电话或校区，没有则需要补充
           var requester = res.data.data.requester;
-          if (!requester.place || !requester.mphone) {
+          if (!requester.place || !requester.mphone || !requester.branch) {
             this.$router.push({ path: "/supplementary" });
           } else {
             this.loginNext(res.data.data.requester);

src/views/incidentDetails.vue

@@ -8,7 +8,7 @@
         <div>报修编号:&nbsp;{{ data.bxcode }}</div>
         <div :class="stateClassFn(data.state.name)">{{ data.state.name }}</div>
       </div>
-      <div class="description" v-if="data.incident.category">
+      <div class="description" v-if="data.category && data.category.category">
         <div>
           报修类别:
         </div>
@@ -44,7 +44,7 @@
         </div>
         <div>
           <template v-if="data.place">
-            {{ data.place.area.area }} {{ data.place.place }}
+            {{ data.branch?data.branch.hosName:'' }} {{ data.place.area.area }} {{ data.place.place }}
           {{ data.address }}
           </template>
         </div>

src/views/indes.vue

@@ -306,7 +306,8 @@ export default {
         });
     },
     toRapir() {
-      this.$router.push({ name: "Repair", params: { data: "" } });
+      // this.$router.push({ name: "Repair", params: { data: "" } });
+      this.$router.push('/repair');
     },
     toNoticeDetails(data) {
       this.$router.push({

src/views/my.vue

@@ -32,12 +32,12 @@
           <div v-if="repairMain.valueconfig != 1 && !loginUser.dept">暂无</div>
         </li>
         <li class="myArea">
-          <div>区域地点</div>
+          <div>校区区域地点</div>
           <div>
             <cube-button @click="showCascadePicker">
               {{ areaData || "暂无" }}
-              <i class="iconfont icon-moren"></i>
             </cube-button>
+            <i class="iconfont icon-moren"></i>
           </div>
         </li>
         <li>
@@ -173,9 +173,8 @@ export default {
       });
     },
     getUserAreaData() {
-      if (this.loginUser.place) {
-        this.areaData =
-          this.loginUser.place.area.area + " " + this.loginUser.place.place;
+      if (this.loginUser.place && this.loginUser.branch) {
+        this.areaData = this.loginUser.branch.hosName + " " +this.loginUser.place.area.area + " " + this.loginUser.place.place;
       }
     },
     toIncidentList(res) {
@@ -220,7 +219,6 @@ export default {
         });
     },
     getPlaceData() {
-      var that = this;
       this.$http
         .post("service/user/data/fetchDataList/place", {
           idx: 0,
@@ -229,24 +227,56 @@ 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.treeData.length; j++) {
-              if (data[i].area.id == that.treeData[j].value) {
-                that.treeData[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.treeData.length; j++) {
+          //     if (data[i].area.id == that.treeData[j].value) {
+          //       that.treeData[j].children.push({
+          //         text: data[i].place,
+          //         value: data[i].id
+          //       });
+          //     }
+          //   }
+          // }
+          console.log(data, 'data');
+          this.treeData = [];
+          const collectionBranch = {};
+          data.forEach((v) => {
+            if(collectionBranch[v.area.branch]){
+              collectionBranch[v.area.branch].push(v);
+            }else{
+              this.treeData.push({text:v.area.branchName, value: v.area.branch, children: []})
+              collectionBranch[v.area.branch] = [v];
             }
-          }
-          that.cascadePicker = that.$createCascadePicker({
-            title: "请选择区域地点",
-            data: that.treeData,
-            selectedIndex: [0, 0],
-            onSelect: that.selectHandle,
-            onCancel: that.cancelHandle
+          })
+
+          this.treeData.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.treeData,'地点');
+          this.cascadePicker = this.$createCascadePicker({
+            title: "请选择校区区域地点",
+            data: this.treeData,
+            selectedIndex: [0, 0, 0],
+            onSelect: this.selectHandle,
+            onCancel: this.cancelHandle
           });
         });
     },
@@ -257,12 +287,12 @@ export default {
       var that = this;
       this.$http
         .get(
-          "service/user/updPlace/" + this.loginUser.id + "/" + selectedVal[1],
+          "service/user/updPlace/" + this.loginUser.id + "/" + selectedVal[2],
           {}
         )
         .then(function(res) {
           if (res.status == 200) {
-            that.promptingConent = "恭喜您,修改区域地点成功!";
+            that.promptingConent = "恭喜您,修改校区区域地点成功!";
             that.promptingStatus = true;
             $("#fade").fadeIn();
             setTimeout(function() {
@@ -273,13 +303,15 @@ export default {
                 area: {}
               };
             }
+            that.loginUser.branch = {id: selectedVal[0]};
             that.loginUser.place.id = selectedVal[1];
             that.loginUser.place.area.id = selectedVal[0];
+            that.loginUser.branch.hosName = selectedText[0];
             that.loginUser.place.place = selectedText[1];
             that.loginUser.place.area.area = selectedText[0];
             var loginUserStr = JSON.stringify(that.loginUser);
             localStorage.setItem("loginUser", loginUserStr);
-            that.areaData = selectedText[0] + " " + selectedText[1];
+            that.areaData = selectedText[0] + " " + selectedText[1] + " " + selectedText[2];
           } else {
             that.promptingConent = "对不起,修改失败,请稍后再试!";
             that.promptingStatus = false;
@@ -302,7 +334,7 @@ export default {
   },
   mounted() {
     // this.cascadePicker = this.$createCascadePicker({
-    //     title: '请选择区域地点',
+    //     title: '请选择校区区域地点',
     //     data: this.treeData,
     //     selectedIndex: [0,0],
     //     onSelect: this.selectHandle,
@@ -466,7 +498,7 @@ export default {
   color: #333333 !important;
   text-align: right !important;
   overflow: hidden;
-  white-space: nowrap;
+  white-space: normal;
   text-overflow: ellipsis;
 }
 </style>

src/views/repair.vue

@@ -105,7 +105,7 @@ const PCA = {
           click: this.showPicker
         }
       },
-      this.selected.length ? this.selected.join(" ") : "请选择区域地点"
+      this.selected.length ? this.selected.join(" ") : "请选择校区区域地点"
     );
   },
   mounted() {},
@@ -145,49 +145,89 @@ const PCA = {
     },
     getPlaceData() {
       this.$parent.$parent.$parent.$parent.$parent.loadShow = true;
-      var that = this;
       this.$http
         .post("service/user/data/fetchDataList/place", {
           idx: 0,
           sum: 1000,
-          area: {
-            wechatAreaId: ""
-          }
         })
         .then(res => {
-          var data = res.data.list;
-          for (var i = 0; i < data.length; i++) {
-            for (var j = 0; j < that.selectData.length; j++) {
-              if (data[i].area.id == that.selectData[j].value) {
-                that.selectData[j].children.push({
-                  text: data[i].place,
-                  value: data[i].id
-                });
-              }
+          let data = res.data.list;
+          // for (var i = 0; i < data.length; i++) {
+          //   for (var j = 0; j < that.selectData.length; j++) {
+          //     if (data[i].area.id == that.selectData[j].value) {
+          //       that.selectData[j].children.push({
+          //         text: data[i].place,
+          //         value: data[i].id
+          //       });
+          //     }
+          //   }
+          // }
+          // -------------------------start
+          console.log(data, 'data');
+          this.selectData = [];
+          const collectionBranch = {};
+          data.forEach((v) => {
+            if(collectionBranch[v.area.branch]){
+              collectionBranch[v.area.branch].push(v);
+            }else{
+              this.selectData.push({text:v.area.branchName, value: v.area.branch, children: []})
+              collectionBranch[v.area.branch] = [v];
             }
-          }
-          console.log(that.selectData);
+          })
+
+          this.selectData.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.selectData,'地点');
+          // this.picker = this.$createCascadePicker({
+          //   title: "校区区域地点选择",
+          //   data: this.selectData,
+          //   selectedIndex: [0, 0, 0],
+          //   onSelect: this.selectHandler
+          // });
+          // -------------------------end
           let loginUser = JSON.parse(localStorage.getItem("loginUser"));
-          let areaIndex = that.selectData.findIndex(
+          let branchIndex = this.selectData.findIndex(
+            v => v.value == loginUser.branch.id
+          );
+
+          let areaIndex = this.selectData[branchIndex].children.findIndex(
             v => v.value == loginUser.place.area.id
           );
-          let placeIndex = that.selectData
-            .find(v => v.value == loginUser.place.area.id)
-            .children.findIndex(v => v.value == loginUser.place.id);
-          that.selectIndex = [areaIndex, placeIndex];
-          that.picker = that.$createCascadePicker({
-            title: "区域地点选择",
-            data: that.selectData,
-            selectedIndex: that.selectIndex,
-            onSelect: that.selectHandler
+
+          let placeIndex = this.selectData[branchIndex].children[areaIndex].children.findIndex(v => v.value == loginUser.place.id);
+
+          this.selectIndex = [branchIndex, areaIndex, placeIndex];
+          this.picker = this.$createCascadePicker({
+            title: "校区区域地点选择",
+            data: this.selectData,
+            selectedIndex: this.selectIndex,
+            onSelect: this.selectHandler
           });
           this.$parent.$parent.$parent.$parent.$parent.loadShow = false;
         });
     },
     getParamsPlace() {
       var data = JSON.parse(localStorage.getItem("loginUser"));
-      this.selected[0] = data.place.area.area;
-      this.selected[1] = data.place.place;
+      this.selected[0] = data.branch?data.branch.hosName:'';
+      this.selected[1] = data.place.area.area;
+      this.selected[2] = data.place.place;
       if (this.$parent.$parent.$parent.$parent.$parent.ifRoom == 1) {
         this.getRoomData(data.place.id);
       }
@@ -325,12 +365,12 @@ export default {
         {
           component: PCA,
           modelKey: "pcaValue",
-          label: "区域地点:",
+          label: "校区区域地点:",
           rules: {
             required: true
           },
           messages: {
-            required: "请选择区域地点"
+            required: "请选择校区区域地点"
           }
         },
         {
@@ -467,14 +507,19 @@ export default {
       });
     },
     submitHandler() {
-      if (this.model.pcaValue.length == 2) {
-        this.model.areaId = this.model.pcaValue[this.model.pcaValue.length - 2];
-        this.model.placeId = this.model.pcaValue[
-          this.model.pcaValue.length - 1
-        ];
-      } else if (this.model.pcaValue.length == 1) {
-        this.model.areaId = this.model.pcaValue[this.model.pcaValue.length - 1];
-        this.model.placeId = "";
+      // if (this.model.pcaValue.length == 2) {
+      //   this.model.areaId = this.model.pcaValue[this.model.pcaValue.length - 2];
+      //   this.model.placeId = this.model.pcaValue[
+      //     this.model.pcaValue.length - 1
+      //   ];
+      // } else if (this.model.pcaValue.length == 1) {
+      //   this.model.areaId = this.model.pcaValue[this.model.pcaValue.length - 1];
+      //   this.model.placeId = "";
+      // }
+      if (this.model.pcaValue.length == 3) {
+        this.model.branch = {id: this.model.pcaValue[0]};
+        this.model.areaId = this.model.pcaValue[1];
+        this.model.placeId = this.model.pcaValue[2];
       }
 
       this.model["requester"] = this.loginUser;
@@ -491,7 +536,7 @@ export default {
         },
         incident: JSON.parse(JSON.stringify(this.model))
       };
-      //  报修主体是报修科室的时候，不传科室id艺洛
+      //  报修主体是报修科室的时候，不传科室id
       if (this.repairMain.valueconfig == 2) {
         reqData.incident.deptId = this.deptIdNum;
       } else {
@@ -658,8 +703,9 @@ export default {
           : "";
       this.model.contacts = this.loginUser.name;
       this.model.address = this.loginUser.houseNumber;
-      this.model.pcaValue[0] = this.loginUser.place.area.id;
-      this.model.pcaValue[1] = this.loginUser.place.id;
+      this.model.pcaValue[0] = this.loginUser.branch.id;
+      this.model.pcaValue[1] = this.loginUser.place.area.id;
+      this.model.pcaValue[2] = this.loginUser.place.id;
       this.model.deptId = this.loginUser.dept ? this.loginUser.dept.dept : "";
     }
   },
@@ -794,6 +840,7 @@ export default {
   color: inherit;
   background: none;
   border: none;
+  white-space: normal;
 }
 .cube-form_standard .cube-upload-def .cube-upload-btn,
 .cube-form_standard .cube-upload-def .cube-upload-file {

src/views/supplementary.vue

@@ -23,12 +23,12 @@
           </div>
         </li>
         <li class="myArea">
-          <div>区域地点</div>
-          <div>
-            <cube-button @click="showCascadePicker">
+          <div>校区区域地点</div>
+          <div style="flex:1;">
+            <cube-button @click="showCascadePicker" style="white-space:normal;">
               {{ areaData || "暂无" }}
-              <i class="iconfont icon-moren"></i>
             </cube-button>
+            <i class="iconfont icon-moren"></i>
           </div>
         </li>
         <li>
@@ -110,7 +110,7 @@ export default {
       } else if (!this.areaData) {
         this.$createDialog({
           type: "alert",
-          content: "区域地点不能为空",
+          content: "校区区域地点不能为空",
           icon: "cubeic-wrong"
         }).show();
       } else {
@@ -173,33 +173,61 @@ export default {
         });
     },
     getPlaceData() {
-      var that = this;
       this.$http
         .post("service/user/data/fetchDataList/place", {
           idx: 0,
           sum: 1000,
-          area: {
-            wechatAreaId: ""
-          }
         })
-        .then(function(res) {
-          var data = res.data.list;
-          for (var i = 0; i < data.length; i++) {
-            for (var j = 0; j < that.treeData.length; j++) {
-              if (data[i].area.id == that.treeData[j].value) {
-                that.treeData[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.treeData.length; j++) {
+          //     if (data[i].area.id == that.treeData[j].value) {
+          //       that.treeData[j].children.push({
+          //         text: data[i].place,
+          //         value: data[i].id
+          //       });
+          //     }
+          //   }
+          // }
+          console.log(data, 'data');
+          this.treeData = [];
+          const collectionBranch = {};
+          data.forEach((v) => {
+            if(collectionBranch[v.area.branch]){
+              collectionBranch[v.area.branch].push(v);
+            }else{
+              this.treeData.push({text:v.area.branchName, value: v.area.branch, children: []})
+              collectionBranch[v.area.branch] = [v];
             }
-          }
-          that.cascadePicker = that.$createCascadePicker({
-            title: "请选择区域地点",
-            data: that.treeData,
-            selectedIndex: [0, 0],
-            onSelect: that.selectHandle,
-            onCancel: that.cancelHandle
+          })
+
+          this.treeData.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.treeData,'地点');
+          this.cascadePicker = this.$createCascadePicker({
+            title: "请选择校区区域地点",
+            data: this.treeData,
+            selectedIndex: [0, 0, 0],
+            onSelect: this.selectHandle,
+            onCancel: this.cancelHandle
           });
         });
     },
@@ -210,12 +238,12 @@ export default {
       var that = this;
       this.$http
         .get(
-          "service/user/updPlace/" + this.loginUser.id + "/" + selectedVal[1],
+          "service/user/updPlace/" + this.loginUser.id + "/" + selectedVal[2],
           {}
         )
         .then(function(res) {
           if (res.status == 200) {
-            that.promptingConent = "恭喜您,修改区域地点成功!";
+            that.promptingConent = "恭喜您,修改校区区域地点成功!";
             that.promptingStatus = true;
             $("#fade").fadeIn();
             setTimeout(function() {
@@ -226,13 +254,15 @@ export default {
                 area: {}
               };
             }
-            that.loginUser.place.id = selectedVal[1];
-            that.loginUser.place.area.id = selectedVal[0];
-            that.loginUser.place.place = selectedText[1];
-            that.loginUser.place.area.area = selectedText[0];
+            that.loginUser.branch = {id: selectedVal[0]};
+            that.loginUser.place.id = selectedVal[2];
+            that.loginUser.place.area.id = selectedVal[1];
+            that.loginUser.branch.hosName = selectedText[0];
+            that.loginUser.place.place = selectedText[2];
+            that.loginUser.place.area.area = selectedText[1];
             var loginUserStr = JSON.stringify(that.loginUser);
             localStorage.setItem("loginUser", loginUserStr);
-            that.areaData = selectedText[0] + " " + selectedText[1];
+            that.areaData = selectedText[0] + " " + selectedText[1] + " " + selectedText[2];
           } else {
             that.promptingConent = "对不起,修改失败,请稍后再试!";
             that.promptingStatus = false;
@@ -255,7 +285,7 @@ export default {
   },
   mounted() {
     // this.cascadePicker = this.$createCascadePicker({
-    //     title: '请选择区域地点',
+    //     title: '请选择校区区域地点',
     //     data: this.treeData,
     //     selectedIndex: [0,0],
     //     onSelect: this.selectHandle,
@@ -368,11 +398,11 @@ export default {
   width: 90%;
   text-align: right;
 }
-.factionAdd i {
+/* .factionAdd i {
   display: inline-block;
   font-size: 0.34rem;
   width: 12%;
-}
+} */
 /* 我的报修 */
 
 /* .myRapir {