diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js
index 287db8dc8..09f6cc80f 100644
--- a/jero-web/src/common/lang/en-us.js
+++ b/jero-web/src/common/lang/en-us.js
@@ -954,57 +954,57 @@ module.exports = {
disableInput: 'Disable input',
OnlyOrTaskconfirmationOut: 'Only when the list confirmation status or task confirmation status is to be confirmed can the reminder be carried out',
or: 'or',
- warningTime:'Warning time',
- RegulationMonthlyManagement:'Regulation Monthly Management',
- RegulationMonthlyFill:'Regulation Monthly Fill',
- RegulationMonthlyName:'Regulation monthly name',
- monthlyLanguage:'Monthly language',
- releaseStatus:'Release status',
- uploadedBy:'Uploaded by',
- uploadMonthly:'Upload monthly',
- chapterContents:'Chapter contents',
- chineseTitle:'Chinese title',
- englishTitle:'English title',
- regulatoryContact:'Regulatory contact',
- exportStatus:'Export status',
- monthlyTitleTemplate:'Monthly title template',
- monthlyIntegrationAndExport:'Monthly integration and export',
- addContent:'Add content',
- editContent:'Edit content',
- viewContent:'View content',
- fillInTheMonth:'Fill in the month',
- monthSelection:'Month selection',
- bringInStandardInformation:'Bring in standard information',
- contentTemplate:'Content template',
- moveUp:'Move up',
- moveDown:'Move down',
- vehicleType:'Vehicle Type',
- usage:'Usage',
- implementationModel:'Implementation model',
- primaryCoverageCn:'Primary coverage (Cn)',
- primaryCoverageEn:'Primary coverage (En)',
- workProgressCn:'NIO Work progress (Cn)',
- workProgressEn:'NIO Work progress (En)',
- initiatingProcess:'Initiating Process',
- collectResults:'Collect results',
- dateOfInitiation:'Date of initiation',
- closingDate:'Closing date',
- viewProcess:'View process',
- evaluationResults:'Evaluation results',
- Assessor:'Assessor',
- collectionOfRegulatoryOpinions:'Collection Of Regulatory Opinions',
- feedbackInformation:'Feedback Information',
- relevantSections:'Relevant sections',
- questionsSuggestions:'Questions or Suggestions',
- reason:'Reason',
- feedbackPoint:'Feedback point',
- link:'Link',
- planNoChinese:'Plan No.',
- standardNameCn:'Standard Name Cn',
- standardNameEn:'Standard Name En',
- deadlineForComments:'Deadline for comments',
- standardNo:'Standard No',
- implemenDate:'Implementation Date',
+ warningTime: 'Warning time',
+ RegulationMonthlyManagement: 'Regulation Monthly Management',
+ RegulationMonthlyFill: 'Regulation Monthly Fill',
+ RegulationMonthlyName: 'Regulation monthly name',
+ monthlyLanguage: 'Monthly language',
+ releaseStatus: 'Release status',
+ uploadedBy: 'Uploaded by',
+ uploadMonthly: 'Upload monthly',
+ chapterContents: 'Chapter contents',
+ chineseTitle: 'Chinese title',
+ englishTitle: 'English title',
+ regulatoryContact: 'Regulatory contact',
+ exportStatus: 'Export status',
+ monthlyTitleTemplate: 'Monthly title template',
+ monthlyIntegrationAndExport: 'Monthly integration and export',
+ addContent: 'Add content',
+ editContent: 'Edit content',
+ viewContent: 'View content',
+ fillInTheMonth: 'Fill in the month',
+ monthSelection: 'Month selection',
+ bringInStandardInformation: 'Bring in standard information',
+ contentTemplate: 'Content template',
+ moveUp: 'Move up',
+ moveDown: 'Move down',
+ vehicleType: 'Vehicle Type',
+ usage: 'Usage',
+ implementationModel: 'Implementation model',
+ primaryCoverageCn: 'Primary coverage (Cn)',
+ primaryCoverageEn: 'Primary coverage (En)',
+ workProgressCn: 'NIO Work progress (Cn)',
+ workProgressEn: 'NIO Work progress (En)',
+ initiatingProcess: 'Initiating Process',
+ collectResults: 'Collect results',
+ dateOfInitiation: 'Date of initiation',
+ closingDate: 'Closing date',
+ viewProcess: 'View process',
+ evaluationResults: 'Evaluation results',
+ Assessor: 'Assessor',
+ collectionOfRegulatoryOpinions: 'Collection Of Regulatory Opinions',
+ feedbackInformation: 'Feedback Information',
+ relevantSections: 'Relevant sections',
+ questionsSuggestions: 'Questions or Suggestions',
+ reason: 'Reason',
+ feedbackPoint: 'Feedback point',
+ link: 'Link',
+ planNoChinese: 'Plan No.',
+ standardNameCn: 'Standard Name Cn',
+ standardNameEn: 'Standard Name En',
+ deadlineForComments: 'Deadline for comments',
+ standardNo: 'Standard No',
+ implemenDate: 'Implementation Date',
// 上报库
Enable: 'Enable',
Latestupdatetime: 'Latest update time',
@@ -1039,7 +1039,7 @@ module.exports = {
Btext: 'Text+Pull more',
Ctext: 'Text+File',
Dtext: 'Pull single+File',
- Etext:'Pull more+File',
+ Etext: 'Pull more+File',
Ftext: 'Text+Pull single+File',
Nnothing: 'Null',
Nchinese: 'Chinese',
@@ -1054,4 +1054,5 @@ module.exports = {
Copyparameterlist: 'Copy parameter list',
Templatenamelist: 'Template name - parameter item collection list',
newNiONumber: 'Number',
+ English: 'English'
}
\ 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 5c6e9c49b..8754dd686 100644
--- a/jero-web/src/common/lang/zh-cn.js
+++ b/jero-web/src/common/lang/zh-cn.js
@@ -1058,4 +1058,5 @@ module.exports = {
Copyparameterlist: '复制参数清单',
Templatenamelist: '模板名称-参数项收集清单',
newNiONumber: 'NIO编号',
+ English:'英文',
}
\ 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 cf346c6fd..5e3551086 100644
--- a/jero-web/src/components/uploadFile/file.vue
+++ b/jero-web/src/components/uploadFile/file.vue
@@ -8,7 +8,7 @@
:class="{'uploadFile':isUploadFile}"
name="file"
:file-list="myfileList"
- :multiple="true"
+ :multiple="multiple"
:action="uploadAction+'?state='+state+'&cut='+cut"
:headers="headers"
@preview="preview"
@@ -33,7 +33,7 @@
export default {
name: 'file',
- props: ['disableds', 'disabled', 'thisFileUploadUrl', 'readonly', 'thisFileType', 'isUploadFile'],
+ props: ['disableds', 'disabled', 'thisFileUploadUrl', 'readonly', 'thisFileType', 'isUploadFile', 'isMultiple'],
data() {
return {
visible: false,
@@ -46,7 +46,8 @@
fileList: [],
myfileList: [],
isLoding: false,
- cut: ''
+ cut: '',
+ multiple: true
}
},
created() {
@@ -62,6 +63,9 @@
} else if (long && long == 'en-us') {
this.cut = 'en'
}
+ if (this.isMultiple) {
+ this.multiple = false
+ }
// console.log(this.thisFileType,this.thisFileSize,this.thisFileUploadUrl);
},
methods: {
@@ -76,11 +80,15 @@
this.myfileList = []
}
},
- beforeUpload(file) {
-
- console.log(file)
+ beforeUpload(file, fileList) {
// let thisFileType = this.thisFileType.replace(/\s+/g, "");
this.fileTypeSatus = true
+ if (this.isMultiple) {
+ if ((this.myfileList && this.myfileList.length == 1) || this.myfileList && this.myfileList.length > 1) {
+ this.$message.warning('只能上传一个文件')
+ return false
+ }
+ }
//TODO 客户要求不拦截文件
// if(file.type){
// if (thisFileType.indexOf(file.type) != -1) {
diff --git a/jero-web/src/views/businessSupport/regulationReport/components/RegulationMonthlyManagement.vue b/jero-web/src/views/businessSupport/regulationReport/components/RegulationMonthlyManagement.vue
index 9d15af59c..a779d23fd 100644
--- a/jero-web/src/views/businessSupport/regulationReport/components/RegulationMonthlyManagement.vue
+++ b/jero-web/src/views/businessSupport/regulationReport/components/RegulationMonthlyManagement.vue
@@ -9,7 +9,7 @@
{{$t('RegulationMonthlyName')}}
+ v-model="queryParam.name">
@@ -46,7 +46,7 @@
- {{record.state == 2 ? $t('release') : $t('withdraw')}}
+ {{record.issueStatus == 2 ? $t('release') : $t('withdraw')}}
{{$t('deleteLib')}}
@@ -82,9 +82,9 @@
return {
//url传参严格按照当前命名
url: {
- list: '',
- urlWithdraw: '',
- deleteBatch: ''
+ list: '/report/lawsMonthlyReportManageEO/page',
+ urlWithdraw: '/report/lawsMonthlyReportManageEO/issue',
+ deleteBatch: '/report/lawsMonthlyReportManageEO/deleteBatch'
},
loading: false,
dataSource: [],
@@ -111,7 +111,7 @@
align: 'center',
width: 140,
ellipsis: true,
- dataIndex: 'releaseStatus'
+ dataIndex: 'issueStatus'
},
{
title: this.$t('uploadTime'),
@@ -210,17 +210,17 @@
}
},
managementAddForm() {
- this.getList()
+ this.pageOnChange(1)
},
//撤回
withdraw(val) {
let item = {}
let content = ''
- if (val.state == 2) {
+ if (val.issueStatus == 2) {
content = this.$t('confirmRelease')
- item.state = 1
+ item.issueStatus = 1
} else {
- item.state = 2
+ item.issueStatus = 2
content = this.$t('confirmWithdraw')
}
item.id = val.id
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 8f8d68927..d320e53b8 100644
--- a/jero-web/src/views/businessSupport/regulationReport/components/modules/managementAdd.vue
+++ b/jero-web/src/views/businessSupport/regulationReport/components/modules/managementAdd.vue
@@ -19,11 +19,11 @@
{{$t('monthlyReportRegulations')}}
-
+
- {{ (formInline['RegulationMonthlyName'] === 'null' || formInline['RegulationMonthlyName'] === '' ||
- formInline['RegulationMonthlyName'] == null) ? $t('clickUpload') : $t('viewUploadedFiles')
+ @click="clickButtonToUpload('name')">
+ {{ (formInline['name'] === 'null' || formInline['name'] === '' ||
+ formInline['name'] == null) ? $t('clickUpload') : $t('viewUploadedFiles')
}}
@@ -36,9 +36,20 @@
{{$t('monthlyLanguage')}}
-
+
+
+
+ {{ item.text }}
+
+
+
@@ -50,7 +61,7 @@
{{$t('submit')}}
-
+
@@ -69,32 +80,33 @@
name: [
{
required: true,
- message: this.$t('VirtualListName') + this.$t('cannotEmpty'),
- trigger: 'blur'
- },
- {
- max: 100,
- message: this.$t('VirtualListName') + this.$t('cannotExceed') + 100 + this.$t('Characters'),
- trigger: 'blur'
+ message: this.$t('monthlyReportRegulations') + this.$t('cannotEmpty'),
+ trigger: 'change'
}
],
- useExplain: [
+ language: [
{
required: true,
- message: this.$t('instructionForUse') + this.$t('cannotEmpty'),
- trigger: 'blur'
- },
- {
- max: 500,
- message: this.$t('instructionForUse') + this.$t('cannotExceed') + 500 + this.$t('Characters'),
- trigger: 'blur'
+ message: this.$t('monthlyLanguage') + this.$t('cannotEmpty'),
+ trigger: 'change'
}
]
},
visible: false,
+ languageList: [
+ {
+ text: this.$t('chinese'),
+ value: 1
+ },
+ {
+ text: this.$t('English'),
+ value: 2
+ }
+ ],
formInline: {},
confirmLoading: false,
- uploadName: ''
+ uploadName: '',
+ disabled: false
}
},
methods: {
@@ -104,7 +116,18 @@
handleSubmit() {
this.$refs.ruleForm.validate(valid => {
if (valid) {
-
+ this.confirmLoading = true
+ postAction('/report/lawsMonthlyReportManageEO/add', this.formInline).then((res) => {
+ if (res.success) {
+ this.$message.success(this.$t('OperationSuccessful'))
+ this.visible = false
+ this.confirmLoading = false
+ this.$emit('managementAddForm')
+ } else {
+ this.confirmLoading = false
+ this.$message.warning(this.$t('operationFailed'))
+ }
+ })
}
})
},