区域地点回归

config/index.js

@@ -46,7 +46,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/incidentDetails.vue

@@ -30,7 +30,7 @@
                     报修地址:
                 </div>
                 <div>
-                    {{data.address}}
+                    {{data.incident.place.area.area}} {{data.incident.place.place}} {{data.address}}
                 </div>
             </div>
         </div>

src/views/repair.vue

@@ -23,15 +23,19 @@
 
         <cube-form-item :field="fields[0]"></cube-form-item>
         <cube-form-item :field="fields[1]"></cube-form-item>
-        <!-- <cube-form-item :field="fields[2]" class="btn_plcaeholde"></cube-form-item> -->
-        <cube-form-item :field="fields[3]">
+        <cube-form-item
+          :field="fields[2]"
+          class="btn_plcaeholde"
+        ></cube-form-item>
+        <cube-form-item :field="fields[3]"></cube-form-item>
+        <!-- <cube-form-item :field="fields[3]">
           <cube-input
             @focus="showAddress(model.address)"
             @input="showAddress(model.address)"
             v-model="model.address"
             >{{ model.address || "请输入故障地点" }}</cube-input
           >
-        </cube-form-item>
+        </cube-form-item> -->
         <cube-form-item
           :field="fields[6]"
           v-if="ifCreate.valueconfig == 1"
@@ -72,103 +76,103 @@ import DatePicker from "./../components/date-picker.vue";
 import CubeExtendPopup from "./../components/extend-popup.vue";
 import LoadIng from "./../views/loading.vue";
 import PrompTing from "./../views/prompting.vue";
