diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/controller/LawsMonthlyReportTitleTemplateEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/controller/LawsMonthlyReportTitleTemplateEOController.java index db6a7d163..4ccc7a42f 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/controller/LawsMonthlyReportTitleTemplateEOController.java +++ b/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 move(@RequestBody List lawsMonthlyReportTitleTemplateEOS) { + public Result move(@RequestBody JSONObject jsonObject) { + JSONArray lawsMonthlyReportTitleTemplateJson = jsonObject.getJSONArray("lawsMonthlyReportTitleTemplateEOS"); + LawsMonthlyReportTitleTemplateEO lawsMonthlyReportTitleTemplateEO = null; + List lawsMonthlyReportTitleTemplateEOS = new ArrayList<>(); + for (Object o : lawsMonthlyReportTitleTemplateJson) { + lawsMonthlyReportTitleTemplateEO=JSONObject.parseObject(JSONObject.toJSONString(o),LawsMonthlyReportTitleTemplateEO.class); + lawsMonthlyReportTitleTemplateEOS.add(lawsMonthlyReportTitleTemplateEO); + } lawsMonthlyReportTitleTemplateEOService.move(lawsMonthlyReportTitleTemplateEOS); return Result.OK("操作成功！"); } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/controller/LawsMonthlyReportWriteEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/controller/LawsMonthlyReportWriteEOController.java index 8c873e5d6..9f965309c 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/controller/LawsMonthlyReportWriteEOController.java +++ b/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 parameter) { + IPage infoPage = lawsMonthlyReportWriteEOService.queryPageDocument(parameter); + Result ok = Result.OK(infoPage); + JSONObject jsonResult = JSONObject.fromObject(ok); + return jsonResult; + } + } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/ILawsMonthlyReportWriteEOService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/ILawsMonthlyReportWriteEOService.java index 503feabb0..9f4e58fec 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/ILawsMonthlyReportWriteEOService.java +++ b/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 exportMonthlyReport(LawsMonthlyReportWriteEO lawsMonthlyReportWriteEO); + + IPage queryPageDocument(Map parameter); } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/impl/LawsMonthlyReportWriteEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/impl/LawsMonthlyReportWriteEOServiceImpl.java index 60deb8c14..1739939b6 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/impl/LawsMonthlyReportWriteEOServiceImpl.java +++ b/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 parameter) { + String cut = (String) parameter.get("cut");//中英文切换标识 + //文档库字段 + List fieldList = onlCgformFieldService.getFieldList(ModuleEnum.DOCUMENT_LIBRARY.getValue()); + //需要查询的字段 + List 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 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 categoryList = sysCategoryService.list(); + //过滤出树形字段 + List treeFieldList = fieldList.stream() + .filter(e -> FieldTypeEnum.TREE.getValue().equals(e.getFieldShowType())) + .collect(Collectors.toList()); + + + List records = infoPage.getRecords(); + //数据字典 + List sysDictItems = sysDictItemServiceImpl.selectItemsAll(); + //下拉选处理数据字典 + for (Map record : records) { + Map 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 entry : record1.entrySet()) { + //下拉选处理数据字典 + bussDocumentLibraryEOService.dictItem(sysDictItems, entry, cut, fieldList,null); + bussDocumentLibraryEOService.treeDictItem(categoryList, entry, treeFieldList, cut,null); + } + } + return infoPage; + } + } diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index 2db63ba8e..9b08f22c0 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/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', } \ No newline at end of file diff --git a/jero-web/src/common/lang/zh-cn.js b/jero-web/src/common/lang/zh-cn.js index 82611fe55..d1d642381 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -1111,4 +1111,9 @@ module.exports = { ValidationComplianceNotification:'验证符合性通知', RegulationTaskConfirmationNotification:'任务确认通知', evaluationMethod:'评估方式', + uploadRelevantMaterials:'相关资料上传', + processBackground:'流程背景', + selectedStandard:'所选标准', + standardDecompositionDocument:'带入标准分解单', + pleaseSelectStandardFirst:'请先选择标准', } \ No newline at end of file diff --git a/jero-web/src/components/layouts/TabLayout.vue b/jero-web/src/components/layouts/TabLayout.vue index 63efafd77..d2b7479b0 100644 --- a/jero-web/src/components/layouts/TabLayout.vue +++ b/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' || diff --git a/jero-web/src/config/router.config.js b/jero-web/src/config/router.config.js index 6c5c7f1d2..b544ebd0b 100644 --- a/jero-web/src/config/router.config.js +++ b/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', diff --git a/jero-web/src/views/businessSupport/regulationReport/components/modules/addModel.vue b/jero-web/src/views/businessSupport/regulationReport/components/modules/addModel.vue index 8e792dd8a..b5543536a 100644 --- a/jero-web/src/views/businessSupport/regulationReport/components/modules/addModel.vue +++ b/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 diff --git a/jero-web/src/views/businessSupport/regulationReport/components/modules/fillTable.vue b/jero-web/src/views/businessSupport/regulationReport/components/modules/fillTable.vue index f738e0f96..7d2abf4fb 100644 --- a/jero-web/src/views/businessSupport/regulationReport/components/modules/fillTable.vue +++ b/jero-web/src/views/businessSupport/regulationReport/components/modules/fillTable.vue @@ -28,9 +28,9 @@ :data-source="dataSource" :columns="columns" > - - {{$t('moveUp')}} - {{$t('moveDown')}} + + {{$t('moveUp')}} + {{$t('moveDown')}} {{$t('edit')}} {{$t('deleteLib')}} @@ -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; } diff --git a/jero-web/src/views/businessSupport/technologyAssessment/components/TermInformation.vue b/jero-web/src/views/businessSupport/technologyAssessment/components/TermInformation.vue new file mode 100644 index 000000000..1ccae18b1 --- /dev/null +++ b/jero-web/src/views/businessSupport/technologyAssessment/components/TermInformation.vue @@ -0,0 +1,70 @@ + + + + + \ 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 66b030e9c..1cf238d6c 100644 --- a/jero-web/src/views/businessSupport/technologyAssessment/components/initiatingProcess.vue +++ b/jero-web/src/views/businessSupport/technologyAssessment/components/initiatingProcess.vue @@ -34,6 +34,24 @@ /> + + +
+
+ {{$t('selectedStandard')}} +
+
+ 件大事发的科技示范和的空间是否和是科技示范的空间是多少 +
+
+ + {{$t('standardDecompositionDocument')}} + +
+
+ +
@@ -52,6 +70,74 @@
+ +
+
+ {{$t('enclosure')}} +
+ + + {{ (formInline.accessory_id === 'null' || formInline.accessory_id === '' || + formInline.accessory_id == null) ? $t('clickUpload') : $t('viewUploadedFiles') + }} + + +
+ + + + +
+
+ {{$t('processBackground')}} +
+ + + +
+ + + + +
+
+ {{$t('remarks')}} +
+ + + +
+ + + + +
+
+ * + {{$t('evaluationMethod')}} +
+ + + + + {{ item.name }} + + + + +
+
@@ -69,38 +155,8 @@
- - -
-
- {{$t('taskDescription')}} -
- - - -
- - - - -
-
- {{$t('enclosure')}} -
- - - {{ (formInline.accessory_id === 'null' || formInline.accessory_id === '' || - formInline.accessory_id == null) ? $t('clickUpload') : $t('viewUploadedFiles') - }} - - -
- - + {{this.$t('pleaseWaitWhileRunning')}} +
@@ -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(){ - var str=[]; - var Chars='0123456789abcdefghijklmnopqrstuvwxyz'; - for(var i=0;i<36;i++){ - str[i]=Chars.substr(Math.floor(Math.random()*16),1) + getUUID() { + var str = [] + var Chars = '0123456789abcdefghijklmnopqrstuvwxyz' + for (var i = 0; i < 36; i++) { + str[i] = Chars.substr(Math.floor(Math.random() * 16), 1) } - str[0]=str[8]=str[13]=str[18]=str[23]='-'; - return str.join("") + str[0] = str[8] = str[13] = str[18] = str[23] = '-' + 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); + } \ No newline at end of file diff --git a/jero-web/src/views/businessSupport/technologyAssessment/components/standardDecompositionSheet.vue b/jero-web/src/views/businessSupport/technologyAssessment/components/standardDecompositionSheet.vue new file mode 100644 index 000000000..511c36717 --- /dev/null +++ b/jero-web/src/views/businessSupport/technologyAssessment/components/standardDecompositionSheet.vue @@ -0,0 +1,247 @@ + + + + + \ No newline at end of file diff --git a/jero-web/src/views/businessSupport/technologyAssessment/index.vue b/jero-web/src/views/businessSupport/technologyAssessment/index.vue index 7f8b97246..52090af72 100644 --- a/jero-web/src/views/businessSupport/technologyAssessment/index.vue +++ b/jero-web/src/views/businessSupport/technologyAssessment/index.vue @@ -111,6 +111,43 @@ /> + + + + +
+
+ * + {{$t('standardDecompositionDocument')}} +
+ + + + + {{ item.name }} + + + + +
+ + + + @@ -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({ - path: '/evaluationInitiationProcess' + this.visible = true + 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; + } \ No newline at end of file diff --git a/jero-web/src/views/processCenter/processForm/evaluationProcess/index.vue b/jero-web/src/views/processCenter/processForm/evaluationProcess/index.vue new file mode 100644 index 000000000..94ec268cf --- /dev/null +++ b/jero-web/src/views/processCenter/processForm/evaluationProcess/index.vue @@ -0,0 +1,209 @@ + + + + + \ No newline at end of file