WL/laws_weilai
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev_2nd_LCYH' of http://git.hzwlsoft.com/laws-nio/laws-weilai into dev_2nd_LCYH

Browse Source
This commit is contained in:
yuekuo
2023-03-25 19:59:15 +08:00
parent 2d31a061df 072888ef83
commit a3d68925dd
5 changed files with 27 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxJsfzbacsServiceImpl.java
+2 -2
View File
@@ -70,7 +70,7 @@ public class OtaBaCxJsfzbacsServiceImpl extends ServiceImpl<OtaBaCxJsfzbacsMappe
if (null != kzqObj) {
try {
field.setAccessible(true);
field.set(sjmk, kzqObj.toString());
field.set(sjmk, kzqObj);
} catch (IllegalAccessException e) {
e.printStackTrace();
}
@@ -93,7 +93,7 @@ public class OtaBaCxJsfzbacsServiceImpl extends ServiceImpl<OtaBaCxJsfzbacsMappe
if (null != bjObj) {
try {
field.setAccessible(true);
field.set(otaBaCxJsfzbacs, bjObj.toString());
field.set(otaBaCxJsfzbacs, bjObj);
} catch (IllegalAccessException e) {
e.printStackTrace();
}
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxKsjjsmccsServiceImpl.java
+1 -1
View File
@@ -48,7 +48,7 @@ public class OtaBaCxKsjjsmccsServiceImpl extends ServiceImpl<OtaBaCxKsjjsmccsMap
if (null != bjObj) {
try {
field.setAccessible(true);
field.set(otaBaCxJsfzbacs, bjObj.toString());
field.set(otaBaCxJsfzbacs, bjObj);
} catch (IllegalAccessException e) {
e.printStackTrace();
}
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxKsjxtmccsServiceImpl.java
+1 -1
View File
@@ -47,7 +47,7 @@ public class OtaBaCxKsjxtmccsServiceImpl extends ServiceImpl<OtaBaCxKsjxtmccsMap
if (null != bjObj) {
try {
field.setAccessible(true);
field.set(otaBaCxKsjxtmccs, bjObj.toString());
field.set(otaBaCxKsjxtmccs, bjObj);
} catch (IllegalAccessException e) {
e.printStackTrace();
}
jero-web/src/views/otamanagement/vehicleinformation/components/safetyPrecautions.vue
+5 -4
View File
@@ -164,7 +164,7 @@ import ImportFile from '@/components/ImportFileData/index'
}
},
mounted() {
this.getList()
// this.getList()
this.getData()
},
methods: {
@@ -180,9 +180,10 @@ import ImportFile from '@/components/ImportFileData/index'
getAction('/ota/otaBaCxAqcs/queryByOtaId',{otaIdT:otaIdT,otaId:localStorage.getItem('otaId')}).then(res=>{
if(res.code == 200){
this.dataSource[0].info = Number(res.result.bhjz)
this.dataSource[1].info =Number(res.result.fsxjz)
this.dataSource[2].info= Number(res.result.sjsbcs)
this.dataSource[3].info=Number(res.result.xxaqjz)
this.dataSource[1].info =Number(res.result.fsxjz)
this.dataSource[2].info= Number(res.result.sjsbcs)
this.dataSource[3].info=Number(res.result.xxaqjz)
this.loading = false
}
})
jero-web/src/views/otamanagement/vehicleregistration/components/maintenance.vue
+18 -18
View File
@@ -14,11 +14,11 @@
<a-col :span="24">
<div class="box-title-text">
<div class="title-text">
<!-- <span class="Required">*</span>-->
<span class="Required">*</span>
<span class="title-text-text" :title="$t('recordstatus')">
{{$t('recordstatus')}}</span>
</div>
<a-form-model-item class="itemModel" prop="recordstatus">
<a-form-model-item class="itemModel" prop="bazt">
<j-dict-select-tag class="box-input" v-model="formInline.bazt"
:placeholder="$t('PleaseSelect')+$t('recordstatus')"
:type="'select'"
@@ -29,11 +29,11 @@
<a-col :span="24">
<div class="box-title-text">
<div class="title-text">
<!-- <span class="Required">*</span>-->
<span class="Required">*</span>
<span class="title-text-text" :title="$t('filingtime')">
{{$t('filingtime')}}</span>
</div>
<a-form-model-item class="itemModel" prop="filingtime">
<a-form-model-item class="itemModel" prop="batjsj">
<a-date-picker class="box-input"
:placeholder="$t('PleaseSelect')+$t('filingtime')"
@change="dateChange({db_field_name:'batjsj'})"
@@ -80,20 +80,20 @@ export default {
bz:'',
},
rules: {
// listConfirmation: [
// {
// required: true,
// message: this.$t('confirmationOfRegulationsList') + this.$t('cannotEmpty'),
// trigger: 'change'
// }
// ],
// legalTaskConfirmation: [
// {
// required: true,
// message: this.$t('regulatoryTaskConfirmation') + this.$t('cannotEmpty'),
// trigger: 'change'
// }
// ],
bazt: [
{
required: true,
message: this.$t('recordstatus') + this.$t('cannotEmpty'),
trigger: 'change'
}
],
batjsj: [
{
required: true,
message: this.$t('filingtime') + this.$t('cannotEmpty'),
trigger: 'change'
}
],
// designDeadline: [
// {
// required: true,