feat(task): 修复时间和分页完成

src/api/promotion/plan.js

@@ -11,8 +11,8 @@ export function getPlanListAPI(queryParams) {
       pageNum: queryParams.pageNum,
       pageSize: queryParams.pageSize,
       queryParams: {
-        activityStartDate: queryParams.activityDate[0],
-        activityEndDate: queryParams.activityDate[1],
+        activityStartDate: queryParams.activityDate && queryParams.activityDate[0],
+        activityEndDate: queryParams.activityDate && queryParams.activityDate[1],
         planStatus: queryParams.planStatus,
         province: queryParams.province,
         city: queryParams.city,

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": '',
+        "approverId": queryParams.managerId,
         "approveStatus": queryParams.taskStatus,
         "storeNameLike": queryParams.storeName,
       }

src/views/jimureport/drag.vue

@@ -22,7 +22,7 @@ export default {
 #jimuReportFrame {
   width: 100%;
   // 为了隐藏积木报表顶部的广告栏
-  min-height: calc(100vh - 30px) !important;
-  margin-top: -60px;
+  // min-height: calc(100vh - 30px) !important;
+  // margin-top: -60px;
 }
 </style>
\ No newline at end of file

src/views/promotion/plan/index.vue

@@ -7,10 +7,11 @@
         label-width="68px">
         <el-row>
           <el-form-item label="选择日期"
-            prop="date">
+            prop="activityDate">
             <el-date-picker v-model="queryParams.activityDate"
               type="daterange"
-              :clearable="false"
+              value-format="YYYY-MM-DD"
+              clearable
               range-separator="至"
               start-placeholder="开始日期"
               end-placeholder="结束日期"
@@ -286,6 +287,7 @@
                 <el-date-picker v-model="addOrEditPlanForm.date"
                   :clearable="false"
                   start-placeholder="活动日期"
+                  value-format="YYYY-MM-DDTHH:mm:ss"
                   :disabled-date="disabledDateFn"
                   :disabled="!!addOrEditPlanForm.id" />
               </el-form-item>
@@ -336,6 +338,7 @@
                 <el-time-picker v-model="addOrEditPlanForm.clockInTime"
                   placeholder="选择时间"
                   format="HH:mm"
+                  value-format="YYYY-MM-DDTHH:mm:ss"
                   style="width: 95%" />
               </el-form-item>
             </el-col>
@@ -346,6 +349,7 @@
                 <el-time-picker v-model="addOrEditPlanForm.clockOutTime"
                   placeholder="选择时间"
                   format="HH:mm"
+                  value-format="YYYY-MM-DDTHH:mm:ss"
                   style="width: 95%"
                   :disabled="!addOrEditPlanForm.clockInTime"
                   :disabled-hours="disabledHours"
@@ -410,7 +414,7 @@ const { recentPickerOptions: pickerOptions, thisYearDate } = useDatePickerOption
 const queryParams = reactive({
   pageNum: 1,
   pageSize: 10,
-  activityDate: thisYearDate,
+  activityDate: [],
   region: '全国',
 })
 const taskStatusList = ref([

src/views/promotion/task/index.vue

@@ -9,7 +9,8 @@
           prop="date">
           <el-date-picker v-model="queryParams.date"
             type="daterange"
-            :clearable="false"
+            value-format="YYYY-MM-DD"
+            clearable
             range-separator="至"
             start-placeholder="开始日期"
             end-placeholder="结束日期"
@@ -69,7 +70,9 @@
             prop="zone">
             <el-select v-model="queryParams.zoneId"
               placeholder="请选择战区"
-              :disabled="cityManagerPrivilege">
+              clearable
+              :disabled="cityManagerPrivilege"
+              @change="getTaskList">
               <el-option v-for="item in zoneList"
                 :key="item.value"
                 :label="item.label"
@@ -80,7 +83,9 @@
             prop="manager">
             <el-select v-model="queryParams.managerId"
               placeholder="请选择负责人"
-              :disabled="cityManagerPrivilege">
+              :disabled="cityManagerPrivilege"
+              clearable
+              @change="getTaskList">
               <el-option v-for="item in managerList"
                 :key="item.value"
                 :label="item.label"
@@ -90,6 +95,8 @@
           <el-form-item label="门店"
             prop="store">
             <el-input v-model="queryParams.storeName"
+              clearable
+              @input="getTaskList"
               placeholder="请输入门店名称" />
           </el-form-item>
         </el-row>
@@ -124,6 +131,11 @@
           </template>
         </el-table-column>
       </el-table>
+      <!-- 分页 -->
+      <pagination :total="total"
+        :page-size="queryParams.pageSize"
+        :current-page="queryParams.page"
+        @current-change="currentChange" />
       <!-- 照片查看弹窗 -->
       <el-dialog :title="photoLookInfoObj.storeName"
         v-model="photoDialogVisible"
@@ -159,7 +171,7 @@ import { ElMessage, ElMessageBox } from 'element-plus';
 const { recentPickerOptions: pickerOptions, last7Date } = useDatePickerOptions(0)
 const queryParams = reactive({
   date: last7Date,
-  taskStatus: 'SUBMITTED',
+  taskStatus: '',
   region: '全国',
   provinceId: undefined,
   cityId: undefined,
@@ -172,6 +184,7 @@ const queryParams = reactive({
 const photoDialogVisible = ref(false)
 const photoDialogList = ref([])
 const photoLookInfoObj = ref({})
+const total = ref(0)
 
 // 城市经理状态为 true
 const cityManagerPrivilege = computed(() => {
@@ -342,6 +355,7 @@ const deleteView = async (row) => {
 
 // 获取任务列表
 const getTaskList = async () => {
+
   // 后台省市不要 id，自己查个名字给后台
   queryParams.province = provinceList.value.find(item => item.value === queryParams.provinceId)?.label
   queryParams.city = cityList.value.find(item => item.value === queryParams.cityId)?.label
@@ -353,8 +367,10 @@ const getTaskList = async () => {
     // 先从归属人查询当前登录用户的战区 ID
     queryParams.zoneId = managerList.value.find(item => item.employeeNo === store.state.value.user.userInfo.userName)?.deptQcId
   }
+  
   const { data: { records } } = await getTaskListAPI(queryParams)
   tableList.value = records
+  total.value = records.length
 }
 getTaskList()
 const formatter = (row, columns, value) => {
@@ -465,6 +481,11 @@ const lookPhoto = async (row) => {
     list: clockList
   }]
 }
+
+const currentChange = (page) => {
+  queryParams.page = page
+  getTaskList()
+}
 </script>