区域地点回归，故障地点取消

index.html

@@ -91,7 +91,7 @@
             </div>
           </div>
           <!-- 区域地点 -->
-          <!-- <div class="formItem">
+          <div class="formItem">
             <div class="label"><span class="required">*</span>区域地点：</div>
             <div>
               <div class="areaplace">
@@ -101,13 +101,12 @@
                 </div>
               </div>
             </div>
-          </div> -->
-          <!-- 故障地点 -->
+          </div>
+          <!-- 详细地址 -->
           <div class="formItem">
-            <div class="label"><span class="required">*</span>故障地点：</div>
+            <div class="label"><span class="required">*</span>详细地址：</div>
             <div class="address">
-              <input type="text" id="bx_address" value="请输入故障地点" autocomplete="off" />
-              <ul id="bx_address_ul"></ul>
+              <textarea class="textarea" id="bx_address">请输入详细的地址</textarea>
             </div>
           </div>
           <div class="formItem" id="if_bx_eventClass">
@@ -279,17 +278,17 @@
 </div>
 </script>
 <!-- 区域 -->
-<!-- <script id="area_list_temp" type="text/html">
+<script id="area_list_temp" type="text/html">
     {{each list}}
     <option value="{{$value.id}}">{{$value.area}}</option>
     {{/each}}
-  </script> -->
+  </script>
 <!-- 地点 -->
-<!-- <script id="place_list_temp" type="text/html">
+<script id="place_list_temp" type="text/html">
     {{each list}}
     <option value="{{$value.id}}">{{$value.place}}</option>
     {{/each}}
-  </script> -->
+  </script>
 <!-- 最新报修列表 -->
 <script id="bx_list_temp" type="text/html">
   {{if data.length == 0}}
@@ -501,7 +500,7 @@
           </div>
         </li>
         <li class="pop1-hd__itemList">
-          <strong>故障地点：</strong><span>{{address}}</span>
+          <strong>报修地址：</strong><span>{{incident.place.area.area}} {{incident.place.place}} {{address}}</span>
         </li>
       </ul>
     </div>
@@ -565,7 +564,7 @@
           </div>
         </li>
         <li class="pop1-hd__itemList">
-          <strong>故障地点：</strong><span>{{address}}</span>
+          <strong>报修地址：</strong><span>{{incident.place.area.area}} {{incident.place.place}} {{address}}</span>
         </li>
       </ul>
     </div>
@@ -635,7 +634,7 @@
           </div>
         </li>
         <li class="pop1-hd__itemList">
-          <strong>故障地点：</strong><span>{{address}}</span>
+          <strong>报修地址：</strong><span>{{incident.place.area.area}} {{incident.place.place}} {{address}}</span>
         </li>
       </ul>
     </div>
@@ -711,7 +710,7 @@
           </div>
         </li>
         <li class="pop1-hd__itemList">
-          <strong>故障地点：</strong><span>{{address}}</span>
+          <strong>报修地址：</strong><span>{{incident.place.area.area}} {{incident.place.place}} {{address}}</span>
         </li>
       </ul>
     </div>
@@ -793,7 +792,7 @@
           </div>
         </li>
         <li class="pop1-hd__itemList">
-          <strong>故障地点：</strong><span>{{address}}</span>
+          <strong>报修地址：</strong><span>{{incident.place.area.area}} {{incident.place.place}} {{address}}</span>
         </li>
       </ul>
     </div>
@@ -875,7 +874,7 @@
           </div>
         </li>
         <li class="pop1-hd__itemList">
-          <strong>故障地点：</strong><span>{{address}}</span>
+          <strong>报修地址：</strong><span>{{incident.place.area.area}} {{incident.place.place}} {{address}}</span>
         </li>
       </ul>
     </div>
@@ -957,7 +956,7 @@
           </div>
         </li>
         <li class="pop1-hd__itemList">
-          <strong>故障地点：</strong><span>{{address}}</span>
+          <strong>报修地址：</strong><span>{{incident.place.area.area}} {{incident.place.place}} {{address}}</span>
         </li>
       </ul>
     </div>
@@ -1109,7 +1108,7 @@
           </div>
         </li>
         <li class="pop1-hd__itemList">
-          <strong>故障地点：</strong><span>{{address}}</span>
+          <strong>报修地址：</strong><span>{{incident.place.area.area}} {{incident.place.place}} {{address}}</span>
         </li>
       </ul>
     </div>

js/index.js

