试验单号

src/views/modules/erf/approvalCycleReport.vue

@@ -2,10 +2,10 @@
   <div class="mod-config approval-cycle-report-page">
     <!-- 查询条件表单 -->
     <el-form :inline="true" label-position="top" class="query-form">
-      <el-form-item label="申请单号">
+      <el-form-item label="试验单号">
         <el-input
           v-model="queryHeaderData.applyNo"
-          placeholder="请输入申请单号"
+          placeholder="请输入试验单号"
           clearable
           style="width: 150px">
         </el-input>
@@ -132,8 +132,8 @@
 
       <el-table-column
         prop="applyNo"
-        label="申请单号"
-        width="100"
+        label="试验单号"
+        width="120"
         align="center"
         header-align="center"
         show-overflow-tooltip>

src/views/modules/erf/components/erfAttachmentManager.vue

@@ -102,7 +102,7 @@
 
       <el-form :inline="true" label-position="top" label-width="80px">
         <el-row>
-          <el-form-item label="申请单号">
+          <el-form-item label="试验单号">
             <el-input v-model="ossForm.orderRef2" readonly style="width: 310px"></el-input>
           </el-form-item>
         </el-row>

src/views/modules/erf/components/expApplyForm.vue

@@ -7,6 +7,18 @@
       label-position="top"
       style="margin-left: 5px; margin-top: -5px;">
 
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="试验单号" prop="applyNo">
+            <el-input
+              v-model="saveHeaderData.applyNo"
+              :readonly="readonly || (isEdit && saveHeaderData.status !== '草稿' && saveHeaderData.status !== '已驳回')"
+              placeholder="请输入试验单号">
+            </el-input>
+          </el-form-item>
+        </el-col>
+      </el-row>
+
       <el-row :gutter="20">
         <el-col :span="12">
           <el-form-item label="事业部" prop="buNo">
@@ -174,7 +186,7 @@
 
         <el-row :gutter="20">
           <el-col :span="8">
-            <el-form-item label="申请单号">
+            <el-form-item label="试验单号">
               <span>{{ saveHeaderData.applyNo }}</span>
             </el-form-item>
           </el-col>
