From 0a27a9c0f9e1213dff16162d73a03dba0473b96e Mon Sep 17 00:00:00 2001
From: baoshiwei <baoshiwei@shlanbao.cn>
Date: 星期五, 27 六月 2025 11:06:36 +0800
Subject: [PATCH] refactor(lb-eims):优化维护计划生成订单功能
---
eims-ui-mobile/src/pages/maint/maint-order.vue | 8 ++++----
eims/ruoyi-modules/lb-eims/src/main/java/org/dromara/eims/job/MaintPlanToOrderJob.java | 2 +-
eims-ui-mobile/src/pages/inspect/insp-record.vue | 7 +++----
3 files changed, 8 insertions(+), 9 deletions(-)
diff --git a/eims-ui-mobile/src/pages/inspect/insp-record.vue b/eims-ui-mobile/src/pages/inspect/insp-record.vue
index 6f5d32a..9d0ffab 100644
--- a/eims-ui-mobile/src/pages/inspect/insp-record.vue
+++ b/eims-ui-mobile/src/pages/inspect/insp-record.vue
@@ -11,6 +11,7 @@
v-model="dataList"
:auto="false"
@query="queryList"
+ refresher-only
show-refresher-update-time
>
<template #top>
@@ -251,19 +252,17 @@
const paging = ref(null)
const dataList = ref([])
-const queryList = (pageNum?: number, pageSize?: number) => {
+const queryList = () => {
// 杩欓噷鐨刾ageNo鍜宲ageSize浼氳嚜鍔ㄨ绠楀ソ锛岀洿鎺ヤ紶缁欐湇鍔″櫒鍗冲彲
// 杩欓噷鐨勮姹傚彧鏄紨绀猴紝璇锋浛鎹㈡垚鑷繁鐨勯」鐩殑缃戠粶璇锋眰锛屽苟鍦ㄧ綉缁滆姹傚洖璋冧腑閫氳繃paging.value.complete(璇锋眰鍥炴潵鐨勬暟缁�)灏嗚姹傜粨鏋滀紶缁檢-paging
const params: QueryParams = {
- pageNum,
- pageSize,
inspCode: inspSt.inspCode,
}
getInspStRecordList(params)
.then((res: any) => {
// 璇峰嬁鍦ㄧ綉缁滆姹傚洖璋冧腑缁檇ataList璧嬪�硷紒锛佸彧闇�瑕佽皟鐢╟omplete灏卞彲浠ヤ簡
- paging.value.completeByTotal(res.rows, res.total)
+ paging.value.complete(res.rows, res.total)
})
.catch((res) => {
// 濡傛灉璇锋眰澶辫触鍐檖aging.value.complete(false)锛屼細鑷姩灞曠ず閿欒椤甸潰
diff --git a/eims-ui-mobile/src/pages/maint/maint-order.vue b/eims-ui-mobile/src/pages/maint/maint-order.vue
index daaa2d8..f314dca 100644
--- a/eims-ui-mobile/src/pages/maint/maint-order.vue
+++ b/eims-ui-mobile/src/pages/maint/maint-order.vue
@@ -12,6 +12,7 @@
v-model="dataList"
@query="queryList"
:auto="false"
+ refresher-only
show-refresher-update-time
>
<template #top>
@@ -302,10 +303,8 @@
dyzCount: null,
specialNote: '',
})
-const queryList = (pageNum?: number, pageSize?: number) => {
+const queryList = () => {
const params: QueryParams = {
- pageNum,
- pageSize: 30,
maintCode: maintCode.value,
}
getMaintStOrderList(params)
@@ -318,8 +317,9 @@
}
})
})
+ console.log(res)
// 璇峰嬁鍦ㄧ綉缁滆姹傚洖璋冧腑缁檇ataList璧嬪�硷紒锛佸彧闇�瑕佽皟鐢╟omplete灏卞彲浠ヤ簡
- paging.value.completeByTotal(res.rows, res.total)
+ paging.value.complete(res.rows)
})
.catch((res) => {
console.error(res)
diff --git a/eims/ruoyi-modules/lb-eims/src/main/java/org/dromara/eims/job/MaintPlanToOrderJob.java b/eims/ruoyi-modules/lb-eims/src/main/java/org/dromara/eims/job/MaintPlanToOrderJob.java
index 7e9e813..ff3f097 100644
--- a/eims/ruoyi-modules/lb-eims/src/main/java/org/dromara/eims/job/MaintPlanToOrderJob.java
+++ b/eims/ruoyi-modules/lb-eims/src/main/java/org/dromara/eims/job/MaintPlanToOrderJob.java
@@ -47,7 +47,7 @@
planBoQueryWrapper.eq("mp.status", DictConstants.SYS_NORMAL_DISABLE_DETAIL.NORMAL);
planBoQueryWrapper .eq("equ.status", DictConstants.EIMS_EQU_STATUS_DETAIL.SHIYONG);
// 杩囨护涓嬫杩愯鏃堕棿绛変簬褰撳ぉ鏃堕棿鐨�
- planBoQueryWrapper.eq("mp.maint_next_time", DateUtils.getDate());
+// planBoQueryWrapper.eq("mp.maint_next_time", DateUtils.getDate());
// 杩囨护娌℃湁淇濆吇鍛ㄦ湡鐨勬暟鎹�
planBoQueryWrapper.isNotNull("mp.maint_cycle");
planBoQueryWrapper.isNotNull("mp.maint_cycle_unit");
--
Gitblit v1.9.3