From 00a87a713ed41628920ae31aae1994672e713639 Mon Sep 17 00:00:00 2001
From: khalil <khalil@chuhaiwl2023.com>
Date: Fri, 28 Mar 2025 18:01:29 +0800
Subject: [PATCH] =?UTF-8?q?=E7=89=B9=E6=9D=83-=E9=93=AD=E7=89=8C=E5=BA=A7?=
 =?UTF-8?q?=E9=A9=BE=E5=8F=AF=E6=8C=89id=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/car/CarGoodsAdminView.vue       | 37 ++++++++-------
 src/views/nameplate/NameplateInfoView.vue | 58 +++++++++++++----------
 2 files changed, 53 insertions(+), 42 deletions(-)

diff --git a/src/views/car/CarGoodsAdminView.vue b/src/views/car/CarGoodsAdminView.vue
index d6b4e9c..51f6378 100644
--- a/src/views/car/CarGoodsAdminView.vue
+++ b/src/views/car/CarGoodsAdminView.vue
@@ -11,10 +11,15 @@
                     <div id="table"></div>
                     <div id="toolbar">
                         <div class="col-sm-12">
+                            <label for="query_carGoodsId" class="col-sm-1 control-label">座驾ID:</label>
+                            <div class="col-sm-3">
+                              <input type="number" class="form-control" name="query_carGoodsId"
+                                     id="query_carGoodsId" />
+                            </div>
                             <label for="query_carGoodsName" class="col-sm-1 control-label">名称:</label>
                             <div class="col-sm-3"><input type="text" class="form-control" name="query_carGoodsName"
-                                    id="query_carGoodsName" /></div>
-
+                                    id="query_carGoodsName" />
+                            </div>
                             <label for="query_carGoodsType" class="col-sm-1 control-label">类型:</label>
                             <div class="col-sm-3">
                                 <select name="query_carGoodsType" id="query_carGoodsType" class="form-control">
@@ -23,21 +28,20 @@
                                     <option value="2">贵族座驾</option>
                                 </select>
                             </div>
-
-                            <label for="condition_type" class="col-sm-1 control-label">状态:</label>
-                            <div class="col-sm-3">
-                                <select name="condition_type" id="condition_type" class="form-control">
-                                    <option value="-1" selected="selected">全部</option>
-                                    <option value="2">启用</option>
-                                    <option value="1">未启用</option>
-                                </select>
-                            </div>
                         </div>
                         <div class="col-sm-12">
-                            <label for="partitionId" class="col-sm-1 control-label">地区:</label>
-                            <div class="col-sm-3">
-                                <select name="partitionId" id="partitionId" class="form-control"></select>
-                            </div>
+                          <label for="condition_type" class="col-sm-1 control-label">状态:</label>
+                          <div class="col-sm-3">
+                            <select name="condition_type" id="condition_type" class="form-control">
+                              <option value="-1" selected="selected">全部</option>
+                              <option value="2">启用</option>
+                              <option value="1">未启用</option>
+                            </select>
+                          </div>
+                          <label for="partitionId" class="col-sm-1 control-label">地区:</label>
+                          <div class="col-sm-3">
+                              <select name="partitionId" id="partitionId" class="form-control"></select>
+                          </div>
                         </div>
                         <div class="col-sm-12">
                             <button id="car-goods-refresh" class="btn btn-default">
