Merge remote-tracking branch 'origin/dev_third_stage' into dev_third_stage

jero-boot/db/蔚来标准sql/laws_weilai_stand.sql

@@ -10,7 +10,7 @@ Target Server Type    : MYSQL
 Target Server Version : 50733
 File Encoding         : 65001
 
-Date: 2022-06-17 17:16:49
+Date: 2022-06-18 16:09:03
 */
 
 SET FOREIGN_KEY_CHECKS=0;
@@ -343,7 +343,7 @@ CREATE TABLE `home_document_dynamic` (
   `update_time` datetime DEFAULT NULL COMMENT '更新日期',
   `sys_org_code` varchar(64) DEFAULT NULL COMMENT '所属部门',
   `msg_content` varchar(1000) DEFAULT NULL COMMENT '消息内容',
-  `msg_content_info` varchar(1000) DEFAULT NULL COMMENT '消息详情',
+  `msg_content_info` varchar(4000) DEFAULT NULL COMMENT '消息详情',
   PRIMARY KEY (`id`) USING BTREE
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC;
 
@@ -1347,7 +1347,7 @@ INSERT INTO `onl_cgform_field` VALUES ('14990381dc845a9198a4128ed1b59218', '4028
 INSERT INTO `onl_cgform_field` VALUES ('14ab86b4d9de68bc3eb01af6b07eaf51', 'adf3934df41447aba921e5466f23dfff', 'attestation_rank', 'aaaa', '认证级别', '20', null, '0', '1', 'string', '100', '0', '', '', '', '', 'text', '', '120', null, '0', '', '', '0', '1', '1', '0', 'single', '', '', 'admin', '2022-04-11 15:39:04', '2022-04-08 17:18:31', 'admin', '', '', '', '', '', 'text', '0', null, null, '0', null, null, null, null, null, null);
 INSERT INTO `onl_cgform_field` VALUES ('14c7e5062e0fb7f5db5138acc6bede28', '402813817eebc6c9017eebc6d4bc0004', 'id_type', null, '主键类型', '11', 'id_type', '0', '1', 'string', '100', '0', null, null, null, null, 'text', null, '120', null, '0', null, null, '0', '1', '1', '0', 'single', null, null, null, null, '2022-02-12 10:33:04', 'admin', null, null, null, null, null, null, null, null, null, null, null, null, null, '0', null, null);
 INSERT INTO `onl_cgform_field` VALUES ('1501848401568935937', '48308196e7b04761b533dc31bc899707', 'title_en', 'English Title', '英文标题', '4', null, '0', '1', 'String', '200', '0', null, null, null, null, '1', null, null, null, '1', null, null, '1', '1', '1', '1', null, null, null, 'admin', '2022-06-06 16:05:28', null, null, null, null, null, null, null, null, null, null, null, null, '1499657602378825729', '1', '1', '0', '1', null);
-INSERT INTO `onl_cgform_field` VALUES ('1506541101228556290', '48308196e7b04761b533dc31bc899707', 'xin1_che1_xing2_shi2_shi1_ri4_qi1', 'New Type Execution Date', '新车型实施日期', '11', null, '0', '1', 'Date', '50', '0', null, '', null, null, '5', null, null, null, '1', null, null, '1', '1', '0', '1', null, null, null, 'admin', '2022-06-06 16:05:28', null, null, null, null, null, null, null, null, null, null, null, null, '1499657602378825729', '1', '1', '0', '1', '1493782653286047745');
+INSERT INTO `onl_cgform_field` VALUES ('1506541101228556290', '48308196e7b04761b533dc31bc899707', 'xin1_che1_xing2_shi2_shi1_ri4_qi1', 'New Type Execution Date', '新车型实施日期', '11', null, '0', '1', 'Date', '50', '0', null, '', null, null, '5', null, null, null, '0', null, null, '1', '1', '0', '1', null, null, null, 'admin', '2022-06-06 16:05:28', null, null, null, null, null, null, null, null, null, null, null, null, '1499657602378825729', '1', '1', '0', '1', '1493782653286047745');
 INSERT INTO `onl_cgform_field` VALUES ('1529373706885799937', 'c998a34ea4b84089932197ed0705c757', 'zhan3_shi4_shun4_xu4', 'sortNumber', '展示顺序', '11', null, '0', '1', 'Double', '100', '0', null, null, null, null, '2', null, null, null, '1', null, null, '0', '1', '1', '1', null, null, null, 'ning.chen', '2022-05-25 16:08:01', '2022-05-25 16:08:01', 'ning.chen', null, null, null, null, null, null, null, null, null, null, null, null, null, '0', '0', null);
 INSERT INTO `onl_cgform_field` VALUES ('157f9119129a2126fd15dc127b9f6f6c', 'a234bb12c0174f9d9d451ae138169b6a', 'content_json', 'aaaa', '内容', '9', null, '0', '1', 'Text', '0', '0', '', '', '', '', 'text', '', '120', null, '0', '', '', '0', '1', '1', '0', 'single', '', '', null, null, '2022-04-11 17:32:20', 'admin', '', '', '', '', '', 'text', '0', null, null, '0', null, null, null, null, null, null);
 INSERT INTO `onl_cgform_field` VALUES ('15ae6e3fcd884d85af9816b49750ee49', '248649d82150438c85819e0ccec85f34', 'page_count', 'aaaa', '页数', '12', null, '0', '1', 'int', '10', '0', '', '', '', '', 'text', '', '120', null, '0', '', '', '0', '1', '1', '0', 'single', '', '', 'admin', '2022-03-02 23:32:49', '2022-03-02 15:34:33', 'admin', '', '', '', '', '', 'text', '0', null, null, '0', null, null, null, null, null, null);
@@ -2130,7 +2130,7 @@ INSERT INTO `onl_cgform_field` VALUES ('c9d6effa04a4e92baf450d293514a815', '91c6
 INSERT INTO `onl_cgform_field` VALUES ('ca3c1eaf0077f5d337e92809c0e76fc8', '90492909f5e047988a55c3cca893983e', 'state', 'aaaa', '标识', '11', null, '0', '1', 'string', '10', '0', '', '', '', '', 'text', '', '120', null, '0', '', '', '0', '1', '1', '0', 'single', '', '', 'admin', '2022-05-24 16:24:12', '2022-05-24 15:08:56', 'admin', '', '', '', '', '', 'text', '0', null, null, '0', null, null, null, null, null, null);
 INSERT INTO `onl_cgform_field` VALUES ('ca5d185bb3b6afcc375870c4f871ae30', '891a5f26e9224ddfb811441c1947d20e', 'create_time', 'aaaa', '创建日期', '3', null, '0', '1', 'Date', '20', '0', '', '', '', '', 'datetime', '', '120', null, '0', '', '', '0', '0', '0', '0', 'single', '', '', 'admin', '2022-05-18 11:14:18', '2022-05-18 10:49:36', 'admin', '', '', '', '', '', null, '0', null, null, '0', null, null, null, '0', null, null);
 INSERT INTO `onl_cgform_field` VALUES ('caa78827083a8ba676af5ba0700c90a1', '08a0edb01bb148899530be6e981791bc', 'creation_time', 'aaaa', '创建日期', '3', null, '0', '1', 'Date', '20', '0', '', '', '', '', 'datetime', '', '120', null, '0', '', '', '0', '0', '0', '0', 'single', '', '', 'admin', '2022-03-02 23:30:18', '2022-03-02 15:58:19', 'admin', '', '', '', '', '', null, '0', null, null, '0', null, null, null, null, null, null);
-INSERT INTO `onl_cgform_field` VALUES ('caae2c9872fabf006080d78dcad188a6', '48308196e7b04761b533dc31bc899707', 'issue_time', 'Issue Date', '发布日期', '10', null, '0', '1', 'Date', '0', '0', '', '', '', '', '5', '', '120', null, '1', '', '', '1', '1', '1', '1', 'single', '', '', 'admin', '2022-06-06 16:05:28', '2022-01-21 14:37:40', 'admin', '', '', '', '', '', 'date', '0', null, null, '0', '1499657602378825729', '0', '1', '0', '1', null);
+INSERT INTO `onl_cgform_field` VALUES ('caae2c9872fabf006080d78dcad188a6', '48308196e7b04761b533dc31bc899707', 'issue_time', 'Issue Date', '发布日期', '10', null, '0', '1', 'Date', '0', '0', '', '', '', '', '5', '', '120', null, '0', '', '', '1', '1', '1', '1', 'single', '', '', 'admin', '2022-06-06 16:05:28', '2022-01-21 14:37:40', 'admin', '', '', '', '', '', 'date', '0', null, null, '0', '1499657602378825729', '0', '1', '0', '1', null);
 INSERT INTO `onl_cgform_field` VALUES ('caf689f3d260bf4041e4fb2938c134bc', '402813817eebc6c9017eebc6cffa0002', 'index_name', null, '索引名称', '3', 'index_name', '0', '1', 'string', '100', '0', null, null, null, null, 'text', null, '120', null, '0', null, null, '0', '1', '1', '0', 'single', null, null, null, null, '2022-02-12 10:33:02', 'admin', null, null, null, null, null, null, null, null, null, null, null, null, null, '0', null, null);
 INSERT INTO `onl_cgform_field` VALUES ('cb467de83e159204955a4e5fe2e97658', 'b78987f2cce64d0dbd98fceec73e824e', 'sys_org_code', 'aaaa', '所属部门', '6', null, '0', '1', 'string', '64', '0', '', '', '', '', 'text', '', '120', null, '0', '', '', '0', '0', '0', '0', 'single', '', '', 'admin', '2022-05-20 13:38:23', '2022-05-20 13:35:01', 'admin', '', '', '', '', '', null, '0', null, null, '0', null, null, null, null, null, null);
 INSERT INTO `onl_cgform_field` VALUES ('cb7da49a981a1b0acc5f7e8a0130bdcd', 'd35109c3632c4952a19ecc094943dd71', 'user_code', null, '用户编码', '11', null, '0', '1', 'String', '32', '0', '', '', '', '', 'text', '', '120', null, '0', '', '', '1', '1', '0', '0', 'single', '', '', 'ning.chen', '2022-05-10 11:24:53', '2019-05-11 16:26:37', 'admin', '', '', '', '', '', null, '0', null, null, '0', null, null, null, '0', null, null);
@@ -3963,9 +3963,7 @@ CREATE TABLE `qrtz_scheduler_state` (
 -- ----------------------------
 -- Records of qrtz_scheduler_state
 -- ----------------------------
-INSERT INTO `qrtz_scheduler_state` VALUES ('MyScheduler', 'DESKTOP-1C20D6T1655456515979', '1655457475134', '10000');
+INSERT INTO `qrtz_scheduler_state` VALUES ('MyScheduler', 'DESKTOP-48T7POT1655451321524', '1655537284521', '10000');
-INSERT INTO `qrtz_scheduler_state` VALUES ('MyScheduler', 'DESKTOP-48T7POT1655451321524', '1655457478061', '10000');
-INSERT INTO `qrtz_scheduler_state` VALUES ('MyScheduler', 'DESKTOP-F68BMEL1655433425835', '1655457475187', '10000');
 
 -- ----------------------------
 -- Table structure for qrtz_simple_triggers
@@ -4042,10 +4040,10 @@ CREATE TABLE `qrtz_triggers` (
 -- ----------------------------
 -- Records of qrtz_triggers
 -- ----------------------------
-INSERT INTO `qrtz_triggers` VALUES ('MyScheduler', 'com.jero.modules.project.job.designComplianceJob', 'DEFAULT', 'com.jero.modules.project.job.designComplianceJob', 'DEFAULT', null, '1655515921000', '-1', '5', 'WAITING', 'CRON', '1655433841000', '0', null, '0', '');
+INSERT INTO `qrtz_triggers` VALUES ('MyScheduler', 'com.jero.modules.project.job.designComplianceJob', 'DEFAULT', 'com.jero.modules.project.job.designComplianceJob', 'DEFAULT', null, '1655602321000', '1655515921000', '5', 'WAITING', 'CRON', '1655433841000', '0', null, '0', '');
-INSERT INTO `qrtz_triggers` VALUES ('MyScheduler', 'com.jero.modules.project.job.InventoryAffirmJob', 'DEFAULT', 'com.jero.modules.project.job.InventoryAffirmJob', 'DEFAULT', null, '1655515861000', '-1', '5', 'WAITING', 'CRON', '1655433825000', '0', null, '0', '');
+INSERT INTO `qrtz_triggers` VALUES ('MyScheduler', 'com.jero.modules.project.job.InventoryAffirmJob', 'DEFAULT', 'com.jero.modules.project.job.InventoryAffirmJob', 'DEFAULT', null, '1655602261000', '1655515861000', '5', 'WAITING', 'CRON', '1655433825000', '0', null, '0', '');
-INSERT INTO `qrtz_triggers` VALUES ('MyScheduler', 'com.jero.modules.project.job.PrehomoJob', 'DEFAULT', 'com.jero.modules.project.job.PrehomoJob', 'DEFAULT', null, '1655515981000', '-1', '5', 'WAITING', 'CRON', '1655433857000', '0', null, '0', '');
+INSERT INTO `qrtz_triggers` VALUES ('MyScheduler', 'com.jero.modules.project.job.PrehomoJob', 'DEFAULT', 'com.jero.modules.project.job.PrehomoJob', 'DEFAULT', null, '1655602381000', '1655515981000', '5', 'WAITING', 'CRON', '1655433857000', '0', null, '0', '');
-INSERT INTO `qrtz_triggers` VALUES ('MyScheduler', 'com.jero.modules.project.job.VerifyComplianceJob', 'DEFAULT', 'com.jero.modules.project.job.VerifyComplianceJob', 'DEFAULT', null, '1655516041000', '-1', '5', 'WAITING', 'CRON', '1655433872000', '0', null, '0', '');
+INSERT INTO `qrtz_triggers` VALUES ('MyScheduler', 'com.jero.modules.project.job.VerifyComplianceJob', 'DEFAULT', 'com.jero.modules.project.job.VerifyComplianceJob', 'DEFAULT', null, '1655602441000', '1655516041000', '5', 'WAITING', 'CRON', '1655433872000', '0', null, '0', '');
 INSERT INTO `qrtz_triggers` VALUES ('MyScheduler', 'com.jero.modules.quartz.job.SampleJob', 'DEFAULT', 'com.jero.modules.quartz.job.SampleJob', 'DEFAULT', null, '1588405730000', '1588405729000', '5', 'PAUSED', 'CRON', '1588405237000', '0', null, '0', '');
 INSERT INTO `qrtz_triggers` VALUES ('MyScheduler', 'com.jero.modules.quartz.job.SampleParamJob', 'DEFAULT', 'com.jero.modules.quartz.job.SampleParamJob', 'DEFAULT', null, '1588405236000', '1588405235000', '5', 'PAUSED', 'CRON', '1588405221000', '0', null, '0', '');
 INSERT INTO `qrtz_triggers` VALUES ('MyScheduler', 'com.jero.modules.space.job.SpaceJobHandler', 'DEFAULT', 'com.jero.modules.space.job.SpaceJobHandler', 'DEFAULT', null, '1655256998000', '1655256993000', '5', 'ERROR', 'CRON', '1655174793000', '0', null, '0', '');
@@ -14401,6 +14399,9 @@ CREATE TABLE `sys_log` (
 -- ----------------------------
 -- Records of sys_log
 -- ----------------------------
+INSERT INTO `sys_log` VALUES ('1537726368656285697', '1', '用户名: 开发管理员,退出成功！', null, 'admin', '开发管理员', '127.0.0.1', null, null, null, null, null, null, '2022-06-17 17:18:31', null, null);
+INSERT INTO `sys_log` VALUES ('1537731151186120706', '1', '用户名: 开发管理员,退出成功！', null, 'admin', '开发管理员', '127.0.0.1', null, null, null, null, null, null, '2022-06-17 17:37:31', null, null);
+INSERT INTO `sys_log` VALUES ('1537731153891446785', '1', '用户名: 开发管理员,退出成功！', null, 'admin', '开发管理员', '127.0.0.1', null, null, null, null, null, null, '2022-06-17 17:37:31', null, null);
 
 -- ----------------------------
 -- Table structure for sys_permission
@@ -14749,7 +14750,6 @@ CREATE TABLE `sys_role_permission` (
 -- ----------------------------
 -- Records of sys_role_permission
 -- ----------------------------
-INSERT INTO `sys_role_permission` VALUES ('0c6b8facbb1cc874964c87a8cf01e4b1', 'f6817f48af4fb3af11b9e8bf182f618b', '841057b8a1bef8f6b4b20f9a618a7fa6', null, null, null);
 INSERT INTO `sys_role_permission` VALUES ('1209423580355481602', 'f6817f48af4fb3af11b9e8bf182f618b', '190c2b43bec6a5f7a4194a85db67d96a', null, null, null);
 INSERT INTO `sys_role_permission` VALUES ('1269526122208522241', 'f6817f48af4fb3af11b9e8bf182f618b', '1267412134208319489', null, null, null);
 INSERT INTO `sys_role_permission` VALUES ('126ea9faebeec2b914d6d9bef957afb6', 'f6817f48af4fb3af11b9e8bf182f618b', 'f1cb187abf927c88b89470d08615f5ac', null, null, null);
@@ -14904,7 +14904,6 @@ INSERT INTO `sys_role_permission` VALUES ('1507175486076260357', '28', '14992127
 INSERT INTO `sys_role_permission` VALUES ('1507175486076260358', '28', '53a9230444d33de28aa11cc108fb1dba', null, '2022-03-25 10:00:12', '180.212.210.237');
 INSERT INTO `sys_role_permission` VALUES ('1507175486076260359', '28', '1371831353354936322', null, '2022-03-25 10:00:12', '180.212.210.237');
 INSERT INTO `sys_role_permission` VALUES ('1507175486076260360', '28', '58857ff846e61794c69208e9d3a85466', null, '2022-03-25 10:00:12', '180.212.210.237');
-INSERT INTO `sys_role_permission` VALUES ('1507175486080454657', '28', '841057b8a1bef8f6b4b20f9a618a7fa6', null, '2022-03-25 10:00:12', '180.212.210.237');
 INSERT INTO `sys_role_permission` VALUES ('1507175486080454658', '28', 'd7d6e2e4e2934f2c9385a623fd98c6f3', null, '2022-03-25 10:00:12', '180.212.210.237');
 INSERT INTO `sys_role_permission` VALUES ('1507175486080454659', '28', '3f915b2769fc80648e92d04e84ca059d', null, '2022-03-25 10:00:12', '180.212.210.237');
 INSERT INTO `sys_role_permission` VALUES ('1507175486080454660', '28', '1260928341675982849', null, '2022-03-25 10:00:12', '180.212.210.237');
@@ -15054,7 +15053,6 @@ INSERT INTO `sys_role_permission` VALUES ('1516352593791504397', '3', '190c2b43b
 INSERT INTO `sys_role_permission` VALUES ('1516352593791504398', '3', '45c966826eeff4c99b8f8ebfe74511fc', null, '2022-04-19 17:46:45', '127.0.0.1');
 INSERT INTO `sys_role_permission` VALUES ('1516352593791504399', '3', '1484415532234330114', null, '2022-04-19 17:46:45', '127.0.0.1');
 INSERT INTO `sys_role_permission` VALUES ('1516352593791504400', '3', '109c78a583d4693ce2f16551b7786786', null, '2022-04-19 17:46:45', '127.0.0.1');
-INSERT INTO `sys_role_permission` VALUES ('1516352593791504401', '3', '841057b8a1bef8f6b4b20f9a618a7fa6', null, '2022-04-19 17:46:45', '127.0.0.1');
 INSERT INTO `sys_role_permission` VALUES ('1516352593791504402', '3', '1192318987661234177', null, '2022-04-19 17:46:45', '127.0.0.1');
 INSERT INTO `sys_role_permission` VALUES ('1516352593799892994', '3', '1485454419484393473', null, '2022-04-19 17:46:45', '127.0.0.1');
 INSERT INTO `sys_role_permission` VALUES ('1516352593799892995', '3', '1485788804943355906', null, '2022-04-19 17:46:45', '127.0.0.1');
@@ -15155,7 +15153,6 @@ INSERT INTO `sys_role_permission` VALUES ('1516355715007942668', '5', '45c966826
 INSERT INTO `sys_role_permission` VALUES ('1516355715007942669', '5', '1484415532234330114', null, '2022-04-19 17:59:10', '127.0.0.1');
 INSERT INTO `sys_role_permission` VALUES ('1516355715007942670', '5', '1500681954729517057', null, '2022-04-19 17:59:10', '127.0.0.1');
 INSERT INTO `sys_role_permission` VALUES ('1516355715007942671', '5', '109c78a583d4693ce2f16551b7786786', null, '2022-04-19 17:59:10', '127.0.0.1');
-INSERT INTO `sys_role_permission` VALUES ('1516355715007942672', '5', '841057b8a1bef8f6b4b20f9a618a7fa6', null, '2022-04-19 17:59:10', '127.0.0.1');
 INSERT INTO `sys_role_permission` VALUES ('1516355715007942673', '5', '1192318987661234177', null, '2022-04-19 17:59:10', '127.0.0.1');
 INSERT INTO `sys_role_permission` VALUES ('1516355715016331265', '5', '1485454419484393473', null, '2022-04-19 17:59:10', '127.0.0.1');
 INSERT INTO `sys_role_permission` VALUES ('1516355715016331266', '5', '1485788804943355906', null, '2022-04-19 17:59:10', '127.0.0.1');
@@ -15250,7 +15247,6 @@ INSERT INTO `sys_role_permission` VALUES ('1516358535471861775', '17', '3f915b27
 INSERT INTO `sys_role_permission` VALUES ('1516358535471861776', '17', '190c2b43bec6a5f7a4194a85db67d96a', null, '2022-04-19 18:10:22', '127.0.0.1');
 INSERT INTO `sys_role_permission` VALUES ('1516358535471861777', '17', '45c966826eeff4c99b8f8ebfe74511fc', null, '2022-04-19 18:10:22', '127.0.0.1');
 INSERT INTO `sys_role_permission` VALUES ('1516358535471861778', '17', '109c78a583d4693ce2f16551b7786786', null, '2022-04-19 18:10:22', '127.0.0.1');
-INSERT INTO `sys_role_permission` VALUES ('1516358535471861779', '17', '841057b8a1bef8f6b4b20f9a618a7fa6', null, '2022-04-19 18:10:22', '127.0.0.1');
 INSERT INTO `sys_role_permission` VALUES ('1516358535480250370', '17', '1192318987661234177', null, '2022-04-19 18:10:22', '127.0.0.1');
 INSERT INTO `sys_role_permission` VALUES ('1516358535480250371', '17', '1485454419484393473', null, '2022-04-19 18:10:22', '127.0.0.1');
 INSERT INTO `sys_role_permission` VALUES ('1516358535480250372', '17', '1500709129079873538', null, '2022-04-19 18:10:22', '127.0.0.1');

jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/controller/ParamsCollectManifestEOController.java

@@ -1,16 +1,24 @@
 package com.jero.modules.cert.collect.controller;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.jero.common.api.vo.Result;
 import com.jero.common.aspect.annotation.AutoLog;
+import com.jero.common.aspect.annotation.PermissionData;
 import com.jero.common.system.base.controller.JeroController;
+import com.jero.common.system.query.QueryGenerator;
 import com.jero.modules.cert.collect.entity.ParamsCollectManifestEO;
 import com.jero.modules.cert.collect.service.IParamsCollectManifestEOService;
 import com.jero.modules.cert.collect.vo.ParamsCollectManifestVO;
 import com.jero.modules.cert.template.entity.ParamsInfoPublishEO;
+import com.jero.modules.system.entity.SysUser;
+import com.jero.modules.system.service.ISysUserService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang.StringUtils;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
@@ -21,6 +29,7 @@ import javax.servlet.http.HttpServletResponse;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
+import java.util.stream.Collectors;
 
 
 /**
@@ -37,6 +46,9 @@ public class ParamsCollectManifestEOController extends JeroController<ParamsColl
 	@Autowired
 	private IParamsCollectManifestEOService paramsCollectManifestEOService;
 
+	@Autowired
+	private ISysUserService sysUserService;
+
 	/**
 	 * 表头中英文切换
 	 *
@@ -265,6 +277,43 @@ public class ParamsCollectManifestEOController extends JeroController<ParamsColl
 		}
 	}
 
+	/**
+	 * 获取用户列表数据
+	 *
+	 * @param user
+	 * @param pageNo
+	 * @param pageSize
+	 * @param req
+	 * @return
+	 */
+	@AutoLog(value = "填写人-分页查询")
+	@ApiOperation(value="填写人-分页查询", notes="填写人-分页查询")
+	@GetMapping(value = "/drePage")
+	public Result<IPage<SysUser>> queryPageList(SysUser user, @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
+												@RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, HttpServletRequest req) {
+		Result<IPage<SysUser>> result = new Result<IPage<SysUser>>();
+		QueryWrapper<SysUser> queryWrapper = QueryGenerator.initQueryWrapper(user, req.getParameterMap());
+		//TODO 外部模拟登陆临时账号，列表不显示
+		queryWrapper.ne("username", "_reserve_user_external");
+		Page<SysUser> page = new Page<SysUser>(pageNo, pageSize);
+		IPage<SysUser> pageList = sysUserService.page(page, queryWrapper);
+
+		//批量查询用户的所属部门
+		//step.1 先拿到全部的 useids
+		//step.2 通过 useids，一次性查询用户的所属部门名字
+		List<String> userIds = pageList.getRecords().stream().map(SysUser::getId).collect(Collectors.toList());
+		if (userIds != null && userIds.size() > 0) {
+			Map<String, String> useDepNames = sysUserService.getDepNamesByUserIds(userIds);
+			pageList.getRecords().forEach(item -> {
+				item.setOrgCodeTxt(useDepNames.get(item.getId()));
+			});
+		}
+		result.setSuccess(true);
+		result.setResult(pageList);
+		log.info(pageList.toString());
+		return result;
+	}
+
 	/**
 	 *  分配工程接口人
 	 *

jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java

@@ -1025,12 +1025,14 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
 	@Override
 	public boolean updateDreBatch(ParamsCollectManifestVO paramsCollectManifestVO) {
 		if (StringUtils.isEmpty(paramsCollectManifestVO.getIds())
-				|| StringUtils.isEmpty(paramsCollectManifestVO.getDre()) || StringUtils.isEmpty(paramsCollectManifestVO.getProjectId())) {
+				|| StringUtils.isEmpty(paramsCollectManifestVO.getDre())
+				|| StringUtils.isEmpty(paramsCollectManifestVO.getProjectId()) || StringUtils.isEmpty(paramsCollectManifestVO.getParamsManifestId())) {
 			throw new JeroBootException("参数不能为空！");
 		}
 		String paramsCollectManifestIds = paramsCollectManifestVO.getIds();
 		String dre = paramsCollectManifestVO.getDre();
 		String projectId = paramsCollectManifestVO.getProjectId();
+		String paramsManifestId = paramsCollectManifestVO.getParamsManifestId();
 
 		String[] paramsCollectManifestIdStr = paramsCollectManifestIds.split(",");
 		List<ParamsCollectManifestEO> updateEOList = new ArrayList<>();
@@ -1052,8 +1054,8 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
 		SysUser sysUser = sysUserService.getUserByName(dre);
 		String[] thirdIds = new String[1];
 		thirdIds[0] = sysUser.getThirdId();
-		String hrefFeishu = backUrl + "/ParameterItemCollection?id=" + projectId; // TODO 后续可能有变动
+		String hrefFeishu = backUrl + "/ParameterItemCollection?id=" + paramsManifestId + "&projectId=" + projectId;
-		String href = "<a href='/ParameterItemCollection?id=" + projectId + "'" + " target='_blank'>the link</a>,";
+		String href = "<a href='/ParameterItemCollection?id=" + paramsManifestId + "&projectId=" + projectId + "'" + " target='_blank'>the link</a>,";
 		String content = connectBuilder.substring(0, connectBuilder.toString().length()-1) + " and other parameter items, please enter the link to handle it.";
 		String contentInfo = connectBuilder.substring(0, connectBuilder.toString().length()-1) + " please enter " + href + " to handle it.";
 		// 发送系统消息
@@ -1080,11 +1082,13 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
 
 	@Override
 	public boolean issueCollection(ParamsCollectManifestVO paramsCollectManifestVO) {
-		if (StringUtils.isEmpty(paramsCollectManifestVO.getIds()) || StringUtils.isEmpty(paramsCollectManifestVO.getProjectId())) {
+		if (StringUtils.isEmpty(paramsCollectManifestVO.getIds())
+				|| StringUtils.isEmpty(paramsCollectManifestVO.getProjectId()) || StringUtils.isEmpty(paramsCollectManifestVO.getParamsManifestId())) {
 			throw new JeroBootException("参数不能为空！");
 		}
 		String paramsCollectManifestIds = paramsCollectManifestVO.getIds();
 		String projectId = paramsCollectManifestVO.getProjectId();
+		String paramsManifestId = paramsCollectManifestVO.getParamsManifestId();
 
 		String[] paramsCollectManifestIdStr = paramsCollectManifestIds.split(",");
 		List<ParamsCollectManifestEO> updateEOList = new ArrayList<>();
@@ -1117,8 +1121,8 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
 			SysUser sysUser = sysUserService.getUserByName(sdt);
 			String[] thirdIds = new String[1];
 			thirdIds[0] = sysUser.getThirdId();
-			String hrefFeishu = backUrl + "/ParameterItemCollection?id=" + projectId; // TODO 后续可能有变动
+			String hrefFeishu = backUrl + "/ParameterItemCollection?id=" + paramsManifestId + "&projectId=" + projectId;
-			String href = "<a href='/ParameterItemCollection?id=" + projectId + "'" + " target='_blank'>the link</a>,";
+			String href = "<a href='/ParameterItemCollection?id=" + paramsManifestId + "&projectId=" + projectId + "'" + " target='_blank'>the link</a>,";
 			String contentInfo = connectBuilder.substring(0, connectBuilder.toString().length()-1) + " and other parameter items, please enter " + href + " and fill in the relevant information.";
 
 			// 发送系统消息

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

@@ -26,6 +26,7 @@ import com.jero.common.util.RedisUtil;
 import com.jero.common.util.oConvertUtils;
 import com.jero.modules.base.service.BaseCommonService;
 import com.jero.modules.system.entity.*;
+import com.jero.modules.system.enums.UserOrDepartEnum;
 import com.jero.modules.system.model.DepartIdModel;
 import com.jero.modules.system.model.SysUserSysDepartModel;
 import com.jero.modules.system.service.*;
@@ -1554,6 +1555,7 @@ public class SysUserController {
                 SysUserDepartVO sysUserDepartVO = new SysUserDepartVO();
                 sysUserDepartVO.setKey(sysDepart.getId());
                 sysUserDepartVO.setTitle(sysDepart.getDepartName());
+                sysUserDepartVO.setFlag(UserOrDepartEnum.USER.getValue());
                 list.add(sysUserDepartVO);
             }
         }
@@ -1562,6 +1564,7 @@ public class SysUserController {
                 SysUserDepartVO sysUserDepartVO = new SysUserDepartVO();
                 sysUserDepartVO.setKey(sysUser.getId());
                 sysUserDepartVO.setTitle(sysUser.getUsername());
+                sysUserDepartVO.setFlag(UserOrDepartEnum.DEPART.getValue());
                 list.add(sysUserDepartVO);
             }
         }

jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/enums/UserOrDepartEnum.java

@@ -0,0 +1,28 @@
+package com.jero.modules.system.enums;
+
+/**
+ * @Author: liyawei
+ * @Description:
+ * @Date: Created in 14:12 2022/5/26
+ */
+public enum UserOrDepartEnum {
+
+    USER("同步部门","USER"),
+    DEPART("同步用户","DEPART");
+
+    private String name;
+    private String value;
+
+    private UserOrDepartEnum(String name, String value) {
+        this.name = name;
+        this.value = value;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public String getValue() {
+        return value;
+    }
+}

jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/vo/SysUserDepartVO.java

@@ -11,6 +11,8 @@ public class SysUserDepartVO {
 
     private String title;
 
+    private String flag; //depart，user 2个属性
+
     public String getKey() {
         return key;
     }
@@ -26,4 +28,12 @@ public class SysUserDepartVO {
     public void setTitle(String title) {
         this.title = title;
     }
+
+    public String getFlag() {
+        return flag;
+    }
+
+    public void setFlag(String flag) {
+        this.flag = flag;
+    }
 }

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

@@ -608,10 +608,6 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
             if ("issue_time".equals(onlCgformField.getDbFieldName())) {
                 map.put("sort", "true");//列表排序标识
             }
-//            if ("issue_time".equals(onlCgformField.getDbFieldName())
-//                    || "implement_time".equals(onlCgformField.getDbFieldName())) {
-//                map.put("sort", "true");//列表排序标识
-//            }
             map.put("db_field_name", onlCgformField.getDbFieldName());//字段
             if (CutEnum.CN.getValue().equals(cut)) {
                 map.put("db_field_txt", onlCgformField.getDbFieldTxt());//字段中文名
@@ -1592,16 +1588,19 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
 
             SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd");
             String issueTime = (String) (map.get("issue_time"));
-            Date issueTimeDate = df.parse(issueTime);
+            Date issueTimeDate = null;
+            if(StringUtils.isNotBlank(issueTime)){
+                issueTimeDate = df.parse(issueTime);
+            }
             String implementTime = (String) map.get("implement_time");//在产车实施日期
             String newCarimplementTime = (String) map.get("xin1_che1_xing2_shi2_shi1_ri4_qi1");//新车型实施日期
-            if (StringUtils.isNotBlank(implementTime)) {
+            if (StringUtils.isNotBlank(implementTime) && ObjectUtils.isNotEmpty(issueTimeDate)) {
                 Date implementTimeDate = df.parse(implementTime);
                 if (issueTimeDate.after(implementTimeDate)) {
                     throw new JeroBootException("发布日期不能大于在产车实施日期");
                 }
             }
-            if (StringUtils.isNotBlank(newCarimplementTime)) {
+            if (StringUtils.isNotBlank(newCarimplementTime) && ObjectUtils.isNotEmpty(issueTimeDate)) {
                 Date newCarimplementTimeDate = df.parse(newCarimplementTime);
                 if (issueTimeDate.after(newCarimplementTimeDate)) {
                     throw new JeroBootException("发布日期不能大于新车型实施日期");
@@ -2201,16 +2200,19 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
         try {
             SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd");
             String issueTime = (String) map.get("issue_time");
-            Date issueTimeDate = df.parse(issueTime);
+            Date issueTimeDate = null;
+            if(StringUtils.isNotBlank(issueTime)){
+                issueTimeDate = df.parse(issueTime);
+            }
             String implementTime = (String) map.get("implement_time");//在产车实施日期
             String newCarimplementTime = (String) map.get("xin1_che1_xing2_shi2_shi1_ri4_qi1");//新车型实施日期
-            if (StringUtils.isNotBlank(implementTime)) {
+            if (StringUtils.isNotBlank(implementTime) && ObjectUtils.isNotEmpty(issueTimeDate)) {
                 Date implementTimeDate = df.parse(implementTime);
                 if (issueTimeDate.after(implementTimeDate)) {
                     throw new JeroBootException("发布日期不能大于在产车实施日期");
                 }
             }
-            if (StringUtils.isNotBlank(newCarimplementTime)) {
+            if (StringUtils.isNotBlank(newCarimplementTime) && ObjectUtils.isNotEmpty(issueTimeDate)) {
                 Date newCarimplementTimeDate = df.parse(newCarimplementTime);
                 if (issueTimeDate.after(newCarimplementTimeDate)) {
                     throw new JeroBootException("发布日期不能大于新车型实施日期");

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/controller/DummyInventoryBaseEOController.java

@@ -11,6 +11,7 @@ import com.jero.common.system.query.QueryGenerator;
 import com.jero.modules.dummy.entity.DummyInventoryBaseEO;
 import com.jero.modules.dummy.enums.InventoryStateEnum;
 import com.jero.modules.dummy.service.IDummyInventoryBaseEOService;
+import com.jero.modules.dummy.vo.VirtualCreaterVo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
@@ -110,6 +111,20 @@ public class DummyInventoryBaseEOController extends JeroController<DummyInventor
 		return Result.OK("编辑成功!");
 	}
 
+	 /**
+	  *  设置创建人
+	  *
+	  * @param virtualCreaterVo
+	  * @return
+	  */
+	 @AutoLog(value = "虚拟清单基础表-设置创建人")
+	 @ApiOperation(value="虚拟清单基础表-设置创建人", notes="虚拟清单基础表-设置创建人")
+	 @PostMapping(value = "/setCreater")
+	 public Result<?> setCreater(@RequestBody VirtualCreaterVo virtualCreaterVo) {
+		 dummyInventoryBaseEOService.setCreater(virtualCreaterVo);
+		 return Result.OK("编辑成功!");
+	 }
+
 	/**
 	 *   通过id删除
 	 *

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/IDummyInventoryBaseEOService.java

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.jero.modules.dummy.entity.DummyInventoryBaseEO;
+import com.jero.modules.dummy.vo.VirtualCreaterVo;
 
 import java.util.List;
 
@@ -32,6 +33,14 @@ public interface IDummyInventoryBaseEOService extends IService<DummyInventoryBas
 	 */
     void editById(DummyInventoryBaseEO dummyInventoryBaseEO);
 
+	/**
+	 * 虚拟清单创建人更新
+	 *
+	 * @param VirtualCreaterVo
+	 * @return
+	 */
+	void setCreater(VirtualCreaterVo virtualCreaterVo);
+
 	/**
 	 * 发布
 	 * @param dummyInventoryBaseEO

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryBaseEOServiceImpl.java

@@ -24,6 +24,7 @@ import com.jero.modules.dummy.service.IDummyInventoryBaseEOService;
 import com.jero.modules.dummy.service.IDummyInventoryInfoEOService;
 import com.jero.modules.dummy.service.IDummyReadEOService;
 import com.jero.modules.dummy.util.ListDiff;
+import com.jero.modules.dummy.vo.VirtualCreaterVo;
 import com.jero.modules.feishu.service.IFeishuService;
 import com.jero.modules.oss.entity.OSSFile;
 import com.jero.modules.oss.service.IOSSFileService;
@@ -116,7 +117,7 @@ public class DummyInventoryBaseEOServiceImpl extends ServiceImpl<DummyInventoryB
     @Override
     public void editById(DummyInventoryBaseEO dummyInventoryBaseEO) {
         DummyInventoryBaseEO baseEO = queryById(dummyInventoryBaseEO.getId());
-        List<String> createByNameList =new ArrayList<>();
+        List<String> createByNameList = new ArrayList<>();
         if (StringUtils.isNotBlank(dummyInventoryBaseEO.getCreateBy())) {
             createByNameList = Arrays.asList(dummyInventoryBaseEO.getCreateBy().split(","));
 
@@ -140,7 +141,15 @@ public class DummyInventoryBaseEOServiceImpl extends ServiceImpl<DummyInventoryB
         saveOrUpdate(dummyInventoryBaseEO);
     }
 
-
+    @Override
+    public void setCreater(VirtualCreaterVo virtualCreaterVo) {
+        String[] idList = virtualCreaterVo.getIds().split(",");
+        for (int i = 0; i < idList.length; i++){
+            DummyInventoryBaseEO baseEO = queryById(idList[i]);
+            baseEO.setCreateBy(virtualCreaterVo.getCreateBy());
+            saveOrUpdate(baseEO);
+        }
+    }
 
     /**
      * 通过id删除

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/vo/VirtualCreaterVo.java

@@ -0,0 +1,16 @@
+package com.jero.modules.dummy.vo;
+
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+
+@Data
+@ApiModel(value="VirtualCreaterVo对象", description="虚拟清单创建人修改VO")
+public class VirtualCreaterVo {
+
+    // 需要修改的虚拟清单id，可能多个
+    private String ids;
+
+    // 需要修改的创建人
+    private String createBy;
+
+}

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/NcrTrackServiceImpl.java

@@ -34,10 +34,11 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.io.OutputStream;
-import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Date;
+import java.util.HashSet;
 import java.util.List;
+import java.util.Set;
 import java.util.UUID;
 import java.util.stream.Collectors;
 
@@ -75,9 +76,7 @@ public class NcrTrackServiceImpl extends ServiceImpl<NcrTrackMapper, NcrTrackVO>
             ncrTrackVO.setTitle(ncrTrackVO.getTitle().replace("*",""));
         }
 //        List<SysUser> sysUserList = sysUserService.list();
-        QueryWrapper<SysUser> userQueryWrapper = new QueryWrapper<>();
+
-        userQueryWrapper.select("id", "username");
-        List<SysUser> sysUserList = this.sysUserService.list(userQueryWrapper);
 
         ncrTrackVO.setInconformity(ReviewResultEnum.INCONFORMITY.getValue());
         ncrTrackVO.setTrack(ReviewResultEnum.TO_TRACK.getValue());
@@ -97,6 +96,25 @@ public class NcrTrackServiceImpl extends ServiceImpl<NcrTrackMapper, NcrTrackVO>
             verifyName = "Verify conformance validation";
         }
         List<SysDictItem> dictItemList = sysDictItemServiceImpl.selectItemsAll();
+        Set<String> userIdSet = new HashSet<>();
+        for (NcrTrackVO trackVO : infoList) {
+            if(StringUtils.isNotBlank(trackVO.getDesignInitiatorId())){
+                userIdSet.add(trackVO.getDesignInitiatorId());
+            }
+            if(StringUtils.isNotBlank(trackVO.getPrehomoInitiatorId())){
+                userIdSet.add(trackVO.getPrehomoInitiatorId());
+            }
+            if(StringUtils.isNotBlank(trackVO.getVerifyInitiatorId())){
+                userIdSet.add(trackVO.getVerifyInitiatorId());
+            }
+        }
+        List<SysUser> sysUserList = new ArrayList<>();
+        if(userIdSet.size() != 0){
+            QueryWrapper<SysUser> userQueryWrapper = new QueryWrapper<>();
+            userQueryWrapper.lambda().in(SysUser::getId,userIdSet);
+            userQueryWrapper.select("id", "username");
+            sysUserList = this.sysUserService.list(userQueryWrapper);
+        }
         for (NcrTrackVO trackVO : infoList) {
             //责任领域中英文切换
             if(StringUtils.isNotBlank(trackVO.getDutyTerritory())){

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

@@ -144,7 +144,7 @@ export default {
       if(this.form.realname !== undefined) {
         params.realname = `*${this.form.realname}*`
       }
-      getAction(`sys/user/page`, params).then(res => {
+      getAction(`params/collectManifest/drePage`, params).then(res => {
         if (res.success) {
           this.areaTable = [...res.result.records]
           this.total = res.result.total
@@ -177,7 +177,7 @@ export default {
       } else if (this.selectedRowKeys.length > 1) {
         this.$message.warning(this.$t('OnlyOneSelected'))
       } else {
-        let param = {ids: this.selectedRowKeysArray, projectId: this.$route.query.id, dre:this.selectedRowKeysDate[0].username }
+        let param = {ids: this.selectedRowKeysArray, paramsManifestId:this.$route.query.id ,projectId: this.$route.query.projectId, dre:this.selectedRowKeysDate[0].username }
         axios({
           url: '/jero-boot/params/collectManifest/updateDreBatch',
           method: 'post',

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

@@ -0,0 +1,241 @@
+<template>
+  <div>
+    <a-upload name="file" :showUploadList="false"
+              class="upload-text"
+              :multiple="false" :headers="tokenHeader"
+              :action="importUrl"
+              @change="handleImport"
+              :accept="accept">
+      <a-icon type="import" :rotate="270"/>
+      {{$t('import')}}
+    </a-upload>
+    <div class="loading-box" v-if="spinning">
+      <div class="loading-content">
+        <a-icon class="loading" type="loading"/>
+        <div class="loading-tips">
+          {{this.$t('Importing')}}...
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+import Vue from 'vue'
+import {ACCESS_TOKEN} from '@/store/mutation-types'
+import eventBUs from '../../common/event'
+import {Modal} from 'ant-design-vue'
+import store from '@/store'
+export default {
+  name: 'index',
+  props: {
+    url: {
+      type: Object,
+      default: {}
+    },
+    //判断当前文档库还是其余的页面
+    isTrue: {
+      type: Boolean,
+      default: false
+    },
+    accept: {
+      type: String,
+      default: ''
+    },
+    projectId: {
+      type: String,
+      default: ''
+    },
+    dummyInventoryBaseId: {
+      type: String,
+      default: ''
+    },
+    paramsTemplateId: {
+      type: String,
+      default: ''
+    },
+    projectLibraryId: {
+      type: String,
+      default: ''
+    }
+  },
+  data() {
+    return {
+      tokenHeader: {'X-Access-Token': Vue.ls.get(ACCESS_TOKEN)},
+      spinning: false,
+      cut: ''
+    }
+  },
+  computed: {
+    importUrl() {
+      if (this.projectId) {
+        return window._CONFIG['domianURL'] + '/' + this.url.importZipUrl + '?cut=' + this.cut + '&projectId=' + this.projectId
+      } else if (this.dummyInventoryBaseId) {
+        return window._CONFIG['domianURL'] + '/' + this.url.importZipUrl + '?cut=' + this.cut + '&dummyInventoryBaseId=' + this.dummyInventoryBaseId
+      } else if (this.paramsTemplateId) {
+        return window._CONFIG['domianURL'] + '/' + this.url.importZipUrl + '?cut=' + this.cut + '&paramsTemplateId=' + this.paramsTemplateId
+      } else if (this.projectLibraryId) {
+        return window._CONFIG['domianURL'] + '/' + this.url.importZipUrl + '?cut=' + this.cut + '&projectLibraryId=' + this.projectLibraryId
+      }
+      return window._CONFIG['domianURL'] + '/' + this.url.importZipUrl + '?cut=' + this.cut
+    }
+  },
+  mounted() {
+    let long = localStorage.getItem('language')
+    this.cut = ''
+    if (long && long == 'zh-cn') {
+      this.cut = 'cn'
+    } else if (long && long == 'en-us') {
+      this.cut = 'en'
+    }
+  },
+  methods: {
+    handleImport(info) {
+      this.spinning = true
+      if (info.file.status !== 'uploading') {
+        this.$emit('getList')
+      }
+
+      if (info.file.status === 'done') {
+        if (info.file.response.success) {
+          if (info.file.response.code === 201) {
+            let {message} = info.file.response
+            let {name} = info.file
+            let content = []
+            if (message) {
+              message = message.split('</br>')
+              message.forEach(res => {
+                if (res) {
+                  content.push( < div > {res} < /div>)
+                }
+              })
+            }
+            this.$warning({
+              title: name,
+              content: (
+                < div >
+                  {content}
+                < /div>
+              )
+            })
+          } else {
+            if (this.isTrue) {
+              this.$emit('getList')
+            } else {
+              eventBUs.$emit('searchReset')
+            }
+            this.$message.success(info.file.response.message || `${info.file.name} 文件导入成功`)
+          }
+          this.spinning = false
+        } else {
+          let data = info.file.response
+          const token = Vue.ls.get(ACCESS_TOKEN)
+          if ((token && data.message.includes('Token失效')) || (token && data.message.includes('token')) || (token && data.message.includes('用户不存在'))) {
+            this.spinning = false
+            Modal.error({
+              title: '登录已过期',
+              content: '很抱歉，登录已过期，请重新登录',
+              okText: '重新登录',
+              mask: false,
+              onOk: () => {
+                store.dispatch('Logout').then(() => {
+                  Vue.ls.remove(ACCESS_TOKEN)
+                  window.location.reload()
+                })
+              }
+            })
+            return
+          }
+          let {message} = info.file.response
+          let {name} = info.file
+          let content = []
+          if (message) {
+            message = message.split('</br>')
+            message.forEach(res => {
+              if (res) {
+                content.push( < div > {res} < /div>)
+              }
+            })
+          }
+          this.$warning({
+            title: name,
+            content: (
+              < div >
+                {content}
+              < /div>
+            )
+          })
+          this.spinning = false
+        }
+      } else if (info.file.status === 'error') {
+        if (info.file.response.status === 500) {
+          let data = info.file.response
+          const token = Vue.ls.get(ACCESS_TOKEN)
+          if ((token && data.message.includes('Token失效')) || (token && data.message.includes('token')) || (token && data.message.includes('用户不存在'))) {
+            Modal.error({
+              title: '登录已过期',
+              content: '很抱歉，登录已过期，请重新登录',
+              okText: '重新登录',
+              mask: false,
+              onOk: () => {
+                store.dispatch('Logout').then(() => {
+                  Vue.ls.remove(ACCESS_TOKEN)
+                  window.location.reload()
+                })
+              }
+            })
+          }
+          this.spinning = false
+        } else {
+          this.$message.error(`文件导入失败: ${info.file.msg} `)
+          this.spinning = false
+        }
+      }
+    }
+  }
+}
+</script>
+
+<style>
+.upload-text .ant-upload {
+  font-size: 14px !important;
+  font-weight: 400 !important;
+  color: #040B29 !important;
+}
+</style>
+<style scoped lang="less">
+.loading-box {
+  position: fixed;
+  top: 0;
+  left: 0;
+  z-index: 9999900;
+  width: 100%;
+  height: 100%;
+  background-color: rgba(255, 255, 255, 0.9);
+  border-radius: 8px;
+  user-select: none;
+
+  .loading-content {
+    position: absolute;
+    top: 50%;
+    left: 50%;
+    color: #21c9cc;
+    transform: translate(-50%, -50%);
+    text-align: center;
+
+    .loading {
+      font-size: 28px;
+    }
+
+    .spin-loading {
+      animation: rotating 2s linear infinite;
+    }
+
+    .loading-tips {
+      margin-top: 5px;
+      font-size: 16px;
+      color: #21c9cc;
+    }
+  }
+}
+</style>

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

@@ -164,7 +164,11 @@
       },
       getUserAndDepart() {
         getAction('sys/user/getUserAndDepart', { name: this.searchModel }).then((res) => {
-          this.gData = res || []
+          if (res){
+            this.gData = res.filter(ele => ele.flag === 'DEPART');
+          } else {
+            this.gData = []
+          }
           this.visibleTree = true
         })
       },

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

@@ -80,7 +80,7 @@ export default {
       this.loadData()
     },
     handleCancel() {
-      this.$emit('areaVisible', false)
+      this.$emit('areaVisibsynchronous', false)
     },
     onSelectChange(selectedRowKeys, selectedRowKeysDate) {
       this.selectedRowKeysDate = selectedRowKeysDate

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

@@ -11,9 +11,9 @@
       >
         <a-row :gutter='24'>
           <a-col :span='24'>
-            <a-form-model-item ref='paramsTemplateName' :label="$t('checkTheDeadline')" prop='paramsTemplateName'>
+            <span style='display: flex;justify-content: center;margin-bottom: 20px;'> <span style='margin-top: 6px;margin-right: 7px'>{{$t('cutoffTime')}}</span>
-              <a-date-picker show-time :placeholder="$t('PleaseSelect')+$t('cutoffTime')" @change="onChange" @ok="onOk" />
+                <a-date-picker show-time :placeholder="$t('PleaseSelect')+$t('cutoffTime')" @change="onChange" @ok="onOk" />
-            </a-form-model-item>
+              </span>
           </a-col>
         </a-row>
       </a-form-model>

jero-web/src/components/dict/JMultiSelectTagOnlyRz.vue

@@ -0,0 +1,200 @@
+<template>
+  <a-checkbox-group v-if="tagType=='checkbox'" @change="onChange" :value="arrayValue" :disabled="disabled">
+    <a-checkbox v-for="(item, key) in dictOptions" :key="key" :value="item.value">
+          <span :title='item.text||item.label'>
+      {{ (item.text && item.text.length > 6 ? item.text.slice(0, 5) + '...' : item.text) || (item.label && item.label.length > 6 ? item.label.slice(0, 5) + '...' : item.label) }}
+         </span>
+    </a-checkbox>
+  </a-checkbox-group>
+
+  <a-select
+    v-else-if="tagType=='select'"
+    :value="arrayValue"
+    @change="onChange"
+    :disabled="disabled"
+    mode="multiple"
+    :placeholder="placeholder"
+    :getPopupContainer="getParentContainer"
+    optionFilterProp="children"
+    :filterOption="filterOption">
+    <a-select-option
+      v-for="(item,index) in dictOptions"
+      :key="index"
+      :value="item.value">
+      <span class="itemOption" :title="item.text || item.label">
+        {{ item.text || item.label }}
+      </span>
+    </a-select-option>
+  </a-select>
+
+</template>
+
+<script>
+import { ajaxGetDictItems, getDictItemsFromCache } from '@/api/api'
+
+export default {
+  name: 'JMultiSelectTag',
+  props: {
+    dictCode: String,
+    placeholder: String,
+    disabled: Boolean,
+    value: String,
+    db_field_name: String,
+    type: String,
+    options: Array,
+    spliter: {
+      type: String,
+      required: false,
+      default: ','
+    },
+    popContainer: {
+      type: String,
+      default: '',
+      required: false
+    }
+  },
+  data() {
+    return {
+      dictOptions: [],
+      tagType: '',
+      arrayValue: !this.value ? [] : this.value.split(this.spliter),
+      content: ''
+    }
+  },
+  created() {
+    if (!this.type || this.type === 'list_multi') {
+      this.tagType = 'select'
+    } else {
+      this.tagType = this.type
+    }
+    //获取字典数据
+    //this.initDictData();
+  },
+  watch: {
+    options: function(val) {
+      this.setCurrentDictOptions(val)
+    },
+    dictCode: {
+      immediate: true,
+      handler() {
+        this.initDictData()
+      }
+    },
+    value(val) {
+      if (!val) {
+        this.arrayValue = []
+      } else {
+        this.arrayValue = this.value.split(this.spliter)
+        let arrayValue = JSON.parse(JSON.stringify(this.arrayValue))
+        let item = []
+        this.dictOptions.forEach(res => {
+          arrayValue.forEach((val, index) => {
+            if (res.value == val && index != 0) {
+              item.push(res.text || res.label)
+            }
+
+          })
+          this.content = item.join(',')
+        })
+        let arrayLabel = []
+        this.dictOptions.forEach((item) => {
+          this.arrayValue.forEach((val) => {
+            if (item.value === val) {
+              arrayLabel.push(item)
+            }
+          })
+        })
+        this.$emit('changelabel', arrayLabel)
+      }
+    }
+  },
+  methods: {
+    initDictData() {
+      if (this.options && this.options.length > 0) {
+        this.dictOptions = [...this.options]
+      } else {
+        //优先从缓存中读取字典配置
+        let cacheOption = getDictItemsFromCache(this.dictCode)
+        if (cacheOption && cacheOption.length > 0) {
+          this.dictOptions = cacheOption
+          return
+        }
+        //根据字典Code, 初始化字典数组
+        ajaxGetDictItems(this.dictCode, null).then((res) => {
+          if (res.success) {
+            this.dictOptions = res.result
+          }
+        })
+      }
+
+    },
+    onChange(selectedValue) {
+      let content = []
+      let item = []
+      this.dictOptions.forEach(res => {
+        selectedValue.forEach((val, index) => {
+          if (res.value == val) {
+            content.push(res.text || res.label)
+            if (index != 0) {
+              item.push(res.text || res.label)
+            }
+          }
+
+        })
+        this.content = item.join(',')
+      })
+      this.$emit('change', selectedValue.join(this.spliter))
+      this.$emit('changeQuery', content.join(this.spliter), this.db_field_name)
+    },
+    setCurrentDictOptions(dictOptions) {
+      this.dictOptions = dictOptions
+
+    },
+    getCurrentDictOptions() {
+      return this.dictOptions
+    },
+    getParentContainer(node) {
+      if (!this.popContainer) {
+        return node.parentNode
+      } else {
+        return document.querySelector(this.popContainer)
+      }
+    },
+    // update--begin--autor:lvdandan-----date:20201120------for：LOWCOD-1086 下拉多选框,搜索时只字典code进行搜索不能通过字典text搜索
+    filterOption(input, option) {
+      return option.componentOptions.children[0].children[0].text.toLowerCase().indexOf(input.toLowerCase()) >= 0
+    }
+    // update--end--autor:lvdandan-----date:20201120------for：LOWCOD-1086 下拉多选框,搜索时只字典code进行搜索不能通过字典text搜索
+  },
+  model: {
+    prop: 'value',
+    event: 'change'
+  }
+}
+</script>
+<style scoped>
+.itemOption {
+  display: inline-block;
+  width: 100%;
+  overflow: hidden;
+  white-space: nowrap;
+  text-overflow: ellipsis;
+  -o-text-overflow: ellipsis;
+}
+/deep/.ant-checkbox-wrapper + .ant-checkbox-wrapper {
+   margin-left: 0px !important;
+}
+</style>
+<style>
+/*.ant-select-selection__choice{*/
+/*    max-width: 50% !important;*/
+/*}*/
+.ant-select-selection--multiple {
+  overflow: auto;
+}
+
+.ant-select-selection--multiple::-webkit-scrollbar {
+  display: none; /* Chrome Safari */
+}
+
+</style>

jero-web/src/components/dict/index.js

@@ -1,5 +1,6 @@
 import JDictSelectTag from './JDictSelectTag.vue'
 import JMultiSelectTag from './JMultiSelectTag.vue'
+import JMultiSelectTagOnlyRz from './JMultiSelectTagOnlyRz.vue'
 import JSearchSelectTag from './JSearchSelectTag.vue'
 import { filterMultiDictText,filterDictText,initDictOptions,filterDictTextByCache } from './JDictSelectUtil'
 
@@ -7,6 +8,7 @@ export default {
   install: function (Vue) {
     Vue.component('JDictSelectTag',JDictSelectTag);
     Vue.component('JMultiSelectTag',JMultiSelectTag);
+    Vue.component('JMultiSelectTagOnlyRz',JMultiSelectTagOnlyRz);
     Vue.component('JSearchSelectTag',JSearchSelectTag);
     Vue.prototype.$initDictOptions = (dictCode) => initDictOptions(dictCode)
     Vue.prototype.$filterMultiDictText = (dictOptions, text) => filterMultiDictText(dictOptions, text)

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

@@ -241,7 +241,7 @@
   }
 
   .box-input {
-    min-width: 200px;
+    /*min-width: 200px;*/
     display: inline-block;
     width: 70%;
     height: 38px;

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

@@ -0,0 +1,254 @@
+<template>
+  <a-form layout="inline" @keyup.enter.native="searchQuery">
+    <a-row :gutter="24">
+      <a-col :md="10" :sm="8" v-for="(item,index) in searchList" :key="index" style="line-height: 48px">
+        <template v-if="index < 3">
+          <div class="box-title-text" v-if="item.field_show_type == '0'">
+            <div class="title-text" :title="item.db_field_txt">
+              <span>{{item.db_field_txt}}</span>
+            </div>
+            <a-tree-select
+              tree-node-filter-prop="title"
+              class="box-input"
+              v-model="queryParam[item.db_field_name]"
+              :maxTagCount="1"
+              :getPopupContainer="triggerNode=> triggerNode.parentNode"
+              :tree-data="item.tree"
+              tree-checkable
+              :placeholder="$t('PleaseSelect')+item.db_field_txt"
+            />
+          </div>
+          <div class="box-title-text" v-else-if="item.field_show_type == '1' || item.field_show_type == '8' ||
+          item.field_show_type == '9' || item.field_show_type == '10' || item.field_show_type == '11'">
+            <div class="title-text" :title="item.db_field_txt">
+              <span>{{item.db_field_txt}}</span>
+            </div>
+            <a-input class="box-input" :placeholder="$t('PleaseEnter')+item.db_field_txt"
+                     v-model="queryParam[item.db_field_name]"></a-input>
+          </div>
+          <div class="box-title-text" v-else-if="item.field_show_type == '2'">
+            <div class="title-text" :title="item.db_field_txt">
+              <span>{{item.db_field_txt}}</span>
+            </div>
+            <a-input-number class="box-input" :placeholder="$t('PleaseEnter')+item.db_field_txt"
+                            v-model="queryParam[item.db_field_name]" :min="1" :max="99999999"/>
+          </div>
+          <div class="box-title-text" v-else-if="item.field_show_type == '4'">
+            <div class="title-text" :title="item.db_field_txt">
+              <span>{{item.db_field_txt}}</span>
+            </div>
+            <j-multi-select-tag class="box-input" v-model="queryParam[item.db_field_name]"
+                                :placeholder="$t('PleaseSelect')+item.db_field_txt" :type="'select'"
+                                :triggerChange="false" :dictCode="item.dict_field"/>
+          </div>
+          <div class="box-title-text" v-else-if="item.field_show_type == '6' || item.field_show_type == '5'">
+            <div class="title-text" :title="item.db_field_txt">
+              <span>{{item.db_field_txt}}</span>
+            </div>
+            <a-range-picker class="box-input" v-model="queryParam[item.db_field_name]"
+                            :placeholder="$t('PleaseSelect')+item.db_field_txt"
+                            @change="onChange(item.db_field_name)"></a-range-picker>
+          </div>
+          <!--          <div class="box-title-text" v-else-if="item.field_show_type == '5'">-->
+          <!--            <div class="title-text" :title="item.db_field_txt">-->
+          <!--              <span>{{item.db_field_txt}}</span>-->
+          <!--            </div>-->
+          <!--            <a-date-picker class="box-input"-->
+          <!--                           :placeholder="$t('PleaseSelect')+item.db_field_txt"-->
+          <!--                           @change="dateChange(item.db_field_name)"-->
+          <!--                           v-model="queryParam[item.db_field_name]"/>-->
+          <!--          </div>-->
+          <div class="box-title-text" v-else-if="item.field_show_type == '3'">
+            <div class="title-text" :title="item.db_field_txt">
+              <span>{{item.db_field_txt}}</span>
+            </div>
+            <j-dict-select-tag class="box-input" v-model="queryParam[item.db_field_name]"
+                               :placeholder="$t('PleaseSelect')+item.db_field_txt"
+                               :type="'select'"
+                               :triggerChange="false" :dictCode="item.dict_field"/>
+          </div>
+        </template>
+
+        <template v-if="index >= 3 && toggleSearchStatus">
+          <div class="box-title-text" v-if="item.field_show_type == '0'">
+            <div class="title-text" :title="item.db_field_txt">
+              <span>{{item.db_field_txt}}</span>
+            </div>
+            <a-tree-select
+              tree-node-filter-prop="title"
+              class="box-input"
+              v-model="queryParam[item.db_field_name]"
+              :maxTagCount="1"
+              :getPopupContainer="triggerNode=> triggerNode.parentNode"
+              :tree-data="item.tree"
+              tree-checkable
+              :placeholder="$t('PleaseSelect')+item.db_field_txt"
+            />
+          </div>
+          <div class="box-title-text" v-else-if="item.field_show_type == '1' || item.field_show_type == '8' ||
+          item.field_show_type == '9' || item.field_show_type == '10' || item.field_show_type == '11'">
+            <div class="title-text" :title="item.db_field_txt">
+              <span>{{item.db_field_txt}}</span>
+            </div>
+            <a-input class="box-input" :placeholder="$t('PleaseEnter')+item.db_field_txt"
+                     v-model="queryParam[item.db_field_name]"></a-input>
+          </div>
+          <div class="box-title-text" v-else-if="item.field_show_type == '2'">
+            <div class="title-text" :title="item.db_field_txt">
+              <span>{{item.db_field_txt}}</span>
+            </div>
+            <a-input-number class="box-input" :placeholder="$t('PleaseEnter')+item.db_field_txt"
+                            v-model="queryParam[item.db_field_name]" :min="1" :max="99999999"/>
+          </div>
+          <div class="box-title-text" v-else-if="item.field_show_type == '4'">
+            <div class="title-text" :title="item.db_field_txt">
+              <span>{{item.db_field_txt}}</span>
+            </div>
+            <j-multi-select-tag class="box-input" v-model="queryParam[item.db_field_name]"
+                                :placeholder="$t('PleaseSelect')+item.db_field_txt" :type="'select'"
+                                :triggerChange="false" :dictCode="item.dict_field"/>
+          </div>
+          <div class="box-title-text" v-else-if="item.field_show_type == '6' || item.field_show_type == '5'">
+            <div class="title-text" :title="item.db_field_txt">
+              <span>{{item.db_field_txt}}</span>
+            </div>
+            <a-range-picker class="box-input" v-model="queryParam[item.db_field_name]"
+                            @change="onChange(item.db_field_name)"></a-range-picker>
+          </div>
+          <!--          <div class="box-title-text" v-else-if="item.field_show_type == '5'">-->
+          <!--            <div class="title-text" :title="item.db_field_txt">-->
+          <!--              <span>{{item.db_field_txt}}</span>-->
+          <!--            </div>-->
+          <!--            <a-date-picker class="box-input"-->
+          <!--                           :placeholder="$t('PleaseSelect')+item.db_field_txt"-->
+          <!--                           @change="dateChange(item.db_field_name)"-->
+          <!--                           v-model="queryParam[item.db_field_name]"/>-->
+          <!--          </div>-->
+          <div class="box-title-text" v-else-if="item.field_show_type == '3'">
+            <div class="title-text" :title="item.db_field_txt">
+              <span>{{item.db_field_txt}}</span>
+            </div>
+            <j-dict-select-tag class="box-input" v-model="queryParam[item.db_field_name]"
+                               :placeholder="$t('PleaseSelect')+item.db_field_txt"
+                               :type="'select'"
+                               :triggerChange="false" :dictCode="item.dict_field"/>
+          </div>
+        </template>
+
+      </a-col>
+      <span style="float: right;overflow: hidden;margin-right: 11px" class="table-page-search-submitButtons">
+         <a-col :md="4" :sm="24" style='display: flex'>
+            <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>
+          <a @click="handleToggleSearch" style="margin-left: 8px" v-if="searchList.length > 3">
+            {{ !toggleSearchStatus ? $t('open') : $t('away') }}
+            <a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>
+          </a>
+         </a-col>
+      </span>
+    </a-row>
+  </a-form>
+</template>
+
+<script>
+import { getAction } from '@/api/manage'
+import eventBUs from '../../common/event.js'
+import moment from 'moment'
+
+export default {
+  name: 'index',
+  props: {
+    url: {
+      type: Object,
+      default: {}
+    },
+    flag: {
+      type: String,
+      default: ''
+    }
+  },
+  data() {
+    return {
+      queryParam: {},
+      toggleSearchStatus: false,
+      searchList: []
+    }
+  },
+  mounted() {
+    this.getSeach()
+  },
+  methods: {
+    searchQuery() {
+      eventBUs.$emit('searchQuery', JSON.parse(JSON.stringify(this.queryParam)))
+    },
+    searchReset() {
+      this.queryParam = {}
+      eventBUs.$emit('searchQuery', JSON.parse(JSON.stringify(this.queryParam)))
+    },
+    getSeach() {
+      let params = {
+        flag: this.flag
+      }
+      getAction(this.url.seachList, params).then((res) => {
+        if (res.success) {
+          this.searchList = res.result
+        }
+      })
+    },
+    // handleToggleSearch() {
+    //   this.toggleSearchStatus = !this.toggleSearchStatus
+    // },
+    dateChange(item) {
+      this.queryParam[item] = moment(this.queryParam[item]).format('YYYY-MM-DD')
+    },
+    onChange(item) {
+      if (this.queryParam[item] && this.queryParam[item].length > 0) {
+        let dateOne = moment(this.queryParam[item][0]).format('YYYY-MM-DD')
+        let dateTwo = moment(this.queryParam[item][1]).format('YYYY-MM-DD')
+        this.queryParam[item] = [dateOne, dateTwo]
+      } else {
+        this.queryParam[item] = []
+      }
+    },
+    handleToggleSearch() {
+      this.toggleSearchStatus = !this.toggleSearchStatus
+    }
+  }
+}
+</script>
+
+<style scoped>
+.box-title-text {
+  line-height: 1.4;
+  display: flex;
+  align-items: center;
+  margin-bottom: 10px;
+}
+
+.title-text {
+  width: 20%;
+  min-width: 110px;
+  color: #000F16;
+  display: inline-block;
+  font-weight: 500;
+  font-size: 14px;
+  margin-right: 16px;
+  margin-top: 3px;
+  text-align: right;
+  white-space: nowrap;
+  overflow: hidden;
+  text-overflow: ellipsis;
+}
+
+.box-input {
+  display: inline-block;
+  width: 70%;
+  height: 38px;
+  margin-top: 2px;
+}
+
+.box-button {
+  height: 38px;
+  /*margin-top: 2px;*/
+}
+</style>

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

@@ -1,7 +1,7 @@
 <template>
   <a-form layout="inline" @keyup.enter.native="searchQuery">
     <a-row :gutter="24">
-      <a-col :md="10" :sm="8" v-for="(item,index) in searchList" :key="index" style="line-height: 48px">
+      <a-col :md="6" :sm="8" v-for="(item,index) in searchList" :key="index" style="line-height: 48px">
         <template v-if="index < 3">
           <div class="box-title-text" v-if="item.field_show_type == '0'">
             <div class="title-text" :title="item.db_field_txt">

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

@@ -0,0 +1,255 @@
+<template>
+  <a-form layout="inline" @keyup.enter.native="searchQuery">
+    <a-row :gutter="24">
+      <a-col :md="10" :sm="8" v-for="(item,index) in searchList" :key="index" style="line-height: 48px">
+        <template v-if="index < 3">
+          <div class="box-title-text" v-if="item.field_show_type == '0'">
+            <div class="title-text" :title="item.db_field_txt">
+              <span>{{item.db_field_txt}}</span>
+            </div>
+            <a-tree-select
+              tree-node-filter-prop="title"
+              class="box-input"
+              v-model="queryParam[item.db_field_name]"
+              :maxTagCount="1"
+              :getPopupContainer="triggerNode=> triggerNode.parentNode"
+              :tree-data="item.tree"
+              tree-checkable
+              :placeholder="$t('PleaseSelect')+item.db_field_txt"
+            />
+          </div>
+          <div class="box-title-text" v-else-if="item.field_show_type == '1' || item.field_show_type == '8' ||
+          item.field_show_type == '9' || item.field_show_type == '10' || item.field_show_type == '11'">
+            <div class="title-text" :title="item.db_field_txt">
+              <span>{{item.db_field_txt}}</span>
+            </div>
+            <a-input class="box-input" :placeholder="$t('PleaseEnter')+item.db_field_txt"
+                     v-model="queryParam[item.db_field_name]"></a-input>
+          </div>
+          <div class="box-title-text" v-else-if="item.field_show_type == '2'">
+            <div class="title-text" :title="item.db_field_txt">
+              <span>{{item.db_field_txt}}</span>
+            </div>
+            <a-input-number class="box-input" :placeholder="$t('PleaseEnter')+item.db_field_txt"
+                            v-model="queryParam[item.db_field_name]" :min="1" :max="99999999"/>
+          </div>
+          <div class="box-title-text" v-else-if="item.field_show_type == '4'">
+            <div class="title-text" :title="item.db_field_txt">
+              <span>{{item.db_field_txt}}</span>
+            </div>
+            <j-multi-select-tag class="box-input" v-model="queryParam[item.db_field_name]"
+                                :placeholder="$t('PleaseSelect')+item.db_field_txt" :type="'select'"
+                                :triggerChange="false" :dictCode="item.dict_field"/>
+          </div>
+          <div class="box-title-text" v-else-if="item.field_show_type == '6' || item.field_show_type == '5'">
+            <div class="title-text" :title="item.db_field_txt">
+              <span>{{item.db_field_txt}}</span>
+            </div>
+            <a-range-picker class="box-input" v-model="queryParam[item.db_field_name]"
+                            :placeholder="$t('PleaseSelect')+item.db_field_txt"
+                            @change="onChange(item.db_field_name)"></a-range-picker>
+          </div>
+          <!--          <div class="box-title-text" v-else-if="item.field_show_type == '5'">-->
+          <!--            <div class="title-text" :title="item.db_field_txt">-->
+          <!--              <span>{{item.db_field_txt}}</span>-->
+          <!--            </div>-->
+          <!--            <a-date-picker class="box-input"-->
+          <!--                           :placeholder="$t('PleaseSelect')+item.db_field_txt"-->
+          <!--                           @change="dateChange(item.db_field_name)"-->
+          <!--                           v-model="queryParam[item.db_field_name]"/>-->
+          <!--          </div>-->
+          <div class="box-title-text" v-else-if="item.field_show_type == '3'">
+            <div class="title-text" :title="item.db_field_txt">
+              <span>{{item.db_field_txt}}</span>
+            </div>
+            <j-dict-select-tag class="box-input" v-model="queryParam[item.db_field_name]"
+                               :placeholder="$t('PleaseSelect')+item.db_field_txt"
+                               :type="'select'"
+                               :triggerChange="false" :dictCode="item.dict_field"/>
+          </div>
+        </template>
+
+        <template v-if="index >= 3 && toggleSearchStatus">
+          <div class="box-title-text" v-if="item.field_show_type == '0'">
+            <div class="title-text" :title="item.db_field_txt">
+              <span>{{item.db_field_txt}}</span>
+            </div>
+            <a-tree-select
+              tree-node-filter-prop="title"
+              class="box-input"
+              v-model="queryParam[item.db_field_name]"
+              :maxTagCount="1"
+              :getPopupContainer="triggerNode=> triggerNode.parentNode"
+              :tree-data="item.tree"
+              tree-checkable
+              :placeholder="$t('PleaseSelect')+item.db_field_txt"
+            />
+          </div>
+          <div class="box-title-text" v-else-if="item.field_show_type == '1' || item.field_show_type == '8' ||
+          item.field_show_type == '9' || item.field_show_type == '10' || item.field_show_type == '11'">
+            <div class="title-text" :title="item.db_field_txt">
+              <span>{{item.db_field_txt}}</span>
+            </div>
+            <a-input class="box-input" :placeholder="$t('PleaseEnter')+item.db_field_txt"
+                     v-model="queryParam[item.db_field_name]"></a-input>
+          </div>
+          <div class="box-title-text" v-else-if="item.field_show_type == '2'">
+            <div class="title-text" :title="item.db_field_txt">
+              <span>{{item.db_field_txt}}</span>
+            </div>
+            <a-input-number class="box-input" :placeholder="$t('PleaseEnter')+item.db_field_txt"
+                            v-model="queryParam[item.db_field_name]" :min="1" :max="99999999"/>
+          </div>
+          <div class="box-title-text" v-else-if="item.field_show_type == '4'">
+            <div class="title-text" :title="item.db_field_txt">
+              <span>{{item.db_field_txt}}</span>
+            </div>
+            <j-multi-select-tag class="box-input" v-model="queryParam[item.db_field_name]"
+                                :placeholder="$t('PleaseSelect')+item.db_field_txt" :type="'select'"
+                                :triggerChange="false" :dictCode="item.dict_field"/>
+          </div>
+          <div class="box-title-text" v-else-if="item.field_show_type == '6' || item.field_show_type == '5'">
+            <div class="title-text" :title="item.db_field_txt">
+              <span>{{item.db_field_txt}}</span>
+            </div>
+            <a-range-picker class="box-input" v-model="queryParam[item.db_field_name]"
+                            @change="onChange(item.db_field_name)"></a-range-picker>
+          </div>
+          <!--          <div class="box-title-text" v-else-if="item.field_show_type == '5'">-->
+          <!--            <div class="title-text" :title="item.db_field_txt">-->
+          <!--              <span>{{item.db_field_txt}}</span>-->
+          <!--            </div>-->
+          <!--            <a-date-picker class="box-input"-->
+          <!--                           :placeholder="$t('PleaseSelect')+item.db_field_txt"-->
+          <!--                           @change="dateChange(item.db_field_name)"-->
+          <!--                           v-model="queryParam[item.db_field_name]"/>-->
+          <!--          </div>-->
+          <div class="box-title-text" v-else-if="item.field_show_type == '3'">
+            <div class="title-text" :title="item.db_field_txt">
+              <span>{{item.db_field_txt}}</span>
+            </div>
+            <j-dict-select-tag class="box-input" v-model="queryParam[item.db_field_name]"
+                               :placeholder="$t('PleaseSelect')+item.db_field_txt"
+                               :type="'select'"
+                               :triggerChange="false" :dictCode="item.dict_field"/>
+          </div>
+        </template>
+
+      </a-col>
+      <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>
+          <a @click="handleToggleSearch" style="margin-left: 8px" v-if="searchList.length > 3">
+            {{ !toggleSearchStatus ? $t('open') : $t('away') }}
+            <a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>
+          </a>
+         </a-col>
+      </span>
+    </a-row>
+  </a-form>
+</template>
+
+<script>
+import { getAction } from '@/api/manage'
+import eventBUs from '../../common/event.js'
+import moment from 'moment'
+
+export default {
+  name: 'index',
+  props: {
+    url: {
+      type: Object,
+      default: {}
+    },
+    flag: {
+      type: String,
+      default: ''
+    }
+  },
+  data() {
+    return {
+      queryParam: {},
+      toggleSearchStatus: false,
+      searchList: []
+    }
+  },
+  mounted() {
+    this.getSeach()
+  },
+  methods: {
+    searchQuery() {
+      eventBUs.$emit('searchQuery', JSON.parse(JSON.stringify(this.queryParam)))
+    },
+    searchReset() {
+      this.queryParam = {}
+      eventBUs.$emit('searchQuery', JSON.parse(JSON.stringify(this.queryParam)))
+    },
+    getSeach() {
+      let params = {
+        flag: this.flag
+      }
+      getAction(this.url.seachList, params).then((res) => {
+        if (res.success) {
+          this.searchList = res.result
+        }
+      })
+    },
+    // handleToggleSearch() {
+    //   this.toggleSearchStatus = !this.toggleSearchStatus
+    // },
+    dateChange(item) {
+      this.queryParam[item] = moment(this.queryParam[item]).format('YYYY-MM-DD')
+    },
+    onChange(item) {
+      if (this.queryParam[item] && this.queryParam[item].length > 0) {
+        let dateOne = moment(this.queryParam[item][0]).format('YYYY-MM-DD')
+        let dateTwo = moment(this.queryParam[item][1]).format('YYYY-MM-DD')
+        this.queryParam[item] = [dateOne, dateTwo]
+      } else {
+        this.queryParam[item] = []
+      }
+    },
+    handleToggleSearch() {
+      this.toggleSearchStatus = !this.toggleSearchStatus
+    }
+  }
+}
+</script>
+
+<style scoped>
+.box-title-text {
+  line-height: 1.4;
+  display: flex;
+  align-items: center;
+  margin-bottom: 10px;
+}
+
+.title-text {
+  width: 20%;
+  min-width: 110px;
+  color: #000F16;
+  display: inline-block;
+  font-weight: 500;
+  font-size: 14px;
+  margin-right: 16px;
+  margin-top: 3px;
+  text-align: right;
+  white-space: nowrap;
+  overflow: hidden;
+  text-overflow: ellipsis;
+}
+
+.box-input {
+  min-width: 200px;
+  display: inline-block;
+  width: 70%;
+  height: 38px;
+  margin-top: 2px;
+}
+
+.box-button {
+  height: 38px;
+  /*margin-top: 2px;*/
+}
+</style>

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

@@ -105,12 +105,12 @@
           return
         }
         let query = {
-          id: this.tableKey,
+          ids: this.tableKey,
           createBy: this.userName.join(',')
         }
         this.submitLoading = true
         this.confirmLoading = true
-        postAction('/dummy/dummyInventoryBaseEO/edit', query).then((res) => {
+        postAction('/dummy/dummyInventoryBaseEO/setCreater', query).then((res) => {
           this.confirmLoading = false
           this.submitLoading = false
           if (res.success) {
@@ -136,7 +136,11 @@
       },
       getUserAndDepart() {
         getAction('sys/user/getUserAndDepart', { name: this.searchModel }).then((res) => {
-          this.gData = res || []
+          if (res){
+            this.gData = res.filter(ele => ele.flag === 'DEPART');
+          } else {
+            this.gData = []
+          }
           this.visibleTree = true
         })
       },

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

@@ -28,14 +28,14 @@
 <!--           认证工程师  -->
            <span v-if='record.state == "待发起收集" || record.state == "工程接口人退回" || record.state == "变更"'>
              <span
-               @click='ondataValueTobeinitiated(record)'>{{ record.dataValue == null? '--': record.dataValue}}</span>
+               @click='ondataValueTobeinitiated(record)'>{{ (record.dataValue == null || record.dataValue == 'undefined')? '--': record.dataValue}}</span>
            </span>
              <span v-else>
-             <span @click='dataValueTobeinitiated(record)'>{{ record.dataValue == null? '--': record.dataValue}}</span>
+             <span @click='dataValueTobeinitiated(record)'>{{ (record.dataValue == null || record.dataValue == 'undefined')? '--': record.dataValue}}</span>
            </span>
            </span>
            <span v-else>
-             <span @click='dataValueTobeinitiated(record)'>{{ record.dataValue == null? '--': record.dataValue}}</span>
+             <span @click='dataValueTobeinitiated(record)'>{{ (record.dataValue == null || record.dataValue == 'undefined')? '--': record.dataValue}}</span>
            </span>
          </span>
         <span slot="detailClick" slot-scope="text,record">
@@ -273,7 +273,7 @@
         // 当前工程接口人的id
         this.getquerySdtId = record.id
         getAction(this.url.getquerySdtList, {
-          projectId: this.$route.query.id,
+          projectId: this.$route.query.projectId,
           dutyTerritory: record.dutyTerritory
         }).then((res) => {
           if (res.success) {
@@ -339,7 +339,6 @@
           paramsManifestId: this.$route.query.id,
           projectId: this.$route.query.projectId
         }
-        console.log(params,'pppp')
         getAction(this.url.getLoginUserType, params).then((res) => {
           if (res.success) {
             this.getTableList()

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

@@ -11,7 +11,7 @@
       >
         <div class="doc-table-content">
           <div class="doc-header">
-            <searchaloneorc :url="url" :flag="'condition'"></searchaloneorc>
+            <searchaloneorcFile :url="url" :flag="'condition'"></searchaloneorcFile>
           </div>
         </div>
         <div class="doc-table-detail">
@@ -34,13 +34,13 @@
 
 <script>
   import { getAction, postAction, deleteAction } from '@/api/manage'
-  import searchaloneorc from '@/components/searchaloneorc/index'
+  import SearchaloneorcFile from '@/components/searchaloneorcfile/index'
   import TableData from '@/components/OcrTable/DocTable'
   import eventBUs from '../../../../common/event'
   export default {
     name: 'docTable',
     components:{
-      searchaloneorc,
+      SearchaloneorcFile,
       TableData,
 
     },

jero-web/src/views/documentManage/splitting/modules/ImportResult.vue

@@ -60,7 +60,7 @@
 <script>
   import { getAction, postAction, deleteAction, downloadFile } from '@/api/manage'
   import SplitUpload from '@/components/importSplitUpload/index'
-  import search from '@/components/search/index'
+  import search from '@/components/searchalonetext/index'
   import TableData from '@/components/SplitTable/DocTable'
   import axios from 'axios'
   import { ACCESS_TOKEN } from '@/store/mutation-types'

jero-web/src/views/documentManage/splitting/modules/SplitText.vue

@@ -11,7 +11,7 @@
       >
         <div class="split-table-content">
           <div class="split-header">
-            <search :url="url" :flag="'condition'"></search>
+            <searchAlone :url="url" :flag="'condition'"></searchAlone>
           </div>
         </div>
         <div class="table-operator operator-select">
@@ -21,7 +21,7 @@
 
             <div  class="operator-select-type">
               <span class="operator-file-type"><i class="operator-i">*</i>{{$t('fileType')}}</span>
-              <a-select v-model="fileGroup" :placeholder="$t('selectFileType')" class="file-type-select">
+              <a-select v-model="fileGroup" style='min-width: 295px' :placeholder="$t('selectFileType')" class="file-type-select">
                 <a-select-option value="GSO" key="GSO" :title="$t('GSO')">
                   {{$t('GSO')}}
                 </a-select-option>
@@ -75,7 +75,7 @@
 
 <script>
   import { getAction, postAction } from '../../../../api/manage'
-  import search from '@/components/search/index'
+  import SearchAlone from '@/components/searchalonetext/index'
   import TableData from '@/components/SplitTable/DocTable'
   import eventBUs from '../../../../common/event'
   import Vue from 'vue'
@@ -86,7 +86,7 @@
   export default {
     name: 'split',
     components:{
-      search,
+      SearchAlone,
       TableData,
     },
     data(){

jero-web/src/views/parameter/ParameterTemplate/index.vue

@@ -201,6 +201,9 @@ export default {
       this.areaVisible=false
     },
     handleSubmit() {
+      if( this.formInline.paramsTemplateName !== undefined) {
+        this.formInline.paramsTemplateName = this.formInline.paramsTemplateName.trim()
+      }
       this.$refs.ruleForm.validate(valid => {
         if (valid) {
             getAction(this.url.copy + `?id=${this.selectedRowKeys[0]}&paramsTemplateName=${this.formInline.paramsTemplateName}`, {}).then((res) => {

jero-web/src/views/parameter/parameterlist/components/addModel.vue

@@ -142,7 +142,7 @@
                       :title="$t('ParameterName')">{{$t('certificationCategory')}}</span>
                 </div>
                 <a-form-model-item class="itemModel-multi" prop="certCategory">
-                  <j-multi-select-tag class="box-input" v-model="formInline.certCategory"
+                  <j-multi-select-tag-only-rz class="box-input" v-model="formInline.certCategory"
                                       @change='Onchange'
                                       v-on:changelabel='Onchangelabel'
                                       :disabled="disabled"

jero-web/src/views/parameter/parameterlist/index.vue

@@ -53,7 +53,7 @@
         {{$t('templateDownload')}}
       </div>
       <div class="operator-text" v-has="'params:paramsInfo:import'">
-        <ImportFile :url="url" :isTrue="false" :accept="'.zip'" :paramsTemplateId='this.$route.query.id'/>
+        <ImportFileOnlyList :url="url" :isTrue="false" :accept="'.zip'" :paramsTemplateId='this.$route.query.id' @getList='getList'/>
       </div>
       <div @click="releaseVersion" class="operator-text" v-has="'params:paramsInfo:publish'">
         <a-icon type="rocket"/>
@@ -106,13 +106,13 @@ import { getAction, postAction, downloadFile, deleteAction, downFilePost } from
 import addModel from './components/addModel'
 import axios from 'axios'
 import { ACCESS_TOKEN } from '@/store/mutation-types'
-import ImportFile from '@/components/ImportFile/index'
+import ImportFileOnlyList from '@/components/ImportFileOnlyList/index'
 import Vue from 'vue'
 export default {
   name: 'index',
   components: {
     addModel,
-    ImportFile
+    ImportFileOnlyList
   },
   data() {
     return {

jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue

@@ -201,8 +201,9 @@
                    @areaVisibleAssignedbyflag='areaVisibleAssignedbyflag' @areaVisible='areaVisibleAssignedby = false'/>
     </a-modal>
     <!--  截至时间--->
-    <a-modal v-model="areaVisibleTaskCutOffTime" :title="$t('TaskCutOffTime')" width='650px' :footer="null">
+    <a-modal v-model="areaVisibleTaskCutOffTime" :title="$t('TaskCutOffTime')" width='600px' :footer="null">
-      <task-cut-off-time v-if='areaVisibleTaskCutOffTime' :selectedRowKeysArray='selectedRowKeysArray' @GetgetTableList='GetgetTableList'
+      <task-cut-off-time v-if='areaVisibleTaskCutOffTime' :selectedRowKeysArray='selectedRowKeysArray'
+                          @GetgetTableList='GetgetTableList'
                          @areaVisibleTaskCutOffTimeflag='areaVisibleTaskCutOffTimeflag'/>
     </a-modal>
     <!--  引用参数--->
@@ -214,7 +215,7 @@
     <!--  同步上报库--->
     <a-modal v-model="areaVisibsynchronous" :title="$t('SynchronousReportLibrary')" width='650px' :footer="null">
       <synchronous-submission-library v-if='areaVisibsynchronous' :paramsManifest='paramsManifest' @GetgetTableList='GetgetTableList'
-                           :selectedRowKeysArray='selectedRowKeysArray' @areaVisible='areaVisibsynchronous = false'/>
+                           :selectedRowKeysArray='selectedRowKeysArray' @areaVisibsynchronous='areaVisibsynchronous = false'/>
     </a-modal>
 <!--    切换角色-->
     <a-modal
@@ -524,7 +525,7 @@ export default {
           flag = 0
         }
           //  状态符合，但是没有工程接口人 不能下发收集
-        if(item.sdt.dataValue === null && (flag == 1 || flag == 3)) {
+        if((item.sdt.dataValue === null || item.sdt.dataValue ==='undefined') && (flag == 1 || flag == 3)) {
           this.NotSelectedNoEngineerValue.push(item)
           flag = 3
         }
@@ -877,7 +878,7 @@ export default {
         _array.push(item.id)
       })
       let _this = this
-      let param = {projectId: this.$route.query.id, ids: _array.join(',')}
+      let param = {paramsManifestId: this.$route.query.id,projectId:this.$route.query.projectId,  ids: _array.join(',')}
       axios({
         url: '/jero-boot/params/collectManifest/issueCollection',
         method: 'post',
@@ -944,7 +945,7 @@ export default {
         let postDateobj = {}
         Object.keys(item).forEach((itemIn, index) => {
           if(itemIn !== 'sdt') {
-            if(item[itemIn] instanceof Object) {
+            if(item[itemIn] instanceof Object && !(item[itemIn] instanceof Array)) {
               postDateobj[itemIn] = item[itemIn]
               item[itemIn].list.forEach((item,index) => {
                 if(item.type == 'pull_more'){

jero-web/src/views/projectManagement/dialog/configure.vue

@@ -182,22 +182,30 @@ export default {
       })
     },
     addModel(id) {
+      this.paramsConfigEOList = []
       this.visible = true
       this.title = '维护配置信息'
       this.formInline = {}
       this.getconList(id)
     },
-    editModel(value) {
-      this.visible = true
-      this.title = '编辑配置信息'
-      this.$nextTick(() => {
-        this.formInline = value
-      })
-    },
     getconList(id) {
       getAction(`${this.url.conList}?paramsManifestId=${id}`, {}).then((res) => {
         if (res.success) {
-          this.paramsConfigEOList = res.result.length === 0 ? this.paramsConfigEOList : res.result
+          if(res.result.length === 0) {
+            this.paramsConfigEOList = [
+              {
+                id: '',
+                // displaySeq: 0,
+                configName: '', // 配置名称
+                version: '', // 版本
+                carType: '', // 车型
+                battery: '', // 电池
+                motor: '', // 电机
+              }
+            ]
+          } else {
+            this.paramsConfigEOList = res.result
+          }
           this.visible = true
         } else {
           this.$message.warning(res.message)