Merge branch 'sb' of yinet2020/YinetOASystemWeb into master

src/views/dashboard/RaddarChart.vue

@@ -11,20 +11,42 @@
             <el-button type="text" @click="detern(scope.row)" style="color: black">{{scope.row.fwtitle}}</el-button>
           </template>
         </el-table-column>
-        <el-table-column prop="createTime" label="完成时间" width="180" align="center"></el-table-column>
+        <el-table-column prop="createTime" label="完成时间" width="180" align="center">
+          <template slot-scope="scope">
+            <span>{{scope.row.createTime | timefilters}}</span>
+          </template>
+        </el-table-column>
  </el-table>
  </el-card>
 </template>
 
 <script>
   import { havedInfo } from "@/api/activiti/form/fw";
+  import moment from "moment";
  export default {
+   filters: {
+     timefilters(val) {
+       if (val == null || val == "") {
+         return "暂无时间";
+       } else {
+         let d = new Date(val);   //val 为表格内取到的后台时间
+         let month =
+           d.getMonth() + 1 < 10 ? "0" + (d.getMonth() + 1) : d.getMonth() + 1;
+         let day = d.getDate() < 10 ? "0" + d.getDate() : d.getDate();
+         let hours = d.getHours() < 10 ? "0" + d.getHours() : d.getHours();
+         let min = d.getMinutes() < 10 ? "0" + d.getMinutes() : d.getMinutes();
+         let sec = d.getSeconds() < 10 ? "0" + d.getSeconds() : d.getSeconds();
+         let times=d.getFullYear() + '-' + month + '-' + day + ' ' + hours + ':' + min + ':' + sec;
+         return moment(val).format("YYYY-MM-DD HH:mm")
+       }
+     }
+   },
       data() {
         return {
           doneList: [],
           raddarParams: {
             pageNum: 1,
-            pageSize: 5,
+            pageSize: 4,
             orderByColumn: "createTime",
             isAsc:"desc",//排序方式
           },

src/views/system/actwork/actManager.vue

@@ -31,7 +31,7 @@
       <el-table-column label="申请人" align="center" prop="applyUser"/>
       <el-table-column label="创建时间" width="180" align="center" prop="create_time">
         <template slot-scope="scope">
-          <span>{{scope.row.create_time | format('yyyy-MM-dd hh:mm')}}</span>
+          <span>{{scope.row.create_time | timefilters}}</span>
         </template>
       </el-table-column>
       <el-table-column label="当前处理" width="180" align="center" prop="dispose">
@@ -92,13 +92,13 @@
 
             <el-table-column label="申请时间" width="180" align="center" prop="startTime">
               <template slot-scope="scope">
-                <span>{{scope.row.startTime | format('yyyy-MM-dd hh:mm')}}</span>
+                <span>{{scope.row.startTime | timefilters}}</span>
               </template>
             </el-table-column>
 
             <el-table-column label="结束时间" width="180" align="center" prop="endTime">
               <template slot-scope="scope">
-                <span>{{scope.row.endTime | format('yyyy-MM-dd hh:mm')}}</span>
+                <span>{{scope.row.endTime | timefilters}}</span>
               </template>
             </el-table-column>
 
@@ -158,8 +158,26 @@
 <script>
   import { recordImg, examineHistory ,ActManager,deleteTask} from '@/api/system/meapply/meapply'
   import {getStartFormKey } from '@/api/activiti/process/startprocess'
+  import moment from "moment";
   export default {
     name: 'meapply',
+    filters: {
+      timefilters(val) {
+        if (val == null || val == "") {
+          return "暂无时间";
+        } else {
+          let d = new Date(val);   //val 为表格内取到的后台时间
+          let month =
+            d.getMonth() + 1 < 10 ? "0" + (d.getMonth() + 1) : d.getMonth() + 1;
+          let day = d.getDate() < 10 ? "0" + d.getDate() : d.getDate();
+          let hours = d.getHours() < 10 ? "0" + d.getHours() : d.getHours();
+          let min = d.getMinutes() < 10 ? "0" + d.getMinutes() : d.getMinutes();
+          let sec = d.getSeconds() < 10 ? "0" + d.getSeconds() : d.getSeconds();
+          let times=d.getFullYear() + '-' + month + '-' + day + ' ' + hours + ':' + min + ':' + sec;
+          return moment(val).format("YYYY-MM-DD HH:mm")
+        }
+      }
+    },
     data() {
       return {
         ruleForm: {

src/views/system/actwork/havedone.vue

@@ -29,12 +29,12 @@
       <el-table-column label="当前处理" width="180" align="center" prop="name"/>
       <el-table-column label="创建时间" width="180" align="center" prop="createTime" >
         <template slot-scope="scope">
-          <span>{{scope.row.createTime | format('yyyy-MM-dd hh:mm')}}</span>
+          <span>{{scope.row.createTime | timefilters}}</span>
         </template>
       </el-table-column>
       <el-table-column label="办理时间" width="180" align="center" prop="endTime" >
         <template slot-scope="scope">
-          <span>{{scope.row.endTime | format('yyyy-MM-dd hh:mm')}}</span>
+          <span>{{scope.row.endTime | timefilters}}</span>
         </template>
       </el-table-column>
       <el-table-column label="操作" width="200" align="center" class-name="small-padding fixed-width" >
@@ -76,12 +76,12 @@
             <el-table-column label="审批人员" width="180"align="center" prop="assigneeName"/>
             <el-table-column label="到达时间"  align="center" prop="startTime">
               <template slot-scope="scope">
-                <span>{{scope.row.startTime | format('yyyy-MM-dd hh:mm')}}</span>
+                <span>{{scope.row.startTime | timefilters}}</span>
               </template>
             </el-table-column>
             <el-table-column label="审批时间"  align="center" prop="endTime">
               <template slot-scope="scope">
-                <span>{{scope.row.endTime | format('yyyy-MM-dd hh:mm')}}</span>
+                <span>{{scope.row.endTime | timefilters}}</span>
               </template>
             </el-table-column>
             <el-table-column label="审批耗时" width="180" align="center" prop="activityType">
@@ -112,9 +112,26 @@
   import { havedInfo } from "@/api/activiti/form/fw";
   import { recordImg, examineHistory } from '@/api/system/meapply/meapply'
   import {getStartFormKey } from '@/api/activiti/process/startprocess'
-
+  import moment from "moment";
   export default {
     name: 'havedone',
+    filters: {
+      timefilters(val) {
+        if (val == null || val == "") {
+          return "暂无时间";
+        } else {
+          let d = new Date(val);   //val 为表格内取到的后台时间
+          let month =
+            d.getMonth() + 1 < 10 ? "0" + (d.getMonth() + 1) : d.getMonth() + 1;
+          let day = d.getDate() < 10 ? "0" + d.getDate() : d.getDate();
+          let hours = d.getHours() < 10 ? "0" + d.getHours() : d.getHours();
+          let min = d.getMinutes() < 10 ? "0" + d.getMinutes() : d.getMinutes();
+          let sec = d.getSeconds() < 10 ? "0" + d.getSeconds() : d.getSeconds();
+          let times=d.getFullYear() + '-' + month + '-' + day + ' ' + hours + ':' + min + ':' + sec;
+          return moment(val).format("YYYY-MM-DD HH:mm")
+        }
+      }
+    },
     data(){
       return {
         //流程遮罩层

src/views/system/actwork/meapply.vue

@@ -47,7 +47,7 @@
       <el-table-column label="申请人" align="center" prop="applyUser"/>
       <el-table-column label="创建时间" width="180" align="center" prop="create_time">
         <template slot-scope="scope">
-          <span>{{scope.row.create_time | format('yyyy-MM-dd hh:mm')}}</span>
+          <span>{{scope.row.create_time | timefilters}}</span>
         </template>
       </el-table-column>
       <el-table-column label="当前处理" width="180" align="center" prop="dispose">
@@ -103,13 +103,13 @@
 
             <el-table-column label="申请时间" width="180" align="center" prop="startTime">
               <template slot-scope="scope">
-                <span>{{scope.row.startTime | format('yyyy-MM-dd hh:mm')}}</span>
+                <span>{{scope.row.startTime | timefilters}}</span>
               </template>
             </el-table-column>
 
             <el-table-column label="结束时间" width="180" align="center" prop="endTime">
               <template slot-scope="scope">
-                <span>{{scope.row.endTime | format('yyyy-MM-dd hh:mm')}}</span>
+                <span>{{scope.row.endTime | timefilters}}</span>
               </template>
             </el-table-column>
 
@@ -143,8 +143,26 @@
 <script>
   import { listInfo, recordImg, examineHistory} from '@/api/system/meapply/meapply'
   import {getStartFormKey } from '@/api/activiti/process/startprocess'
+  import moment from "moment";
   export default {
     name: 'meapply',
+    filters: {
+      timefilters(val) {
+        if (val == null || val == "") {
+          return "暂无时间";
+        } else {
+          let d = new Date(val);   //val 为表格内取到的后台时间
+          let month =
+            d.getMonth() + 1 < 10 ? "0" + (d.getMonth() + 1) : d.getMonth() + 1;
+          let day = d.getDate() < 10 ? "0" + d.getDate() : d.getDate();
+          let hours = d.getHours() < 10 ? "0" + d.getHours() : d.getHours();
+          let min = d.getMinutes() < 10 ? "0" + d.getMinutes() : d.getMinutes();
+          let sec = d.getSeconds() < 10 ? "0" + d.getSeconds() : d.getSeconds();
+          let times=d.getFullYear() + '-' + month + '-' + day + ' ' + hours + ':' + min + ':' + sec;
+          return moment(val).format("YYYY-MM-DD HH:mm")
+        }
+      }
+    },
     data() {
       return {
         //流程遮罩层

src/views/system/actwork/todo.vue

@@ -46,10 +46,11 @@
       </el-table-column>
       <el-table-column label="标题" align="center" prop="title" />
       <el-table-column label="当前处理" width="180" align="center" prop="name" />
-      <el-table-column label="到达时间" width="180" align="center" prop="createTime" >
-        <template slot-scope="scope">
-          <span>{{scope.row.createTime | format('yyyy-MM-dd hh:mm')}}</span>
-        </template>
+      <el-table-column label="到达时间" width="180" align="center" prop="createTime" :formatter="formatDate">
+<!--        <template slot-scope="scope">-->
+<!--&lt;!&ndash;          <span>{{scope.row.createTime | timefilters}}</span>&ndash;&gt;-->
+<!--          <span>{{scope.row.createTime | format('yyyy-MM-dd hh:mm')}}</span>-->
+<!--        </template>-->
       </el-table-column>
      <!-- <el-table-column label="到达时间" width="180" align="center" prop="updateTime" >
         <template slot-scope="scope">
@@ -97,6 +98,7 @@
   import {toDoItemListInfo} from "@/api/activiti/form/fw";
   import {getCurrentFlowFormKey } from '@/api/activiti/process/startprocess'
   import Option from "@/components/files/option";
+  import moment from "moment";
   export default {
     name: 'todo',
     components: {Option},
@@ -152,6 +154,11 @@
       this.getList();
     },
     methods: {
+      formatDate(row, column) {
+        console.log(row)
+        let data = row.createTime;
+        return moment(data).format("YYYY-MM-DD HH:mm")
+      },
 
         detern(row){
             this.reset();