1.目标录入合作者在Excel中可多选修改模板

master/src/main/java/com/ruoyi/common/utils/file/ExcelUtils.java

@@ -38,7 +38,7 @@ public class ExcelUtils {
             if (fileName.endsWith("xls")) {
                 //2003
                 workbook = new HSSFWorkbook(is);
-            } else if (fileName.endsWith("xlsx")) {
+            } else if (fileName.endsWith("xlsx")||fileName.endsWith("xlsm")) {
                 //2007 及2007以上
                 workbook = new XSSFWorkbook(is);
             }

master/src/main/java/com/ruoyi/project/common/CommonController.java

@@ -249,8 +249,8 @@ public class CommonController extends BaseController
             downloadname = "公司培训成绩导入模板.xlsx";
             url = "static/template/training/companyLevelRecord.xlsx";
         } else if( type.equals("targetlist") ) {
-            downloadname = "目标录入导入模板.xlsx";
-            url = "static/template/plant/targetlist.xlsx";
+            downloadname = "目标录入导入模板.xlsm";
+            url = "static/template/plant/targetlist.xlsm";
         } else if( type.equals("targetreview") ) {
             downloadname = "目标回顾导入模板.xlsx";
             url = "static/template/plant/targetreview.xlsx";

master/src/main/java/com/ruoyi/project/plant/controller/TTargetlistController.java

@@ -262,7 +262,7 @@ public class TTargetlistController extends BaseController
                             String partner = "";
                             for (String s : split) {
                                 for (SysDictData p : partners) {
-                                    if (p.getDictLabel().equals(s.trim())) {
+                                    if (p.getDictLabel().equals(s.trim())&&!partner.contains(s)) {
                                         partner += p.getDictValue() + ",";//合作者
                                         break;
                                     }

ui/src/views/plant/targetlist/index.vue

@@ -220,7 +220,7 @@
       <el-upload
         ref="upload"
         :limit="1"
-        accept=".xlsx, .xls"
+        accept=".xlsx, .xls, .xlsm"
         :headers="upload.headers"
         :action="upload.url"
         :disabled="upload.isUploading"
@@ -241,7 +241,7 @@
         <form ref="downloadFileForm" :action="upload.downloadAction" target="FORMSUBMIT">
           <input name="type" :value="upload.type" hidden />
         </form>
-        <div class="el-upload__tip" style="color:red" slot="tip">{{ $t('提示：仅允许导入“xls”或“xlsx”格式文件！') }}</div>
+        <div class="el-upload__tip" style="color:red" slot="tip">{{ $t('提示：仅允许导入“xls”、“xlsx”或“xlsm”格式文件！') }}</div>
       </el-upload>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitFileForm">{{ $t('确 定') }}</el-button>