refactor(task): 更新照片比例效果

src/api/promotion/task.js

@@ -50,7 +50,7 @@ export const getTaskListAPI = (queryParams) => {
         // "createDateEnd": '2025-01-14 23:59:59',
         "province": queryParams.province,
         "city": queryParams.city,
-        "approverId": queryParams.managerId,
+        "manageId": queryParams.managerId,
         "approveStatus": queryParams.taskStatus,
         "storeNameLike": queryParams.storeName,
       }

src/views/promotion/plan/index.vue

@@ -666,9 +666,10 @@ const formatter = (row, col, value) => {
 // 判断计划是否过期
 const checkPlanExpire = (row) => {
   const date = new Date()
-  const targetDate = new Date(`${date.getFullYear()}-${date.getMonth() + 1}-${date.getDate()} 10:00:00`)
-  const rowDate = new Date(row.date)
-  if (rowDate < targetDate || row.planStatus === 1) {
+  // const targetDate = new Date(`${date.getFullYear()}-${date.getMonth() + 1}-${date.getDate()} ${date.getHours() + 1}:${date.getMinutes()}:${date.getSeconds()}`)
+  const rowDate = new Date(row.clockInTime)
+  rowDate.setHours(rowDate.getHours() + 1)
+  if (rowDate < date || row.planStatus === 1) {
     // 过期/已经开始不可以操作
     return false
   } else {

src/views/promotion/task/index.vue

@@ -132,9 +132,9 @@
       </el-table>
       <!-- 分页 -->
       <pagination :total="total"
-        :page-size="queryParams.pageSize"
-        :current-page="queryParams.page"
-        @current-change="currentChange" />
+        v-model:page="queryParams.page"
+        v-model:limit="queryParams.pageSize"
+        @pagination="getTaskList" />
       <!-- 照片查看弹窗 -->
       <el-dialog :title="photoLookInfoObj.storeName"
         v-model="photoDialogVisible"
@@ -185,7 +185,7 @@ const queryParams = reactive({
   managerId: undefined,
   storeName: undefined,
   page: 1,
-  pageSize: 20,
+  pageSize: 10,
   date: todayDate
 })
 const photoDialogVisible = ref(false)
@@ -375,9 +375,9 @@ const getTaskList = async () => {
     queryParams.zoneId = managerList.value.find(item => item.employeeNo === store.state.value.user.userInfo.userName)?.deptQcId
   }
 
-  const { data: { records } } = await getTaskListAPI(queryParams)
+  const { data: { records, totalRecord } } = await getTaskListAPI(queryParams)
   tableList.value = records
-  total.value = records.length
+  total.value = totalRecord
 }
 getTaskList()
 const formatter = (row, columns, value) => {
@@ -519,19 +519,24 @@ const currentChange = (page) => {
       overflow-x: scroll;
 
       .content {
-        display: flex;
+        /* display: flex; */
 
         .el-result {
-          width: 350px;
-          height: 300px;
+          width: 300px;
+          height: 500px;
+          display: inline-block;
+
+          .el-result__icon{
+            width: 100%;
+            height: 100%;
+          }
 
           .el-image {
-            width: 180px;
-            height: 180px;
+            width: 100%;
+            height: 100%;
           }
         }
       }
     }
-
   }
 </style>
\ No newline at end of file