From 57bdd36e65aa6808a001c6178d3fedbfac673508 Mon Sep 17 00:00:00 2001
From: Zhao Qiqi <1287235164@qq.com>
Date: Wed, 6 Jul 2022 11:06:30 +0800
Subject: [PATCH 1/4] =?UTF-8?q?=E9=94=80=E5=94=AE=E8=AE=A2=E5=8D=95--?=
 =?UTF-8?q?=E8=BD=A6=E5=9E=8B=E9=85=8D=E7=BD=AE=E9=A1=B5=E9=9D=A2=E8=BF=9B?=
 =?UTF-8?q?=E8=A1=8C=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../anrui-buscenter-ui/src/views/login/login.vue  |  2 +-
 .../relation/vehiclelibraryconfiguration.vue      | 15 +++++++++------
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/anrui-buscenter/anrui-buscenter-ui/src/views/login/login.vue b/anrui-buscenter/anrui-buscenter-ui/src/views/login/login.vue
index f3db49557b..3150547bfd 100644
--- a/anrui-buscenter/anrui-buscenter-ui/src/views/login/login.vue
+++ b/anrui-buscenter/anrui-buscenter-ui/src/views/login/login.vue
@@ -51,7 +51,7 @@
 </template>
 
 <script>
-import { login, imgCode } from '@/api/user1.js'
+// import { login, imgCode } from '@/api/user1.js'
 import user from '@/api/User/login.js'
 import { setToken, getToken, setSession } from '@/utils/auth'
 import imgCodeRole from '@/components/imgCodeRole/index.vue'
diff --git a/anrui-buscenter/anrui-buscenter-ui/src/views/xiaoshouguanli/xiaoshoudingdan/relation/vehiclelibraryconfiguration.vue b/anrui-buscenter/anrui-buscenter-ui/src/views/xiaoshouguanli/xiaoshoudingdan/relation/vehiclelibraryconfiguration.vue
index b2d4929b6a..8697d0032c 100644
--- a/anrui-buscenter/anrui-buscenter-ui/src/views/xiaoshouguanli/xiaoshoudingdan/relation/vehiclelibraryconfiguration.vue
+++ b/anrui-buscenter/anrui-buscenter-ui/src/views/xiaoshouguanli/xiaoshoudingdan/relation/vehiclelibraryconfiguration.vue
@@ -125,7 +125,9 @@
                   :limit.sync="listQuery.size" class="pagination" @pagination="getList"/>
         </div>
         <div class="">
-          <el-table :key="tableKey" v-loading="listLoading" :data="list" border style="width: 100%">
+          <el-table :key="tableKey" ref="multipleTable" v-loading="listLoading" :data="list" border style="width: 100%"
+                    @selection-change="handleSelectionChange">
+            <el-table-column type="selection" align="center" width="50"/>
             <el-table-column width="80px" label="序号" type="index" :index="indexMethod" align="center"/>
             <el-table-column label="常用配置" align="center">
               <template slot-scope="scope"> <!---->
