diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index 7e92066b7..b1946fe76 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -1235,5 +1235,7 @@ module.exports = { addComparison: 'Add comparison', showOrNot: 'Show or not', comparisonMarket: 'Comparison Market', - share: 'share' + share: 'share', + simplifiedChinese:'Simplified Chinese', + uploadOnly:'Upload only', } \ 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 52078ad02..85ff24ea2 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -1339,4 +1339,6 @@ module.exports = { showOrNot:'是否展示', comparisonMarket:'对比市场', share:'分享', + simplifiedChinese:'简体中文', + uploadOnly:'只能上传', } \ No newline at end of file diff --git a/jero-web/src/components/uploadFile/file.vue b/jero-web/src/components/uploadFile/file.vue index b27182372..510dc1a4c 100644 --- a/jero-web/src/components/uploadFile/file.vue +++ b/jero-web/src/components/uploadFile/file.vue @@ -34,7 +34,7 @@ export default { name: 'file', - props: ['disableds', 'disabled', 'thisFileUploadUrl', 'readonly', 'thisFileType', 'isUploadFile', 'isMultiple', 'restrictUploads'], + props: ['disableds', 'disabled', 'thisFileUploadUrl', 'readonly', 'thisFileType', 'isUploadFile', 'isMultiple', 'restrictUploads', 'Uploadable'], data() { return { visible: false, @@ -68,7 +68,7 @@ if (this.isMultiple) { this.multiple = false } - this.accept = this.restrictUploads ? '.docx,.doc' : '*.*' + this.accept = this.restrictUploads ? this.Uploadable : '*.*' // console.log(this.thisFileType,this.thisFileSize,this.thisFileUploadUrl); }, methods: { @@ -99,10 +99,10 @@ let index1 = fileName.lastIndexOf('.') let index2 = fileName.length let fileSuffix = fileName.substring(index1, index2) - if (fileSuffix == '.docx' || fileSuffix == '.doc') { + if (this.Uploadable.includes(fileSuffix)) { } else { - this.$message.warning(this.$t('onlyFilesUploaded')) + this.$message.warning(this.$t('uploadOnly') + this.Uploadable + this.$t('file')) return false } } diff --git a/jero-web/src/views/businessSupport/regulationReport/components/RegulationMonthlyManagement.vue b/jero-web/src/views/businessSupport/regulationReport/components/RegulationMonthlyManagement.vue index 77c7b5dd3..a6b3cc5e1 100644 --- a/jero-web/src/views/businessSupport/regulationReport/components/RegulationMonthlyManagement.vue +++ b/jero-web/src/views/businessSupport/regulationReport/components/RegulationMonthlyManagement.vue @@ -44,7 +44,7 @@ :columns="columns" > - {{text == 1?$t('chinese'):$t('English')}} + {{text == 1?$t('simplifiedChinese'):$t('English')}} {{text}} @@ -151,7 +151,7 @@ title: this.$t('operation'), align: 'center', fixed: 'right', - width: 180, + width: 240, scopedSlots: { customRender: 'operation' } } ] @@ -179,7 +179,7 @@ this.pageNo = page this.getList() }, - SizeChange(page,pageSize) { + SizeChange(page, pageSize) { this.pageNo = 1 this.pageSize = pageSize this.getList() @@ -220,9 +220,9 @@ let url = window._CONFIG['onlinePreviewDomainURL'] + '?url=' + Base64.encode(this.downLoadFileUrl + '/' + item.fileId + fileSuffix) window.open(url, '_blank') } else { - if (item.createBy == this.userInfo().username){ + if (item.createBy == this.userInfo().username) { downloadFile('/sys/common/downLoadFile', item.name, { id: item.fileId, userName: this.userInfo().username }) - }else{ + } else { this.$message.warning(this.$t('theDoesNotSupportPreview')) } } diff --git a/jero-web/src/views/businessSupport/regulationReport/components/modules/fillTable.vue b/jero-web/src/views/businessSupport/regulationReport/components/modules/fillTable.vue index a93e3f426..df745bf88 100644 --- a/jero-web/src/views/businessSupport/regulationReport/components/modules/fillTable.vue +++ b/jero-web/src/views/businessSupport/regulationReport/components/modules/fillTable.vue @@ -97,7 +97,7 @@ title: this.$t('operation'), align: 'center', fixed: 'right', - width: 180, + width: 280, scopedSlots: { customRender: 'operation' } } ] diff --git a/jero-web/src/views/businessSupport/regulationReport/components/modules/fillTableAdd.vue b/jero-web/src/views/businessSupport/regulationReport/components/modules/fillTableAdd.vue index 15940fc5e..51b79e4d2 100644 --- a/jero-web/src/views/businessSupport/regulationReport/components/modules/fillTableAdd.vue +++ b/jero-web/src/views/businessSupport/regulationReport/components/modules/fillTableAdd.vue @@ -51,6 +51,7 @@ class="box-input" :getPopupContainer="triggerNode=> triggerNode.parentNode" allowClear + :disabled="isParentId" v-model="formInline.parentId"> { + this.isParentId = false this.formInline = {} this.$refs.ruleForm.clearValidate() }) @@ -139,8 +142,13 @@ this.title = this.$t('edit') this.visible = true this.getParent() + this.isParentId = false this.$nextTick(() => { this.formInline = row + if (!row.parentId) { + this.formInline.parentId = undefined + this.isParentId = true + } this.$refs.ruleForm.clearValidate() }) }, diff --git a/jero-web/src/views/businessSupport/regulationReport/components/modules/managementAdd.vue b/jero-web/src/views/businessSupport/regulationReport/components/modules/managementAdd.vue index 9fb30c097..2fdbfc14e 100644 --- a/jero-web/src/views/businessSupport/regulationReport/components/modules/managementAdd.vue +++ b/jero-web/src/views/businessSupport/regulationReport/components/modules/managementAdd.vue @@ -38,7 +38,6 @@ @@ -61,7 +60,8 @@ {{$t('submit')}} - + @@ -95,7 +95,7 @@ visible: false, languageList: [ { - text: this.$t('chinese'), + text: this.$t('simplifiedChinese'), value: 1 }, { @@ -275,7 +275,7 @@ .button-text { height: 38px; - width: calc(100% - 100px); + width: 100%; line-height: 38px; background: #fff; border: 1px #00B3BE solid; diff --git a/jero-web/src/views/documentTools/documentTranslation/components/addModel.vue b/jero-web/src/views/documentTools/documentTranslation/components/addModel.vue index c13dbc0ca..4298fc61f 100644 --- a/jero-web/src/views/documentTools/documentTranslation/components/addModel.vue +++ b/jero-web/src/views/documentTools/documentTranslation/components/addModel.vue @@ -94,7 +94,7 @@ - + diff --git a/jero-web/src/views/processCenter/components/feedbackInformation.vue b/jero-web/src/views/processCenter/components/feedbackInformation.vue index c8e8a146f..b237e6c53 100644 --- a/jero-web/src/views/processCenter/components/feedbackInformation.vue +++ b/jero-web/src/views/processCenter/components/feedbackInformation.vue @@ -41,18 +41,15 @@
- * - {{$t('questionsSuggestions')}} + {{$t('enclosure')}}
- - + + + {{ (item.accessoryFile === 'null' || item.accessoryFile === '' || + item.accessoryFile == null) ? $t('clickUpload') : $t('viewUploadedFiles') + }} +
@@ -67,25 +64,26 @@ :prop="'dataList.'+index+'.reason'" :rules="[{max: 300,message: $t('reason') + $t('cannotExceed') + 300 + $t('Characters'),trigger: 'blur' }]"> - +
- {{$t('enclosure')}} + * + {{$t('questionsSuggestions')}}
- - - {{ (item.accessoryFile === 'null' || item.accessoryFile === '' || - item.accessoryFile == null) ? $t('clickUpload') : $t('viewUploadedFiles') - }} - + +