diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index 91621e96a..e5430aed3 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -398,7 +398,8 @@ module.exports = { InputBoxType: 'Input box type', DropDownType: 'Drop down type', ExhibitionAreaManagement: 'Exhibition area management', - NewLabelItem: 'New label item', + NewLabelItem: 'Add label item', + editLabelItem:'Edit label item', NodeQuickLookup: 'Node quick lookup', AreAllLabelsRead: 'Are all labels read', AllLabelsRead: 'labels read', @@ -428,5 +429,38 @@ module.exports = { PleaseSelectLabelType:'Please select a label type', PleaseEnterDescription:'Please enter a description', LengthBe1to100:'Length should be 1 to 100', + Module:'Module', + PleaseSelectModule:'Please select the module', + AttributeName:'Attribute name', + PleaseEnterPropertyName:'Please enter a property name', + PleaseEnterYourEnglishName:'Please enter your English name', + PleaseSelectAttributeType:'Please select an attribute type', + OptionContent:'Option content', + PleaseSelectOptionContent:'Please select the option content', + PleaseEnterFieldLength:'Please enter the field length', + DisplayOrder:'Display order', + PleaseEnterDisplayOrder:'Please enter the display order', + Required:'Required', + DocumentLibraryModuleDisplay:'Document library module display', + DocumentLibraryListDisplay:'Document library list display', + SelectWhetherDisplayList:'Please select whether to display the document library list', + SelectDisplayArea:'Please select a display area', + Search:'Search', + SelectWhetherToSearch:'Please select whether to search', + DisplayOtherModules:'Display of other modules', + RegulationsListDisplay:'Regulations list display', + selectDisplayListRegulations:'Please select whether to display the list of regulations', + SearchCenterDisplay:'Search center display', + selectSearchCenterDisplayed:'Please select whether the search center is displayed', + selectWhetherRequired:'Please select whether it is required', + SortNumber:'Sort number', + enterDisplayArea:'Please enter the display area', + charactersLength:'1 - 50 characters in length', + enterSortingNumber:'Please enter the sorting number', + ParentName:'Parent name', + charactersLength130:'1 - 30 characters in length', + charactersLength1to300 :'1 - 300 characters in length', + OnlyOneSelected:'Only one piece of data can be selected', + OnlyPDF:'Only PDF files can be imported', } \ 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 29d0eb40c..143cc201b 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -403,6 +403,7 @@ module.exports = { DropDownType:'下拉选类型', ExhibitionAreaManagement:'展示区域管理', NewLabelItem:'新增标签项', + editLabelItem:'编辑标签项', NodeQuickLookup:'节点快速查找', AreAllLabelsRead:'是否全部标记已读', AllLabelsRead:'标记已读', @@ -431,5 +432,39 @@ module.exports = { LabelType:'标签类型', PleaseSelectLabelType:'请选择标签类型', PleaseEnterDescription:'请输入描述', - LengthBe1to100:'长度应为1到100', + LengthBe1to100:'长度在 1 - 100字符', + Module:'所属模块', + PleaseSelectModule:'请选择所属模块', + AttributeName:'属性名称', + PleaseEnterPropertyName:'请输入属性名称', + PleaseEnterYourEnglishName:'请输入英文名称', + PleaseSelectAttributeType:'请选择属性类型', + OptionContent:'选项内容', + PleaseSelectOptionContent:'请选择选项内容', + PleaseEnterFieldLength:'请输入字段长度', + DisplayOrder:'展示顺序', + PleaseEnterDisplayOrder:'请输入展示顺序', + Required:'是否必填', + DocumentLibraryModuleDisplay:'文档库模块展示', + DocumentLibraryListDisplay:'文档库列表展示', + SelectWhetherDisplayList:'请选择是否文档库列表展示', + SelectDisplayArea:'请选择展示区域', + Search:'是否搜索', + SelectWhetherToSearch:'请选择是否搜索', + DisplayOtherModules:'其它模块展示', + RegulationsListDisplay:'法规清单展示', + selectDisplayListRegulations:'请选择法规清单是否展示', + SearchCenterDisplay:'搜索中心展示', + selectSearchCenterDisplayed:'请选择搜索中心是否展示', + selectWhetherRequired:'请选择是否必填', + SortNumber:'排序号', + enterDisplayArea:'请输入展示区域', + charactersLength:'长度在 1 - 50字符', + enterSortingNumber:'请输入排序号', + ParentName:'父级名称', + charactersLength130:'长度在 1 - 30字符', + charactersLength1to300:'长度在 1 - 300字符', + OnlyOneSelected:'只能选择一条数据', + OnlyPDF:'只能导入pdf文件', + } \ No newline at end of file diff --git a/jero-web/src/views/documentManage/collection/index.vue b/jero-web/src/views/documentManage/collection/index.vue index ce0643465..fe9d51609 100644 --- a/jero-web/src/views/documentManage/collection/index.vue +++ b/jero-web/src/views/documentManage/collection/index.vue @@ -183,12 +183,12 @@ async () => { deleteAction(`collection/onlCgformCollection/deleteBatch`,params).then(res=> { if(res.success){ - this.$message.success(res.message) + this.$message.success(this.$t('OperationSuccessful')) eventBUs.$emit('searchReset') // this.selectedRowKeys = [] // this.loadData() }else{ - this.$message.warning(res.message) + this.$message.warning(this.$t('operationFailed')) } }) }, @@ -210,11 +210,11 @@ async () => { deleteAction(`collection/onlCgformCollection/delete`,params).then(res=> { if(res.success){ - this.$message.success(res.message) + this.$message.success(this.$t('OperationSuccessful')) eventBUs.$emit('searchReset') // this.loadData() }else{ - this.$message.warning(res.message) + this.$message.warning(this.$t('operationFailed')) } }) }, diff --git a/jero-web/src/views/documentManage/ocr/index.vue b/jero-web/src/views/documentManage/ocr/index.vue index ca7ce1fca..22a33ce1a 100644 --- a/jero-web/src/views/documentManage/ocr/index.vue +++ b/jero-web/src/views/documentManage/ocr/index.vue @@ -195,10 +195,10 @@ async () => { deleteAction(`ocr/ocrRecord/deleteBatch`, param).then(res => { if (res.success) { - this.$message.success(res.result) + this.$message.success(this.$t('OperationSuccessful')) eventBUs.$emit('searchReset') }else{ - this.$message.warning(res.message) + this.$message.warning(this.$t('operationFailed')) } }) }, @@ -244,10 +244,10 @@ async () => { deleteAction(`ocr/ocrRecord/delete`,params).then(res=> { if(res.success){ - this.$message.success(res.result) + this.$message.success(this.$t('OperationSuccessful')) eventBUs.$emit('searchReset') }else{ - this.$message.warning(res.message) + this.$message.warning(this.$t('operationFailed')) } }) }, @@ -291,10 +291,10 @@ postAction(`ocr/ocrRecord/syncToDocument`,params).then(res=>{ if(res.success){ eventBUs.$emit('searchReset') - this.$message.success(res.message) + this.$message.success(this.$t('OperationSuccessful')) this.toVisible=false }else{ - this.$message.warning(res.message) + this.$message.warning(this.$t('operationFailed')) } }) }, diff --git a/jero-web/src/views/documentManage/ocr/modules/addForm.vue b/jero-web/src/views/documentManage/ocr/modules/addForm.vue deleted file mode 100644 index e1bd8b16a..000000000 --- a/jero-web/src/views/documentManage/ocr/modules/addForm.vue +++ /dev/null @@ -1,11 +0,0 @@ - - - \ No newline at end of file diff --git a/jero-web/src/views/documentManage/ocr/modules/docTable.vue b/jero-web/src/views/documentManage/ocr/modules/docTable.vue index 845cff341..f080108d7 100644 --- a/jero-web/src/views/documentManage/ocr/modules/docTable.vue +++ b/jero-web/src/views/documentManage/ocr/modules/docTable.vue @@ -162,7 +162,7 @@ }, onSelectChange(rowKeys,rows){ if(rowKeys.length>1){ - this.$message.warning('只能选择一条数据') + this.$message.warning(this.$t('OnlyOneSelected')) }else{ this.rowId=rowKeys[0] this.rows=rows[0] @@ -181,7 +181,7 @@ //导入按钮 tableExport(){ if(this.rows.length>1){ - this.$message.warning('只能选择一条数据') + this.$message.warning(this.$t('OnlyOneSelected')) }else { if(this.rows.file_name){ let name = this.rows.file_name.split('.') @@ -207,15 +207,15 @@ } postAction(`ocr/OcrRestful/addOcrRecord`, params).then(res => { if (res.success) { - this.$message.success(res.message) + this.$message.success(this.$t('OperationSuccessful')) eventBUs.$emit('searchReset') } else { - this.$message.warning(res.message) + this.$message.warning(this.$t('operationFailed')) } }) // this.$emit('exportVisible',true) }else{ - this.$message.warning('只能导入pdf文件') + this.$message.warning(this.$t('OnlyPDF')) } } diff --git a/jero-web/src/views/documentManage/subscribtion/index.vue b/jero-web/src/views/documentManage/subscribtion/index.vue index b2d982591..37ecdc82c 100644 --- a/jero-web/src/views/documentManage/subscribtion/index.vue +++ b/jero-web/src/views/documentManage/subscribtion/index.vue @@ -195,12 +195,12 @@ async () => { deleteAction(`subscribe/onlCgformSubscribe/deleteBatch`,params).then(res=> { if(res.success){ - this.$message.success(res.message) + this.$message.success(this.$t('OperationSuccessful')) eventBUs.$emit('searchReset') // this.selectedRowKeys = [] // this.loadData() }else{ - this.$message.warning(res.message) + this.$message.warning(this.$t('operationFailed')) } }) }, @@ -222,11 +222,11 @@ async () => { deleteAction(`subscribe/onlCgformSubscribe/delete`,params).then(res=> { if(res.success){ - this.$message.success(res.message) + this.$message.success(this.$t('OperationSuccessful')) eventBUs.$emit('searchReset') // this.loadData() }else{ - this.$message.warning(res.message) + this.$message.warning(this.$t('operationFailed')) } }) }, diff --git a/jero-web/src/views/documentManage/subscribtion/module/subArea.vue b/jero-web/src/views/documentManage/subscribtion/module/subArea.vue index 2d61ffcb1..dfd5e5859 100644 --- a/jero-web/src/views/documentManage/subscribtion/module/subArea.vue +++ b/jero-web/src/views/documentManage/subscribtion/module/subArea.vue @@ -115,9 +115,9 @@ postAction(`domain/domainUserRel/insert`,params).then(res=>{ if(res.success){ this.$emit('visible',false) - this.$message.success(res.result) + this.$message.success(this.$t('OperationSuccessful')) }else{ - this.$message.warning(res.message) + this.$message.warning(this.$t('operationFailed')) } }) }, diff --git a/jero-web/src/views/documentManage/tags/dialog/OnlCgformTagForm.vue b/jero-web/src/views/documentManage/tags/dialog/OnlCgformTagForm.vue index d5c5d1871..2b3b42867 100644 --- a/jero-web/src/views/documentManage/tags/dialog/OnlCgformTagForm.vue +++ b/jero-web/src/views/documentManage/tags/dialog/OnlCgformTagForm.vue @@ -12,33 +12,37 @@ :wrapper-col="wrapperCol" > -

基本信息

+

{{$t('essentialInformation')}}

+ - - + + + - - + + + - - + + + - - + + - - + + {{item.dictName}} @@ -47,32 +51,33 @@ - - + + - - + + - - + + -

文档库模块展示

+

{{$t('DocumentLibraryModuleDisplay')}}

- - + + - - + + {{item.showArea}} @@ -81,21 +86,21 @@ - - + + -

其它模块展示

+

{{$t('DisplayOtherModules')}}

- - + + - - + + @@ -138,10 +143,6 @@ default: false, required: false }, - isTagContent:{ - type: Boolean, - default: false, - }, drawerVisible:{ type: Boolean, default: false, @@ -155,9 +156,6 @@ submitEdit:{ type:String }, - type:{ - type:String - } }, data () { return { @@ -165,7 +163,7 @@ model: {}, labelCol: { xs: { span: 24 }, - sm: { span: 5 }, + sm: { span: 6 }, }, wrapperCol: { xs: { span: 24 }, @@ -174,43 +172,43 @@ confirmLoading: false, validatorRules: { isModel: [ - { required: true, message: '请输入所属模块!',trigger: 'change'}, + { required: true, message: this.$t('PleaseSelectModule'),trigger: 'change'}, ], dbFieldTxt: [ - { required: true, message: '请输入属性名称!',trigger: 'blur'}, + { required: true, message: this.$t('PleaseEnterPropertyName'),trigger: 'blur'}, ], dbFieldName: [ - { required: true, message: '请输入英文名称!',trigger: 'blur'}, + { required: true, message: this.$t('PleaseEnterYourEnglishName'),trigger: 'blur'}, ], fieldShowType: [ - { required: true, message: '请输入属性类型!',trigger: 'change'}, + { required: true, message: this.$t('PleaseSelectAttributeType'),trigger: 'change'}, ], dictName: [ - { required: true, message: '请输入选项内容!',trigger: 'change'}, + { required: true, message: this.$t('PleaseSelectOptionContent'),trigger: 'change'}, ], dbLength: [ - { required: true, message: '请输入字段长度!',trigger: 'blur'}, + { required: true, message: this.$t('PleaseEnterFieldLength'),trigger: 'blur'}, ], orderNum: [ - { required: true, message: '请输入展示顺序!',trigger: 'blur'}, + { required: true, message: this.$t('PleaseEnterDisplayOrder'),trigger: 'blur'}, ], fieldMustInput: [ - { required: true, message: '请输入字段是否必填!',trigger: 'change'}, + { required: true, message: this.$t('selectWhetherRequired'),trigger: 'change'}, ], isShowForm: [ - { required: true, message: '请选择是否显示文档库列表',trigger: 'change'}, + { required: true, message: this.$t('SelectWhetherDisplayList'),trigger: 'change'}, ], areaId: [ - { required: true, message: '请输入展示区域!',trigger: 'change'}, + { required: true, message: this.$t('SelectDisplayArea'),trigger: 'change'}, ], isQuery: [ - { required: true, message: '请输入是否查询条件',trigger: 'change'}, + { required: true, message: this.$t('SelectWhetherToSearch'),trigger: 'change'}, ], isShowLawsList: [ - { required: true, message: '请选择法规清单是否展示!',trigger: 'change'}, + { required: true, message: this.$t('selectDisplayListRegulations'),trigger: 'change'}, ], isShowSearch: [ - { required: true, message: '请选择搜索中心是否展示!',trigger: 'change'}, + { required: true, message: this.$t('selectSearchCenterDisplayed'),trigger: 'change'}, ], }, addVisible:false, @@ -225,7 +223,8 @@ contentOption:[], contentFlag:3, contentOption1:[], - contentOption2:[] + contentOption2:[], + isTagContent:false, } }, watch:{ @@ -233,12 +232,13 @@ // this.contentFlag=val if(val==0){ this.contentOption=[...this.contentOption2] - // console.log('ops11',this.contentOption) - }else{ + this.isTagContent=true + }else if(val==3||val==4){ this.contentOption=[...this.contentOption1] - // console.log('ops22',this.contentOption) + this.isTagContent=true + }else{ + this.isTagContent=false } - // console.log('val',val) }, contentOption(){ @@ -348,16 +348,18 @@ this.form.id=this.editId } - + this.form.dbIsKey='0' + this.form.dbIsNull='1' + this.form.dbPointLength='0' // let formData = Object.assign(this.editId, this.form); // console.log("表单提交数据",this.form) httpAction(httpurl,this.form,method).then((res)=>{ if(res.success){ - this.$message.success(res.message); + this.$message.success(this.$t('OperationSuccessful')); this.$emit('ok',false); }else{ - this.$message.warning(res.message); + this.$message.warning(this.$t('operationFailed')); } }).finally(() => { this.confirmLoading = false; diff --git a/jero-web/src/views/documentManage/tags/dialog/areaManage.vue b/jero-web/src/views/documentManage/tags/dialog/areaManage.vue index 1bc11b275..60e60503c 100644 --- a/jero-web/src/views/documentManage/tags/dialog/areaManage.vue +++ b/jero-web/src/views/documentManage/tags/dialog/areaManage.vue @@ -16,10 +16,10 @@ :label-col="labelCol" :wrapper-col="wrapperCol" > - - + + - + - + - + {{ text }} - 属性名称 - 编辑 + {{$t('edit')}} - 删除 + {{$t('delete')}}
{ if(res.success){ - this.$message.success(res.result); + this.$message.success(this.$t('OperationSuccessful')); this.loadData() this.form={ isModel:'', @@ -217,13 +218,15 @@ enName:'', sort:'' } + }else{ + this.$message.warning(this.$t('operationFailed')) } }); }else{ //新增 postAction(`/tag/onlCgformArea/add`,this.form).then(res=>{ if(res.success){ - this.$message.success( res.result,); + this.$message.success( this.$t('OperationSuccessful')); this.loadData() this.form={ isModel:'', @@ -231,6 +234,9 @@ enName:'', sort:'' } + }else{ + this.$message.warning(this.$t('operationFailed')) + } } ) @@ -256,10 +262,10 @@ async () => { deleteAction(`tag/onlCgformArea/delete`, { id: val }).then((res) => { if (res.success) { - this.$message.success(res.result); + this.$message.success(this.$t('OperationSuccessful')); this.loadData() }else{ - this.$message.warning(res.message); + this.$message.warning(this.$t('operationFailed')); } }) } diff --git a/jero-web/src/views/documentManage/tags/dialog/dicList.vue b/jero-web/src/views/documentManage/tags/dialog/dicList.vue index 7132f9e5d..8a9f14142 100644 --- a/jero-web/src/views/documentManage/tags/dialog/dicList.vue +++ b/jero-web/src/views/documentManage/tags/dialog/dicList.vue @@ -3,13 +3,13 @@
- - + +
- 查询 - 重置 + {{$t('query')}} + {{$t('reset')}}
@@ -26,7 +26,7 @@
- + - - + + - - + + - - + + - - + + {{item.name}} @@ -65,8 +64,8 @@ - - + + @@ -93,8 +92,8 @@ data(){ return{ title:this.$t('add'), - labelCol: { span: 4 }, - wrapperCol: { span: 18 }, + labelCol: { span: 6 }, + wrapperCol: { span: 16 }, queryParams:{ pageNo:1, pageSize:10 @@ -103,65 +102,26 @@ newVisible:false, rules:{ name:[ - { required: true, message: '请输入名称', trigger: 'blur' }, - { min:1, max: 30, message: '长度在 1 - 30字符', trigger: 'blur' }, + { required: true, message: this.$t('enterName'), trigger: 'blur' }, + { min:1, max: 30, message: this.$t('charactersLength130'), trigger: 'blur' }, ], itemValue:[ - { required: true, message: '请输入数据值', trigger: 'blur' }, - { min:1, max: 30, message: '长度在 1 - 30字符', trigger: 'blur' }, + { required: true, message: this.$t('enterDataValue'), trigger: 'blur' }, + { min:1, max: 30, message: this.$t('charactersLength130'), trigger: 'blur' }, ], enName:[ - { required: true, message: '请输入英文名称', trigger: 'blur' }, - { min:1, max: 100, message: '长度在 1 - 100字符', trigger: 'blur' }, + { required: true, message: this.$t('PleaseEnterYourEnglishName'), trigger: 'blur' }, + { min:1, max: 100, message: this.$t('LengthBe1to100'), trigger: 'blur' }, ], description:[ - { required: true, message: '请输入描述', trigger: 'blur' }, - { min:1, max: 300, message: '长度在 1 - 300字符', trigger: 'blur' }, + { required: true, message: this.$t('PleaseEnterDescription'), trigger: 'blur' }, + { min:1, max: 300, message: this.$t('charactersLength1to300'), trigger: 'blur' }, ] }, - tableData:[ - { - key: '1', - name: '适用地区', - enName:'aaaaa', - describe:'单选', - }, - { - key: '2', - name: '类别', - enName:'bbbb', - describe:'单选', - }, - ], + tableData:[], tabletreeData:[], parentName:undefined, - treeData:[ - { - title: 'Node1', - value: '0-0', - key: '0-0', - children: [ - { - value: '0-0-1', - key: '0-0-1', - scopedSlots: { - // custom title - title: 'title', - }, - }, - { - title: 'Child Node2', - value: '0-0-2', - key: '0-0-2', - }, - ], - }, - { - title: 'Node2', - value: '0-1', - key: '0-1', - }, - ], + treeData:[], parentVisible:false, dataFlag:false, total:0, @@ -284,23 +244,23 @@ if (this.isEdit) { putAction(`sys/dictItem/edit`, params).then(res => { if (res.success) { - this.$message.success(res.message) + this.$message.success(this.$t('OperationSuccessful')) this.form={} this.loadData() this.newVisible = false } else { - this.$message.warning(res.message) + this.$message.warning(this.$t('operationFailed')) } }) } else { postAction(`sys/dictItem/add`, params).then(res => { if (res.success) { - this.$message.success(res.message) + this.$message.success(this.$t('OperationSuccessful')) this.form={} this.loadData() this.newVisible = false } else { - this.$message.warning(res.message) + this.$message.warning(this.$t('operationFailed')) } }) } @@ -312,24 +272,24 @@ if (this.isEdit) { putAction(`sys/category/edit`,params).then(res=>{ if(res.success){ - this.$message.success(res.message) + this.$message.success(this.$t('OperationSuccessful')) this.form={} this.loadData() this.newVisible = false }else { - this.$message.warning(res.message) + this.$message.warning(this.$t('operationFailed')) } }) }else{ //新增 postAction(`sys/category/add`, params).then(res => { if (res.success) { - this.$message.success(res.message) + this.$message.success(this.$t('OperationSuccessful')) this.form={} this.loadData() this.newVisible = false } else { - this.$message.warning(res.message) + this.$message.warning(this.$t('operationFailed')) } }) } @@ -370,10 +330,10 @@ async () => { deleteAction(`sys/dictItem/delete`, params).then(res => { if(res.success) { - this.$message.success(res.message); + this.$message.success(this.$t('OperationSuccessful')); this.loadData() }else{ - this.$message.warning(res.message); + this.$message.warning(this.$t('operationFailed')); } }) } @@ -400,9 +360,9 @@ deleteAction(`sys/category/deleteBatch`, params).then(res => { if(res.success){ this.loadData() - this.$message.success(res.message) + this.$message.success(this.$t('OperationSuccessful')) }else{ - this.$message.warning((res.message)) + this.$message.warning(this.$t('operationFailed')) } }) } diff --git a/jero-web/src/views/documentManage/tags/dialog/listTable.vue b/jero-web/src/views/documentManage/tags/dialog/listTable.vue index 31c077b75..8430780ac 100644 --- a/jero-web/src/views/documentManage/tags/dialog/listTable.vue +++ b/jero-web/src/views/documentManage/tags/dialog/listTable.vue @@ -3,13 +3,13 @@
- +
{{$t('preservation')}} @@ -31,7 +31,6 @@ editData:Object, editId:String, submitEdit:String, - type:String }, mounted() { this.visible=this.drawerVisible diff --git a/jero-web/src/views/documentManage/tags/dialog/treeTable.vue b/jero-web/src/views/documentManage/tags/dialog/treeTable.vue index e3b0f1032..e5c63e1c0 100644 --- a/jero-web/src/views/documentManage/tags/dialog/treeTable.vue +++ b/jero-web/src/views/documentManage/tags/dialog/treeTable.vue @@ -11,8 +11,8 @@ :row-selection="{selectedRowKeys: selectedRowKeys,onChange: onSelectChange, onSelectAll: onSelectAll, onSelect: onSelect, }" >
@@ -32,17 +32,17 @@ loading:false, columns: [ { - title: '名称', + title: this.$t('name'), dataIndex: 'name', key: 'name', }, { - title: '英文名称', + title: this.$t('enName'), dataIndex: 'enName', key: 'enName', }, { - title: '描述', + title: this.$t('describe'), dataIndex: 'description', key: 'description', }, @@ -115,10 +115,10 @@ async () => { deleteAction(`sys/category/delete`, { id: val.id }).then((res) => { if (res.success) { - this.$message.success(res.message); + this.$message.success(this.$t('OperationSuccessful')); this.$emit('ok') }else{ - this.$message.warning(res.message); + this.$message.warning(this.$t('operationFailed')); } }) } diff --git a/jero-web/src/views/documentManage/tags/tabs/tabTable.vue b/jero-web/src/views/documentManage/tags/tabs/tabTable.vue index e19ec7ce7..48c27d66d 100644 --- a/jero-web/src/views/documentManage/tags/tabs/tabTable.vue +++ b/jero-web/src/views/documentManage/tags/tabs/tabTable.vue @@ -64,7 +64,7 @@ }, editVisible(id){ - this.$emit('visibleEd',true,id,'编辑标签项') + this.$emit('visibleEd',true,id,this.$t('editLabelItem')) }, deleteVisible(id){ this.$emit('visibleDelete',id) diff --git a/jero-web/src/views/documentManage/tags/tabs/tagContent.vue b/jero-web/src/views/documentManage/tags/tabs/tagContent.vue index 056700e0a..a173ed3f0 100644 --- a/jero-web/src/views/documentManage/tags/tabs/tagContent.vue +++ b/jero-web/src/views/documentManage/tags/tabs/tagContent.vue @@ -205,10 +205,13 @@ params.isReadOnly=0 postAction(`sys/dict/add`,params).then(res=>{ if(res.success){ - this.$message.success( res.message) + this.$message.success( this.$t('OperationSuccessful')) this.loadData() this.contentVisible=false this.form={} + }else{ + this.$message.warning(this.$t('operationFailed')) + } }) }else if(this.isEdit==0){ @@ -217,10 +220,13 @@ // console.log('editparams',params) putAction(`sys/dict/edit`,params).then(res=>{ if(res.success){ - this.$message.success( res.message) + this.$message.success( this.$t('OperationSuccessful')) this.loadData() this.contentVisible=false this.form={} + }else{ + this.$message.warning(this.$t('operationFailed')) + } }) } @@ -250,10 +256,10 @@ async () => { deleteAction(`sys/dict/logicDelete`, param).then(res => { if (res.success) { - this.$message.success(res.message) + this.$message.success(this.$t('OperationSuccessful')) this.loadData() }else{ - this.$message.warning(res.message); + this.$message.warning(this.$t('operationFailed')); } }) } diff --git a/jero-web/src/views/documentManage/tags/tabs/tagItem.vue b/jero-web/src/views/documentManage/tags/tabs/tagItem.vue index 5831cb9f6..e8d461161 100644 --- a/jero-web/src/views/documentManage/tags/tabs/tagItem.vue +++ b/jero-web/src/views/documentManage/tags/tabs/tagItem.vue @@ -25,17 +25,9 @@
-
- - - +
+ {{$t('add')}} -
@@ -43,7 +35,7 @@
- + @@ -205,7 +197,7 @@ ...this.queryParam, isModel:1 } - console.log('params',params) + // console.log('params',params) if(val==1){ params.isModel=1 }else if(val==0){ @@ -258,7 +250,6 @@ this.titleTag=title this.editId=id this.submitEdit='edit' - let params={ id:id, } @@ -282,14 +273,14 @@ deleteAction(`tag/onlCgformTag/delete`, params).then(res => { if (res.success) { if (this.key == 1) { - this.$message.success(res.message) + this.$message.success(this.$t('OperationSuccessful')) this.loadData(1) } else if (this.key == 2) { - this.$message.success(res.message) + this.$message.success(this.$t('OperationSuccessful')) this.loadData(0) } }else{ - this.$message.warning(res.message) + this.$message.warning(this.$t('operationFailed')) } }) } @@ -312,7 +303,7 @@ this.drawerVisible=true this.titleTag=this.$t('NewLabelItem') this.submitEdit='add' - this.type=val + // this.type=val if(val=='input'){ this.typeVisible=false this.isTagContent=false