瀏覽代碼

Merge commit 'eaf5e64a047bbd6f2d794e1dc60c39318fa08059' into HEAD

gitadmin 5 月之前
父節點
當前提交
a7d73ce3c2

+ 1 - 1
public/version.json

@@ -1,4 +1,4 @@
 {
-    "version": "2.2.501",
+    "version": "2.2.50111",
     "message": "发现有新版本发布,确定更新系统?"
 }

+ 2 - 1
src/components/UploadFile/index.vue

@@ -266,7 +266,8 @@ export default {
         }
         return true
       }
-      const isType = file.type.indexOf(this.fileType) >= 0 && file.type != ''
+      console.log(file, this.fileType)
+      const isType = this.fileType.indexOf(file.type) >= 0 && file.type != ''
       if (!isType) {
         if (tip != 0) {
           this.$message.error('请上传正确的格式!')

+ 2 - 2
src/views/purchasingManagement/purchaseReceipt/uploadVoucherModal.vue

@@ -24,7 +24,7 @@
             uploadType="attach"
             :action="attachAction"
             upText="添加文件"
-            fileType="pdf"
+            fileType="application/pdf"
             @change="changeImport"></Upload>
           <div style="color:#999999;">(只支持PDF格式,最多10个附件)</div>
         </a-form-model-item>
@@ -122,7 +122,7 @@ export default {
   .uploadVoucher-modal{
     .uploadVoucher-con{
      .btn-con{
-       margin: 10px 0 20px;
+       margin: 30px 0 0;
        text-align: center;
        .button-cancel{
          font-size: 12px;