From 59e7552805d87c917a8cc1f611f694a7ff8b49e8 Mon Sep 17 00:00:00 2001
From: Zhao Qiqi <1287235164@qq.com>
Date: Thu, 16 Jun 2022 18:32:27 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=9A=E5=8A=A1=E7=AE=A1=E7=90=86=EF=BC=88?=
 =?UTF-8?q?=E8=BD=A6=E5=9E=8B=E5=BA=93=E3=80=81=E8=BD=A6=E5=9E=8B=E9=85=8D?=
 =?UTF-8?q?=E7=BD=AE=E4=BB=A5=E5=8F=8A=E9=94=80=E5=94=AE=E8=AE=A2=E5=8D=95?=
 =?UTF-8?q?=E5=85=B3=E8=81=94=E7=9A=84=E8=BD=A6=E5=9E=8B=E5=BA=93=E5=92=8C?=
 =?UTF-8?q?=E8=BD=A6=E5=9E=8B=E9=85=8D=E7=BD=AE=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/api/chexingchaxun/modelinquire.js     |  13 +-
 .../modelinquire/modellibrary.vue             | 209 +++++++-----
 .../vehiclelibraryconfiguration.vue           |  77 +++--
 .../xiaoshoudingdan/relation/modellibrary.vue | 320 ++++++++++--------
 .../relation/vehiclelibraryconfiguration.vue  |  58 ++--
 5 files changed, 389 insertions(+), 288 deletions(-)

diff --git a/anrui-buscenter/anrui-buscenter-ui/src/api/chexingchaxun/modelinquire.js b/anrui-buscenter/anrui-buscenter-ui/src/api/chexingchaxun/modelinquire.js
index 0bb3d18e2b..66e161f453 100644
--- a/anrui-buscenter/anrui-buscenter-ui/src/api/chexingchaxun/modelinquire.js
+++ b/anrui-buscenter/anrui-buscenter-ui/src/api/chexingchaxun/modelinquire.js
@@ -1,9 +1,11 @@
 import request from '@/utils/request'
 
