From 0a26d58a3906b9e13946c7cb46fae51a0de98920 Mon Sep 17 00:00:00 2001
From: Crunchy <3114200645@qq.com>
Date: 星期一, 17 三月 2025 15:49:08 +0800
Subject: [PATCH] Merge branch 'dev' into dev_tides

---
 src/views/CNAS/process/method/methodVerification/index.vue |   46 +++++++++++++++++-----------------------------
 1 files changed, 17 insertions(+), 29 deletions(-)

diff --git a/src/views/CNAS/process/method/methodVerification/index.vue b/src/views/CNAS/process/method/methodVerification/index.vue
index f6314b7..8be4cf8 100644
--- a/src/views/CNAS/process/method/methodVerification/index.vue
+++ b/src/views/CNAS/process/method/methodVerification/index.vue
@@ -13,25 +13,14 @@
         </el-form>
       </div>
       <div>
-        <el-button size="medium" type="primary" @click="openFormDia('add')">鏂� 澧�</el-button>
+        <el-button size="small" type="primary" @click="openFormDia('add')">鏂� 澧�</el-button>
       </div>
     </div>
     <div class="table">
-      <div>
-        <TableCard :showForm="false" :showTitle="false">
-          <template v-slot:table>
-            <limsTable
-              :column="tableColumn"
-              :height="'calc(100vh - 23em)'"
-              :table-data="tableData"
-              :table-loading="tableLoading"
-              style="padding: 0 15px;margin-bottom: 16px"
-              :page="page"
-              @pagination="pagination">
-            </limsTable>
-          </template>
-        </TableCard>
-      </div>
+      <limsTable :column="tableColumn" :height="'calc(100vh - 23em)'" :table-data="tableData"
+                 :table-loading="tableLoading" :page="page"
+                 @pagination="pagination">
+      </limsTable>
     </div>
     <formDIa v-if="formDIa" ref="formDIa" :operationType="operationType" @closeDia="closeDia"></formDIa>
   </div>
@@ -39,14 +28,13 @@
 
 <script>
 import limsTable from '@/components/Table/lims-table.vue'
-import TableCard from '@/views/CNAS/externalService/serviceAndSupplyPro/component/index.vue';
 import formDIa from './component/formDIa.vue';
 import { delMethodVerify, exportMethodVerify, pagesMethodVerify } from '@/api/cnas/process/method/methodVerification'
 
 export default {
-  name: 'a7-method-verification',
+  name: 'MethodVerification',
   // import 寮曞叆鐨勭粍浠堕渶瑕佹敞鍏ュ埌瀵硅薄涓墠鑳戒娇鐢�
-  components: { TableCard, limsTable, formDIa },
+  components: { limsTable, formDIa },
   data() {
     // 杩欓噷瀛樻斁鏁版嵁
     return {
@@ -110,6 +98,7 @@
       page: {
         size: 20,
         current: 1,
+        total: 0
       },
       total: 0,
       formDIa: false,
@@ -129,9 +118,9 @@
       }
       const page = this.page
       this.tableLoading = true
-      pagesMethodVerify({...page,...entity}).then(res => {
+      pagesMethodVerify({ ...page, ...entity }).then(res => {
         this.tableLoading = false
-        if (res.code === 200){
+        if (res.code === 200) {
           this.tableData = res.data.records
           this.page.total = res.data.total
         }
@@ -141,16 +130,16 @@
       })
     },
     // 鍒犻櫎
-    deleteRow (row) {
+    deleteRow(row) {
       this.$confirm('姝ゆ搷浣滃皢姘镐箙鍒犻櫎璇ユ暟鎹�, 鏄惁缁х画?', '鎻愮ず', {
         confirmButtonText: '纭畾',
         cancelButtonText: '鍙栨秷',
         type: 'warning'
       }).then(() => {
         this.tableLoading = true
-        delMethodVerify({methodVerifyId: row.methodVerifyId}).then(res => {
+        delMethodVerify({ methodVerifyId: row.methodVerifyId }).then(res => {
           this.tableLoading = false
-          if (res.code === 200){
+          if (res.code === 200) {
             this.$message.success('鍒犻櫎鎴愬姛')
             this.searchList()
           }
@@ -165,7 +154,7 @@
       this.searchForm.methodName = '';
       this.searchList()
     },
-    openFormDia (type, row) {
+    openFormDia(type, row) {
       this.formDIa = true
       this.operationType = type
       this.$nextTick(() => {
@@ -174,15 +163,14 @@
     },
     // 瀵煎嚭
     downLoadPost(row) {
-      exportMethodVerify({methodVerifyId:row.methodVerifyId}).then(res => {
+      exportMethodVerify({ methodVerifyId: row.methodVerifyId }).then(res => {
         this.outLoading = false
-        const blob = new Blob([res],{ type: 'application/msword' });
+        const blob = new Blob([res], { type: 'application/msword' });
         this.$download.saveAs(blob, '鏍囧噯锛堟柟娉曪級纭璁板綍.docx')
-        this.$message.success('瀵煎嚭鎴愬姛')
       })
     },
     // 鍏抽棴寮规
-    closeDia () {
+    closeDia() {
       this.formDIa = false
       this.searchList()
     },

--
Gitblit v1.9.3