From a43becd99dec4696ed629b9f549819b7d788a022 Mon Sep 17 00:00:00 2001
From: maven <2163098428@qq.com>
Date: 星期六, 11 十月 2025 13:38:27 +0800
Subject: [PATCH] yys 修改是否为耗材字段名称
---
src/views/equipment/management/index.vue | 22 +++++++++-------------
1 files changed, 9 insertions(+), 13 deletions(-)
diff --git a/src/views/equipment/management/index.vue b/src/views/equipment/management/index.vue
index 26930d9..bd63979 100644
--- a/src/views/equipment/management/index.vue
+++ b/src/views/equipment/management/index.vue
@@ -142,7 +142,8 @@
:title="dialogTableTitle"
:table-data="dialogTableData"
:columns="dialogTableColumns"
- width="60%"
+ width="70%"
+ height="500px"
/>
</el-card>
</div>
@@ -196,7 +197,7 @@
};
// 鍝嶅簲寮忕姸鎬佺鐞� - 浣跨敤瑙ｆ瀯鍜岄粯璁ゅ��
-const initFormState = () => ({ consumables: false });
+const initFormState = () => ({ isConsumables: false });
const state = reactive({
form: initFormState(),
@@ -253,8 +254,8 @@
columns: [
{ prop: "equipmentNo", label: "璁惧缂栧彿", minWidth: 100 },
{ prop: "equipmentName", label: "璁惧鍚嶇О", minWidth: 100 },
- { prop: "consumables", label: "鑰楁潗",
- formatter: (row) => (row.consumables ? "鏄�" : "鍚�"), minWidth: 100 },
+ { prop: "isConsumables", label: "鑰楁潗",
+ formatter: (row) => (row.isConsumables ? "鏄�" : "鍚�"), minWidth: 100 },
{ prop: "quantity", label: "鎬绘暟閲�", minWidth: 100 },
{ prop: "usedNo", label: "宸蹭娇鐢ㄦ暟閲�", minWidth: 100 },
{ prop: "specification", label: "瑙勬牸鍨嬪彿", minWidth: 100 },
@@ -386,7 +387,7 @@
const resetState = () => {
form.value = {
- consumables: false,
+ isConsumables: false,
};
addOrEdit.value = "add";
loading.value = true;
@@ -411,7 +412,7 @@
const handleAdd = () => {
addOrEdit.value = "add";
form.value = {
- consumables: false,
+ isConsumables: false,
};
title.value = `鏂板${currentTabConfig.value.label}`;
// 閫氱敤鐨�
@@ -461,13 +462,10 @@
// 璋冪敤璇︽儏鎺ュ彛鑾峰彇鏁版嵁
const { data, code } = await getUsageDetailList(row.id);
-
if (code === 200 && data) {
- console.log('璁惧鎿嶄綔璁板綍:', data);
-
// 澶勭悊鏁扮粍鏁版嵁锛岀洿鎺ユ樉绀烘搷浣滆褰曞垪琛�
- if (Array.isArray(data.records)) {
- dialogTableData.value = data.records;
+ if (Array.isArray(data)) {
+ dialogTableData.value = data;
dialogTableColumns.value = [
{ prop: 'equipmentNo', label: '璁惧缂栧彿', minWidth: 100 },
{ prop: 'equipmentName', label: '璁惧鍚嶇О', minWidth: 120 },
@@ -485,7 +483,6 @@
];
} else {
ElMessage.warning('鏆傛棤鎿嶄綔璁板綍');
- dialogTableVisible.value = false;
}
} else {
ElMessage.error('鑾峰彇璇︽儏鏁版嵁澶辫触');
@@ -550,7 +547,6 @@
if (formData.equipmentStatus === EQUIPMENT_STATUS.RETURNED) {
ElMessage.success("璁惧宸插畬鍏ㄥ綊杩�");
} else if (formData.equipmentStatus === EQUIPMENT_STATUS.PARTIAL_RETURN) {
- ElMessage.success("璁惧閮ㄥ垎褰掕繕鎴愬姛");
} else if (formData.equipmentStatus === EQUIPMENT_STATUS.USING) {
ElMessage.success("璁惧棰嗙敤鎴愬姛");
} else {
--
Gitblit v1.9.3