@@ -111,6 +115,7 @@
data() {
return {
formInline: {},
+ isPersonnel: false,
reviewResult: {
'launch': this.$t('Launch'),
'Compliance': this.$t('accord'),
@@ -171,7 +176,6 @@
if (this.queryBy.disposeResult == 'To be tracked' || this.queryBy.disposeResult == 'Non-Compliance') {
this.isAdopt = true
}
- console.log(this.isAdopt)
},
methods: {
submit(callBack) {
@@ -181,11 +185,16 @@
}
})
},
+ PersonnelSelectionClick() {
+ this.$refs.SelectedByRef.getPush()
+ },
reviewResultChange(value) {
if (value.target.value == 'Transfer') {
- this.$refs.SelectedByRef.getPush()
+ this.isPersonnel = true
+ // this.$refs.SelectedByRef.getPush()
} else {
this.$refs.SelectedByRef.visible = false
+ this.isPersonnel = false
this.formInline.secondChargePersonUserId = ''
this.formInline.dezrrSubmitUserName = ''
this.formInline.dezrrSubmitUserId = ''
diff --git a/jero-web/src/views/toDoCenter/projectRegulationTasks/index.vue b/jero-web/src/views/toDoCenter/projectRegulationTasks/index.vue
index 43f97efa6..f0d1ab5ce 100644
--- a/jero-web/src/views/toDoCenter/projectRegulationTasks/index.vue
+++ b/jero-web/src/views/toDoCenter/projectRegulationTasks/index.vue
@@ -76,7 +76,7 @@
-
diff --git a/jero-web/src/views/virtualAuthenticationList/virtualAuthenticationListDesign/certificationListMaintenance.vue b/jero-web/src/views/virtualAuthenticationList/virtualAuthenticationListDesign/certificationListMaintenance.vue
index 5485bc10a..5f3e5a4c3 100644
--- a/jero-web/src/views/virtualAuthenticationList/virtualAuthenticationListDesign/certificationListMaintenance.vue
+++ b/jero-web/src/views/virtualAuthenticationList/virtualAuthenticationListDesign/certificationListMaintenance.vue
@@ -304,6 +304,7 @@
align: 'left',
dataIndex: 'category',
width: 200,
+ sorter: true,
// fixed: 'left',
ellipsis: true
},
@@ -313,12 +314,14 @@
dataIndex: 'inspectionItem',
width: 200,
ellipsis: true,
+ sorter: true,
// fixed: 'left',
scopedSlots: { customRender: 'inspectionItems' }
},
{
title: this.$t('configurationItem'),
align: 'left',
+ sorter: true,
dataIndex: 'configItem',
width: 200,
ellipsis: true
@@ -326,6 +329,7 @@
{
title: 'WVTA ID',
align: 'left',
+ sorter: true,
dataIndex: 'wvtaId',
width: 200,
ellipsis: true
@@ -335,6 +339,7 @@
align: 'left',
dataIndex: 'serialNumber',
width: 210,
+ sorter: true,
ellipsis: true
},
{
@@ -342,11 +347,13 @@
align: 'left',
dataIndex: 'dutyTerritoryName',
width: 200,
+ sorter: true,
ellipsis: true
},
{
title: this.$t('typeOfDeliverables'),
align: 'left',
+ sorter: true,
dataIndex: 'deliverableTypeName',
width: 330,
ellipsis: true
@@ -500,18 +507,10 @@
},
tableOnChange(pagination, filters, sorter) {
this.orderBy = sorter.order == 'ascend' ? '1' : '2'
- if (sorter.columnKey == 'shi4Yong4Fan4Wei2_dictText') {
- this.orderByField = 'shi4Yong4Fan4Wei2'
- } else if (sorter.columnKey == 'state_dictText') {
- this.orderByField = 'state'
- } else if (sorter.columnKey == 'xin1Che1Xing2Shi2Shi1Ri4Qi1') {
- this.orderByField = 'xin1_che1_xing2_shi2_shi1_ri4_qi1'
- } else if (sorter.columnKey == 'implementTime') {
- this.orderByField = 'implement_time'
- } else if (sorter.columnKey == 'dutyTerritory_dictText') {
+ if (sorter.columnKey == 'dutyTerritoryName') {
this.orderByField = 'dutyTerritory'
- } else if (sorter.columnKey == 'attestationRank_dictText') {
- this.orderByField = 'attestationRank'
+ } else if (sorter.columnKey == 'deliverableTypeName') {
+ this.orderByField = 'deliverableType'
} else {
this.orderByField = sorter.columnKey
}