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

bug 67300

Browse Source 
bug 67307
bug 67303
This commit is contained in:
zyx.net
2023-03-27 16:05:27 +08:00
parent 3d8b43c44d
commit 0e829b3304
10 changed files with 45 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-web/src/views/otamanagement/upgradeactivity/components/maintenance.vue
+13 -4
View File
@@ -41,7 +41,7 @@
:getCalendarContainer="(trigger) => trigger.parentNode" :getCalendarContainer="(trigger) => trigger.parentNode"
v-model="formInline.batjsj" v-model="formInline.batjsj"
:disabled="false" :disabled="false"
style="width: 100%"/> style="width: 90%"/>
</a-form-model-item> </a-form-model-item>
</div> </div>
</a-col> </a-col>
@@ -52,9 +52,10 @@
<span class="title-text-text" :title="$t('remarks')"> <span class="title-text-text" :title="$t('remarks')">
{{$t('remarks')}}</span> {{$t('remarks')}}</span>
</div> </div>
<a-form-model-item class="itemModel" prop="remarks"> <a-form-model-item class="itemModel" prop="bz">
<a-textarea :placeholder="$t('pleaseEnter')+$t('remarks')" <a-textarea :placeholder="$t('pleaseEnter')+$t('remarks')"
v-model="formInline.bz" v-model="formInline.bz"
style="width: 90%"
:rows="4"/> :rows="4"/>
</a-form-model-item> </a-form-model-item>
</div> </div>
@@ -95,6 +96,9 @@ export default {
trigger: 'change' trigger: 'change'
} }
], ],
bz: [
{ min: 1, max: 500, message: this.$t('cantExeed') + '500' + this.$t('characters'), trigger: 'blur' }
]
// listConfirmation: [ // listConfirmation: [
// { // {
// required: true, // required: true,
@@ -154,6 +158,11 @@ export default {
edit(row) { edit(row) {
if(row instanceof Array){ if(row instanceof Array){
this.ids = row.join(',') this.ids = row.join(',')
this.formInline = {
bazt:undefined,
batjsj:'',
bz:'',
}
}else{ }else{
this.formInline.bazt = row.bazt ? row.bazt : undefined this.formInline.bazt = row.bazt ? row.bazt : undefined
this.formInline.batjsj = row.batjsj this.formInline.batjsj = row.batjsj
@@ -189,7 +198,7 @@ export default {
}, },
handleCancel() { handleCancel() {
this.formInline = { this.formInline = {
bazt:'', bazt:undefined,
batjsj:'', batjsj:'',
bz:'',} bz:'',}
this.ids = '' this.ids = ''
@@ -274,7 +283,7 @@ export default {
.box-input { .box-input {
display: inline-block; display: inline-block;
height: 38px; height: 38px;
width: 100%; width: 90%;
} }
.itemModel { .itemModel {
jero-web/src/views/otamanagement/upgradeactivity/index.vue
+2 -2
View File
@@ -111,7 +111,7 @@
<div v-has="'regulatoryAndTechnicalAssessment:batchDelete'" <div v-has="'regulatoryAndTechnicalAssessment:batchDelete'"
class="operator-text"> class="operator-text">
<ImportFile :url="url" :dummyInventoryBaseId="$route.query.id" :isTrue="true" <ImportFile :url="url" :dummyInventoryBaseId="$route.query.id" :isTrue="true"
:accept="'.zip'"/> :accept="'.zip'" @getList="getList"/>
</div> </div>
<div @click="handleModule" <div @click="handleModule"
v-has="'regulatoryAndTechnicalAssessment:batchDelete'" v-has="'regulatoryAndTechnicalAssessment:batchDelete'"
@@ -235,7 +235,7 @@ export default {
], ],
columns: [ columns: [
{ {
title: this.$t('registrationnumber'), title: this.$t('upgraderegistrationnumber'),
align: 'left', align: 'left',
dataIndex: 'cpdjbh', dataIndex: 'cpdjbh',
ellipsis: true, ellipsis: true,
jero-web/src/views/otamanagement/upgradeactivityrecord/components/auxiliaryupgradehavechanged.vue
+1 -1
View File
@@ -3,7 +3,7 @@
<div class="box"> <div class="box">
<div class="table-operator"> <div class="table-operator">
<div class="operator-text"> <div class="operator-text">
<ImportFile :url="url" :dummyInventoryBaseId="$route.query.id" :isTrue="true" :accept="'.zip'" /> <ImportFile :url="url" :dummyInventoryBaseId="$route.query.id" :isTrue="true" :accept="'.zip'" @getList="getData"/>
</div> </div>
<div @click='handleModule' class="operator-text"> <div @click='handleModule' class="operator-text">
<a-icon type="download"/> <a-icon type="download"/>
jero-web/src/views/otamanagement/upgradeactivityrecord/components/thetargetvehicleofthisupgrade.vue
+1 -1
View File
@@ -3,7 +3,7 @@
<div class="box"> <div class="box">
<div class="table-operator"> <div class="table-operator">
<div class="operator-text"> <div class="operator-text">
<ImportFile :url="url" :dummyInventoryBaseId="$route.query.id" :isTrue="true" :accept="'.zip'" /> <ImportFile :url="url" :dummyInventoryBaseId="$route.query.id" :isTrue="true" :accept="'.zip'" @getList="getData"/>
</div> </div>
<div @click='handleModule' class="operator-text"> <div @click='handleModule' class="operator-text">
<a-icon type="download"/> <a-icon type="download"/>
jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradehavechanged.vue
+1 -1
View File
@@ -3,7 +3,7 @@
<div class="box"> <div class="box">
<div class="table-operator"> <div class="table-operator">
<div class="operator-text"> <div class="operator-text">
<ImportFile :url="url" :dummyInventoryBaseId="$route.query.id" :isTrue="true" :accept="'.zip'" /> <ImportFile :url="url" :dummyInventoryBaseId="$route.query.id" :isTrue="true" :accept="'.zip'" @getList="getData"/>
</div> </div>
<div @click='handleModule' class="operator-text"> <div @click='handleModule' class="operator-text">
<a-icon type="download"/> <a-icon type="download"/>
jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradeimpactassessment.vue
+1 -1
View File
@@ -3,7 +3,7 @@
<div class="box"> <div class="box">
<div class="table-operator"> <div class="table-operator">
<div class="operator-text"> <div class="operator-text">
<ImportFile :url="url" :dummyInventoryBaseId="$route.query.id" :isTrue="true" :accept="'.zip'" /> <ImportFile :url="url" :dummyInventoryBaseId="$route.query.id" :isTrue="true" :accept="'.zip'" @getList="getData"/>
</div> </div>
<div @click='handleModule' class="operator-text"> <div @click='handleModule' class="operator-text">
<a-icon type="download"/> <a-icon type="download"/>
jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradetargetmodel.vue
+1 -1
View File
@@ -3,7 +3,7 @@
<div class="box"> <div class="box">
<div class="table-operator"> <div class="table-operator">
<div class="operator-text"> <div class="operator-text">
<ImportFile :url="url" :dummyInventoryBaseId="$route.query.id" :isTrue="true" :accept="'.zip'" /> <ImportFile :url="url" :dummyInventoryBaseId="$route.query.id" :isTrue="true" :accept="'.zip'" @getList="getData"/>
</div> </div>
<div @click='handleModule' class="operator-text"> <div @click='handleModule' class="operator-text">
<a-icon type="download"/> <a-icon type="download"/>
jero-web/src/views/otamanagement/upgradeactivityrecord/components/usernotification.vue
+1 -1
View File
@@ -3,7 +3,7 @@
<div class="box"> <div class="box">
<div class="table-operator"> <div class="table-operator">
<div class="operator-text"> <div class="operator-text">
<ImportFile :url="url" :dummyInventoryBaseId="$route.query.id" :isTrue="true" :accept="'.zip'" /> <ImportFile :url="url" :dummyInventoryBaseId="$route.query.id" :isTrue="true" :accept="'.zip'" @getList="getData"/>
</div> </div>
<div @click='handleModule' class="operator-text"> <div @click='handleModule' class="operator-text">
<a-icon type="download"/> <a-icon type="download"/>
jero-web/src/views/otamanagement/vehicleregistration/components/maintenance.vue
+21 -5
View File
@@ -20,6 +20,7 @@
</div> </div>
<a-form-model-item class="itemModel" prop="bazt"> <a-form-model-item class="itemModel" prop="bazt">
<j-dict-select-tag class="box-input" v-model="formInline.bazt" <j-dict-select-tag class="box-input" v-model="formInline.bazt"
@input="selectchange"
:placeholder="$t('PleaseSelect')+$t('recordstatus')" :placeholder="$t('PleaseSelect')+$t('recordstatus')"
:type="'select'" :type="'select'"
:triggerChange="false" :dictCode="'recordstatus'"/> :triggerChange="false" :dictCode="'recordstatus'"/>
@@ -40,7 +41,7 @@
format="YYYY-MM-DD" format="YYYY-MM-DD"
:getCalendarContainer="(trigger) => trigger.parentNode" :getCalendarContainer="(trigger) => trigger.parentNode"
v-model="formInline.batjsj" v-model="formInline.batjsj"
style="width: 100%"/> style="width: 90%"/>
</a-form-model-item> </a-form-model-item>
</div> </div>
</a-col> </a-col>
@@ -51,9 +52,10 @@
<span class="title-text-text" :title="$t('remarks')"> <span class="title-text-text" :title="$t('remarks')">
{{$t('remarks')}}</span> {{$t('remarks')}}</span>
</div> </div>
<a-form-model-item class="itemModel" prop="remarks"> <a-form-model-item class="itemModel" prop="bz">
<a-textarea :placeholder="$t('pleaseEnter')+$t('remarks')" <a-textarea :placeholder="$t('pleaseEnter')+$t('remarks')"
v-model="formInline.bz" v-model="formInline.bz"
style="width: 90%"
:rows="4"/> :rows="4"/>
</a-form-model-item> </a-form-model-item>
</div> </div>
@@ -75,7 +77,7 @@ export default {
visible: false, visible: false,
confirmLoading: false, confirmLoading: false,
formInline: { formInline: {
bazt:'', bazt:undefined,
batjsj:'', batjsj:'',
bz:'', bz:'',
}, },
@@ -94,6 +96,9 @@ export default {
trigger: 'change' trigger: 'change'
} }
], ],
bz: [
{ min: 1, max: 500, message: this.$t('cantExeed') + '500' + this.$t('characters'), trigger: 'blur' }
]
// designDeadline: [ // designDeadline: [
// { // {
// required: true, // required: true,
@@ -139,6 +144,11 @@ export default {
edit(row) { edit(row) {
if(row instanceof Array){ if(row instanceof Array){
this.ids = row.join(',') this.ids = row.join(',')
this.formInline = {
bazt:undefined,
batjsj:'',
bz:'',
}
}else{ }else{
this.formInline.bazt = row.bazt ? row.bazt : undefined this.formInline.bazt = row.bazt ? row.bazt : undefined
this.formInline.batjsj = row.batjsj this.formInline.batjsj = row.batjsj
@@ -172,9 +182,15 @@ export default {
} }
}) })
}, },
selectchange(value){
this.$nextTick(() => {
this.formInline = { ...this.formInline }
this.$refs.ruleForm.validateField('bazt')
})
},
handleCancel() { handleCancel() {
this.formInline = { this.formInline = {
bazt:'', bazt:undefined,
batjsj:'', batjsj:'',
bz:'',} bz:'',}
this.ids = '' this.ids = ''
@@ -259,7 +275,7 @@ export default {
.box-input { .box-input {
display: inline-block; display: inline-block;
height: 38px; height: 38px;
width: 100%; width: 90%;
} }
.itemModel { .itemModel {
jero-web/src/views/otamanagement/vehicleregistration/index.vue
+3 -3
View File
@@ -6,10 +6,10 @@
<a-row :gutter="24"> <a-row :gutter="24">
<a-col :md="6" :sm="8"> <a-col :md="6" :sm="8">
<div class="box-title-text"> <div class="box-title-text">
<div class="title-text" :title="$t('upgraderegistrationnumber')"> <div class="title-text" :title="$t('registrationnumber')">
<span>{{ $t('upgraderegistrationnumber') }}</span> <span>{{ $t('registrationnumber') }}</span>
</div> </div>
<a-input class="box-input" :placeholder="$t('PleaseEnter') + $t('upgraderegistrationnumber')" <a-input class="box-input" :placeholder="$t('PleaseEnter') + $t('registrationnumber')"
v-model="queryParam.cpdjbh"></a-input> v-model="queryParam.cpdjbh"></a-input>
</div> </div>
</a-col> </a-col>