@@ -472,15 +474,16 @@ export default {
       if (this.peiZhiList.length > 0) {
         var modelData = new Object()
         this.peiZhiList.forEach((element) => {
+          console.log('element', element)
           modelData = {
             brandName: this.row.brandName,
             brandSid: this.row.brandSid,
             config: element.configName,  //常用配置
-            guildPrice: element.guidedPrice,  //单台指导价
-            modelConfig: this.row.modelName,  //车型配置名称
-            modelConfigSid: element.sid,  //配置sid
-            modelName:this.row.vehicleAlias,  //车型名称
-            modelSid: this.row.sid,  //车型sid
+            guildPrice: element.price,  //单台指导价
+            modelConfig: element.configName,  //车型配置名称
+            modelConfigSid: element.configSid,  //配置sid
+            modelName:this.row.modelName,  //车型名称
+            modelSid: this.row.modelSid,  //车型sid
             moreConfig: element.otherConfig,  //更多配置
           }
         })

From 40ef38c045ac65c2e655e4bd5dce30f590017c7d Mon Sep 17 00:00:00 2001
From: Zhao Qiqi <1287235164@qq.com>
Date: Wed, 6 Jul 2022 11:07:05 +0800
Subject: [PATCH 2/4] =?UTF-8?q?=E9=AA=8C=E8=BD=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../yancheguanli/yancheguanliAdd.vue          | 20 +++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/anrui-scm/anrui-scm-ui/src/views/supplychain/yancheguanli/yancheguanliAdd.vue b/anrui-scm/anrui-scm-ui/src/views/supplychain/yancheguanli/yancheguanliAdd.vue
index eacf3725e0..18f3d53c8b 100644
--- a/anrui-scm/anrui-scm-ui/src/views/supplychain/yancheguanli/yancheguanliAdd.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/supplychain/yancheguanli/yancheguanliAdd.vue
@@ -55,6 +55,7 @@
                   placeholder="请输入洗车费"
                   class="addinputw"
                   clearable
+                  @keyup.native="temp.price = oninput(temp.price,2)"
                 />
               </el-form-item>
             </el-col>
@@ -135,6 +136,25 @@ export default {
     }
   },
   methods: {
+    // 输入数字正则
+    oninput(val, limit = 0) {
+      val = val.replace(/[^\d.]/g, '') //保留数字
+      val = val.replace(/^00/, '0.') //开头不能有两个0
+      val = val.replace(/^\./g, '0.') //开头为小数点转换为0.
+      val = val.replace(/\.{2,}/g, '.') //两个以上的小数点转换成一个
+      val = val.replace('.', '$#$').replace(/\./g, '').replace('$#$', '.'); //只保留一个小数点
+      /^0\d+/.test(val) ? val = val.slice(1) : '' //两位以上数字开头不能为0
+      const str = '^(\\d+)\\.(\\d{' + limit + '}).*$'
+      const reg = new RegExp(str)
+      if (limit === 0) {
+        // 不需要小数点
+        val = val.replace(reg, '$1')
+      } else {
+        // 通过正则保留小数点后指定的位数
+        val = val.replace(reg, '$1.$2')
+      }
+      return val
+    },
     showAdd(row) {
       this.$nextTick(() => {
         this.$refs['dataForm'].clearValidate()

From 1b13c317bba18ec29deeb6cf8e7d8a00572020a3 Mon Sep 17 00:00:00 2001
From: Zhao Qiqi <1287235164@qq.com>
Date: Wed, 6 Jul 2022 11:21:32 +0800
Subject: [PATCH 3/4] =?UTF-8?q?=E9=AA=8C=E8=BD=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/supplychain/yancheguanli/yancheguanli.vue         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/anrui-scm/anrui-scm-ui/src/views/supplychain/yancheguanli/yancheguanli.vue b/anrui-scm/anrui-scm-ui/src/views/supplychain/yancheguanli/yancheguanli.vue
index 0314b80273..fb2d312d9f 100644
--- a/anrui-scm/anrui-scm-ui/src/views/supplychain/yancheguanli/yancheguanli.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/supplychain/yancheguanli/yancheguanli.vue
@@ -204,7 +204,7 @@ export default {
             if (this.dataList[i].inspectedType == '1') {
               this.dataList[i].inspectedType = '待验车'
             } else {
-              this.dataList[i].inspectedType = '未验车'
+              this.dataList[i].inspectedType = '已验车'
             }
           }
         })

From cc402d79d3edfe3127cc72d35c033aa2c451667a Mon Sep 17 00:00:00 2001
From: yxt_djz <313618925@qq.com>
Date: Wed, 6 Jul 2022 11:34:04 +0800
Subject: [PATCH 4/4] =?UTF-8?q?=E5=AE=8C=E5=96=84=E5=88=B7=E6=96=B0?=
 =?UTF-8?q?=E4=B8=9A=E5=8A=A1=E5=89=8D=E7=AB=AF=E6=97=B6=E5=8A=9F=E8=83=BD?=
 =?UTF-8?q?=E6=8A=A5=E9=94=99=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../anrui/scm/biz/scmapplyinbound/ScmApplyInboundService.java    | 1 +
 1 file changed, 1 insertion(+)

diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinbound/ScmApplyInboundService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinbound/ScmApplyInboundService.java
index f96400f4e9..510e0d61be 100644
--- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinbound/ScmApplyInboundService.java
+++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinbound/ScmApplyInboundService.java
@@ -363,6 +363,7 @@ public class ScmApplyInboundService extends MybatisBaseService<ScmApplyInboundMa
                 scmEntryVehicleExamineDto.setUserSid(dto.getUserSid());
                 scmEntryVehicleExamineDto.setVinNo(scmApplyInboundVehicleDto.getVinNo());
                 scmEntryVehicleExamineDto.setInspectionResult("1");
+                scmEntryVehicleExamineDto.setDepartureDate(dto.getDepartureDate());
                 ResultBean resultBean = scmVehicleExamineService.saveEntryCarInspectedInfo(scmEntryVehicleExamineDto);
                 if (!resultBean.getSuccess()){
                     return rb.setMsg("验车业务模块的数据推送失败!");