报修端大改

src/views/evaluate.vue

@@ -5,7 +5,7 @@
                 报修信息
             </div>
             <div class="state">
-                <div>报修编号:&nbsp;{{data.incident.incidentsign}}</div>
+                <div>工单单号:&nbsp;{{data.incidentsign}}</div>
                 <div :class="stateClassFn(data.state.name)">{{data.state.name}}</div>
             </div>
             <div class="description">
@@ -39,7 +39,7 @@
                     报修地址:
                 </div>
                 <div>
-                    {{data.address}}
+                    {{data.houseNumber}}
                 </div>
             </div>
         </div>
@@ -59,13 +59,16 @@
             <div class="btn" @click="evaluate()">提&nbsp;交&nbsp;评&nbsp;价</div>
         </div>
         <promp-ting :conents="promptingConent" :status="promptingStatus"></promp-ting>
+        <load-ing v-show="loadShow"></load-ing>
     </div>
 </template>
 <script>
 import PrompTing from './../views/prompting.vue'
+import LoadIng from "./../views/loading.vue";
 export default {
     data(){
         return{
+            loadShow: false,
             data:"",
             imgs_wechatRequesterIncident:[],
             imgs_incident:[],
@@ -97,12 +100,12 @@ export default {
             // }
             else{
                 var that=this;
-                this.$http.post('service/apply/bpm/degree',{
-                    "id":that.data.id,
-                    "degree":this.rateData===0?this.degreeDictionary[0].id:this.rateData,
-                    "degreeRemark":this.rateText
+                that.loadShow=true;
+                this.$http.post('service/flow/incident/task/resolve',{
+                    incident: {...that.data, ...{wxdegreeremark: this.rateText, wxdegree: this.rateData===0?this.degreeDictionary[0]:{id: this.rateData}}}
                 }).then(function(res){
-                    if(res.status==200){
+                    that.loadShow=false;
+                    if(res.data.state==200){
                         that.promptingConent="恭喜您,评价成功!";
                         that.promptingStatus=true;
                         $("#fade").fadeIn();
@@ -166,7 +169,7 @@ export default {
               id = this.data.id;
             }else if(type === 'incident'){
               if(this.data){
-                id = this.data.processInstanceId;
+                id = this.data.id;
               } else {
                 that['imgs_' + type] = [];
                 return;
@@ -209,7 +212,8 @@ export default {
     mounted(){
     },
     components: {
-        PrompTing
+      LoadIng,
+      PrompTing
     },
     watch:{
         rate:{

src/views/incidentDetails.vue

@@ -132,227 +132,41 @@
     </div>
     <!-- 流程图 -->
     <div class="processBox">
-      <div
-        class="process"
-        v-if="
-          processData == '不受理' ||
-            processData == '结束' ||
-            processData == '已撤回' ||
-            processData == '重复事件'
-        "
-      >
-        <div class="status">
-          {{ processMessage[4] ? processMessage[4].name : "" }}
+      <div class="progress">
+        <div class="progress_info" v-for="(item,index) in progressInfo" :key="index">
+          <div class="progress_info_L">{{ item.logType ? item.logType.name : '' }}</div>
+          <div class="progress_info_R">
+            <div class="time">
+              <i
+                :class="{
+                  iconfont: true,
+                  'icon-icon_weizuo': item.endTime != '',
+                  'icon-icon_zhengzaijinx': item.endTime == ''
+                }"
+              ></i>
+              <span class="text1">
+                {{ item.startTime | timeFormat("MM-dd HH:mm:ss") }}
+                <template v-if="item.appointorName">
+                  ，{{ item.appointorName }}
+                </template>
+              </span>
+            </div>
+            <div :class="{ cont: true, blue: item.endTime != '' }">
+              <p class="text2" v-if="item.remark" v-html="item.remark"></p>
+            </div>
+          </div>
         </div>
-        <div class="ico">
-          <i class="iconfont icon-icon_weizuo last"></i>
-        </div>
-        <div class="time">
-          <template v-if="processTime[4]">
-            {{processTime[4].startTime | timeFormat("MM-dd HH:mm:ss")}}
-          </template>
-        </div>
-      </div>
-      <div
-        class="processCont"
-        v-if="
-          processData == '不受理' ||
-            processData == '结束' ||
-            processData == '已撤回' ||
-            processData == '重复事件'
-        "
-      >
-        <div class="status"></div>
-        <div
-          class="conents"
-          v-html="processMessage[4] ? processMessage[4].desc : ''"
-        ></div>
-      </div>
-      <div
-        class="process"
-        v-if="
-          processData == '评价' ||
-            (processData == '结束' && processData != '重复事件')
-        "
-      >
-        <div class="status">
-          {{ processMessage[3] ? processMessage[3].name : "" }}
-        </div>
-        <div class="ico">
-          <i
-            class="iconfont icon-icon_zhengzaijinx now"
-            v-if="processData == '评价'"
-          ></i>
-          <i
-            class="iconfont icon-icon_weizuo last"
-            v-if="processData != '评价'"
-          ></i>
-        </div>
-        <div class="time">
-          <template v-if="processTime[3]">
-            {{processTime[3].startTime | timeFormat("MM-dd HH:mm:ss")}}
-          </template>
-        </div>
-      </div>
-      <div
-        class="processCont"
-        v-if="
-          processData == '评价' ||
-            (processData == '结束' && processData != '重复事件')
-        "
-      >
-        <div class="status"></div>
-        <div
-          class="conents"
-          v-html="processMessage[3] ? processMessage[3].desc : ''"
-        ></div>
-      </div>
-      <div
-        class="process"
-        v-if="
-          processData == '处理' ||
-            processData == '评价' ||
-            (processData == '结束' && processData != '重复事件')
-        "
-      >
-        <div class="status">
-          {{ processMessage[2] ? processMessage[2].name : "" }}
-        </div>
-        <div class="ico">
-          <i
-            class="iconfont icon-icon_zhengzaijinx now"
-            v-if="processData == '处理'"
-          ></i>
-          <i
-            class="iconfont icon-icon_weizuo last"
-            v-else
-          ></i>
-        </div>
-        <div class="time">
-          <template v-if="processTime[2]">
-            {{processTime[2].startTime | timeFormat("MM-dd HH:mm:ss")}}
-          </template>
-        </div>
-      </div>
-      <div
-        class="processCont"
-        v-if="
-          processData == '处理' ||
-            processData == '评价' ||
-            (processData == '结束' && processData != '重复事件')
-        "
-      >
-        <div class="status"></div>
-        <div
-          class="conents"
-          v-html="processMessage[2] ? processMessage[2].desc : ''"
-        ></div>
-      </div>
-
-      <div
-        class="process"
-        v-if="
-          processData == '受理' ||
-            processData == '处理' ||
-            processData == '评价' ||
-            (processData == '结束' && processData != '重复事件')
-        "
-      >
-        <div class="status">
-          {{ processMessage[1] ? processMessage[1].name : "" }}
-        </div>
-        <div class="ico">
-          <i
-            class="iconfont icon-icon_zhengzaijinx now"
-            v-if="processData == '受理'"
-          ></i>
-          <i
-            class="iconfont icon-icon_weizuo last"
-            v-if="processData != '受理'"
-          ></i>
-        </div>
-        <div class="time">
-          <template v-if="processTime[1]">
-            {{processTime[1].startTime | timeFormat("MM-dd HH:mm:ss")}}
-          </template>
-        </div>
-      </div>
-      <div
-        class="processCont"
-        v-if="
-          processData == '受理' ||
-            processData == '处理' ||
-            processData == '评价' ||
-            (processData == '结束' && processData != '重复事件')
-        "
-      >
-        <div class="status"></div>
-        <div
-          class="conents"
-          v-html="processMessage[1] ? processMessage[1].desc : ''"
-        ></div>
-      </div>
-      <div class="process">
-        <div class="status">
-          {{ processMessage[0] ? processMessage[0].name : "" }}
-        </div>
-        <div class="ico">
-          <i
-            class="iconfont icon-icon_zhengzaijinx now"
-            v-if="processData == '申请'"
-          ></i>
-          <i
-            class="iconfont icon-icon_weizuo last"
-            v-if="processData != '申请'"
-          ></i>
-        </div>
-        <div class="time">
-          <template v-if="processTime[0]">
-            {{processTime[0].startTime | timeFormat("MM-dd HH:mm:ss")}}
-          </template>
-        </div>
-      </div>
-      <div class="processCont">
-        <div class="status"></div>
-        <div
-          class="conents lastConents"
-          v-html="processMessage[0] ? processMessage[0].desc : ''"
-        ></div>
-      </div>
-    </div>
-    <!-- 撤回原因 -->
-    <div class="label" v-if="processData == '已撤回'">
-      撤回原因
-    </div>
-    <div class="faultLocation" v-if="processData == '已撤回'">
-      <div>
-        撤回原因:
-      </div>
-      <div>
-        {{ data.retractReason || "暂无" }}
       </div>
     </div>
-    <!-- 不受理原因 -->
-    <div class="label" v-if="processData == '不受理'">
-      不受理原因
-    </div>
-    <div class="faultLocation2" v-if="processData == '不受理'">
-      <div>
-        不受理原因:
-      </div>
-      <div>
-        {{ data.rejectRemark || "暂无" }}
-      </div>
-    </div>
-    <div class="chehui" v-if="processData == '申请'">
+    <div class="chehui" v-if="processData == 'accept'">
       <div class="btn" @click="cehui()">撤&nbsp;回</div>
       <div class="btn" @click="goToSummary()" v-if="data.duty && data.duty.addSummary == 1">维修单</div>
     </div>
-    <div class="chehui" v-if="processData == '评价'">
+    <div class="chehui" v-if="processData == 'close'">
       <div class="btn" @click="evaluate()">评&nbsp;价</div>
       <div class="btn" @click="goToSummary()" v-if="data.duty && data.duty.addSummary == 1">维修单</div>
     </div>
-    <div class="chehui" v-if="processData != '申请' && processData != '评价' && data.duty && data.duty.addSummary == 1">
+    <div class="chehui" v-if="processData != 'accept' && processData != 'close' && data.duty && data.duty.addSummary == 1">
       <div class="btn" @click="goToSummary()">维修单</div>
     </div>
     <div class="fot"></div>
@@ -385,7 +199,8 @@ export default {
       shouli: "",
       chuli: "",
       pingjia: "",
-      jieshu: ""
+      jieshu: "",
+      progressInfo: [], //处理进度
     };
   },
   methods: {
@@ -421,15 +236,14 @@ export default {
               icon: "cubeic-wrong"
             }).show();
           } else {
-            // that.loadShow=true;
+            that.loadShow=true;
             that.$http
-              .post("service/apply/bpm/retract", {
-                id: that.data.id,
-                retractReason: promptValue
+              .post("service/flow/incident/task/cancel", {
+                incident: {...that.data, ...{cancelRemark: promptValue}}
               })
               .then(function(res) {
-                // that.loadShow=false;
-                if (res.status == 200) {
+                that.loadShow=false;
+                if (res.data.state == 200) {
                   that.promptingConent = "恭喜您,撤回成功!";
                   that.promptingStatus = true;
                   $("#fade").fadeIn();
@@ -486,35 +300,10 @@ export default {
     getParamsData() {
       this.data = JSON.parse(this.$route.params.data);
       console.log(this.data);
-      if (this.data.repeat) {
-        this.processData = "重复事件";
-      } else if (this.data.state.name == "不受理") {
-        this.processData = "不受理";
-      } else if (this.data.state.name == "未受理") {
-        this.processData = "申请";
-      } else if (this.data.state.name == "处理中") {
-        this.processData = "处理";
-      } else if (this.data.state.name == "待评价") {
-        this.processData = "评价";
-      } else if (this.data.state.name == "已解决") {
-        this.processData = "结束";
-      } else if (this.data.state.name == "已撤回") {
-        this.processData = "已撤回";
-      }
-      console.log(this.processData);
-    },
-    getProcessTime() {
-      var that = this;
-      if (this.data.processInstanceId) {
-        this.$http
-          .post(
-            "service/bpm/bpm/flowTracing/" +
-              this.data.processInstanceId,
-            {}
-          )
-          .then(function(res) {
-            that.processTime = res.data.data;
-          });
+      if (this.data.state.value == "accept") {
+        this.processData = "accept";
+      } else if (this.data.state.value == "close" && !this.data.wxdegree) {
+        this.processData = "close";
       }
     },
     getImgsData(type) {
@@ -558,21 +347,34 @@ export default {
         return "yichehui";
       }
     },
-    getProcessMessageData() {
+    // 获取处理进度
+    getProgressInfo() {
       var that = this;
-      this.$http
-        .post("service/sysinfo/data/fetchDataList/dictionary", {
-          idx: 0,
-          sum: 10,
-          dictionary: {
-            key: "wxincident_task_default"
+      that.$http
+        .post(
+          "/service/simple/data/fetchDataList/incidentLog",
+          {
+              "idx": 0,
+              "sum": 9999,
+              "incidentLog": {
+                  "incidentId": this.data.id
+              }
           }
-        })
+        )
         .then(function(res) {
-          that.processMessage = res.data.list;
-          console.log(that.processMessage);
+          console.log(res.data);
+          that.progressInfo = res.data.list || [];
+          //处理数据
+          that.progressInfo.forEach(v => {
+            if (!v.endTime) {
+              v.endTime = 1;
+            }
+            v.startTime = new Date(v.startTime).getTime();
+          });
+          that.progressInfo.reverse();
+          console.log(that.progressInfo);
         });
-    }
+    },
   },
   mounted() {},
   components: {
@@ -583,8 +385,7 @@ export default {
     this.getParamsData();
     this.getImgsData('wechatRequesterIncident');
     this.getImgsData('incident');
-    this.getProcessMessageData();
-    this.getProcessTime();
+    this.getProgressInfo();
   }
 };
 </script>
@@ -860,3 +661,71 @@ export default {
   border-left: 0ch;
 }
 </style>
+<style scoped lang="less">
+.progress {
+  line-height: 0.4rem;
+  padding: 0.2rem 0.2rem;
+  overflow: hidden;
+  transition-duration: 0.2s;
+  transition-timing-function: linear;
+  &.progressHide {
+    height: 1.7rem;
+  }
+  .progress_info {
+    overflow: hidden;
+    margin-bottom: 0.1rem;
+    &:nth-last-child(1) {
+      .cont {
+        border: none !important;
+      }
+    }
+    .progress_info_L {
+      float: left;
+      color: #333;
+      max-width: 18%;
+    }
+    .progress_info_R {
+      float: right;
+      margin-left: 0.09rem;
+      width: 80%;
+      font-size: 0.25rem;
+      .time {
+        i {
+          margin-left: -0.15rem;
+          &.icon-icon_weizuo {
+            color: #005495;
+          }
+          &.icon-icon_zhengzaijinx {
+            color: #48a843;
+            font-size: 0.37rem;
+          }
+        }
+        span {
+          margin-left: 0.15rem;
+        }
+      }
+      .cont {
+        border-left: 1px solid #999;
+        padding-left: 0.4rem;
+        min-height: 0.4rem;
+        &.blue {
+          border-left: 1px solid #005395;
+        }
+      }
+      .text1{
+        color: #999;
+        overflow: hidden;
+      }
+
+      .text2 {
+        color: #666;
+        word-break: break-all;
+        overflow: hidden;
+      }
+      p {
+        padding: 0;
+      }
+    }
+  }
+}
+</style>

src/views/incidentList.vue

@@ -45,7 +45,7 @@
                           : "暂无"
                       }}
                     </div>
-                    <div>报修时间：&nbsp;{{ data.startDate }}</div>
+                    <div>报修时间：&nbsp;{{ data.startDate | timeFormat("yyyy-MM-dd HH:mm") }}</div>
                   </div>
                   <div
                     class="timeBox noneBorder"
@@ -229,12 +229,6 @@ export default {
         })
         .then((res) => {
           if (res.data.list.length > 0) {
-            for (var i = 0; i < res.data.list.length; i++) {
-              res.data.list[i].startDate = formatDate(
-                new Date(res.data.list[i].startDate),
-                "yyyy-MM-dd hh:mm"
-              );
-            }
             if (this.idx) {
               this.items = this.items.concat(res.data.list);
             } else {
@@ -272,12 +266,6 @@ export default {
           })
           .then((res) => {
             if (res.data.list.length > 0) {
-              for (var i = 0; i < res.data.list.length; i++) {
-                res.data.list[i].startDate = formatDate(
-                  new Date(res.data.list[i].startDate),
-                  "yyyy-MM-dd hh:mm"
-                );
-              }
               if (this.idx) {
                 this.items = this.items.concat(res.data.list);
               } else {
@@ -303,12 +291,6 @@ export default {
         })
         .then((res) => {
           if (res.data.list.length > 0) {
-            for (var i = 0; i < res.data.list.length; i++) {
-              res.data.list[i].startDate = formatDate(
-                new Date(res.data.list[i].startDate),
-                "yyyy-MM-dd hh:mm"
-              );
-            }
             if (this.idx) {
               this.items = this.items.concat(res.data.list);
             } else {
@@ -334,12 +316,6 @@ export default {
           }
         })
         .then((res) => {
-          for (var i = 0; i < res.data.list.length; i++) {
-            res.data.list[i].startDate = formatDate(
-              new Date(res.data.list[i].startDate),
-              "yyyy-MM-dd hh:mm"
-            );
-          }
           if (res.data.list.length > 0) {
             if (this.idx) {
               this.items = this.items.concat(res.data.list);

src/views/indes.vue

@@ -65,7 +65,7 @@
               <div class="head">
                 <!-- <span>{{v.requester.name}}</span> -->
                 <span>工单单号:{{ v.incidentsign }}</span>
-                <span>{{ v.startDate }}</span>
+                <span>{{ v.startDate | timeFormat("MM-dd HH:mm") }}</span>
               </div>
               <div class="cot">
                 {{ v.description }}
@@ -78,13 +78,6 @@
                 <div
                   :class="state != 1 && state != 2 && state != 3 ? 'yesLine' : ''"
                 ></div>
-                <div
-                  :class="
-                    state != 1 && state != 2 && state != 3 && state != 4
-                      ? 'yesLine'
-                      : ''
-                  "
-                ></div>
 
                 <i class="iconfont icon-icon_weizuo shenqing no" v-if="false"></i>
                 <i
@@ -96,12 +89,8 @@
                   v-if="state == 2 || state == 1"
                 ></i>
                 <i
-                  class="iconfont icon-icon_weizuo pingjia no"
-                  v-if="state == 3 || state == 2 || state == 1"
-                ></i>
-                <i
                   class="iconfont icon-icon_weizuo wancheng no"
-                  v-if="state == 4 || state == 3 || state == 2 || state == 1"
+                  v-if="state == 3 || state == 2 || state == 1"
                 ></i>
 
                 <i
@@ -117,10 +106,6 @@
                   v-if="state != 1 && state != 2 && state != 3"
                 ></i>
                 <i
-                  class="iconfont icon-icon_weizuo pingjia yes"
-                  v-if="state != 1 && state != 2 && state != 3 && state != 4"
-                ></i>
-                <i
                   class="iconfont icon-icon_weizuo wancheng yes"
                   v-if="false"
                 ></i>
@@ -138,10 +123,6 @@
                   v-if="state == 3"
                 ></i>
                 <i
-                  class="iconfont icon-icon_zhengzaijinx pingjia now"
-                  v-if="state == 4"
-                ></i>
-                <i
                   class="iconfont icon-icon_zhengzaijinx wancheng now"
                   v-if="state == 5"
                 ></i>
@@ -150,7 +131,6 @@
                 <div>申请</div>
                 <div>受理</div>
                 <div>处理</div>
-                <div>评价</div>
                 <div>完成</div>
               </div>
             </div>
@@ -271,20 +251,12 @@ export default {
           if (res.data.list.length > 0) {
             that.newRapirNoData = false;
             that.newRapirData = res.data.list;
-            that.newRapirData[0].startDate = formatDate(
-              new Date(that.newRapirData[0].startDate),
-              "MM-dd hh:mm"
-            );
-            if (that.newRapirData[0].state.value == "accept" || that.newRapirData[0].state.value == "storage" || that.newRapirData[0].state.value == "reassign") {
+            if (that.newRapirData[0].state.value == "accept" || that.newRapirData[0].state.value == "storage") {
               that.state = 1;
             } else if (that.newRapirData[0].state.value == "pending") {
               that.state = 2;
-            } else if (that.newRapirData[0].state.value == "handler") {
+            } else if (that.newRapirData[0].state.value == "handler" || that.newRapirData[0].state.value == "reassign") {
               that.state = 3;
-            } else if (that.newRapirData[0].state.value == "resolved") {
-              that.state = 4;
-            } else if (that.newRapirData[0].state.value == "close") {
-              that.state = 5;
             } else {
               that.state = 5;
             }
@@ -571,7 +543,7 @@ export default {
 .newRepair .conentBox .flowChart .pits {
   display: flex;
   margin-top: 0.24rem;
-  padding: 0 10%;
+  padding: 0 22% 0 19%;
   position: relative;
 }
 .newRepair .conentBox .flowChart .pits i {
@@ -595,32 +567,33 @@ export default {
 }
 .newRepair .conentBox .flowChart .pits .shenqing {
   position: absolute;
-  left: 8%;
+  left: 18%;
   top: -0.12rem;
 }
 .newRepair .conentBox .flowChart .pits .shouli {
   position: absolute;
-  left: 28%;
+  left: 38%;
   top: -0.12rem;
 }
 .newRepair .conentBox .flowChart .pits .chuli {
   position: absolute;
-  left: 48%;
+  left: 58%;
   top: -0.12rem;
 }
-.newRepair .conentBox .flowChart .pits .pingjia {
+/* .newRepair .conentBox .flowChart .pits .pingjia {
   position: absolute;
   left: 68%;
   top: -0.12rem;
-}
+} */
 .newRepair .conentBox .flowChart .pits .wancheng {
   position: absolute;
-  left: 88%;
+  left: 78%;
   top: -0.12rem;
 }
 .newRepair .conentBox .flowChart .words {
   display: flex;
   margin-top: 0.3rem;
+  padding: 0 10%;
 }
 .newRepair .conentBox .flowChart .words div {
   flex: 1;