修改禅道已知bug
This commit is contained in:
@@ -31,7 +31,7 @@
|
|||||||
</div>
|
</div>
|
||||||
<a-form-model-item class="itemModel" prop="title">
|
<a-form-model-item class="itemModel" prop="title">
|
||||||
<a-input class="box-input"
|
<a-input class="box-input"
|
||||||
:disabled="true"
|
:disabled="formInline.roleCodeIndex == 0 ? false : true"
|
||||||
v-model="formInline.title"
|
v-model="formInline.title"
|
||||||
:placeholder="$t('PleaseEnter')+$t('title')"/>
|
:placeholder="$t('PleaseEnter')+$t('title')"/>
|
||||||
</a-form-model-item>
|
</a-form-model-item>
|
||||||
@@ -994,7 +994,7 @@
|
|||||||
// } else if (row.designInitiator == 0) {
|
// } else if (row.designInitiator == 0) {
|
||||||
// this.designInitiatorList = res.result.studioPersonList || []
|
// this.designInitiatorList = res.result.studioPersonList || []
|
||||||
// } else if (!row.designInitiator || row.designInitiator == '') {
|
// } else if (!row.designInitiator || row.designInitiator == '') {
|
||||||
this.designInitiatorList = res.result.allPersonList || []
|
this.designInitiatorList = res.result.allPersonList || []
|
||||||
// }
|
// }
|
||||||
//设计符合性确认-责任人
|
//设计符合性确认-责任人
|
||||||
// if (row.designDuty == 1) {
|
// if (row.designDuty == 1) {
|
||||||
@@ -1006,7 +1006,7 @@
|
|||||||
// } else if (row.designInitiator == 0) {
|
// } else if (row.designInitiator == 0) {
|
||||||
// this.designDutyList = res.result.studioPersonList || []
|
// this.designDutyList = res.result.studioPersonList || []
|
||||||
// } else if (!row.designDuty || row.designDuty == '') {
|
// } else if (!row.designDuty || row.designDuty == '') {
|
||||||
this.designDutyList = res.result.allPersonList || []
|
this.designDutyList = res.result.allPersonList || []
|
||||||
// }
|
// }
|
||||||
//prehomo确认-发起人
|
//prehomo确认-发起人
|
||||||
// if (row.prehomoInitiator == 1) {
|
// if (row.prehomoInitiator == 1) {
|
||||||
@@ -1018,7 +1018,7 @@
|
|||||||
// } else if (row.designInitiator == 0) {
|
// } else if (row.designInitiator == 0) {
|
||||||
// this.prehomoInitiatorList = res.result.studioPersonList || []
|
// this.prehomoInitiatorList = res.result.studioPersonList || []
|
||||||
// } else if (!row.prehomoInitiator || row.prehomoInitiator == '') {
|
// } else if (!row.prehomoInitiator || row.prehomoInitiator == '') {
|
||||||
this.prehomoInitiatorList = res.result.allPersonList || []
|
this.prehomoInitiatorList = res.result.allPersonList || []
|
||||||
// }
|
// }
|
||||||
//prehomo确认-责任人
|
//prehomo确认-责任人
|
||||||
// if (row.prehomoDuty == 1) {
|
// if (row.prehomoDuty == 1) {
|
||||||
@@ -1030,7 +1030,7 @@
|
|||||||
// } else if (row.designInitiator == 0) {
|
// } else if (row.designInitiator == 0) {
|
||||||
// this.prehomoDutyList = res.result.studioPersonList || []
|
// this.prehomoDutyList = res.result.studioPersonList || []
|
||||||
// } else if (!row.prehomoDuty || row.prehomoDuty == '') {
|
// } else if (!row.prehomoDuty || row.prehomoDuty == '') {
|
||||||
this.prehomoDutyList = res.result.allPersonList || []
|
this.prehomoDutyList = res.result.allPersonList || []
|
||||||
// }
|
// }
|
||||||
//验证符合性确认-发起人
|
//验证符合性确认-发起人
|
||||||
// if (row.verifyInitiator == 1) {
|
// if (row.verifyInitiator == 1) {
|
||||||
@@ -1042,7 +1042,7 @@
|
|||||||
// } else if (row.designInitiator == 0) {
|
// } else if (row.designInitiator == 0) {
|
||||||
// this.verifyInitiatorList = res.result.studioPersonList || []
|
// this.verifyInitiatorList = res.result.studioPersonList || []
|
||||||
// } else if (!row.verifyInitiator || row.verifyInitiator == '') {
|
// } else if (!row.verifyInitiator || row.verifyInitiator == '') {
|
||||||
this.verifyInitiatorList = res.result.allPersonList || []
|
this.verifyInitiatorList = res.result.allPersonList || []
|
||||||
// }
|
// }
|
||||||
//验证符合性确认-责任人
|
//验证符合性确认-责任人
|
||||||
// if (row.verifyDuty == 1) {
|
// if (row.verifyDuty == 1) {
|
||||||
@@ -1054,7 +1054,7 @@
|
|||||||
// } else if (row.designInitiator == 0) {
|
// } else if (row.designInitiator == 0) {
|
||||||
// this.verifyDutyList = res.result.studioPersonList || []
|
// this.verifyDutyList = res.result.studioPersonList || []
|
||||||
// } else if (!row.verifyDuty || row.verifyDuty == '') {
|
// } else if (!row.verifyDuty || row.verifyDuty == '') {
|
||||||
this.verifyDutyList = res.result.allPersonList || []
|
this.verifyDutyList = res.result.allPersonList || []
|
||||||
// }
|
// }
|
||||||
callback()
|
callback()
|
||||||
},
|
},
|
||||||
|
|||||||
@@ -169,6 +169,11 @@
|
|||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div v-if="!isDisplay" style="float: right;margin-top: 1px;margin-bottom: 0px">
|
<div v-if="!isDisplay" style="float: right;margin-top: 1px;margin-bottom: 0px">
|
||||||
|
<div @click="handleExport" v-has="'projectLawsInventory:exportData'" v-if="isRoleSwitching"
|
||||||
|
class="operator-text">
|
||||||
|
<a-icon type="export" :rotate="-90"/>
|
||||||
|
{{ $t('export') }}
|
||||||
|
</div>
|
||||||
<div class="operator-text" @click="submitClick(0)" v-if="isRoleSwitching">
|
<div class="operator-text" @click="submitClick(0)" v-if="isRoleSwitching">
|
||||||
<a-icon type="check-circle"/>
|
<a-icon type="check-circle"/>
|
||||||
{{ $t('submit') }}
|
{{ $t('submit') }}
|
||||||
@@ -1061,11 +1066,21 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
handleExport() {
|
handleExport() {
|
||||||
|
let roleCodeIndex
|
||||||
|
if (this.isDisplay) {
|
||||||
|
roleCodeIndex = 0
|
||||||
|
} else {
|
||||||
|
roleCodeIndex = 4
|
||||||
|
}
|
||||||
|
if (this.formInlineRoleSwitching.roleSwitchingCode == '11' || this.formInlineRoleSwitching.roleSwitchingCode == '12') {
|
||||||
|
roleCodeIndex = 0
|
||||||
|
}
|
||||||
let selectedRowKeys = JSON.parse(JSON.stringify(this.selectedRowKeys))
|
let selectedRowKeys = JSON.parse(JSON.stringify(this.selectedRowKeys))
|
||||||
let query = {
|
let query = {
|
||||||
...this.queryParam,
|
...this.queryParam,
|
||||||
ids: selectedRowKeys.join(','),
|
ids: selectedRowKeys.join(','),
|
||||||
...this.queryParamQuery,
|
...this.queryParamQuery,
|
||||||
|
roleCode:roleCodeIndex,
|
||||||
projectLibraryId: this.$route.query.id
|
projectLibraryId: this.$route.query.id
|
||||||
}
|
}
|
||||||
downloadFile(this.url.exportData, this.$route.query.projectName + this.$t('listOfRegulations') + '.zip', query, this.Deselect)
|
downloadFile(this.url.exportData, this.$route.query.projectName + this.$t('listOfRegulations') + '.zip', query, this.Deselect)
|
||||||
@@ -1733,7 +1748,7 @@
|
|||||||
} 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
|
continue
|
||||||
}else if (!dataSource[i].designDeliverableType) {
|
} else if (!dataSource[i].designDeliverableType) {
|
||||||
this.rowKeysWarningList.push( < div > { dataSource[i].serialNumber + this.$t('confirmationOfDesignConformity') + this.$t('theDeliveryTypeCannotBeEmpty') } < /div>)
|
this.rowKeysWarningList.push( < div > { dataSource[i].serialNumber + this.$t('confirmationOfDesignConformity') + this.$t('theDeliveryTypeCannotBeEmpty') } < /div>)
|
||||||
continue
|
continue
|
||||||
}
|
}
|
||||||
@@ -1751,7 +1766,7 @@
|
|||||||
} 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
|
continue
|
||||||
}else if (!dataSource[i].prehomoDeliverableType) {
|
} else if (!dataSource[i].prehomoDeliverableType) {
|
||||||
this.rowKeysWarningList.push( < div > { dataSource[i].serialNumber + this.$t('PrehomoConfirmation') + this.$t('theDeliveryTypeCannotBeEmpty') } < /div>)
|
this.rowKeysWarningList.push( < div > { dataSource[i].serialNumber + this.$t('PrehomoConfirmation') + this.$t('theDeliveryTypeCannotBeEmpty') } < /div>)
|
||||||
continue
|
continue
|
||||||
}
|
}
|
||||||
@@ -1769,7 +1784,7 @@
|
|||||||
} 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
|
continue
|
||||||
}else if (!dataSource[i].verifyDeliverableType) {
|
} else if (!dataSource[i].verifyDeliverableType) {
|
||||||
this.rowKeysWarningList.push( < div > { dataSource[i].serialNumber + this.$t('verificationAndConformityconfirmation') + this.$t('theDeliveryTypeCannotBeEmpty') } < /div>)
|
this.rowKeysWarningList.push( < div > { dataSource[i].serialNumber + this.$t('verificationAndConformityconfirmation') + this.$t('theDeliveryTypeCannotBeEmpty') } < /div>)
|
||||||
continue
|
continue
|
||||||
}
|
}
|
||||||
@@ -1864,7 +1879,7 @@
|
|||||||
_this.getRowKeys(selectedRowKeys, 2, function() {
|
_this.getRowKeys(selectedRowKeys, 2, function() {
|
||||||
_this.visibleComment = true
|
_this.visibleComment = true
|
||||||
_this.formInlineComment = {}
|
_this.formInlineComment = {}
|
||||||
_this.$nextTick(()=>{
|
_this.$nextTick(() => {
|
||||||
_this.$refs.ruleFormComment.clearValidate()
|
_this.$refs.ruleFormComment.clearValidate()
|
||||||
})
|
})
|
||||||
})
|
})
|
||||||
@@ -1886,7 +1901,7 @@
|
|||||||
})
|
})
|
||||||
}
|
}
|
||||||
let query = {
|
let query = {
|
||||||
commentContent: this.$t('For')+content.join(',') + this.$t('markedRejection')+':' + 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
|
||||||
|
|||||||
Reference in New Issue
Block a user