平台件项目库修改bug

This commit is contained in:
zyx.net
2023-09-27 15:08:45 +08:00
parent 36e6b2a152
commit c91ccf9b36
4 changed files with 17 additions and 8 deletions
+1
View File
@@ -1979,4 +1979,5 @@ module.exports = {
Processdetails:'Process Details', Processdetails:'Process Details',
matchempty:'The match is empty', matchempty:'The match is empty',
onlyDataProcessStatusDeleted:'Data can only be deleted if the process status is task ready, approved, or rejected by the responsible person', onlyDataProcessStatusDeleted:'Data can only be deleted if the process status is task ready, approved, or rejected by the responsible person',
platformitemhasbeenassociated:'A platform item has been associated',
} }
+2 -1
View File
@@ -3934,5 +3934,6 @@ module.exports = {
unpublishedregulationsselected:'仅能选择未发布的法规', unpublishedregulationsselected:'仅能选择未发布的法规',
PlatformInformation:'平台件信息', PlatformInformation:'平台件信息',
Processdetails:'流程详情', Processdetails:'流程详情',
matchempty:'匹配项为空' matchempty:'匹配项为空',
platformitemhasbeenassociated:'已关联平台件项目',
} }
@@ -1986,6 +1986,7 @@
this.detailedWarningList = [] this.detailedWarningList = []
let dataSource = [] let dataSource = []
let status = '' let status = ''
flag = '1'
for (let i = 0; i < this.dataSource.length; i++) { for (let i = 0; i < this.dataSource.length; i++) {
for (let j = 0; j < this.selectedRowKeys.length; j++) { for (let j = 0; j < this.selectedRowKeys.length; j++) {
if (this.dataSource[i].id == this.selectedRowKeys[j]) { if (this.dataSource[i].id == this.selectedRowKeys[j]) {
@@ -1996,7 +1997,6 @@
for (let i = 0; i < dataSource.length; i++) { for (let i = 0; i < dataSource.length; i++) {
if (dataSource[i].verifyFlowStatus !== 'List to be released' && if (dataSource[i].verifyFlowStatus !== 'List to be released' &&
dataSource[i].designFlowStatus !== 'List to be released') { dataSource[i].designFlowStatus !== 'List to be released') {
flag = '1'
status = '1' status = '1'
} }
} }
@@ -2008,11 +2008,12 @@
this.$refs.associatedplatRef.transferModel(flag,type,this.selectedRowKeys.join(',')) this.$refs.associatedplatRef.transferModel(flag,type,this.selectedRowKeys.join(','))
} }
}else{ }else{
let ids = []
this.dataSource.forEach(item => { this.dataSource.forEach(item => {
this.selectedRowKeys.push(item.id) ids.push(item.id)
}) })
flag = '2' flag = '2'
this.$refs.associatedplatRef.transferModel(flag,type,this.selectedRowKeys.join(',')) this.$refs.associatedplatRef.transferModel(flag,type,ids)
} }
}, },
associatedplatForm(id,flag,type,ids){ associatedplatForm(id,flag,type,ids){
@@ -2916,11 +2917,16 @@
dataSource[i].verifyFlowStatus == 'Regulatory engineer returns' || dataSource[i].verifyFlowStatus == 'Regulatory engineer returns' ||
dataSource[i].designFlowStatus == 'List to be released' || dataSource[i].designFlowStatus == 'List to be released' ||
dataSource[i].designFlowStatus == 'Regulatory engineer returns') { dataSource[i].designFlowStatus == 'Regulatory engineer returns') {
if (dataSource[i].regulationOwnerId) { if(dataSource[i].projectLawsInventoryEOS && (dataSource[i].projectLawsInventoryEOS.length > 0 || dataSource[i].projectLawsInventoryEOS !== null)){
this.detailedSuccessList.push(dataSource[i]) if (dataSource[i].regulationOwnerId) {
} else { this.detailedSuccessList.push(dataSource[i])
} else {
this.detailedWarningList.push(
< div > { dataSource[i].serialNumber + this.$t('TheEngineerAndCertification') } < /div>)
}
}else{
this.detailedWarningList.push( this.detailedWarningList.push(
< div > { dataSource[i].serialNumber + this.$t('TheEngineerAndCertification') } < /div>) < div > { dataSource[i].serialNumber + this.$t('platformitemhasbeenassociated') } < /div>)
} }
} else { } else {
this.detailedWarningList.push( this.detailedWarningList.push(
@@ -22,6 +22,7 @@
<a-form-model-item class="itemModel"> <a-form-model-item class="itemModel">
<a-input class="box-input" <a-input class="box-input"
v-model="item.nodeName" v-model="item.nodeName"
:maxLength="200"
:placeholder="$t('PleaseEnter')+$t('Nodename')"/> :placeholder="$t('PleaseEnter')+$t('Nodename')"/>
</a-form-model-item> </a-form-model-item>
</div> </div>