sugangqiang 8 ماه پیش
والد
کامیت
7d15e6af30
2فایلهای تغییر یافته به همراه3 افزوده شده و 4 حذف شده
  1. 2 3
      app/common/validate/Upload.php
  2. 1 1
      public/static/modular/talentAllowance/talentAllowanceInfo_info_supple.js

+ 2 - 3
app/common/validate/Upload.php

@@ -8,9 +8,9 @@ class Upload extends Validate {
 
     protected $rule = [
         'image' => ['fileExt' => 'jpg,png,gif,jpeg', 'fileSize' => 5 * 1024 * 1024, 'fileMime' => 'image/jpg,image/png,image/gif,image/jpeg'],
-        'file' => ['fileExt' => 'pdf,doc,docx,xlsx,xls,csv', 'fileSize' => 20 * 1024 * 1024, 'fileMime' => 'application/pdf,application/msword,application/vnd.openxmlformats-officedocument.wordprocessingml.document,application/vnd.ms-excel,application/vnd.openxmlformats-officedocument.spreadsheetml.sheet'],
+        'file' => ['fileExt' => 'pdf,doc,docx,xlsx,xls,csv', 'fileSize' => 20 * 1024 * 1024, 'fileMime' => 'application/pdf,application/msword,application/vnd.openxmlformats-officedocument.wordprocessingml.document,application/vnd.ms-excel,application/vnd.openxmlformats-officedocument.spreadsheetml.sheet,application/CDFV2'],
         'hybrid' => ['fileExt' => 'zip,rar,7z', 'fileSize' => 100 * 1024 * 1024, 'fileMime' => 'application/zip,application/x-rar-compressed,application/x-7z-compressed'],
-        'system' => ['fileExt' => 'jpg,png,gif,jpeg,pdf,doc,docx,xlsx,xls,csv', 'fileSize' => 20 * 1024 * 1024, 'fileMime' => 'image/jpg,image/png,image/gif,image/jpeg,application/pdf,application/pdf,application/msword,application/vnd.openxmlformats-officedocument.wordprocessingml.document,application/vnd.ms-excel,application/vnd.openxmlformats-officedocument.spreadsheetml.sheet']
+        'system' => ['fileExt' => 'jpg,png,gif,jpeg,pdf,doc,docx,xlsx,xls,csv', 'fileSize' => 20 * 1024 * 1024, 'fileMime' => 'image/jpg,image/png,image/gif,image/jpeg,application/pdf,application/pdf,application/msword,application/vnd.openxmlformats-officedocument.wordprocessingml.document,application/vnd.ms-excel,application/vnd.openxmlformats-officedocument.spreadsheetml.sheet,application/CDFV2']
     ];
     protected $message = [
         'image.fileExt' => '图片的格式仅支持:png,jpg,jpeg,gif',
@@ -26,5 +26,4 @@ class Upload extends Validate {
         'system.fileSize' => '文件大小不能大于20兆',
         'system.fileMime' => '文件类型不支持'
     ];
-
 }

+ 1 - 1
public/static/modular/talentAllowance/talentAllowanceInfo_info_supple.js

@@ -490,7 +490,7 @@ TalentAllowanceInfoDlg.initCommonFileTable = function () {
                     var imgStr = "";
                     if (suffix == "pdf" || suffix == "PDF") {
                         imgStr = "<button type='button'  onclick=\"Feng.showPdf('" + value + "','" + row.id + "','" + row.originalName + "')\" class=\"btn btn-xs btn-danger\"><i class=\"fa fa-file-pdf-o\" aria-hidden=\"true\"></i></button>";
-                    } else if (suffix == "xlsx" || suffix == "XLSX" || suffix == 'xls' || suffix == 'XLS') {
+                    } else if (suffix == "xlsx" || suffix == "XLSX" || suffix == 'xls' || suffix == 'XLS' || suffix == "doc" || suffix == "DOC" || suffix == 'docx' || suffix == "DOCX") {
                         imgStr = "<button type='button'  onclick=\"Feng.showExcel('" + value + "','" + row.id + "','" + row.originalName + "')\" class=\"btn btn-xs btn-danger\"><i class=\"fa fa-file-excel-o\" aria-hidden=\"true\"></i></button>";
                     } else {
                         imgStr = '<img class=\"cImgUrl\"  src=\"' + value + '\" style=\"width:25px;height:25px;\">';