Commit e6f96e9a authored by jingnan's avatar jingnan 👀

单个签审点击数据重复渲染bug修改及无用代码删除

parent 811266c6
...@@ -20,7 +20,6 @@ ...@@ -20,7 +20,6 @@
<div class="ti-label"> <div class="ti-label">
<div class="flex-start"> <div class="flex-start">
<span v-if="item.taskType" class="task-status" :style="{color: '#2A75CE'}">【{{ item.taskType }}</span> <span v-if="item.taskType" class="task-status" :style="{color: '#2A75CE'}">【{{ item.taskType }}</span>
<!-- <span class="task-name">{{ item.taskType }}</span> -->
</div> </div>
<div class="task-item-num"> <div class="task-item-num">
{{ item.taskCount }} {{ item.taskCount }}
...@@ -28,20 +27,13 @@ ...@@ -28,20 +27,13 @@
</div> </div>
</div> </div>
</div> </div>
<!-- <div v-if="!initShowFont" class="more-bar"> -->
<!-- <span v-if="taskList.length < pagination.total" class="more" @click="getMoreTaskData">加载更多</span> -->
<!-- <span>已全部加载!</span> -->
<!-- </div> -->
</el-scrollbar> </el-scrollbar>
</div> </div>
</template> </template>
<script> <script>
import { showIcon } from '@/utils/util' import { showIcon } from '@/utils/util'
import { getTemps } from '@/api/workflow/userSettings.js' import { getTemps } from '@/api/workflow/userSettings.js'
// import { getFinishedTaskHome } from '@/api/workflow/taskCenter.js'
import { getAllApplication } from '@/api/workflow/config' import { getAllApplication } from '@/api/workflow/config'
// import { getTaskCount } from '@/api/workspace.js'
// import _get from 'lodash.get'
import { get } from '@/utils/http' import { get } from '@/utils/http'
export default { export default {
...@@ -64,30 +56,9 @@ export default { ...@@ -64,30 +56,9 @@ export default {
isShowMoreFont: true, isShowMoreFont: true,
initShowFont: false, initShowFont: false,
taskList: [], taskList: [],
// pagination: {
// currentPage: 1,
// pageSize: 10,
// pageSizes: [5],
// total: 0
// },
search: '', search: '',
pageCount: 0, pageCount: 0,
clickNum: 1, clickNum: 1,
textColor: {
// '编制': '#4BAE47',
// '审批': '#FFA200',
// '待发放': '#67ADFE',
驳回: '#DD3B3B',
// '提交审阅': '#FFA200',
// '启动': '#4BAE47',
// '审批中': '#FFA200',
// '工作中': '#4BAE47',
// '待审阅': '#FFA200',
// '审阅中': '#67ADFE',
// '初始化构型层': '#FFA200',
// '修改中': '#FFA200',
默认: '#2A75CE'
},
searchForm: {}, searchForm: {},
searchFormData: [ searchFormData: [
{ {
...@@ -183,45 +154,6 @@ export default { ...@@ -183,45 +154,6 @@ export default {
} }
}) })
}, },
// showTitleParams(propForm, titleParams, title) {
// if (!propForm) return [{ title }]
// if (!titleParams) return [{ title }]
// return titleParams.map(attr => {
// let title = _get(propForm, attr.attr) || ''
// if (attr.placeholder) {
// title = attr.placeholder.replace(/\$\*/, title)
// }
// if (attr.connector) {
// title += attr.connector
// }
// if (attr.dictTypeCode) {
// let dictTitleList = this.dict[attr.dictTypeCode]
// const oldStateDictName = this.stateDictName
// this.stateDictName = attr.dictTypeCode
// if (!dictTitleList) {
// this.stateDictName = oldStateDictName
// dictTitleList = this.dict[attr.dictTypeCode]
// }
// const _title = dictTitleList.find(dic => dic.value === title)
// title = (_title && _title.label) || ''
// }
// return {
// style: attr.style,
// title: title
// }
// })
// },
// async getDict(flag) {
// const list = await this.$utils.getDicListByCode(this.stateDictName)
// this.$set(this.dict, this.stateDictName, list)
// },
// getStateDisplayName(item) {
// if (!item.bizExtInfo || !item.bizExtInfo.bizObjectState) {
// return ''
// }
// const code = item.bizExtInfo.bizObjectState
// return this.$utils.getParamsFromLists(this.dict[this.stateDictName], 'value', code, 'label') || code
// },
getOthersTasks(type) { getOthersTasks(type) {
if (type === '单个签审') { if (type === '单个签审') {
this.quickAccessList.forEach((item, index) => { this.quickAccessList.forEach((item, index) => {
...@@ -232,42 +164,20 @@ export default { ...@@ -232,42 +164,20 @@ export default {
// 获取待办任务列表 // 获取待办任务列表
getTasks(page, type) { getTasks(page, type) {
this.getOthersTasks(type) this.getOthersTasks(type)
// const params = {
// 'page': page || this.pagination.currentPage,
// 'size': this.pagination.pageSize
// }
// params.assignee = localStorage.getItem('userId')
// if (this.searchForm.receiveTimeRange && this.searchForm.receiveTimeRange.length) {
// params.receiveTime1 = this.searchForm.receiveTimeRange[0] + ' 00:00:00'
// params.receiveTime2 = this.searchForm.receiveTimeRange[1] + ' 23:59:59'
// }
this.type = type this.type = type
if (type === '单个签审') { if (type === '单个签审') {
get('/indexTask/task/todoStatistics').then(res => { get('/indexTask/task/todoStatistics').then(res => {
// if (params.page === 1) {
// this.taskList = []
// }
this.addData(res.items, res.items.length) this.addData(res.items, res.items.length)
}) })
} }
if (type === '已办任务') { if (type === '已办任务') {
get('/indexTask/task/finishStatistics').then(res => { get('/indexTask/task/finishStatistics').then(res => {
// if (params.page === 1) {
// this.taskList = []
// }
this.addData(res.items, res.items.length) this.addData(res.items, res.items.length)
}) })
} }
// if (type === '我的请求') {
// post(`/workflow/inst?page=${params.page}&size=${params.size}`, { 'startedUserId': localStorage.getItem('userId'), 'checkOwnerSignAddFlag': true }).then(res => {
// if (params.page === 1) {
// this.taskList = []
// }
// this.addData(res.items.content, res.items.totalElements)
// })
// }
}, },
addData(data, totalElements) { addData(data, totalElements) {
this.taskList = []
data.forEach((item) => { data.forEach((item) => {
if (item.taskCount > 0) { if (item.taskCount > 0) {
this.taskList.push({ this.taskList.push({
...@@ -275,7 +185,6 @@ export default { ...@@ -275,7 +185,6 @@ export default {
}) })
} }
}) })
// this.pagination.total = totalElements
}, },
showIcon(row) { showIcon(row) {
return showIcon(row) return showIcon(row)
...@@ -347,9 +256,6 @@ export default { ...@@ -347,9 +256,6 @@ export default {
} }
}) })
} }
// path: `/task-detail-${item.id}`,
// query: { id: item.id, insId: item.processInstanceId, title: item.title, showMenu: false }
} }
}, },
async goModule(module) { async goModule(module) {
...@@ -381,7 +287,6 @@ export default { ...@@ -381,7 +287,6 @@ export default {
}, },
getMoreTaskData() { getMoreTaskData() {
if (this.clickNum !== this.pageCount) { if (this.clickNum !== this.pageCount) {
// this.pagination.currentPage += 1
this.getTasks(this.pagination.currentPage, this.type) this.getTasks(this.pagination.currentPage, this.type)
this.clickNum += 1 this.clickNum += 1
} }
...@@ -399,7 +304,6 @@ export default { ...@@ -399,7 +304,6 @@ export default {
background-color: #ffffff; background-color: #ffffff;
padding: 10px; padding: 10px;
box-sizing: border-box; box-sizing: border-box;
// border: 1px solid #D9D9D9;
position: relative; position: relative;
.task-header{ .task-header{
display: flex; display: flex;
...@@ -416,10 +320,6 @@ export default { ...@@ -416,10 +320,6 @@ export default {
} }
} }
.refresh{ .refresh{
// position: absolute;
// right: 9px;
// top: 10px;
// z-index: 10;
span{ span{
font-size:12px; font-size:12px;
color: #999999; color: #999999;
...@@ -453,11 +353,7 @@ export default { ...@@ -453,11 +353,7 @@ export default {
border-left: 3px solid #E79460!important; border-left: 3px solid #E79460!important;
} }
.task-item { .task-item {
// padding: 0px 8px;
cursor: pointer; cursor: pointer;
// transition: transform 0.3s ease-in-out,
// box-shadow 0.3s cubic-bezier(0.47, 0, 0.745, 0.715),
// border 0.3s linear 0.1s;
height: 90px; height: 90px;
box-sizing: border-box; box-sizing: border-box;
background: #FBFDFF; background: #FBFDFF;
...@@ -470,10 +366,6 @@ export default { ...@@ -470,10 +366,6 @@ export default {
overflow: hidden; overflow: hidden;
white-space: nowrap; white-space: nowrap;
&:hover { &:hover {
// box-shadow: 0 2px 5px rgba(51, 51, 51, 0.25);
// -webkit-transform: translateY(-2px);
// -moz-transform: translateY(-2px);
// transform: translateY(-2px);
background-color: rgba(245,247,250,1); background-color: rgba(245,247,250,1);
} }
.task-item-time { .task-item-time {
...@@ -490,7 +382,6 @@ export default { ...@@ -490,7 +382,6 @@ export default {
color:rgb(42, 117, 206); color:rgb(42, 117, 206);
} }
.title { .title {
// max-width: calc(-60px + 100%);
text-overflow: ellipsis; text-overflow: ellipsis;
overflow: hidden; overflow: hidden;
white-space: nowrap; white-space: nowrap;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment