WL/laws_weilai
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改禅道已知bug

Browse Source
This commit is contained in:
qq787203167
2022-07-06 18:10:51 +08:00
parent 6bc774913c
commit 768b582643
1 changed files with 29 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-web/src/views/projectManagement/components/listOfRegulations.vue
+29 -28
View File
@@ -1615,7 +1615,7 @@
}) })
}, },
getRowKeys(value, callBack) { getRowKeys(value,num, callBack) {
let isTrue = true let isTrue = true
let dataSource = [] let dataSource = []
for (let i = 0; i < this.dataSource.length; i++) { for (let i = 0; i < this.dataSource.length; i++) {
@@ -1651,35 +1651,36 @@
// this.$message.warning(dataSource[i].serialNumber + this.$t('submitted')) // this.$message.warning(dataSource[i].serialNumber + this.$t('submitted'))
// return // return
} }
if((dataSource[i].designInitiatorId == dataSource[i].regulationOwnerId if(num == 1){
&& dataSource[i].designInitiatorId == this.userInfo().id) || if((dataSource[i].designInitiatorId == dataSource[i].regulationOwnerId
(dataSource[i].designInitiatorId == dataSource[i].homologationEngineerId && dataSource[i].designInitiatorId == this.userInfo().id) ||
&& dataSource[i].designInitiatorId == this.userInfo().id)){ (dataSource[i].designInitiatorId == dataSource[i].homologationEngineerId
if(!dataSource[i].designDutyId || !dataSource[i].designDueDate){ && dataSource[i].designInitiatorId == this.userInfo().id)){
this.rowKeysWarningList.push( < div > { dataSource[i].serialNumber+this.$t('confirmationOfDesignConformity') + this.$t('theResponsiblePersonAndDeadlineClank') } < /div>) if(!dataSource[i].designDutyId || !dataSource[i].designDueDate){
continue this.rowKeysWarningList.push( < div > { dataSource[i].serialNumber+this.$t('confirmationOfDesignConformity') + this.$t('theResponsiblePersonAndDeadlineClank') } < /div>)
} continue
} }
if((dataSource[i].prehomoInitiatorId == dataSource[i].regulationOwnerId
&& dataSource[i].prehomoInitiatorId == this.userInfo().id) ||
(dataSource[i].prehomoInitiatorId == dataSource[i].homologationEngineerId
&& dataSource[i].prehomoInitiatorId == this.userInfo().id)){
if(!dataSource[i].prehomoDutyId || !dataSource[i].prehomoDueDate){
this.rowKeysWarningList.push( < div > { dataSource[i].serialNumber+this.$t('PrehomoConfirmation') + this.$t('theResponsiblePersonAndDeadlineClank') } < /div>)
continue
} }
} if((dataSource[i].prehomoInitiatorId == dataSource[i].regulationOwnerId
if((dataSource[i].verifyInitiatorId == dataSource[i].regulationOwnerId && dataSource[i].prehomoInitiatorId == this.userInfo().id) ||
&& dataSource[i].verifyInitiatorId == this.userInfo().id) || (dataSource[i].prehomoInitiatorId == dataSource[i].homologationEngineerId
(dataSource[i].verifyInitiatorId == dataSource[i].homologationEngineerId && dataSource[i].prehomoInitiatorId == this.userInfo().id)){
&& dataSource[i].verifyInitiatorId == this.userInfo().id)){ if(!dataSource[i].prehomoDutyId || !dataSource[i].prehomoDueDate){
if(!dataSource[i].verifyDutyId || !dataSource[i].verifyDueDate){ this.rowKeysWarningList.push( < div > { dataSource[i].serialNumber+this.$t('PrehomoConfirmation') + this.$t('theResponsiblePersonAndDeadlineClank') } < /div>)
this.rowKeysWarningList.push( < div > { dataSource[i].serialNumber+this.$t('verificationAndConformityconfirmation') + this.$t('theResponsiblePersonAndDeadlineClank') } < /div>) continue
continue }
}
if((dataSource[i].verifyInitiatorId == dataSource[i].regulationOwnerId
&& dataSource[i].verifyInitiatorId == this.userInfo().id) ||
(dataSource[i].verifyInitiatorId == dataSource[i].homologationEngineerId
&& dataSource[i].verifyInitiatorId == this.userInfo().id)){
if(!dataSource[i].verifyDutyId || !dataSource[i].verifyDueDate){
this.rowKeysWarningList.push( < div > { dataSource[i].serialNumber+this.$t('verificationAndConformityconfirmation') + this.$t('theResponsiblePersonAndDeadlineClank') } < /div>)
continue
}
} }
} }
this.rowKeysSuccessList.push(dataSource[i]) this.rowKeysSuccessList.push(dataSource[i])
} else { } else {
this.rowKeysWarningList.push( < div > { dataSource[i].serialNumber + this.$t('incorrectsubmitted') } < /div>) this.rowKeysWarningList.push( < div > { dataSource[i].serialNumber + this.$t('incorrectsubmitted') } < /div>)
// isTrue = false // isTrue = false
@@ -1760,12 +1761,12 @@
onOk() { onOk() {
if (num == 0) { if (num == 0) {
let selectedRowKeys = JSON.parse(JSON.stringify(_this.selectedRowKeys)) let selectedRowKeys = JSON.parse(JSON.stringify(_this.selectedRowKeys))
_this.getRowKeys(selectedRowKeys, function() { _this.getRowKeys(selectedRowKeys, 1,function() {
_this.updateStatusBatch(num, selectedRowKeys) _this.updateStatusBatch(num, selectedRowKeys)
}) })
} else { } else {
let selectedRowKeys = JSON.parse(JSON.stringify(_this.selectedRowKeys)) let selectedRowKeys = JSON.parse(JSON.stringify(_this.selectedRowKeys))
_this.getRowKeys(selectedRowKeys, function() { _this.getRowKeys(selectedRowKeys, 2,function() {
_this.visibleComment = true _this.visibleComment = true
}) })
} }