+
@@ -687,7 +688,7 @@
title: this.$t('DeliverablesResult'),
align: 'left',
dataIndex: 'deliveryResult',
- width: 180,
+ width: 210,
ellipsis: true,
scopedSlots: { customRender: 'DeliverablesResult' }
},
@@ -1406,17 +1407,45 @@
referenceDeliverablesClick() {
if (this.selectedRowKeys && this.selectedRowKeys.length > 0) {
let isTrue
- for (let i = 0; i < this.selectedRowKeysList.length; i++) {
- if (this.selectedRowKeysList[i].flowStatus == 'Results to be submitted') {
- isTrue = true
- } else {
- isTrue = false
- this.$message.warning(this.$t('youCanOnlySelectStatusClearSubmit'))
- return
+ let ids = []
+ let notConditions = []
+ let notConditionsOne = []
+ let data = ''
+ let dataOne = ''
+ let detailedWarningList= []
+ if (this.roleSwitchingCode == 20) {
+ for (let i = 0; i < this.selectedRowKeysList.length; i++) {
+ if (this.selectedRowKeysList[i].dutyPersonName == this.userInfo().username) {
+ if (this.selectedRowKeysList[i].flowStatus == 'Results to be submitted') {
+ ids.push(this.selectedRowKeysList[i].id)
+ } else {
+ notConditions.push(this.selectedRowKeysList[i].inspectionItem)
+ }
+ } else {
+ notConditionsOne.push(this.selectedRowKeysList[i].inspectionItem)
+ }
+ }
+ } else {
+ for (let i = 0; i < this.selectedRowKeysList.length; i++) {
+ if (this.selectedRowKeysList[i].flowStatus == 'Results to be submitted') {
+ ids.push(this.selectedRowKeysList[i].id)
+ } else {
+ notConditions.push(this.selectedRowKeysList[i].inspectionItem)
+ }
}
}
- if (isTrue) {
- this.$refs.referenceDeliverablesListRef.transferModel(JSON.parse(JSON.stringify(this.selectedRowKeys)))
+ if (notConditions && notConditions.length > 0) {
+ data = this.$t('inspectionItems') + '"' + notConditions.join('、') + '"' + this.$t('conditionsNotMet') + ',' + this.$t('onlyDataStatusSubmittedCanBeSelected')
+ detailedWarningList.push(
{data}
)
+ }
+ if (notConditionsOne && notConditionsOne.length > 0){
+ dataOne = this.$t('inspectionItems') + '"' + notConditionsOne.join('、')+'"'+this.$t('operationWithoutPermission')
+ detailedWarningList.push(
{dataOne}
)
+ }
+ if (ids && ids.length > 0) {
+ this.$refs.referenceDeliverablesListRef.transferModel(ids,detailedWarningList)
+ } else {
+ this.failedMessageOne(detailedWarningList)
}
} else {
this.$message.warning(this.$t('selectLeastOne'))
@@ -1738,7 +1767,12 @@
content: ( < div > { detailedWarningList } < /div>)
})
},
-
+ failedMessageOne(data) {
+ let detailedWarningList = data
+ this.$warning({
+ content: ( < div > { detailedWarningList } < /div>)
+ })
+ },
submitTask(value, prompt, ids, notConditions, data) {
let _this = this
this.$confirm({
diff --git a/jero-web/src/views/virtualAuthenticationList/virtualAuthenticationListDesign/certificationListMaintenance.vue b/jero-web/src/views/virtualAuthenticationList/virtualAuthenticationListDesign/certificationListMaintenance.vue
index 5b4fc7b9e..bf4f2b8dc 100644
--- a/jero-web/src/views/virtualAuthenticationList/virtualAuthenticationListDesign/certificationListMaintenance.vue
+++ b/jero-web/src/views/virtualAuthenticationList/virtualAuthenticationListDesign/certificationListMaintenance.vue
@@ -310,14 +310,14 @@
title: this.$t('configurationItem'),
align: 'left',
dataIndex: 'configItem',
- width: 150,
+ width: 200,
ellipsis: true
},
{
title: 'WVTA ID',
align: 'left',
dataIndex: 'wvtaId',
- width: 150,
+ width: 200,
ellipsis: true
},
{
@@ -338,14 +338,14 @@
title: this.$t('typeOfDeliverables'),
align: 'left',
dataIndex: 'deliverableTypeName',
- width: 200,
+ width: 330,
ellipsis: true
},
{
title: this.$t('operation'),
align: 'left',
fixed: 'right',
- width: 200,
+ width: 250,
scopedSlots: { customRender: 'operation' }
}
],
@@ -544,7 +544,7 @@