Merge remote-tracking branch 'origin/master'

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'

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,  //单台指导价
+            guildPrice: element.price,  //单台指导价
-            modelConfig: this.row.modelName,  //车型配置名称
+            modelConfig: element.configName,  //车型配置名称
-            modelConfigSid: element.sid,  //配置sid
+            modelConfigSid: element.configSid,  //配置sid
-            modelName:this.row.vehicleAlias,  //车型名称
+            modelName:this.row.modelName,  //车型名称
-            modelSid: this.row.sid,  //车型sid
+            modelSid: this.row.modelSid,  //车型sid
             moreConfig: element.otherConfig,  //更多配置
           }
         })

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("验车业务模块的数据推送失败!");

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 = '已验车'
             }
           }
         })

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()