From 0a413d5a129b4ffd8980670499ec128e3eafa3d1 Mon Sep 17 00:00:00 2001
From: Zhao Qiqi <1287235164@qq.com>
Date: Fri, 17 Jun 2022 11:30:16 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=9A=E5=8A=A1=E7=AE=A1=E7=90=86--=E5=AE=A2?=
 =?UTF-8?q?=E6=88=B7=E7=AE=A1=E7=90=86=E3=80=81=E8=BD=A6=E5=9E=8B=E5=BA=93?=
 =?UTF-8?q?=E5=8F=8A=E8=BD=A6=E5=9E=8B=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/api/chexingchaxun/modelinquire.js     |   3 +-
 .../anrui-buscenter-ui/src/styles/index.scss  |   1 -
 .../modelinquire/modellibrary.vue             |   2 +-
 .../vehiclelibraryconfiguration.vue           | 136 ++++----
 .../cheliangxuqiu/cheliangxuqiu.vue           |  45 ++-
 .../cheliangxuqiu/cheliangxuqiuAdd.vue        |  50 +--
 .../cheliangxuqiu/cheliangxuqiuinfo.vue       |   2 +-
 .../kehuguanli/kehudangan/kehudangan.vue      |  28 +-
 .../kehuguanli/kehudangan/kehudanganAdd.vue   | 112 +++----
 .../cheliangxuqiu/cheliangxuqiuAdd.vue        |   2 +-
 .../cheliangxuqiu/cheliangxuqiuinfo.vue       |   2 +-
 .../xiaoshoudingdan/relation/modellibrary.vue |   8 +-
 .../relation/vehiclelibraryconfiguration.vue  | 295 ++++++++----------
 .../relation/xuanzekehuAdd.vue                |  16 +-
 14 files changed, 349 insertions(+), 353 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 66e161f453..81e0e3b0a5 100644
