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

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/controller/LawsMonthlyReportTitleTemplateEOController.java

@@ -1,5 +1,7 @@
 package com.jero.modules.report.controller;
 
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.jero.common.api.vo.Result;
 import com.jero.common.aspect.annotation.AutoLog;
@@ -23,6 +25,7 @@ import org.springframework.web.servlet.ModelAndView;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 
@@ -186,13 +189,20 @@ public class LawsMonthlyReportTitleTemplateEOController extends JeroController<L
 
 	 /**
 	  * 上移下移
-	  * @param lawsMonthlyReportTitleTemplateEOS
+	  * @param jsonObject
 	  * @return
 	  */
 	 @AutoLog(value = "上移下移")
 	 @ApiOperation(value="上移下移", notes="上移下移")
 	 @PostMapping(value = "/move")
-	 public Result<?> move(@RequestBody List<LawsMonthlyReportTitleTemplateEO> lawsMonthlyReportTitleTemplateEOS) {
+	 public Result<?> move(@RequestBody JSONObject jsonObject) {
+		 JSONArray lawsMonthlyReportTitleTemplateJson = jsonObject.getJSONArray("lawsMonthlyReportTitleTemplateEOS");
+		 LawsMonthlyReportTitleTemplateEO lawsMonthlyReportTitleTemplateEO = null;
+		 List<LawsMonthlyReportTitleTemplateEO> lawsMonthlyReportTitleTemplateEOS = new ArrayList<>();
+		 for (Object o : lawsMonthlyReportTitleTemplateJson) {
+			 lawsMonthlyReportTitleTemplateEO=JSONObject.parseObject(JSONObject.toJSONString(o),LawsMonthlyReportTitleTemplateEO.class);
+			 lawsMonthlyReportTitleTemplateEOS.add(lawsMonthlyReportTitleTemplateEO);
+		 }
 		 lawsMonthlyReportTitleTemplateEOService.move(lawsMonthlyReportTitleTemplateEOS);
 		 return Result.OK("操作成功！");
 	 }

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/controller/LawsMonthlyReportWriteEOController.java

@@ -9,6 +9,7 @@ import com.jero.modules.report.service.ILawsMonthlyReportWriteEOService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
+import net.sf.json.JSONObject;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
 import org.springframework.validation.annotation.Validated;
@@ -18,6 +19,7 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.servlet.ModelAndView;
 
@@ -27,9 +29,10 @@ import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
+import java.util.Map;
 
 
- /**
+/**
  * @Description: 月报填写
  * @Author: jero-boot
  * @Date:   2022-07-02
@@ -184,4 +187,14 @@ public class LawsMonthlyReportWriteEOController extends JeroController<LawsMonth
 		 return lawsMonthlyReportWriteEOService.exportMonthlyReport(lawsMonthlyReportWriteEO);
 	 }
 
+	@ApiOperation(value="带入标准信息--分页", notes="带入标准信息--分页")
+	@PostMapping(value = "/queryPageDocument")
+	@ResponseBody
+	public JSONObject queryPageDocument(@RequestBody Map<String,Object> parameter) {
+		IPage infoPage = lawsMonthlyReportWriteEOService.queryPageDocument(parameter);
+		Result<IPage> ok = Result.OK(infoPage);
+		JSONObject jsonResult = JSONObject.fromObject(ok);
+		return jsonResult;
+	}
+
 }

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/ILawsMonthlyReportWriteEOService.java

@@ -7,6 +7,7 @@ import org.springframework.http.ResponseEntity;
 
 import javax.servlet.http.HttpServletRequest;
 import java.util.List;
+import java.util.Map;
 
 /**
  * @Description: 月报填写
@@ -77,4 +78,6 @@ public interface ILawsMonthlyReportWriteEOService extends IService<LawsMonthlyRe
 												HttpServletRequest req);
 
 	ResponseEntity<byte[]> exportMonthlyReport(LawsMonthlyReportWriteEO lawsMonthlyReportWriteEO);
+
+	IPage queryPageDocument(Map<String, Object> parameter);
 }

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/impl/LawsMonthlyReportWriteEOServiceImpl.java

@@ -6,7 +6,13 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.jero.common.constant.enums.CutEnum;
+import com.jero.common.constant.enums.ModuleEnum;
 import com.jero.common.system.query.QueryGenerator;
+import com.jero.generater.modules.online.cgform.entity.OnlCgformField;
+import com.jero.generater.modules.online.cgform.service.impl.OnlCgformFieldServiceImpl;
+import com.jero.modules.document.enums.FieldTypeEnum;
+import com.jero.modules.document.mapper.BussDocumentLibraryEOMapper;
+import com.jero.modules.document.service.impl.BussDocumentLibraryEOServiceImpl;
 import com.jero.modules.report.entity.LawsMonthlyReportTitleTemplateEO;
 import com.jero.modules.report.entity.LawsMonthlyReportWriteEO;
 import com.jero.modules.report.entity.NewOpinionTemplateEO;
@@ -20,7 +26,9 @@ import com.jero.modules.report.service.INewOpinionTemplateEOService;
 import com.jero.modules.report.service.INewStandardTemplateEOService;
 import com.jero.modules.report.util.WordUtil;
 import com.jero.modules.system.entity.SysCategory;
+import com.jero.modules.system.entity.SysDictItem;
 import com.jero.modules.system.service.impl.SysCategoryServiceImpl;
+import com.jero.modules.system.service.impl.SysDictItemServiceImpl;
 import com.jero.modules.system.util.StringUtils;
 import org.apache.poi.xwpf.usermodel.ParagraphAlignment;
 import org.apache.poi.xwpf.usermodel.XWPFDocument;
@@ -37,6 +45,7 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Date;
 import java.util.List;
+import java.util.Map;
 import java.util.stream.Collectors;
 
 /**
@@ -58,6 +67,14 @@ public class LawsMonthlyReportWriteEOServiceImpl extends ServiceImpl<LawsMonthly
 	private SysCategoryServiceImpl sysCategoryService;
 	@Value(value = "${jero.path.upload}")
 	private String uploadpath;
+	@Autowired
+	private OnlCgformFieldServiceImpl onlCgformFieldService;
+	@Autowired
+	private BussDocumentLibraryEOServiceImpl bussDocumentLibraryEOService;
+	@Autowired
+	private BussDocumentLibraryEOMapper bussDocumentLibraryEOMapper;
+	@Autowired
+	private SysDictItemServiceImpl sysDictItemServiceImpl;
 	/**
 	 * 保存
 	 *
@@ -344,6 +361,7 @@ public class LawsMonthlyReportWriteEOServiceImpl extends ServiceImpl<LawsMonthly
 		return null;
 	}
 
+
 	/**
 	 *
 	 * @param path
@@ -377,8 +395,75 @@ public class LawsMonthlyReportWriteEOServiceImpl extends ServiceImpl<LawsMonthly
 		} catch (IOException e) {
 			log.error("文件创建异常,异常信息为：" + e.getMessage());
 		}
-
-
-
 	}
+
+	@Override
+	public IPage queryPageDocument(Map<String, Object> parameter) {
+		String cut = (String) parameter.get("cut");//中英文切换标识
+		//文档库字段
+		List<OnlCgformField> fieldList = onlCgformFieldService.getFieldList(ModuleEnum.DOCUMENT_LIBRARY.getValue());
+		//需要查询的字段
+		List<String> fieldListQuery = new ArrayList<>();
+		fieldListQuery.add("serial_number");
+		fieldListQuery.add("title");
+		fieldListQuery.add("title_en");
+		fieldListQuery.add("state");
+		fieldListQuery.add("region");
+		fieldListQuery.add("technology_territory");
+		fieldListQuery.add("xin1_che1_xing2_shi2_shi1_ri4_qi1");
+		fieldListQuery.add("implement_time");
+		fieldListQuery.add("corresponding_standard");
+		fieldListQuery.add("shi4_yong4_che1_xing2");
+		fieldListQuery.add("shi4_yong4_fan4_wei2");
+
+		List<String> fieldListNew = new ArrayList<>();
+		fieldListNew.add("id");
+
+		//转时间格式
+		for (String field : fieldListQuery) {
+			String fieldTemp = null;
+			if ("xin1_che1_xing2_shi2_shi1_ri4_qi1".equals(field) || "implement_time".equals(field)) {
+				String fieldNew = "date_format(" + field + ", '%Y-%m-%d')";
+				fieldTemp = "case when " + fieldNew + " is null then \"\" else " + fieldNew + " end " + field;
+				fieldListNew.add(fieldTemp);
+			} else {
+				fieldTemp = "case when " + field + " is null then \"\" else " + field + " end " + field;
+				fieldListNew.add(fieldTemp);
+			}
+		}
+		//封装查询条件
+		String condition = bussDocumentLibraryEOService.getConditionStr(parameter);
+		int pageNo = Integer.parseInt(parameter.get("pageNo").toString());
+		int pageSize = Integer.parseInt(parameter.get("pageSize").toString());
+		IPage page = new Page(pageNo, pageSize);
+
+		IPage infoPage = bussDocumentLibraryEOMapper.getInfoPage(page, " " + StringUtils.join(fieldListNew, ","), condition);
+
+		//树形数据字典
+		List<SysCategory> categoryList = sysCategoryService.list();
+		//过滤出树形字段
+		List<OnlCgformField> treeFieldList = fieldList.stream()
+				.filter(e -> FieldTypeEnum.TREE.getValue().equals(e.getFieldShowType()))
+				.collect(Collectors.toList());
+
+
+		List<Map> records = infoPage.getRecords();
+		//数据字典
+		List<SysDictItem> sysDictItems = sysDictItemServiceImpl.selectItemsAll();
+		//下拉选处理数据字典
+		for (Map record : records) {
+			Map<String, Object> record1 = (Map) record;
+			record1.put("state_dict",record1.get("state"));//状态
+			record1.put("technology_territory_dict",record1.get("technology_territory"));//相关领域
+			record1.put("shi4_yong4_fan4_wei2_dict",record1.get("shi4_yong4_fan4_wei2"));//适用范围
+			record1.put("shi4_yong4_che1_xing2_dict",record1.get("shi4_yong4_che1_xing2"));//适用车型
+			for (Map.Entry<String, Object> entry : record1.entrySet()) {
+				//下拉选处理数据字典
+				bussDocumentLibraryEOService.dictItem(sysDictItems, entry, cut, fieldList,null);
+				bussDocumentLibraryEOService.treeDictItem(categoryList, entry, treeFieldList, cut,null);
+			}
+		}
+		return infoPage;
+	}
+
 }

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

@@ -1107,4 +1107,9 @@ module.exports = {
   ValidationComplianceNotification:'Validation Compliance Notification',
   RegulationTaskConfirmationNotification:'Regulation Task Confirmation Notification',
   evaluationMethod:'Evaluation method',
+  uploadRelevantMaterials:'Upload relevant materials',
+  processBackground:'Process background',
+  selectedStandard:'Selected standard',
+  standardDecompositionDocument:'Standard decomposition document',
+  pleaseSelectStandardFirst:'Please select a standard first',
 }

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

@@ -1111,4 +1111,9 @@ module.exports = {
   ValidationComplianceNotification:'验证符合性通知',
   RegulationTaskConfirmationNotification:'任务确认通知',
   evaluationMethod:'评估方式',
+  uploadRelevantMaterials:'相关资料上传',
+  processBackground:'流程背景',
+  selectedStandard:'所选标准',
+  standardDecompositionDocument:'带入标准分解单',
+  pleaseSelectStandardFirst:'请先选择标准',
 }

jero-web/src/components/layouts/TabLayout.vue

@@ -97,6 +97,7 @@
           this.$route.path == '/handshakeProcess' ||
           this.$route.path == '/projectStatusAndProgress' ||
           this.$route.path == '/TaskPlanList' ||
+          this.$route.path == '/evaluationProcess' ||
           this.$route.path == '/evaluationInitiationProcess' ||
           this.$route.path == '/historicalVersion' ||
           this.$route.path == '/dashboard/analysis' ||

jero-web/src/config/router.config.js

@@ -367,6 +367,11 @@ export const constantRouterMap = [
     name: 'taskListProcess',
     component: () => import(/* webpackChunkName: "user" */ '@/views/processCenter/processForm/taskListProcess/index')
   },
