Merge remote-tracking branch 'origin/material-ui' into material-ui
This commit is contained in:
commit
9085405a53
|
|
@ -248,7 +248,7 @@
|
||||||
</div>
|
</div>
|
||||||
<span slot="footer" class="dialog-footer">
|
<span slot="footer" class="dialog-footer">
|
||||||
<el-button type="primary" @click="print">打 印</el-button>
|
<el-button type="primary" @click="print">打 印</el-button>
|
||||||
<el-button type="primary" @click="">查看PDF</el-button>
|
<!-- <el-button type="primary" @click="">查看PDF</el-button> -->
|
||||||
<el-button @click="dialogVisible = false">取 消</el-button>
|
<el-button @click="dialogVisible = false">取 消</el-button>
|
||||||
</span>
|
</span>
|
||||||
</el-dialog>
|
</el-dialog>
|
||||||
|
|
|
||||||
|
|
@ -69,6 +69,7 @@
|
||||||
:class="{ disabledFbs: uploadDisabled }"
|
:class="{ disabledFbs: uploadDisabled }"
|
||||||
:on-preview="picturePreviewFbs"
|
:on-preview="picturePreviewFbs"
|
||||||
:on-remove="handleRemoveElectricianImgList"
|
:on-remove="handleRemoveElectricianImgList"
|
||||||
|
:on-success="handleUploadSuccess"
|
||||||
>
|
>
|
||||||
<!-- 文件格式下载,图片格式预览 -->
|
<!-- 文件格式下载,图片格式预览 -->
|
||||||
<div slot="file" slot-scope="{ file }">
|
<div slot="file" slot-scope="{ file }">
|
||||||
|
|
@ -832,8 +833,8 @@ export default {
|
||||||
this.urlTemp = require('../../../../../assets/file.png')
|
this.urlTemp = require('../../../../../assets/file.png')
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
this.maForm.bmFileInfos = fileList
|
// this.maForm.bmFileInfos = fileList
|
||||||
console.log('🚀 ~ handleChangeBusinessList ~ this.bmFileInfos:', this.bmFileInfos)
|
// console.log('🚀 ~ handleChangeBusinessList ~ this.bmFileInfos:', this.bmFileInfos)
|
||||||
// 手动触发表单验证
|
// 手动触发表单验证
|
||||||
this.$refs.maForm.validateField('bmFileInfos')
|
this.$refs.maForm.validateField('bmFileInfos')
|
||||||
// // 根据 bmFileInfos 是否有值来控制 bmFileInfos 的验证
|
// // 根据 bmFileInfos 是否有值来控制 bmFileInfos 的验证
|
||||||
|
|
@ -851,6 +852,12 @@ export default {
|
||||||
|
|
||||||
console.log('4444444444')
|
console.log('4444444444')
|
||||||
},
|
},
|
||||||
|
handleUploadSuccess(res, file, fileList) {
|
||||||
|
if (res.code === 200) {
|
||||||
|
this.maForm.bmFileInfos.push({...res.data, fileName: res.data.name, fileUrl: res.data.url})
|
||||||
|
}
|
||||||
|
console.log('🚀 ~ handleUploadSuccess ~ this.maForm.bmFileInfos:', this.maForm.bmFileInfos)
|
||||||
|
},
|
||||||
|
|
||||||
isImage(file) {
|
isImage(file) {
|
||||||
this.urlTemp = require('@/assets/file.png')
|
this.urlTemp = require('@/assets/file.png')
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue