完善车辆台账列表增加车型、配置的相关字段

anrui-scm/anrui-scm-ui/src/views/cheliang/cheliangtaizhang/cheliangtaizhang.vue

@@ -9,7 +9,7 @@
             <el-form ref="listQueryform" :inline="true" :model="listQuery" label-width="100px" class="tab-header">
               <el-form-item label="存放地点">
                 <el-select v-model="listQuery.params.location" class="addinputw" clearable placeholder="">
-                  <el-option v-for="(item,index) in location_list" :key="item.sid" :label="item.warehouseName" :value="item.sid"/>
+                  <el-option v-for="item in location_list" :key="item.sid" :label="item.warehouseName" :value="item.sid"/>
                 </el-select>
               </el-form-item>
               <el-form-item label="车型名称">
@@ -43,12 +43,6 @@
           <el-table :key="tableKey" v-loading="listLoading" :data="list" border style="width: 100%;" @selection-change="handleSelectionChange">
             <el-table-column width="50px" fixed type="selection" align="center"/>
             <el-table-column width="80px" fixed label="序号" type="index" :index="indexMethod" align="center"/>
-            <!--            <el-table-column label="操作" align="center" width="180px" class-name="small-padding fixed-width">-->
-            <!--              <template slot-scope="{row}">-->
-            <!--                <el-button size="mini" type="primary" @click="handleCheck(row)">查看</el-button>-->
-            <!--                <el-button size="mini" type="primary" @click="cheLiangXiangXiPeiZhi(row)">车型配置</el-button>-->
-            <!--              </template>-->
-            <!--            </el-table-column>-->
             <el-table-column label="车型" fixed width="200" align="left" header-align="center">
               <template slot-scope="scope">
                 <span class="bluezi" @click="cheLiangXiangXiPeiZhi(scope.row)">{{ scope.row.modelName }}</span>
@@ -60,11 +54,6 @@
               </template>
             </el-table-column>
             <el-table-column prop="certificateStateValue" width="130" label="合格证状态" align="center"/>
-            <!--            <el-table-column width="190px" label="发动机号/许可证" align="center">-->
-            <!--              <template slot-scope="scope">-->
-            <!--                <span>{{ scope.row.engineNo }}</span>-->
-            <!--              </template>-->
-            <!--            </el-table-column>-->
             <el-table-column width="140" label="存放地点" align="center">
               <template slot-scope="scope">
                 <span class="bluezi" @click="handleLook(scope.row)">{{ scope.row.locationName }}</span>
@@ -85,9 +74,6 @@
             <el-table-column prop="lockedStateValue" width="130" label="锁定状态" align="center"/>
             <el-table-column prop="manPurOrderTypeValue" width="160" label="厂家采购订单类型" align="center"/>
             <el-table-column prop="orderingNo" width="160" label="厂家订单编号" align="center"/>
-            <!--            <el-table-column prop="rebate1" width="130" label="返利1"  align="center" />-->
-            <!--            <el-table-column prop="rebate2" width="130" label="返利2" align="center" />-->
-            <!--            <el-table-column prop="rebate3" width="130" label="返利3" align="center" />-->
             <el-table-column prop="returnDate" width="130" label="退库日期" align="center"/>
             <el-table-column prop="salePrice" width="130" label="成交价" align="center"/>
             <el-table-column prop="salesDate" width="130" label="销售日期" align="center"/>
@@ -102,10 +88,42 @@
               </template>
             </el-table-column>
             <el-table-column prop="solidDate" width="130" label="买断日期" align="center"/>
-            <!--            <el-table-column prop="specialInstructions" width="150" label="特殊或差异说明" align="left" header-align="center" />-->
-            <!--            <el-table-column prop="useOrgName" width="130" label="使用组织名称" align="center" />-->
-<!--            <el-table-column prop="witPinStateValue" width="100" label="调车状态" align="center"/>-->
             <el-table-column prop="warrantyCardNo" width="130" label="保修卡号" align="center"/>
