Merge remote-tracking branch 'origin/master'

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleenterlibrary/ScmVehicleEnterlibraryService.java

@@ -402,6 +402,7 @@ public class ScmVehicleEnterlibraryService extends MybatisBaseService<ScmVehicle
                     baseVehicleDto.setLocation(scmVehicleEnterlibrary.getLocationSid());
                     baseVehicleDto.setLocationName(scmVehicleEnterlibrary.getLocation());
                     baseVehicleDto.setArrivalDate(scmVehicleEnterlibrary.getInboundDate());
+                    baseVehicleDto.setPriceDate(scmVehicleEnterlibrary.getInboundFactoryDate());
                     baseVehicleDto.setWarrantyCardNo(scmVehicleEnterlibrary.getWarrantyCardNo());// 保修卡号 验车
                     baseVehicleDto.setSpecialInstructions(scmVehicleEnterlibrary.getSpecialInstructions()); // 特殊差异说明 验车
                     List<BaseVehicleDto> list = new ArrayList<>();

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

@@ -358,7 +358,7 @@ export default {
         })
         this.dialogStatus = 'add'
         this.stateId = 0
-        this.viewTitle = '【新增】常用配置信息'
+        this.viewTitle = '【新增】车型信息'
         // 此时数据必须修改才能保存
         const userSid = window.sessionStorage.getItem('userSid')
         getAll({ sid: sid, userSid: userSid }).then(resp => {

anrui-scm/anrui-scm-ui/src/views/cheliang/chexingbaojia/daibaojiaguanli/daibaojia.vue

@@ -249,4 +249,9 @@ export default {
 }
 </script>
 <style scoped>
+.btn_style {
+  background-color: #018ad2;
+  color: white;
+  font-weight: 600;
+}
 </style>

anrui-scm/anrui-scm-ui/src/views/cheliang/chexingbaojia/yibaojiaguanli/yibaojia.vue

@@ -255,4 +255,9 @@ export default {
 }
 </script>
 <style scoped>
+.btn_style {
+  background-color: #018ad2;
+  color: white;
+  font-weight: 600;
+}
 </style>

anrui-scm/anrui-scm-ui/src/views/othermenu/shangzhuangtiaojia/shangzhuangtiaojiaInfo.vue

@@ -7,10 +7,6 @@
         <div>{{ viewTitle }}</div>
         <!--start 添加修改按钮-->
         <div>
-          <el-button type="primary" size="small" :disabled="submitdisabled" @click="save()">保存
-          </el-button>
-          <el-button type="primary" size="small" @click="submitVehicleApply()">提交
-          </el-button>
           <el-button type="info" size="small" @click="handleReturn()">关闭</el-button>
         </div>
       </div>
@@ -57,12 +53,6 @@
           </div>
           <el-table :key="tableKey" :data="formobj.baseVehinstallModpricedetails" :index="index" border style="width: 100%">
             <el-table-column fixed width="80px" label="序号" type="index" :index="index + 1" align="center"/>
-            <el-table-column fixed prop="name" label="操作" width="100px" align="center" header-align="center">
-              <template slot-scope="scope">
-                <el-button size="mini" type="danger" @click="dataDelete(scope.$index)">删除
-                </el-button>
-              </template>
-            </el-table-column>
             <el-table-column label="上装名称" align="center" width="90">
               <template slot-scope="scope">
                 <span>{{ scope.row.jacketName }}</span>
@@ -128,19 +118,7 @@ export default {
       tableKey: 0,
       viewState: 1,
       // 表单数据
-      formobj: {
-        applyPeoName: '',
-        applyTitle: '',
-        createBySid: '',
-        createOrgName: '',
-        createOrgSid: '',
-        modpriceReason: '',
-        nodeState: '',
-        sid: '',
-        useOrgName: '',
-        useOrgSid: '',
-        baseVehinstallModpricedetails: []
-      },
+      formobj: {},
       rules: {},
       submitdisabled: false
     }
@@ -162,19 +140,7 @@ export default {
     handleReturn(isreload) {
       if (isreload === 'true') this.$emit('reloadlist')
       // 表单数据
-      this.formobj = {
-        applyPeoName: '',
-        applyTitle: '',
-        createBySid: '',
-        createOrgName: '',
-        createOrgSid: '',
-        modpriceReason: '',
-        nodeState: '',
-        sid: '',
-        useOrgName: '',
-        useOrgSid: '',
-        baseVehinstallModpricedetails: []
-      }
+      this.formobj = {}
       this.$refs['form_obj'].resetFields()
       this.$emit('doback')
     }