From ce70bd97c7f2577f0978b39b9da1ccdd8d5b768f Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期五, 19 九月 2025 22:50:14 +0800
Subject: [PATCH] 机床增加设备编号

---
 src/views/basesetting/machine.vue |   28 +++++++++++++++++++++-------
 1 files changed, 21 insertions(+), 7 deletions(-)

diff --git a/src/views/basesetting/machine.vue b/src/views/basesetting/machine.vue
index f62bc43..3572019 100644
--- a/src/views/basesetting/machine.vue
+++ b/src/views/basesetting/machine.vue
@@ -29,11 +29,7 @@
           <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>
@@ -174,6 +170,10 @@
             prop: 'code'
           },
           {
+            label: '璁惧缂栧彿',
+            prop: 'equipmentCode'
+          },
+          {
             label: '鏈哄簥鍨嬪彿',
             prop: 'name',
           },
@@ -225,6 +225,20 @@
               {
                 required: true,
                 message: '璇疯緭鍏ユ満搴婄紪鍙�',
+                trigger: 'blur'
+              }
+            ]
+          },
+          {
+            label: '璁惧缂栧彿',
+            prop: 'equipmentCode',
+            type: 'input',
+            span: 12,
+            dataType: 'string',
+            rules: [
+              {
+                required: true,
+                message: '璇疯緭鍏ヨ澶囩紪鍙�',
                 trigger: 'blur'
               }
             ]
@@ -358,7 +372,7 @@
             span: 12,
             dataType: 'string',
           },
-          {
+          /*{
             label: '鍥炰紶鐩綍淇濆瓨鏃堕棿',
             prop: 'receiveDirExpiryHours',
             max:24,
@@ -367,7 +381,7 @@
             type: 'number',
             span: 12,
           },
-		      
+		      */
           {
             label: '澶囨敞',
             prop: 'remark',

--
Gitblit v1.9.3