diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java index 112e02295..116df66f3 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java @@ -911,6 +911,10 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl> getLoginUserTypes(ParamsCollectManifestVO paramsCollectManifestVO, String cut) { + if (StringUtils.isEmpty(paramsCollectManifestVO.getProjectId()) || StringUtils.isEmpty(paramsCollectManifestVO.getParamsManifestId())) { + throw new JeroBootException("参数不能为空！"); + } + String projectId = paramsCollectManifestVO.getProjectId(); String paramsManifestId = paramsCollectManifestVO.getParamsManifestId(); @@ -1055,6 +1059,7 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl queryWrapper = new LambdaQueryWrapper<>(); queryWrapper.eq(ParamsCollectManifestEO::getParamsManifestId, paramsManifestId) + .notIn(ParamsCollectManifestEO::getControlType, ControlTypeEnum.Title.getValue()) .orderByDesc(ParamsCollectManifestEO::getUpdateTime); // 按修改时间降序 List list = list(queryWrapper); int collectFinishNumber = (int) list.stream().filter(e->CollectManifestStateEnum.SYNC_REPORT.getValue().equals(e.getState())).count(); diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsManifestEOServiceImpl.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsManifestEOServiceImpl.java index 49a3b33ab..51fe947a7 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsManifestEOServiceImpl.java +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsManifestEOServiceImpl.java @@ -23,6 +23,7 @@ import com.jero.modules.cert.collect.vo.ParamsManifestHistoryVO; import com.jero.modules.cert.report.service.IParamsReportEOService; import com.jero.modules.cert.template.entity.ParamsInfoPublishEO; import com.jero.modules.cert.template.entity.ParamsTemplateEO; +import com.jero.modules.cert.template.enums.ControlTypeEnum; import com.jero.modules.cert.template.service.IParamsInfoPublishEOService; import com.jero.modules.cert.template.service.IParamsTemplateEOService; import com.jero.modules.project.entity.ProjectRelatedPersonnel; @@ -126,14 +127,16 @@ public class ParamsManifestEOServiceImpl extends ServiceImpl
+
+
+ + {{$t('templateDownload')}} +
+
+ +
+
+ +
+ + +
+ +
+ /> - + @@ -36,32 +55,40 @@ @@ -107,4 +177,17 @@ width: 70%; height: 38px; } + + .clauseContent-text { + width: 100%; + overflow: hidden; + display: -webkit-box; + text-overflow: ellipsis; + /*! autoprefixer: off */ + -webkit-box-orient: vertical; + -webkit-line-clamp: 1; + /*! autoprefixer: on;*/ + text-justify: inter-ideograph; + word-break: break-all + } \ 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 e7cd9c853..8d2c3dff6 100644 --- a/jero-web/src/views/businessSupport/technologyAssessment/components/initiatingProcess.vue +++ b/jero-web/src/views/businessSupport/technologyAssessment/components/initiatingProcess.vue @@ -127,6 +127,7 @@ tree-node-filter-prop="title" v-model="formInline.evaluationMethods" :maxTagCount="1" + @change="evaluationMethodsChange" :getPopupContainer="triggerNode=> triggerNode.parentNode" class="box-input" style="width: 100%" @@ -155,7 +156,13 @@ - + + + 0) { - this.$refs.standardDecompositionSheetRef.getData(JSON.parse(JSON.stringify(this.selectedRowKeysRecord[0]))) + if (this.standardDecomposition && this.standardDecomposition.length > 0) { + this.$refs.standardDecompositionSheetRef.getData(JSON.parse(JSON.stringify(this.standardDecomposition[0]))) } else { this.$message.warning(this.$t('pleaseSelectStandardFirst')) } }, standardDecompositionSheetForm(value) { - + this.$refs.TermInformationRef.getData(JSON.parse(JSON.stringify(value))) + }, + TermInformationRefForm(value) { + this.$refs.standardDecompositionSheetRef.getRowList(JSON.parse(JSON.stringify(value))) }, clickButtonToUpload(item) { this.$refs.uploadFile.perentHandleFunc() @@ -397,6 +409,10 @@ this.formInline[value] = id this.formInline = { ...this.formInline } }, + evaluationMethodsChange(key, name) { + this.formInline.evaluationMethods = [] + this.formInline.evaluationMethods = name + }, dateChange(item) { this.formInline[item] = this.formInline[item] ? moment(this.formInline[item]).format('YYYY-MM-DD') : '' }, @@ -415,37 +431,56 @@ if (this.selectedRowKeysRecord && this.selectedRowKeysRecord.length == 0) { this.$message.warning(this.$t('pleaseSelectStandard')) } else { - this.JLoading = true - let value = Object.assign(this.formInline, this.selectedRowKeysRecord[0]) - if (this.isTrue) { - value.evaluationType = 'Item evaluation' + if (this.$refs.TermInformationRef) { + this.$refs.TermInformationRef.submitData((dataList) => { + this.submitData(startTime, dataList) + }) } else { - value.evaluationType = 'Feedback evaluation' + this.submitData(startTime) } - value.startTime = startTime - value.flowStatus = 'Underway' - value.taskAffirmDueDate = value.endTime - 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, '‘') - } - }) - this.startProcess(value) } } }) }, - startProcess(value) { - let query = { - type: 6, - ...value, - msg: JSON.stringify(value.evaluators).replace(/\"/g, '\'') + submitData(startTime, dataList) { + this.JLoading = true + let value = Object.assign(this.formInline, this.selectedRowKeysRecord[0]) + if (this.isTrue) { + value.evaluationType = 'Item evaluation' + } else { + value.evaluationType = 'Feedback evaluation' + } + value.startTime = startTime + value.flowStatus = 'Underway' + value.taskAffirmDueDate = value.endTime + value.lawsTechnologyEvaluationId = this.getUUID() + value.regulationOwnerId = this.userInfo().id + value.regulationOwnerName = this.userInfo().username + 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, '‘') + } + }) + this.startProcess(value, dataList) + }, + startProcess(value, dataList) { + let query = {} + if (this.isTrue) { + query = { + type: 6, + ...value, + msg: JSON.stringify({ itemList: dataList }).replace(/\"/g, '\'') + } + } else { + query = { + type: 6, + ...value, + msg: JSON.stringify({ evaluators: this.$refs.TermInformationRef.dataList }).replace(/\"/g, '\'') + } } postAction('/workFlow/startProcess', query).then((res) => { if (res.success) { diff --git a/jero-web/src/views/businessSupport/technologyAssessment/components/standardDecompositionSheet.vue b/jero-web/src/views/businessSupport/technologyAssessment/components/standardDecompositionSheet.vue index 511c36717..d7d0a0c65 100644 --- a/jero-web/src/views/businessSupport/technologyAssessment/components/standardDecompositionSheet.vue +++ b/jero-web/src/views/businessSupport/technologyAssessment/components/standardDecompositionSheet.vue @@ -2,7 +2,7 @@
-
- {{$t('standard')}} +
+ {{$t('standardDocuments')}}
- + + + + {{ item.fileName }} + + +
- - -
- - {{$t('templateDownload')}} -
-
- -
- - + + + + + + + + + + + +
- +
+ + +
+ +
0 ? this.sarFileSplitInfoList[0].id : '' + this.visible = true + if (this.queryParam.info_id) { + this.replacePage() + } + }, + getRowList(value) { + if (value && value.itemId) { + this.selectedRowKeys = this.selectedRowKeys.filter(res=>{ + return value.itemId != res + }) + this.selectedRowKeysData = this.selectedRowKeysData.filter(res=>{ + return value.itemId != res.id + }) + } + }, searchQuery() { this.pageNo = 1 this.replacePage() @@ -144,6 +190,7 @@ searchReset() { this.pageNo = 1 this.queryParam = {} + this.queryParam.info_id = this.sarFileSplitInfoList && this.sarFileSplitInfoList.length > 0 ? this.sarFileSplitInfoList[0].id : '' this.replacePage() }, onChange(page, pageSize) { @@ -160,12 +207,13 @@ this.replacePage() }, replacePage() { + let pageNo = JSON.parse(JSON.stringify(this.pageNo)) + let pageSize = JSON.parse(JSON.stringify(this.pageSize)) let query = { - pageNo: this.pageNo, - pageSize: this.pageSize, - info_id: this.standData.id, - menu_id:'', - ...this.queryParam + pageNo: pageNo + '', + pageSize: pageSize + '', + info_id: this.queryParam.info_id, + menu_id: '' } this.loading = true postAction(this.url.list, query).then((res) => { @@ -184,10 +232,16 @@ this.visible = false }, handleSubmit() { - + if (this.selectedRowKeys && this.selectedRowKeys.length > 0) { + this.$emit('standardDecompositionSheetForm', this.selectedRowKeysData) + this.visible = false + } else { + this.$message.warning(this.$t('PleaseSelectData')) + } }, - onSelectChange() { - + onSelectChange(value, record) { + this.selectedRowKeys = value + this.selectedRowKeysData = record } } } @@ -244,4 +298,17 @@ .box-button { height: 38px; } + + .clauseContent-text { + width: 100%; + overflow: hidden; + display: -webkit-box; + text-overflow: ellipsis; + /*! autoprefixer: off */ + -webkit-box-orient: vertical; + -webkit-line-clamp: 1; + /*! autoprefixer: on;*/ + text-justify: inter-ideograph; + word-break: break-all + } \ 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 index bddbf9efc..3f3f20893 100644 --- a/jero-web/src/views/processCenter/processForm/evaluationProcess/index.vue +++ b/jero-web/src/views/processCenter/processForm/evaluationProcess/index.vue @@ -71,7 +71,7 @@ standardContentList: [ { title: this.$t('standard'), - value: 'serial_number' + value: 'serialNumber' }, { title: this.$t('title'), @@ -91,7 +91,7 @@ }, { title: this.$t('RelevantMaterials'), - value: 'RelevantMaterials', + value: 'relatedDataFileId', type: 2 }, { @@ -106,10 +106,10 @@ } }, mounted() { - this.isDisplay = true - // this.queryTaskDetailByTask(() => { - // this.lawsOpinionAssessmentResult() - // }) + this.isDisplay = false + this.queryTaskDetailByTask(() => { + this.lawsOpinionAssessmentResult() + }) }, methods: { ...mapGetters(['userInfo']), @@ -123,6 +123,7 @@ this.queryProject = res || {} callback && callback() } + this.queryProject.evaluationTypeName = this.queryProject.evaluationType == 'Feedback evaluation' ? this.$t('feedbackEvaluation') :this.$t('clauseEvaluation') }) }, lawsOpinionAssessmentResult() {