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

Merge remote-tracking branch 'origin/dev_2nd_LCYH' into dev_2nd_LCYH

Browse Source
This commit is contained in:
wangzhijiang
2023-03-31 13:43:22 +08:00
parent 082521657e 7fc7c84473
commit 67bc443bda
3 changed files with 56 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradetargetmodel.vue
+31 -29
View File
@@ -43,13 +43,11 @@
<span class="Required">*</span>
<span class="title-text-text" :title="$t('upgraderecordnumber')">{{ $t('upgraderecordnumber') }}</span>
</div>
<div style="width:78%">
<!-- <span class="title-text-text">中文</span> -->
<a-form-model-item prop="babh">
<a-form-model-item class="itemModel" prop="babh">
<a-input class="box-input" v-model="form.babh" :title='form.babh' :placeholder="$t('pleaseEnter')"
style="width:93%" :max-length="50"></a-input>
style="width:100%" :max-length="50"></a-input>
</a-form-model-item>
</div>
</div>
</a-col>
<a-col :span="24">
@@ -57,12 +55,12 @@
<div class="title-text-add">
<span class="title-text-text" :title="$t('theNameOfFirm')">{{ $t('theNameOfFirm') }}</span>
</div>
<div class="title-text-add-input">
<!-- <span class="title-text-text">中文</span> -->
<a-form-model-item class="itemModel">
<a-input class="box-input" v-model="form.qymc" :title='form.qymc' :placeholder="$t('pleaseEnter')"
disabled style="width:93%" :max-length="50"></a-input>
disabled style="width:100%" :max-length="50"></a-input>
</a-form-model-item>
</div>
</div>
</a-col>
<a-col :span="24">
@@ -123,32 +121,33 @@
<div class="title-text-add">
<span class="title-text-text plus2" :title="$t('Vehicledynamictype')">{{ $t('Vehicledynamictype') }}</span>
</div>
<a-form-model-item class="itemModel" style="width: 38%;margin-right:12px">
<!-- <j-dict-select-tag class="box-input"
:disabled="disabled"
@change="projectNameChange"
:placeholder="$t('PleaseSelect')"
:type="'select'"
:triggerChange="false"
v-model="form.Vehicledynamictype"/> -->
<a-select class="box-input" v-model="form.dllx1" :disabled="disabled" :placeholder="$t('PleaseSelect')"
@change="changeSelect($event, target)">
<a-form-model-item class="itemModel " >
<div style="display:flex;flex-wrap: nowrap;width: 100%;">
<div style="width: 90%;margin-right: 20px;">
<a-select class="box-input" v-model="form.dllx1" :disabled="disabled" :placeholder="$t('PleaseSelect')"
@change="changeSelect($event, target)"
style="width: 100%;"
>
<a-select-option v-for="(item, key) in projectNameList1" :key="key" :value="item">
{{ item }}
</a-select-option>
</a-select>
</div>
<div style="width: 100%;">
<a-select v-model="form.dllx2" class="box-input" :disabled="disabled" :placeholder="$t('PleaseSelect')"
@change="update2"
style="width: 100%;"
>
<a-select-option v-for="(item, key) in projectNameList2" :key="key" :value="item">
{{ item }}
</a-select-option>
</a-select>
</div>
</div>
</a-form-model-item>
<a-form-model-item class="itemModel" style="width: 40%;">
<a-select v-model="form.dllx2" class="box-input" :disabled="disabled" :placeholder="$t('PleaseSelect')"
@change="update2">
<a-select-option v-for="(item, key) in projectNameList2" :key="key" :value="item">
{{ item }}
<!-- <span style="display: inline-block;width: 100%" :title=" item.projectName ">
{{ item.projectName}}
</span> -->
</a-select-option>
</a-select>
</a-form-model-item>
</div>
</a-col>
@@ -430,6 +429,7 @@ export default {
width: calc(100% - 130px);
display: inline-block;
margin-top: 2px;
max-width: 486px;
}
.box-input {
@@ -461,4 +461,6 @@ export default {
.Required {
color: red;
margin-right: 3px;
}</style>
}
</style>
jero-web/src/views/otamanagement/upgradeactivityrecord/components/usernotification.vue
+6 -4
View File
@@ -155,9 +155,10 @@
<a-col :span="24">
<div class="plus">
<div class="title-text-add">
<span class="title-text-text" :title="$t('usernotificationmode')">{{$t('usernotificationmode')}}</span>
<h1 style='position: relative;left: -8px;'>{{$t('usernotificationmode')}}</h1>
<!-- <span class="title-text-text" :title="$t('usernotificationmode')">{{$t('usernotificationmode')}}</span>-->
</div>
<a-form-model-item class="itemModel" prop="gzyhfs">
<a-form-model-item class="itemModel" prop="gzyhfs" style='margin-top: 40px;'>
<j-multi-select-tag class="box-input"
v-model="formInline.gzyhfs"
:placeholder="$t('PleaseSelect')"
@@ -170,9 +171,10 @@
<a-col :span="24">
<div class="plus">
<div class="title-text-add">
<span class="title-text-text" :title="$t('userinformstherelevantfile')">{{$t('userinformstherelevantfile')}}</span>
<h1 style='position: relative;left: -34px;'>{{$t('userinformstherelevantfile')}}</h1>
<!-- <span class="title-text-text" :title="$t('userinformstherelevantfile')">{{$t('userinformstherelevantfile')}}</span>-->
</div>
<a-form-model-item class="itemModel" prop="gzscnr">
<a-form-model-item class="itemModel" prop="gzscnr" style='margin-top: 40px;'>
<a-button type="primary" @click="clickButtonToUpload('xgwj')" v-model="formInline.xgwj">
{{ (formInline.xgwj === 'null' || formInline.xgwj === '' ||
formInline.xgwj == null) ? $t('uploadattachment') : $t('viewUploadedFiles')
jero-web/src/views/otamanagement/vehicleinformation/components/basicInformation.vue
+19 -15
View File
@@ -155,17 +155,19 @@
<div class="title-text-add">
<span class="title-text-text plus3" :title="$t('Vehicledynamictype')">{{$t('Vehicledynamictype')}}</span>
</div>
<a-form-model-item class="itemModel" style="width: 38%">
<a-select class="box-input" v-model="form.dllx1" allowClear :disabled="disabled" :placeholder="$t('PleaseSelect')" @change="changeSelect($event,target)">
<a-select-option v-for="(item, key) in projectNameList1"
:key="key"
:value="item">
{{ item }}
</a-select-option>
</a-select>
</a-form-model-item>
<a-form-model-item class="itemModel" style="width: 40%;margin-left:20px">
<a-select v-model="form.dllx2" class="box-input" allowClear :disabled="disabled" :placeholder="$t('PleaseSelect')" @change="update">
<a-form-model-item class="itemModel">
<div style="display:flex;flex-wrap: nowrap;width: 100%;">
<div style="width: 90%;margin-right: 20px;">
<a-select class="box-input" style="width: 100%;" v-model="form.dllx1" allowClear :disabled="disabled" :placeholder="$t('PleaseSelect')" @change="changeSelect($event,target)">
<a-select-option v-for="(item, key) in projectNameList1"
:key="key"
:value="item">
{{ item }}
</a-select-option>
</a-select>
</div>
<div style="width: 100%;">
<a-select v-model="form.dllx2" class="box-input" allowClear :disabled="disabled" :placeholder="$t('PleaseSelect')" @change="update">
<a-select-option v-for="(item, key) in projectNameList2"
:key="key"
:value="item">
@@ -175,7 +177,9 @@
</span> -->
</a-select-option>
</a-select>
</a-form-model-item>
</div>
</div>
</a-form-model-item>
</div>
</a-col>
<a-col :span="24">
@@ -343,7 +347,7 @@ import { message } from 'ant-design-vue'
if(res.result.dllx2 == null){
res.result.dllx2 = undefined
}
if(res.result.cplb == null){
res.result.cplb = undefined
}
@@ -380,7 +384,7 @@ import { message } from 'ant-design-vue'
if(otaId==null || otaId == undefined){
otaId=''
}
postAction('/ota/otaBaCxJbxx/add',{ otaId:otaId,...this.form}).then( res => {
if(res.code == 200){
localStorage.setItem('otaId', res.result.otaId)
@@ -419,7 +423,7 @@ import { message } from 'ant-design-vue'
if(this.form.dllx1=='其他'){
this. projectNameList2=['其他']
}
},
update(){