From c0ac58d8d1e836787cc73eca9bd02411229836fb Mon Sep 17 00:00:00 2001
From: spring <2396852758@qq.com>
Date: 星期三, 01 四月 2026 17:00:46 +0800
Subject: [PATCH] fix: 备件管理可以跟设备维修、设备保养做联动
---
src/pages/equipmentManagement/upkeep/maintain.vue | 170 ++++++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 152 insertions(+), 18 deletions(-)
diff --git a/src/pages/equipmentManagement/upkeep/maintain.vue b/src/pages/equipmentManagement/upkeep/maintain.vue
index d3b8549..b11a585 100644
--- a/src/pages/equipmentManagement/upkeep/maintain.vue
+++ b/src/pages/equipmentManagement/upkeep/maintain.vue
@@ -79,6 +79,25 @@
@click="showSparePartPicker" />
</template>
</u-form-item>
+
+ <u-form-item v-if="selectedSpareParts.length"
+ label="棰嗙敤鏁伴噺"
+ border-bottom>
+ <view class="spare-qty-list">
+ <view v-for="item in selectedSpareParts"
+ :key="String(item.id || item.value)"
+ class="spare-qty-row">
+ <view class="spare-qty-name">
+ <text class="spare-name">{{ item.name }}</text>
+ <text v-if="item.quantity !== null && item.quantity !== undefined"
+ class="spare-stock">锛堝簱瀛橈細{{ item.quantity }}锛�</text>
+ </view>
+ <up-number-box v-model="sparePartQtyMap[item.id || item.value]"
+ :min="1"
+ :max="item.quantity !== null && item.quantity !== undefined ? Number(item.quantity) : undefined" />
+ </view>
+ </view>
+ </u-form-item>
<!-- 涓婁紶闄勪欢 -->
<u-form-item v-if="form.status == '1'"
label="淇濆吇闄勪欢"
@@ -214,13 +233,13 @@
</template>
<script setup>
- import { ref, onMounted } from "vue";
+ import { ref, onMounted, reactive } from "vue";
import { onShow } from "@dcloudio/uni-app";
import PageHeader from "@/components/PageHeader.vue";
import {
addMaintenance,
- getSparePartsOptions,
} from "@/api/equipmentManagement/upkeep";
+ import { getSparePartsList } from "@/api/equipmentManagement/spareParts";
import useUserStore from "@/store/modules/user";
import dayjs from "dayjs";
import { formatDateToYMD } from "@/utils/ruoyi";
@@ -255,6 +274,8 @@
const maintenancestatusText = ref("");
const selectedSpareParts = ref([]);
const tempSelectedSpareParts = ref([]);
+ const sparePartQtyMap = reactive({});
+ const sparePartsQtyRaw = ref("");
// 鏂囦欢涓婁紶鐩稿叧
const uploadFiles = ref([]);
@@ -316,6 +337,8 @@
maintenancestatusText.value = "";
selectedSpareParts.value = [];
tempSelectedSpareParts.value = [];
+ Object.keys(sparePartQtyMap).forEach((k) => delete sparePartQtyMap[k]);
+ sparePartsQtyRaw.value = "";
};
const resetFormAndValidate = () => {
@@ -382,13 +405,34 @@
loading.value = false;
return;
}
- // 鍑嗗鎻愪氦鏁版嵁锛宮aintenanceActuallyTime 鍔犱笂褰撳墠鏃跺垎绉�
+ // 棰嗙敤鏁伴噺鏍￠獙
+ const spareIds = Array.isArray(form.value.sparePartsIds) ? form.value.sparePartsIds : [];
+ if (spareIds.length > 0) {
+ for (const partId of spareIds) {
+ const qty = Number(sparePartQtyMap?.[partId]);
+ if (!Number.isFinite(qty) || qty <= 0) {
+ showToast("璇峰～鍐欏浠堕鐢ㄦ暟閲�");
+ loading.value = false;
+ return;
+ }
+ const part = sparePartOptions.value.find((p) => String(p.id || p.value) === String(partId));
+ const stock = part?.quantity;
+ if (stock !== null && stock !== undefined && Number.isFinite(Number(stock))) {
+ if (qty > Number(stock)) {
+ showToast(`澶囦欢銆�${part?.name || ""}銆嶉鐢ㄦ暟閲忎笉鑳借秴杩囧簱瀛橈紙${stock}锛塦);
+ loading.value = false;
+ return;
+ }
+ }
+ }
+ }
+
const submitData = {
...form.value,
imagesFile: form.value.status == "1" ? uploadFiles.value : [],
- sparePartsIds: form.value.sparePartsIds
- ? form.value.sparePartsIds.join(",")
- : "",
+ sparePartsIds: spareIds.length ? spareIds.join(",") : "",
+ sparePartsQty: spareIds.length ? spareIds.map((pid) => sparePartQtyMap?.[pid] ?? 1).join(",") : "",
+ sparePartsUseList: spareIds.length ? spareIds.map((pid) => ({ id: pid, quantity: sparePartQtyMap?.[pid] ?? 1 })) : [],
};
const { code } = await addMaintenance({ id: id, ...submitData });
@@ -430,7 +474,8 @@
return null;
}
dataform.value = JSON.parse(dataStr);
- fetchSparePartOptions(dataform.value.deviceLedgerId);
+ sparePartsQtyRaw.value = dataform.value?.sparePartsQty || "";
+ fetchSparePartOptions();
return JSON.parse(dataStr);
} catch (e) {
console.error("瑙ｆ瀽璁惧鏁版嵁澶辫触:", e);
@@ -467,6 +512,14 @@
// 鏄剧ず璁惧澶囦欢閫夋嫨鍣�
const showSparePartPicker = () => {
tempSelectedSpareParts.value = [...selectedSpareParts.value];
+ tempSelectedSpareParts.value.forEach((p) => {
+ const pid = p?.id ?? p?.value;
+ if (pid !== null && pid !== undefined) {
+ if (!Number.isFinite(Number(sparePartQtyMap[pid])) || Number(sparePartQtyMap[pid]) <= 0) {
+ sparePartQtyMap[pid] = 1;
+ }
+ }
+ });
showSparePart.value = true;
};
@@ -485,22 +538,36 @@
);
if (index > -1) {
tempSelectedSpareParts.value.splice(index, 1);
+ delete sparePartQtyMap[itemId];
} else {
tempSelectedSpareParts.value.push(item);
+ if (!Number.isFinite(Number(sparePartQtyMap[itemId])) || Number(sparePartQtyMap[itemId]) <= 0) {
+ sparePartQtyMap[itemId] = 1;
+ }
}
};
// 纭澶囦欢閫夋嫨
const confirmSparePartSelection = () => {
selectedSpareParts.value = [...tempSelectedSpareParts.value];
- form.value.sparePartsIds = selectedSpareParts.value.map(item => item.id);
+ form.value.sparePartsIds = selectedSpareParts.value.map(item => item.id || item.value);
+ selectedSpareParts.value.forEach((p) => {
+ const pid = p?.id ?? p?.value;
+ if (pid !== null && pid !== undefined) {
+ if (!Number.isFinite(Number(sparePartQtyMap[pid])) || Number(sparePartQtyMap[pid]) <= 0) {
+ sparePartQtyMap[pid] = 1;
+ }
+ }
+ });
showSparePart.value = false;
};
// 绉婚櫎宸查�夊浠�
const removeSparePart = index => {
- selectedSpareParts.value.splice(index, 1);
- form.value.sparePartsIds = selectedSpareParts.value.map(item => item.id);
+ const removed = selectedSpareParts.value.splice(index, 1)[0];
+ form.value.sparePartsIds = selectedSpareParts.value.map(item => item.id || item.value);
+ const rid = removed?.id ?? removed?.value;
+ if (rid !== null && rid !== undefined) delete sparePartQtyMap[rid];
};
const sparePartsIds = ref([]);
// 鍒濆鍖栬〃鍗曟暟鎹�
@@ -589,21 +656,22 @@
// 鍏堣幏鍙栧浠堕�夐」锛屽啀鍒濆鍖栬〃鍗�
const pageId = getPageId();
if (pageId) {
- await fetchSparePartOptions(pageId);
+ await fetchSparePartOptions();
}
// 椤甸潰鏄剧ず鏃跺垵濮嬪寲琛ㄥ崟
});
const sparePartOptions = ref([]);
- const fetchSparePartOptions = deviceLedgerId => {
+ // 澶囦欢鍒楄〃鎺ュ彛瀵归綈缁翠慨椤�/PC锛�/spareParts/listPage 鈫� res.data.records
+ const fetchSparePartOptions = () => {
return new Promise((resolve, reject) => {
- getSparePartsOptions({ deviceLedgerId: deviceLedgerId })
+ getSparePartsList({ current: 1, size: 1000 })
.then(res => {
if (res.code == 200) {
- sparePartOptions.value = res.data || [];
+ sparePartOptions.value = res?.data?.records || [];
const idArray =
typeof sparePartsIds.value === "string"
? sparePartsIds.value.split(",")
- : sparePartsIds.value;
+ : (Array.isArray(sparePartsIds.value) ? sparePartsIds.value : []);
if (idArray.length > 0) {
selectedSpareParts.value = sparePartOptions.value
@@ -617,11 +685,37 @@
name: option.name,
code: option.code,
value: option.id || option.value,
+ quantity: option.quantity,
}));
- // 璁剧疆澶囦欢IDs
- form.value.sparePartsIds = idArray.join(",");
+ // 璁剧疆澶囦欢IDs锛堜繚鎸佹暟缁勶紝鎻愪氦鏃跺啀 join锛�
+ form.value.sparePartsIds = idArray.map((v) => {
+ const n = Number(String(v).trim());
+ return Number.isFinite(n) ? n : String(v).trim();
+ });
+
+ // 鍥炴樉棰嗙敤鏁伴噺锛堣嫢鏈� sparePartsQty锛�
+ if (typeof sparePartsQtyRaw.value === "string" && sparePartsQtyRaw.value.trim()) {
+ const qtyArr = sparePartsQtyRaw.value.split(",").map((s) => Number(String(s).trim()));
+ selectedSpareParts.value.forEach((p, idx) => {
+ const pid = p?.id ?? p?.value;
+ const q = qtyArr[idx];
+ if (pid !== null && pid !== undefined && Number.isFinite(q) && q > 0) {
+ sparePartQtyMap[pid] = q;
+ }
+ });
+ }
+
+ // 榛樿鏁伴噺鍏滃簳
+ selectedSpareParts.value.forEach((p) => {
+ const pid = p?.id ?? p?.value;
+ if (pid !== null && pid !== undefined) {
+ if (!Number.isFinite(Number(sparePartQtyMap[pid])) || Number(sparePartQtyMap[pid]) <= 0) {
+ sparePartQtyMap[pid] = 1;
+ }
+ }
+ });
}
- resolve(res.data);
+ resolve(res?.data?.records || []);
} else {
resolve([]);
}
@@ -1075,6 +1169,46 @@
font-size: 14px;
}
+ /* 棰嗙敤鏁伴噺鏍峰紡 */
+ .spare-qty-list {
+ width: 100%;
+ display: flex;
+ flex-direction: column;
+ gap: 12px;
+ padding: 4px 0;
+ }
+
+ .spare-qty-row {
+ width: 100%;
+ display: flex;
+ align-items: center;
+ justify-content: space-between;
+ gap: 12px;
+ }
+
+ .spare-qty-name {
+ flex: 1;
+ min-width: 0;
+ display: flex;
+ align-items: center;
+ flex-wrap: wrap;
+ gap: 6px;
+ }
+
+ .spare-name {
+ max-width: 220px;
+ overflow: hidden;
+ text-overflow: ellipsis;
+ white-space: nowrap;
+ color: #303133;
+ font-size: 14px;
+ }
+
+ .spare-stock {
+ color: #909399;
+ font-size: 12px;
+ }
+
/* 澶囦欢閫夋嫨寮圭獥鏍峰紡 */
.spare-part-popup {
padding: 16px;
--
Gitblit v1.9.3