From 5da536668e047dbaefbb79731ab2cacfdf70dc56 Mon Sep 17 00:00:00 2001 From: zhang_12370 <z2864490065@outlook.com> Date: 星期二, 22 七月 2025 17:36:38 +0800 Subject: [PATCH] 1、提交配煤计算器 解除煤种限制 2、增加销售出库的导出功能 3、库存管理正式库的导出功能 4、文档管理优化 5、优化设备管理模块 --- src/views/equipment/management/index.vue | 14 ++++++++++---- 1 files changed, 10 insertions(+), 4 deletions(-) diff --git a/src/views/equipment/management/index.vue b/src/views/equipment/management/index.vue index 97ca889..0654e82 100644 --- a/src/views/equipment/management/index.vue +++ b/src/views/equipment/management/index.vue @@ -184,6 +184,8 @@ columns: [ { prop: "equipmentNo", label: "璁惧缂栧彿", minWidth: 100 }, { prop: "equipmentName", label: "璁惧鍚嶇О", minWidth: 100 }, + { prop: "consumables", label: "鑰楁潗", + formatter: (row) => (row.consumables ? "鏄�" : "鍚�"), minWidth: 100 }, { prop: "quantity", label: "鎬绘暟閲�", minWidth: 100 }, { prop: "usedNo", label: "宸蹭娇鐢ㄦ暟閲�", minWidth: 100 }, { prop: "specification", label: "瑙勬牸鍨嬪彿", minWidth: 100 }, @@ -206,7 +208,7 @@ prop: "equipmentStatus", label: "浣跨敤鐘舵��", minWidth: 100, - formatter: (row) => (row.equipmentStatus == "0" ? "浣跨敤涓�" : "宸插綊杩�"), + formatter: (row) => (row.equipmentStatus == 1 ? "浣跨敤涓�" : "宸插綊杩�"), }, { prop: "usageStartTime", label: "浣跨敤寮�濮嬫椂闂�", minWidth: 100 }, { prop: "usageEndTime", label: "浣跨敤缁撴潫鏃堕棿", minWidth: 100 }, @@ -267,7 +269,9 @@ }; const resetState = () => { - form.value = {}; + form.value = { + consumables: false, + }; addOrEdit.value = "add"; loading.value = true; tableData.value = []; @@ -290,7 +294,9 @@ const handleAdd = () => { addOrEdit.value = "add"; - form.value = {}; + form.value = { + consumables: false, + }; title.value = `鏂板${currentTabConfig.value.label}`; // 閫氱敤鐨� copyForm.value = {}; @@ -366,7 +372,7 @@ // 璁惧棰嗙敤寮圭獥鎻愪氦澶勭悊 const onEquipmentRequisitionSubmit = (formData) => { console.log("璁惧棰嗙敤鎻愪氦鏁版嵁锛�", formData); - if (formData.equipmentStatus == "1") { + if (formData.equipmentStatus == 1) { ElMessage.success("璁惧褰掕繕鎴愬姛"); } else { ElMessage.success("璁惧棰嗙敤鎴愬姛"); -- Gitblit v1.9.3