Commit af9e06d7 authored by zhangyichen's avatar zhangyichen

修改bug 55463 【全局】建议点击弹窗外部,关闭弹窗的功能

parent 31f877f7
......@@ -302,6 +302,7 @@
</el-form>
<!-- 部门弹出框-->
<el-dialog
:close-on-click-modal="false"
title="选择所在部门"
:visible.sync="dialogDeptVisible"
:show-close="false"
......
......@@ -67,6 +67,7 @@
</el-form>
<!-- 部门弹出框-->
<el-dialog
:close-on-click-modal="false"
title="部门信息"
:visible.sync="dialogDeptVisible"
:show-close="false"
......
......@@ -151,6 +151,7 @@
</el-form>
<!-- 部门弹出框-->
<el-dialog
:close-on-click-modal="false"
title="部门信息"
:visible.sync="dialogDeptVisible"
:show-close="false"
......
......@@ -252,6 +252,7 @@
</div>
<!-- 人员选择弹出框-->
<el-dialog
:close-on-click-modal="false"
class="consumer-dialog"
title="用户信息"
:visible.sync="dialogPeopleVisible"
......@@ -304,6 +305,7 @@
</el-dialog>
<!-- 角色选择弹出框-->
<el-dialog
:close-on-click-modal="false"
class="consumer-dialog"
title="角色信息"
:visible.sync="dialogRoleVisible"
......@@ -359,6 +361,7 @@
</el-dialog>
<!-- 部门弹出框-->
<el-dialog
:close-on-click-modal="false"
class="consumer-dialog"
title="数据权限信息"
:visible.sync="dialogDeptVisible"
......
......@@ -62,6 +62,7 @@
</div>
<!-- 预览对话框 -->
<el-dialog
:close-on-click-modal="false"
title="表单预览"
center
:visible.sync="visiblePreview"
......
......@@ -14,6 +14,7 @@
<slot v-if="tagsVal.length === 0" name="blank" />
<el-button type="primary" class="tagsBtnAdd" :style="{marginLeft:tagsVal.length === 0 ? 0 : 10 + 'px'}" size="small" icon="el-icon-chat-line-square" @click="AddTags" />
<el-dialog
:close-on-click-modal="false"
custom-class="table-dialog"
:append-to-body="true"
:modal="$route.path !== '/templates/list'"
......
......@@ -14,6 +14,7 @@
<slot v-if="tagsVal.length === 0" name="blank" />
<el-button type="primary" class="tagsBtnAdd" :style="{marginLeft:tagsVal.length === 0 ? 0 : 10 + 'px'}" size="small" @click="AddTags">+</el-button>
<el-dialog
:close-on-click-modal="false"
custom-class="tags-dialog"
:append-to-body="true"
:modal="$route.path !== '/templates/list'"
......
......@@ -189,6 +189,7 @@
<el-button v-if="isCourtSign" type="primary" size="small">加签</el-button>
</div>-->
<!-- <el-dialog
:close-on-click-modal="false"
title="选择审批人"
:visible.sync="approverDialogVisible"
@closed="resetDialog"
......
......@@ -131,7 +131,8 @@
<!-- 加签节点 -->
<el-button v-if="isCourtSign" type="primary" size="small">加签</el-button>
</div>
<el-dialog
<el-dialog
:close-on-click-modal="false"
title="选择审批人"
:visible.sync="approverDialogVisible"
@closed="resetDialog"
......
<template>
<el-dialog
<el-dialog
:close-on-click-modal="false"
class="TemplateEndorsementDialog"
title="加签"
:visible.sync="endorsementDialogFormVisible"
......
<template>
<el-dialog
:close-on-click-modal="false"
class="rejectDialog"
title="拒绝"
:visible.sync="rejectDialogFormVisible"
......
......@@ -311,6 +311,7 @@
</el-dialog>
<!-- 导入弹窗-->
<el-dialog
:close-on-click-modal="false"
title="导入信息"
:visible.sync="dialogImport"
width="35%"
......
......@@ -166,6 +166,7 @@
</div>
</el-tabs>
<el-dialog
:close-on-click-modal="false"
title="人员信息"
:visible.sync="dialogPeopleVisible"
:destroy-on-close="true"
......
......@@ -184,7 +184,8 @@
<el-button type="primary" size="small" @click="toEdit">保 存</el-button>
</div>
</el-tabs>
<el-dialog
<el-dialog
:close-on-click-modal="false"
title="人员信息"
:visible.sync="dialogPeopleVisible"
:show-close="false"
......
......@@ -63,6 +63,7 @@
</div>
</el-card>
<el-dialog
:close-on-click-modal="false"
title="通知模板"
:visible.sync="dialogVisible"
:before-close="handleClose"
......
......@@ -164,7 +164,7 @@
/>
<!-- 操作日志详细 -->
<el-dialog title="异常日志信息" :visible.sync="open" width="700px" append-to-body>
<el-dialog :close-on-click-modal="false" title="异常日志信息" :visible.sync="open" width="700px" append-to-body>
<el-form ref="form" :model="form" label-width="100px" size="mini">
<el-row>
<!-- <el-col :span="12">-->
......
......@@ -164,7 +164,7 @@
/>
<!-- 操作日志详细 -->
<el-dialog title="操作日志信息" :visible.sync="open" width="700px" append-to-body>
<el-dialog :close-on-click-modal="false" title="操作日志信息" :visible.sync="open" width="700px" append-to-body>
<el-form ref="form" :model="form" label-width="100px" size="mini">
<el-row>
<!-- <el-col :span="12">-->
......
......@@ -188,7 +188,7 @@
</el-col>
</el-row>
<!-- 添加或修改参数配置对话框 -->
<el-dialog :title="title" :visible.sync="open" width="600px" append-to-body>
<el-dialog :close-on-click-modal="false" :title="title" :visible.sync="open" width="600px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-row>
<el-col :span="12">
......@@ -291,7 +291,7 @@
</div>
</el-dialog>
<!-- 用户导入对话框 -->
<el-dialog :title="upload.title" :visible.sync="upload.open" width="400px" append-to-body>
<el-dialog :close-on-click-modal="false" :title="upload.title" :visible.sync="upload.open" width="400px" append-to-body>
<el-upload
accept=".xlsx, .xls"
:headers="upload.headers"
......
<template>
<div>
<img :src="options.img" title="点击上传头像" class="img-circle img-lg" @click="editCropper()">
<el-dialog title="头像信息" :visible.sync="open" width="41.3vw" append-to-body>
<el-dialog :close-on-click-modal="false" title="头像信息" :visible.sync="open" width="41.3vw" append-to-body>
<el-row>
<el-col :xs="24" :md="12" :style="{height: '32.4vh'}">
<vue-cropper
......
......@@ -188,7 +188,7 @@
</el-col>
</el-row>
<!-- 添加或修改参数配置对话框 -->
<el-dialog :title="title" :visible.sync="open" width="600px" append-to-body>
<el-dialog :close-on-click-modal="false" :title="title" :visible.sync="open" width="600px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-row>
<el-col :span="12">
......@@ -291,7 +291,7 @@
</div>
</el-dialog>
<!-- 用户导入对话框 -->
<el-dialog :title="upload.title" :visible.sync="upload.open" width="400px" append-to-body>
<el-dialog :close-on-click-modal="false" :title="upload.title" :visible.sync="upload.open" width="400px" append-to-body>
<el-upload
accept=".xlsx, .xls"
:headers="upload.headers"
......
<template>
<div>
<img :src="options.img" title="点击上传头像" class="img-circle img-lg" @click="editCropper()">
<el-dialog title="头像信息" :visible.sync="open" width="41.3vw" append-to-body>
<el-dialog :close-on-click-modal="false" title="头像信息" :visible.sync="open" width="41.3vw" append-to-body>
<el-row>
<el-col :xs="24" :md="12" :style="{height: '32.4vh'}">
<vue-cropper
......
......@@ -188,7 +188,7 @@
</el-col>
</el-row>
<!-- 添加或修改参数配置对话框 -->
<el-dialog :title="title" :visible.sync="open" width="600px" append-to-body>
<el-dialog :close-on-click-modal="false" :title="title" :visible.sync="open" width="600px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-row>
<el-col :span="12">
......@@ -291,7 +291,7 @@
</div>
</el-dialog>
<!-- 用户导入对话框 -->
<el-dialog :title="upload.title" :visible.sync="upload.open" width="400px" append-to-body>
<el-dialog :close-on-click-modal="false" :title="upload.title" :visible.sync="upload.open" width="400px" append-to-body>
<el-upload
accept=".xlsx, .xls"
:headers="upload.headers"
......
<template>
<div>
<img :src="options.img" title="点击上传头像" class="img-circle img-lg" @click="editCropper()">
<el-dialog title="头像信息" :visible.sync="open" width="41.3vw" append-to-body>
<el-dialog :close-on-click-modal="false" title="头像信息" :visible.sync="open" width="41.3vw" append-to-body>
<el-row>
<el-col :xs="24" :md="12" :style="{height: '32.4vh'}">
<vue-cropper
......
......@@ -188,7 +188,7 @@
</el-col>
</el-row>
<!-- 添加或修改参数配置对话框 -->
<el-dialog :title="title" :visible.sync="open" width="600px" append-to-body>
<el-dialog :close-on-click-modal="false" :title="title" :visible.sync="open" width="600px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-row>
<el-col :span="12">
......@@ -291,7 +291,7 @@
</div>
</el-dialog>
<!-- 用户导入对话框 -->
<el-dialog :title="upload.title" :visible.sync="upload.open" width="400px" append-to-body>
<el-dialog :close-on-click-modal="false" :title="upload.title" :visible.sync="upload.open" width="400px" append-to-body>
<el-upload
accept=".xlsx, .xls"
:headers="upload.headers"
......
<template>
<div>
<img :src="options.img" title="点击上传头像" class="img-circle img-lg" @click="editCropper()">
<el-dialog title="头像信息" :visible.sync="open" width="41.3vw" append-to-body>
<el-dialog :close-on-click-modal="false" title="头像信息" :visible.sync="open" width="41.3vw" append-to-body>
<el-row>
<el-col :xs="24" :md="12" :style="{height: '32.4vh'}">
<vue-cropper
......
......@@ -188,7 +188,7 @@
</el-col>
</el-row>
<!-- 添加或修改参数配置对话框 -->
<el-dialog :title="title" :visible.sync="open" width="600px" append-to-body>
<el-dialog :close-on-click-modal="false" :title="title" :visible.sync="open" width="600px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-row>
<el-col :span="12">
......@@ -291,7 +291,7 @@
</div>
</el-dialog>
<!-- 用户导入对话框 -->
<el-dialog :title="upload.title" :visible.sync="upload.open" width="400px" append-to-body>
<el-dialog :close-on-click-modal="false" :title="upload.title" :visible.sync="upload.open" width="400px" append-to-body>
<el-upload
accept=".xlsx, .xls"
:headers="upload.headers"
......
<template>
<div>
<img :src="options.img" title="点击上传头像" class="img-circle img-lg" @click="editCropper()">
<el-dialog title="头像信息" :visible.sync="open" width="41.3vw" append-to-body>
<el-dialog :close-on-click-modal="false" title="头像信息" :visible.sync="open" width="41.3vw" append-to-body>
<el-row>
<el-col :xs="24" :md="12" :style="{height: '32.4vh'}">
<vue-cropper
......
......@@ -137,7 +137,7 @@
@pagination="getStaTable"
/>
<!-- 添加或修改工站信息对话框-->
<el-dialog class="stationDialog" :title="title" :visible.sync="open" width="60%" append-to-body>
<el-dialog :close-on-click-modal="false" class="stationDialog" :title="title" :visible.sync="open" width="60%" append-to-body>
<el-form ref="form" :model="form" :rules="rules" size="small" label-width="120px">
<el-row>
<el-col :span="12">
......
......@@ -167,7 +167,7 @@
</el-table>
</div>
<!-- 添加或修改部门对话框 -->
<el-dialog class="deptDialog" title="部门信息" :visible.sync="open" width="60%" append-to-body>
<el-dialog :close-on-click-modal="false" class="deptDialog" title="部门信息" :visible.sync="open" width="60%" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="120px">
<el-row>
<el-col v-if="form.parentId !== 0" :span="24">
......
......@@ -151,7 +151,7 @@
@pagination="getDevTable"
/>
<!-- 添加或修改设备信息对话框-->
<el-dialog class="deviceDialog" :title="title" :visible.sync="open" width="60%" append-to-body>
<el-dialog :close-on-click-modal="false" class="deviceDialog" :title="title" :visible.sync="open" width="60%" append-to-body>
<el-form ref="form" :model="form" :rules="rules" size="small" label-width="120px">
<el-row>
<el-col :span="12">
......
......@@ -203,7 +203,7 @@
/>
<!-- 添加或修改参数配置对话框 -->
<el-dialog class="dataAddDialog" :title="title" :visible.sync="open" width="500px" append-to-body>
<el-dialog :close-on-click-modal="false" class="dataAddDialog" :title="title" :visible.sync="open" width="500px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-form-item class="labelHeight" label="字典类型" prop="dictType">
<div slot="label" class="labelClass">
......
......@@ -218,7 +218,7 @@
@pagination="getList"
/>
<!-- 添加或修改参数配置对话框 -->
<el-dialog class="dictDialog" title="字典信息" :visible.sync="open" width="60%" append-to-body @close="reset">
<el-dialog :close-on-click-modal="false" class="dictDialog" title="字典信息" :visible.sync="open" width="60%" append-to-body @close="reset">
<el-form ref="form" :model="form" :rules="rules" label-width="130px">
<el-form-item class="labelHeight" label="字典名称" prop="dictName">
<div slot="label" class="labelClassRequired">
......
......@@ -159,7 +159,7 @@
</el-table>
</div>
<!-- 添加或修改菜单对话框 -->
<el-dialog class="menuDialog" title="菜单信息" :visible.sync="open" width="60%" append-to-body>
<el-dialog :close-on-click-modal="false" class="menuDialog" title="菜单信息" :visible.sync="open" width="60%" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="130px">
<el-row>
<el-col :span="24">
......
......@@ -164,7 +164,7 @@
/>
<!-- 添加或修改职务对话框 -->
<el-dialog title="岗位信息" :visible.sync="open" width="500px" append-to-body>
<el-dialog :close-on-click-modal="false" title="岗位信息" :visible.sync="open" width="500px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-form-item label="岗位名称" prop="postName">
<el-input v-model.trim="form.postName" placeholder="岗位名称" disabled />
......
......@@ -174,7 +174,7 @@
/>
<!-- 添加或修改角色配置对话框 -->
<el-dialog class="roleAddDialog" title="角色信息" :visible.sync="open" width="60%" append-to-body>
<el-dialog :close-on-click-modal="false" class="roleAddDialog" title="角色信息" :visible.sync="open" width="60%" append-to-body>
<el-form ref="form" :model="form" :rules="rules" size="small" label-width="120px">
<el-form-item class="labelHeight" label="角色名称" prop="roleName">
<div slot="label" class="labelClassRequired">
......@@ -244,7 +244,7 @@
</el-dialog>
<!-- 分配角色数据权限对话框 -->
<el-dialog class="roleDialog" title="数据权限信息" :visible.sync="openDataScope" width="900px" append-to-body>
<el-dialog :close-on-click-modal="false" class="roleDialog" title="数据权限信息" :visible.sync="openDataScope" width="900px" append-to-body>
<el-row>
<el-col style="width: 49%">
<el-form ref="form" :model="form" :rules="rules" label-width="70px">
......
......@@ -473,7 +473,7 @@
</div>
</el-dialog>
<!-- 用户导入对话框 -->
<el-dialog :title="upload.title" :visible.sync="upload.open" width="400px" append-to-body>
<el-dialog :close-on-click-modal="false" :title="upload.title" :visible.sync="upload.open" width="400px" append-to-body>
<el-upload
accept=".xlsx, .xls"
:headers="upload.headers"
......
<template>
<div>
<img :src="options.img" title="点击上传头像" class="img-circle img-lg" @click="editCropper()">
<el-dialog title="头像信息" :visible.sync="open" width="41.3vw" append-to-body>
<el-dialog :close-on-click-modal="false" title="头像信息" :visible.sync="open" width="41.3vw" append-to-body>
<el-row>
<el-col :xs="24" :md="12" :style="{height: '32.4vh'}">
<vue-cropper
......
......@@ -102,7 +102,7 @@
/>
</div>
<!-- 查看弹出框 -->
<el-dialog :title="modelTitle" :visible.sync="visibleAlert">
<el-dialog :close-on-click-modal="false" :title="modelTitle" :visible.sync="visibleAlert">
<field-item
v-for="(field, index) in alertModel.fields"
:key="index"
......
......@@ -149,7 +149,7 @@
</div>
</div>
<!-- 查看弹出框 -->
<el-dialog :title="modelTitle" :visible.sync="visibleAlert">
<el-dialog :close-on-click-modal="false" :title="modelTitle" :visible.sync="visibleAlert">
<field-item
v-for="(field, index) in alertModel.fields"
:key="index"
......
......@@ -309,6 +309,7 @@
</div>
<!-- 角色选择弹出框-->
<el-dialog
:close-on-click-modal="false"
title="角色信息"
:visible.sync="dialogRoleVisible"
:show-close="false"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment