From 265ae4a9d263a867f663806dbcc6c8a4c7508009 Mon Sep 17 00:00:00 2001
From: Zhao Qiqi <1287235164@qq.com>
Date: Sat, 9 Jul 2022 15:01:59 +0800
Subject: [PATCH] =?UTF-8?q?=E9=87=87=E8=B4=AD=E9=80=80=E5=BA=93--=E9=80=89?=
 =?UTF-8?q?=E6=8B=A9=E8=BD=A6=E8=BE=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../caigoutuiku/relation/xuanzecheliang.vue   | 282 +++++++++---------
 1 file changed, 140 insertions(+), 142 deletions(-)

diff --git a/anrui-scm/anrui-scm-ui/src/views/supplychain/caigoutuiku/relation/xuanzecheliang.vue b/anrui-scm/anrui-scm-ui/src/views/supplychain/caigoutuiku/relation/xuanzecheliang.vue
index 4891a9d9d9..1dca5568f7 100644
--- a/anrui-scm/anrui-scm-ui/src/views/supplychain/caigoutuiku/relation/xuanzecheliang.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/supplychain/caigoutuiku/relation/xuanzecheliang.vue
@@ -8,122 +8,125 @@
           <el-button type="info" size="small" @click="handleReturn()">关闭</el-button>
         </div>
       </div>
-      <div class="webcon">
-        <div class="searchcon">
-          <el-button size="small" class="searchbtn" @click="clicksearchShow">{{ searchxianshitit }}</el-button>
-          <div v-show="isSearchShow" class="search">
-            <el-form ref="listQueryform" :model="listQuery" label-width="130px" class="tab-header">
-              <el-form-item label="品牌">
-                <el-select v-model="listQuery.params.carbrand" class="addinputw" placeholder="请选择"
-                           @change="changeCarbrand">
-                  <el-option v-for="(item, index) in carbrand_list" :key="index.dictKey" :label="item.dictValue"
-                             :value="item.dictKey"/>
-                </el-select>
-              </el-form-item>
-              <el-form-item label="功能">
-                <el-select v-model="listQuery.params.vehicleType" placeholder="请选择" clearable class="addinputw">
-                  <el-option v-for="item in vehicleFunction_list" :key="item.dictKey" :label="item.dictValue"
-                             :value="item.dictKey"/>
-                </el-select>
-              </el-form-item>
-              <el-form-item label="系列">
-                <el-select v-model="listQuery.params.productLine" placeholder="请选择" clearable class="addinputw">
-                  <el-option v-for="item in productLine_list" :key="item.dictKey" :label="item.dictValue"
-                             :value="item.dictKey"/>
-                </el-select>
-              </el-form-item>
-              <el-form-item label="变速箱">
-                <el-select v-model="listQuery.params.gearboxType" class="addinputw" clearable placeholder="请选择">
-                  <el-option v-for="(item,index) in gearboxType_list" :key="item.dictKey" :label="item.dictValue"
-                             :value="item.dictKey"/>
-                </el-select>
-              </el-form-item>
-              <el-form-item label="驱动">
-                <el-select v-model="listQuery.params.driveForm" class="addinputw" clearable placeholder="请选择">
-                  <el-option v-for="(item,index) in driveForm_list" :key="index" :label="item.dictValue"
-                             :value="item.dictKey"/>
-                </el-select>
-              </el-form-item>
-              <el-form-item label="排放标准">
-                <el-select v-model="listQuery.params.emissionStandard" class="addinputw" clearable placeholder="请选择">
-                  <el-option v-for="item in emissionStandard_list" :key="item.dictKey" :label="item.dictValue"
-                             :value="item.dictKey"/>
-                </el-select>
-              </el-form-item>
-              <el-form-item label="马力">
-                <el-select v-model="listQuery.params.power" class="addinputw" clearable placeholder="请选择">
-                  <el-option v-for="(item,index) in power_list" :key="index" :label="item.dictValue"
-                             :value="item.dictKey"/>
-                </el-select>
-              </el-form-item>
-              <el-form-item label="燃料">
-                <el-select v-model="listQuery.params.fuelType" class="addinputw" clearable placeholder="请选择">
-                  <el-option v-for="(item,index) in fuelType_list" :key="index" :label="item.dictValue"
-                             :value="item.dictKey"/>
-                </el-select>
-              </el-form-item>
-              <el-form-item label="版本">
-                <el-select v-model="listQuery.params.vehicleVersion" class="addinputw" clearable placeholder="请选择">
-                  <el-option v-for="(item,index) in vehicleVersion_list" :key="index" :label="item.dictValue"
-                             :value="item.dictKey"/>
-                </el-select>
+      <div class="main-content">
+        <div class="webcon">
+          <div class="searchcon">
+            <el-button size="small" class="searchbtn" @click="clicksearchShow">{{ searchxianshitit }}</el-button>
+            <div v-show="isSearchShow" class="search">
+              <el-form ref="listQueryform" :model="listQuery" label-width="130px" class="tab-header">
+                <el-form-item label="品牌">
+                  <el-select v-model="listQuery.params.carbrand" class="addinputw" placeholder="请选择"
+                             @change="changeCarbrand">
+                    <el-option v-for="(item, index) in carbrand_list" :key="index.dictKey" :label="item.dictValue"
+                               :value="item.dictKey"/>
+                  </el-select>
+                </el-form-item>
+                <el-form-item label="功能">
+                  <el-select v-model="listQuery.params.vehicleType" placeholder="请选择" clearable class="addinputw">
+                    <el-option v-for="item in vehicleFunction_list" :key="item.dictKey" :label="item.dictValue"
+                               :value="item.dictKey"/>
+                  </el-select>
+                </el-form-item>
+                <el-form-item label="系列">
+                  <el-select v-model="listQuery.params.productLine" placeholder="请选择" clearable class="addinputw">
+                    <el-option v-for="item in productLine_list" :key="item.dictKey" :label="item.dictValue"
+                               :value="item.dictKey"/>
+                  </el-select>
+                </el-form-item>
+                <el-form-item label="变速箱">
+                  <el-select v-model="listQuery.params.gearboxType" class="addinputw" clearable placeholder="请选择">
+                    <el-option v-for="(item,index) in gearboxType_list" :key="item.dictKey" :label="item.dictValue"
+                               :value="item.dictKey"/>
+                  </el-select>
+                </el-form-item>
+                <el-form-item label="驱动">
+                  <el-select v-model="listQuery.params.driveForm" class="addinputw" clearable placeholder="请选择">
+                    <el-option v-for="(item,index) in driveForm_list" :key="index" :label="item.dictValue"
+                               :value="item.dictKey"/>
+                  </el-select>
+                </el-form-item>
+                <el-form-item label="排放标准">
+                  <el-select v-model="listQuery.params.emissionStandard" class="addinputw" clearable placeholder="请选择">
+                    <el-option v-for="item in emissionStandard_list" :key="item.dictKey" :label="item.dictValue"
+                               :value="item.dictKey"/>
+                  </el-select>
+                </el-form-item>
+                <el-form-item label="马力">
+                  <el-select v-model="listQuery.params.power" class="addinputw" clearable placeholder="请选择">
+                    <el-option v-for="(item,index) in power_list" :key="index" :label="item.dictValue"
+                               :value="item.dictKey"/>
+                  </el-select>
+                </el-form-item>
+                <el-form-item label="燃料">
+                  <el-select v-model="listQuery.params.fuelType" class="addinputw" clearable placeholder="请选择">
+                    <el-option v-for="(item,index) in fuelType_list" :key="index" :label="item.dictValue"
+                               :value="item.dictKey"/>
+                  </el-select>
+                </el-form-item>
+                <el-form-item label="版本">
+                  <el-select v-model="listQuery.params.vehicleVersion" class="addinputw" clearable placeholder="请选择">
+                    <el-option v-for="(item,index) in vehicleVersion_list" :key="index" :label="item.dictValue"
+                               :value="item.dictKey"/>
+                  </el-select>
 
