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

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

Browse Source
This commit is contained in:
CD
2022-10-09 18:01:09 +08:00
parent 60e7133e65 c1a95d3539
commit b1a3d0d933
6 changed files with 103 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-web/src/common/lang/en-us.js
+1
View File
@@ -1317,4 +1317,5 @@ module.exports = {
viewAll:'View All', viewAll:'View All',
endProcess:'End Process', endProcess:'End Process',
thereForTheCurrentlySelectedData:'There is no standard breakdown for the currently selected data', thereForTheCurrentlySelectedData:'There is no standard breakdown for the currently selected data',
secondaryDirectory:'Secondary directory',
} }
jero-web/src/common/lang/zh-cn.js
+1
View File
@@ -1418,4 +1418,5 @@ module.exports = {
viewAll:'查看全部', viewAll:'查看全部',
endProcess:'结束流程', endProcess:'结束流程',
thereForTheCurrentlySelectedData:'当前所选数据暂无标准分解单', thereForTheCurrentlySelectedData:'当前所选数据暂无标准分解单',
secondaryDirectory:'二级目录',
} }
jero-web/src/views/businessSupport/regulationReport/components/RegulationMonthlyFill.vue
+1 -1
View File
@@ -144,7 +144,7 @@
width: 170 width: 170
}, },
{ {
title: this.$t('chapterContents'), title: this.$t('secondaryDirectory'),
align: 'center', align: 'center',
dataIndex: 'memoriesChapterName', dataIndex: 'memoriesChapterName',
ellipsis: true, ellipsis: true,
jero-web/src/views/businessSupport/regulationReport/components/modules/defaultTemplate.vue
+70 -28
View File
@@ -4,8 +4,9 @@
<a-col :span="12"> <a-col :span="12">
<div class="box-title-text"> <div class="box-title-text">
<div class="title-text"> <div class="title-text">
<span class="title-text-text" <span class="Required" v-if="!disabled">*</span>
:title="$t('title')">{{$t('title')}}</span> <span class="title-text-text"
:title="$t('title')">{{$t('title')}}</span>
</div> </div>
<a-form-model-item class="itemModel" prop="titleCn"> <a-form-model-item class="itemModel" prop="titleCn">
<a-input class="box-input" <a-input class="box-input"
@@ -18,8 +19,9 @@
<a-col :span="12"> <a-col :span="12">
<div class="box-title-text"> <div class="box-title-text">
<div class="title-text"> <div class="title-text">
<span class="title-text-text" <span class="Required" v-if="!disabled">*</span>
:title="$t('englishTitle')">{{$t('englishTitle')}}</span> <span class="title-text-text"
:title="$t('englishTitle')">{{$t('englishTitle')}}</span>
</div> </div>
<a-form-model-item class="itemModel" prop="titleEn"> <a-form-model-item class="itemModel" prop="titleEn">
<a-input class="box-input" <a-input class="box-input"
@@ -34,10 +36,11 @@
<a-col :span="12"> <a-col :span="12">
<div class="box-title-text"> <div class="box-title-text">
<div class="title-text"> <div class="title-text">
<span class="title-text-text" <span class="Required" v-if="!disabled">*</span>
:title="$t('technicalField')">{{$t('technicalField')}}</span> <span class="title-text-text"
:title="$t('technicalField')">{{$t('technicalField')}}</span>
</div> </div>
<a-form-model-item class="itemModel-multi" prop="technologyTerritory"> <a-form-model-item class="itemModel" prop="technologyTerritory">
<a-tree-select <a-tree-select
tree-node-filter-prop="title" tree-node-filter-prop="title"
v-model="formInline.technologyTerritory" v-model="formInline.technologyTerritory"
@@ -53,20 +56,20 @@
</a-form-model-item> </a-form-model-item>
</div> </div>
</a-col> </a-col>
<a-col :span="12"> <!-- <a-col :span="12">-->
<div class="box-title-text"> <!-- <div class="box-title-text">-->
<div class="title-text"> <!-- <div class="title-text">-->
<span class="title-text-text" <!-- <span class="title-text-text"-->
:title="$t('implementationModel')">{{$t('implementationModel')}}</span> <!-- :title="$t('implementationModel')">{{$t('implementationModel')}}</span>-->
</div> <!-- </div>-->
<a-form-model-item class="itemModel" prop="implementCar"> <!-- <a-form-model-item class="itemModel" prop="implementCar">-->
<a-input class="box-input" <!-- <a-input class="box-input"-->
:disabled="disabled" <!-- :disabled="disabled"-->
v-model.trim="formInline.implementCar" <!-- v-model.trim="formInline.implementCar"-->
:placeholder="$t('PleaseEnter')+$t('implementationModel')"/> <!-- :placeholder="$t('PleaseEnter')+$t('implementationModel')"/>-->
</a-form-model-item> <!-- </a-form-model-item>-->
</div> <!-- </div>-->
</a-col> <!-- </a-col>-->
<!-- <a-col :span="12">--> <!-- <a-col :span="12">-->
<!-- <div class="box-title-text">--> <!-- <div class="box-title-text">-->
<!-- <div class="title-text">--> <!-- <div class="title-text">-->
@@ -108,10 +111,10 @@
:title="$t('status')">{{$t('status')}}</span> :title="$t('status')">{{$t('status')}}</span>
</div> </div>
<a-form-model-item class="itemModel-multi itemModel-multi-one"> <a-form-model-item class="itemModel-multi itemModel-multi-one">
<j-multi-select-tag class="box-input" v-model="formInline.state" <j-dict-select-tag class="box-input" v-model="formInline.state"
:disabled="disabled" :disabled="disabled"
:placeholder="$t('PleaseSelect')+$t('status')" :placeholder="$t('PleaseSelect')+$t('status')"
:type="'checkbox'" :type="'radio'"
:triggerChange="false" :dictCode="'state'"/> :triggerChange="false" :dictCode="'state'"/>
</a-form-model-item> </a-form-model-item>
</div> </div>
@@ -125,9 +128,9 @@
:title="$t('usage')">{{$t('usage')}}</span> :title="$t('usage')">{{$t('usage')}}</span>
</div> </div>
<a-form-model-item class="itemModel-multi itemModel-multi-one"> <a-form-model-item class="itemModel-multi itemModel-multi-one">
<j-multi-select-tag class="box-input" v-model="formInline.useMethod" <j-dict-select-tag class="box-input" v-model="formInline.useMethod"
:placeholder="$t('PleaseSelect')+$t('usage')" :placeholder="$t('PleaseSelect')+$t('usage')"
:type="'checkbox'" :type="'radio'"
:disabled="disabled" :disabled="disabled"
:triggerChange="false" :dictCode="'yong4_fa3'"/> :triggerChange="false" :dictCode="'yong4_fa3'"/>
</a-form-model-item> </a-form-model-item>
@@ -156,10 +159,11 @@
:title="$t('ImplementationDate')">{{$t('ImplementationDate')}}</span> :title="$t('ImplementationDate')">{{$t('ImplementationDate')}}</span>
</div> </div>
<a-form-model-item class="itemModel" prop="newCarImplementTime"> <a-form-model-item class="itemModel" prop="newCarImplementTime">
<!-- :placeholder="$t('PleaseEnter')+$t('ImplementationDate')"-->
<a-input class="box-input" <a-input class="box-input"
:disabled="disabled" :disabled="disabled"
v-model.trim="formInline.newCarImplementTime" v-model.trim="formInline.newCarImplementTime"
:placeholder="$t('PleaseEnter')+$t('ImplementationDate')"/> :placeholder="'202X.X.X'"/>
</a-form-model-item> </a-form-model-item>
</div> </div>
</a-col> </a-col>
@@ -170,10 +174,11 @@
:title="$t('vehicleInProductionDate')">{{$t('vehicleInProductionDate')}}</span> :title="$t('vehicleInProductionDate')">{{$t('vehicleInProductionDate')}}</span>
</div> </div>
<a-form-model-item class="itemModel" prop="productionCarImplementTime"> <a-form-model-item class="itemModel" prop="productionCarImplementTime">
<!-- $t('PleaseEnter')+$t('vehicleInProductionDate')-->
<a-input class="box-input" <a-input class="box-input"
:disabled="disabled" :disabled="disabled"
v-model.trim="formInline.productionCarImplementTime" v-model.trim="formInline.productionCarImplementTime"
:placeholder="$t('PleaseEnter')+$t('vehicleInProductionDate')"/> :placeholder="'202X.X.X'"/>
</a-form-model-item> </a-form-model-item>
</div> </div>
</a-col> </a-col>
@@ -185,6 +190,7 @@
<a-col :span="24"> <a-col :span="24">
<div class="box-title-text"> <div class="box-title-text">
<div class="title-text"> <div class="title-text">
<span class="Required" v-if="!disabled">*</span>
<span class="title-text-text" :title="$t('primaryCoverageCn')">{{$t('primaryCoverageCn')}}</span> <span class="title-text-text" :title="$t('primaryCoverageCn')">{{$t('primaryCoverageCn')}}</span>
</div> </div>
<a-form-model-item class="itemModel" prop="contentCn"> <a-form-model-item class="itemModel" prop="contentCn">
@@ -200,6 +206,7 @@
<a-col :span="24"> <a-col :span="24">
<div class="box-title-text"> <div class="box-title-text">
<div class="title-text"> <div class="title-text">
<span class="Required" v-if="!disabled">*</span>
<span class="title-text-text" :title="$t('primaryCoverageEn')">{{$t('primaryCoverageEn')}}</span> <span class="title-text-text" :title="$t('primaryCoverageEn')">{{$t('primaryCoverageEn')}}</span>
</div> </div>
<a-form-model-item class="itemModel" prop="contentEn"> <a-form-model-item class="itemModel" prop="contentEn">
@@ -245,9 +252,10 @@
<a-col :span="24"> <a-col :span="24">
<div class="box-title-text"> <div class="box-title-text">
<div class="title-text"> <div class="title-text">
<span class="Required" v-if="!disabled">*</span>
<span class="title-text-text" :title="$t('regulatoryContact')">{{$t('regulatoryContact')}}</span> <span class="title-text-text" :title="$t('regulatoryContact')">{{$t('regulatoryContact')}}</span>
</div> </div>
<a-form-model-item class="itemModel"> <a-form-model-item class="itemModel" prop="lawsContactName">
<PersonnelSelection <PersonnelSelection
:query="{db_field_name:'lawsContact',db_field_txt:$t('regulatoryContact')}" :query="{db_field_name:'lawsContact',db_field_txt:$t('regulatoryContact')}"
:personneQuery="formInline" :personneQuery="formInline"
@@ -290,7 +298,19 @@
data() { data() {
return { return {
rules: { rules: {
lawsContactName:[
{
required: true,
message: this.$t('regulatoryContact') + this.$t('cannotEmpty'),
trigger: 'change'
}
],
titleCn: [ titleCn: [
{
required: true,
message: this.$t('title') + this.$t('cannotEmpty'),
trigger: 'blur'
},
{ {
max: 500, max: 500,
message: this.$t('title') + this.$t('cannotExceed') + 500 + this.$t('Characters'), message: this.$t('title') + this.$t('cannotExceed') + 500 + this.$t('Characters'),
@@ -298,6 +318,11 @@
} }
], ],
titleEn: [ titleEn: [
{
required: true,
message: this.$t('englishTitle') + this.$t('cannotEmpty'),
trigger: 'blur'
},
{ {
max: 500, max: 500,
message: this.$t('englishTitle') + this.$t('cannotExceed') + 500 + this.$t('Characters'), message: this.$t('englishTitle') + this.$t('cannotExceed') + 500 + this.$t('Characters'),
@@ -354,6 +379,11 @@
} }
], ],
contentEn: [ contentEn: [
{
required: true,
message: this.$t('primaryCoverageEn') + this.$t('cannotEmpty'),
trigger: 'blur'
},
{ {
max: 300, max: 300,
message: this.$t('primaryCoverageEn') + this.$t('cannotExceed') + 300 + this.$t('Characters'), message: this.$t('primaryCoverageEn') + this.$t('cannotExceed') + 300 + this.$t('Characters'),
@@ -361,11 +391,23 @@
} }
], ],
contentCn: [ contentCn: [
{
required: true,
message: this.$t('primaryCoverageCn') + this.$t('cannotEmpty'),
trigger: 'blur'
},
{ {
max: 300, max: 300,
message: this.$t('primaryCoverageCn') + this.$t('cannotExceed') + 300 + this.$t('Characters'), message: this.$t('primaryCoverageCn') + this.$t('cannotExceed') + 300 + this.$t('Characters'),
trigger: 'blur' trigger: 'blur'
} }
],
technologyTerritory: [
{
required: true,
message: this.$t('technicalField') + this.$t('cannotEmpty'),
trigger: 'change'
}
] ]
}, },
formInline: {}, formInline: {},
jero-web/src/views/businessSupport/regulationReport/components/modules/industryTemplate.vue
+24
View File
@@ -4,6 +4,7 @@
<a-col :span="12"> <a-col :span="12">
<div class="box-title-text"> <div class="box-title-text">
<div class="title-text"> <div class="title-text">
<span class="Required" v-if="!disabled">*</span>
<span class="title-text-text" <span class="title-text-text"
:title="$t('title')">{{$t('title')}}</span> :title="$t('title')">{{$t('title')}}</span>
</div> </div>
@@ -18,6 +19,7 @@
<a-col :span="12"> <a-col :span="12">
<div class="box-title-text"> <div class="box-title-text">
<div class="title-text"> <div class="title-text">
<span class="Required" v-if="!disabled">*</span>
<span class="title-text-text" <span class="title-text-text"
:title="$t('englishTitle')">{{$t('englishTitle')}}</span> :title="$t('englishTitle')">{{$t('englishTitle')}}</span>
</div> </div>
@@ -110,6 +112,7 @@
<a-col :span="24"> <a-col :span="24">
<div class="box-title-text"> <div class="box-title-text">
<div class="title-text"> <div class="title-text">
<span class="Required" v-if="!disabled">*</span>
<span class="title-text-text" :title="$t('primaryCoverageCn')">{{$t('primaryCoverageCn')}}</span> <span class="title-text-text" :title="$t('primaryCoverageCn')">{{$t('primaryCoverageCn')}}</span>
</div> </div>
<a-form-model-item class="itemModel" prop="contentCn"> <a-form-model-item class="itemModel" prop="contentCn">
@@ -125,6 +128,7 @@
<a-col :span="24"> <a-col :span="24">
<div class="box-title-text"> <div class="box-title-text">
<div class="title-text"> <div class="title-text">
<span class="Required" v-if="!disabled">*</span>
<span class="title-text-text" :title="$t('primaryCoverageEn')">{{$t('primaryCoverageEn')}}</span> <span class="title-text-text" :title="$t('primaryCoverageEn')">{{$t('primaryCoverageEn')}}</span>
</div> </div>
<a-form-model-item class="itemModel" prop="contentEn"> <a-form-model-item class="itemModel" prop="contentEn">
@@ -165,6 +169,11 @@
return { return {
rules: { rules: {
titleCn: [ titleCn: [
{
required: true,
message: this.$t('title') + this.$t('cannotEmpty'),
trigger: 'blur'
},
{ {
max: 500, max: 500,
message: this.$t('title') + this.$t('cannotExceed') + 500 + this.$t('Characters'), message: this.$t('title') + this.$t('cannotExceed') + 500 + this.$t('Characters'),
@@ -172,6 +181,11 @@
} }
], ],
titleEn: [ titleEn: [
{
required: true,
message: this.$t('englishTitle') + this.$t('cannotEmpty'),
trigger: 'blur'
},
{ {
max: 500, max: 500,
message: this.$t('englishTitle') + this.$t('cannotExceed') + 500 + this.$t('Characters'), message: this.$t('englishTitle') + this.$t('cannotExceed') + 500 + this.$t('Characters'),
@@ -221,6 +235,11 @@
} }
], ],
contentEn: [ contentEn: [
{
required: true,
message: this.$t('primaryCoverageEn') + this.$t('cannotEmpty'),
trigger: 'blur'
},
{ {
max: 300, max: 300,
message: this.$t('primaryCoverageEn') + this.$t('cannotExceed') + 300 + this.$t('Characters'), message: this.$t('primaryCoverageEn') + this.$t('cannotExceed') + 300 + this.$t('Characters'),
@@ -228,6 +247,11 @@
} }
], ],
contentCn: [ contentCn: [
{
required: true,
message: this.$t('primaryCoverageCn') + this.$t('cannotEmpty'),
trigger: 'blur'
},
{ {
max: 300, max: 300,
message: this.$t('primaryCoverageCn') + this.$t('cannotExceed') + 300 + this.$t('Characters'), message: this.$t('primaryCoverageCn') + this.$t('cannotExceed') + 300 + this.$t('Characters'),
jero-web/src/views/businessSupport/technologyAssessment/components/TermInformation.vue
+6 -5
View File
@@ -6,13 +6,14 @@
:visible="visible" :visible="visible"
:confirm-loading="confirmLoading" :confirm-loading="confirmLoading"
:maskClosable="false" :maskClosable="false"
:footer="null"
@cancel="visible = false" @cancel="visible = false"
> >
<template slot="footer"> <!-- <template slot="footer">-->
<a-button key="back" @click="visible = false"> <!-- <a-button key="back" @click="visible = false">-->
{{$t('cancel')}} <!-- {{$t('cancel')}}-->
</a-button> <!-- </a-button>-->
</template> <!-- </template>-->
<div style="margin-bottom: 10px;text-align: center"> <div style="margin-bottom: 10px;text-align: center">
<div @click="handleModule" class="operator-text"> <div @click="handleModule" class="operator-text">
<a-icon type="download"/> <a-icon type="download"/>