From 6140eb0f56b7adae1d4e41dbd4a1ac582dd17d9b Mon Sep 17 00:00:00 2001
From: spring <2396852758@qq.com>
Date: 星期三, 12 三月 2025 11:23:29 +0800
Subject: [PATCH] Merge branch 'dev' of http://114.132.189.42:9002/r/center-lims-before-ruoyi into dev

---
 src/views/CNAS/resourceDemand/device/component/operationInstruction.vue |   21 +++++----------------
 1 files changed, 5 insertions(+), 16 deletions(-)

diff --git a/src/views/CNAS/resourceDemand/device/component/operationInstruction.vue b/src/views/CNAS/resourceDemand/device/component/operationInstruction.vue
index 8ab8536..ab82ea4 100644
--- a/src/views/CNAS/resourceDemand/device/component/operationInstruction.vue
+++ b/src/views/CNAS/resourceDemand/device/component/operationInstruction.vue
@@ -2,7 +2,7 @@
 <template>
   <div>
     <div style="margin: 10px 0;text-align: right">
-      <el-button size="small" type="primary" @click="getList">鍒锋柊</el-button>
+<!--      <el-button size="small" type="primary" @click="getList">鍒锋柊</el-button>-->
       <el-button size="small" type="primary" @click="dialogVisible = true">鍙楁帶鐢宠</el-button>
     </div>
     <el-table :data="tableData" border height="calc(100vh - 18em)">
@@ -31,9 +31,9 @@
         <template v-slot="scope">
           <el-button type="text" size="small" @click="downloadFile(scope.row.fileSystemName)">涓嬭浇</el-button>
           <el-button type="text" size="small" style="color: red;"
-            @click="deleteHomeworkGuidebook(scope.row)">鍒犻櫎</el-button>
-          <el-button type="text" size="small" @click="instructionEditFun(scope.row)">缂栬緫</el-button>
-          <el-button type="text" size="small" @click="approval(scope.row)">瀹℃壒</el-button>
+            @click="deleteHomeworkGuidebook(scope.row)" :disabled="scope.row.status === true">鍒犻櫎</el-button>
+          <el-button type="text" size="small" @click="instructionEditFun(scope.row)" :disabled="scope.row.status === true">缂栬緫</el-button>
+          <el-button type="text" size="small" @click="approval(scope.row)" :disabled="scope.row.status === true">瀹℃壒</el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -309,18 +309,7 @@
       });
     },
     downloadFile(fileName) {
-      let state = /\.(jpg|jpeg|png|gif)$/i.test(fileName)
-      if (state) {
-        let url = this.javaApi + '/img/' + fileName;
-        fileDownload.downloadIamge(url, fileName)
-      } else {
-        const url = this.javaApi + '/word/' + fileName
-        const link = document.createElement('a');
-        link.href = url;
-        link.download = fileName;
-        link.click();
-        this.$message.success('涓嬭浇鎴愬姛')
-      }
+      this.$download.saveAs(fileName, fileName)
     },
     instructionEditFun(row) {
       this.dialogVisible = true

--
Gitblit v1.9.3