From 5223975d315fe4ddf7728c55474d23e39dd3f819 Mon Sep 17 00:00:00 2001
From: gaoshp <291585735@qq.com>
Date: 星期六, 02 八月 2025 21:56:06 +0800
Subject: [PATCH] 12

---
 src/views/basesetting/machine.vue |   25 +++++++++++++------------
 1 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/src/views/basesetting/machine.vue b/src/views/basesetting/machine.vue
index 43c1e73..ed759ad 100644
--- a/src/views/basesetting/machine.vue
+++ b/src/views/basesetting/machine.vue
@@ -80,10 +80,11 @@
             type: 'input',
             prop: 'keyword',
             search: true,
-            hide: true
+            hide: true,
+            showColumn: false
           },
           {
-            label: '鏈哄簥缂栧彿4',
+            label: '鏈哄簥缂栧彿',
             prop: 'code'
           },
           {
@@ -201,18 +202,18 @@
           {
             label: '鎵�灞炵粍缁�',
             prop: 'ownerDept',
-            span: 12
+            span: 12,
+            rules: [
+              {
+                required: true,
+                message: '璇烽�夋嫨鎵�灞炵粍缁�',
+                trigger: 'change'
+              }
+            ]
           },
           {
             label: '鐢熶骇鍟�',
             prop: 'manufacturer',
-            type: 'input',
-            span: 12,
-            dataType: 'string',
-          },
-          {
-            label: '杞鏃堕棿锛堝皬鏃讹級',
-            prop: 'pollingHours',
             type: 'input',
             span: 12,
             dataType: 'string',
@@ -395,14 +396,14 @@
       this.loading = true;
       var obj = {
         keyword: this.search.keyword,
-        machineGroupCode: this.search.machineGroupCode,
+        machineGroupCode: this.search.machineGroupName,
         current: this.mypage.current,
         size: this.mypage.size,
       }
       axios({
         url: '/blade-mdm/machine/page',
         method: 'get',
-        date: obj,
+        params: obj,
       }).then(
         res => {
           const data = res.data.data;

--
Gitblit v1.9.3