Merge remote-tracking branch 'origin/master'

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

@@ -422,6 +422,11 @@ export default {
         type = 'text/plain;charset=utf-8'
       }
 
+      // XML类型
+      if (fileType === 'xml') {
+        type = 'application/xml;charset=utf-8'
+      }
+
       // Excel类型
       if (fileType === 'xlsx' || fileType === 'xls') {
         type = 'excel'

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

@@ -8,7 +8,7 @@
       style="margin-left: 5px; margin-top: -5px;">
 
       <el-row :gutter="20">
-        <el-col :span="6">
+        <el-col :span="12">
           <el-form-item label="事业部" prop="buNo">
             <el-select
               v-model="saveHeaderData.buNo"
@@ -25,7 +25,7 @@
           </el-form-item>
         </el-col>
 
-        <el-col :span="6">
+        <el-col :span="12">
           <el-form-item label="试验类型" prop="experimentType">
             <el-select
               v-model="saveHeaderData.experimentType"
@@ -38,7 +38,7 @@
           </el-form-item>
         </el-col>
 
-        <el-col :span="6">
+        <el-col :span="12">
           <el-form-item label="项目编号" prop="projectNo">
             <el-input
               v-model="saveHeaderData.projectNo"
@@ -48,7 +48,7 @@
           </el-form-item>
         </el-col>
 
-        <el-col :span="6">
+        <el-col :span="12">
           <el-form-item label="期望完成日期" prop="expectedFinishDate">
             <el-date-picker
               v-model="saveHeaderData.expectedFinishDate"
@@ -64,7 +64,7 @@
       </el-row>
 
       <el-row :gutter="20">
-        <el-col :span="24">
+        <el-col :span="12">
           <el-form-item label="试验名称" prop="title">
             <el-input
               v-model="saveHeaderData.title"
@@ -73,6 +73,15 @@
             </el-input>
           </el-form-item>
         </el-col>
+        <el-col :span="12">
+          <el-form-item label="试验负责人">
+            <el-input
+              v-model="saveHeaderData.projectLeader"
+              :readonly="readonly"
+              placeholder="请输入试验负责人">
+            </el-input>
+          </el-form-item>
+        </el-col>
       </el-row>
 
       <el-row :gutter="20">
@@ -88,7 +97,7 @@
       </el-row>
 
       <el-row :gutter="20">
-        <el-col :span="24">
+<!--        <el-col :span="24">
           <el-form-item label="验证方法及判断标准" prop="justification">
             <el-input
               v-model="saveHeaderData.justification"
@@ -108,31 +117,24 @@
               placeholder="请输入产品型号">
             </el-input>
           </el-form-item>
-        </el-col>
+        </el-col>-->
 
-        <el-col :span="12">
+        <el-col :span="24">
           <el-form-item label="申请数量">
             <el-input
               v-model="saveHeaderData.quantityReq"
               :readonly="readonly"
+              :rows="3" type="textarea"
               placeholder="请输入申请数量描述">
             </el-input>
           </el-form-item>
         </el-col>
       </el-row>
 
-      <el-row :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="试验负责人">
-            <el-input
-              v-model="saveHeaderData.projectLeader"
-              :readonly="readonly"
-              placeholder="请输入试验负责人">
-            </el-input>
-          </el-form-item>
-        </el-col>
+<!--      <el-row :gutter="20">
 
-        <el-col :span="12">
+
+&lt;!&ndash;        <el-col :span="12">
           <el-form-item label="联系方式">
             <el-input
               v-model="saveHeaderData.contactMethod"
@@ -140,10 +142,10 @@
               placeholder="请输入联系方式">
             </el-input>
           </el-form-item>
-        </el-col>
-      </el-row>
+        </el-col>&ndash;&gt;
+      </el-row>-->
 
-      <el-row :gutter="20">
+<!--      <el-row :gutter="20">
         <el-col :span="24">
           <el-form-item label="工艺、取样、测试要求">
             <el-input
@@ -155,7 +157,7 @@
             </el-input>
           </el-form-item>
         </el-col>
-      </el-row>
+      </el-row>-->
 
       <!-- 只读模式下显示的附加信息 -->
       <template v-if="readonly && saveHeaderData.applyNo">

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

@@ -423,11 +423,6 @@ export default {
         return
       }
 
-      // 如果已经有物料描述，不自动查询（避免覆盖用户手动输入）
-      if (this.formData.partDesc) {
-        return
-      }
-
       // 查询part表获取物料描述
       getPartDescByPartNo({
         partNo: partNo.trim(),

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

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,29 +407,13 @@
         </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>
 
     <!-- 新增/编辑弹窗 -->
     <el-dialog
       :title="dialogTitle"
       :visible.sync="dialogVisible"
-      width="950px"
+      width="550px"
       :close-on-click-modal="false"
       v-drag>
 
@@ -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>