-              </el-form-item>
-              <el-divider/>
-              <div class="btn" style="text-align: center;">
-                <el-button type="primary" @click="handleFilter">查询</el-button>
-                <el-button type="primary" @click="handleReset">重置</el-button>
-              </div>
-            </el-form>
+                </el-form-item>
+                <el-divider/>
+                <div class="btn" style="text-align: center;">
+                  <el-button type="primary" @click="handleFilter">查询</el-button>
+                  <el-button type="primary" @click="handleReset">重置</el-button>
+                </div>
+              </el-form>
+            </div>
+          </div>
+          <div class="listtop">
+            <div class="tit">现车库存列表</div>
+            <pageye v-show="total>0" :total="total" :page.sync="listQuery.current" :limit.sync="listQuery.size"
+                    class="pagination" @pagination="getList"/>
+          </div>
+          <div class="">
+            <el-table ref="multipleTable" :key="tableKey" v-loading="listLoading" :data="list" border
+                      style="width: 100%"
+                      @selection-change="handleSelectionChange">
+              <el-table-column width="50px" type="selection" align="center"/>
+              <el-table-column width="80px" label="序号" type="index" :index="indexMethod" align="center"/>
+              <el-table-column label="品牌" align="center">
+                <template slot-scope="scope">
+                  <span>{{ scope.row.brandName }}</span>
+                </template>
+              </el-table-column>
+              <el-table-column label="车型" align="center">
+                <template slot-scope="scope">
+                  <span>{{ scope.row.vehicleAlias }}</span>
+                </template>
+              </el-table-column>
+              <el-table-column label="车架号" align="center">
+                <template slot-scope="scope">
+                  <span>{{ scope.row.vinNo }}</span>
+                </template>
+              </el-table-column>
+              <el-table-column label="颜色" align="center">
+                <template slot-scope="scope">
+                  <span>{{ scope.row.color }}</span>
+                </template>
+              </el-table-column>
+              <el-table-column label="存放地点" align="center">
+                <template slot-scope="scope">
+                  <span>{{ scope.row.location }}</span>
+                </template>
+              </el-table-column>
+              <el-table-column label="销售指导价(万元)" align="center">
+                <template slot-scope="scope">
+                  <span>{{ scope.row.guidedPrice }}</span>
+                </template>
+              </el-table-column>
+            </el-table>
+          </div>
+          <div class="pages">
+            <div class="tit"/>
+            <!-- 翻页 -->
+            <pagination v-show="total>0" :total="total" :page.sync="listQuery.current" :limit.sync="listQuery.size"
+                        class="pagination" @pagination="getList"/>
           </div>
