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

public/template/handover.html

@@ -302,6 +302,7 @@
       </el-form>
       <!--    部门弹出框-->
       <el-dialog
+        :close-on-click-modal="false"
         title="选择所在部门"
         :visible.sync="dialogDeptVisible"
         :show-close="false"

public/template/test.html

@@ -67,6 +67,7 @@
   </el-form>
   <!--    部门弹出框-->
   <el-dialog
+    :close-on-click-modal="false"
     title="部门信息"
     :visible.sync="dialogDeptVisible"
     :show-close="false"

public/template/unionConsolationFund.html

@@ -151,6 +151,7 @@
       </el-form>
       <!--    部门弹出框-->
       <el-dialog
+        :close-on-click-modal="false"
         title="部门信息"
         :visible.sync="dialogDeptVisible"
         :show-close="false"

src/components/bpmn/index.vue

@@ -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"

src/components/formDesigner/fieldContainer/index.vue

@@ -62,6 +62,7 @@
     </div>
     <!-- 预览对话框 -->
     <el-dialog
+      :close-on-click-modal="false"
       title="表单预览"
       center
       :visible.sync="visiblePreview"

src/components/formDesigner/fieldItem/fields/DialogTable.vue

@@ -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'"

src/components/formDesigner/fieldItem/fields/Tags.vue

@@ -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'"

src/layout/components/AppMain.vue

