事件详情增加受理人和处理人的展示

src/views/againAssign.vue

@@ -5,21 +5,28 @@
       <div v-if="model.incident" class="conent">
         <div class="navBar">
           <div class="fl">
-            <a :class="{active:actives=='info'}" href="javascript:;" @click="toInfo('info')">事件信息</a>
+            <a
+              :class="{ active: actives == 'info' }"
+              href="javascript:;"
+              @click="toInfo('info')"
+              >事件信息</a
+            >
           </div>
           <div class="fl">
             <a
-              :class="{active:actives=='assignee'}"
+              :class="{ active: actives == 'assignee' }"
               href="javascript:;"
               @click="toInfo('assignee')"
-            >重新指派</a>
+              >重新指派</a
+            >
           </div>
           <div class="fl">
             <a
-              :class="{active:actives=='progress'}"
+              :class="{ active: actives == 'progress' }"
               href="javascript:;"
               @click="toInfo('progress')"
-            >处理进度</a>
+              >处理进度</a
+            >
           </div>
         </div>
         <div class="label headtop" id="info">事件信息</div>
@@ -28,13 +35,15 @@
           <div class="head">
             <p>
               <i class="iconfont icon-zuixinbaoxiu newPapir"></i>
-              事件编号：{{model.incident.incidentsign}}
-              <span class="fr btn chongxinzhipai">{{model.incident.state.name}}</span>
+              事件编号：{{ model.incident.incidentsign }}
+              <span class="fr btn chongxinzhipai">{{
+                model.incident.state.name
+              }}</span>
             </p>
           </div>
           <p>
             <span class="fl">事件分类</span>
-            <span class="fr">{{model.incident.category.category}}</span>
+            <span class="fr">{{ model.incident.category.category }}</span>
           </p>
           <!-- <p>
             <span class="fl">事件主题</span>
@@ -42,33 +51,46 @@
           </p> -->
           <p class="desc">
             <span class="fl">事件描述</span>
-            <span class="fr grayFont" v-html="model.incident.description"></span>
+            <span
+              class="fr grayFont"
+              v-html="model.incident.description"
+            ></span>
           </p>
           <div class="shows" id="shows">
-            <p v-if="valConfig==2">
+            <p v-if="valConfig == 2">
               <span class="fl">报修科室</span>
-              <span class="fr">{{model.incident.department?model.incident.department.dept:''}}</span>
+              <span class="fr">{{
+                model.incident.department ? model.incident.department.dept : ""
+              }}</span>
             </p>
-            <p v-if="valConfig==1">
+            <p v-if="valConfig == 1">
               <span class="fl">报修人</span>
-              <span class="fr">{{model.incident.requester.name}}</span>
+              <span class="fr">{{ model.incident.requester.name }}</span>
             </p>
-            <p v-if="valConfig==2">
+            <p v-if="valConfig == 2">
               <span class="fl">联系人</span>
-              <span class="fr">{{model.incident.contacts}}</span>
+              <span class="fr">{{ model.incident.contacts }}</span>
             </p>
             <p>
               <span class="fl">联系电话</span>
-              <span class="fr" v-if="!model.incident.contactsInformation"></span>
-              <span class="fr" v-if="model.incident.contactsInformation"><a :href="'tel:' + model.incident.contactsInformation"><i class="iconfont icon-shouji"></i>{{model.incident.contactsInformation}}</a></span>
+              <span
+                class="fr"
+                v-if="!model.incident.contactsInformation"
+              ></span>
+              <span class="fr" v-if="model.incident.contactsInformation"
+                ><a :href="'tel:' + model.incident.contactsInformation"
+                  ><i class="iconfont icon-shouji"></i
+                  >{{ model.incident.contactsInformation }}</a
+                ></span
+              >
             </p>
             <p>
               <span class="fl">联系地址</span>
-              <span class="fr">{{model.incident.houseNumber||''}}</span>
+              <span class="fr">{{ model.incident.houseNumber || "" }}</span>
             </p>
             <p class="boeder_B">
               <span class="fl">事件来源</span>
-              <span class="fr">{{model.incident.source.name}}</span>
+              <span class="fr">{{ model.incident.source.name }}</span>
             </p>
             <!-- <p>
               <span class="fl">影响度</span>
@@ -79,27 +101,59 @@
               <span class="fr">{{model.incident.emergency?model.incident.emergency.name:''}}</span>
             </p> -->
             <p>
+              <span class="fl">受理人</span>
+              <span class="fr">{{
+                model.incident.acceptUser ? model.incident.acceptUser.name : ""
+              }}</span>
+            </p>
+            <p>
+              <span class="fl">处理人</span>
+              <span class="fr">{{
+                model.incident.handlerUser
+                  ? model.incident.handlerUser.name
+                  : ""
+              }}</span>
+            </p>
+            <p>
               <span class="fl">优先级</span>
-              <span class="fr">{{model.incident.priority?model.incident.priority.name:''}}</span>
+              <span class="fr">{{
+                model.incident.priority ? model.incident.priority.name : ""
+              }}</span>
             </p>
             <p>
               <span class="fl">逾期响应时间</span>
-              <span class="fr">{{model.incident.overdueResponseDate}}</span>
+              <span class="fr">{{ model.incident.overdueResponseDate }}</span>
             </p>
             <p>
               <span class="fl">逾期解决时间</span>
-              <span class="fr">{{model.incident.overdueTime}}</span>
+              <span class="fr">{{ model.incident.overdueTime }}</span>
             </p>
           </div>
           <p class="info_hide">
