Sfoglia il codice sorgente

已办办结去除提交人,优先显示更新时间

cfort 3 anni fa
parent
commit
99c45a38ec
1 ha cambiato i file con 13 aggiunte e 7 eliminazioni
  1. 13 7
      src/views/system/dashboard/components/new-home.vue

+ 13 - 7
src/views/system/dashboard/components/new-home.vue

@@ -86,6 +86,7 @@
                                     label="发起部门"
                                     label="发起部门"
                                 />
                                 />
                                 <el-table-column
                                 <el-table-column
+                                    :key="Date.now() + Math.random()"
                                     prop="submitBy"
                                     prop="submitBy"
                                     show-overflow-tooltip
                                     show-overflow-tooltip
                                     width="100"
                                     width="100"
@@ -101,6 +102,7 @@
                                     </template>
                                     </template>
                                 </el-table-column>
                                 </el-table-column>
                                 <el-table-column
                                 <el-table-column
+                                    :key="Date.now() + Math.random()"
                                     prop="forwardBy"
                                     prop="forwardBy"
                                     show-overflow-tooltip
                                     show-overflow-tooltip
                                     width="100"
                                     width="100"
@@ -138,20 +140,20 @@
                                 >
                                 >
                                     <template slot-scope="scope">{{ scope.row.createBy | getUserName(userList)}}</template>
                                     <template slot-scope="scope">{{ scope.row.createBy | getUserName(userList)}}</template>
                                 </el-table-column>
                                 </el-table-column>
-                                <el-table-column
+                                <!-- <el-table-column
                                     show-overflow-tooltip
                                     show-overflow-tooltip
                                     label="提交人"
                                     label="提交人"
                                     width="100"
                                     width="100"
                                 >
                                 >
                                     <template slot-scope="scope">{{ getParenthesesStr(scope.row.subject)[2] }}</template>
                                     <template slot-scope="scope">{{ getParenthesesStr(scope.row.subject)[2] }}</template>
-                                </el-table-column>
+                                </el-table-column> -->
                             </template>
                             </template>
                             <el-table-column
                             <el-table-column
                                 show-overflow-tooltip
                                 show-overflow-tooltip
                                 width="160"
                                 width="160"
                                 :label="item.time + '时间'"
                                 :label="item.time + '时间'"
                             >
                             >
-                                <template slot-scope="scope">{{ scope.row.createTime.slice(0, 16) }}</template>
+                                <template slot-scope="scope">{{ scope.row[field] ? scope.row[field].slice(0, 16) : scope.row.createTime.slice(0, 16) }}</template>
                             </el-table-column>
                             </el-table-column>
                         </el-table>
                         </el-table>
                         <div v-if="dataList.length">
                         <div v-if="dataList.length">
@@ -199,25 +201,29 @@
             label: '待办事宜',
             label: '待办事宜',
             key: 'wait',
             key: 'wait',
             icon: 'el-icon-edit',
             icon: 'el-icon-edit',
-            time: '提交'
+            time: '提交',
+            field: 'createTime'
         },
         },
         {
         {
             label: '已办事宜',
             label: '已办事宜',
             key: 'over',
             key: 'over',
             icon: 'el-icon-document-remove',
             icon: 'el-icon-document-remove',
-            time: '办理'
+            time: '办理',
+            field: 'updateTime'
         },
         },
         {
         {
             label: '办结事宜',
             label: '办结事宜',
             key: 'finish',
             key: 'finish',
             icon: 'el-icon-paperclip',
             icon: 'el-icon-paperclip',
-            time: '结束'
+            time: '结束',
+            field: 'updateTime'
         },
         },
         {
         {
             label: '暂存事宜',
             label: '暂存事宜',
             key: 'save',
             key: 'save',
             icon: 'el-icon-receiving',
             icon: 'el-icon-receiving',
-            time: '暂存'
+            time: '暂存',
+            field: 'createTime'
         }
         }
     ]
     ]
     const taskState = {
     const taskState = {