Merge remote-tracking branch 'origin/master'

jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysCategoryController.java

@@ -57,7 +57,7 @@ public class SysCategoryController {
 	 * @param req
 	 * @return
 	 */
-	@RequiresPermissions("sys:category:list")
+//	@RequiresPermissions("sys:category:list")
 	@GetMapping(value = "/rootList")
 	public Result<IPage<SysCategory>> queryPageList(SysCategory sysCategory,
 									  @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,

jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDictController.java

@@ -343,11 +343,7 @@ public class SysDictController {
 	public Result<SysDict> add(@RequestBody SysDict sysDict) {
 		Result<SysDict> result = new Result<SysDict>();
 		try {
-			Integer count=sysDictService.queryExitData(sysDict);
+			if(StringUtils.isEmpty(sysDict.getDictName())){
-			if (count > 0) {
-				sysDict.setDelFlag(0);
-			} else {
-			if(StringUtils.isEmpty(sysDict.getDictCode())){
 				sysDict.setDictCode(sysDict.getDictName());
 			}else {
 				sysDict.setCreateTime(new Date());
@@ -358,7 +354,7 @@ public class SysDictController {
 				//添加成功后需要刷新缓存
 				sysDictService.refreshCache();
 			}
-			}
+
 		} catch (Exception e) {
 			log.error(e.getMessage(),e);
 			result.error500("操作失败");
@@ -381,22 +377,17 @@ public class SysDictController {
 			result.error500("未找到对应实体");
 		}else {
 			if (org.apache.commons.lang3.StringUtils.isNotBlank(String.valueOf(sysDict.getIsReadOnly()))) {
-				/*if (sysDict.getIsReadOnly() == 1) {
+				if (sysDict.getIsReadOnly() == 1) {
 					result.error500("固定字段,不可删除");
-				}else{*/
+				}else{
-					/*if(sysDict.getIsTagDict() == 1) {
+					sysDict.setUpdateTime(new Date());
-						sysDict.setDictEnName(sysDict.getDictCode().replace("_", "  "));
+					boolean ok = sysDictService.updateById(sysDict);
+					if (ok) {
+						result.success("编辑成功!");
+						//编辑成功后需要刷新缓存
+						sysDictService.refreshCache();
 					}
-					else {*/
+				}
-						sysDict.setUpdateTime(new Date());
-						boolean ok = sysDictService.updateById(sysDict);
-						if (ok) {
-							result.success("编辑成功!");
-							//编辑成功后需要刷新缓存
-							sysDictService.refreshCache();
-						}
-					//}
-			//	}
 			}
 		}
 		return result;

jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDictItemController.java

@@ -8,6 +8,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.jero.common.api.vo.Result;
 import com.jero.common.constant.CacheConstant;
 import com.jero.common.system.query.QueryGenerator;
+import com.jero.modules.enums.FixedFieldEnum;
 import com.jero.modules.system.entity.SysDictItem;
 import com.jero.modules.system.service.ISysDictItemService;
 import io.swagger.annotations.ApiOperation;
@@ -97,7 +98,7 @@ public class SysDictItemController {
 			result.error500("未找到对应实体");
 		} else {
 			if (org.apache.commons.lang3.StringUtils.isNotBlank(String.valueOf(sysDictItem.getIsReadOnly()))) {
-				if (sysDictItem.getIsReadOnly() == 1) {
+				if (FixedFieldEnum.FIXED_FIELD_ENUM.getValue().equals(sysDictItem.getIsReadOnly())) {
 					result.error500("固定字段,不可删除");
 				} else {
 					sysDictItem.setUpdateTime(new Date());
@@ -128,7 +129,7 @@ public class SysDictItemController {
 			result.error500("未找到对应实体");
 		}else {
 			if (org.apache.commons.lang3.StringUtils.isNotBlank(String.valueOf(joinSystem.getIsReadOnly()))) {
-				if (joinSystem.getIsReadOnly() == 1) {
+				if (FixedFieldEnum.FIXED_FIELD_ENUM.getValue().equals(joinSystem.getIsReadOnly())) {
 					result.error500("固定字段,不可删除");
 				}
 				else {
@@ -159,7 +160,7 @@ public class SysDictItemController {
 		}
 		else {
 			if (org.apache.commons.lang3.StringUtils.isNotBlank(String.valueOf(sysDictItem.getIsReadOnly()))) {
-				if (sysDictItem.getIsReadOnly() == 1) {
+				if (FixedFieldEnum.FIXED_FIELD_ENUM.getValue().equals(sysDictItem.getIsReadOnly())) {
 					result.error500("固定字段,不可删除");
 				} else {
 					this.sysDictItemService.removeByIds(Arrays.asList(ids.split(",")));

jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/entity/SysCategory.java

@@ -61,7 +61,7 @@ public class SysCategory implements Serializable,Comparable<SysCategory>{
 	@Excel(name = "数据字典id", width = 15)
 	@Dict(dictTable = "sys_dict", dicText = "id", dicCode = "id")
 	@ApiModelProperty(value = "是否为标签内容-数据字典（1是 0否）")
-	private java.lang.Integer sysDictId;
+	private java.lang.String sysDictId;
 
 	/**是否有子节点*/
 	@Excel(name = "是否有子节点(1:有)", width = 15)
@@ -76,7 +76,7 @@ public class SysCategory implements Serializable,Comparable<SysCategory>{
 	private java.lang.String description;
 
 	/**是否为标签内容-数据字典（1是 0否）*/
-	@Excel(name = "是否为标签内容-数据字典（1是 0否）", width = 15)
+	@Excel(name = "是否为标签内容-数据字典（1是 0否）", width = 15, dicText = "is_tag_dict", dicCode = "is_tag_dict")
 	@Dict(dictTable = "onl_cgform_field", dicText = "is_tag_dict", dicCode = "is_tag_dict")
 	@ApiModelProperty(value = "是否为标签内容-数据字典（1是 0否）")
 	private java.lang.Integer isTagDict;

jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/entity/SysDict.java

@@ -91,7 +91,8 @@ public class SysDict implements Serializable {
     /**
      * 是否为标签内容-数据字典（1是 0否）
      */
-    @Excel(name = "是否为标签内容", width = 15)
+    @Excel(name = "是否为标签内容-数据字典（1是 0否）", width = 15, dicText = "is_tag_dict", dicCode = "is_tag_dict")
+    @Dict(dictTable = "onl_cgform_field", dicText = "is_tag_dict", dicCode = "is_tag_dict")
     private java.lang.Integer isTagDict;
 
     /**

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/controller/BussDocumentLibraryEOController.java

@@ -251,8 +251,9 @@ public class BussDocumentLibraryEOController extends JeroController<BussDocument
 	 @ApiOperation(value="文档库信息表-新增表单", notes="文档库信息表-新增表单")
 	 @GetMapping(value = "/getAddForm")
 	 public Result<List<Map<String,Object>>> getAddForm(@RequestParam(name="flag",required=true) String flag,
-														@RequestParam(name="cut",required=true) String cut) {
+														@RequestParam(name="cut",required=true) String cut,
-		 List<Map<String, Object>> list = bussDocumentLibraryEOService.getAddForm(flag,cut);
+														@RequestParam(name="type",required=true) String type) {
+		 List<Map<String, Object>> list = bussDocumentLibraryEOService.getAddForm(flag,cut,type);
 		 return Result.OK(list);
 	 }
 

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/mapper/BussDocumentLibraryEOMapper.java

@@ -68,4 +68,14 @@ public interface BussDocumentLibraryEOMapper extends BaseMapper<BussDocumentLibr
                           @Param("condition") String condition);
 
 
+    /**
+     * 根据代替标准列表查询
+     *
+     * @param
+     * @param replaceStandard
+     * @return
+     */
+    List<Map<String, Object>> getInfoListByReplaceStandard(@Param("replaceStandard") String replaceStandard);
+
+
 }

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/mapper/xml/BussDocumentLibraryEOMapper.xml

@@ -59,5 +59,16 @@
         select ${field}
         ${condition}
     </select>
+    <!--根据代替标准列表查询-->
+    <select id="getInfoListByReplaceStandard" resultType="java.util.LinkedHashMap">
+        select * from buss_document_library
+        where 1=1
+        <if test="replaceStandard != null" >
+            and replace_standard in
+            <foreach collection="replaceStandard.split(',')" index="index" item="item" open="(" separator="," close=")">
+                #{item}
+            </foreach>
+        </if>
+    </select>
 
 </mapper>

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/IBussDocumentLibraryEOService.java

@@ -68,7 +68,7 @@ public interface IBussDocumentLibraryEOService extends IService<BussDocumentLibr
 	 *
 	 * @return
 	 */
-	List<Map<String,Object>> getAddForm(String flag,String cut);
+	List<Map<String,Object>> getAddForm(String flag,String cut,String type);
 
 	/**
 	 * 编辑数据查询

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java

@@ -21,7 +21,6 @@ import com.jero.modules.document.mapper.BussDocumentLibraryEOMapper;
 import com.jero.modules.document.service.IBussDocumentLibraryEOService;
 import com.jero.modules.log.entity.BussLogEO;
 import com.jero.modules.log.service.IBussLogEOService;
-import com.jero.modules.ocr.util.LineHumpUtil;
 import com.jero.modules.oss.entity.OSSFile;
 import com.jero.modules.oss.service.IOSSFileService;
 import com.jero.modules.subscribe.entity.OnlCgformSubscribe;
@@ -236,7 +235,7 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
      * @return
      */
     @Override
-    public List<Map<String, Object>> getAddForm(String flag, String cut) {
+    public List<Map<String, Object>> getAddForm(String flag, String cut, String type) {
         OnlCgformArea onlCgformArea = new OnlCgformArea();
         onlCgformArea.setIsModel(ModuleEnum.DOCUMENT_LIBRARY.getValue());
         //区域管理
@@ -246,14 +245,24 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
 
         if (fieldList.size() != 0) {
             //过滤出表单字段(is_show_form-->表单是否显示0否 1是)
-            fieldList = fieldList.stream().filter(e -> YesOrNoEnum.YES.getValue().equals(String.valueOf(e.getIsShowForm()))).collect(Collectors.toList());
+            if ("add".equals(type)) {
+                //新增时,被代替标准在表单中不显示
+                fieldList = fieldList.stream()
+                        .filter(e -> YesOrNoEnum.YES.getValue().equals(String.valueOf(e.getIsShowForm())) && !e.getDbFieldName().equals("replaced_standard"))
+                        .collect(Collectors.toList());
+            } else {
+                fieldList = fieldList.stream()
+                        .filter(e -> YesOrNoEnum.YES.getValue().equals(String.valueOf(e.getIsShowForm())))
+                        .collect(Collectors.toList());
+            }
+
         }
         List<Map<String, Object>> result = new ArrayList<>();
         for (OnlCgformArea onlCgformAreaTemp : areaList) {
             String areaName = "";
-            if(CutEnum.CN.getValue().equals(cut)){
+            if (CutEnum.CN.getValue().equals(cut)) {
                 areaName = onlCgformAreaTemp.getShowArea();
-            }else{
+            } else {
                 areaName = onlCgformAreaTemp.getEnName();
             }
             List<OnlCgformField> fieldListTemp = fieldList.stream().filter(e -> onlCgformAreaTemp.getId().equals(e.getShowArea())).collect(Collectors.toList());
@@ -279,6 +288,48 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
         queryWrapper.eq(BussDocumentLibraryEO::getId, id);
         //通过id查询数据
         List<Map<String, Object>> dataList = bussDocumentLibraryEOMapper.selectMaps(queryWrapper);
+        //查询所有
+        List<Map<String, Object>> mapList = bussDocumentLibraryEOMapper.selectMaps(null);
+        //对应标准id
+        String correspondingStandard = (String) dataList.get(0).get("corresponding_standard");
+        //处理被代替标准和对应标准
+        List<String> replaceStandardNameList = new ArrayList<>();
+        List<String> correspondingStandardNameList = new ArrayList<>();
+        for (Map<String, Object> map : mapList) {
+            //对应标准处理
+            if (StringUtils.isNotBlank(correspondingStandard) && correspondingStandard.contains((String) map.get("id"))) {
+                correspondingStandardNameList.add((String) map.get("serial_number"));
+            }
+            //代替标准
+            String replaceStandard = (String) map.get("replace_standard");
+            if (StringUtils.isNotBlank(replaceStandard) && replaceStandard.contains(id)) {
+                String serialNumber = (String) map.get("serial_number");
+                replaceStandardNameList.add(serialNumber);
+            }
+        }
+        //对应标准中文
+        if (correspondingStandardNameList.size() != 0) {
+            dataList.get(0).put("corresponding_standard", StringUtils.join(correspondingStandardNameList, ","));
+            dataList.get(0).put("corresponding_standard_id", correspondingStandard);
+        }
+        if (replaceStandardNameList.size() != 0) {
+            dataList.get(0).put("replaced_standard", StringUtils.join(replaceStandardNameList, ","));
+        }
+        //代替标准中文
+        String replaceStandard = (String) dataList.get(0).get("replace_standard");
+        if (StringUtils.isNotBlank(replaceStandard)) {
+            LambdaQueryWrapper<BussDocumentLibraryEO> queryWrapperTemp = new LambdaQueryWrapper<>();
+            queryWrapperTemp.in(BussDocumentLibraryEO::getId, Arrays.asList(replaceStandard.split(",")));
+            List<Map<String, Object>> dataListTemp = bussDocumentLibraryEOMapper.selectMaps(queryWrapperTemp);
+            if (dataListTemp.size() != 0) {
+                List<String> replaceStandardListNew = new ArrayList<>();
+                for (Map<String, Object> map : dataListTemp) {
+                    replaceStandardListNew.add((String) map.get("serial_number"));
+                }
+                dataList.get(0).put("replace_standard", StringUtils.join(replaceStandardListNew, ","));
+                dataList.get(0).put("replace_standard_id", replaceStandard);
+            }
+        }
         return dataList;
     }
 
@@ -290,6 +341,14 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
      */
     @Override
     public List<Map<String, Object>> getInfoById(String id, String cut) {
+        //处理被代替标准
+        //根据代替标准查询被代替标准集合
+        List<Map<String, Object>> replaceStandardList = bussDocumentLibraryEOMapper.getInfoListByReplaceStandard(id);
+        List<String> replaceStandardNameList = new ArrayList<>();
+        for (Map<String, Object> map : replaceStandardList) {
+            String serialNumber = (String) map.get("serial_number");
+            replaceStandardNameList.add(serialNumber);
+        }
         //区域管理
         List<OnlCgformArea> areaList = onlCgformAreaServiceImpl.queryList(new OnlCgformArea());
         //字段属性
@@ -369,7 +428,11 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
                     if (dataList.size() != 0) {
                         dataList.get(0).entrySet().forEach(entry -> {
                             if (onlCgformField.getDbFieldName().equals(entry.getKey())) {
-                                map.put("value", entry.getValue());
+                                if (onlCgformField.getDbFieldName().equals("replaced_standard")) {
+                                    map.put("value", StringUtils.join(replaceStandardNameList, ","));
+                                } else {
+                                    map.put("value", entry.getValue());
+                                }
                             }
                         });
                     }
@@ -407,9 +470,18 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
      * @param map
      */
     public void addInfo(Map<String, Object> map) {
+        if (ObjectUtils.isNotEmpty(map.get("replace_standard_id"))) {
+            map.put("replace_standard", map.get("replace_standard_id"));
+        }
+        if (ObjectUtils.isNotEmpty(map.get("corresponding_standard"))) {
+            map.put("corresponding_standard", map.get("corresponding_standard_id"));
+        }
+
         //代替标准不为空,需要向被替代标准的法规工程师发送站内通知和飞书信息，提醒内容："新标准编号"已实施，请注意更新“替代标准编号”状态
 
         map.remove("cut");
+        map.remove("replace_standard_id");
+        map.remove("corresponding_standard_id");
         //字段属性
         List<OnlCgformField> fieldList = onlCgformFieldService.getFieldList(ModuleEnum.DOCUMENT_LIBRARY.getValue());
         //时间类型字段
@@ -475,8 +547,15 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
      * @param map
      */
     public void updateInfo(Map<String, Object> map) {
-
+        if (ObjectUtils.isNotEmpty(map.get("replace_standard_id"))) {
+            map.put("replace_standard", map.get("replace_standard_id"));
+        }
+        if (ObjectUtils.isNotEmpty(map.get("corresponding_standard_id"))) {
+            map.put("corresponding_standard", map.get("corresponding_standard_id"));
+        }
         map.remove("cut");
+        map.remove("replace_standard_id");
+        map.remove("corresponding_standard_id");
         //字段属性
         List<OnlCgformField> fieldList = onlCgformFieldService.getFieldList(ModuleEnum.DOCUMENT_LIBRARY.getValue());
         //时间类型字段
@@ -548,7 +627,12 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
                         }
 
                     } else {
-                        valuesBuilder.append("'" + value + "'" + ",");
+                        //编辑时replaced_standard被代替标准不存值,通过查询得到
+                        if ("replaced_standard".equals(key)) {
+                            valuesBuilder.append("'" + "" + "'" + ",");
+                        } else {
+                            valuesBuilder.append("'" + value + "'" + ",");
+                        }
                     }
                 }
                 fieldsBuilder.append(key + ",");
@@ -969,38 +1053,41 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
         //查询条件处理
         for (Map.Entry<String, Object> entry : parameter.entrySet()) {
             String key = entry.getKey();
-            String value = (String) entry.getValue();
+            if (!"pageNo".equals(key) && !"pageSize".equals(key)) {
-            if (StringUtils.isNotBlank(value)) {
+                String value = (String) entry.getValue();
-                for (Map<String, Object> map : mapList) {
+                if (StringUtils.isNotBlank(value)) {
-                    String fieldName = (String) map.get("db_field_name");//字段
+                    for (Map<String, Object> map : mapList) {
-                    if (key.equals(fieldName)) {
+                        String fieldName = (String) map.get("db_field_name");//字段
-                        //字段类型(判断是输入框还是下拉,等等)
+                        if (key.equals(fieldName)) {
-                        String fieldType = (String) map.get("field_show_type");//字段类型
+                            //字段类型(判断是输入框还是下拉,等等)
-                        if (FieldTypeEnum.TEXT_STRING.getValue().equals(fieldType)) {
+                            String fieldType = (String) map.get("field_show_type");//字段类型
-                            //输入框
+                            if (FieldTypeEnum.TEXT_STRING.getValue().equals(fieldType)) {
-                            conditionSb.append(" and " + key + " like concat(concat('%','" + value + "'),'%')");
+                                //输入框
-                        } else if (FieldTypeEnum.PULL_SINGLE.getValue().equals(fieldType)
+                                conditionSb.append(" and " + key + " like concat(concat('%','" + value + "'),'%')");
-                                || FieldTypeEnum.PULL_MORE.getValue().equals(fieldType)) {
+                            } else if (FieldTypeEnum.PULL_SINGLE.getValue().equals(fieldType)
-                            StringBuilder valueSb = new StringBuilder();
+                                    || FieldTypeEnum.PULL_MORE.getValue().equals(fieldType)) {
-                            for (String valueTemp : value.split(",")) {
+                                StringBuilder valueSb = new StringBuilder();
-                                valueSb.append("'" + valueTemp + "',");
+                                for (String valueTemp : value.split(",")) {
-                            }
+                                    valueSb.append("'" + valueTemp + "',");
-                            String substring = valueSb.substring(0, valueSb.length() - 1);
+                                }
-                            //下拉单选或下拉多选
+                                String substring = valueSb.substring(0, valueSb.length() - 1);
-                            conditionSb.append(" and " + key + " in(" + substring + ")");
+                                //下拉单选或下拉多选
+                                conditionSb.append(" and " + key + " in(" + substring + ")");
 
-                        } else if (FieldTypeEnum.DATE_SINGLE.getValue().equals(fieldType)) {
+                            } else if (FieldTypeEnum.DATE_SINGLE.getValue().equals(fieldType)) {
-                            //日期(区分单日期还时间范围)
+                                //日期(区分单日期还时间范围)
-                            if (value.contains(",")) {
+                                if (value.contains(",")) {
-                                conditionSb.append(" and " + "date_format(" + key + ",'%Y-%m-%d') >= '" + value.split(",")[0] + "'"
+                                    conditionSb.append(" and " + "date_format(" + key + ",'%Y-%m-%d') >= '" + value.split(",")[0] + "'"
-                                        + " and " + "date_format(" + key + ",'%Y-%m-%d') <= '" + value.split(",")[1] + "'");
+                                            + " and " + "date_format(" + key + ",'%Y-%m-%d') <= '" + value.split(",")[1] + "'");
-                            } else {
+                                } else {
-                                conditionSb.append(" and " + "date_format(" + key + ",'%Y-%m-%d') = '" + value + "'");
+                                    conditionSb.append(" and " + "date_format(" + key + ",'%Y-%m-%d') = '" + value + "'");
+                                }
                             }
                         }
                     }
                 }
             }
+
         }
         //处理列表表头排序
         if (StringUtils.isNotBlank((String) parameter.get("orderByField"))) {
@@ -1496,7 +1583,7 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
      * @return
      */
     private List<String> getWorkbookTitle(String cut) {
-        List<Map<String, Object>> addForm = getAddForm(ModuleEnum.DOCUMENT_LIBRARY.getValue(), cut);
+        List<Map<String, Object>> addForm = getAddForm(ModuleEnum.DOCUMENT_LIBRARY.getValue(), cut, "add");
         StringBuilder sb = new StringBuilder();
         List<String> pullMoreList = new LinkedList<>();//多选字段
         List<String> pullSingleList = new LinkedList<>();//单选字段
@@ -1613,6 +1700,7 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
 
     /**
      * ocr识别调取已入库文件-中英文切换
+     *
      * @param flag header-表头，condition-查询条件
      * @param cut
      * @return
@@ -1620,85 +1708,85 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
     @Override
     public List<Map<String, Object>> getHeaderOrConditionForOcr(String flag, String cut) {
         List<Map<String, Object>> list = new ArrayList<>();
-            Map<String, Object> map1 = new HashMap<>();
+        Map<String, Object> map1 = new HashMap<>();
-            Map<String, Object> map2 = new HashMap<>();
+        Map<String, Object> map2 = new HashMap<>();
-            Map<String, Object> map3 = new HashMap<>();
+        Map<String, Object> map3 = new HashMap<>();
-            Map<String, Object> map4 = new HashMap<>();
+        Map<String, Object> map4 = new HashMap<>();
-            Map<String, Object> map5 = new HashMap<>();
+        Map<String, Object> map5 = new HashMap<>();
 
-            if("header".equals(flag)) {
+        if ("header".equals(flag)) {
-                if (CutEnum.CN.getValue().equals(cut)) {
+            if (CutEnum.CN.getValue().equals(cut)) {
-                    //编号
+                //编号
-                    map1.put("db_field_name", "serial_number");//字段
+                map1.put("db_field_name", "serial_number");//字段
-                    map1.put("db_field_txt", "编号");//字段中文名
+                map1.put("db_field_txt", "编号");//字段中文名
-                    list.add(map1);
+                list.add(map1);
-                    //标题
+                //标题
-                    map2.put("db_field_name", "title");//字段
+                map2.put("db_field_name", "title");//字段
-                    map2.put("db_field_txt", "标题");//字段中文名
+                map2.put("db_field_txt", "标题");//字段中文名
-                    list.add(map2);
+                list.add(map2);
-                    //状态
+                //状态
-                    map3.put("db_field_name", "state");//字段
+                map3.put("db_field_name", "state");//字段
-                    map3.put("db_field_txt", "状态");//字段中文名
+                map3.put("db_field_txt", "状态");//字段中文名
-                    list.add(map3);
+                list.add(map3);
-                    //文件名称
+                //文件名称
-                    map4.put("db_field_name", "file_name");//字段
+                map4.put("db_field_name", "file_name");//字段
-                    map4.put("db_field_txt", "文件名称");//字段中文名
+                map4.put("db_field_txt", "文件名称");//字段中文名
-                    list.add(map4);
+                list.add(map4);
-                    //文件信息
+                //文件信息
-                    map5.put("db_field_name", "text_info");//字段
+                map5.put("db_field_name", "text_info");//字段
-                    map5.put("db_field_txt", "文件信息");//字段中文名
+                map5.put("db_field_txt", "文件信息");//字段中文名
-                    list.add(map5);
+                list.add(map5);
-                } else {
+            } else {
-                    //编号
+                //编号
-                    map1.put("db_field_name", "serial_number");//字段
+                map1.put("db_field_name", "serial_number");//字段
-                    map1.put("db_field_txt", "serial number");//字段中文名
+                map1.put("db_field_txt", "serial number");//字段中文名
-                    list.add(map1);
+                list.add(map1);
-                    //标题
+                //标题
-                    map2.put("db_field_name", "title");//字段
+                map2.put("db_field_name", "title");//字段
-                    map2.put("db_field_txt", "title");//字段中文名
+                map2.put("db_field_txt", "title");//字段中文名
-                    list.add(map2);
+                list.add(map2);
-                    //状态
+                //状态
-                    map3.put("db_field_name", "state");//字段
+                map3.put("db_field_name", "state");//字段
-                    map3.put("db_field_txt", "state");//字段中文名
+                map3.put("db_field_txt", "state");//字段中文名
-                    list.add(map3);
+                list.add(map3);
-                    //文件名称
+                //文件名称
-                    map4.put("db_field_name", "file_name");//字段
+                map4.put("db_field_name", "file_name");//字段
-                    map4.put("db_field_txt", "file name");//字段中文名
+                map4.put("db_field_txt", "file name");//字段中文名
-                    list.add(map4);
+                list.add(map4);
-                    //文件信息
+                //文件信息
-                    map5.put("db_field_name", "text_info");//字段
+                map5.put("db_field_name", "text_info");//字段
-                    map5.put("db_field_txt", "text info");//字段中文名
+                map5.put("db_field_txt", "text info");//字段中文名
-                    list.add(map5);
+                list.add(map5);
-                }
-            }else if("condition".equals(flag)) {
-                if (CutEnum.CN.getValue().equals(cut)) {
-                    //编号
-                    map1.put("db_field_name", "serial_number");//字段
-                    map1.put("db_field_txt", "编号");//字段中文名
-                    map1.put("dict_field", "");//数据字典
-                    map1.put("field_show_type", "1");
-                    list.add(map1);
-                    //标题
-                    map2.put("db_field_name", "title");//字段
-                    map2.put("db_field_txt", "标题");//字段中文名
-                    map2.put("dict_field", "");//数据字典
-                    map2.put("field_show_type", "1");
-                    list.add(map2);
-                } else {
-                    //编号
-                    map1.put("db_field_name", "serial_number");//字段
-                    map1.put("db_field_txt", "serial number");//字段中文名
-                    map1.put("dict_field", "");//数据字典
-                    map1.put("field_show_type", "1");
-                    list.add(map1);
-                    //标题
-                    map2.put("db_field_name", "title");//字段
-                    map2.put("db_field_txt", "title");//字段中文名
-                    map2.put("dict_field", "");//数据字典
-                    map2.put("field_show_type", "1");
-                    list.add(map2);
-                }
             }
+        } else if ("condition".equals(flag)) {
+            if (CutEnum.CN.getValue().equals(cut)) {
+                //编号
+                map1.put("db_field_name", "serial_number");//字段
+                map1.put("db_field_txt", "编号");//字段中文名
+                map1.put("dict_field", "");//数据字典
+                map1.put("field_show_type", "1");
+                list.add(map1);
+                //标题
+                map2.put("db_field_name", "title");//字段
+                map2.put("db_field_txt", "标题");//字段中文名
+                map2.put("dict_field", "");//数据字典
+                map2.put("field_show_type", "1");
+                list.add(map2);
+            } else {
+                //编号
+                map1.put("db_field_name", "serial_number");//字段
+                map1.put("db_field_txt", "serial number");//字段中文名
+                map1.put("dict_field", "");//数据字典
+                map1.put("field_show_type", "1");
+                list.add(map1);
+                //标题
+                map2.put("db_field_name", "title");//字段
+                map2.put("db_field_txt", "title");//字段中文名
+                map2.put("dict_field", "");//数据字典
+                map2.put("field_show_type", "1");
+                list.add(map2);
+            }
+        }
         return list;
     }
 }

jero-web/src/common/lang/en-us.js

@@ -361,5 +361,29 @@ module.exports = {
   BatchCancel:'Batch cancel collection',
   SubscriptionManagement:'Subscription domain management',
   BatchCancellation:'Batch cancellation',
-
+  clickUpload:'Click upload',
+  viewUploadedFiles:'View uploaded files',
+  standardSelection:'Standard selection',
+  Collection:'Collection',
+  CancelCollection:'Cancel collection',
+  deleteLib:'delete',
+  subscribe:'Subscribe',
+  CancelSubscribe:'Cancel Subscribe',
+  ConfirmCollection:'Confirm collection ?',
+  cancelConfirmCollection:'Are you sure you want to cancel the collection',
+  ConfirmSubscribe:'Confirm Subscribe ?',
+  cancelConfirmSubscribe:'Are you sure you want to cancel the subscribe',
+  ConfirmDelete:'Confirm Delete ?',
+  ConfirmBatchDeletion:'Confirm Batch Deletion ? ',
+  download:'download',
+  UpdateLog:'update log',
+  DocumentSplitting:'Document splitting',
+  DocumentTranslation:'Document translation',
+  DocumentComparison:'Document comparison',
+  KnowledgeDatabase:'Knowledge Q & a database',
+  StandardDetails:'Standard details',
+  whole:'whole',
+  DocumentLibrary:'Document Library',
+  DocumentComparisonLibrary:'Document comparison Library',
+  weekly:'weekly',
 }

jero-web/src/common/lang/zh-cn.js

@@ -365,4 +365,29 @@ module.exports = {
   BatchCancellation:'批量取消',
   enterMenuEnName:'请输入菜单英文名称',
   MenuEnName:'菜单英文名称',
+  clickUpload:'点击上传',
+  viewUploadedFiles:'查看已上传文件',
+  standardSelection:'标准选择',
+  Collection:'收藏',
+  CancelCollection:'取消收藏',
+  deleteLib:'删除',
+  subscribe:'订阅',
+  CancelSubscribe:'取消订阅',
+  ConfirmCollection:'确定收藏？',
+  cancelConfirmCollection:'确定取消收藏？',
+  ConfirmSubscribe:'确定订阅?',
+  cancelConfirmSubscribe:'确定取消订阅?',
+  ConfirmDelete:'确定删除?',
+  ConfirmBatchDeletion:'确定批量删除？',
+  download:'下载',
+  UpdateLog:'更新log',
+  DocumentSplitting:'文档拆分',
+  DocumentTranslation:'文档翻译',
+  DocumentComparison:'文档对比',
+  KnowledgeDatabase:'知识问答库',
+  StandardDetails:'标准详情',
+  whole:'全部',
+  DocumentLibrary:'文档库',
+  DocumentComparisonLibrary:'文档对比库',
+  weekly:'周报',
 }

jero-web/src/components/Standardselection/index.vue

@@ -1,19 +1,15 @@
 <template>
   <div>
     <div class="box-title-text">
-      <!--      <div class="title-text">-->
-      <!--        <span class="Required">*</span>-->
-      <!--        <span :class="{'title-text-text':false}">{{query.enName}}</span><br>-->
-      <!--        <span :class="{'title-text-text':false}">{{query.name}}</span>-->
-      <!--      </div>-->
       <a-input class="box-input" :value="value" @input="indexclick($event)"
-               :placeholder="$t('PleaseEnterOrSelect')+query.db_field_txt"/>
+               :disabled="isDisabled"
-      <a-button type="primary" class="button-box" @click="standardClick">
+               :placeholder="!isDisabled?$t('PleaseEnterOrSelect')+query.db_field_txt:query.db_field_txt"/>
-        标准选择
+      <a-button v-if="!isDisabled" type="primary" class="button-box" @click="standardClick">
+        {{this.$t('standardSelection')}}
       </a-button>
     </div>
     <a-drawer
-      :title="'标准选择'"
+      :title="$t('standardSelection')"
       :maskClosable="false"
       :width="1000"
       placement="right"
@@ -61,10 +57,18 @@
 
   export default {
     name: 'index',
-    components:{
+    components: {
       currencySearch
     },
-    props: ['query', 'value', 'replace_standard_id'],
+    props: ['query', 'value', 'standard'],
+    computed: {
+      isDisabled() {
+        if (this.query.db_field_name === 'replaced_standard') {
+          return true
+        }
+        return false
+      }
+    },
     data() {
       return {
         visible: false,
@@ -106,7 +110,7 @@
       standardClick() {
         this.visible = true
         this.queryParam = {}
-        this.replacePage(this.replace_standard_id)
+        this.replacePage()
       },
       replacePage() {
         let query = {
@@ -121,9 +125,7 @@
           if (res.success) {
             this.dataList = res.result.records
             this.total = res.result.total
-            if (this.replace_standard_id) {
+            this.selectedRowKeys = this.standard[this.query.db_field_name + '_id'] ? this.standard[this.query.db_field_name + '_id'].split(',') : []
-              this.selectedRowKeys = this.replace_standard_id.split(',')
-            }
           } else {
             this.dataList = []
           }
@@ -140,7 +142,7 @@
           replace_standard_id.push(res.id)
         })
         this.$emit('input', content.join(','))
-        this.$emit('change', replace_standard_id.join(','))
+        this.$emit('change',this.query.db_field_name,replace_standard_id.join(','))
         this.visible = false
       },
       indexclick(event) {
@@ -238,4 +240,9 @@
     text-align: right;
     margin-top: 20px;
   }
+</style>
+<style>
+  /*.ant-input-disabled{*/
+  /*  background-color: #f5f5f5!important;*/
+  /*}*/
 </style>

jero-web/src/components/addForm/index.vue

@@ -107,7 +107,7 @@
                 <a-button type="primary" class="button-text"
                           @click="clickButtonToUpload(item.db_field_name)">
                   {{ (formInline[item.db_field_name] === 'null' || formInline[item.db_field_name] === '' ||
-                  formInline[item.db_field_name] == null) ? '点击上传' : '查看已上传文件'
+                  formInline[item.db_field_name] == null) ? $t('clickUpload') : $t('viewUploadedFiles')
                   }}
                 </a-button>
               </a-form-model-item>

jero-web/src/components/libraryAddForm/index.vue

@@ -112,7 +112,7 @@
                   <a-button type="primary" class="button-text"
                             @click="clickButtonToUpload(item.db_field_name)">
                     {{ (formInline[item.db_field_name] === 'null' || formInline[item.db_field_name] === '' ||
-                    formInline[item.db_field_name] == null) ? '点击上传' : '查看已上传文件'
+                    formInline[item.db_field_name] == null) ? $t('clickUpload') : $t('viewUploadedFiles')
                     }}
                   </a-button>
                 </a-form-model-item>
@@ -158,7 +158,7 @@
                   <Standardselection :query="item"
                                      @change="StandardselectionChange"
                                      :disabled="disabled"
-                                     :replace_standard_id="formInline.replace_standard_id"
+                                     :standard="formInline"
                                      v-model="formInline[item.db_field_name]"/>
                 </a-form-model-item>
               </div>
@@ -268,6 +268,7 @@
         validatorRules: {},
         confirmLoading: false,
         uploadName: '',
+        type: 'add',
         headerText: [
           {
             text: this.$t('essentialInformation'),
@@ -329,7 +330,7 @@
       }
     },
     mounted() {
-      this.getForm()
+
     },
     methods: {
       sumber() {
@@ -447,16 +448,18 @@
         this.isFormInline = true
         this.confirmLoading = false
       },
-      getForm() {
+      getForm(callBack) {
         this.confirmLoading = true
         let params = {
-          flag: this.flag
+          flag: this.flag,
+          type: this.type
         }
         getAction(this.url.getAddForm, params).then((res) => {
           if (res.success) {
             this.dataList = res.result
             this.ruleList = res.result
             this.IntegrateData()
+            callBack && callBack()
             this.headerText.forEach((res) => {
               res.content = []
               this.dataList.forEach(val => {
@@ -469,18 +472,23 @@
         })
       },
       edit(item) {
-        getAction(this.url.getDocumentInfo, { id: item.id }).then((res) => {
+        this.type = 'edit'
-          if (res.success) {
+        this.getForm(() => {
-            this.formInline = res.result[0]
+          getAction(this.url.getDocumentInfo, { id: item.id }).then((res) => {
-          }
+            if (res.success) {
+              this.formInline = res.result[0]
+            }
+          })
         })
       },
       add() {
         this.formInline = {}
+        this.type = 'add'
+        this.getForm()
       },
-      StandardselectionChange(id){
+      StandardselectionChange(value, id) {
-        this.formInline.replace_standard_id = id
+        this.formInline[value + '_id'] = id
-      },
+      }
     }
   }
 </script>
@@ -590,7 +598,7 @@
 
   .button-text {
     height: 38px;
-    width: calc(100% - 120px);
+    width: calc(100% - 100px);
     line-height: 38px;
     background: #fff;
     border: 1px #00B3BE solid;

jero-web/src/components/search/index.vue

@@ -53,7 +53,7 @@
           </div>
         </template>
       </a-col>
-      <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
+      <span style="float: right;overflow: hidden;margin-right: 11px" class="table-page-search-submitButtons">
                <a-col :md="6" :sm="24">
                   <a-button class="box-button" type="primary" @click="searchQuery">{{$t('query')}}</a-button>
                   <a-button class="box-button" style="margin-left: 8px" @click="searchReset">{{$t('reset')}}</a-button>

jero-web/src/components/tableDate/index.vue

@@ -15,11 +15,11 @@
         <span slot="operation" slot-scope="record">
                      <a class="text" v-for="(ol,index) in OperationList"
                         @click="OperationClick(ol,record)">
-                        <span v-if="ol.text == '取消收藏'">
+                        <span v-if="ol.text == $t('CancelCollection')">
-                                    {{!record.collectFlag || record.collectFlag == 0 ? '收藏' :'取消收藏'}}
+                                    {{!record.collectFlag || record.collectFlag == 0 ? $t('Collection') :$t('CancelCollection')}}
                         </span>
-                        <span v-else-if="ol.text == '取消订阅'">
+                        <span v-else-if="ol.text == $t('CancelSubscribe')">
-                                    {{!record.subscribeFlag || record.subscribeFlag == 0 ? '订阅' :'取消订阅'}}
+                                    {{!record.subscribeFlag || record.subscribeFlag == 0 ? $t('subscribe') :$t('CancelSubscribe')}}
                        </span>
                         <span v-else>
                                {{ol.text}}
@@ -187,9 +187,6 @@
         postAction(this.url.tableList, params).then((res) => {
           if (res.success) {
             this.dataSource = res.result.records
-            this.dataSource.forEach((val) => {
-              val.function_territory = val.function_territory + 'dsfsdfs 收到付款了山东黄搞定；分两个地方骨科大夫的咖啡馆里的法国金弗兰克是的积分流口水的房间的斯洛伐克第三方'
-            })
             this.total = res.result.total
             this.loading = false
           } else {

jero-web/src/components/uploadFile/file.vue

@@ -14,7 +14,7 @@
       :remove='remove'
       @change="handleChange">
       <p><a-icon style="font-size: 67px;color: #c0c4cc;" type="cloud-upload" /></p>
-      <p class="ant-upload-text" style="font-size: 14px;line-height: 30px">点击上传</p>
+      <p class="ant-upload-text" style="font-size: 14px;line-height: 30px">{{this.$t('clickUpload')}}</p>
     </a-upload-dragger>
   </a-modal>
 </div>
@@ -29,7 +29,7 @@
     data(){
        return{
          visible:false,
-         title:'上传文件',
+         title:this.$t('clickUpload'),
          uploadAction:window._CONFIG['domianURL']+"/sys/common/upload",
          myuploadAction:window._CONFIG['domianURL']+this.thisFileUploadUrl,
          upDataList:[],

jero-web/src/views/documentManage/library/docDetail/index.vue

@@ -4,28 +4,28 @@
       <div class="doc-detail-header">
         <div class="doc-detail-title">
           <a-icon type="home" style="margin-right: 4px"/>
-          {{this.$route.query.serial_number}} 《{{this.$route.query.title}}》 标准详情
+          {{this.$route.query.serial_number}} 《{{this.$route.query.title}}》 {{$t('StandardDetails')}}
         </div>
         <div class="doc-detail-right">
           <div @click="UpdateLog" class="operator-text">
             <a-icon type="reload"/>
-            更新log
+            {{$t('UpdateLog')}}
           </div>
           <div @click="DocumentSplitting" class="operator-text">
             <a-icon type="codepen"/>
-            文档拆分
+            {{$t('DocumentSplitting')}}
           </div>
           <div @click="UpdateLog" class="operator-text">
             <a-icon type="file-pdf"/>
-            文档翻译
+            {{$t('DocumentTranslation')}}
           </div>
           <div @click="UpdateLog" class="operator-text">
             <a-icon type="wallet"/>
-            文档对比
+            {{$t('DocumentComparison')}}
           </div>
           <div @click="UpdateLog" class="operator-text">
             <a-icon type="folder"/>
-            知识问答库
+            {{$t('KnowledgeDatabase')}}
           </div>
         </div>
       </div>
@@ -34,13 +34,13 @@
           <div class="header-text">
             {{val}}
           </div>
-          <div class="content-text" v-if="val == '基本信息'">
+          <div class="content-text" v-if="val == $t('essentialInformation')">
             <div class="text-field" v-for="(ol,index1) in item[val]">
               <span class="text-field-left">{{ol.db_field_txt}}</span>
               <span class="text-field-right">{{ol.value ? ol.value : '--'}}</span>
             </div>
           </div>
-          <div class="TextInformation" v-if="val == '文本信息'">
+          <div class="TextInformation" v-if="val == $t('textInformation')">
             <div class="TextInformationContent" v-for="(ol,index1) in item[val]" style="width: 100%">
               <span class="TextInformationContentLeft">
                  <span>{{ol.db_field_txt}}</span>
@@ -51,12 +51,12 @@
                 </span>
               <span class="TextInformationContentright" v-show="ol.value" @click="download(ol.value)">
                 <a-icon type="vertical-align-bottom"/>
-                   下载
+                   {{$t('download')}}
               </span>
               </span>
             </div>
           </div>
-          <div class="TextInformation" v-else-if="val == '关联信息'">
+          <div class="TextInformation" v-else-if="val == $t('relatedInformation')">
             <div class="TextInformationContent" v-for="(ol,index1) in item[val]" style="width: 100%">
                    <span class="TextInformationContentLeft">
                          {{ol.db_field_txt}}
@@ -347,7 +347,8 @@
             font-weight: 400;
             text-align: center;
           }
-          .TextInformationContentcontentButton{
+
+          .TextInformationContentcontentButton {
             width: calc(100% - 268px);
             border-top: 1px #eff1f3 solid;
             border-left: 1px #eff1f3 solid;

jero-web/src/views/documentManage/library/index.vue

@@ -90,19 +90,19 @@
       return {
         OperationList: [
           {
-            text: '取消收藏',
+            text: this.$t('CancelCollection'),
             ClickEvent: 'Collection'
           },
           {
-            text: '取消订阅',
+            text: this.$t('CancelSubscribe'),
             ClickEvent: 'subscribe'
           },
           {
-            text: '编辑',
+            text: this.$t('edit'),
             ClickEvent: 'editTable'
           },
           {
-            text: '删除',
+            text: this.$t('deleteLib'),
             ClickEvent: 'deleteTable'
           }
         ],
@@ -146,7 +146,7 @@
         let query = {
           ...this.$refs.searchRef.queryParam,
           id: this.idList.join(','),
-          flag:'file'
+          flag: 'file'
         }
         downloadFile('document/bussDocumentLibraryEO/exportZip', '文档库.zip', query, this.Deselect)
       },
@@ -163,7 +163,7 @@
         if (this.idList.length > 0) {
           let _this = this
           this.$confirm({
-            content: '确认删除？',
+            content: _this.$t('ConfirmBatchDeletion'),
             onOk() {
               deleteAction(_this.url.deleteBatch, { ids: _this.idList.join(',') }).then((res) => {
                 if (res.success) {
@@ -198,7 +198,7 @@
       deleteTable(val) {
         let _this = this
         this.$confirm({
-          content: '确认删除？',
+          content: _this.$t('ConfirmDelete'),
           onOk() {
             deleteAction(_this.url.deleteBatch, { ids: val.id }).then((res) => {
               if (res.success) {
@@ -215,7 +215,7 @@
       Collection(val) {
         let _this = this
         this.$confirm({
-          content: val.collectFlag == 0 || !val.collectFlag ? '确认收藏？' : '确定取消收藏？',
+          content: val.collectFlag == 0 || !val.collectFlag ? _this.$t('ConfirmCollection') : _this.$t('cancelConfirmCollection'),
           onOk() {
             let url = ''
             if (val.collectFlag == 0 || !val.collectFlag) {
@@ -238,7 +238,7 @@
       subscribe(val) {
         let _this = this
         this.$confirm({
-          content: val.subscribeFlag == 0 || !val.subscribeFlag ? '确认订阅？' : '确定取消订阅？',
+          content: val.subscribeFlag == 0 || !val.subscribeFlag ? _this.$t('ConfirmSubscribe') : _this.$t('cancelConfirmSubscribe'),
           onOk() {
             let url = ''
             if (val.subscribeFlag == 0 || !val.subscribeFlag) {

jero-web/src/views/documentManage/library/modules/addForm.vue

@@ -59,14 +59,14 @@
         this.visible = false
       },
       add() {
-        this.title = '新增'
+        this.title = this.$t('add')
         this.visible = true
         this.$nextTick(() => {
           this.$refs.addFormDataRef.add()
         })
       },
       edit(item) {
-        this.title = '编辑'
+        this.title = this.$t('edit')
         this.visible = true
         this.$nextTick(() => {
           this.$refs.addFormDataRef.edit(item)

jero-web/src/views/documentManage/ocr/modules/docTable.vue

@@ -4,7 +4,6 @@
         class="doc-table-drawer"
         title="调取已入库文件"
         placement="right"
-        v-if="visible"
         :visible="visible"
         :after-visible-change="afterVisibleChange"
         @close="onClose"
@@ -12,46 +11,54 @@
       >
         <div class="doc-table-content">
           <div class="doc-header">
-            <a-form layout="inline" v-model="queryParams" @keyup.enter.native="searchQuery(queryParams)">
+            <search :url="url" :flag="'condition'"></search>
-              <a-row :gutter="24">
+<!--            <a-form layout="inline" v-model="queryParams" @keyup.enter.native="searchQuery(queryParams)">-->
-                <a-col :md="6" :sm="12">
+<!--              <a-row :gutter="24">-->
-                  <a-form-item :label="'编号'">
+<!--                <a-col :md="6" :sm="12">-->
-                    <j-input :placeholder="'请输入编号'" v-model="queryParams.serialNumber"></j-input>
+<!--                  <a-form-item :label="'编号'">-->
-                  </a-form-item>
+<!--                    <j-input :placeholder="'请输入编号'" v-model="queryParams.serialNumber"></j-input>-->
-                </a-col>
+<!--                  </a-form-item>-->
-                <a-col :md="6" :sm="12">
+<!--                </a-col>-->
-                  <a-form-item :label="'标题'">
+<!--                <a-col :md="6" :sm="12">-->
-                    <j-input :placeholder="'请输入标题'" v-model="queryParams.title"></j-input>
+<!--                  <a-form-item :label="'标题'">-->
-                  </a-form-item>
+<!--                    <j-input :placeholder="'请输入标题'" v-model="queryParams.title"></j-input>-->
-                </a-col>
+<!--                  </a-form-item>-->
-                <a-col :md="6" :sm="8">
+<!--                </a-col>-->
-                  <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
+<!--                <a-col :md="6" :sm="8">-->
-                    <a-button type="primary" @click="searchQuery" icon="search">{{$t('query')}}</a-button>
+<!--                  <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">-->
-                    <a-button @click="searchReset" icon="reload" style="margin-left: 8px">清空</a-button>
+<!--                    <a-button type="primary" @click="searchQuery" icon="search">{{$t('query')}}</a-button>-->
-                  </span>
+<!--                    <a-button @click="searchReset" icon="reload" style="margin-left: 8px">清空</a-button>-->
-                </a-col>
+<!--                  </span>-->
-              </a-row>
+<!--                </a-col>-->
-            </a-form>
+<!--              </a-row>-->
+<!--            </a-form>-->
           </div>
         </div>
         <div class="doc-table-detail">
-          <a-table bordered :data-source="tableSource" :columns="columns" :row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }" class="tag-con-table" :pagination="false" >
+          <tableData
-            <span slot="num" slot-scope="text,records,index">
+            :flag="'header'"
-              {{ (queryParams.pageNo-1)*queryParams.pageSize+Number(index)+1 }}
+            :url="url"
-            </span>
+            :showAction="false"
-          </a-table>
+            @onSelectChange="onSelectChange"
-          <div class="page" v-if="tableSource.length > 0">
+          />
-            <a-pagination
-              :show-total="total => `共 ${total} 条`"
-              show-quick-jumper
-              show-size-changer
-              :page-size.sync="queryParams.pageSize"
-              :total="total"
-              @change="onChangePage"
-              @showSizeChange="SizeChange"
-            />
-          </div>
         </div>
+<!--          <a-table bordered :data-source="tableSource" :columns="columns" :row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }" class="tag-con-table" :pagination="false" >-->
+<!--            <span slot="num" slot-scope="text,records,index">-->
+<!--              {{ (queryParams.pageNo-1)*queryParams.pageSize+Number(index)+1 }}-->
+<!--            </span>-->
+<!--          </a-table>-->
+<!--          <div class="page" v-if="tableSource.length > 0">-->
+<!--            <a-pagination-->
+<!--              :show-total="total => `共 ${total} 条`"-->
+<!--              show-quick-jumper-->
+<!--              show-size-changer-->
+<!--              :page-size.sync="queryParams.pageSize"-->
+<!--              :total="total"-->
+<!--              @change="onChangePage"-->
+<!--              @showSizeChange="SizeChange"-->
+<!--            />-->
+<!--          </div>-->
+<!--        </div>-->
         <div class="doc-table-footer">
           <a-button type="primary" class="btn-export" @click="tableExport">导入</a-button>
           <a-button type="primary" @click="onClose">取消</a-button>
@@ -62,8 +69,15 @@
 
 <script>
   import { getAction, postAction, deleteAction } from '@/api/manage'
+  import search from '@/components/search/index'
+  import tableData from '@/components/tableDate/index'
   export default {
     name: 'docTable',
+    components:{
+      search,
+      tableData,
+
+    },
     props:{
       drawVisible:Boolean,
       drawTableSorce:Array,
@@ -79,6 +93,7 @@
           title:''
         },
         total:0,
+        OperationList:[],
         ipagination: {
           defaultPageSize: 10,
           defaultCurrent: 1,
@@ -137,11 +152,18 @@
             ellipsis: true,
           },
         ],
+        url:{
+          tableHeader: 'document/bussDocumentLibraryEO/getHeaderOrConditionForOcr',      //表格头部字段
+          seachList: 'document/bussDocumentLibraryEO/getHeaderOrConditionForOcr',   //搜索字段
+          tableList: 'document/bussDocumentLibraryEO/ocrPageInfo',         //表格数据
+          // getAddForm: 'ocr/ocrRecord/getForm',   // 表单的字段
+          // addInfo: 'ocr/OcrRestful/addOcrRecord',      //新增
+        }
       }
     },
     mounted() {
       this.visible=this.drawVisible
-      this.loadData()
+      // this.loadData()
       // this.tableSource= [...this.drawTableSorce]
     },
     methods: {
@@ -172,6 +194,7 @@
 
       },
       onSelectChange(rowKeys){
+
         console.log('key',rowKeys)
       },
       //点击页数
@@ -212,4 +235,14 @@
       margin-right: 20px;
     }
   }
+
+</style>
+
+<style lang="less">
+
+  .doc-header{
+    .table-page-search-submitButtons{
+      float: none!important;
+    }
+  }
 </style>

jero-web/src/views/documentManage/tags/dialog/dicList.vue

@@ -30,11 +30,11 @@
             :wrapper-col="wrapperCol"
 
           >
-            <a-form-model-item label="名称" prop="dictName">
+            <a-form-model-item label="名称" prop="itemText">
-              <a-input v-model="form.dictName" placeholder="请输入名称" />
+              <a-input v-model="form.itemText" placeholder="请输入名称" />
             </a-form-model-item>
-            <a-form-model-item label="英文名称" prop="dictEnName">
+            <a-form-model-item label="英文名称" prop="itemValue">
-              <a-input v-model="form.dictEnName" placeholder="请输入英文名称" />
+              <a-input v-model="form.itemValue" placeholder="请输入英文名称" />
             </a-form-model-item>
             <a-form-model-item label="父级名称" prop="dictCode" v-if="parentVisible">
               <a-tree-select
@@ -87,14 +87,16 @@
         form:{},
         newVisible:false,
         rules:{
-          dictName:[
+          itemText:[
-              { required: true, message: '请输入展示区域', trigger: 'blur' },
+              { required: true, message: '请输入名称', trigger: 'blur' },
               { min:1, max: 30, message: '长度在 1 - 30字符', trigger: 'blur' },
             ],
-          dictEnName:[
+          itemValue:[
+            { required: true, message: '请输入英文名称', trigger: 'blur' },
               { min:1, max: 100, message: '长度在 1 - 100字符', trigger: 'blur' },
             ],
           description:[
+            { required: true, message: '请输入描述', trigger: 'blur' },
               { min:1, max: 300, message: '长度在 1 - 300字符', trigger: 'blur' },
             ]
         },
@@ -154,24 +156,45 @@
     },
     mounted() {
       this.loadData()
+      this.getParents()
     },
     methods:{
+      //获取父级列表
+      getParents(){
+        let params={
+          sysDictId:this.record.id
+        }
+        getAction(`sys/dict/loadDictItem`,params).then(res=>{
+          if(res.success){
+
+          }
+        })
+      },
       //获取列表数据
       loadData(){
         this.dataFlag=false
-        let params={
+        if(this.dictVal=='list'){
-          ...this.queryParams,
+          let params={
-          dictId:this.record.id
+            ...this.queryParams,
-        }
+            dictId:this.record.id
-        getAction(`sys/dictItem/page`,params).then(res=>{
+          }
-          if(res.success){
+
-            this.total=res.result.total
+          getAction(`sys/dictItem/page`,params).then(res=>{
-            if(this.dictVal=='list'){
+            if(res.success){
+              this.total=res.result.total
               this.tableData=[...res.result.records]
               this.dataFlag=true
             }
-          }
+
-        })
+          })
+        }else if(this.dictVal=='tree'){
+          getAction(`sys/category/rootList`,{
+            sysDictId:this.record.id
+          }).then(res=>{
+
+          })
+        }
+
       },
       //搜索
       search(){
@@ -200,19 +223,26 @@
       hideModal(){
         let params={
           ...this.form,
-
+          dictId:this.record.id
         }
         if(this.isEdit){
-          params.dictId=this.record.id
+          putAction(`sys/dictItem/edit`,params).then(res=>{
-          putAction(``,params).then(res=>{
             if(res.success){
+              this.$message.success(res.message)
               this.loadData()
+              this.newVisible=false
+            }else{
+              this.$message.warning(res.message)
             }
           })
         }else{
           postAction(`sys/dictItem/add`,params).then(res=>{
             if(res.success){
+              this.$message.success(res.message)
               this.loadData()
+              this.newVisible=false
+            }else{
+              this.$message.warning(res.message)
             }
           })
         }
@@ -223,6 +253,7 @@
       },
       //列表编辑
       editDict(rec,val){
+        this.isEdit=true
         this.form={...rec}
         this.newVisible=val
         this.parentVisible=false

jero-web/src/views/documentTools/searchCenter/index.vue

@@ -38,13 +38,13 @@
         <div class="search-center-content">
           <div class="search-con-header">
             <div class="search-header-left">
-              <a-tabs default-active-key="全部" @change="callback">
+              <a-tabs :default-active-key="$t('whole')" @change="callback">
-                <a-tab-pane key="全部" tab="全部"></a-tab-pane>
+                <a-tab-pane :key="$t('whole')" :tab="$t('whole')"></a-tab-pane>
-                <a-tab-pane key="文档库" tab="文档库" force-render>
+                <a-tab-pane :key="$t('DocumentLibrary')" :tab="$t('DocumentLibrary')" force-render>
                 </a-tab-pane>
-                <a-tab-pane key="知识问题库" tab="知识问题库"></a-tab-pane>
+                <a-tab-pane :key="$t('KnowledgeDatabase')" :tab="$t('KnowledgeDatabase')"></a-tab-pane>
-                <a-tab-pane key="文档对比库" tab="文档对比库"></a-tab-pane>
+                <a-tab-pane :key="$t('DocumentComparisonLibrary')" :tab="$t('DocumentComparisonLibrary')"></a-tab-pane>
-                <a-tab-pane key="周报" tab="周报"></a-tab-pane>
+                <a-tab-pane :key="$t('weekly')" :tab="$t('weekly')"></a-tab-pane>
               </a-tabs>
             </div>
           </div>
@@ -585,6 +585,7 @@
               position: relative;
               padding: 26px 0 22px 0;
               box-sizing: border-box;
+
               .search-text-title {
                 padding: 0 0 22px 0;
 
@@ -635,7 +636,7 @@
 
               .search-text-list {
                 ul {
-                  padding:0 0 0 18px;
+                  padding: 0 0 0 18px;
                   margin: 0;
 
                   li {
@@ -695,9 +696,10 @@
     box-sizing: border-box;
     margin-left: 38px;
   }
-  .text-right-right{
+
+  .text-right-right {
     border-left: 2px solid #E6E7EC;
-    padding: 24px 0 24px 24px!important;
+    padding: 24px 0 24px 24px !important;
     box-sizing: border-box;
   }
 </style>