Merge branch 'master' of http://1.71.9.215:3000/feiyi/cbjsxt-front-master

src/components/task/mounTaskComponents/index.js

@@ -180,6 +180,18 @@ export const taskMixin = {
             },
           },
           {
+            prop: 'actStartTime',
+            label: '流程开始时间',
+            width: 140,
+            align: 'center',
+          },
+          {
+            prop: 'actEndTime',
+            label: '结束时间',
+            width: 140,
+            align: 'center',
+          },
+          {
             prop: 'endTime',
             label: '预置环节截止时间',
             width: 140,

src/views/costAudit/baseInfo/statistics/components/index.js

@@ -179,6 +179,18 @@ export const taskMixin = {
             // },
           },
           {
+            prop: 'actStartTime',
+            label: '流程开始时间',
+            width: 140,
+            align: 'center',
+          },
+          {
+            prop: 'actEndTime',
+            label: '结束时间',
+            width: 140,
+            align: 'center',
+          },
+          {
             prop: 'endTime',
             label: '预置环节截止时间',
             width: 140,

src/views/costAudit/projectInfo/auditTaskManage/taskCustomizedRelease/index.js

@@ -180,6 +180,18 @@ export const taskMixin = {
             },
           },
           {
+            prop: 'actStartTime',
+            label: '流程开始时间',
+            width: 140,
+            align: 'center',
+          },
+          {
+            prop: 'actEndTime',
+            label: '结束时间',
+            width: 140,
+            align: 'center',
+          },
+          {
             prop: 'endTime',
             label: '预置环节截止时间',
             width: 140,