From 4f0517d5c30ec2962c16883f0552cfa6db2034dc Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期五, 30 十月 2026 10:08:37 +0800
Subject: [PATCH] feat: 设备台账启用状态、审批签核展示与导入交互修复

---
 src/views/equipmentManagement/ledger/index.vue |   92 +++++++++++++++++++++++++++++++++++++++++-----
 1 files changed, 82 insertions(+), 10 deletions(-)

diff --git a/src/views/equipmentManagement/ledger/index.vue b/src/views/equipmentManagement/ledger/index.vue
index 95baaca..ceb66b1 100644
--- a/src/views/equipmentManagement/ledger/index.vue
+++ b/src/views/equipmentManagement/ledger/index.vue
@@ -140,6 +140,11 @@
             @selection-change="handleSelectionChange"
             @pagination="changePage"
           >
+            <template #isEnabled="{ row }">
+              <el-tag :type="row.isEnabled === 0 ? 'info' : 'success'" size="small">
+                {{ row.isEnabled === 0 ? '鍋滅敤' : '鍚敤' }}
+              </el-tag>
+            </template>
           </PIMTable>
         </div>
       </div>
@@ -166,6 +171,9 @@
         :disabled="upload.isUploading"
         :on-progress="handleFileUploadProgress"
         :on-success="handleFileSuccess"
+        :on-error="handleFileError"
+        :on-change="handleFileChange"
+        :on-exceed="handleFileExceed"
         :auto-upload="false"
         drag
       >
@@ -202,7 +210,11 @@
         <el-descriptions-item label="璁惧绫诲瀷">{{ detailData.type }}</el-descriptions-item>
         <el-descriptions-item label="渚涘簲鍟�">{{ detailData.supplierName }}</el-descriptions-item>
         <el-descriptions-item label="鎵�灞炲尯鍩�">{{ detailData.areaName }}</el-descriptions-item>
-        <el-descriptions-item label="瀛樻斁浣嶇疆">{{ detailData.storageLocation }}</el-descriptions-item>
+        <el-descriptions-item label="鍚敤鐘舵��">
+          <el-tag :type="detailData.isEnabled === 0 ? 'info' : 'success'" size="small">
+            {{ detailData.isEnabled === 0 ? '鍋滅敤' : '鍚敤' }}
+          </el-tag>
+        </el-descriptions-item>
         <el-descriptions-item label="鍗曚綅">{{ detailData.unit }}</el-descriptions-item>
         <el-descriptions-item label="鏁伴噺">{{ detailData.number }}</el-descriptions-item>
         <el-descriptions-item label="鍚敤鎶樻棫">{{ detailData.isDepr === 1 ? '鏄�' : '鍚�' }}</el-descriptions-item>
@@ -287,7 +299,7 @@
   editDeviceArea,
   delDeviceArea,
 } from "@/api/equipmentManagement/area";
-import { onMounted, getCurrentInstance, ref, reactive, computed } from "vue";
+import { onMounted, getCurrentInstance, ref, reactive, computed, nextTick } from "vue";
 import Modal from "./Modal.vue";
 import { ElMessageBox, ElMessage } from "element-plus";
 import { UploadFilled } from "@element-plus/icons-vue";
@@ -339,6 +351,7 @@
   open: false,
   title: "",
   isUploading: false,
+  file: null,
   headers: { Authorization: "Bearer " + getToken() },
   url: import.meta.env.VITE_APP_BASE_API + "/device/ledger/import",
 });
