Merge remote-tracking branch 'origin/master'

src/views/purchase/cert/supCertAddDialog.vue

@@ -3,7 +3,9 @@
     <el-form :model="formData" :rules="formRules" ref="dataForm">
       <el-card style="margin-top: -30px">
         <el-button-group style="display: flex">
-                    <el-button type="primary" @click.native="submitUpload()" style="margin: 0 60px 10px auto; height: 35px" :loading="loading">提交</el-button>
+          <el-button type="primary" @click.native="submitUpload()" style="margin: 0 60px 10px auto; height: 35px"
+                     :loading="loading">提交
+          </el-button>
         </el-button-group>
         <el-row>
           <el-col :span="3">
@@ -126,7 +128,7 @@
                 :limit="1"
                 :headers="headers"
                 :on-exceed="uploadHandleExceed"
-                                accept=".jpg,.png"
+                accept=".jpg,.png,.pdf,.doc"
                 :on-change="uploadOnchange"
                 :on-success="uploadHandleSuccess"
                 :on-error="uploadHandleError"
@@ -136,7 +138,7 @@
                 <el-button slot="trigger" size="small" type="primary" :disabled="formData.auditStatus == 1">
                   {{ choiceFile }}
                 </el-button>
-                                <div>只能上传 .jpg,.png 文件，且不超过 2 MB</div>
+                <div>只能上传 jpg,png,pdf,doc 文件，且不超过 3 MB</div>
               </el-upload>
               <!--                            <el-button type="primary" size="mini" icon="search" @click="toViewCompanyCert"-->
               <!--                                       style="text-align:right"-->
@@ -313,8 +315,8 @@ export default {
       let uid = file.uid
       let pos = fileName.lastIndexOf(".");
       let lastName = fileName.substring(pos, fileName.length);
-            if (lastName.toLowerCase() !== ".jpg" && lastName.toLowerCase() !== ".png") {
-                this.$message.error("上传文件只能是 .jpg,.png 格式");
+      if (lastName.toLowerCase() !== ".jpg" && lastName.toLowerCase() !== ".png" && lastName.toLowerCase() !== ".doc" && lastName.toLowerCase() !== ".pdf") {
+        this.$message.error("上传文件只能是 jpg,png,doc,pdf 格式");
         for (let i = 0; i < fileList.length; i++) {//从list删除
           if (fileList[i].uid === uid) {
             fileList.splice(i, 1)