修复

config/index.js

@@ -22,19 +22,19 @@ module.exports = {
     },
 
     // Various Dev Server settings
-    host: 'localhost', // can be overwritten by process.env.HOST
+    host: '0.0.0.0', // can be overwritten by process.env.HOST
     // host: '192.168.3.170', // can be overwritten by process.env.HOST
     // host: '192.168.31.32', // can be overwritten by process.env.HOST
     // host: '192.168.31.32', // can be overwritten by process.env.HOST
     // host: '0.0.0.0', // can be overwritten by process.env.HOST
-    port: 8082, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined
+    port: 8081, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined
     // 住了的4行
     autoOpenBrowser: true,
     // errorOverlay: true,
     // notifyOnErrors: true,
     // poll: false, // https://webpack.js.org/configuration/dev-server/#devserver-watchoptions-
 
-    
+
     /**
      * Source Maps
      */

src/views/newIncident.vue

@@ -4,23 +4,33 @@
     <div class="navBar">
       <div class="fl">
         <a
-          :class="{'active':label=='incidentInfo'}"
+          :class="{ active: label == 'incidentInfo' }"
           href="javascript:;"
           @click="toInfo('incidentInfo')"
-        >事件信息</a>
+          >事件信息</a
+        >
       </div>
       <div class="fl">
         <a
-          :class="{'active':label=='handlerInfo'}"
+          :class="{ active: label == 'handlerInfo' }"
           href="javascript:;"
           @click="toInfo('handlerInfo')"
-        >处理信息</a>
+          >处理信息</a
+        >
       </div>
     </div>
     <div class="label" id="incidentInfo">事件信息</div>
-    <cube-form :model="model" @validate="validateHandler" @submit="submitHandler">
+    <cube-form
+      :model="model"
+      @validate="validateHandler"
+      @submit="submitHandler"
+    >
       <cube-form-group>
-        <cube-form-item :field="fields[20]" v-if="valConfig==2" class="btn_plcaeholde btn_local">
+        <cube-form-item
+          :field="fields[20]"
+          v-if="valConfig == 2"
+          class="btn_plcaeholde btn_local"
+        >
           <!-- <cube-button @click="showPlacePicker()">{{selectedPlaceTxt?selectedPlaceTxt:'请输入故障地点'}}</cube-button> -->
           <input
             type="text"
@@ -31,8 +41,14 @@
             @click="showDeptPicker()"
           />
         </cube-form-item>
-        <cube-form-item v-if="valConfig==1" :field="fields[0]"></cube-form-item>
-        <cube-form-item v-if="valConfig==2" :field="fields[21]"></cube-form-item>
+        <cube-form-item
+          v-if="valConfig == 1"
+          :field="fields[0]"
+        ></cube-form-item>
+        <cube-form-item
+          v-if="valConfig == 2"
+          :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-button @click="showPlacePicker()">{{selectedPlaceTxt?selectedPlaceTxt:'请选择区域地点'}}</cube-button>
@@ -51,11 +67,14 @@
         </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:'请选择事件分类'}}</cube-button>
+          <cube-button @click="showCategoryPicker()">{{
+            selectedCategoryTxt ? selectedCategoryTxt : "请选择事件分类"
+          }}</cube-button>
         </cube-form-item>
-        <cube-form-item :field="fields[5]" class="btn_plcaeholde"></cube-form-item>
+        <cube-form-item
+          :field="fields[5]"
+          class="btn_plcaeholde"
+        ></cube-form-item>
         <!-- <cube-form-item :field="fields[6]" class="btn_plcaeholde incidentTitle">
           <div class="titleRefer">
             <textarea
@@ -84,7 +103,10 @@
         </div>
         <!-- <cube-form-item :field="fields[8]" class="btn_plcaeholde"></cube-form-item>
         <cube-form-item :field="fields[9]" class="btn_plcaeholde"></cube-form-item>-->
-        <cube-form-item :field="fields[10]" class="btn_plcaeholde"></cube-form-item>
+        <cube-form-item
+          :field="fields[10]"
+          class="btn_plcaeholde"
+        ></cube-form-item>
         <div class="label" id="handlerInfo">处理信息</div>
         <div class="handleRadio">
           <cube-radio-group
@@ -95,14 +117,26 @@
           />
         </div>
         <!-- 直接处理 begin -->
-        <cube-form-item v-if="order==1" :field="fields[11]" class="btn_plcaeholde"></cube-form-item>
-        <cube-form-item v-if="order==1" :field="fields[12]" class="btn_plcaeholde"></cube-form-item>
-        <cube-form-item v-if="order==1" :field="fields[13]" class="btn_plcaeholde"></cube-form-item>
-        <div v-if="order==1" class="label formLabel">
+        <cube-form-item
+          v-if="order == 1"
+          :field="fields[11]"
+          class="btn_plcaeholde"
+        ></cube-form-item>
+        <cube-form-item
+          v-if="order == 1"
+          :field="fields[12]"
+          class="btn_plcaeholde"
+        ></cube-form-item>
+        <cube-form-item
+          v-if="order == 1"
+          :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">
+        <div class="uplod" v-if="order == 1">
           <cube-upload
             ref="upload1"
             :max="3"
@@ -112,23 +146,23 @@
             @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"
+          v-if="order == 1 && model.knowledge == true"
           :field="fields[15]"
           class="btn_plcaeholde"
         ></cube-form-item>
         <!-- 直接处理 end -->
 
         <!-- 派单 begin -->
-        <cube-form-item v-if="order==2" :field="fields[16]"></cube-form-item>
+        <cube-form-item v-if="order == 2" :field="fields[16]"></cube-form-item>
         <cube-form-item
