diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index 1259e9eba..e6b40b606 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -1186,4 +1186,7 @@ module.exports = { translatedText:'Translated Text', Administrativeprivileges:'Administrativ Pprivileges', Checkthepermissions:'Check The Permissions', + selectDirectorylocation: 'Please select the directory location to add the folder', + Fileuploaded:'File uploaded, please wait', + uploadedbyyourself:'You can only delete files and data uploaded by yourself', } \ 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 bb2251c6c..3969259df 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -577,6 +577,7 @@ module.exports = { documentSplitTemplate: '文档拆分模板', batSetting: '批量设置', selectDirectoryTerms: '请选择添加条款的目录位置', + selectDirectorylocation: '请选择添加文件夹的目录位置', OnlyWordItem: '只有GSO文件类型，才能拆分pdf文件，请重新选择文件', OnlyWord: '只能导入word文件', labelAreaDeleted: '若进行删除，则该展示区域下标签项都将被删除', @@ -916,6 +917,7 @@ module.exports = { startMonth: '开始日期', endMonth: '结束日期', Importing: '导入中...', + Fileuploaded:'文件上传中，请稍后', projectDeliveryDescription: '工程交付说明', cancelConfirm: '取消确认', currentInformation: '当前信息', @@ -1190,4 +1192,5 @@ module.exports = { translatedText:'译文', Administrativeprivileges:'管理权限', Checkthepermissions:'查看权限', + uploadedbyyourself:'只能删除自己上传的文件数据', } \ No newline at end of file diff --git a/jero-web/src/views/externalReports/components/addModel.vue b/jero-web/src/views/externalReports/components/addModel.vue index 6c13c556c..0e95682ca 100644 --- a/jero-web/src/views/externalReports/components/addModel.vue +++ b/jero-web/src/views/externalReports/components/addModel.vue @@ -1,96 +1,70 @@ @@ -106,26 +80,29 @@ export default { PersonnelSelection, uploadFile }, - props: ['url'], + // props: ['url'], data() { return { formInline: {}, confirmLoading: false, + spinning: false, visible: false, + url: { + add: 'params/template/add', + edit: 'params/template/edit', + }, rules: { - paramsTemplateName:[ - { required: true, message: this.$t('PleaseEnter')+this.$t('parameterTemplate'), trigger: 'blur' }, - { min:1, max: 50, message: this.$t('cantExeed')+'50'+this.$t('characters'), trigger: 'blur' }, - ], description:[ - { min:1, max: 300, message: this.$t('cantExeed')+'300'+this.$t('characters'), trigger: 'blur' }, + // { required: true, message: this.$t('PleaseEnter')+this.$t('fileDeclaration'), trigger: 'blur' }, + { min:1, max: 200, message: this.$t('cantExeed')+'200'+this.$t('characters'), trigger: 'blur' }, ], - state: [ - { required: true, message: this.$t('PleaseSelect')+this.$t('status'), trigger: 'change' }, + sourceFileId: [ + { + required: true, + message: this.$t('fileName') + this.$t('cannotEmpty'), + trigger: 'change' + } ], - region: [ - { required: true, message: this.$t('PleaseSelect')+this.$t('zoneOfApplication'), trigger: 'change' }, - ] }, disabled: false, projectNameList: [], @@ -162,7 +139,12 @@ export default { }) }, handleCancel() { - this.visible = false + if(this.spinning == true){ + this.visible = true + return + }else{ + this.visible = false + } }, handleSubmit() { if(this.formInline.paramsTemplateName !== undefined) { @@ -170,6 +152,7 @@ export default { } this.$refs.ruleForm.validate(valid => { if (valid) { + this.spinning = true let url = '' let Action if (this.formInline.id) { @@ -185,14 +168,14 @@ export default { query[res] = query[res].join(',') } }) - this.confirmLoading = true - Action(url, query).then((res) => { + postAction(url, query).then((res) => { if (res.success) { - this.confirmLoading = false + this.spinning = false this.$message.success(this.$t('OperationSuccessful')) this.visible = false this.$emit('addModelList') } else { + this.spinning = false this.$message.warning(this.$t('operationFailed')) this.confirmLoading = false } @@ -357,4 +340,40 @@ export default { .ant-input-disabled { color: rgba(0, 0, 0, 0.65) !important; } + + \ No newline at end of file diff --git a/jero-web/src/views/externalReports/index.vue b/jero-web/src/views/externalReports/index.vue index 6173aaa85..faad171c5 100644 --- a/jero-web/src/views/externalReports/index.vue +++ b/jero-web/src/views/externalReports/index.vue @@ -164,7 +164,7 @@ /> - + @@ -189,14 +189,14 @@ - + - + 0) { + let dateOne = moment(dateString[0]).format('YYYY-MM-DD') + let dateTwo = moment(dateString[1]).format('YYYY-MM-DD') + this.queryParams.uploadTime = [dateOne, dateTwo] + } else { + this.queryParams.uploadTime = [] + // this.queryParamOne[item + '_name'] = [] + } }, selectClear() { this.$refs.splitDetailTabel.selectedRowKeys = [] @@ -959,7 +968,7 @@ export default { if (this.menuId) { this.$refs.addModelRef.addModel() } else { - this.$message.warning(this.$t('selectDirectoryTerms')) + this.$message.warning(this.$t('selectDirectorylocation')) } }, diff --git a/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue b/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue index 5ef39eb9b..8c73836da 100644 --- a/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue +++ b/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue @@ -3,7 +3,7 @@
- {{$t('ParameteItemCollectionList')}}({{$t(this.$route.query.projectName)}}) — {{$t(this.paramsManifest.title)}} + {{$t('ParameteItemCollectionList')}}({{$t(this.$route.query.projectName)}}) — {{$t(this.$route.query.title)}}
@@ -648,7 +648,6 @@ mounted() { this.GetgetLoginUserType() console.log(this.currentPersonRole) - this.LoginUserType() setTimeout(() => { if (this.currentPersonRole == 'dre') { this.handlePreservation() @@ -1035,12 +1034,12 @@ this.currentPersonRole = currentPersonRole || userType || val[0].value } this.RoleType = val - this.formInlineRoleSwitching.roleSwitchingCode = currentPersonRole || userType || val[0].value - val.forEach((item,index) => { + this.RoleType.forEach((item,index) => { if(item.value == this.currentPersonRole){ this.rolename = item.label } }) + this.formInlineRoleSwitching.roleSwitchingCode = currentPersonRole || userType || val[0].value this.formInlineRoleSwitching = { ...this.formInlineRoleSwitching } }, // 表格所选中得行内容