diff --git a/jero-web/src/views/documentTools/virtualList/components/editModel.vue b/jero-web/src/views/documentTools/virtualList/components/editModel.vue index 06d7311a2..14903e020 100644 --- a/jero-web/src/views/documentTools/virtualList/components/editModel.vue +++ b/jero-web/src/views/documentTools/virtualList/components/editModel.vue @@ -1,6 +1,6 @@ @@ -674,6 +695,7 @@ }, formInline: {}, disabled: false, + title: '', CategoryTreeList: [], DeliverableTreeList: [] } @@ -703,6 +725,21 @@ }, editModel(item) { this.visible = true + this.disabled = false + this.title = this.$t('edit') + this.$nextTick(() => { + this.formInline = item || {} + this.formInline.technologyTerritory = this.formInline.technologyTerritory ? this.formInline.technologyTerritory.split(',') : [] + this.formInline.designDeliverableType = this.formInline.designDeliverableType ? this.formInline.designDeliverableType.split(',') : [] + this.formInline.prehomoDeliverableType = this.formInline.prehomoDeliverableType ? this.formInline.prehomoDeliverableType.split(',') : [] + this.formInline.verifyDeliverableType = this.formInline.verifyDeliverableType ? this.formInline.verifyDeliverableType.split(',') : [] + this.$refs.ruleForm.clearValidate() + }) + }, + viewModel(item) { + this.visible = true + this.disabled = true + this.title = this.$t('view') this.$nextTick(() => { this.formInline = item || {} this.formInline.technologyTerritory = this.formInline.technologyTerritory ? this.formInline.technologyTerritory.split(',') : [] diff --git a/jero-web/src/views/documentTools/virtualList/components/virtualListDetails.vue b/jero-web/src/views/documentTools/virtualList/components/virtualListDetails.vue index 88826cfab..4f0017e66 100644 --- a/jero-web/src/views/documentTools/virtualList/components/virtualListDetails.vue +++ b/jero-web/src/views/documentTools/virtualList/components/virtualListDetails.vue @@ -226,11 +226,16 @@ > {{$t('edit')}} {{$t('deleteLib')}} + {{$t('view')}} @@ -994,14 +999,14 @@ computed: { columns() { let columnResult = JSON.parse(JSON.stringify(this.columnsAll)) - if (this.title === '市场清单详情') { - for (var i = 0; i < columnResult.length; i++) { - if (columnResult[i].title === this.$t('operation')) { - columnResult.splice(i, 1) - i-- - } - } - } + // if (this.title === '市场清单详情') { + // for (var i = 0; i < columnResult.length; i++) { + // if (columnResult[i].title === this.$t('operation')) { + // columnResult.splice(i, 1) + // i-- + // } + // } + // } this.isTruee = false this.$nextTick(() => { this.isTruee = true @@ -1051,6 +1056,8 @@ this.isTrue = false setTimeout(() => { this.isTrue = true + this.title = this.$route.query.title + this.isTrue = this.$route.query.title == '市场清单详情' ? false : true }, 100) }, //导出 @@ -1181,7 +1188,7 @@ title: this.$t('operation'), align: 'left', fixed: 'right', - width: 240, + width: 120, scopedSlots: { customRender: 'operation' } }) @@ -1346,6 +1353,9 @@ edit(item) { this.$refs.editModelRef.editModel(JSON.parse(JSON.stringify(item))) }, + viewClick(item){ + this.$refs.editModelRef.viewModel(JSON.parse(JSON.stringify(item))) + }, deleteLib(val) { let _this = this this.$confirm({ diff --git a/jero-web/src/views/processCenter/components/taskCirculationHistory.vue b/jero-web/src/views/processCenter/components/taskCirculationHistory.vue index 9496a5adc..39ae27588 100644 --- a/jero-web/src/views/processCenter/components/taskCirculationHistory.vue +++ b/jero-web/src/views/processCenter/components/taskCirculationHistory.vue @@ -8,23 +8,46 @@
- - {{text}} + + {{approvalResult[text]}} + + + + + {{text}} + + + + + {{result.operatorResultName}} + + + + + {{$t('viewFile')}} + + --
+ \ No newline at end of file diff --git a/jero-web/src/views/projectManagement/components/certificationList/components/addModel.vue b/jero-web/src/views/projectManagement/components/certificationList/components/addModel.vue index c4018732d..19b67451e 100644 --- a/jero-web/src/views/projectManagement/components/certificationList/components/addModel.vue +++ b/jero-web/src/views/projectManagement/components/certificationList/components/addModel.vue @@ -36,15 +36,16 @@ - - - - - + @@ -162,7 +163,7 @@ {{$t('typeOfDeliverables')}} - *
{{$t('typeOfDeliverables')}} -