diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index 48dccaec0..5e03aefe8 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -1259,4 +1259,5 @@ module.exports = { pleaseDecompositionStandardOrder:'Please import or bring in at least one decomposition standard order', currentlyTheFirstOneThatCannotMovedUp:'Currently the first one that cannot be moved up', currentlyTheLastOneCannotmovedDown:'Currently the last one cannot be moved down', + weilaiRegulationMonthlyReport:'Weilai Regulation Monthly Report', } \ No newline at end of file diff --git a/jero-web/src/common/lang/zh-cn.js b/jero-web/src/common/lang/zh-cn.js index 89ac86b7b..c95accf02 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -1361,4 +1361,5 @@ module.exports = { pleaseDecompositionStandardOrder:'请导入或带入至少一条分解标准单', currentlyTheFirstOneThatCannotMovedUp:'当前已是第一个无法进行上移', currentlyTheLastOneCannotmovedDown:'当前已是最后一个无法进行下移', + weilaiRegulationMonthlyReport:'蔚来法规月报', } \ No newline at end of file diff --git a/jero-web/src/views/businessSupport/regulationReport/components/RegulationMonthlyFill.vue b/jero-web/src/views/businessSupport/regulationReport/components/RegulationMonthlyFill.vue index 587a41d0c..07f45bb72 100644 --- a/jero-web/src/views/businessSupport/regulationReport/components/RegulationMonthlyFill.vue +++ b/jero-web/src/views/businessSupport/regulationReport/components/RegulationMonthlyFill.vue @@ -187,7 +187,7 @@ this.pageNo = page this.getList() }, - SizeChange(page,pageSize) { + SizeChange(page, pageSize) { this.pageNo = 1 this.pageSize = pageSize this.getList() @@ -227,10 +227,11 @@ ids: selectedRowKeys.join(','), ...this.queryParam } - downloadFile(this.url.exportData, this.$t('monthlyReportRegulations') + '.zip', query, this.Deselect) + downloadFile(this.url.exportData, this.$t('weilaiRegulationMonthlyReport') + '-' + this.queryParam.month + '.zip', query, this.Deselect) }, Deselect() { this.selectedRowKeys = [] + this.getList() }, addContentClick() { this.$refs.fillAddRef.add() diff --git a/jero-web/src/views/documentTools/documentComparison/components/commentList.vue b/jero-web/src/views/documentTools/documentComparison/components/commentList.vue index 7d27bc8fd..ff412e442 100644 --- a/jero-web/src/views/documentTools/documentComparison/components/commentList.vue +++ b/jero-web/src/views/documentTools/documentComparison/components/commentList.vue @@ -391,7 +391,7 @@ } .box-input { - width: calc(100% - 168px); + width: calc(100% - 183px); margin-right: 8px; } diff --git a/jero-web/src/views/documentTools/documentComparison/components/initiateComparison.vue b/jero-web/src/views/documentTools/documentComparison/components/initiateComparison.vue index 5c02c7ce8..3153f2097 100644 --- a/jero-web/src/views/documentTools/documentComparison/components/initiateComparison.vue +++ b/jero-web/src/views/documentTools/documentComparison/components/initiateComparison.vue @@ -71,6 +71,7 @@ {{$t('selectedStandard')}} {{selectedRowKeysLeftRecord[0]?selectedRowKeysLeftRecord[0].serialNumber+' '+selectedRowKeysLeftRecord[0].fileName:$t('noComparisonDocumentSelected')}} @@ -135,6 +136,7 @@ {{$t('selectedStandard')}} {{selectedRowKeysRightRecord[0]?selectedRowKeysRightRecord[0].serialNumber+' '+selectedRowKeysRightRecord[0].fileName:$t('noComparisonDocumentSelected')}}