@@ -55,9 +55,9 @@ $(function () {
   // 获取常见问题列表
   getSolutionList({ "idx": solution_pageNum, "sum": 10, "solution": { "title": "", "status": { "id": 72 }, "solutionRange": 1 } });
   // 获取区域列表
-  // getAreaList({ "idx": 0, "sum": 1000, "area": { "wechatArea": true } });
+  getAreaList({ "idx": 0, "sum": 1000, "area": { "wechatArea": true } });
   // 获取地点列表
-  // getPlaceList({ "idx": 0, "sum": 1000, "area": { "wechatAreaId": "" } });
+  getPlaceList({ "idx": 0, "sum": 1000, "area": { "wechatAreaId": "" } });
   // 获取WxId
   getWxId();
   // 获取最新报修列表
@@ -82,55 +82,55 @@ $(function () {
   }
   pageInit();
   //故障地点seimin
-  (function () {
-    //故障地点带入区域地点
-    $('#bx_address').val(loginUser.place ? loginUser.place.area.area + loginUser.place.place : '');
-    //点击文本框
-    $('#bx_address').on('click', searchAreaPlace);
-    //修改文字，实时监听
-    $('#bx_address').on('keyup', debounce(searchAreaPlace, 500));
-    //报修科室滚动条
-    $('#bx_address_ul').niceScroll();
-    //故障地点搜索
-    function searchAreaPlace() {
-      $.ajax({
-        type: "POST",
-        contentType: "application/json;charset=UTF-8",
-        url: baseUrl + "apply/bpm/searchFaultLocation",
-        data: JSON.stringify({ "searchKey": $('#bx_address').val() }),
-        success: function (res) {
-          if (res.state == 200) {
-            $('#bx_address_ul').find('li').off('click');
-            var html = template('bx_address_ul_temp', { list: res.result });
-            $('#bx_address_ul').html(html).show().find('li').on('click', function () {
-              $('#bx_address').val($(this).text());//文本框赋值
-              $('#bx_address_ul').hide();
-            })
-          }
-        },
-        error: function (err) {
-          console.log(err);
-        }
-      });
-    }
-    //点击空白处隐藏
-    $(document).on('click', function (e) {
-      if (e.target !== $('#bx_address').get(0)) {
-        $('#bx_address_ul').hide();
-        //模拟placeholder
-        if ($('#bx_address').val() == '') {
-          $('#bx_address').val('请输入故障地点');
-        }
-      }
-    })
-  })();
+  // (function () {
+  //   //故障地点带入区域地点
+  //   $('#bx_address').val(loginUser.place ? loginUser.place.area.area + loginUser.place.place : '');
+  //   //点击文本框
+  //   $('#bx_address').on('click', searchAreaPlace);
+  //   //修改文字，实时监听
+  //   $('#bx_address').on('keyup', debounce(searchAreaPlace, 500));
+  //   //报修科室滚动条
+  //   $('#bx_address_ul').niceScroll();
+  //   //故障地点搜索
+  //   function searchAreaPlace() {
+  //     $.ajax({
+  //       type: "POST",
+  //       contentType: "application/json;charset=UTF-8",
+  //       url: baseUrl + "apply/bpm/searchFaultLocation",
+  //       data: JSON.stringify({ "searchKey": $('#bx_address').val() }),
+  //       success: function (res) {
+  //         if (res.state == 200) {
+  //           $('#bx_address_ul').find('li').off('click');
+  //           var html = template('bx_address_ul_temp', { list: res.result });
+  //           $('#bx_address_ul').html(html).show().find('li').on('click', function () {
+  //             $('#bx_address').val($(this).text());//文本框赋值
+  //             $('#bx_address_ul').hide();
+  //           })
+  //         }
+  //       },
+  //       error: function (err) {
+  //         console.log(err);
+  //       }
+  //     });
+  //   }
+  //   //点击空白处隐藏
+  //   $(document).on('click', function (e) {
+  //     if (e.target !== $('#bx_address').get(0)) {
+  //       $('#bx_address_ul').hide();
+  //       //模拟placeholder
+  //       if ($('#bx_address').val() == '') {
+  //         $('#bx_address').val('请输入故障地点');
+  //       }
+  //     }
+  //   })
+  // })();
   //报修科室seimin
   (function () {
     //自动带入报修科室
     if (loginUser.dept) {
       $('#bx_ks').val(loginUser.dept.dept).data('id', loginUser.dept.id);
     } else {
-      $('#bx_address').val('请输入故障地点');
+      $('#bx_address').val('请输入详细的地址');
     }
     //点击文本框
     $('#bx_ks').on('click', function () {
@@ -238,7 +238,7 @@ $(function () {
   });
 
   $('#bx_address').on('focus', function () {
-    if ($(this).val() == '请输入故障地点') {
+    if ($(this).val() == '请输入详细的地址') {
       $(this).val('');
     }
   });
@@ -419,20 +419,20 @@ $(function () {
         $('#bx_name').val('');
       }
     }
-    // if ($('#area_list').val() < 1) {
-    //   alert('区域不能为空');
-    //   //按钮禁止取消
-    //   $(this).removeProp('disabled');
-    //   $(this).removeClass('f-submit--disable');
-    //   return;
-    // }
-    // if ($('#place_list').val() < 1) {
-    //   alert('地点不能为空');
-    //   //按钮禁止取消
-    //   $(this).removeProp('disabled');
-    //   $(this).removeClass('f-submit--disable');
-    //   return;
-    // }
+    if ($('#area_list').val() < 1) {
+      alert('区域不能为空');
+      //按钮禁止取消
+      $(this).removeProp('disabled');
+      $(this).removeClass('f-submit--disable');
+      return;
+    }
+    if ($('#place_list').val() < 1) {
+      alert('地点不能为空');
+      //按钮禁止取消
+      $(this).removeProp('disabled');
+      $(this).removeClass('f-submit--disable');
+      return;
+    }
     if ($('#bx_tel').val().replace(/\s/g, '') === '' || $('#bx_tel').val().replace(/\s/g, '') === '请输入联系电话' || !/^[\d\-]*$/.test($('#bx_tel').val())) {
       alert('请输入正确的联系电话');
       //按钮禁止取消
@@ -440,8 +440,8 @@ $(function () {
       $(this).removeClass('f-submit--disable');
       return;
     }
-    if ($('#bx_address').val().replace(/\s/g, '') === '' || $('#bx_address').val() == '请输入故障地点') {
-      alert('故障地点不能为空');
+    if ($('#bx_address').val().replace(/\s/g, '') === '' || $('#bx_address').val() == '请输入详细的地址') {
+      alert('地址不能为空');
       //按钮禁止取消
       $(this).removeProp('disabled');
       $(this).removeClass('f-submit--disable');
@@ -457,13 +457,13 @@ $(function () {
     var data = { verification: "true" };
     data.incident = {
       address: $.trim($('#bx_address').val()),
-      // areaId: $.trim($('#area_list').val()),
+      areaId: $.trim($('#area_list').val()),
       bxcode: wxId,
       contacts: $.trim($('#bx_name').val()),
       contactsInformation: $('#bx_tel').val(),
       description: $.trim($('#bx_description').val()),
       fileUrl: 'url',
-      // placeId: $.trim($('#place_list').val()),
+      placeId: $.trim($('#place_list').val()),
       requester: loginUser,
       sourceType: "wechatRequesterIncident"
     };
@@ -795,42 +795,42 @@ $(function () {
     })
   }
   //获取区域列表
-  // function getAreaList(data) {
-  //   $.ajax({
-  //     type: 'POST',
-  //     contentType: "application/json;charset=UTF-8",
-  //     url: baseUrl + "user/data/fetchDataList/area",
-  //     data: JSON.stringify(data),
-  //     success: function (res) {
-  //       if (res.status == 200) {
-  //         var html = template('area_list_temp', res);
-  //         $('#area_list').html(html);
-  //       }
-  //     },
-  //     error: function (err) {
-  //       console.log(err)
-  //     }
-  //   })
-  // }
+  function getAreaList(data) {
+    $.ajax({
+      type: 'POST',
+      contentType: "application/json;charset=UTF-8",
+      url: baseUrl + "user/data/fetchDataList/area",
+      data: JSON.stringify(data),
+      success: function (res) {
+        if (res.status == 200) {
+          var html = template('area_list_temp', res);
+          $('#area_list').html(html);
+        }
+      },
+      error: function (err) {
+        console.log(err)
+      }
+    })
+  }
   //获取地点列表
-  // function getPlaceList(data) {
-  //   $.ajax({
-  //     type: 'POST',
-  //     contentType: "application/json;charset=UTF-8",
-  //     url: baseUrl + "user/data/fetchDataList/place",
-  //     data: JSON.stringify(data),
-  //     success: function (res) {
-  //       if (res.status == 200) {
-  //         var html = template('place_list_temp', res);
-  //         $('#place_list').html(html);
-  //         placeList = res.list;
-  //       }
-  //     },
-  //     error: function (err) {
-  //       console.log(err)
-  //     }
-  //   })
-  // }
+  function getPlaceList(data) {
+    $.ajax({
+      type: 'POST',
+      contentType: "application/json;charset=UTF-8",
+      url: baseUrl + "user/data/fetchDataList/place",
+      data: JSON.stringify(data),
+      success: function (res) {
+        if (res.status == 200) {
+          var html = template('place_list_temp', res);
+          $('#place_list').html(html);
+          placeList = res.list;
+        }
+      },
+      error: function (err) {
+        console.log(err)
+      }
+    })
+  }
   //获取微信报修ID
   function getWxId() {
     $.ajax({