From 752b14d2caa47ccceac328f79389fbf5e2e62ce4 Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期三, 24 九月 2025 15:18:39 +0800
Subject: [PATCH] 分析追溯
---
src/pages/equipmentManagement/repair/add.vue | 375 ++++++++++++++++++++++++++++++++---------------------
1 files changed, 227 insertions(+), 148 deletions(-)
diff --git a/src/pages/equipmentManagement/repair/add.vue b/src/pages/equipmentManagement/repair/add.vue
index 7b865c0..0940052 100644
--- a/src/pages/equipmentManagement/repair/add.vue
+++ b/src/pages/equipmentManagement/repair/add.vue
@@ -4,95 +4,100 @@
<PageHeader :title="operationType === 'edit' ? '缂栬緫鎶ヤ慨' : '鏂板鎶ヤ慨'" @back="goBack" />
<!-- 琛ㄥ崟鍐呭 -->
- <van-form @submit="sendForm" ref="formRef" label-width="110px" input-align="right" error-message-align="right" scroll-to-error scroll-to-error-position="center">
+ <u-form @submit="sendForm" ref="formRef" :rules="formRules" :model="form" label-width="110">
<!-- 鍩烘湰淇℃伅 -->
- <van-cell-group title="鍩烘湰淇℃伅" inset>
- <van-field
- v-model="deviceNameText"
- label="璁惧鍚嶇О"
- placeholder="璇烽�夋嫨璁惧鍚嶇О"
- :rules="formRules.deviceLedgerId"
- required
- readonly
- @click="showDevicePicker"
- clearable
- />
- <van-field
- v-model="form.deviceModel"
- label="瑙勬牸鍨嬪彿"
- placeholder="璇疯緭鍏ヨ鏍煎瀷鍙�"
- readonly
- clearable
- />
- <van-field
- v-model="form.repairTime"
- label="鎶ヤ慨鏃ユ湡"
- placeholder="璇烽�夋嫨鎶ヤ慨鏃ユ湡"
- :rules="formRules.repairTime"
- required
- readonly
- @click="showDatePicker"
- clearable
- />
- <van-field
- v-model="form.repairName"
- label="鎶ヤ慨浜�"
- placeholder="璇疯緭鍏ユ姤淇汉"
- :rules="formRules.repairName"
- required
- clearable
- />
- <van-field
- v-model="form.remark"
- label="鏁呴殰鐜拌薄"
- type="textarea"
- rows="3"
- placeholder="璇疯緭鍏ユ晠闅滅幇璞�"
- :rules="formRules.remark"
- required
- clearable
- maxlength="200"
- show-word-limit
- />
- </van-cell-group>
+ <u-cell-group title="鍩烘湰淇℃伅">
+ <u-form-item label="璁惧鍚嶇О" prop="deviceLedgerId" required border-bottom>
+ <u-input
+ v-model="deviceNameText"
+ placeholder="璇烽�夋嫨璁惧鍚嶇О"
+ @click="showDevicePicker"
+ clearable
+ readonly=""
+ />
+ <template #right>
+ <u-icon name="scan" @click="startScan" class="scan-icon" />
+ </template>
+ </u-form-item>
+ <u-form-item label="瑙勬牸鍨嬪彿" prop="deviceModel" border-bottom>
+ <u-input
+ v-model="form.deviceModel"
+ placeholder="璇疯緭鍏ヨ鏍煎瀷鍙�"
+ clearable
+ />
+ </u-form-item>
+ <u-form-item label="鎶ヤ慨鏃ユ湡" prop="repairTime" required border-bottom>
+ <u-input
+ v-model="form.repairTime"
+ placeholder="璇烽�夋嫨鎶ヤ慨鏃ユ湡"
+ readonly
+ @click="showDatePicker"
+ clearable
+ />
+ <template #right>
+ <u-icon name="arrow-right" @click="showDatePicker"></u-icon>
+ </template>
+ </u-form-item>
+ <u-form-item label="鎶ヤ慨浜�" prop="repairName" required border-bottom>
+ <u-input
+ v-model="form.repairName"
+ placeholder="璇疯緭鍏ユ姤淇汉"
+ clearable
+ />
+ </u-form-item>
+ <u-form-item label="鏁呴殰鐜拌薄" prop="remark" required border-bottom>
+ <u-textarea
+ v-model="form.remark"
+ rows="3"
+ placeholder="璇疯緭鍏ユ晠闅滅幇璞�"
+ clearable
+ count
+ maxlength="200"
+ />
+ </u-form-item>
+ </u-cell-group>
<!-- 鎻愪氦鎸夐挳 -->
<view class="footer-btns">
- <van-button class="cancel-btn" @click="goBack">鍙栨秷</van-button>
- <van-button class="save-btn" native-type="submit" form-type="submit" :loading="loading">淇濆瓨</van-button>
+ <u-button class="cancel-btn" @click="goBack">鍙栨秷</u-button>
+ <u-button class="save-btn" type="primary" @click="sendForm" :loading="loading">淇濆瓨</u-button>
</view>
- </van-form>
+ </u-form>
<!-- 璁惧閫夋嫨鍣� -->
- <van-popup v-model:show="showDevice" position="bottom">
- <van-picker
- :model-value="devicePickerValue"
- :columns="deviceColumns"
- @confirm="onDeviceConfirm"
- @cancel="showDevice = false"
- />
- </van-popup>
+ <up-action-sheet
+ :show="showDevice"
+ :actions="deviceActionList"
+ title="閫夋嫨璁惧鍚嶇О"
+ @select="onDeviceSelect"
+ @close="showDevice = false"
+ />
<!-- 鏃ユ湡閫夋嫨鍣� -->
- <van-popup v-model:show="showDate" position="bottom">
- <van-date-picker
- v-model="currentDate"
- title="閫夋嫨鏃ユ湡"
- @confirm="onDateConfirm"
- @cancel="showDate = false"
- />
- </van-popup>
+ <up-datetime-picker
+ :show="showDate"
+ v-model="pickerDateValue"
+ @confirm="onDateConfirm"
+ @cancel="showDate = false"
+ mode="date"
+ />
</view>
</template>
<script setup>
-import { ref, computed, onMounted } from 'vue';
+import { ref, computed, onMounted, onUnmounted } from 'vue';
import { onShow } from '@dcloudio/uni-app';
import PageHeader from '@/components/PageHeader.vue';
import { getDeviceLedger } from '@/api/equipmentManagement/ledger';
import { addRepair, editRepair, getRepairById } from '@/api/equipmentManagement/repair';
import dayjs from "dayjs";
-import { showToast } from 'vant';
+import { formatDateToYMD } from '@/utils/ruoyi';
+const showToast = (message) => {
+ uni.showToast({
+ title: message,
+ icon: 'none'
+ })
+}
defineOptions({
name: "璁惧鎶ヤ慨琛ㄥ崟",
@@ -103,13 +108,22 @@
const operationType = ref('add');
const loading = ref(false);
const showDevice = ref(false);
-const devicePickerValue = ref([]);
const showDate = ref(false);
-const currentDate = ref([new Date().getFullYear(), new Date().getMonth() + 1, new Date().getDate()]);
+const pickerDateValue = ref(Date.now());
// 璁惧閫夐」
const deviceOptions = ref([]);
const deviceNameText = ref('');
+const deviceActionList = computed(() => {
+ return deviceOptions.value.map(item => ({
+ name: item.deviceName,
+ value: item.id
+ }));
+});
+
+// 鎵爜鐩稿叧鐘舵��
+const isScanning = ref(false);
+const scanTimer = ref(null);
// 琛ㄥ崟楠岃瘉瑙勫垯
const formRules = {
@@ -126,14 +140,6 @@
repairTime: dayjs().format("YYYY-MM-DD"), // 鎶ヤ慨鏃ユ湡
repairName: undefined, // 鎶ヤ慨浜�
remark: undefined, // 鏁呴殰鐜拌薄
-});
-
-// 璁惧閫夋嫨鍣ㄥ垪
-const deviceColumns = computed(() => {
- return deviceOptions.value.map(item => ({
- text: item.deviceName,
- value: item.id
- }));
});
// 鍔犺浇璁惧鍒楄〃
@@ -164,7 +170,7 @@
if (code == 200) {
form.value.deviceLedgerId = data.deviceLedgerId;
form.value.deviceModel = data.deviceModel;
- form.value.repairTime = data.repairTime;
+ form.value.repairTime = dayjs(data.repairTime).format("YYYY-MM-DD");
form.value.repairName = data.repairName;
form.value.remark = data.remark;
// 璁剧疆璁惧鍚嶇О鏄剧ず
@@ -182,44 +188,144 @@
}
};
-// 娓呴櫎琛ㄥ崟鏍￠獙鐘舵��
-const clearValidate = () => {
- formRef.value?.clearValidate();
+// 鎵弿浜岀淮鐮佸姛鑳�
+const startScan = () => {
+ if (isScanning.value) {
+ showToast('姝ｅ湪鎵弿涓紝璇风◢鍊�...');
+ return;
+ }
+
+ // 璋冪敤uni-app鐨勬壂鐮丄PI
+ uni.scanCode({
+ scanType: ['qrCode', 'barCode'],
+ success: (res) => {
+ handleScanResult(res.result);
+ },
+ fail: (err) => {
+ console.error('鎵爜澶辫触:', err);
+ showToast('鎵爜澶辫触锛岃閲嶈瘯');
+ }
+ });
};
-// 閲嶇疆琛ㄥ崟鏁版嵁鍜屾牎楠岀姸鎬�
-const resetForm = () => {
- form.value = {
- deviceLedgerId: undefined,
- deviceModel: undefined,
- repairTime: dayjs().format("YYYY-MM-DD"),
- repairName: undefined,
- remark: undefined,
- };
- deviceNameText.value = '';
+// 澶勭悊鎵爜缁撴灉
+const handleScanResult = (scanResult) => {
+ if (!scanResult) {
+ showToast('鎵爜缁撴灉涓虹┖');
+ return;
+ }
+
+ isScanning.value = true;
+ showToast('鎵爜鎴愬姛');
+
+ // 3绉掑悗澶勭悊鎵爜缁撴灉
+ scanTimer.value = setTimeout(() => {
+ processScanResult(scanResult);
+ isScanning.value = false;
+ }, 100);
+};
+function getDeviceIdByRegExp(url) {
+ // 鍖归厤deviceId=鍚庨潰鐨勬暟瀛�
+ const reg = /deviceId=(\d+)/;
+ const match = url.match(reg);
+ // 濡傛灉鍖归厤鍒扮粨鏋滐紝杩斿洖鏁板瓧绫诲瀷锛屽惁鍒欒繑鍥瀗ull
+ return match ? Number(match[1]) : null;
+}
+
+// 澶勭悊鎵爜缁撴灉骞跺尮閰嶈澶�
+const processScanResult = (scanResult) => {
+ const deviceId = getDeviceIdByRegExp(scanResult);
+ const matchedDevice = deviceOptions.value.find(item => item.id == deviceId);
+
+ if (matchedDevice) {
+ // 鎵惧埌鍖归厤鐨勮澶囷紝鑷姩濉厖
+ form.value.deviceLedgerId = matchedDevice.id;
+ deviceNameText.value = matchedDevice.deviceName;
+ form.value.deviceModel = matchedDevice.deviceModel;
+ showToast('璁惧淇℃伅宸茶嚜鍔ㄥ～鍏�');
+ } else {
+ // 鏈壘鍒板尮閰嶇殑璁惧
+ showToast('鏈壘鍒板尮閰嶇殑璁惧锛岃鎵嬪姩閫夋嫨');
+ }
};
-const resetFormAndValidate = () => {
- resetForm();
- clearValidate();
+// 鏄剧ず璁惧閫夋嫨鍣�
+const showDevicePicker = () => {
+ showDevice.value = true;
};
+
+// 纭璁惧閫夋嫨
+const onDeviceSelect = (e) => {
+ form.value.deviceLedgerId = e.value;
+ setDeviceModel(e.value);
+ showDevice.value = false;
+};
+
+// 鏄剧ず鏃ユ湡閫夋嫨鍣�
+const showDatePicker = () => {
+ showDate.value = true;
+};
+
+// 纭鏃ユ湡閫夋嫨
+const onDateConfirm = (e) => {
+ form.value.repairTime = formatDateToYMD(e.value);
+ pickerDateValue.value = dayjs(e.value).format("YYYY-MM-DD");
+ showDate.value = false;
+};
+
+onShow(() => {
+ // 椤甸潰鏄剧ず鏃惰幏鍙栧弬鏁�
+ getPageParams();
+});
+
+onMounted(() => {
+ // 椤甸潰鍔犺浇鏃惰幏鍙栬澶囧垪琛ㄥ拰鍙傛暟
+ loadDeviceName();
+ getPageParams();
+});
+
+// 缁勪欢鍗歌浇鏃舵竻鐞嗗畾鏃跺櫒
+onUnmounted(() => {
+ if (scanTimer.value) {
+ clearTimeout(scanTimer.value);
+ }
+});
// 鎻愪氦琛ㄥ崟
const sendForm = async () => {
try {
// 鎵嬪姩楠岃瘉琛ㄥ崟
- await formRef.value?.validate();
-
+ let isValid = true;
+ let errorMessage = '';
+ if (!form.value.deviceLedgerId) {
+ isValid = false;
+ errorMessage = '璇烽�夋嫨璁惧鍚嶇О';
+ } else if (!form.value.repairTime || form.value.repairTime.trim() === '') {
+ isValid = false;
+ errorMessage = '璇烽�夋嫨鎶ヤ慨鏃ユ湡';
+ } else if (!form.value.repairName || form.value.repairName.trim() === '') {
+ isValid = false;
+ errorMessage = '璇疯緭鍏ユ姤淇汉';
+ } else if (!form.value.remark || form.value.remark.trim() === '') {
+ isValid = false;
+ errorMessage = '璇疯緭鍏ユ晠闅滅幇璞�';
+ }
+
+ if (!isValid) {
+ showToast(errorMessage);
+ return;
+ }
+
loading.value = true;
const id = getPageId();
-
+
// 鍑嗗鎻愪氦鏁版嵁
const submitData = { ...form.value };
-
+
const { code } = id
? await editRepair({ id: id, ...submitData })
: await addRepair(submitData);
-
+
if (code == 200) {
showToast(`${id ? "缂栬緫" : "鏂板"}鎶ヤ慨鎴愬姛`);
setTimeout(() => {
@@ -236,19 +342,21 @@
// 杩斿洖涓婁竴椤�
const goBack = () => {
+ uni.removeStorageSync('repairId');
uni.navigateBack();
};
// 鑾峰彇椤甸潰鍙傛暟
const getPageParams = () => {
- const pages = getCurrentPages();
- const currentPage = pages[pages.length - 1];
- const options = currentPage.options;
+ // 浣跨敤uni.getStorageSync鑾峰彇id
+ const id = uni.getStorageSync('repairId');
// 鏍规嵁鏄惁鏈塱d鍙傛暟鏉ュ垽鏂槸鏂板杩樻槸缂栬緫
- if (options.id) {
+ if (id) {
// 缂栬緫妯″紡锛岃幏鍙栬鎯�
- loadForm(options.id);
+ loadForm(id);
+ // 鍙�夛細鑾峰彇鍚庢竻闄ゅ瓨鍌ㄧ殑id锛岄伩鍏嶅奖鍝嶅悗缁搷浣�
+ uni.removeStorageSync('repairId');
} else {
// 鏂板妯″紡
loadForm();
@@ -257,50 +365,14 @@
// 鑾峰彇椤甸潰ID
const getPageId = () => {
- const pages = getCurrentPages();
- const currentPage = pages[pages.length - 1];
- const options = currentPage.options;
- return options.id;
+ // 浣跨敤uni.getStorageSync鑾峰彇id
+ const id = uni.getStorageSync('repairId');
+ return id;
};
-
-// 鏄剧ず璁惧閫夋嫨鍣�
-const showDevicePicker = () => {
- showDevice.value = true;
-};
-
-// 纭璁惧閫夋嫨
-const onDeviceConfirm = ({ selectedValues, selectedOptions }) => {
- form.value.deviceLedgerId = selectedOptions[0].value;
- devicePickerValue.value = selectedValues;
- showDevice.value = false;
- setDeviceModel(selectedOptions[0].value);
-};
-
-// 鏄剧ず鏃ユ湡閫夋嫨鍣�
-const showDatePicker = () => {
- showDate.value = true;
-};
-
-// 纭鏃ユ湡閫夋嫨
-const onDateConfirm = ({ selectedValues }) => {
- form.value.repairTime = selectedValues.join('-');
- currentDate.value = selectedValues;
- showDate.value = false;
-};
-
-onShow(() => {
- // 椤甸潰鏄剧ず鏃惰幏鍙栧弬鏁�
- getPageParams();
-});
-
-onMounted(() => {
- // 椤甸潰鍔犺浇鏃惰幏鍙栬澶囧垪琛ㄥ拰鍙傛暟
- loadDeviceName();
- getPageParams();
-});
</script>
<style scoped lang="scss">
+@import '@/static/scss/form-common.scss';
.repair-add {
min-height: 100vh;
background: #f8f9fa;
@@ -353,4 +425,11 @@
font-size: 12px;
color: #888;
}
+
+.scan-icon {
+ color: #1989fa;
+ font-size: 18px;
+ margin-left: 8px;
+ cursor: pointer;
+}
</style>
\ No newline at end of file
--
Gitblit v1.9.3