申请人-》试验负责人

src/views/modules/erf/approvalCycleReport.vue

@@ -35,10 +35,10 @@
         </el-select>
       </el-form-item>
 
-      <el-form-item label="申请人">
+      <el-form-item label="试验负责人">
         <el-input
-          v-model="queryHeaderData.creatorName"
-          placeholder="请输入申请人姓名"
+          v-model="queryHeaderData.projectLeader"
+          placeholder="请输入试验负责人姓名"
           clearable
           style="width: 120px">
         </el-input>
@@ -165,8 +165,8 @@
       </el-table-column>
 
       <el-table-column
-        prop="creatorName"
-        label="申请人"
+        prop="projectLeader"
+        label="试验负责人"
         width="70"
         align="center"
         header-align="center">

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

src/views/modules/erf/expApplyApproval.vue

@@ -80,8 +80,8 @@
               <el-input v-model="queryHeaderData.productType" placeholder="支持模糊查询" clearable style="width: 150px"></el-input>
             </el-form-item>
 
-            <el-form-item label="申请人">
-              <el-input v-model="queryHeaderData.creatorName" placeholder="支持模糊查询" clearable style="width: 120px"></el-input>
+            <el-form-item label="试验负责人">
+              <el-input v-model="queryHeaderData.projectLeader" placeholder="支持模糊查询" clearable style="width: 120px"></el-input>
             </el-form-item>
 
             <el-form-item label="申请开始日期">
@@ -177,9 +177,9 @@
               <div class="detail-row">
                 <span class="detail-label">
                   <i class="el-icon-user"></i>
-                  申请人
+                  试验负责人
                 </span>
-                <span class="detail-value">{{ item.creatorName }}</span>
+                <span class="detail-value">{{ item.projectLeader }}</span>
               </div>
 
               <div class="detail-row">
@@ -271,7 +271,7 @@
             <el-descriptions-item label="产品型号">{{ currentApply.productType }}</el-descriptions-item>
             <el-descriptions-item label="申请数量">{{ currentApply.quantityReq }}</el-descriptions-item>
             <el-descriptions-item label="期望完成日期">{{ currentApply.expectedFinishDate }}</el-descriptions-item>
-            <el-descriptions-item label="申请人">{{ currentApply.creatorName }}</el-descriptions-item>
+            <el-descriptions-item label="试验负责人">{{ currentApply.projectLeader }}</el-descriptions-item>
             <el-descriptions-item label="申请时间" :span="2">{{ currentApply.createTime }}</el-descriptions-item>
           </el-descriptions>
         </el-tab-pane>

src/views/modules/erf/expApplyList.vue

@@ -9,8 +9,8 @@
         <el-input v-model="queryHeaderData.applyNo" placeholder="支持模糊查询" clearable style="width: 150px"></el-input>
       </el-form-item>
 
-      <el-form-item label="申请人">
-        <el-input v-model="queryHeaderData.creatorName" placeholder="支持模糊查询" clearable style="width: 120px"></el-input>
+      <el-form-item label="试验负责人">
+        <el-input v-model="queryHeaderData.projectLeader" placeholder="支持模糊查询" clearable style="width: 120px"></el-input>
       </el-form-item>
 
       <el-form-item label="事业部">
@@ -244,8 +244,8 @@
         header-align="center">
       </el-table-column>
       <el-table-column
-        prop="creatorName"
-        label="申请人"
+        prop="projectLeader"
+        label="试验负责人"
         width="100"
         align="center"
         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">
         </erf-attachment-manager>

src/views/modules/erf/plannerSchedule.vue

@@ -80,8 +80,8 @@
               <el-input v-model="searchData.productType" placeholder="支持模糊查询" clearable style="width: 150px"></el-input>
             </el-form-item>
 
-            <el-form-item label="工程师">
-              <el-input v-model="searchData.creatorName" placeholder="支持模糊查询" clearable style="width: 120px"></el-input>
+            <el-form-item label="试验负责人">
+              <el-input v-model="searchData.projectLeader" placeholder="支持模糊查询" clearable style="width: 120px"></el-input>
             </el-form-item>
 
             <el-form-item label="期望完成开始日期">
@@ -174,9 +174,9 @@
               <div class="detail-row">
                 <span class="detail-label">
                   <i class="el-icon-user"></i>
-                  工程师
+                  试验负责人
                 </span>
-                <span class="detail-value">{{ item.creatorName }}</span>
+                <span class="detail-value">{{ item.projectLeader }}</span>
               </div>
 
               <div class="detail-row">

src/views/modules/erf/sampleCycleReport.vue

@@ -35,10 +35,10 @@
         </el-select>
       </el-form-item>
 
-      <el-form-item label="申请人">
+      <el-form-item label="试验负责人">
         <el-input
-          v-model="queryHeaderData.creatorName"
-          placeholder="请输入申请人姓名"
+          v-model="queryHeaderData.projectLeader"
+          placeholder="请输入试验负责人姓名"
           clearable
           style="width: 120px">
         </el-input>
@@ -181,8 +181,8 @@
       </el-table-column>
 
       <el-table-column
-        prop="creatorName"
-        label="申请人"
+        prop="projectLeader"
+        label="试验负责人"
         width="100"
         align="center"
         header-align="center">

src/views/modules/erf/triConfirm.vue

@@ -135,9 +135,9 @@
               <div class="detail-row">
                 <span class="detail-label">
                   <i class="el-icon-user"></i>
-                  申请人
+                  试验负责人
                 </span>
-                <span class="detail-value">{{ item.creatorName }}</span>
+                <span class="detail-value">{{ item.projectLeader }}</span>
               </div>
             </div>