diff --git a/jero-boot/db/蔚来标准sql/dev_third_record.sql b/jero-boot/db/蔚来标准sql/dev_third_record.sql
index f52e1d14e..6a24c7bd5 100644
--- a/jero-boot/db/蔚来标准sql/dev_third_record.sql
+++ b/jero-boot/db/蔚来标准sql/dev_third_record.sql
@@ -958,3 +958,11 @@ DROP INDEX `uniq_sys_user_work_no`;
-- 工作流 流程表增加流程名称 英文字段 2022-08-19 已同步生产环境
ALTER TABLE `laws_weilai_wkflow`.`bus_process_name`
ADD COLUMN `PRC_NAME_EN` varchar(255) NULL COMMENT '流程名称(英文)' AFTER `PROJECT_LAWS_INVENTORY_ID`;
+
+-- 法规月报填写 新增字段 2022-08-25 未同步生产环境
+ALTER TABLE `laws_weilai`.`laws_monthly_report_write`
+ADD COLUMN `related_areas_cn` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '相关领域中文' AFTER `export_state`,
+ADD COLUMN `related_areas_en` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '相关领域英文' AFTER `related_areas_cn`,
+ADD COLUMN `source_cn` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '来源中文' AFTER `related_areas_en`,
+ADD COLUMN `time` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '日期' AFTER `source_cn`,
+ADD COLUMN `source_en` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '来源英文' AFTER `time`;
diff --git a/jero-boot/jero-boot-modules/pom.xml b/jero-boot/jero-boot-modules/pom.xml
index 98a1510d4..1f4c12fa2 100644
--- a/jero-boot/jero-boot-modules/pom.xml
+++ b/jero-boot/jero-boot-modules/pom.xml
@@ -125,6 +125,20 @@
cn.afterturn
easypoi-base
3.2.0
+
+
+ org.apache.poi
+ poi-ooxml-schemas
+
+
+ org.apache.poi
+ poi-ooxml
+
+
+ org.apache.poi
+ poi
+
+
cn.afterturn
@@ -220,6 +234,12 @@
hanlp
portable-1.7.5
+
+ org.apache.xmlbeans
+ xmlbeans
+ 2.6.0
+ compile
+
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/ProblemKnowledgeBaseEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/ProblemKnowledgeBaseEOServiceImpl.java
index e1e298f70..087d3aabf 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/ProblemKnowledgeBaseEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/ProblemKnowledgeBaseEOServiceImpl.java
@@ -92,7 +92,7 @@ public class ProblemKnowledgeBaseEOServiceImpl extends ServiceImpl problemTypeList = Arrays.asList(problem_type.split(","));
+
+ Map problemTypeKeyMap = new HashMap<>();
+ Map problemTypeMatchMap = new HashMap<>();
+ problemTypeKeyMap.put("problem_type", problemTypeList);
+ problemTypeMatchMap.put("terms",problemTypeKeyMap);
+ queryMapJson.add(problemTypeMatchMap);
}
//封装市场选择框查询条件。
diff --git a/jero-web/src/components/globalAdvancedQuery/index.vue b/jero-web/src/components/globalAdvancedQuery/index.vue
index 8c59e085a..1d414485c 100644
--- a/jero-web/src/components/globalAdvancedQuery/index.vue
+++ b/jero-web/src/components/globalAdvancedQuery/index.vue
@@ -178,6 +178,7 @@
v-model="item.val"
:options="item.options"
allowClear
+ class="item-input"
:placeholder="$t('pleaseSelect')"
:mode="allowMultiple(item)?'multiple':''"
/>
@@ -191,12 +192,14 @@
item.val=value"/>
-
+
{{$t('yes')}}
{{$t('not')}}
-
+
@@ -748,4 +751,10 @@
::v-deep .ant-modal-body{
overflow-y: visible!important;
}
+ .item-input{
+ height: 38px;
+ }
+ ::v-deep .ant-select{
+ height: 38px;
+ }
\ No newline at end of file
diff --git a/jero-web/src/views/documentManage/splitting/modules/SplitAddForm.vue b/jero-web/src/views/documentManage/splitting/modules/SplitAddForm.vue
index 5c9a49c3b..dc02a0bb9 100644
--- a/jero-web/src/views/documentManage/splitting/modules/SplitAddForm.vue
+++ b/jero-web/src/views/documentManage/splitting/modules/SplitAddForm.vue
@@ -1324,6 +1324,18 @@
border: 1px #00B3BE solid;
color: #00B3BE;
}
+
+ ::v-deep .ant-select-tree {
+ width: auto;
+ height: 300px;
+ overflow: auto;
+ position: absolute;
+ /*background: #fff;*/
+ }
+
+ ::v-deep .ant-select-tree-dropdown {
+ min-height: 320px;
+ }