diff --git a/src/views/workCenter/annualRevisionPlanActivelyReport/RevisionPlanActivelyReportFlow.vue b/src/views/workCenter/annualRevisionPlanActivelyReport/RevisionPlanActivelyReportFlow.vue index 99456596..6a2018b0 100644 --- a/src/views/workCenter/annualRevisionPlanActivelyReport/RevisionPlanActivelyReportFlow.vue +++ b/src/views/workCenter/annualRevisionPlanActivelyReport/RevisionPlanActivelyReportFlow.vue @@ -343,7 +343,7 @@ export default { this.$refs.baseInfoFormRef.initData(this.model) } else if (this.currentNode === 2) { // 节点2草稿情况下需要回显数据 - if (type === 'draft') { + if (this.model.infoJsonStr) { this.$refs.baseInfoFormRef.initData(this.model) } } else if (this.currentNode === 3) { diff --git a/src/views/workCenter/annualRevisionPlanActivelyReport/modules/ContactEnterStandardForm.vue b/src/views/workCenter/annualRevisionPlanActivelyReport/modules/ContactEnterStandardForm.vue index 264b365d..b78a6578 100644 --- a/src/views/workCenter/annualRevisionPlanActivelyReport/modules/ContactEnterStandardForm.vue +++ b/src/views/workCenter/annualRevisionPlanActivelyReport/modules/ContactEnterStandardForm.vue @@ -72,14 +72,16 @@ export default { // 拿到外面传进来的数据初始化,因为套了几层就不在外层初始化数据了 initData (data) { console.log('&&&&&&&&&&&&7', data) - // 给表单赋值 - this.formInline.collectUserLeader = data.dataList[0].collectUserLeader - this.formInline.collectUserLeader_dictText = data.dataList[0].collectUserLeader_dictText - this.formInline = Object.assign({}, this.formInline) - // 给表格赋值 - this.$nextTick(() => { - this.$refs.tableRef.initData(data) - }) + if (data.dataList && data.dataList.length > 0) { + // 给表单赋值 + this.formInline.collectUserLeader = data.dataList[0].collectUserLeader + this.formInline.collectUserLeader_dictText = data.dataList[0].collectUserLeader_dictText + this.formInline = Object.assign({}, this.formInline) + // 给表格赋值 + this.$nextTick(() => { + this.$refs.tableRef.initData(data) + }) + } }, initTableData (data) { this.$nextTick(() => { diff --git a/src/views/workCenter/annualRevisionPlanStandardizationInit/modules/ContactSelectApproverBaseInfo.vue b/src/views/workCenter/annualRevisionPlanStandardizationInit/modules/ContactSelectApproverBaseInfo.vue index 959dd9c6..6d9db14b 100644 --- a/src/views/workCenter/annualRevisionPlanStandardizationInit/modules/ContactSelectApproverBaseInfo.vue +++ b/src/views/workCenter/annualRevisionPlanStandardizationInit/modules/ContactSelectApproverBaseInfo.vue @@ -204,6 +204,7 @@ export default { dataIndex: 'approvalUser', customRender: (value, row, index) => { return } @@ -318,6 +319,9 @@ export default { // 选人的名字获取 userSelectNameChange (value) { this.selectNames = value + }, + userNameChange (value, fieldName) { + this.dataSource[Number(fieldName)].approvalUser_dictText = value } } } diff --git a/src/views/workCenter/annualRevisionPlanStandardizationInit/modules/LeaderApproveSentBaseInfo.vue b/src/views/workCenter/annualRevisionPlanStandardizationInit/modules/LeaderApproveSentBaseInfo.vue index c27efecc..1cbe8ffd 100644 --- a/src/views/workCenter/annualRevisionPlanStandardizationInit/modules/LeaderApproveSentBaseInfo.vue +++ b/src/views/workCenter/annualRevisionPlanStandardizationInit/modules/LeaderApproveSentBaseInfo.vue @@ -195,6 +195,7 @@ export default { dataIndex: 'drafter', customRender: (value, row, index) => { return } @@ -285,6 +286,9 @@ export default { // 选人的名字获取 userSelectNameChange (value) { this.selectNames = value + }, + userNameChange (value, fieldName) { + this.dataSource[Number(fieldName)].prcMainDraftUser_dictText = value } } } diff --git a/src/views/workCenter/enterpriseStandardRevision/EnterpriseStandardRevisionFlow.vue b/src/views/workCenter/enterpriseStandardRevision/EnterpriseStandardRevisionFlow.vue index d63ccd7f..f3d17b65 100644 --- a/src/views/workCenter/enterpriseStandardRevision/EnterpriseStandardRevisionFlow.vue +++ b/src/views/workCenter/enterpriseStandardRevision/EnterpriseStandardRevisionFlow.vue @@ -437,6 +437,7 @@ export default { this.model.data = (JSON.parse(this.model.infoJsonStr)).data // 如果是节点1的保存回显人员信息 if (this.currentNode === 1 || this.currentNode === 7) { + console.log(JSON.parse(this.model.infoJsonStr).personnelObj) this.draftInitPersonInfo(JSON.parse(this.model.infoJsonStr).personnelObj) } }