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-web/src/components/tableCollection/index.vue b/jero-web/src/components/tableCollection/index.vue index ab50d9fd6..758291e89 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) } }) 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 d51f228f7..29abc1c70 100644 --- a/jero-web/src/views/businessSupport/technologyAssessment/components/initiatingProcess.vue +++ b/jero-web/src/views/businessSupport/technologyAssessment/components/initiatingProcess.vue @@ -155,7 +155,7 @@ - +