-          v-if="order==2&&model.handleUserOrGroup==true"
+          v-if="order == 2 && model.handleUserOrGroup == true"
           :field="fields[17]"
           class="btn_plcaeholde"
         ></cube-form-item>
         <cube-form-item
-          v-if="order==2&&model.handleUserOrGroup==false"
+          v-if="order == 2 && model.handleUserOrGroup == false"
           :field="fields[18]"
           class="btn_plcaeholde"
         ></cube-form-item>
@@ -139,7 +173,10 @@
       </cube-form-group>
     </cube-form>
     <load-ing v-show="loadShow"></load-ing>
-    <promp-ting :conents="promptingConent" :status="promptingStatus"></promp-ting>
+    <promp-ting
+      :conents="promptingConent"
+      :status="promptingStatus"
+    ></promp-ting>
   </div>
 </template>
 <script>
@@ -164,8 +201,9 @@ const solution = {
       selected: [],
       selectData: [],
       initVal: JSON.parse(localStorage.getItem("solution")) || [0, 0, 0],
-      allPlace:{},//存放请求到的所有区域地点
-      sleectHouseNumber:{}//区域地点
+      allPlace: {}, //存放请求到的所有区域地点
+      sleectHouseNumber: {}, //区域地点
+      initSjList: [] //原始事件列表
     };
   },
   render(createElement) {
@@ -266,11 +304,13 @@ export default {
 
       valid: undefined,
       action: {
-        target: this.$host + "/service/common/common/uploadAttachment/incident/",
+        target:
+          this.$host + "/service/common/common/uploadAttachment/incident/",
         data: {}
       },
       action1: {
-        target: this.$host + "/service/common/common/uploadAttachment/incident/",
+        target:
+          this.$host + "/service/common/common/uploadAttachment/incident/",
         data: {}
       },
       isUploading: false,
@@ -869,12 +909,11 @@ export default {
       // }
 
       that.modelData.incident.houseNumber = that.model.address[0];
-        that.modelData.incident['repairType']=that.valConfig
+      that.modelData.incident["repairType"] = that.valConfig;
       if (that.valConfig == 1) {
         // that.modelData.incident.requester = that.loginUser;
         // that.modelData.incident.account = that.loginUser.account;
         // that.modelData.requestershow = that.loginUser;
-
       } else if (that.valConfig == 2) {
         that.modelData.incident.department = that.model.requester;
       }
@@ -1006,11 +1045,13 @@ export default {
         that.model.contacts = that.loginUser.name;
         that.model.houseNumber = that.loginUser.houseNumber;
       }
-      if (that.loginUser.place.id) {
-        if (that.loginUser.place.area) {
-          that.model.placeValue[0] = that.loginUser.place.area.id;
+      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;
         }
-        that.model.placeValue[1] = that.loginUser.place.id;
       }
 
       if (localStorage.getItem("model")) {
@@ -1045,10 +1086,14 @@ export default {
       $("#fade").fadeOut();
       var that = this;
       that.setLocalStroageData();
-      if(that.selectHouseNumber.place){
+      if (that.selectHouseNumber && that.selectHouseNumber.place) {
         that.modelData.incident.place = that.selectHouseNumber;
       }
-      console.log( that.modelData,that.selectHouseNumber,'2020年4月25日14:09:29');
+      console.log(
+        that.modelData,
+        that.selectHouseNumber,
+        "2020年4月25日14:09:29"
+      );
       that.$http
         .post("service/bpm/bpm/start/bpm_incident", that.modelData)
         .then(function(res) {
@@ -1194,6 +1239,24 @@ export default {
         txt: this.selectedCategoryTxt
       };
       localStorage.setItem("category", JSON.stringify(category));
+      // ----------------------回显其他数据---------------------
+      console.log(selectedVal, "seimin");
+      let reverseArr = selectedVal.filter(Boolean).reverse(); //数组翻转，取第一项不为空的
+      let sjId = reverseArr[0]; //事件Id baba
+      let sj = this.initSjList.filter(v => v.id == sjId)[0];
+      console.log(sj);
+      this.model.priority = sj.priority.id;
+      if (sj.userOrGroupType === 1) {
+        //派人
+        this.order = 2;
+        this.model.handleUserOrGroup = true;
+        this.model.handlerUser = sj.handleUser.id;
+      } else if (sj.userOrGroupType === 2) {
+        //派组
+        this.order = 2;
+        this.model.handleUserOrGroup = false;
+        this.model.candidateGroups = sj.group.id;
+      }
     },
     // 事件分类
     getIncidentcategory() {
@@ -1204,6 +1267,7 @@ export default {
           sum: 1000
         })
         .then(function(res) {
+          that.initSjList = JSON.parse(JSON.stringify(res.data.list));
           var list = res.data.list;
           var tree = [];
           list.forEach((v, i) => {
@@ -1256,14 +1320,15 @@ 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.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);
+      });
+      console.log(this.selectHouseNumber, 2222);
 
       // this.model.houseNumber = this.selectedPlaceTxt = selectedTxt.join(" ");
       // var place = {
@@ -1303,10 +1368,9 @@ export default {
     },
     // 取消选中报修科室
     cancelDeptHandler() {
-      if(this.model.requester){
-        this.deptInpVal=this.model.requester.dept
-      }
-      else if (!this.model.requester) {
+      if (this.model.requester) {
+        this.deptInpVal = this.model.requester.dept;
+      } else if (!this.model.requester) {
         this.deptInpVal = "";
         this.model.requester = "";
       }
@@ -1518,7 +1582,7 @@ export default {
   }
 };
 </script>
-<style >
+<style>
 .newIncident .cube-form-group {
   border-bottom: 0.02rem solid rgb(245, 245, 245);
 }