From a800745891d656e789741876a80d4c861278fc06 Mon Sep 17 00:00:00 2001
From: luojie <125330818@qq.com>
Date: Tue, 10 Feb 2026 18:58:42 +0800
Subject: [PATCH] =?UTF-8?q?feat:[=E6=A8=A1=E6=9D=BF=E7=AE=A1=E7=90=86][upd?=
 =?UTF-8?q?ate]?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Template/BaseInfoFormPackage.vue    |  2 +-
 src/components/Template/HandleFormItem.vue         | 40 ++++++++++++----------
 src/utils/conConverter.js                          |  8 -----
 .../business/comps/template/comps/sp/SP00456.vue   |  6 ++--
 4 files changed, 26 insertions(+), 30 deletions(-)

diff --git a/src/components/Template/BaseInfoFormPackage.vue b/src/components/Template/BaseInfoFormPackage.vue
index 5773b94..323012e 100644
--- a/src/components/Template/BaseInfoFormPackage.vue
+++ b/src/components/Template/BaseInfoFormPackage.vue
@@ -70,7 +70,7 @@
                 </div>
             </template>
             <template v-else-if="item.type === 'cellItem'">
-                <div class="form-item ">
+                <div class="form-item " :class="sItem.span == 1 ? 'full-row' : ''">
                     <div class="form-title fs-16" v-if="item.label">{{ $t( item.label) }}</div>
                     <div class="grid-container gap2">
                         <div v-for="(sItem, key) in item.config" class="c-Item" :class="getSpanClass(sItem)" :key="key">
diff --git a/src/components/Template/HandleFormItem.vue b/src/components/Template/HandleFormItem.vue
index 6dbfdcf..2a28bb0 100644
--- a/src/components/Template/HandleFormItem.vue
+++ b/src/components/Template/HandleFormItem.vue
@@ -54,10 +54,11 @@
             <template v-else-if="type === 'attachment'">
                 <el-upload class="upload-demo" :action="uploadFileUrl" :on-preview="handlePreview"
                     :headers="headers"
-                    :on-remove="handleRemove" :before-remove="beforeRemove" multiple :limit="10"
+                    :on-remove="handleRemove" multiple :limit="10"
                     :on-success="handleSuccess"
+                    :before-upload="beforeUpload"
                     :on-exceed="handleExceed" :file-list="fileList">
-                    <el-button size="small" type="primary">点击上传</el-button>
+                    <el-button  :class="getFillTypeStyle() + (orangeBg ? ' orange-bg' : '')" size="small" type="primary">点击上传</el-button>
                     <div slot="tip" class="el-upload__tip">支持扩展名：.rar .zip .doc .docx .pdf .jpg</div>
                 </el-upload>
             </template>
@@ -296,28 +297,31 @@ export default {
         handlePreview(file) {
             // 预览文件，如果是图片则直接打开，否则下载
             if (file.url) {
-                const fileType = file.type || file.name.split('.').pop().toLowerCase();
-                const imageTypes = ['jpg', 'jpeg', 'png', 'gif', 'bmp'];
                 
-                if (imageTypes.includes(fileType)) {
-                    // 图片类型，新建窗口预览
-                    window.open(process.env.VUE_APP_FILE_DOMAIN + file.url, '_blank');
-                } else {
-                    // 非图片类型，下载文件
-                    const link = document.createElement('a');
-                    link.href = file.url;
-                    link.download = file.name;
-                    link.target = '_blank';
-                    link.click();
-                }
+                window.open(process.env.VUE_APP_FILE_DOMAIN + file.url, '_blank');
+            
             }
         },
+        // 上传前校验
+        beforeUpload(file) {
+            console.log(file,"fff")
+            const isAllowedType = ['image/jpeg', 'image/png', 'image/gif', 'application/pdf'].includes(file.type)
+            const isLt2M = file.size / 1024 / 1024 < 2
+            
+            if (!isAllowedType) {
+                this.$message.error('只能上传 JPG/PNG/GIF/PDF 格式的文件!')
+                return false
+            }
+            if (!isLt2M) {
+                this.$message.error('文件大小不能超过 2MB!')
+                return false
+            }
+            
+            return true
+        },
         handleExceed(files, fileList) {
             this.$message.warning(`当前限制选择 10 个文件，本次选择了 ${files.length} 个文件，共选择了 ${files.length + fileList.length} 个文件`);
         },
-        beforeRemove(file, fileList) {
-            return this.$confirm(`确定移除 ${file.name}？`);
-        },
         //试剂弹窗提交
         onMixReagentSubmit(data) {
             if (data.uuid !== this.uuid) return;
diff --git a/src/utils/conConverter.js b/src/utils/conConverter.js
index ffcd021..63bfea2 100644
--- a/src/utils/conConverter.js
+++ b/src/utils/conConverter.js
@@ -172,12 +172,4 @@ class ConcentrationConverter {
     }
   }
 }
-// 将静态方法绑定到实例上，以便可以直接通过实例调用
 export const convertConcentration = new ConcentrationConverter();
-
-// // 将静态方法复制到实例上
-// converterInstance.convert = ConcentrationConverter.convert.bind(ConcentrationConverter);
-// converterInstance.convertAll = ConcentrationConverter.convertAll.bind(ConcentrationConverter);
-// converterInstance.isSupportedUnit = ConcentrationConverter.isSupportedUnit.bind(ConcentrationConverter);
-
-// export const convertConcentration = converterInstance;
\ No newline at end of file
diff --git a/src/views/business/comps/template/comps/sp/SP00456.vue b/src/views/business/comps/template/comps/sp/SP00456.vue
index 6fc0448..d38c0bc 100644
--- a/src/views/business/comps/template/comps/sp/SP00456.vue
+++ b/src/views/business/comps/template/comps/sp/SP00456.vue
@@ -376,12 +376,12 @@ export default {
 			if (type === 'ladder') {
 				const tableRef = this.$refs[`ladderStepTableRef_${configIndex}`];
 				if (tableRef) {
-					tableRef.deleteRow(rowIndex);
+					tableRef[0].deleteRow(rowIndex);
 				}
 			} else if (type === 'paralle') {
 				const tableRef = this.$refs[`paralleStepTableRef_${configIndex}`];
 				if (tableRef) {
-					tableRef.deleteRow(rowIndex);
+					tableRef[0].deleteRow(rowIndex);
 				}
 			}
 		},
@@ -425,7 +425,7 @@ export default {
 						this.$refs[`paralleStepTableRef_${configIndex}`][0]?.updateDataSourceByRowIndex(rowIndex, {
 							actSolutionVolume: volResult.actVol,
 							actSolutionConcentration: volResult.actNd,
-						}, "blur");
+						});
 					}
 				}