Merge remote-tracking branch 'origin/dev_2nd_period_test' into dev_2nd_period_test
This commit is contained in:
+2
-2
@@ -92,14 +92,14 @@
|
||||
@click="viewClick(record)">
|
||||
{{$t('view')}}
|
||||
</a>
|
||||
<!-- v-if="record.createBy == userData.username || administrators"-->
|
||||
<a class="text-operation"
|
||||
v-if="record.createBy == userData.username || administrators"
|
||||
v-has="'monthlyReportFilling:edit'"
|
||||
@click="edit(record)">
|
||||
{{$t('edit')}}
|
||||
</a>
|
||||
<!-- v-if="record.createBy == userData.username || administrators"-->
|
||||
<a class="text-operation"
|
||||
v-if="record.createBy == userData.username || administrators"
|
||||
v-has="'monthlyReportFilling:delete'"
|
||||
@click="deleteLib(record)">
|
||||
{{$t('deleteLib')}}
|
||||
|
||||
+4
-4
@@ -164,7 +164,7 @@
|
||||
<div class="box-title-text">
|
||||
<div class="title-text">
|
||||
<span class="title-text-text"
|
||||
:title="$t('ImplementationDate')">{{$t('ImplementationDate')}}</span>
|
||||
:title="$t('releaseDate')">{{$t('releaseDate')}}</span>
|
||||
</div>
|
||||
<a-form-model-item class="itemModel" prop="newCarImplementTime">
|
||||
<!-- :placeholder="$t('PleaseEnter')+$t('ImplementationDate')"-->
|
||||
@@ -179,7 +179,7 @@
|
||||
<div class="box-title-text">
|
||||
<div class="title-text">
|
||||
<span class="title-text-text"
|
||||
:title="$t('vehicleInProductionDate')">{{$t('vehicleInProductionDate')}}</span>
|
||||
:title="$t('implemenDate')">{{$t('implemenDate')}}</span>
|
||||
</div>
|
||||
<a-form-model-item class="itemModel" prop="productionCarImplementTime">
|
||||
<!-- $t('PleaseEnter')+$t('vehicleInProductionDate')-->
|
||||
@@ -340,14 +340,14 @@
|
||||
productionCarImplementTime: [
|
||||
{
|
||||
max: 500,
|
||||
message: this.$t('vehicleInProductionDate') + this.$t('cannotExceed') + 500 + this.$t('Characters'),
|
||||
message: this.$t('implemenDate') + this.$t('cannotExceed') + 500 + this.$t('Characters'),
|
||||
trigger: 'blur'
|
||||
}
|
||||
],
|
||||
newCarImplementTime: [
|
||||
{
|
||||
max: 500,
|
||||
message: this.$t('ImplementationDate') + this.$t('cannotExceed') + 500 + this.$t('Characters'),
|
||||
message: this.$t('releaseDate') + this.$t('cannotExceed') + 500 + this.$t('Characters'),
|
||||
trigger: 'blur'
|
||||
}
|
||||
],
|
||||
|
||||
Reference in New Issue
Block a user