瀏覽代碼

:zap: 更新流程时间轴显示

smallchill 6 年之前
父節點
當前提交
2385ce478a
共有 2 個文件被更改,包括 24 次插入30 次删除
  1. 12 15
      src/views/work/process/leave/detail.vue
  2. 12 15
      src/views/work/process/leave/handle.vue

+ 12 - 15
src/views/work/process/leave/detail.vue

@@ -6,8 +6,8 @@
           <el-button @click="handleCancel">关闭</el-button>
         </el-form-item>
       </el-row>
-      <el-card class="box-card">
-        <div slot="header" class="clearfix">
+      <el-card shadow="hover">
+        <div slot="header">
           <span>审批信息</span>
         </div>
         <el-form-item label="申请人">
@@ -29,28 +29,25 @@
           <el-input :disabled="true" type="textarea" v-model="form.reason"></el-input>
         </el-form-item>
       </el-card>
-      <el-card class="box-card">
-        <div slot="header" class="clearfix">
+      <el-card shadow="hover">
+        <div slot="header">
           <span>流程信息</span>
         </div>
         <el-row type="flex" class="row-bg">
-          <avue-timeline pending time :time-width="200">
-            <avue-timeline-item v-bind:key="flow.id" v-for="flow in flowList">
-              <div slot="time">
-                <p>{{flow.createTime}}</p>
-              </div>
-              <div slot="content">
+          <el-timeline>
+            <el-timeline-item :key="flow.id" :timestamp="flow.createTime" v-for="flow in flowList" placement="top">
+              <el-card shadow="hover">
                 <p>{{flow.assigneeName}} 在 [{{flow.createTime}}] 开始处理 [{{flow.historyActivityName}}] 环节</p>
                 <p v-if="flow.historyActivityDurationTime!==''">任务历时 [{{flow.historyActivityDurationTime}}]</p>
                 <p v-if="flow.comment!==''">批复意见: [{{flow.comment}}]</p>
                 <p v-if="flow.endTime!==''">结束时间: [{{flow.endTime}}]</p>
-              </div>
-            </avue-timeline-item>
-          </avue-timeline>
+              </el-card>
+            </el-timeline-item>
+          </el-timeline>
         </el-row>
       </el-card>
-      <el-card class="box-card">
-        <div slot="header" class="clearfix">
+      <el-card shadow="hover">
+        <div slot="header">
           <span>流程跟踪</span>
         </div>
         <el-row type="flex" class="row-bg">

+ 12 - 15
src/views/work/process/leave/handle.vue

@@ -8,8 +8,8 @@
           <el-button @click="handleCancel">关闭</el-button>
         </el-form-item>
       </el-row>
-      <el-card class="box-card">
-        <div slot="header" class="clearfix">
+      <el-card shadow="hover">
+        <div slot="header">
           <span>审批信息</span>
         </div>
         <el-form-item label="申请人">
@@ -34,28 +34,25 @@
           <el-input type="textarea" v-model="form.comment"></el-input>
         </el-form-item>
       </el-card>
-      <el-card class="box-card">
-        <div slot="header" class="clearfix">
+      <el-card shadow="hover">
+        <div slot="header">
           <span>流程信息</span>
         </div>
         <el-row type="flex" class="row-bg">
-          <avue-timeline pending time :time-width="200">
-            <avue-timeline-item v-bind:key="flow.id" v-for="flow in flowList">
-              <div slot="time">
-                <p>{{flow.createTime}}</p>
-              </div>
-              <div slot="content">
+          <el-timeline>
+            <el-timeline-item :key="flow.id" :timestamp="flow.createTime" v-for="flow in flowList" placement="top">
+              <el-card shadow="hover">
                 <p>{{flow.assigneeName}} 在 [{{flow.createTime}}] 开始处理 [{{flow.historyActivityName}}] 环节</p>
                 <p v-if="flow.historyActivityDurationTime!==''">任务历时 [{{flow.historyActivityDurationTime}}]</p>
                 <p v-if="flow.comment!==''">批复意见: [{{flow.comment}}]</p>
                 <p v-if="flow.endTime!==''">结束时间: [{{flow.endTime}}]</p>
-              </div>
-            </avue-timeline-item>
-          </avue-timeline>
+              </el-card>
+            </el-timeline-item>
+          </el-timeline>
         </el-row>
       </el-card>
-      <el-card class="box-card">
-        <div slot="header" class="clearfix">
+      <el-card shadow="hover">
+        <div slot="header">
           <span>流程跟踪</span>
         </div>
         <el-row type="flex" class="row-bg">