From 90e2355859fcb054ecdfb2aee239429ed316b115 Mon Sep 17 00:00:00 2001
From: gaoshp <291585735@qq.com>
Date: 星期六, 02 八月 2025 21:59:02 +0800
Subject: [PATCH] 123

---
 src/views/basesetting/machine.vue |   78 +++++++++++++++++++++++++-------------
 1 files changed, 51 insertions(+), 27 deletions(-)

diff --git a/src/views/basesetting/machine.vue b/src/views/basesetting/machine.vue
index 9117339..ed759ad 100644
--- a/src/views/basesetting/machine.vue
+++ b/src/views/basesetting/machine.vue
@@ -17,7 +17,7 @@
     >
       <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-button type="primary" size="default" icon="el-icon-circle-plus" plain @click="handleView">瀵煎叆</el-button> -->
         <el-button type="primary" size="default" icon="el-icon-circle-plus" plain @click="handleAdd">鏂板</el-button>
       </template>
       <template #menu="scope">
@@ -80,7 +80,8 @@
             type: 'input',
             prop: 'keyword',
             search: true,
-            hide: true
+            hide: true,
+            showColumn: false
           },
           {
             label: '鏈哄簥缂栧彿',
@@ -133,6 +134,13 @@
             type: 'input',
             span: 12,
             dataType: 'string',
+            rules: [
+              {
+                required: true,
+                message: '璇疯緭鍏ユ満搴婄紪鍙�',
+                trigger: 'blur'
+              }
+            ]
           },
           {
             label: '鏈哄簥鍨嬪彿',
@@ -140,6 +148,13 @@
             type: 'input',
             span: 12,
             dataType: 'string',
+            rules: [
+              {
+                required: true,
+                message: '璇疯緭鍏ユ満搴婂瀷鍙�',
+                trigger: 'blur'
+              }
+            ]
           },
           {
             label: '鏈哄簥绫诲瀷',
@@ -150,7 +165,14 @@
             props: {
               label: 'dictValue',
               value: 'dictKey',
-            }
+            },
+            rules: [
+              {
+                required: true,
+                message: '璇烽�夋嫨鏈哄簥绫诲瀷',
+                trigger: 'change'
+              }
+            ]
           },
           {
             label: '鎵�灞炴満搴婄粍',
@@ -161,7 +183,14 @@
             props: {
               label: 'dictValue',
               value: 'dictKey',
-            }
+            },
+            rules: [
+              {
+                required: true,
+                message: '璇烽�夋嫨鎵�灞炴満搴婄粍',
+                trigger: 'change'
+              }
+            ]
           },
           {
             label: '鎿嶄綔鍛�',
@@ -173,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',
@@ -331,22 +360,17 @@
         var url = '/blade-mdm/machine/update';
       }
       this.loading = true;
-      axios({
-        url: url,
-        method: 'post',
-        data: obj,
-      }).then(
-        res => {
-          this.loading = false;
-          this.$message({
-            type: 'success',
-            message: '鎿嶄綔鎴愬姛!',
-          });
+      axios({url: url,method: 'post',data: obj}).then(res => {
+        this.loading = false;
+        if(res,res.data.success) {
           this.editBox = false;
+          this.$message({type: 'success',message: '鎿嶄綔鎴愬姛!'});
           this.onLoad();
-          done();
+        }else {
+          this.$message({type: 'error',message: res.data.msg});
         }
-      );
+        done();
+      });
     },
     handleView() {
 
@@ -372,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