@@ -241,6 +253,7 @@ export default {
       buList: [],
       saveHeaderData: {
         applyNo: '',
+        originalApplyNo: '',
         buNo: '',
         experimentType: '',
         projectNo: '',
@@ -259,6 +272,9 @@ export default {
       },
 
       formRules: {
+        applyNo: [
+          { required: true, message: '请输入试验单号', trigger: 'blur' }
+        ],
         buNo: [
           { required: true, message: '请选择事业部', trigger: 'change' }
         ],
@@ -284,7 +300,10 @@ export default {
   mounted() {
     this.loadBuList()
     if (this.applyData && this.applyData.applyNo) {
-      this.saveHeaderData = { ...this.applyData }
+      this.saveHeaderData = {
+        ...this.applyData,
+        originalApplyNo: this.applyData.applyNo
+      }
       this.isEdit = true
     }
   },

src/views/modules/erf/expApplyApproval.vue

@@ -44,7 +44,7 @@
             <span style="margin-left: 8px; font-weight: 500;">筛选条件</span>
           </template>
           <el-form :inline="true" label-position="top" class="search-form">
-            <el-form-item label="申请单号">
+            <el-form-item label="试验单号">
               <el-input v-model="queryHeaderData.applyNo" placeholder="支持模糊查询" clearable style="width: 150px"></el-input>
             </el-form-item>
 
@@ -257,7 +257,7 @@
         <!-- 申请单基本信息 -->
         <el-tab-pane label="申请单信息" name="basic">
           <el-descriptions :column="2" border size="small">
-            <el-descriptions-item label="申请单号">{{ currentApply.applyNo }}</el-descriptions-item>
+            <el-descriptions-item label="试验单号">{{ currentApply.applyNo }}</el-descriptions-item>
             <el-descriptions-item label="事业部">{{ currentApply.buNo }}</el-descriptions-item>
             <el-descriptions-item label="试验类型">
               <el-tag :type="currentApply.experimentType === 'High Risk' ? 'danger' : 'success'">

src/views/modules/erf/expApplyList.vue

@@ -2,8 +2,12 @@
   <div class="mod-config exp-apply-page">
     <!-- 查询条件表单 -->
     <el-form :inline="true" label-position="top" class="query-form">
-      <el-form-item label="申请单号">
-        <el-input v-model="queryHeaderData.applyNo" placeholder="请输入申请单号" clearable style="width: 150px"></el-input>
+      <el-form-item label="试验单号">
+        <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>
 
       <el-form-item label="事业部">
@@ -125,7 +129,7 @@
         align="center"
         header-align="center">
         <template slot-scope="scope">
-          <a
+          <a v-if="scope.row.status === '草稿' || scope.row.status === '已驳回'"
             @click="editApply(scope.row)">修改</a>
           <a
             v-if="scope.row.status === '草稿' || scope.row.status === '已驳回'"
@@ -145,8 +149,8 @@
 
       <el-table-column
         prop="applyNo"
-        label="申请单号"
-        width="100"
+        label="试验单号"
+        width="130"
         align="center"
         header-align="center"
         show-overflow-tooltip>
@@ -470,7 +474,7 @@
         不输入或输入0表示样品报废，大于0表示正常入库
       </div>
       <el-form :model="sampleConfirmData" label-width="100px" size="small">
-        <el-form-item label="申请单号">
+        <el-form-item label="试验单号">
           <el-tag type="primary">{{ sampleConfirmData.applyNo }}</el-tag>
         </el-form-item>
 
@@ -521,7 +525,7 @@
         选择需要复制的内容，将创建一个新的草稿申请单
       </div>
       <el-form :model="copyData" label-width="120px" size="small">
-        <el-form-item label="源申请单号">
+        <el-form-item label="源试验单号">
           <el-tag type="primary">{{ copyData.sourceApplyNo }}</el-tag>
         </el-form-item>
 
@@ -659,6 +663,7 @@ export default {
         buNo: '',
         experimentType: '',
         status: '',
+        creatorName: '',
         createStartDate: '',
         createEndDate: '',
         page: 1,
@@ -820,6 +825,7 @@ export default {
         buNo: '',
         experimentType: '',
         status: '',
+        creatorName: '',
         createStartDate: '',
         createEndDate: '',
         page: 1,

src/views/modules/erf/plannerSchedule.vue

@@ -44,7 +44,7 @@
             <span style="margin-left: 8px; font-weight: 500;">筛选条件</span>
           </template>
           <el-form :inline="true" label-position="top" class="search-form">
-            <el-form-item label="申请单号">
+            <el-form-item label="试验单号">
               <el-input v-model="searchData.applyNo" placeholder="支持模糊查询" clearable style="width: 150px"></el-input>
             </el-form-item>
 
@@ -250,7 +250,7 @@
           申请单信息
         </div>
         <el-descriptions :column="2" border size="small" class="apply-descriptions">
-          <el-descriptions-item label="申请单号">{{ scheduleData.applyNo }}</el-descriptions-item>
+          <el-descriptions-item label="试验单号">{{ scheduleData.applyNo }}</el-descriptions-item>
           <el-descriptions-item label="试验类型">
             <el-tag :type="currentApply.experimentType === 'High Risk' ? 'danger' : 'success'" effect="dark">
               <i :class="currentApply.experimentType === 'High Risk' ? 'el-icon-warning' : 'el-icon-success'"></i>

src/views/modules/erf/sampleCycleReport.vue

@@ -2,10 +2,10 @@
   <div class="mod-config sample-cycle-report-page">
     <!-- 查询条件表单 -->
     <el-form :inline="true" label-position="top" class="query-form">
-      <el-form-item label="申请单号">
+      <el-form-item label="试验单号">
         <el-input
           v-model="queryHeaderData.applyNo"
-          placeholder="请输入申请单号"
+          placeholder="请输入试验单号"
           clearable
           style="width: 150px">
         </el-input>
@@ -148,8 +148,8 @@
 
       <el-table-column
         prop="applyNo"
-        label="申请单号"
-        width="100"
+        label="试验单号"
+        width="120"
         align="center"
         header-align="center"
         show-overflow-tooltip>

src/views/modules/erf/triConfirm.vue

@@ -44,7 +44,7 @@
             <span style="margin-left: 8px; font-weight: 500;">筛选条件</span>
           </template>
           <el-form :inline="true" label-position="top" class="search-form">
-            <el-form-item label="申请单号">
+            <el-form-item label="试验单号">
               <el-input v-model="queryData.applyNo" placeholder="支持模糊查询" clearable style="width: 150px"></el-input>
             </el-form-item>
 
@@ -203,7 +203,7 @@
       <!-- 申请单和工序信息 -->
       <div class="confirm-info">
         <el-descriptions :column="2" border size="small">
-          <el-descriptions-item label="申请单号">{{ confirmData.applyNo }}</el-descriptions-item>
+          <el-descriptions-item label="试验单号">{{ confirmData.applyNo }}</el-descriptions-item>
           <el-descriptions-item label="试验类型">
             <el-tag :type="confirmData.experimentType === 'High Risk' ? 'danger' : 'success'" size="small">
               {{ confirmData.experimentType }}