+  {
+    path: '/evaluationProcess',
+    name: 'evaluationProcess',
+    component: () => import(/* webpackChunkName: "user" */ '@/views/processCenter/processForm/evaluationProcess/index')
+  },
   {
     path: '/handshakeProcess',
     name: 'handshakeProcess',

jero-web/src/views/businessSupport/regulationReport/components/modules/addModel.vue

@@ -207,7 +207,7 @@
           queryConditionVOList: JSON.stringify(queryConditionVOList)
         }
         this.loading = true
-        postAction('/dummy/dummyInventoryInfoEO/queryPageDummy', query).then((res) => {
+        postAction('/report/lawsMonthlyReportWriteEO/queryPageDocument', query).then((res) => {
           if (res.success) {
             this.dataList = res.result.records || []
             this.total = res.result.total

jero-web/src/views/businessSupport/regulationReport/components/modules/fillTable.vue

@@ -28,9 +28,9 @@
         :data-source="dataSource"
         :columns="columns"
       >
-        <span slot="operation" slot-scope="text,record">
+        <span slot="operation" slot-scope="text,record,index">
-           <a class="text-operation" @click="moveUpClick(record)">{{$t('moveUp')}}</a>
+           <a class="text-operation" @click="moveUpClick(record,index)">{{$t('moveUp')}}</a>
-           <a class="text-operation" @click="moveDownClick(record)">{{$t('moveDown')}}</a>
+           <a class="text-operation" @click="moveDownClick(record,index)">{{$t('moveDown')}}</a>
            <a class="text-operation" @click="edit(record)">{{$t('edit')}}</a>
            <a class="text-operation" @click="deleteLib(record)">{{$t('deleteLib')}}</a>
         </span>
@@ -69,6 +69,7 @@
         dataSource: [],
         pageNo: 1,
         pageSize: 10,
+        sortList: [],
         total: 0,
         columns: [
           {
@@ -146,11 +147,49 @@
           }
         })
       },
-      moveUpClick() {
+      moveUpClick(row, index) {
-
+        this.sortList = []
+        this.sortList.push(row)
+        if (row.parentId) {
+          let content = this.dataSource.filter(res => {
+            return row.parentId == res.id
+          })
+          if (index != 0) {
+            this.sortList.push(content[0].children[index - 1])
+          }
+        } else {
+          if (index != 0) {
+            this.sortList.push(this.dataSource[index - 1])
+          }
+        }
+        this.move()
       },
-      moveDownClick() {
+      moveDownClick(row, index) {
-
+        this.sortList = []
+        this.sortList.push(row)
+        if (row.parentId) {
+          let content = this.dataSource.filter(res => {
+            return row.parentId == res.id
+          })
+          if (index != (content[0].children.length - 1)) {
+            this.sortList.push(content[0].children[index + 1])
+          }
+        } else {
+          if (index != (this.dataSource.length - 1)) {
+            this.sortList.push(this.dataSource[index + 1])
+          }
+        }
+        this.move()
+      },
+      move() {
+        postAction('/report/lawsMonthlyReportTitleTemplateEO/move', { lawsMonthlyReportTitleTemplateEOS: this.sortList }).then((res) => {
+          if (res.success) {
+            this.$message.success(this.$t('OperationSuccessful'))
+            this.getList()
+          } else {
+            this.$message.warning(this.$t('operationFailed'))
+          }
+        })
       },
       deleteLib(val) {
         let _this = this
@@ -185,6 +224,7 @@
     text-align: right;
     margin-bottom: 16px;
   }
+
   .text-operation {
     margin-right: 8px;
   }

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

@@ -0,0 +1,70 @@
+<template>
+  <div class="box" style="margin-bottom: 20px">
+    <a-table
+      :columns="columns"
+      :scroll="{x: '100%'}"
+      :data-source="dataList"
+      :pagination="false"
+      :loading="loading">
+
+    </a-table>
+  </div>
+</template>
+
+<script>
+  export default {
+    name: 'TermInformation',
+    data() {
+      return {
+        columns: [
+          {
+            title: this.$t('clauseNo'),
+            dataIndex: 'items_num',
+            align: 'center',
+            ellipsis: true
+          },
+          {
+            title: this.$t('clauseName'),
+            dataIndex: 'items_name',
+            align: 'center',
+            ellipsis: true
+          },
+          {
+            title: this.$t('clauseContent'),
+            dataIndex: 'iterms_conditions',
+            align: 'center',
+            ellipsis: true
+          },
+          {
+            title: this.$t('evaluationMethod'),
+            dataIndex: 'evaluationMethod',
+            align: 'center',
+            scopedSlots: { customRender: 'evaluationMethod' }
+          },
+          {
+            title: this.$t('Assessor'),
+            dataIndex: 'Assessor',
+            align: 'center',
+            scopedSlots: { customRender: 'Assessor' }
+          },
+          {
+            title: this.$t('operation'),
+            dataIndex: 'Assessor',
+            align: 'center',
+            width: 100,
+            scopedSlots: { customRender: 'operation' }
+          }
+        ],
+        dataList: [],
+        loading: false
+      }
+    },
+    mounted() {
+    },
+    methods: {}
+  }
+</script>
+
+<style scoped>
+
+</style>

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

@@ -34,6 +34,24 @@
           />
         </div>
         <a-form-model :model="formInline" class="formAdd" :rules="rules" ref="ruleForm">
+          <a-row :gutter="24" style="margin-bottom: 10px">
+            <a-col :span="24">
+              <div class="box-title-text">
+                <div class="title-text">
+                  <span class="title-text-text" :title="$t('selectedStandard')">{{$t('selectedStandard')}}</span>
+                </div>
+                <div class="title-text-content"
+                     :class="{'title-text-content-one':!isTrue}">
+                  件大事发的科技示范和的空间是否和是科技示范的空间是多少
+                </div>
+                <div class="title-text-right" v-if="isTrue">
+                  <span @click="standardDecompositionDocumentClick">
+                    {{$t('standardDecompositionDocument')}}
+                  </span>
+                </div>
+              </div>
+            </a-col>
+          </a-row>
           <a-row :gutter="24">
             <a-col :span="12">
               <div class="box-title-text">
@@ -52,6 +70,74 @@
                 </a-form-model-item>
               </div>
             </a-col>
+            <a-col :span="12">
+              <div class="box-title-text">
+                <div class="title-text">
+                  <span class="title-text-text" :title="$t('enclosure')">{{$t('enclosure')}}</span>
+                </div>
+                <a-form-model-item class="itemModel" prop="accessory_id">
+                  <a-button type="primary" class="button-text"
+                            @click="clickButtonToUpload('accessory_id')">
+                    {{ (formInline.accessory_id === 'null' || formInline.accessory_id === '' ||
+                    formInline.accessory_id == null) ? $t('clickUpload') : $t('viewUploadedFiles')
+                    }}
+                  </a-button>
+                </a-form-model-item>
+              </div>
+            </a-col>
+          </a-row>
+          <a-row :gutter="24">
+            <a-col :span="24">
+              <div class="box-title-text">
+                <div class="title-text">
+                  <span class="title-text-text" :title="$t('processBackground')">{{$t('processBackground')}}</span>
+                </div>
+                <a-form-model-item class="itemModel" prop="taskExplain">
+                  <a-textarea :placeholder="$t('pleaseEnter')+$t('processBackground')"
+                              v-model="formInline.taskExplain"
+                              :rows="4"/>
+                </a-form-model-item>
+              </div>
+            </a-col>
+          </a-row>
+          <a-row :gutter="24">
+            <a-col :span="24">
+              <div class="box-title-text">
+                <div class="title-text">
+                  <span class="title-text-text" :title="$t('remarks')">{{$t('remarks')}}</span>
+                </div>
+                <a-form-model-item class="itemModel" prop="remarks">
+                  <a-textarea :placeholder="$t('pleaseEnter')+$t('remarks')"
+                              v-model="formInline.remarks"
+                              :rows="4"/>
+                </a-form-model-item>
+              </div>
+            </a-col>
+          </a-row>
+          <a-row :gutter="24" v-if="!isTrue">
+            <a-col :span="12">
+              <div class="box-title-text">
+                <div class="title-text">
+                  <span class="Required">*</span>
+                  <span class="title-text-text" :title="$t('evaluationMethod')">{{$t('evaluationMethod')}}</span>
+                </div>
+                <a-form-model-item class="itemModel" prop="evaluatorIdsName">
+                  <a-select :placeholder="$t('PleaseSelect')+$t('evaluationMethod')"
+                            class="box-input"
+                            :getPopupContainer="triggerNode=> triggerNode.parentNode"
+                            allowClear
+                            v-model="formInline.gatherResult">
+                    <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>
+                </a-form-model-item>
+              </div>
+            </a-col>
             <a-col :span="12">
               <div class="box-title-text">
                 <div class="title-text">
@@ -69,38 +155,8 @@
               </div>
             </a-col>
           </a-row>
-          <a-row :gutter="24">
-            <a-col :span="24">
-              <div class="box-title-text">
-                <div class="title-text">
-                  <span class="title-text-text" :title="$t('taskDescription')">{{$t('taskDescription')}}</span>
-                </div>
-                <a-form-model-item class="itemModel" prop="taskExplain">
-                  <a-textarea :placeholder="$t('pleaseEnter')+$t('taskDescription')"
-                              v-model="formInline.taskExplain"
-                              :rows="4"/>
-                </a-form-model-item>
-              </div>
-            </a-col>
-          </a-row>
-          <a-row :gutter="24">
-            <a-col :span="12">
-              <div class="box-title-text">
-                <div class="title-text">
-                  <span class="title-text-text" :title="$t('enclosure')">{{$t('enclosure')}}</span>
-                </div>
-                <a-form-model-item class="itemModel" prop="accessory_id">
-                  <a-button type="primary" class="button-text"
-                            @click="clickButtonToUpload('accessory_id')">
-                    {{ (formInline.accessory_id === 'null' || formInline.accessory_id === '' ||
-                    formInline.accessory_id == null) ? $t('clickUpload') : $t('viewUploadedFiles')
-                    }}
-                  </a-button>
-                </a-form-model-item>
-              </div>
-            </a-col>
-          </a-row>
         </a-form-model>
+        <TermInformation v-if="isTrue"/>
         <footerProcess
           @submit="submit"
           :isSubmit="true"
@@ -109,6 +165,8 @@
     </div>
     <JLoading :loading="JLoading">{{this.$t('pleaseWaitWhileRunning')}}</JLoading>
     <uploadFile ref="uploadFile" @uploadSuccess="uploadSuccess"/>
+    <standardDecompositionSheet ref="standardDecompositionSheetRef"
+                                @standardDecompositionSheetForm="standardDecompositionSheetForm"/>
   </div>
 </template>
 
@@ -118,6 +176,8 @@
   import uploadFile from '@/components/uploadFile/file'
   import PersonnelSelection from '@/components/PersonnelSelection/index'
   import footerProcess from '../../../processCenter/components/footerProcess'
+  import standardDecompositionSheet from './standardDecompositionSheet'
+  import TermInformation from './TermInformation'
   import { getAction, postAction } from '@/api/manage'
   import moment from 'moment'
   import eventBUs from '../../../../common/event'
@@ -130,7 +190,9 @@
       search,
       uploadFile,
       footerProcess,
-      PersonnelSelection
+      PersonnelSelection,
+      standardDecompositionSheet,
+      TermInformation
     },
     data() {
       return {
@@ -141,13 +203,24 @@
           addModelList: '/dummy/dummyInventoryInfoEO/queryPageDummy'
         },
         loading: false,
-        JLoading:false,
+        JLoading: false,
+        isTrue: false,
         dataSource: [],
         selectedRowKeys: [],
         total: 0,
         pageSize: 10,
         pageNo: 1,
         formInline: {},
+        gatherResultList: [
+          {
+            value: 'Underway',
+            name: this.$t('inProgress')
+          },
+          {
+            value: 'Completed',
+            name: this.$t('Finished')
+          }
+        ],
         rules: {
           endTime: [
             {
@@ -215,6 +288,11 @@
     mounted() {
       document.title = this.$t('regulatoryEngineer') + this.$t('initiatingProcess')
       this.getList()
+      if (this.$route.query.whetherTobring == '1') {
+        this.isTrue = true
+      } else {
+        this.isTrue = false
+      }
       eventBUs.$on('searchQuery', search => {
         Object.keys(search).forEach(res => {
           if (search[res] instanceof Array) {
@@ -263,6 +341,16 @@
           record.shift()
         }
         this.selectedRowKeysRecord = record
+      },
+      standardDecompositionDocumentClick() {
+        if (this.selectedRowKeysRecord && this.selectedRowKeysRecord.length > 0) {
+          this.$refs.standardDecompositionSheetRef.getData(JSON.parse(JSON.stringify(this.selectedRowKeysRecord[0])))
+        } else {
+          this.$message.warning(this.$t('pleaseSelectStandardFirst'))
+        }
+      },
+      standardDecompositionSheetForm(value) {
+
       },
       clickButtonToUpload(item) {
         this.$refs.uploadFile.perentHandleFunc()
@@ -295,14 +383,14 @@
       dateChange(item) {
         this.formInline[item] = this.formInline[item] ? moment(this.formInline[item]).format('YYYY-MM-DD') : ''
       },
-      getUUID(){
+      getUUID() {
-        var str=[];
+        var str = []
-        var Chars='0123456789abcdefghijklmnopqrstuvwxyz';
+        var Chars = '0123456789abcdefghijklmnopqrstuvwxyz'
-        for(var i=0;i<36;i++){
+        for (var i = 0; i < 36; i++) {
-          str[i]=Chars.substr(Math.floor(Math.random()*16),1)
+          str[i] = Chars.substr(Math.floor(Math.random() * 16), 1)
         }
-        str[0]=str[8]=str[13]=str[18]=str[23]='-';
+        str[0] = str[8] = str[13] = str[18] = str[23] = '-'
-        return str.join("")
+        return str.join('')
       },
       submit() {
         this.$refs.ruleForm.validate(valid => {
@@ -336,7 +424,7 @@
         postAction('/workFlow/startProcess', query).then((res) => {
           if (res.success) {
             this.completeTask(value, res.result)
-          }else{
+          } else {
             this.JLoading = false
           }
         })
@@ -444,4 +532,38 @@
     text-align: right;
     margin-top: 20px;
   }
+
+  .title-text-content {
+    display: inline-block;
+    width: calc(100% - 334px);
+    text-align: center;
+    border: 1px solid #d9d9d9;
+    line-height: 38px;
+    border-bottom-left-radius: 5px;
+    border-top-left-radius: 5px;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+  }
+
+  .title-text-right {
+    width: 200px;
+    text-align: center;
+    border: 1px solid #d9d9d9;
+    line-height: 38px;
+    border-bottom-right-radius: 5px;
+    border-top-right-radius: 5px;
+    border-left: none;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+    color: #21c9cc;
+    cursor: pointer;
+  }
+
+  .title-text-content-one {
+    border-bottom-right-radius: 5px;
+    border-top-right-radius: 5px;
+    width: calc(100% - 128px);
+  }
 </style>

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

@@ -0,0 +1,247 @@
+<template>
+  <a-drawer
+    :title="$t('StandardBreakdown')"
+    :maskClosable="false"
+    :width="1000"
+    placement="right"
+    :closable="true"
+    @close="handleCancel"
+    :visible="visible"
+    style="height: 100%;overflow: auto;padding-bottom: 53px;">
+    <div style="margin-bottom: 60px">
+      <div class="table-page-search-wrapper">
+        <a-form layout="inline" @keyup.enter.native="searchQuery">
+          <a-row :gutter="24">
+            <a-col :md="12" :sm="8">
+              <div class="box-title-text">
+                <div class="title-text" :title="$t('standard')">
+                  <span>{{$t('standard')}}</span>
+                </div>
+                <a-input class="box-input" :placeholder="$t('PleaseEnter')+$t('standard')"
+                         v-model="queryParam.serial_number"></a-input>
+              </div>
+            </a-col>
+            <span style="float: right;overflow: hidden;margin-top: 4px" class="table-page-search-submitButtons">
+               <a-col :md="12" :sm="24">
+                   <div @click="handleModule" class="operator-text">
+                       <a-icon type="download"/>
+                      {{$t('templateDownload')}}
+                    </div>
+                    <div class="operator-text">
+                      <ImportFile :url="url" :projectId="$route.query.id" :isTrue="true" :accept="'.xls'"
+                                  @getList="getPersonnelList"/>
+                     </div>
+                    </a-col>
+            </span>
+          </a-row>
+        </a-form>
+      </div>
+      <a-table
+        :columns="columns"
+        rowKey="id"
+        :scroll="{x: 1200}"
+        :data-source="dataList"
+        :pagination="false"
+        :row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }"
+        :loading="loading">
+
+      </a-table>
+      <div class="page" v-if="dataList.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="onChange"
+          @showSizeChange="SizeChange"
+        />
+      </div>
+    </div>
+
+    <div class="drawer-bootom-button">
+      <a-button @click="handleCancel" type="danger" style="margin-right: 16px">{{$t('cancel')}}</a-button>
+      <a-button @click="handleSubmit" type="primary" :loading="confirmLoading">{{$t('submit')}}</a-button>
+    </div>
+  </a-drawer>
+</template>
+
+<script>
+  import { getAction, postAction } from '@/api/manage'
+  import ImportFile from '@/components/ImportFile/index'
+
+  export default {
+    name: 'standardDecompositionSheet',
+    components: {
+      ImportFile
+    },
+    data() {
+      return {
+        visible: false,
+        queryParam: {},
+        confirmLoading: false,
+        selectedRowKeys: [],
+        url: {
+          list: '/split/sarFileSplitItems/getSplitItemsByPage'
+        },
+        columns: [
+          {
+            title: this.$t('clauseNo'),
+            dataIndex: 'items_num',
+            align: 'center',
+            ellipsis: true
+          },
+          {
+            title: this.$t('clauseName'),
+            dataIndex: 'items_name',
+            align: 'center',
+            ellipsis: true
+          },
+          {
+            title: this.$t('clauseContent'),
+            dataIndex: 'iterms_conditions',
+            align: 'center',
+            ellipsis: true
+          },
+          {
+            title: this.$t('technicalField'),
+            dataIndex: 'technology_territory',
+            align: 'center',
+            ellipsis: true
+          },
+          {
+            title: this.$t('informationCategory'),
+            dataIndex: 'information_category',
+            align: 'center',
+            ellipsis: true
+          }
+        ],
+        dataList: [],
+        content: [],
+        loading: false,
+        pageNo: 1,
+        pageSize: 10,
+        total: 0,
+        standData: {},
+        fieldList: [],
+        queryConditionVOList: []
+      }
+    },
+    methods: {
+      handleModule() {
+
+      },
+      getData(row) {
+        this.standData = row
+        this.visible = true
+        this.replacePage()
+      },
+      searchQuery() {
+        this.pageNo = 1
+        this.replacePage()
+      },
+      searchReset() {
+        this.pageNo = 1
+        this.queryParam = {}
+        this.replacePage()
+      },
+      onChange(page, pageSize) {
+        this.pageNo = page
+        this.replacePage()
+      },
+      SizeChange(page, pageSize) {
+        this.pageNo = 1
+        this.pageSize = pageSize
+        this.replacePage()
+      },
+      getPersonnelList() {
+        this.pageNo = 1
+        this.replacePage()
+      },
+      replacePage() {
+        let query = {
+          pageNo: this.pageNo,
+          pageSize: this.pageSize,
+          info_id: this.standData.id,
+          menu_id:'',
+          ...this.queryParam
+        }
+        this.loading = true
+        postAction(this.url.list, query).then((res) => {
+          if (res.success) {
+            this.dataList = res.result.records || []
+            this.total = res.result.total
+            this.loading = false
+          } else {
+            this.dataList = []
+            this.total = 0
+            this.loading = false
+          }
+        })
+      },
+      handleCancel() {
+        this.visible = false
+      },
+      handleSubmit() {
+
+      },
+      onSelectChange() {
+
+      }
+    }
+  }
+</script>
+
+<style scoped>
+  @import '~@assets/less/common.less';
+
+  .page {
+    text-align: right;
+    margin-top: 20px;
+  }
+
+  .drawer-bootom-button {
+    position: absolute;
+    bottom: 0;
+    width: 100%;
+    z-index: 100;
+    border-top: 1px solid #e8e8e8;
+    padding: 10px 16px;
+    text-align: right;
+    left: 0;
+    background: #fff;
+    border-radius: 0 0 2px 2px;
+  }
+
+  .box-title-text {
+    line-height: 1.4;
+    display: flex;
+    align-items: center;
+    margin-bottom: 10px;
+  }
+
+  .title-text {
+    width: 33px;
+    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: 100%;
+    height: 38px;
+  }
+
+  .box-button {
+    height: 38px;
+  }
+</style>

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

@@ -111,6 +111,43 @@
         />
       </div>
     </div>
+    <a-modal
+      :title="$t('initiatingProcess')"
+      :width="600"
+      :visible="visible"
+      :maskClosable="false"
+      @ok="handleOk"
+      @cancel="visible = false"
+    >
+      <a-form-model :model="formInline" class="formAdd" :rules="rules" ref="ruleForm">
+        <a-row :gutter="24">
+          <a-col :span="24">
+            <div class="box-title-text">
+              <div class="title-text" style="margin-top: -18px">
+                <span class="Required">*</span>
+                <span class="title-text-text"
+                      :title="$t('standardDecompositionDocument')">{{$t('standardDecompositionDocument')}}</span>
+              </div>
+              <a-form-model-item class="itemModel" prop="whetherTobring">
+                <a-select :placeholder="$t('PleaseSelect')+$t('standardDecompositionDocument')"
+                          class="box-input"
+                          :getPopupContainer="triggerNode=> triggerNode.parentNode"
+                          allowClear
+                          v-model="formInline.whetherTobring">
+                  <a-select-option v-for="(item, key) in whetherTobringList"
+                                   :key="key"
+                                   :value="item.value">
+                     <span style="display: inline-block;width: 100%" :title=" item.name">
+                           {{ item.name }}
+                     </span>
+                  </a-select-option>
+                </a-select>
+              </a-form-model-item>
+            </div>
+          </a-col>
+        </a-row>
+      </a-form-model>
+    </a-modal>
   </a-card>
 </template>
 
@@ -126,6 +163,7 @@
           list: '',
           getSysCategoryTree: '/sys/category/getSysCategoryTree'
         },
+        visible: false,
         loading: false,
         toggleSearchStatus: false,
         dataSource: [],
@@ -135,6 +173,26 @@
         pageNo: 1,
         CategoryTreeList: [],
         queryParam: {},
+        formInline: {},
+        rules: {
+          whetherTobring: [
+            {
+              required: true,
+              message: this.$t('standardDecompositionDocument') + this.$t('cannotEmpty'),
+              trigger: 'change'
+            }
+          ]
+        },
+        whetherTobringList: [
+          {
+            value: '1',
+            name: '是'
+          },
+          {
+            value: '2',
+            name: '否'
+          }
+        ],
         gatherResultList: [
           {
             value: 'Underway',
@@ -271,14 +329,27 @@
       onSelectChange(value) {
         this.selectedRowKeys = value
       },
+      handleOk() {
+        this.$refs.ruleForm.validate(valid => {
+          if (valid) {
+            this.visible = false
+            // let newUrl = this.$router.resolve({
+            //   path: '/evaluationInitiationProcess',
+            //   query: this.formInline
+            // })
+            let newUrl = this.$router.resolve({
+              path: '/evaluationProcess'
+            })
+            window.open(newUrl.href, '_blank')
+          }
+        })
+      },
       initiatingProcessClick() {
-        let newUrl = this.$router.resolve({
+        this.visible = true
-          path: '/evaluationInitiationProcess'
+        this.formInline = {}
+        this.$nextTick(() => {
+          this.$refs.ruleForm.clearValidate()
         })
-        // let newUrl = this.$router.resolve({
-        //   path: '/regulatoryProcessReview'
-        // })
-        window.open(newUrl.href, '_blank')
       },
       viewProcessClick(row) {
         let newUrl = this.$router.resolve({
@@ -348,4 +419,15 @@
   .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/processForm/evaluationProcess/index.vue

@@ -0,0 +1,209 @@
+<template>
+  <div id="examineBox">
+    <headerProcess
+      :title="title"
+    />
+    <div class="detail-box">
+      <div class="detail-content" style="padding: 10px 0 0 0">
+        <standardContent
+          v-if="isDisplay"
+          :title="$t('essentialInformation')"
+          :standardContentList="standardContentList"
+          :url="url"
+          :standardContentQuery="queryProject"
+        />
+        <feedbackInformation
+          v-if="isDisplay"
+          ref="feedbackInformationRef"
+          :feedbackDataList="feedbackDataList"
+          :title="$t('feedbackInformation')"
+        />
+        <footerProcess
+          v-if="isDisplay"
+          isPreservation
+          :isSubmit="true"
+          @preservation="preservation"
+          @submit="submit"
+        />
+        <circulationHistory v-if="isDisplay"/>
+      </div>
+    </div>
+    <JLoading :loading="loading">{{this.$t('pleaseWaitWhileRunning')}}</JLoading>
+  </div>
+</template>
+
+<script>
+  import headerProcess from '../../components/headerProcess'
+  import standardContent from '../../components/standardContent'
+  import circulationHistory from '../../components/regulatoryCirculationHistory'
+  import footerProcess from '../../components/footerProcess'
+  import feedbackInformation from '../../components/feedbackInformation'
+  import { getAction, postAction, deleteAction, downloadFile } from '@/api/manage'
+  import moment from 'moment'
+  import { mapGetters } from 'vuex'
+  export default {
+    name: 'evaluationProcess',
+    components: {
+      headerProcess,
+      standardContent,
+      circulationHistory,
+      footerProcess,
+      feedbackInformation
+    },
+    data() {
+
+      return {
+        title: this.$t('collectionOfRegulatoryOpinions'),
+        url: {
+          queryTaskDetailByTaskIds: '/task/queryTaskDetailByTaskIds',
+          list: '/lawsOpinionGather/lawsOpinionAssessmentResultEO/list'
+        },
+        loading: false,
+        isDisplay: true,
+        feedbackDataList: [],
+        queryProject: {},
+        standardContentList: [
+          {
+            title: this.$t('standard'),
+            value: 'serial_number'
+          },
+          {
+            title: this.$t('title'),
+            value: 'title'
+          },
+          {
+            title: this.$t('regulatoryEngineer'),
+            value: 'currentUserName'
+          },
+          {
+            title: this.$t('closingDate'),
+            value: 'endTime'
+          },
+          {
+            title: this.$t('enclosure'),
+            value: 'accessory_id',
+            type: 2
+          },
+          {},
+          {
+            title: this.$t('taskDescription'),
+            value: 'taskExplain'
+          }
+          // {
+          //   title: this.$t('remarks'),
+          //   value: 'remark'
+          // }
+        ]
+      }
+    },
+    mounted() {
+      this.isDisplay = false
+      this.queryTaskDetailByTask(() => {
+        this.lawsOpinionAssessmentResult()
+      })
+    },
+    methods: {
+      ...mapGetters(['userInfo']),
+      queryTaskDetailByTask(callback) {
+        this.loading = true
+        getAction(this.url.queryTaskDetailByTaskIds, { taskIds: this.$route.query.taskIds }).then((res) => {
+          if (res instanceof String) {
+            this.queryProject = JSON.parse(res) || {}
+            callback && callback()
+          } else {
+            this.queryProject = res || {}
+            callback && callback()
+          }
+        })
+      },
+      lawsOpinionAssessmentResult() {
+        getAction(this.url.list, {
+          lawsOpinionGatherId: this.queryProject.id,
+          actiProcInstId: this.$route.query.prcId
+        }).then((res) => {
+          if (res.success) {
+            this.feedbackDataList = res.result || []
+            this.loading = false
+          } else {
+            this.feedbackDataList = []
+            this.loading = false
+          }
+          this.isDisplay = true
+        })
+      },
+      preservation() {
+        this.loading = true
+        let dataList = this.$refs.feedbackInformationRef.dataList
+        this.insertBatch(dataList, 1)
+      },
+      insertBatch(list, num) {
+        list.forEach(res => {
+          res.lawsOpinionGatherId = this.queryProject.id
+          res.actiProcInstId = this.$route.query.prcId
+        })
+        postAction('/lawsOpinionGather/lawsOpinionAssessmentResultEO/insertBatch', { dataList:list }).then((res) => {
+          if (res.success) {
+            if (num == 1) {
+              this.$message.success(this.$t('OperationSuccessful'))
+              this.$router.push({
+                path: '/collectionOfRegulatoryOpinions'
+              })
+              this.loading = false
+            } else {
+              this.completeTask()
+            }
+          } else {
+            if (num == 1) {
+              this.loading = false
+              this.$message.warning(this.$t('operationFailed'))
+            }
+          }
+        })
+      },
+      submit() {
+        let dataList = this.$refs.feedbackInformationRef.dataList
+        this.insertBatch(dataList, 2)
+      },
+      completeTask() {
+        let query = {
+          userid: this.userInfo().id,
+          taskId: this.$route.query.taskIds,
+          json: JSON.stringify(this.queryProject).replace(/\"/g, '\'')
+        }
+        postAction('/workFlow/completeTask', query).then((res) => {
+          if (res.success) {
+            // setTimeout(() => {
+            //   window.close()
+            // }, 1000)
+            this.$message.success(this.$t('OperationSuccessful'))
+            this.loading = false
+            this.$router.push({
+              path: '/collectionOfRegulatoryOpinions'
+            })
+          } else {
+            this.loading = false
+            this.$message.warning(this.$t('operationFailed'))
+          }
+        })
+      }
+    }
+  }
+</script>
+
+<style scoped>
+  .detail-box {
+    padding: 67px 0 0 0;
+    background: #ffffff;
+    height: 100%;
+    overflow: auto;
+  }
+
+  #examineBox {
+    display: flex;
+    flex-direction: column;
+    background: #fff;
+    position: relative;
+    height: 100%;
+    overflow-y: auto;
+  }
+</style>