@@ -47,7 +47,7 @@ export default {
 // fix css style bug in open el-dialog
 .el-popup-parent--hidden {
   .fixed-header {
-    padding-right: 15px;
+    // padding-right: 15px;
   }
 }
 </style>

src/views/instance/Template.vue

@@ -132,6 +132,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"

src/views/instance/components/TemplateEndorsementDialog.vue

@@ -5,6 +5,7 @@
     :visible.sync="endorsementDialogFormVisible"
     :before-close="beforeClose"
     @closed="resetForm"
+    :close-on-click-modal="false"
   >
     <div class="main-dialog-content">
       <el-form

src/views/instance/components/TemplateRejectDialog.vue

@@ -5,6 +5,7 @@
     :visible.sync="rejectDialogFormVisible"
     :before-close="beforeClose"
     @closed="resetForm"
+    :close-on-click-modal="false"
   >
     <el-form :model="rejectForm">
       <el-form-item label="拒绝备注" :label-width="formLabelWidth">

src/views/integratedManagement/dataIntegrated.vue

@@ -311,6 +311,7 @@
       </el-dialog>
       <!--        导入弹窗-->
       <el-dialog
+        :close-on-click-modal="false"
         title="导入信息"
         :visible.sync="dialogImport"
         width="35%"

src/views/mesCenter/addMes.vue

@@ -166,6 +166,7 @@
       </div>
     </el-tabs>
     <el-dialog
+      :close-on-click-modal="false"
       title="人员信息"
       :visible.sync="dialogPeopleVisible"
       :destroy-on-close="true"

src/views/mesCenter/editMes.vue

@@ -185,6 +185,7 @@
       </div>
     </el-tabs>
     <el-dialog
+      :close-on-click-modal="false"
       title="人员信息"
       :visible.sync="dialogPeopleVisible"
       :show-close="false"

src/views/mesCenter/mailMes.vue

@@ -68,9 +68,9 @@
 
       <!--emementUI表单-->
       <el-dialog
+        :close-on-click-modal="false"
         title="消息信息"
         :visible.sync="editFormVisible"
-        :close-on-click-modal="false"
         class="edit-form"
         :before-close="formHandleClose"
       >

src/views/mesCenter/msgConfigOld.vue

@@ -63,6 +63,7 @@
       </div>
     </el-card>
     <el-dialog
+      :close-on-click-modal="false"
       title="通知模板"
       :visible.sync="dialogVisible"
       :before-close="handleClose"

src/views/monitor/errorLog/index.vue

@@ -49,11 +49,13 @@
           type="danger"
           size="small"
           @click="handleClean"
+          :disabled="list.length === 0"
         >清空</el-button>
         <el-button
           v-hasPermi="['zt:errlog:export']"
           type="success"
           size="small"
+          :disabled="list.length === 0"
           @click="handleExport"
         >导出</el-button>
         <!--          <el-button size="small" @click="resetQuery">重置</el-button>-->
@@ -120,7 +122,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="24">

src/views/monitor/loginInfo/index.vue

@@ -65,11 +65,13 @@
             type="danger"
             size="small"
             @click="handleClean"
+            :disabled="list.length === 0"
           >清空</el-button>
           <!--          v-hasPermi="['zt:loginlog:export']"-->
           <el-button
             type="success"
             size="small"
+            :disabled="list.length === 0"
             @click="handleExport"
           >导出</el-button>
           <!--          <el-button size="mini" @click="resetQuery">重置</el-button>-->
@@ -80,50 +82,17 @@
     <div style="padding:10px">
       <div class="mb12 font-small-bold">登录日志列表</div>
       <el-table v-loading="loading" border :data="list" @selection-change="handleSelectionChange">
-<!--        <el-table-column type="selection" width="55" align="center" />-->
-<!--        &lt;!&ndash;      <el-table-column type="index" label="序号" width="50" />&ndash;&gt;-->
-<!--        <el-table-column label="访问编号" width="100" align="center" prop="infoId" show-overflow-tooltip>-->
-<!--          <template slot-scope="scope">-->
-<!--            {{ scope.row.infoId || '-' }}-->
-<!--          </template>-->
-<!--        </el-table-column>-->
-<!--        <el-table-column label="用户名称" align="center" prop="userName" show-overflow-tooltip>-->
-<!--          <template slot-scope="scope">-->
-<!--            {{ scope.row.userName || '-' }}-->
-<!--          </template>-->
-<!--        </el-table-column>-->
-<!--        <el-table-column label="登录地址" align="center" prop="ipaddr" show-overflow-tooltip>-->
-<!--          <template slot-scope="scope">-->
-<!--            {{ scope.row.ipaddr || '-' }}-->
-<!--          </template>-->
-<!--        </el-table-column>-->
-<!--        <el-table-column label="操作信息" align="center" prop="msg" show-overflow-tooltip>-->
-<!--          <template slot-scope="scope">-->
-<!--            {{ scope.row.msg || '-' }}-->
-<!--          </template>-->
-<!--        </el-table-column>-->
-<!--        &lt;!&ndash;      <el-table-column label="登录地址" align="center" prop="ipaddr" width="130" :show-overflow-tooltip="true" />&ndash;&gt;-->
-<!--        <el-table-column label="登录地点" align="center" prop="loginLocation" :show-overflow-tooltip="true" />-->
-<!--        &lt;!&ndash;        <el-table-column label="浏览器" align="center" prop="browser" show-overflow-tooltip>&ndash;&gt;-->
-<!--        &lt;!&ndash;          <template slot-scope="scope">&ndash;&gt;-->
-<!--        &lt;!&ndash;            {{ scope.row.browser || '-' }}&ndash;&gt;-->
-<!--        &lt;!&ndash;          </template>&ndash;&gt;-->
-<!--        &lt;!&ndash;        </el-table-column>&ndash;&gt;-->
-<!--        &lt;!&ndash;        <el-table-column label="操作系统" align="center" prop="os" show-overflow-tooltip>&ndash;&gt;-->
-<!--        &lt;!&ndash;          <template slot-scope="scope">&ndash;&gt;-->
-<!--        &lt;!&ndash;            {{ scope.row.os || '-' }}&ndash;&gt;-->
-<!--        &lt;!&ndash;          </template>&ndash;&gt;-->
-<!--        &lt;!&ndash;        </el-table-column>&ndash;&gt;-->
-<!--        <el-table-column label="登录状态" align="center" prop="status" :formatter="statusFormat" />-->
         <el-table-column type="selection" width="55" align="center" />
         <el-table-column label="访问编号" align="center" prop="businessId" />
         <el-table-column label="用户名称" align="center" prop="username" />
         <el-table-column label="登录地址" align="center" prop="ipaddr" width="130" :show-overflow-tooltip="true" />
         <el-table-column label="登录地点" align="center" prop="loginLocation" :show-overflow-tooltip="true" />
-        <!-- <el-table-column label="浏览器" align="center" prop="browser" />
-         <el-table-column label="操作系统" align="center" prop="os" />-->
         <el-table-column label="登录状态" align="center" prop="status" :formatter="statusFormat" />
-        <el-table-column label="提示信息" align="center" prop="msg" />
+        <el-table-column label="提示信息" align="center" prop="msg" >
+          <template slot-scope="scope">
+            <span>{{ scope.row.msg || '-' }}</span>
+          </template>
+        </el-table-column>
         <el-table-column label="登录时间" align="center" prop="loginTime" width="180" show-overflow-tooltip>
           <template slot-scope="scope">
             <span>{{ parseTime(scope.row.loginTime) | transformDateByFormat('YYYY-MM-DD HH:mm:ss') }}</span>

src/views/monitor/operLog/index.vue

@@ -49,11 +49,13 @@
           type="danger"
           size="small"
           @click="handleClean"
+          :disabled="list.length === 0"
         >清空</el-button>
         <el-button
           v-hasPermi="['zt:operLog:export']"
           type="success"
           size="small"
+          :disabled="list.length === 0"
           @click="handleExport"
         >导出</el-button>
         <!--          <el-button size="small" @click="resetQuery">重置</el-button>-->
@@ -120,7 +122,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="24">

src/views/system/dept/index.vue

@@ -99,7 +99,7 @@
     </el-table>
 
     <!-- 添加或修改部门对话框 -->
-    <el-dialog title="部门信息" :visible.sync="open" width="900px" append-to-body>
+    <el-dialog :close-on-click-modal="false" title="部门信息" :visible.sync="open" width="900px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
         <el-row>
           <el-col v-if="form.parentId !== 0" :span="24">
@@ -167,7 +167,7 @@ export default {
         if (stuCardReg.test(value)) {
           callback()
         } else {
-          callback(new Error('请输入正确的手机号码'))
+          callback(new Error('请输入正确的联系电话'))
         }
       }
     }
