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 |   11 +++++++++++
 1 files changed, 11 insertions(+), 0 deletions(-)

diff --git a/src/views/basesetting/machine.vue b/src/views/basesetting/machine.vue
index 8a77765..841687d 100644
--- a/src/views/basesetting/machine.vue
+++ b/src/views/basesetting/machine.vue
@@ -43,7 +43,9 @@
           <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 }">
@@ -149,6 +151,7 @@
           {
             label: '鏈哄簥缁�',
             prop: 'machineGroupName',
+            filterable:true,
             search: true,
             type: 'select',
             dicUrl: '/blade-system/dict-biz/dictionary?code=machine_group',
@@ -232,6 +235,7 @@
           {
             label: '鎵�灞炴満搴婄粍',
             prop: 'machineGroupCode',
+            filterable:true,
             type: 'select',
             span: 12,
             dicUrl: '/blade-system/dict-biz/dictionary?code=machine_group',
@@ -309,6 +313,13 @@
             span: 12,
             dataType: 'string',
           },
+		  {
+            label: '绋嬪簭涓存椂鐩綍',
+            prop: 'progTempDir',
+            type: 'input',
+            span: 12,
+            dataType: 'string',
+          },
           {
             label: '澶囨敞',
             prop: 'remark',

--
Gitblit v1.9.3