From fec0b1ed80c30b0771e5ebcb8ab7142787a14995 Mon Sep 17 00:00:00 2001
From: jiang <1354748262@qq.com>
Date: 星期五, 26 一月 2024 14:04:05 +0800
Subject: [PATCH] 更新配瓦规则状态选择

---
 jcdm-ui/src/views/main/da/tileMatchRules/index.vue |  169 +++++++++++++++++++++-----------------------------------
 1 files changed, 64 insertions(+), 105 deletions(-)

diff --git a/jcdm-ui/src/views/main/da/tileMatchRules/index.vue b/jcdm-ui/src/views/main/da/tileMatchRules/index.vue
index 03168e7..c7e7eb5 100644
--- a/jcdm-ui/src/views/main/da/tileMatchRules/index.vue
+++ b/jcdm-ui/src/views/main/da/tileMatchRules/index.vue
@@ -10,38 +10,7 @@
             @keyup.enter.native="handleQuery"
           />
         </el-form-item>
-<!--        <el-form-item label="鎵爜瀵硅薄1" prop="scanObject1">-->
-<!--          <el-input-->
-<!--            v-model="queryParams.scanObject1"-->
-<!--            placeholder="璇疯緭鍏ユ壂鐮佸璞�1"-->
-<!--            clearable-->
-<!--            @keyup.enter.native="handleQuery"-->
-<!--          />-->
-<!--        </el-form-item>-->
-<!--        <el-form-item label="鎵爜瀵硅薄2" prop="scanObject2">-->
-<!--          <el-input-->
-<!--            v-model="queryParams.scanObject2"-->
-<!--            placeholder="璇疯緭鍏ユ壂鐮佸璞�2"-->
-<!--            clearable-->
-<!--            @keyup.enter.native="handleQuery"-->
-<!--          />-->
-<!--        </el-form-item>-->
-<!--        <el-form-item label="杞村悕绉�" prop="axisName">-->
-<!--          <el-input-->
-<!--            v-model="queryParams.axisName"-->
-<!--            placeholder="璇疯緭鍏ヨ酱鍚嶇О"-->
-<!--            clearable-->
-<!--            @keyup.enter.native="handleQuery"-->
-<!--          />-->
-<!--        </el-form-item>-->
-<!--        <el-form-item label="棰堝悕绉�" prop="neckName">-->
-<!--          <el-input-->
-<!--            v-model="queryParams.neckName"-->
-<!--            placeholder="璇疯緭鍏ラ鍚嶇О"-->
-<!--            clearable-->
-<!--            @keyup.enter.native="handleQuery"-->
-<!--          />-->
-<!--        </el-form-item>-->
+
         <el-form-item label="鐡﹀悕绉�" prop="tileName">
           <el-input
             v-model="queryParams.tileName"
@@ -50,73 +19,29 @@
             @keyup.enter.native="handleQuery"
           />
         </el-form-item>
