update modal可全屏

This commit is contained in:
赵霄
2023-10-08 16:48:57 +08:00
parent 20b2604ff8
commit 893e1450af
51 changed files with 169 additions and 105 deletions
+13 -6
View File
@@ -1,9 +1,10 @@
<template>
<a-modal
<j-modal
:title="title"
:width="450"
:visible="visible"
:closable="false"
switchFullscreen
:maskClosable="false">
<template slot="footer">
@@ -12,14 +13,17 @@
<a-form>
<a-form-item v-if="isMultiTenant" :labelCol="{span:4}" :wrapperCol="{span:20}" style="margin-bottom:10px" :validate-status="validate_status1">
<a-tooltip placement="topLeft" >
<a-tooltip placement="topLeft">
<template slot="title">
<span>您有多个租户请选择登录租户</span>
</template>
<a-avatar style="background-color:#87d068" icon="gold" />
</a-tooltip>
<a-select @change="handleTenantChange" :class="{'valid-error':validate_status1==='error'}" placeholder="请选择登录租户" style="margin-left:10px;width: 80%">
<a-select @change="handleTenantChange"
:class="{'valid-error':validate_status1==='error'}"
placeholder="请选择登录租户"
style="margin-left:10px;width: 80%">
<a-icon slot="suffixIcon" type="gold" />
<a-select-option v-for="d in tenantList" :key="d.id" :value="d.id">
{{ d.name }}
@@ -28,14 +32,17 @@
</a-form-item>
<a-form-item v-if="isMultiDepart" :labelCol="{span:4}" :wrapperCol="{span:20}" style="margin-bottom:10px" :validate-status="validate_status2">
<a-tooltip placement="topLeft" >
<a-tooltip placement="topLeft">
<template slot="title">
<span>您有多个部门请选择登录部门</span>
</template>
<a-avatar style="background-color:rgb(104, 208, 203);" icon="gold" />
</a-tooltip>
<a-select @change="handleDepartChange" :class="{'valid-error':validate_status2==='error'}" placeholder="请选择登录部门" style="margin-left:10px;width: 80%">
<a-select @change="handleDepartChange"
:class="{'valid-error':validate_status2==='error'}"
placeholder="请选择登录部门"
style="margin-left:10px;width: 80%">
<a-icon slot="suffixIcon" type="gold" />
<a-select-option v-for="d in departList" :key="d.id" :value="d.orgCode">
{{ d.departName }}
@@ -44,7 +51,7 @@
</a-form-item>
</a-form>
</a-modal>
</j-modal>
</template>
<script>
+6 -6
View File
@@ -8,12 +8,12 @@
<a @click="onThirdLogin('wechat_open')" title="微信"><a-icon class="item-icon" type="wechat"></a-icon></a>
</div>
<!-- 第三方登录绑定账号密码输入弹框 -->
<a-modal title="请输入密码" :visible="thirdPasswordShow" @ok="thirdLoginCheckPassword" @cancel="thirdLoginNoPassword">
<j-modal title="请输入密码" :visible="thirdPasswordShow" switchFullscreen @ok="thirdLoginCheckPassword" @cancel="thirdLoginNoPassword">
<a-input-password placeholder="请输入密码" v-model="thirdLoginPassword" />
</a-modal>
</j-modal>
<!-- 第三方登录提示是否绑定账号弹框 -->
<a-modal :footer="null" :closable="false" :visible="thirdConfirmShow" :class="'ant-modal-confirm'">
<j-modal :footer="null" :closable="false" :visible="thirdConfirmShow" :class="'ant-modal-confirm'" switchFullscreen>
<div class="ant-modal-confirm-body-wrapper">
<div class="ant-modal-confirm-body">
<a-icon type="question-circle" style="color:#faad14"/>
@@ -27,10 +27,10 @@
<a-button @click="thirdLoginUserBind" type="primary">确认绑定</a-button>
</div>
</div>
</a-modal>
</j-modal>
<!-- 第三方登录绑定手机号 -->
<a-modal :visible="bindingPhoneModal" :class="'ant-modal-confirm'">
<j-modal :visible="bindingPhoneModal" :class="'ant-modal-confirm'" switchFullscreen>
<template slot="footer">
<a-button key="submit" type="primary" @click="thirdHandleOk">
确定
@@ -72,7 +72,7 @@
</a-col>
</a-row>
</div>
</a-modal>
</j-modal>
</div>
</template>