增加处理日志

src/filters/index.js

@@ -3,6 +3,9 @@ Vue.filter('timeFormat', function (date, fmt) {
   if (!date) {
     return '';
   }
+  if(typeof date === 'number'){
+    date = new Date(date);
+  }
   if (typeof date === 'string') {
     var dateArr = date.split(/[- : \/]/);
     date = new Date(dateArr[0], dateArr[1] - 1, dateArr[2], dateArr[3], dateArr[4], dateArr[5]);

src/views/handlerLog.vue

@@ -0,0 +1,78 @@
+<template>
+<div class="handlerLog">
+  <div class="label">处理日志</div>
+  <table class="handlerLog__table">
+    <tr>
+      <td class="xh">序号</td>
+      <td class="clr">处理人</td>
+      <td class="date">时间</td>
+      <td>内容</td>
+    </tr>
+    <tr v-for="(item,i) in data" :key="item.id">
+      <td>{{ i + 1 }}</td>
+      <td>{{ item.userName }}</td>
+      <td>{{ item.opTime | timeFormat("yyyy-MM-dd HH:mm:ss")}}</td>
+      <td>{{ item.opValue }}</td>
+    </tr>
+  </table>
+</div>
+</template>
+
+<script>
+  export default {
+    data(){
+      return {}
+    },
+    props:{
+      data:{
+        type:Array,
+        default(){
+          return [];
+        }
+      }
+    }
+  }
+</script>
+
+<style lang="less" scoped>
+.label {
+  background-color: #eeeeee;
+  height: 0.6rem;
+  line-height: 0.58rem;
+  padding-left: 0.2rem;
+  font-size: 0.24rem;
+  color: #666666;
+  span {
+    font-size: 0.2rem;
+    display: inline-block;
+    margin-left: 0.08rem;
+    color: #999999;
+  }
+  &.formLabel {
+    background-color: #fff;
+  }
+}
+.handlerLog .handlerLog__table{
+  border-collapse: collapse;
+  border: 1px solid #ccc;
+  width: 100%;
+}
+.handlerLog .handlerLog__table td{
+  text-align: center;
+  border: 1px solid #ccc;
+  word-break: break-all;
+  font-size: 0.25rem;
+  padding: 0.1rem 0;
+}
+.handlerLog .handlerLog__table td.xh  {
+  width: 0.7rem;
+}
+
+.handlerLog .handlerLog__table td.clr  {
+  width: 1.2rem;
+}
+
+.handlerLog .handlerLog__table td.date  {
+  width: 2.6rem;
+}
+</style>

src/views/order.vue

@@ -15,6 +15,13 @@
                 @click="toInfo('progress')"
               >处理进度</a>
             </div>
+            <div class="fl" :class="{'p50':model.incident.handlerUser.id!=loginUser.id}">
+              <a
+                :class="{active:actives=='handlerLog'}"
+                href="javascript:;"
+                @click="toInfo('handlerLog')"
+              >处理日志</a>
+            </div>
             <div class="fl" v-if="model.incident.handlerUser.id==loginUser.id">
               <a :class="{active:actives=='jd'}" href="javascript:;" @click="toInfo('jd')">接单</a>
             </div>
@@ -130,7 +137,7 @@
                 </p>
               </div>
             </div>
-
+            <HandlerLog :data="model.incident.handlerLogs" id="handlerLog"></HandlerLog>
             <div class="label" id="progress">处理进度</div>
             <div :class="{'progress':true,'progressHide':!pro_hides}" id="progressBox">
               <div class="progress_info" v-for="item in progressInfo">
@@ -181,6 +188,7 @@
 <script>
 import LoadIng from "./../views/loading.vue";
 import PrompTing from "./../views/prompting.vue";
+import HandlerLog from "./../views/handlerLog.vue";
 export default {
   data() {
     return {
@@ -212,7 +220,8 @@ export default {
   },
   components: {
     LoadIng,
-    PrompTing
+    PrompTing,
+    HandlerLog
   },
   methods: {
     //   获取事件数据
@@ -397,10 +406,10 @@ i.iconfont.blue {
     top: 0.88rem;
 
     div {
-      width: 33.33%;
+      width: 25%;
       text-align: center;
       &.p50{
-        width: 49.99% ;
+        width: 33.333% ;
     }
       a {
         display: inline-block;

src/views/processing.vue

@@ -20,6 +20,16 @@
             :class="{ p50: modelData.incident.handlerUser.id != loginUser.id }"
           >
             <a
+              :class="{ active: actives == 'handlerLog' }"
+              href="javascript:;"
+              @click="toInfo('handlerLog')"
+              >处理日志</a>
+          </div>
+          <div
+            class="fl"
+            :class="{ p50: modelData.incident.handlerUser.id != loginUser.id }"
+          >
+            <a
               :class="{ active: actives == 'progress' }"
               href="javascript:;"
               @click="toInfo('progress')"
@@ -202,7 +212,7 @@
               </p>
             </div>
           </div>
-
+          <HandlerLog :data="modelData.incident.handlerLogs" id="handlerLog"></HandlerLog>
           <div class="label" id="progress">处理进度</div>
           <div
             :class="{ progress: true, progressHide: !pro_hides }"
@@ -292,6 +302,7 @@
                       >
                     </div>
                   </cube-form-item>
+
                   <div class="label formLabel" v-if="order == 1">
                     报修图片
                     <span>(最多可上传3张JPG或PNG,每张不能超过10M)</span>
@@ -354,6 +365,19 @@
                     :field="fields[9]"
                     v-if="order == 3"
                   ></cube-form-item>
+                  <cube-form-item
+                    :field="fields[16]"
+                    class="incidentTitle"
+                  >
+                    <div class="titleRefer">
+                      <textarea
+                        style="margin-top:0.1rem;width:100%;"
+                        class="titleTxtArea fl"
+                        placeholder="请输入处理日志"
+                        v-model="handlerLog"
+                      ></textarea>
+                    </div>
+                  </cube-form-item>
                 </cube-form-group>
                 <cube-form-group class="sub">
                   <cube-button type="submit" @click="subVali()"
@@ -380,6 +404,7 @@ import DatePicker from "./../components/date-picker.vue";
 import CubeExtendPopup from "./../components/extend-popup.vue";
 import LoadIng from "./../views/loading.vue";
 import PrompTing from "./../views/prompting.vue";
+import HandlerLog from "./../views/handlerLog.vue";
 // import host from '../request/host'
 
 // 知识库类型
@@ -516,6 +541,7 @@ export default {
         incident: {}
       }, //上传的model
       incidentTitle: "", //处理方案
+      handlerLog: "", //处理日志
       referenceInfo: {}, //引用信息
       selectedCategoryTxt: "", //事件分类选中展示
       selectedAreaId: "", //区域选中id--seimin
@@ -794,6 +820,18 @@ export default {
           rules: {
             required: true
           }
+        },
+        {
+          type: "textarea",
+          modelKey: "handlerLog",
+          label: "处理日志:",
+          props: {
+            placeholder: "请填写处理日志"
+          },
+          rules: {
+            required: false
+          },
+          debounce: 100
         }
       ]
     };
@@ -807,7 +845,8 @@ export default {
     }
   },
   components: {
-    LoadIng
+    LoadIng,
+    HandlerLog
   },
   methods: {
     //获取区域
@@ -1427,24 +1466,8 @@ export default {
         params: { data: that.model.handleDescription }
       });
     },
-
-    // 提交
-    submitHandler() {
-      var that = this;
-
-      that.setLocalStroageData();
-      // that.modelData.incident.place = {
-      //   area:{
-      //     id:this.selectedAreaId,
-      //     area:this.selectedAreaName
-      //   },
-      //   id:this.selectedPlaceId,
-      //   place:this.selectedPlaceName
-      // };//增加区域地点
-      console.log(that.model, 11111);
-      // console.log(this.selectedPlaceId,this.selectedAreaId,8888);//2020年4月25日16:12:55
-      that.model.fileUrl = "url";
-      that.loadShow = true;
+    basePost(){
+      let that = this;
       if (this.order == 5) {
         that.$http
           .post(
@@ -1556,6 +1579,37 @@ export default {
             }
           });
       }
+    },
+    // 提交
+    submitHandler() {
+      var that = this;
+
+      that.setLocalStroageData();
+      // that.modelData.incident.place = {
+      //   area:{
+      //     id:this.selectedAreaId,
+      //     area:this.selectedAreaName
+      //   },
+      //   id:this.selectedPlaceId,
+      //   place:this.selectedPlaceName
+      // };//增加区域地点
+      console.log(that.model,that.modelData, 11111);
+      // console.log(this.selectedPlaceId,this.selectedAreaId,8888);//2020年4月25日16:12:55
+      that.model.fileUrl = "url";
+      that.loadShow = true;
+      //填写了处理日志，并且是处理中状态
+      if(that.handlerLog&&that.handlerLog.trim()&&that.modelData.incident.state.value == 'handler'){
+        that.$http
+          .post(
+            "service/bpm/data/addData/operationLog",
+            {operationLog:{opType:'handlerLog',opValue:that.handlerLog,extra1:that.modelData.incident.id}}
+          )
+          .then(function(result1) {
+              that.basePost();
+          })
+      }else{
+        that.basePost();
+      }
       event.preventDefault();
     },
     validateHandler(result) {
@@ -1658,7 +1712,8 @@ export default {
     // JsonView
     CubeExtendPopup,
     LoadIng,
-    PrompTing
+    PrompTing,
+    HandlerLog
   }
 };
 </script>
@@ -1833,10 +1888,10 @@ i.iconfont.blue {
     top: 0.88rem;
     z-index: 9;
     div {
-      width: 33.33%;
+      width: 25%;
       text-align: center;
       &.p50 {
-        width: 49.99%;
+        width: 33.33%;
       }
       a {
         display: inline-block;

src/views/solved.vue

@@ -22,6 +22,14 @@
           </div>
           <div class="fl">
             <a
+              :class="{ active: actives == 'handlerLog' }"
+              href="javascript:;"
+              @click="toInfo('handlerLog')"
+              >处理日志</a
+            >
+          </div>
+          <div class="fl">
+            <a
               :class="{ active: actives == 'progress' }"
               href="javascript:;"
               @click="toInfo('progress')"
@@ -226,7 +234,7 @@
                 <span class="fl">转派原因</span>
                 <span class="fr" >{{model.transferReason}}</span>
               </p> -->
-
+          <HandlerLog :data="model.incident.handlerLogs" id="handlerLog"></HandlerLog>
           <div class="label" id="progress">处理进度</div>
           <div
             :class="{ progress: true, progressHide: !pro_hides }"
@@ -257,7 +265,6 @@
               pro_hides ? "隐藏详情 <<" : "展开详情 >>"
             }}</span>
           </p>
-
           <div
             class="form"
             v-if="model.incident.handlerUser.id == loginUser.id"
@@ -306,6 +313,7 @@
 </template>
 <script>
 import LoadIng from "./../views/loading.vue";
+import HandlerLog from "./../views/handlerLog.vue";
 export default {
   data() {
     return {
@@ -340,7 +348,8 @@ export default {
     };
   },
   components: {
-    LoadIng
+    LoadIng,
+    HandlerLog
   },
   methods: {
     //   获取事件数据
@@ -578,7 +587,7 @@ i.iconfont {
     position: fixed;
     top: 0.88rem;
     div {
-      width: 33.33%;
+      width: 25%;
       text-align: center;
       a {
         display: inline-block;