From 4e44261ac4f6dcac2f15b3d30636d4b4823f6918 Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期三, 27 五月 2026 13:24:38 +0800
Subject: [PATCH] 君哥 1.恢复之前工艺路线模块，删除字段计件/计时字段，工资定额修改成计划工时，新增计划执行人员。工艺绑定，工艺路线恢复。仅需删除bom。 2.对于新增订单需流转协同办公进行审批，审批完成流转生产管控-生产订单 3.新增审批管理，规范管理所有节点审批人。 4.修改菜单栏样式bug
---
src/views/collaborativeApproval/knowledgeBase/index.vue | 18 +++++++++++++++---
1 files changed, 15 insertions(+), 3 deletions(-)
diff --git a/src/views/collaborativeApproval/knowledgeBase/index.vue b/src/views/collaborativeApproval/knowledgeBase/index.vue
index f7a1ef3..bdce9bd 100644
--- a/src/views/collaborativeApproval/knowledgeBase/index.vue
+++ b/src/views/collaborativeApproval/knowledgeBase/index.vue
@@ -382,7 +382,7 @@
}
},
{
- name: "鏌ョ湅",
+ name: "璇︽儏",
type: "text",
clickFun: (row) => {
viewKnowledge(row);
@@ -425,8 +425,15 @@
listKnowledgeBase({...page.value, ...searchForm.value})
.then(res => {
tableLoading.value = false;
- tableData.value = res.data.records
page.value.total = res.data.total;
+ // 濡傛灉褰撳墠椤垫暟瓒呰繃鎬婚〉鏁帮紝閲嶇疆鍒扮1椤靛苟閲嶆柊鏌ヨ
+ const maxPage = Math.ceil(res.data.total / page.value.size) || 1;
+ if (page.value.current > maxPage && maxPage > 0) {
+ page.value.current = 1;
+ // 閲嶆柊鏌ヨ绗�1椤垫暟鎹�
+ return getList();
+ }
+ tableData.value = res.data.records;
}).catch(err => {
tableLoading.value = false;
})
@@ -434,9 +441,14 @@
// 鍒嗛〉澶勭悊
const pagination = (obj) => {
+ const oldSize = page.value.size;
page.value.current = obj.page;
page.value.size = obj.limit;
- handleQuery();
+ // 濡傛灉 size 鏀瑰彉浜嗭紝閲嶇疆鍒扮1椤碉紝閬垮厤褰撳墠椤佃秴鍑鸿寖鍥�
+ if (oldSize !== obj.limit) {
+ page.value.current = 1;
+ }
+ getList();
};
// 閫夋嫨鍙樺寲澶勭悊
--
Gitblit v1.9.3