From 952240909a036a341300ec25a2259e6faed33362 Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期四, 04 九月 2025 16:09:49 +0800
Subject: [PATCH] 设备保修真机测试，bug修改
---
src/pages/equipmentManagement/repair/maintain.vue | 37 +++++++++++++++----------------------
1 files changed, 15 insertions(+), 22 deletions(-)
diff --git a/src/pages/equipmentManagement/repair/maintain.vue b/src/pages/equipmentManagement/repair/maintain.vue
index 12a39b7..aa8a8e3 100644
--- a/src/pages/equipmentManagement/repair/maintain.vue
+++ b/src/pages/equipmentManagement/repair/maintain.vue
@@ -50,9 +50,11 @@
<up-datetime-picker
:show="showDatePicker"
v-model="pickerDateValue"
- mode="date"
+ mode="datetime"
title="閫夋嫨鏃ユ湡"
+ format="YYYY-MM-DD HH:mm:ss"
@confirm="onDateConfirm"
+ @cancel="showDatePicker = false"
/>
</view>
</template>
@@ -64,7 +66,6 @@
import { addMaintain } from '@/api/equipmentManagement/repair';
import useUserStore from "@/store/modules/user";
import dayjs from "dayjs";
-import { formatDateToYMD } from '@/utils/ruoyi'
defineOptions({
name: "璁惧缁翠慨琛ㄥ崟",
@@ -89,7 +90,7 @@
const form = ref({
maintenanceName: userStore.nickName || '', // 榛樿浣跨敤褰撳墠鐢ㄦ埛鏄电О
maintenanceResult: undefined, // 缁翠慨缁撴灉
- maintenanceTime: dayjs().format("YYYY-MM-DD"), // 缁翠慨鏃ユ湡锛堝彧鏄剧ず鏃ユ湡锛�
+ maintenanceTime: dayjs().format("YYYY-MM-DD HH:mm:ss"), // 缁翠慨鏃ユ湡锛堝彧鏄剧ず鏃ユ湡锛�
});
// 鑷畾涔塻howToast鍑芥暟
@@ -100,17 +101,12 @@
})
};
-// 娓呴櫎琛ㄥ崟鏍￠獙鐘舵��
-const clearValidate = () => {
- // uview-plus涓嶉渶瑕佹墜鍔ㄦ竻闄ら獙璇佺姸鎬侊紝閲嶇疆琛ㄥ崟鏃朵細鑷姩娓呴櫎
-};
-
// 閲嶇疆琛ㄥ崟鏁版嵁鍜屾牎楠岀姸鎬�
const resetForm = () => {
form.value = {
maintenanceName: userStore.nickName || '',
maintenanceResult: undefined,
- maintenanceTime: dayjs().format("YYYY-MM-DD"),
+ maintenanceTime: dayjs().format("YYYY-MM-DD HH:mm:ss"),
};
};
@@ -145,10 +141,6 @@
// 鍑嗗鎻愪氦鏁版嵁锛宮aintenanceTime 鍔犱笂褰撳墠鏃跺垎绉�
const submitData = { ...form.value };
- if (submitData.maintenanceTime && !submitData.maintenanceTime.includes(':')) {
- // 濡傛灉 maintenanceTime 鍙寘鍚棩鏈燂紝娣诲姞褰撳墠鏃跺垎绉�
- submitData.maintenanceTime = submitData.maintenanceTime + ' ' + dayjs().format('HH:mm:ss');
- }
const { code } = await addMaintain({ id: id, ...submitData });
@@ -156,12 +148,14 @@
showToast('鏂板缁翠慨鎴愬姛');
resetFormAndValidate();
setTimeout(() => {
- uni.navigateBack();
- }, 1500);
+ goBack();
+ }, 500);
} else {
loading.value = false;
}
} catch (e) {
+ console.log(e);
+
loading.value = false;
showToast('鎿嶄綔澶辫触');
}
@@ -169,21 +163,20 @@
// 杩斿洖涓婁竴椤�
const goBack = () => {
+ uni.removeStorageSync('repairId');
uni.navigateBack();
};
// 鑾峰彇椤甸潰ID
const getPageId = () => {
- const pages = getCurrentPages();
- const currentPage = pages[pages.length - 1];
- const options = currentPage.options;
- return options.id;
+ const id = uni.getStorageSync('repairId');
+ return id;
};
// 纭鏃ユ湡閫夋嫨
const onDateConfirm = (e) => {
- form.value.maintenanceTime = formatDateToYMD(e.value)
- pickerDateValue.value = formatDateToYMD(e.value)
+ form.value.maintenanceTime = dayjs(e.value).format('YYYY-MM-DD HH:mm:ss')
+ pickerDateValue.value = e.value
showDatePicker.value = false;
};
@@ -192,7 +185,7 @@
// 璁剧疆缁翠慨浜轰负褰撳墠鐢ㄦ埛鏄电О
form.value.maintenanceName = userStore.nickName || '';
// 璁剧疆褰撳墠鏃ユ湡锛堝彧鍖呭惈骞存湀鏃ワ級
- form.value.maintenanceTime = dayjs().format('YYYY-MM-DD');
+ form.value.maintenanceTime = dayjs().format('YYYY-MM-DD HH:mm:ss');
};
onShow(() => {
--
Gitblit v1.9.3