-<!--        <el-form-item label="杞村弬鏁版暟浣嶇疆" prop="axisParameterNoPosition">-->
-<!--          <el-input-->
-<!--            v-model="queryParams.axisParameterNoPosition"-->
-<!--            placeholder="璇疯緭鍏ヨ酱鍙傛暟鏁颁綅缃�"-->
-<!--            clearable-->
-<!--            @keyup.enter.native="handleQuery"-->
-<!--          />-->
-<!--        </el-form-item>-->
-<!--        <el-form-item label="棰堝弬鏁版暟浣嶇疆" prop="neckParameterPosition">-->
-<!--          <el-input-->
-<!--            v-model="queryParams.neckParameterPosition"-->
-<!--            placeholder="璇疯緭鍏ラ鍙傛暟鏁颁綅缃�"-->
-<!--            clearable-->
-<!--            @keyup.enter.native="handleQuery"-->
-<!--          />-->
-<!--        </el-form-item>-->
-<!--        <el-form-item label="杞村��" prop="axisValue">-->
-<!--          <el-input-->
-<!--            v-model="queryParams.axisValue"-->
-<!--            placeholder="璇疯緭鍏ヨ酱鍊�"-->
-<!--            clearable-->
-<!--            @keyup.enter.native="handleQuery"-->
-<!--          />-->
-<!--        </el-form-item>-->
-<!--        <el-form-item label="棰堝��" prop="neckValue">-->
-<!--          <el-input-->
-<!--            v-model="queryParams.neckValue"-->
-<!--            placeholder="璇疯緭鍏ラ鍊�"-->
-<!--            clearable-->
-<!--            @keyup.enter.native="handleQuery"-->
-<!--          />-->
-<!--        </el-form-item>-->
-<!--        <el-form-item label="鐡﹂鑹�" prop="tileColor">-->
-<!--          <el-input-->
-<!--            v-model="queryParams.tileColor"-->
-<!--            placeholder="璇疯緭鍏ョ摝棰滆壊"-->
-<!--            clearable-->
-<!--            @keyup.enter.native="handleQuery"-->
-<!--          />-->
-<!--        </el-form-item>-->
-<!--        <el-form-item label="鍒涘缓鐢ㄦ埛" prop="createUser">-->
-<!--          <el-input-->
-<!--            v-model="queryParams.createUser"-->
-<!--            placeholder="璇疯緭鍏ュ垱寤虹敤鎴�"-->
-<!--            clearable-->
-<!--            @keyup.enter.native="handleQuery"-->
-<!--          />-->
-<!--        </el-form-item>-->
-<!--        <el-form-item label="鏇存敼鐢ㄦ埛" prop="updateUser">-->
-<!--          <el-input-->
-<!--            v-model="queryParams.updateUser"-->
-<!--            placeholder="璇疯緭鍏ユ洿鏀圭敤鎴�"-->
-<!--            clearable-->
-<!--            @keyup.enter.native="handleQuery"-->
-<!--          />-->
-<!--        </el-form-item>-->
+
         <el-form-item label="鐘舵��" prop="state">
-          <el-input
-            v-model="queryParams.state"
-            placeholder="璇疯緭鍏ョ姸鎬�"
-            clearable
-            @keyup.enter.native="handleQuery"
-          />
+          <el-select v-model="queryParams.state" placeholder="璇烽�夋嫨鐘舵��" clearable>
+            <el-option
+              v-for="dict in dict.type.sys_normal_disable"
+              :key="dict.value"
+              :label="dict.label"
+              :value="dict.value"
+            />
+          </el-select>
         </el-form-item>
         <el-form-item style="float: right">
           <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">鎼滅储</el-button>
+          <el-button type="warning" icon="el-icon-copy-document" size="mini" @click="advancedQuery">楂樼骇鏌ヨ</el-button>
           <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">閲嶇疆</el-button>
+        </el-form-item>
+      </el-form>
+      <el-form :model="queryParams" ref="queryParams" size="small" :inline="true" v-show="advancedShowSearch" label-width="68px">
+        <el-form-item  label="棰堝悕绉�" prop="neckName">
+          <el-input v-model="queryParams.neckName" placeholder="璇疯緭鍏ラ鍚嶇О" clearable @keyup.enter.native="handleQuery"/>
+        </el-form-item>
+        <el-form-item label="杞村悕绉�" prop="axisName">
+          <el-input v-model="queryParams.axisName" placeholder="璇疯緭鍏ヨ酱鍚嶇О" clearable @keyup.enter.native="handleQuery"/>
         </el-form-item>
       </el-form>
     </el-card>
@@ -249,12 +174,12 @@
     />
 
     <!-- 娣诲姞鎴栦慨鏀归厤鐡﹁鍒欏璇濇 -->
-    <el-dialog v-dialogpop-up :title="title" :visible.sync="open" width="500px" append-to-body>
+    <el-dialog v-dialogpop-up :title="title" :visible.sync="open" width="650px" append-to-body>
       <span slot="title">
         <i class="el-icon-s-order"></i>
         {{titleName}}
       </span>
-      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+      <el-form ref="form"  inline :model="form" :rules="rules" label-width="80px">
         <el-form-item label="浜у搧绯诲垪" prop="productSeries">
           <el-input v-model="form.productSeries" placeholder="璇疯緭鍏ヤ骇鍝佺郴鍒�" />
         </el-form-item>
@@ -273,10 +198,10 @@
         <el-form-item label="鐡﹀悕绉�" prop="tileName">
           <el-input v-model="form.tileName" placeholder="璇疯緭鍏ョ摝鍚嶇О" />
         </el-form-item>
-        <el-form-item label="杞村弬鏁颁綅缃�" prop="axisParameterNoPosition">
-          <el-input v-model="form.axisParameterNoPosition" placeholder="璇疯緭鍏ヨ酱鍙傛暟浣嶇疆" />
+        <el-form-item label="杞村弬鏁颁綅缃�" prop="axisParameterNoPosition"  label-width="120">
+          <el-input v-model="form.axisParameterNoPosition" placeholder="璇疯緭鍏ヨ酱鍙傛暟浣嶇疆"  />
         </el-form-item>
