From 223cd226f064fb549c8529e6c091be07d38cb394 Mon Sep 17 00:00:00 2001
From: zhengyiming <540361168@qq.com>
Date: 星期三, 22 十月 2025 21:51:49 +0800
Subject: [PATCH] Merge branch 'master' of http://120.26.58.240:8888/r/flexJobMiniApp
---
apps/cMiniApp/src/subpackages/task/taskUserSubmitCheckHistories/InnerPage.vue | 4 +++-
apps/bMiniApp/src/subpackages/task/taskUserSubmitCheckHistories/InnerPage.vue | 5 ++++-
apps/bMiniApp/project.private.config.json | 4 ++--
3 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/apps/bMiniApp/project.private.config.json b/apps/bMiniApp/project.private.config.json
index 661be4b..4316853 100644
--- a/apps/bMiniApp/project.private.config.json
+++ b/apps/bMiniApp/project.private.config.json
@@ -26,8 +26,8 @@
"name": "鍙戣柂淇敼",
"pathName": "subpackages/payrollManage/payrollChange/payrollChange",
"query": "orderRosterId=5262960e-a190-4419-9943-08de11389ea2&settleId=225c2ed0-aefc-43aa-ff08-08de11385920&operatorToken=04e6c650-4240-4fc4-8ae6-7e96231780b2",
- "scene": null,
- "launchMode": "default"
+ "launchMode": "default",
+ "scene": null
},
{
"name": "鍙戣柂璇︽儏",
diff --git a/apps/bMiniApp/src/subpackages/task/taskUserSubmitCheckHistories/InnerPage.vue b/apps/bMiniApp/src/subpackages/task/taskUserSubmitCheckHistories/InnerPage.vue
index 0bb2284..be949e7 100644
--- a/apps/bMiniApp/src/subpackages/task/taskUserSubmitCheckHistories/InnerPage.vue
+++ b/apps/bMiniApp/src/subpackages/task/taskUserSubmitCheckHistories/InnerPage.vue
@@ -90,9 +90,12 @@
},
taskInfoId: id,
date: dayjs(date).format('YYYY-MM-DD'),
- type: queryState.type,
};
+ if (Number(queryState.type) !== 0) {
+ params.type = queryState.type;
+ }
+
let res = await taskCheckReceiveServices.getCheckReceiveTaskUserSubmitCheckHistories(params, {
showLoading: false,
});
diff --git a/apps/cMiniApp/src/subpackages/task/taskUserSubmitCheckHistories/InnerPage.vue b/apps/cMiniApp/src/subpackages/task/taskUserSubmitCheckHistories/InnerPage.vue
index 0bb2284..89e312e 100644
--- a/apps/cMiniApp/src/subpackages/task/taskUserSubmitCheckHistories/InnerPage.vue
+++ b/apps/cMiniApp/src/subpackages/task/taskUserSubmitCheckHistories/InnerPage.vue
@@ -90,8 +90,10 @@
},
taskInfoId: id,
date: dayjs(date).format('YYYY-MM-DD'),
- type: queryState.type,
};
+ if (Number(queryState.type) !== 0) {
+ params.type = queryState.type;
+ }
let res = await taskCheckReceiveServices.getCheckReceiveTaskUserSubmitCheckHistories(params, {
showLoading: false,
--
Gitblit v1.9.1