合并分支 'dev_third_stage' 到 'master'

Dev third stage

查看合并请求 laws-nio/laws-weilai!86

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

@@ -15,8 +15,8 @@ public class PPEmployee {
     private	String	data_difference; //数据来源[WORKDAY,XPT,NIOCAPITAL]
     private	String	employee_difference; //	员工来源[CN, EU_US,EU]
     private	String	employee_id; //	员工编号(员工唯一标识) ----workNo
-    private	String	worker_user_id; //WD帐号创建SSO账号 / AD账户 ----thirdId
+    private	String	worker_user_id; //WD帐号创建SSO账号 / AD账户 ----thirdId, username
-    private	String	user_name; //	WD同步到people的域帐号 ----username
+    private	String	user_name; //	WD同步到people的域帐号
 //    private	String	foreign_employee_id; //	兼职公司对应的员工编号
     private	String	name; //	全名
     private	String	formatted_name; //	全名-拼音及中文 ----realname

jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/SysUserMapper.java

@@ -149,4 +149,6 @@ public interface SysUserMapper extends BaseMapper<SysUser> {
 	 * @return
 	 */
 	List<SysUser> queryByDepIds(@Param("departIds")List<String> departIds,@Param("username") String username);
+
+	List<SysUser> getPPEmployeeList(@Param("thirdType") String thirdType);
 }

jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/xml/SysUserMapper.xml

@@ -195,4 +195,9 @@
 			and username != #{username}
 		</if>
 	</select>
+
+	<select id="getPPEmployeeList" resultType="com.jero.modules.system.entity.SysUser">
+		select * from sys_user where third_type = #{thirdType}
+	</select>
+
 </mapper>

jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SyncDataServiceImpl.java

@@ -1,7 +1,6 @@
 package com.jero.modules.system.service.impl;
 
 import cn.hutool.core.collection.CollectionUtil;
-import cn.hutool.core.util.ObjectUtil;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.jero.common.constant.CommonConstant;
@@ -25,7 +24,6 @@ import org.springframework.transaction.annotation.Transactional;
 import java.io.IOException;
 import java.security.InvalidKeyException;
 import java.security.NoSuchAlgorithmException;
-import java.text.SimpleDateFormat;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -202,25 +200,25 @@ public class SyncDataServiceImpl implements ISyncDataService{
             List<SysUser> sysUserList = sysUserService.getPPEmployeeList();
 //            log.info("查询到的用户信息结果集为："+JSONObject.toJSONString(userEOList));
             for(SysUser user:sysUserList){
-                localUserMap.put(user.getId(),user);
+                localUserMap.put(user.getThirdId(),user);
             }
 //            log.info("将用户信息集合转换为的用户MAP为："+JSONObject.toJSONString(localUserMap));
             log.info("开始更新数据库信息");
             for(PPEmployee ppEmployee:ppEmployeeList){
                 try {
-                    PPEmployeeMap.put(ppEmployee.getId(), ppEmployee);
+                    PPEmployeeMap.put(ppEmployee.getWorker_user_id(), ppEmployee);
                     //1.判断当前账号是否已添加到用户中
-                    if (!localUserMap.containsKey(ppEmployee.getId())) {
+                    if (!localUserMap.containsKey(ppEmployee.getWorker_user_id())) {
                         //删除数据库中与该账户相同的数据
-                        if(StringUtils.isNotBlank(ppEmployee.getId())) {
+                        if(StringUtils.isNotBlank(ppEmployee.getWorker_user_id())) {
 //                            sysUserService.removeById(ppEmployee.getId()); // 这个为什么是逻辑删除
                             log.info("需要新增的用户信息为:" + JSONObject.toJSONString(ppEmployee));
                             SysUser newUser = sysUserService.addPPUserInfo(ppEmployee);
-                            localUserMap.put(ppEmployee.getId(), newUser);
+                            localUserMap.put(ppEmployee.getWorker_user_id(), newUser);
                         }
 
                     } else {
-                        SysUser userEO = localUserMap.get(ppEmployee.getId());
+                        SysUser userEO = localUserMap.get(ppEmployee.getWorker_user_id());
                         log.info("需要更新的用户信息为:" + JSONObject.toJSONString(userEO) + "     " + JSONObject.toJSONString(ppEmployee));
                         if(userEO != null) {
                             sysUserService.updatePPUserInfo(userEO, ppEmployee);

jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysUserServiceImpl.java

@@ -1,6 +1,5 @@
 package com.jero.modules.system.service.impl;
 
-import cn.hutool.core.collection.CollectionUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -19,7 +18,6 @@ import com.jero.modules.base.service.BaseCommonService;
 import com.jero.modules.system.entity.*;
 import com.jero.modules.system.enums.PPSyncEnum;
 import com.jero.modules.system.mapper.*;
-import com.jero.modules.system.model.DepartIdModel;
 import com.jero.modules.system.model.SysUserSysDepartModel;
 import com.jero.modules.system.service.ISysUserService;
 import com.jero.modules.system.vo.SysUserDepVo;
@@ -480,9 +478,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
 
 	@Override
 	public List<SysUser> getPPEmployeeList() {
-		QueryWrapper<SysUser> sysUserQueryWrapper = new QueryWrapper<>();
+		return this.baseMapper.getPPEmployeeList(PPSyncEnum.PP.getValue());
-		sysUserQueryWrapper.lambda().eq(SysUser::getThirdType, PPSyncEnum.PP.getValue());
-		return list(sysUserQueryWrapper);
 	}
 
 	@Override
@@ -491,11 +487,11 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
 		SysUser sysUser = new SysUser();
 		// 基本信息
 		sysUser.setId(ppEmployee.getId());
-		sysUser.setUsername(ppEmployee.getUser_name());
+		sysUser.setUsername(ppEmployee.getWorker_user_id());
 		sysUser.setRealname(ppEmployee.getFormatted_name());
 		sysUser.setStatus("Active".equals(ppEmployee.getEmployee_status())? CommonConstant.USER_UNFREEZE : CommonConstant.USER_FREEZE);
 		sysUser.setDelFlag("1".equals(ppEmployee.getDelete_flag())? CommonConstant.DEL_FLAG_0 : CommonConstant.DEL_FLAG_1);
-		sysUser.setThirdId(ppEmployee.getUser_name());
+		sysUser.setThirdId(ppEmployee.getWorker_user_id());
 		sysUser.setActivitiSync(CommonConstant.ACT_SYNC_1);
 		sysUser.setWorkNo(ppEmployee.getEmployee_id());
 		sysUser.setWorkerType("Employee".equals(ppEmployee.getWorker_type())? CommonConstant.WORKER_TYPE_1 : CommonConstant.WORKER_TYPE_2);
@@ -535,11 +531,11 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
 	public void updatePPUserInfo(SysUser sysUser, PPEmployee ppEmployee) {
 
 		// 基本信息
-		sysUser.setUsername(ppEmployee.getUser_name());
+		sysUser.setUsername(ppEmployee.getWorker_user_id());
 		sysUser.setRealname(ppEmployee.getFormatted_name());
 		sysUser.setStatus("Active".equals(ppEmployee.getEmployee_status())? CommonConstant.USER_UNFREEZE : CommonConstant.USER_FREEZE);
 		sysUser.setDelFlag("1".equals(ppEmployee.getDelete_flag())? CommonConstant.DEL_FLAG_0 : CommonConstant.DEL_FLAG_1);
-		sysUser.setThirdId(ppEmployee.getUser_name());
+		sysUser.setThirdId(ppEmployee.getWorker_user_id());
 		sysUser.setWorkNo(ppEmployee.getEmployee_id());
 		sysUser.setWorkerType("Employee".equals(ppEmployee.getWorker_type())? CommonConstant.WORKER_TYPE_1 : CommonConstant.WORKER_TYPE_2);
 		sysUser.setCreateTime(ppEmployee.getCreation_time());

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/service/impl/LawsProcessHistoryEOServiceImpl.java

@@ -11,7 +11,7 @@ import com.jero.modules.lawsOpinionGather.enums.LawsOpinionGatherNodeEnum;
 import com.jero.modules.lawsOpinionGather.enums.OperatorRoleCodeEnum;
 import com.jero.modules.lawsOpinionGather.mapper.LawsProcessHistoryEOMapper;
 import com.jero.modules.lawsOpinionGather.service.ILawsProcessHistoryEOService;
-import com.jero.modules.lawsTechnologyEvaluation.job.LawsTechnologyEvaluationNodeEnum;
+import com.jero.modules.lawsTechnologyEvaluation.enums.LawsTechnologyEvaluationNodeEnum;
 import com.jero.modules.project.enums.OperatorTypeEnum;
 import com.jero.modules.project.enums.RequestSourceEnum;
 import com.jero.modules.system.entity.SysUser;

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/enums/LawsTechnologyEvaluationNodeEnum.java

@@ -1,4 +1,4 @@
-package com.jero.modules.lawsTechnologyEvaluation.job;
+package com.jero.modules.lawsTechnologyEvaluation.enums;
 
 import com.alibaba.druid.util.StringUtils;
 import com.jero.common.constant.enums.CutEnum;

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/job/LawsTechnologyEvaluationJob.java

@@ -63,7 +63,7 @@ public class LawsTechnologyEvaluationJob implements Job {
 
                 if(CollectionUtils.isNotEmpty(lawsTechnologyEvaluationFlowDetailEOList)){
                     String actiProcInstIds = lawsTechnologyEvaluationFlowDetailEOList.stream().map(LawsTechnologyEvaluationFlowDetailEO::getActiProcInstId).distinct().collect(Collectors.joining(","));
-                    Result<String> result = this.workFlowFeignClient.completeTaskByPids(actiProcInstIds);
+                    Result<String> result = this.workFlowFeignClient.completeLawsTechnologyEvaluationTaskByPids(actiProcInstIds);
                     if(result.getCode().equals(CommonConstant.SC_OK_200)){
                         updateLawsTechnologyEvaluationEOList.forEach(lawsTechnologyEvaluationEO -> {
                             lawsTechnologyEvaluationEO.setFlowStatus(GatherResultEnum.COMPLETED.getValue());

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/impl/LawsTechnologyEvaluationComplianceResultEOServiceImpl.java

@@ -137,7 +137,7 @@ public class LawsTechnologyEvaluationComplianceResultEOServiceImpl extends Servi
 		List<LawsTechnologyEvaluationComplianceResultEO> complianceResultEOList = this.baseMapper.selectList(queryWrapper);
 
 		if(CollectionUtils.isNotEmpty(complianceResultEOList)){
-
+			this.disposeData(complianceResultEOList,cut);
 			List<String> complianceResultIdList = complianceResultEOList.stream().map(LawsTechnologyEvaluationComplianceResultEO::getId).distinct().collect(Collectors.toList());
 			QueryWrapper<LawsTechnologyEvaluationResultEO> evaluationResultEOQueryWrapper = new QueryWrapper<>();
 			evaluationResultEOQueryWrapper.lambda().in(LawsTechnologyEvaluationResultEO::getComplianceResultId,complianceResultIdList);
@@ -179,14 +179,17 @@ public class LawsTechnologyEvaluationComplianceResultEOServiceImpl extends Servi
 		String title = "";
 		String bottomTitle = "";
 		String fileName = "";
+		String sheetName = "";
 		if(org.apache.commons.lang3.StringUtils.equals(cut, CutEnum.CN.getValue())){
 			title = "相关章节,问题说明,附件";
 			bottomTitle = "符合性结果：";
 			fileName = "评估结果 " + ".xlsx";
+			sheetName = "反馈结果";
 		}else if(org.apache.commons.lang3.StringUtils.equals(cut,CutEnum.EN.getValue())){
 			title = "Related section,Problem description,Accessory";
 			bottomTitle = "Compliance results:";
 			fileName = "Evaluation results " + ".xlsx";
+			sheetName = "Feedback result";
 		}
 
 		OutputStream os = null;
@@ -201,10 +204,12 @@ public class LawsTechnologyEvaluationComplianceResultEOServiceImpl extends Servi
 
 			//设置导出数据
 			if(CollectionUtils.isNotEmpty(exportData)) {
-				int size = exportData.size();
+				//创建表头
+				String[] titleArr = title.split(",");
+
 				for (int i = 0; i < exportData.size(); i++){
 					//使用评估人的名字命名sheet页
-					HSSFSheet sheet = workbook.createSheet(exportData.get(i).getCreateBy());
+					HSSFSheet sheet = workbook.createSheet(exportData.get(i).getCreateBy() + " " + sheetName);
 
 					CellStyle titleCellStyle = workbook.createCellStyle();
 					titleCellStyle.setAlignment(HorizontalAlignment.CENTER);//垂直居中
@@ -212,11 +217,8 @@ public class LawsTechnologyEvaluationComplianceResultEOServiceImpl extends Servi
 					titleCellStyle.setWrapText(true);//自动换行
 
 					Row firstRow = sheet.createRow(0);
-
+					for (int j=0; j<3; j++){
-					//创建表头
+						sheet.setColumnWidth(j,10000);
-					String[] titleArr = title.split(",");
-					for (int j=0; j<=3; j++){
-						sheet.setColumnWidth(j,4000);
 						Cell cell = firstRow.createCell(j);
 						cell.setCellStyle(titleCellStyle);
 						cell.setCellValue(titleArr[j]);
@@ -236,18 +238,12 @@ public class LawsTechnologyEvaluationComplianceResultEOServiceImpl extends Servi
 
 					//把符合性结果设置进excel表格中。
 					Row bottomRow = sheet.createRow(evaluationResultListSize + 1);
-					Cell bottomRowFirstCell = bottomRow.getCell(0);
+					Cell bottomRowFirstCell = bottomRow.createCell(0);
 					bottomRowFirstCell.setCellStyle(titleCellStyle);
-					bottomRowFirstCell.setCellValue(bottomTitle);
+					bottomRowFirstCell.setCellValue(bottomTitle + " " + exportData.get(i).getComplianceResultName());
-
-					Cell bottomRowSecondCell = bottomRow.getCell(1);
-					bottomRowSecondCell.setCellValue(exportData.get(i).getComplianceResultName());
 				}
-
-
 			}
 
-
 			File fileTemp = new File(path);
 			if (fileTemp.exists()) {
 				fileTemp.delete();
@@ -291,7 +287,6 @@ public class LawsTechnologyEvaluationComplianceResultEOServiceImpl extends Servi
 						}
 					}
 				}
-
 			}
 			ZipUtil.zip(path, path + ".zip");
 			//文件

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/impl/LawsTechnologyEvaluationEOServiceImpl.java

@@ -327,33 +327,22 @@ public class LawsTechnologyEvaluationEOServiceImpl extends ServiceImpl<LawsTechn
 			nowFile.mkdirs();
 
 			HSSFSheet sheet = workbook.createSheet("sheet1");
-			sheet.setDefaultColumnWidth(16);//列宽
-			HSSFCellStyle cellStyle = workbook.createCellStyle();
-			cellStyle.setWrapText(true);//自动换行
-			cellStyle.setAlignment(HorizontalAlignment.CENTER);//垂直居中
-			cellStyle.setVerticalAlignment(VerticalAlignment.CENTER);//水平居中
 
-			HSSFCellStyle cellStyleTemp = workbook.createCellStyle();
+			CellStyle titleCellStyle = workbook.createCellStyle();
-			cellStyleTemp.setWrapText(true);//自动换行
+			titleCellStyle.setAlignment(HorizontalAlignment.CENTER);//垂直居中
-
+			titleCellStyle.setVerticalAlignment(VerticalAlignment.CENTER);//水平居中
-			String explainInfo = null;
+			titleCellStyle.setWrapText(true);//自动换行
-
-			HSSFRichTextString explain = new HSSFRichTextString(explainInfo);
 
 			//表头
 			Row row = sheet.createRow(0);//开始创建标题行
 			String[] headerArr = title.split(",");
 			for (int m = 0; m < headerArr.length; m++) {
-				row.createCell(m).setCellValue(headerArr[m]);
+				sheet.setColumnWidth(m,10000);
+				Cell cell = row.createCell(m);
+				cell.setCellStyle(titleCellStyle);
+				cell.setCellValue(headerArr[m]);
 			}
 
-			/*Row rowExplain = sheet.createRow(1);
-			short height = (short) (7 * 200);
-			rowExplain.setHeight((short) height);
-			Cell cell = rowExplain.createCell(0);
-			cell.setCellValue(explain);
-			cell.setCellStyle(cellStyleTemp);*/
-
 			response.setHeader("Content-Disposition",
 					"attachment; filename=\"" + fileOriName + ".xls");
 			response.setContentType("application/force-download");

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/feginClient/WorkFlowFeignClient.java

@@ -145,4 +145,7 @@ public interface WorkFlowFeignClient {
      */
     @RequestMapping(value = "/bat-wkflow/startLawsTechnologyEvaluationProcess",method = RequestMethod.POST,headers = {"content-type=application/json"})
     Result<String> startLawsTechnologyEvaluationProcess(String jsonObject);
+
+    @RequestMapping(value = "/bat-wkflow/task/completeLawsTechnologyEvaluationTaskByPids",method = RequestMethod.GET)
+    Result<String> completeLawsTechnologyEvaluationTaskByPids(@RequestParam("actiProcInstIds") String actiProcInstIds);
 }

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

@@ -1138,4 +1138,11 @@ module.exports = {
   processName:'Process Name',
   feedbackResults:'Feedback results',
   theDoesNotSupportPreview:'The current file format does not support Preview',
+  releaseSituation:'Release situation',
+  comparisonResults:'Comparison results',
+  Published:'Published',
+  initiateComparison:'Initiate comparison',
+  translationLanguage:'Translation language',
+  translationResults:'Translation results',
+  conversionTime:'Conversion time',
 }

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

@@ -1142,4 +1142,11 @@ module.exports = {
   processName:'流程名称',
   feedbackResults:'反馈结果',
   theDoesNotSupportPreview:'当前文件格式不支持预览',
+  releaseSituation:'发布情况',
+  comparisonResults:'对比结果',
+  Published:'已发布',
+  initiateComparison:'发起对比',
+  translationLanguage:'翻译语言',
+  translationResults:'翻译结果',
+  conversionTime:'转换时间',
 }

jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/components/evaluationResultsList.vue

@@ -92,6 +92,7 @@
             title: this.$t('relevantSections'),
             align: 'center',
             dataIndex: 'relatedSection',
+            ellipsis: true,
             width: 180
           },
           {

jero-web/src/views/businessSupport/regulationReport/components/RegulationMonthlyManagement.vue

@@ -220,7 +220,11 @@
           let url = window._CONFIG['onlinePreviewDomainURL'] + '?url=' + Base64.encode(this.downLoadFileUrl + '/' + item.fileId + fileSuffix)
           window.open(url, '_blank')
         } else {
-          this.$message.warning(this.$t('theDoesNotSupportPreview'))
+          if (item.createBy == this.userInfo().username){
+            downloadFile('/sys/common/downLoadFile', item.name, { id: item.fileId, userName: this.userInfo().username })
+          }else{
+            this.$message.warning(this.$t('theDoesNotSupportPreview'))
+          }
         }
       },
       download(item) {

jero-web/src/views/businessSupport/technologyAssessment/components/evaluationResultsClause.vue

@@ -230,7 +230,15 @@
     },
     methods: {
       CurrentStandard() {
-
+        let query = {
+          firstInitiation: '2',
+          whetherTobring: '1'
+        }
+        let newUrl = this.$router.resolve({
+          path: '/evaluationInitiationProcess',
+          query: query
+        })
+        window.open(newUrl.href, '_blank')
       },
       onSelectChange(value) {
         this.selectedRowKeys = value

jero-web/src/views/businessSupport/technologyAssessment/components/evaluationResultsWhole.vue

@@ -81,7 +81,7 @@
         dataSource: [],
         url: {
           list: '/lawsTechnologyEvaluation/lawsTechnologyEvaluationComplianceResultEO/list',
-          exportData:'lawsTechnologyEvaluation/lawsTechnologyEvaluationComplianceResultEO/exportZip',
+          exportData: 'lawsTechnologyEvaluation/lawsTechnologyEvaluationComplianceResultEO/exportZip'
         },
         selectedRowKeys: [],
         loading: false,
@@ -114,7 +114,15 @@
     },
     methods: {
       CurrentStandard() {
-
+        let query = {
+          firstInitiation: '2',
+          whetherTobring: '2'
+        }
+        let newUrl = this.$router.resolve({
+          path: '/evaluationInitiationProcess',
+          query: query
+        })
+        window.open(newUrl.href, '_blank')
       },
       onSelectChange(value) {
 

jero-web/src/views/businessSupport/technologyAssessment/components/initiatingProcess.vue

@@ -5,34 +5,37 @@
     />
     <div class="detail-box">
       <div class="detail-content" style="padding: 20px">
-        <div class="table-page-search-wrapper">
+        <div class="table-page-search-wrapper" v-if="whetherDisplay">
           <search ref="searchRef"
                   :flag="'1'"
                   :url="url"/>
         </div>
-        <a-table
+        <div v-if="whetherDisplay">
-          ref="table"
+          <a-table
-          size="middle"
+            ref="table"
-          :loading="loading"
+            size="middle"
-          :pagination="false"
+            :loading="loading"
-          :scroll="{x: '100%'}"
+            :pagination="false"
-          rowKey="id"
+            :scroll="{x: '100%'}"
-          :data-source="dataSource"
+            rowKey="id"
-          :row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange ,columnTitle:' '}"
+            :data-source="dataSource"
-          :columns="columns"
+            :row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange ,columnTitle:' '}"
-        >
+            :columns="columns"
-        </a-table>
+          >
-        <div class="page" v-if="dataSource && dataSource.length > 0">
+          </a-table>
-          <a-pagination
+          <div class="page" v-if="dataSource && dataSource.length > 0">
-            :show-total="total => $t('total')+` ${total} `+$t('strip')"
+            <a-pagination
-            show-quick-jumper
+              :show-total="total => $t('total')+` ${total} `+$t('strip')"
-            :page-size.sync="pageSize"
+              show-quick-jumper
-            :total="total"
+              :page-size.sync="pageSize"
-            :current="pageNo"
+              :total="total"
-            @change="pageOnChange"
+              :current="pageNo"
-            @showSizeChange="SizeChange"
+              @change="pageOnChange"
-          />
+              @showSizeChange="SizeChange"
+            />
+          </div>
         </div>
+
         <a-form-model :model="formInline" class="formAdd" :rules="rules" ref="ruleForm">
           <a-row :gutter="24" style="margin-bottom: 10px">
             <a-col :span="24">
@@ -238,6 +241,7 @@
         },
         searchParmes: {},
         selectedRowKeysRecord: [],
+        whetherDisplay: false,
         columns: [
           {
             title: this.$t('standard'),
@@ -293,6 +297,11 @@
       } else {
         this.isTrue = false
       }
+      if (this.$route.query.firstInitiation == '1') {
+        this.whetherDisplay = true
+      } else {
+        this.whetherDisplay = false
+      }
       eventBUs.$on('searchQuery', search => {
         Object.keys(search).forEach(res => {
           if (search[res] instanceof Array) {
@@ -454,7 +463,9 @@
         value.startTime = startTime
         value.flowStatus = 'Underway'
         value.taskAffirmDueDate = value.endTime
-        value.lawsTechnologyEvaluationId = this.getUUID()
+        if (!value.lawsTechnologyEvaluationId){
+          value.lawsTechnologyEvaluationId = this.getUUID()
+        }
         value.regulationOwnerId = this.userInfo().id
         value.regulationOwnerName = this.userInfo().username
         Object.keys(value).forEach(res => {
@@ -474,12 +485,14 @@
           query = {
             type: 6,
             ...value,
+            firstInitiation: this.$route.query.firstInitiation,
             msg: JSON.stringify({ itemList: dataList }).replace(/\"/g, '\'')
           }
         } else {
           query = {
             type: 6,
             ...value,
+            firstInitiation: this.$route.query.firstInitiation,
             msg: JSON.stringify({ evaluators: value.evaluators }).replace(/\"/g, '\'')
           }
         }

jero-web/src/views/businessSupport/technologyAssessment/index.vue

@@ -339,6 +339,7 @@
         this.$refs.ruleForm.validate(valid => {
           if (valid) {
             this.visible = false
+            this.formInline.firstInitiation = '1'
             let newUrl = this.$router.resolve({
               path: '/evaluationInitiationProcess',
               query: this.formInline
@@ -365,9 +366,12 @@
           let newUrl = this.$router.resolve({
             path: '/evaluationResultsWhole',
             query: {
-              id:row.id,
+              id: row.id,
-              processBackground:row.processBackground,
+              processBackground: row.processBackground,
-              serialNumber:row.serialNumber
+              serialNumber: row.serialNumber,
+              title: row.title,
+              technologyTerritory: row.technologyTerritory,
+              standId: row.standId
             }
           })
           window.open(newUrl.href, '_blank')
@@ -375,9 +379,12 @@
           let newUrl = this.$router.resolve({
             path: '/evaluationResultsClause',
             query: {
-              id:row.id,
+              id: row.id,
-              processBackground:row.processBackground,
+              processBackground: row.processBackground,
-              serialNumber:row.serialNumber
+              serialNumber: row.serialNumber,
+              title: row.title,
+              technologyTerritory: row.technologyTerritory,
+              standId: row.standId
             }
           })
           window.open(newUrl.href, '_blank')

jero-web/src/views/dashboard/components/monthlyReportRegulations.vue

@@ -2,60 +2,98 @@
   <div class="monthlyReportRegulations-box">
     <div class="header-text">
       <div class="header-text-left">{{this.$t('monthlyReportRegulations')}}</div>
-      <div class="header-text-right">
+      <div class="header-text-right" @click="moreClick">
         More
         <img src="../../../assets/gengduo.png" alt="">
       </div>
     </div>
-    <div class="monthlyReportRegulations-box-content">
+    <div class="monthlyReportRegulations-box-content" v-if="monthlyReportRegulationsList.length > 0">
-      <div class="monthlyReportRegulations-text" v-for="item in monthlyReportRegulationsList">
+      <div class="monthlyReportRegulations-text" v-for="item in monthlyReportRegulationsList" @click="preview(item)">
         <div class="yuan"></div>
         <div class="text" :title="item.name">{{item.name}}</div>
-        <div class="time">{{item.time}}</div>
+        <div class="time">{{item.createTime}}</div>
       </div>
     </div>
+    <div v-else style="height: 300px;position: relative">
+      <JNoData/>
+    </div>
+    <JLoading :loading="loading">{{$t('dataLoading')}}</JLoading>
   </div>
 </template>
 
 <script>
+  import { getAction, postAction, deleteAction, downloadFile } from '@/api/manage'
+  import { Base64 } from 'js-base64'
+  import { mapGetters } from 'vuex'
+
   export default {
     name: 'monthlyReportRegulations',
     data() {
       return {
-        monthlyReportRegulationsList: [
+        monthlyReportRegulationsList: [],
-          {
+        loading: false,
-            name: '蔚来汽车法规月报_202201_主页面 CN.docx',
+        downLoadFileUrl: window._CONFIG['domianPreviewURL'] + '/sys/common/download',
-            time: '2022-01-01 13:24:36'
+        url: {
-          },
+          list: '/report/lawsMonthlyReportManageEO/page'
-          {
+        }
-            name: '蔚来汽车法规月报_202202_主页面 CN.docx',
+      }
-            time: '2022-02-01 15:50:06'
+    },
-          },
+    mounted() {
-          {
+      this.getList()
-            name: '蔚来汽车法规月报_202203_主页面 CN.docx',
+    },
-            time: '2022-03-01 13:56:20'
+    methods: {
-          },
+      ...mapGetters(['userInfo']),
-          {
+      getList() {
-            name: '蔚来汽车法规月报_202204_主页面 CN.docx',
+        let query = {
-            time: '2022-04-01 16:24:45'
+          pageNo: 1,
-          },
+          pageSize: 6,
-          {
+          issueStatus: '1'
-            name: '蔚来汽车法规月报_202205_主页面 CN.docx',
+        }
-            time: '2022-06-01 17:24:06'
+        this.loading = true
-          },
+        getAction(this.url.list, query).then((res) => {
-          {
+          if (res.success) {
-            name: '蔚来汽车法规月报_202206_主页面 CN.docx',
+            this.monthlyReportRegulationsList = res.result.records || []
-            time: '2022-06-01 17:24:06'
+            this.loading = false
+          } else {
+            this.loading = false
           }
-        ]
+        })
+      },
+      moreClick() {
+        this.$router.push({
+          path: '/monthlyRegulationReport'
+        })
+      },
+      preview(item) {
+        let fileName = item.name
+        let index1 = fileName.lastIndexOf('.')
+        let index2 = fileName.length
+        let fileSuffix = fileName.substring(index1, index2)
+        if (fileSuffix === '.pdf') {
+          window.open('/pdf/web/viewer.html?file=' + encodeURIComponent('/jero-boot/sys/common/pdf/viewFile?id=' + item.fileId + '&userName=' + this.userInfo().username))
+        } else if (fileSuffix === '.docx') {
+          let url = window._CONFIG['onlinePreviewDomainURL'] + '?url=' + Base64.encode(this.downLoadFileUrl + '/' + item.fileId + fileSuffix)
+          window.open(url, '_blank')
+        } else if (fileSuffix === '.xlsx' || fileSuffix === '.xls') {
+          let url = window._CONFIG['onlinePreviewDomainURL'] + '?url=' + Base64.encode(this.downLoadFileUrl + '/' + item.fileId + fileSuffix)
+          window.open(url, '_blank')
+        } else {
+          if (item.createBy == this.userInfo().username){
+            downloadFile('/sys/common/downLoadFile', item.name, { id: item.fileId, userName: this.userInfo().username })
+          }else{
+            this.$message.warning(this.$t('theDoesNotSupportPreview'))
+          }
+        }
       }
     }
+
   }
 </script>
 
 <style scoped lang="less">
   .monthlyReportRegulations-box {
     width: 100%;
+    position: relative;
 
     .header-text {
       width: 100%;
@@ -73,6 +111,7 @@
         font-weight: 400;
         color: #9B9DA9;
         margin-top: 6px;
+        cursor: pointer;
       }
     }
 

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

@@ -0,0 +1,340 @@
+<template>
+  <a-card :bordered="false">
+    <div class="table-page-search-wrapper">
+      <a-form layout="inline" @keyup.enter.native="searchQuery">
+        <a-row :gutter="24">
+          <a-col :md="6" :sm="8">
+            <div class="box-title-text">
+              <div class="title-text" :title="$t('standard')">
+                <span>{{$t('standard')}}</span>
+              </div>
+              <j-input class="box-input" :placeholder="$t('PleaseEnter')+$t('standard')"
+                       v-model="queryParam.serialNumber"></j-input>
+            </div>
+          </a-col>
+          <a-col :md="6" :sm="8">
+            <div class="box-title-text">
+              <div class="title-text" :title="$t('title')">
+                <span>{{$t('title')}}</span>
+              </div>
+              <j-input class="box-input" :placeholder="$t('PleaseEnter')+$t('title')"
+                       v-model="queryParam.title"></j-input>
+            </div>
+          </a-col>
+          <a-col :md="6" :sm="8">
+            <div class="box-title-text tree-select">
+              <div class="title-text" :title="$t('releaseSituation')">
+                <span>{{$t('releaseSituation')}}</span>
+              </div>
+              <a-select :placeholder="$t('PleaseSelect')+$t('releaseSituation')"
+                        class="box-input"
+                        :getPopupContainer="triggerNode=> triggerNode.parentNode"
+                        allowClear
+                        v-model="queryParam.flowStatus">
+                <a-select-option v-for="(item, key) in gatherResultList"
+                                 :key="key"
+                                 :value="item.value">
+                     <span style="display: inline-block;width: 100%" :title=" item.name">
+                           {{ item.name }}
+                     </span>
+                </a-select-option>
+              </a-select>
+            </div>
+          </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-col>
+      </span>
+        </a-row>
+      </a-form>
+    </div>
+    <div class="table-operator">
+      <div @click="initiatingProcessClick" class="operator-text">
+        <a-icon type="apartment"/>
+        {{$t('initiateComparison')}}
+      </div>
+    </div>
+    <div>
+      <a-table
+        ref="table"
+        size="middle"
+        :loading="loading"
+        :pagination="false"
+        :scroll="{x: '100%'}"
+        rowKey="id"
+        :data-source="dataSource"
+        :row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }"
+        :columns="columns"
+      >
+        <!--         -->
+        <span slot="operation" slot-scope="text,record">
+           <a class="text-operation" @click="comparisonResultsClick(record)">{{$t('comparisonResults')}}</a>
+           <a class="text-operation"
+              @click="subscribe(record)">
+            {{!record.state || record.state == 0 ? $t('release') :$t('withdraw')}}
+           </a>
+          <a class="text-operation" @click="edit(record)">{{$t('edit')}}</a>
+          <a class="text-operation" @click="deleteData(record)">{{$t('delete')}}</a>
+        </span>
+      </a-table>
+      <div class="page" v-if="dataSource && dataSource.length > 0">
+        <a-pagination
+          :show-total="total => $t('total')+` ${total} `+$t('strip')"
+          show-quick-jumper
+          show-size-changer
+          :page-size.sync="pageSize"
+          :total="total"
+          :current="pageNo"
+          @change="pageOnChange"
+          @showSizeChange="SizeChange"
+        />
+      </div>
+    </div>
+  </a-card>
+</template>
+
+<script>
+  import { getAction, postAction } from '@/api/manage'
+
+  export default {
+    name: 'index',
+    components: {},
+    data() {
+      return {
+        //url传参严格按照当前命名
+        url: {
+          list: '',
+          deleteBatch:'',
+        },
+        loading: false,
+        dataSource: [],
+        selectedRowKeys: [],
+        total: 0,
+        pageSize: 10,
+        pageNo: 1,
+        queryParam: {},
+        gatherResultList: [
+          {
+            value: '1',
+            name: this.$t('draft')
+          },
+          {
+            value: '2',
+            name: this.$t('Published')
+          }
+        ],
+        columns: [
+          {
+            title: this.$t('standard') + 1,
+            align: 'center',
+            dataIndex: 'serialNumber',
+            width: 170
+          },
+          {
+            title: this.$t('title') + 1,
+            align: 'center',
+            dataIndex: 'title',
+            width: 170
+          },
+          {
+            title: this.$t('TextStatus'),
+            align: 'center',
+            width: 170,
+            ellipsis: true,
+            dataIndex: 'TextStatus'
+          },
+          {
+            title: this.$t('fileName'),
+            align: 'center',
+            width: 170,
+            ellipsis: true,
+            dataIndex: 'fileName'
+          },
+          {
+            title: this.$t('standard') + 2,
+            align: 'center',
+            dataIndex: 'serialNumberTwo',
+            width: 170
+          },
+          {
+            title: this.$t('title') + 2,
+            align: 'center',
+            dataIndex: 'titleTwo',
+            width: 170
+          },
+          {
+            title: this.$t('TextStatus'),
+            align: 'center',
+            width: 170,
+            ellipsis: true,
+            dataIndex: 'TextStatusTwo'
+          },
+          {
+            title: this.$t('fileName'),
+            align: 'center',
+            width: 170,
+            ellipsis: true,
+            dataIndex: 'fileNameTwo'
+          },
+          {
+            title: this.$t('releaseSituation'),
+            align: 'center',
+            width: 170,
+            ellipsis: true,
+            dataIndex: 'releaseSituation'
+          },
+          {
+            title: this.$t('remarks'),
+            align: 'center',
+            ellipsis: true,
+            width: 170,
+            dataIndex: 'remark'
+          },
+          {
+            title: this.$t('operation'),
+            align: 'center',
+            fixed: 'right',
+            width: 260,
+            scopedSlots: { customRender: 'operation' }
+          }
+        ]
+      }
+    },
+    mounted() {
+      this.getList()
+    },
+    methods: {
+      searchQuery() {
+        this.pageNo = 1
+        this.getList()
+      },
+      searchReset() {
+        this.queryParam = {}
+        this.pageNo = 1
+        this.getList()
+      },
+      pageOnChange(page) {
+        this.pageNo = page
+        this.getList()
+      },
+      SizeChange(pageSize) {
+        this.pageNo = 1
+        this.pageSize = pageSize
+        this.getList()
+      },
+      getList() {
+        let queryParam = JSON.parse(JSON.stringify(this.queryParam))
+        Object.keys(queryParam).forEach(val => {
+          if (queryParam[val] instanceof Array) {
+            queryParam[val] = queryParam[val].join(',')
+          }
+        })
+        let query = {
+          pageNo: this.pageNo,
+          pageSize: this.pageSize,
+          ...queryParam
+        }
+        this.loading = true
+        getAction(this.url.list, query).then((res) => {
+          if (res.success) {
+            this.dataSource = res.result.records || []
+            this.total = res.result.total
+            this.loading = false
+          } else {
+            this.loading = false
+          }
+        })
+      },
+      onSelectChange(value) {
+        this.selectedRowKeys = value
+      },
+      comparisonResultsClick() {
+
+      },
+      subscribe() {
+
+      },
+      edit(){
+
+      },
+      initiatingProcessClick(){
+
+      },
+      deleteData(val){
+        let _this = this
+        this.$confirm({
+          content: _this.$t('ConfirmDelete'),
+          onOk() {
+            getAction(_this.url.deleteBatch, { ids: val.id }).then((res) => {
+              if (res.success) {
+                _this.$message.success(_this.$t('OperationSuccessful'))
+                _this.getList()
+              } else {
+                _this.$message.warning(res.message)
+              }
+            })
+          }
+        })
+      },
+    }
+  }
+</script>
+<style scoped>
+  @import '~@assets/less/common.less';
+
+  .page {
+    text-align: right;
+    margin-top: 20px;
+  }
+
+  .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;*/
+  }
+
+  .text-operation {
+    margin-right: 8px;
+  }
+
+  .itemModel {
+    width: calc(100% - 130px);
+    display: inline-block;
+    margin-top: 2px;
+  }
+
+  .Required {
+    color: red;
+    margin-right: 4px;
+  }
+</style>

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

@@ -0,0 +1,330 @@
+<template>
+  <a-card :bordered="false">
+    <div class="table-page-search-wrapper">
+      <a-form layout="inline" @keyup.enter.native="searchQuery">
+        <a-row :gutter="24">
+          <a-col :md="6" :sm="8">
+            <div class="box-title-text">
+              <div class="title-text" :title="$t('standard')">
+                <span>{{$t('standard')}}</span>
+              </div>
+              <j-input class="box-input" :placeholder="$t('PleaseEnter')+$t('standard')"
+                       v-model="queryParam.serialNumber"></j-input>
+            </div>
+          </a-col>
+          <a-col :md="6" :sm="8">
+            <div class="box-title-text">
+              <div class="title-text" :title="$t('title')">
+                <span>{{$t('title')}}</span>
+              </div>
+              <j-input class="box-input" :placeholder="$t('PleaseEnter')+$t('title')"
+                       v-model="queryParam.title"></j-input>
+            </div>
+          </a-col>
+          <a-col :md="6" :sm="8">
+            <div class="box-title-text tree-select">
+              <div class="title-text" :title="$t('releaseSituation')">
+                <span>{{$t('releaseSituation')}}</span>
+              </div>
+              <a-select :placeholder="$t('PleaseSelect')+$t('releaseSituation')"
+                        class="box-input"
+                        :getPopupContainer="triggerNode=> triggerNode.parentNode"
+                        allowClear
+                        v-model="queryParam.flowStatus">
+                <a-select-option v-for="(item, key) in gatherResultList"
+                                 :key="key"
+                                 :value="item.value">
+                     <span style="display: inline-block;width: 100%" :title=" item.name">
+                           {{ item.name }}
+                     </span>
+                </a-select-option>
+              </a-select>
+            </div>
+          </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-col>
+      </span>
+        </a-row>
+      </a-form>
+    </div>
+    <div class="table-operator">
+      <div @click="initiatingProcessClick" class="operator-text">
+        <a-icon type="apartment"/>
+        {{$t('initiateComparison')}}
+      </div>
+    </div>
+    <div>
+      <a-table
+        ref="table"
+        size="middle"
+        :loading="loading"
+        :pagination="false"
+        :scroll="{x: '100%'}"
+        rowKey="id"
+        :data-source="dataSource"
+        :row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }"
+        :columns="columns"
+      >
+        <!--         -->
+        <span slot="operation" slot-scope="text,record">
+          <a class="text-operation" @click="viewClick(record)">{{$t('view')}}</a>
+          <a class="text-operation" @click="checkClick(record)">{{$t('check')}}</a>
+                     <a class="text-operation"
+                        @click="subscribe(record)">
+            {{!record.state || record.state == 0 ? $t('release') :$t('withdraw')}}
+           </a>
+          <a class="text-operation" @click="downloadData(record)">{{$t('download')}}</a>
+          <a class="text-operation" @click="deleteData(record)">{{$t('delete')}}</a>
+        </span>
+      </a-table>
+      <div class="page" v-if="dataSource && dataSource.length > 0">
+        <a-pagination
+          :show-total="total => $t('total')+` ${total} `+$t('strip')"
+          show-quick-jumper
+          show-size-changer
+          :page-size.sync="pageSize"
+          :total="total"
+          :current="pageNo"
+          @change="pageOnChange"
+          @showSizeChange="SizeChange"
+        />
+      </div>
+    </div>
+  </a-card>
+</template>
+
+<script>
+  import { getAction, postAction } from '@/api/manage'
+
+  export default {
+    name: 'index',
+    components: {},
+    data() {
+      return {
+        //url传参严格按照当前命名
+        url: {
+          list: '',
+          deleteBatch:'',
+        },
+        loading: false,
+        dataSource: [],
+        selectedRowKeys: [],
+        total: 0,
+        pageSize: 10,
+        pageNo: 1,
+        queryParam: {},
+        gatherResultList: [
+          {
+            value: '1',
+            name: this.$t('draft')
+          },
+          {
+            value: '2',
+            name: this.$t('Published')
+          }
+        ],
+        columns: [
+          {
+            title: this.$t('standard'),
+            align: 'center',
+            dataIndex: 'serialNumber',
+            width: 170
+          },
+          {
+            title: this.$t('title'),
+            align: 'center',
+            dataIndex: 'title',
+            width: 170
+          },
+          {
+            title: this.$t('TextStatus'),
+            align: 'center',
+            width: 170,
+            ellipsis: true,
+            dataIndex: 'TextStatus'
+          },
+          {
+            title: this.$t('fileName'),
+            align: 'center',
+            width: 170,
+            ellipsis: true,
+            dataIndex: 'fileName'
+          },
+          {
+            title: this.$t('translationLanguage'),
+            align: 'center',
+            dataIndex: 'translationLanguage',
+            width: 170
+          },
+          {
+            title: this.$t('translationResults'),
+            align: 'center',
+            dataIndex: 'translationResults',
+            width: 170
+          },
+          {
+            title: this.$t('conversionTime'),
+            align: 'center',
+            width: 170,
+            ellipsis: true,
+            dataIndex: 'conversionTime'
+          },
+          {
+            title: this.$t('releaseSituation'),
+            align: 'center',
+            width: 170,
+            ellipsis: true,
+            dataIndex: 'releaseSituation'
+          },
+          {
+            title: this.$t('operation'),
+            align: 'center',
+            fixed: 'right',
+            width: 260,
+            scopedSlots: { customRender: 'operation' }
+          }
+        ]
+      }
+    },
+    mounted() {
+      this.getList()
+    },
+    methods: {
+      searchQuery() {
+        this.pageNo = 1
+        this.getList()
+      },
+      searchReset() {
+        this.queryParam = {}
+        this.pageNo = 1
+        this.getList()
+      },
+      pageOnChange(page) {
+        this.pageNo = page
+        this.getList()
+      },
+      SizeChange(pageSize) {
+        this.pageNo = 1
+        this.pageSize = pageSize
+        this.getList()
+      },
+      getList() {
+        let queryParam = JSON.parse(JSON.stringify(this.queryParam))
+        Object.keys(queryParam).forEach(val => {
+          if (queryParam[val] instanceof Array) {
+            queryParam[val] = queryParam[val].join(',')
+          }
+        })
+        let query = {
+          pageNo: this.pageNo,
+          pageSize: this.pageSize,
+          ...queryParam
+        }
+        this.loading = true
+        getAction(this.url.list, query).then((res) => {
+          if (res.success) {
+            this.dataSource = res.result.records || []
+            this.total = res.result.total
+            this.loading = false
+          } else {
+            this.loading = false
+          }
+        })
+      },
+      onSelectChange(value) {
+        this.selectedRowKeys = value
+      },
+      viewClick(row) {
+
+      },
+      checkClick(row){
+
+      },
+      downloadData(){
+
+      },
+      subscribe() {
+
+      },
+      initiatingProcessClick(){
+
+      },
+      deleteData(val){
+        let _this = this
+        this.$confirm({
+          content: _this.$t('ConfirmDelete'),
+          onOk() {
+            getAction(_this.url.deleteBatch, { ids: val.id }).then((res) => {
+              if (res.success) {
+                _this.$message.success(_this.$t('OperationSuccessful'))
+                _this.getList()
+              } else {
+                _this.$message.warning(res.message)
+              }
+            })
+          }
+        })
+      },
+    }
+  }
+</script>
+<style scoped>
+  @import '~@assets/less/common.less';
+
+  .page {
+    text-align: right;
+    margin-top: 20px;
+  }
+
+  .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;*/
+  }
+
+  .text-operation {
+    margin-right: 8px;
+  }
+
+  .itemModel {
+    width: calc(100% - 130px);
+    display: inline-block;
+    margin-top: 2px;
+  }
+
+  .Required {
+    color: red;
+    margin-right: 4px;
+  }
+</style>

jero-web/src/views/processCenter/components/feedbackInformation.vue

@@ -181,6 +181,13 @@
       deleteData() {
         this.formInline.dataList.pop()
         this.formInline = { ...this.formInline }
+      },
+      submitData(callBack) {
+        this.$refs.ruleForm.validate(valid => {
+          if (valid) {
+            callBack && callBack(this.formInline.dataList)
+          }
+        })
       }
     }
   }

jero-web/src/views/processCenter/processForm/regulatoryProcess/index.vue

@@ -142,13 +142,13 @@
           res.lawsOpinionGatherId = this.queryProject.id
           res.actiProcInstId = this.$route.query.prcId
         })
-        postAction('/lawsOpinionGather/lawsOpinionAssessmentResultEO/insertBatch', { dataList:list }).then((res) => {
+        postAction('/lawsOpinionGather/lawsOpinionAssessmentResultEO/insertBatch', { dataList: list }).then((res) => {
           if (res.success) {
             if (num == 1) {
               this.$message.success(this.$t('OperationSuccessful'))
-              this.$router.push({
+              // this.$router.push({
-                path: '/collectionOfRegulatoryOpinions'
+              //   path: '/collectionOfRegulatoryOpinions'
-              })
+              // })
               this.loading = false
             } else {
               this.completeTask()
@@ -162,8 +162,12 @@
         })
       },
       submit() {
-        let dataList = this.$refs.feedbackInformationRef.formInline.dataList
+        this.$refs.feedbackInformationRef.submitData((res) => {
-        this.insertBatch(dataList, 2)
+          this.loading = true
+          this.insertBatch(res, 2)
+        })
+        // let dataList = this.$refs.feedbackInformationRef.formInline.dataList
+        // this.insertBatch(dataList, 2)
       },
       completeTask() {
         let query = {

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

@@ -1180,12 +1180,12 @@
             selectedRowKeysValue.push(res)
           }
         })
+        console.log(selectedRowKeysValue)
         for (let i = 0; i < selectedRowKeysValue.length; i++) {
           let postDateobj = {}
           let itemIn = Object.keys(selectedRowKeysValue[i])
           for (let j = 0; j < itemIn.length; j++) {
-            if (itemIn[j] !== 'sdt') {
+            if (itemIn[j] !== 'sdt' && selectedRowKeysValue[i][itemIn[j]].list) {
-              console.log(selectedRowKeysValue[i][itemIn[j]])
               if (selectedRowKeysValue[i][itemIn[j]] instanceof Object && !(selectedRowKeysValue[i][itemIn[j]] instanceof Array)) {
                 postDateobj[itemIn[j]] = selectedRowKeysValue[i][itemIn[j]]
                 for (let k = 0; k < selectedRowKeysValue[i][itemIn[j]].list.length; k++) {
@@ -1244,7 +1244,7 @@
           let postDateobj = {}
           let itemIn = Object.keys(selectedRowKeysValue[i])
           for (let j = 0; j < itemIn.length; j++) {
-            if (itemIn[j] !== 'sdt') {
+            if (itemIn[j] !== 'sdt' && selectedRowKeysValue[i][itemIn[j]].list) {
               if (selectedRowKeysValue[i][itemIn[j]] instanceof Object && !(selectedRowKeysValue[i][itemIn[j]] instanceof Array)) {
                 postDateobj[itemIn[j]] = selectedRowKeysValue[i][itemIn[j]]
                 for (let k = 0; k < selectedRowKeysValue[i][itemIn[j]].list.length; k++) {