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-01 18:10:37 +08:00
parent 1cae6e9239
commit 1912f76fc2
7 changed files with 138 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-web/src/views/projectManagement/components/listOfRegulations.vue
+51 -35
View File
@@ -1197,6 +1197,16 @@
}
},
edit(item) {
let roleCodeIndex
if (this.isDisplay) {
roleCodeIndex = 0
} else {
roleCodeIndex = 4
}
if (this.formInlineRoleSwitching.roleSwitchingCode == '11' || this.formInlineRoleSwitching.roleSwitchingCode == '12') {
roleCodeIndex = 0
}
item.roleCodeIndex = roleCodeIndex
this.$refs.editModelRef.editModel(JSON.parse(JSON.stringify(item)))
},
deleteLib(val) {
@@ -1290,13 +1300,19 @@
if (this.dataSource[i].homologationEngineerId && this.dataSource[i].regulationOwnerId) {
this.detailedSuccessList.push(this.dataSource[i])
} else {
this.detailedWarningList.push(<div> {this.dataSource[i].serialNumber + this.$t('TheEngineerAndCertification') } </div>)
this.detailedWarningList.push( < div > {
this
.dataSource[i].serialNumber + this.$t('TheEngineerAndCertification')
} < /div>)
// this.$message.warning(this.dataSource[i].serialNumber + this.$t('TheEngineerAndCertification'))
// isTrue = false
// return
}
} else {
this.detailedWarningList.push(<div> {this.dataSource[i].serialNumber + ',' + this.$t('pleaseSelectinitiatedOrRejected') } </div>)
this.detailedWarningList.push( < div > {
this
.dataSource[i].serialNumber + ',' + this.$t('pleaseSelectinitiatedOrRejected')
} < /div>)
// this.$message.warning(this.dataSource[i].serialNumber + ',' + this.$t('pleaseSelectinitiatedOrRejected'))
// isTrue = false
// return
@@ -1307,12 +1323,12 @@
if (this.detailedSuccessList && this.detailedSuccessList.length > 0) {
this.visible = true
this.formInline = {}
}else{
} else {
let that = this
this.$warning({
content: (
< div >
{that.detailedWarningList}
{ that.detailedWarningList }
< /div>
)
})
@@ -1342,36 +1358,36 @@
if ((dataList[i].taskAffirmStatus == 'Not started' || dataList.taskAffirmStatus == 'Rejected') &&
dataList[i].inventoryAffirmStatus == 'Accepted') {
if (dataList[i].engineeringInterfacePerson) {
if (dataList[i].verifyRemark) {
if (dataList[i].verifyDeliverableType) {
if (dataList[i].verifyDueDate && dataList[i].verifyDutyId
&& dataList[i].verifyInitiatorId) {
} else {
this.TaskWarningList.push(<div> {dataList[i].serialNumber + this.$t('pleaseConfirmedByPrehomo') } </div>)
continue;
this.TaskWarningList.push( < div > { dataList[i].serialNumber + this.$t('pleaseConfirmedByPrehomo') } < /div>)
continue
// isTrue = false
// this.$message.warning(this.dataSource[i].serialNumber + ',' + this.$t('pleaseConformityVerification'))
// return
}
}
if (dataList[i].prehomoRemark) {
if (dataList[i].prehomoDeliverableType) {
if (dataList[i].prehomoDueDate && dataList[i].prehomoDutyId
&& dataList[i].prehomoInitiatorId) {
} else {
this.TaskWarningList.push(<div> {dataList[i].serialNumber + this.$t('pleaseConfirmedByPrehomo') } </div>)
continue;
this.TaskWarningList.push( < div > { dataList[i].serialNumber + this.$t('pleaseConfirmedByPrehomo') } < /div>)
continue
// isTrue = false
// this.$message.warning(this.dataSource[i].serialNumber + ',' + this.$t('pleaseConfirmedByPrehomo'))
// return
}
}
if (dataList[i].designRemark) {
if (dataList[i].designDeliverableType) {
if (dataList[i].designDueDate && dataList[i].designDutyId
&& dataList[i].designInitiatorId) {
} else {
this.TaskWarningList.push(<div> {dataList[i].serialNumber + this.$t('pleaseDesignConformityConfirmation') } </div>)
continue;
this.TaskWarningList.push( < div > { dataList[i].serialNumber + this.$t('pleaseDesignConformityConfirmation') } < /div>)
continue
// isTrue = false
// this.$message.warning(this.dataSource[i].serialNumber + ',' + this.$t('pleaseDesignConformityConfirmation'))
// return
@@ -1379,27 +1395,27 @@
}
this.TaskSuccessList.push(dataList[i])
} else {
this.TaskWarningList.push(<div> {dataList[i].serialNumber + this.$t('theProjectContactEmpty') } </div>)
this.TaskWarningList.push( < div > { dataList[i].serialNumber + this.$t('theProjectContactEmpty') } < /div>)
// isTrue = false
// this.$message.warning(this.dataSource[i].serialNumber + ',' + this.$t('theProjectContactEmpty'))
// return
}
} else {
this.TaskWarningList.push(<div> {dataList[i].serialNumber + this.$t('PleaseTaskConfirmationRejected') } </div>)
this.TaskWarningList.push( < div > { dataList[i].serialNumber + this.$t('PleaseTaskConfirmationRejected') } < /div>)
// isTrue = false
// this.$message.warning(this.dataSource[i].serialNumber + ',' + this.$t('PleaseTaskConfirmationRejected'))
// return
}
}
if (this.TaskWarningList && this.TaskWarningList.length > 0) {
if (this.TaskSuccessList && this.TaskSuccessList.length > 0) {
this.visible = true
this.formInline = {}
}else{
} else {
let that = this
this.$warning({
content: (
< div >
{that.TaskWarningList}
{ that.TaskWarningList }
< /div>
)
})
@@ -1436,11 +1452,11 @@
this.confirmLoading = false
}
let that = this
if (this.detailedWarningList.length > 0){
if (this.detailedWarningList.length > 0) {
this.$warning({
content: (
< div >
{that.detailedWarningList}
{ that.detailedWarningList }
< /div>
)
})
@@ -1449,20 +1465,20 @@
this.detailedWarningList = []
})
} else {
let index = 0
for (let i = 0; i < this.TaskSuccessList.length; i++) {
index++
this.TaskSuccessList[i].taskAffirmDueDate = this.formInline.taskAffirmDueDate
Object.keys(this.TaskSuccessList[i]).forEach(res => {
if (this.TaskSuccessList[i][res] && this.TaskSuccessList[i][res] instanceof String) {
this.TaskSuccessList[i][res] = this.TaskSuccessList[i][res].replace(/\"/g, '“')
this.TaskSuccessList[i][res] = this.TaskSuccessList[i][res].replace(/\'/g, '‘')
}
})
setTimeout(() => {
this.confirmLoading = true
this.startProcess(this.TaskSuccessList[i], index)
}, 500)
((i) => {
this.TaskSuccessList[i].taskAffirmDueDate = this.formInline.taskAffirmDueDate
Object.keys(this.TaskSuccessList[i]).forEach(res => {
if (this.TaskSuccessList[i][res] && this.TaskSuccessList[i][res] instanceof String) {
this.TaskSuccessList[i][res] = this.TaskSuccessList[i][res].replace(/\"/g, '“')
this.TaskSuccessList[i][res] = this.TaskSuccessList[i][res].replace(/\'/g, '‘')
}
})
setTimeout(() => {
this.confirmLoading = true
this.startProcess(this.TaskSuccessList[i], (i + 1))
}, 500)
})(i)
}
}
}
@@ -1502,11 +1518,11 @@
this.confirmLoading = false
this.getList()
let that = this
if (this.TaskWarningList.length > 0){
if (this.TaskWarningList.length > 0) {
this.$warning({
content: (
< div >
{that.TaskWarningList}
{ that.TaskWarningList }
< /div>
)
})