+            <el-table-column prop="brandName" width="130" label="品牌" align="center"/>
+            <el-table-column prop="vehicleTypeValue" width="130" label="功能" align="center"/>
+            <el-table-column prop="productLineValue" width="130" label="系列" align="center"/>
+            <el-table-column prop="driveFormValue" width="130" label="驱动" align="center"/>
+            <el-table-column prop="powerValue" width="130" label="马力" align="center"/>
+            <el-table-column prop="vehicleVersionValue" width="130" label="版本" align="center"/>
+            <el-table-column prop="fuelTypeValue" width="130" label="燃料" align="center"/>
+            <el-table-column prop="gearboxTypeValue" width="130" label="变速箱" align="center"/>
+            <el-table-column prop="emissionStandardValue" width="130" label="排放标准" align="center"/>
+            <el-table-column prop="engineTypeValue" width="130" label="发动机型号" align="center"/>
+            <el-table-column prop="marketSegmentsValue" width="130" label="细分市场" align="center"/>
+            <el-table-column prop="specifications" width="130" label="规格型号" align="center"/>
+            <el-table-column prop="departmentValue" width="130" label="系别" align="center"/>
+
+            <el-table-column prop="carColor" width="130" label="颜色" align="center"/>
+            <el-table-column prop="slowMachine" width="130" label="缓速器" align="center"/>
+            <el-table-column prop="rearViewMirror" width="130" label="后视镜" align="center"/>
+            <el-table-column prop="tireSize" width="130" label="轮胎" align="center"/>
+            <el-table-column prop="specification" width="130" label="驾驶室" align="center"/>
+            <el-table-column prop="rearAxleValue" width="130" label="后桥" align="center"/>
+            <el-table-column prop="rearAxleRatio" width="130" label="速比" align="center"/>
+            <el-table-column prop="airConditioner" width="130" label="空调" align="center"/>
+            <el-table-column prop="hubMaterial" width="130" label="轮毂材质" align="center"/>
+            <el-table-column prop="baffleModel" width="130" label="导流罩" align="center"/>
+            <el-table-column prop="suspension" width="130" label="悬架" align="center"/>
+            <el-table-column prop="seat" width="130" label="座椅" align="center"/>
+            <el-table-column prop="tireCover" width="130" label="护轮罩" align="center"/>
+            <el-table-column prop="saddle" width="130" label="鞍座" align="center"/>
+            <el-table-column prop="wheelbase" width="130" label="轴距" align="center"/>
+            <el-table-column prop="bumper" width="130" label="保险杠" align="center"/>
+            <el-table-column prop="configuringBao" width="130" label="配置包" align="center"/>
+            <el-table-column prop="independentSources" width="130" label="独立热源" align="center"/>
+            <el-table-column prop="fuelTank" width="130" label="燃料箱" align="center"/>
+            <el-table-column prop="multimedia" width="130" label="多媒体" align="center"/>
+            <el-table-column prop="otherConfig" width="130" label="更多配置" align="center"/>
           </el-table>
         </div>
         <div class="pages">
@@ -190,10 +208,8 @@ import cheliangtaizhangAdd from './cheliangtaizhangAdd'
 import Pagination from '@/components/pagination'
 import pageye from '@/components/pagination/pageye'
 import CheliangtaizhangInfo from './cheliangtaizhangInfo'
-import ChangyongpeizhiInfo from '@/views/cheliang/chexingpeizhi/changyongpeizhiInfo'
 import vehicleconfiguration from '@/views/cheliang/cheliangtaizhang/relation/vehicleconfiguration'
 import ButtonBar from '@/components/ButtonBar'
-import Vehicle from '@/views/workFlow/weishoumaiduanFlow/weishoumaiduanguanli/vehicle'
 import { getPathSidByUserSid } from '@/api/cheliang/basevehiclemodel'
 import cheliangtaizhangChu from '@/views/cheliang/cheliangtaizhang/relation/cheliangtaizhangChu'
 import cheliangtaizhangMai from '@/views/cheliang/cheliangtaizhang/relation/cheliangtaizhangMai'