-// const PCA = {
-//   props: {
-//     value: {
-//       default() {
-//         return [];
-//       }
-//     }
-//   },
-//   data() {
-//     return {
-//       selected: [],
-//       selectData: []
-//     };
-//   },
-//   render(createElement) {
-//     return createElement(
-//       "cube-input",
-//       {
-//         on: {
-//           click: this.showPicker
-//         }
-//       },
-//       this.selected.length ? this.selected.join(" ") : "请选择区域地点"
-//     );
-//   },
-//   mounted() {},
-//   methods: {
-//     showPicker() {
-//       this.picker.show();
-//     },
-//     selectHandler(selectedVal, selectedIndex, selectedTxt) {
-//       this.selected = selectedTxt;
-//       this.$emit("input", selectedVal);
-//     },
-//     getAreaData() {
-//       var that = this;
-//       this.$http
-//         .post("service/user/data/fetchDataList/area", {
-//           idx: 0,
-//           sum: 1000,
-//           area: {
-//             wechatArea: true
-//           }
-//         })
-//         .then(function(res) {
-//           var data = res.data.list;
-//           for (var i = 0; i < data.length; i++) {
-//             that.selectData.push({
-//               text: data[i].area,
-//               value: data[i].id,
-//               children: []
-//             });
-//           }
-//         });
-//     },
-//     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.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
-//                 });
-//               }
-//             }
-//           }
-//           that.picker = that.$createCascadePicker({
-//             title: "区域地点选择",
-//             data: that.selectData,
-//             selectedIndex: [0, 0],
-//             onSelect: that.selectHandler
-//           });
-//         });
-//     },
-//     getParamsPlace() {
-//       var data = JSON.parse(localStorage.getItem("loginUser"));
-//       this.selected[0] = data.place.area.area;
-//       this.selected[1] = data.place.place;
-//     }
-//   },
-//   created() {
-//     this.getAreaData();
-//     this.getPlaceData();
-//     this.getParamsPlace();
-//   }
-// };
+const PCA = {
+  props: {
+    value: {
+      default() {
+        return [];
+      }
+    }
+  },
+  data() {
+    return {
+      selected: [],
+      selectData: []
+    };
+  },
+  render(createElement) {
+    return createElement(
+      "cube-button",
+      {
+        on: {
+          click: this.showPicker
+        }
+      },
+      this.selected.length ? this.selected.join(" ") : "请选择区域地点"
+    );
+  },
+  mounted() {},
+  methods: {
+    showPicker() {
+      this.picker.show();
+    },
+    selectHandler(selectedVal, selectedIndex, selectedTxt) {
+      this.selected = selectedTxt;
+      this.$emit("input", selectedVal);
+    },
+    getAreaData() {
+      var that = this;
+      this.$http
+        .post("service/user/data/fetchDataList/area", {
+          idx: 0,
+          sum: 1000,
+          area: {
+            wechatArea: true
+          }
+        })
+        .then(function(res) {
+          var data = res.data.list;
+          for (var i = 0; i < data.length; i++) {
+            that.selectData.push({
+              text: data[i].area,
+              value: data[i].id,
+              children: []
+            });
+          }
+        });
+    },
+    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.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
+                });
+              }
+            }
+          }
+          that.picker = that.$createCascadePicker({
+            title: "区域地点选择",
+            data: that.selectData,
+            selectedIndex: [0, 0],
+            onSelect: that.selectHandler
+          });
+        });
+    },
+    getParamsPlace() {
+      var data = JSON.parse(localStorage.getItem("loginUser"));
+      this.selected[0] = data.place.area.area;
+      this.selected[1] = data.place.place;
+    }
+  },
+  created() {
+    this.getAreaData();
+    this.getPlaceData();
+    this.getParamsPlace();
+  }
+};
 const delay = (function() {
   let timer = 0;
   return function(callback, ms) {
@@ -181,9 +185,9 @@ export default {
     return {
       loginUser: null,
       // 故障地点下拉数据
-      addressData: [],
+      // addressData: [],
       // 故障地点选中文本
-      addressText: "",
+      // addressText: "",
       // 报修科室下拉数据
       deptIdData: [],
       // 报修科室选中文本
@@ -214,7 +218,7 @@ export default {
       phone: "",
       model: {
         contactsInformation: "",
-        // pcaValue: [],
+        pcaValue: [],
         address: "",
         description: "",
         bxcode: "",
@@ -250,7 +254,7 @@ export default {
           }
         },
         {
-          component: "input",
+          component: PCA,
           modelKey: "pcaValue",
           label: "区域地点:",
           rules: {
@@ -261,15 +265,16 @@ export default {
           }
         },
         {
-          type: "input",
+          type: "textarea",
           modelKey: "address",
-          label: "故障地点:",
+          label: "详细地址:",
           props: {
-            placeholder: "请输入故障地点"
+            placeholder: "请输入详细地址"
           },
           rules: {
             required: true
-          }
+          },
+          debounce: 100
         },
         {
           type: "textarea",
@@ -363,18 +368,18 @@ 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 = "";
+      }
 
       this.model["requester"] = this.loginUser;
-      // delete this.model.pcaValue;
+      delete this.model.pcaValue;
       this.model.fileUrl = "url";
       this.model.sourceType = "wechatRequesterIncident";
       var that = this;
@@ -547,9 +552,9 @@ export default {
           ? this.loginUser.dept.phone
           : "";
       this.model.contacts = this.loginUser.name;
-      this.model.address = this.loginUser.place
-        ? this.loginUser.place.area.area + this.loginUser.place.place
-        : "";
+      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.deptId = this.loginUser.dept ? this.loginUser.dept.dept : "";
     }
   },
@@ -592,11 +597,11 @@ export default {
     // 获取报修主体
     this.deptIdNum = this.loginUser.dept ? this.loginUser.dept.id : "";
     this.deptIdText = this.loginUser.dept ? this.loginUser.dept.dept : "";
-    this.addressText = this.loginUser.place
-      ? this.loginUser.place.place
-        ? this.loginUser.place.area.area + this.loginUser.place.place
-        : this.loginUser.place.area
-      : null;
+    // this.addressText = this.loginUser.place
+    //   ? this.loginUser.place.place
+    //     ? this.loginUser.place.area.area + this.loginUser.place.place
+    //     : this.loginUser.place.area
+    //   : null;
     this.$refs.upload.pause();
   },
   components: {