diff --git a/jero-web/src/views/projectManagement/components/TaskList.vue b/jero-web/src/views/projectManagement/components/TaskList.vue index 4e2991b71..9de65fa66 100644 --- a/jero-web/src/views/projectManagement/components/TaskList.vue +++ b/jero-web/src/views/projectManagement/components/TaskList.vue @@ -76,10 +76,10 @@
-
- - {{ $t('batSetting') }} -
+ + + +
{{$t('CertificationDirectory')}} @@ -95,12 +95,10 @@ diff --git a/jero-web/src/views/projectManagement/components/listOfRegulations.vue b/jero-web/src/views/projectManagement/components/listOfRegulations.vue index e2aaec1ba..c8c4f0d60 100644 --- a/jero-web/src/views/projectManagement/components/listOfRegulations.vue +++ b/jero-web/src/views/projectManagement/components/listOfRegulations.vue @@ -225,6 +225,10 @@ @click="resultReportedClick(record)"> {{$t('resultReported')}} + + {{$t('view')}} + @@ -238,7 +242,8 @@ - {{ record.designDeliverableTypeName }}
+ {{ record.designDeliverableTypeName }}
@@ -250,7 +255,8 @@ - {{ record.prehomoDeliverableTypeName }}
+ {{ record.prehomoDeliverableTypeName }}
 @@ -262,7 +268,8 @@ - {{ record.verifyDeliverableTypeName }}
+ {{ record.verifyDeliverableTypeName }}
 @@ -424,6 +431,7 @@ {{$t('dataLoading')}} + @@ -435,6 +443,7 @@ import transferList from './transferList' import fixedPlate from './fixedPlateForm' import resultReportedUpload from './resultReportedUpload' + import listOfRegulationsView from './listOfRegulationsView' import globalAdvancedQuery from '@/components/globalAdvancedQuery/index' import { getAction, postAction, downloadFile, deleteAction } from '@/api/manage' import moment from 'moment' @@ -452,7 +461,8 @@ transferList, globalAdvancedQuery, fixedPlate, - resultReportedUpload + resultReportedUpload, + listOfRegulationsView }, data() { return { @@ -726,7 +736,7 @@ title: this.$t('operation'), align: 'center', fixed: 'right', - width: 210, + width: 240, scopedSlots: { customRender: 'operation' } } ], @@ -1008,6 +1018,19 @@ }, methods: { ...mapGetters(['userInfo']), + viewClick(row) { + let roleCodeIndex + if (this.isDisplay) { + roleCodeIndex = 0 + } else { + roleCodeIndex = 4 + } + if (this.formInlineRoleSwitching.roleSwitchingCode == '11' || this.formInlineRoleSwitching.roleSwitchingCode == '12') { + roleCodeIndex = 0 + } + row.roleCodeIndex = roleCodeIndex + this.$refs.listOfRegulationsViewRef.editModel(JSON.parse(JSON.stringify(row))) + }, handleModule() { downloadFile(this.url.exportTemplate, this.$t('listOfRegulations') + this.$t('importTemplate') + '.xls', {}) }, @@ -1191,7 +1214,7 @@ for (let j = 0; j < selectedRowKeys.length; j++) { if (this.dataSource[i].id == selectedRowKeys[j]) { if (this.dataSource[i].taskAffirmStatus == 'Accepted' || - (this.dataSource[i].inventoryAffirmStatus == 'Accepted' && this.dataSource[i].taskAffirmStatus == 'Accepted')|| + (this.dataSource[i].inventoryAffirmStatus == 'Accepted' && this.dataSource[i].taskAffirmStatus == 'Accepted') || (this.dataSource[i].inventoryAffirmStatus == 'Accepted' && this.dataSource[i].taskAffirmStatus == 'Not started')) { isTrue = true } else { @@ -1398,7 +1421,7 @@ } }) if (queryParam.dutyTerritory) { - queryParam.dutyTerritory = '*'+queryParam.dutyTerritory+'*' + queryParam.dutyTerritory = '*' + queryParam.dutyTerritory + '*' } let query = { ...this.queryParamQuery, diff --git a/jero-web/src/views/projectManagement/components/listOfRegulationsView.vue b/jero-web/src/views/projectManagement/components/listOfRegulationsView.vue new file mode 100644 index 000000000..8601a76be --- /dev/null +++ b/jero-web/src/views/projectManagement/components/listOfRegulationsView.vue @@ -0,0 +1,555 @@ + + + + \ No newline at end of file