From 023de2a98eaf873009ffb58f3b37a704a7675140 Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期五, 22 八月 2025 12:59:55 +0800
Subject: [PATCH] 增加字段

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

diff --git a/src/views/basesetting/machine.vue b/src/views/basesetting/machine.vue
index 8a77765..999f9ce 100644
--- a/src/views/basesetting/machine.vue
+++ b/src/views/basesetting/machine.vue
@@ -29,21 +29,19 @@
           <template #menu-left>
             <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" 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 }">
@@ -149,6 +147,7 @@
           {
             label: '鏈哄簥缁�',
             prop: 'machineGroupName',
+            filterable:true,
             search: true,
             type: 'select',
             dicUrl: '/blade-system/dict-biz/dictionary?code=machine_group',
@@ -232,6 +231,7 @@
           {
             label: '鎵�灞炴満搴婄粍',
             prop: 'machineGroupCode',
+            filterable:true,
             type: 'select',
             span: 12,
             dicUrl: '/blade-system/dict-biz/dictionary?code=machine_group',
@@ -275,7 +275,7 @@
             dataType: 'string',
           },
           {
-            label: '绯荤粺鎺у埗',
+            label: '鎺у埗绯荤粺',
             prop: 'controlSystem',
             type: 'select',
             span: 12,
@@ -296,11 +296,27 @@
             }]
           },
           {
+            label: '绋嬪簭涓存椂鐩綍',
+            prop: 'progTempDir',
+            type: 'input',
+            span: 12,
+            dataType: 'string',
+          },
+          {
             label: '绋嬪簭涓嬪彂鐩綍',
             prop: 'progSendDir',
             type: 'input',
             span: 12,
             dataType: 'string',
+          },
+          {
+            label: '涓嬪彂鐩綍淇濆瓨鏃堕棿',
+            prop: 'sendDirExpiryHours',
+            placeholder:"(灏忔椂)",
+            max:24,
+            min:1,
+            type: 'number',
+            span: 12,
           },
           {
             label: '绋嬪簭鍥炰紶鐩綍',
@@ -310,6 +326,16 @@
             dataType: 'string',
           },
           {
+            label: '鍥炰紶鐩綍淇濆瓨鏃堕棿',
+            prop: 'receiveDirExpiryHours',
+             max:24,
+            min:1,
+            placeholder:"(灏忔椂)",
+            type: 'number',
+            span: 12,
+          },
+		      
+          {
             label: '澶囨敞',
             prop: 'remark',
             type: 'textarea',

--
Gitblit v1.9.3