Merge pull request '发票作废申请,支持多图上传' (#195) from develop into master
Reviewed-on: http://git.xdadan.loc/tanex/emis-frontend/pulls/195
This commit is contained in:
commit
de25fa24fe
@ -12,7 +12,7 @@
|
||||
</el-form-item>
|
||||
<!-- </el-form> -->
|
||||
<!-- 数据表格 -->
|
||||
<el-table :data="invoiceList" style="width: 100%" border>
|
||||
<el-table :data="invoiceList" style="width: 100%; margin-bottom: 20px;" border>
|
||||
<el-table-column :label="$t('账单名称')" align="center" prop="settleBillName" min-width="150" />
|
||||
<el-table-column :label="$t('账单号')" align="center" prop="settleBillNo" min-width="150" />
|
||||
<el-table-column :label="$t('金额')" align="center" prop="applyMoney" min-width="150" />
|
||||
@ -32,7 +32,7 @@
|
||||
style="width: 500px;" />
|
||||
</el-form-item>
|
||||
<el-form-item label="附件上传" prop="applyTextUrl">
|
||||
<el-upload class="upload-demo" style="width: 500px;" drag v-if="!isFormDisabled"
|
||||
<!-- <el-upload class="upload-demo" style="width: 500px;" drag v-if="!isFormDisabled"
|
||||
action="https://jsonplaceholder.typicode.com/posts/" multiple :on-preview="handlePreview"
|
||||
:before-upload="beforeUpload" :file-list="fileList" :limit="1" :action="uploadImgUrl"
|
||||
:on-success="handleUploadSuccess" :on-error="handleUploadError" :headers="headers" :on-remove="handleRemove">
|
||||
@ -41,7 +41,8 @@
|
||||
</el-upload>
|
||||
<div v-else>
|
||||
<el-link v-for="item in fileList" :key="item.url" :href="item.url" target="_blank">{{ item.name }}</el-link>
|
||||
</div>
|
||||
</div> -->
|
||||
<ImageUpload ref="imageUpload" :fileSize="5" :limit="10" v-model="form.applyTextUrl"></ImageUpload>
|
||||
</el-form-item>
|
||||
|
||||
<div style="text-align: right;margin-bottom: 10px;" v-show="!isFormDisabled">
|
||||
@ -213,12 +214,5 @@ export default {
|
||||
}
|
||||
</script>
|
||||
<style lang="scss" scoped>
|
||||
:deep.upload-demo .el-upload-dragger {
|
||||
width: 500px;
|
||||
}
|
||||
|
||||
:deep.label-top-item {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
}
|
||||
</style>
|
||||
|
||||
Loading…
Reference in New Issue
Block a user