hz/fe-manage
1
0
Fork 0
mirror of https://codeup.aliyun.com/67762337eccfc218f6110e0e/vue/fe-manage.git synced 2025-12-10 11:26:45 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'zcwy-0306' into dev0223

Browse Source
This commit is contained in:
zhangsir
2024-04-11 08:40:46 +08:00
parent 68953890c7 fb5b05dc3d
commit 859d5c289f
1 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/views/evaluation/evaluationUpload.vue
View File

@@ -719,7 +719,7 @@ import {timeoutUpload} from "@/api/configPublic";
totalAdd: 0, totalAdd: 0,
params: { params: {
pageNo: 1, pageNo: 1,
pageSize: 10, pageSize: 100,
}, },
paramsAdd: { paramsAdd: {
pageNo: 1, pageNo: 1,
@@ -1035,8 +1035,8 @@ import {timeoutUpload} from "@/api/configPublic";
}, },
{ {
title: "添加时间", title: "添加时间",
dataIndex: "addTime", dataIndex: "createTime",
key: "addTime", key: "createTime",
className: "h", className: "h",
ellipsis: true, ellipsis: true,
align: "center", align: "center",
@@ -1472,10 +1472,12 @@ import {timeoutUpload} from "@/api/configPublic";
if(res.code === 200){ if(res.code === 200){
state.tableDataAdd = res.data state.tableDataAdd = res.data
state.tableLoadingAdd = false state.tableLoadingAdd = false
const workNums = state.tableData1.map(item=>item.workNum)
state.tableDataAdd.forEach(item => { state.tableDataAdd.forEach(item => {
if(workNums.includes(item.userNo)) state.tableData1.find(itemData => {
item.status = 0 if(itemData.workNum === item.userNo){
item.createTime = itemData.createTime
}
})
}) })
} }
}) })