From 98464ea4bca57afcf28db79aca17912fc350d91c Mon Sep 17 00:00:00 2001
From: lizijiee <562949697@qq.com>
Date: Mon, 1 Apr 2024 20:41:09 +0800
Subject: [PATCH 1/2] =?UTF-8?q?feat:=20=E4=BF=AE=E5=A4=8D=E7=82=B9?=
=?UTF-8?q?=E5=87=BB=E7=99=BD=E5=9B=BE=E6=8A=A5=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/worksheet/content/Content.vue | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/src/views/worksheet/content/Content.vue b/src/views/worksheet/content/Content.vue
index bee4397..305ac53 100644
--- a/src/views/worksheet/content/Content.vue
+++ b/src/views/worksheet/content/Content.vue
@@ -222,8 +222,9 @@ async function queryDetail(checkDuplicateId: any) {
refreshHandler();
}
+// 点击任务包图片，查看详情
async function handleSelect(item: any) {
- taskDetailInfo.value = await getTaskDetailInfo(item.id)
+ // taskDetailInfo.value = await getTaskDetailInfo(item.id)
const packageid = workStore.getActiveId;
if (isEmpty(packageid)) {
listData.value.length = 0;
From 641d63704c392322e9aa49cf56f7b5f193ace680 Mon Sep 17 00:00:00 2001
From: Dragon <>
Date: Mon, 1 Apr 2024 21:00:40 +0800
Subject: [PATCH 2/2] bug
---
src/views/final/comp/RepeatTaskTableModal.vue | 47 +++++++++++++++++--
src/views/final/content/Content.vue | 30 ++++++++++--
2 files changed, 68 insertions(+), 9 deletions(-)
diff --git a/src/views/final/comp/RepeatTaskTableModal.vue b/src/views/final/comp/RepeatTaskTableModal.vue
index 587fb28..a2acfad 100644
--- a/src/views/final/comp/RepeatTaskTableModal.vue
+++ b/src/views/final/comp/RepeatTaskTableModal.vue
@@ -184,7 +184,7 @@ async function query(page: number, pageSize: number) {
const result = await getRepeatList({
sortorder: 'asc',
pageSize: pagination.pageSize,
- pageNo: 1,
+ pageNo: pagination.page,
sortname: '',
})
console.log(666666)
@@ -362,6 +362,15 @@ function goDetail(row) {
router.push({ name: 'final-detail', query: { id: row.id, packageid: row.packageid } })
}
+const showActions = computed(() => {
+ return selectionIds.value.length
+})
+
+function switchBatch() {
+ selectionIds.value = []
+ checkedRowKeys.value = []
+}
+
defineExpose({
showModal,
})
@@ -387,10 +396,26 @@ defineExpose({
任务信息
+
-
-
-
+
+
+
+
+
+
+ 取消
+
+
+
+
+
+
diff --git a/src/views/final/content/Content.vue b/src/views/final/content/Content.vue
index a28a943..bc8a4c5 100644
--- a/src/views/final/content/Content.vue
+++ b/src/views/final/content/Content.vue
@@ -629,6 +629,10 @@ function getSelectItems() {
return tableData.value.filter(item => selectionIds.value.includes(item.id))
}
+const showActions = computed(() => {
+ return selectionIds.value.length
+})
+
// 单个审批通过
function singleApproval(row) {
const param = {
@@ -726,6 +730,11 @@ function doAudit(param: any) {
})
}
+function switchBatch() {
+ selectionIds.value = []
+ checkedRowKeys.value = []
+}
+
function reload() {
selectionIds.value = []
checkedRowKeys.value = []
@@ -765,15 +774,26 @@ async function refreshHandler(searchId?: any) {
小结查重
-
+
+
+
+
+
+
+
+ 取消
+
+
-
+