From d23d569f9f1a9716b55fb1ac828cd3e7e4376502 Mon Sep 17 00:00:00 2001
From: Zhao Qiqi <1287235164@qq.com>
Date: Thu, 28 Jul 2022 18:06:51 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=87=87=E8=B4=AD=E8=AE=A2?=
 =?UTF-8?q?=E5=8D=95=E6=B5=8B=E8=AF=95=E9=97=AE=E9=A2=98=EF=BC=8C=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=E5=90=88=E6=A0=BC=E8=AF=81=E5=8F=B0=E8=B4=A6=E6=B5=8B?=
 =?UTF-8?q?=E8=AF=95=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/api/portal/Upload_chexing.js          |  2 +-
 anrui-scm/anrui-scm-ui/src/styles/index.scss  |  3 +-
 .../relation/vehicleconfiguration.vue         |  2 +-
 .../src/views/cheliang/chexing/chexing.vue    |  9 +--
 .../relation/chexingguanlianchangyong.vue     |  2 +-
 .../hegezhengtaizhang/hegezhengtaizhang.vue   | 65 +++++++++++++------
 6 files changed, 54 insertions(+), 29 deletions(-)

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
index 8832b569c4..429b98c89f 100644
--- a/anrui-scm/anrui-scm-ui/src/api/portal/Upload_chexing.js
+++ b/anrui-scm/anrui-scm-ui/src/api/portal/Upload_chexing.js
@@ -3,7 +3,7 @@ import qs from 'qs'
 // 统一请求路径前缀
 const base = process.env.VUE_APP_URL
 
-// 文件上传接口
+// 文件上传接口（仅存车型管理页面使用接口）
 export const uploadFile = '/api/base/v1/basevehiclemodel/pictureUpload'
 
 //文件上传接口（仅存放地点变更页面使用接口）
