diff --git a/jero-boot/db/蔚来标准sql/dev_third_record.sql b/jero-boot/db/蔚来标准sql/dev_third_record.sql index 0fe7be784..c2be63920 100644 --- a/jero-boot/db/蔚来标准sql/dev_third_record.sql +++ b/jero-boot/db/蔚来标准sql/dev_third_record.sql @@ -334,3 +334,28 @@ INSERT INTO `sys_category` (`id`, `pid`, `name`, `code`, `create_by`, `create_ti INSERT INTO `sys_category` (`id`, `pid`, `name`, `code`, `create_by`, `create_time`, `update_by`, `update_time`, `sys_org_code`, `sys_dict_id`, `has_child`, `en_name`, `description`, `is_tag_dict`, `attribute_type`, `is_read_only`, `del_flag`, `item_value`, `sort_order`) VALUES ('1546745318161055745', '1546745025973256194', '评1+1', NULL, 'admin', '2022-07-12 14:36:36', NULL, NULL, 'A01', '1546744902203539458', NULL, 'P1+1', NULL, 1, NULL, NULL, 0, NULL, 1); INSERT INTO `sys_dict` (`id`, `dict_name`, `dict_code`, `description`, `del_flag`, `create_by`, `create_time`, `update_by`, `update_time`, `type`, `dict_en_name`, `is_tag_dict`, `is_read_only`, `attribute_type`, `order_num`) VALUES ('1546744902203539458', '评估方式', 'evaluation_method', '评估方式', 0, 'admin', '2022-07-12 14:34:56', NULL, NULL, NULL, NULL, 1, 0, '2', 1); + +-- 参数项清单 修改字段长度 2022-07-12 +ALTER TABLE `laws_weilai`.`params_info` + MODIFY COLUMN `description` varchar(1000) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '参数说明' AFTER `duty_territory`; + +ALTER TABLE `laws_weilai`.`cert_category_params_info` + MODIFY COLUMN `description` varchar(1000) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '参数说明' AFTER `params_name`; + +ALTER TABLE `laws_weilai`.`params_info_publish` + MODIFY COLUMN `description` varchar(1000) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '参数说明' AFTER `duty_territory`; + +ALTER TABLE `laws_weilai`.`cert_category_params_info_publish` + MODIFY COLUMN `description` varchar(1000) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '参数说明' AFTER `params_name`; + +ALTER TABLE `laws_weilai`.`params_collect_manifest` + MODIFY COLUMN `description` varchar(1000) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '参数说明' AFTER `duty_territory`; + +ALTER TABLE `laws_weilai`.`params_collect_manifest_history` + MODIFY COLUMN `description` varchar(1000) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '参数说明' AFTER `params_batch`; + +ALTER TABLE `laws_weilai`.`params_report_detail` + MODIFY COLUMN `description` varchar(1000) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '参数说明' AFTER `duty_territory`; + +ALTER TABLE `laws_weilai`.`report_cert_category_params_info` + MODIFY COLUMN `description` varchar(1000) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '参数说明' AFTER `params_name`; \ No newline at end of file diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsCollectManifestHistoryEOMapper.xml b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsCollectManifestHistoryEOMapper.xml index 6857bebfa..d59367314 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsCollectManifestHistoryEOMapper.xml +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsCollectManifestHistoryEOMapper.xml @@ -48,7 +48,9 @@ AND params_manifest_id = #{paramsCollectManifestEO.paramsManifestId} - + + AND state = #{paramsCollectManifestEO.state} + diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/service/impl/ParamsInfoEOServiceImpl.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/service/impl/ParamsInfoEOServiceImpl.java index 0c2e0f47a..04a07a6a6 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/service/impl/ParamsInfoEOServiceImpl.java +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/service/impl/ParamsInfoEOServiceImpl.java @@ -1211,7 +1211,7 @@ public class ParamsInfoEOServiceImpl extends ServiceImpl implements IParamsInfoPublishEOService { @Autowired diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java index 3e8e82250..56f5ff6d2 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java @@ -5757,11 +5757,13 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl record1 = (Map) record; + String technology_territory = (String)record1.get("technology_territory"); for (Map.Entry entry : record1.entrySet()) { //下拉选处理数据字典 dictItem(sysDictItems, entry, cut, fieldList,null); treeDictItem(categoryList, entry, treeFieldList, cut,null); } + record1.put("technology_territory_id",technology_territory); } return infoPage; } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/entity/LawsOpinionGatherEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/entity/LawsOpinionGatherEO.java index 35461f2e7..5e5a18fcf 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/entity/LawsOpinionGatherEO.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/entity/LawsOpinionGatherEO.java @@ -77,7 +77,7 @@ public class LawsOpinionGatherEO implements Serializable { private String technologyTerritory; @TableField(exist = false) /**技术领域展示字段*/ - private String technologyTerritoryShow; + private String technologyTerritoryName; /**收集结果*/ @Excel(name = "收集结果", width = 15) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/service/impl/LawsOpinionAssessmentResultEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/service/impl/LawsOpinionAssessmentResultEOServiceImpl.java index 23fc954b6..3679cf031 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/service/impl/LawsOpinionAssessmentResultEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/service/impl/LawsOpinionAssessmentResultEOServiceImpl.java @@ -156,8 +156,8 @@ public class LawsOpinionAssessmentResultEOServiceImpl extends ServiceImpl params) { - Integer pageNo = (Integer) params.get("pageNo"); - Integer pageSize = (Integer) params.get("pageSize"); + Integer pageNo = Integer.parseInt(params.get("pageNo").toString()); + Integer pageSize = Integer.parseInt(params.get("pageSize").toString()); String exportAll = (String)params.get("exportAll"); String ids = (String)params.get("ids"); String cut = (String)params.get("cut"); @@ -191,6 +191,8 @@ public class LawsOpinionAssessmentResultEOServiceImpl extends ServiceImpl opinionArchiveFileList = iOSSFileService.getFileInfosByConnectId(StringUtils.join(lawsOpinionGather.getOpinionArchiveId(), ",")); diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/controller/LawsTechnologyEvaluationEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/controller/LawsTechnologyEvaluationEOController.java index f62943826..ada4ac7cb 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/controller/LawsTechnologyEvaluationEOController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/controller/LawsTechnologyEvaluationEOController.java @@ -53,10 +53,12 @@ public class LawsTechnologyEvaluationEOController extends JeroController queryPageList(LawsTechnologyEvaluationEO lawsTechnologyEvaluationEO, @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + @RequestParam(name="cut", defaultValue="cn") String cut, HttpServletRequest req) { QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(lawsTechnologyEvaluationEO, req.getParameterMap()); Page page = new Page(pageNo, pageSize); IPage pageList = lawsTechnologyEvaluationEOService.page(page, queryWrapper); + this.lawsTechnologyEvaluationEOService.disposeData(pageList.getRecords(),cut); return Result.OK(pageList); } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/entity/LawsTechnologyEvaluationEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/entity/LawsTechnologyEvaluationEO.java index bb3718991..37a7d210f 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/entity/LawsTechnologyEvaluationEO.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/entity/LawsTechnologyEvaluationEO.java @@ -6,6 +6,7 @@ import java.math.BigDecimal; import java.util.Date; import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; @@ -82,16 +83,22 @@ public class LawsTechnologyEvaluationEO implements Serializable { @Excel(name = "技术领域", width = 15) @ApiModelProperty(value = "技术领域") private String technologyTerritory; + @TableField(exist = false) + private String technologyTerritoryName; /**评估方式*/ @Excel(name = "评估方式", width = 15) @ApiModelProperty(value = "评估方式") private String evaluationMethods; + @TableField(exist = false) + private String evaluationMethodsName; /**流程状态*/ @Excel(name = "流程状态", width = 15) @ApiModelProperty(value = "流程状态") private String flowStatus; + @TableField(exist = false) + private String flowStatusName; /**发起日期*/ @Excel(name = "发起日期", width = 15, format = "yyyy-MM-dd") diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/ILawsTechnologyEvaluationEOService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/ILawsTechnologyEvaluationEOService.java index ba0402ba0..fd70dcc12 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/ILawsTechnologyEvaluationEOService.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/ILawsTechnologyEvaluationEOService.java @@ -67,4 +67,11 @@ public interface ILawsTechnologyEvaluationEOService extends IService processCall(JSONObject jsonObject); + + /** + * 处理数据 + * @param records + * @param cut + */ + void disposeData(List records, String cut); } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/impl/LawsTechnologyEvaluationEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/impl/LawsTechnologyEvaluationEOServiceImpl.java index ef74f3786..2dc019550 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/impl/LawsTechnologyEvaluationEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/impl/LawsTechnologyEvaluationEOServiceImpl.java @@ -3,20 +3,26 @@ package com.jero.modules.lawsTechnologyEvaluation.service.impl; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.jero.common.api.vo.Result; +import com.jero.common.constant.enums.CutEnum; import com.jero.common.exception.JeroBootException; +import com.jero.modules.lawsOpinionGather.enums.GatherResultEnum; import com.jero.modules.lawsTechnologyEvaluation.entity.LawsTechnologyEvaluationEO; -import com.jero.modules.lawsTechnologyEvaluation.entity.LawsTechnologyEvaluationFlowDetailEO; import com.jero.modules.lawsTechnologyEvaluation.mapper.LawsTechnologyEvaluationEOMapper; import com.jero.modules.lawsTechnologyEvaluation.service.ILawsTechnologyEvaluationEOService; import com.jero.modules.project.enums.OperatorTypeEnum; import com.jero.modules.project.enums.RequestSourceEnum; +import com.jero.modules.system.entity.SysCategory; +import com.jero.modules.system.service.impl.SysCategoryServiceImpl; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import java.util.ArrayList; +import java.util.Arrays; import java.util.List; import java.util.Date; +import java.util.stream.Collectors; + import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; /** @@ -28,6 +34,9 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; @Service public class LawsTechnologyEvaluationEOServiceImpl extends ServiceImpl implements ILawsTechnologyEvaluationEOService { + @Autowired + private SysCategoryServiceImpl sysCategoryService; + /** * 保存 * @@ -122,4 +131,45 @@ public class LawsTechnologyEvaluationEOServiceImpl extends ServiceImpl().success("调用成功！"); } + + @Override + public void disposeData(List datas, String cut) { + if(CollectionUtils.isNotEmpty(datas)){ + List categoryList = sysCategoryService.list(); + for (LawsTechnologyEvaluationEO data : datas) { + if(StringUtils.isNotEmpty(data.getEvaluationMethods())){ + List evaluationMethodsList = Arrays.asList(data.getEvaluationMethods().split(",")); + String name = getTreeName(cut, categoryList, evaluationMethodsList); + data.setEvaluationMethodsName(name); + } + if(StringUtils.isNotEmpty(data.getFlowStatus())){ + data.setFlowStatusName(GatherResultEnum.getTextByValue(data.getFlowStatus(),cut)); + } + if(StringUtils.isNotEmpty(data.getTechnologyTerritory())){ + List technologyTerritory = Arrays.asList(data.getTechnologyTerritory().split(",")); + String name = getTreeName(cut, categoryList, technologyTerritory); + data.setTechnologyTerritoryName(name); + } + } + } + } + + private String getTreeName(String cut, List categoryList, List technologyTerritoryList) { + StringBuilder sb = new StringBuilder(); + for (String technologyTerritory : technologyTerritoryList) { + List collect = categoryList.stream().filter(e -> technologyTerritory.equals(e.getId())).collect(Collectors.toList()); + if(collect.size() != 0){ + if (CutEnum.CN.getValue().equals(cut)) { + sb.append(collect.get(0).getName() + ","); + } else { + sb.append(collect.get(0).getEnName()+ ","); + } + } + } + String technologyTerritoryName = ""; + if (StringUtils.isNotBlank(sb)) { + technologyTerritoryName = sb.substring(0, sb.length() - 1); + } + return technologyTerritoryName; + } } diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index 313d0a2b1..6178f5f41 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -389,6 +389,7 @@ module.exports = { whole: 'Whole', DocumentLibrary: 'Document Library', GeneralExportInformation:'General export information', + CustomizeExportInformation:'Customize export information', DocumentComparisonLibrary: 'Document comparison Library', weekly: 'Weekly', SyncLibrary: 'Sync to doc. library', diff --git a/jero-web/src/common/lang/zh-cn.js b/jero-web/src/common/lang/zh-cn.js index d6238311a..8a5cd55ea 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -394,6 +394,7 @@ module.exports = { whole: '全部', DocumentLibrary: '文档库', GeneralExportInformation:'常规导出信息', + CustomizeExportInformation:'自定义导出信息', DocumentComparisonLibrary: '文档对比库', weekly: '周报', SyncLibrary: '同步至文档库', diff --git a/jero-web/src/components/tableCollection/index.vue b/jero-web/src/components/tableCollection/index.vue index ab50d9fd6..1399e3518 100644 --- a/jero-web/src/components/tableCollection/index.vue +++ b/jero-web/src/components/tableCollection/index.vue @@ -294,8 +294,15 @@ onClickSee(val) { let _this = this this.areaVisibleView = true + let url = '' + if (this.$route.query.it === undefined) { + url = `/jero-boot/params/config/getById?id=${val.db_field_name}` + } else { + // 历史版本 + url = `/jero-boot/params/collectManifestHistory/getConfigById?id=${val.db_field_name}` + } axios({ - url: `/jero-boot/params/config/getById?id=${val.db_field_name}`, + url: url, method: 'get', transformRequest: [function(data) { let ret = '' @@ -312,8 +319,9 @@ .then((res) => { console.log(res) if (res.data.success) { - this.configDetail = res.data.result + this.configDetail = res.data.result || {} } else { + this.configDetail = {} _this.$message.warning(res.data.result) } }) @@ -501,12 +509,25 @@ getTableListReset() { let params = { paramsManifestId: this.$route.query.id, - userTypes: this.currentPersonRole + pageNo: this.pageNo, + pageSize: this.pageSize, + // userTypes: this.currentPersonRole } + let url this.loading = true this.$emit('listReset', '') // todo - getAction(this.url.tableList, params).then((res) => { + if (this.$route.query.it === undefined) { + // 页面跳转 + url = this.url.tableList + params.paramsManifestId = this.$route.query.id + params.userTypes = this.currentPersonRole + } else { + // 历史版本 + url = 'params/collectManifestHistory/list' + params.paramsManifestId = this.$route.query.it + } + getAction(url, params).then((res) => { if (res.success) { let tt = [] if (this.currentPersonRole !== 'dre') { diff --git a/jero-web/src/components/tableCollection/index1.vue b/jero-web/src/components/tableCollection/index1.vue index 0dc4b2e8e..2faa372e5 100644 --- a/jero-web/src/components/tableCollection/index1.vue +++ b/jero-web/src/components/tableCollection/index1.vue @@ -96,7 +96,7 @@ - +
{{$t('configurationName')}}: @@ -290,12 +290,16 @@ this.$emit('handlePreservation') this.getTableList() }, + hideModal(){ + this.areaVisibleView = false + }, // 查看配置详细信息 onClickSee(val) { + console.log(val) let _this = this this.areaVisibleView = true axios({ - url: `/jero-boot/params/config/getById?id=${val.db_field_name}`, + url: `/jero-boot/report/detail/getConfig?id=${val.db_field_name}`, method: 'get', transformRequest: [function(data) { let ret = '' diff --git a/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/components/initiatingProcess.vue b/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/components/initiatingProcess.vue index 4c8e45171..c7e910665 100644 --- a/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/components/initiatingProcess.vue +++ b/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/components/initiatingProcess.vue @@ -260,9 +260,11 @@ this.selectedRowKeys = value if (this.selectedRowKeys.length > 1) { this.selectedRowKeys.shift() - record.shift() } - this.selectedRowKeysRecord = record + this.selectedRowKeysRecord = record.filter(res=>{ + return res.id == this.selectedRowKeys[0] + }) + this.selectedRowKeysRecord = [...this.selectedRowKeysRecord] }, clickButtonToUpload(item) { this.$refs.uploadFile.perentHandleFunc() diff --git a/jero-web/src/views/businessSupport/technologyAssessment/components/TermInformation.vue b/jero-web/src/views/businessSupport/technologyAssessment/components/TermInformation.vue index 1ccae18b1..b44281a68 100644 --- a/jero-web/src/views/businessSupport/technologyAssessment/components/TermInformation.vue +++ b/jero-web/src/views/businessSupport/technologyAssessment/components/TermInformation.vue @@ -6,14 +6,42 @@ :data-source="dataList" :pagination="false" :loading="loading"> - + + + + + + + + {{$t('delete')}} +
\ No newline at end of file diff --git a/jero-web/src/views/businessSupport/technologyAssessment/components/initiatingProcess.vue b/jero-web/src/views/businessSupport/technologyAssessment/components/initiatingProcess.vue index 1cf238d6c..c7156aeaf 100644 --- a/jero-web/src/views/businessSupport/technologyAssessment/components/initiatingProcess.vue +++ b/jero-web/src/views/businessSupport/technologyAssessment/components/initiatingProcess.vue @@ -42,7 +42,7 @@
- 件大事发的科技示范和的空间是否和是科技示范的空间是多少 + {{selectedRowKeysRecord[0] ? selectedRowKeysRecord[0].serialNumber :''}}
@@ -73,13 +73,14 @@
- {{$t('enclosure')}} + {{$t('uploadRelevantMaterials')}}
- {{ (formInline.accessory_id === 'null' || formInline.accessory_id === '' || - formInline.accessory_id == null) ? $t('clickUpload') : $t('viewUploadedFiles') + @click="clickButtonToUpload('relatedDataFileId')"> + {{ (formInline.relatedDataFileId === 'null' || formInline.relatedDataFileId === '' || + formInline.relatedDataFileId == null) ? $t('clickUpload') : $t('viewUploadedFiles') }} @@ -94,7 +95,7 @@
@@ -108,7 +109,7 @@ @@ -121,20 +122,18 @@ * {{$t('evaluationMethod')}} - - - - - {{ item.name }} - - - + + @@ -144,19 +143,19 @@ * {{$t('Assessor')}} - + + v-model="formInline.evaluatorsName"/> - + { + if (res.success) { + this.gatherResultList = res.result + } else { + this.gatherResultList = [] + } + }) + }, pageOnChange(page) { this.pageNo = page this.getList() @@ -336,11 +336,21 @@ }, onSelectChange(value, record) { this.selectedRowKeys = value + this.selectedRowKeysRecord = [] if (this.selectedRowKeys.length > 1) { this.selectedRowKeys.shift() - record.shift() } - this.selectedRowKeysRecord = record + let content = record.filter(res => { + return res.id == this.selectedRowKeys[0] + }) + if (content && content.length > 0) { + this.selectedRowKeysRecord.push({ + standId: content[0].id, + serialNumber: content[0].serial_number, + title: content[0].title, + technologyTerritory: content[0].technology_territory_id + }) + } }, standardDecompositionDocumentClick() { if (this.selectedRowKeysRecord && this.selectedRowKeysRecord.length > 0) { @@ -392,7 +402,7 @@ str[0] = str[8] = str[13] = str[18] = str[23] = '-' return str.join('') }, - submit() { + submit(startTime) { this.$refs.ruleForm.validate(valid => { if (valid) { if (this.selectedRowKeysRecord && this.selectedRowKeysRecord.length == 0) { @@ -400,12 +410,20 @@ } else { this.JLoading = true let value = Object.assign(this.formInline, this.selectedRowKeysRecord[0]) - value.standId = value.id + if (this.isTrue) { + value.evaluationType = 'Item evaluation' + } else { + value.evaluationType = 'Feedback evaluation' + } + value.startTime = startTime + value.flowStatus = 'Underway' value.taskAffirmDueDate = value.endTime - delete value.id - value.id = this.getUUID() - value.currentUserName = this.userInfo().username + value.lawsTechnologyEvaluationId = this.getUUID() + value.regulationOwnerId = this.userInfo().id Object.keys(value).forEach(res => { + if (value[res] && value[res] instanceof Array) { + value[res] = value[res].join(',') + } if (value[res] && value[res] instanceof String) { value[res] = value[res].replace(/\"/g, '“') value[res] = value[res].replace(/\'/g, '‘') @@ -418,14 +436,21 @@ }, startProcess(value) { let query = { - type: 5, - msg: JSON.stringify(value).replace(/\"/g, '\'') + type: 6, + ...value, + msg: JSON.stringify(value.evaluators).replace(/\"/g, '\'') } postAction('/workFlow/startProcess', query).then((res) => { if (res.success) { - this.completeTask(value, res.result) + this.$message.success(this.$t('OperationSuccessful')) + this.JLoading = false + this.$router.push({ + path: '/technologyAssessment' + }) + // this.completeTask(value, res.result) } else { this.JLoading = false + this.$message.warning(this.$t('operationFailed')) } }) }, @@ -437,13 +462,10 @@ } postAction('/workFlow/completeTask', query).then((res) => { if (res.success) { - // setTimeout(() => { - // window.close() - // }, 1000) this.$message.success(this.$t('OperationSuccessful')) this.JLoading = false this.$router.push({ - path: '/collectionOfRegulatoryOpinions' + path: '/technologyAssessment' }) } else { this.JLoading = false diff --git a/jero-web/src/views/businessSupport/technologyAssessment/index.vue b/jero-web/src/views/businessSupport/technologyAssessment/index.vue index 52090af72..02f48cd6f 100644 --- a/jero-web/src/views/businessSupport/technologyAssessment/index.vue +++ b/jero-web/src/views/businessSupport/technologyAssessment/index.vue @@ -49,7 +49,7 @@ class="box-input" :getPopupContainer="triggerNode=> triggerNode.parentNode" allowClear - v-model="queryParam.gatherResult"> + v-model="queryParam.flowStatus"> @@ -160,7 +160,7 @@ return { //url传参严格按照当前命名 url: { - list: '', + list: '/lawsTechnologyEvaluation/lawsTechnologyEvaluationEO/page', getSysCategoryTree: '/sys/category/getSysCategoryTree' }, visible: false, @@ -228,14 +228,14 @@ align: 'center', width: 170, ellipsis: true, - dataIndex: 'evaluationMethod' + dataIndex: 'evaluationMethods' }, { title: this.$t('ProcessStatus'), align: 'center', width: 170, ellipsis: true, - dataIndex: 'ProcessStatus' + dataIndex: 'flowStatus' }, { title: this.$t('dateOfInitiation'), @@ -256,7 +256,7 @@ align: 'center', ellipsis: true, width: 170, - dataIndex: 'remarks' + dataIndex: 'remark' }, { title: this.$t('operation'), @@ -333,13 +333,13 @@ 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' + path: '/evaluationInitiationProcess', + query: this.formInline }) + // let newUrl = this.$router.resolve({ + // path: '/evaluationProcess' + // }) window.open(newUrl.href, '_blank') } }) diff --git a/jero-web/src/views/parameter/managementdetails/commponts/customexportmodle.vue b/jero-web/src/views/parameter/managementdetails/commponts/customexportmodle.vue index 550f1e191..c413fbf9e 100644 --- a/jero-web/src/views/parameter/managementdetails/commponts/customexportmodle.vue +++ b/jero-web/src/views/parameter/managementdetails/commponts/customexportmodle.vue @@ -17,6 +17,7 @@
+ * {{$t('configure')}}
@@ -41,14 +42,23 @@
+ * {{$t('CustomTemplateName')}}
- - + + + + {{ mode.label }} + + + + + + +
@@ -87,6 +97,7 @@ export default { confirmLoading: false, description:false, dictOptions:[], + exportTemplatetOptions:[], visible: false, required:false, disabled:false, @@ -110,8 +121,8 @@ export default { description:[ { min:1, max: 200, message: this.$t('cantExeed')+'200'+this.$t('characters'), trigger: 'blur' }, ], - status: [ - { required: true, message: this.$t('PleaseSelect')+this.$t('status'), trigger: 'change' }, + exportTemplateId: [ + { required: true, message: this.$t('PleaseSelect')+this.$t('CustomTemplateName'), trigger: 'change' }, ], fileConnectId: [ { required: true, message: this.$t('PleaseSelect')+this.$t('attachmentTemplate'), trigger: 'change' }, @@ -160,9 +171,9 @@ export default { this.visible = true this.title = this.$t('CustomExport') this.formInline = {} - this.formInline.separator = ',' this.formInline = {...this.formInline} this.getConfigure() + this.getexportTemplateId() this.$nextTick(() => { this.$refs['ruleForm'].clearValidate() @@ -172,7 +183,7 @@ export default { let pram = { paramsManifestId: this.$route.query.id } - getAction('report/detail/getConfigLabelList', pram).then((res) => { + getAction('report/detail/getConfigLabelListCustom', pram).then((res) => { if (res.success) { console.log(res.result) this.dictOptions = res.result @@ -181,6 +192,16 @@ export default { } }) }, + getexportTemplateId(){ + getAction('report/detail/getTemplateLabelList', {}).then((res) => { + if (res.success) { + console.log(res.result) + this.exportTemplatetOptions = res.result + } else { + // this.$refs.uploadFile.perentHandleFunc() + } + }) + }, editModel(value) { this.visible = true this.title = '编辑' @@ -213,17 +234,17 @@ export default { let url = this.url.ConventionalExport let Action = getAction let query = JSON.parse(JSON.stringify(this.formInline)) - Object.keys(query).forEach(res => { - if (query[res] && query[res] instanceof Array) { - query[res] = query[res].join(',') - } - }) - if(this.contentListStart){ - query.certCategoryName = this.contentListStart - } + // Object.keys(query).forEach(res => { + // if (query[res] && query[res] instanceof Array) { + // query[res] = query[res].join(',') + // } + // }) + // if(this.contentListStart){ + // query.certCategoryName = this.contentListStart + // } query.paramsManifestId = this.$route.query.id this.confirmLoading = true - downloadFile('report/detail/exportNormal', this.$t('GeneralExportInformation')+'.zip', query) + downloadFile('report/detail/exportCustom', this.$t('CustomizeExportInformation')+'.zip', query) this.confirmLoading = false } }) diff --git a/jero-web/src/views/parameter/managementdetails/index.vue b/jero-web/src/views/parameter/managementdetails/index.vue index 6dc973175..3dc497d98 100644 --- a/jero-web/src/views/parameter/managementdetails/index.vue +++ b/jero-web/src/views/parameter/managementdetails/index.vue @@ -1,4 +1,5 @@