diff --git a/anrui-scm/anrui-scm-ui/src/api/cheliang/basemodelconfig.js b/anrui-scm/anrui-scm-ui/src/api/cheliang/basemodelconfig.js
index b8b0021345..addc5f3ff5 100644
--- a/anrui-scm/anrui-scm-ui/src/api/cheliang/basemodelconfig.js
+++ b/anrui-scm/anrui-scm-ui/src/api/cheliang/basemodelconfig.js
@@ -1,7 +1,7 @@
 import request from '@/utils/request'
 import qs from 'qs'
 
-// 车型关联表条件查询 已改
+// 车型与常用配置关联表条件查询 已改
 export function pagerList(data) {
   return request({
     url: '/base/basevehmodelconfig/listPage', data,
@@ -10,6 +10,15 @@ export function pagerList(data) {
   })
 }
 
+// 常用配置
+export function getList(data) {
+  return request({
+    url: '/base/v1/basemodelconfig/pagerList', data,
+    method: 'post',
+    headers: { 'Content-Type': 'application/json' }
+  })
+}
+
 // PC-车型与常用配置建立关联关系 已改
 export function setRel(data) {
   return request({
@@ -25,12 +34,31 @@ export function deleteRel(params) {
     url: '/base/basevehmodelconfig/checkRelieve',
     method: 'DELETE',
     params: {
-      modelSid:params.modelSid,
-      configurationItemsSid:params.configurationItemsSid
+      modelSid: params.modelSid,
+      configurationItemsSid: params.configurationItemsSid
     }
   })
 }
 
+// 价格维护修改回显 已改
+export function fetchBySid(data) {
+  return request({
+    url: '/base/basevehmodelconfig/fetchBySid/' + data,
+    method: 'get',
+    params: data
+  })
+}
+
+// 价格维护编辑保存
+export function update(data) {
+  return request({
+    url: '/base/basevehmodelconfig/update',
+    method: 'post',
+    data: data,
+    headers: { 'Content-Type': 'application/json' }
+  })
+}
+
 //添加
 export function SaveList(data) {
   return request({
diff --git a/anrui-scm/anrui-scm-ui/src/api/cheliang/basevehiclemodel.js b/anrui-scm/anrui-scm-ui/src/api/cheliang/basevehiclemodel.js
index 3b87f9d787..b629b02cd3 100644
--- a/anrui-scm/anrui-scm-ui/src/api/cheliang/basevehiclemodel.js
+++ b/anrui-scm/anrui-scm-ui/src/api/cheliang/basevehiclemodel.js
@@ -27,7 +27,7 @@ export function deleteBySids(params) {
     url: '/base/v1/basevehiclemodel/deleteBySids',
     method: 'DELETE',
     params: {
-      sids:params
+      sids: params
     }
   })
 }
@@ -41,6 +41,15 @@ export function details(data) {
   })
 }
 
+//编辑回显 已改
+export function getAll(data) {
+  return request({
+    url: '/base/v1/basevehiclemodel/getAll/' + data,
+    method: 'get',
+    params: data
+  })
+}
+
 //车型列表导出
 export function basefinbankExportExcel(data) {
   return request({
diff --git a/anrui-scm/anrui-scm-ui/src/api/portal/Upload.js b/anrui-scm/anrui-scm-ui/src/api/portal/Upload.js
index dad59def38..906d19d80c 100644
--- a/anrui-scm/anrui-scm-ui/src/api/portal/Upload.js
+++ b/anrui-scm/anrui-scm-ui/src/api/portal/Upload.js
@@ -19,7 +19,7 @@ export const uploadFile = '/api/portal/file/upload'
 // 移除图片
 export function deleteFilesOss(data) {
 	return request({
-		url: '/base/v1/baseVehicleAppendixs/deleteFilesOss',data,
+		url: '/base/v1/baseVehicleAppendixs/deleteFilesOss', // data,
 		method: 'post',
      data: qs.stringify(data),
 		// headers: { 'Content-Type': 'multipart/form-data' }
diff --git a/anrui-scm/anrui-scm-ui/src/api/portal/Upload_chexing.js b/anrui-scm/anrui-scm-ui/src/api/portal/Upload_chexing.js
new file mode 100644
index 0000000000..96bf260c74
--- /dev/null
+++ b/anrui-scm/anrui-scm-ui/src/api/portal/Upload_chexing.js
@@ -0,0 +1,27 @@
+import request from '@/utils/request'
+import qs from 'qs'
+// 统一请求路径前缀
+const base = process.env.VUE_APP_URL
+
+// 文件上传接口
+export const uploadFile = '/api/base/v1/basevehiclemodel/pictureUpload'
+
+// 上传图片
+// export function imageUpload(data) {
+// 	return request({
+// 		url: '/portal/file/upload',
+// 		method: 'post',
+// 		data,
+// 		headers: { 'Content-Type': 'multipart/form-data' }
+// 	})
+// }
+
+// 移除图片
+export function deleteFilesOss(data) {
+  return request({
+    url: '/base/v1/baseVehicleAppendixs/deleteFilesOss', // data,
+    method: 'post',
+    data: qs.stringify(data),
+    // headers: { 'Content-Type': 'multipart/form-data' }
+  })
+}
diff --git a/anrui-scm/anrui-scm-ui/src/components/uploadFile/upload.vue b/anrui-scm/anrui-scm-ui/src/components/uploadFile/upload.vue
index 2142df7797..a554e94db9 100644
--- a/anrui-scm/anrui-scm-ui/src/components/uploadFile/upload.vue
+++ b/anrui-scm/anrui-scm-ui/src/components/uploadFile/upload.vue
@@ -102,11 +102,11 @@
         handler(newVal, oldVal) {
           console.log('aaaa1', newVal)
           this.files = newVal
-          if (this.stateName = 'xunidingjinAdd') {
-            if (this.files.length > 1) {
-              this.files.splice(0, 1)
-            }
-          }
+          // if (this.stateName = 'xunidingjinAdd') {
+          //   if (this.files.length > 1) {
+          //     this.files.splice(0, 1)
+          //   }
+          // }
           console.log('aaaa2', this.files)
         }
       }
diff --git a/anrui-scm/anrui-scm-ui/src/components/uploadFile/uploadImg.vue b/anrui-scm/anrui-scm-ui/src/components/uploadFile/uploadImg.vue
index 23e148dc71..e7edfb4e0f 100644
--- a/anrui-scm/anrui-scm-ui/src/components/uploadFile/uploadImg.vue
+++ b/anrui-scm/anrui-scm-ui/src/components/uploadFile/uploadImg.vue
@@ -93,11 +93,11 @@
         handler(newVal, oldVal) {
           console.log('aaaa1', newVal)
           this.files = newVal
-          if (this.stateName = 'xunidingjinAdd') {
-            if (this.files.length > 1) {
-              this.files.splice(0, 1)
-            }
-          }
+          // if (this.stateName = 'xunidingjinAdd') {
+          //   if (this.files.length > 1) {
+          //     this.files.splice(0, 1)
+          //   }
+          // }
           console.log('aaaa2', this.files)
         }
       }
diff --git a/anrui-scm/anrui-scm-ui/src/components/uploadFile/upload_chexing.vue b/anrui-scm/anrui-scm-ui/src/components/uploadFile/upload_chexing.vue
new file mode 100644
index 0000000000..81f09b6872
--- /dev/null
+++ b/anrui-scm/anrui-scm-ui/src/components/uploadFile/upload_chexing.vue
@@ -0,0 +1,242 @@
+<template>
+  <div><!---->
+    <el-upload class="upload-demo" :headers="accessToken" :action="uploadFile" :accept="accept" :data="uploadData"
+               :on-success="uploadImgSuccess_FuJian" :on-remove="handleRemove" :file-list="fileList_FuJian"
+               :on-preview="handlePictureCardPreview" :show-file-list="false">
+      <el-button size="small" type="primary">点击上传</el-button>
+    </el-upload>
+  </div>
+</template>
+
+<script>
+  import { uploadFile } from '@/api/portal/Upload_chexing.js'
+  import { getStorage } from '@/utils/auth.js' //token
+  import {
+    SaveList
+  } from '@/api/cheliang/basevehiclemodel'
+  import { mapGetters } from 'vuex'
+
+  export default {
+    model: {
+      prop: 'name',
+      event: 'change'
+    },
+    props: {
+      placeholder: {
+        type: String,
+        default: ''
+      },
+      bucket: {
+        type: String,
+        default: 'abc'
+      },
+      // 长度
+      width: {
+        type: String,
+        default: '270px'
+      },
+      limit: {
+        type: Number,
+        default: 1
+      },
+      accept: {
+        type: String,
+        default:
+          '.jpg,.jpeg,.png,.bmp,.pdf,.JPG,.JPEG,.BMP,.PDF,.xls,.docx,.xlsx,.ppt,.pptx'
+      },
+      // 文件名称
+      name: {
+        type: Array,
+        required: true
+      },
+      uploadData: {
+        type: Object,
+        default: {}
+      }
+    },
+    data() {
+      return {
+        dialogImageUrl: '',
+        dialogVisible: false,
+        accessToken: null,
+        uploadFile: uploadFile,
+        fileList_FuJian: [],
+        enclosure: '',
+        file_add: '',
+        file_catch: '',
+        files: [],
+        files_list: [],
+        filedUrl: '',
+        // fileUrl: fileUrl,
+        // showpicture:false,
+        isview: false,
+        nameArr: '',
+        loadding: false,
+        stateName: '',
+      /*  uploadData: { modelSid: '' },*/
+        sid: ''
+      }
+    },
+    computed: {
+      ...mapGetters([
+        'id',
+        'departmentCode',
+        'departmentLevel',
+        'departmentType',
+        'token'
+      ])
+    },
+    watch: {
+      name: {
+        deep: true,
+        immediate: true,
+        handler(newVal, oldVal) {
+          console.log('aaaa1', newVal)
+          this.files = newVal
+          console.log('aaaa2', this.files)
+        }
+      }
+    },
+    mounted() {
+      this.$nextTick(() => {
+        this.Init()
+      })
+    },
+    created() {
+      this.uploadFile = uploadFile // 接口
+      this.accessToken = {
+        token: getStorage()
+      }
+    },
+    methods: {
+      view() {
+        // window.open(this.filedUrl)
+      },
+      showImg(sid) {
+      //  this.uploadData.sid = sid
+      },
+
+      // 页面第一次加载
+      Init() {
+        if (this.name !== undefined) {
+          this.files = []
+          for (var i = 0; i < this.name.length; i++) {
+            this.files.push({
+              name: this.name[i],
+              url: this.name[i]
+            })
+          }
+        }
+      },
+      // 上传方案--成功后执行
+      uploadImgSuccess_FuJian(response, file, fileList) {
+        let _this = this
+        console.log('您选择的file:', file)
+      //  console.log('您传递的data:', _this.uploadData)
+        if (file.response.code === '200') {
+          this.loadding = false
+          // 返显图片
+          this.filedUrl = this.fileUrl + file.response.data
+          // var uid = file.response.data
+          this.files.push({
+            name: file.response.data.sourceFileName,
+            url: file.response.data.fullUrl,
+            size: file.response.data.size
+          })
+          this.$emit('change', this.files)
+          this.$emit('eett', this.files)
+          // this.getUrl()
+          // SaveList(this.tempInfo).then(response => {
+          //   if (response.success) {
+          //   }
+          // })
+        }
+      },
+      removeImage(file, ImageFileList) {
+        this.files.splice(this.files.indexOf(file), 1)
+        const imgFiles = []
+        this.files.forEach((o) => {
+          imgFiles.push(o.url)
+        })
+        this.$emit('fileChange', this.files)
+      },
+      handleRemove(file, fileList) {
+        console.log('file:' + JSON.stringify(file))
+        console.log('fileList:' + JSON.stringify(fileList))
+        this.enclosure = ''
+        // 1. 保存新增文件id(this.file_add)
+        this.getNewFileId(fileList)
+        // 2. 保存数据库读取的已有文件id(this.file_catch)
+        this.getCatchFileId(file)
+        // 3. 保存并拼接id
+        this.getFileId()
+        // 4. 返回拼接id
+        this.$emit('change', this.enclosure)
+      },
+      // 返回this.file_add(新上传文件的id拼接集合)
+      getNewFileId(fileList) {
+        // debugger
+        this.file_add = ''
+        for (var i = 0; i < fileList.length; i++) {
+          if (fileList[i].response && fileList[i].response.code === '200') {
+            this.file_add = this.file_add + fileList[i].response.data + ','
+          }
+        }
+        if (this.file_add !== '') {
+          this.file_add = this.file_add.substring(0, this.file_add.length - 1)
+        }
+        // console.log('1. this.file_add: ' + this.file_add)
+      },
+      // 返回this.file_catch（数库一寸照的文件的id的拼接集合）
+      getCatchFileId(file) {
+        for (var i = 0; i < this.files_list.length; i++) {
+          if (this.file_catch !== '') {
+            // 1. 检查当前删除的文件是否是修改文件列表里面的，如果是，将修改列表里去除此id
+            if (this.files_list[i].name === file.name) {
+              // 2. 拆开file_catch到fils_arry
+              var fils_arry = this.file_catch.split(',')
+              // 3. 从fils_arry去除 this.files_list[i].id
+              var arry = []
+              fils_arry.forEach((element) => {
+                // 不加载文件里面的
+                if (element !== this.files_list[i].id) {
+                  arry.push(element)
+                }
+              })
+              // 4. 重新拼接成file_catch
+              this.file_catch = arry.join(',')
+            }
+          }
+        }
+        // console.log('2. this.file_catch:' + this.file_catch)
+      },
+      // 保存并拼接id
+      getFileId() {
+        // console.log('3. this.file_catch:' + this.file_catch + ',this.file_add:' + this.file_add)
+        if (this.file_catch !== '') {
+          if (this.file_add !== '') {
+            this.enclosure = this.file_catch + ',' + this.file_add
+          } else {
+            this.enclosure = this.file_catch
+          }
+        } else {
+          this.enclosure = this.file_add
+        }
+      },
+      handlePictureCardPreview(file) {
+        this.dialogImageUrl = file.url
+      },
+      // 上传失败
+      uploadError() {
+        this.loadding = false
+      },
+      uploadProgrees(event, file, fileList) {
+        if (Number(event.percent) > 0) {
+          this.loadding = true
+        }
+      }
+    }
+  }
+</script>
+
+<style lang="scss" scoped></style>
diff --git a/anrui-scm/anrui-scm-ui/src/main.js b/anrui-scm/anrui-scm-ui/src/main.js
index 10f6174268..9f0893e298 100644
--- a/anrui-scm/anrui-scm-ui/src/main.js
+++ b/anrui-scm/anrui-scm-ui/src/main.js
@@ -77,6 +77,7 @@ function getUserInfo(){
     window.sessionStorage.setItem('departmentSid',user.departmentSid);
   })
 }
+
 getUserInfo();
 function GetQueryString(name) {
   var reg = new RegExp('(^|&)' + name + '=([^&]*)(&|$)')
diff --git a/anrui-scm/anrui-scm-ui/src/styles/el-form.scss b/anrui-scm/anrui-scm-ui/src/styles/el-form.scss
index 0e470b2f02..e4c33ba95a 100644
--- a/anrui-scm/anrui-scm-ui/src/styles/el-form.scss
+++ b/anrui-scm/anrui-scm-ui/src/styles/el-form.scss
@@ -7,7 +7,7 @@
 .listconadd .title {
   text-align: center;
   font-size: 28px;
-  line-height: 90px;
+  //line-height: 90px;
 }
 
 .listaddtop {
@@ -23,12 +23,11 @@
   }
 }
 
-
 .listconadd .demo-ruleForm {
   padding: 22px 28px;
 }
 
-.el-collapse-item__header{
+.el-collapse-item__header {
   .el-icon-arrow-right:before {
     content: "";
     font-size: 20px;
@@ -60,8 +59,15 @@
   }
 }
 
-.tleftb, .trightb {
-  border-top: 1px solid #e0e3eb !important;
+.tleftb {
+  text-align: right;
+  font-size: 14px;
+  color: #606266;
+  line-height: 40px !important;
+  font-weight: 600;
 }
 
-
+.icon {
+  color: #e84026;
+  margin-right: 4px;
+}
diff --git a/anrui-scm/anrui-scm-ui/src/styles/index.scss b/anrui-scm/anrui-scm-ui/src/styles/index.scss
index 6c271bb2fa..c2959aa82a 100644
--- a/anrui-scm/anrui-scm-ui/src/styles/index.scss
+++ b/anrui-scm/anrui-scm-ui/src/styles/index.scss
@@ -69,11 +69,11 @@ div:focus {
 }
 // main-container global css
 .container{
-	min-height: 100%;
+  min-height: 100%;
   height: 100%;
-	background-color: #FFFFFF;
-	box-sizing: border-box;
-	padding: 10px 0;
+  background-color: #FFFFFF;
+  box-sizing: border-box;
+  padding: 10px 0;
 }
 
 .fl{
@@ -149,68 +149,68 @@ div:focus {
 // .listeltable{overflow-y: auto;height: calc(100vh - 420px);}
 
 .formadd {
-	padding: 20px 0;
+  padding: 20px 0;
   // height: calc(100vh - 200px);overflow-y: auto;
-	.title {
-		padding: 10px;font-weight: bold;
+  .title {
+    padding: 10px;font-weight: bold;
     font-size: 20px;
     background-color: $header-bg;
     text-align: center;
     color: #ffffff;
-	}
+  }
   .el-row {
-      display:flex;
-      flex-wrap: wrap;
-      border-left: 1px solid $table-border-color;
-      .el-col{
-        border-right: 1px solid $table-border-color;
-        border-bottom: 1px solid $table-border-color;
-        padding: 5px 15px 5px 15px !important;
-        min-height: 50px;
-        line-height: 1;
-        .el-form-item{
-          margin-bottom: 0;
-          // .addinputw{width: 400px;}
-          .addinputw{width: 80%;}
-        }
+    display:flex;
+    flex-wrap: wrap;
+    border-left: 1px solid $table-border-color;
+    .el-col{
+      border-right: 1px solid $table-border-color;
+      border-bottom: 1px solid $table-border-color;
+      padding: 5px 15px 5px 15px !important;
+      min-height: 50px;
+      line-height: 1;
+      .el-form-item{
+        margin-bottom: 0;
+        // .addinputw{width: 400px;}
+        .addinputw{width: 80%;}
       }
+    }
 
-		}
-    .footer{margin: 20px;}
+  }
+  .footer{margin: 20px;}
 }
 
 
 .forminfo {
-	padding: 20px 0;
-	.title {
-		padding: 10px;font-weight: bold;
+  padding: 20px 0;
+  .title {
+    padding: 10px;font-weight: bold;
     font-size: 20px;
     background-color: $header-bg;
     text-align: center;
     color: #ffffff;
-	}
+  }
   .el-row {
-      display:flex;
-      flex-wrap: wrap;
-      border-left: 1px solid $table-border-color;
-        .trightb{ text-align: right;font-weight: bold;color: #606266;  }
-        .tleft{ text-align: left;  }
-      .el-col{
-        border-right: 1px solid $table-border-color;
-        border-bottom: 1px solid $table-border-color;
-        padding: 0px 15px 0px 15px !important;
-        min-height: 50px;
-        line-height: 50px;
-        font-size: 14px;
-
-      }
+    display:flex;
+    flex-wrap: wrap;
+    border-left: 1px solid $table-border-color;
+    .trightb{ text-align: right;font-weight: bold;color: #606266;  }
+    .tleft{ text-align: left;  }
+    .el-col{
+      border-right: 1px solid $table-border-color;
+      border-bottom: 1px solid $table-border-color;
+      padding: 0 15px 0 15px !important;
+      min-height: 50px;
+      line-height: 50px;
+      font-size: 14px;
+
+    }
 
-		}
-    .footer{margin: 20px;}
+  }
+  .footer{margin: 20px;}
 }
 
 .el-form-item__error {
-    z-index: 100;
+  z-index: 100;
 }
 .bluezi{color: $header-bg; cursor: pointer}
 // 经销商添加样式
@@ -218,30 +218,30 @@ div:focus {
   display: flex;flex-direction: row;justify-content: space-around; background-color: #0294d7;flex: 3;
 }
 .titcon .title{
-  	padding: 10px;font-weight: bold;
-    font-size: 20px;
-    text-align: center;
-    color: #ffffff;
+  padding: 10px;font-weight: bold;
+  font-size: 20px;
+  text-align: center;
+  color: #ffffff;
 }
 .titcon .baocun{text-align: right;flex: 2;padding: 5px 20px;}
 .addinputwda{width: 600px;}
 .searchcon{margin: 0px 0 10px 0;}
-.searchcon .searchbtn{margin: 10px 0;}
+.searchcon .searchbtn{margin: 10px 0;border: #2cab69 1px solid;color: #2cab69;}
 
 
 
 // 弹出窗口按钮
 .btnCancel{
-    background: #e84026 !important;outline: none;border: none;color: #fff !important;
+  background: #e84026 !important;outline: none;border: none;color: #fff !important;
 }
 .btnCancel:hover{
-    background: #ed6651 !important;
+  background: #ed6651 !important;
 }
 .btnFalses{
-    background: #2cab69 !important;outline: none;border: none;
+  background: #2cab69 !important;outline: none;border: none;
 }
 .btnFalses:hover{
-    background: #3dc47e !important;
+  background: #3dc47e !important;
 }
 .btntopblueline{background-color: #066bc9 !important;}
 .btntopblueline:hover{background-color: #34a1db !important;}
diff --git a/anrui-scm/anrui-scm-ui/src/views/cheliang/chexing/chexing.vue b/anrui-scm/anrui-scm-ui/src/views/cheliang/chexing/chexing.vue
index 953470dbd0..934dbb8d98 100644
--- a/anrui-scm/anrui-scm-ui/src/views/cheliang/chexing/chexing.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/cheliang/chexing/chexing.vue
@@ -51,19 +51,6 @@
                 <el-option v-for="item in productLine_list" :key="item.dictKey" :label="item.dictValue"
                            :value="item.dictKey"/>
               </el-select>
-              <!--              <el-select-->
-              <!--                v-model="listQuery.params.vehicleFunctionKey"-->
-              <!--                placeholder="请选择"-->
-              <!--                clearable-->
-              <!--                class="addinputw"-->
-              <!--              >-->
-              <!--                <el-option-->
-              <!--                  v-for="item in vehicleFunction_list"-->
-              <!--                  :key="item.dictKey"-->
-              <!--                  :label="item.dictValue"-->
-              <!--                  :value="item.dictKey"-->
-              <!--                />-->
-              <!--              </el-select>-->
             </el-form-item>
             <el-form-item label="驱动">
               <el-select
@@ -232,19 +219,21 @@
           </el-table-column>
           <el-table-column label="发动机型号" align="center">
             <template slot-scope="scope">
-              <span>{{ scope.row.engineType }}</span>
+              <span>{{ scope.row.engineTypeValue }}</span>
             </template>
           </el-table-column>
           <el-table-column label="车型编码" align="center">
             <template slot-scope="scope">
-              <span>{{ scope.row.otherConfig }}</span>
+              <span>{{ scope.row.vehicleTypeCode }}</span>
             </template>
           </el-table-column>
           <el-table-column label="车型照片" align="center" width="280px" class-name="small-padding fixed-width">
             <template slot-scope="scope">
               <el-button size="mini" type="primary" @click="handleGetCheck(scope.row)">查看</el-button>
               <div class="upload_img">
-                <upload ref="uploadImg" v-model="imgList" :limit="1" bucket="map" :upload-data="{type:'0001'}"></upload>
+                <upload ref="uploadMoreImg" v-model="imgList" :limit="1"
+                        bucket="map"
+                        :upload-data="{type:'0001',modelSid: scope.row.sid}"></upload>
               </div>
             </template>
           </el-table-column>
@@ -291,7 +280,8 @@
     deleteBySids,
     basefinbankExportExcel,
     brandDown,
-    pullDown
+    pullDown,
+    getAll
   } from '@/api/cheliang/basevehiclemodel'
   import { setMIng, getMIng, getCHeap, setCHeap } from '@/utils/baocun'
   import Pagination from '@/components/pagination'
@@ -299,7 +289,7 @@
   import chexingAdd from './chexingAdd'
   import chexinglook from './chexinglook'
   import chexingpeizhi from './relation/chexingguanlianchangyong'
-  import upload from '../../../components/uploadFile/upload'
+  import upload from '../../../components/uploadFile/upload_chexing'
 
   export default {
     name: 'Pinpaiguanli',
@@ -604,13 +594,17 @@
         console.log('图片列表', row.vehicleModelUrls)
         this.srcList = row.vehicleModelUrls
       },
-      handleUpload() {
-
+      handleUpload(row) {
+        const sid = row.sid
+       // this.$refs.uploadMoreImg.uploadData.modelSid = 123456
+        // this.$refs['uploadMoreImg'].showImg(sid)
       },
+
       // 打开查看
       handleCheck(row) {
         this.viewState = 4
         const sid = row.sid
+        console.log('详情sid', sid)
         this.$refs['divinfo'].showInfo(sid, row)
       },
       // 根据本行ID删除数据
diff --git a/anrui-scm/anrui-scm-ui/src/views/cheliang/chexing/chexingAdd.vue b/anrui-scm/anrui-scm-ui/src/views/cheliang/chexing/chexingAdd.vue
index 5aa3e175df..bfe5392070 100644
--- a/anrui-scm/anrui-scm-ui/src/views/cheliang/chexing/chexingAdd.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/cheliang/chexing/chexingAdd.vue
@@ -195,7 +195,7 @@
   } from 'vuex'
   import {
     SaveList,
-    details,
+    getAll,
     getOrg,
     selectByOrgSid,
     namesDownBySid,
@@ -210,29 +210,7 @@
     name: 'PinpaiAdd',
     components: { Upload },
     data() {
-      // var validCascader = (rule, value, callback) => {
-      //   if (this.useOrgArry.length == 0) {
-      //     callback(new Error('请填写使用组织'))
-      //   } else {
-      //     callback()
-      //   }
-      // }
       return {
-        baseVehicleModelAppendixDtos: {
-          aa: {
-            modelSid: '',  // 车型sid
-            filePath: ''  // 图片路径
-          },
-          bb: {
-            modelSid: '',  // 车型sid
-            filePath: ''  // 图片路径
-          },
-          cc: {
-            modelSid: '',  // 车型sid
-            filePath: ''  // 图片路径
-          }
-        },
-
         viewTitle: '',
         // --字段展示-------
         fieldShow: 0, // 0.所有 1.欧曼 2.陕汽
@@ -258,7 +236,7 @@
           vehicleTypeCode: '',  // 车型编码
           carBrand: '',  // 品牌
           // carBrandValue:'',
-          brandName:'',
+          brandName: '',
           vehicleType: '',  // 功能key
           vehicleTypeValue: '',  // 功能value值
           modelName: '',  // 车型名称
@@ -387,111 +365,90 @@
 
       showEdit(sid, row) {
         console.log(sid)
+        console.log('imgList', this.imgList)
         this.$nextTick(() => {
           this.$refs['dataForm'].clearValidate()
         })
         this.viewTitle = '【修改】车型信息'
         this.dialogStatus = 'update'
-        this.temp.sid = sid
         console.log('编辑回显', sid)
-        details(sid).then(resp => {
+        getAll(sid).then(resp => {
           const data = resp.data
           this.temp = data
-          // this.useOrgArry = data.useOrg
+          this.temp = JSON.parse(JSON.stringify(this.temp).replace(
+            /baseVehicleModelAppendixVos/g,
+            'baseVehicleModelAppendixDtos'
+            )
+          )
+          this.temp.sid = sid
+          if (this.temp.baseVehicleModelAppendixDtos.length > 0) {
+            for (var i = 0; i < this.temp.baseVehicleModelAppendixDtos.length; i++) {
+              var imgName = this.temp.baseVehicleModelAppendixDtos[i].filePath.split('/')
+              this.imgList.push({
+                name: imgName[imgName.length - 1],
+                url: this.temp.baseVehicleModelAppendixDtos[i].filePath
+              })
+            }
+            console.log('123123', this.imgList)
+          }
         })
       },
-      // 使用组织
-      usrOrgArryChange(e) {
-        console.log('选中结果：' + JSON.stringify(e))
-        var result = ''
-        var result_Sid = ''
-        if (e.length > 0) {
-          // 循环多选项
-          e.forEach((item) => {
-            var last_id = item[item.length - 1]
-            // console.log('options：'+JSON.stringify(this.options))
-            // 循环查找名字
-            this.select_temp = '' // 临时遍历，用来保存选中结果
-            this.select_temp_Sid = ''
-            this.findOrgId(last_id, this.options)
-            result = result + this.select_temp + ','
-            result_Sid = result_Sid + this.select_temp_Sid + ','
+      // 提交添加数据
+      handleCreate() {
+        this.$refs['dataForm'].validate(valid => {
+          if (valid) {
+            this.FormLoading = true
+            if (this.dialogStatus === 'add') {
+              this.getUrl()
+              SaveList(this.temp).then(response => {
+                this.FormLoading = false
+                if (response.code === '200') {
+                  this.dialogFormVisible = false
+                  this.handleReturn('true')
+                } else {
 
-          })
-        }
-        if (result !== '') {
-          result = result.substring(0, result.length - 1)
-        }
-        if (result_Sid !== '') {
-          result_Sid = result_Sid.substring(0, result_Sid.length - 1)
-        }
-        this.temp.useOrgName = result
-        console.log('选中名称：' + this.temp.useOrgName)
-      },
-      // 创建组织
-      createOrgChange(e) {
-        console.log('选中结果：' + JSON.stringify(e))
-        var result = ''
-        var result_Sid = ''
-        if (e.length > 0) {
-          // 循环多选项
-          e.forEach((item) => {
-            var last_id = item[item.length - 1]
-            // console.log('options：'+JSON.stringify(this.options))
-            // 循环查找名字
-            this.select_temp = '' // 临时遍历，用来保存选中结果
-            this.select_temp_Sid = ''
-            this.findOrgId(last_id, this.options)
-            result = result + this.select_temp + ','
-            result_Sid = result_Sid + this.select_temp_Sid + ','
+                }
+              })
+            } else {
+              const useOrg_array = this.temp.useOrg[0]
+              const useOrg_str = useOrg_array[useOrg_array.length - 1]
+              this.temp.useOrg = useOrg_str
+              this.updateUrl()
+              SaveList(this.temp).then(response => {
+                this.FormLoading = false
+                if (response.code === '200') {
+                  this.dialogFormVisible = false
+                  this.handleReturn('true')
+                } else {
 
-          })
-        }
-        if (result !== '') {
-          result = result.substring(0, result.length - 1)
-        }
-        if (result_Sid !== '') {
-          result_Sid = result_Sid.substring(0, result_Sid.length - 1)
-        }
-        this.temp.useOrgName = result
-        console.log('选中名称：' + this.temp.useOrgName)
-      },
-      // --- 循环查询
-      findOrgId(id, options) {
-        for (var i = 0; i < options.length; i++) {
-          if (id == options[i].sid) {
-            this.select_temp = options[i].name // 保存找到的内容
-            return true
-          } else {
-            // 判断是否最后一级
-            if (options[i].children !== undefined) {
-              // 不是的话查询下一级
-              if (this.findOrgId(id, options[i].children)) {
-                return true
-              }
+                }
+              })
             }
           }
-        }
-      },
-      // 组织
-      getZuZhi() {
-        getOrg().then(res => {
-          if (res.code === '200') {
-            this.options = res.data
-            this.zuzhi0(this.options)
-          }
         })
       },
-      zuzhi0(data) {
-        data.forEach((e) => {
-          if (e.children.length != 0) {
-            this.zuzhi0(e.children)
-          } else {
-            delete e.children
-            this.dataArr.push(e)
-            return
-          }
-        })
+      getUrl() {
+        console.log('已有图片', this.imgList)
+        for (var i = 0; i < this.imgList.length; i++) {
+          console.log(this.temp)
+          this.temp.baseVehicleModelAppendixDtos.push({
+            modelSid: this.temp.sid,
+            filePath: this.imgList[i].url
+          })
+          console.log('保存的图片', this.temp.baseVehicleModelAppendixDtos)
+        }
+      },
+      updateUrl() {
+        console.log('回显', this.imgList)
+        for (var i = 0; i < this.imgList.length; i++) {
+          const img_file = []
+          img_file.push({
+            modelSid: this.temp.sid,
+            filePath: this.imgList[i].url
+          })
+          this.temp.baseVehicleModelAppendixDtos = img_file
+          console.log('保存的图片', this.temp.baseVehicleModelAppendixDtos)
+        }
       },
       // ----------------------------------方法--------------------
       // 返回
@@ -500,7 +457,8 @@
         this.temp = {
           sid: '',  // 车型sid
           vehicleTypeCode: '',  // 车型编码
-          carBrandValue:'',
+          carBrandValue: '',
+          brandName: '',
           carBrand: '',  // 品牌
           vehicleType: '',  // 功能key
           vehicleTypeValue: '',  // 功能value值
@@ -673,51 +631,6 @@
           state: '' //	状态
         }
       },
-      // 提交添加数据
-      handleCreate() {
-        this.$refs['dataForm'].validate(valid => {
-          if (valid) {
-            this.FormLoading = true
-            if (this.dialogStatus === 'add') {
-              this.getUrl()
-              SaveList(this.temp).then(response => {
-                this.FormLoading = false
-                if (response.code === '200') {
-                  this.dialogFormVisible = false
-                  this.handleReturn('true')
-                } else {
-
-                }
-              })
-            } else {
-              this.getUrl()
-              SaveList(this.temp).then(response => {
-                this.FormLoading = false
-                if (response.code === '200') {
-                  this.dialogFormVisible = false
-                  this.handleReturn('true')
-                } else {
-
-                }
-              })
-            }
-          }
-        })
-      },
-      getUrl() {
-        console.log('已有图片', this.imgList)
-        for (var i = 0; i < this.imgList.length; i++) {
-          // var namese = this.imgList[i].name
-          // var nameArr = namese.split('.')
-          console.log(this.temp)
-          this.temp.baseVehicleModelAppendixDtos.push({
-            attachType: '0001',
-            modelSid: this.temp.sid,
-            filePath: this.imgList[i].url
-          })
-          console.log('保存的图片', this.temp.baseVehicleModelAppendixDtos)
-        }
-      },
       getChang() {
         selectByOrgSid().then(res => {
           if (res.code === '200') {
@@ -725,36 +638,6 @@
           }
         })
       },
-      getPinPAi(sid) {
-        let bb = {}
-        this.facturer.forEach((e) => {
-          // eslint-disable-next-line eqeqeq
-          if (e.sid == sid) {
-            bb = {
-              name: e.manufacturerName,
-              sid: e.sid
-            }
-          }
-        })
-        const manufacturer = bb.name
-        switch (manufacturer) {
-          case '欧曼':
-            this.fieldShow = 1
-            break
-          case '陕西重汽':
-            this.fieldShow = 2
-            break
-          default:
-            this.fieldShow = 0
-        }
-        namesDownBySid({
-          manufacturerSid: sid
-        }).then(res => {
-          if (res.code === '200') {
-            this.Brand = res.data
-          }
-        })
-      },
       getGong(value) {
         console.log('触发下拉框按钮', value)
         let bb = {}
@@ -811,62 +694,7 @@
         })
         this.temp.marketSegmentsValue = bb.name
       },
-      getCheliang() {
-        let bb = null
-        this.cleType.forEach(e => {
-          if (e.dictKey == value) {
-            bb = {
-              type: 'vehicleType',
-              name: e.dictValue,
-              vaule: e.dictKey
-            }
-          }
-        })
-        this.temp.vehicleTypeValue = bb.name
-        if (this.temp.modelValue != undefined) {
-          this.temp.modelValue.forEach((e, index) => {
-            if (e.type == bb.type) {
-              this.temp.modelValue.splice(index, 1)
-            }
-          })
 
-        } else {
-          this.temp.modelValue = []
-        }
-        this.temp.modelValue.push(bb)
-        let ab = ''
-        this.temp.modelValue.forEach((e, index) => {
-          ab = ab + e.name
-        })
-        this.temp.modelName = ab
-      },
-      getChangpin(value) {
-        let bb = null
-        //循环遍历 取name value
-        this.ctLine.forEach(e => {
-          if (e.dictKey == value) {
-            bb = {
-              type: 'productLine',
-              name: e.dictValue,
-              vaule: e.dictKey
-            }
-          }
-        })
-        this.temp.productLineValue = bb.name
-        //改变的时候先把旧值删掉
-        this.temp.modelValue.forEach((e, index) => {
-          if (e.type == bb.type) {
-            this.temp.modelValue.splice(index, 1)
-          }
-        })
-        this.temp.modelValue.push(bb)
-        let ab = ''
-        //往里面加值
-        this.temp.modelValue.forEach((e, index) => {
-          ab = ab + e.name
-        })
-        this.temp.modelName = ab
-      },
       getQudong(value) {
         let bb = null
         this.eForm.forEach(e => {
@@ -1061,6 +889,187 @@
         // })
 
       },
+
+      // ======== 暂无用代码 ========
+      // 组织
+      getZuZhi() {
+        getOrg().then(res => {
+          if (res.code === '200') {
+            this.options = res.data
+            this.zuzhi0(this.options)
+          }
+        })
+      },
+      zuzhi0(data) {
+        data.forEach((e) => {
+          if (e.children.length != 0) {
+            this.zuzhi0(e.children)
+          } else {
+            delete e.children
+            this.dataArr.push(e)
+            return
+          }
+        })
+      },
+      // 使用组织
+      usrOrgArryChange(e) {
+        console.log('选中结果：' + JSON.stringify(e))
+        var result = ''
+        var result_Sid = ''
+        if (e.length > 0) {
+          // 循环多选项
+          e.forEach((item) => {
+            var last_id = item[item.length - 1]
+            // console.log('options：'+JSON.stringify(this.options))
+            // 循环查找名字
+            this.select_temp = '' // 临时遍历，用来保存选中结果
+            this.select_temp_Sid = ''
+            this.findOrgId(last_id, this.options)
+            result = result + this.select_temp + ','
+            result_Sid = result_Sid + this.select_temp_Sid + ','
+
+          })
+        }
+        if (result !== '') {
+          result = result.substring(0, result.length - 1)
+        }
+        if (result_Sid !== '') {
+          result_Sid = result_Sid.substring(0, result_Sid.length - 1)
+        }
+        this.temp.useOrgName = result
+        console.log('选中名称：' + this.temp.useOrgName)
+      },
+      // 创建组织
+      createOrgChange(e) {
+        console.log('选中结果：' + JSON.stringify(e))
+        var result = ''
+        var result_Sid = ''
+        if (e.length > 0) {
+          // 循环多选项
+          e.forEach((item) => {
+            var last_id = item[item.length - 1]
+            // console.log('options：'+JSON.stringify(this.options))
+            // 循环查找名字
+            this.select_temp = '' // 临时遍历，用来保存选中结果
+            this.select_temp_Sid = ''
+            this.findOrgId(last_id, this.options)
+            result = result + this.select_temp + ','
+            result_Sid = result_Sid + this.select_temp_Sid + ','
+
+          })
+        }
+        if (result !== '') {
+          result = result.substring(0, result.length - 1)
+        }
+        if (result_Sid !== '') {
+          result_Sid = result_Sid.substring(0, result_Sid.length - 1)
+        }
+        this.temp.useOrgName = result
+        console.log('选中名称：' + this.temp.useOrgName)
+      },
+      // --- 循环查询
+      findOrgId(id, options) {
+        for (var i = 0; i < options.length; i++) {
+          if (id == options[i].sid) {
+            this.select_temp = options[i].name // 保存找到的内容
+            return true
+          } else {
+            // 判断是否最后一级
+            if (options[i].children !== undefined) {
+              // 不是的话查询下一级
+              if (this.findOrgId(id, options[i].children)) {
+                return true
+              }
+            }
+          }
+        }
+      },
+      getPinPAi(sid) {
+        let bb = {}
+        this.facturer.forEach((e) => {
+          // eslint-disable-next-line eqeqeq
+          if (e.sid == sid) {
+            bb = {
+              name: e.manufacturerName,
+              sid: e.sid
+            }
+          }
+        })
+        const manufacturer = bb.name
+        switch (manufacturer) {
+          case '欧曼':
+            this.fieldShow = 1
+            break
+          case '陕西重汽':
+            this.fieldShow = 2
+            break
+          default:
+            this.fieldShow = 0
+        }
+        namesDownBySid({
+          manufacturerSid: sid
+        }).then(res => {
+          if (res.code === '200') {
+            this.Brand = res.data
+          }
+        })
+      },
+      getCheliang() {
+        let bb = null
+        this.cleType.forEach(e => {
+          if (e.dictKey == value) {
+            bb = {
+              type: 'vehicleType',
+              name: e.dictValue,
+              vaule: e.dictKey
+            }
+          }
+        })
+        this.temp.vehicleTypeValue = bb.name
+        if (this.temp.modelValue != undefined) {
+          this.temp.modelValue.forEach((e, index) => {
+            if (e.type == bb.type) {
+              this.temp.modelValue.splice(index, 1)
+            }
+          })
+
+        } else {
+          this.temp.modelValue = []
+        }
+        this.temp.modelValue.push(bb)
+        let ab = ''
+        this.temp.modelValue.forEach((e, index) => {
+          ab = ab + e.name
+        })
+        this.temp.modelName = ab
+      },
+      getChangpin(value) {
+        let bb = null
+        //循环遍历 取name value
+        this.ctLine.forEach(e => {
+          if (e.dictKey == value) {
+            bb = {
+              type: 'productLine',
+              name: e.dictValue,
+              vaule: e.dictKey
+            }
+          }
+        })
+        this.temp.productLineValue = bb.name
+        //改变的时候先把旧值删掉
+        this.temp.modelValue.forEach((e, index) => {
+          if (e.type == bb.type) {
+            this.temp.modelValue.splice(index, 1)
+          }
+        })
+        this.temp.modelValue.push(bb)
+        let ab = ''
+        //往里面加值
+        this.temp.modelValue.forEach((e, index) => {
+          ab = ab + e.name
+        })
+        this.temp.modelName = ab
+      },
       getXuanJia(value) {
         let bb = null
         this.pension.forEach(e => {
@@ -1145,6 +1154,7 @@
         // })
         // this.temp.speedRatio = cd
       }
+
     }
 
   }
diff --git a/anrui-scm/anrui-scm-ui/src/views/cheliang/chexing/chexinglook.vue b/anrui-scm/anrui-scm-ui/src/views/cheliang/chexing/chexinglook.vue
index 9cfdb667b8..bf58c9a399 100644
--- a/anrui-scm/anrui-scm-ui/src/views/cheliang/chexing/chexinglook.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/cheliang/chexing/chexinglook.vue
@@ -23,7 +23,7 @@
           </el-col>
           <el-col :span="8">
             <el-form-item prop="otherConfig">
-              <span>{{temp.otherConfig}}</span>
+              <span>{{temp.vehicleTypeCode}}</span>
             </el-form-item>
           </el-col>
         </el-row>
@@ -33,7 +33,7 @@
           </el-col>
           <el-col :span="8">
             <el-form-item prop="vehicleFunction">
-              <span>{{temp.vehicleFunction}}</span>
+              <span>{{temp.vehicleTypeValue}}</span>
             </el-form-item>
           </el-col>
           <el-col :span="4">
@@ -41,7 +41,7 @@
           </el-col>
           <el-col :span="8">
             <el-form-item prop="series">
-              <span>{{temp.series}}</span>
+              <span>{{temp.productLineValue}}</span>
             </el-form-item>
           </el-col>
         </el-row>
@@ -161,7 +161,7 @@
           </div>
           <template class="tablelist">
             <el-table
-              :data="temp.list"
+              :data="list"
               :index="index"
               border
               style="width: 100%"
@@ -174,7 +174,7 @@
               />
               <el-table-column prop="mNum" width="150" label="指导价" align="center">
                 <template slot-scope="props">
-                  <span>{{props.row.price}}</span>
+                  <span>{{props.row.guidedPrice}}</span>
                 </template>
               </el-table-column>
               <el-table-column prop="mName" width="150" label="颜色" align="center">
@@ -293,6 +293,7 @@
         index: 0,
         listLoading: false,
         temp: {}, // 添加和修改
+        list: [],
         templook: { titlea: '00000112' }, // 查看实体
         textMap: {
           update: '修改',
@@ -328,6 +329,7 @@
       // 返回
       handleReturn() {
         this.temp = {}
+        this.list = []
         this.$emit('doback')
       },
 
@@ -341,6 +343,7 @@
           this.FormLoading = false
           if (response.success) {
             this.temp = response.data
+            this.list.push(response.data.baseModelConfigVo)
           }
         }).catch(() => {
 
diff --git a/anrui-scm/anrui-scm-ui/src/views/cheliang/chexing/relation/changyongpeizhi.vue b/anrui-scm/anrui-scm-ui/src/views/cheliang/chexing/relation/changyongpeizhi.vue
index 6dc11e4cab..6efb69e846 100644
--- a/anrui-scm/anrui-scm-ui/src/views/cheliang/chexing/relation/changyongpeizhi.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/cheliang/chexing/relation/changyongpeizhi.vue
@@ -5,7 +5,7 @@
       <div class="tab-header webtop">
         <div>常用配置管理</div>
         <div>
-          <el-button type="primary" size="small" @click="handleCreate()">新增</el-button>
+          <el-button type="primary" size="small" @click="handleCreate()">新增配置</el-button>
           <el-button type="primary" size="small" @click="handleConfirm()">确认</el-button>
           <el-button type="info" size="small" @click="handleReturn()">返回</el-button>
         </div>
@@ -431,7 +431,7 @@
 
 <script>
   import { mapGetters } from 'vuex'
-  import { pagerList, deleteBySids, pullDown } from '@/api/cheliang/basemodelconfig'
+  import { getList, deleteBySids, pullDown, setRel } from '@/api/cheliang/basemodelconfig'
   import Pagination from '@/components/pagination'
   import pageye from '@/components/pagination/pageye'
   import changyongpeizhiAdd from '../../chexingpeizhi/changyongpeizhiAdd'
@@ -519,6 +519,9 @@
           update: '编辑',
           create: '创建'
         },
+        rel_list: {},
+        modelSids: [],
+        configurationItemsSids: [],
         sids: [],
         names: '', // [ {{names}} ]
         chesid: '',
@@ -599,8 +602,8 @@
         this.names = name
         console.log('9639636', this.names)
       },
-      showSetRel(setRelList){
-
+      showSetRel(modelSid){
+        this.rel_list.modelSid = modelSid
       },
       getType() {
         // 下拉框-车身颜色
@@ -657,13 +660,21 @@
             console.log('下拉框请求后桥速比', res.data)
           }
         })
-        // 空调
+        // 空调 导流罩 护轮罩 独立热源 多媒体
         pullDown({
           type: 'whether'
         }).then((res) => {
           if (res.code === '200') {
             this.airConditioner_list = res.data
             console.log('下拉框请求空调', res.data)
+            this.baffleModel_list = res.data
+            console.log('下拉框请求导流罩', res.data)
+            this.tireCover_list = res.data
+            console.log('下拉框请求护轮罩', res.data)
+            this.independentSources_list = res.data
+            console.log('下拉框请求护独立热源', res.data)
+            this.multimedia_list = res.data
+            console.log('下拉框请求多媒体', res.data)
           }
         })
         // 轮毂材质
@@ -676,14 +687,14 @@
           }
         })
         // 导流罩
-        pullDown({
-          type: 'whether'
-        }).then((res) => {
-          if (res.code === '200') {
-            this.baffleModel_list = res.data
-            console.log('下拉框请求导流罩', res.data)
-          }
-        })
+        // pullDown({
+        //   type: 'whether'
+        // }).then((res) => {
+        //   if (res.code === '200') {
+        //     this.baffleModel_list = res.data
+        //     console.log('下拉框请求导流罩', res.data)
+        //   }
+        // })
         // 悬架
         pullDown({
           type: 'suspension'
@@ -703,14 +714,14 @@
           }
         })
         // 护轮罩
-        pullDown({
-          type: 'whether'
-        }).then((res) => {
-          if (res.code === '200') {
-            this.tireCover_list = res.data
-            console.log('下拉框请求护轮罩', res.data)
-          }
-        })
+        // pullDown({
+        //   type: 'whether'
+        // }).then((res) => {
+        //   if (res.code === '200') {
+        //     this.tireCover_list = res.data
+        //     console.log('下拉框请求护轮罩', res.data)
+        //   }
+        // })
         // 鞍座
         pullDown({
           type: 'saddle'
@@ -748,14 +759,14 @@
           }
         })
         // 独立热源
-        pullDown({
-          type: 'whether'
-        }).then((res) => {
-          if (res.code === '200') {
-            this.independentSources_list = res.data
-            console.log('下拉框请求护独立热源', res.data)
-          }
-        })
+        // pullDown({
+        //   type: 'whether'
+        // }).then((res) => {
+        //   if (res.code === '200') {
+        //     this.independentSources_list = res.data
+        //     console.log('下拉框请求护独立热源', res.data)
+        //   }
+        // })
         // 下拉框-油箱
         pullDown({
           type: 'fuelTank'
@@ -766,17 +777,18 @@
           }
         })
         // 多媒体
-        pullDown({
-          type: 'whether'
-        }).then((res) => {
-          if (res.code === '200') {
-            this.multimedia_list = res.data
-            console.log('下拉框请求多媒体', res.data)
-          }
-        })
+        // pullDown({
+        //   type: 'whether'
+        // }).then((res) => {
+        //   if (res.code === '200') {
+        //     this.multimedia_list = res.data
+        //     console.log('下拉框请求多媒体', res.data)
+        //   }
+        // })
       },
       // 返回
-      handleReturn() {
+      handleReturn(isreload) {
+        if (isreload === 'true') this.$emit('reloadlist')
         this.$emit('doback')
       },
       // 序号
@@ -789,17 +801,26 @@
         this.pageState = 3
       },
       handleSelectionChange(row) {
+        console.log('11row',row)
         const aa = []
+        const bb = []
+        const cc = []
         row.forEach((element) => {
           aa.push(element.sid)
+          bb.push(element.modelSid)
+          cc.push(element.configurationItemsSid)
         })
         this.sids = aa
+        this.modelSids = bb
+        this.configurationItemsSids = cc
         console.log('选择的数据', this.sids)
+        console.log('选择的数据', this.modelSids)
+        console.log('选择的数据', this.configurationItemsSids)
       },
       // 查询列表信息
       getList() {
         this.listLoading = true
-        pagerList(this.listQuery).then((response) => {
+        getList(this.listQuery).then((response) => {
           this.listLoading = false
           if (
             response.code === '200' &&
@@ -872,8 +893,27 @@
         this.pageState = 4
         this.$refs['divadd'].showAdd()
       },
+      // this.handleReturn('true')
       handleConfirm() {
+        if (this.sids.length === 0) {
+          this.$message({ showClose: true, type: 'error', message: '请选择一条记录进行关联' })
+          return
+        }
+        if (this.sids.length > 1) {
+          this.$message({ showClose: true, type: 'error', message: '只能选择一条记录进行关联' })
+          return
+        }
+        this.rel_list.configurationItemsSid = this.sids[0]
+        console.log('11111',this.rel_list)
+        setRel(this.rel_list).then(response => {
+          this.FormLoading = false
+          if (response.success) {
+            this.dialogFormVisible = false
+            this.handleReturn('true')
+          } else {
 
+          }
+        })
       }
     }
   }
diff --git a/anrui-scm/anrui-scm-ui/src/views/cheliang/chexing/relation/chexingguanlianchangyong.vue b/anrui-scm/anrui-scm-ui/src/views/cheliang/chexing/relation/chexingguanlianchangyong.vue
index 684df2c9c1..c993e28dc5 100644
--- a/anrui-scm/anrui-scm-ui/src/views/cheliang/chexing/relation/chexingguanlianchangyong.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/cheliang/chexing/relation/chexingguanlianchangyong.vue
@@ -691,13 +691,21 @@
             console.log('下拉框请求后桥速比', res.data)
           }
         })
-        // 空调
+        // 空调 导流罩 护轮罩 独立热源 多媒体
         pullDown({
           type: 'whether'
         }).then((res) => {
           if (res.code === '200') {
             this.airConditioner_list = res.data
             console.log('下拉框请求空调', res.data)
+            this.baffleModel_list = res.data
+            console.log('下拉框请求导流罩', res.data)
+            this.tireCover_list = res.data
+            console.log('下拉框请求护轮罩', res.data)
+            this.independentSources_list = res.data
+            console.log('下拉框请求护独立热源', res.data)
+            this.multimedia_list = res.data
+            console.log('下拉框请求多媒体', res.data)
           }
         })
         // 轮毂材质
@@ -710,14 +718,14 @@
           }
         })
         // 导流罩
-        pullDown({
-          type: 'whether'
-        }).then((res) => {
-          if (res.code === '200') {
-            this.baffleModel_list = res.data
-            console.log('下拉框请求导流罩', res.data)
-          }
-        })
+        // pullDown({
+        //   type: 'whether'
+        // }).then((res) => {
+        //   if (res.code === '200') {
+        //     this.baffleModel_list = res.data
+        //     console.log('下拉框请求导流罩', res.data)
+        //   }
+        // })
         // 悬架
         pullDown({
           type: 'suspension'
@@ -737,14 +745,14 @@
           }
         })
         // 护轮罩
-        pullDown({
-          type: 'whether'
-        }).then((res) => {
-          if (res.code === '200') {
-            this.tireCover_list = res.data
-            console.log('下拉框请求护轮罩', res.data)
-          }
-        })
+        // pullDown({
+        //   type: 'whether'
+        // }).then((res) => {
+        //   if (res.code === '200') {
+        //     this.tireCover_list = res.data
+        //     console.log('下拉框请求护轮罩', res.data)
+        //   }
+        // })
         // 鞍座
         pullDown({
           type: 'saddle'
@@ -782,14 +790,14 @@
           }
         })
         // 独立热源
-        pullDown({
-          type: 'whether'
-        }).then((res) => {
-          if (res.code === '200') {
-            this.independentSources_list = res.data
-            console.log('下拉框请求护独立热源', res.data)
-          }
-        })
+        // pullDown({
+        //   type: 'whether'
+        // }).then((res) => {
+        //   if (res.code === '200') {
+        //     this.independentSources_list = res.data
+        //     console.log('下拉框请求护独立热源', res.data)
+        //   }
+        // })
         // 下拉框-油箱
         pullDown({
           type: 'fuelTank'
@@ -800,24 +808,24 @@
           }
         })
         // 多媒体
-        pullDown({
-          type: 'whether'
-        }).then((res) => {
-          if (res.code === '200') {
-            this.multimedia_list = res.data
-            console.log('下拉框请求多媒体', res.data)
-          }
-        })
+        // pullDown({
+        //   type: 'whether'
+        // }).then((res) => {
+        //   if (res.code === '200') {
+        //     this.multimedia_list = res.data
+        //     console.log('下拉框请求多媒体', res.data)
+        //   }
+        // })
       },
       // 打开价格维护
-      handleJiage() {
+      handleJiage(row) {
         this.pageState = 2
-        this.$refs['weihu'].showWeiHu(this.title)
+        this.$refs['weihu'].showWeiHu(row.sid)
       },
       // 打开关联
       handleGuanlian() {
         this.pageState = 3
-        // this.$refs['changyongpeizhi'].showSetRel(this.setRelList)
+        this.$refs['changyongpeizhi'].showSetRel( this.setRelList.modelSid)
       },
       // 解除关联
       handleDelete() {
@@ -833,13 +841,7 @@
         console.log('解除关系所需参数', this.checkRelieve_list)
         this.checkRelieve_list.configurationItemsSid = this.configurationItemsSid_list[0] //
         deleteRel(this.checkRelieve_list).then((response) => {
-          if (response.code === '200') {
-            this.$notify({
-              title: '提示',
-              message: '删除成功',
-              type: 'success',
-              duration: 2000
-            })
+          if (response.success) {
             this.getList()
           }
         })
diff --git a/anrui-scm/anrui-scm-ui/src/views/cheliang/chexing/relation/chexingpeizhijiageweihuAdd.vue b/anrui-scm/anrui-scm-ui/src/views/cheliang/chexing/relation/chexingpeizhijiageweihuAdd.vue
index 162b3d13ea..87256f7b73 100644
--- a/anrui-scm/anrui-scm-ui/src/views/cheliang/chexing/relation/chexingpeizhijiageweihuAdd.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/cheliang/chexing/relation/chexingpeizhijiageweihuAdd.vue
@@ -4,18 +4,14 @@
       <div>价格维护</div>
     </div>
     <div class="listconadd">
-      <el-form ref="dataForm" :model="temp" label-position="right" class="formadd" :rules="rules">
+      <el-form ref="weihuForm" :model="temp" label-position="right" class="formadd" :rules="rules">
         <el-row class="tleftb_one">
           <el-col :span="6" class="tleftb">
             <span><span class="icon">*</span>车型名称</span> <!--modelName-->
           </el-col>
           <el-col :span="18">
-            <el-form-item prop="modelName">
-              <el-select v-model="temp.modelName" placeholder="请选择" filterable clearable class="addinputw"
-                         @change="getPinpai()">
-                <el-option v-for="item in carBrand_list" :key="item.sid" :label="item.brandName"
-                           :value="item.brandName"/>
-              </el-select>
+            <el-form-item>
+              <span>{{temp.modelName}}</span>
             </el-form-item>
           </el-col>
         </el-row>
@@ -24,9 +20,8 @@
             <span><span class="icon">*</span>常用配置</span>
           </el-col>
           <el-col :span="18">
-            <el-form-item prop="brandName">
-              <el-input v-model="temp.otherConfig" maxlength="125" placeholder="请输入" clearable class="addinputw"
-                        clearable/>
+            <el-form-item>
+              <span>{{temp.configName}}</span>
             </el-form-item>
           </el-col>
         </el-row>
@@ -36,8 +31,7 @@
           </el-col>
           <el-col :span="18">
             <el-form-item>
-              <el-input v-model="temp.specifications" type="textarea" maxlength="125" placeholder="请输入"
-                        class="addinputw" clearable/>
+              <span>{{temp.otherConfig}}</span>
             </el-form-item>
           </el-col>
         </el-row>
@@ -46,8 +40,8 @@
             <span><span class="icon">*</span>厂家结算价</span>
           </el-col>
           <el-col :span="6">
-            <el-form-item prop="carModel">
-              <el-input v-model="temp.specifications" type="textarea" maxlength="125" placeholder="请输入"
+            <el-form-item>
+              <el-input v-model="temp.manufactorSettlementPrice" type="textarea" maxlength="125" placeholder="请输入"
                         class="addinputw" clearable/>
             </el-form-item>
           </el-col>
@@ -56,7 +50,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item>
-              <el-input v-model="temp.specifications" maxlength="125" placeholder="请输入" class="addinputw" clearable/>
+              <el-input v-model="temp.guidedPrice" maxlength="125" placeholder="请输入" class="addinputw" clearable/>
             </el-form-item>
           </el-col>
         </el-row>
@@ -73,12 +67,15 @@
   import {
     mapGetters
   } from 'vuex'
+  import {
+    fetchBySid,
+    update
+  } from '@/api/cheliang/basemodelconfig'
 
   export default {
     name: 'chexingpeizhijiageweihu',
     data() {
       return {
-        viewTitle: '',
         // --字段展示-------
         fieldShow: 0, // 0.所有 1.欧曼 2.陕汽
         // --按钮菜单-------
@@ -100,7 +97,9 @@
         createOrgArry: [], // 创建组织
         temp: {
           sid: '', // 一条数据的sid
-          modelName: '' // 车型名称(产品名称 陕汽必须1)
+          modelName: '', // 车型名称(产品名称 陕汽必须1)
+          manufactorSettlementPrice: '', // 厂家结算价
+          guidedPrice: '' // 销售指导价
         }, // 添加和修改
         templook: {}, // 查看实体
         textMap: {
@@ -113,14 +112,6 @@
         pdateChe: null,
         pdateChang: null,
         side: [],
-        options: [],
-        useOrg: [],
-        props: {
-          value: 'sid',
-          label: 'name',
-          children: 'children',
-          checkStrictly: true
-        },
         dialogFormVisible: false, // 添加修改对话框状态
         dialogFormShowVisible: false, // 查看对话框默认关闭状态
         dialogStatus: '', // 对话框状态
@@ -135,28 +126,18 @@
 
     },
     methods: {
-      showWeiHu(modelName) {
+      showWeiHu(sid) {
         this.$nextTick(() => {
-          this.$refs['dataForm'].clearValidate()
+          this.$refs['weihuForm'].clearValidate()
+        })
+        fetchBySid(sid).then(resp => {
+          if (resp.success) {
+            const data = resp.data
+            this.temp = data
+            this.temp.sid = sid
+          }
         })
-        this.temp.modelName = modelName
       },
-
-      // showEdit(sid, row) {
-      //   console.log(sid)
-      //   this.$nextTick(() => {
-      //     this.$refs['dataForm'].clearValidate()
-      //   })
-      //   this.viewTitle = '【修改】车型信息'
-      //   this.dialogStatus = 'update'
-      //   this.temp.sid = sid
-      //   console.log('编辑回显', sid)
-      //   details(sid).then(resp => {
-      //     const data = resp.data
-      //     this.temp = data
-      //     this.useOrgArry = data.useOrg
-      //   })
-      // },
       // ----------------------------------方法--------------------
       // 返回
       handleReturn(isreload) {
@@ -170,14 +151,26 @@
       resetTemp() {
         this.temp = {}
       },
-      // 提交添加数据
+      // 保存修改数据
       handleCreate() {
-        this.$refs['dataForm'].validate(valid => {
+        this.$refs['weihuForm'].validate(valid => {
           if (valid) {
-
+            const temp = {
+              sid: this.temp.sid,
+              manufactorSettlementPrice: this.temp.manufactorSettlementPrice,
+              guidedPrice: this.temp.guidedPrice
+            }
+            update(temp).then(resp => {
+              if (resp.success) {
+                const data = resp.data
+                this.temp = data
+                this.handleReturn('true')
+              }
+            })
           }
         })
       }
+
     }
   }
 </script>
diff --git a/anrui-scm/anrui-scm-ui/src/views/cheliang/chexingpeizhi/changyongpeizhiAdd.vue b/anrui-scm/anrui-scm-ui/src/views/cheliang/chexingpeizhi/changyongpeizhiAdd.vue
index 3b559402f6..a28176a3d2 100644
--- a/anrui-scm/anrui-scm-ui/src/views/cheliang/chexingpeizhi/changyongpeizhiAdd.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/cheliang/chexingpeizhi/changyongpeizhiAdd.vue
@@ -674,13 +674,21 @@
             console.log('下拉框请求后桥速比', res.data)
           }
         })
-        // 空调
+        // 空调 导流罩 护轮罩 独立热源 多媒体
         pullDown({
           type: 'whether'
         }).then((res) => {
           if (res.code === '200') {
             this.airConditioner_list = res.data
             console.log('下拉框请求空调', res.data)
+            this.baffleModel_list = res.data
+            console.log('下拉框请求导流罩', res.data)
+            this.tireCover_list = res.data
+            console.log('下拉框请求护轮罩', res.data)
+            this.independentSources_list = res.data
+            console.log('下拉框请求护独立热源', res.data)
+            this.multimedia_list = res.data
+            console.log('下拉框请求多媒体', res.data)
           }
         })
         // 轮毂材质
@@ -693,14 +701,14 @@
           }
         })
         // 导流罩
-        pullDown({
-          type: 'whether'
-        }).then((res) => {
-          if (res.code === '200') {
-            this.baffleModel_list = res.data
-            console.log('下拉框请求导流罩', res.data)
-          }
-        })
+        // pullDown({
+        //   type: 'whether'
+        // }).then((res) => {
+        //   if (res.code === '200') {
+        //     this.baffleModel_list = res.data
+        //     console.log('下拉框请求导流罩', res.data)
+        //   }
+        // })
         // 悬架
         pullDown({
           type: 'suspension'
@@ -720,14 +728,14 @@
           }
         })
         // 护轮罩
-        pullDown({
-          type: 'whether'
-        }).then((res) => {
-          if (res.code === '200') {
-            this.tireCover_list = res.data
-            console.log('下拉框请求护轮罩', res.data)
-          }
-        })
+        // pullDown({
+        //   type: 'whether'
+        // }).then((res) => {
+        //   if (res.code === '200') {
+        //     this.tireCover_list = res.data
+        //     console.log('下拉框请求护轮罩', res.data)
+        //   }
+        // })
         // 鞍座
         pullDown({
           type: 'saddle'
@@ -765,14 +773,14 @@
           }
         })
         // 独立热源
-        pullDown({
-          type: 'whether'
-        }).then((res) => {
-          if (res.code === '200') {
-            this.independentSources_list = res.data
-            console.log('下拉框请求护独立热源', res.data)
-          }
-        })
+        // pullDown({
+        //   type: 'whether'
+        // }).then((res) => {
+        //   if (res.code === '200') {
+        //     this.independentSources_list = res.data
+        //     console.log('下拉框请求护独立热源', res.data)
+        //   }
+        // })
         // 下拉框-油箱
         pullDown({
           type: 'fuelTank'
@@ -783,14 +791,14 @@
           }
         })
         // 多媒体
-        pullDown({
-          type: 'whether'
-        }).then((res) => {
-          if (res.code === '200') {
-            this.multimedia_list = res.data
-            console.log('下拉框请求多媒体', res.data)
-          }
-        })
+        // pullDown({
+        //   type: 'whether'
+        // }).then((res) => {
+        //   if (res.code === '200') {
+        //     this.multimedia_list = res.data
+        //     console.log('下拉框请求多媒体', res.data)
+        //   }
+        // })
       },
 
       changeCarColor(value) {