Merge remote-tracking branch 'origin/dev_third_stage' into dev_third_stage

jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/oss/service/impl/OSSFileServiceImpl.java

@@ -19,11 +19,9 @@ import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import org.springframework.util.FileCopyUtils;
 import org.springframework.web.multipart.MultipartFile;
-import sun.misc.BASE64Encoder;
 
 import java.io.File;
 import java.io.IOException;
-import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Date;
@@ -230,14 +228,15 @@ public class OSSFileServiceImpl extends ServiceImpl<OSSFileMapper, OSSFile> impl
                     throw new JeroBootException("Only upload pdf,word,excel type of file Please select the file again！");
                 }
             }
-        } else if ("2".equals(state)) {
+        } else if ("2".equals(state)) { // 认证-参数导出模板上传 专用
-            String fileTypeStrTwo = ".doc,.DOC,.docx,.DOCX,.xls, .XLS,.xlsx,.XLSX";
+            String fileTypeStrTwo = ".docx,.DOCX,.xlsx,.XLSX";
+            List<String> fileTypeStrTwoList = Arrays.asList(fileTypeStrTwo.split(","));
             //固定文件
-            if (!fileTypeStrTwo.contains(fileType)) {
+            if (!fileTypeStrTwoList.contains(fileType)) {
                 if (cut.equals(CutEnum.CN.getValue())) {
-                    throw new JeroBootException("只能够上传word,excel类型的文件。请重新选择文件！");
+                    throw new JeroBootException("只能够上传.docx,.DOCX,.xlsx,.XLSX后缀类型的文件。请重新选择文件！");
                 } else {
-                    throw new JeroBootException("Only upload word,excel type of file Please select the file again！");
+                    throw new JeroBootException("Only upload .docx,.DOCX,.xlsx,.XLSX suffix type of file Please select the file again！");
                 }
             }
         }  else {

jero-web/src/common/lang/en-us.js

@@ -1272,4 +1272,7 @@ module.exports = {
   BatchMaintenanceProgress:'Batch Maintenance Progress',
   BatchChangeStatus:'Batch Change Status',
   CollectinguthenticationParameters:'Collecting Authentication Parameters',
+  rejectedBy:'Rejected By',
+  rejectionTime:'Rejection Time',
+  rejectReason:'Reject Reason',
 }

jero-web/src/common/lang/zh-cn.js

@@ -1374,5 +1374,7 @@ module.exports = {
   BatchMaintenanceProgress:'批量维护进度',
   BatchChangeStatus:'批量修改状态',
   CollectinguthenticationParameters:'认证参数收集',
-
+  rejectedBy:'拒绝人',
+  rejectionTime:'拒绝时间',
+  rejectReason:'拒绝原因',
 }

jero-web/src/views/projectManagement/components/listOfRegulationsView.vue

@@ -433,6 +433,46 @@
               </div>
             </a-col>
           </a-row>
+          <div class="header-text">
+            {{$t('reasonsForRejection')}}
+          </div>
+          <a-row :gutter="24">
+            <a-col :span="12">
+              <div class="box-title-text">
+                <div class="title-text">
+                <span class="title-text-text"
+                      :title="$t('rejectedBy')">{{$t('rejectedBy')}}</span>
+                </div>
+                <div class="itemModel">
+                  {{formInline.verifyRemark ? formInline.verifyRemark : '--'}}
+                </div>
+              </div>
+            </a-col>
+            <a-col :span="12">
+              <div class="box-title-text">
+                <div class="title-text">
+                <span class="title-text-text"
+                      :title="$t('rejectionTime')">{{$t('rejectionTime')}}</span>
+                </div>
+                <div class="itemModel">
+                  {{formInline.verifyRemark ? formInline.verifyRemark : '--'}}
+                </div>
+              </div>
+            </a-col>
+          </a-row>
+          <a-row :gutter="24">
+            <a-col :span="12">
+              <div class="box-title-text">
+                <div class="title-text">
+                <span class="title-text-text"
+                      :title="$t('rejectReason')">{{$t('rejectReason')}}</span>
+                </div>
+                <div class="itemModel">
+                  {{formInline.verifyRemark ? formInline.verifyRemark : '--'}}
+                </div>
+              </div>
+            </a-col>
+          </a-row>
         </a-form-model>
       </a-spin>
       <div class="drawer-bootom-button">