修复

src/views/newIncident.vue

@@ -109,26 +109,12 @@
           :field="fields[13]"
           class="btn_plcaeholde"
         ></cube-form-item>
-        <div v-if="order == 1" class="label formLabel">
-          报修图片
-          <span>(最多可上传3张JPG或PNG,每张不能超过10M)</span>
-        </div>
-        <div class="uplod" v-if="order == 1">
-          <cube-upload
-            ref="upload1"
-            :max="3"
-            :action="action1"
-            :simultaneous-uploads="3"
-            @files-added="filesAdded1"
-            @file-submitted="fileSubmitted1"
-          />
-        </div>
-        <cube-form-item v-if="order == 1" :field="fields[14]"></cube-form-item>
+        <!-- <cube-form-item v-if="order == 1" :field="fields[14]"></cube-form-item>
         <cube-form-item
           v-if="order == 1 && model.knowledge == true"
           :field="fields[15]"
           class="btn_plcaeholde"
-        ></cube-form-item>
+        ></cube-form-item> -->
         <!-- 直接处理 end -->
 
         <!-- 派单 begin -->
@@ -292,11 +278,6 @@ export default {
           this.$host + "/service/common/common/uploadAttachment/incident/",
         data: {}
       },
-      action1: {
-        target:
-          this.$host + "/service/common/common/uploadAttachment/incident/",
-        data: {}
-      },
       isUploading: false,
       loadShow: false,
       incidentWithConsumable: localStorage.getItem("incidentWithConsumable"), //是否绑定耗材