+// 车型库
 // 根据条件分页查询数据的列表(车型)
 export function modelPageList(data) {
   return request({
-    url: '/base/v1/basevehiclemodel/modelPageList',
+    // url: '/base/v1/basevehiclemodel/modelPageList', // 旧接口
+    url: '/base/v1/basevehicle/getModelList',
     method: 'post',
     data: data,
     headers: {
@@ -31,6 +33,15 @@ export function dataDictionary(data) {
     params: data
   })
 }
+// 根据登陆人sid查询分公司 （孟哲写的接口）
+export function getPathSidByUserSid(data) {
+  return request({
+    url: '/portal/v1/sysstafforg/getPathSidByUserSid',
+    method: 'get',
+    params: data
+  })
+}
+
 // 品牌下拉
 export function brandDown(data) {
   return request({
diff --git a/anrui-buscenter/anrui-buscenter-ui/src/views/chexingchaxun/modelinquire/modellibrary.vue b/anrui-buscenter/anrui-buscenter-ui/src/views/chexingchaxun/modelinquire/modellibrary.vue
index ce7b572061..82377a482a 100644
--- a/anrui-buscenter/anrui-buscenter-ui/src/views/chexingchaxun/modelinquire/modellibrary.vue
+++ b/anrui-buscenter/anrui-buscenter-ui/src/views/chexingchaxun/modelinquire/modellibrary.vue
@@ -12,81 +12,76 @@
           <el-button size="small" class="searchbtn" @click="clicksearchShow">{{ searchxianshitit }}</el-button>
           <div v-show="isSearchShow" class="search">
             <el-form ref="listQueryform" :inline="true" :model="listQuery" label-width="100px" class="tab-header">
-              <el-row>
                 <el-form-item label="品牌:" class="searchlist">
-                  <el-select v-model="listQuery.params.carBrand" placeholder="请选择" filterable clearable>
-                    <el-option v-for="item in carBrand_list" :key="item.sid" :label="item.brandName" :value="item.sid"/>
+                  <el-select v-model="listQuery.params.brand" placeholder="请选择" filterable clearable>
+                    <el-option v-for="item in carBrand_list" :key="item.sid" :label="item.brandName" :value="item.brandName"/>
                   </el-select>
                 </el-form-item>
                 <el-form-item label="功能:" class="searchlist">
-                  <el-select v-model="listQuery.params.vehicleType" placeholder="请选择" filterable clearable>
-                    <el-option v-for="item in vehicleType_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"/>
+                  <el-select v-model="listQuery.params.vehicleFunction" placeholder="请选择" filterable clearable>
+                    <el-option v-for="item in vehicleType_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictValue"/>
                   </el-select>
                 </el-form-item>
-                <el-form-item label="系列:" class="searchlist">
+                <el-form-item label="系列:" class="searchlist"> <!-- 接口上无此请求参数，但原型上有 -->
                   <el-select v-model="listQuery.params.productLine" placeholder="请选择" filterable clearable>
-                    <el-option v-for="item in productLine_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"/>
+                    <el-option v-for="item in productLine_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictValue"/>
                   </el-select>
                 </el-form-item>
                 <el-form-item label="驱动:" class="searchlist">
-                  <el-select v-model="listQuery.params.driveForm" placeholder="请选择" filterable clearable>
-                    <el-option v-for="item in driveForm_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"/>
+                  <el-select v-model="listQuery.params.driver" placeholder="请选择" filterable clearable>
+                    <el-option v-for="item in driveForm_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictValue"/>
                   </el-select>
                 </el-form-item>
                 <el-form-item label="马力:" class="searchlist">
-                  <el-select v-model="listQuery.params.power" placeholder="请选择" filterable clearable>
-                    <el-option v-for="item in power_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"/>
+                  <el-select v-model="listQuery.params.horsepower" placeholder="请选择" filterable clearable>
+                    <el-option v-for="item in power_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictValue"/>
                   </el-select>
                 </el-form-item>
                 <el-form-item label="版本:" class="searchlist">
                   <el-select v-model="listQuery.params.vehicleVersion" placeholder="请选择" filterable clearable>
-                    <el-option v-for="item in vehicleVersion_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"/>
+                    <el-option v-for="item in vehicleVersion_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictValue"/>
                   </el-select>
                 </el-form-item>
-              </el-row>
-              <el-row>
                 <el-form-item label="燃料:" class="searchlist">
                   <el-select v-model="listQuery.params.fuelType" placeholder="请选择" filterable clearable>
-                    <el-option v-for="item in fuelType_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"/>
+                    <el-option v-for="item in fuelType_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictValue"/>
                   </el-select>
                 </el-form-item>
-                <el-form-item label="车型编码:" class="searchlist">
-                  <el-input v-model="listQuery.params.applyName" placeholder="" clearable style="width: 150px"/>
-                </el-form-item>
+<!--                <el-form-item label="车型编码:" class="searchlist">&lt;!&ndash; 接口上无此请求参数，但原型上有 &ndash;&gt;-->
+<!--                  <el-input v-model="listQuery.params.applyName" placeholder="" clearable style="width: 150px"/>-->
+<!--                </el-form-item>-->
                 <el-form-item label="变速箱:" class="searchlist">
-                  <el-select v-model="listQuery.params.gearboxType" placeholder="请选择" filterable clearable>
-                    <el-option v-for="item in gearboxType_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"/>
+                  <el-select v-model="listQuery.params.gearbox" placeholder="请选择" filterable clearable>
+                    <el-option v-for="item in gearboxType_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictValue"/>
                   </el-select>
                 </el-form-item>
                 <el-form-item label="排放标准:" class="searchlist">
                   <el-select v-model="listQuery.params.emissionStandard" placeholder="请选择" filterable clearable>
-                    <el-option v-for="item in emissionStandard_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"/>
+                    <el-option v-for="item in emissionStandard_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictValue"/>
                   </el-select>
                 </el-form-item>
-                <el-form-item label="发动机型号:" class="searchlist">
+                <el-form-item label="发动机型号:" class="searchlist"><!-- 接口上无此请求参数，但原型上有 -->
                   <el-select v-model="listQuery.params.engineType" placeholder="请选择" filterable clearable>
-                    <el-option v-for="item in engineType_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"/>
+                    <el-option v-for="item in engineType_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictValue"/>
                   </el-select>
                 </el-form-item>
-                <el-form-item label="细分市场:" class="searchlist">
+                <el-form-item label="细分市场:" class="searchlist"><!-- 无作用请求参数 -->
                   <el-select v-model="listQuery.params.marketSegments" placeholder="请选择" filterable clearable>
-                    <el-option v-for="item in marketSegments_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"/>
+                    <el-option v-for="item in marketSegments_list" :key="item.dictKey" :label="item.dictValue"
+                               :value="item.dictKey"/>
                   </el-select>
                 </el-form-item>
-              </el-row>
-              <el-row>
-                <el-form-item label="规格型号:" class="searchlist">
-                  <el-input v-model="listQuery.params.specifications" placeholder="" clearable style="width: 150px"/>
-                </el-form-item>
-                <el-form-item label="快捷检索:" class="searchlist">
-                  <el-input v-model="listQuery.params.modelName" placeholder="" clearable style="width: 150px"/>
-                </el-form-item>
-              </el-row>
-              <div class="searchbtns">
-                <el-button type="primary" @click="handleFilter">查询</el-button>
-                <el-button type="primary" @click="handReset">重置</el-button>
-              </div>
+              <el-form-item label="规格型号:" class="searchlist">
+                <el-input v-model="listQuery.params.specifications" placeholder="" clearable style="width: 150px"/>
+              </el-form-item>
+              <el-form-item label="快捷检索:" class="searchlist">
+                <el-input v-model="listQuery.params.name" placeholder="" clearable style="width: 150px"/>
+              </el-form-item>
             </el-form>
+            <div class="btn">
+              <el-button type="primary" @click="handleFilter">查询</el-button>
+              <el-button type="primary" @click="handReset">重置</el-button>
+            </div>
           </div>
         </div>
         <div class="listtop">
@@ -96,47 +91,52 @@
         <div class="">
           <el-table :key="tableKey" v-loading="listLoading" :data="list" border style="width: 100%">
             <el-table-column width="80px" label="序号" type="index" :index="indexMethod" align="center"/>
-            <el-table-column label="品牌" align="center">
+            <el-table-column width="120px" 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 class="bluezi" @click="handlink(scope.row)">{{ scope.row.vehicleAlias }}</span>
+                <span class="bluezi" @click="handlink(scope.row)">{{ scope.row.modelName }}</span>
               </template>
             </el-table-column>
-            <el-table-column label="版本" align="center">
-              <template slot-scope="scope">
-                <span>{{ scope.row.vehicleVersionValue }}</span>
+            <el-table-column width="100px" label="版本" align="center">
+              <template slot-scope="scope"> <!-- 旧：vehicleVersionValue-->
+                <span>{{ scope.row.versionValue }}</span>
               </template>
             </el-table-column>
-            <el-table-column label="燃料" align="center">
+            <el-table-column width="100px" label="燃料" align="center">
               <template slot-scope="scope">
                 <span>{{ scope.row.fuelTypeValue }}</span>
               </template>
             </el-table-column>
-            <el-table-column label="变速箱" align="center">
+            <el-table-column width="100px" label="变速箱" align="center">
               <template slot-scope="scope">
                 <span>{{ scope.row.gearboxTypeValue }}</span>
               </template>
             </el-table-column>
-            <el-table-column label="销售指导价（万元）" align="center">
+            <el-table-column width="150px" label="销售指导价（万元）" align="center">
               <template slot-scope="scope">
                 <span>{{ scope.row.guidedPrice }}</span>
               </template>
             </el-table-column>
-            <el-table-column label="现车" align="center">
+            <el-table-column width="100px" label="车型图片" align="center">
+              <template slot-scope="scope">
+                <el-button type="primary" size="small" @click="handlookImg(scope.row)">查看</el-button>
+              </template>
+            </el-table-column>
+            <el-table-column width="110px" label="现车" align="center">
               <template slot-scope="scope">
                 <span>{{ scope.row.nowCarNum }}</span>
               </template>
             </el-table-column>
-            <el-table-column label="排产" align="center">
+            <el-table-column width="110px" label="排产" align="center">
               <template slot-scope="scope">
-                <span>{{ scope.row.productionCarNum }}</span>
+                <span>{{ scope.row.produceCarNum }}</span>
               </template>
             </el-table-column>
-            <el-table-column label="操作" align="center">
+            <el-table-column width="100px" label="其他更多" align="center">
               <template slot-scope="scope">
                 <el-button type="primary" size="small" @click="handlook(scope.row)">查看</el-button>
               </template>
@@ -145,16 +145,23 @@
         </div>
         <div class="pages">
           <!-- 翻页 -->
-          <pagination v-show="list.length > 0" :total="listQuery.total" :page.sync="listQuery.current" :limit.sync="listQuery.size" class="pagination" @pagination="getList"/>
+          <pagination v-show="list.length > 0" :total="listQuery.total" :page.sync="listQuery.current"
+                      :limit.sync="listQuery.size" class="pagination" @pagination="getList"/>
         </div>
       </div>
     </div>
+    <!-- 查看车型照片弹窗 -->
+    <el-dialog title="查看" :visible.sync="dialogImgVisible">
+      <el-image v-for="item in srcList" :key="item" style="width: 100px; height: 100px" :src="item"
+                :preview-src-list="srcList"/>
+    </el-dialog>
+    <!-- 其他更多配置弹窗 -->
     <el-dialog :visible.sync="dialogVisible" width="50%">
       <el-table :key="tableKey" :data="datalist" border style="width: 100%">
         <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.company }}</span>
+            <span>{{ scope.row.companyName }}</span>
           </template>
         </el-table-column>
         <el-table-column label="现车" align="center">
@@ -164,7 +171,7 @@
         </el-table-column>
         <el-table-column label="排产车" align="center">
           <template slot-scope="scope">
-            <span>{{ scope.row.productionCarNum }}</span>
+            <span>{{ scope.row.produceCarNum }}</span>
           </template>
         </el-table-column>
       </el-table>
@@ -175,7 +182,7 @@
 </template>
 
 <script>
-import { modelPageList, dataDictionary, brandDown, notTheCompanyModelPageList } from '@/api/chexingchaxun/modelinquire.js'
+import {brandDown, dataDictionary, getPathSidByUserSid, modelPageList} from '@/api/chexingchaxun/modelinquire.js'
 import Pagination from '@/components/pagination'
 import pageye from '@/components/pagination/pageye'
 import configuration from './vehiclelibraryconfiguration.vue'
@@ -190,10 +197,12 @@ export default {
   data() {
     return {
       isSearchShow: false,
-      dialogVisible: false,
+      dialogVisible: false, // 其他更多弹窗
+      dialogImgVisible: false, // 车型照片弹窗
       searchxianshitit: '显示查询条件',
       viewState: 1,
       tableKey: 0,
+      srcList: [],
       list: [],
       datalist: [],
       carBrand_list: [],
@@ -221,16 +230,16 @@ export default {
         current: 1,
         size: 10,
         params: {
-          carBrand: '', // 品牌
-          driveForm: '', // 驱动
+          brand: '', // 品牌
+          driver: '', // 驱动
           fuelType: '', // 燃料
-          gearboxType: '', // 变速箱
+          gearbox: '', // 变速箱
           modelName: '', // 车型
-          power: '', // 马力
+          horsepower: '', // 马力
           productLine: '', // 系列
-          useOrg: '', // 分公司
+          // useOrg: '', // 分公司 后端使用
           userSid: window.sessionStorage.getItem('userSid'), // 用户
-          vehicleType: '', // 功能
+          vehicleFunction: '', // 功能
           vehicleVersion: '', // 版本
           emissionStandard: '', // 排放标准
           engineType: '', // 发动机型号
@@ -259,46 +268,60 @@ export default {
     },
     init() {
       this.getList()
+      this.getPathSid()
     },
     // ----------功能打开结束--------
-    // 数组字典加载
-    Dictionary() {
-      brandDown().then((res) => {
+    getPathSid() {
+      const userSid = window.sessionStorage.getItem('userSid')
+      getPathSidByUserSid({userSid: userSid}).then((res) => {
+        if (res.code === '200') {
+          // this.listQuery.params.createOrgSId = res.data
+          this.useOrg = res.data
+          this.getBrand(res.data)
+        }
+      })
+    },
+    // 下拉框-品牌
+    getBrand(useOrg) {
+      brandDown({useOrg: useOrg}).then((res) => {
         if (res.code === '200') {
           this.carBrand_list = res.data
         }
       })
-      dataDictionary({ type: 'vehicleFunction' }).then((res) => {
+    },
+    // 数组字典加载
+    Dictionary() {
+      dataDictionary({type: 'vehicleFunction'}).then((res) => {
         if (res.code === '200') {
           this.vehicleType_list = res.data
         }
       })
-      dataDictionary({ type: 'productLine' }).then((res) => {
+      dataDictionary({type: 'productLine'}).then((res) => {
         if (res.code === '200') {
           this.productLine_list = res.data
         }
       })
-      dataDictionary({ type: 'driver' }).then((res) => {
+      dataDictionary({type: 'driver'}).then((res) => {
         if (res.code === '200') {
           this.driveForm_list = res.data
         }
       })
-      dataDictionary({ type: 'horsepower' }).then((res) => {
+      dataDictionary({type: 'horsepower'}).then((res) => {
         if (res.code === '200') {
           this.power_list = res.data
         }
       })
-      dataDictionary({ type: 'vehicleVersion' }).then((res) => {
+      dataDictionary({type: 'vehicleVersion'}).then((res) => {
         if (res.code === '200') {
           this.vehicleVersion_list = res.data
         }
       })
-      dataDictionary({ type: 'fuelType' }).then((res) => {
+      dataDictionary({type: 'fuelType'}).then((res) => {
         if (res.code === '200') {
           this.fuelType_list = res.data
         }
       })
-      dataDictionary({ type: 'gearbox' }).then((res) => {
+      dataDictionary({type: 'gearbox'}).then((res) => {
         if (res.code === '200') {
           this.gearboxType_list = res.data
         }
@@ -345,16 +368,16 @@ export default {
         current: 1,
         size: 10,
         params: {
-          carBrand: '', // 品牌
-          driveForm: '', // 驱动
+          brand: '', // 品牌
+          driver: '', // 驱动
           fuelType: '', // 燃料
-          gearboxType: '', // 变速箱
+          gearbox: '', // 变速箱
           modelName: '', // 车型
-          power: '', // 马力
+          horsepower: '', // 马力
           productLine: '', // 系列
-          useOrg: '', // 分公司
+          // useOrg: '', // 分公司 后端使用
           userSid: window.sessionStorage.getItem('userSid'), // 用户
-          vehicleType: '', // 功能
+          vehicleFunction: '', // 功能
           vehicleVersion: '', // 版本
           emissionStandard: '', // 排放标准
           engineType: '', // 发动机型号
@@ -365,14 +388,23 @@ export default {
       }
       this.getList()
     },
+    handlookImg(row) {
+      this.dialogImgVisible = true
+      console.log('图片列表', row.modelImage)
+      const imgList = []
+      imgList.push(row.modelImage)
+      this.srcList = imgList // 暂时是一张图片，和移动端保持一致
+      console.log('图片列表', this.srcList)
+    },
     handlook(row) {
       this.dialogVisible = true
-      this.dialogQuery.params.modelSid = row.sid
-      notTheCompanyModelPageList(this.dialogQuery).then((res) => {
-        if (res.code === '200') {
-          this.datalist = res.data.records
-        }
-      })
+      this.datalist = row.moreList
+      // this.dialogQuery.params.modelSid = row.sid
+      // notTheCompanyModelPageList(this.dialogQuery).then((res) => {
+      //   if (res.code === '200') {
+      //     this.datalist = res.data.records
+      //   }
+      // })
     },
     handlink(row) {
       this.viewState = 2
@@ -401,8 +433,19 @@ export default {
 .pagination {
   margin-bottom: -10px;
 }
+
 .searchbtn {
   border: #2cab69 1px solid;
   color: #2cab69;
 }
+
+.btn {
+  padding: 15px 0 15px 0;
+  border: 1px solid #e0e3eb;
+  text-align: center;
+}
+
+.tab-header {
+  margin-bottom: 0 !important;
+}
 </style>
diff --git a/anrui-buscenter/anrui-buscenter-ui/src/views/chexingchaxun/modelinquire/vehiclelibraryconfiguration.vue b/anrui-buscenter/anrui-buscenter-ui/src/views/chexingchaxun/modelinquire/vehiclelibraryconfiguration.vue
index 90782aef85..40cfba53d8 100644
--- a/anrui-buscenter/anrui-buscenter-ui/src/views/chexingchaxun/modelinquire/vehiclelibraryconfiguration.vue
+++ b/anrui-buscenter/anrui-buscenter-ui/src/views/chexingchaxun/modelinquire/vehiclelibraryconfiguration.vue
@@ -12,7 +12,6 @@
           <el-button size="small" class="searchbtn" @click="clicksearchShow">{{ searchxianshitit }}</el-button>
           <div v-show="isSearchShow" class="search">
             <el-form ref="listQueryform" :inline="true" :model="listQuery" label-width="100px" class="tab-header">
-              <el-row>
                 <el-form-item label="颜色:" class="searchlist">
                   <el-select v-model="listQuery.params.carColor" placeholder="请选择" filterable clearable>
                     <el-option v-for="item in carColor_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"/>
@@ -43,8 +42,6 @@
                     <el-option v-for="item in rearAxleRatio_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"/>
                   </el-select>
                 </el-form-item>
-              </el-row>
-              <el-row>
                 <el-form-item label="空调:" class="searchlist">
                   <el-select v-model="listQuery.params.airConditionerKey" placeholder="请选择" filterable clearable>
                     <el-option v-for="item in airConditioner_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"/>
@@ -75,8 +72,6 @@
                     <el-option v-for="item in tireCover_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"/>
                   </el-select>
                 </el-form-item>
-              </el-row>
-              <el-row>
                 <el-form-item label="鞍座:" class="searchlist">
                   <el-select v-model="listQuery.params.saddleKey" placeholder="请选择" filterable clearable>
                     <el-option v-for="item in saddle_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"/>
@@ -107,22 +102,20 @@
                     <el-option v-for="item in fuelTank_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"/>
                   </el-select>
                 </el-form-item>
-              </el-row>
-              <el-row>
-                <el-form-item label="多媒体:" class="searchlist">
-                  <el-select v-model="listQuery.params.multimediaKey" placeholder="请选择" filterable clearable>
-                    <el-option v-for="item in multimedia_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"/>
-                  </el-select>
-                </el-form-item>
-                <el-form-item label="快捷检索:" class="searchlist">
-                  <el-input v-model="listQuery.params.configName" placeholder="" clearable style="width: 150px"/>
-                </el-form-item>
-              </el-row>
-              <div class="searchbtns">
-                <el-button type="primary" @click="handleFilter">查询</el-button>
-                <el-button type="primary" @click="handReset">重置</el-button>
-              </div>
+              <el-form-item label="多媒体:" class="searchlist">
+                <el-select v-model="listQuery.params.multimediaKey" placeholder="请选择" filterable clearable>
+                  <el-option v-for="item in multimedia_list" :key="item.dictKey" :label="item.dictValue"
+                             :value="item.dictKey"/>
+                </el-select>
+              </el-form-item>
+              <el-form-item label="快捷检索:" class="searchlist">
+                <el-input v-model="listQuery.params.configName" placeholder="" clearable style="width: 150px"/>
+              </el-form-item>
             </el-form>
+            <div class="btn">
+              <el-button type="primary" @click="handleFilter">查询</el-button>
+              <el-button type="primary" @click="handReset">重置</el-button>
+            </div>
           </div>
         </div>
         <div class="listtop">
@@ -157,11 +150,11 @@
                 <span>{{ scope.row.guidedPrice }}</span>
               </template>
             </el-table-column>
-            <el-table-column label="价格有效期" align="center" width="110">
-              <template slot-scope="scope">
-                <span>{{ scope.row.priceValidity }}</span>
-              </template>
-            </el-table-column>
+            <!--            <el-table-column label="价格有效期" align="center" width="110">-->
+            <!--              <template slot-scope="scope">-->
+            <!--                <span>{{ scope.row.priceValidity }}</span>-->
+            <!--              </template>-->
+            <!--            </el-table-column>-->
             <el-table-column label="其他更多" align="center" width="100">
               <template slot-scope="scope">
                 <el-button type="primary" size="small" @click="handlook(scope.row)">查看</el-button>
@@ -180,7 +173,7 @@
         <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.company }}</span>
+            <span>{{ scope.row.companyName }}</span>
           </template>
         </el-table-column>
         <el-table-column label="现车" align="center">
@@ -190,7 +183,7 @@
         </el-table-column>
         <el-table-column label="排产车" align="center">
           <template slot-scope="scope">
-            <span>{{ scope.row.productionCarNum }}</span>
+            <span>{{ scope.row.produceCarNum }}</span>
           </template>
         </el-table-column>
       </el-table>
@@ -205,7 +198,7 @@
 </template>
 
 <script>
-import { configPageList, dataDictionary, notTheCompanyModelPageList } from '@/api/chexingchaxun/modelinquire.js'
+import {configPageList, dataDictionary} from '@/api/chexingchaxun/modelinquire.js'
 import Pagination from '@/components/pagination'
 import pageye from '@/components/pagination/pageye'
 import modelstandardconfiguration from './modelstandardconfiguration'
@@ -409,7 +402,7 @@ export default {
     showData(row) {
       this.listQuery.params.modelSid = row.sid
       this.modelSid = row.sid
-      this.modelName = row.vehicleAlias
+      this.modelName = row.modelName
       this.Dictionary()
       this.getList()
     },
@@ -462,13 +455,14 @@ export default {
     },
     handlook(row) {
       this.dialogVisible = true
-      this.dialogQuery.params.modelSid = this.listQuery.params.modelSid
-      this.dialogQuery.params.modelConfigSid = row.sid
-      notTheCompanyModelPageList(this.dialogQuery).then((res) => {
-        if (res.code === '200') {
-          this.datalist = res.data.records
-        }
-      })
+      this.datalist = row.moreList
+      // this.dialogQuery.params.modelSid = this.listQuery.params.modelSid
+      // this.dialogQuery.params.modelConfigSid = row.sid
+      // notTheCompanyModelPageList(this.dialogQuery).then((res) => {
+      //   if (res.code === '200') {
+      //     this.datalist = res.data.records
+      //   }
+      // })
     },
     handlink(row) {
       this.viewState = 2
@@ -508,8 +502,19 @@ export default {
 .pagination {
   margin-bottom: -10px;
 }
+
 .searchbtn {
   border: #2cab69 1px solid;
   color: #2cab69;
 }
+
+.btn {
+  padding: 15px 0 15px 0;
+  border: 1px solid #e0e3eb;
+  text-align: center;
+}
+
+.tab-header {
+  margin-bottom: 0 !important;
+}
 </style>
diff --git a/anrui-buscenter/anrui-buscenter-ui/src/views/xiaoshouguanli/xiaoshoudingdan/relation/modellibrary.vue b/anrui-buscenter/anrui-buscenter-ui/src/views/xiaoshouguanli/xiaoshoudingdan/relation/modellibrary.vue
index 0858730092..47d4d74f5e 100644
--- a/anrui-buscenter/anrui-buscenter-ui/src/views/xiaoshouguanli/xiaoshoudingdan/relation/modellibrary.vue
+++ b/anrui-buscenter/anrui-buscenter-ui/src/views/xiaoshouguanli/xiaoshoudingdan/relation/modellibrary.vue
@@ -12,138 +12,131 @@
           <el-button size="small" class="searchbtn" @click="clicksearchShow">{{ searchxianshitit }}</el-button>
           <div v-show="isSearchShow" class="search">
             <el-form ref="listQueryform" :inline="true" :model="listQuery" label-width="100px" class="tab-header">
-              <el-row>
-                <el-form-item label="品牌:" class="searchlist">
-                  <el-select v-model="listQuery.params.carBrand" placeholder="请选择" filterable clearable>
-                    <el-option v-for="item in carBrand_list" :key="item.sid" :label="item.brandName"
-                               :value="item.brandName"/>
-                  </el-select>
-                </el-form-item>
-                <el-form-item label="功能:" class="searchlist">
-                  <el-select v-model="listQuery.params.vehicleType" placeholder="请选择" filterable clearable>
-                    <el-option v-for="item in vehicleType_list" :key="item.dictKey" :label="item.dictValue"
-                               :value="item.dictKey"/>
-                  </el-select>
-                </el-form-item>
-                <el-form-item label="系列:" class="searchlist">
-                  <el-select v-model="listQuery.params.productLine" placeholder="请选择" filterable clearable>
-                    <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="驱动:" class="searchlist">
-                  <el-select v-model="listQuery.params.driveForm" placeholder="请选择" filterable clearable>
-                    <el-option v-for="item in driveForm_list" :key="item.dictKey" :label="item.dictValue"
-                               :value="item.dictKey"/>
-                  </el-select>
-                </el-form-item>
-                <el-form-item label="马力:" class="searchlist">
-                  <el-select v-model="listQuery.params.power" placeholder="请选择" filterable clearable>
-                    <el-option v-for="item in power_list" :key="item.dictKey" :label="item.dictValue"
-                               :value="item.dictKey"/>
-                  </el-select>
-                </el-form-item>
-                <el-form-item label="版本:" class="searchlist">
-                  <el-select v-model="listQuery.params.vehicleVersion" placeholder="请选择" filterable clearable>
-                    <el-option v-for="item in vehicleVersion_list" :key="item.dictKey" :label="item.dictValue"
-                               :value="item.dictKey"/>
-                  </el-select>
-                </el-form-item>
-              </el-row>
-              <el-row>
-                <el-form-item label="燃料:" class="searchlist">
-                  <el-select v-model="listQuery.params.fuelType" placeholder="请选择" filterable clearable>
-                    <el-option v-for="item in fuelType_list" :key="item.dictKey" :label="item.dictValue"
-                               :value="item.dictKey"/>
-                  </el-select>
-                </el-form-item>
-                <el-form-item label="车型编码:" class="searchlist">
-                  <el-input v-model="listQuery.params.applyName" placeholder="" clearable style="width: 150px"/>
-                </el-form-item>
-                <el-form-item label="变速箱:" class="searchlist">
-                  <el-select v-model="listQuery.params.gearboxType" placeholder="请选择" filterable clearable>
-                    <el-option v-for="item in gearboxType_list" :key="item.dictKey" :label="item.dictValue"
-                               :value="item.dictKey"/>
-                  </el-select>
-                </el-form-item>
-                <el-form-item label="排放标准:" class="searchlist">
-                  <el-select v-model="listQuery.params.emissionStandard" placeholder="请选择" filterable clearable>
-                    <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="发动机型号:" class="searchlist">
-                  <el-select v-model="listQuery.params.engineType" placeholder="请选择" filterable clearable>
-                    <el-option v-for="item in engineType_list" :key="item.dictKey" :label="item.dictValue"
-                               :value="item.dictKey"/>
-                  </el-select>
-                </el-form-item>
-                <el-form-item label="细分市场:" class="searchlist">
-                  <el-select v-model="listQuery.params.marketSegments" placeholder="请选择" filterable clearable>
-                    <el-option v-for="item in marketSegments_list" :key="item.dictKey" :label="item.dictValue"
-                               :value="item.dictKey"/>
-                  </el-select>
-                </el-form-item>
-              </el-row>
-              <el-row>
-                <el-form-item label="规格型号:" class="searchlist">
-                  <el-input v-model="listQuery.params.specifications" placeholder="" clearable style="width: 150px"/>
-                </el-form-item>
-                <el-form-item label="快捷检索:" class="searchlist">
-                  <el-input v-model="listQuery.params.modelName" placeholder="" clearable style="width: 150px"/>
-                </el-form-item>
-              </el-row>
-              <div class="searchbtns">
-                <el-button type="primary" @click="handleFilter">查询</el-button>
-                <el-button type="primary" @click="handReset">重置</el-button>
-              </div>
+              <el-form-item label="品牌:" class="searchlist">
+                <el-select v-model="listQuery.params.brand" placeholder="请选择" filterable clearable>
+                  <el-option v-for="item in carBrand_list" :key="item.sid" :label="item.brandName" :value="item.brandName"/>
+                </el-select>
+              </el-form-item>
+              <el-form-item label="功能:" class="searchlist">
+                <el-select v-model="listQuery.params.vehicleFunction" placeholder="请选择" filterable clearable>
+                  <el-option v-for="item in vehicleType_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictValue"/>
+                </el-select>
+              </el-form-item>
+              <el-form-item label="系列:" class="searchlist"> <!-- 接口上无此请求参数，但原型上有 -->
+                <el-select v-model="listQuery.params.productLine" placeholder="请选择" filterable clearable>
+                  <el-option v-for="item in productLine_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictValue"/>
+                </el-select>
+              </el-form-item>
+              <el-form-item label="驱动:" class="searchlist">
+                <el-select v-model="listQuery.params.driver" placeholder="请选择" filterable clearable>
+                  <el-option v-for="item in driveForm_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictValue"/>
+                </el-select>
+              </el-form-item>
+              <el-form-item label="马力:" class="searchlist">
+                <el-select v-model="listQuery.params.horsepower" placeholder="请选择" filterable clearable>
+                  <el-option v-for="item in power_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictValue"/>
+                </el-select>
+              </el-form-item>
+              <el-form-item label="版本:" class="searchlist">
+                <el-select v-model="listQuery.params.vehicleVersion" placeholder="请选择" filterable clearable>
+                  <el-option v-for="item in vehicleVersion_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictValue"/>
+                </el-select>
+              </el-form-item>
+              <el-form-item label="燃料:" class="searchlist">
+                <el-select v-model="listQuery.params.fuelType" placeholder="请选择" filterable clearable>
+                  <el-option v-for="item in fuelType_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictValue"/>
+                </el-select>
+              </el-form-item>
+<!--              <el-form-item label="车型编码:" class="searchlist">&lt;!&ndash; 接口上无此请求参数，但原型上有 &ndash;&gt;-->
+<!--                <el-input v-model="listQuery.params.applyName" placeholder="" clearable style="width: 150px"/>-->
+<!--              </el-form-item>-->
+              <el-form-item label="变速箱:" class="searchlist">
+                <el-select v-model="listQuery.params.gearbox" placeholder="请选择" filterable clearable>
+                  <el-option v-for="item in gearboxType_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictValue"/>
+                </el-select>
+              </el-form-item>
+              <el-form-item label="排放标准:" class="searchlist">
+                <el-select v-model="listQuery.params.emissionStandard" placeholder="请选择" filterable clearable>
+                  <el-option v-for="item in emissionStandard_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictValue"/>
+                </el-select>
+              </el-form-item>
+              <el-form-item label="发动机型号:" class="searchlist"><!-- 接口上无此请求参数，但原型上有 -->
+                <el-select v-model="listQuery.params.engineType" placeholder="请选择" filterable clearable>
+                  <el-option v-for="item in engineType_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictValue"/>
+                </el-select>
+              </el-form-item>
+              <el-form-item label="细分市场:" class="searchlist"><!-- 无作用请求参数 -->
+                <el-select v-model="listQuery.params.marketSegments" placeholder="请选择" filterable clearable>
+                  <el-option v-for="item in marketSegments_list" :key="item.dictKey" :label="item.dictValue"
+                             :value="item.dictKey"/>
+                </el-select>
+              </el-form-item>
+              <el-form-item label="规格型号:" class="searchlist">
+                <el-input v-model="listQuery.params.specifications" placeholder="" clearable style="width: 150px"/>
+              </el-form-item>
+              <el-form-item label="快捷检索:" class="searchlist">
+                <el-input v-model="listQuery.params.name" placeholder="" clearable style="width: 150px"/>
+              </el-form-item>
             </el-form>
+            <div class="btn">
+              <el-button type="primary" @click="handleFilter">查询</el-button>
+              <el-button type="primary" @click="handReset">重置</el-button>
+            </div>
           </div>
         </div>
         <div class="listtop">
           <div class="tit">车辆列表</div>
-          <pageye v-show="list.length > 0" :total="listQuery.total" :page.sync="listQuery.current"
-                  :limit.sync="listQuery.size" class="pagination" @pagination="getList"/>
+          <pageye v-show="list.length > 0" :total="listQuery.total" :page.sync="listQuery.current" :limit.sync="listQuery.size" class="pagination" @pagination="getList"/>
         </div>
         <div class="">
           <el-table :key="tableKey" v-loading="listLoading" :data="list" border style="width: 100%">
             <el-table-column width="80px" label="序号" type="index" :index="indexMethod" align="center"/>
-            <el-table-column label="车型" align="center">
+            <el-table-column width="120px" label="品牌" align="center">
               <template slot-scope="scope">
-                <span class="bluezi" @click="handlink(scope.row)">{{ scope.row.vehicleAlias }}</span>
+                <span>{{ scope.row.brandName }}</span>
               </template>
             </el-table-column>
-            <el-table-column label="版本" align="center">
+            <el-table-column label="车型" align="center">
               <template slot-scope="scope">
-                <span>{{ scope.row.vehicleVersionValue }}</span>
+                <span class="bluezi" @click="handlink(scope.row)">{{ scope.row.modelName }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column width="100px" label="版本" align="center">
+              <template slot-scope="scope"> <!-- 旧：vehicleVersionValue-->
+                <span>{{ scope.row.versionValue }}</span>
               </template>
             </el-table-column>
-            <el-table-column label="燃料" align="center">
+            <el-table-column width="100px" label="燃料" align="center">
               <template slot-scope="scope">
                 <span>{{ scope.row.fuelTypeValue }}</span>
               </template>
             </el-table-column>
-            <el-table-column label="变速箱" align="center">
+            <el-table-column width="100px" label="变速箱" align="center">
               <template slot-scope="scope">
                 <span>{{ scope.row.gearboxTypeValue }}</span>
               </template>
             </el-table-column>
-            <el-table-column label="销售指导价（万元）" align="center">
+            <el-table-column width="150px" label="销售指导价（万元）" align="center">
               <template slot-scope="scope">
                 <span>{{ scope.row.guidedPrice }}</span>
               </template>
             </el-table-column>
-            <el-table-column label="现车" align="center">
+            <el-table-column width="100px" label="车型图片" align="center">
+              <template slot-scope="scope">
+                <el-button type="primary" size="small" @click="handlookImg(scope.row)">查看</el-button>
+              </template>
+            </el-table-column>
+            <el-table-column width="110px" label="现车" align="center">
               <template slot-scope="scope">
                 <span>{{ scope.row.nowCarNum }}</span>
               </template>
             </el-table-column>
-            <el-table-column label="排产" align="center">
+            <el-table-column width="110px" label="排产" align="center">
               <template slot-scope="scope">
-                <span>{{ scope.row.productionCarNum }}</span>
+                <span>{{ scope.row.produceCarNum }}</span>
               </template>
             </el-table-column>
-            <el-table-column label="操作" align="center">
+            <el-table-column width="100px" label="其他更多" align="center">
               <template slot-scope="scope">
                 <el-button type="primary" size="small" @click="handlook(scope.row)">查看</el-button>
               </template>
@@ -157,12 +150,18 @@
         </div>
       </div>
     </div>
+    <!-- 查看车型照片弹窗 -->
+    <el-dialog title="查看" :visible.sync="dialogImgVisible">
+      <el-image v-for="item in srcList" :key="item" style="width: 100px; height: 100px" :src="item"
+                :preview-src-list="srcList"/>
+    </el-dialog>
+    <!-- 其他更多配置弹窗 -->
     <el-dialog :visible.sync="dialogVisible" width="50%">
       <el-table :key="tableKey" :data="datalist" border style="width: 100%">
         <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.company }}</span>
+            <span>{{ scope.row.companyName }}</span>
           </template>
         </el-table-column>
         <el-table-column label="现车" align="center">
@@ -172,7 +171,7 @@
         </el-table-column>
         <el-table-column label="排产车" align="center">
           <template slot-scope="scope">
-            <span>{{ scope.row.productionCarNum }}</span>
+            <span>{{ scope.row.produceCarNum }}</span>
           </template>
         </el-table-column>
       </el-table>
@@ -183,12 +182,13 @@
 </template>
 
 <script>
-  import {
-    brandDown,
-    dataDictionary,
-    modelPageList,
-    notTheCompanyModelPageList
-  } from '@/api/chexingchaxun/modelinquire'
+import {
+  brandDown,
+  dataDictionary,
+  getPathSidByUserSid,
+  modelPageList,
+  notTheCompanyModelPageList
+} from '@/api/chexingchaxun/modelinquire'
   import Pagination from '@/components/pagination'
   import pageye from '@/components/pagination/pageye'
   import configuration from './vehiclelibraryconfiguration.vue'
@@ -204,9 +204,11 @@
       return {
         isSearchShow: false,
         dialogVisible: false,
+        dialogImgVisible: false, // 车型照片弹窗
         searchxianshitit: '隐藏查询条件',
         viewState: 1,
         tableKey: 0,
+        srcList: [],
         list: [],
         datalist: [],
         carBrand_list: [],
@@ -234,16 +236,16 @@
           current: 1,
           size: 10,
           params: {
-            carBrand: '', // 品牌
-            driveForm: '', // 驱动
+            brand: '', // 品牌
+            driver: '', // 驱动
             fuelType: '', // 燃料
-            gearboxType: '', // 变速箱
+            gearbox: '', // 变速箱
             modelName: '', // 车型
-            power: '', // 马力
+            horsepower: '', // 马力
             productLine: '', // 系列
-            useOrg: '', // 分公司
+            // useOrg: '', // 分公司 后端使用
             userSid: window.sessionStorage.getItem('userSid'), // 用户
-            vehicleType: '', // 功能
+            vehicleFunction: '', // 功能
             vehicleVersion: '', // 版本
             emissionStandard: '', // 排放标准
             engineType: '', // 发动机型号
@@ -268,15 +270,29 @@
       },
       init() {
         this.getList()
+        this.getPathSid()
       },
       // ----------功能打开结束--------
-      // 数组字典加载
-      Dictionary() {
-        brandDown().then((res) => {
+      getPathSid() {
+        const userSid = window.sessionStorage.getItem('userSid')
+        getPathSidByUserSid({userSid: userSid}).then((res) => {
+          if (res.code === '200') {
+            // this.listQuery.params.createOrgSId = res.data
+            this.useOrg = res.data
+            this.getBrand(res.data)
+          }
+        })
+      },
+      // 下拉框-品牌
+      getBrand(useOrg) {
+        brandDown({useOrg: useOrg}).then((res) => {
           if (res.code === '200') {
             this.carBrand_list = res.data
           }
         })
+      },
+      // 数组字典加载
+      Dictionary() {
         dataDictionary({type: 'vehicleFunction'}).then((res) => {
           if (res.code === '200') {
             this.vehicleType_list = res.data
@@ -359,16 +375,16 @@
           current: 1,
           size: 10,
           params: {
-            carBrand: '', // 品牌
-            driveForm: '', // 驱动
+            brand: '', // 品牌
+            driver: '', // 驱动
             fuelType: '', // 燃料
-            gearboxType: '', // 变速箱
+            gearbox: '', // 变速箱
             modelName: '', // 车型
-            power: '', // 马力
+            horsepower: '', // 马力
             productLine: '', // 系列
-            useOrg: '', // 分公司
+            // useOrg: '', // 分公司 后端使用
             userSid: window.sessionStorage.getItem('userSid'), // 用户
-            vehicleType: '', // 功能
+            vehicleFunction: '', // 功能
             vehicleVersion: '', // 版本
             emissionStandard: '', // 排放标准
             engineType: '', // 发动机型号
@@ -379,14 +395,23 @@
         }
         this.getList()
       },
+      handlookImg(row) {
+        this.dialogImgVisible = true
+        console.log('图片列表', row.modelImage)
+        const imgList = []
+        imgList.push(row.modelImage)
+        this.srcList = imgList // 暂时是一张图片，和移动端保持一致
+        console.log('图片列表', this.srcList)
+      },
       handlook(row) {
         this.dialogVisible = true
-        this.dialogQuery.params.modelSid = row.sid
-        notTheCompanyModelPageList(this.dialogQuery).then((res) => {
-          if (res.code === '200') {
-            this.datalist = res.data.records
-          }
-        })
+        this.datalist = row.moreList
+        // this.dialogQuery.params.modelSid = row.sid
+        // notTheCompanyModelPageList(this.dialogQuery).then((res) => {
+        //   if (res.code === '200') {
+        //     this.datalist = res.data.records
+        //   }
+        // })
       },
       handlink(row) {
         this.viewState = 2
@@ -408,19 +433,34 @@
   }
 </script>
 <style scoped>
-  .listtop {
-    display: flex;
-    justify-content: space-between;
-    align-items: center;
-    border: 1px solid #dfe4ed;
-    height: 40px;
-  }
+.listtop {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  border: 1px solid #dfe4ed;
+  height: 40px;
+}
 
-  .tit {
-    margin-bottom: -10px;
-  }
+.tit {
+  margin-bottom: -10px;
+}
 
-  .pagination {
-    margin-bottom: -10px;
-  }
+.pagination {
+  margin-bottom: -10px;
+}
+
+.searchbtn {
+  border: #2cab69 1px solid;
+  color: #2cab69;
+}
+
+.btn {
+  padding: 15px 0 15px 0;
+  border: 1px solid #e0e3eb;
+  text-align: center;
+}
+
+.tab-header {
+  margin-bottom: 0 !important;
+}
 </style>
diff --git a/anrui-buscenter/anrui-buscenter-ui/src/views/xiaoshouguanli/xiaoshoudingdan/relation/vehiclelibraryconfiguration.vue b/anrui-buscenter/anrui-buscenter-ui/src/views/xiaoshouguanli/xiaoshoudingdan/relation/vehiclelibraryconfiguration.vue
index 08d33224cb..cf6b534d93 100644
--- a/anrui-buscenter/anrui-buscenter-ui/src/views/xiaoshouguanli/xiaoshoudingdan/relation/vehiclelibraryconfiguration.vue
+++ b/anrui-buscenter/anrui-buscenter-ui/src/views/xiaoshouguanli/xiaoshoudingdan/relation/vehiclelibraryconfiguration.vue
@@ -13,7 +13,6 @@
           <el-button size="small" class="searchbtn" @click="clicksearchShow">{{ searchxianshitit }}</el-button>
           <div v-show="isSearchShow" class="search">
             <el-form ref="listQueryform" :inline="true" :model="listQuery" label-width="100px" class="tab-header">
-              <el-row>
                 <el-form-item label="颜色:" class="searchlist">
                   <el-select v-model="listQuery.params.carColor" placeholder="请选择" filterable clearable>
                     <el-option v-for="item in carColor_list" :key="item.dictKey" :label="item.dictValue"
@@ -50,8 +49,6 @@
                                :value="item.dictKey"/>
                   </el-select>
                 </el-form-item>
-              </el-row>
-              <el-row>
                 <el-form-item label="空调:" class="searchlist">
                   <el-select v-model="listQuery.params.airConditionerKey" placeholder="请选择" filterable clearable>
                     <el-option v-for="item in airConditioner_list" :key="item.dictKey" :label="item.dictValue"
@@ -88,8 +85,6 @@
                                :value="item.dictKey"/>
                   </el-select>
                 </el-form-item>
-              </el-row>
-              <el-row>
                 <el-form-item label="鞍座:" class="searchlist">
                   <el-select v-model="listQuery.params.saddleKey" placeholder="请选择" filterable clearable>
                     <el-option v-for="item in saddle_list" :key="item.dictKey" :label="item.dictValue"
@@ -126,8 +121,6 @@
                                :value="item.dictKey"/>
                   </el-select>
                 </el-form-item>
-              </el-row>
-              <el-row>
                 <el-form-item label="多媒体:" class="searchlist">
                   <el-select v-model="listQuery.params.multimediaKey" placeholder="请选择" filterable clearable>
                     <el-option v-for="item in multimedia_list" :key="item.dictKey" :label="item.dictValue"
@@ -137,12 +130,11 @@
                 <el-form-item label="快捷检索:" class="searchlist">
                   <el-input v-model="listQuery.params.configName" placeholder="" clearable style="width: 150px"/>
                 </el-form-item>
-              </el-row>
-              <div class="searchbtns">
-                <el-button type="primary" @click="handleFilter">查询</el-button>
-                <el-button type="primary" @click="handReset">重置</el-button>
-              </div>
             </el-form>
+            <div class="btn">
+              <el-button type="primary" @click="handleFilter">查询</el-button>
+              <el-button type="primary" @click="handReset">重置</el-button>
+            </div>
           </div>
         </div>
         <div class="listtop">
@@ -183,11 +175,11 @@
                 <span>{{ scope.row.guidedPrice }}</span>
               </template>
             </el-table-column>
-            <el-table-column label="价格有效期" align="center" width="110">
-              <template slot-scope="scope">
-                <span>{{ scope.row.priceValidity }}</span>
-              </template>
-            </el-table-column>
+            <!--            <el-table-column label="价格有效期" align="center" width="110">-->
+            <!--              <template slot-scope="scope">-->
+            <!--                <span>{{ scope.row.priceValidity }}</span>-->
+            <!--              </template>-->
+            <!--            </el-table-column>-->
             <el-table-column label="其他更多" align="center" width="100">
               <template slot-scope="scope">
                 <el-button type="primary" size="small" @click="handlook(scope.row)">查看</el-button>
@@ -207,7 +199,7 @@
         <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.company }}</span>
+            <span>{{ scope.row.companyName }}</span>
           </template>
         </el-table-column>
         <el-table-column label="现车" align="center">
@@ -217,7 +209,7 @@
         </el-table-column>
         <el-table-column label="排产车" align="center">
           <template slot-scope="scope">
-            <span>{{ scope.row.productionCarNum }}</span>
+            <span>{{ scope.row.produceCarNum }}</span>
           </template>
         </el-table-column>
       </el-table>
@@ -232,7 +224,7 @@
 </template>
 
 <script>
-import {configPageList, dataDictionary, notTheCompanyModelPageList} from '@/api/chexingchaxun/modelinquire'
+import {configPageList, dataDictionary} from '@/api/chexingchaxun/modelinquire'
 import Pagination from '@/components/pagination'
 import pageye from '@/components/pagination/pageye'
 // import modelstandardconfiguration from './modelstandardconfiguration'
@@ -424,7 +416,7 @@ export default {
       this.row = row
       this.listQuery.params.modelSid = row.sid
       this.modelSid = row.sid
-      this.modelName = row.vehicleAlias
+      this.modelName = row.modelName
       this.Dictionary()
       this.getList()
     },
@@ -477,13 +469,14 @@ export default {
     },
     handlook(row) {
       this.dialogVisible = true
-      this.dialogQuery.params.modelSid = this.listQuery.params.modelSid
-      this.dialogQuery.params.modelConfigSid = row.sid
-      notTheCompanyModelPageList(this.dialogQuery).then((res) => {
-        if (res.code === '200') {
-          this.datalist = res.data.records
-        }
-      })
+      this.datalist = row.moreList
+      // this.dialogQuery.params.modelSid = this.listQuery.params.modelSid
+      // this.dialogQuery.params.modelConfigSid = row.sid
+      // notTheCompanyModelPageList(this.dialogQuery).then((res) => {
+      //   if (res.code === '200') {
+      //     this.datalist = res.data.records
+      //   }
+      // })
     },
     handleSelectionChange(row) {
       if (row.length > 1) {
@@ -562,4 +555,13 @@ export default {
 .pagination {
   margin-bottom: -10px;
 }
+.btn {
+  padding: 15px 0 15px 0;
+  border: 1px solid #e0e3eb;
+  text-align: center;
+}
+
+.tab-header {
+  margin-bottom: 0 !important;
+}
 </style>