From 46d143d1d6fe8f286399f4d027c9a86adf7cd7fc Mon Sep 17 00:00:00 2001 From: baoshiwei <baoshiwei@shlanbao.cn> Date: 星期三, 09 七月 2025 08:50:01 +0800 Subject: [PATCH] feat(inspection,maintenance): - 实现保养工单批量确认功能 - 在点检记录确认时增加时间限制,距离上次更新时间两小时内不允许确认 --- eims-ui-mobile/src/pages/inspect/insp-record.vue | 27 +++++++++++++++++++++------ 1 files changed, 21 insertions(+), 6 deletions(-) diff --git a/eims-ui-mobile/src/pages/inspect/insp-record.vue b/eims-ui-mobile/src/pages/inspect/insp-record.vue index d38c7ea..aa5832a 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> @@ -146,6 +147,7 @@ <!-- </wd-cell>--> <view class="w-full h-[1px] bg-base"></view> <wd-input + v-if="inspSt.status !== '0'" label="杩愯鏃堕棿" label-width="200rpx" clearable @@ -155,6 +157,7 @@ size="large" /> <wd-input + v-if="inspSt.status !== '0'" label="鏁呴殰鏃堕棿" label-width="200rpx" clearable @@ -176,8 +179,8 @@ size="large" /> <!-- 鏂板鎻愪氦鎸夐挳 --> - <view class="flex justify-around mt-4"> - <wd-button type="primary" block size="large" v-if="inspSt.status === '0' || inspSt.status === '1'" @click="handleClickRight">鎻愪氦</wd-button> + <view class="flex justify-around"> + <wd-button type="primary" style="margin: 20px" block v-if="inspSt.status === '0' || inspSt.status === '1'" @click="handleClickRight">鎻愪氦</wd-button> <!-- <wd-button type="success" block size="large" v-if="isLeader() && inspSt.status === '1'" @click="handleComplete">纭瀹屾垚</wd-button>--> </view> </view> @@ -251,19 +254,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)锛屼細鑷姩灞曠ず閿欒椤甸潰 @@ -387,6 +388,20 @@ message.alert('璇峰~鍐欒繍琛屾鏁板拰鏁呴殰娆℃暟!') return false } + // 濡傛灉褰撳墠鏃堕棿璺濅笂娆℃柊鏃堕棿涓ゅ皬鏃朵互鍐呭垯涓嶅厑璁哥‘璁� + console.log('inspSt.updateTime', inspSt.updateTime) + console.log('new Date().getTime()', new Date().getTime()) + console.log('inspSt.updateTime', new Date(inspSt.updateTime).getTime()) + console.log('new Date().getTime() - new Date(inspSt.updateTime).getTime()', new Date().getTime() - new Date(inspSt.updateTime).getTime()) + console.log("2 * 60 * 60 * 1000", 2 * 60 * 60 * 1000) + console.log('new Date().getTime() - new Date(inspSt.updateTime).getTime() < 2 * 60 * 60 * 1000', new Date().getTime() - new Date(inspSt.updateTime).getTime() < 2 * 60 * 60 * 1000) + if ( + new Date().getTime() - new Date(inspSt.updateTime).getTime() < 2 * 60 * 60 * 1000 + ) { + console.log("new Date().getTime() - new Date(inspSt.updateTime).getTime() < 2 * 60 * 60 * 1000",new Date().getTime() - new Date(inspSt.updateTime).getTime() < 2 * 60 * 60 * 1000) + message.alert('鐐规涓ゅ皬鏃朵互鍐呬笉鍏佽纭!') + return false + } const now = new Date(); const data: any = Object.assign( {}, -- Gitblit v1.9.3