Merge branch 'main' of http://120.76.84.145:10101/gitblit/r/H5/leshan-labor...

董国庆

2026-01-22 80db5f7ce1d0bd929c78c7e8dd1a3ff7240a095a

Merge branch 'main' of http://120.76.84.145:10101/gitblit/r/H5/leshan-laboratory

 culture/src/views/strainReportLibrary/reportLibraryOne/add.vue

@@ -61,7 +61,7 @@
                    <el-upload action="#" :file-list="fileList" :http-request="handleUpload"
                        :before-upload="beforeUpload" :on-preview="handlePreview" :on-remove="handleRemove">
                        <el-button size="small" type="primary">点击上传</el-button>
                        <div slot="tip" class="el-upload__tip">支持任意格式文件上传</div>
                        <div slot="tip" class="el-upload__tip">支持 Word、Excel 和所有图片格式，禁止 PPT、PDF、CAJ</div>
                    </el-upload>
                </el-form-item>
                <div class="header-title" style="width: 100%;">
@@ -307,6 +307,32 @@
        },
        // 上传前校验
        beforeUpload(file) {
            // 获取文件扩展名
            const fileName = file.name || '';
            const fileExtension = fileName.substring(fileName.lastIndexOf('.') + 1).toLowerCase();
            
            // 禁止的文件类型
            const forbiddenExtensions = ['ppt', 'pptx', 'pdf', 'caj'];
            if (forbiddenExtensions.includes(fileExtension)) {
                this.$message.error(`不支持上传 ${fileExtension.toUpperCase()} 格式文件`);
                return false;
            }
            
            // 允许的文件类型
            // Word 格式
            const wordExtensions = ['doc', 'docx'];
            // Excel 格式
            const excelExtensions = ['xls', 'xlsx'];
            // 图片格式
            const imageExtensions = ['jpg', 'jpeg', 'png', 'gif', 'bmp', 'webp', 'svg', 'ico', 'tiff', 'tif', 'heic', 'heif'];
            
            const allowedExtensions = [...wordExtensions, ...excelExtensions, ...imageExtensions];
            
            if (!allowedExtensions.includes(fileExtension)) {
                this.$message.error(`不支持上传 ${fileExtension.toUpperCase()} 格式文件，仅支持 Word、Excel 和图片格式`);
                return false;
            }
            
            return true;
        },
        // 自定义上传处理

 culture/src/views/strainReportLibrary/reportLibraryOne/components/approval/index.vue

@@ -65,9 +65,9 @@
                            </div>
                            <el-form-item prop="name" style="margin-top: 38px">
                                <el-upload action="#" :file-list="fileList" disabled list-type="text"
                                    :on-preview="handlePreview">
                                    :before-upload="beforeUpload" :on-preview="handlePreview">
                                    <el-button size="small" type="primary">点击上传</el-button>
                                    <div slot="tip" class="el-upload__tip">支持任意格式文件上传</div>
                                    <div slot="tip" class="el-upload__tip">支持 Word、Excel 和所有图片格式，禁止 PPT、PDF、CAJ</div>
                                </el-upload>
                            </el-form-item>

