Merge branch 'zcwy-0306' into dev0223

src/views/evaluation/evaluationUpload.vue

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