diff --git a/src/views/modules/erf/approvalCycleReport.vue b/src/views/modules/erf/approvalCycleReport.vue index 9cc2373..9be0090 100644 --- a/src/views/modules/erf/approvalCycleReport.vue +++ b/src/views/modules/erf/approvalCycleReport.vue @@ -35,10 +35,10 @@ - + @@ -165,8 +165,8 @@ diff --git a/src/views/modules/erf/components/erfAttachmentManager.vue b/src/views/modules/erf/components/erfAttachmentManager.vue index d7598c9..ea5f185 100644 --- a/src/views/modules/erf/components/erfAttachmentManager.vue +++ b/src/views/modules/erf/components/erfAttachmentManager.vue @@ -165,6 +165,10 @@ export default { type: String, required: true }, + createdBy: { + type: String, + default: '' + }, // 是否禁用编辑 disabled: { type: Boolean, @@ -356,7 +360,7 @@ export default { formData.append('orderRef1', 'ERF') formData.append('orderRef2', this.ossForm.orderRef2) formData.append('orderRef6', 'EXP_APPLY') - formData.append('createdBy', this.$store.state.user.name) + formData.append('createdBy', this.createdBy) formData.append('orderRef5', this.ossForm.remark) this.uploadLoading = true diff --git a/src/views/modules/erf/expApplyApproval.vue b/src/views/modules/erf/expApplyApproval.vue index 1807fac..66fe230 100644 --- a/src/views/modules/erf/expApplyApproval.vue +++ b/src/views/modules/erf/expApplyApproval.vue @@ -80,8 +80,8 @@ - - + + @@ -177,9 +177,9 @@
- 申请人 + 试验负责人 - {{ item.creatorName }} + {{ item.projectLeader }}
@@ -271,7 +271,7 @@ {{ currentApply.productType }} {{ currentApply.quantityReq }} {{ currentApply.expectedFinishDate }} - {{ currentApply.creatorName }} + {{ currentApply.projectLeader }} {{ currentApply.createTime }} diff --git a/src/views/modules/erf/expApplyList.vue b/src/views/modules/erf/expApplyList.vue index 7a75e98..a07f560 100644 --- a/src/views/modules/erf/expApplyList.vue +++ b/src/views/modules/erf/expApplyList.vue @@ -9,8 +9,8 @@ - - + + @@ -244,8 +244,8 @@ header-align="center"> @@ -298,6 +298,7 @@ v-if="currentRow.applyNo" ref="attachmentManager" :apply-no="currentRow.applyNo" + :created-by="currentRow.projectLeader" :disabled="false" :height="detailHeight"> diff --git a/src/views/modules/erf/plannerSchedule.vue b/src/views/modules/erf/plannerSchedule.vue index dcd29a2..8e8d1ad 100644 --- a/src/views/modules/erf/plannerSchedule.vue +++ b/src/views/modules/erf/plannerSchedule.vue @@ -80,8 +80,8 @@ - - + + @@ -174,9 +174,9 @@
- 工程师 + 试验负责人 - {{ item.creatorName }} + {{ item.projectLeader }}
diff --git a/src/views/modules/erf/sampleCycleReport.vue b/src/views/modules/erf/sampleCycleReport.vue index 974f3d8..a919b4c 100644 --- a/src/views/modules/erf/sampleCycleReport.vue +++ b/src/views/modules/erf/sampleCycleReport.vue @@ -35,10 +35,10 @@ - + @@ -181,8 +181,8 @@ diff --git a/src/views/modules/erf/triConfirm.vue b/src/views/modules/erf/triConfirm.vue index d4d6a5a..db15804 100644 --- a/src/views/modules/erf/triConfirm.vue +++ b/src/views/modules/erf/triConfirm.vue @@ -135,9 +135,9 @@
- 申请人 + 试验负责人 - {{ item.creatorName }} + {{ item.projectLeader }}