--- a/anrui-buscenter/anrui-buscenter-ui/src/api/chexingchaxun/modelinquire.js
+++ b/anrui-buscenter/anrui-buscenter-ui/src/api/chexingchaxun/modelinquire.js
@@ -17,7 +17,8 @@ export function modelPageList(data) {
 // 根据条件分页查询数据的列表（车型配置）
 export function configPageList(data) {
   return request({
-    url: '/base/v1/basemodelconfig/configPageList',
+    // url: '/base/v1/basemodelconfig/configPageList', // 旧
+    url: '/base/v1/basemodelconfig/getModelConfigList',
     method: 'post',
     data: data,
     headers: {
diff --git a/anrui-buscenter/anrui-buscenter-ui/src/styles/index.scss b/anrui-buscenter/anrui-buscenter-ui/src/styles/index.scss
index ea545def67..6ebe8d181a 100644
--- a/anrui-buscenter/anrui-buscenter-ui/src/styles/index.scss
+++ b/anrui-buscenter/anrui-buscenter-ui/src/styles/index.scss
@@ -108,7 +108,6 @@ div:focus {
 .webcon{height: calc(100vh - 220px);overflow-y: auto;overflow-x: hidden;}
 // .listcon{height: calc(100vh - 425px);overflow-y: auto;overflow-x: hidden;}
 .listconadd{height: calc(100vh - 200px);overflow-y: auto;overflow-x: hidden;}
-.listconsub{height: calc(100vh - 310px);overflow-y: auto;overflow-x: hidden;}
 .listconsubjxs{height: calc(100vh - 300px);overflow-y: auto;overflow-x: hidden;}
 // 搜索的
 .webtop {
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 82377a482a..461883c911 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
@@ -68,7 +68,7 @@
                 <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"/>
+                               :value="item.dictValue"/>
                   </el-select>
                 </el-form-item>
               <el-form-item label="规格型号:" class="searchlist">
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 23c7c089c3..04add3627c 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
@@ -13,103 +13,103 @@
           <div v-show="isSearchShow" class="search">
             <el-form ref="listQueryform" :inline="true" :model="listQuery" label-width="100px" class="tab-header">
                 <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"/>
+                  <el-select v-model="listQuery.params.bodyColor" placeholder="请选择" filterable clearable>
+                    <el-option v-for="item in carColor_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.slowMachine" placeholder="请选择" filterable clearable>
-                    <el-option v-for="item in slowMachine_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"/>
+                    <el-option v-for="item in slowMachine_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.rearViewMirrorKey" placeholder="请选择" filterable clearable>
-                    <el-option v-for="item in rearViewMirror_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"/>
+                  <el-select v-model="listQuery.params.rearViewMirror" placeholder="请选择" filterable clearable>
+                    <el-option v-for="item in rearViewMirror_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.tireSizeKey" placeholder="请选择" filterable clearable>
-                    <el-option v-for="item in tireSize_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"/>
+                  <el-select v-model="listQuery.params.tireSize" placeholder="请选择" filterable clearable>
+                    <el-option v-for="item in tireSize_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.specification" placeholder="请选择" filterable clearable>
-                    <el-option v-for="item in specification_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"/>
+                    <el-option v-for="item in specification_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.rearAxleRatio" placeholder="请选择" filterable clearable>
-                    <el-option v-for="item in rearAxleRatio_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"/>
+                    <el-option v-for="item in rearAxleRatio_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.airConditionerKey" placeholder="请选择" filterable clearable>
-                    <el-option v-for="item in airConditioner_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"/>
+                  <el-select v-model="listQuery.params.airConditioner" placeholder="请选择" filterable clearable>
+                    <el-option v-for="item in airConditioner_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.hubMaterialKey" placeholder="请选择" filterable clearable>
-                    <el-option v-for="item in hubMaterial_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"/>
+                  <el-select v-model="listQuery.params.hubMaterial" placeholder="请选择" filterable clearable>
+                    <el-option v-for="item in hubMaterial_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.baffleModelKey" placeholder="请选择" filterable clearable>
-                    <el-option v-for="item in baffleModel_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"/>
+                  <el-select v-model="listQuery.params.diversionCover	" placeholder="请选择" filterable clearable>
+                    <el-option v-for="item in baffleModel_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.suspensionKey" placeholder="请选择" filterable clearable>
-                    <el-option v-for="item in suspension_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"/>
+                  <el-select v-model="listQuery.params.suspension" placeholder="请选择" filterable clearable>
+                    <el-option v-for="item in suspension_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.seatKey" placeholder="请选择" filterable clearable>
-                    <el-option v-for="item in seat_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"/>
+                  <el-select v-model="listQuery.params.seat" placeholder="请选择" filterable clearable>
+                    <el-option v-for="item in seat_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.tireCoverKey" placeholder="请选择" filterable clearable>
-                    <el-option v-for="item in tireCover_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"/>
+                  <el-select v-model="listQuery.params.protectTireCover" placeholder="请选择" filterable clearable>
+                    <el-option v-for="item in tireCover_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.saddleKey" placeholder="请选择" filterable clearable>
-                    <el-option v-for="item in saddle_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"/>
+                  <el-select v-model="listQuery.params.saddle" placeholder="请选择" filterable clearable>
+                    <el-option v-for="item in saddle_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.wheelbaseKey" placeholder="请选择" filterable clearable>
-                    <el-option v-for="item in wheelbase_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"/>
+                  <el-select v-model="listQuery.params.wheelbase" placeholder="请选择" filterable clearable>
+                    <el-option v-for="item in wheelbase_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.bumperKey" placeholder="请选择" filterable clearable>
-                    <el-option v-for="item in bumper_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"/>
+                  <el-select v-model="listQuery.params.bumper" placeholder="请选择" filterable clearable>
+                    <el-option v-for="item in bumper_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.configuringBaoKey" placeholder="请选择" filterable clearable>
-                    <el-option v-for="item in configuringBao_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"/>
+                  <el-select v-model="listQuery.params.configuringBao" placeholder="请选择" filterable clearable>
+                    <el-option v-for="item in configuringBao_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.independentSourcesKey" placeholder="请选择" filterable clearable>
-                    <el-option v-for="item in independentSources_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"/>
+                  <el-select v-model="listQuery.params.independentSources" placeholder="请选择" filterable clearable>
+                    <el-option v-for="item in independentSources_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.fuelTank" placeholder="请选择" filterable clearable>
-                    <el-option v-for="item in fuelTank_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"/>
+                    <el-option v-for="item in fuelTank_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.multimediaKey" placeholder="请选择" filterable clearable>
+                <el-select v-model="listQuery.params.multiMedia" placeholder="请选择" filterable clearable>
                   <el-option v-for="item in multimedia_list" :key="item.dictKey" :label="item.dictValue"
-                             :value="item.dictKey"/>
+                             :value="item.dictValue"/>
                 </el-select>
               </el-form-item>
               <el-form-item label="快捷检索:" class="searchlist">
-                <el-input v-model="listQuery.params.configName" placeholder="" clearable style="width: 150px"/>
+                <el-input v-model="listQuery.params.name" placeholder="" clearable style="width: 150px"/>
               </el-form-item>
             </el-form>
             <div class="btn">
@@ -142,12 +142,12 @@
             </el-table-column>
             <el-table-column label="排产（台）" align="center" width="150">
               <template slot-scope="scope">
-                <span class="bluezi" @click="handproduction(scope.row)">{{ scope.row.productionCarNum }}</span>
+                <span class="bluezi" @click="handproduction(scope.row)">{{ scope.row.produceCarNum }}</span>
               </template>
             </el-table-column>
             <el-table-column label="销售指导价（万元）" align="center" width="150">
               <template slot-scope="scope">
-                <span>{{ scope.row.guidedPrice }}</span>
+                <span>{{ scope.row.price }}</span>
               </template>
             </el-table-column>
             <!--            <el-table-column label="价格有效期" align="center" width="110">-->
@@ -258,27 +258,27 @@ export default {
         current: 1,
         size: 10,
         params: {
-          carColor: '', // 颜色
+          bodyColor: '', // 颜色
           configName: '', // 配置
           fuelTank: '', // 燃料
           rearAxleRatio: '', // 后桥速比
           modelSid: '', // 车型sid
           slowMachine: '', // 缓速器
           specification: '', // 驾驶室
-          rearViewMirrorKey: '', // 后视镜
-          tireSizeKey: '', // 轮胎
-          airConditionerKey: '', // 空调
-          hubMaterialKey: '', // 轮毂材质
-          baffleModelKey: '', // 导流罩
-          suspensionKey: '', // 悬架
-          seatKey: '', // 座椅
-          tireCoverKey: '', // 护轮罩
-          saddleKey: '', // 鞍座
-          wheelbaseKey: '', // 轴距
-          bumperKey: '', // 保险杠
-          configuringBaoKey: '', // 配置包
-          independentSourcesKey: '', // 独立热源
-          multimediaKey: '', // 多媒体
+          rearViewMirror: '', // 后视镜
+          tireSize: '', // 轮胎
+          airConditioner: '', // 空调
+          hubMaterial: '', // 轮毂材质
+          diversionCover	: '', // 导流罩
+          suspension: '', // 悬架
+          seat: '', // 座椅
+          protectTireCover: '', // 护轮罩
+          saddle: '', // 鞍座
+          wheelbase: '', // 轴距
+          bumper: '', // 保险杠
+          configuringBao: '', // 配置包
+          independentSources: '', // 独立热源
+          multiMedia: '', // 多媒体
           userSid: window.sessionStorage.getItem('userSid')
         },
         total: 0
@@ -413,7 +413,7 @@ export default {
         this.listLoading = false
         if (response.code === '200') {
           this.listQuery.total = response.data.total
-          this.list = response.data.records
+          this.list = response.data.modelConfigList
         }
       })
     },
@@ -426,26 +426,26 @@ export default {
         current: 1,
         size: 10,
         params: {
-          carColor: '', // 颜色
+          bodyColor: '', // 颜色
           configName: '', // 配置
           fuelTank: '', // 燃料
           rearAxleRatio: '', // 后桥速比
           slowMachine: '', // 缓速器
           specification: '', // 驾驶室
-          rearViewMirrorKey: '', // 后视镜
-          tireSizeKey: '', // 轮胎
-          airConditionerKey: '', // 空调
-          hubMaterialKey: '', // 轮毂材质
-          baffleModelKey: '', // 导流罩
-          suspensionKey: '', // 悬架
-          seatKey: '', // 座椅
-          tireCoverKey: '', // 护轮罩
-          saddleKey: '', // 鞍座
-          wheelbaseKey: '', // 轴距
-          bumperKey: '', // 保险杠
-          configuringBaoKey: '', // 配置包
-          independentSourcesKey: '', // 独立热源
-          multimediaKey: '', // 多媒体
+          rearViewMirror: '', // 后视镜
+          tireSize: '', // 轮胎
+          airConditioner: '', // 空调
+          hubMaterial: '', // 轮毂材质
+          diversionCover	: '', // 导流罩
+          suspension: '', // 悬架
+          seat: '', // 座椅
+          protectTireCover: '', // 护轮罩
+          saddle: '', // 鞍座
+          wheelbase: '', // 轴距
+          bumper: '', // 保险杠
+          configuringBao: '', // 配置包
+          independentSources: '', // 独立热源
+          multiMedia: '', // 多媒体
           modelSid: this.modelSid,
           userSid: window.sessionStorage.getItem('userSid')
         },
diff --git a/anrui-buscenter/anrui-buscenter-ui/src/views/kehuguanli/cheliangxuqiu/cheliangxuqiu.vue b/anrui-buscenter/anrui-buscenter-ui/src/views/kehuguanli/cheliangxuqiu/cheliangxuqiu.vue
index bd5c8f7eb0..40522597f0 100644
--- a/anrui-buscenter/anrui-buscenter-ui/src/views/kehuguanli/cheliangxuqiu/cheliangxuqiu.vue
+++ b/anrui-buscenter/anrui-buscenter-ui/src/views/kehuguanli/cheliangxuqiu/cheliangxuqiu.vue
@@ -122,6 +122,7 @@ import { loginDetails } from '@/api/dictcommons/basemanufacturer'
 import { getStorage } from '@/utils/auth'
 import cheliangxuqiuAdd from './cheliangxuqiuAdd'
 import cheliangxuqiuinfo from './cheliangxuqiuinfo'
+import {brandDown, getPathSidByUserSid} from "@/api/chexingchaxun/modelinquire";
 
 export default {
   name: 'cheliangxuqiu',
@@ -174,7 +175,6 @@ export default {
   },
   created() {
     // 初始化变量
-    this.init()
     // 加载列表
   },
   methods: {
@@ -189,8 +189,8 @@ export default {
     },
     init() {
       this.postHuoquyonghu()
-      this.chePinPai()
       this.getShuJUZiDian()
+      this.getPathSid()
     },
     getShuJUZiDian() {
       typeValues({ type: 'purchaseType' }).then((res) => {
@@ -202,11 +202,21 @@ export default {
     getGouche(value) {
 
     },
-    // 车辆品牌
-    chePinPai() {
-      getPinpai().then((response) => {
-        if (response.code === '200') {
-          this.brand_list = response.data
+    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.brand_list = res.data
         }
       })
     },
@@ -232,19 +242,20 @@ export default {
       this.stateId = sid
       this.upLevel = upLevel // 关闭所需判断属性
       this.getList()
+      this.init()
     },
     // ----------功能打开开始--------
     // 品牌
-    getPinPai(sid) {
-      var manufacturerSid = {
-        manufacturerSid: sid
-      }
-      getNamesDownBySid(manufacturerSid).then((response) => {
-        if (response.code === '200') {
-          this.branddate = response.data
-        }
-      })
-    },
+    // getPinPai(sid) {
+    //   var manufacturerSid = {
+    //     manufacturerSid: sid
+    //   }
+    //   getNamesDownBySid(manufacturerSid).then((response) => {
+    //     if (response.code === '200') {
+    //       this.branddate = response.data
+    //     }
+    //   })
+    // },
     // 车型名称
     getCheXingName(brandSid) {
       var sid = {
diff --git a/anrui-buscenter/anrui-buscenter-ui/src/views/kehuguanli/cheliangxuqiu/cheliangxuqiuAdd.vue b/anrui-buscenter/anrui-buscenter-ui/src/views/kehuguanli/cheliangxuqiu/cheliangxuqiuAdd.vue
index 849534bf45..6e80f77417 100644
--- a/anrui-buscenter/anrui-buscenter-ui/src/views/kehuguanli/cheliangxuqiu/cheliangxuqiuAdd.vue
+++ b/anrui-buscenter/anrui-buscenter-ui/src/views/kehuguanli/cheliangxuqiu/cheliangxuqiuAdd.vue
@@ -9,7 +9,7 @@
           <el-button type="info" size="small" icon="el-icon-close" @click="handleReturn()">关闭</el-button>
         </div>
       </div>
-      <div class="listconsub">
+      <div class="listconadd">
         <el-form ref="dataForm" :model="temp" label-position="right" label-width="190px" style="height:100%" class="formadd" :rules="rules">
           <div class="title" style="height:40px">车辆需求</div>
           <el-row>
@@ -188,24 +188,19 @@
 </template>
 
 <script>
-import { typeValues } from '@/api/dictcommons/shujuzidian'
+import {typeValues} from '@/api/dictcommons/shujuzidian'
 import {
   getNamesDown,
   getNamesDownBySid,
   getNamesDownlist,
-  getPinpai
+  getSelectDown,
+  loginDetails
 } from '@/api/dictcommons/basemanufacturer'
-import {
-  loginDetails,
-  getSelectDown
-} from '@/api/dictcommons/basemanufacturer'
-import { getStorage } from '@/utils/auth'
-import {
-  saveOrUpdatePcCrmVehicleInfo,
-  getPcVehicleInfoBySid,
-  UpdatePcCrmVehicleInfo
-} from '@/api/jichuxinxi/crmvehicle'
+import {getStorage} from '@/utils/auth'
+import {getPcVehicleInfoBySid, saveOrUpdatePcCrmVehicleInfo, UpdatePcCrmVehicleInfo} from '@/api/jichuxinxi/crmvehicle'
 import modelsToChoose from './modelsToChoose.vue'
+import {brandDown, getPathSidByUserSid} from "@/api/chexingchaxun/modelinquire";
+
 export default {
   name: 'CheliangxuqiuAdd',
   components: {
@@ -300,7 +295,7 @@ export default {
   },
   // 页面加载
   created() {
-    this.init()
+
   },
   methods: {
     // --------------------------初始话--------------------------------
@@ -309,7 +304,7 @@ export default {
       this.getChangShang()
       this.getZifang()
       // this.postHuoquyonghu()
-      this.chePinPai()
+      this.getPathSid()
     },
     openUpdate(sid, user, checkin, showed) {
       //   this.kehusid = sid
@@ -342,6 +337,7 @@ export default {
           }
         })
       }
+      this.init()
     },
     openCreate(sid, checkin) {
       this.kehusid = sid
@@ -349,6 +345,7 @@ export default {
       // this.$refs['dataForm'].clearValidate()
       this.stateId = '0'
       this.resetTemp()
+      this.init()
     },
     // 返回
     handleReturn() {
@@ -506,14 +503,25 @@ export default {
     inputclear() {
       this.temp.vendorName = ''
     },
-    // 车辆品牌
-    chePinPai() {
-      getPinpai().then((response) => {
-        if (response.code === '200') {
-          this.brand_list = response.data
+    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.brand_list = res.data
+        }
+      })
     },
+
     changePinPai(value) {
       let bb = []
       this.brand_list.forEach((e) => {
diff --git a/anrui-buscenter/anrui-buscenter-ui/src/views/kehuguanli/cheliangxuqiu/cheliangxuqiuinfo.vue b/anrui-buscenter/anrui-buscenter-ui/src/views/kehuguanli/cheliangxuqiu/cheliangxuqiuinfo.vue
index e76373a32b..cf8b987539 100644
--- a/anrui-buscenter/anrui-buscenter-ui/src/views/kehuguanli/cheliangxuqiu/cheliangxuqiuinfo.vue
+++ b/anrui-buscenter/anrui-buscenter-ui/src/views/kehuguanli/cheliangxuqiu/cheliangxuqiuinfo.vue
@@ -7,7 +7,7 @@
           <el-button type="info" size="small" icon="el-icon-close" @click="handleReturn()">关闭</el-button>
         </div>
       </div>
-      <div class="listconsub">
+      <div class="listconadd">
         <el-form ref="dataForm" :model="temp" label-position="right" label-width="190px" class="formadd" :rules="rules">
           <div class="title">车型详情</div>
           <el-row>
diff --git a/anrui-buscenter/anrui-buscenter-ui/src/views/kehuguanli/kehudangan/kehudangan.vue b/anrui-buscenter/anrui-buscenter-ui/src/views/kehuguanli/kehudangan/kehudangan.vue
index 32c0c9c643..c8ab518b7d 100644
--- a/anrui-buscenter/anrui-buscenter-ui/src/views/kehuguanli/kehudangan/kehudangan.vue
+++ b/anrui-buscenter/anrui-buscenter-ui/src/views/kehuguanli/kehudangan/kehudangan.vue
@@ -26,8 +26,11 @@
               </el-select>
             </el-form-item>
             <el-form-item label="客户类型" :label-width="formLabelWidth" class="diaForm">
-              <el-radio v-model="customerTypeList.customerType" label="个人">个人</el-radio>
-              <el-radio v-model="customerTypeList.customerType" label="企业">企业</el-radio>
+              <el-radio-group v-model="customerTypeList.customerType">
+                <el-radio v-for="item in merType" :key="item.dictKey" :label="item.dictValue"
+                          @change="customerTypeChange">{{ item.dictValue }}
+                </el-radio>
+              </el-radio-group>
             </el-form-item>
           </el-form>
           <span slot="footer" class="dialog-footer">
@@ -140,9 +143,8 @@
 </template>
 
 <script>
-import { namesDown, getPcDistributorList } from '@/api/jichuxinxi/crmcustomer'
-import { pagerList, deleteBySids } from '@/api/jichuxinxi/crmcustomer'
-import { typeValues } from '@/api/dictcommons/shujuzidian'
+import {deleteBySids, pagerList} from '@/api/jichuxinxi/crmcustomer'
+import {typeValues} from '@/api/dictcommons/shujuzidian'
 import Pagination from '@/components/pagination'
 import pageye from '@/components/pagination/pageye'
 import kehudanganAdd from './kehudanganAdd.vue'
@@ -162,7 +164,6 @@ export default {
     cheliangxuqiu,
     kehudanganziliao
   },
-
   data() {
     return {
       upLevel: '0',
@@ -171,7 +172,9 @@ export default {
       customerTypeList: {
         visitWay: '', // 联络方式
         visitWayKey: '',
-        customerType: ''// 客户类型
+        customerType: '', // 客户类型
+        customerTypeKey: '',// 客户类型
+        psid:''
       },
       visitWay_list: [],
       isSearchShow: false,
@@ -290,7 +293,9 @@ export default {
         this.customerTypeList = {
           visitWay: '',
           visitWayKey: '',
-          customerType: ''
+          customerType: '',
+          customerTypeKey: '',
+          psid:'',
         }
       } else {
         this.$message({
@@ -497,6 +502,13 @@ export default {
         }
       })
     },
+    // 客户类型
+    customerTypeChange(val) {
+      const choosetItem = this.merType.filter((item) => item.dictValue == val)
+      this.customerTypeList.customerTypeKey = choosetItem[0].dictKey
+      this.customerTypeList.psid = choosetItem[0].sid
+      console.log('name:', this.customerTypeList.customerType, 'key:', this.customerTypeList.customerTypeKey,'sid',this.customerTypeList.psid)
+    },
     // 联络方式
     getVisitWay(value) {
       let bb = null
diff --git a/anrui-buscenter/anrui-buscenter-ui/src/views/kehuguanli/kehudangan/kehudanganAdd.vue b/anrui-buscenter/anrui-buscenter-ui/src/views/kehuguanli/kehudangan/kehudanganAdd.vue
index 1d5a2a80da..ee45ca1c2a 100644
--- a/anrui-buscenter/anrui-buscenter-ui/src/views/kehuguanli/kehudangan/kehudanganAdd.vue
+++ b/anrui-buscenter/anrui-buscenter-ui/src/views/kehuguanli/kehudangan/kehudanganAdd.vue
@@ -407,28 +407,24 @@
 
 <script>
 import {
-  savePcCustomerInfo,
-  namesDown,
   getPcCustomerInfoBySid,
-  getPcDistributorList,
+  // getPcDistributorList,
+  // namesDown,
+  savePcCustomerInfo,
   updatePcCustomerInfo,
 } from '@/api/jichuxinxi/crmcustomer'
-import {
-  getProvince,
-  getCity,
-  getCounty
-} from '@/api/portal/areaPicker' // 省市区
-import { typeValues } from '@/api/dictcommons/shujuzidian'
-import { loginDetails } from '@/api/dictcommons/basemanufacturer'
-import { getStorage } from '@/utils/auth'
+import {getCity, getCounty, getProvince} from '@/api/portal/areaPicker' // 省市区
+import {typeValues} from '@/api/dictcommons/shujuzidian'
+import {loginDetails} from '@/api/dictcommons/basemanufacturer'
+import {getStorage} from '@/utils/auth'
 import Pagination from '@/components/pagination'
 import pageye from '@/components/pagination/pageye'
-import { getPcBusinessInfoBySid } from '@/api/jichuxinxi/crmbusiness'
+import {getPcBusinessInfoBySid} from '@/api/jichuxinxi/crmbusiness'
 import Upload from '@/components/uploadFile/upload.vue' //   上传文件
 
 export default {
   name: 'KehudanganAdd',
-  components: { Pagination, pageye, Upload },
+  components: {Pagination, pageye, Upload},
   data() {
     var checkSubmit = (rule, value, callback) => {
       const Submit =
@@ -496,7 +492,6 @@ export default {
       Customeryou: '',
       checkin: '', //登记状态
       kehusid: '',
-      customerType: '',
       YongHuid: [],
       stateId: 0,
       FormLoading: false,
@@ -564,16 +559,12 @@ export default {
   },
   created() {
     // 初始化变量
-    this.init()
-    this.huoquSheng() //获取省
   },
   methods: {
     // 初始
     init() {
       this.getShuJUZiDian()
-      this.getGuaKao()
       this.postHuoquyonghu()
-      this.getZhongJie()
     },
     // 修改回显
     openUpdate(sid) {
@@ -588,15 +579,15 @@ export default {
             this.temp = response.data
             this.temp.birthday = this.getDates(this.temp.birthday)
             if (this.temp.customerType !== '') {
+              if (this.temp.customerType === '个人') {
+                this.temp.certificateType = '身份证'
+                this.temp.certificateTypeKey = '01'
+              } else {
+                this.temp.certificateType = '营业执照'
+                this.temp.certificateTypeKey = '02'
+              }
               typeValues({type: 'customerType'}).then((res) => {
                 if (res.code === '200') {
-                  if (this.temp.customerType === '个人') {
-                    this.temp.certificateType = '身份证'
-                    this.temp.certificateTypeKey = '01'
-                  } else {
-                    this.temp.certificateType = '营业执照'
-                    this.temp.certificateTypeKey = '02'
-                  }
                   this.customerType_list = res.data
                   this.customerType_list.forEach((e) => {
                     if (e.dictValue == this.temp.customerType) {
@@ -621,11 +612,14 @@ export default {
           }
         })
       }
+      this.init()
+      this.huoquSheng() //获取省
     },
     // 新增
     openCreate(customerTypeList) {
       this.resetTemp()
       this.temp.customerType = customerTypeList.customerType
+      this.temp.customerTypeKey = customerTypeList.customerTypeKey
       this.temp.visitWay = customerTypeList.visitWay
       this.temp.visitWayKey = customerTypeList.visitWayKey
       this.$refs['dataForm'].clearValidate()
@@ -638,21 +632,14 @@ export default {
           this.temp.certificateType = '营业执照'
           this.temp.certificateTypeKey = '02'
         }
-        typeValues({ type: 'customerType' }).then((res) => {
+        typeValues({psid: customerTypeList.psid, type: this.customerClass}).then((res) => {
           if (res.code === '200') {
-            this.customerType_list = res.data
-            this.customerType_list.forEach((e) => {
-              if (e.dictValue == this.temp.customerType) {
-                typeValues({ psid: e.sid, type: this.customerClass }).then((res) => {
-                  if (res.code === '200') {
-                    this.merClass = res.data
-                  }
-                })
-              }
-            })
+            this.merClass = res.data
           }
         })
       }
+      this.init()
+      this.huoquSheng() //获取省
     },
     // 下拉卡框 数据字典
     getShuJUZiDian() {
@@ -719,17 +706,18 @@ export default {
     //   })
     // },
     // 挂靠单位
-    getGuaKao() {
-      namesDown({ name: this.temp.affiliatedOrgSid }).then((response) => {
-        if (response.code === '200') {
-          this.edOrgSid = response.data
-        }
-      })
-    },
+    // getGuaKao() {
+    //   namesDown({ name: this.temp.affiliatedOrgSid }).then((response) => {
+    //     if (response.code === '200') {
+    //       this.edOrgSid = response.data
+    //     }
+    //   })
+    // },
     // -------------------------获取省市县方法-------------------------
     huoquSheng() {
+      console.log(123456)
       getProvince().then((res) => {
-        // console.log('11111省：', res)
+        console.log('11111省：', res)
         if (res.code === '200') {
           this.inputProvinceList = res.data
         }
@@ -974,25 +962,25 @@ export default {
       return
     },
     // 中介单位
-    getZhongJie() {
-      getPcDistributorList().then((response) => {
-        if (response.code === '200') {
-          this.ncySid = response.data
-        }
-      })
-    },
+    // getZhongJie() {
+    //   getPcDistributorList().then((response) => {
+    //     if (response.code === '200') {
+    //       this.ncySid = response.data
+    //     }
+    //   })
+    // },
     // 中介单位处理
-    getZongjieDanwei(value) {
-      let bb = null
-      this.ncySid.forEach((e) => {
-        if (e.sid == value) {
-          bb = {
-            name: e.distributorName,
-          }
-        }
-      })
-      this.temp.agencyName = bb.name
-    },
+    // getZongjieDanwei(value) {
+    //   let bb = null
+    //   this.ncySid.forEach((e) => {
+    //     if (e.sid == value) {
+    //       bb = {
+    //         name: e.distributorName,
+    //       }
+    //     }
+    //   })
+    //   this.temp.agencyName = bb.name
+    // },
     // ---------------------------------------------------------------------------------
     // ---------------------------数据字典的处理------------------------------------------------------
     // ---------------------------------------------------------------------------------
diff --git a/anrui-buscenter/anrui-buscenter-ui/src/views/xiaoshouguanli/cheliangxuqiu/cheliangxuqiuAdd.vue b/anrui-buscenter/anrui-buscenter-ui/src/views/xiaoshouguanli/cheliangxuqiu/cheliangxuqiuAdd.vue
index 3a633bf1dd..7c172abb4f 100644
--- a/anrui-buscenter/anrui-buscenter-ui/src/views/xiaoshouguanli/cheliangxuqiu/cheliangxuqiuAdd.vue
+++ b/anrui-buscenter/anrui-buscenter-ui/src/views/xiaoshouguanli/cheliangxuqiu/cheliangxuqiuAdd.vue
@@ -9,7 +9,7 @@
           <el-button type="primary" size="small" @click="handleReturn()">返回</el-button>
         </div>
       </div>
-      <div class="listconsub">
+      <div class="listconadd">
         <el-form ref="dataForm" :title="textMap[dialogStatus]" :model="temp" label-position="right" label-width="190px"
                  class="formadd" :rules="rules">
           <div class="title">车辆需求</div>
diff --git a/anrui-buscenter/anrui-buscenter-ui/src/views/xiaoshouguanli/cheliangxuqiu/cheliangxuqiuinfo.vue b/anrui-buscenter/anrui-buscenter-ui/src/views/xiaoshouguanli/cheliangxuqiu/cheliangxuqiuinfo.vue
index 698dad58ce..9f3c3cc70b 100644
--- a/anrui-buscenter/anrui-buscenter-ui/src/views/xiaoshouguanli/cheliangxuqiu/cheliangxuqiuinfo.vue
+++ b/anrui-buscenter/anrui-buscenter-ui/src/views/xiaoshouguanli/cheliangxuqiu/cheliangxuqiuinfo.vue
@@ -8,7 +8,7 @@
           <el-button type="primary" size="small" @click="handleReturn()">返回</el-button>
         </div>
       </div>
-      <div class="listconsub">
+      <div class="listconadd">
         <el-form ref="dataForm" :title="textMap[dialogStatus]" :model="temp" label-position="right" :disabled="edit" label-width="190px" class="formadd" :rules="rules">
           <div class="title">车辆需求</div>
           <el-row>
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 47d4d74f5e..c0b2a00e9a 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
@@ -47,9 +47,9 @@
                   <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">&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"/>
@@ -68,7 +68,7 @@
               <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"/>
+                             :value="item.dictValue"/>
                 </el-select>
               </el-form-item>
               <el-form-item label="规格型号:" class="searchlist">
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 94aec7cdaa..a003325260 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,123 +13,105 @@
           <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-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"/>
-                  </el-select>
-                </el-form-item>
-                <el-form-item label="缓速器:" class="searchlist">
-                  <el-select v-model="listQuery.params.slowMachine" placeholder="请选择" filterable clearable>
-                    <el-option v-for="item in slowMachine_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.rearViewMirrorKey" placeholder="请选择" filterable clearable>
-                    <el-option v-for="item in rearViewMirror_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.tireSizeKey" placeholder="请选择" filterable clearable>
-                    <el-option v-for="item in tireSize_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.specification" placeholder="请选择" filterable clearable>
-                    <el-option v-for="item in specification_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.rearAxleRatio" placeholder="请选择" filterable clearable>
-                    <el-option v-for="item in rearAxleRatio_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.airConditionerKey" placeholder="请选择" filterable clearable>
-                    <el-option v-for="item in airConditioner_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.hubMaterialKey" placeholder="请选择" filterable clearable>
-                    <el-option v-for="item in hubMaterial_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.baffleModelKey" placeholder="请选择" filterable clearable>
-                    <el-option v-for="item in baffleModel_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.suspensionKey" placeholder="请选择" filterable clearable>
-                    <el-option v-for="item in suspension_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.seatKey" placeholder="请选择" filterable clearable>
-                    <el-option v-for="item in seat_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.tireCoverKey" placeholder="请选择" filterable clearable>
-                    <el-option v-for="item in tireCover_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.saddleKey" placeholder="请选择" filterable clearable>
-                    <el-option v-for="item in saddle_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.wheelbaseKey" placeholder="请选择" filterable clearable>
-                    <el-option v-for="item in wheelbase_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.bumperKey" placeholder="请选择" filterable clearable>
-                    <el-option v-for="item in bumper_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.configuringBaoKey" placeholder="请选择" filterable clearable>
-                    <el-option v-for="item in configuringBao_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.independentSourcesKey" placeholder="请选择" filterable clearable>
-                    <el-option v-for="item in independentSources_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.fuelTank" placeholder="请选择" filterable clearable>
-                    <el-option v-for="item in fuelTank_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.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-item label="颜色:" class="searchlist">
+                <el-select v-model="listQuery.params.bodyColor" placeholder="请选择" filterable clearable>
+                  <el-option v-for="item in carColor_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.slowMachine" placeholder="请选择" filterable clearable>
+                  <el-option v-for="item in slowMachine_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.rearViewMirror" placeholder="请选择" filterable clearable>
+                  <el-option v-for="item in rearViewMirror_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.tireSize" placeholder="请选择" filterable clearable>
+                  <el-option v-for="item in tireSize_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.specification" placeholder="请选择" filterable clearable>
+                  <el-option v-for="item in specification_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.rearAxleRatio" placeholder="请选择" filterable clearable>
+                  <el-option v-for="item in rearAxleRatio_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.airConditioner" placeholder="请选择" filterable clearable>
+                  <el-option v-for="item in airConditioner_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.hubMaterial" placeholder="请选择" filterable clearable>
+                  <el-option v-for="item in hubMaterial_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.diversionCover	" placeholder="请选择" filterable clearable>
+                  <el-option v-for="item in baffleModel_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.suspension" placeholder="请选择" filterable clearable>
+                  <el-option v-for="item in suspension_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.seat" placeholder="请选择" filterable clearable>
+                  <el-option v-for="item in seat_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.protectTireCover" placeholder="请选择" filterable clearable>
+                  <el-option v-for="item in tireCover_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.saddle" placeholder="请选择" filterable clearable>
+                  <el-option v-for="item in saddle_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.wheelbase" placeholder="请选择" filterable clearable>
+                  <el-option v-for="item in wheelbase_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.bumper" placeholder="请选择" filterable clearable>
+                  <el-option v-for="item in bumper_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.configuringBao" placeholder="请选择" filterable clearable>
+                  <el-option v-for="item in configuringBao_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.independentSources" placeholder="请选择" filterable clearable>
+                  <el-option v-for="item in independentSources_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.fuelTank" placeholder="请选择" filterable clearable>
+                  <el-option v-for="item in fuelTank_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.multiMedia" placeholder="请选择" filterable clearable>
+                  <el-option v-for="item in multimedia_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.name" placeholder="" clearable style="width: 150px"/>
+              </el-form-item>
             </el-form>
             <div class="btn">
               <el-button type="primary" @click="handleFilter">查询</el-button>
@@ -143,14 +125,11 @@
                   :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 type="selection" align="center" width="50"/>
+          <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">
               <template slot-scope="scope">
-                <span>{{ scope.row.configName }}</span>
-                <!--                <span class="bluezi" @click="handlink(scope.row)">{{}}</span>-->
+                <span class="bluezi" @click="handlink(scope.row)">{{ scope.row.configName }}</span>
               </template>
             </el-table-column>
             <el-table-column label="颜色" align="center" width="100">
@@ -159,20 +138,18 @@
               </template>
             </el-table-column>
             <el-table-column label="现车（台）" align="center" width="150">
-              <template slot-scope="scope">
+              <template slot-scope="scope"> <!--@click="handvehicle(scope.row)"-->
                 <span>{{ scope.row.nowCarNum }}</span>
-                <!--                <span class="bluezi" @click="handvehicle(scope.row)"></span>-->
               </template>
-            </el-table-column>
+            </el-table-column><!-- @click="handproduction(scope.row)"-->
             <el-table-column label="排产（台）" align="center" width="150">
               <template slot-scope="scope">
-                <span>{{ scope.row.productionCarNum }}</span>
-                <!--                <span class="bluezi" @click="handproduction(scope.row)"></span>-->
+                <span>{{ scope.row.produceCarNum }}</span>
               </template>
             </el-table-column>
             <el-table-column label="销售指导价（万元）" align="center" width="150">
               <template slot-scope="scope">
-                <span>{{ scope.row.guidedPrice }}</span>
+                <span>{{ scope.row.price }}</span>
               </template>
             </el-table-column>
             <!--            <el-table-column label="价格有效期" align="center" width="110">-->
@@ -284,27 +261,27 @@ export default {
         current: 1,
         size: 10,
         params: {
-          carColor: '', // 颜色
+          bodyColor: '', // 颜色
           configName: '', // 配置
           fuelTank: '', // 燃料
           rearAxleRatio: '', // 后桥速比
           modelSid: '', // 车型sid
           slowMachine: '', // 缓速器
           specification: '', // 驾驶室
-          rearViewMirrorKey: '', // 后视镜
-          tireSizeKey: '', // 轮胎
-          airConditionerKey: '', // 空调
-          hubMaterialKey: '', // 轮毂材质
-          baffleModelKey: '', // 导流罩
-          suspensionKey: '', // 悬架
-          seatKey: '', // 座椅
-          tireCoverKey: '', // 护轮罩
-          saddleKey: '', // 鞍座
-          wheelbaseKey: '', // 轴距
-          bumperKey: '', // 保险杠
-          configuringBaoKey: '', // 配置包
-          independentSourcesKey: '', // 独立热源
-          multimediaKey: '', // 多媒体
+          rearViewMirror: '', // 后视镜
+          tireSize: '', // 轮胎
+          airConditioner: '', // 空调
+          hubMaterial: '', // 轮毂材质
+          diversionCover	: '', // 导流罩
+          suspension: '', // 悬架
+          seat: '', // 座椅
+          protectTireCover: '', // 护轮罩
+          saddle: '', // 鞍座
+          wheelbase: '', // 轴距
+          bumper: '', // 保险杠
+          configuringBao: '', // 配置包
+          independentSources: '', // 独立热源
+          multiMedia: '', // 多媒体
           userSid: window.sessionStorage.getItem('userSid')
         },
         total: 0
@@ -427,7 +404,7 @@ export default {
         this.listLoading = false
         if (response.code === '200') {
           this.listQuery.total = response.data.total
-          this.list = response.data.records
+          this.list = response.data.modelConfigList
         }
       })
     },
@@ -440,26 +417,26 @@ export default {
         current: 1,
         size: 10,
         params: {
-          carColor: '', // 颜色
+          bodyColor: '', // 颜色
           configName: '', // 配置
           fuelTank: '', // 燃料
           rearAxleRatio: '', // 后桥速比
           slowMachine: '', // 缓速器
           specification: '', // 驾驶室
-          rearViewMirrorKey: '', // 后视镜
-          tireSizeKey: '', // 轮胎
-          airConditionerKey: '', // 空调
-          hubMaterialKey: '', // 轮毂材质
-          baffleModelKey: '', // 导流罩
-          suspensionKey: '', // 悬架
-          seatKey: '', // 座椅
-          tireCoverKey: '', // 护轮罩
-          saddleKey: '', // 鞍座
-          wheelbaseKey: '', // 轴距
-          bumperKey: '', // 保险杠
-          configuringBaoKey: '', // 配置包
-          independentSourcesKey: '', // 独立热源
-          multimediaKey: '', // 多媒体
+          rearViewMirror: '', // 后视镜
+          tireSize: '', // 轮胎
+          airConditioner: '', // 空调
+          hubMaterial: '', // 轮毂材质
+          diversionCover	: '', // 导流罩
+          suspension: '', // 悬架
+          seat: '', // 座椅
+          protectTireCover: '', // 护轮罩
+          saddle: '', // 鞍座
+          wheelbase: '', // 轴距
+          bumper: '', // 保险杠
+          configuringBao: '', // 配置包
+          independentSources: '', // 独立热源
+          multiMedia: '', // 多媒体
           modelSid: this.modelSid,
           userSid: window.sessionStorage.getItem('userSid')
         },
diff --git a/anrui-buscenter/anrui-buscenter-ui/src/views/xiaoshouguanli/xiaoshoudingdan/relation/xuanzekehuAdd.vue b/anrui-buscenter/anrui-buscenter-ui/src/views/xiaoshouguanli/xiaoshoudingdan/relation/xuanzekehuAdd.vue
index f16053146f..762bcbdc9e 100644
--- a/anrui-buscenter/anrui-buscenter-ui/src/views/xiaoshouguanli/xiaoshoudingdan/relation/xuanzekehuAdd.vue
+++ b/anrui-buscenter/anrui-buscenter-ui/src/views/xiaoshouguanli/xiaoshoudingdan/relation/xuanzekehuAdd.vue
@@ -416,7 +416,7 @@
   import {mapGetters} from 'vuex'
   import {
     savePcCustomerInfo,
-    namesDown,
+    // namesDown,
     getPcCustomerInfoBySid,
     getPcDistributorList,
     updatePcCustomerInfo,
@@ -750,13 +750,13 @@
       //   })
       // },
       // 挂靠单位
-      getGuaKao() {
-        namesDown({name: this.temp.affiliatedOrgSid}).then((response) => {
-          if (response.code === '200') {
-            this.edOrgSid = response.data
-          }
-        })
-      },
+      // getGuaKao() {
+      //   namesDown({name: this.temp.affiliatedOrgSid}).then((response) => {
+      //     if (response.code === '200') {
+      //       this.edOrgSid = response.data
+      //     }
+      //   })
+      // },
       // -------------------------获取省市县方法-------------------------
       huoquSheng() {
         getProvince().then((res) => {