From b64d6db597d332c699f84e4928f6d3e5551851f1 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期二, 04 三月 2025 16:43:16 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev

---
 src/views/CNAS/resourceDemand/standardMaterial/index.vue |   35 +++++++++++++++++------------------
 1 files changed, 17 insertions(+), 18 deletions(-)

diff --git a/src/views/CNAS/resourceDemand/standardMaterial/index.vue b/src/views/CNAS/resourceDemand/standardMaterial/index.vue
index c23d9f9..2ad23f6 100644
--- a/src/views/CNAS/resourceDemand/standardMaterial/index.vue
+++ b/src/views/CNAS/resourceDemand/standardMaterial/index.vue
@@ -5,11 +5,11 @@
         <el-form :model="searchForm" ref="searchForm" size="small" :inline="true">
           <el-form-item label="鏍囧噯鐗╄川鍚嶇О" prop="name">
             <el-input size="small" placeholder="璇疯緭鍏�" clearable v-model="searchForm.name"
-                      @keyup.enter.native="searchList"></el-input>
+              @keyup.enter.native="searchList"></el-input>
           </el-form-item>
           <el-form-item label="鐢熶骇鍘傚" prop="factoryManufacturer">
             <el-input size="small" placeholder="璇疯緭鍏�" clearable v-model="searchForm.factoryManufacturer"
-                      @keyup.enter.native="searchList"></el-input>
+              @keyup.enter.native="searchList"></el-input>
           </el-form-item>
           <el-form-item>
             <el-button type="primary" icon="el-icon-search" size="mini" @click="searchList">鏌� 璇�</el-button>
@@ -24,7 +24,7 @@
     </div>
     <div class="table">
       <lims-table :tableData="tableData" :column="tableColumn" :height="'calc(100vh - 250px)'" @pagination="pagination"
-                  :page="page" :tableLoading="tableLoading"></lims-table>
+        :page="page" :tableLoading="tableLoading"></lims-table>
     </div>
     <form-dia v-if="formDia" ref="formDia" @closeYearDia="closeYearDia"></form-dia>
     <borrow-dia v-if="borrowDia" ref="borrowDia" @closeYearDia="closeBorrowDia"></borrow-dia>
@@ -177,39 +177,38 @@
   mounted() {
     this.searchList()
   },
-  methods :{
+  methods: {
     exportFun() {
       this.outLoading = true
-      exportOfStandardSubstanceList(this.searchForm).then(res =>{
+      exportOfStandardSubstanceList(this.searchForm).then(res => {
         this.outLoading = false
-        const blob = new Blob([res], {type: 'application/octet-stream'},false);
+        const blob = new Blob([res], { type: 'application/octet-stream' }, false);
         this.$download.saveAs(blob, '鏍囧噯鐗╄川娓呭崟.xlsx')
-        this.$message.success('瀵煎嚭鎴愬姛')
       })
     },
     // 鏌ヨ鍒楄〃
-    searchList () {
+    searchList() {
       this.tableLoading = true
       getPageStandardSubstance({
         ...this.page,
         ...this.searchForm
       }).then(res => {
         this.tableLoading = false
-        if (res.code === 200){
+        if (res.code === 200) {
           this.tableData = res.data.records
           this.page.total = res.data.total
         }
       })
     },
     // 鍒犻櫎
-    delPlan (row) {
+    delPlan(row) {
       this.$confirm('姝ゆ搷浣滃皢姘镐箙鍒犻櫎璇ユ暟鎹�, 鏄惁缁х画?', '鎻愮ず', {
         confirmButtonText: '纭畾',
         cancelButtonText: '鍙栨秷',
         type: 'warning'
       }).then(() => {
         this.tableLoading = true
-        removeStandardSubstance({id:row.id}).then(res => {
+        removeStandardSubstance({ id: row.id }).then(res => {
           this.tableLoading = false
           if (res.code === 200) {
             this.$message.success('鍒犻櫎鎴愬姛')
@@ -226,40 +225,40 @@
       });
     },
     // 鏂板锛岀紪杈戯紝鎵瑰噯寮规
-    openFormDia (type, row) {
+    openFormDia(type, row) {
       this.formDia = true
       this.$nextTick(() => {
         this.$refs.formDia.openDia(type, row)
       })
     },
-    closeYearDia () {
+    closeYearDia() {
       this.formDia = false
       this.searchList()
     },
     // 鍊熺敤
-    borrow (row) {
+    borrow(row) {
       this.borrowDia = true
       this.$nextTick(() => {
         this.$refs.borrowDia.openDia(row)
       })
     },
-    closeBorrowDia () {
+    closeBorrowDia() {
       this.borrowDia = false
       this.searchList()
     },
     // 褰掕繕
-    return (row) {
+    return(row) {
       this.returnDia = true
       this.$nextTick(() => {
         this.$refs.returnDia.openDia(row)
       })
     },
-    closeReturnDia () {
+    closeReturnDia() {
       this.returnDia = false
       this.searchList()
     },
     // 閲嶇疆鏌ヨ鏉′欢
-    resetSearchForm () {
+    resetSearchForm() {
       this.searchForm.name = '';
       this.searchForm.factoryManufacturer = '';
       this.searchList()

--
Gitblit v1.9.3