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-08 09:51:46 +08:00
parent cf304b6a5f
commit 1dd6af1a34
4 changed files with 147 additions and 98 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-web/src/common/lang/en-us.js
+3
View File
@@ -1092,4 +1092,7 @@ module.exports = {
pleaseSelectStandard:'Please select a standard', pleaseSelectStandard:'Please select a standard',
theResponsiblePersonEmpty:'The responsible person of cannot be empty', theResponsiblePersonEmpty:'The responsible person of cannot be empty',
theDeadlineEmpty:'The deadline of cannot be empty', theDeadlineEmpty:'The deadline of cannot be empty',
theDeliveryTypeCannotBeEmpty:'The delivery type of cannot be empty',
For:'For',
markedRejection:'Marked rejection',
} }
jero-web/src/common/lang/zh-cn.js
+3
View File
@@ -1096,4 +1096,7 @@ module.exports = {
pleaseSelectStandard:'请选择标准', pleaseSelectStandard:'请选择标准',
theResponsiblePersonEmpty:'的责任人不能为空', theResponsiblePersonEmpty:'的责任人不能为空',
theDeadlineEmpty:'的截止时间不能为空', theDeadlineEmpty:'的截止时间不能为空',
theDeliveryTypeCannotBeEmpty:'的交付物类型不能为空',
For:'针对于',
markedRejection:'标注的驳回意见',
} }
jero-web/src/views/projectManagement/components/commentList.vue
+1 -1
View File
@@ -20,7 +20,7 @@
</div> </div>
<div class="comment-box" v-if="dataList && dataList.length > 0"> <div class="comment-box" v-if="dataList && dataList.length > 0">
<div class="comment-box-top-box" v-for="(item,index) in dataList" :key="index"> <div class="comment-box-top-box" v-for="(item,index) in dataList" :key="index">
<div class="title-text">{{$t('record')+(index + 1)}}</div> <!-- <div class="title-text">{{$t('record')+(index + 1)}}</div>-->
<div class="box-content"> <div class="box-content">
<div class="img-box"> <div class="img-box">
<img src="../../../assets/daiban.png" class="img" alt=""> <img src="../../../assets/daiban.png" class="img" alt="">
jero-web/src/views/projectManagement/components/listOfRegulations.vue
+120 -77
View File
@@ -226,7 +226,7 @@
{{text}} {{text}}
</span> </span>
</span> </span>
<!-- @click="standardClick(record)"--> <!-- @click="standardClick(record)"-->
<span slot="standard" slot-scope="text,record" :title="text"> <span slot="standard" slot-scope="text,record" :title="text">
<a class="textName"> <a class="textName">
{{text}} {{text}}
@@ -435,7 +435,7 @@
export default { export default {
name: 'listOfRegulations', name: 'listOfRegulations',
props:['areaOfResponsibilityList'], props: ['areaOfResponsibilityList'],
components: { components: {
ImportFile, ImportFile,
listAddModel, listAddModel,
@@ -884,51 +884,51 @@
value: 'engineeringInterfacePerson', value: 'engineeringInterfacePerson',
valueName: 'engineeringInterfacePersonName', valueName: 'engineeringInterfacePersonName',
text: this.$t('engineeringInterfacePerson') text: this.$t('engineeringInterfacePerson')
}, }
], ],
listOptions:[ listOptions: [
{ {
value:'Not started', value: 'Not started',
key:'Not started', key: 'Not started',
label:this.$t('notLaunch'), label: this.$t('notLaunch')
}, },
{ {
value:'List to confirm', value: 'List to confirm',
key:'List to confirm', key: 'List to confirm',
label:this.$t('toBeConfirmed'), label: this.$t('toBeConfirmed')
}, },
{ {
value:'Accepted', value: 'Accepted',
key:'Accepted', key: 'Accepted',
label:this.$t('accept'), label: this.$t('accept')
}, },
{ {
value:'Rejected', value: 'Rejected',
key:'Rejected', key: 'Rejected',
label:this.$t('refuse'), label: this.$t('refuse')
}, }
], ],
taskOptions:[ taskOptions: [
{ {
value:'Not started', value: 'Not started',
key:'Not started', key: 'Not started',
label:this.$t('notLaunch'), label: this.$t('notLaunch')
}, },
{ {
value:'List to confirm', value: 'List to confirm',
key:'List to confirm', key: 'List to confirm',
label:this.$t('toBeConfirmed'), label: this.$t('toBeConfirmed')
}, },
{ {
value:'Accepted', value: 'Accepted',
key:'Accepted', key: 'Accepted',
label:this.$t('accept'), label: this.$t('accept')
}, },
{ {
value:'Rejected', value: 'Rejected',
key:'Rejected', key: 'Rejected',
label:this.$t('refuse'), label: this.$t('refuse')
}, }
], ],
visibleRoleSwitching: false, visibleRoleSwitching: false,
confirmLoadingRoleSwitching: false, confirmLoadingRoleSwitching: false,
@@ -945,8 +945,8 @@
}, },
detailedSuccessList: [], detailedSuccessList: [],
detailedWarningList: [], detailedWarningList: [],
rowKeysSuccessList:[], rowKeysSuccessList: [],
rowKeysWarningList:[], rowKeysWarningList: []
} }
}, },
@@ -1411,21 +1411,45 @@
for (let i = 0; i < dataSource.length; i++) { for (let i = 0; i < dataSource.length; i++) {
if (dataSource[i].inventoryAffirmStatus == 'Not started' || dataSource[i].inventoryAffirmStatus == 'Rejected') { if (dataSource[i].inventoryAffirmStatus == 'Not started' || dataSource[i].inventoryAffirmStatus == 'Rejected') {
if (dataSource[i].homologationEngineerId && dataSource[i].regulationOwnerId) { if (dataSource[i].homologationEngineerId && dataSource[i].regulationOwnerId) {
if (dataSource[i].designDeliverableType){ if (dataSource[i].designDeliverableType) {
if (!dataSource[i].designInitiatorId){ if (!dataSource[i].designInitiatorId) {
this.detailedWarningList.push( < div > { dataSource[i].serialNumber + ','+this.$t('designComplianceReview')+ this.$t('Sponsor')+this.$t('cannotEmpty') } < /div>) this.detailedWarningList.push( < div > { dataSource[i].serialNumber + ',' + this.$t('designComplianceReview') + this.$t('Sponsor') + this.$t('cannotEmpty') } < /div>)
continue
}
if (!dataSource[i].designDutyId) {
this.detailedWarningList.push( < div > { dataSource[i].serialNumber + ',' + this.$t('designComplianceReview') + this.$t('personLiable') + this.$t('cannotEmpty') } < /div>)
continue
}
if (!dataSource[i].designDueDate) {
this.detailedWarningList.push( < div > { dataSource[i].serialNumber + ',' + this.$t('designComplianceReview') + this.$t('cutoffTime') + this.$t('cannotEmpty') } < /div>)
continue continue
} }
} }
if (dataSource[i].prehomoDeliverableType){ if (dataSource[i].prehomoDeliverableType) {
if (!dataSource[i].prehomoInitiatorId){ if (!dataSource[i].prehomoInitiatorId) {
this.detailedWarningList.push( < div > { dataSource[i].serialNumber + ','+this.$t('preHomeConfirmation')+ this.$t('Sponsor')+this.$t('cannotEmpty') } < /div>) this.detailedWarningList.push( < div > { dataSource[i].serialNumber + ',' + this.$t('preHomeConfirmation') + this.$t('Sponsor') + this.$t('cannotEmpty') } < /div>)
continue
}
if (!dataSource[i].prehomoDutyId) {
this.detailedWarningList.push( < div > { dataSource[i].serialNumber + ',' + this.$t('preHomeConfirmation') + this.$t('personLiable') + this.$t('cannotEmpty') } < /div>)
continue
}
if (!dataSource[i].prehomoDueDate) {
this.detailedWarningList.push( < div > { dataSource[i].serialNumber + ',' + this.$t('preHomeConfirmation') + this.$t('cutoffTime') + this.$t('cannotEmpty') } < /div>)
continue continue
} }
} }
if (dataSource[i].verifyDeliverableType){ if (dataSource[i].verifyDeliverableType) {
if (!dataSource[i].verifyInitiatorId){ if (!dataSource[i].verifyInitiatorId) {
this.detailedWarningList.push( < div > { dataSource[i].serialNumber + ','+this.$t('verificationComplianceReview')+ this.$t('Sponsor')+this.$t('cannotEmpty') } < /div>) this.detailedWarningList.push( < div > { dataSource[i].serialNumber + ',' + this.$t('verificationComplianceReview') + this.$t('Sponsor') + this.$t('cannotEmpty') } < /div>)
continue
}
if (!dataSource[i].verifyDutyId) {
this.detailedWarningList.push( < div > { dataSource[i].serialNumber + ',' + this.$t('verificationComplianceReview') + this.$t('personLiable') + this.$t('cannotEmpty') } < /div>)
continue
}
if (!dataSource[i].verifyDueDate) {
this.detailedWarningList.push( < div > { dataSource[i].serialNumber + ',' + this.$t('verificationComplianceReview') + this.$t('cutoffTime') + this.$t('cannotEmpty') } < /div>)
continue continue
} }
} }
@@ -1438,7 +1462,7 @@
// return // return
} }
} else { } else {
this.detailedWarningList.push( < div > {dataSource[i].serialNumber + ',' + this.$t('pleaseSelectinitiatedOrRejected')} < /div>) this.detailedWarningList.push( < div > { dataSource[i].serialNumber + ',' + this.$t('pleaseSelectinitiatedOrRejected') } < /div>)
// this.$message.warning(this.dataSource[i].serialNumber + ',' + this.$t('pleaseSelectinitiatedOrRejected')) // this.$message.warning(this.dataSource[i].serialNumber + ',' + this.$t('pleaseSelectinitiatedOrRejected'))
// isTrue = false // isTrue = false
// return // return
@@ -1658,7 +1682,7 @@
}) })
}, },
getRowKeys(value,num, 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++) {
@@ -1694,49 +1718,58 @@
// this.$message.warning(dataSource[i].serialNumber + this.$t('submitted')) // this.$message.warning(dataSource[i].serialNumber + this.$t('submitted'))
// return // return
} }
if(num == 1){ if (num == 1) {
if((dataSource[i].designInitiatorId == dataSource[i].regulationOwnerId if ((dataSource[i].designInitiatorId == dataSource[i].regulationOwnerId
&& dataSource[i].designInitiatorId == this.userInfo().id) || && dataSource[i].designInitiatorId == this.userInfo().id) ||
(dataSource[i].designInitiatorId == dataSource[i].homologationEngineerId (dataSource[i].designInitiatorId == dataSource[i].homologationEngineerId
&& dataSource[i].designInitiatorId == this.userInfo().id)){ && dataSource[i].designInitiatorId == this.userInfo().id)) {
if(!dataSource[i].designDutyId && !dataSource[i].designDueDate){ if (!dataSource[i].designDutyId && !dataSource[i].designDueDate) {
this.rowKeysWarningList.push( < div > { dataSource[i].serialNumber+this.$t('confirmationOfDesignConformity') + this.$t('theResponsiblePersonAndDeadlineClank') } < /div>) this.rowKeysWarningList.push( < div > { dataSource[i].serialNumber + this.$t('confirmationOfDesignConformity') + this.$t('theResponsiblePersonAndDeadlineClank') } < /div>)
continue continue
}else if(!dataSource[i].designDutyId){ } else if (!dataSource[i].designDutyId) {
this.rowKeysWarningList.push( < div > { dataSource[i].serialNumber+this.$t('confirmationOfDesignConformity') + this.$t('theResponsiblePersonEmpty') } < /div>) this.rowKeysWarningList.push( < div > { dataSource[i].serialNumber + this.$t('confirmationOfDesignConformity') + this.$t('theResponsiblePersonEmpty') } < /div>)
continue continue
}else if(!dataSource[i].designDueDate){ } else if (!dataSource[i].designDueDate) {
this.rowKeysWarningList.push( < div > { dataSource[i].serialNumber+this.$t('confirmationOfDesignConformity') + this.$t('theDeadlineEmpty') } < /div>) this.rowKeysWarningList.push( < div > { dataSource[i].serialNumber + this.$t('confirmationOfDesignConformity') + this.$t('theDeadlineEmpty') } < /div>)
continue
}else if (!dataSource[i].designDeliverableType) {
this.rowKeysWarningList.push( < div > { dataSource[i].serialNumber + this.$t('confirmationOfDesignConformity') + this.$t('theDeliveryTypeCannotBeEmpty') } < /div>)
continue continue
} }
} }
if((dataSource[i].prehomoInitiatorId == dataSource[i].regulationOwnerId if ((dataSource[i].prehomoInitiatorId == dataSource[i].regulationOwnerId
&& dataSource[i].prehomoInitiatorId == this.userInfo().id) || && dataSource[i].prehomoInitiatorId == this.userInfo().id) ||
(dataSource[i].prehomoInitiatorId == dataSource[i].homologationEngineerId (dataSource[i].prehomoInitiatorId == dataSource[i].homologationEngineerId
&& dataSource[i].prehomoInitiatorId == this.userInfo().id)){ && dataSource[i].prehomoInitiatorId == this.userInfo().id)) {
if(!dataSource[i].prehomoDutyId && !dataSource[i].prehomoDueDate){ if (!dataSource[i].prehomoDutyId && !dataSource[i].prehomoDueDate) {
this.rowKeysWarningList.push( < div > { dataSource[i].serialNumber+this.$t('PrehomoConfirmation') + this.$t('theResponsiblePersonAndDeadlineClank') } < /div>) this.rowKeysWarningList.push( < div > { dataSource[i].serialNumber + this.$t('PrehomoConfirmation') + this.$t('theResponsiblePersonAndDeadlineClank') } < /div>)
continue continue
}else if(!dataSource[i].prehomoDutyId){ } else if (!dataSource[i].prehomoDutyId) {
this.rowKeysWarningList.push( < div > { dataSource[i].serialNumber+this.$t('PrehomoConfirmation') + this.$t('theResponsiblePersonEmpty') } < /div>) this.rowKeysWarningList.push( < div > { dataSource[i].serialNumber + this.$t('PrehomoConfirmation') + this.$t('theResponsiblePersonEmpty') } < /div>)
continue continue
}else if(!dataSource[i].prehomoDueDate){ } else if (!dataSource[i].prehomoDueDate) {
this.rowKeysWarningList.push( < div > { dataSource[i].serialNumber+this.$t('PrehomoConfirmation') + this.$t('theDeadlineEmpty') } < /div>) this.rowKeysWarningList.push( < div > { dataSource[i].serialNumber + this.$t('PrehomoConfirmation') + this.$t('theDeadlineEmpty') } < /div>)
continue
}else if (!dataSource[i].prehomoDeliverableType) {
this.rowKeysWarningList.push( < div > { dataSource[i].serialNumber + this.$t('PrehomoConfirmation') + this.$t('theDeliveryTypeCannotBeEmpty') } < /div>)
continue continue
} }
} }
if((dataSource[i].verifyInitiatorId == dataSource[i].regulationOwnerId if ((dataSource[i].verifyInitiatorId == dataSource[i].regulationOwnerId
&& dataSource[i].verifyInitiatorId == this.userInfo().id) || && dataSource[i].verifyInitiatorId == this.userInfo().id) ||
(dataSource[i].verifyInitiatorId == dataSource[i].homologationEngineerId (dataSource[i].verifyInitiatorId == dataSource[i].homologationEngineerId
&& dataSource[i].verifyInitiatorId == this.userInfo().id)){ && dataSource[i].verifyInitiatorId == this.userInfo().id)) {
if(!dataSource[i].verifyDutyId && !dataSource[i].verifyDueDate){ if (!dataSource[i].verifyDutyId && !dataSource[i].verifyDueDate) {
this.rowKeysWarningList.push( < div > { dataSource[i].serialNumber+this.$t('verificationAndConformityconfirmation') + this.$t('theResponsiblePersonAndDeadlineClank') } < /div>) this.rowKeysWarningList.push( < div > { dataSource[i].serialNumber + this.$t('verificationAndConformityconfirmation') + this.$t('theResponsiblePersonAndDeadlineClank') } < /div>)
continue continue
}else if(!dataSource[i].verifyDutyId){ } else if (!dataSource[i].verifyDutyId) {
this.rowKeysWarningList.push( < div > { dataSource[i].serialNumber+this.$t('verificationAndConformityconfirmation') + this.$t('theResponsiblePersonEmpty') } < /div>) this.rowKeysWarningList.push( < div > { dataSource[i].serialNumber + this.$t('verificationAndConformityconfirmation') + this.$t('theResponsiblePersonEmpty') } < /div>)
continue continue
}else if(!dataSource[i].verifyDueDate){ } else if (!dataSource[i].verifyDueDate) {
this.rowKeysWarningList.push( < div > { dataSource[i].serialNumber+this.$t('verificationAndConformityconfirmation') + this.$t('theDeadlineEmpty') } < /div>) this.rowKeysWarningList.push( < div > { dataSource[i].serialNumber + this.$t('verificationAndConformityconfirmation') + this.$t('theDeadlineEmpty') } < /div>)
continue
}else if (!dataSource[i].verifyDeliverableType) {
this.rowKeysWarningList.push( < div > { dataSource[i].serialNumber + this.$t('verificationAndConformityconfirmation') + this.$t('theDeliveryTypeCannotBeEmpty') } < /div>)
continue continue
} }
} }
@@ -1752,7 +1785,7 @@
if (this.rowKeysSuccessList && this.rowKeysSuccessList.length > 0) { if (this.rowKeysSuccessList && this.rowKeysSuccessList.length > 0) {
callBack && callBack() callBack && callBack()
}else{ } else {
let that = this let that = this
this.$warning({ this.$warning({
content: ( content: (
@@ -1799,7 +1832,7 @@
_this.$message.warning(_this.$t('operationFailed')) _this.$message.warning(_this.$t('operationFailed'))
_this.confirmLoading = false _this.confirmLoading = false
} }
if(this.rowKeysWarningList && this.rowKeysWarningList.length > 0){ if (this.rowKeysWarningList && this.rowKeysWarningList.length > 0) {
let that = this let that = this
this.$warning({ this.$warning({
content: ( content: (
@@ -1822,13 +1855,17 @@
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, 1,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, 2,function() { _this.getRowKeys(selectedRowKeys, 2, function() {
_this.visibleComment = true _this.visibleComment = true
_this.formInlineComment = {}
_this.$nextTick(()=>{
_this.$refs.ruleFormComment.clearValidate()
})
}) })
} }
} }
@@ -1841,8 +1878,14 @@
this.$refs.ruleFormComment.validate(valid => { this.$refs.ruleFormComment.validate(valid => {
if (valid) { if (valid) {
let url = '/project/projectCommentEO/add' let url = '/project/projectCommentEO/add'
let content = []
if (this.rowKeysSuccessList && this.rowKeysSuccessList.length > 0) {
this.rowKeysSuccessList.forEach(res => {
content.push(res.serialNumber)
})
}
let query = { let query = {
commentContent: this.formInlineComment.commentContent, commentContent: this.$t('For')+content.join(',') + this.$t('markedRejection')+'：' + this.formInlineComment.commentContent,
projectLibraryId: this.$route.query.id projectLibraryId: this.$route.query.id
} }
this.confirmLoadingComment = true this.confirmLoadingComment = true
@@ -1967,15 +2010,15 @@
} }
} }
}, },
standardClick(row){ standardClick(row) {
let newUrl = this.$router.resolve({ let newUrl = this.$router.resolve({
path: '/docManage/library/detail', path: '/docManage/library/detail',
query: { query: {
id:row.id id: row.id
} }
}) })
window.open(newUrl.href, '_blank') window.open(newUrl.href, '_blank')
}, }
} }
} }
</script> </script>