供应链（修正车型测试问题）

anrui-scm/anrui-scm-ui/src/layout/components/AppMain.vue

@@ -31,7 +31,7 @@ export default {
   /* margin-left:10px; */
   padding: 0 10px;
   overflow-x: hidden;
-  overflow-y: auto;
+  overflow-y: hidden;
 }
 .fixed-header+.app-main {
   padding-top: 50px;

anrui-scm/anrui-scm-ui/src/styles/index.scss

@@ -108,6 +108,8 @@ div:focus {
 .app-container {margin: 5px;
   background-color: #fff;
 }
+// 设置了滚动区域
+.main-content{ overflow-x: hidden;overflow-y: auto;height: calc(100vh - 186px);}
 .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;}

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

@@ -4,7 +4,6 @@
       <div>{{ viewTitle }}</div>
       <div>
         <el-button type="primary" size="small" @click="handleCreate()">保存</el-button>
-        <el-button type="primary" size="small">下载</el-button>
         <el-button type="info" size="small" @click="handleReturn()">返回</el-button>
       </div>
     </div>

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

@@ -4,7 +4,6 @@
       <div>详情配置</div>
       <div>
         <!-- <el-button type="primary" size="small" @click="handleCreate()">保存</el-button> -->
-        <el-button type="primary" size="small">下载</el-button>
         <el-button type="info" size="small" @click="handleReturn()">返回</el-button>
       </div>
     </div>

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

@@ -2,7 +2,7 @@
   <div class="app-container">
     <!-- Start 列表页面 -->
     <div v-show="viewState === 1">
-      <button-bar view-title="存放地点" ref="btnbar" :btndisabled="btndisabled" @btnhandle="btnHandle"/>
+      <button-bar view-title="车型管理" ref="btnbar" :btndisabled="btndisabled" @btnhandle="btnHandle"/>
       <div class="searchcon">
         <el-button size="small" class="searchbtn" @click="clicksearchShow">{{ searchxianshitit }}</el-button>
         <div v-show="isSearchShow" class="search">
@@ -89,7 +89,7 @@
         <el-table :key="tableKey" v-loading="listLoading" :data="list" border style="width: 100%;" @selection-change="handleSelectionChange">
           <el-table-column width="80px" label="序号" type="index" :index="indexMethod" align="center"/>
           <el-table-column width="50px" type="selection" align="center"/>
-          <el-table-column label="操作" align="center" width="120px" class-name="small-padding fixed-width">
+          <el-table-column label="操作" align="center" width="140px" class-name="small-padding fixed-width">
             <template slot-scope="{row}">
               <el-button size="mini" type="primary" @click="handlePeizhi(row)">车型配置</el-button>
             </template>
@@ -99,12 +99,12 @@
               <span>{{ scope.row.brandName }}</span>
             </template>
           </el-table-column>
-          <el-table-column label="车型" width="300px" align="center">
+          <el-table-column label="车型" width="320px" align="center">
             <template slot-scope="scope">
-              <span class="bluezi" @click="handleCheck(scope.row)">{{ scope.row.modelName }}</span>
+              <span class="bluezi" @click="handleCheck(scope.row)">{{ scope.row.vehicleAlias }}</span>
             </template>
           </el-table-column>
-          <el-table-column label="版本" align="center">
+          <el-table-column label="版本" width="140px" align="center">
             <template slot-scope="scope">
               <span>{{ scope.row.vehicleVersion }}</span>
             </template>
@@ -119,7 +119,7 @@
               <span>{{ scope.row.vehicleTypeCode }}</span>
             </template>
           </el-table-column>
-          <el-table-column label="车型照片" align="center" width="220px" class-name="small-padding fixed-width">
+          <el-table-column label="车型照片" align="center" width="180px" 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">-->
@@ -587,7 +587,7 @@ export default {
             })
             var sids = this.sids.join(',')
             console.log('删除的数据', sids)
