区域地点回归

config/index.js

@@ -41,7 +41,7 @@ module.exports = {
 
     // https://webpack.js.org/configuration/devtool/#development
     // 住了一行
-    // devtool: 'cheap-module-eval-source-map',
+    devtool: 'source-map',
 
     // If you have problems debugging vue-files in devtools,
     // set this to false - it *may* help

src/views/newIncident.vue

@@ -50,13 +50,13 @@
           :field="fields[21]"
         ></cube-form-item>
         <cube-form-item :field="fields[1]"></cube-form-item>
-        <!-- <cube-form-item :field="fields[2]" class="btn_plcaeholde">
+        <cube-form-item :field="fields[2]" class="btn_plcaeholde">
           <cube-button @click="showPlacePicker()">{{selectedPlaceTxt?selectedPlaceTxt:'请选择区域地点'}}</cube-button>
-        </cube-form-item>-->
+        </cube-form-item>
         <!-- 故障地点： -->
-        <cube-form-item :field="fields[19]" class="btn_plcaeholde btn_local">
+        <!-- <cube-form-item :field="fields[19]" class="btn_plcaeholde btn_local"> -->
           <!-- <cube-button @click="showPlacePicker()">{{selectedPlaceTxt?selectedPlaceTxt:'请输入故障地点'}}</cube-button> -->
-          <input
+          <!-- <input
             type="text"
             class="inp_local"
             placeholder="请输入故障地点"
@@ -64,8 +64,8 @@
             @input="changeLocalList()"
             @click="showPlacePicker()"
           />
-        </cube-form-item>
-        <!-- <cube-form-item :field="fields[3]"></cube-form-item> -->
+        </cube-form-item> -->
+        <cube-form-item :field="fields[3]"></cube-form-item>
         <cube-form-item :field="fields[4]" class="btn_plcaeholde">
           <cube-button @click="showCategoryPicker()">{{
             selectedCategoryTxt ? selectedCategoryTxt : "请选择事件分类"
@@ -897,18 +897,18 @@ 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 = "";
+      }
 
-      that.modelData.incident.houseNumber = that.model.address[0];
+      // that.modelData.incident.houseNumber = that.model.address[0];
       that.modelData.incident["repairType"] = that.valConfig;
       if (that.valConfig == 1) {
         // that.modelData.incident.requester = that.loginUser;
@@ -918,8 +918,8 @@ export default {
         that.modelData.incident.department = that.model.requester;
       }
 
-      // that.modelData.incident.area = { id: that.model.areaId };
-      // that.modelData.incident.place = { id: that.model.placeId };
+      that.modelData.incident.area = { id: that.model.areaId };
+      that.modelData.incident.place = { id: that.model.placeId };
       that.modelData.incident.category = {
         id: category[category.length - 1]
       };
@@ -929,7 +929,7 @@ export default {
       that.modelData.incident.contactsInformation =
         that.model.contactsInformation;
       that.modelData.incident.contacts = that.model.contacts;
-      // that.modelData.incident.houseNumber = that.model.houseNumber;
+      that.modelData.incident.houseNumber = that.model.houseNumber;
       that.modelData.incident.acceptUser = that.loginUser;
       that.modelData.incident.requester = {};
       that.modelData.incident.handlingPersonnelUser = { id: that.loginUser.id };
@@ -1325,22 +1325,22 @@ 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);
-
-      // this.model.houseNumber = this.selectedPlaceTxt = selectedTxt.join(" ");
-      // var place = {
-      //   index: selectedIndex,
-      //   txt: this.model.houseNumber
-      // };
-      // localStorage.setItem("place", JSON.stringify(place));
+      // 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);
+      this.model.placeValue = selectedVal;
+      this.model.houseNumber = this.selectedPlaceTxt = selectedTxt.join(" ");
+      var place = {
+        index: selectedIndex,
+        txt: this.model.houseNumber
+      };
+      localStorage.setItem("place", JSON.stringify(place));
     },
     // 报修科室
     showDeptPicker() {
@@ -1554,10 +1554,10 @@ export default {
     this.getsjnum();
     // 事件分类
     this.getIncidentcategory();
-    // this.getAreaData();
-    // this.getPlaceData();
+    this.getAreaData();
+    this.getPlaceData();
     // 获取故障地点
-    this.getFaultLocation();
+    // this.getFaultLocation();
     if (this.valConfig == 2) {
       this.getDept();
     }

src/views/processing.vue

@@ -151,11 +151,11 @@
             <div class="handlerInfo">
               <cube-form :model="model" @validate="validateHandler" @submit="submitHandler">
                 <cube-form-group>
-                  <cube-form-item :field="fields[12]" class="btn_plcaeholde">
+                  <!-- <cube-form-item :field="fields[12]" class="btn_plcaeholde"> -->
                     <!-- <cube-button @click="showDatePicker">{{model.dateValue || 'Please select date'}}</cube-button> -->
                     <!-- <date-picker ref="datePicker" :min="[2008, 8, 8]" :max="[2020, 10, 20]" @select="dateSelectHandler"></date-picker> -->
-                  </cube-form-item>
-                  <cube-form-item :field="fields[13]" class="btn_plcaeholde"></cube-form-item>
+                  <!-- </cube-form-item> -->
+                  <!-- <cube-form-item :field="fields[13]" class="btn_plcaeholde"></cube-form-item> -->
                   <div class="handleRadio">
                     <cube-radio-group
                       v-model="order"
@@ -1123,15 +1123,15 @@ export default {
       var that = this;
 
       that.setLocalStroageData();
-      that.modelData.incident.place = {
-        area:{
-          id:this.selectedAreaId,
-          area:this.selectedAreaName
-        },
-        id:this.selectedPlaceId,
-        place:this.selectedPlaceName
-      };//增加区域地点
-      console.log(that.modelData,11111);
+      // that.modelData.incident.place = {
+      //   area:{
+      //     id:this.selectedAreaId,
+      //     area:this.selectedAreaName
+      //   },
+      //   id:this.selectedPlaceId,
+      //   place:this.selectedPlaceName
+      // };//增加区域地点
+      // console.log(that.modelData,11111);
       // console.log(this.selectedPlaceId,this.selectedAreaId,8888);//2020年4月25日16:12:55
       that.model.fileUrl = "url";
       that.loadShow = true;
@@ -1268,20 +1268,20 @@ export default {
   mounted() {
     console.log(this.modelData,this.model,999);
     // 获取区域列表
-      this.getAreaList().then(res=>{
-        if(this.modelData.incident.place){
-          // 获取地点列表
-          this.getPlaceList(this.modelData.incident.place.area.id)
-          .then(res1=>{
-            this.selectedAreaId = this.modelData.incident.place.area.id;
-            this.selectedAreaName = this.modelData.incident.place.area.area;
-            this.model.selectArea = this.modelData.incident.place.area.id;
-            this.selectedPlaceId = this.modelData.incident.place.id;
-            this.selectedPlaceName = this.modelData.incident.place.place;
-            this.model.selectPlace = this.modelData.incident.place.id;
-          });
-        }
-      })
+      // this.getAreaList().then(res=>{
+      //   if(this.modelData.incident.place){
+      //     // 获取地点列表
+      //     this.getPlaceList(this.modelData.incident.place.area.id)
+      //     .then(res1=>{
+      //       this.selectedAreaId = this.modelData.incident.place.area.id;
+      //       this.selectedAreaName = this.modelData.incident.place.area.area;
+      //       this.model.selectArea = this.modelData.incident.place.area.id;
+      //       this.selectedPlaceId = this.modelData.incident.place.id;
+      //       this.selectedPlaceName = this.modelData.incident.place.place;
+      //       this.model.selectPlace = this.modelData.incident.place.id;
+      //     });
+      //   }
+      // })
   },
   components: {
     CubePage,