From 191c452776f818fe2105ead9270ef8f1f3872b3e Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期六, 23 八月 2025 01:21:28 +0800
Subject: [PATCH] 修改机床导入提示信息

---
 src/views/basesetting/machine.vue |   52 ++++++++++++++++++++++++++++++++++++++++++++++++++--
 1 files changed, 50 insertions(+), 2 deletions(-)

diff --git a/src/views/basesetting/machine.vue b/src/views/basesetting/machine.vue
index 09df335..1e95e38 100644
--- a/src/views/basesetting/machine.vue
+++ b/src/views/basesetting/machine.vue
@@ -29,11 +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"
+              <!-- <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-upload> -->
+              <el-button type="primary" plain @click="importAction">瀵煎叆</el-button>
               <el-button type="primary" size="default" icon="el-icon-circle-plus" plain @click="handleAdd">鏂板</el-button>
             </div>
 
@@ -58,6 +59,11 @@
             </template>
           </avue-form>
         </el-dialog>
+
+        <el-dialog title="" append-to-body v-model="excelBox" width="555px">
+            <avue-form :option="excelOption" v-model="excelForm" :upload-after="uploadAfter">
+            </avue-form>
+        </el-dialog>
       </basic-container>
     </el-col>
   </el-row>
@@ -74,6 +80,29 @@
   data() {
     var that = this;
     return {
+      excelBox: false,
+      excelOption: {
+          submitBtn: false,
+          emptyBtn: false,
+          column: [
+              {
+                  label: '鏂囦欢瀵煎叆',
+                  prop: 'file',
+                  type: 'upload',
+                  drag: true,
+                  loadText: '瀵煎叆涓紝璇风◢鍚�',
+                  span: 24,
+                  propsHttp: {
+                      res: 'data',
+                  },
+                  data: {
+                  },
+                  tip: '',
+                  action: '/blade-mdm/machine/import',
+              },
+          ],
+      },
+      excelForm: {},
       treeOption: {
         nodeKey: 'id',
         lazy: true,
@@ -350,6 +379,25 @@
     };
   },
   methods: {
+    importAction() {
+      this.excelBox = true;
+    },
+    uploadAfter(res, done, loading, column) {
+        window.console.log('res',res);
+        //console.log('res',res)
+        if(res.failure==0 && res.success>0){
+            //鏈夋垚鍔熺殑锛屽叧闂璇濇
+            this.excelBox = false;
+            this.$message.success(res.message);
+            this.onLoad(this.page);
+            //done();
+        }else{
+            //0鎴愬姛鐨勶紝浠呮彁绀�
+            this.$message.info("鎴愬姛"+res.success+",澶辫触"+res.failure+":"+res.message);
+            done();
+        }
+        
+    },
     handleChange(a,b,c) {
       console.log(a,b,c);
     },

--
Gitblit v1.9.3