diff --git a/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/constant/enums/ModuleEnum.java b/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/constant/enums/ModuleEnum.java index 5067695ea..68acaa736 100644 --- a/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/constant/enums/ModuleEnum.java +++ b/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/constant/enums/ModuleEnum.java @@ -8,8 +8,6 @@ package com.jero.common.constant.enums; public enum ModuleEnum { DOCUMENT_LIBRARY("文档管理","1"), OCR_RECORD("OCR识别转换记录表","2"), - ONL_CGFORM_TAG("标签项管理","3"), - ONL_CGFORM_AREA("展示区域管理","4"), ONL_CGFORM_COLLECTION("我的收藏","5"), ONL_CGFORM_SUBSCRIBE("我的订阅","6"); diff --git a/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/mapper/xml/OnlCgformFieldMapper.xml b/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/mapper/xml/OnlCgformFieldMapper.xml index 3a47af5c3..203cd3de6 100644 --- a/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/mapper/xml/OnlCgformFieldMapper.xml +++ b/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/mapper/xml/OnlCgformFieldMapper.xml @@ -119,12 +119,13 @@ - + diff --git a/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/service/impl/OnlCgformFieldServiceImpl.java b/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/service/impl/OnlCgformFieldServiceImpl.java index 9a978c0c8..eb404ef40 100644 --- a/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/service/impl/OnlCgformFieldServiceImpl.java +++ b/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/service/impl/OnlCgformFieldServiceImpl.java @@ -818,10 +818,6 @@ public class OnlCgformFieldServiceImpl extends ServiceImpl logicDelete(@RequestParam(name="id",required=true) String id) { diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/controller/OnlCgformTagController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/controller/OnlCgformTagController.java index 412a72973..6a8fe50d8 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/controller/OnlCgformTagController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/controller/OnlCgformTagController.java @@ -9,6 +9,7 @@ import com.jero.modules.enums.FixedFieldEnum; import com.jero.modules.system.service.impl.SysDictItemServiceImpl; import com.jero.modules.tag.entity.OnlCgformArea; import com.jero.modules.tag.entity.OnlCgformTag; +import com.jero.modules.tag.enums.FileTableIdEnum; import com.jero.modules.tag.service.IOnlCgformTagService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -84,7 +85,7 @@ public class OnlCgformTagController extends JeroController add(@Validated @RequestBody OnlCgformTag onlCgformTag) { onlCgformTagService.add(onlCgformTag); - onlCgformApiController.h("48308196e7b04761b533dc31bc899707","normal"); + onlCgformApiController.h(String.valueOf(FileTableIdEnum.FILE_TABLE_ID),"normal"); return Result.OK("添加成功！"); } @@ -103,8 +104,7 @@ public class OnlCgformTagController extends JeroController deleteBatch(@RequestParam(name="ids",required=true) String ids) { OnlCgformTag onlCgformTag = onlCgformTagService.queryById(ids); if (FixedFieldEnum.FIXED_FIELD_ENUM.getValue().equals(onlCgformTag.getIsReadOnly()) || FixedFieldEnum.CONFIGURABLE_FIELD.getValue().equals(onlCgformTag.getIsReadOnly())) { - return Result.error("固定字段,不可删除"); + return Result.error("包含固定字段,不可删除"); }else { this.onlCgformTagService.deleteByIds(Arrays.asList(ids.split(","))); - //TODO 统一定义枚举或者统一常量形式并且加注释说明，不然ID写的太乱后期不好修改 - onlCgformApiController.h("48308196e7b04761b533dc31bc899707","normal"); + onlCgformApiController.h(String.valueOf(FileTableIdEnum.FILE_TABLE_ID),"normal"); return Result.OK("批量删除成功！"); } } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/enums/FileTableIdEnum.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/enums/FileTableIdEnum.java new file mode 100644 index 000000000..ac72688d4 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/enums/FileTableIdEnum.java @@ -0,0 +1,30 @@ +package com.jero.modules.tag.enums; + +public enum FileTableIdEnum { + FILE_TABLE_ID("文档库表id","48308196e7b04761b533dc31bc899707"), + ; + + String name; + String value; + + FileTableIdEnum(String name, String value) { + this.name = name; + this.value = value; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getValue() { + return value; + } + + public void setValue(String value) { + this.value = value; + } +} \ No newline at end of file diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/service/impl/OnlCgformAreaServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/service/impl/OnlCgformAreaServiceImpl.java index 0f72c375f..8004f3d89 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/service/impl/OnlCgformAreaServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/service/impl/OnlCgformAreaServiceImpl.java @@ -119,7 +119,6 @@ public class OnlCgformAreaServiceImpl extends ServiceImpl queryWrapper = new QueryWrapper<>(); if (CutEnum.CN.getValue().equals(cut)) { queryWrapper.select("id","show_area").orderByAsc("sort"); - System.out.println("QueryWrapper数据:"+queryWrapper); return list(queryWrapper); }else{ queryWrapper.select("id","en_name").orderByAsc("sort"); diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/service/impl/OnlCgformTagServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/service/impl/OnlCgformTagServiceImpl.java index 0d26416f1..277def50b 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/service/impl/OnlCgformTagServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/service/impl/OnlCgformTagServiceImpl.java @@ -8,13 +8,16 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.jero.common.constant.CommonConstant; import com.jero.common.constant.enums.CutEnum; +import com.jero.common.system.vo.LoginUser; import com.jero.generater.modules.online.cgform.service.impl.OnlCgformFieldServiceImpl; +import com.jero.modules.document.enums.FieldTypeEnum; import com.jero.modules.tag.entity.OnlCgformArea; import com.jero.modules.tag.entity.OnlCgformTag; import com.jero.modules.tag.mapper.OnlCgformTagMapper; import com.jero.modules.tag.service.IOnlCgformTagService; import com.jero.modules.utils.HanYuPinYinUtil; import org.apache.commons.lang3.StringUtils; +import org.apache.shiro.SecurityUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -55,21 +58,24 @@ public class OnlCgformTagServiceImpl extends ServiceImpl - - + + \ No newline at end of file diff --git a/jero-web/src/views/documentManage/splitting/index.vue b/jero-web/src/views/documentManage/splitting/index.vue index afc4bc800..b528e3fe8 100644 --- a/jero-web/src/views/documentManage/splitting/index.vue +++ b/jero-web/src/views/documentManage/splitting/index.vue @@ -2,7 +2,26 @@
- + + + + + + + + + + + + + + + {{$t('query')}} + {{$t('reset')}} + + + +
@@ -19,15 +38,34 @@
- + + + {{$t('backDocument')}} + {{$t('See')}} + {{$t('delete')}} + + +
+ +
@@ -57,29 +95,62 @@ return{ splitVisible:false, importsVisible:false, - OperationList: [ + selectedRowKeys:[], + loading:false, + total:0, + ids:[], + tableData:[ { - text: '回传至文档库', - ClickEvent: 'returnBack' - }, - { - text: '查看', - ClickEvent: 'seeTable' - }, - { - text: '删除', - ClickEvent: 'deleteTable' + dbFieldTxt_dictText:'11111', + dbFieldEnName_dictText:'aaaaa', + fieldShowType_dictText:'345435435', + dbLength_dictText:'et435344354', + orderNum_dictText:'dfgdrgd', + showAreaName:'sdfsdfsd', } ], - url: { - // tableHeader: 'document/bussDocumentLibraryEO/getHeader', //表格头部字段 - // seachList: 'document/bussDocumentLibraryEO/queryCondition', //搜索字段 - // tableList: 'document/bussDocumentLibraryEO/queryPageInfo', //表格数据 - // getAddForm: 'document/bussDocumentLibraryEO/getAddForm', // 表单的字段 - // addInfo: 'document/bussDocumentLibraryEO/addInfo', //新增 - // updateInfo: 'document/bussDocumentLibraryEO/updateInfo', //编辑 - // getDocumentInfo: 'document/bussDocumentLibraryEO/getDocumentInfoById', //查看 - // deleteBatch: 'document/bussDocumentLibraryEO/deleteBatch' //删除 + columns:[ + { + title: this.$t('standard'), + align: "center", + dataIndex: 'dbFieldTxt_dictText', + }, + { + title: this.$t('title'), + align: "center", + dataIndex: 'dbFieldEnName_dictText', + }, + { + title: this.$t('TextStatus'), + align: "center", + dataIndex: 'fieldShowType_dictText', + }, + { + title: this.$t('fileName'), + align: "center", + dataIndex: 'dbLength_dictText' + }, + { + title: this.$t('splitTime'), + align: "center", + dataIndex: 'orderNum_dictText' + }, + { + title: this.$t('splitResult'), + align: "center", + dataIndex: 'showAreaName' + }, + { + title: this.$t('operation'), + dataIndex: 'action', + scopedSlots: {customRender: 'action'}, + align: "center", + width: 170 + } + ], + queryParams:{ + pageNo:1, + pageSize:10 } } }, @@ -90,9 +161,26 @@ }, mounted() { - + this.loadData() }, methods:{ + //获取列表数据 + loadData(){ + this.loading=true + let params={ + ...this.queryParams + } + getAction(``,params).then(res=>{ + if(res.success){ + this.tableData=[...res.result.records] + this.loading=false + this.total=res.result.total + }else{ + this.loading=false + } + + }) + }, //拆分已入库文本 handleModule(){ this.splitVisible=true @@ -103,28 +191,46 @@ }, //批量删除 handleDel(){ + let params={ + ids:this.selectedRowKeys.join(',') + } + if(this.selectedRowKeys&&this.selectedRowKeys.length>0){ + this.$confirm({ + title: this.$t('ConfirmDelete'), + content: '', + onOk: + async () => { + deleteAction(``, params).then(res => { + if (res.success) { + this.$message.success(this.$t('OperationSuccessful')) + if(this.selectedRowKeys&&this.selectedRowKeys.length==this.tableData.length){ + this.queryParams.pageNo=this.queryParams.pageNo-1 + } + this.loadData() + }else{ + this.$message.warning(this.$t('operationFailed')) + } + }) + } - }, - //回传至文档库 - returnBack(val){ - console.log('val',val) - }, - //查看 - seeTable(){ - this.$router.push({ - path:'/docManage/splitting/splitDetail' - }) + }) + } + else{ + this.$message.warning(this.$t('selectLeastOne')) + } }, //删除 - deleteTable(val){ - let _this = this + deleteDetail(val){ this.$confirm({ content: '确认删除？', onOk() { - deleteAction(_this.url.deleteBatch, { ids: val.id }).then((res) => { + deleteAction(``, { id: val.id }).then((res) => { if (res.success) { - _this.$message.success(res.message) - eventBUs.$emit('searchReset') + this.$message.success(res.message) + if(this.tableData&&this.tableData.length==1){ + this.queryParams.pageNo=this.queryParams.pageNo-1 + } + this.loadData() } else { this.$message.warning(res.message) } @@ -137,7 +243,43 @@ }, iVisible(val){ this.importsVisible=val - } + }, + //查询 + searchQuery(){ + + }, + //清空 + searchReset(){ + + }, + onSelectChange(selKeys){ + this.selectedRowKeys=selKeys + }, + handleTableChange(){ + + }, + //点击页数 + onChangePage(page,pageSize){ + this.queryParams.pageNo = page + this.$emit('queryParams',this.queryParams) + }, + //一页显示条数 + SizeChange(page,pageSize){ + this.queryParams.pageSize = pageSize + this.$emit('queryParams',this.queryParams) + }, + //回传至文档库 + backDocument(val){ + + }, + //查看 + detail(val){ + this.$router.push({ + path:'/docManage/splitting/splitDetail', + query:val + }) + }, + } } @@ -146,12 +288,26 @@ @import '~@assets/less/common.less'; - \ No newline at end of file diff --git a/jero-web/src/views/documentManage/splitting/modules/imports.vue b/jero-web/src/views/documentManage/splitting/modules/imports.vue index 7a6d0fe50..c612a166b 100644 --- a/jero-web/src/views/documentManage/splitting/modules/imports.vue +++ b/jero-web/src/views/documentManage/splitting/modules/imports.vue @@ -2,7 +2,7 @@
- - + + - - + + {{$t('query')}} - 清空 + {{$t('reset')}} @@ -38,7 +38,7 @@
- + {{ (form.file === 'null' || form.file === '' || - form.file == null) ? '上传' : '查看已上传文件' + form.file == null) ? $t('upload1') : $t('viewUploadedFiles') }} - 模板下载 + {{$t('templateDownload')}}
- 保存 - 取消 + {{$t('preservation')}} + {{$t('cancel')}}
@@ -80,7 +80,7 @@ diff --git a/jero-web/src/views/documentManage/splitting/modules/split.vue b/jero-web/src/views/documentManage/splitting/modules/split.vue index c281c6c76..322dbb39b 100644 --- a/jero-web/src/views/documentManage/splitting/modules/split.vue +++ b/jero-web/src/views/documentManage/splitting/modules/split.vue @@ -2,7 +2,7 @@
- - - - - - - - + + + + + + + + {{$t('query')}} - 清空 + {{$t('reset')}} @@ -34,11 +34,11 @@
- +
- 拆分 - 取消 + {{$t('split')}} + {{$t('cancel')}}
@@ -64,7 +64,14 @@ data(){ return{ visible:false, - tableSource:[], //列表数据 + tableSource:[ + { + standNumber:'aaaa', + standName:'11111', + fileName:'234323', + fileType_dictText:'ewre', + } + ], //列表数据 selectedRowKeys:[], queryParams:{ pageNo:1, @@ -73,35 +80,33 @@ total:0, columns: [ { - title:'编号', + title:this.$t('standard'), key: 'standNumber', align:"center", dataIndex: 'standNumber', ellipsis: true, }, { - title:'标题', + title:this.$t('title'), key: 'standName', align:"center", dataIndex: 'standName', ellipsis: true, }, { - title:'文件名称', + title:this.$t('fileName'), key: 'fileName', align:"center", dataIndex: 'fileName', ellipsis: true, }, { - title:'文本状态', + title:this.$t('TextStatus'), key: 'fileType_dictText', align:"center", dataIndex: 'fileType_dictText', ellipsis: true, }, - - ] } }, @@ -158,6 +163,9 @@ .split-table-content{ .split-header{ margin-bottom: 20px; + .split-item{ + display: flex; + } } } diff --git a/jero-web/src/views/documentManage/splitting/modules/splitAddForm.vue b/jero-web/src/views/documentManage/splitting/modules/splitAddForm.vue index 2b23c059b..674f9507f 100644 --- a/jero-web/src/views/documentManage/splitting/modules/splitAddForm.vue +++ b/jero-web/src/views/documentManage/splitting/modules/splitAddForm.vue @@ -3,7 +3,7 @@
+ - - + + + - - + + + - - + + + - - + + + - - + + - 内容简介 + + {{$t('contentValidity')}}
- +
- 增加 - 删除 + {{$t('Add')}} + {{$t('delete')}}
- 保存 - 取消 + {{$t('preservation')}} + {{$t('cancel')}}
- - - - - - - - - + + + + + + + + + {{$t('query')}} {{ $t('reset') }} @@ -91,8 +91,8 @@
@@ -174,23 +174,19 @@ loading:false, columns: [ { - title: '条款号', + title: this.$t('clauseNo'), dataIndex: 'serialNumber', key: 'serialNumber', align: "center", - width: 80, - ellipsis: true, }, { - title: '条款名称', + title: this.$t('clauseName'), dataIndex: 'serialName', key: 'serialName', align: "center", - width: 80, - ellipsis: true, }, { - title: '条款内容', + title: this.$t('clauseContent'), dataIndex: 'serialContent', key: 'serialContent', align: "center", @@ -198,27 +194,23 @@ ellipsis: true, }, { - title: '功能领域', + title: this.$t('functionalAreas'), dataIndex: 'functionArea', key: 'functionArea', align: "center", - width: 80, - ellipsis: true, }, { - title: '技术领域', + title: this.$t('technicalField'), dataIndex: 'tecArea', key: 'tecArea', align: "center", - width: 80, - ellipsis: true, }, { title: this.$t('operation'), dataIndex: 'action', scopedSlots: {customRender: 'action'}, align: "center", - width: 80 + width: 120 } ], addVisible:false @@ -403,11 +395,20 @@ flex: 1; .split-detail-search-header{ margin-bottom: 20px; + .table-page-search-submitButtons{ + display: flex; + } } .split-detail-table{ .action-edit{ margin-right: 20px; } + .page{ + text-align: right; + } + } + .split-item{ + display: flex; } } .page{ @@ -415,4 +416,12 @@ } } } + + + \ No newline at end of file diff --git a/jero-web/src/views/documentManage/subscribtion/index.vue b/jero-web/src/views/documentManage/subscribtion/index.vue index 0ffa0967d..ef9cc03e9 100644 --- a/jero-web/src/views/documentManage/subscribtion/index.vue +++ b/jero-web/src/views/documentManage/subscribtion/index.vue @@ -17,16 +17,38 @@
- + + + {{record.serialNumber}} + + + {{record.title}} + + + {{$t('CancelCollection')}} + + +
+ +
@@ -56,29 +78,31 @@ //列表表头 columns: [ { - title: '编号', + title: this.$t('standard'), dataIndex: 'serialNumber', key: 'serialNumber', align: "center", width: 100, + scopedSlots: {customRender: 'serialNumber'}, ellipsis: true, }, { - title: '标题', + title: this.$t('title'), align: "center", width: 100, dataIndex: 'title', + scopedSlots: {customRender: 'serialtitle'}, ellipsis: true, }, { - title: '状态', + title: this.$t('status'), align: "center", width: 100, dataIndex: 'state', ellipsis: true, }, { - title: '订阅时间', + title: this.$t('subscriptionTime'), align: "center", width: 100, dataIndex: 'createTime', @@ -94,7 +118,7 @@ ], tableData:[], //列表数据 visible:false, - selecIds:'', + selecIds:[], loading:false, url:{ tableHeader: 'subscribe/onlCgformSubscribe/getHeader', //表格头部字段 @@ -136,20 +160,21 @@ //批量取消收藏 handleBatCancel(){ let params={ - ids:this.selecIds + ids:this.selecIds.join(',') } - if(this.selecIds){ + if(this.selecIds&&this.selecIds.length>0){ this.$confirm({ - title: '确认批量取消订阅?', + title: this.$t('confirmBulkUnsubscribe'), content: '', onOk: async () => { deleteAction(`subscribe/onlCgformSubscribe/deleteBatch`,params).then(res=> { if(res.success){ this.$message.success(this.$t('OperationSuccessful')) - eventBUs.$emit('searchReset') - // this.selectedRowKeys = [] - // this.loadData() + if(this.selecIds.length==this.tableData.length&&this.queryParams.pageNo!==1){ + this.queryParams.pageNo=this.queryParams.pageNo-1 + } + this.loadData() }else{ this.$message.warning(this.$t('operationFailed')) } @@ -158,24 +183,26 @@ onCancel() {}, }); }else{ - this.$message.warning('请选择至少一条数据') + this.$message.warning(this.$t('selectLeastOne')) } }, - //取消收藏 + //取消订阅 onCancel(record){ let params={ id:record.id } this.$confirm({ - title: '确认取消订阅?', + title: this.$t('unsubscribeConfirm'), content: '', onOk: async () => { deleteAction(`subscribe/onlCgformSubscribe/delete`,params).then(res=> { if(res.success){ this.$message.success(this.$t('OperationSuccessful')) - eventBUs.$emit('searchReset') - // this.loadData() + if(this.tableData.length==1&&this.queryParams.pageNo!==1){ + this.queryParams.pageNo=this.queryParams.pageNo-1 + } + this.loadData() }else{ this.$message.warning(this.$t('operationFailed')) } @@ -211,7 +238,7 @@ // ids.push(item.id) // }) // } - this.selecIds=rows.join(',') + this.selecIds=rows }, //点击编号 numberClick(records){ @@ -224,7 +251,8 @@ areaVisible(val){ this.visible=val }, - detailClick(item) { + //跳转详情 + onDetail(item) { let newUrl = this.$router.resolve({ path: '/docManage/library/detail', query: item @@ -242,6 +270,7 @@ } .page{ margin-top: 20px; + text-align: right; } } diff --git a/jero-web/src/views/documentManage/subscribtion/module/subArea.vue b/jero-web/src/views/documentManage/subscribtion/module/subArea.vue index 9bac951bd..4acb85d7c 100644 --- a/jero-web/src/views/documentManage/subscribtion/module/subArea.vue +++ b/jero-web/src/views/documentManage/subscribtion/module/subArea.vue @@ -76,13 +76,14 @@ getAction(`sys/category/getSysCategoryTree`,params).then(res=> { if(res.success){ this.data=[...res.result] - this.treeData=this.addAttr(this.data) + this.treeData=[...this.addAttr(this.data)] // console.log('treeData',this.treeData) } }) }, onSearch(){ - this.loadData() + // this.treeData=[] + // this.treeData=this.getSearch(this.data) }, //获取用户的订阅 getSubscribtion(){ @@ -95,7 +96,7 @@ }) this.checkedKeys=[...ids] // this.selectedKeys=this.checkedKeys - console.log('checkKeys',this.checkedKeys) + // console.log('checkKeys',this.checkedKeys) } }) }, @@ -103,9 +104,6 @@ if((Array.isArray(dataI)) && dataI.length>0){ dataI.forEach((item,index)=>{ this.$set(item,'key',item.id) - // if(item.title.indexOf(this.searchValue)!==-1){ - // console.log('item.title',item.title) - // } let arr = []; this.addAttr(item.children,arr); }); @@ -113,8 +111,24 @@ // console.log('dataI',dataI) return dataI }, + getSearch(dataI){ + let dataSearch=[] + console.log('tree',this.treeData,this.data) + if((Array.isArray(dataI)) && dataI.length>0){ + dataI.forEach((item,index)=>{ + this.$set(item,'key',item.id) + if(item.title.indexOf(this.searchValue)>-1){ + dataSearch.push(item) + } + let arr = []; + this.addAttr(item.children,arr); + }); + } + console.log('dataSearch',dataSearch) + return dataSearch + }, afterVisibleChange(val) { - console.log('visible', val); + // console.log('visible', val); }, handleOk(e) { this.confirmLoading = true; @@ -175,7 +189,7 @@ return null; }) .filter((item, i, self) => item && self.indexOf(item) === i); - console.log('item',item) + Object.assign(this, { expandedKeys, searchValue: value, diff --git a/jero-web/src/views/documentManage/tags/dialog/dicList.vue b/jero-web/src/views/documentManage/tags/dialog/dicList.vue index c060b1603..d56b33642 100644 --- a/jero-web/src/views/documentManage/tags/dialog/dicList.vue +++ b/jero-web/src/views/documentManage/tags/dialog/dicList.vue @@ -17,13 +17,13 @@ {{$t('add')}}
-
+
{{$t('BatchDelete')}}
- +
@@ -94,6 +94,7 @@ }, data(){ return{ + selected:[], title:this.$t('add'), labelCol: { span: 6 }, wrapperCol: { span: 16 }, @@ -256,64 +257,70 @@ }, //保存 hideModal(){ - if(this.dictVal=='list') { - let params = { - ...this.form, - dictId: this.record.id - } - if (this.isEdit) { - putAction(`sys/dictItem/edit`, params).then(res => { - if (res.success) { - this.$message.success(this.$t('OperationSuccessful')) - this.form={} - this.loadData() - this.newVisible = false + + this.$refs.ruleForm.validate(valid => { + if (valid) { + if(this.dictVal=='list') { + let params = { + ...this.form, + dictId: this.record.id + } + if (this.isEdit) { + putAction(`sys/dictItem/edit`, params).then(res => { + if (res.success) { + this.$message.success(this.$t('OperationSuccessful')) + this.form = {} + this.loadData() + this.newVisible = false + } else { + this.$message.warning(this.$t('operationFailed')) + } + }) } else { - this.$message.warning(this.$t('operationFailed')) + postAction(`sys/dictItem/add`, params).then(res => { + if (res.success) { + this.$message.success(this.$t('OperationSuccessful')) + this.form = {} + this.loadData() + this.newVisible = false + } else { + this.$message.warning(this.$t('operationFailed')) + } + }) } - }) - } else { - postAction(`sys/dictItem/add`, params).then(res => { - if (res.success) { - this.$message.success(this.$t('OperationSuccessful')) - this.form={} - this.loadData() - this.newVisible = false + } else if (this.dictVal == 'tree') { + console.log('tree1111') + let params = { + ...this.form, + sysDictId: this.record.id + } + if (this.isEdit) { + putAction(`sys/category/edit`, params).then(res => { + if (res.success) { + this.$message.success(this.$t('OperationSuccessful')) + this.form = {} + this.loadData() + this.newVisible = false + } else { + this.$message.warning(this.$t('operationFailed')) + } + }) } else { - this.$message.warning(this.$t('operationFailed')) + //新增 + postAction(`sys/category/add`, params).then(res => { + if (res.success) { + this.$message.success(this.$t('OperationSuccessful')) + this.form = {} + this.loadData() + this.newVisible = false + } else { + this.$message.warning(this.$t('operationFailed')) + } + }) } - }) + } } - }else if(this.dictVal=='tree'){ - let params = { - ...this.form, - sysDictId: this.record.id - } - if (this.isEdit) { - putAction(`sys/category/edit`,params).then(res=>{ - if(res.success){ - this.$message.success(this.$t('OperationSuccessful')) - this.form={} - this.loadData() - this.newVisible = false - }else { - this.$message.warning(this.$t('operationFailed')) - } - }) - }else{ - //新增 - postAction(`sys/category/add`, params).then(res => { - if (res.success) { - this.$message.success(this.$t('OperationSuccessful')) - this.form={} - this.loadData() - this.newVisible = false - } else { - this.$message.warning(this.$t('operationFailed')) - } - }) - } - } + }) }, //取消 cancelModel(){ @@ -345,6 +352,7 @@ let params={ id:val } + this.$confirm({ title: this.$t('ConfirmDelete'), content: '', @@ -353,7 +361,9 @@ deleteAction(`sys/dictItem/delete`, params).then(res => { if(res.success) { this.$message.success(this.$t('OperationSuccessful')); - this.queryParams.pageNo=1 + if(this.tableData&&this.tableData.length==1&&this.queryParams.pageNo!=1){ + this.queryParams.pageNo=this.queryParams.pageNo-1 + } this.loadData() }else{ this.$message.warning(this.$t('operationFailed')); @@ -380,15 +390,29 @@ content: '', onOk: async () => { - deleteAction(`sys/category/deleteBatch`, params).then(res => { - if(res.success){ - this.queryParams.pageNo=1 - this.loadData() - this.$message.success(this.$t('OperationSuccessful')) - }else{ - this.$message.warning(this.$t('operationFailed')) - } - }) + if(this.dictVal=='list'){ + deleteAction(`sys/dictItem/logicDeleteBatch`, params).then(res => { + if(res.success){ + if(this.ids.length==this.tableData.length&&this.queryParams.pageNo!=1){ + this.queryParams.pageNo=this.queryParams.pageNo-1 + } + this.loadData() + this.$message.success(this.$t('OperationSuccessful')) + }else{ + this.$message.warning(this.$t('operationFailed')) + } + }) + }else if(this.dictVal=='tree'){ + deleteAction(`sys/category/deleteBatch`, params).then(res => { + if(res.success){ + this.queryParams.pageNo=1 + this.loadData() + this.$message.success(this.$t('OperationSuccessful')) + }else{ + this.$message.warning(this.$t('operationFailed')) + } + }) + } } }) }else{ diff --git a/jero-web/src/views/documentManage/tags/dialog/listTable.vue b/jero-web/src/views/documentManage/tags/dialog/listTable.vue index 5aee55af8..339dc5302 100644 --- a/jero-web/src/views/documentManage/tags/dialog/listTable.vue +++ b/jero-web/src/views/documentManage/tags/dialog/listTable.vue @@ -1,6 +1,6 @@