@@ -203,8 +219,6 @@ import cheliangpeijian from './cheliangpeijianchange/cheliangpeijian'
 export default {
   name: 'cheliangtaizhang',
   components: {
-    Vehicle,
-    ChangyongpeizhiInfo,
     Pagination,
     pageye,
     ButtonBar,
@@ -443,7 +457,7 @@ export default {
     },
     getPathSid() {
       const userSid = window.sessionStorage.getItem('userSid')
-      getPathSidByUserSid({userSid: userSid}).then((res) => {
+      getPathSidByUserSid({ userSid: userSid }).then((res) => {
         if (res.code === '200') {
           this.listQuery.params.createOrgSid = res.data
           this.queryParams.params.useOrgSid = res.data
@@ -557,7 +571,7 @@ export default {
     doMaiduan() { // salesDate settlementStatus
       if (this.sids.length > 0) {
         for (var i = 0; i < this.multipleSelection.length; i++) {
-          if (this.multipleSelection[i].settlementStatus == '已买断') {
+          if (this.multipleSelection[i].settlementStatus === '已买断') {
             this.$message({
               showClose: true,
               message: '所选车辆存在已买断状态车辆！',
@@ -565,7 +579,7 @@ export default {
             })
             return
           }
-          if ((this.multipleSelection[i].salesDate == null || this.multipleSelection[i].salesDate == '') && this.multipleSelection[i].settlementStatus !== '预买断') {
+          if ((this.multipleSelection[i].salesDate == null || this.multipleSelection[i].salesDate === '') && this.multipleSelection[i].settlementStatus !== '预买断') {
             this.$message({
               showClose: true,
               message: '请选择销售日期不为空或买断状态为预买断的车辆！',
@@ -573,7 +587,7 @@ export default {
             })
             return
           }
-          if ((this.multipleSelection[i].salesDate !== null || this.multipleSelection[i].salesDate !== '') || this.multipleSelection[i].settlementStatus == '预买断') {
+          if ((this.multipleSelection[i].salesDate !== null || this.multipleSelection[i].salesDate !== '') || this.multipleSelection[i].settlementStatus === '预买断') {
             this.viewState = 7
             const bb = []
             this.multipleSelection.forEach((element) => {
@@ -593,7 +607,7 @@ export default {
     },
     // 买断的详情
     handleCheckMai(row) {
-      if (row.settlementStatus == '已买断') {
+      if (row.settlementStatus === '已买断') {
         this.viewState = 8
         this.$refs['divMaiInfo'].showMaiInfo(row)
       } else {
@@ -667,32 +681,27 @@ export default {
     // 根据本行ID删除数据
     doDel() {
       if (this.sids.length > 0) {
-        const _this = this
         const tip = '请确认是否删除所选 ' + this.multipleSelection.length + ' 条记录?'
         this.$confirm(tip, '提示', {
           confirmButtonText: '确定',
           cancelButtonText: '取消',
           type: 'warning'
-        })
-          .then(() => {
-            const loading = this.$loading({
-              lock: true,
-              text: 'Loading',
-              spinner: 'el-icon-loading',
-              background: 'rgba(0, 0, 0, 0.7)'
-            })
-            deleteBySids(this.sids)
-              .then(resp => {
-                loading.close()
-                _this.$message({type: 'success', message: resp.msg, showClose: true})
-                _this.getList()
-              })
-              .catch(e => {
-                loading.close()
-              })
+        }).then(() => {
+          const loading = this.$loading({
+            lock: true,
+            text: 'Loading',
+            spinner: 'el-icon-loading',
+            background: 'rgba(0, 0, 0, 0.7)'
           })
-          .catch(() => {
+          deleteBySids(this.sids).then(resp => {
+            loading.close()
+            this.$message({ type: 'success', message: resp.msg, showClose: true })
+            this.getList()
+          }).catch(e => {
+            loading.close()
           })
+        }).catch(() => {
+        })
       } else {
         this.$notify({
           title: '提示',