From b12b91b24733d0104474e956f20898df8a5ffd7a Mon Sep 17 00:00:00 2001
From: spring <2396852758@qq.com>
Date: 星期六, 14 三月 2026 11:22:33 +0800
Subject: [PATCH] fix: 设备保修设备名称可选
---
src/pages/equipmentManagement/smartDispatch/index.vue | 2
src/pages/equipmentManagement/repair/maintain.vue | 8 +-
src/pages/equipmentManagement/repair/index.vue | 4
src/pages/equipmentManagement/repair/add.vue | 188 +++++++++++++++++++---------------------------
4 files changed, 86 insertions(+), 116 deletions(-)
diff --git a/src/pages/equipmentManagement/repair/add.vue b/src/pages/equipmentManagement/repair/add.vue
index 71de940..e734cd5 100644
--- a/src/pages/equipmentManagement/repair/add.vue
+++ b/src/pages/equipmentManagement/repair/add.vue
@@ -14,17 +14,22 @@
<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>
+ border-bottom
+ class="device-name-form-item">
+ <view class="device-picker-wrap">
+ <picker mode="selector"
+ class="device-picker-full"
+ :range="deviceOptions"
+ range-key="deviceName"
+ :value="deviceIndex"
+ @change="onDevicePickerChange">
+ <view class="picker-input-row">
+ <text class="picker-input-text"
+ :class="{ placeholder: !deviceNameText }">{{ deviceNameText || "璇烽�夋嫨璁惧鍚嶇О" }}</text>
+ <view class="picker-input-arrow"><u-icon name="arrow-right" /></view>
+ </view>
+ </picker>
+ </view>
</u-form-item>
<u-form-item label="瑙勬牸鍨嬪彿"
prop="deviceModel"
@@ -48,7 +53,7 @@
</template>
</u-form-item>
<u-form-item label="鎶ヤ慨鐘舵��"
- prop="repairTime"
+ prop="status"
required
border-bottom>
<u-input v-model="repairStatusText"
@@ -91,12 +96,6 @@
:loading="loading">淇濆瓨</u-button>
</view>
</u-form>
- <!-- 璁惧閫夋嫨鍣� -->
- <up-action-sheet :show="showDevice"
- :actions="deviceActionList"
- title="閫夋嫨璁惧鍚嶇О"
- @select="onDeviceSelect"
- @close="showDevice = false" />
<!-- 鏃ユ湡閫夋嫨鍣� -->
<up-datetime-picker :show="showDate"
v-model="pickerDateValue"
@@ -107,7 +106,7 @@
</template>
<script setup>
- import { ref, computed, onMounted, onUnmounted } from "vue";
+ import { ref, computed, onMounted } from "vue";
import { onShow } from "@dcloudio/uni-app";
import PageHeader from "@/components/PageHeader.vue";
import { getDeviceLedger } from "@/api/equipmentManagement/ledger";
@@ -133,23 +132,18 @@
const formRef = ref(null);
const operationType = ref("add");
const loading = ref(false);
- const showDevice = ref(false);
const showDate = ref(false);
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 deviceIndex = computed(() => {
+ const id = form.value.deviceLedgerId;
+ if (id == null || !deviceOptions.value.length) return 0;
+ const idx = deviceOptions.value.findIndex(item => item.id === id || item.id == id);
+ return idx >= 0 ? idx : 0;
});
-
- // 鎵爜鐩稿叧鐘舵��
- const isScanning = ref(false);
- const scanTimer = ref(null);
// 琛ㄥ崟楠岃瘉瑙勫垯
const formRules = {
@@ -158,6 +152,9 @@
],
repairTime: [
{ required: true, trigger: "change", message: "璇烽�夋嫨鎶ヤ慨鏃ユ湡" },
+ ],
+ status: [
+ { required: true, trigger: "change", message: "璇烽�夋嫨鎶ヤ慨鐘舵��" },
],
repairName: [{ required: true, trigger: "blur", message: "璇疯緭鍏ユ姤淇汉" }],
remark: [{ required: true, trigger: "blur", message: "璇疯緭鍏ユ晠闅滅幇璞�" }],
@@ -168,6 +165,7 @@
deviceLedgerId: undefined, // 璁惧ID
deviceModel: undefined, // 瑙勬牸鍨嬪彿
repairTime: dayjs().format("YYYY-MM-DD"), // 鎶ヤ慨鏃ユ湡
+ status: undefined, // 鎶ヤ慨鐘舵��
repairName: undefined, // 鎶ヤ慨浜�
remark: undefined, // 鏁呴殰鐜拌薄
});
@@ -220,6 +218,7 @@
form.value.deviceLedgerId = data.deviceLedgerId;
form.value.deviceModel = data.deviceModel;
form.value.repairTime = dayjs(data.repairTime).format("YYYY-MM-DD");
+ form.value.status = data.status;
form.value.repairName = data.repairName;
form.value.remark = data.remark;
repairStatusText.value =
@@ -242,77 +241,14 @@
}
};
- // 鎵弿浜岀淮鐮佸姛鑳�
- const startScan = () => {
- if (isScanning.value) {
- showToast("姝ｅ湪鎵弿涓紝璇风◢鍊�...");
- return;
+ // 涓嬫媺妗嗛�夋嫨璁惧
+ const onDevicePickerChange = e => {
+ const index = Number(e.detail?.value ?? 0);
+ const item = deviceOptions.value[index];
+ if (item) {
+ form.value.deviceLedgerId = item.id;
+ setDeviceModel(item.id);
}
-
- // 璋冪敤uni-app鐨勬壂鐮丄PI
- uni.scanCode({
- scanType: ["qrCode", "barCode"],
- success: res => {
- handleScanResult(res.result);
- },
- fail: err => {
- console.error("鎵爜澶辫触:", err);
- showToast("鎵爜澶辫触锛岃閲嶈瘯");
- },
- });
- };
-
- // 澶勭悊鎵爜缁撴灉
- 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 showDevicePicker = () => {
- showDevice.value = true;
- };
-
- // 纭璁惧閫夋嫨
- const onDeviceSelect = e => {
- form.value.deviceLedgerId = e.value;
- setDeviceModel(e.value);
- showDevice.value = false;
};
// 鏄剧ず鏃ユ湡閫夋嫨鍣�
@@ -339,11 +275,6 @@
});
// 缁勪欢鍗歌浇鏃舵竻鐞嗗畾鏃跺櫒
- onUnmounted(() => {
- if (scanTimer.value) {
- clearTimeout(scanTimer.value);
- }
- });
// 鎻愪氦琛ㄥ崟
const sendForm = async () => {
@@ -357,6 +288,9 @@
} else if (!form.value.repairTime || form.value.repairTime.trim() === "") {
isValid = false;
errorMessage = "璇烽�夋嫨鎶ヤ慨鏃ユ湡";
+ } else if (form.value.status === undefined || form.value.status === null || form.value.status === "") {
+ isValid = false;
+ errorMessage = "璇烽�夋嫨鎶ヤ慨鐘舵��";
} else if (!form.value.repairName || form.value.repairName.trim() === "") {
isValid = false;
errorMessage = "璇疯緭鍏ユ姤淇汉";
@@ -480,10 +414,46 @@
color: #888;
}
- .scan-icon {
- color: #1989fa;
- font-size: 18px;
- margin-left: 8px;
- cursor: pointer;
+ :deep(.device-name-form-item .u-form-item__content) {
+ justify-content: flex-start !important;
+ }
+
+ .device-picker-wrap {
+ width: 100%;
+ flex: 1;
+ min-width: 0;
+ }
+
+ .device-picker-full {
+ display: block;
+ width: 100%;
+ }
+
+ .picker-input-row {
+ display: flex;
+ align-items: center;
+ justify-content: space-between;
+ width: 100%;
+ min-height: 36px;
+ padding: 0;
+ }
+
+ .picker-input-text {
+ flex: 1;
+ min-width: 0;
+ font-size: 15px;
+ color: #333;
+ line-height: 36px;
+ margin-right: 8px;
+ }
+
+ .picker-input-arrow {
+ flex-shrink: 0;
+ display: flex;
+ align-items: center;
+ }
+
+ .picker-input-text.placeholder {
+ color: #c0c4cc;
}
</style>
\ No newline at end of file
diff --git a/src/pages/equipmentManagement/repair/index.vue b/src/pages/equipmentManagement/repair/index.vue
index 49b2374..a9bfe4b 100644
--- a/src/pages/equipmentManagement/repair/index.vue
+++ b/src/pages/equipmentManagement/repair/index.vue
@@ -49,7 +49,7 @@
<text class="detail-value">{{ formatDate(item.repairTime) || '-' }}</text>
</view>
<view class="detail-row">
- <text class="detail-label">鎶ヤ慨浜�</text>
+ <text class="detail-label">缁翠慨浜�</text>
<text class="detail-value">{{ item.repairName || '-' }}</text>
</view>
<view class="detail-row">
@@ -57,7 +57,7 @@
<text class="detail-value">{{ item.remark || '-' }}</text>
</view>
<view class="detail-row">
- <text class="detail-label">缁翠慨浜�</text>
+ <text class="detail-label">鎶ヤ慨浜�</text>
<text class="detail-value">{{ item.maintenanceName || '-' }}</text>
</view>
<view class="detail-row">
diff --git a/src/pages/equipmentManagement/repair/maintain.vue b/src/pages/equipmentManagement/repair/maintain.vue
index 46b45aa..67190f5 100644
--- a/src/pages/equipmentManagement/repair/maintain.vue
+++ b/src/pages/equipmentManagement/repair/maintain.vue
@@ -12,10 +12,10 @@
<u-cell-group title="缁翠慨淇℃伅"
inset>
<u-form-item prop="maintenanceName"
- label="缁翠慨浜�"
+ label="鎶ヤ慨浜�"
required>
<u-input v-model="form.maintenanceName"
- placeholder="璇疯緭鍏ョ淮淇汉"
+ placeholder="璇疯緭鍏ユ姤淇汉"
clearable />
</u-form-item>
<u-form-item prop="maintenanceResult"
@@ -101,7 +101,7 @@
// 琛ㄥ崟楠岃瘉瑙勫垯
const formRules = {
maintenanceName: [
- { required: true, trigger: "blur", message: "璇疯緭鍏ョ淮淇汉" },
+ { required: true, trigger: "blur", message: "璇疯緭鍏ユ姤淇汉" },
],
maintenanceResult: [
{ required: true, trigger: "blur", message: "璇疯緭鍏ョ淮淇粨鏋�" },
@@ -223,7 +223,7 @@
// 鍒濆鍖栬〃鍗曟暟鎹�
const initForm = () => {
form.value.status = "1";
- // 璁剧疆缁翠慨浜轰负褰撳墠鐢ㄦ埛鏄电О
+ // 璁剧疆鎶ヤ慨浜轰负褰撳墠鐢ㄦ埛鏄电О
form.value.maintenanceName = userStore.nickName || "";
// 璁剧疆褰撳墠鏃ユ湡锛堝彧鍖呭惈骞存湀鏃ワ級
form.value.maintenanceTime = dayjs().format("YYYY-MM-DD HH:mm:ss");
diff --git a/src/pages/equipmentManagement/smartDispatch/index.vue b/src/pages/equipmentManagement/smartDispatch/index.vue
index d673103..4124ecd 100644
--- a/src/pages/equipmentManagement/smartDispatch/index.vue
+++ b/src/pages/equipmentManagement/smartDispatch/index.vue
@@ -68,7 +68,7 @@
<text class="detail-value">{{ task.faultDescription }}</text>
</view>
<view class="detail-row">
- <text class="detail-label">鎶ヤ慨浜�</text>
+ <text class="detail-label">缁翠慨浜�</text>
<text class="detail-value">{{ task.reporterName }}</text>
</view>
<view class="detail-row">
--
Gitblit v1.9.3