diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index 47e57ad62..91621e96a 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -401,7 +401,7 @@ module.exports = { NewLabelItem: 'New label item', NodeQuickLookup: 'Node quick lookup', AreAllLabelsRead: 'Are all labels read', - AllLabelsRead: 'All labels read', + AllLabelsRead: 'labels read', SubscriptionNotification: 'Subscription notification', warningInformation: 'warning information', ForwardPush: 'Forward push', @@ -416,4 +416,17 @@ module.exports = { PersonnelSelection:'Personnel selection', EmployeeNumber:'Employee number', EmployeeType:'Employee type', + LabeItemName:'Label item name', + PleaseEnterLabelName:'Please enter label name', + DisplayArea:'Display area', + ChineseName:'Chinese name', + AttributeType:'Attribute type', + FieldLength:'Field length', + DisplayOrder:'Display order', + LabelName:'Label name', + LabelType:'Label type', + PleaseSelectLabelType:'Please select a label type', + PleaseEnterDescription:'Please enter a description', + LengthBe1to100:'Length should be 1 to 100', + } \ 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 a6599ed7a..29d0eb40c 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -405,7 +405,7 @@ module.exports = { NewLabelItem:'新增标签项', NodeQuickLookup:'节点快速查找', AreAllLabelsRead:'是否全部标记已读', - AllLabelsRead:'全部标记已读', + AllLabelsRead:'标记已读', SubscriptionNotification:'订阅通知', warningInformation:'预警信息', ForwardPush:'转发推送', @@ -420,4 +420,16 @@ module.exports = { PersonnelSelection:'人员选择', EmployeeNumber:'员工号', EmployeeType:'员工类型', + LabeItemName:'标签项名称', + PleaseEnterLabelName:'请输入标签名称', + DisplayArea:'展示区域', + ChineseName:'中文名称', + AttributeType:'属性类型', + FieldLength:'字段长度', + DisplayOrder:'展示顺序', + LabelName:'标签名称', + LabelType:'标签类型', + PleaseSelectLabelType:'请选择标签类型', + PleaseEnterDescription:'请输入描述', + LengthBe1to100:'长度应为1到100', } \ No newline at end of file diff --git a/jero-web/src/components/layouts/Tabcrumbs.vue b/jero-web/src/components/layouts/Tabcrumbs.vue index eccedcb5c..99a39c46d 100644 --- a/jero-web/src/components/layouts/Tabcrumbs.vue +++ b/jero-web/src/components/layouts/Tabcrumbs.vue @@ -26,6 +26,7 @@ }, watch: { '$route': function(val) { + console.log(val) if (val.meta.title == '首页') { this.Navigation = val.meta.title this.subNavigation = null diff --git a/jero-web/src/views/documentManage/ocr/modules/docTable.vue b/jero-web/src/views/documentManage/ocr/modules/docTable.vue index 7a92fd11d..845cff341 100644 --- a/jero-web/src/views/documentManage/ocr/modules/docTable.vue +++ b/jero-web/src/views/documentManage/ocr/modules/docTable.vue @@ -2,7 +2,7 @@
- - + + + + @@ -152,6 +154,9 @@ }, submitEdit:{ type:String + }, + type:{ + type:String } }, data () { @@ -217,11 +222,27 @@ //展示区域选项内容 areaOptions:[], //选项内容选项 - contentOption:[] + contentOption:[], + contentFlag:3, + contentOption1:[], + contentOption2:[] } }, watch:{ + 'form.fieldShowType'(val){ + // this.contentFlag=val + if(val==0){ + this.contentOption=[...this.contentOption2] + // console.log('ops11',this.contentOption) + }else{ + this.contentOption=[...this.contentOption1] + // console.log('ops22',this.contentOption) + } + // console.log('val',val) + }, + contentOption(){ + } }, computed: { changeType(val){ @@ -261,7 +282,16 @@ let params = {}; getAction(`sys/dict/queryDictName`,params).then((res)=>{ if(res.success){ - this.contentOption=res.result + let data=[...res.result] + this.contentOption1=[] + this.contentOption2=[] + data.map(res=>{ + if(res.attributeType=='1'){ + this.contentOption1.push(res) + }else if(res.attributeType=='2'){ + this.contentOption2.push(res) + } + }) } }); }, diff --git a/jero-web/src/views/documentManage/tags/dialog/dicList.vue b/jero-web/src/views/documentManage/tags/dialog/dicList.vue index bc644ce48..7132f9e5d 100644 --- a/jero-web/src/views/documentManage/tags/dialog/dicList.vue +++ b/jero-web/src/views/documentManage/tags/dialog/dicList.vue @@ -37,15 +37,18 @@ :wrapper-col="wrapperCol" > - - + + + + + - + {{item.name}} @@ -99,10 +102,14 @@ form:{}, newVisible:false, rules:{ - itemText:[ + name:[ { required: true, message: '请输入名称', trigger: 'blur' }, { min:1, max: 30, message: '长度在 1 - 30字符', trigger: 'blur' }, ], + itemValue:[ + { required: true, message: '请输入数据值', trigger: 'blur' }, + { min:1, max: 30, message: '长度在 1 - 30字符', trigger: 'blur' }, + ], enName:[ { required: true, message: '请输入英文名称', trigger: 'blur' }, { min:1, max: 100, message: '长度在 1 - 100字符', trigger: 'blur' }, @@ -160,6 +167,7 @@ total:0, isEdit:false, selectedIds:[], //树形选中的id + parentData:[] } }, watch: { @@ -169,13 +177,8 @@ }, mounted() { this.loadData() - this.getParents() }, methods:{ - //获取父级列表 - getParents(){ - - }, //获取列表数据 loadData(){ this.dataFlag=false @@ -191,7 +194,6 @@ this.tableData=[...res.result.records] this.dataFlag=true } - }) }else if(this.dictVal=='tree'){ getAction(`sys/category/queryBySysDictId`,{ @@ -200,17 +202,27 @@ isTagDict:1 }).then(res=>{ let parentNode=[] - this.tabletreeData=[...res.result] - let data = this.toTree(this.tabletreeData) + let tabletreeData=[...res.result] + let data = this.toTree(tabletreeData) this.tabletreeData=data + this.parentData=this.getParents(tabletreeData) this.dataFlag=true }) } }, + //获取父级名称 + getParents(data){ + let parents=[] + data.forEach((item)=>{ + if(item.pid=='0'){ + parents.push(item) + } + }) + return parents + }, //将数据拼成树形结构 toTree(config) { - // 删除 所有 children,以防止多次调用 config.forEach(function(item) { delete item.children; }); @@ -340,6 +352,9 @@ this.title=this.$t('edit') this.isEdit=true this.form={...form} + if(form.pid=='0'){ + this.form.pid='' + } this.newVisible=val this.parentVisible=true }, diff --git a/jero-web/src/views/documentManage/tags/dialog/newDrawer.vue b/jero-web/src/views/documentManage/tags/dialog/newDrawer.vue index 9fbbe6c98..6f08cd292 100644 --- a/jero-web/src/views/documentManage/tags/dialog/newDrawer.vue +++ b/jero-web/src/views/documentManage/tags/dialog/newDrawer.vue @@ -1,6 +1,6 @@ - + {{$t('add')}}
@@ -43,7 +43,7 @@ - + @@ -54,9 +54,9 @@ - - - + + + @@ -88,70 +88,41 @@ isTagContent:false, editData:{}, //编辑的数据 editFlag:true, - areas:[ - { - value: 1, - label:'基本信息' - }, - { - value:2, - label:'文本信息' - } - ], + areas:[], tableData:[], - taglab:[ - { - key: '1', - name: '编号', - englishName:'number', - type:'文本框', - length:100, - numberSort:1, - showArea:'文档库' - }, - { - key: '2', - name: '标题', - englishName:'title', - type:'下拉单选', - length:100, - numberSort:2, - showArea:'文档拆分' - }, - ], taglabColumns: [ { - title: '中文名称', + title: this.$t('ChineseName'), align: "center", width: 100, dataIndex: 'dbFieldTxt', }, { - title: '英文名称', + title: this.$t('enName'), align: "center", width: 100, dataIndex: 'dbFieldEnName', }, { - title: '属性类型', + title: this.$t('AttributeType'), align: "center", width: 100, dataIndex: 'fieldShowType_dictText', }, { - title: '字段长度', + title: this.$t('FieldLength'), align: "center", width: 80, dataIndex: 'dbLength' }, { - title: '展示顺序', + title: this.$t('DisplayOrder'), align: "center", width: 80, dataIndex: 'orderNum' }, { - title: '展示区域', + title: this.$t('DisplayArea'), align: "center", width: 80, dataIndex: 'showArea_dictText' @@ -164,41 +135,7 @@ width: 170 } ], - taglabSplit:[ - { - key: '1', - name: '编号', - englishName:'number', - }, - { - key: '2', - name: '标题', - englishName:'title', - }, - ], - tagSplit:[ - { - dataIndex: 'dbFieldName', - key: 'dbFieldName', - slots: { title: 'customTitle' }, - scopedSlots: { customRender: 'dbFieldName' }, - align: "center", - width: 100, - }, - { - title: '英文名称', - align: "center", - width: 100, - dataIndex: 'dbFieldEnName', - }, - { - title: this.$t('operation'), - dataIndex: 'action', - scopedSlots: {customRender: 'action'}, - align: "center", - width: 170 - } - ], + areaVisible:false, areaTable:[], areaTotal:0, @@ -207,13 +144,30 @@ editId:'', submitEdit:'add', key:1, - total:0 + total:0, + type:'input' } }, mounted() { this.loadData(1) + this.loadShowArea() + // this.getHeader() }, methods:{ + getHeader(){ + getAction(`tag/onlCgformArea/getHeader`,{flag:3}).then(res=>{ + + }) + }, + //获取展示区域 + loadShowArea(){ + let params = {}; + getAction(`tag/onlCgformArea/queryShowArea`,params).then((res)=>{ + if(res.success){ + this.areas=res.result + } + }); + }, searchQuery(){ if(this.key==1){ this.loadData(1) @@ -358,6 +312,7 @@ this.drawerVisible=true this.titleTag=this.$t('NewLabelItem') this.submitEdit='add' + this.type=val if(val=='input'){ this.typeVisible=false this.isTagContent=false diff --git a/jero-web/src/views/system/PermissionList.vue b/jero-web/src/views/system/PermissionList.vue index 3f782d524..b3034056f 100644 --- a/jero-web/src/views/system/PermissionList.vue +++ b/jero-web/src/views/system/PermissionList.vue @@ -3,24 +3,28 @@
- {{$t('add')}} - {{$t('BatchDelete')}} - +
+ + {{$t('add')}} +
+ + + + + + + +
-
- {{$t('selected')}} {{ - selectedRowKeys.length }}{{$t('term')}} - {{$t('empty')}} -
+ + + + + + + {{$t('user')}} + + + + + {{$t('more')}} + + + + {{$t('toGrantAuthorization')}} + + + {{$t('edit')}} + + + + {{$t('delete')}} + + + + +
@@ -144,13 +167,14 @@ customRender: (text) => { return moment(text).format('YYYY-MM-DD') } + }, + { + title: this.$t('operation'), + width: 100, + dataIndex: 'action', + align: 'center', + scopedSlots: { customRender: 'action' } } - // { - // title: this.$t('operation'), - // dataIndex: 'action', - // align: 'center', - // scopedSlots: { customRender: 'action' } - // } ], // 高级查询拼接条件 superQueryMatchType2: 'and', diff --git a/jero-web/src/views/system/UserList.vue b/jero-web/src/views/system/UserList.vue index 436f5110b..27ed6bb15 100644 --- a/jero-web/src/views/system/UserList.vue +++ b/jero-web/src/views/system/UserList.vue @@ -68,7 +68,11 @@
- +
+ + {{$t('addUser')}} +
+ diff --git a/jero-web/src/views/system/modules/DeptUserInfo.vue b/jero-web/src/views/system/modules/DeptUserInfo.vue index 4b8a46f6b..4f05b219b 100644 --- a/jero-web/src/views/system/modules/DeptUserInfo.vue +++ b/jero-web/src/views/system/modules/DeptUserInfo.vue @@ -7,7 +7,7 @@ - + @@ -165,6 +165,9 @@ this.queryParam = {} this.loadDataIndex(1); }, + searchQuery(){ + this.loadDataIndex(1); + }, loadData(){}, loadDataIndex(arg) { if (!this.url.list) {