From 91af6caf5a797bcc912e9a22656c97775bd4a198 Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期五, 05 九月 2025 11:20:16 +0800
Subject: [PATCH] 设备保养、设备维修真机测试，bug修改
---
src/pages/equipmentManagement/upkeep/maintain.vue | 71 ++++++++++++++++++++---------------
1 files changed, 40 insertions(+), 31 deletions(-)
diff --git a/src/pages/equipmentManagement/upkeep/maintain.vue b/src/pages/equipmentManagement/upkeep/maintain.vue
index 33f9338..7ffb435 100644
--- a/src/pages/equipmentManagement/upkeep/maintain.vue
+++ b/src/pages/equipmentManagement/upkeep/maintain.vue
@@ -59,15 +59,13 @@
</u-popup>
<!-- 淇濆吇缁撴灉閫夋嫨鍣� -->
- <u-popup v-model="showResult" mode="bottom" :closeable="true">
- <view class="popup-title">閫夋嫨淇濆吇缁撴灉</view>
- <u-picker
- v-model="resultPickerValue"
- :columns="resultColumns"
- @confirm="onResultConfirm"
- @cancel="showResult = false"
- />
- </u-popup>
+ <up-action-sheet
+ :show="showResult"
+ :actions="resultColumns"
+ title="閫夋嫨淇濆吇缁撴灉"
+ @select="onResultConfirm"
+ @close="showResult = false"
+ />
</view>
</template>
@@ -105,8 +103,8 @@
// 淇濆吇缁撴灉閫夐」
const resultColumns = [
- { text: '瀹屽ソ', value: 1 },
- { text: '缁翠慨', value: 0 }
+ { name: '瀹屽ソ', value: 1 },
+ { name: '缁翠慨', value: 0 }
];
// 琛ㄥ崟楠岃瘉瑙勫垯
@@ -120,7 +118,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 +131,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 = '';
};
@@ -146,9 +144,25 @@
// 鎻愪氦琛ㄥ崟
const sendForm = async () => {
try {
- // 浣跨敤uview-plus鐨勮〃鍗曢獙璇佹柟寮�
- const valid = await formRef.value.validate();
- if (!valid) return;
+ // 鎵嬪姩楠岃瘉琛ㄥ崟
+ let isValid = true;
+ let errorMessage = '';
+ if (!form.value.maintenanceActuallyName) {
+ isValid = false;
+ errorMessage = '璇疯緭鍏ュ疄闄呬繚鍏讳汉';
+ } else if (!form.value.maintenanceActuallyTime) {
+ isValid = false;
+ errorMessage = '璇烽�夋嫨瀹為檯淇濆吇鏃ユ湡';
+ } else if (form.value.maintenanceResult === undefined) {
+ isValid = false;
+ errorMessage = '璇烽�夋嫨淇濆吇缁撴灉';
+ }
+
+ if (!isValid) {
+ showToast(errorMessage);
+ return;
+ }
+
// 楠岃瘉閫氳繃
submitFormData();
} catch (e) {
@@ -170,11 +184,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 +203,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 +222,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;
};
@@ -223,10 +232,9 @@
};
// 纭淇濆吇缁撴灉閫夋嫨
-const onResultConfirm = ({ selectedIndex, selectedValue, selectedLabel }) => {
- form.value.maintenanceResult = selectedValue;
- maintenanceResultText.value = selectedLabel;
- resultPickerValue.value = selectedValue;
+const onResultConfirm = (selected) => {
+ form.value.maintenanceResult = selected.value;
+ maintenanceResultText.value = selected.name;
showResult.value = false;
};
@@ -235,7 +243,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()];
};
@@ -251,6 +259,7 @@
</script>
<style scoped lang="scss">
+@import '@/static/scss/form-common.scss';
.upkeep-maintain {
min-height: 100vh;
background: #f8f9fa;
--
Gitblit v1.9.3