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

---
 src/views/CNAS/process/sampleDisposal/index.vue |   55 ++++---------------------------------------------------
 1 files changed, 4 insertions(+), 51 deletions(-)

diff --git a/src/views/CNAS/process/sampleDisposal/index.vue b/src/views/CNAS/process/sampleDisposal/index.vue
index c534d45..94b45b9 100644
--- a/src/views/CNAS/process/sampleDisposal/index.vue
+++ b/src/views/CNAS/process/sampleDisposal/index.vue
@@ -5,6 +5,7 @@
         <el-button size="small" type="primary" @click="handleAdd0" style="margin-left: 20px;">鏂板</el-button>
         <div class="table" style="height: calc(100% - 200px)" v-if="activeName == '濉啓'">
           <lims-table :tableData="tableData" :column="column" :tableLoading="tableLoading"
+                      key="tableData"
             :height="'calc(100vh - 290px)'" :page="page" @pagination="pagination"></lims-table>
         </div>
       </el-tab-pane>
@@ -25,6 +26,7 @@
         </div>
         <div class="table">
           <lims-table :tableData="tableData0" :column="column0" :tableLoading="tableLoading"
+                      key="tableData0"
             :height="'calc(100vh - 300px)'" :page="page0" @pagination="pagination0"></lims-table>
         </div>
       </el-tab-pane>
@@ -249,51 +251,11 @@
     };
   },
   mounted() {
-    // this.entityCopy = this.HaveJson(this.componentData.entity);
     this.getCustomPageList()
     this.getList()
     this.getList0()
   },
   methods: {
-    getPower() {
-      let power = JSON.parse(sessionStorage.getItem('power'))
-      let add = false
-      let out = false
-      let submitProcessTotaldeal = false
-      let checkProcessTotaldeal = false
-      let ratifyProcessTotaldeal = false
-      for (var i = 0; i < power.length; i++) {
-        if (power[i].menuMethod == 'addProcessDeal') {
-          add = true
-        }
-        // if (power[i].menuMethod == 'exportProcessEvaluate') {
-        //   out = true
-        // }
-        if (power[i].menuMethod == 'submitProcessTotaldeal') {
-          submitProcessTotaldeal = true
-        }
-        if (power[i].menuMethod == 'checkProcessTotaldeal') {
-          checkProcessTotaldeal = true
-        }
-        if (power[i].menuMethod == 'ratifyProcessTotaldeal') {
-          ratifyProcessTotaldeal = true
-        }
-      }
-      if (!ratifyProcessTotaldeal) {
-        this.componentData.do.splice(4, 1)
-      }
-      if (!checkProcessTotaldeal) {
-        this.componentData.do.splice(3, 1)
-      }
-      if (!submitProcessTotaldeal) {
-        this.componentData.do.splice(2, 1)
-      }
-      if (!add) {
-        this.componentData0.do.splice(1, 1)
-        this.componentData0.do.splice(0, 1)
-      }
-      this.addPower = add
-    },
     // 鑾峰彇閫佹牱鍗曚綅鍒楄〃
     getCustomPageList() {
       selectCustomPageList({
@@ -381,7 +343,6 @@
           ...this.addInfo
         }).then(res => {
           this.addLoading = false
-          if (res.code === 201) return
           this.addDialogVisible = false
           this.$message({
             type: 'success',
@@ -398,7 +359,6 @@
           ...this.addInfo
         }).then(res => {
           this.addLoading = false
-          if (res.code === 201) return
           this.addDialogVisible = false
           this.$message({
             type: 'success',
@@ -419,7 +379,6 @@
         submitProcessTotaldeal({
           id: row.id
         }).then(res => {
-          if (res.code === 201) return
           this.$message({
             type: 'success',
             message: '鎻愪氦鎴愬姛!'
@@ -430,13 +389,10 @@
     },
     // 鏌ョ湅
     handleLook(row) {
-      // console.log(row)
-      // this.title0 = '鏌ョ湅'
-      // this.commonFun(row)
       this.activeName = '濉啓'
       this.queryParams.totaldealId = row.id
       this.$nextTick(() => {
-        this.page.current = 0;
+        this.page.current = 1;
         this.getList();
       })
     },
@@ -478,7 +434,6 @@
         }).then(res => {
           this.checkLoading = false
           this.noCheckLoading = false
-          if (res.code === 201) return
           this.$message({
             type: 'success',
             message: '鎿嶄綔鎴愬姛!'
@@ -493,7 +448,6 @@
         }).then(res => {
           this.checkLoading = false
           this.noCheckLoading = false
-          if (res.code === 201) return
           this.$message({
             type: 'success',
             message: '鎿嶄綔鎴愬姛!'
@@ -510,7 +464,7 @@
         return
       }
       // 鍚庣涓嬭浇
-      this.$download.downloadFileFromUrl(row.url, row.month + ' 鏍峰搧澶勭悊鐢宠琛�');
+      this.$download.saveAs(row.url, row.month + ' 鏍峰搧澶勭悊鐢宠琛�');
     },
     handleDelete(row) {
       this.$confirm("鏄惁鍒犻櫎璇ユ潯鏁版嵁?", "鎻愮ず", {
@@ -520,7 +474,6 @@
       })
         .then(() => {
           delProcessDeal({ id: row.id }).then((res) => {
-            if (res.code == 201) return;
             this.$message.success("鍒犻櫎鎴愬姛");
             this.page.current = 0;
             this.getList();

--
Gitblit v1.9.3