-        <el-form-item label="棰堝弬鏁颁綅缃�" prop="neckParameterPosition">
+        <el-form-item label="棰堝弬鏁颁綅缃�" prop="neckParameterPosition"  label-width="120">
           <el-input v-model="form.neckParameterPosition" placeholder="璇疯緭鍏ラ鍙傛暟浣嶇疆" />
         </el-form-item>
         <el-form-item label="杞村��" prop="axisValue">
@@ -288,12 +213,12 @@
         <el-form-item label="鐡﹂鑹�" prop="tileColor">
           <el-input v-model="form.tileColor" placeholder="璇疯緭鍏ョ摝棰滆壊" />
         </el-form-item>
-        <el-form-item label="鍒涘缓鐢ㄦ埛" prop="createUser">
-          <el-input v-model="form.createUser" placeholder="璇疯緭鍏ュ垱寤虹敤鎴�" />
-        </el-form-item>
-        <el-form-item label="鏇存敼鐢ㄦ埛" prop="updateUser">
-          <el-input v-model="form.updateUser" placeholder="璇疯緭鍏ユ洿鏀圭敤鎴�" />
-        </el-form-item>
+<!--        <el-form-item label="鍒涘缓鐢ㄦ埛" prop="createUser">-->
+<!--          <el-input v-model="form.createUser" placeholder="璇疯緭鍏ュ垱寤虹敤鎴�" />-->
+<!--        </el-form-item>-->
+<!--        <el-form-item label="鏇存敼鐢ㄦ埛" prop="updateUser">-->
+<!--          <el-input v-model="form.updateUser" placeholder="璇疯緭鍏ユ洿鏀圭敤鎴�" />-->
+<!--        </el-form-item>-->
         <el-form-item label="鐘舵��" prop="state">
           <el-select v-model="form.state" placeholder="璇烽�夋嫨鐘舵��">
             <el-option
@@ -321,6 +246,7 @@
   dicts: ['subscription_type', 'sys_yes_no', 'data_type','sys_normal_disable'],
   data() {
     return {
+      advancedShowSearch: false,
       // 閬僵灞�
       loading: true,
       titleName: "",
@@ -366,6 +292,36 @@
         id: [
           { required: true, message: "涓婚敭id涓嶈兘涓虹┖", trigger: "blur" }
         ],
+        productSeries: [
+          { required: true, message: "浜у搧绯诲垪涓嶈兘涓虹┖", trigger: "blur" }
+        ],
+        axisName: [
+          { required: true, message: "杞村悕绉颁笉鑳戒负绌�", trigger: "blur" }
+        ],
+        neckName: [
+          { required: true, message: "棰堝悕绉颁笉鑳戒负绌�", trigger: "blur" }
+        ],
+        tileName: [
+          { required: true, message: "鐡﹀悕绉颁笉鑳戒负绌�", trigger: "blur" }
+        ],
+        axisParameterNoPosition: [
+          { required: true, message: "杞村弬鏁颁綅缃笉鑳戒负绌�", trigger: "blur" }
+        ],
+        neckParameterPosition: [
+          { required: true, message: "棰堝弬鏁颁綅缃笉鑳戒负绌�", trigger: "blur" }
+        ],
+        axisValue: [
+          { required: true, message: "杞村�间笉鑳戒负绌�", trigger: "blur" }
+        ],
+        neckValue: [
+          { required: true, message: "棰堝�间笉鑳戒负绌�", trigger: "blur" }
+        ],
+        tileColor: [
+          { required: true, message: "鐡﹀�间笉鑳戒负绌�", trigger: "blur" }
+        ],
+        state: [
+          { required: true, message: "鐘舵�佷笉鑳戒负绌�", trigger: "blur" }
+        ]
       }
     };
   },
@@ -373,6 +329,9 @@
     this.getList();
   },
   methods: {
+    advancedQuery(){
+      this.advancedShowSearch = (this.advancedShowSearch) ? this.advancedShowSearch = false : this.advancedShowSearch = true;
+    },
     /** 鏌ヨ閰嶇摝瑙勫垯鍒楄〃 */
     getList() {
       this.loading = true;

--
Gitblit v1.9.3