diff --git a/src/resources/components/TsTable/TsTable.vue b/src/resources/components/TsTable/TsTable.vue index 97ce050cfc04e8eabcee4787637c050e1a5bf5da..73154cef77fe0679ff393831535d45a2f2e4c692 100644 --- a/src/resources/components/TsTable/TsTable.vue +++ b/src/resources/components/TsTable/TsTable.vue @@ -1166,7 +1166,7 @@ export default { } if (showList && showList.length) { showList.forEach(s => { - thList.push({ key: s.key + 'Width', width: s.width && s.width > 10 ? s.width : s.key == 'selection' ? 40 : null }); + thList.push({ key: s.key + 'Width', width: s.width && s.width > 1 ? s.width : s.key == 'selection' ? 40 : null }); }); } return thList; diff --git a/src/views/pages/process/task/overview/Tdjson.vue b/src/views/pages/process/task/overview/Tdjson.vue index eb9cfdbd64786e0f7006fc59dbb7e5cc6adbf70f..4ee5b4011402a700d45c12c93f3c56f0d66405e9 100644 --- a/src/views/pages/process/task/overview/Tdjson.vue +++ b/src/views/pages/process/task/overview/Tdjson.vue @@ -122,15 +122,15 @@ export default { props: ['config', 'header', 'row'], data() { return { - isShowUserCard: false + isShowUserCard: true }; }, mounted() { - let _this = this; - setTimeout(() => { - // 优化用户信息加载时间 - _this.isShowUserCard = true; - }, 0); + // let _this = this; // 注释头像从小变大会有抖动问题 + // setTimeout(() => { + // // 优化用户信息加载时间 + // _this.isShowUserCard = true; + // }, 0); }, methods: { updateFocus(row) { diff --git a/src/views/pages/process/task/overview/UserList.vue b/src/views/pages/process/task/overview/UserList.vue index 7a28e6a991ead6766c5c75a41b060f28ed1f9d39..060cb673d1a28ffa0c368432914dc1fe1a012b02 100644 --- a/src/views/pages/process/task/overview/UserList.vue +++ b/src/views/pages/process/task/overview/UserList.vue @@ -67,14 +67,15 @@ export default { data() { return { userList: this.item.userlist, - isShowUserCard: false + isShowUserCard: true }; }, mounted() { if (this.styleClass === 'table') { - setTimeout(() => { - this.isShowUserCard = true; - }, 0); + // 注释,头像会有抖动,放大问题 + // setTimeout(() => { + // this.isShowUserCard = true; + // }, 0); } else { this.isShowUserCard = true; } diff --git a/src/views/pages/process/task/processtask-manage.vue b/src/views/pages/process/task/processtask-manage.vue index 090dac191a8f4f870fb3ef7782ee25c6adc72829..cd3a61cf51a75a110f0fb2df4597378941299cc3 100644 --- a/src/views/pages/process/task/processtask-manage.vue +++ b/src/views/pages/process/task/processtask-manage.vue @@ -47,6 +47,7 @@ :canEdit="true" keyName="id" multiple + class="tstable-box" @changeCurrent="changePage" @changePageSize="changePageSize" @updateSort="updateSort" @@ -248,7 +249,7 @@ export default { this.handlerSearchResult(res.Return); } }) - .finally(res => { + .catch(res => { this.isLoading = false; }); }, @@ -405,14 +406,19 @@ export default { if (this.tableConfig.tbodyList.length > 0) { // 表格里面的 action 显示列表接口信息 this.getListOperation(idList); + } else { + this.isLoading = false; } }, getColumnWidth(item = {}) { const newItem = {...item }; if (item && item.key == 'focususers') { // 解决关注工单字段,没有title导致页面宽度会有抖动的问题 - newItem.width = 50; - newItem.style = {width: '50px', display: 'inline-block'}; + newItem.width = 3; + newItem.style = {display: 'inline-block', width: '3px', textAlign: 'right'}; + } else if (item && item.key == 'currentstep') { + newItem.width = 260; + newItem.style = {display: 'inline-block', width: '260px'}; // 修复当前步骤宽度被撑大,页面有抖动问题 } return newItem; }, @@ -493,6 +499,8 @@ export default { }); }); } + }).finally(() => { + this.isLoading = false; }); }, clearTimmer() { @@ -809,4 +817,22 @@ html { } } } +.tstable-box { + // 修复关注工单列左右间隙过大问题 + /deep/ td:nth-of-type(1) { + padding-right: 0 !important; + } + /deep/ td:nth-of-type(2) { + padding-right: 0 !important; + } + /deep/ td:nth-of-type(2) { + padding-left: 4px !important; + } + /deep/ th:nth-of-type(3) { + padding-left: 0 !important; + } + /deep/ td:nth-of-type(3) { + padding-left: 0 !important; + } +}