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:
zyx.net
2022-08-05 18:08:53 +08:00
parent 34cde577e5 a4acabfa10
commit c0ec0fdda3
9 changed files with 67 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-web/src/common/lang/en-us.js
+1
View File
@@ -1240,4 +1240,5 @@ module.exports = {
uploadOnly:'Upload only', uploadOnly:'Upload only',
turnOnAutoMatch:'Turn on auto match', turnOnAutoMatch:'Turn on auto match',
Adjustareasofresponsibility:'Adjust areas of responsibility', Adjustareasofresponsibility:'Adjust areas of responsibility',
regulatoryTechnicalAssessment:'Regulatory Technical Assessment',
} }
jero-web/src/common/lang/zh-cn.js
+1
View File
@@ -1343,4 +1343,5 @@ module.exports = {
uploadOnly:'只能上传', uploadOnly:'只能上传',
turnOnAutoMatch:'打开自动匹配', turnOnAutoMatch:'打开自动匹配',
Adjustareasofresponsibility:'调整责任领域', Adjustareasofresponsibility:'调整责任领域',
regulatoryTechnicalAssessment:'法规技术评估',
} }
jero-web/src/views/businessSupport/regulationReport/components/modules/defaultTemplate.vue
+5 -5
View File
@@ -15,7 +15,7 @@
</a-form-model-item> </a-form-model-item>
</div> </div>
</a-col> </a-col>
<a-col :span="12" style="text-align: right"> <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"
@@ -292,15 +292,15 @@
rules: { rules: {
titleCn: [ titleCn: [
{ {
max: 100, max: 500,
message: this.$t('title') + this.$t('cannotExceed') + 100 + this.$t('Characters'), message: this.$t('title') + this.$t('cannotExceed') + 500 + this.$t('Characters'),
trigger: 'blur' trigger: 'blur'
} }
], ],
titleEn: [ titleEn: [
{ {
max: 100, max: 500,
message: this.$t('englishTitle') + this.$t('cannotExceed') + 100 + this.$t('Characters'), message: this.$t('englishTitle') + this.$t('cannotExceed') + 500 + this.$t('Characters'),
trigger: 'blur' trigger: 'blur'
} }
], ],
jero-web/src/views/businessSupport/technologyAssessment/components/initiatingProcess.vue
+19 -5
View File
@@ -48,7 +48,7 @@
{{selectedRowKeysRecord[0] ? selectedRowKeysRecord[0].serialNumber :''}} {{selectedRowKeysRecord[0] ? selectedRowKeysRecord[0].serialNumber :''}}
</div> </div>
<div class="title-text-right" v-if="isTrue"> <div class="title-text-right" v-if="isTrue">
<span @click="standardDecompositionDocumentClick"> <span :title="$t('standardDecompositionDocument')" @click="standardDecompositionDocumentClick">
{{$t('standardDecompositionDocument')}} {{$t('standardDecompositionDocument')}}
</span> </span>
</div> </div>
@@ -96,7 +96,7 @@
<div class="title-text"> <div class="title-text">
<span class="title-text-text" :title="$t('processBackground')">{{$t('processBackground')}}</span> <span class="title-text-text" :title="$t('processBackground')">{{$t('processBackground')}}</span>
</div> </div>
<a-form-model-item class="itemModel" prop="taskExplain"> <a-form-model-item class="itemModel" prop="processBackground">
<a-textarea :placeholder="$t('pleaseEnter')+$t('processBackground')" <a-textarea :placeholder="$t('pleaseEnter')+$t('processBackground')"
v-model="formInline.processBackground" v-model="formInline.processBackground"
:disabled="!whetherDisplay" :disabled="!whetherDisplay"
@@ -111,7 +111,7 @@
<div class="title-text"> <div class="title-text">
<span class="title-text-text" :title="$t('remarks')">{{$t('remarks')}}</span> <span class="title-text-text" :title="$t('remarks')">{{$t('remarks')}}</span>
</div> </div>
<a-form-model-item class="itemModel" prop="remarks"> <a-form-model-item class="itemModel" prop="remark">
<a-textarea :placeholder="$t('pleaseEnter')+$t('remarks')" <a-textarea :placeholder="$t('pleaseEnter')+$t('remarks')"
v-model="formInline.remark" v-model="formInline.remark"
:disabled="!whetherDisplay" :disabled="!whetherDisplay"
@@ -124,7 +124,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">*</span> <!-- <span class="Required">*</span>-->
<span class="title-text-text" :title="$t('evaluationMethod')">{{$t('evaluationMethod')}}</span> <span class="title-text-text" :title="$t('evaluationMethod')">{{$t('evaluationMethod')}}</span>
</div> </div>
<a-form-model-item class="itemModel" prop="gatherResult"> <a-form-model-item class="itemModel" prop="gatherResult">
@@ -239,7 +239,21 @@
message: this.$t('Assessor') + this.$t('cannotEmpty'), message: this.$t('Assessor') + this.$t('cannotEmpty'),
trigger: 'change' trigger: 'change'
} }
] ],
processBackground:[
{
max: 300,
message: this.$t('processBackground') + this.$t('cannotExceed') + 300 + this.$t('Characters'),
trigger: 'blur'
}
],
remark:[
{
max: 300,
message: this.$t('remarks') + this.$t('cannotExceed') + 300 + this.$t('Characters'),
trigger: 'blur'
}
],
}, },
searchParmes: {}, searchParmes: {},
selectedRowKeysRecord: [], selectedRowKeysRecord: [],
jero-web/src/views/businessSupport/technologyAssessment/index.vue
+3 -1
View File
@@ -197,7 +197,7 @@
}, },
{ {
value: '2', value: '2',
name: this.$t('not') name: this.$t('notOnlyRz')
} }
], ],
gatherResultList: [ gatherResultList: [
@@ -215,12 +215,14 @@
title: this.$t('standard'), title: this.$t('standard'),
align: 'center', align: 'center',
dataIndex: 'serialNumber', dataIndex: 'serialNumber',
ellipsis: true,
width: 170 width: 170
}, },
{ {
title: this.$t('title'), title: this.$t('title'),
align: 'center', align: 'center',
dataIndex: 'title', dataIndex: 'title',
ellipsis: true,
width: 170 width: 170
}, },
{ {
jero-web/src/views/processCenter/components/evaluatorFeedback.vue
+5 -5
View File
@@ -5,7 +5,7 @@
{{title}} {{title}}
</div> </div>
</div> </div>
<div class="content-text"> <div class="content-text-text">
<a-form-model :model="formInline" class="formAdd" :rules="rules" ref="ruleForm"> <a-form-model :model="formInline" class="formAdd" :rules="rules" ref="ruleForm">
<a-row :gutter="24"> <a-row :gutter="24">
<a-col :span="12"> <a-col :span="12">
@@ -60,7 +60,7 @@
}]"> }]">
<a-input class="box-input" <a-input class="box-input"
:disabled="disabled" :disabled="disabled"
v-model="item.relatedSection" v-model.trim="item.relatedSection"
:placeholder="$t('PleaseEnter')+$t('relevantSections')"/> :placeholder="$t('PleaseEnter')+$t('relevantSections')"/>
</a-form-model-item> </a-form-model-item>
</div> </div>
@@ -81,7 +81,7 @@
}]"> }]">
<a-input class="box-input" <a-input class="box-input"
:disabled="disabled" :disabled="disabled"
v-model="item.issueOrSuggest" v-model.trim="item.issueOrSuggest"
:placeholder="$t('PleaseEnter')+$t('problemDescription')"/> :placeholder="$t('PleaseEnter')+$t('problemDescription')"/>
</a-form-model-item> </a-form-model-item>
</div> </div>
@@ -185,8 +185,8 @@
trigger: 'blur' trigger: 'blur'
}, },
{ {
max: 300, max: 1000,
message: this.$t('reviewComments') + this.$t('cannotExceed') + 300 + this.$t('Characters'), message: this.$t('reviewComments') + this.$t('cannotExceed') + 1000 + this.$t('Characters'),
trigger: 'blur' trigger: 'blur'
} }
], ],
jero-web/src/views/processCenter/components/evaluatorFeedbackList.vue
+1 -1
View File
@@ -5,7 +5,7 @@
{{title}} {{title}}
</div> </div>
</div> </div>
<div class="content-text"> <div class="content-text-text">
<a-table <a-table
ref="table" ref="table"
:loading="loading" :loading="loading"
jero-web/src/views/processCenter/processForm/evaluationProcess/index.vue
+2 -1
View File
@@ -64,7 +64,7 @@
}, },
data() { data() {
return { return {
title: this.$t('collectionOfRegulatoryOpinions'), title: this.$t('regulatoryTechnicalAssessment'),
url: { url: {
queryTaskDetailByTaskIds: '/task/queryTaskDetailByTaskIds', queryTaskDetailByTaskIds: '/task/queryTaskDetailByTaskIds',
list: '/lawsTechnologyEvaluation/lawsTechnologyEvaluationResultEO/queryEvaluationResultAndComplianceResult' list: '/lawsTechnologyEvaluation/lawsTechnologyEvaluationResultEO/queryEvaluationResultAndComplianceResult'
@@ -141,6 +141,7 @@
} }
}, },
mounted() { mounted() {
document.title = this.$t('regulatoryTechnicalAssessment')
this.isDisplay = false this.isDisplay = false
if (this.$route.query.taskDefinitionKey == 'pgrqr') { if (this.$route.query.taskDefinitionKey == 'pgrqr') {
this.isPreservation = true this.isPreservation = true
jero-web/src/views/regulatoryEarlyWarning/index.vue
+7
View File
@@ -100,6 +100,7 @@
title: this.$t('standard'), title: this.$t('standard'),
align: 'center', align: 'center',
dataIndex: 'serial_number', dataIndex: 'serial_number',
ellipsis: true,
width: 170, width: 170,
scopedSlots: { customRender: 'serial_number' } scopedSlots: { customRender: 'serial_number' }
}, },
@@ -107,6 +108,7 @@
title: this.$t('title'), title: this.$t('title'),
align: 'center', align: 'center',
dataIndex: 'title', dataIndex: 'title',
ellipsis: true,
width: 170, width: 170,
scopedSlots: { customRender: 'titleName' } scopedSlots: { customRender: 'titleName' }
}, },
@@ -187,6 +189,7 @@
}, },
methods: { methods: {
callback(tab) { callback(tab) {
this.selectedRowKeys = []
this.activeTab = tab this.activeTab = tab
this.getList() this.getList()
}, },
@@ -203,6 +206,7 @@
} }
}, },
handleExport() { handleExport() {
if (this.selectedRowKeys && this.selectedRowKeys.length > 0) {
let selectedRowKeys = JSON.parse(JSON.stringify(this.selectedRowKeys)) let selectedRowKeys = JSON.parse(JSON.stringify(this.selectedRowKeys))
let text = '' let text = ''
let flag let flag
@@ -219,6 +223,9 @@
flag: flag flag: flag
} }
downloadFile(this.url.exportData, text + '.xls', query, this.Deselect) downloadFile(this.url.exportData, text + '.xls', query, this.Deselect)
} else {
this.$message.warning(this.$t('selectLeastOne'))
}
}, },
Deselect() { Deselect() {
this.selectedRowKeys = [] this.selectedRowKeys = []