@@ -971,8 +952,8 @@ export default {
         // that.modelData.requestershow = that.loginUser;
       } else if (that.valConfig == 2) {
         that.modelData.incident.branch = that.model.branch;
-        if(that.$route.query.id && that.model.requester){
-          that.modelData.incident.department = {id: +that.$route.query.id};
+        if(that.$route.params.dept && that.$route.params.dept.id && that.model.requester){
+          that.modelData.incident.department = {id: +that.$route.params.dept.id};
         }
       }
       if (that.wxIncidentWithCmdb == 1) {
@@ -1068,6 +1049,18 @@ export default {
     getMessage() {
       var that = this;
 
+      if(that.$route.params.model){
+        that.model = that.$route.params.model;
+      }
+
+      if(that.$route.params.order){
+        that.order = that.$route.params.order;
+      }
+
+      if(that.$route.params.selectedCategoryTxt){
+        that.selectedCategoryTxt = that.$route.params.selectedCategoryTxt;
+      }
+
       if (that.$route.params.data) {
         var inspecInfo = that.$route.params.data;
         // 巡检生成事件
@@ -1094,30 +1087,6 @@ export default {
           that.model.description = that.modelData.incident.description =
             that.$route.params.abnormal;
         }
-      } else {
-        // that.name = that.loginUser.name;
-        // that.model.contactsInformation = that.loginUser.phone;
-        // that.model.contacts = that.loginUser.name;
-        // that.model.houseNumber = that.loginUser.houseNumber;
-      }
-      // if (that.loginUser.place && that.loginUser.place.length) {
-      //   if (that.loginUser.place.id) {
-      //     if (that.loginUser.place.area) {
-      //       that.model.placeValue[0] = that.loginUser.place.area.id;
-      //     }
-      //     that.model.placeValue[1] = that.loginUser.place.id;
-      //   }
-      // }
-
-      if (localStorage.getItem("model")) {
-        that.model = JSON.parse(localStorage.getItem("model"));
-        that.incidentTitle = that.model.title;
-      }
-      if (localStorage.getItem("modelData")) {
-        that.modelData = JSON.parse(localStorage.getItem("modelData"));
-      }
-      if (localStorage.getItem("order")) {
-        that.order = localStorage.getItem("order") - 0;
       }
     },
     // 提交
@@ -1231,12 +1200,8 @@ export default {
         .then(res => {
           if (res.data) {
             that.action.target = that.action.target + res.data.id;
-            that.action1.target = that.action1.target + res.data.id;
             setTimeout(function() {
               that.$refs.upload.start();
-              if (that.order == 1) {
-                that.$refs.upload1.start();
-              }
             }, 100);
             if (
               this.order == 1 &&
@@ -1337,29 +1302,9 @@ export default {
           txt: "不能上传超过100M的文件"
         }).show();
     },
-    filesAdded1(files) {
-      let hasIgnore = false;
-      const maxSize = 1000 * 1024 * 1024; // 1M
-      for (let k in files) {
-        const file = files[k];
-        if (file.size > maxSize) {
-          file.ignore = true;
-          hasIgnore = true;
-        }
-      }
-      hasIgnore &&
-        this.$createToast({
-          type: "warn",
-          time: 1000,
-          txt: "不能上传超过100M的文件"
-        }).show();
-    },
     fileSubmitted(files) {
       this.action.data = { fileName: files.name };
     },
-    fileSubmitted1(files) {
-      this.action1.data = { fileName: files.name };
-    },
     // 展示故障现象选择器
     showCategoryPicker() {
       this.categoryPicker.show();
@@ -1622,7 +1567,7 @@ export default {
     },
     // 跳转到报修科室搜索页面
     toSearchDept() {
-      this.$router.push(`/searchDept?type=searchDept&branch=${this.model.branch}`);
+      this.$router.push({name: 'SearchDept', params: {model: this.model, branch: this.model.branch, order: this.order, selectedCategoryTxt: this.selectedCategoryTxt}});
     },
     getAreaData(branchId) {
       this.placeSelectData = [];
@@ -1714,9 +1659,14 @@ export default {
     },
     // 回显处理人或组
     showUserOrGroup(){
-      this.order = 2;
-      this.model.handleUserOrGroup = true;
-      this.model.handlerUser = this.loginUser.id;
+      if(!this.$route.params.model){
+        this.model.handleUserOrGroup = true;
+        this.model.handlerUser = this.loginUser.id;
+      }
+
+      if(!this.$route.params.order){
+        this.order = 2;
+      }
     },
     // 处理顶部责任科室数据
     handlerDuty(){
@@ -1797,18 +1747,18 @@ export default {
       this.getBranchList();
 
       // 回显选择的报修科室
-      if(this.$route.query.id && this.$route.query.dept){
-        this.model.requester = this.$route.query.dept;
+      if(this.$route.params.dept && this.$route.params.dept.id && this.$route.params.dept.dept){
+        this.model.requester = this.$route.params.dept.dept;
         // 回显科室信息
         this.showUserOrGroup();
-        if(this.$route.query.areaId && this.$route.query.placeId && this.$route.query.areaName && this.$route.query.placeName){
-          this.model.placeValue = [+this.$route.query.areaId, +this.$route.query.placeId];
-          this.selectedPlaceTxt = this.$route.query.areaName + ' ' + this.$route.query.placeName;
+        if(this.$route.params.dept.areaId && this.$route.params.dept.placeId && this.$route.params.dept.areaName && this.$route.params.dept.placeName){
+          this.model.placeValue = [+this.$route.params.dept.areaId, +this.$route.params.dept.placeId];
+          this.selectedPlaceTxt = this.$route.params.dept.areaName + ' ' + this.$route.params.dept.placeName;
         }else{
           this.model.placeValue = [];
           this.selectedPlaceTxt = '';
         }
-        this.model.contactsInformation = this.$route.query.phone;
+        this.model.contactsInformation = this.$route.params.dept.phone;
       }
 
       // 回显院区
@@ -1825,9 +1775,6 @@ export default {
   },
   mounted() {
     this.$refs.upload.pause();
-    if (this.$refs.upload1) {
-      this.$refs.upload1.pause();
-    }
   },
   components: {
     seiminModel,

src/views/searchDept.vue

@@ -115,7 +115,7 @@ export default {
         department: {
           dept: keyword,
           selectType: "pinyin_qs",
-          branch: this.$route.query.branch ? +this.$route.query.branch : undefined,
+          branch: this.$route.params.branch ? +this.$route.params.branch : undefined,
         }
       };
       this.toast = this.$createToast({
@@ -211,7 +211,20 @@ export default {
         return item.dept === keyword;
       });
       if (arr.length) {
-        this.$router.push(`/newIncident?id=${arr[0].id}&dept=${arr[0].dept}&phone=${arr[0].phone || ''}&areaId=${arr[0].place ? arr[0].place.area.id : ''}&areaName=${arr[0].place ? arr[0].place.area.area : ''}&placeId=${arr[0].place ? arr[0].place.id : ''}&placeName=${arr[0].place ? arr[0].place.place : ''}`);
+        this.$router.push({name: 'NewIncident', params: {
+            model: this.$route.params.model,
+            order: this.$route.params.order,
+            selectedCategoryTxt: this.$route.params.selectedCategoryTxt,
+            dept: {
+              id: arr[0].id,
+              dept: arr[0].dept,
+              phone: arr[0].phone || '',
+              areaId: arr[0].place ? arr[0].place.area.id : '',
+              areaName: arr[0].place ? arr[0].place.area.area : '',
+              placeId: arr[0].place ? arr[0].place.id : '',
+              placeName: arr[0].place ? arr[0].place.place : '',
+            }
+        }})
       }
     },
     //保存关键字到历史记录