-        </div>
-        <div class="listtop">
-          <div class="tit">现车库存列表</div>
-          <pageye v-show="total>0" :total="total" :page.sync="listQuery.current" :limit.sync="listQuery.size"
-                  class="pagination" @pagination="getList"/>
-        </div>
-        <div class="">
-          <el-table ref="multipleTable" :key="tableKey" v-loading="listLoading" :data="list" border style="width: 100%"
-                    @selection-change="handleSelectionChange">
-            <el-table-column width="50px" type="selection" align="center"/>
-            <el-table-column width="80px" label="序号" type="index" :index="indexMethod" align="center"/>
-            <el-table-column label="品牌" align="center">
-              <template slot-scope="scope">
-                <span>{{ scope.row.brandName }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column label="车型" align="center">
-              <template slot-scope="scope">
-                <span>{{ scope.row.vehicleAlias }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column label="车架号" align="center">
-              <template slot-scope="scope">
-                <span>{{ scope.row.vinNo }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column label="颜色" align="center">
-              <template slot-scope="scope">
-                <span>{{ scope.row.color }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column label="存放地点" align="center">
-              <template slot-scope="scope">
-                <span>{{ scope.row.location }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column label="销售指导价(万元)" align="center">
-              <template slot-scope="scope">
-                <span>{{ scope.row.guidedPrice }}</span>
-              </template>
-            </el-table-column>
-          </el-table>
-        </div>
-        <div class="pages">
-          <div class="tit"/>
-          <!-- 翻页 -->
-          <pagination v-show="total>0" :total="total" :page.sync="listQuery.current" :limit.sync="listQuery.size"
-                      class="pagination" @pagination="getList"/>
         </div>
       </div>
     </div>
@@ -131,22 +134,22 @@
 </template>
 
 <script>
-  import { mapGetters } from 'vuex'
-  import Pagination from '@/components/pagination'
-  import pageye from '@/components/pagination/pageye'
-  import req from '@/api/supplychain/purchasereturntowarehouse'
+import { mapGetters } from 'vuex'
+import Pagination from '@/components/pagination'
+import pageye from '@/components/pagination/pageye'
+import req from '@/api/supplychain/purchasereturntowarehouse'
 
-  export default {
-    name: 'xuanzecheliang',
-    components: {
-      Pagination,
-      pageye
-    },
-    data() {
-      return {
-        createPage: '',
-        dialogVisible: false, // 弹窗
-        isSearchShow: false,
+export default {
+  name: 'xuanzecheliang',
+  components: {
+    Pagination,
+    pageye
+  },
+  data() {
+    return {
+      createPage: '',
+      dialogVisible: false, // 弹窗
+      isSearchShow: false,
         searchxianshitit: '显示查询条件',
         btndisabled: false,
         viewState: 1, // 1、列表 2、添加-车辆预定 3、编辑  4、查看 5、订金-定金收取
@@ -180,7 +183,8 @@
             productLine: '',
             vehicleState: '',
             vehicleType: '',
-            vehicleVersion: ''
+            vehicleVersion: '',
+            vinNoList:[]
           }
         },
         selectDate: undefined,
@@ -236,7 +240,8 @@
             productLine: '',
             vehicleState: '',
             vehicleType: '',
-            vehicleVersion: ''
+            vehicleVersion: '',
+            vinNoList: []
           }
         }
       },
@@ -365,7 +370,7 @@
                 }
               }
             }
-            
+
           }
           this.$emit('handleVehicle', this.depositVehicleList)
           this.$nextTick(() => {
@@ -395,15 +400,7 @@
       // 查询列表信息
       getList() {
         this.listLoading = true
-        req.pagerList({
-          current: this.listQuery.current,
-          size: this.listQuery.size,
-          params: {
-            modelName: this.listQuery.modelName,
-            carModel: this.listQuery.carModel,
-            brandName: this.listQuery.brandName
-          }
-        }).then((response) => {
+        req.pagerList(this.listQuery).then((response) => {
           console.log('列表查询结果：', response)
           this.listLoading = false
           if (
@@ -426,7 +423,8 @@
       },
       // 排除已选信息
       loadVinNo(vinNoList) {
-        this.vinNoList = vinNoList
+        this.listQuery.params.vinNoList = vinNoList
+        this.getList()
       }
     }