Merge remote-tracking branch 'origin/build' into build

This commit is contained in:
aixianling
2022-12-26 10:28:05 +08:00

View File

@@ -88,9 +88,8 @@
<ai-dialog <ai-dialog
:visible.sync="isShowAuth" :visible.sync="isShowAuth"
width="890px" width="890px"
title="权限管理" customFooter
@close="isShowAuth = false" title="权限管理">
@onConfirm="isShowAuth = false">
<ai-user-selecter ref="aiUserSelecter" v-if="isShowUser" :disabledList="disabledList" :props="{label: 'name', id: 'wxUserId'}" :instance="instance" v-model="authInfos" @change="onUserChange"> <ai-user-selecter ref="aiUserSelecter" v-if="isShowUser" :disabledList="disabledList" :props="{label: 'name', id: 'wxUserId'}" :instance="instance" v-model="authInfos" @change="onUserChange">
<el-button size="small" type="primary" icon="iconfont iconAdd">添加成员</el-button> <el-button size="small" type="primary" icon="iconfont iconAdd">添加成员</el-button>
</ai-user-selecter> </ai-user-selecter>
@@ -111,6 +110,9 @@
</template> </template>
</el-table-column> </el-table-column>
</ai-table> </ai-table>
<div class="dialog-footer" slot="footer">
<el-button @click="isShowAuth = false">关闭</el-button>
</div>
</ai-dialog> </ai-dialog>
</template> </template>
</ai-list> </ai-list>