|
@@ -263,30 +263,31 @@ export default {
|
|
statementContent: '', // 声明弹窗内容
|
|
statementContent: '', // 声明弹窗内容
|
|
statementFileId: null, // 声明文件id
|
|
statementFileId: null, // 声明文件id
|
|
statementImage: '', // 声明图片
|
|
statementImage: '', // 声明图片
|
|
- statementLink: '' // 声明链接
|
|
|
|
|
|
+ statementLink: '', // 声明链接
|
|
|
|
+ statementFileName: ''
|
|
},
|
|
},
|
|
// 表单校验规则1
|
|
// 表单校验规则1
|
|
addFromDataRules: {
|
|
addFromDataRules: {
|
|
- shopType: { required: true, message: '供应商类型不能为空', trigger: 'change' },
|
|
|
|
- brandId: { required: true, message: '品牌不能为空', trigger: 'change' },
|
|
|
|
|
|
+ shopType: { required: true, message: '供应商类型不能为空', trigger: 'change', type: 'number' },
|
|
|
|
+ brandId: { required: true, message: '品牌不能为空', trigger: 'change', type: 'number' },
|
|
shopName: { required: true, message: '请输入供应商名称', trigger: 'change' },
|
|
shopName: { required: true, message: '请输入供应商名称', trigger: 'change' },
|
|
mobile: [
|
|
mobile: [
|
|
{ required: true, message: '请输入手机号', trigger: 'blur' },
|
|
{ required: true, message: '请输入手机号', trigger: 'blur' },
|
|
{ validator: valideMobile, trigger: 'blur' }
|
|
{ validator: valideMobile, trigger: 'blur' }
|
|
],
|
|
],
|
|
linkMan: { required: true, message: '联系人不能为空', trigger: 'blur' },
|
|
linkMan: { required: true, message: '联系人不能为空', trigger: 'blur' },
|
|
- countryId: { required: true, message: '产地不能为空', trigger: 'change' },
|
|
|
|
|
|
+ countryId: { required: true, message: '产地不能为空', trigger: 'change', type: 'number' },
|
|
brandAuthLogo: { required: true, message: '品牌logo不能为空', trigger: 'change' },
|
|
brandAuthLogo: { required: true, message: '品牌logo不能为空', trigger: 'change' },
|
|
shopInfo: { validator: valideShopInfo, trigger: 'change', required: true }
|
|
shopInfo: { validator: valideShopInfo, trigger: 'change', required: true }
|
|
},
|
|
},
|
|
// 表单校验规则2
|
|
// 表单校验规则2
|
|
brandDataRules: {
|
|
brandDataRules: {
|
|
- brandId: { required: true, message: '品牌不能为空', trigger: 'change' },
|
|
|
|
- countryId: { required: true, message: '产地不能为空', trigger: 'change' },
|
|
|
|
|
|
+ brandId: { required: true, message: '品牌不能为空', trigger: 'change', type: 'number' },
|
|
|
|
+ countryId: { required: true, message: '产地不能为空', trigger: 'change', type: 'number' },
|
|
brandAuthLogo: { required: true, message: '品牌logo不能为空', trigger: 'change' },
|
|
brandAuthLogo: { required: true, message: '品牌logo不能为空', trigger: 'change' },
|
|
statementContent: { required: true, message: '声明内容不能为空', trigger: 'blur' },
|
|
statementContent: { required: true, message: '声明内容不能为空', trigger: 'blur' },
|
|
statementLink: { required: true, message: '声明链接不能为空', trigger: 'blur' },
|
|
statementLink: { required: true, message: '声明链接不能为空', trigger: 'blur' },
|
|
- statementFileId: { required: true, message: '请上传声明文件', trigger: 'change' },
|
|
|
|
|
|
+ statementFileId: { required: true, message: '请上传声明文件', trigger: 'change', type: 'number' },
|
|
statementImage: { required: true, message: '请上传声明图片', trigger: 'change' }
|
|
statementImage: { required: true, message: '请上传声明图片', trigger: 'change' }
|
|
},
|
|
},
|
|
// 上传成功的文件列表
|
|
// 上传成功的文件列表
|
|
@@ -486,7 +487,6 @@ export default {
|
|
this.prevBrandId = -1
|
|
this.prevBrandId = -1
|
|
console.log('添加:' + this.excludeBrand)
|
|
console.log('添加:' + this.excludeBrand)
|
|
}
|
|
}
|
|
-
|
|
|
|
this.showDialog = false
|
|
this.showDialog = false
|
|
}
|
|
}
|
|
})
|
|
})
|
|
@@ -508,7 +508,7 @@ export default {
|
|
this.fileList2 = [{ name: '文件已上传', url: this.brandData.statementImage }]
|
|
this.fileList2 = [{ name: '文件已上传', url: this.brandData.statementImage }]
|
|
}
|
|
}
|
|
if (this.brandData.statementFileId) {
|
|
if (this.brandData.statementFileId) {
|
|
- this.fileList3 = [{ name: '文件已上传', url: '' }]
|
|
|
|
|
|
+ this.fileList3 = [{ name: this.brandData.statementFileName, url: '' }]
|
|
}
|
|
}
|
|
this.showDialog = true
|
|
this.showDialog = true
|
|
},
|
|
},
|
|
@@ -541,8 +541,11 @@ export default {
|
|
},
|
|
},
|
|
// 文件上传成功
|
|
// 文件上传成功
|
|
fileUploadSuccess(data) {
|
|
fileUploadSuccess(data) {
|
|
- this.brandData.statementFileId = data.data
|
|
|
|
- this.saveBrand()
|
|
|
|
|
|
+ this.brandData.statementFileId = data.data.fileId
|
|
|
|
+ this.brandData.statementFileName = data.data.fileName
|
|
|
|
+ if (data.code === 0) {
|
|
|
|
+ this.saveBrand()
|
|
|
|
+ }
|
|
},
|
|
},
|
|
fileUploadFaild(err, file, fileList) {
|
|
fileUploadFaild(err, file, fileList) {
|
|
console.log(err)
|
|
console.log(err)
|