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 queryBySysName(@RequestParam(name="id",required=true) String sysName) { List sysCategory = sysCategoryService.queryBySysName(sysName); @@ -136,7 +136,6 @@ public class SysCategoryController { public Result add(@RequestBody SysCategory sysCategory) { Result result = new Result(); try { - sysCategory.setDelFlag(CommonConstant.DEL_FLAG_0); sysCategoryService.addSysCategory(sysCategory); result.success("添加成功！"); } catch (Exception e) { diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDictController.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDictController.java index 23b26f7c2..e2fe7d671 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDictController.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDictController.java @@ -76,6 +76,7 @@ public class SysDictController { @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, HttpServletRequest req) { Result> result = new Result>(); QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(sysDict, req.getParameterMap()); + queryWrapper.eq("del_flag",CommonConstant.DEL_FLAG_0); Page page = new Page(pageNo, pageSize); IPage pageList = sysDictService.page(page, queryWrapper); log.debug("查询当前页："+pageList.getCurrent()); diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDictItemController.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDictItemController.java index 0c364ffc8..51ca3d495 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDictItemController.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDictItemController.java @@ -55,7 +55,7 @@ public class SysDictItemController { @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,HttpServletRequest req) { Result> result = new Result>(); QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(sysDictItem, req.getParameterMap()); - queryWrapper.orderByAsc("sort_order"); + queryWrapper.orderByAsc("sort_order").eq("del_flag",CommonConstant.DEL_FLAG_0); Page page = new Page(pageNo, pageSize); IPage pageList = sysDictItemService.page(page, queryWrapper); result.setSuccess(true); @@ -151,7 +151,7 @@ public class SysDictItemController { * @return */ //@RequiresRoles({"admin"}) - @RequiresPermissions("sys:dict:list") + //@RequiresPermissions("sys:dict:list")未改 @RequestMapping(value = "/logicDelete", method = RequestMethod.DELETE) @CacheEvict(value=CacheConstant.SYS_DICT_CACHE, allEntries=true) public Result logicDelete(@RequestParam(name="id",required=true) String id) { diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/ISysCategoryService.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/ISysCategoryService.java index 02a03b7a9..b368b3204 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/ISysCategoryService.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/ISysCategoryService.java @@ -72,5 +72,5 @@ public interface ISysCategoryService extends IService { */ List getSysCategoryTree(); - List queryBySysName(String sysName); + List queryBySysName(String sysDictId); } diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysCategoryServiceImpl.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysCategoryServiceImpl.java index 5ec5fb25e..6733da937 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysCategoryServiceImpl.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysCategoryServiceImpl.java @@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.jero.common.constant.CommonConstant; import com.jero.common.constant.FillRuleConstant; import com.jero.common.exception.JeroBootException; import com.jero.common.util.FillRuleUtil; @@ -59,6 +60,7 @@ public class SysCategoryServiceImpl extends ServiceImpl queryBySysDictId(String sysDictId) { QueryWrapper queryWrapper=new QueryWrapper<>(); - queryWrapper.eq("sys_dict_id",sysDictId); + queryWrapper.eq("sys_dict_id",sysDictId).eq("del_flag", CommonConstant.DEL_FLAG_0); return list(queryWrapper); } - +/**搜索条件*/ @Override public List queryBySysName(String sysName) { QueryWrapper queryWrapper=new QueryWrapper<>(); - queryWrapper.like("name",sysName); + queryWrapper.like("name",sysName).eq("del_flag", CommonConstant.DEL_FLAG_0); return list(queryWrapper); } @Override diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/util/HttpRequestUtil.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/util/HttpRequestUtil.java index 984f2c14e..d17fd4df6 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/util/HttpRequestUtil.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/util/HttpRequestUtil.java @@ -62,7 +62,7 @@ public class HttpRequestUtil { RequestConfig requestConfig = RequestConfig.custom().setConnectTimeout(20000000).setSocketTimeout(200000000).build(); HttpPost httpPost = new HttpPost(url); httpPost.setConfig(requestConfig); - httpPost.setEntity(new StringEntity(body)); + httpPost.setEntity(new StringEntity(body,"utf-8")); if (headerMap != null) { Iterator var38 = headerMap.entrySet().iterator(); diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/feishu/service/IFeishuService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/feishu/service/IFeishuService.java new file mode 100644 index 000000000..e529ecbb8 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/feishu/service/IFeishuService.java @@ -0,0 +1,29 @@ +package com.jero.modules.feishu.service; + +import java.io.IOException; + +/** + * @Author: liyawei + * @Description: + * @Date: Created in 13:40 2022/3/10 + */ +public interface IFeishuService { + + /** + * 获取token + * @return + * @throws IOException + */ + String getTenantAccessToken() throws IOException; + + /** + * 批量发送消息 + * @param userIds 用户域账号，对应数据库字段：third_id + * @param message 消息内容 + * @param title 消息类型 + * @param backUrl 消息内容中的跳转链接 + * @return + * @throws IOException + */ + String batchSendMessage(String[] userIds, String message, String title, String backUrl) throws IOException; +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/feishu/service/impl/FeishuServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/feishu/service/impl/FeishuServiceImpl.java new file mode 100644 index 000000000..7eb48ed40 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/feishu/service/impl/FeishuServiceImpl.java @@ -0,0 +1,114 @@ +package com.jero.modules.feishu.service.impl; + +import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.JSONObject; +import com.jero.modules.feishu.service.IFeishuService; +import com.jero.modules.system.util.HttpRequestUtil; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.stereotype.Service; + +import java.io.IOException; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +/** + * @Author: liyawei + * @Description: + * @Date: Created in 13:41 2022/3/10 + */ +@Slf4j +@Service +public class FeishuServiceImpl implements IFeishuService { + @Value("${Feishu.appId}") + private String appId; + + @Value("${Feishu.appSecret}") + private String appSecret; + + @Value("${Feishu.getTenantAccessTokenUrl}") + private String getTenantAccessTokenUrl; + + @Value("${Feishu.batchSendMessageUrl}") + private String batchSendMessageUrl; + + /** + * 获取token + * @return + * @throws IOException + */ + public String getTenantAccessToken() throws IOException { + Map headerMap = new HashMap<>(); + headerMap.put("Content-Type", "application/json; charset=utf-8"); + Map paramsMap = new HashMap<>(); + paramsMap.put("app_id", appId); + paramsMap.put("app_secret", appSecret); + String response = HttpRequestUtil.getResponseOfPOST(getTenantAccessTokenUrl, headerMap, JSON.toJSONString(paramsMap)); + //返回结果样例： {"code":0,"expire":7167,"msg":"ok","tenant_access_token":"t-3c05f981f36a8a92050718c6875e3c8b02c62304"} + JSONObject tokenJson = JSONObject.parseObject(response); + if(!tokenJson.get("code").toString().equals("0")) { + log.error("请求出现异常：" + tokenJson.get("msg") + " " + tokenJson); + return null; + } + String tenantAccessToken = tokenJson.get("tenant_access_token").toString(); + return tenantAccessToken; + } + + /** + * 批量发送消息 + * @param userIds 用户域账号，对应数据库字段：third_id + * @param message 消息内容 + * @param title 消息类型 + * @param backUrl 消息内容中的跳转链接 + * @return + * @throws IOException + */ + public String batchSendMessage(String[] userIds, String message, String title, String backUrl) throws IOException { + String token = getTenantAccessToken(); + // 设置请求头 + Map headerMap = new HashMap<>(); + headerMap.put("Authorization", "Bearer " + token); + headerMap.put("Content-Type", "application/json; charset=utf-8"); + // 设置消息标题 + JSONObject zh_cn = new JSONObject(); + zh_cn.put("title", title); + // 设置消息内容 + // 第一行 + JSONObject contentOne = new JSONObject(); + contentOne.put("tag", "text"); + contentOne.put("text", message); + // 第二行 + JSONObject contentTwo = new JSONObject(); + contentTwo.put("tag", "a"); + contentTwo.put("text", "跳转链接"); + contentTwo.put("href", backUrl); + List contentList = new ArrayList<>(); + contentList.add(contentOne); + contentList.add(contentTwo); + + List> list = new ArrayList<>(); + list.add(contentList); + zh_cn.put("content", list); + + JSONObject post = new JSONObject(); + post.put("zh_cn", zh_cn); + JSONObject contentObj = new JSONObject(); + contentObj.put("post", post); + // 设置请求参数 + JSONObject paramsMap = new JSONObject(); + paramsMap.put("user_ids", userIds); + paramsMap.put("msg_type", "post"); + paramsMap.put("content", contentObj); + // 发送请求给飞书 + String response = HttpRequestUtil.getResponseOfPOST(batchSendMessageUrl, headerMap, paramsMap.toJSONString()); + // 返回结果样例：{"code":0,"data":{"invalid_department_ids":[],"invalid_open_ids":[],"invalid_union_ids":[],"invalid_user_ids":[],"message_id":"bm-d595567e4f448fafe397bc916f0be646"},"msg":"ok"} + // 获取返回结果 + JSONObject tokenJson = JSONObject.parseObject(response); + if(!tokenJson.get("code").toString().equals("0")) { + log.error("请求出现异常：" + tokenJson.get("msg") + " " + tokenJson); + } + return tokenJson.get("msg").toString(); + } +} 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/entity/OnlCgformTag.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/entity/OnlCgformTag.java index 61a8e4b6f..95f6d2dcc 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/entity/OnlCgformTag.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/entity/OnlCgformTag.java @@ -86,10 +86,10 @@ public class OnlCgformTag implements Serializable { @ApiModelProperty(value = "字段英文名称描述") private java.lang.String dbFieldEnName; - /**表单控件类型*/ - @Excel(name = "表单控件类型", width = 15,dicCode ="field_show_type") + /**属性类型*/ + @Excel(name = "属性类型", width = 15,dicCode ="field_show_type") @Dict(dicCode ="field_show_type") - @ApiModelProperty(value = "表单控件类型") + @ApiModelProperty(value = "属性类型") private java.lang.String fieldShowType; @TableField(exist = false) 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/mapper/OnlCgformTagMapper.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/mapper/OnlCgformTagMapper.java index 3cf2aaee4..def178225 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/mapper/OnlCgformTagMapper.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/mapper/OnlCgformTagMapper.java @@ -27,6 +27,7 @@ public interface OnlCgformTagMapper extends BaseMapper { "left join sys_dict_item as i on f.field_show_type=i.item_value\n" + "left join onl_cgform_area as a on f.show_area=a.id\n" + "where f.cgform_head_id=\"48308196e7b04761b533dc31bc899707\"\n" + + "and f.is_delete=0\n" + "and i.dict_id=1493098515761917954 \n" + "order by f.create_time desc ") IPage queryPageList(IPage page,@Param("params") Map params); 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..9a842dc9f 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: '确认删除？', + content: this.$t('confirmDeletion'), 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!=1){ + this.queryParams.pageNo=this.queryParams.pageNo-1 + } + this.loadData() } else { this.$message.warning(res.message) } @@ -137,7 +243,55 @@ }, 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){ + this.$confirm({ + content: this.$t('backDocument'), + onOk() { + deleteAction(``, { id: val.id }).then((res) => { + if (res.success) { + this.$message.success(res.message) + this.loadData() + } else { + this.$message.warning(res.message) + } + }) + } + }) + }, + //查看 + detail(val){ + this.$router.push({ + path:'/docManage/splitting/splitDetail', + query:val + }) + }, + } } @@ -146,12 +300,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') }} @@ -89,10 +89,10 @@
- +
@@ -110,18 +110,22 @@
- + +