上传文件修改

src/views/supplier/components/uploadFile.vue

@@ -81,11 +81,11 @@ export default {
     // 图片上传之前的钩子
     beforeUpload(file) {
       this.params.authUserId = this.authUserId || -1
-      const size = file.size
-      if (size > 1024 * 2000) {
-        this.$message.warning('文件上传大小超出限制(≤2MB)')
-        return false
-      }
+      // const size = file.size
+      // if (size > 1024 * 2000) {
+      //   this.$message.warning('文件上传大小超出限制(≤2MB)')
+      //   return false
+      // }
     },
     remove() {
       this.$emit('remove')

src/views/supplier/user/add.vue

@@ -90,7 +90,7 @@
     </div>
 
     <!-- 供应商添加品牌的对话框 -->
-    <el-dialog v-loading="dialogLoading" title="添加代理品牌" :visible.sync="showDialog" width="width" @closed="dialogClosed">
+    <el-dialog title="添加代理品牌" :visible.sync="showDialog" width="width" @closed="dialogClosed">
       <el-form ref="formData2Ref" :model="formData2" label-width="120px" :rules="formDataRules">
 
         <el-form-item label="选择品牌:" prop="brandId">
@@ -167,7 +167,7 @@
           <el-input v-model="formData2.statementImage" type="hidden" class="hiddenInput" />
         </el-form-item>
 
-        <el-form-item v-else ref="statement4" label="文件:" prop="statementFileId">
+        <el-form-item v-else ref="statementFileRef" label="文件:" prop="statementFileId">
           <upload-file
             v-if="formData2.statementType === 4"
             ref="uploadFileRef"
@@ -189,7 +189,7 @@
 
       <div slot="footer">
         <el-button @click="showDialog = false">取 消</el-button>
-        <el-button type="primary" @click="handleAddBrand">确 定</el-button>
+        <el-button type="primary" :loading="dialogLoading" @click="handleAddBrand">确 定</el-button>
       </div>
     </el-dialog>
 
@@ -376,9 +376,11 @@ export default {
     },
     // 添加品牌
     handleAddBrand() {
+      this.dialogLoading = true
       // 如果声明类型为4，则需要先上传文件再保存
-      if (this.formData2.statementType === 4) {
-        this.$refs.formData2Ref.$refs.upload.submit()
+      if (this.formData2.statementType === 4 && (this.formData2.statementFileId === '' || this.formData2.statementFileId === null)) {
+        console.log(this.$refs.formData2Ref)
+        this.$refs.uploadFileRef.$refs.upload.submit()
       } else {
         this.saveShopInfo()
       }
@@ -388,7 +390,6 @@ export default {
         if (!valid) {
           return
         }
-        debugger
         // 如果是新增的
         const shopInfo = this.clone(this.formData2)
         if (shopInfo.isNew) {
@@ -399,13 +400,13 @@ export default {
         }
         this.addExcludeBrand(shopInfo.brandId)
         shopInfo.isNew = false
+        this.dialogLoading = false
         this.showDialog = false
       })
     },
     // 移除品牌
     handleRemove(index) {
       const pop = this.supplierBrands.splice(index, 1)[0]
-      console.log(pop)
       this.removeExcludeBrand(pop.brandId)
     },
     // 修改品牌
@@ -445,10 +446,12 @@ export default {
     },
 
     // 文件上传成功
-    fileUploadSuccess(data, file) {
-      this.formData2.statementFileName = file.name
-      this.formData2.statementFileId = data.data
-      this.saveShopInfo()
+    fileUploadSuccess(data) {
+      this.formData2.statementFileName = data.data.fileName
+      this.formData2.statementFileId = data.data.fileId
+      if (data.code === 0) {
+        this.saveShopInfo()
+      }
     },
     fileUploadFaild(err, file, fileList) {
       this.$message.error('文件上传失败')
@@ -458,6 +461,9 @@ export default {
       this.formData2.statementFileId = null
       console.log('删除文件')
     },
+    fileChange() {
+      // this.$refs.statementFileRef
+    },
 
     // 图片上传成功 品牌logo  1
     imageUploadSuccess1(data) {