@@ -188,7 +188,7 @@ export default {
       // 状态数据字典
       statusOptions: [
         {
-          dictLabel: '正常',
+          dictLabel: '启用',
           dictValue: '1'
         },
         {

src/views/system/dict/data.vue

@@ -22,7 +22,7 @@
         />
       </el-form-item>
       <el-form-item label="状态" prop="flag">
-        <el-select v-model="queryParams.flag" placeholder="数据状态" clearable size="small">
+        <el-select v-model="queryParams.flag" placeholder="请选择状态" clearable size="small">
           <el-option
             v-for="dict in statusOptions"
             :key="dict.dictValue"
@@ -47,17 +47,6 @@
         >新增
         </el-button>
       </el-col>
-      <el-col :span="1.5">
-        <el-button
-          v-hasPermi="['sys:dict:update']"
-          type="success"
-          icon="el-icon-edit"
-          size="mini"
-          :disabled="single"
-          @click="handleUpdate"
-        >修改
-        </el-button>
-      </el-col>
       <el-col :span="1.5">
         <el-button
           v-hasPermi="['sys:dict:delete']"
@@ -153,7 +142,7 @@
     />
 
     <!-- 添加或修改参数配置对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+    <el-dialog :close-on-click-modal="false" :title="title" :visible.sync="open" width="500px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
         <el-form-item label="字典类型">
           <el-input v-model.trim="form.dictType" :disabled="true" show-word-limit maxlength="30" placeholder="请输入字典类型" />
@@ -430,7 +419,7 @@ export default {
     /** 导出按钮操作 */
     handleExport() {
       const queryParams = this.queryParams
-      this.$confirm('是否确认导出所有数据项?', '警告', {
+      this.$confirm('是否确认导出所有数据项?', '提示', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
         type: 'warning'

src/views/system/dict/index.vue

@@ -26,7 +26,7 @@
       <el-form-item label="状态" prop="flag">
         <el-select
           v-model="queryParams.flag"
-          placeholder="请选择"
+          placeholder="请选择状态"
           clearable
           size="small"
           style="width: 200px"
@@ -61,21 +61,21 @@
             v-hasPermi="['sys:dict:add']"
             type="primary"
             icon="el-icon-plus"
-            size="small"
+            size="mini"
             @click="handleAdd"
           >新增</el-button>
         </el-col>
-        <el-col :span="1.5">
-          <el-button
-            v-hasPermi="['sys:dict:update']"
-            type="success"
-            icon="el-icon-edit"
-            size="mini"
-            :disabled="single"
-            @click="handleUpdate"
-          >修改
-          </el-button>
-        </el-col>
+<!--        <el-col :span="1.5">-->
+<!--          <el-button-->
+<!--            v-hasPermi="['sys:dict:update']"-->
+<!--            type="success"-->
+<!--            icon="el-icon-edit"-->
+<!--            size="mini"-->
+<!--            :disabled="single"-->
+<!--            @click="handleUpdate"-->
+<!--          >修改-->
+<!--          </el-button>-->
+<!--        </el-col>-->
         <el-col :span="1.5">
           <el-button
             v-hasPermi="['sys:dict:delete']"
@@ -92,7 +92,7 @@
             v-hasPermi="['sys:dict:export']"
             type="success"
             icon="el-icon-download"
-            size="small"
+            size="mini"
             @click="handleExport"
           >导出</el-button>
         </el-col>
@@ -173,7 +173,7 @@
       @pagination="getList"
     />
     <!-- 添加或修改参数配置对话框 -->
-    <el-dialog title="字典信息" :visible.sync="open" width="500px" append-to-body @close="reset" destroy-on-close>
+    <el-dialog :close-on-click-modal="false" title="字典信息" :visible.sync="open" width="500px" append-to-body @close="reset" destroy-on-close>
       <el-form ref="form" :model="form" :rules="rules" label-width="100px">
         <el-form-item label="字典名称" prop="dictName">
           <el-input v-model.trim="form.dictName" :maxlength="30" show-word-limit placeholder="请输入字典名称" />
@@ -330,7 +330,7 @@ export default {
       // 状态数据字典
       statusOptions: [
         {
-          dictLabel: '正常',
+          dictLabel: '启用',
           dictValue: '1'
         },
         {
@@ -534,7 +534,7 @@ export default {
     /** 删除按钮操作 */
     handleDelete(row) {
       const dictIds = row.businessId || this.ids
-      this.$confirm('是否确认删除字典编号为"' + dictIds + '"的数据项?', '警告', {
+      this.$confirm('是否确认删除字典编号为"' + dictIds + '"的数据项?', '提示', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
         type: 'warning'
@@ -548,7 +548,7 @@ export default {
     /** 导出按钮操作 */
     handleExport() {
       const queryParams = this.queryParams
-      this.$confirm('是否确认导出所有类型数据项?', '警告', {
+      this.$confirm('是否确认导出所有类型数据项?', '提示', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
         type: 'warning'

src/views/system/menu/index.vue

@@ -125,7 +125,7 @@
       </el-table>
     </div>
     <!-- 添加或修改菜单对话框 -->
-    <el-dialog title="菜单信息" :visible.sync="open" width="900px" append-to-body>
+    <el-dialog :close-on-click-modal="false" title="菜单信息" :visible.sync="open" width="900px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
         <el-row>
           <el-col :span="24">
@@ -302,7 +302,7 @@ export default {
       // 菜单状态数据字典
       statusOptions: [
         {
-          dictLabel: '正常',
+          dictLabel: '启用',
           dictValue: '1'
         },
         {

src/views/system/post/index.vue

@@ -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 />
@@ -203,7 +203,7 @@
               :key="dict.dictValue"
               :label="dict.dictValue"
             >{{ dict.dictLabel }}
-              <!--                          <el-radio label="0">正常</el-radio>-->
+              <!--                          <el-radio label="0">启用</el-radio>-->
               <!--                          <el-radio label="1">停用</el-radio>-->
             </el-radio>
           </el-radio-group>
@@ -530,7 +530,7 @@ export default {
     /** 导出按钮操作 */
     handleExport() {
       const queryParams = this.queryParams
-      this.$confirm('是否确认导出所有岗位数据项?', '警告', {
+      this.$confirm('是否确认导出所有岗位数据项?', '提示', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
         type: 'warning'

src/views/system/role/index.vue

@@ -134,7 +134,7 @@
       @pagination="getList"
     />
     <!-- 添加或修改角色配置对话框 -->
-    <el-dialog title="角色信息" :visible.sync="open" width="550px" append-to-body destroy-on-close>
+    <el-dialog :close-on-click-modal="false" title="角色信息" :visible.sync="open" width="550px" append-to-body destroy-on-close>
       <el-form ref="form" :model="form" :rules="rules" size="small" label-width="80px">
         <el-form-item label="角色名称" prop="roleName">
           <el-input v-model.trim="form.roleName" show-word-limit :maxlength="30" placeholder="请输入角色名称" />
@@ -143,7 +143,7 @@
           <el-input v-model.trim="form.roleKey" show-word-limit :maxlength="30" placeholder="请输入权限字符" />
         </el-form-item>
         <el-form-item label="角色排序" prop="roleSort">
-          <el-input-number v-model="form.roleSort" style="width: 100%" controls-position="right" :min="0" :max="9999"/>
+          <el-input-number v-model="form.roleSort" style="width: 100%" controls-position="right" :min="0" :max="9999" placeholder="请输入角色排序"/>
         </el-form-item>
         <el-form-item label="角色状态">
           <el-radio-group v-model="form.flag">
@@ -180,7 +180,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">
@@ -544,7 +544,7 @@ export default {
     // 角色状态修改
     handleStatusChange(row) {
       const text = row.flag === '1' ? '启用' : '停用'
-      this.$confirm('确认要' + text + '该角色吗?', '警告', {
+      this.$confirm('确认要' + text + '该角色吗?', '提示', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
         type: 'warning'
@@ -756,7 +756,7 @@ export default {
     /** 导出按钮操作 */
     handleExport() {
       const queryParams = this.queryParams
-      this.$confirm('是否确认导出所有用户信息?', '警告', {
+      this.$confirm('是否确认导出所有用户信息?', '提示', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
         type: 'warning'

src/views/system/user/index.vue

@@ -26,7 +26,7 @@
         <el-form-item label="状态" prop="flag">
           <el-select
             v-model="queryParams.flag"
-            placeholder="请选择"
+            placeholder="请选择状态"
             clearable
             size="small"
             style="width: 150px"
@@ -196,7 +196,7 @@
       </el-col>
     </el-row>
     <!-- 添加或修改参数配置对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="900px" :append-to-body="false">
+    <el-dialog :close-on-click-modal="false" :title="title" :visible.sync="open" width="900px" :append-to-body="false">
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
         <el-row>
           <el-col :span="12">
@@ -294,7 +294,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"
@@ -406,7 +406,7 @@ export default {
         if (stuCardReg.test(value)) {
           callback()
         } else {
-          callback(new Error('请输入正确的手机号码'))
+          callback(new Error('请输入正确的联系电话'))
         }
       }
     }
@@ -624,7 +624,7 @@ export default {
         //   { required: false, message: '请输入手机号码', trigger: 'blur' },
         //   {
         //     pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/,
-        //     message: '请输入正确的手机号码',
+        //     message: '请输入正确的联系电话',
         //     trigger: 'blur'
         //   },
         //   { validator: phone, trigger: 'blur' }
@@ -724,7 +724,7 @@ export default {
     // 用户状态修改
     handleStatusChange(row) {
       const text = row.flag === '1' ? '启用' : '停用'
-      this.$confirm('确认要' + text + '该用户吗?', '警告', {
+      this.$confirm('确认要' + text + '该用户吗?', '提示', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
         type: 'warning'
@@ -947,7 +947,7 @@ export default {
     /** 导出按钮操作 */
     handleExport() {
       const queryParams = this.queryParams
-      this.$confirm('是否确认导出所有用户信息?', '警告', {
+      this.$confirm('是否确认导出所有用户信息?', '提示', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
         type: 'warning'

src/views/system/user/profile/userAvatar.vue

 <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

src/views/system/user/profile/userInfo.vue

@@ -51,7 +51,7 @@ export default {
           { required: true, message: '手机号码不能为空', trigger: 'blur' },
           {
             pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/,
-            message: '请输入正确的手机号码',
+            message: '请输入正确的联系电话',
             trigger: 'blur'
           }
         ]

src/views/workflow/formTemplate/list.vue

@@ -102,7 +102,7 @@
       />
     </div>
     <!-- 查看弹出框 -->
-    <el-dialog :title="modelTitle" :visible.sync="visibleAlert">
+    <el-dialog :title="modelTitle" :visible.sync="visibleAlert" :close-on-click-modal="false">
       <field-item
         v-for="(field, index) in alertModel.fields"
         :key="index"

src/views/workflow/formTemplateHtml/list.vue

@@ -149,7 +149,7 @@
       </div>
     </div>
     <!-- 查看弹出框 -->
-    <el-dialog :title="modelTitle" :visible.sync="visibleAlert">
+    <el-dialog :title="modelTitle" :visible.sync="visibleAlert" :close-on-click-modal="false">
       <field-item
         v-for="(field, index) in alertModel.fields"
         :key="index"

src/views/workflow/processLIst/ProcessList.vue

@@ -310,6 +310,7 @@
     <!--    角色选择弹出框-->
     <el-dialog
       title="角色信息"
+      :close-on-click-modal="false"
       :visible.sync="dialogRoleVisible"
       :show-close="false"
       :destroy-on-close="true"