diff --git a/src/views/workCenter/enterpriseStandardInspectionPlan/modules/InspectionPlanDrawer.vue b/src/views/workCenter/enterpriseStandardInspectionPlan/modules/InspectionPlanDrawer.vue index 8c9fbdad..c2891442 100644 --- a/src/views/workCenter/enterpriseStandardInspectionPlan/modules/InspectionPlanDrawer.vue +++ b/src/views/workCenter/enterpriseStandardInspectionPlan/modules/InspectionPlanDrawer.vue @@ -76,7 +76,7 @@ @@ -105,7 +105,7 @@ import UserSelection from '@comp/selection/UserSelection' import { getWorkGroupTreeList } from '@api/api' import WorkGroupSelection from '@comp/selection/WorkGroupSelection' import { addInspectPlanTable, editInspectPlanTable } from '@api/workCenter' -import { StandardSource } from '@/enums/commonEnums' +import { EsInspectionPlan, StandardSource } from '@/enums/commonEnums' export default { name: 'InspectionPlanDrawer', @@ -234,9 +234,24 @@ export default { created () { this.getWorkGroupTree() }, + computed: { + // 是否节点2 + isFillInComments () { + return this.$route.query.nodeId === EsInspectionPlan.fillInComments.value + }, + currentUserName () { + return this.$store.getters.userInfo.realname + '(' + this.$store.getters.userInfo.username + ')' + } + }, methods: { add () { - this.edit({}) + const obj = {} + // 如果是节点2,征求意见对象默认回显自己,并且禁用 + if (this.isFillInComments) { + obj.objectOfConsultationDictText = this.currentUserName + obj.objectOfConsultation = this.$store.getters.userInfo.id + } + this.edit(obj) }, edit (record) { this.visible = true diff --git a/src/views/workCenter/enterpriseStandardInspectionProcess/modules/InspectionProcessRectificationPlan.vue b/src/views/workCenter/enterpriseStandardInspectionProcess/modules/InspectionProcessRectificationPlan.vue index 96a5459f..4ae2cdc6 100644 --- a/src/views/workCenter/enterpriseStandardInspectionProcess/modules/InspectionProcessRectificationPlan.vue +++ b/src/views/workCenter/enterpriseStandardInspectionProcess/modules/InspectionProcessRectificationPlan.vue @@ -70,6 +70,20 @@ export default { }, data () { const columns = [ + { // 依据条款 + title: this.$t('workCenter.esInspectionProcess.accordingToTerms'), + align: 'center', + width: 120, + dataIndex: 'enterpriseStandardInspectReport.baseClause', + scopedSlots: { customRender: 'text' } + }, + { // 标准内容或要求 + title: this.$t('workCenter.esInspectionProcess.standardContentOrDemand'), + align: 'center', + width: 180, + dataIndex: 'enterpriseStandardInspectReport.standardRequire', + scopedSlots: { customRender: 'text' } + }, { // 不符合项描述 title: this.$t('workCenter.esInspectionProcess.nonCompliantDescription'), align: 'center',