-            <span class="fl hide" @click="hides()" v-if="!item_hides">展开详情 >></span>
-            <span class="fl hide" @click="hides()" v-if="item_hides">隐藏详情<<</span>
+            <span class="fl hide" @click="hides()" v-if="!item_hides"
+              >展开详情 >></span
+            >
+            <span class="fl hide" @click="hides()" v-if="item_hides"
+              >隐藏详情<<</span
+            >
           </p>
           <div class="imgs-container" v-if="imgs.length">
             <div class="imgs-cont">
-              <img v-if='img.suffix=="jpeg"||img.suffix=="jpg"||img.suffix=="gif"||img.suffix=="png"||img.suffix=="svg"||img.suffix=="pdf"' :src="img.previewUrl" v-for="(img, index) in imgs" class="imgs">
+              <img
+                v-if="
+                  img.suffix == 'jpeg' ||
+                    img.suffix == 'jpg' ||
+                    img.suffix == 'gif' ||
+                    img.suffix == 'png' ||
+                    img.suffix == 'svg' ||
+                    img.suffix == 'pdf'
+                "
+                :src="img.previewUrl"
+                v-for="(img, index) in imgs"
+                class="imgs"
+              />
               <p v-else>
-                <a :href='[img.previewUrl]'>{{img.name}}</a>
+                <a :href="[img.previewUrl]">{{ img.name }}</a>
               </p>
             </div>
           </div>
@@ -107,33 +161,40 @@
           <div class="info">
             <p>
               <span class="fl">重新指派原因:</span>
-              <span class="fr">{{model.resignComment}}</span>
+              <span class="fr">{{ model.resignComment }}</span>
             </p>
           </div>
 
           <div class="label" id="progress">处理进度</div>
-          <div :class="{'progress':true,'progressHide':!pro_hides}" id="progressBox">
+          <div
+            :class="{ progress: true, progressHide: !pro_hides }"
+            id="progressBox"
+          >
             <div class="progress_info" v-for="item in progressInfo">
-              <div class="progress_info_L">{{item.activityName}}</div>
+              <div class="progress_info_L">{{ item.activityName }}</div>
               <div class="progress_info_R">
                 <div class="time">
                   <i
-                    :class="{'iconfont':true, 'icon-icon_weizuo':item.endTime!='','icon-icon_zhengzaijinx':item.endTime=='' }"
+                    :class="{
+                      iconfont: true,
+                      'icon-icon_weizuo': item.endTime != '',
+                      'icon-icon_zhengzaijinx': item.endTime == ''
+                    }"
                   ></i>
-                  <span class="text1">{{item.startTime}}</span>
+                  <span class="text1">{{ item.startTime }}</span>
                 </div>
-                <div
-                  :class="{'cont':true,'blue':item.endTime!='' }"
-                >
+                <div :class="{ cont: true, blue: item.endTime != '' }">
                   <p class="text2" v-if="item.desc" v-html="item.desc"></p>
                 </div>
               </div>
             </div>
           </div>
           <p class="info_hide">
-            <span class="fl hide" @click="proHides()">{{pro_hides?'隐藏详情 <<':'展开详情 >>'}}</span>
+            <span class="fl hide" @click="proHides()">{{
+              pro_hides ? "隐藏详情 <<" : "展开详情 >>"
+            }}</span>
           </p>
-          <div v-if="model.incident.handlerUser.id==loginUser.id">
+          <div v-if="model.incident.handlerUser.id == loginUser.id">
             <div class="label">指派</div>
             <div class="form">
               <div class="txtLabel">
@@ -174,7 +235,10 @@
         </div>
       </div>
       <load-ing v-if="!model.incident"></load-ing>
-      <promp-ting :conents="promptingConent" :status="promptingStatus"></promp-ting>
+      <promp-ting
+        :conents="promptingConent"
+        :status="promptingStatus"
+      ></promp-ting>
     </div>
   </div>
 </template>
