geg-gas/geg-gas-web
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'gaoang-2024-8' into 'dev'

Browse Source 
feat: 审批提交弹窗可点x关闭，上传按钮disabled时隐藏

See merge request itc-framework/ma/2024/front!15
This commit is contained in:
Administrator
2024-08-21 02:15:54 +00:00
parent 82205bb46f 786f2ac029
commit 900e05586a
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/components/Form/src/components/Upload.vue
View File

@ -65,7 +65,7 @@
> >
<plus-outlined v-if="listType == 'picture-card'" /> <plus-outlined v-if="listType == 'picture-card'" />
<div :style="style" v-else> <div :style="style" v-else>
<a-button :loading="loading" :disabled="loading"> <a-button :loading="loading" :disabled="loading" v-if="!disabled">
<upload-outlined /> <upload-outlined />
点击上传 点击上传
</a-button> </a-button>

2
src/components/SecondDev/OpinionDialog.vue
View File

@ -1,5 +1,5 @@
<template> <template>
<a-modal :mask-closable="false" :title="dialogTitle" :visible="isOpen" :width="500" centered class="geg"> <a-modal :mask-closable="false" :title="dialogTitle" :visible="isOpen" :width="500" centered class="geg" @cancel="onClickCancel">
<template #footer> <template #footer>
<a-button :disabled="loading" @click="onClickCancel">取消</a-button> <a-button :disabled="loading" @click="onClickCancel">取消</a-button>
<a-button :loading="loading" type="primary" @click="onClickOK">确定</a-button> <a-button :loading="loading" type="primary" @click="onClickOK">确定</a-button>