@@ -393,6 +393,36 @@
            this.form.pageSize = size
            this.getList()
        },
        // 上传前校验
        beforeUpload(file) {
            // 获取文件扩展名
            const fileName = file.name || '';
            const fileExtension = fileName.substring(fileName.lastIndexOf('.') + 1).toLowerCase();
            
            // 禁止的文件类型
            const forbiddenExtensions = ['ppt', 'pptx', 'pdf', 'caj'];
            if (forbiddenExtensions.includes(fileExtension)) {
                this.$message.error(`不支持上传 ${fileExtension.toUpperCase()} 格式文件`);
                return false;
            }
            
            // 允许的文件类型
            // Word 格式
            const wordExtensions = ['doc', 'docx'];
            // Excel 格式
            const excelExtensions = ['xls', 'xlsx'];
            // 图片格式
            const imageExtensions = ['jpg', 'jpeg', 'png', 'gif', 'bmp', 'webp', 'svg', 'ico', 'tiff', 'tif', 'heic', 'heif'];
            
            const allowedExtensions = [...wordExtensions, ...excelExtensions, ...imageExtensions];
            
            if (!allowedExtensions.includes(fileExtension)) {
                this.$message.error(`不支持上传 ${fileExtension.toUpperCase()} 格式文件，仅支持 Word、Excel 和图片格式`);
                return false;
            }
            
            return true;
        },
        handlePreview(file) {
            if (file && file.url) {
                // 判断是否为图片文件

 culture/src/views/strainReportLibrary/reportLibraryOneFour/add.vue

@@ -61,7 +61,7 @@
                    <el-upload action="#" :file-list="fileList" :http-request="handleUpload"
                        :before-upload="beforeUpload" :on-preview="handlePreview" :on-remove="handleRemove">
                        <el-button size="small" type="primary">点击上传</el-button>
                        <div slot="tip" class="el-upload__tip">支持任意格式文件上传</div>
                        <div slot="tip" class="el-upload__tip">支持 Word、Excel 和所有图片格式，禁止 PPT、PDF、CAJ</div>
                    </el-upload>
                </el-form-item>
                <!-- <div class="header-title" style="width: 100%;">
@@ -304,6 +304,32 @@

        // 上传前校验
        beforeUpload(file) {
            // 获取文件扩展名
            const fileName = file.name || '';
            const fileExtension = fileName.substring(fileName.lastIndexOf('.') + 1).toLowerCase();
            
            // 禁止的文件类型
            const forbiddenExtensions = ['ppt', 'pptx', 'pdf', 'caj'];
            if (forbiddenExtensions.includes(fileExtension)) {
                this.$message.error(`不支持上传 ${fileExtension.toUpperCase()} 格式文件`);
                return false;
            }
            
            // 允许的文件类型
            // Word 格式
            const wordExtensions = ['doc', 'docx'];
            // Excel 格式
            const excelExtensions = ['xls', 'xlsx'];
            // 图片格式
            const imageExtensions = ['jpg', 'jpeg', 'png', 'gif', 'bmp', 'webp', 'svg', 'ico', 'tiff', 'tif', 'heic', 'heif'];
            
            const allowedExtensions = [...wordExtensions, ...excelExtensions, ...imageExtensions];
            
            if (!allowedExtensions.includes(fileExtension)) {
                this.$message.error(`不支持上传 ${fileExtension.toUpperCase()} 格式文件，仅支持 Word、Excel 和图片格式`);
                return false;
            }
            
            return true;
        },
        // 自定义上传处理

 culture/src/views/strainReportLibrary/reportLibraryOneFour/components/approval/index.vue

@@ -59,9 +59,9 @@

                            <el-form-item prop="name" style="margin-top: 38px">
                                <el-upload action="#" :file-list="fileList" disabled list-type="text"
                                    :on-preview="handlePreview">
                                    :before-upload="beforeUpload" :on-preview="handlePreview">
                                    <el-button size="small" type="primary">点击上传</el-button>
                                    <div slot="tip" class="el-upload__tip">支持任意格式文件上传</div>
                                    <div slot="tip" class="el-upload__tip">支持 Word、Excel 和所有图片格式，禁止 PPT、PDF、CAJ</div>
                                </el-upload>
                            </el-form-item>

@@ -253,6 +253,36 @@
        }
    },
    methods: {
        // 上传前校验
        beforeUpload(file) {
            // 获取文件扩展名
            const fileName = file.name || '';
            const fileExtension = fileName.substring(fileName.lastIndexOf('.') + 1).toLowerCase();
            
            // 禁止的文件类型
            const forbiddenExtensions = ['ppt', 'pptx', 'pdf', 'caj'];
            if (forbiddenExtensions.includes(fileExtension)) {
                this.$message.error(`不支持上传 ${fileExtension.toUpperCase()} 格式文件`);
                return false;
            }
            
            // 允许的文件类型
            // Word 格式
            const wordExtensions = ['doc', 'docx'];
            // Excel 格式
            const excelExtensions = ['xls', 'xlsx'];
            // 图片格式
            const imageExtensions = ['jpg', 'jpeg', 'png', 'gif', 'bmp', 'webp', 'svg', 'ico', 'tiff', 'tif', 'heic', 'heif'];
            
            const allowedExtensions = [...wordExtensions, ...excelExtensions, ...imageExtensions];
            
            if (!allowedExtensions.includes(fileExtension)) {
                this.$message.error(`不支持上传 ${fileExtension.toUpperCase()} 格式文件，仅支持 Word、Excel 和图片格式`);
                return false;
            }
            
            return true;
        },
        handlePreview(file) {
            if (file && file.url) {
                // 判断是否为图片文件

 culture/src/views/strainReportLibrary/reportLibraryOneTWO/add.vue

@@ -61,7 +61,7 @@
                    <el-upload action="#" :file-list="fileList" :http-request="handleUpload"
                        :before-upload="beforeUpload" :on-preview="handlePreview" :on-remove="handleRemove">
                        <el-button size="small" type="primary">点击上传</el-button>
                        <div slot="tip" class="el-upload__tip">支持任意格式文件上传</div>
                        <div slot="tip" class="el-upload__tip">支持 Word、Excel 和所有图片格式，禁止 PPT、PDF、CAJ</div>
                    </el-upload>
                </el-form-item>
                <!-- <div class="header-title" style="width: 100%;">
@@ -300,6 +300,32 @@
    },
        // 上传前校验
        beforeUpload(file) {
            // 获取文件扩展名
            const fileName = file.name || '';
            const fileExtension = fileName.substring(fileName.lastIndexOf('.') + 1).toLowerCase();
            
            // 禁止的文件类型
            const forbiddenExtensions = ['ppt', 'pptx', 'pdf', 'caj'];
            if (forbiddenExtensions.includes(fileExtension)) {
                this.$message.error(`不支持上传 ${fileExtension.toUpperCase()} 格式文件`);
                return false;
            }
            
            // 允许的文件类型
            // Word 格式
            const wordExtensions = ['doc', 'docx'];
            // Excel 格式
            const excelExtensions = ['xls', 'xlsx'];
            // 图片格式
            const imageExtensions = ['jpg', 'jpeg', 'png', 'gif', 'bmp', 'webp', 'svg', 'ico', 'tiff', 'tif', 'heic', 'heif'];
            
            const allowedExtensions = [...wordExtensions, ...excelExtensions, ...imageExtensions];
            
            if (!allowedExtensions.includes(fileExtension)) {
                this.$message.error(`不支持上传 ${fileExtension.toUpperCase()} 格式文件，仅支持 Word、Excel 和图片格式`);
                return false;
            }
            
            return true;
        },
        // 自定义上传处理

 culture/src/views/strainReportLibrary/reportLibraryOneTWO/components/approval/index.vue

@@ -64,9 +64,9 @@
                                </div>
                            </div>
                            <el-form-item prop="name" style="margin-top: 38px">
                                <el-upload action="#" :file-list="fileList" :on-preview="handlePreview">
                                <el-upload action="#" :file-list="fileList" :before-upload="beforeUpload" :on-preview="handlePreview">
                                    <el-button size="small" type="primary">点击上传</el-button>
                                    <div slot="tip" class="el-upload__tip">支持任意格式文件上传</div>
                                    <div slot="tip" class="el-upload__tip">支持 Word、Excel 和所有图片格式，禁止 PPT、PDF、CAJ</div>
                                </el-upload>
                            </el-form-item>

@@ -257,6 +257,36 @@
        }
    },
    methods: {
        // 上传前校验
        beforeUpload(file) {
            // 获取文件扩展名
            const fileName = file.name || '';
            const fileExtension = fileName.substring(fileName.lastIndexOf('.') + 1).toLowerCase();
            
            // 禁止的文件类型
            const forbiddenExtensions = ['ppt', 'pptx', 'pdf', 'caj'];
            if (forbiddenExtensions.includes(fileExtension)) {
                this.$message.error(`不支持上传 ${fileExtension.toUpperCase()} 格式文件`);
                return false;
            }
            
            // 允许的文件类型
            // Word 格式
            const wordExtensions = ['doc', 'docx'];
            // Excel 格式
            const excelExtensions = ['xls', 'xlsx'];
            // 图片格式
            const imageExtensions = ['jpg', 'jpeg', 'png', 'gif', 'bmp', 'webp', 'svg', 'ico', 'tiff', 'tif', 'heic', 'heif'];
            
            const allowedExtensions = [...wordExtensions, ...excelExtensions, ...imageExtensions];
            
            if (!allowedExtensions.includes(fileExtension)) {
                this.$message.error(`不支持上传 ${fileExtension.toUpperCase()} 格式文件，仅支持 Word、Excel 和图片格式`);
                return false;
            }
            
            return true;
        },
        handlePreview(file) {
            if (file && file.url) {
                // 判断是否为图片文件

 culture/src/views/strainReportLibrary/reportLibraryOneThree/add.vue

@@ -61,7 +61,7 @@
                    <el-upload action="#" :file-list="fileList" :http-request="handleUpload"
                        :before-upload="beforeUpload" :on-preview="handlePreview" :on-remove="handleRemove">
                        <el-button size="small" type="primary">点击上传</el-button>
                        <div slot="tip" class="el-upload__tip">支持任意格式文件上传</div>
                        <div slot="tip" class="el-upload__tip">支持 Word、Excel 和所有图片格式，禁止 PPT、PDF、CAJ</div>
                    </el-upload>
                </el-form-item>
                <!-- <div class="header-title" style="width: 100%;">
@@ -302,6 +302,32 @@
        },
        // 上传前校验
        beforeUpload(file) {
            // 获取文件扩展名
            const fileName = file.name || '';
            const fileExtension = fileName.substring(fileName.lastIndexOf('.') + 1).toLowerCase();
            
            // 禁止的文件类型
            const forbiddenExtensions = ['ppt', 'pptx', 'pdf', 'caj'];
            if (forbiddenExtensions.includes(fileExtension)) {
                this.$message.error(`不支持上传 ${fileExtension.toUpperCase()} 格式文件`);
                return false;
            }
            
            // 允许的文件类型
            // Word 格式
            const wordExtensions = ['doc', 'docx'];
            // Excel 格式
            const excelExtensions = ['xls', 'xlsx'];
            // 图片格式
            const imageExtensions = ['jpg', 'jpeg', 'png', 'gif', 'bmp', 'webp', 'svg', 'ico', 'tiff', 'tif', 'heic', 'heif'];
            
            const allowedExtensions = [...wordExtensions, ...excelExtensions, ...imageExtensions];
            
            if (!allowedExtensions.includes(fileExtension)) {
                this.$message.error(`不支持上传 ${fileExtension.toUpperCase()} 格式文件，仅支持 Word、Excel 和图片格式`);
                return false;
            }
            
            return true;
        },
        // 自定义上传处理

 culture/src/views/strainReportLibrary/reportLibraryOneThree/components/approval/index.vue

@@ -64,9 +64,9 @@
                                </div>
                            </div>
                            <el-form-item prop="name" style="margin-top: 38px">
                                <el-upload action="#" :file-list="fileList" :on-preview="handlePreview">
                                <el-upload action="#" :file-list="fileList" :before-upload="beforeUpload" :on-preview="handlePreview">
                                    <el-button size="small" type="primary">点击上传</el-button>
                                    <div slot="tip" class="el-upload__tip">支持任意格式文件上传</div>
                                    <div slot="tip" class="el-upload__tip">支持 Word、Excel 和所有图片格式，禁止 PPT、PDF、CAJ</div>
                                </el-upload>
                            </el-form-item>

@@ -357,6 +357,36 @@
            }
            return [1, 1];
        },
        // 上传前校验
        beforeUpload(file) {
            // 获取文件扩展名
            const fileName = file.name || '';
            const fileExtension = fileName.substring(fileName.lastIndexOf('.') + 1).toLowerCase();
            
            // 禁止的文件类型
            const forbiddenExtensions = ['ppt', 'pptx', 'pdf', 'caj'];
            if (forbiddenExtensions.includes(fileExtension)) {
                this.$message.error(`不支持上传 ${fileExtension.toUpperCase()} 格式文件`);
                return false;
            }
            
            // 允许的文件类型
            // Word 格式
            const wordExtensions = ['doc', 'docx'];
            // Excel 格式
            const excelExtensions = ['xls', 'xlsx'];
            // 图片格式
            const imageExtensions = ['jpg', 'jpeg', 'png', 'gif', 'bmp', 'webp', 'svg', 'ico', 'tiff', 'tif', 'heic', 'heif'];
            
            const allowedExtensions = [...wordExtensions, ...excelExtensions, ...imageExtensions];
            
            if (!allowedExtensions.includes(fileExtension)) {
                this.$message.error(`不支持上传 ${fileExtension.toUpperCase()} 格式文件，仅支持 Word、Excel 和图片格式`);
                return false;
            }
            
            return true;
        },
        handlePreview(file) {
            if (file && file.url) {
                // 判断是否为图片文件