diff --git a/anrui-scm/anrui-scm-ui/src/styles/index.scss b/anrui-scm/anrui-scm-ui/src/styles/index.scss
index 775bbaf53f..fc6e6711fc 100644
--- a/anrui-scm/anrui-scm-ui/src/styles/index.scss
+++ b/anrui-scm/anrui-scm-ui/src/styles/index.scss
@@ -329,7 +329,8 @@ div:focus {
 }
 
 .forminfo {
-  padding: 20px 0;
+  padding: 10px 40px 0 40px;
+  font-size: 16px;
   .title {
     padding: 10px;font-weight: bold;
     font-size: 20px;
diff --git a/anrui-scm/anrui-scm-ui/src/views/cheliang/cheliangcaigou/relation/vehicleconfiguration.vue b/anrui-scm/anrui-scm-ui/src/views/cheliang/cheliangcaigou/relation/vehicleconfiguration.vue
index 4515c58887..4e27ffdb63 100644
--- a/anrui-scm/anrui-scm-ui/src/views/cheliang/cheliangcaigou/relation/vehicleconfiguration.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/cheliang/cheliangcaigou/relation/vehicleconfiguration.vue
@@ -46,7 +46,7 @@ export default {
     showInfo(row) {
       this.FormLoading = true
       this.sid_list.modelSid = row.modelSid
-      this.sid_list.configSid = row.modelConfigSid
+      this.sid_list.configSid = row.configSid
       this.sid_list.vehModelConfigSid = row.vehModelConfigSid
       if (row.guidedPrice !== '' || row.guidedPrice !== null){
         const guidedPrice_two = parseFloat(Number(row.guidedPrice) / 10000).toFixed(2)
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 1bfc0829d3..fa260e533a 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
@@ -138,12 +138,13 @@
                 <span>{{ scope.row.emissionStandardValue }}</span>
               </template>
             </el-table-column>
-            <el-table-column label="车型照片" align="center" width="120px" class-name="small-padding fixed-width">
+            <el-table-column label="车型照片" align="center" width="160px" 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="uploadMoreImg" v-model="imgList" :limit="1" bucket="map" @eett="getList" :upload-data="{type:'0001',modelSid: scope.row.sid}"></upload>-->
-                <!--              </div>-->
+                <div class="upload_img">
+                  <upload ref="uploadMoreImg" v-model="imgList" :limit="1" bucket="map" @eett="getList"
+                          :upload-data="{type:'0001',modelSid: scope.row.sid}"></upload>
+                </div>
               </template>
             </el-table-column>
           </el-table>
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 c79ba89cbb..e7fadfb2e3 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
@@ -132,7 +132,7 @@
             <el-table-column width="80px" fixed label="序号" type="index" :index="indexMethod" align="center"/>
             <el-table-column label="操作" fixed align="center" width="110px" class-name="small-padding fixed-width">
               <template slot-scope="{row}">
-                <el-button size="mini" type="primary" @click="handleJiage(row)">价格维护</el-button>
+                <el-button size="mini" type="primary" :disabled="row.guidedPrice !== ''"  @click="handleJiage(row)">价格维护</el-button>
               </template>
             </el-table-column>
             <el-table-column width="110px" fixed label="指导价(元)" align="center">
diff --git a/anrui-scm/anrui-scm-ui/src/views/cheliang/hegezhengtaizhang/hegezhengtaizhang.vue b/anrui-scm/anrui-scm-ui/src/views/cheliang/hegezhengtaizhang/hegezhengtaizhang.vue
index 4e76c5b468..83ce07b3e8 100644
--- a/anrui-scm/anrui-scm-ui/src/views/cheliang/hegezhengtaizhang/hegezhengtaizhang.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/cheliang/hegezhengtaizhang/hegezhengtaizhang.vue
@@ -35,14 +35,14 @@
                 </el-select>
               </el-form-item>
               <el-form-item label="车架号">
-                <el-input v-model="listQuery.params.certificationNo" placeholder="请输入车架号" clearable
+                <el-input v-model="listQuery.params.vinNo" placeholder="请输入车架号" clearable
                           class="filter-item"/>
               </el-form-item>
               <el-form-item label="移交状态">
-                <el-select v-model="listQuery.params.certificateState" class="addinputw" clearable
+                <el-select v-model="listQuery.params.transferStateKey" class="addinputw" clearable
                            placeholder="请选择移交状态"
                            style="width: 200px;">
-                  <el-option v-for="item in Situation" :key="item.dictKey" :label="item.dictValue"
+                  <el-option v-for="item in transferState_list" :key="item.dictKey" :label="item.dictValue"
                              :value="item.dictKey"/>
                 </el-select>
               </el-form-item>
@@ -63,15 +63,20 @@
                     @selection-change="handleSelectionChange">
             <el-table-column width="50px" type="selection" align="center"/>
             <el-table-column width="80px" fixed label="序号" type="index" :index="indexMethod" align="center"/>
-            <el-table-column label="操作" fixed align="center" width="220px" 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="cheLiangXiangXi(row)">车辆信息</el-button>
+<!--            <el-table-column label="操作" fixed align="center" width="220px" 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="cheLiangXiangXi(row)">车辆信息</el-button>-->
+<!--              </template>-->
+<!--            </el-table-column>-->
+            <el-table-column label="车架号" width="180px" align="center">
+              <template slot-scope="scope">
+                <span class="bluezi" @click="cheLiangXiangXi(scope.row)">{{ scope.row.vinNo }}</span>
               </template>
             </el-table-column>
             <el-table-column label="合格证编号" width="180px" align="center">
               <template slot-scope="scope">
-                <span>{{ scope.row.certificationNo }}</span>
+                <span class="bluezi" @click="handleCheck(scope.row)">{{ scope.row.certificationNo }}</span>
               </template>
             </el-table-column>
             <el-table-column label="发证日期" width="140px" align="center">
@@ -84,6 +89,11 @@
                 <span>{{ scope.row.certificateStateValue }}</span>
               </template>
             </el-table-column>
+            <el-table-column label="移交状态" width="120px" align="center">
+              <template slot-scope="scope">
+                <span>{{ scope.row.transferStateValue }}</span>
+              </template>
+            </el-table-column>
             <el-table-column label="到证日期" width="140px" align="center">
               <template slot-scope="scope">
                 <span>{{ scope.row.toCardDate }}</span>
@@ -264,22 +274,25 @@ export default {
           certificateStartDate: '',
           certificateEndDate: '',
           certificateState: '',
-          certificationNo: ''
+          certificationNo: '',
+          vinNo:'',
+          transferStateKey:''
         },
         current: 1,
         size: 20
       },
-        Situation: [],
-        selectDate: undefined,
-        temp: {}, // 添加和修改
-        templook: {}, // 查看实体
-        textMap: {
-          update: '编辑',
-          create: '创建'
-        },
-        dialogFormVisible: false, // 添加修改对话框状态
-        dialogFormShowVisible: false, // 查看对话框默认关闭状态
-        dialogStatus: '', // 对话框状态
+      Situation: [],
+      transferState_list: [],
+      selectDate: undefined,
+      temp: {}, // 添加和修改
+      templook: {}, // 查看实体
+      textMap: {
+        update: '编辑',
+        create: '创建'
+      },
+      dialogFormVisible: false, // 添加修改对话框状态
+      dialogFormShowVisible: false, // 查看对话框默认关闭状态
+      dialogStatus: '', // 对话框状态
         typeOptions: [],
 
         rules: {
@@ -382,6 +395,14 @@ export default {
           this.Situation = res.data
         }
       })
+      typeValues({
+        type: 'transferState'
+      }).then((res) => {
+        console.log(res)
+        if (res.code === '200') {
+          this.transferState_list = res.data
+        }
+      })
     },
     // 查询列表信息
       getList() {
@@ -414,7 +435,9 @@ export default {
           certificateStartDate: '',
           certificateEndDate: '',
           certificateState: '',
-          certificationNo: ''
+          certificationNo: '',
+          vinNo:'',
+          transferStateKey:''
         },
         current: 1,
         size: 20