From 6f7d37fdb2fbbdbaf666c177c2beb44bb34bff80 Mon Sep 17 00:00:00 2001
From: "han\\hanst" <songtao.han@xujiesoft.com>
Date: Mon, 2 Feb 2026 14:32:25 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=8D=E5=88=B6=E5=A2=9E=E5=8A=A0=E5=8E=9F?=
 =?UTF-8?q?=E6=9D=90=E6=96=99=E6=B8=85=E5=8D=95=E9=80=89=E9=A1=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/erf/components/expTriConfirm.vue  |  2 +-
 src/views/modules/erf/expApplyList.vue        | 51 +++++++++++--------
 2 files changed, 30 insertions(+), 23 deletions(-)

diff --git a/src/views/modules/erf/components/expTriConfirm.vue b/src/views/modules/erf/components/expTriConfirm.vue
index d4f26da..2cdeef2 100644
--- a/src/views/modules/erf/components/expTriConfirm.vue
+++ b/src/views/modules/erf/components/expTriConfirm.vue
@@ -239,7 +239,7 @@
     <el-dialog
       title="选择工序模版"
       :visible.sync="templateDialogVisible"
-      width="600px"
+      width="615px"
       :close-on-click-modal="false">
 
       <el-table
diff --git a/src/views/modules/erf/expApplyList.vue b/src/views/modules/erf/expApplyList.vue
index 857a9bf..3bf7147 100644
--- a/src/views/modules/erf/expApplyList.vue
+++ b/src/views/modules/erf/expApplyList.vue
@@ -281,7 +281,7 @@
           请在上方表格中选择一条申请单记录
         </div>
       </el-tab-pane>
-      <!-- Tab 2: 三方确认 -->
+      <!-- Tab: 三方确认 -->
       <el-tab-pane label="三方确认"  v-if="currentRow.experimentType==='High Risk'" name="triConfirm">
         <exp-tri-confirm
           v-if="currentRow.applyNo&&currentRow.experimentType==='High Risk'"
@@ -295,10 +295,25 @@
         </div>
       </el-tab-pane>
 
-      <!-- Tab 3: 附件上传 -->
+      <!-- Tab: 原材料清单 -->
+      <el-tab-pane label="原材料清单" name="rawMaterial">
+        <exp-raw-material-list
+          v-if="currentRow.applyNo"
+          ref="rawMaterialList"
+          :apply-no="currentRow.applyNo"
+          :site="currentRow.site || $store.state.user.site"
+          :buNo="currentRow.buNo"
+          :disabled="currentRow.status === '已完成' || currentRow.status === '已取消'"
+          :height="detailHeight">
+        </exp-raw-material-list>
+        <div v-else class="empty-tip">
+          <i class="el-icon-document" style="font-size: 40px; color: #C0C4CC; margin-bottom: 10px"></i>
+          <p style="font-size: 13px">请选择申请单查看原材料清单</p>
+        </div>
+      </el-tab-pane>
 
 
-      <!-- Tab 4: 审批状态和日志 -->
+      <!-- Tab: 审批状态和日志 -->
       <el-tab-pane label="审批状态和日志" name="approvalStatus">
         <div v-if="currentRow.applyNo" :style="{height: detailHeight + 'px', overflowY: 'auto', padding: '0px 10px'}">
 
@@ -392,22 +407,6 @@
         </div>
       </el-tab-pane>
 
-      <!-- Tab 5: 原材料清单 -->
-      <el-tab-pane label="原材料清单" name="rawMaterial">
-        <exp-raw-material-list
-          v-if="currentRow.applyNo"
-          ref="rawMaterialList"
-          :apply-no="currentRow.applyNo"
-          :site="currentRow.site || $store.state.user.site"
-          :buNo="currentRow.buNo"
-          :disabled="currentRow.status === '已完成' || currentRow.status === '已取消'"
-          :height="detailHeight">
-        </exp-raw-material-list>
-        <div v-else class="empty-tip">
-          <i class="el-icon-document" style="font-size: 40px; color: #C0C4CC; margin-bottom: 10px"></i>
-          <p style="font-size: 13px">请选择申请单查看原材料清单</p>
-        </div>
-      </el-tab-pane>
     </el-tabs>
 
     <!-- 新增/编辑弹窗 -->
@@ -499,10 +498,12 @@
         </el-form-item>
 
         <el-form-item label="复制选项">
-          <el-checkbox-group v-model="copyData.copyOptions">
+          <el-checkbox-group v-model="copyData.copyOptions" class="checkbox-vertical">
             <el-checkbox v-if="currentRow.experimentType === 'High Risk'" label="triConfirm">三方确认信息</el-checkbox>
+            <el-checkbox label="rawMaterialList">原材料清单</el-checkbox>
             <el-checkbox label="attachment">附件</el-checkbox>
           </el-checkbox-group>
+
         </el-form-item>
       </el-form>
 
@@ -680,7 +681,7 @@ export default {
       copyLoading: false,
       copyData: {
         sourceApplyNo: '',
-        copyOptions: ['triConfirm'] // 默认全选
+        copyOptions: ['triConfirm','rawMaterialList'] // 默认全选
       }
     }
   },
@@ -1460,7 +1461,7 @@ export default {
       }
 
       // 根据试验类型判断是否显示三方确认选项
-      const defaultOptions = []
+      const defaultOptions = ['rawMaterialList']
       if (this.currentRow.experimentType === 'High Risk') {
         defaultOptions.unshift('triConfirm')
       }
@@ -1482,6 +1483,7 @@ export default {
         sourceApplyNo: this.copyData.sourceApplyNo,
         copyTriConfirm: this.copyData.copyOptions.includes('triConfirm'),
         copyAttachment: this.copyData.copyOptions.includes('attachment'),
+        copyRawMaterialList: this.copyData.copyOptions.includes('rawMaterialList'),
         currentUserId: this.$store.state.user.id
       }
 
@@ -2006,4 +2008,9 @@ export default {
   line-height: 30px !important;
 }
 
+/deep/ .checkbox-vertical .el-checkbox {
+  display: block;
+  margin-left: 0;
+  margin-bottom: 8px;
+}
 </style>