@@ -184,7 +248,7 @@ import PrompTing from "./../views/prompting.vue";
 export default {
   data() {
     return {
-      id:'',
+      id: "",
       loginUser: JSON.parse(localStorage.getItem("loginUser")),
       valConfig: JSON.parse(localStorage.getItem("valConfig")) - 0, //报修主体
       promptingConent: "",
@@ -200,7 +264,7 @@ export default {
       candidateGroupsArr: [], //处理组
       handlerUser: "", //处理人
       handlerGroup: "", //处理组
-      pro_hides:false,//展开/收起处理进度
+      pro_hides: false //展开/收起处理进度
     };
   },
   components: {
@@ -216,7 +280,9 @@ export default {
           "/service/form/renderForm/receiveform/" +
             that.processInstanceId +
             "/" +
-            that.loginUser.id+'/'+that.id,
+            that.loginUser.id +
+            "/" +
+            that.id,
           {}
         )
         .then(function(res) {
@@ -259,13 +325,15 @@ export default {
       $("#shows").slideToggle();
     },
     // 处理进度隐藏/展开
-    proHides(){
-      if(!this.pro_hides){
-        $('#progressBox').animate({'height':$('#progressBox')[0].scrollHeight})
-      }else{
-        $('#progressBox').animate({'height':'1.7rem'})
+    proHides() {
+      if (!this.pro_hides) {
+        $("#progressBox").animate({
+          height: $("#progressBox")[0].scrollHeight
+        });
+      } else {
+        $("#progressBox").animate({ height: "1.7rem" });
       }
-      this.pro_hides=!this.pro_hides;
+      this.pro_hides = !this.pro_hides;
     },
     // 快速定位
     toInfo(id) {
@@ -471,15 +539,15 @@ i.iconfont.blue {
       .boeder_B {
         border-bottom: 0.01rem solid #ccc;
       }
-       p {
-          &.desc{
-            overflow: hidden;
-          }
-          .grayFont {
-            width: 75%;
-            text-align: right;
-            overflow-x: scroll;
-          }
+      p {
+        &.desc {
+          overflow: hidden;
+        }
+        .grayFont {
+          width: 75%;
+          text-align: right;
+          overflow-x: scroll;
+        }
       }
       .bottom {
         overflow: hidden;
@@ -517,14 +585,14 @@ i.iconfont.blue {
             color: #00559d;
           }
         }
-        .imgs-container{
-          a{
-            color:#03c !important;
-            &:visited{
+        .imgs-container {
+          a {
+            color: #03c !important;
+            &:visited {
               color: #551a8b !important;
             }
           }
-           img {
+          img {
             width: 1.5rem;
             height: 1.5rem;
             margin-right: 0.7rem;
@@ -536,17 +604,17 @@ i.iconfont.blue {
         .progress {
           padding: 0.2rem 0.2rem;
           overflow: hidden;
-          transition-duration: .2s;
+          transition-duration: 0.2s;
           transition-timing-function: linear;
-          &.progressHide{
+          &.progressHide {
             height: 1.7rem;
           }
           .progress_info {
             overflow: hidden;
             margin-bottom: 0.1rem;
-            &:nth-last-child(1){
-              .cont{
-                border:none !important;
+            &:nth-last-child(1) {
+              .cont {
+                border: none !important;
               }
             }
             .progress_info_L {

src/views/closed.vue

@@ -81,8 +81,16 @@
             </p>
             <p>
               <span class="fl">联系电话</span>
-              <span class="fr" v-if="!model.incident.contactsInformation"></span>
-              <span class="fr" v-if="model.incident.contactsInformation"><a :href="'tel:' + model.incident.contactsInformation"><i class="iconfont icon-shouji"></i>{{ model.incident.contactsInformation }}</a></span>
+              <span
+                class="fr"
+                v-if="!model.incident.contactsInformation"
+              ></span>
+              <span class="fr" v-if="model.incident.contactsInformation"
+                ><a :href="'tel:' + model.incident.contactsInformation"
+                  ><i class="iconfont icon-shouji"></i
+                  >{{ model.incident.contactsInformation }}</a
+                ></span
+              >
             </p>
             <p>
               <span class="fl">联系地址</span>
@@ -101,6 +109,20 @@
               <span class="fr">{{model.incident.emergency?model.incident.emergency.name:''}}</span>
             </p> -->
             <p>
+              <span class="fl">受理人</span>
+              <span class="fr">{{
+                model.incident.acceptUser ? model.incident.acceptUser.name : ""
+              }}</span>
+            </p>
+            <p>
+              <span class="fl">处理人</span>
+              <span class="fr">{{
+                model.incident.handlerUser
+                  ? model.incident.handlerUser.name
+                  : ""
+              }}</span>
+            </p>
+            <p>
               <span class="fl">优先级</span>
               <span class="fr">{{
                 model.incident.priority ? model.incident.priority.name : ""

src/views/grabSheet.vue

@@ -75,6 +75,14 @@
                 <span class="fr">{{model.incident.emergency?model.incident.emergency.name:''}}</span>
               </p> -->
               <p>
+                <span class="fl">受理人</span>
+                <span class="fr">{{model.incident.acceptUser?model.incident.acceptUser.name:''}}</span>
+              </p>
+              <p>
+                <span class="fl">处理人</span>
+                <span class="fr">{{model.incident.handlerUser?model.incident.handlerUser.name:''}}</span>
+              </p>
+              <p>
                 <span class="fl">优先级</span>
                 <span class="fr">{{model.incident.priority?model.incident.priority.name:''}}</span>
               </p>

src/views/order.vue

@@ -78,6 +78,14 @@
                 <span class="fr">{{model.incident.emergency?model.incident.emergency.name:''}}</span>
               </p> -->
               <p>
+                <span class="fl">受理人</span>
+                <span class="fr">{{model.incident.acceptUser?model.incident.acceptUser.name:''}}</span>
+              </p>
+              <p>
+                <span class="fl">处理人</span>
+                <span class="fr">{{model.incident.handlerUser?model.incident.handlerUser.name:''}}</span>
+              </p>
+              <p>
                 <span class="fl">优先级</span>
                 <span class="fr">{{model.incident.priority?model.incident.priority.name:''}}</span>
               </p>

src/views/processing.vue

@@ -113,6 +113,22 @@
               <span class="fr">{{modelData.incident.emergency?modelData.incident.emergency.name:''}}</span>
             </p> -->
             <p>
+              <span class="fl">受理人</span>
+              <span class="fr">{{
+                modelData.incident.acceptUser
+                  ? modelData.incident.acceptUser.name
+                  : ""
+              }}</span>
+            </p>
+            <p>
+              <span class="fl">处理人</span>
+              <span class="fr">{{
+                modelData.incident.handlerUser
+                  ? modelData.incident.handlerUser.name
+                  : ""
+              }}</span>
+            </p>
+            <p>
               <span class="fl">优先级</span>
               <span class="fr">{{
                 modelData.incident.priority
@@ -543,7 +559,7 @@ export default {
         {
           label: "转派",
           value: 3
-        },
+        }
         // {
         //   label: "指派",
         //   value: 5

src/views/solved.vue

@@ -5,21 +5,28 @@
       <div v-if="model.incident" class="conent">
         <div class="navBar">
           <div class="fl">
-            <a :class="{active:actives=='info'}" href="javascript:;" @click="toInfo('info')">事件信息</a>
+            <a
+              :class="{ active: actives == 'info' }"
+              href="javascript:;"
+              @click="toInfo('info')"
+              >事件信息</a
+            >
           </div>
           <div class="fl">
             <a
-              :class="{active:actives=='handlerInfo'}"
+              :class="{ active: actives == 'handlerInfo' }"
               href="javascript:;"
               @click="toInfo('handlerInfo')"
-            >处理信息</a>
+              >处理信息</a
+            >
           </div>
           <div class="fl">
             <a
-              :class="{active:actives=='progress'}"
+              :class="{ active: actives == 'progress' }"
               href="javascript:;"
               @click="toInfo('progress')"
-            >处理进度</a>
+              >处理进度</a
+            >
           </div>
         </div>
 
@@ -28,13 +35,15 @@
           <div class="head">
             <p>
               <i class="iconfont icon-zuixinbaoxiu newPapir"></i>
-              事件编号：{{model.incident.incidentsign}}
-              <span class="fr btn yijiejue">{{model.incident.state.name}}</span>
+              事件编号：{{ model.incident.incidentsign }}
+              <span class="fr btn yijiejue">{{
+                model.incident.state.name
+              }}</span>
             </p>
           </div>
           <p>
             <span class="fl">事件分类</span>
-            <span class="fr">{{model.incident.category.category}}</span>
+            <span class="fr">{{ model.incident.category.category }}</span>
           </p>
           <!-- <p>
             <span class="fl">事件主题</span>
@@ -42,33 +51,46 @@
           </p> -->
           <p class="desc">
             <span class="fl">事件描述</span>
-            <span class="grayFont fr " v-html="model.incident.description"></span>
+            <span
+              class="grayFont fr "
+              v-html="model.incident.description"
+            ></span>
           </p>
           <div class="shows" id="shows">
-              <p v-if="valConfig==2">
-                <span class="fl">报修科室</span>
-                <span class="fr">{{model.incident.department?model.incident.department.dept:''}}</span>
-              </p>
-            <p v-if="valConfig==1">
+            <p v-if="valConfig == 2">
+              <span class="fl">报修科室</span>
+              <span class="fr">{{
+                model.incident.department ? model.incident.department.dept : ""
+              }}</span>
+            </p>
+            <p v-if="valConfig == 1">
               <span class="fl">报修人</span>
-              <span class="fr">{{model.incident.requester.name}}</span>
+              <span class="fr">{{ model.incident.requester.name }}</span>
             </p>
-            <p v-if="valConfig==2">
+            <p v-if="valConfig == 2">
               <span class="fl">联系人</span>
-              <span class="fr">{{model.incident.contacts}}</span>
+              <span class="fr">{{ model.incident.contacts }}</span>
             </p>
             <p>
               <span class="fl">联系电话</span>
-              <span class="fr" v-if="!model.incident.contactsInformation"></span>
-              <span class="fr" v-if="model.incident.contactsInformation"><a :href="'tel:' + model.incident.contactsInformation"><i class="iconfont icon-shouji"></i>{{model.incident.contactsInformation}}</a></span>
+              <span
+                class="fr"
+                v-if="!model.incident.contactsInformation"
+              ></span>
+              <span class="fr" v-if="model.incident.contactsInformation"
+                ><a :href="'tel:' + model.incident.contactsInformation"
+                  ><i class="iconfont icon-shouji"></i
+                  >{{ model.incident.contactsInformation }}</a
+                ></span
+              >
             </p>
             <p>
               <span class="fl">联系地址</span>
-              <span class="fr">{{model.incident.houseNumber||''}}</span>
+              <span class="fr">{{ model.incident.houseNumber || "" }}</span>
             </p>
             <p class="boeder_B">
               <span class="fl">事件来源</span>
-              <span class="fr">{{model.incident.source.name}}</span>
+              <span class="fr">{{ model.incident.source.name }}</span>
             </p>
             <!-- <p>
               <span class="fl">影响度</span>
@@ -79,35 +101,71 @@
               <span class="fr">{{model.incident.emergency?model.incident.emergency.name:''}}</span>
             </p> -->
             <p>
+              <span class="fl">受理人</span>
+              <span class="fr">{{
+                model.incident.acceptUser ? model.incident.acceptUser.name : ""
+              }}</span>
+            </p>
+            <p>
+              <span class="fl">处理人</span>
+              <span class="fr">{{
+                model.incident.handlerUser
+                  ? model.incident.handlerUser.name
+                  : ""
+              }}</span>
+            </p>
+            <p>
               <span class="fl">优先级</span>
-              <span class="fr">{{model.incident.priority?model.incident.priority.name:''}}</span>
+              <span class="fr">{{
+                model.incident.priority ? model.incident.priority.name : ""
+              }}</span>
             </p>
             <p>
               <span class="fl">逾期响应时间</span>
-              <span class="fr">{{model.incident.overdueResponseDate}}</span>
+              <span class="fr">{{ model.incident.overdueResponseDate }}</span>
             </p>
             <p>
               <span class="fl">逾期解决时间</span>
-              <span class="fr">{{model.incident.overdueTime}}</span>
+              <span class="fr">{{ model.incident.overdueTime }}</span>
             </p>
             <p>
               <span class="fl">区域</span>
-              <span class="fr">{{model.incident.place?model.incident.place.area.area:'--'}}</span>
+              <span class="fr">{{
+                model.incident.place ? model.incident.place.area.area : "--"
+              }}</span>
             </p>
             <p>
               <span class="fl">地点</span>
-              <span class="fr">{{model.incident.place?model.incident.place.place:'--'}}</span>
+              <span class="fr">{{
+                model.incident.place ? model.incident.place.place : "--"
+              }}</span>
             </p>
           </div>
           <p class="info_hide">
-            <span class="fl hide" @click="hides()" v-if="!item_hides">展开详情 >></span>
-            <span class="fl hide" @click="hides()" v-if="item_hides">隐藏详情<<</span>
+            <span class="fl hide" @click="hides()" v-if="!item_hides"
+              >展开详情 >></span
+            >
+            <span class="fl hide" @click="hides()" v-if="item_hides"
+              >隐藏详情<<</span
+            >
           </p>
           <div class="imgs-container" v-if="imgs.length">
             <div class="imgs-cont">
-              <img v-if='img.suffix=="jpeg"||img.suffix=="jpg"||img.suffix=="gif"||img.suffix=="png"||img.suffix=="svg"||img.suffix=="pdf"' :src="img.previewUrl" v-for="(img, index) in imgs" class="imgs">
+              <img
+                v-if="
+                  img.suffix == 'jpeg' ||
+                    img.suffix == 'jpg' ||
+                    img.suffix == 'gif' ||
+                    img.suffix == 'png' ||
+                    img.suffix == 'svg' ||
+                    img.suffix == 'pdf'
+                "
+                :src="img.previewUrl"
+                v-for="(img, index) in imgs"
+                class="imgs"
+              />
               <p v-else>
-                <a :href='[img.previewUrl]'>{{img.name}}</a>
+                <a :href="[img.previewUrl]">{{ img.name }}</a>
               </p>
             </div>
           </div>
@@ -115,26 +173,40 @@
           <div class="label" id="handlerInfo">处理信息</div>
           <p>
             <span class="fl">处理人</span>
-            <span class="fr">{{model.incident.acceptUser?model.incident.acceptUser.name:''}}</span>
+            <span class="fr">{{
+              model.incident.acceptUser ? model.incident.acceptUser.name : ""
+            }}</span>
           </p>
           <p>
             <span class="fl">联系电话</span>
             <span class="fr" v-if="!model.incident.contactsInformation"></span>
-              <span class="fr" v-if="model.incident.contactsInformation"><a :href="'tel:' + model.incident.contactsInformation"><i class="iconfont icon-shouji"></i>{{model.incident.contactsInformation}}</a></span>
+            <span class="fr" v-if="model.incident.contactsInformation"
+              ><a :href="'tel:' + model.incident.contactsInformation"
+                ><i class="iconfont icon-shouji"></i
+                >{{ model.incident.contactsInformation }}</a
+              ></span
+            >
           </p>
           <p>
             <span class="fl">处理方式</span>
-            <span
-              class="fr showwrap"
-            >{{model.incident.handleCategory?model.incident.handleCategory.name:''}}</span>
+            <span class="fr showwrap">{{
+              model.incident.handleCategory
+                ? model.incident.handleCategory.name
+                : ""
+            }}</span>
           </p>
           <p>
             <span class="fl">关闭代码</span>
-            <span class="fr">{{model.incident.closecode?model.incident.closecode.name:''}}</span>
+            <span class="fr">{{
+              model.incident.closecode ? model.incident.closecode.name : ""
+            }}</span>
           </p>
           <p class="desc">
             <span class="fl">处理方案</span>
-            <span class="fr grayFont" v-html="model.incident.handleDescription"></span>
+            <span
+              class="fr grayFont"
+              v-html="model.incident.handleDescription"
+            ></span>
           </p>
           <!-- <p>
             <span class="fl" v-if="model.incident.synergeticReason">协同对象</span>
@@ -156,19 +228,24 @@
               </p> -->
 
           <div class="label" id="progress">处理进度</div>
-          <div :class="{'progress':true,'progressHide':!pro_hides}" id="progressBox">
+          <div
+            :class="{ progress: true, progressHide: !pro_hides }"
+            id="progressBox"
+          >
             <div class="progress_info" v-for="item in progressInfo">
-              <div class="progress_info_L">{{item.activityName}}</div>
+              <div class="progress_info_L">{{ item.activityName }}</div>
               <div class="progress_info_R">
                 <div class="time">
                   <i
-                    :class="{'iconfont':true, 'icon-icon_weizuo':item.endTime!='','icon-icon_zhengzaijinx':item.endTime=='' }"
+                    :class="{
+                      iconfont: true,
+                      'icon-icon_weizuo': item.endTime != '',
+                      'icon-icon_zhengzaijinx': item.endTime == ''
+                    }"
                   ></i>
-                  <span class="text1">{{item.startTime}}</span>
+                  <span class="text1">{{ item.startTime }}</span>
                 </div>
-                <div
-                  :class="{'cont':true,'blue':item.endTime!='' }"
-                >
+                <div :class="{ cont: true, blue: item.endTime != '' }">
                   <p class="text2" v-if="item.desc" v-html="item.desc"></p>
                 </div>
               </div>
@@ -176,25 +253,42 @@
           </div>
 
           <p class="info_hide">
-            <span class="fl hide" @click="proHides()">{{pro_hides?'隐藏详情 <<':'展开详情 >>'}}</span>
+            <span class="fl hide" @click="proHides()">{{
+              pro_hides ? "隐藏详情 <<" : "展开详情 >>"
+            }}</span>
           </p>
 
-          <div class="form"  v-if="model.incident.handlerUser.id==loginUser.id">
+          <div
+            class="form"
+            v-if="model.incident.handlerUser.id == loginUser.id"
+          >
             <div class="txtLabel">
               <div class="txt fl handler">
                 <span style="color:red;">*</span>是否已解决：
               </div>
-              <cube-select class="selectGroup fl" v-model="isclose" :options="iscloseArr"></cube-select>
+              <cube-select
+                class="selectGroup fl"
+                v-model="isclose"
+                :options="iscloseArr"
+              ></cube-select>
             </div>
             <div class="txtLabel">
               <div class="txt fl">
                 <span style="color:red;">*</span> 结果类型:
               </div>
-              <cube-select class="selectGroup fl" v-model="handleResult" :options="handleResultArr"></cube-select>
+              <cube-select
+                class="selectGroup fl"
+                v-model="handleResult"
+                :options="handleResultArr"
+              ></cube-select>
             </div>
             <div class="txtLabel">
               <div class="txt fl">满意度评价:</div>
-              <cube-select class="selectGroup fl" v-model="degree" :options="degreeArr"></cube-select>
+              <cube-select
+                class="selectGroup fl"
+                v-model="degree"
+                :options="degreeArr"
+              ></cube-select>
             </div>
             <div class="txtLabel">
               <div class="txt fl">回访备注:</div>
@@ -215,7 +309,7 @@ import LoadIng from "./../views/loading.vue";
 export default {
   data() {
     return {
-      id:'',
+      id: "",
       loginUser: JSON.parse(localStorage.getItem("loginUser")),
       valConfig: JSON.parse(localStorage.getItem("valConfig")) - 0, //报修主体
       selected: 1,
@@ -237,7 +331,7 @@ export default {
       visitRemarks: "", //回访备注
       item_hides: false,
       item_hides1: false,
-      pro_hides:false,//展开/收起处理进度
+      pro_hides: false, //展开/收起处理进度
       actives: "info",
       processInstanceId: "",
       progressInfo: [], //处理进度
@@ -257,15 +351,17 @@ export default {
           "/service/form/renderForm/closeform/" +
             that.processInstanceId +
             "/" +
-            that.loginUser.id+'/'+that.id,
+            that.loginUser.id +
+            "/" +
+            that.id,
           {}
         )
         .then(function(res) {
           console.log(res.data);
           that.model = res.data.model;
-          that.model.msgflag = '已解决';
+          that.model.msgflag = "已解决";
           //seimin
-          localStorage.setItem('modelData',JSON.stringify(that.model))
+          localStorage.setItem("modelData", JSON.stringify(that.model));
         });
     },
     // 获取图片
@@ -346,13 +442,15 @@ export default {
       $("#shows1").slideToggle();
     },
     // 处理进度隐藏/展开
-    proHides(){
-      if(!this.pro_hides){
-        $('#progressBox').animate({'height':$('#progressBox')[0].scrollHeight})
-      }else{
-        $('#progressBox').animate({'height':'1.7rem'})
+    proHides() {
+      if (!this.pro_hides) {
+        $("#progressBox").animate({
+          height: $("#progressBox")[0].scrollHeight
+        });
+      } else {
+        $("#progressBox").animate({ height: "1.7rem" });
       }
-      this.pro_hides=!this.pro_hides;
+      this.pro_hides = !this.pro_hides;
     },
     // 快速定位
     toInfo(id) {
@@ -373,7 +471,7 @@ export default {
       delete that.model.handlerCode;
       that.model.handler_code = "resolve";
       that.model.isclose = that.isclose;
-      if(that.model.isclose=='close'){
+      if (that.model.isclose == "close") {
         delete that.model.receive_code;
       }
       that.model.incident.handleResult = { id: that.handleResult };
@@ -429,7 +527,9 @@ export default {
       ? this.$route.params.data.processInstanceId
       : JSON.parse(localStorage.getItem("modelData")).incident
           .processInstanceId;
-          this.id=this.$route.params.data?this.$route.params.data.id:JSON.parse(localStorage.getItem("modelData")).incident.id;
+    this.id = this.$route.params.data
+      ? this.$route.params.data.id
+      : JSON.parse(localStorage.getItem("modelData")).incident.id;
     this.getParamsData();
     this.getProgressInfo();
     this.getImgs();
@@ -549,15 +649,15 @@ i.iconfont {
       .boeder_B {
         border-bottom: 0.01rem solid #ccc;
       }
-        p {
-          &.desc{
-            overflow: hidden;
-          }
-          .grayFont {
-            width: 75%;
-            text-align: right;
-            overflow-x: scroll;
-          }
+      p {
+        &.desc {
+          overflow: hidden;
+        }
+        .grayFont {
+          width: 75%;
+          text-align: right;
+          overflow-x: scroll;
+        }
       }
       .bottom {
         overflow: hidden;
@@ -595,14 +695,14 @@ i.iconfont {
             color: #00559d;
           }
         }
-        .imgs-container{
-          a{
-            color:#03c !important;
-            &:visited{
+        .imgs-container {
+          a {
+            color: #03c !important;
+            &:visited {
               color: #551a8b !important;
             }
           }
-           img {
+          img {
             width: 1.5rem;
             height: 1.5rem;
             margin-right: 0.7rem;
@@ -615,17 +715,17 @@ i.iconfont {
         .progress {
           padding: 0.2rem 0.2rem;
           overflow: hidden;
-          transition-duration: .2s;
+          transition-duration: 0.2s;
           transition-timing-function: linear;
-          &.progressHide{
+          &.progressHide {
             height: 1.7rem;
           }
           .progress_info {
             overflow: hidden;
             margin-bottom: 0.1rem;
-            &:nth-last-child(1){
-              .cont{
-                border:none !important;
+            &:nth-last-child(1) {
+              .cont {
+                border: none !important;
               }
             }
             .progress_info_L {

src/views/waitConfirm.vue

@@ -5,21 +5,28 @@
         <div class="header">处理方案</div>
         <div class="navBar">
           <div class="fl">
-            <a :class="{active:actives=='info'}" href="javascript:;" @click="toInfo('info')">事件信息</a>
+            <a
+              :class="{ active: actives == 'info' }"
+              href="javascript:;"
+              @click="toInfo('info')"
+              >事件信息</a
+            >
           </div>
           <div class="fl">
             <a
-              :class="{active:actives=='handlerInfo'}"
+              :class="{ active: actives == 'handlerInfo' }"
               href="javascript:;"
               @click="toInfo('handlerInfo')"
-            >处理信息</a>
+              >处理信息</a
+            >
           </div>
           <div class="fl">
             <a
-              :class="{active:actives=='progress'}"
+              :class="{ active: actives == 'progress' }"
               href="javascript:;"
               @click="toInfo('progress')"
-            >处理进度</a>
+              >处理进度</a
+            >
           </div>
         </div>
 
@@ -28,15 +35,38 @@
           <div class="head">
             <p>
               <i class="iconfont icon-zuixinbaoxiu newPapir"></i>
-              事件编号：{{model.incident.incidentsign}}
+              事件编号：{{ model.incident.incidentsign }}
               <span
-                :class="{ 'fr':true,'btn':true, 'daipingjia':model.incident.state.name=='待评价', 'daijiedan':(model.incident.state.name=='待接单'&&model.incident.handlerUser&&!model.incident.candidateGroups), 'daiqiangdan':(model.incident.state.name=='待接单'&&!model.incident.handlerUser&&model.incident.candidateGroups), 'chulizhong':model.incident.state.name=='处理中', 'yijiejue':model.incident.state.name=='已解决', 'yiguanbi':model.incident.state.name=='已关闭'}"
-              >{{model.incident.state.name=='待接单'?(model.incident.handlerUser&&!model.incident.candidateGroups?'待接单':'待抢单'):model.incident.state.name}}</span>
+                :class="{
+                  fr: true,
+                  btn: true,
+                  daipingjia: model.incident.state.name == '待评价',
+                  daijiedan:
+                    model.incident.state.name == '待接单' &&
+                    model.incident.handlerUser &&
+                    !model.incident.candidateGroups,
+                  daiqiangdan:
+                    model.incident.state.name == '待接单' &&
+                    !model.incident.handlerUser &&
+                    model.incident.candidateGroups,
+                  chulizhong: model.incident.state.name == '处理中',
+                  yijiejue: model.incident.state.name == '已解决',
+                  yiguanbi: model.incident.state.name == '已关闭'
+                }"
+                >{{
+                  model.incident.state.name == "待接单"
+                    ? model.incident.handlerUser &&
+                      !model.incident.candidateGroups
+                      ? "待接单"
+                      : "待抢单"
+                    : model.incident.state.name
+                }}</span
+              >
             </p>
           </div>
           <p>
             <span class="fl">事件分类</span>
-            <span class="fr">{{model.incident.category.category}}</span>
+            <span class="fr">{{ model.incident.category.category }}</span>
           </p>
           <!-- <p>
             <span class="fl">事件主题</span>
@@ -44,33 +74,43 @@
           </p> -->
           <p>
             <span class="fl">事件描述</span>
-            <span class="fr showwrap">{{model.incident.description}}</span>
+            <span class="fr showwrap">{{ model.incident.description }}</span>
           </p>
           <div class="shows" id="shows">
-              <p v-if="valConfig==2">
-                <span class="fl">报修科室</span>
-                <span class="fr">{{model.incident.department?model.incident.department.dept:''}}</span>
-              </p>
-            <p v-if="valConfig==1">
+            <p v-if="valConfig == 2">
+              <span class="fl">报修科室</span>
+              <span class="fr">{{
+                model.incident.department ? model.incident.department.dept : ""
+              }}</span>
+            </p>
+            <p v-if="valConfig == 1">
               <span class="fl">报修人</span>
-              <span class="fr">{{model.incident.requester.name}}</span>
+              <span class="fr">{{ model.incident.requester.name }}</span>
             </p>
-            <p v-if="valConfig==2">
+            <p v-if="valConfig == 2">
               <span class="fl">联系人</span>
-              <span class="fr">{{model.incident.contacts}}</span>
+              <span class="fr">{{ model.incident.contacts }}</span>
             </p>
             <p>
               <span class="fl">联系电话</span>
-              <span class="fr" v-if="!model.incident.contactsInformation"></span>
-              <span class="fr" v-if="model.incident.contactsInformation"><a :href="'tel:' + model.incident.contactsInformation"><i class="iconfont icon-shouji"></i>{{model.incident.contactsInformation}}</a></span>
+              <span
+                class="fr"
+                v-if="!model.incident.contactsInformation"
+              ></span>
+              <span class="fr" v-if="model.incident.contactsInformation"
+                ><a :href="'tel:' + model.incident.contactsInformation"
+                  ><i class="iconfont icon-shouji"></i
+                  >{{ model.incident.contactsInformation }}</a
+                ></span
+              >
             </p>
             <p>
               <span class="fl">联系地址</span>
-              <span class="fr">{{model.incident.houseNumber||''}}</span>
+              <span class="fr">{{ model.incident.houseNumber || "" }}</span>
             </p>
             <p class="boeder_B">
               <span class="fl">事件来源</span>
-              <span class="fr">{{model.incident.source.name}}</span>
+              <span class="fr">{{ model.incident.source.name }}</span>
             </p>
             <!-- <p>
               <span class="fl">影响度</span>
@@ -81,27 +121,59 @@
               <span class="fr">{{model.incident.emergency?model.incident.emergency.name:''}}</span>
             </p> -->
             <p>
+              <span class="fl">受理人</span>
+              <span class="fr">{{
+                model.incident.acceptUser ? model.incident.acceptUser.name : ""
+              }}</span>
+            </p>
+            <p>
+              <span class="fl">处理人</span>
+              <span class="fr">{{
+                model.incident.handlerUser
+                  ? model.incident.handlerUser.name
+                  : ""
+              }}</span>
+            </p>
+            <p>
               <span class="fl">优先级</span>
-              <span class="fr">{{model.incident.priority?model.incident.priority.name:''}}</span>
+              <span class="fr">{{
+                model.incident.priority ? model.incident.priority.name : ""
+              }}</span>
             </p>
             <p>
               <span class="fl">逾期响应时间</span>
-              <span class="fr">{{model.incident.overdueResponseDate}}</span>
+              <span class="fr">{{ model.incident.overdueResponseDate }}</span>
             </p>
             <p>
               <span class="fl">逾期解决时间</span>
-              <span class="fr">{{model.incident.overdueTime}}</span>
+              <span class="fr">{{ model.incident.overdueTime }}</span>
             </p>
           </div>
           <p class="info_hide">
-            <span class="fl hide" @click="hides()" v-if="!item_hides">展开详情 >></span>
-            <span class="fl hide" @click="hides()" v-if="item_hides">隐藏详情<<</span>
+            <span class="fl hide" @click="hides()" v-if="!item_hides"
+              >展开详情 >></span
+            >
+            <span class="fl hide" @click="hides()" v-if="item_hides"
+              >隐藏详情<<</span
+            >
           </p>
           <div class="imgs-container" v-if="imgs.length">
             <div class="imgs-cont">
-              <img v-if='img.suffix=="jpeg"||img.suffix=="jpg"||img.suffix=="gif"||img.suffix=="png"||img.suffix=="svg"||img.suffix=="pdf"' :src="img.previewUrl" v-for="(img, index) in imgs" class="imgs">
+              <img
+                v-if="
+                  img.suffix == 'jpeg' ||
+                    img.suffix == 'jpg' ||
+                    img.suffix == 'gif' ||
+                    img.suffix == 'png' ||
+                    img.suffix == 'svg' ||
+                    img.suffix == 'pdf'
+                "
+                :src="img.previewUrl"
+                v-for="(img, index) in imgs"
+                class="imgs"
+              />
               <p v-else>
-                <a :href='[img.previewUrl]'>{{img.name}}</a>
+                <a :href="[img.previewUrl]">{{ img.name }}</a>
               </p>
             </div>
           </div>
@@ -109,28 +181,39 @@
           <div class="label" id="handlerInfo">处理信息</div>
           <p>
             <span class="fl">处理人</span>
-            <span class="fr">{{model.incident.acceptUser?model.incident.acceptUser.name:''}}</span>
+            <span class="fr">{{
+              model.incident.acceptUser ? model.incident.acceptUser.name : ""
+            }}</span>
           </p>
           <p>
             <span class="fl">联系电话</span>
             <span class="fr" v-if="!model.incident.contactsInformation"></span>
-              <span class="fr" v-if="model.incident.contactsInformation"><a :href="'tel:' + model.incident.contactsInformation"><i class="iconfont icon-shouji"></i>{{model.incident.contactsInformation}}</a></span>
+            <span class="fr" v-if="model.incident.contactsInformation"
+              ><a :href="'tel:' + model.incident.contactsInformation"
+                ><i class="iconfont icon-shouji"></i
+                >{{ model.incident.contactsInformation }}</a
+              ></span
+            >
           </p>
           <p>
             <span class="fl">处理方式</span>
-            <span class="fr showwrap">{{model.incident.handleCategory}}</span>
+            <span class="fr showwrap">{{ model.incident.handleCategory }}</span>
           </p>
           <p>
             <span class="fl">关闭代码</span>
-            <span class="fr">{{model.incident.closecode?model.incident.closecode.name:''}}</span>
+            <span class="fr">{{
+              model.incident.closecode ? model.incident.closecode.name : ""
+            }}</span>
           </p>
           <p>
             <span class="fl">处理方案</span>
-            <span class="fr">{{model.incident.handleDescription||''}}</span>
+            <span class="fr">{{ model.incident.handleDescription || "" }}</span>
           </p>
           <p>
             <span class="fl">升级对象</span>
-            <span class="fr">{{model.incident.handlerUser?model.incident.handlerUser.name:''}}</span>
+            <span class="fr">{{
+              model.incident.handlerUser ? model.incident.handlerUser.name : ""
+            }}</span>
           </p>
           <!-- <p>
             <span class="fl">升级原因</span>
@@ -140,17 +223,19 @@
           <div class="label" id="progress">处理进度</div>
           <div class="progress">
             <div class="progress_info" v-for="item in progressInfo">
-              <div class="progress_info_L">{{item.activityName}}</div>
+              <div class="progress_info_L">{{ item.activityName }}</div>
               <div class="progress_info_R">
                 <div class="time">
                   <i
-                    :class="{'iconfont':true, 'icon-icon_weizuo':item.endTime!='','icon-icon_zhengzaijinx':item.endTime=='' }"
+                    :class="{
+                      iconfont: true,
+                      'icon-icon_weizuo': item.endTime != '',
+                      'icon-icon_zhengzaijinx': item.endTime == ''
+                    }"
                   ></i>
-                  <span class="text1">{{item.startTime}}</span>
+                  <span class="text1">{{ item.startTime }}</span>
                 </div>
-                <div
-                  :class="{'cont':true,'blue':item.endTime!='' }"
-                >
+                <div :class="{ cont: true, blue: item.endTime != '' }">
                   <p class="text2" v-if="item.desc" v-html="item.desc"></p>
                 </div>
               </div>
@@ -405,14 +490,14 @@ i.iconfont {
             color: #00559d;
           }
         }
-        .imgs-container{
-          a{
-            color:#03c !important;
-            &:visited{
+        .imgs-container {
+          a {
+            color: #03c !important;
+            &:visited {
               color: #551a8b !important;
             }
           }
-           img {
+          img {
             width: 1.5rem;
             height: 1.5rem;
             margin-right: 0.7rem;
@@ -428,9 +513,9 @@ i.iconfont {
           .progress_info {
             overflow: hidden;
             margin-bottom: 0.1rem;
-            &:nth-last-child(1){
-              .cont{
-                border:none !important;
+            &:nth-last-child(1) {
+              .cont {
+                border: none !important;
               }
             }
             .progress_info_L {