Merge branch 'master' of http://192.168.101.10:13000/gogs/zhaoshangyinzi

ruoyi-ui/src/views/management/nstruction/index.vue

@@ -461,7 +461,7 @@
       <img width="100%" :src="dialogImageUrl" alt="" />
     </el-dialog>
     <!-- 添加或修改参数配置对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="800px" append-to-body>
+    <el-dialog :title="title" :visible.sync="open" width="800px" append-to-body :close-on-click-modal="false">
       <el-form ref="form" :model="form" :rules="rules" label-width="150px">
         <!-- <el-form-item label="时间" prop="configName">
           <el-date-picker type="date" placeholder="选择日期" v-model="form.createTime" style="width: 335px"></el-date-picker>
@@ -521,6 +521,7 @@
       :visible.sync="opentwo"
       width="800px"
       append-to-body
+      :close-on-click-modal="false"
     >
       <el-form
         ref="formtwo"
@@ -586,6 +587,7 @@
       :visible.sync="openther"
       width="800px"
       append-to-body
+      :close-on-click-modal="false"
     >
       <el-form
         ref="formther"

ruoyi-ui/src/views/under/index.vue

@@ -582,7 +582,7 @@
     <!-- </div> -->
 
     <!-- 添加或修改参数配置对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="800px" append-to-body>
+    <el-dialog :title="title" :visible.sync="open" width="800px" append-to-body :close-on-click-modal="false">
       <el-form ref="form" :model="form" :rules="rules" label-width="150px">
         <el-form-item label="企业名称" prop="companyName">
           <el-input v-model="form.companyName" placeholder="请输入企业名称" />
@@ -628,6 +628,7 @@
       :visible.sync="opentwo"
       width="800px"
       append-to-body
+      :close-on-click-modal="false"
     >
       <el-form
         ref="formtwo"