From 0810a49ce1c57ea53970624a770a63f7afa0af5c Mon Sep 17 00:00:00 2001
From: "han\\hanst" <songtao.han@xujiesoft.com>
Date: Mon, 9 Mar 2026 16:55:44 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=8D=E5=88=B6=E9=9C=80=E8=A6=81=E8=BE=93?=
 =?UTF-8?q?=E5=85=A5=E8=AF=95=E9=AA=8C=E5=8D=95=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/erf/components/expApplyForm.vue   | 28 +++++++------------
 src/views/modules/erf/expApplyList.vue        | 10 ++++++-
 2 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/src/views/modules/erf/components/expApplyForm.vue b/src/views/modules/erf/components/expApplyForm.vue
index 0c79a27..0ae6086 100644
--- a/src/views/modules/erf/components/expApplyForm.vue
+++ b/src/views/modules/erf/components/expApplyForm.vue
@@ -7,18 +7,6 @@
       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">
@@ -49,7 +37,15 @@
             </el-select>
           </el-form-item>
         </el-col>
-
+        <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-col :span="12">
           <el-form-item label="项目编号" prop="projectNo">
             <el-input
@@ -73,9 +69,7 @@
             </el-date-picker>
           </el-form-item>
         </el-col>
-      </el-row>
 
-      <el-row :gutter="20">
         <el-col :span="12">
           <el-form-item label="试验名称" prop="title">
             <el-input
@@ -91,10 +85,8 @@
             <el-input v-model="saveHeaderData.projectLeader" disabled></el-input>
           </el-form-item>
         </el-col>
-      </el-row>
 
-      <el-row :gutter="20">
-        <el-col :span="24">
+        <el-col :span="12">
           <el-form-item label="试验目的" prop="purpose">
             <el-input
               v-model="saveHeaderData.purpose"
diff --git a/src/views/modules/erf/expApplyList.vue b/src/views/modules/erf/expApplyList.vue
index aba4c0d..35683a7 100644
--- a/src/views/modules/erf/expApplyList.vue
+++ b/src/views/modules/erf/expApplyList.vue
@@ -528,6 +528,9 @@
         <el-form-item label="源试验单号">
           <el-tag type="primary">{{ copyData.sourceApplyNo }}</el-tag>
         </el-form-item>
+        <el-form-item label="试验单号">
+          <el-input v-model="copyData.applyNo" placeholder="请输入试验单号"></el-input>
+        </el-form-item>
 
         <el-form-item label="复制选项">
           <el-checkbox-group v-model="copyData.copyOptions" class="checkbox-vertical">
@@ -741,6 +744,7 @@ export default {
       copyLoading: false,
       copyData: {
         sourceApplyNo: '',
+        applyNo: '',
         copyOptions: ['triConfirm','rawMaterialList'] // 默认全选
       }
     }
@@ -1604,10 +1608,14 @@ export default {
      * 确认复制申请单
      */
     confirmCopy() {
+      if (!this.copyData.applyNo) {
+        this.$message.warning('请输入新的试验单号')
+        return
+      }
       this.copyLoading = true
-
       const copyParams = {
         sourceApplyNo: this.copyData.sourceApplyNo,
+        applyNo: this.copyData.applyNo,
         copyTriConfirm: this.copyData.copyOptions.includes('triConfirm'),
         copyAttachment: this.copyData.copyOptions.includes('attachment'),
         copyRawMaterialList: this.copyData.copyOptions.includes('rawMaterialList'),