bugfix

src/views/newIncident.vue

@@ -723,6 +723,10 @@ export default {
               console.log(this.model);
               this.model.placeValue = [];
               this.selectedPlaceTxt = '';
+
+              this.model.contactsInformation = '';
+
+              this.model.requester = '';
             }
           }
         },
@@ -967,7 +971,7 @@ export default {
         // that.modelData.requestershow = that.loginUser;
       } else if (that.valConfig == 2) {
         that.modelData.incident.branch = that.model.branch;
-        if(that.$route.query.id){
+        if(that.$route.query.id && that.model.requester){
           that.modelData.incident.department = {id: +that.$route.query.id};
         }
       }
@@ -1618,7 +1622,7 @@ export default {
     },
     // 跳转到报修科室搜索页面
     toSearchDept() {
-      this.$router.push(`/searchDept?type=searchDept`);
+      this.$router.push(`/searchDept?type=searchDept&branch=${this.model.branch}`);
     },
     getAreaData(branchId) {
       this.placeSelectData = [];
@@ -1669,12 +1673,26 @@ export default {
           console.log(this.initAreaList, data);
           console.log(this.placeSelectData);
 
-          this.placePicker = this.$createCascadePicker({
-            title: "区域地点选择",
-            data: this.placeSelectData,
-            selectedIndex: [0, 0],
-            onSelect: this.selectPlaceHandler
-          });
+          if(this.model.placeValue.length){
+            let [areaId, placeId] = this.model.placeValue;
+            let areaIndex = this.placeSelectData.findIndex(v => v.value == areaId);
+            let placeIndex = this.placeSelectData[areaIndex].children.findIndex(v => v.value == placeId);
+            areaIndex = areaIndex < 0 ? 0 : areaIndex;
+            placeIndex = placeIndex < 0 ? 0 : placeIndex;
+            this.placePicker = this.$createCascadePicker({
+              title: "区域地点选择",
+              data: this.placeSelectData,
+              selectedIndex: [areaIndex, placeIndex],
+              onSelect: this.selectPlaceHandler
+            });
+          }else{
+            this.placePicker = this.$createCascadePicker({
+              title: "区域地点选择",
+              data: this.placeSelectData,
+              selectedIndex: [0, 0],
+              onSelect: this.selectPlaceHandler
+            });
+          }
         });
     },
     // 获取院区列表

src/views/searchDept.vue

@@ -115,6 +115,7 @@ export default {
         department: {
           dept: keyword,
           selectType: "pinyin_qs",
+          branch: this.$route.query.branch ? +this.$route.query.branch : undefined,
         }
       };
       this.toast = this.$createToast({