From 0f34d97b5c0c559b3d132bf1171de43a5ea9a596 Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期四, 04 九月 2025 17:43:25 +0800
Subject: [PATCH] 设备保养真机测试，bug修改
---
src/pages/equipmentManagement/upkeep/index.vue | 8 ++++++--
src/pages/equipmentManagement/upkeep/add.vue | 17 ++++++++---------
src/pages/equipmentManagement/upkeep/maintain.vue | 21 ++++++++-------------
3 files changed, 22 insertions(+), 24 deletions(-)
diff --git a/src/pages/equipmentManagement/upkeep/add.vue b/src/pages/equipmentManagement/upkeep/add.vue
index c0e7e34..fbdf304 100644
--- a/src/pages/equipmentManagement/upkeep/add.vue
+++ b/src/pages/equipmentManagement/upkeep/add.vue
@@ -301,19 +301,20 @@
// 杩斿洖涓婁竴椤�
const goBack = () => {
+ // 娓呴櫎瀛樺偍鐨刬d
+ uni.removeStorageSync('repairId');
uni.navigateBack();
};
// 鑾峰彇椤甸潰鍙傛暟
const getPageParams = () => {
- const pages = getCurrentPages();
- const currentPage = pages[pages.length - 1];
- const options = currentPage.options;
+ // 浠庢湰鍦板瓨鍌ㄨ幏鍙杋d
+ const id = uni.getStorageSync('repairId');
// 鏍规嵁鏄惁鏈塱d鍙傛暟鏉ュ垽鏂槸鏂板杩樻槸缂栬緫
- if (options.id) {
+ if (id) {
// 缂栬緫妯″紡锛岃幏鍙栬鎯�
- loadForm(options.id);
+ loadForm(id);
} else {
// 鏂板妯″紡
loadForm();
@@ -322,10 +323,8 @@
// 鑾峰彇椤甸潰ID
const getPageId = () => {
- const pages = getCurrentPages();
- const currentPage = pages[pages.length - 1];
- const options = currentPage.options;
- return options.id;
+ // 浠庢湰鍦板瓨鍌ㄨ幏鍙杋d
+ return uni.getStorageSync('repairId');
};
</script>
diff --git a/src/pages/equipmentManagement/upkeep/index.vue b/src/pages/equipmentManagement/upkeep/index.vue
index 39454f9..4c47c65 100644
--- a/src/pages/equipmentManagement/upkeep/index.vue
+++ b/src/pages/equipmentManagement/upkeep/index.vue
@@ -221,8 +221,10 @@
return
}
const targetId = id || multipleList.value[0].id
+ // 浣跨敤鏈湴瀛樺偍浼犻�抜d
+ uni.setStorageSync('repairId', targetId)
uni.navigateTo({
- url: `/pages/equipmentManagement/upkeep/maintain?id=${targetId}`
+ url: '/pages/equipmentManagement/upkeep/maintain'
})
}
@@ -236,8 +238,10 @@
// 缂栬緫 - 璺宠浆鍒癮dd椤甸潰锛岄�氳繃id鍖哄垎鏂板杩樻槸缂栬緫
const edit = (id) => {
if (!id) return
+ // 浣跨敤鏈湴瀛樺偍浼犻�抜d
+ uni.setStorageSync('repairId', id)
uni.navigateTo({
- url: `/pages/equipmentManagement/upkeep/add?id=${id}`
+ url: '/pages/equipmentManagement/upkeep/add'
})
}
diff --git a/src/pages/equipmentManagement/upkeep/maintain.vue b/src/pages/equipmentManagement/upkeep/maintain.vue
index 33f9338..f10654e 100644
--- a/src/pages/equipmentManagement/upkeep/maintain.vue
+++ b/src/pages/equipmentManagement/upkeep/maintain.vue
@@ -120,7 +120,7 @@
const form = ref({
maintenanceActuallyName: userStore.nickName || '', // 榛樿浣跨敤褰撳墠鐢ㄦ埛鏄电О
maintenanceResult: undefined, // 淇濆吇缁撴灉
- maintenanceActuallyTime: dayjs().format("YYYY-MM-DD"), // 瀹為檯淇濆吇鏃ユ湡锛堝彧鏄剧ず鏃ユ湡锛�
+ maintenanceActuallyTime: dayjs().format("YYYY-MM-DD HH:mm:ss"), // 瀹為檯淇濆吇鏃ユ湡锛堝彧鏄剧ず鏃ユ湡锛�
});
// 娓呴櫎琛ㄥ崟鏍￠獙鐘舵��
@@ -133,7 +133,7 @@
form.value = {
maintenanceActuallyName: userStore.nickName || '',
maintenanceResult: undefined,
- maintenanceActuallyTime: dayjs().format("YYYY-MM-DD"),
+ maintenanceActuallyTime: dayjs().format("YYYY-MM-DD HH:mm:ss"),
};
maintenanceResultText.value = '';
};
@@ -170,11 +170,6 @@
// 鍑嗗鎻愪氦鏁版嵁锛宮aintenanceActuallyTime 鍔犱笂褰撳墠鏃跺垎绉�
const submitData = { ...form.value };
- if (submitData.maintenanceActuallyTime && !submitData.maintenanceActuallyTime.includes(':')) {
- // 濡傛灉 maintenanceActuallyTime 鍙寘鍚棩鏈燂紝娣诲姞褰撳墠鏃跺垎绉�
- submitData.maintenanceActuallyTime = submitData.maintenanceActuallyTime + ' ' + dayjs().format('HH:mm:ss');
- }
-
const { code } = await addMaintenance({ id: id, ...submitData });
if (code == 200) {
@@ -194,15 +189,15 @@
// 杩斿洖涓婁竴椤�
const goBack = () => {
+ // 娓呴櫎瀛樺偍鐨刬d
+ uni.removeStorageSync('repairId');
uni.navigateBack();
};
// 鑾峰彇椤甸潰ID
const getPageId = () => {
- const pages = getCurrentPages();
- const currentPage = pages[pages.length - 1];
- const options = currentPage.options;
- return options.id;
+ // 浠庢湰鍦板瓨鍌ㄨ幏鍙杋d
+ return uni.getStorageSync('repairId');
};
// 鏄剧ず鏃ユ湡閫夋嫨鍣�
@@ -213,7 +208,7 @@
// 纭鏃ユ湡閫夋嫨
const onDateConfirm = (e) => {
// 鍙繚瀛樺勾鏈堟棩锛屼笉鍖呭惈鏃跺垎绉�
- form.value.maintenanceActuallyTime = formatDateToYMD(e.value);
+ form.value.maintenanceActuallyTime = dayjs(e.value).format('YYYY-MM-DD HH:mm:ss');
showDate.value = false;
};
@@ -235,7 +230,7 @@
// 璁剧疆淇濆吇浜轰负褰撳墠鐢ㄦ埛鏄电О
form.value.maintenanceActuallyName = userStore.nickName || '';
// 璁剧疆褰撳墠鏃ユ湡锛堝彧鍖呭惈骞存湀鏃ワ級
- form.value.maintenanceActuallyTime = dayjs().format('YYYY-MM-DD');
+ form.value.maintenanceActuallyTime = dayjs().format('YYYY-MM-DD HH:mm:ss');
currentDate.value = [new Date().getFullYear(), new Date().getMonth() + 1, new Date().getDate()];
};
--
Gitblit v1.9.3