@@ -387,8 +400,11 @@
       prop: "supplierName",
     },
     {
-      label: "瀛樻斁浣嶇疆",
-      prop: "storageLocation",
+      label: "鍚敤鐘舵��",
+      prop: "isEnabled",
+      dataType: "slot",
+      slot: "isEnabled",
+      width: 100,
     },
     {
       label: "鏁伴噺",
@@ -670,7 +686,13 @@
 
 const handleImport = () => {
   upload.title = "璁惧鍙拌处瀵煎叆";
+  upload.isUploading = false;
+  upload.file = null;
   upload.open = true;
+  // 娓呯悊涓婁竴娆″け璐�/鎴愬姛閬楃暀鐨勬枃浠讹紝閬垮厤鍑虹幇宸查�夋枃浠跺嵈鏃犳硶鍐嶆閫夋嫨鐨勬儏鍐�
+  nextTick(() => {
+    proxy.$refs["uploadRef"] && proxy.$refs["uploadRef"].clearFiles();
+  });
 };
 
 const importTemplate = () => {
@@ -685,21 +707,71 @@
   upload.isUploading = true;
 };
 
-const handleFileSuccess = (response, file, fileList) => {
-  upload.open = false;
-  upload.isUploading = false;
-  proxy.$refs["uploadRef"].handleRemove(file);
+const handleFileChange = (file) => {
+  // 鍙褰曞緟涓婁紶鐨勬枃浠讹紱鍒犻櫎/鎴愬姛/澶辫触鏃� Element Plus 涔熶細瑙﹀彂 change锛屼笉鑳借鐩栨垚鏃ф枃浠�
+  upload.file = file && file.status === "ready" ? file.raw : null;
+};
+
+const handleFileExceed = (files) => {
+  // 鍙厑璁搁�夋嫨涓�涓枃浠讹紝鍚庨�夌殑鏂囦欢瑕嗙洊鍏堥�夌殑鏂囦欢
+  proxy.$refs["uploadRef"].clearFiles();
+  proxy.$refs["uploadRef"].handleStart(files[0]);
+};
+
+const showImportResult = (msg) => {
   proxy.$alert(
     "<div style='overflow: auto;overflow-x: hidden;max-height: 70vh;padding: 10px 20px 0;'>" +
-      response.msg +
+      msg +
       "</div>",
     "瀵煎叆缁撴灉",
     { dangerouslyUseHTMLString: true }
   );
-  getTableData();
+};
+
+const handleFileSuccess = (response, file, fileList) => {
+  upload.open = false;
+  upload.isUploading = false;
+  upload.file = null;
+  proxy.$refs["uploadRef"].handleRemove(file);
+  const success = response && response.code === 200;
+  showImportResult((response && response.msg) || (success ? "瀵煎叆鎴愬姛" : "瀵煎叆澶辫触"));
+  if (success) {
+    getTableData();
+  }
+};
+
+// 缃戠粶寮傚父/鍚庣杩斿洖闈� 2xx 鏃惰Е鍙戯紝蹇呴』澶嶄綅涓婁紶鐘舵�佸苟缁欏嚭鎻愮ず锛屽惁鍒欏啀娆$偣鍑烩�滅‘瀹氣�濅笉浼氭湁浠讳綍鍙嶅簲
+const handleFileError = (error, file, fileList) => {
+  upload.isUploading = false;
+  upload.file = null;
+  // 绉婚櫎澶辫触鏂囦欢锛屽惁鍒欐枃浠剁姸鎬佷负 fail锛屽啀娆$偣鈥滅‘瀹氣�濅笉浼氶噸鏂颁笂浼�
+  try {
+    proxy.$refs["uploadRef"].handleRemove(file);
+  } catch (e) {
+    // ignore
+  }
+  let msg = "瀵煎叆澶辫触锛岃妫�鏌ョ綉缁滄垨绋嶅悗閲嶈瘯";
+  try {
+    const data = error && error.message ? JSON.parse(error.message) : null;
+    if (data && data.msg) {
+      msg = data.msg;
+    }
+  } catch (e) {
+    // 闈� JSON 鍝嶅簲锛屼娇鐢ㄩ粯璁ゆ彁绀�
+  }
+  showImportResult(msg);
 };
 
 const submitFileForm = () => {
+  if (upload.isUploading) {
+    ElMessage.warning("鏂囦欢涓婁紶涓紝璇风◢鍊�");
+    return;
+  }
+  if (!upload.file) {
+    ElMessage.warning("璇峰厛閫夋嫨瑕佸鍏ョ殑 Excel 鏂囦欢");
+    return;
+  }
+  upload.isUploading = true;
   proxy.$refs["uploadRef"].submit();
 };
 

--
Gitblit v1.9.3