diff --git a/src/views/spectrumAnalysis/components/Modals/LoadFromFileModal.vue b/src/views/spectrumAnalysis/components/Modals/LoadFromFileModal.vue
index f119b57..448f6f6 100644
--- a/src/views/spectrumAnalysis/components/Modals/LoadFromFileModal.vue
+++ b/src/views/spectrumAnalysis/components/Modals/LoadFromFileModal.vue
@@ -138,7 +138,7 @@
       </template>
       <!-- 底部按钮结束 -->
     </custom-modal>
-    <a-modal v-model="visible_file" :width="1200" title="File List" @cancel="cancelFileModale">
+    <a-modal v-model="visible_file" :width="1200" title="File List" :maskClosable="false" @cancel="cancelFileModale">
       <a-spin :spinning="loading_file">
         <div style="position: relative; padding-bottom: 40px; height: 460px; overflow: hidden">
           <a-row type="flex" style="margin-bottom: 15px">
@@ -445,7 +445,9 @@ export default {
                 })
 
                 if (findFile) {
-                  const regExp = new RegExp(`(${otherFilePrefix}${fileType}_${qualify}_\\d{1,}\\.{0,}\\d{0,}).*?(\\.PHD)`)
+                  const regExp = new RegExp(
+                    `(${otherFilePrefix}${fileType}_${qualify}_\\d{1,}\\.{0,}\\d{0,}).*?(\\.PHD)`
+                  )
                   record[nameKeys[index]] = {
                     file: findFile,
                     fileName: findFile.name.replace(regExp, '$1$2'),
diff --git a/src/views/system/modules/DictItemModal.vue b/src/views/system/modules/DictItemModal.vue
index 4eda537..81777ec 100644
--- a/src/views/system/modules/DictItemModal.vue
+++ b/src/views/system/modules/DictItemModal.vue
@@ -3,185 +3,167 @@
     :title="title"
     :width="800"
     :visible="visible"
+    :maskClosable="false"
     :confirmLoading="confirmLoading"
     @ok="handleOk"
     @cancel="handleCancel"
     :cancelButtonProps="{ props: { type: 'warn' } }"
   >
     <a-spin :spinning="confirmLoading">
-      <a-form-model  ref="form" :model="model" :rules="validatorRules">
-
-        <a-form-model-item
-          :labelCol="labelCol"
-          :wrapperCol="wrapperCol"
-          prop="itemText"
-          label="Name">
-          <a-input placeholder="Please Enter Name" v-model="model.itemText"/>
+      <a-form-model ref="form" :model="model" :rules="validatorRules">
+        <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="itemText" label="Name">
+          <a-input placeholder="Please Enter Name" v-model="model.itemText" />
         </a-form-model-item>
 
-        <a-form-model-item
-          :labelCol="labelCol"
-          :wrapperCol="wrapperCol"
-          prop="itemValue"
-          label="Item Value">
+        <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="itemValue" label="Item Value">
           <a-input placeholder="Please Enter Item Value" v-model="model.itemValue" />
         </a-form-model-item>
 
-        <a-form-model-item
-          :labelCol="labelCol"
-          :wrapperCol="wrapperCol"
-          label="Description">
+        <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="Description">
           <a-input v-model="model.description" />
         </a-form-model-item>
 
-        <a-form-model-item
-          :labelCol="labelCol"
-          :wrapperCol="wrapperCol"
-          label="Sort">
+        <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="Sort">
           <a-input-number :min="1" v-model="model.sortOrder" />
           The Smaller The Value, the More Advanced
         </a-form-model-item>
 
-        <a-form-model-item
-          :labelCol="labelCol"
-          :wrapperCol="wrapperCol"
-          label="Enable"
-          hasFeedback>
-          <a-switch checkedChildren="Enable" unCheckedChildren="Disable" @change="onChose" v-model="visibleCheck"/>
+        <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="Enable" hasFeedback>
+          <a-switch checkedChildren="Enable" unCheckedChildren="Disable" @change="onChose" v-model="visibleCheck" />
         </a-form-model-item>
-
       </a-form-model>
     </a-spin>
   </a-modal>
 </template>
 
 <script>
-  import pick from 'lodash.pick'
-  import {addDictItem, editDictItem} from '@/api/api'
-  import { getAction } from '@api/manage'
+import pick from 'lodash.pick'
+import { addDictItem, editDictItem } from '@/api/api'
+import { getAction } from '@api/manage'
 
-  export default {
-    name: "DictItemModal",
-    data() {
-      return {
-        title: "操作",
-        visible: false,
-        visibleCheck: true,
-        model: {},
-        dictId: "",
-        status: 1,
-        labelCol: {
-          xs: {span: 24},
-          sm: {span: 5},
-        },
-        wrapperCol: {
-          xs: {span: 24},
-          sm: {span: 16},
-        },
-        confirmLoading: false,
-        validatorRules: {
-          itemText:  [{required: true, message: 'Please Enter Name'}],
-          itemValue:  [{required: true, message: 'Please Enter Item Value'},{validator: this.validateItemValue}],
-        },
-      }
-    },
-    created() {
-    },
-    methods: {
-      add(dictId) {
-        this.dictId = dictId;
-        //初始化默认值
-        this.edit({sortOrder:1,status:1});
+export default {
+  name: 'DictItemModal',
+  data() {
+    return {
+      title: '操作',
+      visible: false,
+      visibleCheck: true,
+      model: {},
+      dictId: '',
+      status: 1,
+      labelCol: {
+        xs: { span: 24 },
+        sm: { span: 5 },
       },
-      edit(record) {
-        if (record.id) {
-          this.dictId = record.dictId;
-        }
-        this.status = record.status;
-        this.visibleCheck = (record.status == 1) ? true : false;
-        this.model = Object.assign({}, record);
-        this.model.dictId = this.dictId;
-        this.model.status = this.status;
-        this.visible = true;
+      wrapperCol: {
+        xs: { span: 24 },
+        sm: { span: 16 },
       },
-      onChose(checked) {
-        if (checked) {
-          this.status = 1;
-          this.visibleCheck = true;
-        } else {
-          this.status = 0;
-          this.visibleCheck = false;
-        }
+      confirmLoading: false,
+      validatorRules: {
+        itemText: [{ required: true, message: 'Please Enter Name' }],
+        itemValue: [{ required: true, message: 'Please Enter Item Value' }, { validator: this.validateItemValue }],
       },
-      // 确定
-      handleOk() {
-        const that = this;
-        // 触发表单验证
-        this.$refs.form.validate(valid => {
-          if (valid) {
-            that.confirmLoading = true;
-            this.model.itemText = (this.model.itemText || '').trim()
-            this.model.itemValue = (this.model.itemValue || '').trim()
-            this.model.description = (this.model.description || '').trim()
-            this.model.status = this.status;
-            let obj;
-            if (!this.model.id) {
-              obj = addDictItem(this.model);
-            } else {
-              obj = editDictItem(this.model);
-            }
-            obj.then((res) => {
-              if (res.success) {
-                that.$message.success(res.message);
-                that.$emit('ok');
-              } else {
-                that.$message.warning(res.message);
-              }
-            }).finally(() => {
-              that.confirmLoading = false;
-              that.close();
-            })
-          }else{
-            return false;
-          }
-        })
-      },
-      // 关闭
-      handleCancel() {
-        this.close();
-      },
-      close() {
-        this.$emit('close');
-        this.visible = false;
-        this.$refs.form.resetFields();
-      },
-      validateItemValue(rule, value, callback){
-        let param = {
-          itemValue:value,
-          dictId:this.dictId,
-        }
-        if(this.model.id){
-          param.id = this.model.id
-        }
-        if(value){
-          let reg=new RegExp("[`~!@#$^&*()=|{}'.<>《》/?！￥（）—【】‘；：”“。，、？]")
-          if(reg.test(value)){
-            callback("Cannot Have Special Charactors")
-          }else{
-            //update--begin--autor:lvdandan-----date:20201203------for：JT-27【数据字典】字典 - 数据值可重复
-            getAction("/sys/dictItem/dictItemCheck",param).then((res)=>{
-              if(res.success){
-                callback()
-              }else{
-                callback(res.message);
-              }
-            });
-            //update--end--autor:lvdandan-----date:20201203------for：JT-27【数据字典】字典 - 数据值可重复
-          }
-        }else{
-          callback()
-        }
-      }
     }
-  }
+  },
+  created() {},
+  methods: {
+    add(dictId) {
+      this.dictId = dictId
+      //初始化默认值
+      this.edit({ sortOrder: 1, status: 1 })
+    },
+    edit(record) {
+      if (record.id) {
+        this.dictId = record.dictId
+      }
+      this.status = record.status
+      this.visibleCheck = record.status == 1 ? true : false
+      this.model = Object.assign({}, record)
+      this.model.dictId = this.dictId
+      this.model.status = this.status
+      this.visible = true
+    },
+    onChose(checked) {
+      if (checked) {
+        this.status = 1
+        this.visibleCheck = true
+      } else {
+        this.status = 0
+        this.visibleCheck = false
+      }
+    },
+    // 确定
+    handleOk() {
+      const that = this
+      // 触发表单验证
+      this.$refs.form.validate((valid) => {
+        if (valid) {
+          that.confirmLoading = true
+          this.model.itemText = (this.model.itemText || '').trim()
+          this.model.itemValue = (this.model.itemValue || '').trim()
+          this.model.description = (this.model.description || '').trim()
+          this.model.status = this.status
+          let obj
+          if (!this.model.id) {
+            obj = addDictItem(this.model)
+          } else {
+            obj = editDictItem(this.model)
+          }
+          obj
+            .then((res) => {
+              if (res.success) {
+                that.$message.success(res.message)
+                that.$emit('ok')
+              } else {
+                that.$message.warning(res.message)
+              }
+            })
+            .finally(() => {
+              that.confirmLoading = false
+              that.close()
+            })
+        } else {
+          return false
+        }
+      })
+    },
+    // 关闭
+    handleCancel() {
+      this.close()
+    },
+    close() {
+      this.$emit('close')
+      this.visible = false
+      this.$refs.form.resetFields()
+    },
+    validateItemValue(rule, value, callback) {
+      let param = {
+        itemValue: value,
+        dictId: this.dictId,
+      }
+      if (this.model.id) {
+        param.id = this.model.id
+      }
+      if (value) {
+        let reg = new RegExp("[`~!@#$^&*()=|{}'.<>《》/?！￥（）—【】‘；：”“。，、？]")
+        if (reg.test(value)) {
+          callback('Cannot Have Special Charactors')
+        } else {
+          //update--begin--autor:lvdandan-----date:20201203------for：JT-27【数据字典】字典 - 数据值可重复
+          getAction('/sys/dictItem/dictItemCheck', param).then((res) => {
+            if (res.success) {
+              callback()
+            } else {
+              callback(res.message)
+            }
+          })
+          //update--end--autor:lvdandan-----date:20201203------for：JT-27【数据字典】字典 - 数据值可重复
+        }
+      } else {
+        callback()
+      }
+    },
+  },
+}
 </script>
diff --git a/src/views/system/modules/DictModal.vue b/src/views/system/modules/DictModal.vue
index 579a7b9..db011ab 100644
--- a/src/views/system/modules/DictModal.vue
+++ b/src/views/system/modules/DictModal.vue
@@ -3,6 +3,7 @@
     :title="title"
     :width="600"
     :visible="visible"
+    :maskClosable="false"
     :confirmLoading="confirmLoading"
     @ok="handleOk"
     @cancel="handleCancel"
@@ -10,141 +11,125 @@
   >
     <a-spin :spinning="confirmLoading">
       <a-form-model ref="form" :model="model" :rules="validatorRules">
-
-        <a-form-model-item
-          :labelCol="labelCol"
-          :wrapperCol="wrapperCol"
-          prop="dictName"
-          required
-          label="Dict Name">
-          <a-input placeholder="Please Enter Dict Name" v-model="model.dictName"/>
+        <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="dictName" required label="Dict Name">
+          <a-input placeholder="Please Enter Dict Name" v-model="model.dictName" />
         </a-form-model-item>
 
-        <a-form-model-item
-          :labelCol="labelCol"
-          :wrapperCol="wrapperCol"
-          prop="dictCode"
-          required
-          label="Dict Code">
-          <a-input placeholder="Please Enter Dict Code" v-model="model.dictCode"/>
+        <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="dictCode" required label="Dict Code">
+          <a-input placeholder="Please Enter Dict Code" v-model="model.dictCode" />
         </a-form-model-item>
 
-        <a-form-model-item
-          :labelCol="labelCol"
-          :wrapperCol="wrapperCol"
-          label="Description">
-          <a-input v-model="model.description"/>
+        <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="Description">
+          <a-input v-model="model.description" />
         </a-form-model-item>
-
       </a-form-model>
     </a-spin>
   </a-modal>
 </template>
 
 <script>
-  import pick from 'lodash.pick'
-  import { addDict, editDict, duplicateCheck } from '@/api/api'
+import pick from 'lodash.pick'
+import { addDict, editDict, duplicateCheck } from '@/api/api'
 
-  export default {
-    name: 'DictModal',
-    data() {
-      return {
-        value: 1,
-        title: '操作',
-        visible: false,
-        model: {},
-        labelCol: {
-          xs: { span: 24 },
-          sm: { span: 5 }
-        },
-        wrapperCol: {
-          xs: { span: 24 },
-          sm: { span: 16 }
-        },
-        confirmLoading: false,
-        validatorRules: {
-          dictName: [{ required: true, message: 'Please Enter Dict Name' }],
-          dictCode: [
-            { required: true, message: 'Please Enter Dict Code' },
-            { validator: this.validateDictCode }]
-          }
+export default {
+  name: 'DictModal',
+  data() {
+    return {
+      value: 1,
+      title: '操作',
+      visible: false,
+      model: {},
+      labelCol: {
+        xs: { span: 24 },
+        sm: { span: 5 },
+      },
+      wrapperCol: {
+        xs: { span: 24 },
+        sm: { span: 16 },
+      },
+      confirmLoading: false,
+      validatorRules: {
+        dictName: [{ required: true, message: 'Please Enter Dict Name' }],
+        dictCode: [{ required: true, message: 'Please Enter Dict Code' }, { validator: this.validateDictCode }],
+      },
+    }
+  },
+  created() {},
+  methods: {
+    validateDictCode(rule, value, callback) {
+      // 重复校验
+      var params = {
+        tableName: 'sys_dict',
+        fieldName: 'dict_code',
+        fieldVal: value,
+        dataId: this.model.id,
       }
-    },
-    created() {
-    },
-    methods: {
-      validateDictCode(rule, value, callback) {
-        // 重复校验
-        var params = {
-          tableName: 'sys_dict',
-          fieldName: 'dict_code',
-          fieldVal: value,
-          dataId: this.model.id
-        }
-        duplicateCheck(params).then((res) => {
-          if (res.success) {
-            callback()
-          } else {
-            callback(res.message)
-          }
-        })
-      },
-      handleChange(value) {
-        this.model.status = value
-      },
-      add() {
-        this.edit({})
-      },
-      edit(record) {
-        if (record.id) {
-          this.visiblekey = true
+      duplicateCheck(params).then((res) => {
+        if (res.success) {
+          callback()
         } else {
-          this.visiblekey = false
+          callback(res.message)
         }
-        this.model = Object.assign({}, record)
-        this.visible = true
-      },
-      // 确定
-      handleOk() {
-        const that = this
-        // 触发表单验证
-        this.$refs.form.validate(valid => {
-          if (valid) {
-            that.confirmLoading = true
-            this.model.dictName = (this.model.dictName || '').trim()
-            this.model.dictCode = (this.model.dictCode || '').trim()
-            this.model.description = (this.model.description || '').trim()
-            let obj
-            if (!this.model.id) {
-              obj = addDict(this.model)
-            } else {
-              obj = editDict(this.model)
-            }
-            obj.then((res) => {
+      })
+    },
+    handleChange(value) {
+      this.model.status = value
+    },
+    add() {
+      this.edit({})
+    },
+    edit(record) {
+      if (record.id) {
+        this.visiblekey = true
+      } else {
+        this.visiblekey = false
+      }
+      this.model = Object.assign({}, record)
+      this.visible = true
+    },
+    // 确定
+    handleOk() {
+      const that = this
+      // 触发表单验证
+      this.$refs.form.validate((valid) => {
+        if (valid) {
+          that.confirmLoading = true
+          this.model.dictName = (this.model.dictName || '').trim()
+          this.model.dictCode = (this.model.dictCode || '').trim()
+          this.model.description = (this.model.description || '').trim()
+          let obj
+          if (!this.model.id) {
+            obj = addDict(this.model)
+          } else {
+            obj = editDict(this.model)
+          }
+          obj
+            .then((res) => {
               if (res.success) {
                 that.$message.success(res.message)
                 that.$emit('ok')
               } else {
                 that.$message.warning(res.message)
               }
-            }).finally(() => {
+            })
+            .finally(() => {
               that.confirmLoading = false
               that.close()
             })
-          }else{
-            return false;
-          }
-        })
-      },
-      // 关闭
-      handleCancel() {
-        this.close()
-      },
-      close() {
-        this.$emit('close')
-        this.visible = false
-        this.$refs.form.resetFields();
-      }
-    }
-  }
+        } else {
+          return false
+        }
+      })
+    },
+    // 关闭
+    handleCancel() {
+      this.close()
+    },
+    close() {
+      this.$emit('close')
+      this.visible = false
+      this.$refs.form.resetFields()
+    },
+  },
+}
 </script>
\ No newline at end of file
diff --git a/src/views/system/modules/PermissionDataRuleModal.vue b/src/views/system/modules/PermissionDataRuleModal.vue
index d51311a..08678af 100644
--- a/src/views/system/modules/PermissionDataRuleModal.vue
+++ b/src/views/system/modules/PermissionDataRuleModal.vue
@@ -3,171 +3,161 @@
     :title="title"
     :width="1000"
     :visible="visible"
+    :maskClosable="false"
     :confirmLoading="confirmLoading"
     @ok="handleOk"
     @cancel="handleCancel"
     :cancelButtonProps="{ props: { type: 'warn' } }"
-    cancelText="Cancel">
-
+    cancelText="Cancel"
+  >
     <a-spin :spinning="confirmLoading">
       <a-form-model ref="form" :model="model" :rules="validatorRules">
-
-        <a-form-model-item
-          :labelCol="labelCol"
-          :wrapperCol="wrapperCol"
-          prop="ruleName"
-          label="Rule Name">
-          <a-input placeholder="Please Enter Rule Name" v-model="model.ruleName"/>
+        <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="ruleName" label="Rule Name">
+          <a-input placeholder="Please Enter Rule Name" v-model="model.ruleName" />
         </a-form-model-item>
         <a-form-model-item
           v-show="showRuleColumn"
           :labelCol="labelCol"
           :wrapperCol="wrapperCol"
           prop="ruleColumn"
-          label="Rule Column">
-          <a-input placeholder="Please Enter Rule Column" v-model.trim="model.ruleColumn"/>
+          label="Rule Column"
+        >
+          <a-input placeholder="Please Enter Rule Column" v-model.trim="model.ruleColumn" />
         </a-form-model-item>
-        <a-form-model-item
-          :labelCol="labelCol"
-          :wrapperCol="wrapperCol"
-          prop="ruleConditions"
-          label="Rule Conditions">
-          <j-dict-select-tag @input="handleChangeRuleCondition" v-model="model.ruleConditions" placeholder="Please Enter Rule Conditions" dictCode="rule_conditions"/>
+        <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="ruleConditions" label="Rule Conditions">
+          <j-dict-select-tag
+            @input="handleChangeRuleCondition"
+            v-model="model.ruleConditions"
+            placeholder="Please Enter Rule Conditions"
+            dictCode="rule_conditions"
+          />
         </a-form-model-item>
-        <a-form-model-item
-          :labelCol="labelCol"
-          :wrapperCol="wrapperCol"
-          prop="ruleValue"
-          label="Rule Value">
-          <a-input placeholder="Please Enter Rule Value" v-model="model.ruleValue"/>
+        <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="ruleValue" label="Rule Value">
+          <a-input placeholder="Please Enter Rule Value" v-model="model.ruleValue" />
         </a-form-model-item>
 
-        <a-form-model-item
-          :labelCol="labelCol"
-          :wrapperCol="wrapperCol"
-          label="Status">
+        <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="Status">
           <a-radio-group buttonStyle="solid" v-model="model.status">
             <a-radio-button value="1">Valid</a-radio-button>
             <a-radio-button value="0">Invalid</a-radio-button>
           </a-radio-group>
         </a-form-model-item>
-
       </a-form-model>
     </a-spin>
   </a-modal>
 </template>
 <script>
-  import { httpAction } from '@/api/manage'
+import { httpAction } from '@/api/manage'
 
-  export default {
-    name: 'PermissionDataRuleModal',
-    data() {
-      return {
-        queryParam: {},
-        title: '操作',
-        visible: false,
-        model: {},
-        ruleConditionList: [],
-        labelCol: {
-          xs: {span: 24},
-          sm: {span: 5}
-        },
-        wrapperCol: {
-          xs: {span: 24},
-          sm: {span: 16}
-        },
-        confirmLoading: false,
-        permissionId: '',
-        validatorRules: {
-          ruleConditions:  [{required: true, message: '请选择条件!'}],
-          ruleName:[{required: true, message: '请输入规则名称!'}],
-          ruleValue:  [{required: true, message: '请输入规则值!'}],
-          ruleColumn: []
-        },
-        url: {
-          list: '/sys/dictItem/list',
-          add: '/sys/permission/addPermissionRule',
-          edit: '/sys/permission/editPermissionRule'
-        },
-        showRuleColumn:true
+export default {
+  name: 'PermissionDataRuleModal',
+  data() {
+    return {
+      queryParam: {},
+      title: '操作',
+      visible: false,
+      model: {},
+      ruleConditionList: [],
+      labelCol: {
+        xs: { span: 24 },
+        sm: { span: 5 },
+      },
+      wrapperCol: {
+        xs: { span: 24 },
+        sm: { span: 16 },
+      },
+      confirmLoading: false,
+      permissionId: '',
+      validatorRules: {
+        ruleConditions: [{ required: true, message: '请选择条件!' }],
+        ruleName: [{ required: true, message: '请输入规则名称!' }],
+        ruleValue: [{ required: true, message: '请输入规则值!' }],
+        ruleColumn: [],
+      },
+      url: {
+        list: '/sys/dictItem/list',
+        add: '/sys/permission/addPermissionRule',
+        edit: '/sys/permission/editPermissionRule',
+      },
+      showRuleColumn: true,
+    }
+  },
+  created() {},
+  methods: {
+    add(permId) {
+      this.permissionId = permId
+      //初始化默认值
+      this.edit({ status: '1' })
+    },
+    edit(record) {
+      this.model = Object.assign({}, record)
+      if (record.permissionId) {
+        this.model.permissionId = record.permissionId
+      } else {
+        this.model.permissionId = this.permissionId
       }
+      this.visible = true
+      this.initRuleCondition()
     },
-    created() {
+    close() {
+      this.$emit('close')
+      this.visible = false
+      this.$refs.form.resetFields()
     },
-    methods: {
-      add(permId) {
-        this.permissionId = permId
-        //初始化默认值
-        this.edit({status:'1'})
-      },
-      edit(record) {
-        this.model = Object.assign({}, record)
-        if (record.permissionId) {
-          this.model.permissionId = record.permissionId
-        } else {
-          this.model.permissionId = this.permissionId
-        }
-        this.visible = true
-        this.initRuleCondition()
-      },
-      close() {
-        this.$emit('close')
-        this.visible = false
-        this.$refs.form.resetFields()
-      },
-      handleOk() {
-        const that = this
-        // 触发表单验证
-        this.$refs.form.validate(valid => {
-          if (valid) {
-            that.confirmLoading = true
-            let httpurl = ''
-            let method = ''
-            if (!this.model.id) {
-              httpurl += this.url.add
-              method = 'post'
-            } else {
-              httpurl += this.url.edit
-              method = 'put'
-            }
-            httpAction(httpurl, this.model, method).then((res) => {
+    handleOk() {
+      const that = this
+      // 触发表单验证
+      this.$refs.form.validate((valid) => {
+        if (valid) {
+          that.confirmLoading = true
+          let httpurl = ''
+          let method = ''
+          if (!this.model.id) {
+            httpurl += this.url.add
+            method = 'post'
+          } else {
+            httpurl += this.url.edit
+            method = 'put'
+          }
+          httpAction(httpurl, this.model, method)
+            .then((res) => {
               if (res.success) {
                 that.$message.success(res.message)
                 that.$emit('ok')
               } else {
                 that.$message.warning(res.message)
               }
-            }).finally(() => {
+            })
+            .finally(() => {
               that.confirmLoading = false
               that.close()
             })
-          }else{
-            return false;
-          }
-        })
-      },
-      handleCancel() {
-        this.close()
-      },
-      initRuleCondition(){
-        if(this.model.ruleConditions && this.model.ruleConditions=='USE_SQL_RULES'){
-          this.showRuleColumn = false
-        }else{
-          this.showRuleColumn = true
-        }
-      },
-      handleChangeRuleCondition(val){
-        if(val=='USE_SQL_RULES'){
-          this.model.ruleColumn=''
-          this.showRuleColumn = false
-        }else{
-          this.showRuleColumn = true
+        } else {
+          return false
         }
+      })
+    },
+    handleCancel() {
+      this.close()
+    },
+    initRuleCondition() {
+      if (this.model.ruleConditions && this.model.ruleConditions == 'USE_SQL_RULES') {
+        this.showRuleColumn = false
+      } else {
+        this.showRuleColumn = true
       }
-    }
-  }
+    },
+    handleChangeRuleCondition(val) {
+      if (val == 'USE_SQL_RULES') {
+        this.model.ruleColumn = ''
+        this.showRuleColumn = false
+      } else {
+        this.showRuleColumn = true
+      }
+    },
+  },
+}
 </script>
 
 <style scoped>
-
 </style>
\ No newline at end of file
diff --git a/src/views/system/modules/SelectUserModal.vue b/src/views/system/modules/SelectUserModal.vue
index 228498e..4120d5e 100644
--- a/src/views/system/modules/SelectUserModal.vue
+++ b/src/views/system/modules/SelectUserModal.vue
@@ -5,29 +5,27 @@
       :title="title"
       :width="1000"
       :visible="visible"
+      :maskClosable="false"
       @ok="handleOk"
       @cancel="handleCancel"
       :cancelButtonProps="{ props: { type: 'warn' } }"
-      cancelText="Cancel">
-
-
+      cancelText="Cancel"
+    >
       <!-- 查询区域 -->
       <div class="table-page-search-wrapper">
-        <a-form layout="inline"  @keyup.enter.native="searchQuery">
+        <a-form layout="inline" @keyup.enter.native="searchQuery">
           <a-row :gutter="24">
-
             <a-col :span="10">
               <a-form-item label="User Name">
                 <a-input v-model="queryParam.username"></a-input>
               </a-form-item>
             </a-col>
             <a-col :span="8">
-                    <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
-                      <a-button type="primary" @click="searchQuery" icon="search">Search</a-button>
-                      <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">Reset</a-button>
-                    </span>
+              <span style="float: left; overflow: hidden" class="table-page-search-submitButtons">
+                <a-button type="primary" @click="searchQuery" icon="search">Search</a-button>
+                <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">Reset</a-button>
+              </span>
             </a-col>
-
           </a-row>
         </a-form>
       </div>
@@ -42,248 +40,249 @@
           :pagination="ipagination"
           :loading="loading"
           :scroll="{ y: 240 }"
-          :rowSelection="{selectedRowKeys: selectedRowKeys,onSelectAll:onSelectAll,onSelect:onSelect,onChange: onSelectChange}"
-          @change="handleTableChange">
-
+          :rowSelection="{
+            selectedRowKeys: selectedRowKeys,
+            onSelectAll: onSelectAll,
+            onSelect: onSelect,
+            onChange: onSelectChange,
+          }"
+          @change="handleTableChange"
+        >
         </a-table>
       </div>
       <!-- table区域-end -->
-
-
     </a-modal>
   </div>
 </template>
 
 <script>
-  import {filterObj} from '@/utils/util'
-  import {getAction} from '@/api/manage'
+import { filterObj } from '@/utils/util'
+import { getAction } from '@/api/manage'
 
-  export default {
-    name: "SelectUserModal",
-    data() {
-      return {
-        title: "Add From List",
-        names: [],
-        visible: false,
-        placement: 'right',
-        description: '',
-        // 查询条件
-        queryParam: {},
-        // 表头
-        columns1: [
-          {
-            title: '#',
-            dataIndex: '',
-            key: 'rowIndex',
-            width: 50,
-            align: "center",
-            customRender: function (t, r, index) {
-              return parseInt(index) + 1;
-            }
+export default {
+  name: 'SelectUserModal',
+  data() {
+    return {
+      title: 'Add From List',
+      names: [],
+      visible: false,
+      placement: 'right',
+      description: '',
+      // 查询条件
+      queryParam: {},
+      // 表头
+      columns1: [
+        {
+          title: '#',
+          dataIndex: '',
+          key: 'rowIndex',
+          width: 50,
+          align: 'center',
+          customRender: function (t, r, index) {
+            return parseInt(index) + 1
           },
-          {
-            title: 'User Name',
-            align: "center",
-            width: 100,
-            dataIndex: 'username'
-          },
-          {
-            title: 'Real Name',
-            align: "center",
-            width: 100,
-            dataIndex: 'realname'
-          },
-          {
-            title: 'Gender',
-            align: "center",
-            width: 100,
-            dataIndex: 'sex_dictText'
-          },
-          {
-            title: 'Phone',
-            align: "center",
-            width: 100,
-            dataIndex: 'phone'
-          },
-          {
-            title: 'Org',
-            align: "center",
-            width: 150,
-            dataIndex: 'orgCode'
-          }
-        ],
-        columns2: [
-          {
-            title: 'User Name',
-            align: "center",
-            dataIndex: 'username',
-
-          },
-          {
-            title: 'Real Name',
-            align: "center",
-            dataIndex: 'realname',
-          },
-          {
-            title: 'Action',
-            dataIndex: 'action',
-            align: "center",
-            width: 100,
-            scopedSlots: {customRender: 'action'},
-          }
-        ],
-        //数据集
-        dataSource1: [],
-        dataSource2: [],
-        // 分页参数
-        ipagination: {
-          current: 1,
-          pageSize: 10,
-          pageSizeOptions: ['10', '20', '30'],
-          showTotal: (total, range) => {
-            const { current, pageSize } = this.ipagination
-            return `Total ${total} items　Page ${current} / ${Math.ceil(total / pageSize)}`
-          },
-          showQuickJumper: true,
-          showSizeChanger: true,
-          total: 0
         },
-        isorter: {
-          column: 'createTime',
-          order: 'desc',
+        {
+          title: 'User Name',
+          align: 'center',
+          width: 100,
+          dataIndex: 'username',
         },
-        loading: false,
-        selectedRowKeys: [],
-        selectedRows: [],
-        url: {
-          list: "/sys/user/list",
-        }
-      }
-    },
-    created() {
-      this.loadData();
-    },
-    methods: {
-      searchQuery() {
-        this.loadData(1);
+        {
+          title: 'Real Name',
+          align: 'center',
+          width: 100,
+          dataIndex: 'realname',
+        },
+        {
+          title: 'Gender',
+          align: 'center',
+          width: 100,
+          dataIndex: 'sex_dictText',
+        },
+        {
+          title: 'Phone',
+          align: 'center',
+          width: 100,
+          dataIndex: 'phone',
+        },
+        {
+          title: 'Org',
+          align: 'center',
+          width: 150,
+          dataIndex: 'orgCode',
+        },
+      ],
+      columns2: [
+        {
+          title: 'User Name',
+          align: 'center',
+          dataIndex: 'username',
+        },
+        {
+          title: 'Real Name',
+          align: 'center',
+          dataIndex: 'realname',
+        },
+        {
+          title: 'Action',
+          dataIndex: 'action',
+          align: 'center',
+          width: 100,
+          scopedSlots: { customRender: 'action' },
+        },
+      ],
+      //数据集
+      dataSource1: [],
+      dataSource2: [],
+      // 分页参数
+      ipagination: {
+        current: 1,
+        pageSize: 10,
+        pageSizeOptions: ['10', '20', '30'],
+        showTotal: (total, range) => {
+          const { current, pageSize } = this.ipagination
+          return `Total ${total} items　Page ${current} / ${Math.ceil(total / pageSize)}`
+        },
+        showQuickJumper: true,
+        showSizeChanger: true,
+        total: 0,
       },
-      searchReset() {
-        this.queryParam = {};
-        this.loadData(1);
+      isorter: {
+        column: 'createTime',
+        order: 'desc',
       },
-      handleCancel() {
-        this.visible = false;
+      loading: false,
+      selectedRowKeys: [],
+      selectedRows: [],
+      url: {
+        list: '/sys/user/list',
       },
-      handleOk() {
-        this.dataSource2 = this.selectedRowKeys;
-        console.log("data:" + this.dataSource2);
-        this.$emit("selectFinished", this.dataSource2);
-        this.visible = false;
-      },
-      add() {
-        this.visible = true;
-      },
-      loadData(arg) {
-        //加载数据 若传入参数1则加载第一页的内容
-        if (arg === 1) {
-          this.ipagination.current = 1;
-        }
-        var params = this.getQueryParams();//查询条件
-        getAction(this.url.list, params).then((res) => {
-          if (res.success) {
-            this.dataSource1 = res.result.records;
-            this.ipagination.total = res.result.total;
-          }
-        })
-      },
-      getQueryParams() {
-        var param = Object.assign({}, this.queryParam, this.isorter);
-        param.field = this.getQueryField();
-        param.pageNo = this.ipagination.current;
-        param.pageSize = this.ipagination.pageSize;
-        return filterObj(param);
-      },
-      getQueryField() {
-        //TODO 字段权限控制
-      },
-      onSelectAll(selected, selectedRows, changeRows) {
-        if (selected === true) {
-          for (var a = 0; a < changeRows.length; a++) {
-            this.dataSource2.push(changeRows[a]);
-          }
-        } else {
-          for (var b = 0; b < changeRows.length; b++) {
-            this.dataSource2.splice(this.dataSource2.indexOf(changeRows[b]), 1);
-          }
-        }
-        // console.log(selected, selectedRows, changeRows);
-      },
-      onSelect(record, selected) {
-        if (selected === true) {
-          this.dataSource2.push(record);
-        } else {
-          var index = this.dataSource2.indexOf(record);
-          //console.log();
-          if (index >= 0) {
-            this.dataSource2.splice(this.dataSource2.indexOf(record), 1);
-          }
-
-        }
-      },
-      onSelectChange(selectedRowKeys, selectedRows) {
-        this.selectedRowKeys = selectedRowKeys;
-        this.selectionRows = selectedRows;
-      },
-      onClearSelected() {
-        this.selectedRowKeys = [];
-        this.selectionRows = [];
-      },
-      handleDelete: function (record) {
-        this.dataSource2.splice(this.dataSource2.indexOf(record), 1);
-      },
-      handleTableChange(pagination, filters, sorter) {
-        //分页、排序、筛选变化时触发
-        console.log(sorter);
-        //TODO 筛选
-        if (Object.keys(sorter).length > 0) {
-          this.isorter.column = sorter.field;
-          this.isorter.order = "ascend" == sorter.order ? "asc" : "desc"
-        }
-        this.ipagination = pagination;
-        this.loadData();
-      }
     }
-  }
+  },
+  created() {
+    this.loadData()
+  },
+  methods: {
+    searchQuery() {
+      this.loadData(1)
+    },
+    searchReset() {
+      this.queryParam = {}
+      this.loadData(1)
+    },
+    handleCancel() {
+      this.visible = false
+    },
+    handleOk() {
+      this.dataSource2 = this.selectedRowKeys
+      console.log('data:' + this.dataSource2)
+      this.$emit('selectFinished', this.dataSource2)
+      this.visible = false
+    },
+    add() {
+      this.visible = true
+    },
+    loadData(arg) {
+      //加载数据 若传入参数1则加载第一页的内容
+      if (arg === 1) {
+        this.ipagination.current = 1
+      }
+      var params = this.getQueryParams() //查询条件
+      getAction(this.url.list, params).then((res) => {
+        if (res.success) {
+          this.dataSource1 = res.result.records
+          this.ipagination.total = res.result.total
+        }
+      })
+    },
+    getQueryParams() {
+      var param = Object.assign({}, this.queryParam, this.isorter)
+      param.field = this.getQueryField()
+      param.pageNo = this.ipagination.current
+      param.pageSize = this.ipagination.pageSize
+      return filterObj(param)
+    },
+    getQueryField() {
+      //TODO 字段权限控制
+    },
+    onSelectAll(selected, selectedRows, changeRows) {
+      if (selected === true) {
+        for (var a = 0; a < changeRows.length; a++) {
+          this.dataSource2.push(changeRows[a])
+        }
+      } else {
+        for (var b = 0; b < changeRows.length; b++) {
+          this.dataSource2.splice(this.dataSource2.indexOf(changeRows[b]), 1)
+        }
+      }
+      // console.log(selected, selectedRows, changeRows);
+    },
+    onSelect(record, selected) {
+      if (selected === true) {
+        this.dataSource2.push(record)
+      } else {
+        var index = this.dataSource2.indexOf(record)
+        //console.log();
+        if (index >= 0) {
+          this.dataSource2.splice(this.dataSource2.indexOf(record), 1)
+        }
+      }
+    },
+    onSelectChange(selectedRowKeys, selectedRows) {
+      this.selectedRowKeys = selectedRowKeys
+      this.selectionRows = selectedRows
+    },
+    onClearSelected() {
+      this.selectedRowKeys = []
+      this.selectionRows = []
+    },
+    handleDelete: function (record) {
+      this.dataSource2.splice(this.dataSource2.indexOf(record), 1)
+    },
+    handleTableChange(pagination, filters, sorter) {
+      //分页、排序、筛选变化时触发
+      console.log(sorter)
+      //TODO 筛选
+      if (Object.keys(sorter).length > 0) {
+        this.isorter.column = sorter.field
+        this.isorter.order = 'ascend' == sorter.order ? 'asc' : 'desc'
+      }
+      this.ipagination = pagination
+      this.loadData()
+    },
+  },
+}
 </script>
 <style lang="less" scoped>
-  .ant-card-body .table-operator {
-    margin-bottom: 18px;
-  }
+.ant-card-body .table-operator {
+  margin-bottom: 18px;
+}
 
-  .ant-table-tbody .ant-table-row td {
-    padding-top: 15px;
-    padding-bottom: 15px;
-  }
+.ant-table-tbody .ant-table-row td {
+  padding-top: 15px;
+  padding-bottom: 15px;
+}
 
-  .anty-row-operator button {
-    margin: 0 5px
-  }
+.anty-row-operator button {
+  margin: 0 5px;
+}
 
-  .ant-btn-danger {
-    background-color: #ffffff
-  }
+.ant-btn-danger {
+  background-color: #ffffff;
+}
 
-  .ant-modal-cust-warp {
-    height: 100%
-  }
+.ant-modal-cust-warp {
+  height: 100%;
+}
 
-  .ant-modal-cust-warp .ant-modal-body {
-    height: calc(100% - 110px) !important;
-    overflow-y: auto
-  }
+.ant-modal-cust-warp .ant-modal-body {
+  height: calc(100% - 110px) !important;
+  overflow-y: auto;
+}
 
-  .ant-modal-cust-warp .ant-modal-content {
-    height: 90% !important;
-    overflow-y: hidden
-  }
+.ant-modal-cust-warp .ant-modal-content {
+  height: 90% !important;
+  overflow-y: hidden;
+}
 </style>
\ No newline at end of file