From 549ebb53247d7288700c1af23a74443019285276 Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期一, 18 八月 2025 21:04:41 +0800
Subject: [PATCH] backimport2增加查询条件

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

diff --git a/src/views/basesetting/machine.vue b/src/views/basesetting/machine.vue
index fcd92c3..841687d 100644
--- a/src/views/basesetting/machine.vue
+++ b/src/views/basesetting/machine.vue
@@ -28,13 +28,24 @@
         >
           <template #menu-left>
             <el-button type="primary" size="default" icon="el-icon-circle-plus" plain @click="handleExport">瀵煎嚭</el-button>
-            <!-- <el-button type="primary" size="default" icon="el-icon-circle-plus" plain @click="handleView">瀵煎叆</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" size="default" icon="el-icon-circle-plus" plain @click="handleAdd">鏂板</el-button>
           </template>
           <template #menu="scope">
             <el-button type="primary" text size="default" icon="el-icon-upload" @click.stop="handleEdit(scope.row, scope.index)">缂栬緫</el-button>
             <el-button type="primary" text size="default" icon="el-icon-upload" @click.stop="handleDel(scope.row, scope.index)">鍒犻櫎</el-button>
+            <!--
             <el-button type="primary" text size="default" icon="el-icon-upload" @click.stop="handleUp(scope.row, scope.index)">浜х敓鏈哄簥鍥炰紶鏈烘瀯鏍�</el-button>
+            -->
           </template>
 
           <template #status="{ row }">
@@ -140,6 +151,7 @@
           {
             label: '鏈哄簥缁�',
             prop: 'machineGroupName',
+            filterable:true,
             search: true,
             type: 'select',
             dicUrl: '/blade-system/dict-biz/dictionary?code=machine_group',
@@ -223,6 +235,7 @@
           {
             label: '鎵�灞炴満搴婄粍',
             prop: 'machineGroupCode',
+            filterable:true,
             type: 'select',
             span: 12,
             dicUrl: '/blade-system/dict-biz/dictionary?code=machine_group',
@@ -300,6 +313,13 @@
             span: 12,
             dataType: 'string',
           },
+		  {
+            label: '绋嬪簭涓存椂鐩綍',
+            prop: 'progTempDir',
+            type: 'input',
+            span: 12,
+            dataType: 'string',
+          },
           {
             label: '澶囨敞',
             prop: 'remark',
@@ -313,6 +333,9 @@
     };
   },
   methods: {
+    handleChange(a,b,c) {
+      console.log(a,b,c);
+    },
     nodeClick(data) {
       this.treeDeptId = data.id;
       this.mypage.current = 1;
@@ -497,5 +520,9 @@
 </script>
 
 <style lang="scss">
-
+.upload-demo {
+  display: inline-block;
+  margin-left: 6px;
+  margin-right: 6px;
+}
 </style>

--
Gitblit v1.9.3