فهرست منبع

列表统一样式调整,首页及记录盒bug修复

cfort 2 سال پیش
والد
کامیت
c1eb047dd5

+ 9 - 0
src/components/ibps-crud/index.vue

@@ -482,6 +482,12 @@ export default {
         top: -5px;
         position: absolute;
     }
+    .el-table .sort-caret.ascending{
+        border-bottom-color: #909399;
+    }
+    .el-table .sort-caret.descending{
+        border-top-color: #909399;
+    }
     .el-table td{
         padding: 4px 0 !important;
         color: #000000;
@@ -496,4 +502,7 @@ export default {
         background: #F9FFFF;
         color: #000000;
     }
+    .el-table .el-table-column--selection {
+        text-align: center;
+    }
 </style>

+ 1 - 1
src/utils/common.js

@@ -8,7 +8,7 @@ import { getNextIdByAlias } from '@/api/platform/system/identity'
 import { save as sendMsg } from '@/api/platform/message/innerMessage'
 import { save as saveNews } from '@/api/platform/system/news'
 import { bpmTaskSave } from '@/api/platform/bpmn/bpmTask'
-import { onlyOfficeToPdf,generateUUID } from '@/api/platform/form/seal'
+import { onlyOfficeToPdf, generateUUID } from '@/api/platform/form/seal'
 import { downloadFile as download } from '@/business/platform/file/utils'
 import { removeFormData } from '@/api/platform/data/dataTemplate'
 

+ 2 - 2
src/views/platform/bpmn/bpmInstHis/list.vue

@@ -245,7 +245,7 @@ export default {
             templateData: {},
             listData: [],
             pagination: {},
-            sorts: {},
+            sorts: { END_TIME_: 'DESC' },
             // 默认过滤部分分类
             hasPermission: true,
             specialType,
@@ -538,7 +538,7 @@ export default {
                     pageNo: this.pagination.page || 1,
                     limit: this.pagination.limit || 100
                 },
-                sorts: [this.sorts]
+                ...ActionUtils.formatParams(null, null, this.sorts)
             }
             if (this.$utils.isNotEmpty(this.typeId)) {
                 params.parameters[0].parameters[0].parameters.push({ key: 'Q^TYPE_ID_^S', value: this.typeId })

+ 3 - 6
src/views/system/dashboard/components/workbench.vue

@@ -63,6 +63,7 @@
                             <template slot="overDept" slot-scope="scope">{{ getAttr(scope.row.subject, 'deptName') }}</template>
                             <template slot="creator" slot-scope="scope">{{ scope.row.createBy | getUserName(userList) }}</template>
                             <template slot="updateBy" slot-scope="scope">{{ getName(scope.row) }}</template>
+                            <template slot="time" slot-scope="scope">{{ scope.row.endTime || scope.row.updateTime || scope.row.createTime }}</template>
                         </ibps-crud>
                     </div>
                 </div>
@@ -287,7 +288,7 @@ export default {
                         { prop: 'scope', label: '发起部门', slotName: 'overDept', width: 120 },
                         { prop: 'scope', label: '发起人', headerName: 'submitBy', slotName: 'creator', width: 100 },
                         { prop: 'scope', label: `提交人`, slotName: 'updateBy', width: 100 },
-                        { prop: 'createTime', label: '创建时间', width: 150 }
+                        { prop: 'scope', label: '办理时间', slotName: 'time', width: 150 }
                     ],
                     finish: [
                         { prop: 'scope', label: '事务名称', slotName: 'name', width: 250 },
@@ -296,7 +297,7 @@ export default {
                         { prop: 'scope', label: '发起部门', slotName: 'overDept', width: 120 },
                         { prop: 'scope', label: '发起人', headerName: 'submitBy', slotName: 'creator', width: 100 },
                         { prop: 'scope', label: `提交人`, slotName: 'updateBy', width: 100 },
-                        { prop: 'createTime', label: '结束时间', width: 150 }
+                        { prop: 'scope', label: '结束时间', slotName: 'time', width: 150 }
                     ],
                     save: [
                         { prop: 'scope', label: '事务名称', slotName: 'name', width: 250 },
@@ -668,13 +669,10 @@ export default {
                 normal: '事务超时提醒'
             }
             const nowTime = new Date(new Date().getTime() + 28800000).toJSON().slice(0, 16).replace('T', ' ')
-            // console.log(data)
             data.forEach(item => {
                 const isExist = !!noticeList.find(i => i.taskId === item.taskId)
                 // 筛选出不存在于主管提醒表的过期数据
                 if (!isExist) {
-                    // 无部门信息的用户不往过期事务表加数据
-                    // if (this.orgInfo.groupID) {
                     const obj = {
                         // 事务ID
                         shi_wu_id_: item.taskId,
@@ -701,7 +699,6 @@ export default {
                         ti_xing_shi_jian_: nowTime
                     }
                     addList.push(obj)
-                    // }
                     const msg = {
                         subject: msgTitle[item.workType],
                         content: `<p>事务【${item.workName}】${msgContent[item.workType]}<p>`,