@@ -574,7 +578,7 @@ export default {
                     showRefresh: false,
                     pageSize: 20,
                     pagination: true,
-                    pageList: [1, 20, 50, 100, 200],
+                    pageList: [20, 50, 100, 200],
                     search: false,
                     sidePagination: "server", //表示服务端请求
                     //设置为undefined可以获取pageNumber，pageSize，searchText，sortName，sortOrder
@@ -585,6 +589,7 @@ export default {
                             page: params.pageNumber,
                             pageSize: params.pageSize,
                             searchText: params.searchText,
+                            carGoodsId: $("#query_carGoodsId").val(),
                             carGoodsName: $("#query_carGoodsName").val(),
                             carGoodsType: $("#query_carGoodsType").val(),
                             enable: $("condition_type").val(),
diff --git a/src/views/nameplate/NameplateInfoView.vue b/src/views/nameplate/NameplateInfoView.vue
index 1fb2096..213d5ac 100644
--- a/src/views/nameplate/NameplateInfoView.vue
+++ b/src/views/nameplate/NameplateInfoView.vue
@@ -9,37 +9,42 @@
                 <div id="toolbar" style="height: auto;">
                     <form id="searchForm" class="" action="" method="post" target="_blank">
                         <div class="col-sm-12">
-                            <label for="nameplateType" class="col-sm-1 control-label">铭牌类型:</label>
-                            <div class="col-sm-2">
-                                <select name="nameplateType" id="nameplateType" data-btn-class="btn-warning"
-                                    class="form-control">
-                                    <option value="" selected="selected">全部</option>
-                                </select>
-                            </div>
+                          <label for="nameplateId" class="col-sm-1 control-label">铭牌ID:</label>
+                          <div class="col-sm-2">
+                            <input type="text" class="form-control" name="id" id="id">
+                          </div>
 
-                            <label for="name" class="col-sm-1 control-label">铭牌名称:</label>
-                            <div class="col-sm-2"><input type="text" class="form-control" name="nick" id="name"></div>
+                          <label for="name" class="col-sm-1 control-label">铭牌名称:</label>
+                          <div class="col-sm-2"><input type="text" class="form-control" name="name" id="name"></div>
 
-                            <label for="status" class="col-sm-1 control-label">状态:</label>
-                            <div class="col-sm-2">
-                                <select name="status" id="status" data-btn-class="btn-warning" class="form-control">
-                                    <option value="" selected="selected">全部</option>
-                                </select>
-                            </div>
-
-                            <label for="type" class="col-sm-1 control-label">铭牌款式:</label>
-                            <div class="col-sm-2">
-                                <select name="type" id="type" data-btn-class="btn-warning" class="form-control">
-                                    <option value="" selected="selected">全部</option>
-                                </select>
-                            </div>
+                          <label for="status" class="col-sm-1 control-label">状态:</label>
+                          <div class="col-sm-2">
+                            <select name="status" id="status" data-btn-class="btn-warning" class="form-control">
+                              <option value="" selected="selected">全部</option>
+                            </select>
+                          </div>
                         </div>
                         <div class="col-sm-12">
-                            <label for="partitionId" class="col-sm-1 control-label">地区:</label>
+                          <label for="nameplateType" class="col-sm-1 control-label">铭牌类型:</label>
+                          <div class="col-sm-2">
+                            <select name="nameplateType" id="nameplateType" data-btn-class="btn-warning"
+                                    class="form-control">
+                              <option value="" selected="selected">全部</option>
+                            </select>
+                          </div>
+
+                          <label for="type" class="col-sm-1 control-label">铭牌款式:</label>
+                          <div class="col-sm-2">
+                            <select name="type" id="type" data-btn-class="btn-warning" class="form-control">
+                              <option value="" selected="selected">全部</option>
+                            </select>
+                          </div>
+
+                          <label for="partitionId" class="col-sm-1 control-label">地区:</label>
                             <div class="col-sm-2">
                                 <select name="partitionId" id="partitionId" class="form-control"></select>
                             </div>
-                            
+
                         </div>
                     </form>
                     <div class="col-sm-12">
@@ -395,9 +400,9 @@ export default {
                     cache: false,
                     striped: true,
                     showRefresh: false,
-                    pageSize: 10,
+                    pageSize: 20,
                     pagination: true,
-                    pageList: [10, 20, 30, 50],
+                    pageList: [20, 30, 50],
                     search: false,
                     sidePagination: "server", //表示服务端请求
                     queryParamsType: "-",
@@ -406,6 +411,7 @@ export default {
                             pageNumber: params.pageNumber,
                             pageSize: params.pageSize,
                             nameplateType: $('#nameplateType').val(),
+                            id: $('#id').val(),
                             name: $('#name').val(),
                             status: $('#status').val(),
                             type: $('#type').val(),