From 288369dd7487adc61fe45f24d6d141152f5492df Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期三, 08 十月 2025 10:06:58 +0800
Subject: [PATCH] 翻页问题修复

---
 src/views/basesetting/machine.vue |   49 ++++++++++++++++++++++++++++++++++++++-----------
 1 files changed, 38 insertions(+), 11 deletions(-)

diff --git a/src/views/basesetting/machine.vue b/src/views/basesetting/machine.vue
index 1e95e38..3572019 100644
--- a/src/views/basesetting/machine.vue
+++ b/src/views/basesetting/machine.vue
@@ -29,15 +29,12 @@
           <template #menu-left>
             <div class="menuLeft">
               <el-button type="primary" size="default" icon="el-icon-circle-plus" plain @click="handleExport">瀵煎嚭</el-button>
-              <!-- <el-upload :show-file-list="false" class="upload-demo"
-                  action="/api/blade-mdm/machine/import"
-                        :on-change="handleChange">
-                <el-button type="primary" plain size="default">瀵煎叆</el-button>
-              </el-upload> -->
+              
               <el-button type="primary" plain @click="importAction">瀵煎叆</el-button>
+               <el-button type="primary" plain @click="downloadTemplate">涓嬭浇妯℃澘
+                        </el-button>
               <el-button type="primary" size="default" icon="el-icon-circle-plus" plain @click="handleAdd">鏂板</el-button>
             </div>
-
           </template>
           <template #menu="scope">
             <el-button type="primary" text size="default" icon="el-icon-edit" @click.stop="handleEdit(scope.row, scope.index)">缂栬緫</el-button>
@@ -158,6 +155,7 @@
         labelWidth: 120,
         emptyBtn: false,
         searchSpan: 8,
+        searchEnter:true,
         column: [
           {
             label: '缂栧彿/鍚嶇О',
@@ -170,6 +168,10 @@
           {
             label: '鏈哄簥缂栧彿',
             prop: 'code'
+          },
+          {
+            label: '璁惧缂栧彿',
+            prop: 'equipmentCode'
           },
           {
             label: '鏈哄簥鍨嬪彿',
@@ -223,6 +225,20 @@
               {
                 required: true,
                 message: '璇疯緭鍏ユ満搴婄紪鍙�',
+                trigger: 'blur'
+              }
+            ]
+          },
+          {
+            label: '璁惧缂栧彿',
+            prop: 'equipmentCode',
+            type: 'input',
+            span: 12,
+            dataType: 'string',
+            rules: [
+              {
+                required: true,
+                message: '璇疯緭鍏ヨ澶囩紪鍙�',
                 trigger: 'blur'
               }
             ]
@@ -345,7 +361,7 @@
             prop: 'sendDirExpiryHours',
             placeholder:"(灏忔椂)",
             max:24,
-            min:1,
+            min:0,
             type: 'number',
             span: 12,
           },
@@ -356,16 +372,16 @@
             span: 12,
             dataType: 'string',
           },
-          {
+          /*{
             label: '鍥炰紶鐩綍淇濆瓨鏃堕棿',
             prop: 'receiveDirExpiryHours',
-             max:24,
-            min:1,
+            max:24,
+            min:0,
             placeholder:"(灏忔椂)",
             type: 'number',
             span: 12,
           },
-		      
+		      */
           {
             label: '澶囨敞',
             prop: 'remark',
@@ -487,6 +503,15 @@
         });
       });
     },
+    downloadTemplate() {
+      NProgress.start();
+      exportBlob(
+          `/blade-mdm/machine/download-template`
+      ).then(res => {
+          downloadXls(res.data, `鏈哄簥瀵煎叆妯＄増.xlsx`);
+          NProgress.done();
+      });
+    },
     formSubmit(params, done) {
       var obj = {...params};
       if(params.status.length == 0) {
@@ -510,6 +535,8 @@
           this.$message({type: 'error',message: res.data.msg});
         }
         done();
+      }).catch(e=>{
+        done();
       });
     },
     handleView() {

--
Gitblit v1.9.3