-            deleteBySids(this.sids)
+            deleteBySids(sids)
               .then(resp => {
                 loading.close()
                 _this.$message({ type: 'success', message: resp.msg, showClose: true })

anrui-scm/anrui-scm-ui/src/views/cheliang/chexing/chexingAdd.vue

@@ -4,7 +4,6 @@
       <div>{{ viewTitle }}</div>
       <div>
         <el-button type="primary" size="small" @click="handleCreate()">保存</el-button>
-        <el-button type="primary" size="small">下载</el-button>
         <el-button type="info" size="small" @click="handleReturn()">返回</el-button>
       </div>
     </div>
@@ -1154,4 +1153,10 @@
   .secondTit {
     line-height: 2 !important;
   }
+  .listconadd {
+    padding: 0 48px !important;
+  }
+  .formadd{
+    padding-top: 10px !important;
+  }
 </style>

anrui-scm/anrui-scm-ui/src/views/cheliang/chexing/relation/changyongpeizhi.vue

@@ -618,17 +618,19 @@ export default {
         this.$message({ showClose: true, type: 'error', message: '请选择一条记录进行关联' })
         return
       }
-      for (var i = 0; i < this.sids.length; i++){
-        this.rel_list.push({
+      const rel_list = []
+      for (var i = 0; i < this.sids.length; i++) {
+        rel_list.push({
           configurationItemsSid: this.sids[i]
         })
       }
-      console.log('已选择的常用配置',this.rel_list)
-      this.rel_list.forEach((element) => {
+      console.log('已选择的常用配置', rel_list)
+      rel_list.forEach((element) => {
         element.modelSid = this.modelSid
         element.staffSid = window.sessionStorage.getItem('staffSid')
       })
-      setRel(this.rel_list).then(response => {
+      console.log('关联数据', 211154)
+      setRel(rel_list).then(response => {
         this.FormLoading = false
         if (response.success) {
           this.handleReturn('true')

anrui-scm/anrui-scm-ui/src/views/cheliang/chexing/relation/chexingguanlianchangyong.vue

@@ -356,7 +356,7 @@ export default {
     showGuanlian(row) {
       this.setRelList.modelSid = row.sid
       this.chesid = row.sid
-      this.title = row.modelName
+      this.title = row.vehicleAlias
       this.listQuery.params.modelSid = row.sid
       this.getList() // 加载列表
       this.getType()

anrui-scm/anrui-scm-ui/src/views/cheliang/chexing/relation/chexingpeizhijiageweihuAdd.vue

@@ -11,7 +11,7 @@
           </el-col>
           <el-col :span="18">
             <el-form-item>
-              <span>{{ temp.modelName }}</span>
+              <span>{{ temp.vehicleAlias }}</span>
             </el-form-item>
           </el-col>
         </el-row>
@@ -71,7 +71,7 @@ export default {
     return {
       temp: {
         sid: '', // 一条数据的sid
-        modelName: '', // 车型名称(产品名称 陕汽必须1)
+        vehicleAlias: '', // 车型名称(产品名称 陕汽必须1)
         manufactorSettlementPrice: '', // 厂家结算价
         guidedPrice: '' // 销售指导价
       },

anrui-scm/anrui-scm-ui/src/views/cheliang/chexingpeizhi/changyongpeizhi.vue

@@ -12,27 +12,31 @@
           <el-button type="primary" size="small" @click="handleOpen()">进入关联表</el-button>
         </div>
       </div>
-      <div class="searchcon">
-        <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="颜色">
-              <el-select v-model="listQuery.params.carColorKey" placeholder="请选择" clearable class="addinputw">
-                <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="缓速器">
-              <el-select v-model="listQuery.params.slowMachineKey" placeholder="请选择" clearable class="addinputw">
-                <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="后视镜">
-              <el-select v-model="listQuery.params.rearViewMirrorKey" placeholder="请选择" clearable class="addinputw">
-                <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="轮胎">
-              <el-select v-model="listQuery.params.tireSizeKey" placeholder="请选择" clearable class="addinputw">
+      <div class="main-content">
+        <div class="searchcon">
+          <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="颜色">
+                <el-select v-model="listQuery.params.carColorKey" placeholder="请选择" clearable class="addinputw">
+                  <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="缓速器">
+                <el-select v-model="listQuery.params.slowMachineKey" placeholder="请选择" clearable class="addinputw">
+                  <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="后视镜">
+                <el-select v-model="listQuery.params.rearViewMirrorKey" placeholder="请选择" clearable class="addinputw">
+                  <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="轮胎">
+                <el-select v-model="listQuery.params.tireSizeKey" placeholder="请选择" clearable class="addinputw">
                 <el-option v-for="item in tireSize_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"/>
               </el-select>
             </el-form-item>
@@ -112,44 +116,47 @@
               </el-select>
             </el-form-item>
             <el-form-item label="常用配置名称">
-              <el-input v-model="listQuery.params.configName" maxlength="125" placeholder="请输入常用配置名称" class="addinputw" clearable/>
+              <el-input v-model="listQuery.params.configName" maxlength="125" placeholder="请输入常用配置名称" class="addinputw"
+                        clearable/>
             </el-form-item>
-            <el-divider/>
-            <div class="btn" style="text-align: center;">
-              <el-button type="primary" @click="handleFilter">查询</el-button>
-              <el-button type="primary" @click="resetQuery">重置</el-button>
-            </div>
-          </el-form>
+              <el-divider/>
+              <div class="btn" style="text-align: center;">
+                <el-button type="primary" @click="handleFilter">查询</el-button>
+                <el-button type="primary" @click="resetQuery">重置</el-button>
+              </div>
+            </el-form>
+          </div>
         </div>
-      </div>
-      <div class="listtop">
-        <div class="tit">常用配置列表</div>
-        <pageye v-show="list.length > 0" :total="listQuery.total" :page.sync="listQuery.current" :limit.sync="listQuery.size" class="pagination" @pagination="getList"/>
-      </div>
-      <div class="">
-        <el-table :key="tableKey" v-loading="listLoading" :data="list" border style="width: 100%;" @selection-change="handleSelectionChange">
-          <el-table-column width="50px" type="selection" align="center"/>
-          <el-table-column width="80px" label="序号" type="index" :index="indexMethod" align="center"/>
-          <el-table-column label="关联状态" align="center">
-            <template slot-scope="scope">
-              <span>{{ scope.row.isRelationState === 1 ? '已关联' : '未关联' }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column label="使用状态" align="center">
-            <template slot-scope="scope">
-              <span>{{ scope.row.isUseState === 1 ? '已使用' : '未使用' }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column label="颜色" align="center">
-            <template slot-scope="scope">
-              <span>{{ scope.row.carColor }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column label="缓速器" align="center">
-            <template slot-scope="scope">
-              <span>{{ scope.row.slowMachine }}</span>
-            </template>
-          </el-table-column>
+        <div class="listtop">
+          <div class="tit">常用配置列表</div>
+          <pageye v-show="list.length > 0" :total="listQuery.total" :page.sync="listQuery.current"
+                  :limit.sync="listQuery.size" class="pagination" @pagination="getList"/>
+        </div>
+        <div class="">
+          <el-table :key="tableKey" v-loading="listLoading" :data="list" border style="width: 100%;"
+                    @selection-change="handleSelectionChange">
+            <el-table-column fixed width="80px" label="序号" type="index" :index="indexMethod" align="center"/>
+            <el-table-column fixed width="50px" type="selection" align="center"/>
+            <el-table-column label="关联状态" align="center">
+              <template slot-scope="scope">
+                <span>{{ scope.row.isRelationState === 1 ? '已关联' : '未关联' }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="使用状态" align="center">
+              <template slot-scope="scope">
+                <span>{{ scope.row.isUseState === 1 ? '已使用' : '未使用' }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="颜色" align="center">
+              <template slot-scope="scope">
+                <span>{{ scope.row.carColor }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="缓速器" align="center">
+              <template slot-scope="scope">
+                <span>{{ scope.row.slowMachine }}</span>
+              </template>
+            </el-table-column>
           <el-table-column label="后视镜" align="center">
             <template slot-scope="scope">
               <span>{{ scope.row.rearViewMirror }}</span>
@@ -235,21 +242,23 @@
               <span>{{ scope.row.multimedia }}</span>
             </template>
           </el-table-column>
-          <el-table-column label="货箱" align="center">
-            <template slot-scope="scope">
-              <span>{{ scope.row.packingCase }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column label="操作" align="center" width="80px" class-name="small-padding fixed-width">
-            <template slot-scope="{row}">
-              <el-button size="mini" type="primary" @click="handleCheck(row)">查看</el-button>
-            </template>
-          </el-table-column>
-        </el-table>
-      </div>
-      <div class="pages">
-        <!-- 翻页 -->
-        <pagination v-show="list.length > 0" :total="listQuery.total" :page.sync="listQuery.current" :limit.sync="listQuery.size" class="pagination" @pagination="getList"/>
+            <el-table-column label="货箱" align="center">
+              <template slot-scope="scope">
+                <span>{{ scope.row.packingCase }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="操作" align="center" width="80px" class-name="small-padding fixed-width">
+              <template slot-scope="{row}">
+                <el-button size="mini" type="primary" @click="handleCheck(row)">查看</el-button>
+              </template>
+            </el-table-column>
+          </el-table>
+        </div>
+        <div class="pages">
+          <!-- 翻页 -->
+          <pagination v-show="list.length > 0" :total="listQuery.total" :page.sync="listQuery.current"
+                      :limit.sync="listQuery.size" class="pagination" @pagination="getList"/>
+        </div>
       </div>
     </div>
     <!--End 列表页面-->
@@ -260,7 +269,7 @@
 </template>
 
 <script>
-import { deleteBySids, pullDown, getList } from '@/api/cheliang/basemodelconfig'
+import { deleteBySids, getList, pullDown } from '@/api/cheliang/basemodelconfig'
 import Pagination from '@/components/pagination'
 import pageye from '@/components/pagination/pageye'
 import changyongpeizhiAdd from './changyongpeizhiAdd'

anrui-scm/anrui-scm-ui/src/views/cheliang/chexingpeizhi/changyongpeizhiAdd.vue

@@ -6,7 +6,6 @@
       <div>{{ viewTitle }}</div>
       <div>
         <el-button type="primary" size="small" @click="handleCreate()">保存</el-button>
-        <el-button type="primary" size="small">下载</el-button>
         <el-button type="info" size="small" @click="handleReturn()">关闭</el-button>
       </div>
     </div>

anrui-scm/anrui-scm-ui/src/views/cheliang/chexingpeizhi/changyongpeizhiInfo.vue

@@ -3,7 +3,6 @@
     <div class="tab-header webtop">
       <div>常用配置详情</div>
       <div>
-        <el-button type="primary" size="small">下载</el-button>
         <el-button type="info" size="small" @click="handleReturn()">关闭</el-button>
       </div>
     </div>

anrui-scm/anrui-scm-ui/src/views/cheliang/hegezhengtaizhang/hegezhengInfo.vue

@@ -3,7 +3,6 @@
     <div class="tab-header webtop">
       <div>合格证台账详情信息</div>
       <div>
-        <el-button type="primary" size="small">下载</el-button>
         <el-button type="info" size="small" @click="handleReturn()">返回</el-button>
       </div>
     </div>

anrui-scm/anrui-scm-ui/src/views/cheliang/hegezhengtaizhang/hegezhengtaizhangAdd.vue

@@ -6,7 +6,6 @@
       <div>{{ viewTitle }}</div>
       <div>
         <el-button type="primary" size="small" @click="handleCreate()">保存</el-button>
-        <el-button type="primary" size="small">下载</el-button>
         <el-button type="info" size="small" @click="handleReturn()">返回</el-button>
       </div>
     </div>