diff --git a/jshERP-web/src/components/dict/JDictSelectTag.vue b/jshERP-web/src/components/dict/JDictSelectTag.vue
deleted file mode 100644
index 76d33c30..00000000
--- a/jshERP-web/src/components/dict/JDictSelectTag.vue
+++ /dev/null
@@ -1,103 +0,0 @@
-<template>
-  <a-radio-group v-if="tagType=='radio'" @change="handleInput" :value="getValueSting" :disabled="disabled">
-    <a-radio v-for="(item, key) in dictOptions" :key="key" :value="item.value">{{ item.text }}</a-radio>
-  </a-radio-group>
-
-  <a-radio-group v-else-if="tagType=='radioButton'"  buttonStyle="solid" @change="handleInput" :value="getValueSting" :disabled="disabled">
-    <a-radio-button v-for="(item, key) in dictOptions" :key="key" :value="item.value">{{ item.text }}</a-radio-button>
-  </a-radio-group>
-
-  <a-select v-else-if="tagType=='select'" :getPopupContainer = "(target) => target.parentNode" :placeholder="placeholder" :disabled="disabled" :value="getValueSting" @change="handleInput">
-    <a-select-option :value="undefined">请选择</a-select-option>
-    <a-select-option v-for="(item, key) in dictOptions" :key="key" :value="item.value">
-      <span style="display: inline-block;width: 100%" :title=" item.text || item.label ">
-        {{ item.text || item.label }}
-      </span>
-    </a-select-option>
-  </a-select>
-</template>
-
-<script>
-  import {ajaxGetDictItems,getDictItemsFromCache} from '@/api/api'
-
-  export default {
-    name: "JDictSelectTag",
-    props: {
-      dictCode: String,
-      placeholder: String,
-      triggerChange: Boolean,
-      disabled: Boolean,
-      value: [String, Number],
-      type: String
-    },
-    data() {
-      return {
-        dictOptions: [],
-        tagType:""
-      }
-    },
-    watch:{
-      dictCode:{
-        immediate:true,
-        handler() {
-          this.initDictData()
-        },
-      }
-    },
-    created() {
-      // console.log(this.dictCode);
-      if(!this.type || this.type==="list"){
-        this.tagType = "select"
-      }else{
-        this.tagType = this.type
-      }
-      //获取字典数据
-      // this.initDictData();
-    },
-    computed: {
-      getValueSting(){
-        return this.value != null ? this.value.toString() : null;
-      },
-    },
-    methods: {
-      initDictData() {
-        //优先从缓存中读取字典配置
-        if(getDictItemsFromCache(this.dictCode)){
-          this.dictOptions = getDictItemsFromCache(this.dictCode);
-          return
-        }
-
-        //根据字典Code, 初始化字典数组
-        ajaxGetDictItems(this.dictCode, null).then((res) => {
-          if (res.success) {
-//                console.log(res.result);
-            this.dictOptions = res.result;
-          }
-        })
-      },
-      handleInput(e) {
-        let val;
-        if(this.tagType=="radio"){
-          val = e.target.value
-        }else{
-          val = e
-        }
-        console.log(val);
-        if(this.triggerChange){
-          this.$emit('change', val);
-        }else{
-          this.$emit('input', val);
-        }
-      },
-      setCurrentDictOptions(dictOptions){
-        this.dictOptions = dictOptions
-      },
-      getCurrentDictOptions(){
-        return this.dictOptions
-      }
-    }
-  }
-</script>
-
-<style scoped>
-</style>
\ No newline at end of file
diff --git a/jshERP-web/src/components/dict/JDictSelectUtil.js b/jshERP-web/src/components/dict/JDictSelectUtil.js
deleted file mode 100644
index 4bc975d2..00000000
--- a/jshERP-web/src/components/dict/JDictSelectUtil.js
+++ /dev/null
@@ -1,142 +0,0 @@
-/**
- * 字典 util
- * author: scott
- * date: 20190109
- */
-
-import {ajaxGetDictItems,getDictItemsFromCache} from '@/api/api'
-import {getAction} from '@/api/manage'
-
-/**
- * 获取字典数组
- * @param dictCode 字典Code
- * @return List<Map>
- */
-export async function initDictOptions(dictCode) {
-  if (!dictCode) {
-    return '字典Code不能为空!';
-  }
-  //优先从缓存中读取字典配置
-  if(getDictItemsFromCache(dictCode)){
-    let res = {}
-    res.result = getDictItemsFromCache(dictCode);
-    res.success = true;
-    return res;
-  }
-  //获取字典数组
-  let res = await ajaxGetDictItems(dictCode);
-  return res;
-}
-
-/**
- * 字典值替换文本通用方法
- * @param dictOptions  字典数组
- * @param text  字典值
- * @return String
- */
-export function filterDictText(dictOptions, text) {
-  // --update-begin----author:sunjianlei---date:20200323------for: 字典翻译 text 允许逗号分隔 ---
-  if (text != null && dictOptions instanceof Array) {
-    let result = []
-    // 允许多个逗号分隔
-    let splitText = text.toString().trim().split(',')
-    for (let txt of splitText) {
-      let dictText = txt
-      for (let dictItem of dictOptions) {
-        if (txt === dictItem.value.toString()) {
-          dictText = dictItem.text
-          break
-        }
-      }
-      result.push(dictText)
-    }
-    return result.join(',')
-  }
-  return text
-  // --update-end----author:sunjianlei---date:20200323------for: 字典翻译 text 允许逗号分隔 ---
-}
-
-/**
- * 字典值替换文本通用方法(多选)
- * @param dictOptions  字典数组
- * @param text  字典值
- * @return String
- */
-export function filterMultiDictText(dictOptions, text) {
-  //js “!text” 认为0为空，所以做提前处理
-  if(text === 0 || text === '0'){
-    if(dictOptions){
-      for (let dictItem of dictOptions) {
-        if (text == dictItem.value) {
-          return dictItem.text
-        }
-      }
-    }
-  }
-
-  if(!text || text=='null' || !dictOptions || dictOptions.length==0){
-    return ""
-  }
-  let re = "";
-  text = text.toString()
-  let arr = text.split(",")
-  dictOptions.forEach(function (option) {
-    if(option){
-      for(let i=0;i<arr.length;i++){
-        if (arr[i] === option.value) {
-          re += option.text+",";
-          break;
-        }
-      }
-    }
-  });
-  if(re==""){
-    return text;
-  }
-  return re.substring(0,re.length-1);
-}
-
-/**
- * 翻译字段值对应的文本
- * @param children
- * @returns string
- */
-export function filterDictTextByCache(dictCode, key) {
-  if(key==null ||key.length==0){
-    return;
-  }
-  if (!dictCode) {
-    return '字典Code不能为空!';
-  }
-   //优先从缓存中读取字典配置
-  if(getDictItemsFromCache(dictCode)){
-    let item = getDictItemsFromCache(dictCode).filter(t => t["value"] == key)
-    if(item && item.length>0){
-      return item[0]["text"]
-    }
-  }
-}
-
-/** 通过code获取字典数组 */
-export async function getDictItems(dictCode, params) {
-    //优先从缓存中读取字典配置
-    if(getDictItemsFromCache(dictCode)){
-      let desformDictItems = getDictItemsFromCache(dictCode).map(item => ({...item, label: item.text}))
-      return desformDictItems;
-    }
-
-    //缓存中没有，就请求后台
-    return await ajaxGetDictItems(dictCode, params).then(({success, result}) => {
-      if (success) {
-        let res = result.map(item => ({...item, label: item.text}))
-        console.log('------- 从DB中获取到了字典-------dictCode : ', dictCode, res)
-        return Promise.resolve(res)
-      } else {
-        console.error('getDictItems error: : ', res)
-        return Promise.resolve([])
-      }
-    }).catch((res) => {
-      console.error('getDictItems error: ', res)
-      return Promise.resolve([])
-    })
-}
\ No newline at end of file
diff --git a/jshERP-web/src/components/dict/JMultiSelectTag.vue b/jshERP-web/src/components/dict/JMultiSelectTag.vue
deleted file mode 100644
index c35834c2..00000000
--- a/jshERP-web/src/components/dict/JMultiSelectTag.vue
+++ /dev/null
@@ -1,107 +0,0 @@
-<template>
-  <a-checkbox-group v-if="tagType=='checkbox'" @change="onChange" :value="arrayValue" :disabled="disabled">
-    <a-checkbox v-for="(item, key) in dictOptions" :key="key" :value="item.value">{{ item.text || item.label }}</a-checkbox>
-  </a-checkbox-group>
-
-  <a-select
-    v-else-if="tagType=='select'"
-    :value="arrayValue"
-    @change="onChange"
-    :disabled="disabled"
-    mode="multiple"
-    :placeholder="placeholder"
-    :getPopupContainer="(node) => node.parentNode"
-    allowClear>
-    <a-select-option
-      v-for="(item,index) in dictOptions"
-      :key="index"
-      :value="item.value">
-      <span style="display: inline-block;width: 100%" :title=" item.text || item.label ">
-        {{ item.text || item.label }}
-      </span>
-    </a-select-option>
-  </a-select>
-
-</template>
-
-<script>
-  import {ajaxGetDictItems,getDictItemsFromCache} from '@/api/api'
-  export default {
-    name: 'JMultiSelectTag',
-    props: {
-      dictCode: String,
-      placeholder: String,
-      disabled: Boolean,
-      value: String,
-      type: String,
-      options:Array
-    },
-    data() {
-      return {
-        dictOptions: [],
-        tagType:"",
-        arrayValue:!this.value?[]:this.value.split(",")
-      }
-    },
-    created() {
-      if(!this.type || this.type==="list_multi"){
-        this.tagType = "select"
-      }else{
-        this.tagType = this.type
-      }
-      //获取字典数据
-      //this.initDictData();
-    },
-    watch:{
-      options: function(val){
-        this.setCurrentDictOptions(val);
-      },
-      dictCode:{
-        immediate:true,
-        handler() {
-          this.initDictData()
-        },
-      },
-      value (val) {
-        if(!val){
-          this.arrayValue = []
-        }else{
-          this.arrayValue = this.value.split(",")
-        }
-      }
-    },
-    methods: {
-      initDictData() {
-        if(this.options && this.options.length>0){
-          this.dictOptions = [...this.options]
-        }else{
-          //优先从缓存中读取字典配置
-          if(getDictItemsFromCache(this.dictCode)){
-            this.dictOptions = getDictItemsFromCache(this.dictCode);
-            return
-          }
-          //根据字典Code, 初始化字典数组
-          ajaxGetDictItems(this.dictCode, null).then((res) => {
-            if (res.success) {
-              this.dictOptions = res.result;
-            }
-          })
-        }
-
-      },
-      onChange (selectedValue) {
-        this.$emit('change', selectedValue.join(","));
-      },
-      setCurrentDictOptions(dictOptions){
-        this.dictOptions = dictOptions
-      },
-      getCurrentDictOptions(){
-        return this.dictOptions
-      }
-    },
-    model: {
-      prop: 'value',
-      event: 'change'
-    }
-  }
-</script>
diff --git a/jshERP-web/src/components/dict/JSearchSelectTag.vue b/jshERP-web/src/components/dict/JSearchSelectTag.vue
deleted file mode 100644
index 65f63f70..00000000
--- a/jshERP-web/src/components/dict/JSearchSelectTag.vue
+++ /dev/null
@@ -1,201 +0,0 @@
-<template>
-
-  <a-select
-    v-if="async"
-    showSearch
-    labelInValue
-    :disabled="disabled"
-    :getPopupContainer="(node) => node.parentNode"
-    @search="loadData"
-    :placeholder="placeholder"
-    v-model="selectedAsyncValue"
-    style="width: 100%"
-    :filterOption="false"
-    @change="handleAsyncChange"
-    allowClear
-    :notFoundContent="loading ? undefined : null"
-  >
-    <a-spin v-if="loading" slot="notFoundContent" size="small"/>
-    <a-select-option v-for="d in options" :key="d.value" :value="d.value">{{ d.text }}</a-select-option>
-  </a-select>
-
-  <a-select
-    v-else
-    :getPopupContainer="(node) => node.parentNode"
-    showSearch
-    :disabled="disabled"
-    :placeholder="placeholder"
-    optionFilterProp="children"
-    style="width: 100%"
-    @change="handleChange"
-    :filterOption="filterOption"
-    v-model="selectedValue"
-    allowClear
-    :notFoundContent="loading ? undefined : null">
-    <a-spin v-if="loading" slot="notFoundContent" size="small"/>
-    <a-select-option v-for="d in options" :key="d.value" :value="d.value">{{ d.text }}</a-select-option>
-  </a-select>
-
-</template>
-
-<script>
-  import { ajaxGetDictItems,getDictItemsFromCache } from '@/api/api'
-  import debounce from 'lodash/debounce';
-  import { getAction } from '../../api/manage'
-
-  export default {
-    name: 'JSearchSelectTag',
-    props:{
-      disabled: Boolean,
-      value: [String, Number],
-      dict: String,
-      dictOptions: Array,
-      async: Boolean,
-      placeholder:{
-        type:String,
-        default:"请选择",
-        required:false
-      }
-    },
-    data(){
-      this.loadData = debounce(this.loadData, 800);//消抖
-      this.lastLoad = 0;
-      return {
-        loading:false,
-        selectedValue:[],
-        selectedAsyncValue:[],
-        options: [],
-      }
-    },
-    created(){
-      this.initDictData();
-    },
-    watch:{
-      "value":{
-        immediate:true,
-        handler(val){
-          if(!val){
-            if(val==0){
-              this.initSelectValue()
-            }else{
-              this.selectedValue=[]
-              this.selectedAsyncValue=[]
-            }
-          }else{
-            this.initSelectValue()
-          }
-        }
-      },
-      "dict":{
-        handler(){
-          this.initDictData()
-        }
-      }
-    },
-    methods:{
-      initSelectValue(){
-        if(this.async){
-          if(!this.selectedAsyncValue || !this.selectedAsyncValue.key || this.selectedAsyncValue.key!=this.value){
-            console.log("这才请求后台")
-            getAction(`/sys/dict/loadDictItem/${this.dict}`,{key:this.value}).then(res=>{
-              if(res.success){
-                let obj = {
-                  key:this.value,
-                  label:res.result
-                }
-                this.selectedAsyncValue = {...obj}
-              }
-            })
-          }
-        }else{
-          this.selectedValue = this.value.toString()
-        }
-      },
-      loadData(value){
-        console.log("数据加载",value)
-        this.lastLoad +=1
-        const currentLoad = this.lastLoad
-        this.options = []
-        this.loading=true
-        // 字典code格式：table,text,code
-        getAction(`/sys/dict/loadDict/${this.dict}`,{keyword:value}).then(res=>{
-          this.loading=false
-          if(res.success){
-            if(currentLoad!=this.lastLoad){
-              return
-            }
-            this.options = res.result
-            console.log("我是第一个",res)
-          }else{
-            this.$message.warning(res.message)
-          }
-
-        })
-
-      },
-      initDictData(){
-        if(!this.async){
-          //如果字典项集合有数据
-          if(this.dictOptions && this.dictOptions.length>0){
-            this.options = [...this.dictOptions]
-          }else{
-            //根据字典Code, 初始化字典数组
-            let dictStr = ''
-            if(this.dict){
-                let arr = this.dict.split(',')
-                if(arr[0].indexOf('where')>0){
-                  let tbInfo = arr[0].split('where')
-                  dictStr = tbInfo[0].trim()+','+arr[1]+','+arr[2]+','+encodeURIComponent(tbInfo[1])
-                }else{
-                  dictStr = this.dict
-                }
-                if (this.dict.indexOf(",") == -1) {
-                  //优先从缓存中读取字典配置
-                  if (getDictItemsFromCache(this.dictCode)) {
-                    this.options = getDictItemsFromCache(this.dictCode);
-                    return
-                  }
-                }
-                ajaxGetDictItems(dictStr, null).then((res) => {
-                  if (res.success) {
-                    this.options = res.result;
-                  }
-                })
-            }
-          }
-        }
-      },
-      filterOption(input, option) {
-        return option.componentOptions.children[0].text.toLowerCase().indexOf(input.toLowerCase()) >= 0
-      },
-      handleChange (selectedValue) {
-        console.log("selectedValue",selectedValue)
-        this.selectedValue = selectedValue
-        this.callback()
-      },
-      handleAsyncChange(selectedObj){
-        this.selectedAsyncValue = selectedObj
-        this.selectedValue = selectedObj.key
-        this.callback()
-      },
-      callback(){
-        this.$emit('change', this.selectedValue);
-      },
-      setCurrentDictOptions(dictOptions){
-        this.options = dictOptions
-      },
-      getCurrentDictOptions(){
-        return this.options
-      }
-
-    },
-    model: {
-      prop: 'value',
-      event: 'change'
-    }
-  }
-</script>
-
-<style scoped>
-
-</style>
\ No newline at end of file
diff --git a/jshERP-web/src/components/dict/README.md b/jshERP-web/src/components/dict/README.md
deleted file mode 100644
index 4106df04..00000000
--- a/jshERP-web/src/components/dict/README.md
+++ /dev/null
@@ -1,181 +0,0 @@
-# JDictSelectTag 组件用法
-----
-- 从字典表获取数据,dictCode格式说明: 字典code
-```html
-<j-dict-select-tag  v-model="queryParam.sex" placeholder="请输入用户性别"
-                  dictCode="sex"/>
-```
-
-v-decorator用法：
-```html
-<j-dict-select-tag  v-decorator="['sex', {}]" :triggerChange="true" placeholder="请输入用户性别"
-                  dictCode="sex"/>
-```
-
-- 从数据库表获取字典数据，dictCode格式说明: 表名,文本字段,取值字段
-```html
-<j-dict-select-tag v-model="queryParam.username" placeholder="请选择用户名称" 
-                   dictCode="sys_user,realname,id"/>
-```
-
-
-
-# JDictSelectUtil.js 列表字典函数用法
-----
-
-- 第一步: 引入依赖方法
-```html
-       import {initDictOptions, filterDictText} from '@/components/dict/JDictSelectUtil'
-```
-
-- 第二步: 在created()初始化方法执行字典配置方法
-```html
-      //初始化字典配置
-      this.initDictConfig();
-```
-      
-- 第三步: 实现initDictConfig方法，加载列表所需要的字典(列表上有多个字典项，就执行多次initDictOptions方法)
-      
-```html
-      initDictConfig() {
-        //初始化字典 - 性别
-        initDictOptions('sex').then((res) => {
-          if (res.success) {
-            this.sexDictOptions = res.result;
-          }
-        });
-      },
-```
-      
-- 第四步: 实现字段的customRender方法
-```html
-     customRender: (text, record, index) => {
-       //字典值替换通用方法
-       return filterDictText(this.sexDictOptions, text);
-     }
-```
-
-
-# JMultiSelectTag 多选组件
-下拉/checkbox
-
-## 参数配置
-| 参数           | 类型   | 必填 |说明|
-|--------------|---------|----|---------|
-| placeholder      |string   | | placeholder |
-| disabled      |Boolean   | | 是否禁用 |
-| type      |string   | | 多选类型 select/checkbox 默认是select |
-| dictCode      |string   | | 数据字典编码或者表名,显示字段名,存储字段名拼接而成的字符串,如果提供了options参数 则此参数可不填|
-| options      |Array   | | 多选项,如果dictCode参数未提供,可以设置此参数加载多选项 |
-
-使用示例
-----
-```vue
-<template>
-  <a-form>
-    <a-form-item label="下拉多选" style="width: 300px">
-      <j-multi-select-tag
-        v-model="selectValue"
-        :options="dictOptions"
-        placeholder="请做出你的选择">
-      </j-multi-select-tag>
-      {{ selectValue }}
-    </a-form-item>
-
-    <a-form-item label="checkbox">
-      <j-multi-select-tag
-        v-model="checkboxValue"
-        :options="dictOptions"
-        type="checkbox">
-      </j-multi-select-tag>
-      {{ checkboxValue }}
-    </a-form-item>
-  </a-form >
-</template>
-
-<script>
-  import JMultiSelectTag from '@/components/dict/JMultiSelectTag'
-  export default {
-    components: {JMultiSelectTag},
-    data() {
-      return {
-        selectValue:"",
-        checkboxValue:"",
-        dictOptions:[{
-          label:"选项一",
-          value:"1"
-        },{
-          label:"选项二",
-          value:"2"
-        },{
-          label:"选项三",
-          value:"3"
-        }]
-      }
-    }
-  }
-</script>
-```
-
-# JSearchSelectTag 字典表的搜索组件
-下拉搜索组件,支持异步加载,异步加载用于大数据量的字典表
-
-## 参数配置
-| 参数           | 类型   | 必填 |说明|
-|--------------|---------|----|---------|
-| placeholder      |string   | | placeholder |
-| disabled      |Boolean   | | 是否禁用 |
-| dict      |string   | | 表名,显示字段名,存储字段名拼接而成的字符串,如果提供了dictOptions参数 则此参数可不填|
-| dictOptions      |Array   | | 多选项,如果dict参数未提供,可以设置此参数加载多选项 |
-| async      |Boolean   | | 是否支持异步加载,设置成true,则通过输入的内容加载远程数据,否则在本地过滤数据,默认false|
-
-使用示例
-----
-```vue
-<template>
-  <a-form>
-    <a-form-item label="下拉搜索" style="width: 300px">
-      <j-search-select-tag
-        placeholder="请做出你的选择"
-        v-model="selectValue"
-        :dictOptions="dictOptions">
-      </j-search-select-tag>
-      {{ selectValue }}
-    </a-form-item>
-
-    <a-form-item label="异步加载" style="width: 300px">
-      <j-search-select-tag
-        placeholder="请做出你的选择"
-        v-model="asyncSelectValue"
-        dict="sys_depart,depart_name,id"
-        :async="true">
-      </j-search-select-tag>
-      {{ asyncSelectValue }}
-    </a-form-item>
-  </a-form >
-</template>
-
-<script>
-  import JSearchSelectTag from '@/components/dict/JSearchSelectTag'
-  export default {
-    components: {JSearchSelectTag},
-    data() {
-      return {
-        selectValue:"",
-        asyncSelectValue:"",
-        dictOptions:[{
-          text:"选项一",
-          value:"1"
-        },{
-          text:"选项二",
-          value:"2"
-        },{
-          text:"选项三",
-          value:"3"
-        }]
-      }
-    }
-  }
-</script>
-```
-
diff --git a/jshERP-web/src/components/dict/index.js b/jshERP-web/src/components/dict/index.js
deleted file mode 100644
index 22c3235d..00000000
--- a/jshERP-web/src/components/dict/index.js
+++ /dev/null
@@ -1,7 +0,0 @@
-import T from './JDictSelectTag.vue'
-const JDictSelectTag = {
-  install: function (Vue) {
-    Vue.component('JDictSelectTag',T);
-  }
-}
-export default JDictSelectTag;
\ No newline at end of file
diff --git a/jshERP-web/src/components/jeecg/JEditableTable.vue b/jshERP-web/src/components/jeecg/JEditableTable.vue
index 52d33c75..724a11b8 100644
--- a/jshERP-web/src/components/jeecg/JEditableTable.vue
+++ b/jshERP-web/src/components/jeecg/JEditableTable.vue
@@ -764,7 +764,6 @@
   import { FormTypes, VALIDATE_NO_PASSED } from '@/utils/JEditableTableUtil'
   import { cloneObject, randomString, randomNumber } from '@/utils/util'
   import JDate from '@/components/jeecg/JDate'
-  import { initDictOptions } from '@/components/dict/JDictSelectUtil'
   import { getFileAccessHttpUrl } from '@/api/manage';
   import JInputPop from '@/components/jeecg/minipop/JInputPop'
   import JFilePop from '@/components/jeecg/minipop/JFilePop'
@@ -1029,9 +1028,6 @@
                     return {}
                   })
                 }
-                if (column.dictCode) {
-                  this._loadDictConcatToOptions(column)
-                }
               }
             })
           })
@@ -2472,24 +2468,6 @@
         }
       },
 
-      /** 加载数据字典并合并到 options */
-      _loadDictConcatToOptions(column) {
-        initDictOptions(column.dictCode).then((res) => {
-          if (res && res.code == 200) {
-            let newOptions = (column.options || [])// .concat(res.result)
-            res.data.forEach(item => {
-              for (let option of newOptions) if (option.value === item.value) return
-              newOptions.push(item)
-            })
-            column.options = newOptions
-          } else {
-            console.group(`JEditableTable 查询字典(${column.dictCode})发生异常`)
-            console.log(res.data)
-            console.groupEnd()
-          }
-        })
-      },
-
       /* --- common function end --- */
 
       /* --- 以下是辅助方法，多用于动态构造页面中的数据 --- */
diff --git a/jshERP-web/src/components/jeecg/JSuperQuery.vue b/jshERP-web/src/components/jeecg/JSuperQuery.vue
index 7397f4b7..995f2fb2 100644
--- a/jshERP-web/src/components/jeecg/JSuperQuery.vue
+++ b/jshERP-web/src/components/jeecg/JSuperQuery.vue
@@ -1,640 +1,639 @@
-<template>
-<div class="j-super-query-box">
-
-  <slot name="button" :isActive="superQueryFlag" :isMobile="izMobile" :open="handleOpen" :reset="handleReset">
-    <a-tooltip v-if="superQueryFlag" v-bind="tooltipProps" :mouseLeaveDelay="0.2">
-      <!-- begin 不知道为什么不加上这段代码就无法生效 -->
-      <span v-show="false">{{tooltipProps}}</span>
-      <!-- end 不知道为什么不加上这段代码就无法生效 -->
-      <template slot="title">
-        <span>已有高级查询条件生效</span>
-        <a-divider type="vertical"/>
-        <a @click="handleReset">清空</a>
-      </template>
-      <a-button-group>
-        <a-button type="primary" @click="handleOpen">
-          <a-icon type="appstore" theme="twoTone" spin/>
-          <span>高级查询</span>
-        </a-button>
-        <a-button v-if="izMobile" type="primary" icon="delete" @click="handleReset"/>
-      </a-button-group>
-    </a-tooltip>
-    <a-button v-else type="primary" icon="filter" @click="handleOpen">高级查询</a-button>
-  </slot>
-
-  <j-modal
-    title="高级查询构造器"
-    :width="1000"
-    :visible="visible"
-    @cancel="handleCancel"
-    :mask="false"
-    :fullscreen="izMobile"
-    class="j-super-query-modal"
-    style="top:5%;max-height: 95%;"
-  >
-
-    <template slot="footer">
-      <div style="float: left">
-        <a-button :loading="loading" @click="handleReset">重置</a-button>
-        <a-button :loading="loading" @click="handleSave">保存查询条件</a-button>
-      </div>
-      <a-button :loading="loading" @click="handleCancel">关闭</a-button>
-      <a-button :loading="loading" type="primary" @click="handleOk">查询</a-button>
-    </template>
-
-    <a-spin :spinning="loading">
-      <a-row>
-        <a-col :sm="24" :md="24-5">
-
-          <a-empty v-if="queryParamsModel.length === 0" style="margin-bottom: 12px;">
-            <div slot="description">
-              <span>没有任何查询条件</span>
-              <a-divider type="vertical"/>
-              <a @click="handleAdd">点击新增</a>
-            </div>
-          </a-empty>
-
-          <a-form v-else layout="inline">
-
-            <a-row style="margin-bottom: 12px;">
-              <a-col :md="12" :xs="24">
-                <a-form-item label="过滤条件匹配" :labelCol="{md: 6,xs:24}" :wrapperCol="{md: 18,xs:24}" style="width: 100%;">
-                  <a-select v-model="matchType" :getPopupContainer="node=>node.parentNode" style="width: 100%;">
-                    <a-select-option value="and">AND（所有条件都要求匹配）</a-select-option>
-                    <a-select-option value="or">OR（条件中的任意一个匹配）</a-select-option>
-                  </a-select>
-                </a-form-item>
-              </a-col>
-            </a-row>
-
-            <a-row type="flex" style="margin-bottom:10px" :gutter="16" v-for="(item, index) in queryParamsModel" :key="index">
-
-              <a-col :md="8" :xs="24" style="margin-bottom: 12px;">
-                <a-tree-select
-                  showSearch
-                  v-model="item.field"
-                  :treeData="fieldTreeData"
-                  :dropdownStyle="{ maxHeight: '400px', overflow: 'auto' }"
-                  placeholder="选择查询字段"
-                  allowClear
-                  treeDefaultExpandAll
-                  :getPopupContainer="node=>node.parentNode"
-                  style="width: 100%"
-                  @select="(val,option)=>handleSelected(option,item)"
-                >
-                </a-tree-select>
-              </a-col>
-
-              <a-col :md="4" :xs="24" style="margin-bottom: 12px;">
-                <a-select placeholder="匹配规则" :value="item.rule" :getPopupContainer="node=>node.parentNode" @change="handleRuleChange(item,$event)">
-                  <a-select-option value="eq">等于</a-select-option>
-                  <a-select-option value="like">包含</a-select-option>
-                  <a-select-option value="right_like">以..开始</a-select-option>
-                  <a-select-option value="left_like">以..结尾</a-select-option>
-                  <a-select-option value="in">在...中</a-select-option>
-                  <a-select-option value="ne">不等于</a-select-option>
-                  <a-select-option value="gt">大于</a-select-option>
-                  <a-select-option value="ge">大于等于</a-select-option>
-                  <a-select-option value="lt">小于</a-select-option>
-                  <a-select-option value="le">小于等于</a-select-option>
-                </a-select>
-              </a-col>
-
-              <a-col :md="8" :xs="24" style="margin-bottom: 12px;">
-                <template v-if="item.dictCode">
-                  <template v-if="item.type === 'table-dict'">
-                    <j-popup
-                      v-model="item.val"
-                      :code="item.dictTable"
-                      :field="item.dictCode"
-                      :orgFields="item.dictCode"
-                      :destFields="item.dictCode"
-                    ></j-popup>
-                  </template>
-                  <template v-else>
-                    <j-multi-select-tag v-show="allowMultiple(item)" v-model="item.val" :dictCode="item.dictCode" placeholder="请选择"/>
-                    <j-dict-select-tag v-show="!allowMultiple(item)" v-model="item.val" :dictCode="item.dictCode" placeholder="请选择"/>
-                  </template>
-                </template>
-                <j-popup v-else-if="item.type === 'popup'" :value="item.val" v-bind="item.popup" group-id="superQuery" @input="(e,v)=>handleChangeJPopup(item,e,v)"/>
-                <j-select-multi-user
-                  v-else-if="item.type === 'select-user' || item.type === 'sel_user'"
-                  v-model="item.val"
-                  :buttons="false"
-                  :multiple="false"
-                  placeholder="请选择用户"
-                  :returnKeys="['id', item.customReturnField || 'username']"
-                />
-                <j-select-depart
-                  v-else-if="item.type === 'select-depart' || item.type === 'sel_depart'"
-                  v-model="item.val"
-                  :multi="false"
-                  placeholder="请选择部门"
-                  :customReturnField="item.customReturnField || 'id'"
-                />
-                <a-select
-                  v-else-if="item.options instanceof Array"
-                  v-model="item.val"
-                  :options="item.options"
-                  allowClear
-                  placeholder="请选择"
-                  :mode="allowMultiple(item)?'multiple':''"
-                />
-                <j-area-linkage v-model="item.val" v-else-if="item.type==='area-linkage' || item.type==='pca'" style="width: 100%"/>
-                <j-date v-else-if=" item.type=='date' " v-model="item.val" placeholder="请选择日期" style="width: 100%"></j-date>
-                <j-date v-else-if=" item.type=='datetime' " v-model="item.val" placeholder="请选择时间" :show-time="true" date-format="YYYY-MM-DD HH:mm:ss" style="width: 100%"></j-date>
-                <a-time-picker v-else-if="item.type==='time'" :value="item.val ? moment(item.val,'HH:mm:ss') : null" format="HH:mm:ss" style="width: 100%" @change="(time,value)=>item.val=value"/>
-                <a-input-number v-else-if=" item.type=='int'||item.type=='number' " style="width: 100%" placeholder="请输入数值" v-model="item.val"/>
-                <a-input v-else v-model="item.val" placeholder="请输入值"/>
-              </a-col>
-
-              <a-col :md="4" :xs="0" style="margin-bottom: 12px;">
-                <a-button @click="handleAdd" icon="plus"></a-button>&nbsp;
-                <a-button @click="handleDel( index )" icon="minus"></a-button>
-              </a-col>
-
-              <a-col :md="0" :xs="24" style="margin-bottom: 12px;text-align: right;">
-                <a-button @click="handleAdd" icon="plus"></a-button>&nbsp;
-                <a-button @click="handleDel( index )" icon="minus"></a-button>
-              </a-col>
-
-            </a-row>
-
-          </a-form>
-        </a-col>
-        <a-col :sm="24" :md="5">
-          <!-- 查询记录 -->
-
-          <a-card class="j-super-query-history-card" :bordered="true">
-            <div slot="title">
-              保存的查询
-            </div>
-
-            <a-empty v-if="saveTreeData.length === 0" class="j-super-query-history-empty" description="没有保存任何查询"/>
-            <a-tree
-              v-else
-              class="j-super-query-history-tree"
-              showIcon
-              :treeData="saveTreeData"
-              :selectedKeys="[]"
-              @select="handleTreeSelect"
-            >
-            </a-tree>
-          </a-card>
-
-
-        </a-col>
-      </a-row>
-
-
-    </a-spin>
-
-    <a-modal title="请输入保存的名称" :visible="prompt.visible" @cancel="prompt.visible=false" @ok="handlePromptOk">
-      <a-input v-model="prompt.value"></a-input>
-    </a-modal>
-
-  </j-modal>
-</div>
-</template>
-
-<script>
-  import moment from 'moment'
-  import * as utils from '@/utils/util'
-  import { mixinDevice } from '@/utils/mixin'
-  import JDate from '@/components/jeecg/JDate.vue'
-  import JSelectDepart from '@/components/jeecgbiz/JSelectDepart'
-  import JSelectMultiUser from '@/components/jeecgbiz/JSelectMultiUser'
-  import JMultiSelectTag from '@/components/dict/JMultiSelectTag'
-  import JAreaLinkage from '@comp/jeecg/JAreaLinkage'
-
-  export default {
-    name: 'JSuperQuery',
-    mixins: [mixinDevice],
-    components: { JAreaLinkage, JMultiSelectTag, JDate, JSelectDepart, JSelectMultiUser },
-    props: {
-      /*
-       fieldList: [{
-          value:'',
-          text:'',
-          type:'',
-          dictCode:'' // 只要 dictCode 有值，无论 type 是什么，都显示为字典下拉框
-       }]
-       type:date datetime int number string
-      * */
-      fieldList: {
-        type: Array,
-        required: true
-      },
-      /*
-      * 这个回调函数接收一个数组参数 即查询条件
-      * */
-      callback: {
-        type: String,
-        required: false,
-        default: 'handleSuperQuery'
-      },
-
-      // 当前是否在加载中
-      loading: {
-        type: Boolean,
-        default: false
-      },
-
-      // 保存查询条件的唯一 code，通过该 code 区分
-      // 默认为 null，代表以当前路由全路径为区分Code
-      saveCode: {
-        type: String,
-        default: null
-      }
-
-    },
-    data() {
-      return {
-        moment,
-        fieldTreeData: [],
-
-        prompt: {
-          visible: false,
-          value: ''
-        },
-
-        visible: false,
-        queryParamsModel: [],
-        treeIcon: <a-icon type="file-text"/>,
-        // 保存查询条件的treeData
-        saveTreeData: [],
-        // 保存查询条件的前缀名
-        saveCodeBefore: 'JSuperQuerySaved_',
-        // 查询类型，过滤条件匹配（and、or）
-        matchType: 'and',
-        superQueryFlag: false,
-      }
-    },
-    computed: {
-      izMobile() {
-        return this.device === 'mobile'
-      },
-      tooltipProps() {
-        return this.izMobile ? { visible: false } : {}
-      },
-      fullSaveCode() {
-        let saveCode = this.saveCode
-        if (saveCode == null || saveCode === '') {
-          saveCode = this.$route.fullPath
-        }
-        return this.saveCodeBefore + saveCode
-      },
-    },
-    watch: {
-      // 当 saveCode 变化时，重新查询已保存的条件
-      fullSaveCode: {
-        immediate: true,
-        handler() {
-          let list = this.$ls.get(this.fullSaveCode)
-          if (list instanceof Array) {
-            this.saveTreeData = list.map(i => this.renderSaveTreeData(i))
-          }
-        }
-      },
-      fieldList: {
-        deep: true,
-        immediate: true,
-        handler(val) {
-          let mainData = [], subData = []
-          val.forEach(item => {
-            let data = { ...item }
-            data.label = data.label || data.text
-            let hasChildren = (data.children instanceof Array)
-            data.disabled = hasChildren
-            data.selectable = !hasChildren
-            if (hasChildren) {
-              data.children = data.children.map(item2 => {
-                let child = { ...item2 }
-                child.label = child.label || child.text
-                child.label = data.label + '-' + child.label
-                child.value = data.value + ',' + child.value
-                child.val = ''
-                return child
-              })
-              data.val = ''
-              subData.push(data)
-            } else {
-              mainData.push(data)
-            }
-          })
-          this.fieldTreeData = mainData.concat(subData)
-        }
-      }
-    },
-
-    methods: {
-      show() {
-        if (!this.queryParamsModel || this.queryParamsModel.length === 0) {
-          this.resetLine()
-        }
-        this.visible = true
-      },
-      handleOk() {
-        if (!this.isNullArray(this.queryParamsModel)) {
-          let event = {
-            matchType: this.matchType,
-            params: this.removeEmptyObject(this.queryParamsModel)
-          }
-          // 移动端模式下关闭弹窗
-          if (this.izMobile) {
-            this.visible = false
-          }
-          this.emitCallback(event)
-        } else {
-          this.$message.warn("不能查询空条件")
-        }
-      },
-      emitCallback(event = {}) {
-        let { params = [], matchType = this.matchType } = event
-        this.superQueryFlag = (params && params.length > 0)
-        for (let param of params) {
-          if (Array.isArray(param.val)) {
-            param.val = param.val.join(',')
-          }
-        }
-        console.debug('---高级查询参数--->', { params, matchType })
-        this.$emit(this.callback, params, matchType)
-      },
-      handleCancel() {
-        this.close()
-      },
-      close() {
-        this.$emit('close')
-        this.visible = false
-      },
-      handleAdd() {
-        this.addNewLine()
-      },
-      addNewLine() {
-        this.queryParamsModel.push({ rule: 'eq' })
-      },
-      resetLine() {
-        this.superQueryFlag = false
-        this.queryParamsModel = []
-        this.addNewLine()
-      },
-      handleDel(index) {
-        this.queryParamsModel.splice(index, 1)
-      },
-      handleSelected(node, item) {
-        let { type, options, dictCode, dictTable, customReturnField, popup } = node.dataRef
-        item['type'] = type
-        item['options'] = options
-        item['dictCode'] = dictCode
-        item['dictTable'] = dictTable
-        item['customReturnField'] = customReturnField
-        if (popup) {
-          item['popup'] = popup
-        }
-        this.$set(item, 'val', undefined)
-      },
-      handleOpen() {
-        this.show()
-      },
-      handleReset() {
-        this.resetLine()
-        this.emitCallback()
-      },
-      handleSave() {
-        let queryParams = this.removeEmptyObject(this.queryParamsModel)
-        if (this.isNullArray(queryParams)) {
-          this.$message.warning('空条件不能保存')
-        } else {
-          this.prompt.value = ''
-          this.prompt.visible = true
-        }
-      },
-      handlePromptOk() {
-        let { value } = this.prompt
-        if(!value){
-          this.$message.warning('保存名称不能为空')
-          return
-        }
-        // 取出查询条件
-        let records = this.removeEmptyObject(this.queryParamsModel)
-        // 判断有没有重名的
-        let filterList = this.saveTreeData.filter(i => i.originTitle === value)
-        if (filterList.length > 0) {
-          this.$confirm({
-            content: `${value} 已存在，是否覆盖？`,
-            onOk: () => {
-              this.prompt.visible = false
-              filterList[0].records = records
-              this.saveToLocalStore()
-              this.$message.success('保存成功')
-            }
-          })
-        } else {
-          // 没有重名的，直接添加
-          this.prompt.visible = false
-          // 添加到树列表中
-          this.saveTreeData.push(this.renderSaveTreeData({
-            title: value,
-            matchType: this.matchType,
-            records: records
-          }))
-          // 保存到 LocalStore
-          this.saveToLocalStore()
-          this.$message.success('保存成功')
-        }
-      },
-      handleTreeSelect(idx, event) {
-        if (event.selectedNodes[0]) {
-          let { matchType, records } = event.selectedNodes[0].data.props
-          // 将保存的matchType取出，兼容旧数据，如果没有保存就还是使用原来的
-          this.matchType = matchType || this.matchType
-          this.queryParamsModel = utils.cloneObject(records)
-        }
-      },
-      handleRemoveSaveTreeItem(event, vNode) {
-        // 阻止事件冒泡
-        event.stopPropagation()
-
-        this.$confirm({
-          content: '是否删除当前查询？',
-          onOk: () => {
-            let { eventKey } = vNode
-            this.saveTreeData.splice(Number.parseInt(eventKey.substring(2)), 1)
-            this.saveToLocalStore()
-          },
-        })
-      },
-
-      // 将查询保存到 LocalStore 里
-      saveToLocalStore() {
-        let saveValue = this.saveTreeData.map(({ originTitle, matchType, records }) => ({ title: originTitle, matchType, records }))
-        this.$ls.set(this.fullSaveCode, saveValue)
-      },
-
-      isNullArray(array) {
-        //判断是不是空数组对象
-        if (!array || array.length === 0) {
-          return true
-        }
-        if (array.length === 1) {
-          let obj = array[0]
-          if (!obj.field || (obj.val == null || obj.val === '') || !obj.rule) {
-            return true
-          }
-        }
-        return false
-      },
-      // 去掉数组中的空对象
-      removeEmptyObject(arr) {
-        let array = utils.cloneObject(arr)
-        for (let i = 0; i < array.length; i++) {
-          let item = array[i]
-          if (item == null || Object.keys(item).length <= 0) {
-            array.splice(i--, 1)
-          } else {
-            if (Array.isArray(item.options)) {
-              // 如果有字典属性，就不需要保存 options 了
-              if (item.dictCode) {
-                // 去掉特殊属性
-                delete item.options
-              }
-            }
-          }
-        }
-        return array
-      },
-
-      /** 渲染保存查询条件的 title（加个删除按钮） */
-      renderSaveTreeData(item) {
-        item.icon = this.treeIcon
-        item.originTitle = item['title']
-        item.title = (fn, vNode) => {
-          let { originTitle } = vNode.dataRef
-          return (
-            <div class="j-history-tree-title">
-              <span>{originTitle}</span>
-
-              <div class="j-history-tree-title-closer" onClick={e => this.handleRemoveSaveTreeItem(e, vNode)}>
-                <a-icon type="close-circle"/>
-              </div>
-            </div>
-          )
-        }
-        return item
-      },
-
-      /** 判断是否允许多选 */
-      allowMultiple(item) {
-        return item.rule === 'in'
-      },
-
-      handleRuleChange(item, newValue) {
-        let oldValue = item.rule
-        this.$set(item, 'rule', newValue)
-        // 上一个规则是否是 in，且type是字典或下拉
-        if (oldValue === 'in') {
-          if (item.dictCode || item.options instanceof Array) {
-            let value = item.val
-            if (typeof item.val === 'string') {
-              value = item.val.split(',')[0]
-            } else if (Array.isArray(item.val)) {
-              value = item.val[0]
-            }
-            this.$set(item, 'val', value)
-          }
-        }
-      },
-
-      handleChangeJPopup(item, e, values) {
-        item.val = values[item.popup['destFields']]
-      },
-
-    }
-  }
-</script>
-
-<style lang="less" scoped>
-
-  .j-super-query-box {
-    display: inline-block;
-  }
-
-  .j-super-query-modal {
-
-    .j-super-query-history-card {
-      /deep/ .ant-card-body,
-      /deep/ .ant-card-head-title {
-        padding: 0;
-      }
-
-      /deep/ .ant-card-head {
-        padding: 4px 8px;
-        min-height: initial;
-      }
-    }
-
-    .j-super-query-history-empty {
-      /deep/ .ant-empty-image {
-        height: 80px;
-        line-height: 80px;
-        margin-bottom: 0;
-      }
-
-      /deep/ img {
-        width: 80px;
-        height: 65px;
-      }
-
-      /deep/ .ant-empty-description {
-        color: #afafaf;
-        margin: 8px 0;
-      }
-    }
-
-    .j-super-query-history-tree {
-
-      .j-history-tree-title {
-        width: calc(100% - 24px);
-        position: relative;
-        display: inline-block;
-
-        &-closer {
-          color: #999999;
-          position: absolute;
-          top: 0;
-          right: 0;
-          width: 24px;
-          height: 24px;
-          text-align: center;
-          opacity: 0;
-          transition: opacity 0.3s, color 0.3s;
-
-          &:hover {
-            color: #666666;
-          }
-
-          &:active {
-            color: #333333;
-          }
-        }
-
-        &:hover {
-          .j-history-tree-title-closer {
-            opacity: 1;
-          }
-        }
-
-      }
-
-      /deep/ .ant-tree-switcher {
-        display: none;
-      }
-
-      /deep/ .ant-tree-node-content-wrapper {
-        width: 100%;
-      }
-    }
-
-  }
-
+<template>
+<div class="j-super-query-box">
+
+  <slot name="button" :isActive="superQueryFlag" :isMobile="izMobile" :open="handleOpen" :reset="handleReset">
+    <a-tooltip v-if="superQueryFlag" v-bind="tooltipProps" :mouseLeaveDelay="0.2">
+      <!-- begin 不知道为什么不加上这段代码就无法生效 -->
+      <span v-show="false">{{tooltipProps}}</span>
+      <!-- end 不知道为什么不加上这段代码就无法生效 -->
+      <template slot="title">
+        <span>已有高级查询条件生效</span>
+        <a-divider type="vertical"/>
+        <a @click="handleReset">清空</a>
+      </template>
+      <a-button-group>
+        <a-button type="primary" @click="handleOpen">
+          <a-icon type="appstore" theme="twoTone" spin/>
+          <span>高级查询</span>
+        </a-button>
+        <a-button v-if="izMobile" type="primary" icon="delete" @click="handleReset"/>
+      </a-button-group>
+    </a-tooltip>
+    <a-button v-else type="primary" icon="filter" @click="handleOpen">高级查询</a-button>
+  </slot>
+
+  <j-modal
+    title="高级查询构造器"
+    :width="1000"
+    :visible="visible"
+    @cancel="handleCancel"
+    :mask="false"
+    :fullscreen="izMobile"
+    class="j-super-query-modal"
+    style="top:5%;max-height: 95%;"
+  >
+
+    <template slot="footer">
+      <div style="float: left">
+        <a-button :loading="loading" @click="handleReset">重置</a-button>
+        <a-button :loading="loading" @click="handleSave">保存查询条件</a-button>
+      </div>
+      <a-button :loading="loading" @click="handleCancel">关闭</a-button>
+      <a-button :loading="loading" type="primary" @click="handleOk">查询</a-button>
+    </template>
+
+    <a-spin :spinning="loading">
+      <a-row>
+        <a-col :sm="24" :md="24-5">
+
+          <a-empty v-if="queryParamsModel.length === 0" style="margin-bottom: 12px;">
+            <div slot="description">
+              <span>没有任何查询条件</span>
+              <a-divider type="vertical"/>
+              <a @click="handleAdd">点击新增</a>
+            </div>
+          </a-empty>
+
+          <a-form v-else layout="inline">
+
+            <a-row style="margin-bottom: 12px;">
+              <a-col :md="12" :xs="24">
+                <a-form-item label="过滤条件匹配" :labelCol="{md: 6,xs:24}" :wrapperCol="{md: 18,xs:24}" style="width: 100%;">
+                  <a-select v-model="matchType" :getPopupContainer="node=>node.parentNode" style="width: 100%;">
+                    <a-select-option value="and">AND（所有条件都要求匹配）</a-select-option>
+                    <a-select-option value="or">OR（条件中的任意一个匹配）</a-select-option>
+                  </a-select>
+                </a-form-item>
+              </a-col>
+            </a-row>
+
+            <a-row type="flex" style="margin-bottom:10px" :gutter="16" v-for="(item, index) in queryParamsModel" :key="index">
+
+              <a-col :md="8" :xs="24" style="margin-bottom: 12px;">
+                <a-tree-select
+                  showSearch
+                  v-model="item.field"
+                  :treeData="fieldTreeData"
+                  :dropdownStyle="{ maxHeight: '400px', overflow: 'auto' }"
+                  placeholder="选择查询字段"
+                  allowClear
+                  treeDefaultExpandAll
+                  :getPopupContainer="node=>node.parentNode"
+                  style="width: 100%"
+                  @select="(val,option)=>handleSelected(option,item)"
+                >
+                </a-tree-select>
+              </a-col>
+
+              <a-col :md="4" :xs="24" style="margin-bottom: 12px;">
+                <a-select placeholder="匹配规则" :value="item.rule" :getPopupContainer="node=>node.parentNode" @change="handleRuleChange(item,$event)">
+                  <a-select-option value="eq">等于</a-select-option>
+                  <a-select-option value="like">包含</a-select-option>
+                  <a-select-option value="right_like">以..开始</a-select-option>
+                  <a-select-option value="left_like">以..结尾</a-select-option>
+                  <a-select-option value="in">在...中</a-select-option>
+                  <a-select-option value="ne">不等于</a-select-option>
+                  <a-select-option value="gt">大于</a-select-option>
+                  <a-select-option value="ge">大于等于</a-select-option>
+                  <a-select-option value="lt">小于</a-select-option>
+                  <a-select-option value="le">小于等于</a-select-option>
+                </a-select>
+              </a-col>
+
+              <a-col :md="8" :xs="24" style="margin-bottom: 12px;">
+                <template v-if="item.dictCode">
+                  <template v-if="item.type === 'table-dict'">
+                    <j-popup
+                      v-model="item.val"
+                      :code="item.dictTable"
+                      :field="item.dictCode"
+                      :orgFields="item.dictCode"
+                      :destFields="item.dictCode"
+                    ></j-popup>
+                  </template>
+                  <template v-else>
+                    <j-multi-select-tag v-show="allowMultiple(item)" v-model="item.val" :dictCode="item.dictCode" placeholder="请选择"/>
+                    <j-dict-select-tag v-show="!allowMultiple(item)" v-model="item.val" :dictCode="item.dictCode" placeholder="请选择"/>
+                  </template>
+                </template>
+                <j-popup v-else-if="item.type === 'popup'" :value="item.val" v-bind="item.popup" group-id="superQuery" @input="(e,v)=>handleChangeJPopup(item,e,v)"/>
+                <j-select-multi-user
+                  v-else-if="item.type === 'select-user' || item.type === 'sel_user'"
+                  v-model="item.val"
+                  :buttons="false"
+                  :multiple="false"
+                  placeholder="请选择用户"
+                  :returnKeys="['id', item.customReturnField || 'username']"
+                />
+                <j-select-depart
+                  v-else-if="item.type === 'select-depart' || item.type === 'sel_depart'"
+                  v-model="item.val"
+                  :multi="false"
+                  placeholder="请选择部门"
+                  :customReturnField="item.customReturnField || 'id'"
+                />
+                <a-select
+                  v-else-if="item.options instanceof Array"
+                  v-model="item.val"
+                  :options="item.options"
+                  allowClear
+                  placeholder="请选择"
+                  :mode="allowMultiple(item)?'multiple':''"
+                />
+                <j-area-linkage v-model="item.val" v-else-if="item.type==='area-linkage' || item.type==='pca'" style="width: 100%"/>
+                <j-date v-else-if=" item.type=='date' " v-model="item.val" placeholder="请选择日期" style="width: 100%"></j-date>
+                <j-date v-else-if=" item.type=='datetime' " v-model="item.val" placeholder="请选择时间" :show-time="true" date-format="YYYY-MM-DD HH:mm:ss" style="width: 100%"></j-date>
+                <a-time-picker v-else-if="item.type==='time'" :value="item.val ? moment(item.val,'HH:mm:ss') : null" format="HH:mm:ss" style="width: 100%" @change="(time,value)=>item.val=value"/>
+                <a-input-number v-else-if=" item.type=='int'||item.type=='number' " style="width: 100%" placeholder="请输入数值" v-model="item.val"/>
+                <a-input v-else v-model="item.val" placeholder="请输入值"/>
+              </a-col>
+
+              <a-col :md="4" :xs="0" style="margin-bottom: 12px;">
+                <a-button @click="handleAdd" icon="plus"></a-button>&nbsp;
+                <a-button @click="handleDel( index )" icon="minus"></a-button>
+              </a-col>
+
+              <a-col :md="0" :xs="24" style="margin-bottom: 12px;text-align: right;">
+                <a-button @click="handleAdd" icon="plus"></a-button>&nbsp;
+                <a-button @click="handleDel( index )" icon="minus"></a-button>
+              </a-col>
+
+            </a-row>
+
+          </a-form>
+        </a-col>
+        <a-col :sm="24" :md="5">
+          <!-- 查询记录 -->
+
+          <a-card class="j-super-query-history-card" :bordered="true">
+            <div slot="title">
+              保存的查询
+            </div>
+
+            <a-empty v-if="saveTreeData.length === 0" class="j-super-query-history-empty" description="没有保存任何查询"/>
+            <a-tree
+              v-else
+              class="j-super-query-history-tree"
+              showIcon
+              :treeData="saveTreeData"
+              :selectedKeys="[]"
+              @select="handleTreeSelect"
+            >
+            </a-tree>
+          </a-card>
+
+
+        </a-col>
+      </a-row>
+
+
+    </a-spin>
+
+    <a-modal title="请输入保存的名称" :visible="prompt.visible" @cancel="prompt.visible=false" @ok="handlePromptOk">
+      <a-input v-model="prompt.value"></a-input>
+    </a-modal>
+
+  </j-modal>
+</div>
+</template>
+
+<script>
+  import moment from 'moment'
+  import * as utils from '@/utils/util'
+  import { mixinDevice } from '@/utils/mixin'
+  import JDate from '@/components/jeecg/JDate.vue'
+  import JSelectDepart from '@/components/jeecgbiz/JSelectDepart'
+  import JSelectMultiUser from '@/components/jeecgbiz/JSelectMultiUser'
+  import JAreaLinkage from '@comp/jeecg/JAreaLinkage'
+
+  export default {
+    name: 'JSuperQuery',
+    mixins: [mixinDevice],
+    components: { JAreaLinkage, JDate, JSelectDepart, JSelectMultiUser },
+    props: {
+      /*
+       fieldList: [{
+          value:'',
+          text:'',
+          type:'',
+          dictCode:'' // 只要 dictCode 有值，无论 type 是什么，都显示为字典下拉框
+       }]
+       type:date datetime int number string
+      * */
+      fieldList: {
+        type: Array,
+        required: true
+      },
+      /*
+      * 这个回调函数接收一个数组参数 即查询条件
+      * */
+      callback: {
+        type: String,
+        required: false,
+        default: 'handleSuperQuery'
+      },
+
+      // 当前是否在加载中
+      loading: {
+        type: Boolean,
+        default: false
+      },
+
+      // 保存查询条件的唯一 code，通过该 code 区分
+      // 默认为 null，代表以当前路由全路径为区分Code
+      saveCode: {
+        type: String,
+        default: null
+      }
+
+    },
+    data() {
+      return {
+        moment,
+        fieldTreeData: [],
+
+        prompt: {
+          visible: false,
+          value: ''
+        },
+
+        visible: false,
+        queryParamsModel: [],
+        treeIcon: <a-icon type="file-text"/>,
+        // 保存查询条件的treeData
+        saveTreeData: [],
+        // 保存查询条件的前缀名
+        saveCodeBefore: 'JSuperQuerySaved_',
+        // 查询类型，过滤条件匹配（and、or）
+        matchType: 'and',
+        superQueryFlag: false,
+      }
+    },
+    computed: {
+      izMobile() {
+        return this.device === 'mobile'
+      },
+      tooltipProps() {
+        return this.izMobile ? { visible: false } : {}
+      },
+      fullSaveCode() {
+        let saveCode = this.saveCode
+        if (saveCode == null || saveCode === '') {
+          saveCode = this.$route.fullPath
+        }
+        return this.saveCodeBefore + saveCode
+      },
+    },
+    watch: {
+      // 当 saveCode 变化时，重新查询已保存的条件
+      fullSaveCode: {
+        immediate: true,
+        handler() {
+          let list = this.$ls.get(this.fullSaveCode)
+          if (list instanceof Array) {
+            this.saveTreeData = list.map(i => this.renderSaveTreeData(i))
+          }
+        }
+      },
+      fieldList: {
+        deep: true,
+        immediate: true,
+        handler(val) {
+          let mainData = [], subData = []
+          val.forEach(item => {
+            let data = { ...item }
+            data.label = data.label || data.text
+            let hasChildren = (data.children instanceof Array)
+            data.disabled = hasChildren
+            data.selectable = !hasChildren
+            if (hasChildren) {
+              data.children = data.children.map(item2 => {
+                let child = { ...item2 }
+                child.label = child.label || child.text
+                child.label = data.label + '-' + child.label
+                child.value = data.value + ',' + child.value
+                child.val = ''
+                return child
+              })
+              data.val = ''
+              subData.push(data)
+            } else {
+              mainData.push(data)
+            }
+          })
+          this.fieldTreeData = mainData.concat(subData)
+        }
+      }
+    },
+
+    methods: {
+      show() {
+        if (!this.queryParamsModel || this.queryParamsModel.length === 0) {
+          this.resetLine()
+        }
+        this.visible = true
+      },
+      handleOk() {
+        if (!this.isNullArray(this.queryParamsModel)) {
+          let event = {
+            matchType: this.matchType,
+            params: this.removeEmptyObject(this.queryParamsModel)
+          }
+          // 移动端模式下关闭弹窗
+          if (this.izMobile) {
+            this.visible = false
+          }
+          this.emitCallback(event)
+        } else {
+          this.$message.warn("不能查询空条件")
+        }
+      },
+      emitCallback(event = {}) {
+        let { params = [], matchType = this.matchType } = event
+        this.superQueryFlag = (params && params.length > 0)
+        for (let param of params) {
+          if (Array.isArray(param.val)) {
+            param.val = param.val.join(',')
+          }
+        }
+        console.debug('---高级查询参数--->', { params, matchType })
+        this.$emit(this.callback, params, matchType)
+      },
+      handleCancel() {
+        this.close()
+      },
+      close() {
+        this.$emit('close')
+        this.visible = false
+      },
+      handleAdd() {
+        this.addNewLine()
+      },
+      addNewLine() {
+        this.queryParamsModel.push({ rule: 'eq' })
+      },
+      resetLine() {
+        this.superQueryFlag = false
+        this.queryParamsModel = []
+        this.addNewLine()
+      },
+      handleDel(index) {
+        this.queryParamsModel.splice(index, 1)
+      },
+      handleSelected(node, item) {
+        let { type, options, dictCode, dictTable, customReturnField, popup } = node.dataRef
+        item['type'] = type
+        item['options'] = options
+        item['dictCode'] = dictCode
+        item['dictTable'] = dictTable
+        item['customReturnField'] = customReturnField
+        if (popup) {
+          item['popup'] = popup
+        }
+        this.$set(item, 'val', undefined)
+      },
+      handleOpen() {
+        this.show()
+      },
+      handleReset() {
+        this.resetLine()
+        this.emitCallback()
+      },
+      handleSave() {
+        let queryParams = this.removeEmptyObject(this.queryParamsModel)
+        if (this.isNullArray(queryParams)) {
+          this.$message.warning('空条件不能保存')
+        } else {
+          this.prompt.value = ''
+          this.prompt.visible = true
+        }
+      },
+      handlePromptOk() {
+        let { value } = this.prompt
+        if(!value){
+          this.$message.warning('保存名称不能为空')
+          return
+        }
+        // 取出查询条件
+        let records = this.removeEmptyObject(this.queryParamsModel)
+        // 判断有没有重名的
+        let filterList = this.saveTreeData.filter(i => i.originTitle === value)
+        if (filterList.length > 0) {
+          this.$confirm({
+            content: `${value} 已存在，是否覆盖？`,
+            onOk: () => {
+              this.prompt.visible = false
+              filterList[0].records = records
+              this.saveToLocalStore()
+              this.$message.success('保存成功')
+            }
+          })
+        } else {
+          // 没有重名的，直接添加
+          this.prompt.visible = false
+          // 添加到树列表中
+          this.saveTreeData.push(this.renderSaveTreeData({
+            title: value,
+            matchType: this.matchType,
+            records: records
+          }))
+          // 保存到 LocalStore
+          this.saveToLocalStore()
+          this.$message.success('保存成功')
+        }
+      },
+      handleTreeSelect(idx, event) {
+        if (event.selectedNodes[0]) {
+          let { matchType, records } = event.selectedNodes[0].data.props
+          // 将保存的matchType取出，兼容旧数据，如果没有保存就还是使用原来的
+          this.matchType = matchType || this.matchType
+          this.queryParamsModel = utils.cloneObject(records)
+        }
+      },
+      handleRemoveSaveTreeItem(event, vNode) {
+        // 阻止事件冒泡
+        event.stopPropagation()
+
+        this.$confirm({
+          content: '是否删除当前查询？',
+          onOk: () => {
+            let { eventKey } = vNode
+            this.saveTreeData.splice(Number.parseInt(eventKey.substring(2)), 1)
+            this.saveToLocalStore()
+          },
+        })
+      },
+
+      // 将查询保存到 LocalStore 里
+      saveToLocalStore() {
+        let saveValue = this.saveTreeData.map(({ originTitle, matchType, records }) => ({ title: originTitle, matchType, records }))
+        this.$ls.set(this.fullSaveCode, saveValue)
+      },
+
+      isNullArray(array) {
+        //判断是不是空数组对象
+        if (!array || array.length === 0) {
+          return true
+        }
+        if (array.length === 1) {
+          let obj = array[0]
+          if (!obj.field || (obj.val == null || obj.val === '') || !obj.rule) {
+            return true
+          }
+        }
+        return false
+      },
+      // 去掉数组中的空对象
+      removeEmptyObject(arr) {
+        let array = utils.cloneObject(arr)
+        for (let i = 0; i < array.length; i++) {
+          let item = array[i]
+          if (item == null || Object.keys(item).length <= 0) {
+            array.splice(i--, 1)
+          } else {
+            if (Array.isArray(item.options)) {
+              // 如果有字典属性，就不需要保存 options 了
+              if (item.dictCode) {
+                // 去掉特殊属性
+                delete item.options
+              }
+            }
+          }
+        }
+        return array
+      },
+
+      /** 渲染保存查询条件的 title（加个删除按钮） */
+      renderSaveTreeData(item) {
+        item.icon = this.treeIcon
+        item.originTitle = item['title']
+        item.title = (fn, vNode) => {
+          let { originTitle } = vNode.dataRef
+          return (
+            <div class="j-history-tree-title">
+              <span>{originTitle}</span>
+
+              <div class="j-history-tree-title-closer" onClick={e => this.handleRemoveSaveTreeItem(e, vNode)}>
+                <a-icon type="close-circle"/>
+              </div>
+            </div>
+          )
+        }
+        return item
+      },
+
+      /** 判断是否允许多选 */
+      allowMultiple(item) {
+        return item.rule === 'in'
+      },
+
+      handleRuleChange(item, newValue) {
+        let oldValue = item.rule
+        this.$set(item, 'rule', newValue)
+        // 上一个规则是否是 in，且type是字典或下拉
+        if (oldValue === 'in') {
+          if (item.dictCode || item.options instanceof Array) {
+            let value = item.val
+            if (typeof item.val === 'string') {
+              value = item.val.split(',')[0]
+            } else if (Array.isArray(item.val)) {
+              value = item.val[0]
+            }
+            this.$set(item, 'val', value)
+          }
+        }
+      },
+
+      handleChangeJPopup(item, e, values) {
+        item.val = values[item.popup['destFields']]
+      },
+
+    }
+  }
+</script>
+
+<style lang="less" scoped>
+
+  .j-super-query-box {
+    display: inline-block;
+  }
+
+  .j-super-query-modal {
+
+    .j-super-query-history-card {
+      /deep/ .ant-card-body,
+      /deep/ .ant-card-head-title {
+        padding: 0;
+      }
+
+      /deep/ .ant-card-head {
+        padding: 4px 8px;
+        min-height: initial;
+      }
+    }
+
+    .j-super-query-history-empty {
+      /deep/ .ant-empty-image {
+        height: 80px;
+        line-height: 80px;
+        margin-bottom: 0;
+      }
+
+      /deep/ img {
+        width: 80px;
+        height: 65px;
+      }
+
+      /deep/ .ant-empty-description {
+        color: #afafaf;
+        margin: 8px 0;
+      }
+    }
+
+    .j-super-query-history-tree {
+
+      .j-history-tree-title {
+        width: calc(100% - 24px);
+        position: relative;
+        display: inline-block;
+
+        &-closer {
+          color: #999999;
+          position: absolute;
+          top: 0;
+          right: 0;
+          width: 24px;
+          height: 24px;
+          text-align: center;
+          opacity: 0;
+          transition: opacity 0.3s, color 0.3s;
+
+          &:hover {
+            color: #666666;
+          }
+
+          &:active {
+            color: #333333;
+          }
+        }
+
+        &:hover {
+          .j-history-tree-title-closer {
+            opacity: 1;
+          }
+        }
+
+      }
+
+      /deep/ .ant-tree-switcher {
+        display: none;
+      }
+
+      /deep/ .ant-tree-node-content-wrapper {
+        width: 100%;
+      }
+    }
+
+  }
+
 </style>
\ No newline at end of file
diff --git a/jshERP-web/src/components/jeecg/README.md b/jshERP-web/src/components/jeecg/README.md
index 23547473..00ea9bcb 100644
--- a/jshERP-web/src/components/jeecg/README.md
+++ b/jshERP-web/src/components/jeecg/README.md
@@ -1,512 +1,509 @@
-# JDate 日期组件 使用文档
-  
-###### 说明: antd-vue日期组件需要用moment中转一下，用起来不是很方便，特二次封装，使用时只需要传字符串即可
-## 参数配置
-| 参数           | 类型      | 必填 |说明|
-|--------------|---------|----|---------|
-| placeholder      |string   | | placeholder      |
-| readOnly   | boolean   | | true/false 默认false                 |
-| value      | string | | 绑定v-model或是v-decorator后不需要设置    |
-| showTime | boolean | | 是否展示时间true/false 默认false  |
-| dateFormat    | string | |日期格式 默认'YYYY-MM-DD' 若showTime设置为true则需要将其设置成对应的时间格式(如:YYYY-MM-DD HH:mm:ss)               |
-| triggerChange | string | |触发组件值改变的事件是否是change,当使用v-decorator时且没有设置decorator的option.trigger为input需要设置该值为true               |
-使用示例
-----
-1.组件带有v-model的使用方法
-```vue
-<j-date v-model="dateStr"></j-date>
-```
-
-2.组件带有v-decorator的使用方法  
-  a).设置trigger-change属性为true
-  ```vue
-    <j-date :trigger-change="true" v-decorator="['dateStr',{}]"></j-date>
-  ```
-    
-  b).设置decorator的option.trigger为input
-   ```vue
-    <j-date v-decorator="['dateStr',{trigger:'input'}]"></j-date>
-   ```
-
-3.其他使用
-添加style
-```vue
-<j-date v-model="dateStr" style="width:100%"></j-date>
-```
-添加placeholder
-```vue
-<j-date v-model="dateStr" placeholder="请输入dateStr"></j-date>
-```
-添加readOnly
-```vue
-<j-date v-model="dateStr" :read-only="true"></j-date>
-```
-
-备注:
-script内需引入jdate
-```vue
-<script>
-  import JDate from '@/components/jeecg/JDate'
-  export default {
-    name: "demo",
-    components: {
-      JDate
-    }
-    //...
-  }
-</script>
-```
-
-
- ---
-
-
-# JSuperQuery 高级查询 使用文档
-## 参数配置
-| 参数           | 类型      | 必填 | 说明                   |
-|--------------|---------|----|----------------------|
-| fieldList      | array   |✔| 需要查询的列集合示例如下，type类型有:date/datetime/string/int/number      |
-| callback   | array   |  | 回调函数名称(非必须)默认handleSuperQuery                |
-
-fieldList结构示例：
-```vue
-  const superQueryFieldList=[{
-    type:"date",
-    value:"birthday",
-    text:"生日"
-  },{
-    type:"string",
-    value:"name",
-    text:"用户名"
-  },{
-    type:"int",
-    value:"age",
-    text:"年龄"
-  }]
-```
-页面代码概述:  
-----
-1.import之后再components之内声明
-```vue
-import JSuperQuery from '@/components/jeecg/JSuperQuery.vue';
-  export default {
-    name: "JeecgDemoList",
-    components: {
-      JSuperQuery
-    },
-
-```
-2.页面引用
-```vue
-  <!-- 高级查询区域 -->
-  <j-super-query :fieldList="fieldList" ref="superQueryModal" @handleSuperQuery="handleSuperQuery"></j-super-query>
-```
-3.list页面data中需要定义三个属性：
-```vue
-  fieldList:superQueryFieldList,
-  superQueryFlag:false,
-  superQueryParams:""
-```
-4.list页面声明回调事件handleSuperQuery(与组件的callback对应即可)
-```vue
-//高级查询方法
-handleSuperQuery(arg) {
-  if(!arg){
-    this.superQueryParams=''
-    this.superQueryFlag = false
-  }else{
-    this.superQueryFlag = true
-    this.superQueryParams=JSON.stringify(arg)
-  }
-  this.loadData()
-},
-```
-5.改造list页面方法
-```vue
-  // 获取查询条件
-  getQueryParams() {
-    let sqp = {}
-    if(this.superQueryParams){
-      sqp['superQueryParams']=encodeURI(this.superQueryParams)
-    }
-    var param = Object.assign(sqp, this.queryParam, this.isorter);
-    param.field = this.getQueryField();
-    param.pageNo = this.ipagination.current;
-    param.pageSize = this.ipagination.pageSize;
-    return filterObj(param);
-  },
-```
-6.打开弹框调用show方法：
-```vue
-this.$refs.superQueryModal.show();
-```
-
-# JEllipsis 字符串超长截取省略号显示
-  
-###### 说明: 遇到超长文本展示，通过此标签可以截取省略号显示，鼠标放置会提示全文本
-## 参数配置
-| 参数  | 类型     | 必填 |    说明      |
-|--------|---------|----|----------------|
-| value  |string   | 必填   |  字符串文本|
-| length | number  | 非必填 |  默认25    |
-使用示例
-----
-1.组件带有v-model的使用方法
-```vue
-<j-ellipsis :value="text"/>
-
-
-# Modal弹框实现最大化功能  
-
-1.定义modal的宽度：
-```vue
-  <a-modal
-    :width="modalWidth"
-    
-    
-    />
-```
-2.自定义modal的title,居右显示切换图标
-```vue
-  <template slot="title">
-    <div style="width: 100%;">
-      <span>{{ title }}</span>
-      <span style="display:inline-block;width:calc(100% - 51px);padding-right:10px;text-align: right">
-        <a-button @click="toggleScreen" icon="appstore" style="height:20px;width:20px;border:0px"></a-button>
-      </span>
-    </div>
-  </template>
-```
-3.定义toggleScreen事件,用于切换modal宽度
-```vue
-  toggleScreen(){
-      if(this.modaltoggleFlag){
-        this.modalWidth = window.innerWidth;
-      }else{
-        this.modalWidth = 800;
-      }
-      this.modaltoggleFlag = !this.modaltoggleFlag;
-    },
-```
-4.data中声明上述用到的属性
-```vue
-    data () {
-      return {
-        modalWidth:800,
-        modaltoggleFlag:true,
-```
-
-# <a-select/> 下拉选项滚动错位的解决方法
-
-## 问题描述
-
-当使用了 `a-modal` 或其他带有滚动条的组件时，使用`a-select`组件并打开下拉框时滚动滚动条，就会导致错位的问题产生。
-
-## 解决方法
-
-大多数情况下，在 `a-select` 上添加一个 `getPopupContainer` 属性，值为`node => node.parentNode`即可解决。
-但是如果遇到 `a-select` 标签层级过深的情况，可能仍然会显示异常，只需要多加几个`.parentNode` （例：node => node.parentNode.parentNode.parentNode）多尝试几次直到解决问题即可。
-
-### 代码示例
-
-```html
-<a-select
-    placeholder="请选择展示模板"
-    :options="dicts.displayTemplate"
-    :getPopupContainer="node => node.parentNode"
-/>
-```
-
-# JAsyncTreeList 异步数列表组件使用说明
-
-## 引入组件
-
-```js
-import JTreeTable from '@/components/jeecg/JTreeTable'
-export default {
-  components: { JTreeTable }
-}
-```
-
-## 所需参数
-
-| 参数        | 类型   | 必填   | 说明                                                         |
-|-------------|--------|--------|--------------------------------------------------------------|
-| rowKey      | String | 非必填 | 表格行 key 的取值，默认为"id"                                |
-| columns     | Array  | 必填   | 表格列的配置描述，具体见Antd官方文档                         |
-| url         | String | 必填   | 数据查询url                                                  |
-| childrenUrl | String | 非必填 | 查询子级时的url，若不填则使用url参数查询子级                 |
-| queryKey    | String | 非必填 | 根据某个字段查询，如果传递 id 就根据 id 查询，默认为parentId |
-| queryParams | Object | 非必填 | 查询参数，当查询参数改变的时候会自动重新查询，默认为{}       |
-| topValue    | String | 非必填 | 查询顶级时的值，如果顶级为0，则传0，默认为null               |
-| tableProps  | Object | 非必填 | 自定义给内部table绑定的props                                 |
-
-## 代码示例
-
-```html
-<template>
-  <a-card :bordered="false">
-    <j-tree-table :url="url" :columns="columns" :tableProps="tableProps"/>
-  </a-card>
-</template>
-
-<script>
-  import JTreeTable from '@/components/jeecg/JTreeTable'
-
-  export default {
-    name: 'AsyncTreeTable',
-    components: { JTreeTable },
-    data() {
-      return {
-        url: '/api/asynTreeList',
-        columns: [
-          { title: '菜单名称', dataIndex: 'name' },
-          { title: '组件', dataIndex: 'component' },
-          { title: '排序', dataIndex: 'orderNum' }
-        ],
-        selectedRowKeys: []
-      }
-    },
-     computed: {
-       tableProps() {
-         let _this = this
-         return {
-           // 列表项是否可选择
-           // 配置项见：https://vue.ant.design/components/table-cn/#rowSelection
-           rowSelection: {
-             selectedRowKeys: _this.selectedRowKeys,
-             onChange: (selectedRowKeys) => _this.selectedRowKeys = selectedRowKeys
-           }
-         }
-       }
-     }
-  }
-</script>
-```
-
-# JCheckbox 使用文档
-  
-###### 说明: antd-vue checkbox组件处理的是数组，用起来不是很方便，特二次封装，使用时只需处理字符串即可
-## 参数配置
-| 参数           | 类型   | 必填 |说明|
-|--------------|---------|----|---------|
-| options      |array   |✔| checkbox需要配置的项，是个数组，数组中每个对象包含两个属性:label(用于显示)和value(用于存储) |
-
-使用示例
-----
-```vue
-<template>
-  <a-form :form="form">
-    <a-form-item label="v-model式用法">
-      <j-checkbox v-model="sport" :options="sportOptions"></j-checkbox><span>{{ sport }}</span>
-    </a-form-item>
-
-    <a-form-item label="v-decorator式用法">
-      <j-checkbox v-decorator="['sport']" :options="sportOptions"></j-checkbox><span>{{ getFormFieldValue('sport') }}</span>
-    </a-form-item>
-  </a-form>
-</template>
-
-<script>
-  import JCheckbox from '@/components/jeecg/JCheckbox'
-  export default {
-    components: {JCheckbox},
-    data() {
-      return {
-        form: this.$form.createForm(this),
-        sport:'',
-        sportOptions:[
-          {
-            label:"足球",
-            value:"1"
-          },{
-            label:"篮球",
-            value:"2"
-          },{
-            label:"乒乓球",
-            value:"3"
-          }]
-      }
-    },
-    methods: {
-     getFormFieldValue(field){
-       return this.form.getFieldValue(field)
-     }
-    }
-  }
-</script>
-```
-
-# JCodeEditor 使用文档
-  
-###### 说明: 一个简易版的代码编辑器，支持语法高亮
-## 参数配置
-| 参数           | 类型   | 必填 |说明|
-|--------------|---------|----|---------|
-| language      |string   | | 表示当前编写代码的类型 javascript/html/css/sql |
-| placeholder      |string   | | placeholder |
-| lineNumbers      |Boolean   | | 是否显示行号 |
-| fullScreen      |Boolean   | | 是否显示全屏按钮 |
-| zIndex      |string   | | 全屏以后的z-index |
-
-使用示例
-----
-```vue
-<template>
-  <div>
-    <j-code-editor
-      language="javascript"
-      v-model="editorValue"
-      :fullScreen="true"
-      style="min-height: 100px"/>
-    {{ editorValue }}
-  </div>
-</template>
-
-<script>
-  import JCodeEditor from '@/components/jeecg/JCodeEditor'
-  export default {
-    components: {JCodeEditor},
-    data() {
-      return {
-        form: this.$form.createForm(this),
-        editorValue:'',
-      }
-    }
-  }
-</script>
-```
-
-# JFormContainer 使用文档
-  
-###### 说明: 暂用于表单禁用
-
-使用示例
-----
-```vue
-<!-- 在form下直接写这个组件，设置disabled为true就能将此form中的控件禁用 -->
-  <a-form layout="inline" :form="form" >
-    <j-form-container disabled>
-      <!-- 表单内容省略..... -->
-    </j-form-container>
-  </a-form>
-```
-
-# JImportModal 使用文档
-  
-###### 说明: 用于列表页面导入excel功能
-
-使用示例
-----
-```vue
-
-<template>
-  <!--  此处省略部分代码...... -->
-  <a-button @click="handleImportXls" type="primary" icon="upload">导入</a-button>
-  <!--  此处省略部分代码...... -->
-  <j-import-modal ref="importModal" :url="getImportUrl()" @ok="importOk"></j-import-modal>
-  <!--  此处省略部分代码...... -->
-</template>
-
-<script>
-  import JCodeEditor from '@/components/jeecg/JCodeEditor'
-  export default {
-    components: {JCodeEditor},
-    data() {
-      return {
-        //省略代码......
-      }
-    },
-    methods:{
-      //省略部分代码......
-      handleImportXls(){
-        this.$refs.importModal.show()
-      },
-      getImportUrl(){
-         return '你自己处理上传业务的后台地址'
-      },
-      importOk(){
-        this.loadData(1)
-      }
-    }
-  }
-</script>
-```
-
-# JSelectMultiple 多选下拉组件
-online用 实际开发请使用components/dict/JMultiSelectTag
-
-# JSlider 滑块验证码
-
-使用示例
-----
-```vue
-<template>
-  <div style="width: 300px">
-    <j-slider @onSuccess="sliderSuccess"></j-slider>
-  </div>
-</template>
-
-<script>
-  import JSlider from '@/components/jeecg/JSlider'
-  export default {
-    components: {JSlider},
-    data() {
-      return {
-        form: this.$form.createForm(this),
-        editorValue:'',
-      }
-    },
-    methods:{
-      sliderSuccess(){
-        console.log("验证完成")
-      }
-    }
-  }
-</script>
-```
-
-
-# JTreeSelect 树形下拉组件
-异步加载的树形下拉组件
-
-## 参数配置
-| 参数           | 类型   | 必填 |说明|
-|--------------|---------|----|---------|
-| placeholder      |string   | | placeholder |
-| dict      |string   | ✔| 表名,显示字段名,存储字段名拼接的字符串 |
-| pidField      |string   | ✔| 父ID的字段名 |
-| pidValue      |string   | | 根节点父ID的值 默认'0' 不可以设置为空,如果想使用此组件，而数据库根节点父ID为空，请修改之 |
-| multiple      |boolean   | |是否支持多选 |
-
-使用示例
-----
-```vue
-<template>
-  <a-form>
-    <a-form-item label="树形下拉测试" style="width: 300px">
-      <j-tree-select
-        v-model="departId"
-        placeholder="请选择部门"
-        dict="sys_depart,depart_name,id"
-        pidField="parent_id">
-      </j-tree-select>
-      {{ departId }}
-    </a-form-item>
-  </a-form >
-</template>
-
-<script>
-  import JTreeSelect from '@/components/jeecg/JTreeSelect'
-  export default {
-    components: {JTreeSelect},
-    data() {
-      return {
-        departId:""
-      }
-    }
-  }
-</script>
-```
-
-
+# JDate 日期组件 使用文档
+  
+###### 说明: antd-vue日期组件需要用moment中转一下，用起来不是很方便，特二次封装，使用时只需要传字符串即可
+## 参数配置
+| 参数           | 类型      | 必填 |说明|
+|--------------|---------|----|---------|
+| placeholder      |string   | | placeholder      |
+| readOnly   | boolean   | | true/false 默认false                 |
+| value      | string | | 绑定v-model或是v-decorator后不需要设置    |
+| showTime | boolean | | 是否展示时间true/false 默认false  |
+| dateFormat    | string | |日期格式 默认'YYYY-MM-DD' 若showTime设置为true则需要将其设置成对应的时间格式(如:YYYY-MM-DD HH:mm:ss)               |
+| triggerChange | string | |触发组件值改变的事件是否是change,当使用v-decorator时且没有设置decorator的option.trigger为input需要设置该值为true               |
+使用示例
+----
+1.组件带有v-model的使用方法
+```vue
+<j-date v-model="dateStr"></j-date>
+```
+
+2.组件带有v-decorator的使用方法  
+  a).设置trigger-change属性为true
+  ```vue
+    <j-date :trigger-change="true" v-decorator="['dateStr',{}]"></j-date>
+  ```
+    
+  b).设置decorator的option.trigger为input
+   ```vue
+    <j-date v-decorator="['dateStr',{trigger:'input'}]"></j-date>
+   ```
+
+3.其他使用
+添加style
+```vue
+<j-date v-model="dateStr" style="width:100%"></j-date>
+```
+添加placeholder
+```vue
+<j-date v-model="dateStr" placeholder="请输入dateStr"></j-date>
+```
+添加readOnly
+```vue
+<j-date v-model="dateStr" :read-only="true"></j-date>
+```
+
+备注:
+script内需引入jdate
+```vue
+<script>
+  import JDate from '@/components/jeecg/JDate'
+  export default {
+    name: "demo",
+    components: {
+      JDate
+    }
+    //...
+  }
+</script>
+```
+
+
+ ---
+
+
+# JSuperQuery 高级查询 使用文档
+## 参数配置
+| 参数           | 类型      | 必填 | 说明                   |
+|--------------|---------|----|----------------------|
+| fieldList      | array   |✔| 需要查询的列集合示例如下，type类型有:date/datetime/string/int/number      |
+| callback   | array   |  | 回调函数名称(非必须)默认handleSuperQuery                |
+
+fieldList结构示例：
+```vue
+  const superQueryFieldList=[{
+    type:"date",
+    value:"birthday",
+    text:"生日"
+  },{
+    type:"string",
+    value:"name",
+    text:"用户名"
+  },{
+    type:"int",
+    value:"age",
+    text:"年龄"
+  }]
+```
+页面代码概述:  
+----
+1.import之后再components之内声明
+```vue
+import JSuperQuery from '@/components/jeecg/JSuperQuery.vue';
+  export default {
+    name: "JeecgDemoList",
+    components: {
+      JSuperQuery
+    },
+
+```
+2.页面引用
+```vue
+  <!-- 高级查询区域 -->
+  <j-super-query :fieldList="fieldList" ref="superQueryModal" @handleSuperQuery="handleSuperQuery"></j-super-query>
+```
+3.list页面data中需要定义三个属性：
+```vue
+  fieldList:superQueryFieldList,
+  superQueryFlag:false,
+  superQueryParams:""
+```
+4.list页面声明回调事件handleSuperQuery(与组件的callback对应即可)
+```vue
+//高级查询方法
+handleSuperQuery(arg) {
+  if(!arg){
+    this.superQueryParams=''
+    this.superQueryFlag = false
+  }else{
+    this.superQueryFlag = true
+    this.superQueryParams=JSON.stringify(arg)
+  }
+  this.loadData()
+},
+```
+5.改造list页面方法
+```vue
+  // 获取查询条件
+  getQueryParams() {
+    let sqp = {}
+    if(this.superQueryParams){
+      sqp['superQueryParams']=encodeURI(this.superQueryParams)
+    }
+    var param = Object.assign(sqp, this.queryParam, this.isorter);
+    param.field = this.getQueryField();
+    param.pageNo = this.ipagination.current;
+    param.pageSize = this.ipagination.pageSize;
+    return filterObj(param);
+  },
+```
+6.打开弹框调用show方法：
+```vue
+this.$refs.superQueryModal.show();
+```
+
+# JEllipsis 字符串超长截取省略号显示
+  
+###### 说明: 遇到超长文本展示，通过此标签可以截取省略号显示，鼠标放置会提示全文本
+## 参数配置
+| 参数  | 类型     | 必填 |    说明      |
+|--------|---------|----|----------------|
+| value  |string   | 必填   |  字符串文本|
+| length | number  | 非必填 |  默认25    |
+使用示例
+----
+1.组件带有v-model的使用方法
+```vue
+<j-ellipsis :value="text"/>
+
+
+# Modal弹框实现最大化功能  
+
+1.定义modal的宽度：
+```vue
+  <a-modal
+    :width="modalWidth"
+    
+    
+    />
+```
+2.自定义modal的title,居右显示切换图标
+```vue
+  <template slot="title">
+    <div style="width: 100%;">
+      <span>{{ title }}</span>
+      <span style="display:inline-block;width:calc(100% - 51px);padding-right:10px;text-align: right">
+        <a-button @click="toggleScreen" icon="appstore" style="height:20px;width:20px;border:0px"></a-button>
+      </span>
+    </div>
+  </template>
+```
+3.定义toggleScreen事件,用于切换modal宽度
+```vue
+  toggleScreen(){
+      if(this.modaltoggleFlag){
+        this.modalWidth = window.innerWidth;
+      }else{
+        this.modalWidth = 800;
+      }
+      this.modaltoggleFlag = !this.modaltoggleFlag;
+    },
+```
+4.data中声明上述用到的属性
+```vue
+    data () {
+      return {
+        modalWidth:800,
+        modaltoggleFlag:true,
+```
+
+# <a-select/> 下拉选项滚动错位的解决方法
+
+## 问题描述
+
+当使用了 `a-modal` 或其他带有滚动条的组件时，使用`a-select`组件并打开下拉框时滚动滚动条，就会导致错位的问题产生。
+
+## 解决方法
+
+大多数情况下，在 `a-select` 上添加一个 `getPopupContainer` 属性，值为`node => node.parentNode`即可解决。
+但是如果遇到 `a-select` 标签层级过深的情况，可能仍然会显示异常，只需要多加几个`.parentNode` （例：node => node.parentNode.parentNode.parentNode）多尝试几次直到解决问题即可。
+
+### 代码示例
+
+```html
+<a-select
+    placeholder="请选择展示模板"
+    :options="dicts.displayTemplate"
+    :getPopupContainer="node => node.parentNode"
+/>
+```
+
+# JAsyncTreeList 异步数列表组件使用说明
+
+## 引入组件
+
+```js
+import JTreeTable from '@/components/jeecg/JTreeTable'
+export default {
+  components: { JTreeTable }
+}
+```
+
+## 所需参数
+
+| 参数        | 类型   | 必填   | 说明                                                         |
+|-------------|--------|--------|--------------------------------------------------------------|
+| rowKey      | String | 非必填 | 表格行 key 的取值，默认为"id"                                |
+| columns     | Array  | 必填   | 表格列的配置描述，具体见Antd官方文档                         |
+| url         | String | 必填   | 数据查询url                                                  |
+| childrenUrl | String | 非必填 | 查询子级时的url，若不填则使用url参数查询子级                 |
+| queryKey    | String | 非必填 | 根据某个字段查询，如果传递 id 就根据 id 查询，默认为parentId |
+| queryParams | Object | 非必填 | 查询参数，当查询参数改变的时候会自动重新查询，默认为{}       |
+| topValue    | String | 非必填 | 查询顶级时的值，如果顶级为0，则传0，默认为null               |
+| tableProps  | Object | 非必填 | 自定义给内部table绑定的props                                 |
+
+## 代码示例
+
+```html
+<template>
+  <a-card :bordered="false">
+    <j-tree-table :url="url" :columns="columns" :tableProps="tableProps"/>
+  </a-card>
+</template>
+
+<script>
+  import JTreeTable from '@/components/jeecg/JTreeTable'
+
+  export default {
+    name: 'AsyncTreeTable',
+    components: { JTreeTable },
+    data() {
+      return {
+        url: '/api/asynTreeList',
+        columns: [
+          { title: '菜单名称', dataIndex: 'name' },
+          { title: '组件', dataIndex: 'component' },
+          { title: '排序', dataIndex: 'orderNum' }
+        ],
+        selectedRowKeys: []
+      }
+    },
+     computed: {
+       tableProps() {
+         let _this = this
+         return {
+           // 列表项是否可选择
+           // 配置项见：https://vue.ant.design/components/table-cn/#rowSelection
+           rowSelection: {
+             selectedRowKeys: _this.selectedRowKeys,
+             onChange: (selectedRowKeys) => _this.selectedRowKeys = selectedRowKeys
+           }
+         }
+       }
+     }
+  }
+</script>
+```
+
+# JCheckbox 使用文档
+  
+###### 说明: antd-vue checkbox组件处理的是数组，用起来不是很方便，特二次封装，使用时只需处理字符串即可
+## 参数配置
+| 参数           | 类型   | 必填 |说明|
+|--------------|---------|----|---------|
+| options      |array   |✔| checkbox需要配置的项，是个数组，数组中每个对象包含两个属性:label(用于显示)和value(用于存储) |
+
+使用示例
+----
+```vue
+<template>
+  <a-form :form="form">
+    <a-form-item label="v-model式用法">
+      <j-checkbox v-model="sport" :options="sportOptions"></j-checkbox><span>{{ sport }}</span>
+    </a-form-item>
+
+    <a-form-item label="v-decorator式用法">
+      <j-checkbox v-decorator="['sport']" :options="sportOptions"></j-checkbox><span>{{ getFormFieldValue('sport') }}</span>
+    </a-form-item>
+  </a-form>
+</template>
+
+<script>
+  import JCheckbox from '@/components/jeecg/JCheckbox'
+  export default {
+    components: {JCheckbox},
+    data() {
+      return {
+        form: this.$form.createForm(this),
+        sport:'',
+        sportOptions:[
+          {
+            label:"足球",
+            value:"1"
+          },{
+            label:"篮球",
+            value:"2"
+          },{
+            label:"乒乓球",
+            value:"3"
+          }]
+      }
+    },
+    methods: {
+     getFormFieldValue(field){
+       return this.form.getFieldValue(field)
+     }
+    }
+  }
+</script>
+```
+
+# JCodeEditor 使用文档
+  
+###### 说明: 一个简易版的代码编辑器，支持语法高亮
+## 参数配置
+| 参数           | 类型   | 必填 |说明|
+|--------------|---------|----|---------|
+| language      |string   | | 表示当前编写代码的类型 javascript/html/css/sql |
+| placeholder      |string   | | placeholder |
+| lineNumbers      |Boolean   | | 是否显示行号 |
+| fullScreen      |Boolean   | | 是否显示全屏按钮 |
+| zIndex      |string   | | 全屏以后的z-index |
+
+使用示例
+----
+```vue
+<template>
+  <div>
+    <j-code-editor
+      language="javascript"
+      v-model="editorValue"
+      :fullScreen="true"
+      style="min-height: 100px"/>
+    {{ editorValue }}
+  </div>
+</template>
+
+<script>
+  import JCodeEditor from '@/components/jeecg/JCodeEditor'
+  export default {
+    components: {JCodeEditor},
+    data() {
+      return {
+        form: this.$form.createForm(this),
+        editorValue:'',
+      }
+    }
+  }
+</script>
+```
+
+# JFormContainer 使用文档
+  
+###### 说明: 暂用于表单禁用
+
+使用示例
+----
+```vue
+<!-- 在form下直接写这个组件，设置disabled为true就能将此form中的控件禁用 -->
+  <a-form layout="inline" :form="form" >
+    <j-form-container disabled>
+      <!-- 表单内容省略..... -->
+    </j-form-container>
+  </a-form>
+```
+
+# JImportModal 使用文档
+  
+###### 说明: 用于列表页面导入excel功能
+
+使用示例
+----
+```vue
+
+<template>
+  <!--  此处省略部分代码...... -->
+  <a-button @click="handleImportXls" type="primary" icon="upload">导入</a-button>
+  <!--  此处省略部分代码...... -->
+  <j-import-modal ref="importModal" :url="getImportUrl()" @ok="importOk"></j-import-modal>
+  <!--  此处省略部分代码...... -->
+</template>
+
+<script>
+  import JCodeEditor from '@/components/jeecg/JCodeEditor'
+  export default {
+    components: {JCodeEditor},
+    data() {
+      return {
+        //省略代码......
+      }
+    },
+    methods:{
+      //省略部分代码......
+      handleImportXls(){
+        this.$refs.importModal.show()
+      },
+      getImportUrl(){
+         return '你自己处理上传业务的后台地址'
+      },
+      importOk(){
+        this.loadData(1)
+      }
+    }
+  }
+</script>
+```
+
+# JSlider 滑块验证码
+
+使用示例
+----
+```vue
+<template>
+  <div style="width: 300px">
+    <j-slider @onSuccess="sliderSuccess"></j-slider>
+  </div>
+</template>
+
+<script>
+  import JSlider from '@/components/jeecg/JSlider'
+  export default {
+    components: {JSlider},
+    data() {
+      return {
+        form: this.$form.createForm(this),
+        editorValue:'',
+      }
+    },
+    methods:{
+      sliderSuccess(){
+        console.log("验证完成")
+      }
+    }
+  }
+</script>
+```
+
+
+# JTreeSelect 树形下拉组件
+异步加载的树形下拉组件
+
+## 参数配置
+| 参数           | 类型   | 必填 |说明|
+|--------------|---------|----|---------|
+| placeholder      |string   | | placeholder |
+| dict      |string   | ✔| 表名,显示字段名,存储字段名拼接的字符串 |
+| pidField      |string   | ✔| 父ID的字段名 |
+| pidValue      |string   | | 根节点父ID的值 默认'0' 不可以设置为空,如果想使用此组件，而数据库根节点父ID为空，请修改之 |
+| multiple      |boolean   | |是否支持多选 |
+
+使用示例
+----
+```vue
+<template>
+  <a-form>
+    <a-form-item label="树形下拉测试" style="width: 300px">
+      <j-tree-select
+        v-model="departId"
+        placeholder="请选择部门"
+        dict="sys_depart,depart_name,id"
+        pidField="parent_id">
+      </j-tree-select>
+      {{ departId }}
+    </a-form-item>
+  </a-form >
+</template>
+
+<script>
+  import JTreeSelect from '@/components/jeecg/JTreeSelect'
+  export default {
+    components: {JTreeSelect},
+    data() {
+      return {
+        departId:""
+      }
+    }
+  }
+</script>
+```
+
+
diff --git a/jshERP-web/src/config/router.config.js b/jshERP-web/src/config/router.config.js
index f1a29d91..646d3aff 100644
--- a/jshERP-web/src/config/router.config.js
+++ b/jshERP-web/src/config/router.config.js
@@ -41,12 +41,7 @@ export const constantRouterMap = [
         path: 'register',
         name: 'register',
         component: () => import(/* webpackChunkName: "user" */ '@/views/user/Register')
-      },
-      {
-        path: 'register-result',
-        name: 'registerResult',
-        component: () => import(/* webpackChunkName: "user" */ '@/views/user/RegisterResult')
-      },
+      }
     ]
   },
   {
diff --git a/jshERP-web/src/main.js b/jshERP-web/src/main.js
index ad360b12..b3f369cd 100644
--- a/jshERP-web/src/main.js
+++ b/jshERP-web/src/main.js
@@ -32,7 +32,6 @@ import {
 } from "@/store/mutation-types"
 import config from '@/defaultSettings'
 
-import JDictSelectTag from './components/dict/index.js'
 import hasPermission from '@/utils/hasPermission'
 import vueBus from '@/utils/vueBus';
 import JeecgComponents from '@/components/jeecg/index'
@@ -45,7 +44,6 @@ Vue.use(Antd)
 Vue.use(VueAxios, router)
 Vue.use(Viser)
 Vue.use(hasPermission)
-Vue.use(JDictSelectTag)
 Vue.use(Print)
 Vue.use(preview)
 Vue.use(vueBus);
diff --git a/jshERP-web/src/mixins/OnlAutoListMixin.js b/jshERP-web/src/mixins/OnlAutoListMixin.js
deleted file mode 100644
index 7c94140e..00000000
--- a/jshERP-web/src/mixins/OnlAutoListMixin.js
+++ /dev/null
@@ -1,78 +0,0 @@
-export const HrefJump = {
-  data() {
-    return {
-      fieldHrefSlots: [],
-      hrefComponent: {
-        model: {
-          title: '',
-          width: '100%',
-          visible: false,
-          destroyOnClose: true,
-          style: {
-            top: 0,
-            left: 0,
-            height: '100%',
-            margin: 0,
-            padding: 0
-          },
-          bodyStyle: { padding: '8px', height: 'calc(100vh - 108px)', overflow: 'auto', overflowX: 'hidden' },
-          // 隐藏掉取消按钮
-          cancelButtonProps: { style: { display: 'none' } },
-          afterClose: () => {
-            // 恢复body的滚动
-            document.body.style.overflow = null
-          }
-        },
-        on: {
-          ok: () => this.hrefComponent.model.visible = false,
-          cancel: () => this.hrefComponent.model.visible = false
-        },
-        is: null,
-        params: {},
-      }
-    }
-  },
-  methods: {
-    //支持链接href跳转
-    handleClickFieldHref(field, record) {
-      let href = field.href
-      let urlPattern = /(ht|f)tp(s?)\:\/\/[0-9a-zA-Z]([-.\w]*[0-9a-zA-Z])*(:(0-9)*)*(\/?)([a-zA-Z0-9\-\.\?\,\'\/\\\+&amp;%\$#_]*)?/
-      let compPattern = /\.vue(\?.*)?$/
-      if (typeof href === 'string') {
-        href = href.trim().replace(/\${([^}]+)?}/g, (s1, s2) => record[s2])
-        if (urlPattern.test(href)) {
-          window.open(href, '_blank')
-        } else if (compPattern.test(href)) {
-          this.openHrefCompModal(href)
-        } else {
-          this.$router.push(href)
-        }
-      }
-    },
-    openHrefCompModal(href) {
-      // 解析 href 参数
-      let index = href.indexOf('?')
-      let path = href
-      if (index !== -1) {
-        path = href.substring(0, index)
-        let paramString = href.substring(index + 1, href.length)
-        let paramArray = paramString.split('&')
-        let params = {}
-        paramArray.forEach(paramObject => {
-          let paramItem = paramObject.split('=')
-          params[paramItem[0]] = paramItem[1]
-        })
-        this.hrefComponent.params = params
-      } else {
-        this.hrefComponent.params = {}
-      }
-      this.hrefComponent.model.visible = true
-      this.hrefComponent.model.title = '@/views/' + path
-      this.hrefComponent.is = () => import('@/views/' + (path.startsWith('/')?path.slice(1):path))
-      // 禁止body滚动，防止滚动穿透
-      setTimeout(() => {
-        document.body.style.overflow = 'hidden'
-      }, 300)
-    },
-  }
-}
\ No newline at end of file
diff --git a/jshERP-web/src/mixins/OnlineCommonUtil.js b/jshERP-web/src/mixins/OnlineCommonUtil.js
deleted file mode 100644
index 7de0b6df..00000000
--- a/jshERP-web/src/mixins/OnlineCommonUtil.js
+++ /dev/null
@@ -1,26 +0,0 @@
-import { formatDate } from '@/utils/util'
-import Area from '@/components/_util/Area'
-
-const onlUtil = {
-  data(){
-    return {
-      mixin_pca:''
-    }
-  },
-  created(){
-    this.mixin_pca = new Area()
-  },
-  methods:{
-    simpleDateFormat(millisecond, format){
-      return formatDate(millisecond, format)
-    },
-    getPcaText(code){
-      return this.mixin_pca.getText(code);
-    },
-    getPcaCode(text){
-      return this.mixin_pca.getCode(text)
-    }
-  }
-}
-
-export  { onlUtil }
\ No newline at end of file
diff --git a/jshERP-web/src/views/form/advancedForm/AdvancedForm.vue b/jshERP-web/src/views/form/advancedForm/AdvancedForm.vue
deleted file mode 100644
index ad75b979..00000000
--- a/jshERP-web/src/views/form/advancedForm/AdvancedForm.vue
+++ /dev/null
@@ -1,206 +0,0 @@
-<template>
-  <div>
-    <a-card class="card" title="仓库管理" :bordered="false">
-      <repository-form ref="repository" :showSubmit="false" />
-    </a-card>
-    <a-card class="card" title="任务管理" :bordered="false">
-      <task-form ref="task" :showSubmit="false" />
-    </a-card>
-
-    <!-- table -->
-    <a-card>
-      <form :autoFormCreate="(form) => this.form = form">
-        <a-table
-          :columns="columns"
-          :dataSource="data"
-          :pagination="false"
-        >
-          <template v-for="(col, i) in ['name', 'workId', 'department']" :slot="col" slot-scope="text, record, index">
-            <a-input
-              :key="col"
-              v-if="record.editable"
-              style="margin: -5px 0"
-              :value="text"
-              :placeholder="columns[i].title"
-              @change="e => handleChange(e.target.value, record.key, col)"
-            />
-            <template v-else>{{ text }}</template>
-          </template>
-          <template slot="operation" slot-scope="text, record, index">
-            <template v-if="record.editable">
-              <span v-if="record.isNew">
-                <a @click="saveRow(record.key)">添加</a>
-                <a-divider type="vertical" />
-                <a-popconfirm title="是否要删除此行？" @confirm="remove(record.key)">
-                  <a>删除</a>
-                </a-popconfirm>
-              </span>
-              <span v-else>
-                <a @click="saveRow(record.key)">保存</a>
-                <a-divider type="vertical" />
-                <a @click="cancel(record.key)">取消</a>
-              </span>
-            </template>
-            <span v-else>
-              <a @click="toggle(record.key)">编辑</a>
-              <a-divider type="vertical" />
-              <a-popconfirm title="是否要删除此行？" @confirm="remove(record.key)">
-                <a>删除</a>
-              </a-popconfirm>
-            </span>
-          </template>
-        </a-table>
-        <a-button style="width: 100%; margin-top: 16px; margin-bottom: 8px" type="dashed" icon="plus" @click="newMember">新增成员</a-button>
-      </form>
-    </a-card>
-
-    <!-- fixed footer toolbar -->
-    <footer-tool-bar>
-      <a-button type="primary" @click="validate" :loading="loading">提交</a-button>
-    </footer-tool-bar>
-  </div>
-</template>
-
-<script>
-  import RepositoryForm from './RepositoryForm'
-  import TaskForm from './TaskForm'
-  import FooterToolBar from '@/components/tools/FooterToolBar'
-
-  export default {
-    name: "AdvancedForm",
-    components: {
-      FooterToolBar,
-      RepositoryForm,
-      TaskForm
-    },
-    data () {
-      return {
-        description: '高级表单常见于一次性输入和提交大批量数据的场景。',
-        loading: false,
-
-        // table
-        columns: [
-          {
-            title: '成员姓名',
-            dataIndex: 'name',
-            key: 'name',
-            width: '20%',
-            scopedSlots: { customRender: 'name' }
-          },
-          {
-            title: '工号',
-            dataIndex: 'workId',
-            key: 'workId',
-            width: '20%',
-            scopedSlots: { customRender: 'workId' }
-          },
-          {
-            title: '所属部门',
-            dataIndex: 'department',
-            key: 'department',
-            width: '40%',
-            scopedSlots: { customRender: 'department' }
-          },
-          {
-            title: '操作',
-            key: 'action',
-            scopedSlots: { customRender: 'operation' }
-          }
-        ],
-        data: [
-          {
-            key: '1',
-            name: '小明',
-            workId: '001',
-            editable: false,
-            department: '行政部'
-          },
-          {
-            key: '2',
-            name: '李莉',
-            workId: '002',
-            editable: false,
-            department: 'IT部'
-          },
-          {
-            key: '3',
-            name: '王小帅',
-            workId: '003',
-            editable: false,
-            department: '财务部'
-          }
-        ]
-      }
-    },
-    methods: {
-      handleSubmit (e) {
-        e.preventDefault()
-      },
-      newMember () {
-        this.data.push({
-          key: '-1',
-          name: '',
-          workId: '',
-          department: '',
-          editable: true,
-          isNew: true
-        })
-      },
-      remove (key) {
-        const newData = this.data.filter(item => item.key !== key)
-        this.data = newData
-      },
-      saveRow (key) {
-        let target = this.data.filter(item => item.key === key)[0]
-        target.editable = false
-        target.isNew = false
-      },
-      toggle (key) {
-        let target = this.data.filter(item => item.key === key)[0]
-        target.editable = !target.editable
-      },
-      getRowByKey (key, newData) {
-        const data = this.data
-        return (newData || data).filter(item => item.key === key)[0]
-      },
-      cancel (key) {
-        let target = this.data.filter(item => item.key === key)[0]
-        target.editable = false
-      },
-      handleChange (value, key, column) {
-        const newData = [...this.data]
-        const target = newData.filter(item => key === item.key)[0]
-        if (target) {
-          target[column] = value
-          this.data = newData
-        }
-      },
-
-      // 最终全页面提交
-      validate () {
-        this.$refs.repository.form.validateFields((err, values) => {
-          if (!err) {
-            this.$notification['error']({
-              message: 'Received values of form:',
-              description: values
-            })
-          }
-        })
-        this.$refs.task.form.validateFields((err, values) => {
-          if (!err) {
-            this.$notification['error']({
-              message: 'Received values of form:',
-              description: values
-            })
-          }
-        })
-      }
-    }
-  }
-</script>
-
-<style lang="less" scoped>
-  .card{
-    margin-bottom: 24px;
-  }
-</style>
\ No newline at end of file
diff --git a/jshERP-web/src/views/form/advancedForm/RepositoryForm.vue b/jshERP-web/src/views/form/advancedForm/RepositoryForm.vue
deleted file mode 100644
index 0ad1fad1..00000000
--- a/jshERP-web/src/views/form/advancedForm/RepositoryForm.vue
+++ /dev/null
@@ -1,119 +0,0 @@
-<template>
-  <a-form @submit="handleSubmit" :form="form" class="form">
-    <a-row class="form-row" :gutter="16">
-      <a-col :lg="6" :md="12" :sm="24">
-        <a-form-item label="仓库名">
-          <a-input
-            placeholder="请输入仓库名称"
-            v-decorator="[
-              'repository.name',
-              {rules: [{ required: true, message: '请输入仓库名称', whitespace: true}]}
-            ]" />
-        </a-form-item>
-      </a-col>
-      <a-col :xl="{span: 7, offset: 1}" :lg="{span: 8}" :md="{span: 12}" :sm="24">
-        <a-form-item
-          label="仓库域名">
-          <a-input
-            addonBefore="http://"
-            addonAfter=".com"
-            placeholder="请输入"
-            v-decorator="[
-              'repository.domain',
-              {rules: [{ required: true, message: '请输入仓库域名', whitespace: true}, {validator: validate}]}
-            ]" />
-        </a-form-item>
-      </a-col>
-      <a-col :xl="{span: 9, offset: 1}" :lg="{span: 10}" :md="{span: 24}" :sm="24">
-        <a-form-item
-          label="仓库管理员">
-          <a-select placeholder="请选择管理员" v-decorator="[ 'repository.manager', {rules: [{ required: true, message: '请选择管理员'}]} ]">
-            <a-select-option value="王同学">王同学</a-select-option>
-            <a-select-option value="李同学">李同学</a-select-option>
-            <a-select-option value="黄同学">黄同学</a-select-option>
-          </a-select>
-        </a-form-item>
-      </a-col>
-    </a-row>
-    <a-row class="form-row" :gutter="16">
-      <a-col :lg="6" :md="12" :sm="24">
-        <a-form-item
-          label="审批人">
-          <a-select placeholder="请选择审批员" v-decorator="[ 'repository.auditor', {rules: [{ required: true, message: '请选择审批员'}]} ]">
-            <a-select-option value="王晓丽">王晓丽</a-select-option>
-            <a-select-option value="李军">李军</a-select-option>
-          </a-select>
-        </a-form-item>
-      </a-col>
-      <a-col :xl="{span: 7, offset: 1}" :lg="{span: 8}" :md="{span: 12}" :sm="24">
-        <a-form-item
-          label="生效日期">
-          <a-range-picker
-            style="width: 100%"
-            v-decorator="[
-              'repository.effectiveDate',
-              {rules: [{ required: true, message: '请选择生效日期'}]}
-            ]" />
-        </a-form-item>
-      </a-col>
-      <a-col :xl="{span: 9, offset: 1}" :lg="{span: 10}" :md="{span: 24}" :sm="24">
-        <a-form-item
-          label="仓库类型">
-          <a-select
-            placeholder="请选择仓库类型"
-            v-decorator="[
-              'repository.type',
-              {rules: [{ required: true, message: '请选择仓库类型'}]}
-            ]" >
-            <a-select-option value="公开">公开</a-select-option>
-            <a-select-option value="私密">私密</a-select-option>
-          </a-select>
-        </a-form-item>
-      </a-col>
-    </a-row>
-    <a-form-item v-if="showSubmit">
-      <a-button htmlType="submit" >Submit</a-button>
-    </a-form-item>
-  </a-form>
-</template>
-
-<script>
-  export default {
-    name: "RepositoryForm",
-    props: {
-      showSubmit: {
-        type: Boolean,
-        default: false
-      }
-    },
-    data () {
-      return {
-        form: this.$form.createForm(this)
-      }
-    },
-    methods: {
-      handleSubmit (e) {
-        e.preventDefault()
-        this.form.validateFields((err, values) => {
-          if (!err) {
-            this.$notification['error']({
-              message: 'Received values of form:',
-              description: values
-            })
-          }
-        })
-      },
-      validate (rule, value, callback) {
-        const regex = /^user-(.*)$/
-        if (!regex.test(value)) {
-          callback('需要以 user- 开头')
-        }
-        callback()
-      }
-    }
-  }
-</script>
-
-<style scoped>
-
-</style>
\ No newline at end of file
diff --git a/jshERP-web/src/views/form/advancedForm/TaskForm.vue b/jshERP-web/src/views/form/advancedForm/TaskForm.vue
deleted file mode 100644
index e1af2aeb..00000000
--- a/jshERP-web/src/views/form/advancedForm/TaskForm.vue
+++ /dev/null
@@ -1,107 +0,0 @@
-<template>
-  <a-form @submit="handleSubmit" :form="form" class="form">
-    <a-row class="form-row" :gutter="16">
-      <a-col :lg="6" :md="12" :sm="24">
-        <a-form-item
-          label="任务名">
-          <a-input placeholder="请输入任务名称" v-decorator="[ 'task.name', {rules: [{ required: true, message: '请输入任务名称', whitespace: true}]} ]" />
-        </a-form-item>
-      </a-col>
-      <a-col :xl="{span: 7, offset: 1}" :lg="{span: 8}" :md="{span: 12}" :sm="24">
-        <a-form-item
-          label="任务描述">
-          <a-input placeholder="请输入任务描述" v-decorator="[ 'task.description', {rules: [{ required: true, message: '请输入任务描述', whitespace: true}]} ]" />
-        </a-form-item>
-      </a-col>
-      <a-col :xl="{span: 9, offset: 1}" :lg="{span: 10}" :md="{span: 24}" :sm="24">
-        <a-form-item
-          label="执行人">
-          <a-select
-            placeholder="请选择执行人"
-            v-decorator="[
-              'task.executor',
-              {rules: [{ required: true, message: '请选择执行人'}]}
-            ]" >
-            <a-select-option value="黄丽丽">黄丽丽</a-select-option>
-            <a-select-option value="李大刀">李大刀</a-select-option>
-          </a-select>
-        </a-form-item>
-      </a-col>
-    </a-row>
-    <a-row class="form-row" :gutter="16">
-      <a-col :lg="6" :md="12" :sm="24">
-        <a-form-item
-          label="责任人">
-          <a-select
-            placeholder="请选择责任人"
-            v-decorator="[
-              'task.manager',
-              {rules: [{ required: true, message: '请选择责任人'}]}
-            ]" >
-            <a-select-option value="王伟">王伟</a-select-option>
-            <a-select-option value="李红军">李红军</a-select-option>
-          </a-select>
-        </a-form-item>
-      </a-col>
-      <a-col :xl="{span: 7, offset: 1}" :lg="{span: 8}" :md="{span: 12}" :sm="24">
-        <a-form-item
-          label="提醒时间">
-          <a-time-picker
-            style="width: 100%"
-            v-decorator="[
-              'task.time',
-              {rules: [{ required: true, message: '请选择提醒时间'}]}
-            ]" />
-        </a-form-item>
-      </a-col>
-      <a-col :xl="{span: 9, offset: 1}" :lg="{span: 10}" :md="{span: 24}" :sm="24">
-        <a-form-item
-          label="任务类型">
-          <a-select
-            placeholder="请选择任务类型"
-            v-decorator="[ 'task.type', {rules: [{ required: true, message: '请选择任务类型'}]} ]" >
-            <a-select-option value="定时执行">定时执行</a-select-option>
-            <a-select-option value="周期执行">周期执行</a-select-option>
-          </a-select>
-        </a-form-item>
-      </a-col>
-    </a-row>
-    <a-form-item v-if="showSubmit">
-      <a-button htmlType="submit" >Submit</a-button>
-    </a-form-item>
-  </a-form>
-</template>
-
-<script>
-  export default {
-    name: "TaskForm",
-    props: {
-      showSubmit: {
-        type: Boolean,
-        default: false
-      }
-    },
-    data () {
-      return {
-        form: this.$form.createForm(this)
-      }
-    },
-    methods: {
-      handleSubmit (e) {
-        e.preventDefault()
-        this.form.validateFields((err, values) => {
-          if (!err) {
-            this.$notification['error']({
-              message: 'Received values of form:',
-              description: values
-            })
-          }
-        })
-      }
-    }
-  }
-</script>
-
-<style scoped>
-
-</style>
\ No newline at end of file
diff --git a/jshERP-web/src/views/form/stepForm/Step1.vue b/jshERP-web/src/views/form/stepForm/Step1.vue
deleted file mode 100644
index 384602c4..00000000
--- a/jshERP-web/src/views/form/stepForm/Step1.vue
+++ /dev/null
@@ -1,60 +0,0 @@
-<template>
-  <div>
-    <a-form style="max-width: 500px; margin: 40px auto 0;">
-      <a-form-item
-        label="付款账户"
-        :labelCol="{span: 5}"
-        :wrapperCol="{span: 19}"
-      >
-        <a-select value="1" placeholder="ant-design@alipay.com">
-          <a-select-option value="1">ant-design@alipay.com</a-select-option>
-        </a-select>
-      </a-form-item>
-      <a-form-item
-        label="收款账户"
-        :labelCol="{span: 5}"
-        :wrapperCol="{span: 19}"
-      >
-        <a-input-group :compact="true" style="display: inline-block; vertical-align: middle">
-          <a-select defaultValue="alipay" style="width: 100px">
-            <a-select-option value="alipay">支付宝</a-select-option>
-            <a-select-option value="wexinpay">微信</a-select-option>
-          </a-select>
-          <a-input :style="{width: 'calc(100% - 100px)'}" value="test@example.com"/>
-        </a-input-group>
-      </a-form-item>
-      <a-form-item
-        label="收款人姓名"
-        :labelCol="{span: 5}"
-        :wrapperCol="{span: 19}"
-      >
-        <a-input value="Alex" />
-      </a-form-item>
-      <a-form-item
-        label="转账金额"
-        :labelCol="{span: 5}"
-        :wrapperCol="{span: 19}"
-      >
-        <a-input prefix="￥" value="5000" />
-      </a-form-item>
-      <a-form-item :wrapperCol="{span: 19, offset: 5}">
-        <a-button type="primary" @click="nextStep">下一步</a-button>
-      </a-form-item>
-    </a-form>
-  </div>
-</template>
-
-<script>
-  export default {
-    name: "Step1",
-    methods: {
-      nextStep () {
-        this.$emit('nextStep')
-      }
-    }
-  }
-</script>
-
-<style scoped>
-
-</style>
\ No newline at end of file
diff --git a/jshERP-web/src/views/form/stepForm/Step2.vue b/jshERP-web/src/views/form/stepForm/Step2.vue
deleted file mode 100644
index 5e02c418..00000000
--- a/jshERP-web/src/views/form/stepForm/Step2.vue
+++ /dev/null
@@ -1,82 +0,0 @@
-<template>
-  <div>
-    <a-form style="max-width: 500px; margin: 40px auto 0;">
-      <a-alert
-        :closable="true"
-        message="确认转账后，资金将直接打入对方账户，无法退回。"
-        style="margin-bottom: 24px;"
-      />
-      <a-form-item
-        label="付款账户"
-        :labelCol="{span: 5}"
-        :wrapperCol="{span: 19}"
-        class="stepFormText"
-      >
-        ant-design@alipay.com
-      </a-form-item>
-      <a-form-item
-        label="收款账户"
-        :labelCol="{span: 5}"
-        :wrapperCol="{span: 19}"
-        class="stepFormText"
-      >
-        test@example.com
-      </a-form-item>
-      <a-form-item
-        label="收款人姓名"
-        :labelCol="{span: 5}"
-        :wrapperCol="{span: 19}"
-        class="stepFormText"
-      >
-        Alex
-      </a-form-item>
-      <a-form-item
-        label="转账金额"
-        :labelCol="{span: 5}"
-        :wrapperCol="{span: 19}"
-        class="stepFormText"
-      >
-        ￥ 5,000.00
-      </a-form-item>
-      <a-form-item :wrapperCol="{span: 19, offset: 5}">
-        <a-button :loading="loading" type="primary" @click="nextStep">提交</a-button>
-        <a-button style="margin-left: 8px" @click="prevStep">上一步</a-button>
-      </a-form-item>
-    </a-form>
-  </div>
-</template>
-
-<script>
-  export default {
-    name: "Step2",
-    data () {
-      return {
-        loading: false
-      }
-    },
-    methods: {
-      nextStep () {
-        let that = this
-        that.loading = true
-        setTimeout(function () {
-          that.$emit('nextStep')
-        }, 1500)
-      },
-      prevStep () {
-        this.$emit('prevStep')
-      }
-    }
-  }
-</script>
-
-<style lang="less" scoped>
-  .stepFormText {
-    margin-bottom: 24px;
-
-    .ant-form-item-label,
-    .ant-form-item-control {
-      line-height: 22px;
-    }
-  }
-
-</style>
\ No newline at end of file
diff --git a/jshERP-web/src/views/form/stepForm/Step3.vue b/jshERP-web/src/views/form/stepForm/Step3.vue
deleted file mode 100644
index a9e739e1..00000000
--- a/jshERP-web/src/views/form/stepForm/Step3.vue
+++ /dev/null
@@ -1,69 +0,0 @@
-<template>
-  <div>
-    <a-form style="margin: 40px auto 0;">
-      <result title="操作成功" :is-success="true" description="预计两小时内到账">
-        <div class="information">
-          <a-row>
-            <a-col :sm="8" :xs="24">付款账户：</a-col>
-            <a-col :sm="16" :xs="24">ant-design@alipay.com</a-col>
-          </a-row>
-          <a-row>
-            <a-col :sm="8" :xs="24">收款账户：</a-col>
-            <a-col :sm="16" :xs="24">test@example.com</a-col>
-          </a-row>
-          <a-row>
-            <a-col :sm="8" :xs="24">收款人姓名：</a-col>
-            <a-col :sm="16" :xs="24">辉夜</a-col>
-          </a-row>
-          <a-row>
-            <a-col :sm="8" :xs="24">转账金额：</a-col>
-            <a-col :sm="16" :xs="24"><span class="money">500</span> 元</a-col>
-          </a-row>
-        </div>
-        <div slot="action">
-          <a-button type="primary" @click="finish">再转一笔</a-button>
-          <a-button style="margin-left: 8px" @click="toOrderList">查看账单</a-button>
-        </div>
-      </result>
-    </a-form>
-  </div>
-</template>
-
-<script>
-  import Result from '../../result/Result'
-
-  export default {
-    name: "Step3",
-    components: {
-      Result
-    },
-    data () {
-      return {
-        loading: false
-      }
-    },
-    methods: {
-      finish () {
-        this.$emit('finish')
-      },
-      toOrderList () {
-        this.$router.push('/list/query-list')
-      }
-    }
-  }
-</script>
-<style lang="less" scoped>
-  .information {
-    line-height: 22px;
-
-    .ant-row:not(:last-child) {
-      margin-bottom: 24px;
-    }
-  }
-  .money {
-    font-family: "Helvetica Neue",sans-serif;
-    font-weight: 500;
-    font-size: 20px;
-    line-height: 14px;
-  }
-</style>
\ No newline at end of file
diff --git a/jshERP-web/src/views/form/stepForm/StepForm.vue b/jshERP-web/src/views/form/stepForm/StepForm.vue
deleted file mode 100644
index 623d6444..00000000
--- a/jshERP-web/src/views/form/stepForm/StepForm.vue
+++ /dev/null
@@ -1,62 +0,0 @@
-<template>
-  <a-card :bordered="false">
-    <a-steps class="steps" :current="currentTab">
-      <a-step title="填写转账信息" />
-      <a-step title="确认转账信息" />
-      <a-step title="完成" />
-    </a-steps>
-    <div class="content">
-      <step1 v-if="currentTab === 0" @nextStep="nextStep"/>
-      <step2 v-if="currentTab === 1" @nextStep="nextStep" @prevStep="prevStep"/>
-      <step3 v-if="currentTab === 2" @prevStep="prevStep" @finish="finish"/>
-    </div>
-  </a-card>
-</template>
-
-<script>
-  import Step1 from './Step1'
-  import Step2 from './Step2'
-  import Step3 from './Step3'
-
-  export default {
-    name: "StepForm",
-    components: {
-      Step1,
-      Step2,
-      Step3
-    },
-    data () {
-      return {
-        description: '将一个冗长或用户不熟悉的表单任务分成多个步骤，指导用户完成。',
-        currentTab: 0,
-
-        // form
-        form: null,
-      }
-    },
-    methods: {
-
-      // handler
-      nextStep () {
-        if (this.currentTab < 2) {
-          this.currentTab += 1
-        }
-      },
-      prevStep () {
-        if (this.currentTab > 0) {
-          this.currentTab -= 1
-        }
-      },
-      finish () {
-        this.currentTab = 0
-      }
-    }
-  }
-</script>
-
-<style lang="less" scoped>
-  .steps {
-    max-width: 750px;
-    margin: 16px auto;
-  }
-</style>
\ No newline at end of file
diff --git a/jshERP-web/src/views/modules/message/SysMessageList.vue b/jshERP-web/src/views/modules/message/SysMessageList.vue
deleted file mode 100644
index 091b95c7..00000000
--- a/jshERP-web/src/views/modules/message/SysMessageList.vue
+++ /dev/null
@@ -1,238 +0,0 @@
-<template>
-  <a-card :bordered="false">
-
-    <!-- 查询区域 -->
-    <div class="table-page-search-wrapper">
-      <a-form layout="inline" @keyup.enter.native="searchQuery">
-        <a-row :gutter="24">
-          <a-col :md="6" :sm="8">
-            <a-form-item label="消息标题">
-              <a-input placeholder="请输入消息标题" v-model="queryParam.esTitle"></a-input>
-            </a-form-item>
-          </a-col>
-          <a-col :md="6" :sm="8">
-            <a-form-item label="发送内容">
-              <a-input placeholder="请输入发送内容" v-model="queryParam.esContent"></a-input>
-            </a-form-item>
-          </a-col>
-          <template v-if="toggleSearchStatus">
-            <a-col :md="6" :sm="8">
-              <a-form-item label="接收人">
-                <a-input placeholder="请输入接收人" v-model="queryParam.esReceiver"></a-input>
-              </a-form-item>
-            </a-col>
-          </template>
-          <a-col :md="6" :sm="8">
-            <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
-              <a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
-              <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
-              <a @click="handleToggleSearch" style="margin-left: 8px">
-                {{ toggleSearchStatus ? '收起' : '展开' }}
-                <a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>
-              </a>
-            </span>
-          </a-col>
-
-        </a-row>
-      </a-form>
-    </div>
-
-    <!-- 操作按钮区域 -->
-    <div class="table-operator">
-      <a-button @click="handleAdd" v-show="show" type="primary" icon="plus">新增</a-button>
-      <a-button type="primary" v-show="show" icon="download" @click="handleExportXls('消息')">导出</a-button>
-      <a-upload v-show="show" name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl"
-                @change="handleImportExcel">
-        <a-button type="primary" icon="import">导入</a-button>
-      </a-upload>
-      <a-dropdown v-if="selectedRowKeys.length > 0">
-        <a-menu slot="overlay">
-          <a-menu-item key="1" @click="batchDel">
-            <a-icon type="delete"/>
-            删除
-          </a-menu-item>
-        </a-menu>
-        <a-button style="margin-left: 8px"> 批量操作
-          <a-icon type="down"/>
-        </a-button>
-      </a-dropdown>
-    </div>
-
-    <!-- table区域-begin -->
-    <div>
-      <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
-        <i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a style="font-weight: 600">{{
-        selectedRowKeys.length }}</a>项
-        <a style="margin-left: 24px" @click="onClearSelected">清空</a>
-      </div>
-
-      <a-table
-        ref="table"
-        size="middle"
-        bordered
-        rowKey="id"
-        :columns="columns"
-        :dataSource="dataSource"
-        :pagination="ipagination"
-        :loading="loading"
-        :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
-        @change="handleTableChange">
-
-        <!-- 字符串超长截取省略号显示-->
-        <span slot="esContent" slot-scope="text">
-          <j-ellipsis :value="text" :length="10" />
-        </span>
-
-        <span slot="action" slot-scope="text, record">
-          <a href="javascript:;" @click="handleDetail(record)">详情</a>
-          <a-divider type="vertical"/>
-          <a-dropdown>
-            <a class="ant-dropdown-link">更多<a-icon type="down"/></a>
-            <a-menu slot="overlay">
-               <a-menu-item v-show="show">
-                <a  @click="handleEdit(record)">编辑</a>
-              </a-menu-item>
-              <a-menu-item>
-                <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
-                  <a>删除</a>
-                </a-popconfirm>
-              </a-menu-item>
-            </a-menu>
-          </a-dropdown>
-        </span>
-
-      </a-table>
-    </div>
-    <!-- table区域-end -->
-
-    <!-- 表单区域 -->
-    <sysMessage-modal ref="modalForm" @ok="modalFormOk"></sysMessage-modal>
-  </a-card>
-</template>
-
-<script>
-  import SysMessageModal from './modules/SysMessageModal'
-  import {JeecgListMixin} from '@/mixins/JeecgListMixin'
-  import JEllipsis from "@/components/jeecg/JEllipsis";
-
-  export default {
-    name: "SysMessageList",
-    mixins: [JeecgListMixin],
-    components: {
-      JEllipsis,
-      SysMessageModal
-    },
-    data() {
-      return {
-        description: '消息管理页面',
-        // 新增修改按钮是否显示
-        show: false,
-        // 表头
-        columns: [
-          {
-            title: '#',
-            dataIndex: '',
-            key: 'rowIndex',
-            width: 60,
-            align: "center",
-            customRender: function (t, r, index) {
-              return parseInt(index) + 1;
-            }
-          },
-          {
-            title: '消息标题',
-            align: "center",
-            dataIndex: 'esTitle'
-          },
-          {
-            title: '发送内容',
-            align: "center",
-            dataIndex: 'esContent',
-            scopedSlots: {customRender: 'esContent'},
-          },
-          {
-            title: '接收人',
-            align: "center",
-            dataIndex: 'esReceiver'
-          },
-          {
-            title: '发送次数',
-            align: "center",
-            dataIndex: 'esSendNum'
-          },
-          {
-            title: '发送状态',
-            align: 'center',
-            dataIndex: 'esSendStatus_dictText'
-          },
-          {
-            title: '发送时间',
-            align: "center",
-            dataIndex: 'esSendTime'
-          },
-          {
-            title: '发送方式',
-            align: 'center',
-            dataIndex: 'esType_dictText'
-          },
-          {
-            title: '操作',
-            dataIndex: 'action',
-            align: "center",
-            scopedSlots: {customRender: 'action'},
-          }
-        ],
-        url: {
-          list: "/message/sysMessage/list",
-          delete: "/message/sysMessage/delete",
-          deleteBatch: "/message/sysMessage/deleteBatch",
-          exportXlsUrl: "message/sysMessage/exportXls",
-          importExcelUrl: "message/sysMessage/importExcel",
-        },
-      }
-    },
-    computed: {
-      importExcelUrl: function () {
-        return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
-      }
-    },
-    methods: {}
-  }
-</script>
-<style lang="less" scoped>
-  /** Button按钮间距 */
-  .ant-btn {
-    margin-left: 3px
-  }
-
-  .ant-card-body .table-operator {
-    margin-bottom: 18px;
-  }
-
-  .ant-table-tbody .ant-table-row td {
-    padding-top: 15px;
-    padding-bottom: 15px;
-  }
-
-  .anty-row-operator button {
-    margin: 0 5px
-  }
-
-  .ant-btn-danger {
-    background-color: #ffffff
-  }
-
-  .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-content {
-    height: 90% !important;
-    overflow-y: hidden
-  }
-</style>
\ No newline at end of file
diff --git a/jshERP-web/src/views/modules/message/SysMessageTemplateList.vue b/jshERP-web/src/views/modules/message/SysMessageTemplateList.vue
deleted file mode 100644
index 70335fc7..00000000
--- a/jshERP-web/src/views/modules/message/SysMessageTemplateList.vue
+++ /dev/null
@@ -1,253 +0,0 @@
-<template>
-  <a-card :bordered="false">
-
-    <!-- 查询区域 -->
-    <div class="table-page-search-wrapper">
-      <a-form layout="inline" @keyup.enter.native="searchQuery">
-        <a-row :gutter="24">
-
-          <a-col :md="6" :sm="8">
-            <a-form-item label="模板CODE">
-              <a-input placeholder="请输入模板CODE" v-model="queryParam.templateCode"></a-input>
-            </a-form-item>
-          </a-col>
-          <a-col :md="6" :sm="8">
-            <a-form-item label="模板内容">
-              <a-input placeholder="请输入模板内容" v-model="queryParam.templateContent"></a-input>
-            </a-form-item>
-          </a-col>
-          <template v-if="toggleSearchStatus">
-            <a-col :md="6" :sm="8">
-              <a-form-item label="模板标题">
-                <a-input placeholder="请输入模板标题" v-model="queryParam.templateName"></a-input>
-              </a-form-item>
-            </a-col>
-            <a-col :md="6" :sm="8">
-              <a-form-item label="模板类型">
-                <a-input placeholder="请输入模板类型" v-model="queryParam.templateType"></a-input>
-              </a-form-item>
-            </a-col>
-          </template>
-          <a-col :md="6" :sm="8">
-            <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
-              <a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
-              <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
-              <a @click="handleToggleSearch" style="margin-left: 8px">
-                {{ toggleSearchStatus ? '收起' : '展开' }}
-                <a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>
-              </a>
-            </span>
-          </a-col>
-
-        </a-row>
-      </a-form>
-    </div>
-
-    <!-- 操作按钮区域 -->
-    <div class="table-operator">
-      <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
-      <a-button type="primary" icon="download" @click="handleExportXls('消息模板')">导出</a-button>
-      <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl"
-                @change="handleImportExcel">
-        <a-button type="primary" icon="import">导入</a-button>
-      </a-upload>
-      <a-dropdown v-if="selectedRowKeys.length > 0">
-        <a-menu slot="overlay">
-          <a-menu-item key="1" @click="batchDel">
-            <a-icon type="delete"/>
-            删除
-          </a-menu-item>
-        </a-menu>
-        <a-button style="margin-left: 8px"> 批量操作
-          <a-icon type="down"/>
-        </a-button>
-      </a-dropdown>
-    </div>
-
-    <!-- table区域-begin -->
-    <div>
-      <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
-        <i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a style="font-weight: 600">{{
-        selectedRowKeys.length }}</a>项
-        <a style="margin-left: 24px" @click="onClearSelected">清空</a>
-      </div>
-
-      <a-table
-        ref="table"
-        size="middle"
-        bordered
-        rowKey="id"
-        :columns="columns"
-        :dataSource="dataSource"
-        :pagination="ipagination"
-        :loading="loading"
-        :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
-        @change="handleTableChange">
-
-        <!-- 字符串超长截取省略号显示-->
-        <span slot="templateContent" slot-scope="text">
-          <j-ellipsis :value="text" :length="25" />
-        </span>
-
-
-        <span slot="action" slot-scope="text, record">
-          <a @click="handleEdit(record)">编辑</a>
-
-          <a-divider type="vertical"/>
-          <a-dropdown>
-            <a class="ant-dropdown-link">更多 <a-icon type="down"/></a>
-            <a-menu slot="overlay">
-              <a-menu-item>
-                <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
-                  <a>删除</a>
-                </a-popconfirm>
-              </a-menu-item>
-              <a-menu-item>
-                  <a @click="handleTest(record)">发送测试</a>
-              </a-menu-item>
-            </a-menu>
-          </a-dropdown>
-        </span>
-
-      </a-table>
-    </div>
-    <!-- table区域-end -->
-
-    <!-- 表单区域 -->
-    <sysMessageTemplate-modal ref="modalForm" @ok="modalFormOk"></sysMessageTemplate-modal>
-
-    <sysMessageTest-modal ref="testModal"></sysMessageTest-modal>
-  </a-card>
-</template>
-
-<script>
-  import SysMessageTemplateModal from './modules/SysMessageTemplateModal'
-  import SysMessageTestModal from './modules/SysMessageTestModal'
-  import {JeecgListMixin} from '@/mixins/JeecgListMixin'
-  import JEllipsis from "@/components/jeecg/JEllipsis";
-
-  export default {
-    name: "SysMessageTemplateList",
-    mixins: [JeecgListMixin],
-    components: {
-      JEllipsis,
-      SysMessageTemplateModal,
-      SysMessageTestModal
-    },
-    data() {
-      return {
-        description: '消息模板管理页面',
-        // 表头
-        columns: [
-          {
-            title: '#',
-            dataIndex: '',
-            key: 'rowIndex',
-            width: 60,
-            align: "center",
-            customRender: function (t, r, index) {
-              return parseInt(index) + 1;
-            }
-          },
-          {
-            title: '模板CODE',
-            align: "center",
-            dataIndex: 'templateCode'
-          },
-          {
-            title: '模板标题',
-            align: "center",
-            dataIndex: 'templateName'
-          },
-          {
-            title: '模板内容',
-            align: "center",
-            dataIndex: 'templateContent',
-            scopedSlots: {customRender: 'templateContent'},
-          },
-          {
-            title: '模板类型',
-            align: "center",
-            dataIndex: 'templateType',
-            customRender: function (text) {
-              if(text=='1') {
-                return "短信";
-              }
-              if(text=='2') {
-                return "邮件";
-              }
-              if(text=='3') {
-                return "微信";
-              }
-              if(text=='4') {
-                return "系统";
-              }
-            }
-          },
-          {
-            title: '操作',
-            dataIndex: 'action',
-            align: "center",
-            scopedSlots: {customRender: 'action'},
-          }
-        ],
-        url: {
-          list: "/message/sysMessageTemplate/list",
-          delete: "/message/sysMessageTemplate/delete",
-          deleteBatch: "/message/sysMessageTemplate/deleteBatch",
-          exportXlsUrl: "message/sysMessageTemplate/exportXls",
-          importExcelUrl: "message/sysMessageTemplate/importExcel",
-        },
-      }
-    },
-    computed: {
-      importExcelUrl: function () {
-        return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
-      }
-    },
-    methods: {
-      handleTest(record){
-        this.$refs.testModal.open(record);
-        this.$refs.testModal.title = "发送测试";
-      }
-
-    }
-  }
-</script>
-<style lang="less" scoped>
-  /** Button按钮间距 */
-  .ant-btn {
-    margin-left: 3px
-  }
-
-  .ant-card-body .table-operator {
-    margin-bottom: 18px;
-  }
-
-  .ant-table-tbody .ant-table-row td {
-    padding-top: 15px;
-    padding-bottom: 15px;
-  }
-
-  .anty-row-operator button {
-    margin: 0 5px
-  }
-
-  .ant-btn-danger {
-    background-color: #ffffff
-  }
-
-  .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-content {
-    height: 90% !important;
-    overflow-y: hidden
-  }
-</style>
\ No newline at end of file
diff --git a/jshERP-web/src/views/modules/message/modules/SysMessageModal.vue b/jshERP-web/src/views/modules/message/modules/SysMessageModal.vue
deleted file mode 100644
index fcfb40ca..00000000
--- a/jshERP-web/src/views/modules/message/modules/SysMessageModal.vue
+++ /dev/null
@@ -1,185 +0,0 @@
-<template>
-  <a-drawer
-    :title="title"
-    :maskClosable="true"
-    width=650
-    placement="right"
-    :closable="true"
-    @close="close"
-    :visible="visible"
-    style="height: calc(100% - 55px);overflow: auto;padding-bottom: 53px;">
-
-    <a-spin :spinning="confirmLoading">
-      <a-form :form="form">
-
-        <a-form-item
-          :labelCol="labelCol"
-          :wrapperCol="wrapperCol"
-          label="消息标题">
-          <a-input placeholder="请输入消息标题" v-decorator="['esTitle', {}]"/>
-        </a-form-item>
-        <a-form-item
-          :labelCol="labelCol"
-          :wrapperCol="wrapperCol"
-          label="发送内容">
-          <a-input placeholder="请输入发送内容" v-decorator="['esContent', {}]"/>
-        </a-form-item>
-        <a-form-item
-          :labelCol="labelCol"
-          :wrapperCol="wrapperCol"
-          label="发送所需参数">
-          <a-input placeholder="请输入发送所需参数Json格式" v-decorator="['esParam', {}]"/>
-        </a-form-item>
-        <a-form-item
-          :labelCol="labelCol"
-          :wrapperCol="wrapperCol"
-          label="接收人">
-          <a-input placeholder="请输入接收人" v-decorator="['esReceiver', {}]"/>
-        </a-form-item>
-        <a-form-item
-          :labelCol="labelCol"
-          :wrapperCol="wrapperCol"
-          label="发送方式">
-          <j-dict-select-tag :triggerChange="true" dictCode="msgType" v-decorator="[ 'esType', {}]" placeholder="请选择发送方式">
-          </j-dict-select-tag>
-        </a-form-item>
-        <a-form-item
-          :labelCol="labelCol"
-          :wrapperCol="wrapperCol"
-          label="发送时间">
-          <a-date-picker showTime format='YYYY-MM-DD HH:mm:ss' v-decorator="[ 'esSendTime', {}]"/>
-        </a-form-item>
-        <a-form-item
-          :labelCol="labelCol"
-          :wrapperCol="wrapperCol"
-          label="发送状态">
-          <j-dict-select-tag :triggerChange="true" dictCode="msgSendStatus" v-decorator="[ 'esSendStatus', {}]" placeholder="请选择发送状态">
-          </j-dict-select-tag>
-        </a-form-item>
-        <a-form-item
-          :labelCol="labelCol"
-          :wrapperCol="wrapperCol"
-          label="发送次数">
-          <a-input-number v-decorator="[ 'esSendNum', {}]"/>
-        </a-form-item>
-        <a-form-item
-          :labelCol="labelCol"
-          :wrapperCol="wrapperCol"
-          label="发送失败原因">
-          <a-input v-decorator="['esResult', {}]"/>
-        </a-form-item>
-        <a-form-item
-          :labelCol="labelCol"
-          :wrapperCol="wrapperCol"
-          label="备注">
-          <a-input v-decorator="['remark', {}]"/>
-        </a-form-item>
-      </a-form>
-    </a-spin>
-    <div v-show="!disableSubmit">
-      <a-button style="margin-right: .8rem" @confirm="handleCancel">取消</a-button>
-      <a-button @click="handleOk" type="primary" :loading="confirmLoading">提交</a-button>
-    </div>
-  </a-drawer>
-</template>
-
-<script>
-  import {httpAction} from '@/api/manage'
-  import pick from 'lodash.pick'
-  import moment from "moment"
-
-  export default {
-    name: "SysMessageModal",
-    data() {
-      return {
-        title: "操作",
-        visible: false,
-        model: {},
-        labelCol: {
-          xs: {span: 24},
-          sm: {span: 5},
-        },
-        wrapperCol: {
-          xs: {span: 24},
-          sm: {span: 16},
-        },
-
-        confirmLoading: false,
-        form: this.$form.createForm(this),
-        validatorRules: {},
-        disableSubmit: true,
-        url: {
-          add: "/message/sysMessage/add",
-          edit: "/message/sysMessage/edit",
-        },
-      }
-    },
-    created() {
-    },
-    methods: {
-      add() {
-        this.edit({});
-      },
-      edit(record) {
-        this.form.resetFields();
-        this.model = Object.assign({}, record);
-        this.visible = true;
-        this.$nextTick(() => {
-          this.form.setFieldsValue(pick(this.model, 'esContent', 'esParam', 'esReceiver', 'esResult', 'esSendNum', 'esSendStatus', 'esTitle', 'esType', 'remark'))
-          //时间格式化
-          this.form.setFieldsValue({esSendTime: this.model.esSendTime ? moment(this.model.esSendTime) : null})
-        });
-
-      },
-      close() {
-        this.$emit('close');
-        this.visible = false;
-      },
-      handleOk() {
-        const that = this;
-        // 触发表单验证
-        this.form.validateFields((err, values) => {
-          if (!err) {
-            that.confirmLoading = true;
-            let httpurl = '';
-            let method = '';
-            if (!this.model.id) {
-              httpurl += this.url.add;
-              method = 'post';
-            } else {
-              httpurl += this.url.edit;
-              method = 'put';
-            }
-            let formData = Object.assign(this.model, values);
-            //时间格式化
-            formData.esSendTime = formData.esSendTime ? formData.esSendTime.format('YYYY-MM-DD HH:mm:ss') : null;
-
-            console.log(formData)
-            httpAction(httpurl, formData, method).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();
-            })
-
-
-          }
-        })
-      },
-      handleCancel() {
-        this.close()
-      },
-
-
-    }
-  }
-</script>
-
-<style scoped>
-
-</style>
\ No newline at end of file
diff --git a/jshERP-web/src/views/modules/message/modules/SysMessageTemplateModal.vue b/jshERP-web/src/views/modules/message/modules/SysMessageTemplateModal.vue
deleted file mode 100644
index cfc09535..00000000
--- a/jshERP-web/src/views/modules/message/modules/SysMessageTemplateModal.vue
+++ /dev/null
@@ -1,223 +0,0 @@
-<template>
-  <a-modal
-    :title="title"
-    :width="800"
-    :visible="visible"
-    :confirmLoading="confirmLoading"
-    @ok="handleOk"
-    @cancel="handleCancel"
-    cancelText="关闭">
-
-    <a-spin :spinning="confirmLoading">
-      <a-form :form="form">
-        <a-row :gutter="{ xs: 8, sm: 16, md: 24, lg: 32 }">
-          <a-col :span="12">
-            <a-form-item
-              :labelCol="labelCol"
-              :wrapperCol="wrapperCol"
-              label="模板CODE"
-              style="margin-right: -35px"
-            >
-              <a-input
-                :disabled="disable"
-                placeholder="请输入模板编码"
-                v-decorator="['templateCode', validatorRules.templateCode ]"
-              />
-            </a-form-item>
-          </a-col>
-          <a-col :span="12">
-            <a-form-item
-              :labelCol="labelCol"
-              :wrapperCol="wrapperCol"
-              label="模板类型">
-              <j-dict-select-tag  @change="handleChangeTemplateType" :triggerChange="true" dictCode="msgType" v-decorator="['templateType', validatorRules.templateType ]" placeholder="请选择模板类型">
-              </j-dict-select-tag>
-            </a-form-item>
-          </a-col>
-        </a-row>
-        <a-row class="form-row" :gutter="24" >
-          <a-col :span="24" pull="2">
-            <a-form-item
-              :labelCol="labelCol"
-              :wrapperCol="wrapperCol"
-              label="模板标题"
-              style="margin-left: -15px">
-              <a-input
-                placeholder="请输入模板标题"
-                v-decorator="['templateName', validatorRules.templateName]"
-                style="width: 122%"
-              />
-            </a-form-item>
-          </a-col>
-        </a-row>
-        <a-row class="form-row" :gutter="24">
-          <a-col :span="24" pull="4">
-            <a-form-item
-              v-show="!useEditor"
-              :labelCol="labelCol"
-              :wrapperCol="wrapperCol"
-              label="模板内容"
-              style="margin-left: 4px;width: 126%">
-              <a-textarea placeholder="请输入模板内容" v-decorator="['templateContent', validatorRules.templateContent ]" :autosize="{ minRows: 8, maxRows: 8 }"/>
-            </a-form-item>
-          </a-col>
-        </a-row>
-        <a-row class="form-row" :gutter="24">
-          <a-col :span="24" pull="4">
-            <a-form-item
-              v-show="useEditor"
-              :labelCol="labelCol"
-              :wrapperCol="wrapperCol"
-              label="模板内容"
-              style="margin-left: 4px;width: 126%">
-              <j-editor  v-model="templateEditorContent"></j-editor>
-            </a-form-item>
-          </a-col>
-        </a-row>
-
-      </a-form>
-    </a-spin>
-  </a-modal>
-</template>
-
-<script>
-  import {httpAction} from '@/api/manage'
-  import pick from 'lodash.pick'
-  import { duplicateCheck } from '@/api/api'
-  import JEditor from '@/components/jeecg/JEditor'
-
-  export default {
-    name: "SysMessageTemplateModal",
-    components:{
-      JEditor
-    },
-    data() {
-      return {
-        title: "操作",
-        visible: false,
-        disable: true,
-        model: {},
-        labelCol: {
-          xs: {span: 24},
-          sm: {span: 5},
-        },
-        wrapperCol: {
-          xs: {span: 24},
-          sm: {span: 16},
-        },
-        confirmLoading: false,
-        form: this.$form.createForm(this),
-        validatorRules: {
-        templateCode: {rules: [{required: true, message: '请输入模板CODE!' },{validator: this.validateTemplateCode}]},
-        templateName: {rules: [{required: true, message: '请输入模板标题!'}]},
-        templateContent: {rules: []},
-        templateType: {rules: [{required: true, message: '请输入模板类型!'}]},
-        },
-        url: {
-          add: "/message/sysMessageTemplate/add",
-          edit: "/message/sysMessageTemplate/edit",
-        },
-        useEditor:false,
-        templateEditorContent:""
-      }
-    },
-    created() {
-    },
-    methods: {
-      add() {
-        this.disable = false;
-        this.edit({});
-      },
-      edit(record) {
-        this.form.resetFields();
-        this.model = Object.assign({}, record);
-        this.useEditor = (record.templateType==2 || record.templateType==4)
-        if(this.useEditor){
-          this.templateEditorContent=record.templateContent
-        }else{
-          this.templateEditorContent=''
-        }
-        this.visible = true;
-        this.$nextTick(() => {
-          if(this.useEditor){
-            this.form.setFieldsValue(pick(this.model, 'templateCode', 'templateName', 'templateTestJson', 'templateType'))
-          }else{
-            this.form.setFieldsValue(pick(this.model, 'templateCode', 'templateContent', 'templateName', 'templateTestJson', 'templateType'))
-          }
-        });
-      },
-      close() {
-        this.$emit('close');
-        this.visible = false;
-        this.disable = true;
-      },
-      handleOk() {
-        this.model.templateType = this.templateType;
-        const that = this;
-        // 触发表单验证
-        this.form.validateFields((err, values) => {
-          if (!err) {
-            that.confirmLoading = true;
-            let httpurl = '';
-            let method = '';
-            if (!this.model.id) {
-              httpurl += this.url.add;
-              method = 'post';
-            } else {
-              httpurl += this.url.edit;
-              method = 'put';
-            }
-            let formData = Object.assign(this.model, values);
-            //时间格式化
-
-            if(this.useEditor){
-              formData.templateContent=this.templateEditorContent
-            }
-            console.log(formData)
-            httpAction(httpurl, formData, method).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();
-            })
-
-
-          }
-        })
-      },
-      validateTemplateCode(rule, value, callback){
-        var params = {
-          tableName: "sys_sms_template",
-          fieldName: "template_code",
-          fieldVal: value,
-          dataId: this.model.id
-        }
-        duplicateCheck(params).then((res)=>{
-          if(res.success){
-            callback();
-          }else{
-            callback(res.message);
-          }
-        })
-
-      },
-      handleCancel() {
-        this.close()
-      },
-      handleChangeTemplateType(value){
-        //如果是邮件类型那么则改变模板内容是富文本编辑器
-        this.useEditor = (value==2 || value==4)
-      }
-
-    }
-  }
-</script>
-
-<style scoped>
-
-</style>
\ No newline at end of file
diff --git a/jshERP-web/src/views/modules/message/modules/SysMessageTestModal.vue b/jshERP-web/src/views/modules/message/modules/SysMessageTestModal.vue
deleted file mode 100644
index 77cc36fd..00000000
--- a/jshERP-web/src/views/modules/message/modules/SysMessageTestModal.vue
+++ /dev/null
@@ -1,122 +0,0 @@
-<template>
-  <a-modal
-    :title="title"
-    :width="800"
-    :visible="visible"
-    :confirmLoading="confirmLoading"
-    @ok="handleOk"
-    @cancel="handleCancel"
-    cancelText="关闭">
-
-    <a-spin :spinning="confirmLoading">
-      <a-form>
-        <a-form-item
-          :labelCol="labelCol"
-          :wrapperCol="wrapperCol"
-          label="模板标题">
-          <a-input disabled v-model="templateName"/>
-        </a-form-item>
-        <a-form-item
-          :labelCol="labelCol"
-          :wrapperCol="wrapperCol"
-          label="模板内容">
-          <a-textarea disabled v-model="templateContent" :autosize="{ minRows: 5, maxRows: 8 }"/>
-        </a-form-item>
-        <a-form-item
-          :labelCol="labelCol"
-          :wrapperCol="wrapperCol"
-          label="测试数据">
-          <a-textarea placeholder="请输入json格式测试数据" v-model="testData" :autosize="{ minRows: 5, maxRows: 8 }"/>
-        </a-form-item>
-        <a-form-item
-          :labelCol="labelCol"
-          :wrapperCol="wrapperCol"
-          label="消息类型">
-          <j-dict-select-tag
-            v-model="msgType"
-            placeholder="请选择消息类型"
-            dictCode="msgType"/>
-        </a-form-item>
-        <a-form-item
-          :labelCol="labelCol"
-          :wrapperCol="wrapperCol"
-          label="消息接收方">
-          <a-input placeholder="请输入消息接收方" v-model="receiver"/>
-        </a-form-item>
-      </a-form>
-    </a-spin>
-  </a-modal>
-</template>
-
-<script>
-  import {httpAction} from '@/api/manage'
-
-  export default {
-    name: "SysMessageTestModal",
-    data() {
-      return {
-        title: "操作",
-        visible: false,
-        model: {},
-        labelCol: {
-          xs: {span: 24},
-          sm: {span: 5},
-        },
-        wrapperCol: {
-          xs: {span: 24},
-          sm: {span: 16},
-        },
-
-        confirmLoading: false,
-        url: {
-          send: "/message/sysMessageTemplate/sendMsg",
-        },
-        templateName: "",
-        templateContent: "",
-        receiver: "",
-        msgType: "",
-        testData: "",
-        sendParams: {}
-      }
-    },
-    methods: {
-      open(record) {
-        this.sendParams.templateCode = record.templateCode;
-        this.templateName = record.templateName;
-        this.templateContent = record.templateContent;
-        this.testData = record.templateTestJson;
-        this.visible = true;
-      },
-      close() {
-        this.receiver = "";
-        this.msgType = "";
-        this.sendParams = {};
-        this.visible = false;
-      },
-      handleOk() {
-        let httpurl = this.url.send;
-        let method = 'post';
-        this.sendParams.testData = this.testData;
-        this.sendParams.receiver = this.receiver;
-        this.sendParams.msgType = this.msgType;
-        httpAction(httpurl, this.sendParams, method).then((res) => {
-          if (res.success) {
-            this.$message.success(res.message);
-          } else {
-            this.$message.warning(res.message);
-          }
-        }).finally(() => {
-          this.confirmLoading = false;
-          this.close();
-        })
-      },
-      handleCancel() {
-        this.close()
-      },
-    }
-  }
-</script>
-
-<style scoped>
-
-</style>
\ No newline at end of file
diff --git a/jshERP-web/src/views/modules/monitor/DiskMonitoring.vue b/jshERP-web/src/views/modules/monitor/DiskMonitoring.vue
deleted file mode 100644
index 717d1b23..00000000
--- a/jshERP-web/src/views/modules/monitor/DiskMonitoring.vue
+++ /dev/null
@@ -1,49 +0,0 @@
-<template>
-  <a-card title="磁盘监控">
-    <a-row>
-      <template v-if="diskInfo && diskInfo.length>0">
-        <a-col :span="8" v-for="(item,index) in diskInfo" :key=" 'diskInfo'+index ">
-          <dash-chart-demo :title="item.name" :datasource="item.restPPT"></dash-chart-demo>
-        </a-col>
-      </template>
-    </a-row>
-  </a-card>
-</template>
-
-<script>
-  import { getAction } from '@/api/manage'
-  import DashChartDemo from '@/components/chart/DashChartDemo'
-  import ARow from 'ant-design-vue/es/grid/Row'
-
-  export default {
-    name: 'DiskMonitoring',
-    components:{
-      ARow,
-      DashChartDemo,
-    },
-    data() {
-      return {
-        description: '磁盘监控',
-        //数据集
-        diskInfo:[],
-        url:{
-          queryDiskInfo:'actuator/redis/queryDiskInfo',
-        }
-      }
-    },
-    created() {
-      getAction(this.url.queryDiskInfo).then((res)=>{
-        if(res.success){
-          for(var i=0;i<res.result.length;i++){
-            res.result[i].restPPT = res.result[i].restPPT/10;
-          }
-          this.diskInfo = res.result;
-        }
-      })
-    }
-  }
-</script>
-
-<style scoped>
-
-</style>
\ No newline at end of file
diff --git a/jshERP-web/src/views/modules/monitor/HttpTrace.vue b/jshERP-web/src/views/modules/monitor/HttpTrace.vue
deleted file mode 100644
index 4c978ba1..00000000
--- a/jshERP-web/src/views/modules/monitor/HttpTrace.vue
+++ /dev/null
@@ -1,148 +0,0 @@
-<template>
-  <a-skeleton active :loading="loading" :paragraph="{rows: 17}">
-    <a-card :bordered="false" class="card-area">
-
-      <a-alert type="info" :showIcon="true">
-        <div slot="message">
-          共追踪到 {{ dataSource.length }} 条近期HTTP请求记录
-          <a-divider type="vertical"/>
-          <a @click="handleClickUpdate">立即刷新</a>
-        </div>
-      </a-alert>
-
-      <!-- 表格区域 -->
-      <a-table
-        :columns="columns"
-        :dataSource="dataSource"
-        :pagination="pagination"
-        :loading="tableLoading"
-        :scroll="{ x: 900 }"
-        style="margin-top: 20px;"
-        @change="handleTableChange">
-
-        <template slot="timeTaken" slot-scope="text">
-          <a-tag v-if="text < 500" color="green">{{ text }} ms</a-tag>
-          <a-tag v-else-if="text < 1000" color="cyan">{{ text }} ms</a-tag>
-          <a-tag v-else-if="text < 1500" color="orange">{{ text }} ms</a-tag>
-          <a-tag v-else color="red">{{ text }} ms</a-tag>
-        </template>
-
-        <template slot="responseStatus" slot-scope="text">
-          <a-tag v-if="text < 200" color="pink">{{ text }} </a-tag>
-          <a-tag v-else-if="text < 201" color="green">{{ text }} </a-tag>
-          <a-tag v-else-if="text < 399" color="cyan">{{ text }} </a-tag>
-          <a-tag v-else-if="text < 403" color="orange">{{ text }} </a-tag>
-          <a-tag v-else-if="text < 501" color="red">{{ text }} </a-tag>
-          <span v-else>{{ text }}</span>
-        </template>
-
-        <template slot="requestMethod" slot-scope="text">
-          <a-tag v-if="text === 'GET'" color="#87d068">{{ text }}</a-tag>
-          <a-tag v-else-if="text === 'POST'" color="#2db7f5">{{ text }}</a-tag>
-          <a-tag v-else-if="text === 'PUT'" color="#ffba5a">{{ text }}</a-tag>
-          <a-tag v-else-if="text === 'DELETE'" color="#f50">{{ text }}</a-tag>
-          <span v-else>{{ text }} ms</span>
-        </template>
-
-      </a-table>
-
-    </a-card>
-  </a-skeleton>
-</template>
-
-<script>
-  import moment from 'moment'
-  import { getAction } from '@/api/manage'
-
-  moment.locale('zh-cn')
-
-  export default {
-    data() {
-      return {
-        advanced: false,
-        dataSource: [],
-        pagination: {
-          defaultPageSize: 10,
-          defaultCurrent: 1,
-          pageSizeOptions: ['10', '20', '30', '40', '100'],
-          showQuickJumper: true,
-          showSizeChanger: true,
-          showTotal: (total, range) => `显示 ${range[0]} ~ ${range[1]} 条记录，共 ${total} 条记录`
-        },
-        loading: true,
-        tableLoading: true
-      }
-    },
-    computed: {
-      columns() {
-        return [{
-          title: '请求时间',
-          dataIndex: 'timestamp',
-          customRender(text) {
-            return moment(text).format('YYYY-MM-DD HH:mm:ss')
-          }
-        }, {
-          title: '请求方法',
-          dataIndex: 'request.method',
-          scopedSlots: { customRender: 'requestMethod' },
-          filters: [
-            { text: 'GET', value: 'GET' },
-            { text: 'POST', value: 'POST' },
-            { text: 'PUT', value: 'PUT' },
-            { text: 'DELETE', value: 'DELETE' }
-          ],
-          filterMultiple: true,
-          onFilter: (value, record) => record.request.method.includes(value)
-        }, {
-          title: '请求URL',
-          dataIndex: 'request.uri',
-          customRender(text) {
-            return text.split('?')[0]
-          }
-        }, {
-          title: '响应状态',
-          dataIndex: 'response.status',
-          scopedSlots: { customRender: 'responseStatus' }
-        }, {
-          title: '请求耗时',
-          dataIndex: 'timeTaken',
-          scopedSlots: { customRender: 'timeTaken' }
-        }]
-      }
-    },
-    mounted() {
-      this.fetch()
-    },
-    methods: {
-
-      handleClickUpdate() {
-        this.fetch()
-      },
-
-      handleTableChange() {
-        this.fetch()
-      },
-
-      fetch() {
-        this.tableLoading = true
-        getAction('actuator/httptrace').then((data) => {
-          let filterData = []
-          for (let d of data.traces) {
-            if (d.request.method !== 'OPTIONS' && d.request.uri.indexOf('httptrace') === -1) {
-              filterData.push(d)
-            }
-          }
-          this.dataSource = filterData
-        }).catch((e) => {
-          console.error(e)
-          this.$message.error('获取HTTP信息失败')
-        }).finally(() => {
-          this.loading = false
-          this.tableLoading = false
-        })
-      }
-
-    }
-  }
-</script>
-<style></style>
diff --git a/jshERP-web/src/views/modules/monitor/JvmInfo.vue b/jshERP-web/src/views/modules/monitor/JvmInfo.vue
deleted file mode 100644
index 66e15cfd..00000000
--- a/jshERP-web/src/views/modules/monitor/JvmInfo.vue
+++ /dev/null
@@ -1,169 +0,0 @@
-<template>
-  <a-skeleton active :loading="loading" :paragraph="{rows: 17}">
-    <a-card :bordered="false">
-
-      <a-alert type="info" :showIcon="true">
-        <div slot="message">
-          上次更新时间：{{ this.time }}
-          <a-divider type="vertical"/>
-          <a @click="handleClickUpdate">立即更新</a>
-        </div>
-      </a-alert>
-
-      <a-table
-        rowKey="id"
-        size="middle"
-        :columns="columns"
-        :dataSource="dataSource"
-        :pagination="false"
-        :loading="tableLoading"
-        style="margin-top: 20px;">
-
-        <template slot="param" slot-scope="text, record">
-          <a-tag :color="textInfo[record.param].color">{{ text }}</a-tag>
-        </template>
-
-        <template slot="text" slot-scope="text, record">
-          {{ textInfo[record.param].text }}
-        </template>
-
-        <template slot="value" slot-scope="text, record">
-          {{ text }} {{ textInfo[record.param].unit }}
-        </template>
-
-      </a-table>
-    </a-card>
-  </a-skeleton>
-</template>
-<script>
-  import moment from 'moment'
-  import { getAction } from '@/api/manage'
-
-  moment.locale('zh-cn')
-
-  export default {
-    data() {
-      return {
-        time: '',
-        loading: true,
-        tableLoading: true,
-        columns: [{
-          title: '参数',
-          width: '30%',
-          dataIndex: 'param',
-          scopedSlots: { customRender: 'param' }
-        }, {
-          title: '描述',
-          width: '40%',
-          dataIndex: 'text',
-          scopedSlots: { customRender: 'text' }
-        }, {
-          title: '当前值',
-          width: '30%',
-          dataIndex: 'value',
-          scopedSlots: { customRender: 'value' }
-        }],
-        dataSource: [],
-        // 列表通过 textInfo 渲染出颜色、描述和单位
-        textInfo: {
-          'jvm.memory.max': { color: 'purple', text: 'JVM 最大内存', unit: 'MB' },
-          'jvm.memory.committed': { color: 'purple', text: 'JVM 可用内存', unit: 'MB' },
-          'jvm.memory.used': { color: 'purple', text: 'JVM 已用内存', unit: 'MB' },
-          'jvm.buffer.memory.used': { color: 'cyan', text: 'JVM 缓冲区已用内存', unit: 'MB' },
-          'jvm.buffer.count': { color: 'cyan', text: '当前缓冲区数量', unit: '个' },
-          'jvm.threads.daemon': { color: 'green', text: 'JVM 守护线程数量', unit: '个' },
-          'jvm.threads.live': { color: 'green', text: 'JVM 当前活跃线程数量', unit: '个' },
-          'jvm.threads.peak': { color: 'green', text: 'JVM 峰值线程数量', unit: '个' },
-          'jvm.classes.loaded': { color: 'orange', text: 'JVM 已加载 Class 数量', unit: '个' },
-          'jvm.classes.unloaded': { color: 'orange', text: 'JVM 未加载 Class 数量', unit: '个' },
-          'jvm.gc.memory.allocated': { color: 'pink', text: 'GC 时, 年轻代分配的内存空间', unit: 'MB' },
-          'jvm.gc.memory.promoted': { color: 'pink', text: 'GC 时, 老年代分配的内存空间', unit: 'MB' },
-          'jvm.gc.max.data.size': { color: 'pink', text: 'GC 时, 老年代的最大内存空间', unit: 'MB' },
-          'jvm.gc.live.data.size': { color: 'pink', text: 'FullGC 时, 老年代的内存空间', unit: 'MB' },
-          'jvm.gc.pause.count': { color: 'blue', text: '系统启动以来GC 次数', unit: '次' },
-          'jvm.gc.pause.totalTime': { color: 'blue', text: '系统启动以来GC 总耗时', unit: '秒' }
-        },
-        // 当一条记录中需要取出多条数据的时候需要配置该字段
-        moreInfo: {
-          'jvm.gc.pause': ['.count', '.totalTime']
-        }
-      }
-    },
-    mounted() {
-      this.loadTomcatInfo()
-    },
-    methods: {
-
-      handleClickUpdate() {
-        this.loadTomcatInfo()
-      },
-
-      loadTomcatInfo() {
-        this.tableLoading = true
-        this.time = moment().format('YYYY年MM月DD日 HH时mm分ss秒')
-        Promise.all([
-          getAction('actuator/metrics/jvm.memory.max'),
-          getAction('actuator/metrics/jvm.memory.committed'),
-          getAction('actuator/metrics/jvm.memory.used'),
-          getAction('actuator/metrics/jvm.buffer.memory.used'),
-          getAction('actuator/metrics/jvm.buffer.count'),
-          getAction('actuator/metrics/jvm.threads.daemon'),
-          getAction('actuator/metrics/jvm.threads.live'),
-          getAction('actuator/metrics/jvm.threads.peak'),
-          getAction('actuator/metrics/jvm.classes.loaded'),
-          getAction('actuator/metrics/jvm.classes.unloaded'),
-          getAction('actuator/metrics/jvm.gc.memory.allocated'),
-          getAction('actuator/metrics/jvm.gc.memory.promoted'),
-          getAction('actuator/metrics/jvm.gc.max.data.size'),
-          getAction('actuator/metrics/jvm.gc.live.data.size'),
-          getAction('actuator/metrics/jvm.gc.pause')
-        ]).then((res) => {
-
-          let info = []
-          res.forEach((value, id) => {
-            let more = this.moreInfo[value.name]
-            if (!(more instanceof Array)) {
-              more = ['']
-            }
-            more.forEach((item, idx) => {
-              let param = value.name + item
-              let val = value.measurements[idx].value
-
-              if (param === 'jvm.memory.max'
-                || param === 'jvm.memory.committed'
-                || param === 'jvm.memory.used'
-                || param === 'jvm.buffer.memory.used'
-                || param === 'jvm.gc.memory.allocated'
-                || param === 'jvm.gc.memory.promoted'
-                || param === 'jvm.gc.max.data.size'
-                || param === 'jvm.gc.live.data.size'
-              ) {
-                val = this.convert(val, Number)
-              }
-              info.push({ id: param + id, param, text: 'false value', value: val })
-            })
-          })
-          this.dataSource = info
-
-
-        }).catch((e) => {
-          console.error(e)
-          this.$message.error('获取JVM信息失败')
-        }).finally(() => {
-          this.loading = false
-          this.tableLoading = false
-        })
-      },
-
-      convert(value, type) {
-        if (type === Number) {
-          return Number(value / 1048576).toFixed(3)
-        } else if (type === Date) {
-          return moment(value * 1000).format('YYYY-MM-DD HH:mm:ss')
-        }
-        return value
-      }
-    }
-  }
-</script>
-<style></style>
diff --git a/jshERP-web/src/views/modules/monitor/RedisInfo.vue b/jshERP-web/src/views/modules/monitor/RedisInfo.vue
deleted file mode 100644
index 9eab35a8..00000000
--- a/jshERP-web/src/views/modules/monitor/RedisInfo.vue
+++ /dev/null
@@ -1,189 +0,0 @@
-<template>
-  <a-skeleton active :loading="loading" :paragraph="{rows: 17}">
-    <a-card>
-      <!-- Radis 信息实时监控 -->
-      <a-row :gutter="8">
-        <a-col :sm="24" :xl="12">
-          <area-chart-ty v-bind="memory"/>
-        </a-col>
-        <a-col :sm="24" :xl="12">
-          <area-chart-ty v-bind="key"/>
-        </a-col>
-      </a-row>
-
-      <h3>Redis 详细信息</h3>
-      <a-table
-        :loading="tableLoading"
-        :columns="columns"
-        :dataSource="redisInfo"
-        :pagination="false"/>
-
-    </a-card>
-  </a-skeleton>
-</template>
-<script>
-  import moment from 'moment'
-  import { getAction } from '@/api/manage'
-  import AreaChartTy from '@/components/chart/AreaChartTy'
-
-  export default {
-    name: 'RedisInfo',
-    components: {
-      AreaChartTy
-    },
-    data() {
-      return {
-        loading: true,
-        tableLoading: true,
-        // 定时器ID
-        timer: null,
-        // 定时器周期
-        millisec: 3000,
-        // Key 实时数量
-        key: {
-          title: 'Radis Key 实时数量（个）',
-          dataSource: [],
-          y: '数量（个）',
-          height: 340,
-          min: 0,
-          max: 100,
-          color: '#FF6987',
-          lineSize: 8,
-          lineColor: '#DC143C'
-        },
-        // 内存实时占用情况
-        memory: {
-          title: 'Radis 内存实时占用情况（KB）',
-          dataSource: [],
-          y: '内存（KB）',
-          min: 0,
-          max: 3000,
-          height: 340,
-          lineSize: 8
-        },
-        redisInfo: [],
-        columns: [{
-          title: 'Key',
-          align: 'center',
-          dataIndex: 'key'
-        }, {
-          title: 'Description',
-          align: 'left',
-          dataIndex: 'description'
-        }, {
-          title: 'Value',
-          align: 'center',
-          dataIndex: 'value'
-        }],
-        url: {
-          keysSize: '/actuator/redis/keysSize',
-          memoryInfo: '/actuator/redis/memoryInfo',
-          info: '/actuator/redis/info'
-        },
-        path: '/monitor/redis/info'
-      }
-    },
-    mounted() {
-      this.openTimer()
-      this.loadRedisInfo()
-      setTimeout(() => {
-        this.loadData()
-      }, 1000)
-    },
-    beforeDestroy() {
-      this.closeTimer()
-    },
-    methods: {
-
-      /** 开启定时器 */
-      openTimer() {
-        this.loadData()
-        this.closeTimer()
-        this.timer = setInterval(() => {
-          if (this.$route.path === this.path) {
-            this.loadData()
-          }
-        }, this.millisec)
-      },
-
-      /** 关闭定时器 */
-      closeTimer() {
-        if (this.timer) clearInterval(this.timer)
-      },
-
-      /** 查询数据 */
-      loadData() {
-        Promise.all([
-          getAction(this.url.keysSize),
-          getAction(this.url.memoryInfo)
-        ]).then((res) => {
-          let time = moment().format('hh:mm:ss')
-
-          let [{ dbSize: currentSize }, memoryInfo] = res
-          let currentMemory = memoryInfo.used_memory / 1000
-
-          // push 数据
-          this.key.dataSource.push({ x: time, y: currentSize })
-          this.memory.dataSource.push({ x: time, y: currentMemory })
-          // 最大长度为6
-          if (this.key.dataSource.length > 6) {
-            this.key.dataSource.splice(0, 1)
-            this.memory.dataSource.splice(0, 1)
-          }
-
-          // 计算 Key 最大最小值
-          let keyPole = this.getMaxAndMin(this.key.dataSource, 'y')
-          this.key.max = Math.floor(keyPole[0]) + 10
-          this.key.min = Math.floor(keyPole[1]) - 10
-          if (this.key.min < 0) this.key.min = 0
-
-          // 计算 Memory 最大最小值
-          let memoryPole = this.getMaxAndMin(this.memory.dataSource, 'y')
-          this.memory.max = Math.floor(memoryPole[0]) + 100
-          this.memory.min = Math.floor(memoryPole[1]) - 100
-          if (this.memory.min < 0) this.memory.min = 0
-
-        }).catch((e) => {
-          console.error(e)
-          this.closeTimer()
-          this.$message.error('获取 Redis 信息失败')
-        }).finally(() => {
-          this.loading = false
-        })
-
-      },
-
-      // 获取一组数据中最大和最小的值
-      getMaxAndMin(dataSource, field) {
-        let maxValue = null, minValue = null
-        dataSource.forEach(item => {
-          let value = Number.parseInt(item[field])
-          // max
-          if (maxValue == null) {
-            maxValue = value
-          } else if (value > maxValue) {
-            maxValue = value
-          }
-          // min
-          if (minValue == null) {
-            minValue = value
-          } else if (value < minValue) {
-            minValue = value
-          }
-        })
-        return [maxValue, minValue]
-      },
-
-      loadRedisInfo() {
-        this.tableLoading = true
-        getAction(this.url.info).then((res) => {
-          this.redisInfo = res.result
-        }).finally(() => {
-          this.tableLoading = false
-        })
-      }
-
-    }
-  }
-</script>
-<style></style>
diff --git a/jshERP-web/src/views/modules/monitor/RedisTerminal.vue b/jshERP-web/src/views/modules/monitor/RedisTerminal.vue
deleted file mode 100644
index e671afa1..00000000
--- a/jshERP-web/src/views/modules/monitor/RedisTerminal.vue
+++ /dev/null
@@ -1,13 +0,0 @@
-<template>
-  <div>
-    <div>Redis终端</div>
-  </div>
-</template>
-<script>
-export default {
-  name: 'RedisTerminal'
-}
-</script>
-<style>
-
-</style>
diff --git a/jshERP-web/src/views/modules/monitor/SystemInfo.vue b/jshERP-web/src/views/modules/monitor/SystemInfo.vue
deleted file mode 100644
index 2d15f111..00000000
--- a/jshERP-web/src/views/modules/monitor/SystemInfo.vue
+++ /dev/null
@@ -1,137 +0,0 @@
-<template>
-  <a-skeleton active :loading="loading" :paragraph="{rows: 17}">
-    <a-card :bordered="false">
-
-      <a-alert type="info" :showIcon="true">
-        <div slot="message">
-          上次更新时间：{{ this.time }}
-          <a-divider type="vertical"/>
-          <a @click="handleClickUpdate">立即更新</a>
-        </div>
-      </a-alert>
-
-      <a-table
-        rowKey="id"
-        size="middle"
-        :columns="columns"
-        :dataSource="dataSource"
-        :pagination="false"
-        :loading="tableLoading"
-        style="margin-top: 20px;">
-
-        <template slot="param" slot-scope="text, record">
-          <a-tag :color="textInfo[record.param].color">{{ text }}</a-tag>
-        </template>
-
-        <template slot="text" slot-scope="text, record">
-          {{ textInfo[record.param].text }}
-        </template>
-
-        <template slot="value" slot-scope="text, record">
-          {{ text }} {{ textInfo[record.param].unit }}
-        </template>
-
-      </a-table>
-    </a-card>
-  </a-skeleton>
-</template>
-<script>
-  import moment from 'moment'
-  import { getAction } from '@/api/manage'
-
-  moment.locale('zh-cn')
-
-  export default {
-    data() {
-      return {
-        time: '',
-        loading: true,
-        tableLoading: true,
-        columns: [{
-          title: '参数',
-          width: '30%',
-          dataIndex: 'param',
-          scopedSlots: { customRender: 'param' }
-        }, {
-          title: '描述',
-          width: '40%',
-          dataIndex: 'text',
-          scopedSlots: { customRender: 'text' }
-        }, {
-          title: '当前值',
-          width: '30%',
-          dataIndex: 'value',
-          scopedSlots: { customRender: 'value' }
-        }],
-        dataSource: [],
-        // 列表通过 textInfo 渲染出颜色、描述和单位
-        textInfo: {
-          'system.cpu.count': { color: 'green', text: 'CPU 数量', unit: '核' },
-          'system.cpu.usage': { color: 'green', text: '系统 CPU 使用率', unit: '%' },
-          'process.start.time': { color: 'purple', text: '应用启动时间点', unit: '' },
-          'process.uptime': { color: 'purple', text: '应用已运行时间', unit: '秒' },
-          'process.cpu.usage': { color: 'purple', text: '当前应用 CPU 使用率', unit: '%' }
-        },
-        // 当一条记录中需要取出多条数据的时候需要配置该字段
-        moreInfo: {}
-      }
-    },
-    mounted() {
-      this.loadTomcatInfo()
-    },
-    methods: {
-
-      handleClickUpdate() {
-        this.loadTomcatInfo()
-      },
-
-      loadTomcatInfo() {
-        this.tableLoading = true
-        this.time = moment().format('YYYY年MM月DD日 HH时mm分ss秒')
-        Promise.all([
-          getAction('actuator/metrics/system.cpu.count'),
-          getAction('actuator/metrics/system.cpu.usage'),
-          getAction('actuator/metrics/process.start.time'),
-          getAction('actuator/metrics/process.uptime'),
-          getAction('actuator/metrics/process.cpu.usage')
-        ]).then((res) => {
-          let info = []
-          res.forEach((value, id) => {
-            let more = this.moreInfo[value.name]
-            if (!(more instanceof Array)) {
-              more = ['']
-            }
-            more.forEach((item, idx) => {
-              let param = value.name + item
-              let val = value.measurements[idx].value
-              if (param === 'system.cpu.usage' || param === 'process.cpu.usage') {
-                val = this.convert(val, Number)
-              }
-              if (param === 'process.start.time') {
-                val = this.convert(val, Date)
-              }
-              info.push({ id: param + id, param, text: 'false value', value: val })
-            })
-          })
-          this.dataSource = info
-        }).catch((e) => {
-          console.error(e)
-          this.$message.error('获取服务器信息失败')
-        }).finally(() => {
-          this.loading = false
-          this.tableLoading = false
-        })
-      },
-
-      convert(value, type) {
-        if (type === Number) {
-          return Number(value * 100).toFixed(2)
-        } else if (type === Date) {
-          return moment(value * 1000).format('YYYY-MM-DD HH:mm:ss')
-        }
-        return value
-      }
-    }
-  }
-</script>
-<style></style>
diff --git a/jshERP-web/src/views/modules/monitor/TomcatInfo.vue b/jshERP-web/src/views/modules/monitor/TomcatInfo.vue
deleted file mode 100644
index 5885be94..00000000
--- a/jshERP-web/src/views/modules/monitor/TomcatInfo.vue
+++ /dev/null
@@ -1,149 +0,0 @@
-<template>
-  <a-skeleton active :loading="loading" :paragraph="{rows: 17}">
-    <a-card :bordered="false">
-
-      <a-alert type="info" :showIcon="true">
-        <div slot="message">
-          上次更新时间：{{ this.time }}
-          <a-divider type="vertical"/>
-          <a @click="handleClickUpdate">立即更新</a>
-        </div>
-      </a-alert>
-
-      <a-table
-        rowKey="id"
-        size="middle"
-        :columns="columns"
-        :dataSource="dataSource"
-        :pagination="false"
-        :loading="tableLoading"
-        style="margin-top: 20px;">
-
-        <template slot="param" slot-scope="text, record">
-          <a-tag :color="textInfo[record.param].color">{{ text }}</a-tag>
-        </template>
-
-        <template slot="text" slot-scope="text, record">
-          {{ textInfo[record.param].text }}
-        </template>
-
-        <template slot="value" slot-scope="text, record">
-          {{ text }} {{ textInfo[record.param].unit }}
-        </template>
-
-      </a-table>
-
-    </a-card>
-  </a-skeleton>
-</template>
-<script>
-  import moment from 'moment'
-  import { getAction } from '@/api/manage'
-
-  moment.locale('zh-cn')
-
-  export default {
-    data() {
-      return {
-        time: '',
-        loading: true,
-        tableLoading: true,
-        columns: [{
-          title: '参数',
-          width: '30%',
-          dataIndex: 'param',
-          scopedSlots: { customRender: 'param' }
-        }, {
-          title: '描述',
-          width: '40%',
-          dataIndex: 'text',
-          scopedSlots: { customRender: 'text' }
-        }, {
-          title: '当前值',
-          width: '30%',
-          dataIndex: 'value',
-          scopedSlots: { customRender: 'value' }
-        }],
-        dataSource: [],
-        // 列表通过 textInfo 渲染出颜色、描述和单位
-        textInfo: {
-          'tomcat.sessions.created': { color: 'green', text: 'tomcat 已创建 session 数', unit: '个' },
-          'tomcat.sessions.expired': { color: 'green', text: 'tomcat 已过期 session 数', unit: '个' },
-          'tomcat.sessions.active.current': { color: 'green', text: 'tomcat 当前活跃 session 数', unit: '个' },
-          'tomcat.sessions.active.max': { color: 'green', text: 'tomcat 活跃 session 数峰值', unit: '个' },
-          'tomcat.sessions.rejected': { color: 'green', text: '超过session 最大配置后，拒绝的 session 个数', unit: '个' },
-
-          'tomcat.global.sent': { color: 'purple', text: '发送的字节数', unit: 'bytes' },
-          'tomcat.global.request.max': { color: 'purple', text: 'request 请求最长耗时', unit: '秒' },
-          'tomcat.global.request.count': { color: 'purple', text: '全局 request 请求次数', unit: '次' },
-          'tomcat.global.request.totalTime': { color: 'purple', text: '全局 request 请求总耗时', unit: '秒' },
-
-          'tomcat.servlet.request.max': { color: 'cyan', text: 'servlet 请求最长耗时', unit: '秒' },
-          'tomcat.servlet.request.count': { color: 'cyan', text: 'servlet 总请求次数', unit: '次' },
-          'tomcat.servlet.request.totalTime': { color: 'cyan', text: 'servlet 请求总耗时', unit: '秒' },
-
-          'tomcat.threads.current': { color: 'pink', text: 'tomcat 当前线程数（包括守护线程）', unit: '个' },
-          'tomcat.threads.config.max': { color: 'pink', text: 'tomcat 配置的线程最大数', unit: '个' }
-        },
-        // 当一条记录中需要取出多条数据的时候需要配置该字段
-        moreInfo: {
-          'tomcat.global.request': ['.count', '.totalTime'],
-          'tomcat.servlet.request': ['.count', '.totalTime']
-        }
-      }
-    },
-    mounted() {
-      this.loadTomcatInfo()
-    },
-    methods: {
-
-      handleClickUpdate() {
-        this.loadTomcatInfo()
-      },
-
-      loadTomcatInfo() {
-        this.tableLoading = true
-        this.time = moment().format('YYYY年MM月DD日 HH时mm分ss秒')
-        Promise.all([
-          getAction('actuator/metrics/tomcat.sessions.created'),
-          getAction('actuator/metrics/tomcat.sessions.expired'),
-          getAction('actuator/metrics/tomcat.sessions.active.current'),
-          getAction('actuator/metrics/tomcat.sessions.active.max'),
-          getAction('actuator/metrics/tomcat.sessions.rejected'),
-          getAction('actuator/metrics/tomcat.global.sent'),
-          getAction('actuator/metrics/tomcat.global.request.max'),
-          getAction('actuator/metrics/tomcat.global.request'),
-          // 2.1.3.RELEASE 无此API
-          //getAction('actuator/metrics/tomcat.servlet.request'),
-          // getAction('actuator/metrics/tomcat.servlet.request.max'),
-          getAction('actuator/metrics/tomcat.threads.current'),
-          getAction('actuator/metrics/tomcat.threads.config.max')
-        ]).then((res) => {
-          let tomcatInfo = []
-          res.forEach((value, id) => {
-            let more = this.moreInfo[value.name]
-            if (!(more instanceof Array)) {
-              more = ['']
-            }
-            more.forEach((item, idx) => {
-              let param = value.name + item
-              tomcatInfo.push({
-                id: param + id, param,
-                text: 'false value',
-                value: value.measurements[idx].value
-              })
-            })
-          })
-          this.dataSource = tomcatInfo
-        }).catch((e) => {
-          console.error(e)
-          this.$message.error('获取Tomcat信息失败')
-        }).finally(() => {
-          this.loading = false
-          this.tableLoading = false
-        })
-      }
-    }
-  }
-</script>
-<style></style>
diff --git a/jshERP-web/src/views/modules/online/cgform/OnlCgformCopyList.vue b/jshERP-web/src/views/modules/online/cgform/OnlCgformCopyList.vue
deleted file mode 100644
index 44d776a4..00000000
--- a/jshERP-web/src/views/modules/online/cgform/OnlCgformCopyList.vue
+++ /dev/null
@@ -1,391 +0,0 @@
-<template>
-  <a-card :bordered="false">
-
-    <!-- 查询区域 -->
-    <div class="table-page-search-wrapper">
-      <a-form layout="inline">
-        <a-row :gutter="24">
-
-          <a-col :xl="6" :lg="7" :md="8" :sm="24">
-            <a-form-item label="表名">
-              <a-input placeholder="请输入表名" v-model="queryParam.tableName"></a-input>
-            </a-form-item>
-          </a-col>
-
-          <a-col :xl="6" :lg="7" :md="8" :sm="24">
-            <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
-              <a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
-              <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
-            </span>
-          </a-col>
-
-        </a-row>
-      </a-form>
-    </div>
-
-    <!-- 操作按钮区域 -->
-    <div class="table-operator">
-      <a-button @click="doCgformButton" type="primary" icon="highlight">自定义按钮</a-button>
-      <a-button @click="doEnhanceJs" type="primary" icon="strikethrough">JS增强</a-button>
-      <a-button @click="doEnhanceSql" type="primary" icon="filter">SQL增强</a-button>
-      <a-button @click="doEnhanceJava" type="primary" icon="tool">Java增强</a-button>
-
-      <a-dropdown v-if="selectedRowKeys.length > 0">
-        <a-menu slot="overlay">
-          <a-menu-item key="1" @click="batchDel">
-            <a-icon type="delete"/>
-            删除
-          </a-menu-item>
-        </a-menu>
-        <a-button> 批量操作
-          <a-icon type="down"/>
-        </a-button>
-      </a-dropdown>
-    </div>
-
-    <!-- table区域-begin -->
-    <div>
-      <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
-        <i class="anticon anticon-info-circle ant-alert-icon"></i>
-        已选择
-        <a style="font-weight: 600">{{ selectedRowKeys.length }}</a>
-        项
-        <a style="margin-left: 24px" @click="onClearSelected">清空</a>
-      </div>
-
-      <a-table
-        ref="table"
-        size="middle"
-        bordered
-        rowKey="id"
-        :columns="columns"
-        :dataSource="dataSource"
-        :pagination="ipagination"
-        :loading="loading"
-        :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
-        @change="handleTableChange">
-
-        <template slot="action" slot-scope="text, record">
-          <a @click="handleEdit(record)">编辑</a>
-
-          <a-divider type="vertical"/>
-          <a-dropdown>
-            <a class="ant-dropdown-link">更多
-              <a-icon type="down"/>
-            </a>
-            <a-menu slot="overlay">
-              <a-menu-item>
-                <a @click="goPageOnline(record)">功能测试</a>
-              </a-menu-item>
-
-              <a-menu-item>
-                <a @click="handleOnlineUrlShow(record)">配置地址</a>
-              </a-menu-item>
-
-              <a-menu-item>
-                <a @click="handleRemoveRecord(record.id)">移除</a>
-              </a-menu-item>
-
-            </a-menu>
-          </a-dropdown>
-        </template>
-
-        <template slot="dbsync" slot-scope="text">
-          <span v-if="text==='Y'" style="color:limegreen">已同步</span>
-          <span v-if="text==='N'" style="color:red">未同步</span>
-        </template>
-
-      </a-table>
-    </div>
-    <!-- table区域-end -->
-
-    <!-- 表单区域 -->
-    <onl-cgform-head-modal ref="modalForm" @ok="modalFormOk" :action-button="false"></onl-cgform-head-modal>
-
-    <!-- 提示online报表链接 -->
-    <a-modal
-      :title="onlineUrlTitle"
-      :visible="onlineUrlVisible"
-      @cancel="handleOnlineUrlClose">
-      <template slot="footer">
-        <a-button @click="handleOnlineUrlClose">关闭</a-button>
-        <a-button type="primary" class="copy-this-text" :data-clipboard-text="onlineUrl" @click="onCopyUrl">复制</a-button>
-      </template>
-      <p>{{ onlineUrl }}</p>
-    </a-modal>
-
-    <enhance-js ref="ehjs"></enhance-js>
-    <enhance-sql ref="ehsql"></enhance-sql>
-    <enhance-java ref="ehjava"></enhance-java>
-    <trans-db2-online ref="transd2o" @ok="transOk"></trans-db2-online>
-
-    <onl-cgform-button-list ref="btnList"></onl-cgform-button-list>
-  </a-card>
-</template>
-
-<script>
-  import { deleteAction, postAction,getAction } from '@/api/manage'
-  import { JeecgListMixin } from '@/mixins/JeecgListMixin'
-  import Clipboard from 'clipboard'
-  import { filterObj } from '@/utils/util';
-
-  export default {
-    name: 'OnlCgformHeadList',
-    mixins: [JeecgListMixin],
-    components: {
-    },
-    data() {
-      return {
-        description: 'Online表单视图',
-        // 表头
-        columns: [
-          {
-            title: '#',
-            dataIndex: '',
-            key: 'rowIndex',
-            width: 60,
-            align: 'center',
-            customRender: function(t, r, index) {
-              return parseInt(index) + 1
-            }
-          },
-
-          {
-            title: '视图表名',
-            align: 'center',
-            dataIndex: 'tableName'
-          },
-          {
-            title: '视图表描述',
-            align: 'center',
-            dataIndex: 'tableTxt'
-          },
-          {
-            title: '原表版本',
-            align: 'center',
-            dataIndex: 'tableVersion'
-          },
-          {
-            title: '视图版本',
-            align: 'center',
-            dataIndex: 'copyVersion'
-          },
-          {
-            title: '操作',
-            dataIndex: 'action',
-            align: 'center',
-            scopedSlots: { customRender: 'action' }
-          }
-        ],
-        url: {
-          list: '/online/cgform/head/list',
-          delete: '/online/cgform/head/delete',
-          deleteBatch: '/online/cgform/head/deleteBatch',
-          removeRecord: '/online/cgform/head/removeRecord',
-        },
-        tableTypeDictOptions: [],
-        sexDictOptions: [],
-        syncModalVisible: false,
-        syncFormId: '',
-        synMethod: 'normal',
-        syncLoading: false,
-        onlineUrlTitle: '',
-        onlineUrlVisible: false,
-        onlineUrl: '',
-        selectedRowKeys: [],
-        selectedRows: [],
-        physicId:""
-      }
-    },
-    watch: {
-      '$route'() {
-        this.loadData()
-      }
-    },
-    methods: {
-      getQueryParams() {
-        //获取查询条件
-        var param = Object.assign({}, this.queryParam, this.isorter ,this.filters);
-        param.field = this.getQueryField();
-        param.pageNo = this.ipagination.current;
-        param.pageSize = this.ipagination.pageSize;
-        param.copyType = 1;
-        param.physicId = this.physicId;
-        return filterObj(param);
-      },
-
-      loadData(arg) {
-        if(!this.$route.params.code){
-          return false
-        }
-        this.physicId = this.$route.params.code
-        if(!this.url.list){
-          this.$message.error("请设置url.list属性!")
-          return
-        }
-        //加载数据 若传入参数1则加载第一页的内容
-        if (arg === 1) {
-          this.ipagination.current = 1;
-        }
-        var params = this.getQueryParams();//查询条件
-        this.loading = true;
-        getAction(this.url.list, params).then((res) => {
-          if (res.success) {
-            this.dataSource = res.result.records;
-            this.ipagination.total = res.result.total;
-          }
-          if(res.code===510){
-            this.$message.warning(res.message)
-          }
-          this.loading = false;
-        })
-      },
-
-      goPageOnline(rd) {
-        if(rd.isTree=='Y'){
-          this.$router.push({ path: '/online/cgformTreeList/' + rd.id })
-        }else{
-          this.$router.push({ path: '/online/cgformList/' + rd.id })
-        }
-      },
-      handleOnlineUrlClose() {
-        this.onlineUrlTitle = ''
-        this.onlineUrlVisible = false
-      },
-      handleOnlineUrlShow(record) {
-        if(record.isTree=='Y'){
-          this.onlineUrl = `/online/cgformTreeList/${record.id}`
-        }else{
-          this.onlineUrl = `/online/cgformList/${record.id}`
-        }
-        this.onlineUrlVisible = true
-        this.onlineUrlTitle = '菜单链接[' + record.tableTxt + ']'
-      },
-      handleRemoveRecord(id) {
-        let that = this
-        this.$confirm({
-          title: '确认要移除此记录?',
-          onOk() {
-            deleteAction(that.url.removeRecord, { id: id }).then((res) => {
-              if (res.success) {
-                that.$message.success('移除成功')
-                that.loadData()
-              } else {
-                that.$message.warning(res.message)
-              }
-            })
-          },
-          onCancel() {
-          }
-        })
-      },
-      doEnhanceJs() {
-        if (!this.selectedRowKeys || this.selectedRowKeys.length != 1) {
-          this.$message.warning('请先选中一条记录')
-          return
-        }
-        this.$refs.ehjs.show(this.selectedRowKeys[0])
-      },
-      doEnhanceSql() {
-        if (!this.selectedRowKeys || this.selectedRowKeys.length != 1) {
-          this.$message.warning('请先选中一条记录')
-          return
-        }
-        this.$refs.ehsql.show(this.selectedRowKeys[0])
-      },
-      doEnhanceJava() {
-        if (!this.selectedRowKeys || this.selectedRowKeys.length != 1) {
-          this.$message.warning('请先选中一条记录')
-          return
-        }
-        this.$refs.ehjava.show(this.selectedRowKeys[0])
-      },
-      doCgformButton() {
-        if (!this.selectedRowKeys || this.selectedRowKeys.length != 1) {
-          this.$message.warning('请先选中一条记录')
-          return
-        }
-        this.$refs.btnList.show(this.selectedRowKeys[0])
-
-        //this.$router.push({ path: '/online/cgformButton/' + this.selectedRowKeys[0] })
-      },
-      importOnlineForm() {
-        this.$refs.transd2o.show()
-      },
-      transOk() {
-        this.loadData()
-      },
-      onSelectChange(keys, rows) {
-        this.selectedRowKeys = keys
-        this.selectedRows = rows
-      },
-      onCopyUrl(){
-        var clipboard = new Clipboard('.copy-this-text')
-        clipboard.on('success', () => {
-          clipboard.destroy()
-          this.$message.success('复制成功')
-          this.handleOnlineUrlClose()
-        })
-        clipboard.on('error', () => {
-          this.$message.error('该浏览器不支持自动复制')
-          clipboard.destroy()
-        })
-      },
-      showMyCopyInfo(id){
-        console.log("查看复制表单的信息",id)
-      },
-      copyConfig(id){
-        postAction(`${this.url.copyOnline}?code=${id}`).then(res=>{
-          if(res.success){
-            this.$message.success("复制成功")
-            this.loadData()
-          }else{
-            this.$message.error("复制失败>>"+res.message)
-          }
-        })
-      }
-
-    }
-  }
-</script>
-<style scoped>
-  @import '~@assets/less/common.less';
-</style>
-<style lang="less">
-  .ant-card-body .table-operator {
-    margin-bottom: 18px;
-  }
-
-  .ant-table-tbody .ant-table-row td {
-    padding-top: 15px;
-    padding-bottom: 15px;
-  }
-
-  .anty-row-operator button {
-    margin: 0 5px
-  }
-
-  .ant-btn-danger {
-    background-color: #ffffff
-  }
-
-  .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-content {
-    height: 90% !important;
-    overflow-y: hidden
-  }
-
-  .valid-error-cust{
-    .ant-select-selection{
-      border:2px solid #f5222d;
-    }
-  }
-</style>
\ No newline at end of file
diff --git a/jshERP-web/src/views/modules/online/cgform/OnlCgformHeadList.vue b/jshERP-web/src/views/modules/online/cgform/OnlCgformHeadList.vue
deleted file mode 100644
index f64e86fd..00000000
--- a/jshERP-web/src/views/modules/online/cgform/OnlCgformHeadList.vue
+++ /dev/null
@@ -1,493 +0,0 @@
-<template>
-  <a-card :bordered="false">
-
-    <!-- 查询区域 -->
-    <div class="table-page-search-wrapper">
-      <a-form layout="inline">
-        <a-row :gutter="24">
-
-          <a-col :xl="6" :lg="7" :md="8" :sm="24">
-            <a-form-item label="表名">
-              <a-input placeholder="请输入表名" v-model="queryParam.tableName"></a-input>
-            </a-form-item>
-          </a-col>
-          <a-col :xl="6" :lg="7" :md="8" :sm="24">
-            <a-form-item label="表类型">
-              <j-dict-select-tag dictCode="cgform_table_type" v-model="queryParam.tableType"/>
-            </a-form-item>
-          </a-col>
-          <a-col :xl="6" :lg="7" :md="8" :sm="24">
-            <a-form-item label="表描述">
-              <a-input placeholder="请输入表描述" v-model="queryParam.tableTxt"></a-input>
-            </a-form-item>
-          </a-col>
-          <a-col :xl="6" :lg="7" :md="8" :sm="24">
-            <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
-              <a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
-              <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
-            </span>
-          </a-col>
-
-        </a-row>
-      </a-form>
-    </div>
-
-    <!-- 操作按钮区域 -->
-    <div class="table-operator">
-      <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
-      <a-button @click="doCgformButton" type="primary" icon="highlight">自定义按钮</a-button>
-      <a-button @click="doEnhanceJs" type="primary" icon="strikethrough">JS增强</a-button>
-      <a-button @click="doEnhanceSql" type="primary" icon="filter">SQL增强</a-button>
-      <a-button @click="doEnhanceJava" type="primary" icon="tool">Java增强</a-button>
-      <a-button @click="importOnlineForm" type="primary" icon="database">从数据库导入表单</a-button>
-      <a-button @click="goGenerateCode" type="primary" icon="database">代码生成</a-button>
-
-      <a-dropdown v-if="selectedRowKeys.length > 0">
-        <a-menu slot="overlay">
-          <a-menu-item key="1" @click="batchDel">
-            <a-icon type="delete"/>
-            删除
-          </a-menu-item>
-        </a-menu>
-        <a-button> 批量操作
-          <a-icon type="down"/>
-        </a-button>
-      </a-dropdown>
-    </div>
-
-    <!-- table区域-begin -->
-    <div>
-      <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
-        <i class="anticon anticon-info-circle ant-alert-icon"></i>
-        已选择
-        <a style="font-weight: 600">{{ selectedRowKeys.length }}</a>
-        项
-        <a style="margin-left: 24px" @click="onClearSelected">清空</a>
-      </div>
-
-      <a-table
-        ref="table"
-        size="middle"
-        bordered
-        rowKey="id"
-        :columns="columns"
-        :dataSource="dataSource"
-        :pagination="ipagination"
-        :loading="loading"
-        :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
-        @change="handleTableChange">
-
-        <template slot="action" slot-scope="text, record">
-          <a @click="handleEdit(record)">编辑</a>
-
-          <a-divider type="vertical"/>
-          <a-dropdown>
-            <a class="ant-dropdown-link">更多
-              <a-icon type="down"/>
-            </a>
-            <a-menu slot="overlay">
-              <a-menu-item v-if="record.isDbSynch!='Y'">
-                <a @click="openSyncModal(record.id)">同步数据库</a>
-              </a-menu-item>
-
-              <template v-if="record.isDbSynch=='Y' && record.tableType !== 3">
-                <a-menu-item>
-                  <a @click="goPageOnline(record)">功能测试</a>
-                </a-menu-item>
-                <a-menu-item>
-                  <a @click="handleOnlineUrlShow(record)">配置地址</a>
-                </a-menu-item>
-              </template>
-
-              <a-menu-item>
-                <a @click="copyConfig(record.id)">复制视图</a>
-              </a-menu-item>
-
-              <a-menu-item v-if="record.hascopy==1">
-                <a @click="showMyCopyInfo(record.id)">配置视图</a>
-              </a-menu-item>
-
-              <a-menu-item>
-                <a @click="handleRemoveRecord(record.id)">移除</a>
-              </a-menu-item>
-
-              <a-menu-item>
-                <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
-                  <a>删除</a>
-                </a-popconfirm>
-              </a-menu-item>
-
-            </a-menu>
-          </a-dropdown>
-        </template>
-
-        <template slot="dbsync" slot-scope="text">
-          <span v-if="text==='Y'" style="color:limegreen">已同步</span>
-          <span v-if="text==='N'" style="color:red">未同步</span>
-        </template>
-
-      </a-table>
-    </div>
-    <!-- table区域-end -->
-
-    <!-- 表单区域 -->
-    <onl-cgform-head-modal ref="modalForm" @ok="modalFormOk"></onl-cgform-head-modal>
-
-    <!-- 同步数据库提示框 -->
-    <a-modal
-      :width="500"
-      :height="300"
-      title="同步数据库"
-      :visible="syncModalVisible"
-      @cancel="handleCancleDbSync"
-      style="top:5%;height: 95%;">
-      <template slot="footer">
-        <a-button @click="handleCancleDbSync">关闭</a-button>
-        <a-button type="primary" :loading="syncLoading" @click="handleDbSync">
-          确定
-        </a-button>
-      </template>
-      <a-radio-group v-model="synMethod">
-        <a-radio style="display: block;width: 30px;height: 30px" value="normal">普通同步(保留表数据)</a-radio>
-        <a-radio style="display: block;width: 30px;height: 30px" value="force">强制同步(删除表,重新生成)</a-radio>
-      </a-radio-group>
-    </a-modal>
-
-    <!-- 提示online报表链接 -->
-    <a-modal
-      :title="onlineUrlTitle"
-      :visible="onlineUrlVisible"
-      @cancel="handleOnlineUrlClose">
-      <template slot="footer">
-        <a-button @click="handleOnlineUrlClose">关闭</a-button>
-        <a-button type="primary" class="copy-this-text" :data-clipboard-text="onlineUrl" @click="onCopyUrl">复制</a-button>
-      </template>
-      <p>{{ onlineUrl }}</p>
-    </a-modal>
-
-    <enhance-js ref="ehjs"></enhance-js>
-    <enhance-sql ref="ehsql"></enhance-sql>
-    <enhance-java ref="ehjava"></enhance-java>
-    <trans-db2-online ref="transd2o" @ok="transOk"></trans-db2-online>
-    <code-generator ref="cg"></code-generator>
-
-    <onl-cgform-button-list ref="btnList"></onl-cgform-button-list>
-  </a-card>
-</template>
-
-<script>
-  import { initDictOptions, filterDictText } from '@/components/dict/JDictSelectUtil'
-  import { deleteAction, postAction } from '@/api/manage'
-  import JDictSelectTag from '../../../../components/dict/JDictSelectTag.vue'
-  import { JeecgListMixin } from '@/mixins/JeecgListMixin'
-  import Clipboard from 'clipboard'
-  import { filterObj } from '@/utils/util';
-
-  export default {
-    name: 'OnlCgformHeadList',
-    mixins: [JeecgListMixin],
-    components: {
-      JDictSelectTag,
-    },
-    data() {
-      return {
-        description: 'Online表单开发管理页面',
-        // 表头
-        columns: [
-          {
-            title: '#',
-            dataIndex: '',
-            key: 'rowIndex',
-            width: 60,
-            align: 'center',
-            customRender: function(t, r, index) {
-              return parseInt(index) + 1
-            }
-          },
-          {
-            title: '表类型',
-            align: 'center',
-            dataIndex: 'tableType',
-            customRender: (text, record) => {
-              let tbTypeText = filterDictText(this.tableTypeDictOptions, `${text}`)
-              if(record.isTree === 'Y'){
-                tbTypeText+='(树)'
-              }
-              return tbTypeText;
-            }
-          },
-          {
-            title: '表名',
-            align: 'center',
-            dataIndex: 'tableName'
-          },
-          {
-            title: '表描述',
-            align: 'center',
-            dataIndex: 'tableTxt'
-          },
-          {
-            title: '版本',
-            align: 'center',
-            dataIndex: 'tableVersion'
-          },
-
-          {
-            title: '同步数据库状态',
-            align: 'center',
-            dataIndex: 'isDbSynch',
-            scopedSlots: { customRender: 'dbsync' }
-          },
-          {
-            title: '操作',
-            dataIndex: 'action',
-            align: 'center',
-            scopedSlots: { customRender: 'action' }
-          }
-        ],
-        url: {
-          list: '/online/cgform/head/list',
-          delete: '/online/cgform/head/delete',
-          deleteBatch: '/online/cgform/head/deleteBatch',
-          doDbSynch: '/online/cgform/api/doDbSynch/',
-          removeRecord: '/online/cgform/head/removeRecord',
-          copyOnline: '/online/cgform/head/copyOnline'
-        },
-        tableTypeDictOptions: [],
-        sexDictOptions: [],
-        syncModalVisible: false,
-        syncFormId: '',
-        synMethod: 'normal',
-        syncLoading: false,
-        onlineUrlTitle: '',
-        onlineUrlVisible: false,
-        onlineUrl: '',
-        selectedRowKeys: [],
-        selectedRows: []
-      }
-    },
-    created() {
-      //初始化字典 - 表类型
-      initDictOptions('cgform_table_type').then((res) => {
-        if (res.success) {
-          this.tableTypeDictOptions = res.result
-        }
-      })
-    },
-    methods: {
-      doDbSynch(id) {
-        postAction(this.url.doDbSynch + id, { synMethod: '1' }).then((res) => {
-          if (res.success) {
-            this.$message.success(res.message)
-            this.loadData()
-          } else {
-            this.$message.warning(res.message)
-          }
-        })
-      },
-      getQueryParams() {
-        //获取查询条件
-        var param = Object.assign({}, this.queryParam, this.isorter ,this.filters);
-        param.field = this.getQueryField();
-        param.pageNo = this.ipagination.current;
-        param.pageSize = this.ipagination.pageSize;
-        param.copyType = 0;
-        return filterObj(param);
-      },
-      handleCancleDbSync() {
-        this.syncModalVisible = false
-      },
-      handleDbSync() {
-        this.syncLoading = true
-        postAction(this.url.doDbSynch + this.syncFormId + '/' + this.synMethod).then((res) => {
-          this.syncModalVisible = false
-          this.syncLoading = false
-          if (res.success) {
-            this.$message.success(res.message)
-            this.loadData()
-          } else {
-            this.$message.warning(res.message)
-          }
-        })
-        setTimeout(()=>{
-          if(this.syncLoading){
-            this.syncModalVisible = false
-            this.syncLoading = false
-            this.$message.success("网络延迟,已自动刷新!")
-            this.loadData()
-          }
-        },10000)
-      },
-      openSyncModal(id) {
-        this.syncModalVisible = true
-        this.syncLoading = false
-        this.syncFormId = id
-      },
-      goPageOnline(rd) {
-        if(rd.themeTemplate === 'erp'){
-          this.$router.push({ path: '/online/cgformErpList/' + rd.id })
-        }else{
-          if(rd.isTree=='Y'){
-            this.$router.push({ path: '/online/cgformTreeList/' + rd.id })
-          }else{
-            this.$router.push({ path: '/online/cgformList/' + rd.id })
-          }
-        }
-      },
-      handleOnlineUrlClose() {
-        this.onlineUrlTitle = ''
-        this.onlineUrlVisible = false
-      },
-      handleOnlineUrlShow(record) {
-        if(record.isTree=='Y'){
-          this.onlineUrl = `/online/cgformTreeList/${record.id}`
-        }else{
-          this.onlineUrl = `/online/cgformList/${record.id}`
-        }
-        this.onlineUrlVisible = true
-        this.onlineUrlTitle = '菜单链接[' + record.tableTxt + ']'
-      },
-      handleRemoveRecord(id) {
-        let that = this
-        this.$confirm({
-          title: '确认要移除此记录?',
-          onOk() {
-            deleteAction(that.url.removeRecord, { id: id }).then((res) => {
-              if (res.success) {
-                that.$message.success('移除成功')
-                that.loadData()
-              } else {
-                that.$message.warning(res.message)
-              }
-            })
-          },
-          onCancel() {
-          }
-        })
-      },
-      doEnhanceJs() {
-        if (!this.selectedRowKeys || this.selectedRowKeys.length != 1) {
-          this.$message.warning('请先选中一条记录')
-          return
-        }
-        this.$refs.ehjs.show(this.selectedRowKeys[0])
-      },
-      doEnhanceSql() {
-        if (!this.selectedRowKeys || this.selectedRowKeys.length != 1) {
-          this.$message.warning('请先选中一条记录')
-          return
-        }
-        this.$refs.ehsql.show(this.selectedRowKeys[0])
-      },
-      doEnhanceJava() {
-        if (!this.selectedRowKeys || this.selectedRowKeys.length != 1) {
-          this.$message.warning('请先选中一条记录')
-          return
-        }
-        this.$refs.ehjava.show(this.selectedRowKeys[0])
-      },
-      doCgformButton() {
-        if (!this.selectedRowKeys || this.selectedRowKeys.length != 1) {
-          this.$message.warning('请先选中一条记录')
-          return
-        }
-        this.$refs.btnList.show(this.selectedRowKeys[0])
-
-        //this.$router.push({ path: '/online/cgformButton/' + this.selectedRowKeys[0] })
-      },
-      importOnlineForm() {
-        this.$refs.transd2o.show()
-      },
-      transOk() {
-        this.loadData()
-      },
-      goGenerateCode() {
-        if (!this.selectedRowKeys || this.selectedRowKeys.length != 1) {
-          this.$message.warning('请先选中一条记录')
-          return
-        }
-        let row = this.selectedRows[0]
-        if (!row.isDbSynch || row.isDbSynch == 'N') {
-          this.$message.warning('请先同步数据库!')
-          return
-        }
-        if (row.tableType == 3) {
-          this.$message.warning('请选中该表对应的主表生成代码')
-          return
-        }
-        this.$refs.cg.show(this.selectedRowKeys[0])
-      },
-      onSelectChange(keys, rows) {
-        this.selectedRowKeys = keys
-        this.selectedRows = rows
-      },
-      onCopyUrl(){
-        var clipboard = new Clipboard('.copy-this-text')
-        clipboard.on('success', () => {
-          clipboard.destroy()
-          this.$message.success('复制成功')
-          this.handleOnlineUrlClose()
-        })
-        clipboard.on('error', () => {
-          this.$message.error('该浏览器不支持自动复制')
-          clipboard.destroy()
-        })
-      },
-      showMyCopyInfo(id){
-        this.$router.push({ path: '/online/copyform/' + id })
-      },
-      copyConfig(id){
-        postAction(`${this.url.copyOnline}?code=${id}`).then(res=>{
-          if(res.success){
-            this.$message.success("复制成功")
-            this.loadData()
-          }else{
-            this.$message.error("复制失败>>"+res.message)
-          }
-        })
-      }
-
-    }
-  }
-</script>
-<style scoped>
-  @import '~@assets/less/common.less';
-</style>
-<style lang="less">
-  .ant-card-body .table-operator {
-    margin-bottom: 18px;
-  }
-
-  .ant-table-tbody .ant-table-row td {
-    padding-top: 15px;
-    padding-bottom: 15px;
-  }
-
-  .anty-row-operator button {
-    margin: 0 5px
-  }
-
-  .ant-btn-danger {
-    background-color: #ffffff
-  }
-
-  .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-content {
-    height: 90% !important;
-    overflow-y: hidden
-  }
-
-  .valid-error-cust{
-    .ant-select-selection{
-      border:2px solid #f5222d;
-    }
-  }
-</style>
\ No newline at end of file
diff --git a/jshERP-web/src/views/modules/online/cgform/auto/ButtonExpHandler.js b/jshERP-web/src/views/modules/online/cgform/auto/ButtonExpHandler.js
deleted file mode 100644
index 3eaf6643..00000000
--- a/jshERP-web/src/views/modules/online/cgform/auto/ButtonExpHandler.js
+++ /dev/null
@@ -1,41 +0,0 @@
-/**
- * online 自定义按钮表达式处理类
- */
-export default class ButtonExpHandler {
-  /**
-   * 构造器
-   * @param express
-   */
-  constructor(express,record) {
-    this._express = express;
-    this._record = record;
-  }
-
-  get show() {
-    if(!this._express || this._express==''){
-      return true;
-    }
-    let arr = this._express.split('#');
-    //获取字段值
-    let fieldValue = this._record[arr[0]];
-    //获取表达式
-    let exp = arr[1].toLowerCase();
-    //判断表达式
-    if(exp === 'eq'){
-      return fieldValue == arr[2];
-    }else if(exp === 'ne'){
-      return !(fieldValue == arr[2]);
-    }else if(exp === 'empty'){
-      if(arr[2]==='true' || arr[2]===true){
-        return !fieldValue || fieldValue=='';
-      }else{
-        return fieldValue && fieldValue.length>0
-      }
-    }else if(exp === 'in'){
-      let arr2 = arr[2].split(',');
-      return arr2.indexOf(String(fieldValue))>=0;
-    }
-    return false;
-  }
-
-}
\ No newline at end of file
diff --git a/jshERP-web/src/views/modules/online/cgform/auto/OnlCgformAutoList.vue b/jshERP-web/src/views/modules/online/cgform/auto/OnlCgformAutoList.vue
deleted file mode 100644
index 61539211..00000000
--- a/jshERP-web/src/views/modules/online/cgform/auto/OnlCgformAutoList.vue
+++ /dev/null
@@ -1,827 +0,0 @@
-<template>
-  <a-card :bordered="false" style="height: 100%">
-    <div class="table-page-search-wrapper">
-      <a-form layout="inline" @keyup.enter.native="searchByquery">
-        <a-row :gutter="24" v-if="queryInfo && queryInfo.length>0">
-          <template v-for="(item,index) in queryInfo">
-            <template v-if=" item.hidden==='1' ">
-              <a-col v-if="item.view=='datetime'" :md="12" :sm="16" :key=" 'query'+index " v-show="toggleSearchStatus">
-                <online-query-form-item :queryParam="queryParam" :item="item" :dictOptions="dictOptions"></online-query-form-item>
-              </a-col>
-              <a-col v-else :md="6" :sm="8" :key=" 'query'+index " v-show="toggleSearchStatus">
-                <online-query-form-item :queryParam="queryParam" :item="item" :dictOptions="dictOptions"></online-query-form-item>
-              </a-col>
-            </template>
-            <template v-else>
-              <a-col v-if="item.view=='datetime'" :md="12" :sm="16" :key=" 'query'+index ">
-                <online-query-form-item :queryParam="queryParam" :item="item" :dictOptions="dictOptions"></online-query-form-item>
-              </a-col>
-              <a-col v-else :md="6" :sm="8" :key=" 'query'+index ">
-                <online-query-form-item :queryParam="queryParam" :item="item" :dictOptions="dictOptions"></online-query-form-item>
-              </a-col>
-            </template>
-          </template>
-
-          <a-col :md="6" :sm="8">
-            <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
-              <a-button type="primary" @click="searchByquery" icon="search">查询</a-button>
-              <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
-              <a @click="handleToggleSearch" style="margin-left: 8px">
-                {{ toggleSearchStatus ? '收起' : '展开' }}
-                <a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>
-              </a>
-            </span>
-          </a-col>
-
-        </a-row>
-      </a-form>
-    </div>
-
-    <!-- 操作按钮区域 -->
-    <div class="table-operator">
-      <a-button v-if="buttonSwitch.add" @click="handleAdd" type="primary" icon="plus">新增</a-button>
-      <a-button v-if="buttonSwitch.import" @click="handleImportXls" type="primary" icon="upload">导入</a-button>
-      <a-button v-if="buttonSwitch.export" @click="handleExportXls" type="primary" icon="download">导出</a-button>
-      <template v-if="cgButtonList && cgButtonList.length>0" v-for="(item,index) in cgButtonList">
-        <a-button
-          v-if=" item.optType=='js' "
-          :key=" 'cgbtn'+index "
-          @click="cgButtonJsHandler(item.buttonCode)"
-          type="primary"
-          :icon="item.buttonIcon">
-          {{ item.buttonName }}
-        </a-button>
-        <a-button
-          v-else-if=" item.optType=='action' "
-          :key=" 'cgbtn'+index "
-          @click="cgButtonActionHandler(item.buttonCode)"
-          type="primary"
-          :icon="item.buttonIcon">
-          {{ item.buttonName }}
-        </a-button>
-      </template>
-
-      <!-- 高级查询 -->
-      <j-super-query
-        ref="superQuery"
-        :fieldList="superQuery.fieldList"
-        :saveCode="$route.fullPath"
-        :loading="table.loading"
-        @handleSuperQuery="handleSuperQuery"/>
-
-      <a-button
-        v-if="buttonSwitch.batch_delete"
-        @click="handleDelBatch"
-        v-show="table.selectedRowKeys.length > 0"
-        ghost
-        type="primary"
-        icon="delete">批量删除</a-button>
-    </div>
-
-    <div>
-      <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
-        <i class="anticon anticon-info-circle ant-alert-icon"></i>
-        已选择&nbsp;<a style="font-weight: 600">{{ table.selectedRowKeys.length }}</a>项&nbsp;&nbsp;
-        <a style="margin-left: 24px" @click="onClearSelected">清空</a>
-      </div>
-
-      <a-table
-        ref="cgformAutoList"
-        bordered
-        size="middle"
-        rowKey="id"
-        :columns="table.columns"
-        :dataSource="table.dataSource"
-        :pagination="table.pagination"
-        :loading="table.loading"
-        :rowSelection="rowSelectionConfig"
-        @change="handleTableChange"
-        :scroll="table.scroll"
-        style="min-height: 300px">
-
-        <!-- 支持链接href跳转 -->
-        <template
-          v-for="field of fieldHrefSlots"
-          :slot="field.slotName"
-          slot-scope="text, record"
-        >
-          <a @click="handleClickFieldHref(field,record)">{{ text }}</a>
-        </template>
-
-
-        <template slot="dateSlot" slot-scope="text">
-          <span>{{ getFormatDate(text) }}</span>
-        </template>
-
-        <template slot="htmlSlot" slot-scope="text">
-          <div v-html="text"></div>
-        </template>
-
-        <template slot="imgSlot" slot-scope="text">
-          <span v-if="!text" style="font-size: 12px;font-style: italic;">无图片</span>
-          <img v-else :src="getImgView(text)" height="25px" alt="图片不存在" style="max-width:80px;font-size: 12px;font-style: italic;"/>
-        </template>
-
-        <template slot="fileSlot" slot-scope="text">
-          <span v-if="!text" style="font-size: 12px;font-style: italic;">无文件</span>
-          <a-button
-            v-else
-            :ghost="true"
-            type="primary"
-            icon="download"
-            size="small"
-            @click="downloadRowFile(text)">
-            下载
-          </a-button>
-        </template>
-
-        <span slot="action" slot-scope="text, record">
-          <template v-if="hasBpmStatus">
-            <template v-if="record.bpm_status == '1'||record.bpm_status == ''|| record.bpm_status == null">
-              <template v-if="buttonSwitch.update">
-              <a @click="handleEdit(record)">编辑</a>
-              <a-divider type="vertical"/>
-            </template>
-            </template>
-          </template>
-          <template v-else>
-            <template v-if="buttonSwitch.update">
-              <a @click="handleEdit(record)">编辑</a>
-              <a-divider type="vertical"/>
-            </template>
-          </template>
-          <a-dropdown>
-            <a class="ant-dropdown-link">
-              更多 <a-icon type="down" />
-            </a>
-            <a-menu slot="overlay">
-              <a-menu-item v-if="buttonSwitch.detail">
-                <a href="javascript:;" @click="handleDetail(record)">详情</a>
-              </a-menu-item>
-              <template v-if="hasBpmStatus">
-                <template v-if="record.bpm_status == '1'||record.bpm_status == ''|| record.bpm_status == null">
-                    <a-menu-item v-if="buttonSwitch.delete">
-                      <a-popconfirm title="确定删除吗?" @confirm="() => handleDeleteOne(record)">
-                        <a>删除</a>
-                      </a-popconfirm>
-                    </a-menu-item>
-                </template>
-              </template>
-              <template v-else>
-                <a-menu-item v-if="buttonSwitch.delete">
-                  <a-popconfirm title="确定删除吗?" @confirm="() => handleDeleteOne(record)">
-                    <a>删除</a>
-                  </a-popconfirm>
-                </a-menu-item>
-               </template>
-              <template v-if="cgButtonLinkList && cgButtonLinkList.length>0" v-for="(btnItem,btnIndex) in cgButtonLinkList">
-                <a-menu-item :key=" 'cgbtnLink'+btnIndex " v-if="showLinkButton(btnItem,record)">
-                  <a href="javascript:void(0);" @click="cgButtonLinkHandler(record,btnItem.buttonCode,btnItem.optType)">
-                    <a-icon v-if="btnItem.buttonIcon" :type="btnItem.buttonIcon" />
-                    {{ btnItem.buttonName }}
-                  </a>
-                </a-menu-item>
-              </template>
-
-            </a-menu>
-          </a-dropdown>
-        </span>
-      </a-table>
-
-      <onl-cgform-auto-modal @success="handleFormSuccess" ref="modal" :code="code" @schema="handleGetSchema" />
-
-      <j-import-modal ref="importModal" :url="getImportUrl()" @ok="importOk"></j-import-modal>
-
-      <!-- 跳转Href的动态组件方式 -->
-      <a-modal v-bind="hrefComponent.model" v-on="hrefComponent.on">
-        <component :is="hrefComponent.is" v-bind="hrefComponent.params"/>
-      </a-modal>
-
-    </div>
-  </a-card>
-</template>
-
-<script>
-
-  import { HrefJump } from '@/mixins/OnlAutoListMixin'
-  import { postAction,getAction,deleteAction,downFile } from '@/api/manage'
-  import { filterMultiDictText } from '@/components/dict/JDictSelectUtil'
-  import { cloneObject, filterObj } from '@/utils/util'
-  import JImportModal from '@/components/jeecg/JImportModal'
-  import JSuperQuery from '@comp/jeecg/JSuperQuery'
-  import ButtonExpHandler from './ButtonExpHandler'
-
-  export default {
-    name: 'OnlCgFormAutoList',
-    mixins: [HrefJump],
-    components: {
-      JSuperQuery,
-      JImportModal,
-    },
-    data() {
-      return {
-        code: '',
-        description: '在线报表功能测试页面',
-        currentTableName:"",
-        url: {
-          getQueryInfo:'/online/cgform/api/getQueryInfo/',
-          getColumns: '/online/cgform/api/getColumns/',
-          getData: '/online/cgform/api/getData/',
-          optPre:"/online/cgform/api/form/",
-          exportXls:'/online/cgform/api/exportXls/',
-          buttonAction:'/online/cgform/api/doButton',
-        },
-        flowCodePre:"onl_",
-        isorter:{
-          column: 'createTime',
-          order: 'desc',
-        },
-        //dictOptions:{fieldName:[]}
-        dictOptions:{
-
-        },
-        cgButtonLinkList:[],
-        cgButtonList:[],
-        queryInfo:[],
-        // 查询参数，多个页面的查询参数用 code 作为键来区分
-        queryParamsMap: {},
-        toggleSearchStatus:false,
-        table: {
-          loading: true,
-          scroll:{x:false},
-          // 表头
-          columns: [],
-          //数据集
-          dataSource: [],
-          // 选择器
-          selectedRowKeys: [],
-          selectionRows: [],
-          // 分页参数
-          pagination: {
-
-          }
-        },
-        metaPagination:{
-          current: 1,
-          pageSize: 10,
-          pageSizeOptions: ['10', '20', '30'],
-          showTotal: (total, range) => {
-            return range[0] + '-' + range[1] + ' 共' + total + '条'
-          },
-          showQuickJumper: true,
-          showSizeChanger: true,
-          total: 0
-        },
-        actionColumn:{
-          title: '操作',
-          dataIndex: 'action',
-          scopedSlots: { customRender: 'action' },
-          fixed:"right",
-          align:"center",
-          width:150
-        },
-        formTemplate:"99",
-        EnhanceJS:'',
-        hideColumns:[],
-        buttonSwitch:{
-          add:true,
-          update:true,
-          delete:true,
-          batch_delete:true,
-          import:true,
-          export:true,
-          detail:true
-        },
-        hasBpmStatus:false,
-        checkboxFlag:false,
-        // 高级查询
-        superQuery: {
-          // 字段列表
-          fieldList: [],
-          // 查询参数
-          params: '',
-          // 查询条件拼接方式 'and' or 'or'
-          matchType: 'and'
-        }
-      }
-    },
-    created() {
-      this.initAutoList();
-    },
-    mounted(){
-      this.cgButtonJsHandler('mounted')
-    },
-    watch: {
-      '$route'() {
-        // 刷新参数放到这里去触发，就可以刷新相同界面了
-        this.initAutoList()
-      }
-    },
-    computed:{
-      rowSelectionConfig:function() {
-        if(!this.checkboxFlag){
-          return null
-        }
-        return {
-          fixed:true,
-          selectedRowKeys:this.table.selectedRowKeys,
-          onChange: this.handleChangeInTableSelect
-        }
-      },
-      queryParam: {
-        get() {
-          return this.queryParamsMap[this.code]
-        },
-        set(newVal) {
-          this.$set(this.queryParamsMap, this.code, newVal)
-        }
-      }
-    },
-    methods: {
-      hasBpmStatusFilter(){
-        var columnObjs = this.table.columns;
-        let columns = [];
-        for (var item of columnObjs) {
-          columns.push(item.dataIndex);
-        }
-        if(columns.includes('bpm_status')||columns.includes('BPM_STATUS')){
-          this.hasBpmStatus = true;
-        }else{
-          this.hasBpmStatus = false;
-        }
-      },
-      initQueryInfo(){
-        getAction(`${this.url.getQueryInfo}${this.code}`).then((res)=>{
-          console.log("--onlineList-获取查询条件配置",res);
-          if(res.success){
-            this.queryInfo = res.result
-          }else{
-            this.$message.warning(res.message)
-          }
-        })
-      },
-      initAutoList(){
-        if(!this.$route.params.code){
-          return false
-        }
-        // 清空高级查询条件
-        this.superQuery.params = ''
-        if (this.$refs.superQuery) {
-          this.$refs.superQuery.handleReset()
-        }
-
-        this.table.loading = true
-        this.code = this.$route.params.code
-        if (!this.queryParam) {
-          this.queryParam = {}
-        }
-        getAction(`${this.url.getColumns}${this.code}`).then((res)=>{
-          console.log("--onlineList-加载动态列>>",res);
-          if(res.success){
-            if(res.result.checkboxFlag == 'Y'){
-              this.checkboxFlag = true
-            }else{
-              this.checkboxFlag = false
-            }
-
-            if(res.result.paginationFlag=='Y'){
-              this.table.pagination = {...this.metaPagination}
-            }else{
-              this.table.pagination = false
-            }
-
-            this.fieldHrefSlots = res.result.fieldHrefSlots
-            this.dictOptions = res.result.dictOptions
-            this.formTemplate = res.result.formTemplate
-            this.description = res.result.description
-            this.currentTableName = res.result.currentTableName
-            this.initCgButtonList(res.result.cgButtonList)
-            this.initCgEnhanceJs(res.result.enhanceJs)
-            this.initButtonSwitch(res.result.hideColumns)
-            let currColumns = res.result.columns
-            for(let a=0;a<currColumns.length;a++){
-              if(currColumns[a].customRender){
-                let dictCode = currColumns[a].customRender;
-                let replaceFlag = '_replace_text_';
-                if(dictCode.startsWith(replaceFlag)){
-                  let textFieldName = dictCode.replace(replaceFlag,'')
-                  currColumns[a].customRender=(text,record)=>{
-                    return record[textFieldName]
-                  }
-                }else{
-                  currColumns[a].customRender=(text)=>{
-                    return filterMultiDictText(this.dictOptions[dictCode], text);
-                  }
-                }
-              }
-            }
-            if(res.result.scrollFlag==1){
-              this.table.scroll = { x :'115%' }
-            }else{
-              this.table.scroll = { x :false }
-            }
-            currColumns.push(this.actionColumn);
-            this.table.columns = [...currColumns]
-            this.hasBpmStatusFilter();
-            this.loadData();
-            this.initQueryInfo();
-            //加载新路由，清空checkbox选中
-            this.table.selectedRowKeys = [];
-          }else{
-            this.$message.warning(res.message)
-          }
-        })
-      },
-      loadData(arg){
-        if(this.table.pagination){
-          if(arg==1){
-            this.table.pagination.current=1
-          }
-          this.table.loading = true
-          let params = this.getQueryParams();//查询条件
-          console.log("--onlineList-查询条件-->",params)
-          getAction(`${this.url.getData}${this.code}`,params).then((res)=>{
-            console.log("--onlineList-列表数据",res)
-            if(res.success){
-              let result = res.result;
-              if(Number(result.total)>0){
-                this.table.pagination.total = Number(result.total)
-                this.table.dataSource = result.records
-              }else{
-                this.table.pagination.total=0;
-                this.table.dataSource=[]
-                //this.$message.warning("查无数据")
-              }
-            }else{
-              this.$message.warning(res.message)
-            }
-          }).finally(() => {
-            this.table.loading = false
-          })
-        }else{
-          this.loadDataNoPage()
-        }
-      },
-      loadDataNoPage(){
-        this.table.loading = true
-        let param = this.getQueryParams()//查询条件
-        param['pageSize'] = -521;
-        getAction(`${this.url.getData}${this.code}`,filterObj(param)).then((res)=>{
-          console.log("--onlineList-列表数据",res)
-          if(res.success){
-            let result = res.result;
-            if(Number(result.total)>0){
-              this.table.dataSource = result.records
-            }else{
-              this.table.dataSource=[]
-            }
-          }else{
-            this.$message.warning(res.message)
-          }
-        }).finally(() => {
-          this.table.loading = false
-        })
-      },
-      getQueryParams() {
-        let param = Object.assign({}, this.queryParam,this.isorter);
-        param.pageNo = this.table.pagination.current;
-        param.pageSize = this.table.pagination.pageSize;
-        param.superQueryMatchType = this.superQuery.matchType
-        param.superQueryParams = encodeURIComponent(this.superQuery.params)
-        return filterObj(param);
-      },
-      handleChangeInTableSelect(selectedRowKeys, selectionRows) {
-        this.table.selectedRowKeys = selectedRowKeys
-        this.table.selectionRows = selectionRows
-        this.selectedRowKeys = selectedRowKeys
-      },
-      handleTableChange(pagination, filters, sorter){
-        //TODO 筛选
-        if (Object.keys(sorter).length>0){
-          this.isorter.column = sorter.field;
-          this.isorter.order = "ascend"==sorter.order?"asc":"desc"
-        }
-        this.table.pagination = pagination;
-        this.loadData();
-      },
-      handleAdd(){
-        this.cgButtonJsHandler('beforeAdd')
-        this.$refs.modal.add(this.formTemplate);
-      },
-      handleImportXls(){
-        this.$refs.importModal.show()
-      },
-      importOk(){
-        this.loadData(1)
-      },
-      handleExportXls2(){
-        let param = this.queryParam;
-        if(this.table.selectedRowKeys && this.table.selectedRowKeys.length>0){
-          param['selections'] = this.table.selectedRowKeys.join(",")
-        }
-        let paramsStr = encodeURI(JSON.stringify(param));
-        console.log('paramsStr: ' + paramsStr)
-        let url = window._CONFIG['domianURL']+this.url.exportXls+this.code+"?paramsStr="+paramsStr
-        window.location.href = url;
-      },
-      handleExportXls(){
-        let param = this.queryParam;
-        if(this.table.selectedRowKeys && this.table.selectedRowKeys.length>0){
-          param['selections'] = this.table.selectedRowKeys.join(",")
-        }
-        console.log("导出参数",param)
-        let paramsStr = JSON.stringify(filterObj(param));
-        downFile(this.url.exportXls+this.code,{paramsStr:paramsStr}).then((data)=>{
-          if (!data) {
-            this.$message.warning("文件下载失败")
-            return
-          }
-          if (typeof window.navigator.msSaveBlob !== 'undefined') {
-            window.navigator.msSaveBlob(new Blob([data]), this.description+'.xls')
-          }else{
-            let url = window.URL.createObjectURL(new Blob([data]))
-            let link = document.createElement('a')
-            link.style.display = 'none'
-            link.href = url
-            link.setAttribute('download', this.description+'.xls')
-            document.body.appendChild(link)
-            link.click()
-            document.body.removeChild(link); //下载完成移除元素
-            window.URL.revokeObjectURL(url); //释放掉blob对象
-          }
-        })
-      },
-      handleEdit(record){
-        this.cgButtonLinkHandler(record,"beforeEdit","js")
-        this.$refs.modal.edit(this.formTemplate,record.id);
-      },
-      showLinkButton(item,record){
-        let btn = new ButtonExpHandler(item.exp,record);
-        return btn.show;
-      },
-      handleDetail(record){
-        this.$refs.modal.detail(this.formTemplate,record.id);
-      },
-      handleDeleteOne(record){
-        this.cgButtonLinkHandler(record,"beforeDelete","js")
-        this.handleDelete(record.id)
-      },
-      handleDelete(id){
-        deleteAction(this.url.optPre+this.code+"/"+id).then((res)=>{
-          if(res.success){
-            this.$message.success(res.message)
-            this.loadData()
-          }else{
-            this.$message.warning(res.message)
-          }
-        })
-      },
-
-      handleFormSuccess(){
-        this.loadData()
-      },
-      // 查询完 schema 后，生成高级查询的字段列表
-      handleGetSchema(schema) {
-        if (schema && schema.properties) {
-          let setField = (array, field) => {
-            let type = field.type || 'string'
-            type = (type === 'inputNumber' ? 'number' : type)
-            array.push({
-              type: type,
-              value: field.key,
-              text: field.title,
-              // 额外字典参数
-              dictCode: field.dictCode,
-              dictTable: field.dictTable,
-              dictText: field.dictText,
-              options: field.enum || field.options,
-              order: field.order,
-            })
-          }
-          let fieldList = []
-          for (let key in schema.properties) {
-            if (!schema.properties.hasOwnProperty(key)) {
-              continue
-            }
-            let field = schema.properties[key]
-            // tab = 子表
-            if (field.view === 'tab') {
-              let subTable = {
-                type: 'sub-table',
-                value: field.key,
-                text: field.describe,
-                children: []
-              }
-              for (let column of field.columns) {
-                setField(subTable.children, column)
-              }
-              fieldList.push(subTable)
-            } else {
-              field.key = key
-              setField(fieldList, field)
-            }
-          }
-          // 冒泡排序
-          for (let i = 0; i < fieldList.length; i++) {
-            for (let j = i + 1; j < fieldList.length; j++) {
-              let temp1 = fieldList[i]
-              let temp2 = fieldList[j]
-              if (temp1.order > temp2.order) {
-                fieldList[i] = temp2
-                fieldList[j] = temp1
-              }
-            }
-          }
-          this.superQuery.fieldList = fieldList
-        }
-      },
-      onClearSelected(){
-        this.table.selectedRowKeys = []
-        this.table.selectionRows = []
-      },
-      getImgView(text){
-        if(text && text.indexOf(",")>0){
-          text = text.substring(0,text.indexOf(","))
-        }
-        return window._CONFIG['staticDomainURL']+"/"+text
-      },
-      downloadRowFile(text){
-        if(!text){
-          this.$message.warning("未知的文件")
-          return;
-        }
-        if(text.indexOf(",")>0){
-          text = text.substring(0,text.indexOf(","))
-        }
-        window.open(window._CONFIG['staticDomainURL']+"/"+text);//TODO 下载的方法
-      },
-      handleDelBatch(){
-        if(this.table.selectedRowKeys.length<=0){
-          this.$message.warning('请选择一条记录！');
-          return false;
-        }else{
-          let ids = "";
-          let that = this;
-          that.table.selectedRowKeys.forEach(function(val) {
-            ids+=val+",";
-          });
-          that.$confirm({
-            title:"确认删除",
-            content:"是否删除选中数据?",
-            onOk: function(){
-              that.handleDelete(ids)
-              that.onClearSelected();
-            }
-          });
-        }
-      },
-
-      searchByquery(){
-        this.loadData(1);
-      },
-      searchReset(){
-        this.queryParam = {}
-        this.loadData(1);
-      },
-      handleToggleSearch(){
-        this.toggleSearchStatus = !this.toggleSearchStatus;
-      },
-      getFormatDate(text){
-        if(!text){
-          return ''
-        }
-        let a = text;
-        if(a.length>10){
-          a = a.substring(0,10);
-        }
-        return a;
-      },
-      getImportUrl(){
-        return '/online/cgform/api/importXls/'+this.code
-      },
-      initCgEnhanceJs(enhanceJs){
-        //console.log("--onlineList-js增强",enhanceJs)
-        if(enhanceJs){
-          let Obj = eval ("(" + enhanceJs + ")");
-          this.EnhanceJS = new Obj(getAction,postAction,deleteAction);
-          this.cgButtonJsHandler('created')
-        }else{
-          this.EnhanceJS = ''
-        }
-      },
-      initCgButtonList(btnList){
-        let linkArr = []
-        let buttonArr = []
-        if(btnList && btnList.length>0){
-          for(let i=0;i<btnList.length;i++){
-            let temp = btnList[i]
-            if(temp.buttonStyle=='button'){
-              buttonArr.push(temp)
-            }else if(temp.buttonStyle=='link'){
-              linkArr.push(temp)
-            }
-          }
-        }
-        this.cgButtonLinkList = [...linkArr]
-        this.cgButtonList=[...buttonArr]
-      },
-      cgButtonJsHandler(buttonCode){
-        if(this.EnhanceJS[buttonCode]){
-          this.EnhanceJS[buttonCode](this)
-        }
-      },
-      cgButtonActionHandler(buttonCode){
-        //处理自定义button的 需要配置该button自定义sql
-        if(!this.table.selectedRowKeys || this.table.selectedRowKeys.length==0){
-          this.$message.warning("请先选中一条记录")
-          return false
-        }
-        if(this.table.selectedRowKeys.length>1){
-          this.$message.warning("请只选中一条记录")
-          return false
-        }
-        let params = {
-          formId:this.code,
-          buttonCode:buttonCode,
-          dataId:this.table.selectedRowKeys[0]
-        }
-        console.log("自定义按钮请求后台参数：",params)
-        postAction(this.url.buttonAction,params).then(res=>{
-          if(res.success){
-            this.loadData()
-            this.$message.success("处理完成!")
-          }else{
-            this.$message.warning("处理失败!")
-          }
-        })
-
-      },
-      cgButtonLinkHandler(record,buttonCode,optType){
-        if(optType=="js"){
-          if(this.EnhanceJS[buttonCode]){
-            this.EnhanceJS[buttonCode](this,record)
-          }
-        }else if(optType=="action"){
-          let params = {
-            formId:this.code,
-            buttonCode:buttonCode,
-            dataId:record.id
-          }
-          console.log("自定义按钮link请求后台参数：",params)
-          postAction(this.url.buttonAction,params).then(res=>{
-            if(res.success){
-              this.loadData()
-              this.$message.success("处理完成!")
-            }else{
-              this.$message.warning("处理失败!")
-            }
-          })
-        }
-      },
-      initButtonSwitch(hideColumns){
-        Object.keys(this.buttonSwitch).forEach(key=>{
-          this.buttonSwitch[key]=true
-        })
-        if(hideColumns && hideColumns.length>0){
-          Object.keys(this.buttonSwitch).forEach(key=>{
-            if(hideColumns.indexOf(key)>=0){
-              this.buttonSwitch[key]=false
-            }
-          })
-        }
-      },
-
-      // 高级查询
-      handleSuperQuery(params, matchType) {
-        if (!params || params.length === 0) {
-          this.superQuery.params = ''
-        } else {
-          this.superQuery.params = JSON.stringify(params)
-        }
-        this.superQuery.matchType = matchType
-        this.loadData()
-      },
-
-    }
-  }
-</script>
-<style scoped>
-  @import '~@assets/less/common.less';
-</style>
-<style>
-  .ant-card-body .table-operator{
-    margin-bottom: 18px;
-  }
-  .ant-table-tbody .ant-table-row td{
-    padding-top:15px;
-    padding-bottom:15px;
-  }
-  .anty-row-operator button{margin: 0 5px}
-  .ant-btn-danger{background-color: #ffffff}
-
-  .anty-img-wrap{height:25px;position: relative;}
-  .anty-img-wrap > img{max-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-content{height:90% !important;overflow-y: hidden}
-</style>
\ No newline at end of file
diff --git a/jshERP-web/src/views/modules/online/cgform/auto/OnlCgformTreeList.vue b/jshERP-web/src/views/modules/online/cgform/auto/OnlCgformTreeList.vue
deleted file mode 100644
index 86a53302..00000000
--- a/jshERP-web/src/views/modules/online/cgform/auto/OnlCgformTreeList.vue
+++ /dev/null
@@ -1,696 +0,0 @@
-<template>
-  <a-card :bordered="false" style="height: 100%">
-    <!-- 操作按钮区域 -->
-    <div class="table-operator">
-      <a-button v-if="buttonSwitch.add" @click="handleAdd" type="primary" icon="plus">新增</a-button>
-      <a-button v-if="buttonSwitch.import" @click="handleImportXls" type="primary" icon="upload" style="margin-left:8px">导入</a-button>
-      <a-button v-if="buttonSwitch.export" @click="handleExportXls" type="primary" icon="download" style="margin-left:8px">导出</a-button>
-      <template v-if="cgButtonList && cgButtonList.length>0" v-for="(item,index) in cgButtonList">
-        <a-button
-          v-if=" item.optType=='js' "
-          :key=" 'cgbtn'+index "
-          @click="cgButtonJsHandler(item.buttonCode)"
-          type="primary"
-          :icon="item.buttonIcon"
-          style="margin-left:8px">
-          {{ item.buttonName }}
-        </a-button>
-        <a-button
-          v-else-if=" item.optType=='action' "
-          :key=" 'cgbtn'+index "
-          @click="cgButtonActionHandler(item.buttonCode)"
-          type="primary"
-          :icon="item.buttonIcon"
-          style="margin-left:8px">
-          {{ item.buttonName }}
-        </a-button>
-      </template>
-
-      <a-button
-        v-if="buttonSwitch.batch_delete"
-        @click="handleDelBatch"
-        style="margin-left:8px"
-        v-show="selectedRowKeys.length > 0"
-        ghost
-        type="primary"
-        icon="delete">批量删除</a-button>
-    </div>
-
-    <div>
-      <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
-        <i class="anticon anticon-info-circle ant-alert-icon"></i>
-        已选择&nbsp;<a style="font-weight: 600">{{ selectedRowKeys.length }}</a>项&nbsp;&nbsp;
-        <a style="margin-left: 24px" @click="onClearSelected">清空</a>
-      </div>
-
-      <a-table
-        ref="cgformTreeList"
-        size="middle"
-        rowKey="id"
-        :columns="columns"
-        :dataSource="dataSource"
-        :pagination="pagination"
-        :loading="loading"
-        @change="handleTableChange"
-        v-bind="tableProps"
-        @expand="handleExpand"
-        style="min-height: 300px"
-        :expandedRowKeys="expandedRowKeys">
-
-        <template slot="dateSlot" slot-scope="text">
-          <span>{{ getDateNoTime(text) }}</span>
-        </template>
-
-        <template slot="htmlSlot" slot-scope="text">
-          <div v-html="text"></div>
-        </template>
-
-        <template slot="imgSlot" slot-scope="text">
-          <span v-if="!text" style="font-size: 12px;font-style: italic;">无图片</span>
-          <img v-else :src="getImgView(text)" height="25px" alt="图片不存在" style="max-width:80px;font-size: 12px;font-style: italic;"/>
-        </template>
-
-        <template slot="fileSlot" slot-scope="text">
-          <span v-if="!text" style="font-size: 12px;font-style: italic;">无文件</span>
-          <a-button
-            v-else
-            :ghost="true"
-            type="primary"
-            icon="download"
-            size="small"
-            @click="downloadRowFile(text)">
-            下载
-          </a-button>
-        </template>
-
-        <span slot="action" slot-scope="text, record">
-
-          <template v-if="showOptButton('update',record)">
-            <a @click="handleEdit(record)">编辑</a>
-            <a-divider type="vertical"/>
-          </template>
-
-          <a-dropdown>
-            <a class="ant-dropdown-link">
-              更多 <a-icon type="down" />
-            </a>
-            <a-menu slot="overlay">
-              <a-menu-item >
-                <a @click="handleDetail(record)">详情</a>
-              </a-menu-item>
-              <a-menu-item v-if="showOptButton('delete',record)">
-                <a-popconfirm title="确定删除吗?" @confirm="() => handleDeleteOne(record)">
-                  <a>删除</a>
-                </a-popconfirm>
-              </a-menu-item>
-              <!-- 自定义按钮 -->
-              <template v-if="cgButtonLinkList && cgButtonLinkList.length>0" v-for="(btnItem,btnIndex) in cgButtonLinkList">
-                <a-menu-item :key=" 'cgbtnLink'+btnIndex ">
-                  <a href="javascript:void(0);" @click="cgButtonLinkHandler(record,btnItem.buttonCode,btnItem.optType)">
-                    <a-icon v-if="btnItem.buttonIcon" :type="btnItem.buttonIcon" />
-                    {{ btnItem.buttonName }}
-                  </a>
-                </a-menu-item>
-              </template>
-
-            </a-menu>
-          </a-dropdown>
-        </span>
-
-      </a-table>
-
-      <onl-cgform-auto-modal @success="handleFormSuccess" ref="modal" :code="code"></onl-cgform-auto-modal>
-
-      <j-import-modal ref="importModal" :url="getImportUrl()" @ok="importOk"></j-import-modal>
-
-    </div>
-  </a-card>
-</template>
-
-<script>
-
-  import { getAction,postAction,deleteAction,downFile } from '@/api/manage'
-  import { filterMultiDictText } from '@/components/dict/JDictSelectUtil'
-  import { filterObj } from '@/utils/util';
-  import JImportModal from '@/components/jeecg/JImportModal'
-
-  export default {
-    name: 'OnlCgformTreeList',
-    components: {
-      JImportModal,
-    },
-    data() {
-      return {
-        code: '87b55a515d3441b6b98e48e5b35474a6',
-        description: '在线报表功能测试页面',
-        currentTableName:"",
-        pidField:"",
-        hasChildrenField:"",
-        textField:'',
-        loading: false,
-        // 表头
-        columns: [],
-        //数据集
-        dataSource: [],
-        // 选择器
-        selectedRowKeys: [],
-        selectionRows: [],
-        // 分页参数
-        pagination: {
-          current: 1,
-          pageSize: 10,
-          pageSizeOptions: ['10', '20', '30'],
-          showTotal: (total, range) => {
-            return range[0] + '-' + range[1] + ' 共' + total + '条'
-          },
-          showQuickJumper: true,
-          showSizeChanger: true,
-          total: 0
-        },
-
-        url: {
-          getColumns: '/online/cgform/api/getColumns/',
-          getTreeData: '/online/cgform/api/getTreeData/',
-          optPre:"/online/cgform/api/form/",
-          exportXls:'/online/cgform/api/exportXls/',
-          buttonAction:'/online/cgform/api/doButton',
-        },
-        isorter:{
-          column: 'create_time',
-          order: 'desc',
-        },
-        dictOptions:{
-
-        },
-
-        queryParam:{
-
-        },
-        actionColumn:{
-          title: '操作',
-          dataIndex: 'action',
-          scopedSlots: { customRender: 'action' },
-          fixed:"right",
-          align:"center",
-          width:150
-        },
-        formTemplate:"99",
-
-        /*自定义按钮-link*/
-        cgButtonLinkList:[],
-        /*自定义按钮-button*/
-        cgButtonList:[],
-        /*JS增强*/
-        EnhanceJS:'',
-        /*操作按钮权限*/
-        buttonSwitch:{
-          add:true,
-          update:true,
-          delete:true,
-          batch_delete:true,
-          import:true,
-          export:true
-        },
-        expandedRowKeys:[],
-        hasBpmStatus:false,
-        flowCodePre:"onl_",
-
-      }
-    },
-    created() {
-      this.initAutoListConfig().then(()=>{
-        this.loadData(1)
-      }).catch(msg=>{
-        console.log(msg)
-      })
-    },
-    mounted(){
-      //this.cgButtonJsHandler('mounted')
-    },
-    watch: {
-      '$route'() {
-        // 刷新参数放到这里去触发，就可以刷新相同界面了
-        this.initAutoListConfig().then(()=>{
-          this.loadData(1)
-        }).catch(msg=>{
-          console.log(msg)
-        })
-      }
-    },
-    computed: {
-      tableProps() {
-        let _this = this
-        return {
-          // 列表项是否可选择
-          // https://vue.ant.design/components/table-cn/#rowSelection
-          rowSelection: {
-            selectedRowKeys: _this.selectedRowKeys,
-            onChange: (selectedRowKeys) => _this.selectedRowKeys = selectedRowKeys
-          }
-        }
-      }
-    },
-    methods: {
-      resetData(){
-        this.description=''
-        this.currentTableName=''
-        this.pidField=''
-        this.hasChildrenField=''
-        this.textField=''
-        this.columns = []
-        this.dataSource = []
-        this.selectedRowKeys=[]
-        this.selectionRows=[]
-      },
-      initAutoListConfig() {
-        return new Promise((resolve, reject) => {
-          if (!this.$route.params.code) {
-            reject("列表加载需要参数CODE为空!")
-          } else {
-            this.resetData()
-            this.loading = true
-            this.code = this.$route.params.code
-            getAction(`${this.url.getColumns}${this.code}`)
-              .then(res => {
-                console.log("--onlineList-加载动态列>>", res);
-                if(res.success){
-                  this.configInfohandler(res)
-                  resolve();
-                }else{
-                  reject("onlineList-加载表配置信息失败")
-                }
-                this.loading = false
-              })
-              .catch(err => {
-                reject(err)
-              })
-          }
-        })
-      },
-      configInfohandler(res){
-        this.dictOptions = res.result.dictOptions
-        this.formTemplate = res.result.formTemplate
-        this.description = res.result.description
-        this.currentTableName = res.result.currentTableName
-        this.pidField = res.result.pidField
-        this.hasChildrenField = res.result.hasChildrenField
-        this.textField = res.result.textField
-        //自定义按钮
-        this.initCgButtonList(res.result.cgButtonList)
-        //JS增强
-        this.initCgEnhanceJs(res.result.enhanceJs)
-        //操作按钮权限
-        this.initButtonSwitch(res.result.hideColumns)
-        let currColumns = res.result.columns
-        let textFieldIndex = -1
-        let hasBpmStatus = false
-        for(let a=0;a<currColumns.length;a++){
-          currColumns[a].align = 'left'
-          //找到显示列
-          if(this.textField==currColumns[a].dataIndex){
-            textFieldIndex = a
-          }
-          //数据字典翻译
-          if(currColumns[a].customRender){
-            let dictCode = currColumns[a].customRender;
-            currColumns[a].customRender=(text)=>{
-              return filterMultiDictText(this.dictOptions[dictCode], text);
-            }
-          }
-          //判断是否有bpm_status
-          if(currColumns[a].dataIndex.toLowerCase()=='bpm_status'){
-            hasBpmStatus = true;
-          }
-        }
-        this.hasBpmStatus = hasBpmStatus;
-
-        if(textFieldIndex!=-1){
-          let textFieldColumn = currColumns.splice(textFieldIndex,1)
-          currColumns.unshift(textFieldColumn[0])
-        }
-        currColumns.push(this.actionColumn);
-        this.columns = [...currColumns]
-      },
-      //加载根节点
-      loadData(arg){
-        if(arg==1){
-          this.pagination.current=1
-        }
-        this.loading = true
-        this.expandedRowKeys=[]
-        let params = this.getQueryParams();//查询条件
-        params[this.pidField]='0'
-        console.log("--onlineList-查询条件-->",params)
-        getAction(`${this.url.getTreeData}${this.code}`,params).then((res)=>{
-          console.log("--onlineList-列表数据",res)
-          if(res.success){
-            let result = res.result;
-            if(Number(result.total)>0){
-              this.pagination.total = Number(result.total)
-              let dataSource = res.result.records.map(item => {
-                // 判断是否标记了带有子级
-                if (item[this.hasChildrenField] === true || item[this.hasChildrenField]=='1') {
-                  let loadChild = { id: `${item.id}_loadChild`, name: 'loading...', isLoading: true }
-                  item.children = [loadChild]
-                }
-                return item
-              })
-              this.dataSource = dataSource
-            }else{
-              this.pagination.total=0;
-              this.dataSource=[]
-            }
-          }else{
-            this.$message.warning(res.message)
-          }
-          this.loading = false
-        })
-      },
-      //加载叶子节点
-      handleExpand(expanded, record) {
-        // 判断是否是展开状态
-        if (expanded) {
-          this.expandedRowKeys.push(record.id)
-          if (record.children.length>0 && record.children[0].isLoading === true) {
-            let params = this.getQueryParams();//查询条件
-            params[this.pidField] = record.id
-            getAction(`${this.url.getTreeData}${this.code}`,params).then((res)=>{
-              if(res.success){
-                if(Number(res.result.total)>0){
-                  let dataSource = res.result.records.map(item => {
-                    // 判断是否标记了带有子级
-                    if (item[this.hasChildrenField] === true || item[this.hasChildrenField]=='1') {
-                      let loadChild = { id: `${item.id}_loadChild`, name: 'loading...', isLoading: true }
-                      item.children = [loadChild]
-                    }
-                    return item
-                  })
-                  record.children = dataSource
-                }else{
-                  record.children=''
-                  record.hasChildrenField='0'
-                }
-              }else{
-                this.$message.warning(res.message)
-              }
-            })
-          }
-        }else{
-          let keyIndex = this.expandedRowKeys.indexOf(record.id)
-          if(keyIndex>=0){
-            this.expandedRowKeys.splice(keyIndex, 1);
-          }
-        }
-      },
-      getQueryParams() {
-        let param = Object.assign({}, this.queryParam,this.isorter);
-        param.pageNo = this.pagination.current;
-        param.pageSize = this.pagination.pageSize;
-        return filterObj(param);
-      },
-      initCgButtonList(btnList){
-        let linkArr = []
-        let buttonArr = []
-        if(btnList && btnList.length>0){
-          for(let i=0;i<btnList.length;i++){
-            let temp = btnList[i]
-            if(temp.buttonStyle=='button'){
-              buttonArr.push(temp)
-            }else if(temp.buttonStyle=='link'){
-              linkArr.push(temp)
-            }
-          }
-        }
-        this.cgButtonLinkList = [...linkArr]
-        this.cgButtonList=[...buttonArr]
-      },
-      initCgEnhanceJs(enhanceJs){
-        //console.log("--onlineList-js增强",enhanceJs)
-        if(enhanceJs){
-          let Obj = eval ("(" + enhanceJs + ")");
-          this.EnhanceJS = new Obj(getAction,postAction,deleteAction);
-          this.cgButtonJsHandler('created')
-        }else{
-          this.EnhanceJS = ''
-        }
-      },
-      initButtonSwitch(hideColumns){
-        if(hideColumns && hideColumns.length>0){
-          Object.keys(this.buttonSwitch).forEach(key=>{
-            if(hideColumns.indexOf(key)>=0){
-              this.buttonSwitch[key]=false
-            }
-          })
-
-        }
-      },
-      onClearSelected(){
-        this.selectedRowKeys = []
-        this.selectionRows = []
-      },
-      handleTableChange(pagination, filters, sorter){
-        //TODO 筛选
-        if (Object.keys(sorter).length>0){
-          this.isorter.column = sorter.field;
-          this.isorter.order = "ascend"==sorter.order?"asc":"desc"
-        }
-        this.pagination = pagination;
-        this.loadData();
-      },
-      /*-------数据格式化-begin----------*/
-      getDateNoTime(text){
-        if(!text){
-          return ''
-        }
-        let a = text;
-        if(a.length>10){
-          a = a.substring(0,10);
-        }
-        return a;
-      },
-      getImgView(text){
-        if(text && text.indexOf(",")>0){
-          text = text.substring(0,text.indexOf(","))
-        }
-        return window._CONFIG['staticDomainURL']+"/"+text
-      },
-      downloadRowFile(text){
-        if(!text){
-          this.$message.warning("未知的文件")
-          return;
-        }
-        if(text.indexOf(",")>0){
-          text = text.substring(0,text.indexOf(","))
-        }
-        window.open(window._CONFIG['staticDomainURL']+"/"+text);
-      },
-      /*-------数据格式化-end----------*/
-
-      /*-------功能按钮触发事件-begin----------*/
-      handleEdit(record){
-        this.cgButtonLinkHandler(record,"beforeEdit","js")
-        this.$refs.modal.edit(this.formTemplate,record.id);
-      },
-      handleDetail(record){
-        this.$refs.modal.detail(this.formTemplate,record.id);
-      },
-      handleDeleteOne(record){
-        this.cgButtonLinkHandler(record,"beforeDelete","js")
-        this.handleDelete(record.id)
-      },
-      handleDelete(id){
-        deleteAction(this.url.optPre+this.code+"/"+id).then((res)=>{
-          if(res.success){
-            this.$message.success(res.message)
-            this.loadData()
-          }else{
-            this.$message.warning(res.message)
-          }
-        })
-      },
-      handleAdd(){
-        this.cgButtonJsHandler('beforeAdd')
-        this.$refs.modal.add(this.formTemplate);
-      },
-      handleFormSuccess(){
-        this.loadData()
-      },
-      handleImportXls(){
-        this.$refs.importModal.show()
-      },
-      importOk(){
-        this.loadData(1)
-      },
-      getImportUrl(){
-        return '/online/cgform/api/importXls/'+this.code
-      },
-      handleExportXls(){
-        let param = this.queryParam;
-        if(this.selectedRowKeys && this.selectedRowKeys.length>0){
-          param['selections'] = this.selectedRowKeys.join(",")
-        }
-        console.log("导出参数",param)
-        let paramsStr = JSON.stringify(filterObj(param));
-        downFile(this.url.exportXls+this.code,{paramsStr:paramsStr}).then((data)=>{
-          if (!data) {
-            this.$message.warning("文件下载失败")
-            return
-          }
-          if (typeof window.navigator.msSaveBlob !== 'undefined') {
-            window.navigator.msSaveBlob(new Blob([data]), this.description+'.xls')
-          }else{
-            let url = window.URL.createObjectURL(new Blob([data]))
-            let link = document.createElement('a')
-            link.style.display = 'none'
-            link.href = url
-            link.setAttribute('download', this.description+'.xls')
-            document.body.appendChild(link)
-            link.click()
-            document.body.removeChild(link); //下载完成移除元素
-            window.URL.revokeObjectURL(url); //释放掉blob对象
-          }
-        })
-      },
-      handleDelBatch(){
-        if(this.selectedRowKeys.length<=0){
-          this.$message.warning('请选择一条记录！');
-          return false;
-        }else{
-          let ids = "";
-          let that = this;
-          that.selectedRowKeys.forEach(function(val) {
-            ids+=val+",";
-          });
-          that.$confirm({
-            title:"确认删除",
-            content:"是否删除选中数据?",
-            onOk: function(){
-              that.handleDelete(ids)
-              that.onClearSelected();
-            }
-          });
-        }
-      },
-      /*-------功能按钮触发事件-begin----------*/
-
-      /*-------JS增强-begin----------*/
-      cgButtonLinkHandler(record,buttonCode,optType){
-        if(optType=="js"){
-          if(this.EnhanceJS[buttonCode]){
-            this.EnhanceJS[buttonCode](this,record)
-          }
-        }else if(optType=="action"){
-          let params = {
-            formId:this.code,
-            buttonCode:buttonCode,
-            dataId:record.id
-          }
-          console.log("自定义按钮link请求后台参数：",params)
-          postAction(this.url.buttonAction,params).then(res=>{
-            if(res.success){
-              this.loadData()
-              this.$message.success("处理完成!")
-            }else{
-              this.$message.warning("处理失败!")
-            }
-          })
-        }
-      },
-      cgButtonJsHandler(buttonCode){
-        if(this.EnhanceJS[buttonCode]){
-          this.EnhanceJS[buttonCode](this)
-        }
-      },
-      cgButtonActionHandler(buttonCode){
-        //处理自定义button的 需要配置该button自定义sql
-        if(!this.selectedRowKeys || this.selectedRowKeys.length==0){
-          this.$message.warning("请先选中一条记录")
-          return false
-        }
-        if(this.selectedRowKeys.length>1){
-          this.$message.warning("请只选中一条记录")
-          return false
-        }
-        let params = {
-          formId:this.code,
-          buttonCode:buttonCode,
-          dataId:this.selectedRowKeys[0]
-        }
-        console.log("自定义按钮请求后台参数：",params)
-        postAction(this.url.buttonAction,params).then(res=>{
-          if(res.success){
-            this.loadData()
-            this.$message.success("处理完成!")
-          }else{
-            this.$message.warning("处理失败!")
-          }
-        })
-
-      },
-      /*-------JS增强-end----------*/
-      showOptButton(opt,record){
-        //只有当按钮属性为false,或是按钮属性为true但是流程已提交时才隐藏
-        if(!this.buttonSwitch[opt]){
-          return false
-        }else{
-          if(this.hasBpmStatus){
-            if(record.bpm_status !=null && record.bpm_status !='' && record.bpm_status != '1'){
-              return false
-            }
-          }
-        }
-        return true
-      },
-      showViewFlowButton(record){
-        if(this.hasBpmStatus){
-          if(record.bpm_status !=null && record.bpm_status !='' && record.bpm_status != '1'){
-            return true
-          }
-        }
-        return false
-      },
-      startProcess: function(record){
-        var that = this;
-        this.$confirm({
-          title:"提示",
-          content:"确认提交流程吗?",
-          onOk: function(){
-            var param = {
-              flowCode:that.flowCodePre+that.currentTableName,
-              id:record.id,
-              formUrl:"modules/bpm/task/form/OnlineFormDetail",
-              formUrlMobile:"modules/bpm/task/form/OnlineFormDetail"
-            }
-            postAction(that.url.startProcess,param).then((res)=>{
-              if(res.success){
-                that.$message.success(res.message);
-                that.loadData();
-                that.onClearSelected();
-              }else{
-                that.$message.warning(res.message);
-              }
-            });
-          }
-        });
-      },
-
-    }
-  }
-</script>
-<style>
-  .ant-card-body .table-operator{
-    margin-bottom: 18px;
-  }
-  .ant-table-tbody .ant-table-row td{
-    padding-top:15px;
-    padding-bottom:15px;
-  }
-  .anty-row-operator button{margin: 0 5px}
-  .ant-btn-danger{background-color: #ffffff}
-
-  .anty-img-wrap{height:25px;position: relative;}
-  .anty-img-wrap > img{max-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-content{height:90% !important;overflow-y: hidden}
-</style>
\ No newline at end of file
diff --git a/jshERP-web/src/views/modules/online/cgform/auto/erp/OnlCgformErpList.vue b/jshERP-web/src/views/modules/online/cgform/auto/erp/OnlCgformErpList.vue
deleted file mode 100644
index b96fd39c..00000000
--- a/jshERP-web/src/views/modules/online/cgform/auto/erp/OnlCgformErpList.vue
+++ /dev/null
@@ -1,111 +0,0 @@
-<template>
-  <a-card :bordered="false" style="height: 100%">
-    <online-common-list
-      :ref="'onl_'+mainModel.currentTableName"
-      :code="code"
-      :model="mainModel"
-      @seleted="onSelected">
-    </online-common-list>
-
-    <a-tabs defaultActiveKey="0">
-      <a-tab-pane v-for="(item,index) in subList" :tab="item.description" :key="index+''" :forceRender="true" >
-        <online-common-list
-          :ref="item.currentTableName"
-          :code="item.code"
-          :model="item"
-          :main="selectedRow">
-        </online-common-list>
-      </a-tab-pane>
-    </a-tabs>
-  </a-card>
-</template>
-
-<script>
-  import { getAction } from '@/api/manage'
-
-  export default {
-    name: 'OnlCgformErpList',
-    components:{
-    },
-    data(){
-      return {
-        code:'',
-        url: {
-          getColumns: '/online/cgform/api/getErpColumns/',
-        },
-        mainModel:{},
-        subList:[],
-        mainId:'',
-        selectedRow:{}
-
-      }
-    },
-    watch: {
-      '$route'() {
-        // 刷新参数放到这里去触发，就可以刷新相同界面了
-        this.initColumnConfig()
-      }
-    },
-
-    created() {
-      this.initColumnConfig();
-    },
-    methods:{
-      getSubIndex(index){
-        return index+1 + ''
-      },
-      getSubRef(item){
-        let ref = item.currentTableName
-        console.log("ref string",ref)
-        return ref;
-      },
-      initColumnConfig(){
-        if(!this.$route.params.code){
-          return false
-        }
-        this.code = this.$route.params.code
-        getAction(`${this.url.getColumns}${this.code}`).then((res)=>{
-          console.log("erp表单配置",res)
-          if(res.success){
-            this.mainModel = res.result.main
-            this.subList = res.result.subList
-
-            this.$nextTick(()=>{
-              this.$refs['onl_'+this.mainModel.currentTableName].initListByModel();
-              if(this.subList && this.subList.length>0){
-                for(let item of this.subList){
-                  this.$refs[item.currentTableName][0].initListByModel();
-                }
-              }
-            });
-
-          }
-        })
-      },
-      onSelected(row){
-        console.log("onSelected",row)
-        this.selectedRow = row;
-      }
-
-
-    }
-  }
-</script>
-
-<style>
-  .ant-card-body .table-operator{
-    margin-bottom: 18px;
-  }
-  .ant-table-tbody .ant-table-row td{
-    padding-top:15px;
-    padding-bottom:15px;
-  }
-  .anty-row-operator button{margin: 0 5px}
-  .ant-btn-danger{background-color: #ffffff}
-
-  .anty-img-wrap{height:25px;position: relative;}
-  .anty-img-wrap > img{max-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-content{height:90% !important;overflow-y: hidden}
-</style>
\ No newline at end of file
diff --git a/jshERP-web/src/views/modules/online/cgform/util/TableUtils.js b/jshERP-web/src/views/modules/online/cgform/util/TableUtils.js
deleted file mode 100644
index cccca017..00000000
--- a/jshERP-web/src/views/modules/online/cgform/util/TableUtils.js
+++ /dev/null
@@ -1,269 +0,0 @@
-/**
- * 同步列表，可以同步新增、修改、删除
- * @author sunjianlei
- * */
-export async function syncAllTable(vm, table1) {
-  vm.$refs.editableTable.resetScrollTop()
-  let deleteIds = table1.$refs.editableTable.getDeleteIds()
-  let table1Value
-  await table1.$refs.editableTable.getValuesPromise(false).then((values) => {
-    table1Value = values
-    return vm.$refs.editableTable.getValuesPromise(false)
-  }).then((values) => {
-
-    table1Value.forEach(value => {
-      let flag = false
-      values.forEach((thisValue) => {
-        if (value.id === thisValue.id) {
-
-          // 判断是否修改了值
-          let dbFieldName = thisValue['dbFieldName']
-          let dbFieldTxt = thisValue['dbFieldTxt']
-
-          // return
-
-          if (value.dbFieldName !== dbFieldName
-            || value.dbFieldTxt !== dbFieldTxt) {
-
-            // 修改了
-            vm.$refs.editableTable.setValues([{
-              rowKey: thisValue.id,
-              values: {
-                dbFieldName: value.dbFieldName,
-                dbFieldTxt: value.dbFieldTxt
-              }
-            }])
-
-          }
-          flag = true
-        } else {
-          // id不匹配则有可能是新增也有可能是删除了的
-          // 遍历传进来的 deleteIds 进行对比
-          deleteIds.forEach(delId => {
-            // 对比成功，则删除该条数据
-            if (delId === thisValue.id) {
-              vm.$refs.editableTable.removeRows(vm.$refs.editableTable.caseId + delId)
-              flag = true
-            }
-          })
-        }
-      })
-      // return
-      // 判断是否操作了该条数据，若没有操作则代表要执行新增操作
-      if (!flag) {
-        let record = Object.assign({}, value)
-        vm.columns.forEach(column => {
-          if (
-            column.dataIndex !== 'dbFieldName' &&
-            column.dataIndex !== 'dbFieldTxt'
-          ) {
-            record[column.dataIndex] = column.defaultValue
-          }
-        })
-        vm.$refs.editableTable.push(record)
-      }
-    })
-  })
-
-}
-
-/**
- * 将数据分类并Set进dataSource
- * @author sunjianlei
- **/
-export function setDataSource(vm, queryData) {
-  let dataSource = []
-  // 遍历查询出来的数据
-  queryData.forEach(value => {
-
-    let data = { id: value['id'] }
-    vm.columns.forEach(column => {
-      let key = column.key
-      if (key) {
-        data[key] = value[key]
-
-        // 由于多选下拉框返回的是一个数组，所以需要改成 [1,2,3] 数组的形式，否则组件不识别
-        // if (key === 'indexField') {
-        //   data[key] = value[key].split(',')
-        // }
-
-      }
-    })
-    dataSource.push(data)
-  })
-  vm.dataSource = dataSource
-}
-
-/** 获取主表的初始化数据 */
-export function getMasterTableInitialData() {
-  return [
-    {
-      dbFieldName: 'id',
-      dbFieldTxt: '主键',
-      dbLength: 36,
-      dbPointLength: 0,
-      dbDefaultVal: '',
-      dbType: 'string',
-      dbIsKey: '1',
-      dbIsNull: '0',
-      // table2
-      isShowForm: '0',
-      isShowList: '0',
-      isReadOnly: '1',
-      fieldShowType: 'text',
-      fieldLength: '120',
-      queryMode: 'single',
-      orderNum: 1
-    },
-    {
-      dbFieldName: 'create_by',
-      dbFieldTxt: '创建人',
-      dbLength: 50,
-      dbPointLength: 0,
-      dbDefaultVal: '',
-      dbType: 'string',
-      dbIsKey: '0',
-      dbIsNull: '1',
-      // table2
-      isShowForm: '0',
-      isShowList: '0',
-      fieldShowType: 'text',
-      fieldLength: '120',
-      queryMode: 'single',
-      orderNum: 2
-    },
-    {
-      dbFieldName: 'create_time',
-      dbFieldTxt: '创建日期',
-      dbLength: 20,
-      dbPointLength: 0,
-      dbDefaultVal: '',
-      dbType: 'Date',
-      dbIsKey: '0',
-      dbIsNull: '1',
-      // table2
-      isShowForm: '0',
-      isShowList: '0',
-      fieldShowType: 'datetime',
-      fieldLength: '120',
-      queryMode: 'single',
-      orderNum: 3
-    },
-    {
-      dbFieldName: 'update_by',
-      dbFieldTxt: '更新人',
-      dbLength: 50,
-      dbPointLength: 0,
-      dbDefaultVal: '',
-      dbType: 'string',
-      dbIsKey: '0',
-      dbIsNull: '1',
-      // table2
-      isShowForm: '0',
-      isShowList: '0',
-      fieldShowType: 'text',
-      fieldLength: '120',
-      queryMode: 'single',
-      orderNum: 4
-    },
-    {
-      dbFieldName: 'update_time',
-      dbFieldTxt: '更新日期',
-      dbLength: 20,
-      dbPointLength: 0,
-      dbDefaultVal: '',
-      dbType: 'Date',
-      dbIsKey: '0',
-      dbIsNull: '1',
-      // table2
-      isShowForm: '0',
-      isShowList: '0',
-      fieldShowType: 'datetime',
-      fieldLength: '120',
-      queryMode: 'single',
-      orderNum: 5
-    },{
-      dbFieldName: 'sys_org_code',
-      dbFieldTxt: '所属部门',
-      dbLength: 64,
-      dbPointLength: 0,
-      dbDefaultVal: '',
-      dbType: 'string',
-      dbIsKey: '0',
-      dbIsNull: '1',
-      // table2
-      isShowForm: '0',
-      isShowList: '0',
-      fieldShowType: 'text',
-      fieldLength: '120',
-      queryMode: 'single',
-      orderNum: 6
-    }
-    // {
-    //   dbFieldName: 'sys_org_code',
-    //   dbFieldTxt: '所属部门',
-    //   dbLength: 50,
-    //   dbPointLength: 0,
-    //   dbDefaultVal: '',
-    //   dbType: 'string',
-    //   dbIsKey: false,
-    //   dbIsNull: true
-    // }, {
-    //   dbFieldName: 'sys_company_code',
-    //   dbFieldTxt: '所属公司',
-    //   dbLength: 50,
-    //   dbPointLength: 0,
-    //   dbDefaultVal: '',
-    //   dbType: 'string',
-    //   dbIsKey: false,
-    //   dbIsNull: true
-    // }, {
-    //   dbFieldName: 'bpm_status',
-    //   dbFieldTxt: '流程状态',
-    //   dbLength: 32,
-    //   dbPointLength: 0,
-    //   dbDefaultVal: '',
-    //   dbType: 'string',
-    //   dbIsKey: false,
-    //   dbIsNull: true
-    // }
-  ]
-}
-/** 获取树的初始化数据 */
-export function getTreeNeedFields() {
-  return [{
-    dbFieldName: 'pid',
-    dbFieldTxt: '父级节点',
-    dbLength: 32,
-    dbPointLength: 0,
-    dbDefaultVal: '',
-    dbType: 'string',
-    dbIsKey: '0',
-    dbIsNull: '1',
-    // table2
-    isShowForm: '1',
-    isShowList: '0',
-    fieldShowType: 'text',
-    fieldLength: '120',
-    queryMode: 'single',
-    orderNum: 7
-  },{
-    dbFieldName: 'has_child',
-    dbFieldTxt: '是否有子节点',
-    dbLength: 3,
-    dbPointLength: 0,
-    dbDefaultVal: '',
-    dbType: 'string',
-    dbIsKey: '0',
-    dbIsNull: '1',
-    // table2
-    isShowForm: '0',
-    isShowList: '0',
-    fieldShowType: 'list',
-    fieldLength: '120',
-    queryMode: 'single',
-    orderNum: 8,
-    // table3
-    dictField:"yn"
-  }]
-}
\ No newline at end of file
diff --git a/jshERP-web/src/views/modules/online/cgreport/OnlCgreportHeadList.vue b/jshERP-web/src/views/modules/online/cgreport/OnlCgreportHeadList.vue
deleted file mode 100644
index 2532f53c..00000000
--- a/jshERP-web/src/views/modules/online/cgreport/OnlCgreportHeadList.vue
+++ /dev/null
@@ -1,256 +0,0 @@
-<template>
-  <a-card :bordered="false">
-
-    <!-- 查询区域 -->
-    <div class="table-page-search-wrapper">
-      <a-form layout="inline">
-        <a-row :gutter="24">
-
-          <a-col :xl="6" :lg="7" :md="8" :sm="24">
-            <a-form-item label="报表编码">
-              <a-input placeholder="请输入报表编码" v-model="queryParam.code"></a-input>
-            </a-form-item>
-          </a-col>
-          <a-col :xl="6" :lg="7" :md="8" :sm="24">
-            <a-form-item label="报表名字">
-              <a-input placeholder="请输入报表名字" v-model="queryParam.name"></a-input>
-            </a-form-item>
-          </a-col>
-
-          <a-col :xl="6" :lg="7" :md="8" :sm="24">
-            <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
-              <a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
-              <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
-            </span>
-          </a-col>
-
-        </a-row>
-      </a-form>
-    </div>
-
-    <!-- 操作按钮区域 -->
-    <div class="table-operator">
-      <a-button @click="handleAdd" type="primary" icon="plus">录入</a-button>
-
-      <a-dropdown v-if="selectedRowKeys.length > 0">
-        <a-menu slot="overlay">
-          <a-menu-item key="1" @click="batchDel">
-            <a-icon type="delete"/>
-            删除
-          </a-menu-item>
-        </a-menu>
-        <a-button style="margin-left: 8px"> 批量操作
-          <a-icon type="down"/>
-        </a-button>
-      </a-dropdown>
-    </div>
-
-    <!-- table区域-begin -->
-    <div>
-      <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
-        <i class="anticon anticon-info-circle ant-alert-icon"></i>
-        已选择
-        <a style="font-weight: 600">
-          {{ selectedRowKeys.length }}
-        </a>
-        项
-        <a style="margin-left: 24px" @click="onClearSelected">清空</a>
-      </div>
-
-      <a-table
-        ref="table"
-        size="middle"
-        bordered
-        rowKey="id"
-        :columns="columns"
-        :dataSource="dataSource"
-        :pagination="ipagination"
-        :loading="loading"
-        :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
-        @change="handleTableChange">
-
-        <span slot="action" slot-scope="text, record">
-          <a @click="handleEdit(record)">编辑</a>
-
-          <a-divider type="vertical"/>
-          <a-dropdown>
-            <a class="ant-dropdown-link">更多 <a-icon type="down"/></a>
-            <a-menu slot="overlay">
-              <a-menu-item @click="popReportURL(record.id)">
-                配置地址
-              </a-menu-item>
-              <a-menu-item>
-                <a @click="goPageOnline(record.id)">功能测试</a>
-              </a-menu-item>
-              <a-menu-item>
-                <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
-                  <a>删除</a>
-                </a-popconfirm>
-              </a-menu-item>
-            </a-menu>
-          </a-dropdown>
-        </span>
-
-      </a-table>
-    </div>
-    <!-- table区域-end -->
-
-    <!-- 表单区域 -->
-    <onlCgreportHead-modal ref="modalForm" @ok="modalFormOk"></onlCgreportHead-modal>
-
-    <!-- 提示online报表链接 -->
-    <a-modal
-      title="报表访问链接"
-      :visible="visible"
-      @cancel="handleCancel">
-      <template slot="footer">
-        <a-button @click="handleCancel">关闭</a-button>
-        <a-button type="primary" class="copy-this-text" :data-clipboard-text="reportUrlText" @click="onCopyUrl">复制</a-button>
-      </template>
-      <p>{{ reportUrlText }}</p>
-    </a-modal>
-  </a-card>
-</template>
-
-<script>
-  import {JeecgListMixin} from '@/mixins/JeecgListMixin'
-  import Clipboard from 'clipboard'
-  import { getAction } from '@/api/manage'
-
-  export default {
-    name: 'OnlCgreportHeadList',
-    mixins: [JeecgListMixin],
-    components: {
-      Clipboard
-    },
-    data() {
-      return {
-        description: '在线报表配置管理页面',
-        visible:false,
-        reportUrlText:'',
-        // 表头
-        columns: [
-          {
-            title: '报表名称',
-            align: 'center',
-            dataIndex: 'name'
-          },
-          {
-            title: '编码',
-            align: 'center',
-            dataIndex: 'code'
-          },
-          {
-            title: '查询SQL',
-            align: 'center',
-            dataIndex: 'cgrSql'
-          },
-          {
-            title: '数据源',
-            align: 'center',
-            dataIndex: 'dbSource'
-          },
-          {
-            title: '创建时间',
-            align: 'center',
-            dataIndex: 'createTime'
-          },
-          {
-            title: '描述',
-            align: 'center',
-            dataIndex: 'content'
-          },
-          {
-            title: '操作',
-            dataIndex: 'action',
-            align: 'center',
-            scopedSlots: { customRender: 'action' }
-          }
-        ],
-        url: {
-          list: '/online/cgreport/head/list',
-          delete: '/online/cgreport/head/delete',
-          deleteBatch: '/online/cgreport/head/deleteBatch',
-          getParamsInfo:'/online/cgreport/api/getParamsInfo/'
-        }
-      }
-    },
-    methods: {
-      initReportUrlText(id){
-        getAction(this.url.getParamsInfo+id).then((res) => {
-          let textUrl = ""
-          if (res.success) {
-            if(res.result && res.result.length>0){
-              for(let i of res.result){
-                textUrl+=i.paramName+"=${"+i.paramName+"}&"
-              }
-            }
-          } else {
-            this.$message.warning(res.message)
-          }
-          if(textUrl.length>0){
-            textUrl = textUrl.substring(0,textUrl.length-1)
-            this.reportUrlText = `/online/cgreport/${id}?${textUrl}`
-          }else{
-            this.reportUrlText = `/online/cgreport/${id}`
-          }
-        })
-      },
-      goPageOnline(id){
-        this.$router.push({path: '/online/cgreport/'+id})
-      },
-      popReportURL(id){
-        this.visible = true;
-        this.initReportUrlText(id)
-      },
-      handleCancel(){
-        this.visible = false
-        this.reportUrlText = '';
-      },
-      onCopyUrl(){
-        var clipboard = new Clipboard('.copy-this-text')
-        clipboard.on('success', () => {
-          clipboard.destroy()
-          this.$message.success('复制成功')
-          this.handleCancel()
-        })
-        clipboard.on('error', () => {
-          this.$message.error('该浏览器不支持自动复制')
-          clipboard.destroy()
-        })
-      }
-    }
-  }
-</script>
-<style lang="less" scoped>
-  .ant-card-body .table-operator {
-    margin-bottom: 18px;
-  }
-
-  .ant-table-tbody .ant-table-row td {
-    padding-top: 15px;
-    padding-bottom: 15px;
-  }
-
-  .anty-row-operator button {
-    margin: 0 5px
-  }
-
-  .ant-btn-danger {
-    background-color: #ffffff
-  }
-
-  .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-content {
-    height: 90% !important;
-    overflow-y: hidden
-  }
-</style>
\ No newline at end of file
diff --git a/jshERP-web/src/views/modules/online/cgreport/auto/OnlCgreportAutoList.vue b/jshERP-web/src/views/modules/online/cgreport/auto/OnlCgreportAutoList.vue
deleted file mode 100644
index 6736263d..00000000
--- a/jshERP-web/src/views/modules/online/cgreport/auto/OnlCgreportAutoList.vue
+++ /dev/null
@@ -1,320 +0,0 @@
-<template>
-  <a-card :bordered="false" style="height: 100%">
-
-    <div class="table-page-search-wrapper">
-      <a-form layout="inline">
-        <a-row :gutter="24" v-if="queryInfo && queryInfo.length>0">
-          <template v-for="(item,index) in queryInfo">
-            <template v-if=" item.hidden==='1' ">
-              <a-col v-if="item.view.indexOf('Date')>=0" :md="12" :sm="16" :key=" 'query'+index " v-show="toggleSearchStatus">
-                <onl-cgreport-query-form-item :queryParam="queryParam" :item="item" :dictOptions="dictOptions"></onl-cgreport-query-form-item>
-              </a-col>
-              <a-col v-else :md="6" :sm="8" :key=" 'query'+index " v-show="toggleSearchStatus">
-                <onl-cgreport-query-form-item :queryParam="queryParam" :item="item" :dictOptions="dictOptions"></onl-cgreport-query-form-item>
-              </a-col>
-            </template>
-            <template v-else>
-              <a-col v-if="item.view.indexOf('Date')>=0" :md="12" :sm="16" :key=" 'query'+index ">
-                <onl-cgreport-query-form-item :queryParam="queryParam" :item="item" :dictOptions="dictOptions"></onl-cgreport-query-form-item>
-              </a-col>
-              <a-col v-else :md="6" :sm="8" :key=" 'query'+index ">
-                <onl-cgreport-query-form-item :queryParam="queryParam" :item="item" :dictOptions="dictOptions"></onl-cgreport-query-form-item>
-              </a-col>
-            </template>
-          </template>
-
-          <a-col :md="6" :sm="8">
-            <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
-              <a-button type="primary" @click="searchByQuery" icon="search">查询</a-button>
-              <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
-              <a @click="handleToggleSearch" style="margin-left: 8px">
-                {{ toggleSearchStatus ? '收起' : '展开' }}
-                <a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>
-              </a>
-            </span>
-          </a-col>
-        </a-row>
-      </a-form>
-    </div>
-
-
-    <div class="table-operator" style="margin-bottom: 10px">
-      <a-button type="primary" icon="plus" @click="exportExcel">导出</a-button>
-    </div>
-
-
-    <a-table
-      ref="table"
-      size="middle"
-      bordered
-      rowKey="id"
-      :columns="table.columns"
-      :dataSource="table.dataSource"
-      :pagination="table.pagination"
-      :loading="table.loading"
-      :scroll="table.scroll"
-      :rowSelection="{fixed:true, selectedRowKeys: table.selectedRowKeys, onChange: handleChangeInTableSelect}"
-      @change="handleChangeInTable"
-      style="min-height: 300px"
-    >
-
-      <!-- 支持链接href跳转 -->
-      <template
-        v-for="field of fieldHrefSlots"
-        :slot="field.slotName"
-        slot-scope="text, record"
-      >
-        <a @click="handleClickFieldHref(field,record)">{{ text }}</a>
-      </template>
-
-    </a-table>
-
-    <!-- 跳转Href的动态组件方式 -->
-    <a-modal v-bind="hrefComponent.model" v-on="hrefComponent.on">
-      <component :is="hrefComponent.is" v-bind="hrefComponent.params"/>
-    </a-modal>
-
-  </a-card>
-</template>
-
-<script>
-  import { HrefJump } from '@/mixins/OnlAutoListMixin'
-  import { getAction,downFile } from '@/api/manage'
-  import { filterMultiDictText } from '@/components/dict/JDictSelectUtil'
-  import {filterObj} from '@/utils/util';
-
-  export default {
-    name: 'OnlCgreportAutoList',
-    mixins: [HrefJump],
-    components: {
-    },
-    data() {
-      return {
-        // 查询参数
-        queryInfo: [],
-        // 查询参数，多个页面的查询参数用 code 作为键来区分
-        queryParamsMap: {},
-        selfParam:{
-        },
-        sorter: {
-          column: '',
-          order: 'desc',
-        },
-        dictOptions: {},
-        toggleSearchStatus: false, // 高级搜索 展开/关闭
-        reportCode: '',
-        description: '在线报表功能测试页面',
-        url: {
-          getColumnsAndData: '/online/cgreport/api/getColumnsAndData/',
-          getQueryInfo: '/online/cgreport/api/getQueryInfo/',
-          getParamsInfo:'/online/cgreport/api/getParamsInfo/'
-        },
-        table: {
-          loading: true,
-          // 表头
-          columns: [],
-          //数据集
-          dataSource: [],
-          // 选择器
-          selectedRowKeys: [],
-          selectionRows: [],
-          scroll: { x: false },
-          // 分页参数
-          pagination: {
-            current: 1,
-            pageSize: 10,
-            pageSizeOptions: ['10', '20', '30'],
-            showTotal: (total, range) => {
-              return range[0] + '-' + range[1] + ' 共' + total + '条'
-            },
-            showQuickJumper: true,
-            showSizeChanger: true,
-            total: 0
-          }
-        },
-        cgreportHeadName:""
-      }
-    },
-    mounted() {
-      this.initParamsInfo()
-      this.initQueryInfo();
-    },
-    watch: {
-      '$route'() {
-        // 刷新参数放到这里去触发，就可以刷新相同界面了
-        this.initParamsInfo()
-        this.initQueryInfo();
-      }
-    },
-    computed: {
-      queryParam: {
-        get() {
-          return this.queryParamsMap[this.reportCode]
-        },
-        set(newVal) {
-          this.$set(this.queryParamsMap, this.reportCode, newVal)
-        }
-      }
-    },
-    methods: {
-      initParamsInfo(){
-        if(!this.$route.params.code){
-          return false
-        }
-        //获取报表ID
-        this.reportCode = this.$route.params.code;
-        if (!this.queryParam) {
-          this.queryParam = {}
-        }
-
-        this.selfParam={}
-        getAction(`${this.url.getParamsInfo}${this.reportCode}`).then((res) => {
-          if (res.success) {
-            if(res.result && res.result.length>0){
-              for(let i of res.result){
-                this.selfParam['self_'+i.paramName]=(!this.$route.query[i.paramName])?"":this.$route.query[i.paramName]
-              }
-            }
-          } else {
-            this.$message.warning(res.message)
-          }
-          this.loadData()
-        })
-      },
-
-      initQueryInfo() {
-        if(!this.reportCode){
-          return false
-        }
-        getAction(`${this.url.getQueryInfo}${this.reportCode}`).then((res) => {
-          console.log("获取查询条件", res);
-          if (res.success) {
-            this.queryInfo = res.result
-          } else {
-            this.$message.warning(res.message)
-          }
-        })
-      },
-      loadData(arg) {
-        if(!this.reportCode){
-          return false
-        }
-        if (arg == 1) {
-          this.table.pagination.current = 1
-        }
-        let params = this.getQueryParams();//查询条件
-        console.log(params)
-
-        //获取报表ID
-        console.log(' 动态报表 reportCode ： ' + this.reportCode);
-        this.table.loading = true
-
-        getAction(`${this.url.getColumnsAndData}${this.reportCode}`, params).then(res => {
-          if (res.success) {
-            let { data, columns, cgreportHeadName, dictOptions, fieldHrefSlots } = res.result
-
-            let columnWidth = 230
-            this.dictOptions = dictOptions
-            for(let a=0;a<columns.length;a++){
-              if(columns[a].customRender){
-                let field_name = columns[a].customRender;
-                columns[a].customRender = (t => t ? filterMultiDictText(this.dictOptions[field_name], t + '') : t)
-              }
-              columns.width = columnWidth
-            }
-            this.table.scroll.x = columns.length * columnWidth
-            this.table.columns = [...columns]
-            this.cgreportHeadName = cgreportHeadName
-            this.fieldHrefSlots = fieldHrefSlots
-            if (data) {
-              this.table.pagination.total = Number(data.total)
-              this.table.dataSource = data.records
-            } else {
-              this.table.pagination.total = 0
-              this.table.dataSource = []
-            }
-
-          }else{
-            this.$message.warn('查询失败：'+res.message)
-          }
-
-        }).catch((e) => {
-          console.error(e)
-          this.$message.error('查询失败')
-        }).finally(() => {
-          this.table.loading = false
-        })
-      },
-      getQueryParams() {
-        let param = Object.assign({}, this.queryParam, this.sorter,this.selfParam);
-        param.pageNo = this.table.pagination.current;
-        param.pageSize = this.table.pagination.pageSize;
-        return filterObj(param);
-      },
-      searchByQuery() {
-        this.loadData(1);
-      },
-      searchReset() {
-        this.queryParam = {}
-        this.loadData(1);
-      },
-      handleToggleSearch() {
-        this.toggleSearchStatus = !this.toggleSearchStatus;
-      },
-      exportExcel() {
-        let fileName = this.cgreportHeadName
-        let selfParam = {}
-        for (let queryName in this.$route.query) {
-          if (this.$route.query.hasOwnProperty(queryName)) {
-            let value = this.$route.query[queryName]
-            selfParam['self_' + queryName] = value || ''
-          }
-        }
-        downFile(`/online/cgreport/api/exportXls/${this.reportCode}`, Object.assign(selfParam, this.queryParam)).then((data) => {
-          if (!data) {
-            this.$message.warning("文件下载失败")
-            return
-          }
-          if (typeof window.navigator.msSaveBlob !== 'undefined') {
-            window.navigator.msSaveBlob(new Blob([data]), fileName+'.xls')
-          }else{
-            let url = window.URL.createObjectURL(new Blob([data]))
-            let link = document.createElement('a')
-            link.style.display = 'none'
-            link.href = url
-            link.setAttribute('download', fileName+'.xls')
-            document.body.appendChild(link)
-            link.click()
-            document.body.removeChild(link); //下载完成移除元素
-            window.URL.revokeObjectURL(url); //释放掉blob对象
-          }
-        })
-      },
-      handleChangeInTableSelect(selectedRowKeys, selectionRows) {
-        this.table.selectedRowKeys = selectedRowKeys
-        this.table.selectionRows = selectionRows
-      },
-      handleChangeInTable(pagination, filters, sorter) {
-        //分页、排序、筛选变化时触发
-        if (Object.keys(sorter).length > 0) {
-          this.sorter.column = sorter.field
-          this.sorter.order = 'ascend' == sorter.order ? 'asc' : 'desc'
-        } else {
-          this.sorter.column = null
-          this.sorter.order = null
-        }
-        this.table.pagination = pagination
-        this.loadData()
-      }
-
-    }
-  }
-</script>
-<style scoped>
-  .div {
-    display: flex;
-    align-items: center;
-    height: 500px
-  }
-
-</style>
\ No newline at end of file
diff --git a/jshERP-web/src/views/modules/oss/OSSFileList.vue b/jshERP-web/src/views/modules/oss/OSSFileList.vue
deleted file mode 100644
index ca5d34cf..00000000
--- a/jshERP-web/src/views/modules/oss/OSSFileList.vue
+++ /dev/null
@@ -1,196 +0,0 @@
-<template>
-  <a-card :bordered="false">
-    <!-- 查询区域 -->
-    <div class="table-page-search-wrapper">
-      <a-form layout="inline" @keyup.enter.native="searchQuery">
-        <a-row :gutter="24">
-          <a-col :md="6" :sm="8">
-            <a-form-item label="文件名称">
-              <a-input placeholder="请输入文件名称" v-model="queryParam.fileName"></a-input>
-            </a-form-item>
-          </a-col>
-          <a-col :md="6" :sm="8">
-            <a-form-item label="文件地址">
-              <a-input placeholder="请输入文件地址" v-model="queryParam.url"></a-input>
-            </a-form-item>
-          </a-col>
-          <a-col :md="6" :sm="8">
-            <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
-              <a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
-              <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
-            </span>
-          </a-col>
-        </a-row>
-      </a-form>
-    </div>
-
-    <!-- 操作按钮区域 -->
-    <div class="table-operator">
-      <!--      <a-button type="primary" icon="download" @click="handleExportXls('文件列表')">导出</a-button>-->
-      <a-upload
-          name="file"
-          :multiple="false"
-          :action="uploadAction"
-          :headers="tokenHeader"
-          :showUploadList="false"
-          :beforeUpload="beforeUpload"
-          @change="handleChange">
-        <a-button>
-          <a-icon type="upload"/>
-          OSS文件上传
-        </a-button>
-      </a-upload>
-
-      <a-upload
-        name="file"
-        :multiple="false"
-        :action="minioUploadAction"
-        :headers="tokenHeader"
-        :showUploadList="false"
-        :beforeUpload="beforeUpload"
-        @change="handleChange">
-        <a-button>
-          <a-icon type="upload"/>
-          MINIO文件上传
-        </a-button>
-      </a-upload>
-    </div>
-
-    <!-- table区域-begin -->
-    <div>
-      <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
-        <i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a
-          style="font-weight: 600">{{
-        selectedRowKeys.length }}</a>项
-        <a style="margin-left: 24px" @click="onClearSelected">清空</a>
-      </div>
-
-      <a-table
-          ref="table"
-          size="middle"
-          bordered
-          rowKey="id"
-          :columns="columns"
-          :dataSource="dataSource"
-          :pagination="ipagination"
-          :loading="loading"
-          :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
-          @change="handleTableChange">
-
-        <span slot="action" slot-scope="text, record">
-          <a @click="handlePreview(record)">预览</a>
-          <a-divider type="vertical"/>
-          <a @click="ossDelete(record.id)">删除</a>
-        </span>
-
-      </a-table>
-    </div>
-    <!-- table区域-end -->
-  </a-card>
-</template>
-
-<script>
-  import {JeecgListMixin} from '@/mixins/JeecgListMixin'
-
-  export default {
-    name: "OSSFileList",
-    mixins: [JeecgListMixin],
-    data() {
-      return {
-        description: '文件列表',
-        // 表头
-        columns: [
-          {
-            title: '#',
-            dataIndex: '',
-            key: 'rowIndex',
-            width: 60,
-            align: "center",
-            customRender: function (t, r, index) {
-              return parseInt(index) + 1;
-            }
-          },
-          {
-            title: '文件名称',
-            align: "center",
-            dataIndex: 'fileName'
-          },
-          {
-            title: '文件地址',
-            align: "center",
-            dataIndex: 'url'
-          },
-          {
-            title: '操作',
-            dataIndex: 'action',
-            align: "center",
-            scopedSlots: {customRender: 'action'},
-          }
-        ],
-        url: {
-          upload: "/oss/file/upload",
-          list: "/oss/file/list",
-          delete: "/oss/file/delete",
-          minioUpload: "/sys/upload/uploadMinio"
-        }
-      }
-    },
-    computed: {
-      uploadAction() {
-        return window._CONFIG['domianURL'] + this.url.upload;
-      },
-      minioUploadAction() {
-        return window._CONFIG['domianURL'] + this.url.minioUpload;
-      },
-    },
-    methods: {
-      beforeUpload(file) {
-        var fileType = file.type;
-        if (fileType === 'image') {
-          if (fileType.indexOf('image') < 0) {
-            this.$message.warning('请上传图片');
-            return false;
-          }
-        } else if (fileType === 'file') {
-          if (fileType.indexOf('image') >= 0) {
-            this.$message.warning('请上传文件');
-            return false;
-          }
-        }
-        return true
-      },
-      handleChange(info) {
-        if (info.file.status === 'done') {
-          if (info.file.response.success) {
-            this.loadData()
-            this.$message.success(`${info.file.name} 上传成功!`);
-          } else {
-            this.$message.error(`${info.file.response.message}`);
-          }
-        } else if (info.file.status === 'error') {
-          this.$message.error(`${info.file.response.message}`);
-        }
-      },
-      ossDelete(id) {
-        var that = this;
-        that.$confirm({
-          title: "确认删除",
-          content: "是否删除选中文件?",
-          onOk: function () {
-            that.handleDelete(id)
-          }
-        });
-      },
-      handlePreview(record) {
-        if (record && record.url) {
-          let url = window._CONFIG['onlinePreviewDomainURL'] + '?url=' + encodeURIComponent(record.url)
-          window.open(url, '_blank')
-        }
-      }
-    }
-  }
-</script>
-
-<style scoped>
-  @import '~@assets/less/common.less';
-</style>
diff --git a/jshERP-web/src/views/profile/advanced/Advanced.vue b/jshERP-web/src/views/profile/advanced/Advanced.vue
deleted file mode 100644
index af448439..00000000
--- a/jshERP-web/src/views/profile/advanced/Advanced.vue
+++ /dev/null
@@ -1,342 +0,0 @@
-<template>
-  <page-layout title="单号：234231029431" logo="https://gw.alipayobjects.com/zos/rmsportal/nxkuOJlFJuAUhzlMTCEe.png">
-
-    <detail-list slot="headerContent" size="small" :col="2" class="detail-layout">
-      <detail-list-item term="创建人">曲丽丽</detail-list-item>
-      <detail-list-item term="订购产品">XX服务</detail-list-item>
-      <detail-list-item term="创建时间">2018-08-07</detail-list-item>
-      <detail-list-item term="关联单据"><a>12421</a></detail-list-item>
-      <detail-list-item term="生效日期">2018-08-07 ~ 2018-12-11</detail-list-item>
-      <detail-list-item term="备注">请于两个工作日内确认</detail-list-item>
-    </detail-list>
-    <a-row slot="extra" class="status-list">
-      <a-col :xs="12" :sm="12">
-        <div class="text">状态</div>
-        <div class="heading">待审批</div>
-      </a-col>
-      <a-col :xs="12" :sm="12">
-        <div class="text">订单金额</div>
-        <div class="heading">¥ 568.08</div>
-      </a-col>
-    </a-row>
-    <!-- actions -->
-    <template slot="action">
-      <a-button-group style="margin-right: 4px;">
-        <a-button>操作</a-button>
-        <a-button>操作</a-button>
-        <a-button><a-icon type="ellipsis"/></a-button>
-      </a-button-group>
-      <a-button type="primary" >主操作</a-button>
-    </template>
-
-    <a-card :bordered="false" title="流程进度">
-      <a-steps :direction="isMobile() && 'vertical' || 'horizontal'" :current="1" progressDot>
-        <a-step title="创建项目">
-        </a-step>
-        <a-step title="部门初审">
-        </a-step>
-        <a-step title="财务复核">
-        </a-step>
-        <a-step title="完成">
-        </a-step>
-      </a-steps>
-    </a-card>
-
-    <a-card style="margin-top: 24px" :bordered="false" title="用户信息">
-      <detail-list>
-        <detail-list-item term="用户姓名">付晓晓</detail-list-item>
-        <detail-list-item term="会员卡号">32943898021309809423</detail-list-item>
-        <detail-list-item term="身份证">3321944288191034921</detail-list-item>
-        <detail-list-item term="联系方式">18112345678</detail-list-item>
-        <detail-list-item term="联系地址">浙江省杭州市西湖区黄姑山路工专路交叉路口</detail-list-item>
-      </detail-list>
-      <detail-list title="信息组">
-        <detail-list-item term="某某数据">725</detail-list-item>
-        <detail-list-item term="该数据更新时间">2018-08-08</detail-list-item>
-        <detail-list-item >&nbsp;</detail-list-item>
-        <detail-list-item term="某某数据">725</detail-list-item>
-        <detail-list-item term="该数据更新时间">2018-08-08</detail-list-item>
-        <detail-list-item >&nbsp;</detail-list-item>
-      </detail-list>
-      <a-card type="inner" title="多层信息组">
-        <detail-list title="组名称" size="small">
-          <detail-list-item term="负责人">林东东</detail-list-item>
-          <detail-list-item term="角色码">1234567</detail-list-item>
-          <detail-list-item term="所属部门">XX公司-YY部</detail-list-item>
-          <detail-list-item term="过期时间">2018-08-08</detail-list-item>
-          <detail-list-item term="描述">这段描述很长很长很长很长很长很长很长很长很长很长很长很长很长很长...</detail-list-item>
-        </detail-list>
-        <a-divider style="margin: 16px 0" />
-        <detail-list title="组名称" size="small" :col="1">
-          <detail-list-item term="学名">	Citrullus lanatus (Thunb.) Matsum. et Nakai一年生蔓生藤本；茎、枝粗壮，具明显的棱。卷须较粗..</detail-list-item>
-        </detail-list>
-        <a-divider style="margin: 16px 0" />
-        <detail-list title="组名称" size="small" :col="2">
-          <detail-list-item term="负责人">付小小</detail-list-item>
-          <detail-list-item term="角色码">1234567</detail-list-item>
-        </detail-list>
-      </a-card>
-
-    </a-card>
-
-    <a-card style="margin-top: 24px" :bordered="false" title="用户近半年来电记录">
-      <div class="no-data"><a-icon type="frown-o"/>暂无数据</div>
-    </a-card>
-
-    <!-- 操作 -->
-    <a-card
-      style="margin-top: 24px"
-      :bordered="false"
-      :tabList="tabList"
-      :activeTabKey="activeTabKey"
-      @tabChange="(key) => {this.activeTabKey = key}"
-    >
-      <a-table
-        v-if="activeTabKey === '1'"
-        :columns="operationColumns"
-        :dataSource="operation1"
-        :pagination="false"
-      >
-        <template
-          slot="status"
-          slot-scope="status">
-          <a-badge :status="status | statusTypeFilter" :text="status | statusFilter"/>
-        </template>
-      </a-table>
-      <a-table
-        v-if="activeTabKey === '2'"
-        :columns="operationColumns"
-        :dataSource="operation2"
-        :pagination="false"
-      >
-        <template
-          slot="status"
-          slot-scope="status">
-          <a-badge :status="status | statusTypeFilter" :text="status | statusFilter"/>
-        </template>
-      </a-table>
-      <a-table
-        v-if="activeTabKey === '3'"
-        :columns="operationColumns"
-        :dataSource="operation3"
-        :pagination="false"
-      >
-        <template
-          slot="status"
-          slot-scope="status">
-          <a-badge :status="status | statusTypeFilter" :text="status | statusFilter"/>
-        </template>
-      </a-table>
-    </a-card>
-
-  </page-layout>
-</template>
-
-<script>
-  import { mixinDevice } from '@/utils/mixin.js'
-  import PageLayout from '@/components/page/PageLayout'
-  import DetailList from '@/components/tools/DetailList'
-
-  const DetailListItem = DetailList.Item
-
-  export default {
-    name: "Advanced",
-    components: {
-      PageLayout,
-      DetailList,
-      DetailListItem
-    },
-    mixins: [mixinDevice],
-    data () {
-      return {
-        tabList: [
-          {
-            key: '1',
-            tab: '操作日志一'
-          },
-          {
-            key: '2',
-            tab: '操作日志二'
-          },
-          {
-            key: '3',
-            tab: '操作日志三'
-          }
-        ],
-        activeTabKey: '1',
-
-        operationColumns: [
-          {
-            title: '操作类型',
-            dataIndex: 'type',
-            key: 'type'
-          },
-          {
-            title: '操作人',
-            dataIndex: 'name',
-            key: 'name'
-          },
-          {
-            title: '执行结果',
-            dataIndex: 'status',
-            key: 'status',
-            scopedSlots: { customRender: 'status' },
-          },
-          {
-            title: '操作时间',
-            dataIndex: 'updatedAt',
-            key: 'updatedAt'
-          },
-          {
-            title: '备注',
-            dataIndex: 'remark',
-            key: 'remark'
-          }
-        ],
-        operation1: [
-          {
-            key: 'op1',
-            type: '订购关系生效',
-            name: '曲丽丽',
-            status: 'agree',
-            updatedAt: '2017-10-03  19:23:12',
-            remark: '-'
-          },
-          {
-            key: 'op2',
-            type: '财务复审',
-            name: '付小小',
-            status: 'reject',
-            updatedAt: '2017-10-03  19:23:12',
-            remark: '不通过原因'
-          },
-          {
-            key: 'op3',
-            type: '部门初审',
-            name: '周毛毛',
-            status: 'agree',
-            updatedAt: '2017-10-03  19:23:12',
-            remark: '-'
-          },
-          {
-            key: 'op4',
-            type: '提交订单',
-            name: '林东东',
-            status: 'agree',
-            updatedAt: '2017-10-03  19:23:12',
-            remark: '很棒'
-          },
-          {
-            key: 'op5',
-            type: '创建订单',
-            name: '汗牙牙',
-            status: 'agree',
-            updatedAt: '2017-10-03  19:23:12',
-            remark: '-'
-          }
-        ],
-        operation2: [
-          {
-            key: 'op2',
-            type: '财务复审',
-            name: '付小小',
-            status: 'reject',
-            updatedAt: '2017-10-03  19:23:12',
-            remark: '不通过原因'
-          },
-          {
-            key: 'op3',
-            type: '部门初审',
-            name: '周毛毛',
-            status: 'agree',
-            updatedAt: '2017-10-03  19:23:12',
-            remark: '-'
-          },
-          {
-            key: 'op4',
-            type: '提交订单',
-            name: '林东东',
-            status: 'agree',
-            updatedAt: '2017-10-03  19:23:12',
-            remark: '很棒'
-          }
-        ],
-        operation3: [
-          {
-            key: 'op2',
-            type: '财务复审',
-            name: '付小小',
-            status: 'reject',
-            updatedAt: '2017-10-03  19:23:12',
-            remark: '不通过原因'
-          },
-          {
-            key: 'op3',
-            type: '部门初审',
-            name: '周毛毛',
-            status: 'agree',
-            updatedAt: '2017-10-03  19:23:12',
-            remark: '-'
-          }
-        ],
-      }
-    },
-    filters: {
-      statusFilter(status) {
-        const statusMap = {
-          'agree': '成功',
-          'reject': '驳回'
-        }
-        return statusMap[status]
-      },
-      statusTypeFilter(type) {
-        const statusTypeMap = {
-          'agree': 'success',
-          'reject': 'error'
-        }
-        return statusTypeMap[type]
-      }
-    }
-  }
-</script>
-
-<style lang="less" scoped>
-
-  .detail-layout {
-    margin-left: 44px;
-  }
-  .text {
-    color: rgba(0, 0, 0, .45);
-  }
-
-  .heading {
-    color: rgba(0, 0, 0, .85);
-    font-size: 20px;
-  }
-
-  .no-data {
-    color: rgba(0, 0, 0, .25);
-    text-align: center;
-    line-height: 64px;
-    font-size: 16px;
-
-    i {
-      font-size: 24px;
-      margin-right: 16px;
-      position: relative;
-      top: 3px;
-    }
-  }
-
-  .mobile {
-    .detail-layout {
-      margin-left: unset;
-    }
-    .text {
-
-    }
-    .status-list {
-      text-align: left;
-    }
-  }
-</style>
\ No newline at end of file
diff --git a/jshERP-web/src/views/profile/basic/Index.vue b/jshERP-web/src/views/profile/basic/Index.vue
deleted file mode 100644
index 39dbd26e..00000000
--- a/jshERP-web/src/views/profile/basic/Index.vue
+++ /dev/null
@@ -1,255 +0,0 @@
-<template>
-  <page-layout :title="title">
-    <a-card :bordered="false">
-      <detail-list title="退款申请">
-        <detail-list-item term="取货单号">1000000000</detail-list-item>
-        <detail-list-item term="状态">已取货</detail-list-item>
-        <detail-list-item term="销售单号">1234123421</detail-list-item>
-        <detail-list-item term="子订单">3214321432</detail-list-item>
-      </detail-list>
-      <a-divider style="margin-bottom: 32px"/>
-      <detail-list title="用户信息">
-        <detail-list-item term="用户姓名">付小小</detail-list-item>
-        <detail-list-item term="联系电话">18100000000</detail-list-item>
-        <detail-list-item term="常用快递">菜鸟仓储</detail-list-item>
-        <detail-list-item term="取货地址">浙江省杭州市西湖区万塘路18号</detail-list-item>
-        <detail-list-item term="备注">	无</detail-list-item>
-      </detail-list>
-      <a-divider style="margin-bottom: 32px"/>
-
-      <div class="title">退货商品</div>
-      <s-table
-        style="margin-bottom: 24px" 
-        :columns="goodsColumns" 
-        :data="loadGoodsData">
-
-      </s-table>
-
-      <div class="title">退货进度</div>
-      <s-table
-        style="margin-bottom: 24px" 
-        :columns="scheduleColumns" 
-        :data="loadScheduleData">
-
-        <template
-          slot="status"
-          slot-scope="status">
-          <a-badge :status="status" :text="status | statusFilter"/>
-        </template>
-
-      </s-table>
-    </a-card>
-  </page-layout>
-</template>
-
-<script>
-  import PageLayout from '@/components/page/PageLayout'
-  import STable from '@/components/table/'
-  import DetailList from '@/components/tools/DetailList'
-  import ABadge from "ant-design-vue/es/badge/Badge"
-  const DetailListItem = DetailList.Item
-
-  export default {
-    components: {
-      PageLayout,
-      ABadge,
-      DetailList,
-      DetailListItem,
-      STable
-    },
-    data () {
-      return {
-        goodsColumns: [
-          {
-            title: '商品编号',
-            dataIndex: 'id',
-            key: 'id'
-          },
-          {
-            title: '商品名称',
-            dataIndex: 'name',
-            key: 'name'
-          },
-          {
-            title: '商品条码',
-            dataIndex: 'barcode',
-            key: 'barcode'
-          },
-          {
-            title: '单价',
-            dataIndex: 'price',
-            key: 'price',
-            align: 'right'
-          },
-          {
-            title: '数量（件）',
-            dataIndex: 'num',
-            key: 'num',
-            align: 'right'
-          },
-          {
-            title: '金额',
-            dataIndex: 'amount',
-            key: 'amount',
-            align: 'right'
-          }
-        ],
-        // 加载数据方法 必须为 Promise 对象
-        loadGoodsData: () => {
-          return new Promise((resolve => {
-            resolve({
-              data: [
-                {
-                  id: '1234561',
-                  name: '矿泉水 550ml',
-                  barcode: '12421432143214321',
-                  price: '2.00',
-                  num: '1',
-                  amount: '2.00'
-                },
-                {
-                  id: '1234562',
-                  name: '凉茶 300ml',
-                  barcode: '12421432143214322',
-                  price: '3.00',
-                  num: '2',
-                  amount: '6.00'
-                },
-                {
-                  id: '1234563',
-                  name: '好吃的薯片',
-                  barcode: '12421432143214323',
-                  price: '7.00',
-                  num: '4',
-                  amount: '28.00'
-                },
-                {
-                  id: '1234564',
-                  name: '特别好吃的蛋卷',
-                  barcode: '12421432143214324',
-                  price: '8.50',
-                  num: '3',
-                  amount: '25.50'
-                }
-              ],
-              pageSize: 10,
-              pageNo: 1,
-              totalPage: 1,
-              totalCount: 10
-            })
-          })).then(res => {
-            return res
-          })
-        },
-
-        scheduleColumns: [
-          {
-            title: '时间',
-            dataIndex: 'time',
-            key: 'time'
-          },
-          {
-            title: '当前进度',
-            dataIndex: 'rate',
-            key: 'rate'
-          },
-          {
-            title: '状态',
-            dataIndex: 'status',
-            key: 'status',
-            scopedSlots: { customRender: 'status' },
-          },
-          {
-            title: '操作员ID',
-            dataIndex: 'operator',
-            key: 'operator'
-          },
-          {
-            title: '耗时',
-            dataIndex: 'cost',
-            key: 'cost'
-          }
-        ],
-        loadScheduleData: () => {
-          return new Promise((resolve => {
-            resolve({
-              data: [
-                {
-                  key: '1',
-                  time: '2017-10-01 14:10',
-                  rate: '联系客户',
-                  status: 'processing',
-                  operator: '取货员 ID1234',
-                  cost: '5mins'
-                },
-                {
-                  key: '2',
-                  time: '2017-10-01 14:05',
-                  rate: '取货员出发',
-                  status: 'success',
-                  operator: '取货员 ID1234',
-                  cost: '1h'
-                },
-                {
-                  key: '3',
-                  time: '2017-10-01 13:05',
-                  rate: '取货员接单',
-                  status: 'success',
-                  operator: '取货员 ID1234',
-                  cost: '5mins'
-                },
-                {
-                  key: '4',
-                  time: '2017-10-01 13:00',
-                  rate: '申请审批通过',
-                  status: 'success',
-                  operator: '系统',
-                  cost: '1h'
-                },
-                {
-                  key: '5',
-                  time: '2017-10-01 12:00',
-                  rate: '发起退货申请',
-                  status: 'success',
-                  operator: '用户',
-                  cost: '5mins'
-                }
-              ],
-              pageSize: 10,
-              pageNo: 1,
-              totalPage: 1,
-              totalCount: 10
-            })
-          })).then(res => {
-            return res
-          })
-        },
-      }
-    },
-    filters: {
-      statusFilter(status) {
-        const statusMap = {
-          'processing': '进行中',
-          'success': '完成',
-          'failed': '失败'
-        }
-        return statusMap[status]
-      }
-    },
-    computed: {
-      title () {
-        return this.$route.meta.title
-      }
-    },
-
-  }
-</script>
-
-<style lang="less" scoped>
-  .title {
-    color: rgba(0,0,0,.85);
-    font-size: 16px;
-    font-weight: 500;
-    margin-bottom: 16px;
-  }
-</style>
\ No newline at end of file
diff --git a/jshERP-web/src/views/result/Error.vue b/jshERP-web/src/views/result/Error.vue
deleted file mode 100644
index 634c4b6e..00000000
--- a/jshERP-web/src/views/result/Error.vue
+++ /dev/null
@@ -1,45 +0,0 @@
-<template>
-  <a-card :bordered="false">
-    <result :is-success="false" :title="title" :description="description">
-      <template slot="action">
-        <a-button type="primary" >返回修改</a-button>
-      </template>
-      <div>
-        <div style="font-size: 16px; color: rgba(0, 0, 0, 0.85); font-weight: 500; margin-bottom: 16px">
-          您提交的内容有如下错误：
-        </div>
-        <div style="margin-bottom: 16px">
-          <a-icon type="close-circle-o" style="color: #f5222d; margin-right: 8px"/>
-          您的账户已被冻结
-          <a style="margin-left: 16px">立即解冻 <a-icon type="right" /></a>
-        </div>
-        <div>
-          <a-icon type="close-circle-o" style="color: #f5222d; margin-right: 8px"/>
-          您的账户还不具备申请资格
-          <a style="margin-left: 16px">立即升级 <a-icon type="right" /></a>
-        </div>
-      </div>
-    </result>
-  </a-card>
-</template>
-
-<script>
-  import Result from './Result'
-
-  export default {
-    name: "Error",
-    components: {
-      Result
-    },
-    data () {
-      return {
-        title: '提交失败',
-        description: '请核对并修改以下信息后，再重新提交。'
-      }
-    }
-  }
-</script>
-
-<style scoped>
-
-</style>
\ No newline at end of file
diff --git a/jshERP-web/src/views/result/Result.vue b/jshERP-web/src/views/result/Result.vue
deleted file mode 100644
index 09278d9b..00000000
--- a/jshERP-web/src/views/result/Result.vue
+++ /dev/null
@@ -1,91 +0,0 @@
-<template>
-  <div class="result">
-    <div>
-      <a-icon :class="[isSuccess ? 'success' : 'error' ,'icon']" :type="isSuccess ? 'check-circle' : 'close-circle'"/>
-    </div>
-    <div class="title" v-if="title">{{ title }}</div>
-    <div class="description" v-if="description">{{ description }}</div>
-    <div class="content" v-if="content">
-      <slot></slot>
-    </div>
-    <div class="action">
-      <slot name="action"></slot>
-    </div>
-  </div>
-</template>
-
-<script>
-  export default {
-    name: "Result",
-    // 'isSuccess', 'title', 'description'
-    props: {
-      isSuccess: {
-        type: Boolean,
-        default: false
-      },
-      title: {
-        type: String,
-        default: ''
-      },
-      description: {
-        type: String,
-        default: ''
-      },
-      content: {
-        type: Boolean,
-        default: true
-      }
-    }
-  }
-</script>
-
-<style lang="less" scoped>
-  .result {
-    text-align: center;
-    width: 72%;
-    margin: 0 auto;
-    padding: 24px 0 8px;
-
-    .icon {
-      font-size: 72px;
-      line-height: 72px;
-      margin-bottom: 24px;
-    }
-    .success {
-      color: #52c41a;
-    }
-    .error {
-      color: red;
-    }
-    .title {
-      font-size: 24px;
-      color: rgba(0, 0, 0, .85);
-      font-weight: 500;
-      line-height: 32px;
-      margin-bottom: 16px;
-    }
-    .description {
-      font-size: 14px;
-      line-height: 22px;
-      color: rgba(0, 0, 0, 0.45);
-      margin-bottom: 24px;
-    }
-    .content {
-      background: #fafafa;
-      padding: 24px 40px;
-      border-radius: 2px;
-      text-align: left;
-    }
-    .action {
-      margin-top: 32px;
-    }
-  }
-
-  .mobile {
-    .result {
-      width: 100%;
-      margin: 0 auto;
-      padding: unset;
-    }
-  }
-</style>
\ No newline at end of file
diff --git a/jshERP-web/src/views/result/Success.vue b/jshERP-web/src/views/result/Success.vue
deleted file mode 100644
index b5061e31..00000000
--- a/jshERP-web/src/views/result/Success.vue
+++ /dev/null
@@ -1,92 +0,0 @@
-<template>
-  <a-card :bordered="false">
-    <result :is-success="true" :description="description" :title="title">
-      <template slot="action">
-        <a-button type="primary">返回列表</a-button>
-        <a-button style="margin-left: 8px">查看项目</a-button>
-        <a-button style="margin-left: 8px">打印</a-button>
-      </template>
-      <div>
-        <div style="font-size: 16px; color: rgba(0, 0, 0, 0.85); font-weight: 500; margin-bottom: 20px;">项目名称</div>
-        <a-row style="margin-bottom: 16px">
-          <a-col :xs="24" :sm="12" :md="12" :lg="12" :xl="6">
-            <span style="color: rgba(0, 0, 0, 0.85)">项目 ID：</span>
-            20180724089
-          </a-col>
-          <a-col :xs="24" :sm="12" :md="12" :lg="12" :xl="6">
-            <span style="color: rgba(0, 0, 0, 0.85)">负责人：</span>
-            曲丽丽是谁？
-          </a-col>
-          <a-col :xs="24" :sm="24" :md="24" :lg="24" :xl="12">
-            <span style="color: rgba(0, 0, 0, 0.85)">生效时间：</span>
-            2016-12-12 ~ 2017-12-12
-          </a-col>
-        </a-row>
-        <a-steps :current="1" :direction="isMobile() && directionType.vertical || directionType.horizontal" progressDot>
-          <a-step >
-            <span style="font-size: 14px" slot="title">创建项目</span>
-            <template slot="description">
-              <div style="fontSize: 12px; color: rgba(0, 0, 0, 0.45); position: relative; left: 42px;" slot="description" >
-                <div style="margin: 8px 0 4px">
-                  曲丽丽
-                  <a-icon style="margin-left: 8px" type="dingding-o" />
-                </div>
-                <div>2016-12-12 12:32</div>
-              </div>
-            </template>
-          </a-step>
-          <a-step title="部门初审">
-            <span style="font-size: 14px" slot="title">部门初审</span>
-            <template slot="description">
-              <div style="fontSize: 12px; color: rgba(0, 0, 0, 0.45); position: relative; left: 42px;" slot="description" >
-                <div style="margin: 8px 0 4px">
-                  周毛毛
-                  <a-icon style="margin-left: 8px; color: #00A0E9" type="dingding-o" />
-                </div>
-                <div><a href="">催一下</a></div>
-              </div>
-            </template>
-          </a-step>
-          <a-step title="财务复核">
-            <span style="font-size: 14px" slot="title">财务复核</span>
-          </a-step>
-          <a-step title="完成" >
-            <span style="font-size: 14px" slot="title">完成</span>
-          </a-step>
-        </a-steps>
-      </div>
-    </result>
-  </a-card>
-</template>
-
-<script>
-  import Result from './Result'
-  import { mixinDevice } from '@/utils/mixin.js'
-
-  const directionType = {
-    horizontal: 'horizontal',
-    vertical: 'vertical'
-  }
-
-  export default {
-    name: "Success",
-    components: {
-      Result
-    },
-    mixins: [mixinDevice],
-    data () {
-      return {
-        title: '提交成功',
-        description: '提交结果页用于反馈一系列操作任务的处理结果，\n' +
-          ' 如果仅是简单操作，使用 Message 全局提示反馈即可。\n' +
-          ' 本文字区域可以展示简单的补充说明，如果有类似展示\n' +
-          ' “单据”的需求，下面这个灰色区域可以呈现比较复杂的内容。',
-        directionType
-      }
-    }
-  }
-</script>
-
-<style scoped>
-
-</style>
\ No newline at end of file
diff --git a/jshERP-web/src/views/system/AddressList.vue b/jshERP-web/src/views/system/AddressList.vue
deleted file mode 100644
index f6a1a412..00000000
--- a/jshERP-web/src/views/system/AddressList.vue
+++ /dev/null
@@ -1,31 +0,0 @@
-<template>
-  <a-row type="flex" :gutter="16">
-    <a-col :md="5" :sm="24">
-      <address-list-left v-model="currentOrgCode"/>
-    </a-col>
-    <a-col :md="24-5" :sm="24">
-      <address-list-right v-model="currentOrgCode"/>
-    </a-col>
-  </a-row>
-</template>
-
-<script>
-  import AddressListLeft from './modules/AddressListLeft'
-  import AddressListRight from './modules/AddressListRight'
-
-  export default {
-    name: 'AddressList',
-    components: { AddressListLeft, AddressListRight },
-    data() {
-      return {
-        description: '通讯录页面',
-        currentOrgCode: ''
-      }
-    },
-
-    methods: {}
-  }
-</script>
-<style scoped>
-  @import '~@assets/less/common.less';
-</style>
\ No newline at end of file
diff --git a/jshERP-web/src/views/system/DataLogList.vue b/jshERP-web/src/views/system/DataLogList.vue
deleted file mode 100644
index 98351e25..00000000
--- a/jshERP-web/src/views/system/DataLogList.vue
+++ /dev/null
@@ -1,138 +0,0 @@
-<template>
-  <a-card :bordered="false">
-    <!-- 查询区域 -->
-    <div class="table-page-search-wrapper">
-      <a-form layout="inline" @keyup.enter.native="searchQuery">
-        <a-row :gutter="24">
-          <a-col :md="6" :sm="8">
-            <a-form-item label="表名">
-              <a-input placeholder="请输入表名" v-model="queryParam.dataTable"></a-input>
-            </a-form-item>
-          </a-col>
-          <a-col :md="6" :sm="8">
-            <a-form-item label="数据ID">
-              <a-input placeholder="请输入ID" v-model="queryParam.dataId"></a-input>
-            </a-form-item>
-          </a-col>
-
-          <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
-               <a-col :md="6" :sm="24">
-                  <a-button type="primary" @click="searchQuery">查询</a-button>
-                  <a-button style="margin-left: 8px" @click="searchReset">重置</a-button>
-               </a-col>
-            </span>
-        </a-row>
-      </a-form>
-    </div>
-
-    <!-- 操作按钮区域 -->
-    <div class="table-operator">
-      <a-button @click="handleCompare()" type="primary" icon="plus">数据比较</a-button>
-    </div>
-
-    <!--table区 -->
-    <div>
-      <!--已选择的清空 -->
-      <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
-        <i class="anticon anticon-info-circle ant-alert-icon"></i>已选择&nbsp;<a style="font-weight: 600">{{ selectedRowKeys.length }}</a>项&nbsp;&nbsp;
-        <a style="margin-left: 24px" @click="onClearSelected">清空</a>
-      </div>
-      <a-table
-        ref="table"
-        size="middle"
-        bordered
-        rowKey="id"
-        :columns="columns"
-        :dataSource="dataSource"
-        :pagination="ipagination"
-        :loading="loading"
-        :rowSelection="{selectedRowKeys: selectedRowKeys,onChange: onSelectChange}"
-        @change="handleTableChange"
-      >
-        <!-- 字符串超长截取省略号显示-->
-        <span slot="dataContent" slot-scope="text, record">
-          <j-ellipsis :value="text" :length="80" />
-        </span>
-      </a-table>
-    </div>
-    <data-log-modal ref="modalForm" @ok="modalFormOk"></data-log-modal>
-  </a-card>
-</template>
-
-<script>
-  import DataLogModal from './modules/DataLogModal'
-  import {JeecgListMixin} from '@/mixins/JeecgListMixin'
-  import JEllipsis from "@/components/jeecg/JEllipsis";
-
-  export default {
-    name: 'DataLogList',
-    mixins: [JeecgListMixin],
-    components: {
-      JEllipsis,
-      DataLogModal
-    },
-    data() {
-      return {
-        description: '数据日志管理页面',
-        //表头
-        columns: [
-          {
-            title: '表名',
-            align: 'center',
-            dataIndex: 'dataTable',
-            width: "120"
-          }, {
-            title: '数据ID',
-            align: 'center',
-            dataIndex: 'dataId',
-            width: "120"
-          }, {
-            title: '版本号',
-            align: 'center',
-            dataIndex: 'dataVersion',
-            width: "50"
-          }, {
-            title: '数据内容',
-            align: 'center',
-            dataIndex: 'dataContent',
-            width: "150",
-            scopedSlots: {customRender: 'dataContent'},
-          }, {
-            title: '创建人',
-            align: 'center',
-            dataIndex: 'createBy',
-            width: "100"
-          },
-        ],
-        url: {
-          list: "/sys/dataLog/list",
-        },
-      }
-    },
-    methods: {
-      handleCompare: function () {
-        if (!this.selectionRows || this.selectionRows.length != 2) {
-          this.openNotifIcon('请选择两条数据');
-          return false;
-        } else if (this.selectionRows[0].dataId != this.selectionRows[1].dataId) {
-          this.openNotifIcon('请选择相同的数据库表和数据ID进行比较');
-          return false;
-        } else {
-          this.$refs.modalForm.addModal(this.selectionRows);
-          this.$refs.modalForm.title = "数据比较";
-        }
-      },
-      openNotifIcon(msg) {
-        this.$notification['warning']({
-          message: '提示信息',
-          description: msg,
-        });
-      },
-    }
-
-  }
-
-</script>
-<style scoped>
-  @import '~@assets/less/common.less'
-</style>
\ No newline at end of file
diff --git a/jshERP-web/src/views/system/DepartList.vue b/jshERP-web/src/views/system/DepartList.vue
deleted file mode 100644
index 95597b09..00000000
--- a/jshERP-web/src/views/system/DepartList.vue
+++ /dev/null
@@ -1,657 +0,0 @@
-<template xmlns:background-color="http://www.w3.org/1999/xhtml">
-  <a-row :gutter="10">
-    <a-col :md="12" :sm="24">
-      <a-card :bordered="false">
-
-        <!-- 按钮操作区域 -->
-        <a-row style="margin-left: 14px">
-          <a-button @click="handleAdd(1)" type="primary">添加部门</a-button>
-          <a-button @click="handleAdd(2)" type="primary">添加下级</a-button>
-          <a-button type="primary" icon="download" @click="handleExportXls('部门信息')">导出</a-button>
-          <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
-            <a-button type="primary" icon="import">导入</a-button>
-          </a-upload>
-          <a-button title="删除多条数据" @click="batchDel" type="default">批量删除</a-button>
-          <!--<a-button @click="refresh" type="default" icon="reload" :loading="loading">刷新</a-button>-->
-        </a-row>
-        <div style="background: #fff;padding-left:16px;height: 100%; margin-top: 5px">
-          <a-alert type="info" :showIcon="true">
-            <div slot="message">
-              当前选择：<span v-if="this.currSelected.title">{{ getCurrSelectedTitle() }}</span>
-              <a v-if="this.currSelected.title" style="margin-left: 10px" @click="onClearSelected">取消选择</a>
-            </div>
-          </a-alert>
-          <a-input-search @search="onSearch" style="width:100%;margin-top: 10px" placeholder="请输入部门名称"/>
-          <!-- 树-->
-          <a-col :md="10" :sm="24">
-            <template>
-              <a-dropdown :trigger="[this.dropTrigger]" @visibleChange="dropStatus">
-               <span style="user-select: none">
-            <a-tree
-              checkable
-              multiple
-              @select="onSelect"
-              @check="onCheck"
-              @rightClick="rightHandle"
-              :selectedKeys="selectedKeys"
-              :checkedKeys="checkedKeys"
-              :treeData="departTree"
-              :checkStrictly="checkStrictly"
-              :expandedKeys="iExpandedKeys"
-              :autoExpandParent="autoExpandParent"
-              @expand="onExpand"/>
-                </span>
-                <!--新增右键点击事件,和增加添加和删除功能-->
-                <a-menu slot="overlay">
-                  <a-menu-item @click="handleAdd(3)" key="1">添加</a-menu-item>
-                  <a-menu-item @click="handleDelete" key="2">删除</a-menu-item>
-                  <a-menu-item @click="closeDrop" key="3">取消</a-menu-item>
-                </a-menu>
-              </a-dropdown>
-            </template>
-          </a-col>
-        </div>
-      </a-card>
-      <!---- author:os_chengtgen -- date:20190827 --  for:切换父子勾选模式 =======------>
-      <div class="drawer-bootom-button">
-        <a-dropdown :trigger="['click']" placement="topCenter">
-          <a-menu slot="overlay">
-            <a-menu-item key="1" @click="switchCheckStrictly(1)">父子关联</a-menu-item>
-            <a-menu-item key="2" @click="switchCheckStrictly(2)">取消关联</a-menu-item>
-            <a-menu-item key="3" @click="checkALL">全部勾选</a-menu-item>
-            <a-menu-item key="4" @click="cancelCheckALL">取消全选</a-menu-item>
-            <a-menu-item key="5" @click="expandAll">展开所有</a-menu-item>
-            <a-menu-item key="6" @click="closeAll">合并所有</a-menu-item>
-          </a-menu>
-          <a-button>
-            树操作 <a-icon type="up" />
-          </a-button>
-        </a-dropdown>
-      </div>
-      <!---- author:os_chengtgen -- date:20190827 --  for:切换父子勾选模式 =======------>
-    </a-col>
-    <a-col :md="12" :sm="24">
-      <a-tabs defaultActiveKey="1">
-        <a-tab-pane tab="基本信息" key="1" >
-          <a-card :bordered="false" v-if="selectedKeys.length>0">
-            <a-form :form="form">
-              <a-form-item
-                :labelCol="labelCol"
-                :wrapperCol="wrapperCol"
-                label="机构名称">
-                <a-input placeholder="请输入机构/部门名称" v-decorator="['departName', validatorRules.departName ]"/>
-              </a-form-item>
-              <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="上级部门">
-                <a-tree-select
-                  style="width:100%"
-                  :dropdownStyle="{maxHeight:'200px',overflow:'auto'}"
-                  :treeData="treeData"
-                  :disabled="disable"
-                  v-model="model.parentId"
-                  placeholder="无">
-                </a-tree-select>
-              </a-form-item>
-              <a-form-item
-                :labelCol="labelCol"
-                :wrapperCol="wrapperCol"
-                label="机构编码">
-                <a-input disabled placeholder="请输入机构编码" v-decorator="['orgCode', validatorRules.orgCode ]"/>
-              </a-form-item>
-              <a-form-item
-                :labelCol="labelCol"
-                :wrapperCol="wrapperCol"
-                label="机构类型">
-                <template v-if="orgCategoryDisabled">
-                  <a-radio-group v-decorator="['orgCategory',validatorRules.orgCategory]" placeholder="请选择机构类型">
-                    <a-radio value="1">
-                      公司
-                    </a-radio>
-                  </a-radio-group>
-                </template>
-                <template v-else>
-                  <a-radio-group v-decorator="['orgCategory',validatorRules.orgCategory]" placeholder="请选择机构类型">
-                    <a-radio value="2">
-                      部门
-                    </a-radio>
-                    <a-radio value="3">
-                      岗位
-                    </a-radio>
-                  </a-radio-group>
-                </template>
-              </a-form-item>
-              <a-form-item
-                :labelCol="labelCol"
-                :wrapperCol="wrapperCol"
-                label="排序">
-                <a-input-number v-decorator="[ 'departOrder',{'initialValue':0}]"/>
-              </a-form-item>
-              <a-form-item
-                :labelCol="labelCol"
-                :wrapperCol="wrapperCol"
-                label="手机号">
-                <a-input placeholder="请输入手机号" v-decorator="['mobile', {'initialValue':''}]"/>
-              </a-form-item>
-              <a-form-item
-                :labelCol="labelCol"
-                :wrapperCol="wrapperCol"
-                label="地址">
-                <a-input placeholder="请输入地址" v-decorator="['address', {'initialValue':''}]"/>
-              </a-form-item>
-              <a-form-item
-                :labelCol="labelCol"
-                :wrapperCol="wrapperCol"
-                label="备注">
-                <a-textarea placeholder="请输入备注" v-decorator="['memo', {'initialValue':''}]"/>
-              </a-form-item>
-            </a-form>
-            <div class="anty-form-btn">
-              <a-button @click="emptyCurrForm" type="default" htmlType="button" icon="sync">重置</a-button>
-              <a-button @click="submitCurrForm" type="primary" htmlType="button" icon="form">保存</a-button>
-            </div>
-          </a-card>
-          <a-card v-else >
-            <a-empty>
-              <span slot="description"> 请先选择一个部门! </span>
-            </a-empty>
-          </a-card>
-        </a-tab-pane>
-        <a-tab-pane tab="部门权限" key="2" forceRender>
-          <depart-auth-modal ref="departAuth"/>
-        </a-tab-pane>
-      </a-tabs>
-
-    </a-col>
-    <depart-modal ref="departModal" @ok="loadTree"></depart-modal>
-  </a-row>
-</template>
-<script>
-  import DepartModal from './modules/DepartModal'
-  import pick from 'lodash.pick'
-  import {queryDepartTreeList, searchByKeywords, deleteByDepartId} from '@/api/api'
-  import {httpAction, deleteAction} from '@/api/manage'
-  import {JeecgListMixin} from '@/mixins/JeecgListMixin'
-  import DepartAuthModal from './modules/DepartAuthModal'
-  // 表头
-  const columns = [
-    {
-      title: '机构名称',
-      dataIndex: 'departName'
-    },
-    {
-      title: '机构类型',
-      align: 'center',
-      dataIndex: 'orgType'
-    },
-    {
-      title: '机构编码',
-      dataIndex: 'orgCode',
-    },
-    {
-      title: '手机号',
-      dataIndex: 'mobile'
-    },
-    {
-      title: '传真',
-      dataIndex: 'fax'
-    },
-    {
-      title: '地址',
-      dataIndex: 'address'
-    },
-    {
-      title: '排序',
-      align: 'center',
-      dataIndex: 'departOrder'
-    },
-    {
-      title: '操作',
-      align: 'center',
-      dataIndex: 'action',
-      scopedSlots: {customRender: 'action'}
-    }
-  ]
-  export default {
-    name: 'DepartList',
-    mixins: [JeecgListMixin],
-    components: {
-      DepartAuthModal,
-      DepartModal
-    },
-    data() {
-      return {
-        iExpandedKeys: [],
-        loading: false,
-        autoExpandParent: true,
-        currFlowId: '',
-        currFlowName: '',
-        disable: true,
-        treeData: [],
-        visible: false,
-        departTree: [],
-        rightClickSelectedKey: '',
-        rightClickSelectedOrgCode: '',
-        hiding: true,
-        model: {},
-        dropTrigger: '',
-        depart: {},
-        columns: columns,
-        disableSubmit: false,
-        checkedKeys: [],
-        selectedKeys: [],
-        autoIncr: 1,
-        currSelected: {},
-
-        allTreeKeys:[],
-        checkStrictly: true,
-
-        form: this.$form.createForm(this),
-        labelCol: {
-          xs: {span: 24},
-          sm: {span: 5}
-        },
-        wrapperCol: {
-          xs: {span: 24},
-          sm: {span: 16}
-        },
-        graphDatasource: {
-          nodes: [],
-          edges: []
-        },
-        validatorRules: {
-          departName: {rules: [{required: true, message: '请输入机构/部门名称!'}]},
-          orgCode: {rules: [{required: true, message: '请输入机构编码!'}]},
-          orgCategory: {rules: [{required: true, message: '请输入机构类型!'}]},
-          mobile: {rules: [{validator: this.validateMobile}]}
-        },
-        url: {
-          delete: '/sys/sysDepart/delete',
-          edit: '/sys/sysDepart/edit',
-          deleteBatch: '/sys/sysDepart/deleteBatch',
-          exportXlsUrl: "sys/sysDepart/exportXls",
-          importExcelUrl: "sys/sysDepart/importExcel",
-        },
-        orgCategoryDisabled:false,
-      }
-    },
-    computed: {
-      importExcelUrl: function () {
-        return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
-      }
-    },
-    methods: {
-      loadData() {
-        this.refresh();
-      },
-      loadTree() {
-        var that = this
-        that.treeData = []
-        that.departTree = []
-        queryDepartTreeList().then((res) => {
-          if (res.success) {
-            //部门全选后，再添加部门，选中数量增多
-            this.allTreeKeys = [];
-            for (let i = 0; i < res.result.length; i++) {
-              let temp = res.result[i]
-              that.treeData.push(temp)
-              that.departTree.push(temp)
-              that.setThisExpandedKeys(temp)
-              that.getAllKeys(temp);
-              // console.log(temp.id)
-            }
-            this.loading = false
-          }
-        })
-      },
-      setThisExpandedKeys(node) {
-        if (node.children && node.children.length > 0) {
-          this.iExpandedKeys.push(node.key)
-          for (let a = 0; a < node.children.length; a++) {
-            this.setThisExpandedKeys(node.children[a])
-          }
-        }
-      },
-      refresh() {
-        this.loading = true
-        this.loadTree()
-      },
-      // 右键操作方法
-      rightHandle(node) {
-        this.dropTrigger = 'contextmenu'
-        console.log(node.node.eventKey)
-        this.rightClickSelectedKey = node.node.eventKey
-        this.rightClickSelectedOrgCode = node.node.dataRef.orgCode
-      },
-      onExpand(expandedKeys) {
-        console.log('onExpand', expandedKeys)
-        // if not set autoExpandParent to false, if children expanded, parent can not collapse.
-        // or, you can remove all expanded children keys.
-        this.iExpandedKeys = expandedKeys
-        this.autoExpandParent = false
-      },
-      backFlowList() {
-        this.$router.back(-1)
-      },
-      // 右键点击下拉框改变事件
-      dropStatus(visible) {
-        if (visible == false) {
-          this.dropTrigger = ''
-        }
-      },
-      // 右键店家下拉关闭下拉框
-      closeDrop() {
-        this.dropTrigger = ''
-      },
-      addRootNode() {
-        this.$refs.nodeModal.add(this.currFlowId, '')
-      },
-      batchDel: function () {
-        console.log(this.checkedKeys)
-        if (this.checkedKeys.length <= 0) {
-          this.$message.warning('请选择一条记录！')
-        } else {
-          var ids = ''
-          for (var a = 0; a < this.checkedKeys.length; a++) {
-            ids += this.checkedKeys[a] + ','
-          }
-          var that = this
-          this.$confirm({
-            title: '确认删除',
-            content: '确定要删除所选中的 ' + this.checkedKeys.length + ' 条数据，以及子节点数据吗?',
-            onOk: function () {
-              deleteAction(that.url.deleteBatch, {ids: ids}).then((res) => {
-                if (res.success) {
-                  that.$message.success(res.message)
-                  that.loadTree()
-                  that.onClearSelected()
-                } else {
-                  that.$message.warning(res.message)
-                }
-              })
-            }
-          })
-        }
-      },
-      onSearch(value) {
-        let that = this
-        if (value) {
-          searchByKeywords({keyWord: value}).then((res) => {
-            if (res.success) {
-              that.departTree = []
-              for (let i = 0; i < res.result.length; i++) {
-                let temp = res.result[i]
-                that.departTree.push(temp)
-              }
-            } else {
-              that.$message.warning(res.message)
-            }
-          })
-        } else {
-          that.loadTree()
-        }
-
-      },
-      nodeModalOk() {
-        this.loadTree()
-      },
-      nodeModalClose() {
-      },
-      hide() {
-        console.log(111)
-        this.visible = false
-      },
-      onCheck(checkedKeys, info) {
-        console.log('onCheck', checkedKeys, info)
-        this.hiding = false
-        //this.checkedKeys = checkedKeys.checked
-        // <!---- author:os_chengtgen -- date:20190827 --  for:切换父子勾选模式 =======------>
-        if(this.checkStrictly){
-          this.checkedKeys = checkedKeys.checked;
-        }else{
-          this.checkedKeys = checkedKeys
-        }
-        // <!---- author:os_chengtgen -- date:20190827 --  for:切换父子勾选模式 =======------>
-      },
-      onSelect(selectedKeys, e) {
-        console.log('selected', selectedKeys, e)
-        this.hiding = false
-        let record = e.node.dataRef
-        console.log('onSelect-record', record)
-        this.currSelected = Object.assign({}, record)
-        this.model = this.currSelected
-        this.selectedKeys = [record.key]
-        this.model.parentId = record.parentId
-        this.setValuesToForm(record)
-        this.$refs.departAuth.show(record.id);
-
-      },
-      // 触发onSelect事件时,为部门树右侧的form表单赋值
-      setValuesToForm(record) {
-        if(record.orgCategory == '1'){
-          this.orgCategoryDisabled = true;
-        }else{
-          this.orgCategoryDisabled = false;
-        }
-        this.$nextTick(() => {
-          this.form.getFieldDecorator('fax', {initialValue: ''})
-          this.form.setFieldsValue(pick(record, 'departName','orgCategory', 'orgCode', 'departOrder', 'mobile', 'fax', 'address', 'memo'))
-        })
-      },
-      getCurrSelectedTitle() {
-        return !this.currSelected.title ? '' : this.currSelected.title
-      },
-      onClearSelected() {
-        this.hiding = true
-        this.checkedKeys = []
-        this.currSelected = {}
-        this.form.resetFields()
-        this.selectedKeys = []
-        this.$refs.departAuth.departId = ''
-      },
-      handleNodeTypeChange(val) {
-        this.currSelected.nodeType = val
-      },
-      notifyTriggerTypeChange(value) {
-        this.currSelected.notifyTriggerType = value
-      },
-      receiptTriggerTypeChange(value) {
-        this.currSelected.receiptTriggerType = value
-      },
-      submitCurrForm() {
-        this.form.validateFields((err, values) => {
-          if (!err) {
-            if (!this.currSelected.id) {
-              this.$message.warning('请点击选择要修改部门!')
-              return
-            }
-
-            let formData = Object.assign(this.currSelected, values)
-            console.log('Received values of form: ', formData)
-            httpAction(this.url.edit, formData, 'put').then((res) => {
-              if (res.success) {
-                this.$message.success('保存成功!')
-                this.loadTree()
-              } else {
-                this.$message.error(res.message)
-              }
-            })
-          }
-        })
-      },
-      emptyCurrForm() {
-        this.form.resetFields()
-      },
-      nodeSettingFormSubmit() {
-        this.form.validateFields((err, values) => {
-          if (!err) {
-            console.log('Received values of form: ', values)
-          }
-        })
-      },
-      openSelect() {
-        this.$refs.sysDirectiveModal.show()
-      },
-      handleAdd(num) {
-        if (num == 1) {
-          this.$refs.departModal.add()
-          this.$refs.departModal.title = '新增'
-        } else if (num == 2) {
-          let key = this.currSelected.key
-          if (!key) {
-            this.$message.warning('请先点击选中上级部门！')
-            return false
-          }
-          this.$refs.departModal.add(this.selectedKeys)
-          this.$refs.departModal.title = '新增'
-        } else {
-          this.$refs.departModal.add(this.rightClickSelectedKey)
-          this.$refs.departModal.title = '新增'
-        }
-      },
-      handleDelete() {
-        var that = this
-        this.$confirm({
-          title: '确认删除',
-          content: '确定要删除此部门以及子节点数据吗?',
-          onOk: function () {
-            deleteByDepartId({id: that.rightClickSelectedKey}).then((resp) => {
-              if (resp.success) {
-                //删除成功后，去除已选中中的数据
-                that.checkedKeys.splice(that.checkedKeys.findIndex(key => key === that.rightClickSelectedKey), 1);
-                that.$message.success('删除成功!')
-                that.loadTree()
-                //删除后同步清空右侧基本信息内容
-                let orgCode=that.form.getFieldValue("orgCode");
-                if(orgCode && orgCode === that.rightClickSelectedOrgCode){
-                  that.onClearSelected()
-                }
-              } else {
-                that.$message.warning('删除失败!')
-              }
-            })
-          }
-        })
-      },
-      selectDirectiveOk(record) {
-        console.log('选中指令数据', record)
-        this.nodeSettingForm.setFieldsValue({directiveCode: record.directiveCode})
-        this.currSelected.sysCode = record.sysCode
-      },
-      getFlowGraphData(node) {
-        this.graphDatasource.nodes.push({
-          id: node.id,
-          text: node.flowNodeName
-        })
-        if (node.children.length > 0) {
-          for (let a = 0; a < node.children.length; a++) {
-            let temp = node.children[a]
-            this.graphDatasource.edges.push({
-              source: node.id,
-              target: temp.id
-            })
-            this.getFlowGraphData(temp)
-          }
-        }
-      },
-     // <!---- author:os_chengtgen -- date:20190827 --  for:切换父子勾选模式 =======------>
-      expandAll () {
-        this.iExpandedKeys = this.allTreeKeys
-      },
-      closeAll () {
-        this.iExpandedKeys = []
-      },
-      checkALL () {
-        this.checkStriccheckStrictlytly = false
-        this.checkedKeys = this.allTreeKeys
-      },
-      cancelCheckALL () {
-        //this.checkedKeys = this.defaultCheckedKeys
-        this.checkedKeys = []
-      },
-      switchCheckStrictly (v) {
-        if(v==1){
-          this.checkStrictly = false
-        }else if(v==2){
-          this.checkStrictly = true
-        }
-      },
-      getAllKeys(node) {
-        // console.log('node',node);
-        this.allTreeKeys.push(node.key)
-        if (node.children && node.children.length > 0) {
-          for (let a = 0; a < node.children.length; a++) {
-            this.getAllKeys(node.children[a])
-          }
-        }
-      }
-      // <!---- author:os_chengtgen -- date:20190827 --  for:切换父子勾选模式 =======------>
-      
-    },
-    created() {
-      this.currFlowId = this.$route.params.id
-      this.currFlowName = this.$route.params.name
-      // this.loadTree()
-    },
-
-  }
-</script>
-<style scoped>
-  .ant-card-body .table-operator {
-    margin: 15px;
-  }
-
-  .anty-form-btn {
-    width: 100%;
-    text-align: center;
-  }
-
-  .anty-form-btn button {
-    margin: 0 5px;
-  }
-
-  .anty-node-layout .ant-layout-header {
-    padding-right: 0
-  }
-
-  .header {
-    padding: 0 8px;
-  }
-
-  .header button {
-    margin: 0 3px
-  }
-
-  .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-content {
-    height: 90% !important;
-    overflow-y: hidden
-  }
-
-  #app .desktop {
-    height: auto !important;
-  }
-
-  /** Button按钮间距 */
-  .ant-btn {
-    margin-left: 3px
-  }
-
-  .drawer-bootom-button {
-    /*position: absolute;*/
-    bottom: 0;
-    width: 100%;
-    border-top: 1px solid #e8e8e8;
-    padding: 10px 16px;
-    text-align: left;
-    left: 0;
-    background: #fff;
-    border-radius: 0 0 2px 2px;
-  }
-</style>
\ No newline at end of file
diff --git a/jshERP-web/src/views/system/DepartList2.vue b/jshERP-web/src/views/system/DepartList2.vue
deleted file mode 100644
index 09939ede..00000000
--- a/jshERP-web/src/views/system/DepartList2.vue
+++ /dev/null
@@ -1,260 +0,0 @@
-<template>
-  <a-card :bordered="false">
-
-    <!-- 查询区域 -->
-    <!--
-   -->
-    <!-- 操作按钮区域 -->
-    <div class="table-operator">
-      <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
-
-      <a-dropdown v-if="selectedRowKeys.length > 0">
-        <a-menu slot="overlay">
-          <a-menu-item key="1" @click="batchDel">
-            <a-icon type="delete"/>
-            删除
-          </a-menu-item>
-        </a-menu>
-        <a-button style="margin-left: 8px"> 批量操作
-          <a-icon type="down"/>
-        </a-button>
-      </a-dropdown>
-    </div>
-
-    <!-- table区域-begin -->
-    <div>
-      <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
-        <i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a style="font-weight: 600">{{ selectedRowKeys.length }}</a>项
-        <a style="margin-left: 24px" @click="onClearSelected">清空</a>
-      </div>
-      <a-table
-        ref="table"
-        size="middle"
-        bordered
-        rowKey="id"
-        :columns="columns"
-        :dataSource="dataSource"
-        :pagination="ipagination"
-        :loading="loading"
-        :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
-        @change="handleTableChange">
-
-        <span slot="action" slot-scope="text, record">
-          <a @click="handleEdit(record)">编辑</a>
-
-          <a-divider type="vertical"/>
-          <a-dropdown>
-            <a class="ant-dropdown-link">更多 <a-icon type="down"/></a>
-            <a-menu slot="overlay">
-              <a-menu-item>
-                <a href="javascript:;" @click="handleDetail(record)">详情</a>
-              </a-menu-item>
-              <a-menu-item>
-                <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
-                  <a>删除</a>
-                </a-popconfirm>
-              </a-menu-item>
-            </a-menu>
-          </a-dropdown>
-        </span>
-
-      </a-table>
-    </div>
-    <!-- table区域-end -->
-
-    <!-- 表单区域 -->
-    <sysDepart-modal ref="sysDepartModal" @ok="modalFormOk"></sysDepart-modal>
-  </a-card>
-</template>
-
-<script>
-  import SysDepartModal from './modules/DepartModal'
-  /*  import { filterObj } from '@/utils/util'
-    , queryByFactories*/
-  import {queryDepartTreeList} from '@/api/api'
-  import {deleteAction} from '@/api/manage'
-
-  // 表头
-  const columns = [
-    {
-      title: '机构名称',
-      dataIndex: 'departName',
-    },
-    {
-      title: '机构类型',
-      align: "center",
-      dataIndex: 'orgType'
-    },
-    {
-      title: '机构编码',
-      dataIndex: 'orgCode'
-    },
-    {
-      title: '手机号',
-      dataIndex: 'mobile'
-    },
-    {
-      title: '传真',
-      dataIndex: 'fax'
-    },
-    {
-      title: '地址',
-      dataIndex: 'address'
-    },
-    {
-      title: '排序',
-      align: 'center',
-      dataIndex: 'departOrder'
-    },
-    {
-      title: '操作',
-      align: "center",
-      dataIndex: 'action',
-      scopedSlots: {customRender: 'action'},
-    }
-  ];
-
-  export default {
-    name: "DepartList2",
-    components: {
-      SysDepartModal
-    },
-    data() {
-      return {
-        description: 'jeecg 生成SysDepart代码管理页面',
-        // 查询条件
-        queryParam: {},
-        //数据集
-        factories: '',
-        dataSource: [],
-        columns: columns,
-        // 分页参数
-        /*        ipagination:{
-                  current: 1,
-                  pageSize: 5,
-                  pageSizeOptions: ['5', '10', '20'],
-                  showTotal: (total, range) => {
-                    return range[0] + "-" + range[1] + " 共" + total + "条"
-                  },
-                  showQuickJumper: true,
-                  showSizeChanger: true,
-                  total: 0
-                },*/
-        isorter: {
-          column: 'createTime',
-          order: 'desc',
-        },
-        loading: false,
-        selectedRowKeys: [],
-        selectedRows: [],
-        url: {
-          list: "/sys/sysDepart/list",
-          delete: "/sys/sysDepart/delete",
-          deleteBatch: "/sys/sysDepart/deleteBatch",
-        },
-
-      }
-    },
-    created() {
-      this.loadData();
-    },
-    methods: {
-      loadData() {
-        this.dataSource = [];
-        queryDepartTreeList().then((res) => {
-          if (res.success) {
-            this.dataSource = res.result;
-          }
-        })
-
-      },
-
-      getQueryField() {
-        //TODO 字段权限控制
-        var str = "id,";
-        for (var a = 0; a < this.columns.length; a++) {
-          str += "," + this.columns[a].dataIndex;
-        }
-        return str;
-      },
-      onSelectChange(selectedRowKeys, selectionRows) {
-        this.selectedRowKeys = selectedRowKeys;
-        this.selectionRows = selectionRows;
-      },
-      onClearSelected() {
-        this.selectedRowKeys = [];
-        this.selectionRows = [];
-      },
-//TODO getQueryParams
-      handleDelete: function (id) {
-        var that = this;
-        deleteAction(that.url.delete, {id: id}).then((res) => {
-          if (res.success) {
-            that.$message.success(res.message);
-            that.loadData();
-          } else {
-            that.$message.warning(res.message);
-          }
-        });
-      },
-      handleDetail(record) {
-        this.$refs.sysDepartModal.edit(record);
-        this.$refs.sysDepartModal.title = "详情";
-        this.$refs.sysDepartModal.disableSubmit = true;
-      },
-      batchDel: function () {
-        if (this.selectedRowKeys.length <= 0) {
-          this.$message.warning('请选择一条记录！');
-          return;
-        } else {
-          var ids = "";
-          for (var a = 0; a < this.selectedRowKeys.length; a++) {
-            ids += this.selectedRowKeys[a] + ",";
-          }
-          var that = this;
-          this.$confirm({
-            title: "确认删除",
-            content: "是否删除选中数据?",
-            onOk: function () {
-              deleteAction(that.url.deleteBatch, {ids: ids}).then((res) => {
-                if (res.success) {
-                  that.$message.success(res.message);
-                  that.loadData();
-                  that.onClearSelected();
-                } else {
-                  that.$message.warning(res.message);
-                }
-              });
-            }
-          });
-        }
-      },
-      handleEdit: function (record) {
-        this.$refs.sysDepartModal.edit(record);
-        this.$refs.sysDepartModal.title = "编辑";
-      },
-      handleAdd() {
-        this.$refs.sysDepartModal.add();
-        this.$refs.sysDepartModal.title = "新增";
-      },
-      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();
-      },
-      modalFormOk() {
-        // 新增/修改 成功时，重载列表
-        this.loadData();
-      }
-    }
-  }
-</script>
-<style scoped>
-  @import '~@assets/less/common.less'
-</style>
\ No newline at end of file
diff --git a/jshERP-web/src/views/system/DepartUserList.vue b/jshERP-web/src/views/system/DepartUserList.vue
deleted file mode 100644
index 96352f8e..00000000
--- a/jshERP-web/src/views/system/DepartUserList.vue
+++ /dev/null
@@ -1,221 +0,0 @@
-<template>
-  <a-row :gutter="10">
-    <a-col :md="8" :sm="24">
-      <a-card :bordered="false">
-        <div style="background: #fff;padding-left:16px;height: 100%; margin-top: 5px">
-          <a-input-search @search="onSearch" style="width:100%;margin-top: 10px" placeholder="请输入部门名称"/>
-          <!-- 树-->
-
-          <template v-if="userIdentity === '2' && departTree.length>0">
-
-            <!--组织机构-->
-            <a-tree
-              showLine
-              :selectedKeys="selectedKeys"
-              :checkStrictly="true"
-              @select="onSelect"
-              :dropdownStyle="{maxHeight:'200px',overflow:'auto'}"
-              :treeData="departTree"
-              :autoExpandParent="autoExpandParent"
-              :expandedKeys="iExpandedKeys"
-              @expand="onExpand"
-            />
-
-          </template>
-          <div style="margin-top: 24px;" v-else-if="userIdentity === '2' && departTree.length==0">
-            <h3><span>您的部门下暂无有效部门信息</span></h3>
-          </div>
-          <div style="margin-top: 24px;" v-else><h3>普通员工暂此权限</h3></div>
-        </div>
-      </a-card>
-    </a-col>
-    <a-col :md="16" :sm="24">
-      <a-card :bordered="false">
-        <a-tabs defaultActiveKey="2" @change="callback">
-          <a-tab-pane tab="基本信息" key="1" forceRender>
-            <Dept-Base-Info ref="DeptBaseInfo"></Dept-Base-Info>
-          </a-tab-pane>
-          <a-tab-pane tab="用户信息" key="2">
-            <Dept-User-Info ref="DeptUserInfo" @clearSelectedDepartKeys="clearSelectedDepartKeys"></Dept-User-Info>
-          </a-tab-pane>
-          <a-tab-pane tab="部门角色" key="3" forceRender>
-            <dept-role-info ref="DeptRoleInfo" @clearSelectedDepartKeys="clearSelectedDepartKeys"/>
-          </a-tab-pane>
-        </a-tabs>
-      </a-card>
-    </a-col>
-  </a-row>
-</template>
-<script>
-  import DeptBaseInfo from './modules/DeptBaseInfo'
-  import DeptUserInfo from './modules/DeptUserInfo'
-  import {queryMyDepartTreeList, searchByKeywords} from '@/api/api'
-  import {JeecgListMixin} from '@/mixins/JeecgListMixin'
-  import DeptRoleInfo from './modules/DeptRoleInfo'
-
-  export default {
-    name: 'DepartUserList',
-    mixins: [JeecgListMixin],
-    components: {
-      DeptRoleInfo,
-      DeptBaseInfo,
-      DeptUserInfo,
-    },
-    data() {
-      return {
-        currentDeptId: '',
-        iExpandedKeys: [],
-        loading: false,
-        autoExpandParent: true,
-        currFlowId: '',
-        currFlowName: '',
-        disable: true,
-        treeData: [],
-        visible: false,
-        departTree: [],
-        rightClickSelectedKey: '',
-        hiding: true,
-        model: {},
-        dropTrigger: '',
-        depart: {},
-        disableSubmit: false,
-        checkedKeys: [],
-        selectedKeys: [],
-        autoIncr: 1,
-        currSelected: {},
-        form: this.$form.createForm(this),
-        labelCol: {
-          xs: {span: 24},
-          sm: {span: 5}
-        },
-        wrapperCol: {
-          xs: {span: 24},
-          sm: {span: 16}
-        },
-        graphDatasource: {
-          nodes: [],
-          edges: []
-        },
-        userIdentity:"",
-      }
-    },
-    methods: {
-      callback(key) {
-        //console.log(key)
-      },
-      loadData() {
-        this.refresh();
-      },
-      clearSelectedDepartKeys() {
-        this.checkedKeys = [];
-        this.selectedKeys = [];
-        this.currentDeptId = '';
-        this.$refs.DeptUserInfo.currentDeptId='';
-        this.$refs.DeptRoleInfo.currentDeptId='';
-      },
-      loadTree() {
-        var that = this
-        that.treeData = []
-        that.departTree = []
-        queryMyDepartTreeList().then((res) => {
-          if (res.success && res.result ) {
-            for (let i = 0; i < res.result.length; i++) {
-              let temp = res.result[i]
-              that.treeData.push(temp)
-              that.departTree.push(temp)
-              that.setThisExpandedKeys(temp)
-              // console.log(temp.id)
-            }
-            this.loading = false
-          }
-          that.userIdentity = res.message
-        })
-      },
-      setThisExpandedKeys(node) {
-        //只展开一级目录
-        if (node.children && node.children.length > 0) {
-          this.iExpandedKeys.push(node.key)
-          //下方代码放开注释则默认展开所有节点
-          /**
-          for (let a = 0; a < node.children.length; a++) {
-            this.setThisExpandedKeys(node.children[a])
-          }
-          */
-        }
-      },
-      refresh() {
-        this.loading = true
-        this.loadTree()
-      },
-
-      onExpand(expandedKeys) {
-        // console.log('onExpand', expandedKeys)
-        // if not set autoExpandParent to false, if children expanded, parent can not collapse.
-        // or, you can remove all expanded children keys.
-        this.iExpandedKeys = expandedKeys
-        this.autoExpandParent = false
-      },
-
-      onSearch(value) {
-        let that = this
-        if (value) {
-          searchByKeywords({keyWord: value,myDeptSearch:'1'}).then((res) => {
-            if (res.success) {
-              that.departTree = []
-              for (let i = 0; i < res.result.length; i++) {
-                let temp = res.result[i]
-                that.departTree.push(temp)
-              }
-            } else {
-              that.$message.warning(res.message)
-            }
-          })
-        } else {
-          that.loadTree()
-        }
-
-      },
-      onCheck(checkedKeys, e) {
-        let record = e.node.dataRef;
-        // console.log('onCheck', checkedKeys, e);
-        this.checkedKeys = [];
-        // if (e.checked === true) {
-        this.currentDeptId = record.id;
-        this.checkedKeys.push(record.id);
-
-        this.$refs.DeptBaseInfo.open(record);
-        this.$refs.DeptUserInfo.open(record);
-        this.$refs.DeptRoleInfo.open(record);
-        // }
-        // else {
-        //   this.checkedKeys = [];
-        //   this.$refs.DeptBaseInfo.clearForm();
-        //   this.$refs.DeptUserInfo.clearList();
-        // }
-
-        this.hiding = false;
-        // this.checkedKeys = checkedKeys.checked
-      },
-      onSelect(selectedKeys, e) {
-        if (this.selectedKeys[0] !== selectedKeys[0]) {
-          this.selectedKeys = [selectedKeys[0]];
-        }
-        let record = e.node.dataRef;
-        this.checkedKeys.push(record.id);
-        this.$refs.DeptBaseInfo.open(record);
-        this.$refs.DeptUserInfo.onClearSelected();
-        this.$refs.DeptUserInfo.open(record);
-        this.$refs.DeptRoleInfo.onClearSelected();
-        this.$refs.DeptRoleInfo.open(record);
-      },
-    },
-    created() {
-      this.currFlowId = this.$route.params.id
-      this.currFlowName = this.$route.params.name
-      // this.loadTree()
-    },
-  }
-</script>
-<style scoped>
-  @import '~@assets/less/common.less'
-</style>
\ No newline at end of file
diff --git a/jshERP-web/src/views/system/DictDeleteList.vue b/jshERP-web/src/views/system/DictDeleteList.vue
deleted file mode 100644
index d0334805..00000000
--- a/jshERP-web/src/views/system/DictDeleteList.vue
+++ /dev/null
@@ -1,138 +0,0 @@
-<template>
-  <a-modal
-    :width="modalWidth"
-    :style="modalStyle"
-    :visible="visible"
-    :maskClosable="false"
-    @cancel="handleCancel">
-    <template slot="footer">
-      <a-button @click="handleCancel">关闭</a-button>
-    </template>
-    <a-table
-      ref="table"
-      rowKey="id"
-      size="middle"
-      :columns="columns"
-      :loading="loading"
-      :dataSource="dataSource"
-      :pagination="false">
-      <span slot="action" slot-scope="text, record">
-        <a @click="handleBack(record.id)"><a-icon type="redo"/>字典取回</a>
-        <a-divider type="vertical"/>
-        <a @click="handleDelete(record.id)"><a-icon type="scissor"/>彻底删除</a>
-      </span>
-    </a-table>
-
-  </a-modal>
-
-
-</template>
-
-<script>
-  import { getAction,deleteAction,putAction } from '@/api/manage'
-  export default {
-    name: "DictDeleteList",
-    data () {
-      return {
-        modalWidth: '90%',
-        modalStyle: { 'top': '20px'},
-        title: '操作',
-        visible: false,
-        loading: false,
-        dataSource:[],
-        columns:[
-          {
-            title: '#',
-            dataIndex: '',
-            key: 'rowIndex',
-            width: 120,
-            align: "center",
-            customRender: function (t, r, index) {
-              return parseInt(index) + 1;
-            }
-          },
-          {
-            title: '字典名称',
-            align: "left",
-            dataIndex: 'dictName'
-          },
-          {
-            title: '字典编号',
-            align: "left",
-            dataIndex: 'dictCode'
-          },
-          {
-            title: '描述',
-            align: "left",
-            dataIndex: 'description'
-          },
-          {
-            title: '操作',
-            dataIndex: 'action',
-            align: "center",
-            scopedSlots: {customRender: 'action'}
-          }
-        ]
-      }
-    },
-
-    methods: {
-      handleCancel(){
-        this.visible = false
-        //回收站字典列表刷新
-        this.$emit("refresh")
-      },
-      show(){
-        this.visible = true
-        this.loadData();
-      },
-      loadData(){
-        this.loading = true
-        getAction("/sys/dict/deleteList").then(res=>{
-          this.loading = false
-          if(res.success){
-            this.dataSource = res.result
-          }else{
-            this.$message.warning(res.message)
-          }
-        })
-      },
-      handleBack(id){
-        putAction("/sys/dict/back/"+id).then(res=>{
-          if(res.success){
-            this.$message.success(res.message)
-            this.loadData();
-          }else{
-            this.$message.warning(res.message)
-          }
-        })
-      },
-      handleDelete(id){
-        this.$confirm({
-          title: '彻底删除字典',
-          content: (<div>
-            <p>您确定要彻底删除这个字典项吗？</p>
-            <p style="color:red;">注意：彻底删除后将无法恢复，请谨慎操作！</p>
-            </div>),
-          centered: false,
-          onOk: () => {
-          var that = this;
-          deleteAction("/sys/dict/deletePhysic/"+id).then((res) => {
-            if (res.success) {
-              this.$message.success(res.message)
-              this.loadData();
-            } else {
-              that.$message.warning(res.message);
-            }
-          });
-        },
-      })
-      }
-
-    }
-  }
-</script>
-
-<style scoped>
-
-</style>
\ No newline at end of file
diff --git a/jshERP-web/src/views/system/DictItemList.vue b/jshERP-web/src/views/system/DictItemList.vue
deleted file mode 100644
index dd2f6bca..00000000
--- a/jshERP-web/src/views/system/DictItemList.vue
+++ /dev/null
@@ -1,207 +0,0 @@
-<template>
-  <a-card :bordered="false">
-    <!-- 抽屉 -->
-    <a-drawer
-      title="字典列表"
-      :width="screenWidth"
-      @close="onClose"
-      :visible="visible"
-    >
-      <!-- 抽屉内容的border -->
-      <div
-        :style="{
-          padding:'10px',
-          border: '1px solid #e9e9e9',
-          background: '#fff',
-        }">
-
-        <div class="table-page-search-wrapper">
-          <a-form layout="inline" :form="form" @keyup.enter.native="searchQuery">
-            <a-row :gutter="10">
-              <a-col :md="8" :sm="12">
-                <a-form-item label="名称">
-                  <a-input style="width: 120px;" placeholder="请输入名称" v-model="queryParam.itemText"></a-input>
-                </a-form-item>
-              </a-col>
-              <a-col :md="9" :sm="24">
-                <a-form-item label="状态" style="width: 170px" :labelCol="labelCol" :wrapperCol="wrapperCol">
-                  <a-select
-                    placeholder="请选择"
-                    v-model="queryParam.status"
-                  >
-                    <a-select-option value="1">正常</a-select-option>
-                    <a-select-option value="0">禁用</a-select-option>
-                  </a-select>
-                </a-form-item>
-              </a-col>
-              <a-col :md="7" :sm="24">
-              <span style="float: left;" class="table-page-search-submitButtons">
-                <a-button type="primary" @click="searchQuery">搜索</a-button>
-                <a-button type="primary" @click="searchReset" style="margin-left: 8px">重置</a-button>
-              </span>
-              </a-col>
-            </a-row>
-            <a-row>
-              <a-col :md="2" :sm="24">
-                <a-button style="margin-bottom: 10px" type="primary" @click="handleAdd">新增</a-button>
-              </a-col>
-            </a-row>
-          </a-form>
-        </div>
-        <div>
-          <a-table
-            ref="table"
-            rowKey="id"
-            size="middle"
-            :columns="columns"
-            :dataSource="dataSource"
-            :pagination="ipagination"
-            :loading="loading"
-            @change="handleTableChange"
-          >
-
-          <span slot="action" slot-scope="text, record">
-            <a @click="handleEdit(record)">编辑</a>
-            <a-divider type="vertical"/>
-            <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
-              <a>删除</a>
-            </a-popconfirm>
-          </span>
-
-          </a-table>
-        </div>
-      </div>
-    </a-drawer>
-    <dict-item-modal ref="modalForm" @ok="modalFormOk"></dict-item-modal> <!-- 字典数据 -->
-  </a-card>
-</template>
-
-<script>
-  import pick from 'lodash.pick'
-  import {filterObj} from '@/utils/util';
-  import DictItemModal from './modules/DictItemModal'
-  import {JeecgListMixin} from '@/mixins/JeecgListMixin'
-
-  export default {
-    name: "DictItemList",
-    mixins: [JeecgListMixin],
-    components: {DictItemModal},
-    data() {
-      return {
-        columns: [
-          {
-            title: '名称',
-            align: "center",
-            dataIndex: 'itemText',
-          },
-          {
-            title: '数据值',
-            align: "center",
-            dataIndex: 'itemValue',
-          },
-          {
-            title: '操作',
-            dataIndex: 'action',
-            align: "center",
-            scopedSlots: {customRender: 'action'},
-          }
-        ],
-        queryParam: {
-          dictId: "",
-          dictName: "",
-          itemText: "",
-          delFlag: "1",
-          status: [],
-        },
-        title: "操作",
-        visible: false,
-        screenWidth: 800,
-        model: {},
-        dictId: "",
-        status: 1,
-        labelCol: {
-          xs: {span: 5},
-          sm: {span: 5},
-        },
-        wrapperCol: {
-          xs: {span: 12},
-          sm: {span: 12},
-        },
-        form: this.$form.createForm(this),
-        validatorRules: {
-          itemText: {rules: [{required: true, message: '请输入名称!'}]},
-          itemValue: {rules: [{required: true, message: '请输入数据值!'}]},
-        },
-        url: {
-          list: "/sys/dictItem/list",
-          delete: "/sys/dictItem/delete",
-          deleteBatch: "/sys/dictItem/deleteBatch",
-        },
-      }
-    },
-    created() {
-      // 当页面初始化时,根据屏幕大小来给抽屉设置宽度
-      this.resetScreenSize();
-    },
-    methods: {
-      add(dictId) {
-        this.dictId = dictId;
-        this.edit({});
-      },
-      edit(record) {
-        if (record.id) {
-          this.dictId = record.id;
-        }
-        this.queryParam = {}
-        this.form.resetFields();
-        this.model = Object.assign({}, record);
-        this.model.dictId = this.dictId;
-        this.model.status = this.status;
-        this.visible = true;
-        this.$nextTick(() => {
-          this.form.setFieldsValue(pick(this.model, 'itemText', 'itemValue'))
-        });
-        // 当其它模块调用该模块时,调用此方法加载字典数据
-        this.loadData();
-      },
-
-      getQueryParams() {
-        var param = Object.assign({}, this.queryParam);
-        param.dictId = this.dictId;
-        param.field = this.getQueryField();
-        param.pageNo = this.ipagination.current;
-        param.pageSize = this.ipagination.pageSize;
-        if (this.superQueryParams) {
-          param['superQueryParams'] = encodeURI(this.superQueryParams)
-          param['superQueryMatchType'] = this.superQueryMatchType
-        }
-        return filterObj(param);
-      },
-
-      // 添加字典数据
-      handleAdd() {
-        this.$refs.modalForm.add(this.dictId);
-        this.$refs.modalForm.title = "新增";
-      },
-      showDrawer() {
-        this.visible = true
-      },
-      onClose() {
-        this.visible = false
-        this.form.resetFields();
-        this.dataSource = [];
-      },
-      // 抽屉的宽度随着屏幕大小来改变
-      resetScreenSize() {
-        let screenWidth = document.body.clientWidth;
-        if (screenWidth < 600) {
-          this.screenWidth = screenWidth;
-        } else {
-          this.screenWidth = 600;
-        }
-      },
-    }
-  }
-</script>
-<style scoped>
-</style>
\ No newline at end of file
diff --git a/jshERP-web/src/views/system/DictList.vue b/jshERP-web/src/views/system/DictList.vue
deleted file mode 100644
index 30fc051d..00000000
--- a/jshERP-web/src/views/system/DictList.vue
+++ /dev/null
@@ -1,208 +0,0 @@
-<template>
-  <a-card :bordered="false">
-
-    <!-- 左侧面板 -->
-    <div class="table-page-search-wrapper">
-      <a-form layout="inline" @keyup.enter.native="searchQuery">
-        <a-row :gutter="12">
-          <a-col :md="7" :sm="8">
-            <a-form-item label="字典名称" :labelCol="{span: 6}" :wrapperCol="{span: 14, offset: 1}">
-              <a-input placeholder="请输入字典名称" v-model="queryParam.dictName"></a-input>
-            </a-form-item>
-          </a-col>
-          <a-col :md="7" :sm="8">
-            <a-form-item label="字典编号" :labelCol="{span: 6}" :wrapperCol="{span: 14, offset: 1}">
-              <a-input placeholder="请输入字典编号" v-model="queryParam.dictCode"></a-input>
-            </a-form-item>
-          </a-col>
-          <a-col :md="7" :sm="8">
-            <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
-              <a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
-              <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
-            </span>
-          </a-col>
-        </a-row>
-      </a-form>
-
-      <div class="table-operator" style="border-top: 5px">
-        <a-button @click="handleAdd" type="primary" icon="plus">添加</a-button>
-        <a-button type="primary" icon="download" @click="handleExportXls('字典信息')">导出</a-button>
-        <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
-          <a-button type="primary" icon="import">导入</a-button>
-        </a-upload>
-        <a-button type="primary" icon="sync" @click="refleshCache()">刷新缓存</a-button>
-
-        <a-button type="primary" icon="hdd" @click="openDeleteList">回收站</a-button>
-      </div>
-
-      <a-table
-        ref="table"
-        rowKey="id"
-        size="middle"
-        :columns="columns"
-        :dataSource="dataSource"
-        :pagination="ipagination"
-        :loading="loading"
-        @change="handleTableChange">
-        <span slot="action" slot-scope="text, record">
-          <a @click="handleEdit(record)">
-            <a-icon type="edit"/>
-            编辑
-          </a>
-          <a-divider type="vertical"/>
-          <a @click="editDictItem(record)"><a-icon type="setting"/> 字典配置</a>
-          <a-divider type="vertical"/>
-          <a-popconfirm title="确定删除吗?" @confirm="() =>handleDelete(record.id)">
-            <a>删除</a>
-          </a-popconfirm>
-        </span>
-      </a-table>
-
-    </div>
-    <dict-modal ref="modalForm" @ok="modalFormOk"></dict-modal>  <!-- 字典类型 -->
-    <dict-item-list ref="dictItemList"></dict-item-list>
-    <dict-delete-list ref="dictDeleteList" @refresh="() =>loadData()"></dict-delete-list>
-  </a-card>
-</template>
-
-<script>
-  import { filterObj } from '@/utils/util';
-  import { JeecgListMixin } from '@/mixins/JeecgListMixin'
-  import DictModal from './modules/DictModal'
-  import DictItemList from './DictItemList'
-  import DictDeleteList from './DictDeleteList'
-  import { getAction } from '@/api/manage'
-  import { UI_CACHE_DB_DICT_DATA } from "@/store/mutation-types"
-  import Vue from 'vue'
-
-  export default {
-    name: "DictList",
-    mixins:[JeecgListMixin],
-    components: {DictModal, DictItemList,DictDeleteList},
-    data() {
-      return {
-        description: '这是数据字典页面',
-        visible: false,
-        // 查询条件
-        queryParam: {
-          dictCode: "",
-          dictName: "",
-        },
-        // 表头
-        columns: [
-          {
-            title: '#',
-            dataIndex: '',
-            key: 'rowIndex',
-            width: 120,
-            align: "center",
-            customRender: function (t, r, index) {
-              return parseInt(index) + 1;
-            }
-          },
-          {
-            title: '字典名称',
-            align: "left",
-            dataIndex: 'dictName',
-          },
-          {
-            title: '字典编号',
-            align: "left",
-            dataIndex: 'dictCode',
-          },
-          {
-            title: '描述',
-            align: "left",
-            dataIndex: 'description',
-          },
-          {
-            title: '操作',
-            dataIndex: 'action',
-            align: "center",
-            scopedSlots: {customRender: 'action'},
-          }
-        ],
-        dict: "",
-        labelCol: {
-          xs: {span: 8},
-          sm: {span: 5},
-        },
-        wrapperCol: {
-          xs: {span: 16},
-          sm: {span: 19},
-        },
-        url: {
-          list: "/sys/dict/list",
-          delete: "/sys/dict/delete",
-          exportXlsUrl: "sys/dict/exportXls",
-          importExcelUrl: "sys/dict/importExcel",
-          refleshCache: "sys/dict/refleshCache",
-          queryAllDictItems: "sys/dict/queryAllDictItems",
-        },
-      }
-    },
-    computed: {
-      importExcelUrl: function () {
-        return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
-      }
-    },
-    methods: {
-      getQueryParams() {
-        var param = Object.assign({}, this.queryParam, this.isorter);
-        param.field = this.getQueryField();
-        param.pageNo = this.ipagination.current;
-        param.pageSize = this.ipagination.pageSize;
-        if (this.superQueryParams) {
-          param['superQueryParams'] = encodeURI(this.superQueryParams)
-          param['superQueryMatchType'] = this.superQueryMatchType
-        }
-        return filterObj(param);
-      },
-      //取消选择
-      cancelDict() {
-        this.dict = "";
-        this.visible = false;
-        this.loadData();
-      },
-      //编辑字典数据
-      editDictItem(record) {
-        this.$refs.dictItemList.edit(record);
-      },
-      // 重置字典类型搜索框的内容
-      searchReset() {
-        var that = this;
-        that.queryParam.dictName = "";
-        that.queryParam.dictCode = "";
-        that.loadData(this.ipagination.current);
-      },
-      openDeleteList(){
-        this.$refs.dictDeleteList.show()
-      },
-      refleshCache(){
-        getAction(this.url.refleshCache).then((res) => {
-          if (res.success) {
-            //重新加载缓存
-            getAction(this.url.queryAllDictItems).then((res) => {
-              if (res.success) {
-                Vue.ls.remove(UI_CACHE_DB_DICT_DATA)
-                Vue.ls.set(UI_CACHE_DB_DICT_DATA, res.result, 7 * 24 * 60 * 60 * 1000)
-              }
-            })
-            this.$message.success("刷新缓存完成！");
-          }
-        }).catch(e=>{
-          this.$message.warn("刷新缓存失败！");
-          console.log("刷新失败",e)
-        })
-      }
-    },
-    watch: {
-      openKeys(val) {
-        console.log('openKeys', val)
-      },
-    },
-  }
-</script>
-<style scoped>
-  @import '~@assets/less/common.less'
-</style>
\ No newline at end of file
diff --git a/jshERP-web/src/views/system/NewPermissionList.vue b/jshERP-web/src/views/system/NewPermissionList.vue
deleted file mode 100644
index ef6d49cb..00000000
--- a/jshERP-web/src/views/system/NewPermissionList.vue
+++ /dev/null
@@ -1,227 +0,0 @@
-<template>
-  <a-card :bordered="false">
-
-    <!-- 操作按钮区域 -->
-    <div class="table-operator">
-      <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
-      <a-button
-        @click="batchDel"
-        v-if="selectedRowKeys.length > 0"
-        ghost
-        type="primary"
-        icon="delete">批量删除
-      </a-button>
-    </div>
-
-    <!-- table区域-begin -->
-    <div>
-
-      <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
-        <i class="anticon anticon-info-circle ant-alert-icon"></i>已选择&nbsp;<a style="font-weight: 600">{{
-        selectedRowKeys.length }}</a>项&nbsp;&nbsp;
-        <a style="margin-left: 24px" @click="onClearSelected">清空</a>
-      </div>
-
-      <a-table
-        :columns="columns"
-        size="middle"
-        :pagination="false"
-        :dataSource="dataSource"
-        :loading="loading"
-        @expand="expandSubmenu"
-        :expandedRowKeys="expandedRowKeys"
-        :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
-        @expandedRowsChange="handleExpandedRowsChange">
-
-        <span slot="action" slot-scope="text, record">
-          <a @click="handleEdit(record)">编辑</a>
-
-          <a-divider type="vertical"/>
-          <a-dropdown>
-            <a class="ant-dropdown-link">
-              更多 <a-icon type="down"/>
-            </a>
-            <a-menu slot="overlay">
-              <a-menu-item>
-                <a href="javascript:;" @click="handleDetail(record)">详情</a>
-              </a-menu-item>
-              <a-menu-item>
-                <a href="javascript:;" @click="handleAddSub(record)">添加下级</a>
-              </a-menu-item>
-              <a-menu-item>
-                <a href="javascript:;" @click="handleDataRule(record)">数据规则</a>
-              </a-menu-item>
-
-              <a-menu-item>
-                <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
-                  <a>删除</a>
-                </a-popconfirm>
-              </a-menu-item>
-            </a-menu>
-          </a-dropdown>
-        </span>
-        <!-- 字符串超长截取省略号显示 -->
-        <span slot="url" slot-scope="text">
-          <j-ellipsis :value="text" :length="25"/>
-        </span>
-        <!-- 字符串超长截取省略号显示-->
-        <span slot="component" slot-scope="text">
-          <j-ellipsis :value="text"/>
-        </span>
-      </a-table>
-
-    </div>
-    <!-- table区域-end -->
-
-    <permission-modal ref="modalForm" @ok="modalFormOk"></permission-modal>
-    <permission-data-rule-list ref="PermissionDataRuleList" @ok="modalFormOk"></permission-data-rule-list>
-
-  </a-card>
-</template>
-
-<script>
-  import PermissionModal from './modules/PermissionModal'
-  import { getSystemMenuList, getSystemSubmenu, getSystemSubmenuBatch } from '@/api/api'
-  import { JeecgListMixin } from '@/mixins/JeecgListMixin'
-  import PermissionDataRuleList from './PermissionDataRuleList'
-  import JEllipsis from '@/components/jeecg/JEllipsis'
-
-  const columns = [
-    {
-      title: '菜单名称',
-      dataIndex: 'name',
-      key: 'name'
-    }, {
-      title: '菜单类型',
-      dataIndex: 'menuType',
-      key: 'menuType',
-      customRender: function(text) {
-        if (text == 0) {
-          return '菜单'
-        } else if (text == 1) {
-          return '菜单'
-        } else if (text == 2) {
-          return '按钮/权限'
-        } else {
-          return text
-        }
-      }
-    },/*{
-      title: '权限编码',
-      dataIndex: 'perms',
-      key: 'permissionCode',
-    },*/{
-      title: 'icon',
-      dataIndex: 'icon',
-      key: 'icon'
-    },
-    {
-      title: '组件',
-      dataIndex: 'component',
-      key: 'component',
-      scopedSlots: { customRender: 'component' }
-    },
-    {
-      title: '路径',
-      dataIndex: 'url',
-      key: 'url',
-      scopedSlots: { customRender: 'url' }
-    },
-    {
-      title: '排序',
-      dataIndex: 'sortNo',
-      key: 'sortNo'
-    },
-    {
-      title: '操作',
-      dataIndex: 'action',
-      scopedSlots: { customRender: 'action' },
-      align: 'center',
-      width: 150
-    }
-  ]
-
-  export default {
-    name: 'PermissionListAsync',
-    mixins: [JeecgListMixin],
-    components: {
-      PermissionDataRuleList,
-      PermissionModal,
-      JEllipsis
-    },
-    data() {
-      return {
-        description: '这是菜单管理页面',
-        // 表头
-        columns: columns,
-        loading: false,
-        // 展开的行，受控属性
-        expandedRowKeys: [],
-        url: {
-          list: '/sys/permission/list',
-          delete: '/sys/permission/delete',
-          deleteBatch: '/sys/permission/deleteBatch'
-        }
-      }
-    },
-    methods: {
-      loadData() {
-        this.loading = true
-        getSystemMenuList().then((res) => {
-          if (res.success) {
-            this.dataSource = res.result
-            return this.loadDataByExpandedRows(this.dataSource)
-          }
-        }).finally(()=>{
-          this.loading = false
-        })
-      },
-      expandSubmenu(expanded, record){
-        if (expanded && (!record.children || record.children.length === 0)) {
-          getSystemSubmenu({parentId:record.id}).then((res) => {
-            if (res.success) {
-              record.children = res.result
-            }
-          })
-        }
-      },
-      // 根据已展开的行查询数据（用于保存后刷新时异步加载子级的数据）
-      loadDataByExpandedRows(dataList) {
-        if (this.expandedRowKeys.length > 0) {
-          return getSystemSubmenuBatch({ parentIds: this.expandedRowKeys.join(',') }).then((res) => {
-            if (res.success) {
-              let childrenMap = res.result
-              let fn = (list) => {
-                list.forEach(data => {
-                  if (this.expandedRowKeys.includes(data.id)) {
-                    data.children = childrenMap[data.id]
-                    fn(data.children)
-                  }
-                })
-              }
-              fn(dataList)
-            }
-          })
-        } else {
-          return Promise.resolve()
-        }
-      },
-      // 打开数据规则编辑
-      handleDataRule(record) {
-        this.$refs.PermissionDataRuleList.edit(record)
-      },
-      handleAddSub(record) {
-        this.$refs.modalForm.title = "添加子菜单";
-        this.$refs.modalForm.localMenuType = 1;
-        this.$refs.modalForm.disableSubmit = false;
-        this.$refs.modalForm.edit({status:'1',permsType:'1',route:true,'parentId':record.id});
-      },
-      handleExpandedRowsChange(expandedRows) {
-        this.expandedRowKeys = expandedRows
-      },
-    }
-  }
-</script>
-<style scoped>
-  @import '~@assets/less/common.less';
-</style>
\ No newline at end of file
diff --git a/jshERP-web/src/views/system/PermissionDataRuleList.vue b/jshERP-web/src/views/system/PermissionDataRuleList.vue
deleted file mode 100644
index cd2dcf87..00000000
--- a/jshERP-web/src/views/system/PermissionDataRuleList.vue
+++ /dev/null
@@ -1,188 +0,0 @@
-<template>
-  <a-drawer
-    title="数据权限规则"
-    :width="drawerWidth"
-    @close="onClose"
-    :visible="visible">
-
-    <!-- 抽屉内容的border -->
-    <div
-      :style="{
-        padding:'10px',
-        border: '1px solid #e9e9e9',
-        background: '#fff',
-      }">
-      <div class="table-page-search-wrapper">
-        <a-form @keyup.enter.native="searchQuery">
-          <a-row :gutter="12">
-            <a-col :md="8" :sm="8">
-              <a-form-item label="规则名称" :labelCol="{span: 8}" :wrapperCol="{span: 14, offset: 1}">
-                <a-input placeholder="请输入规则名称" v-model="queryParam.ruleName"></a-input>
-              </a-form-item>
-            </a-col>
-            <a-col :md="8" :sm="8">
-              <a-form-item label="规则值" :labelCol="{span: 8}" :wrapperCol="{span: 14, offset: 1}">
-                <a-input placeholder="请输入规则值" v-model="queryParam.ruleValue"></a-input>
-              </a-form-item>
-            </a-col>
-            <a-col :md="7" :sm="8">
-              <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
-                <a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
-                <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
-              </span>
-            </a-col>
-          </a-row>
-          <a-row>
-            <a-col :md="24" :sm="24">
-              <a-button style="margin-bottom: 10px" @click="addPermissionRule" type="primary" icon="plus">添加</a-button>
-            </a-col>
-          </a-row>
-        </a-form>
-
-        <a-table
-          ref="table"
-          rowKey="id"
-          size="middle"
-          :columns="columns"
-          :dataSource="dataSource"
-          :loading="loading"
-          :rowClassName="getRowClassname">
-          <span slot="action" slot-scope="text, record">
-            <a @click="handleEdit(record)">
-              <a-icon type="edit"/>编辑
-            </a>
-            <a-divider type="vertical"/>
-            <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
-              <a>删除</a>
-            </a-popconfirm>
-          </span>
-        </a-table>
-
-      </div>
-    </div>
-    <permission-data-rule-modal @ok="modalFormOk" ref="modalForm"></permission-data-rule-modal>
-  </a-drawer>
-</template>
-<script>
-  import {getPermissionRuleList, queryPermissionRule} from '@/api/api'
-  import {JeecgListMixin} from '@/mixins/JeecgListMixin'
-  import PermissionDataRuleModal from './modules/PermissionDataRuleModal'
-
-  const columns = [
-    {
-      title: '规则名称',
-      dataIndex: 'ruleName',
-      key: 'ruleName'
-    },
-    {
-      title: '规则字段',
-      dataIndex: 'ruleColumn',
-      key: 'ruleColumn'
-    },
-    {
-      title: '规则值',
-      dataIndex: 'ruleValue',
-      key: 'ruleValue'
-    },
-    {
-      title: '操作',
-      dataIndex: 'action',
-      scopedSlots: {customRender: 'action'},
-      align: 'center'
-    }
-  ]
-  export default {
-    name: 'PermissionDataRuleList',
-    mixins: [JeecgListMixin],
-    components: {
-      PermissionDataRuleModal
-    },
-    data() {
-      return {
-        queryParam: {},
-        drawerWidth: 650,
-        columns: columns,
-        permId: '',
-        visible: false,
-        form: this.$form.createForm(this),
-        loading: false,
-        url: {
-          list: "/sys/permission/getPermRuleListByPermId",
-          delete: "/sys/permission/deletePermissionRule",
-        },
-      }
-    },
-    created() {
-      this.resetScreenSize()
-    },
-    methods: {
-      loadData() {
-        //20190908 scott for: 首次进入菜单列表的时候，不加载权限列表
-        if(!this.permId){
-          return
-        }
-        let that = this
-        this.dataSource = []
-        var params = this.getQueryParams()//查询条件
-        getPermissionRuleList(params).then((res) => {
-          if (res.success) {
-            that.dataSource = res.result
-          }
-        })
-      },
-      edit(record) {
-        if (record.id) {
-          this.visible = true
-          this.permId = record.id
-        }
-        this.queryParam = {}
-        this.queryParam.permissionId = record.id
-        this.visible = true
-        this.loadData()
-        this.resetScreenSize()
-      },
-      addPermissionRule() {
-        this.$refs.modalForm.add(this.permId)
-        this.$refs.modalForm.title = '新增'
-      },
-      searchQuery() {
-        var params = this.getQueryParams();
-        params.permissionId = this.permId;
-        queryPermissionRule(params).then((res) => {
-          if (res.success) {
-            this.dataSource = res.result
-          }
-        })
-      },
-      searchReset() {
-        this.queryParam = {}
-        this.queryParam.permissionId = this.permId
-        this.loadData(1);
-      },
-      onClose() {
-        this.visible = false
-      },
-      // 根据屏幕变化,设置抽屉尺寸
-      resetScreenSize() {
-        let screenWidth = document.body.clientWidth
-        if (screenWidth < 500) {
-          this.drawerWidth = screenWidth
-        } else {
-          this.drawerWidth = 650
-        }
-      },
-      getRowClassname(record){
-        if(record.status!=1){
-          return "data-rule-invalid"
-        }
-      }
-    }
-  }
-</script>
-
-<style>
-  .data-rule-invalid{
-    background: #f4f4f4;
-    color: #bababa;
-  }
-</style>
\ No newline at end of file
diff --git a/jshERP-web/src/views/system/PermissionList.vue b/jshERP-web/src/views/system/PermissionList.vue
deleted file mode 100644
index a7d95e32..00000000
--- a/jshERP-web/src/views/system/PermissionList.vue
+++ /dev/null
@@ -1,196 +0,0 @@
-<template>
-  <a-card :bordered="false">
-
-    <!-- 操作按钮区域 -->
-    <div class="table-operator">
-      <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
-      <a-button
-        @click="batchDel"
-        v-if="selectedRowKeys.length > 0"
-        ghost
-        type="primary"
-        icon="delete">批量删除
-      </a-button>
-    </div>
-
-    <!-- table区域-begin -->
-    <div>
-
-      <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
-        <i class="anticon anticon-info-circle ant-alert-icon"></i>已选择&nbsp;<a style="font-weight: 600">{{
-        selectedRowKeys.length }}</a>项&nbsp;&nbsp;
-        <a style="margin-left: 24px" @click="onClearSelected">清空</a>
-      </div>
-
-      <a-table
-        :columns="columns"
-        :scroll="{x: 1500}"
-        size="middle"
-        :pagination="false"
-        :dataSource="dataSource"
-        :loading="loading"
-        :expandedRowKeys="expandedRowKeys"
-        :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
-        @expandedRowsChange="handleExpandedRowsChange">
-
-        <span slot="action" slot-scope="text, record">
-          <a @click="handleEdit(record)">编辑</a>
-
-          <a-divider type="vertical"/>
-          <a-dropdown>
-            <a class="ant-dropdown-link">
-              更多 <a-icon type="down"/>
-            </a>
-            <a-menu slot="overlay">
-              <a-menu-item>
-                <a href="javascript:;" @click="handleDetail(record)">详情</a>
-              </a-menu-item>
-              <a-menu-item>
-                <a href="javascript:;" @click="handleAddSub(record)">添加下级</a>
-              </a-menu-item>
-              <a-menu-item>
-                <a href="javascript:;" @click="handleDataRule(record)">数据规则</a>
-              </a-menu-item>
-
-              <a-menu-item>
-                <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
-                  <a>删除</a>
-                </a-popconfirm>
-              </a-menu-item>
-            </a-menu>
-          </a-dropdown>
-        </span>
-        <!-- 字符串超长截取省略号显示 -->
-        <span slot="url" slot-scope="text">
-          <j-ellipsis :value="text" :length="25"/>
-        </span>
-        <!-- 字符串超长截取省略号显示-->
-        <span slot="component" slot-scope="text">
-          <j-ellipsis :value="text"/>
-        </span>
-      </a-table>
-
-    </div>
-    <!-- table区域-end -->
-
-    <permission-modal ref="modalForm" @ok="modalFormOk"></permission-modal>
-    <permission-data-rule-list ref="PermissionDataRuleList" @ok="modalFormOk"></permission-data-rule-list>
-
-  </a-card>
-</template>
-
-<script>
-  import PermissionModal from './modules/PermissionModal'
-  import { getPermissionList } from '@/api/api'
-  import { JeecgListMixin } from '@/mixins/JeecgListMixin'
-  import PermissionDataRuleList from './PermissionDataRuleList'
-  import JEllipsis from '@/components/jeecg/JEllipsis'
-
-  const columns = [
-    {
-      title: '菜单名称',
-      dataIndex: 'name',
-      key: 'name'
-    }, {
-      title: '菜单类型',
-      dataIndex: 'menuType',
-      key: 'menuType',
-      customRender: function(text) {
-        if (text == 0) {
-          return '菜单'
-        } else if (text == 1) {
-          return '菜单'
-        } else if (text == 2) {
-          return '按钮/权限'
-        } else {
-          return text
-        }
-      }
-    },/*{
-      title: '权限编码',
-      dataIndex: 'perms',
-      key: 'permissionCode',
-    },*/{
-      title: 'icon',
-      dataIndex: 'icon',
-      key: 'icon'
-    },
-    {
-      title: '组件',
-      dataIndex: 'component',
-      key: 'component',
-      scopedSlots: { customRender: 'component' }
-    },
-    {
-      title: '路径',
-      dataIndex: 'url',
-      key: 'url',
-      scopedSlots: { customRender: 'url' }
-    },
-    {
-      title: '排序',
-      dataIndex: 'sortNo',
-      key: 'sortNo'
-    },
-    {
-      title: '操作',
-      dataIndex: 'action',
-      fixed: 'right',
-      scopedSlots: { customRender: 'action' },
-      align: 'center',
-      width: 150
-    }
-  ]
-
-  export default {
-    name: 'PermissionList',
-    mixins: [JeecgListMixin],
-    components: {
-      PermissionDataRuleList,
-      PermissionModal,
-      JEllipsis
-    },
-    data() {
-      return {
-        description: '这是菜单管理页面',
-        // 表头
-        columns: columns,
-        loading: false,
-        // 展开的行，受控属性
-        expandedRowKeys: [],
-        url: {
-          list: '/sys/permission/list',
-          delete: '/sys/permission/delete',
-          deleteBatch: '/sys/permission/deleteBatch'
-        }
-      }
-    },
-    methods: {
-      loadData() {
-        this.dataSource = []
-        getPermissionList().then((res) => {
-          if (res.success) {
-            console.log(res.result)
-            this.dataSource = res.result
-          }
-        })
-      },
-      // 打开数据规则编辑
-      handleDataRule(record) {
-        this.$refs.PermissionDataRuleList.edit(record)
-      },
-      handleAddSub(record) {
-        this.$refs.modalForm.title = "添加子菜单";
-        this.$refs.modalForm.localMenuType = 1;
-        this.$refs.modalForm.disableSubmit = false;
-        this.$refs.modalForm.edit({status:'1',permsType:'1',route:true,'parentId':record.id});
-      },
-      handleExpandedRowsChange(expandedRows) {
-        this.expandedRowKeys = expandedRows
-      },
-    }
-  }
-</script>
-<style scoped>
-  @import '~@assets/less/common.less';
-</style>
\ No newline at end of file
diff --git a/jshERP-web/src/views/system/QuartzJobList.vue b/jshERP-web/src/views/system/QuartzJobList.vue
deleted file mode 100644
index 2dfc8cc8..00000000
--- a/jshERP-web/src/views/system/QuartzJobList.vue
+++ /dev/null
@@ -1,263 +0,0 @@
-<template>
-  <a-card :bordered="false">
-
-    <!-- 查询区域 -->
-    <div class="table-page-search-wrapper">
-      <a-form layout="inline" @keyup.enter.native="searchQuery">
-        <a-row :gutter="24">
-
-          <a-col :md="6" :sm="10">
-            <a-form-item label="任务类名">
-              <a-input placeholder="请输入任务类名" v-model="queryParam.jobClassName"></a-input>
-            </a-form-item>
-          </a-col>
-          <a-col :md="6" :sm="10">
-            <a-form-item label="任务状态">
-              <a-select style="width: 220px" v-model="queryParam.status" placeholder="请选择状态">
-                <a-select-option value="">全部</a-select-option>
-                <a-select-option value="0">正常</a-select-option>
-                <a-select-option value="-1">停止</a-select-option>
-              </a-select>
-            </a-form-item>
-          </a-col>
-
-          <a-col :md="6" :sm="10" >
-            <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
-              <a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
-              <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
-            </span>
-          </a-col>
-
-        </a-row>
-      </a-form>
-    </div>
-
-    <!-- 操作按钮区域 -->
-    <div class="table-operator">
-      <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
-      <a-button type="primary" icon="download" @click="handleExportXls('定时任务信息')">导出</a-button>
-      <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
-        <a-button type="primary" icon="import">导入</a-button>
-      </a-upload>
-      <a-dropdown v-if="selectedRowKeys.length > 0">
-        <a-menu slot="overlay">
-          <a-menu-item key="1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item>
-        </a-menu>
-        <a-button style="margin-left: 8px"> 批量操作 <a-icon type="down" /></a-button>
-      </a-dropdown>
-    </div>
-
-    <!-- table区域-begin -->
-    <div>
-      <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
-        <i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a style="font-weight: 600">{{ selectedRowKeys.length }}</a>项
-        <a style="margin-left: 24px" @click="onClearSelected">清空</a>
-      </div>
-
-      <a-table
-        ref="table"
-        size="middle"
-        bordered
-        rowKey="id"
-        :columns="columns"
-        :dataSource="dataSource"
-        :pagination="ipagination"
-        :loading="loading"
-        :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
-        @change="handleTableChange">
-
-        <!-- 字符串超长截取省略号显示-->
-        <span slot="description" slot-scope="text">
-          <j-ellipsis :value="text" :length="20" />
-        </span>
-        <span slot="parameterRender" slot-scope="text">
-          <j-ellipsis :value="text" :length="20" />
-        </span>
-
-
-        <span slot="action" slot-scope="text, record">
-          <a @click="resumeJob(record)" v-if="record.status==-1">启动</a>
-          <a @click="pauseJob(record)" v-if="record.status==0">停止</a>
-
-          <a-divider type="vertical" />
-          <a-dropdown>
-            <a class="ant-dropdown-link">更多 <a-icon type="down" /></a>
-            <a-menu slot="overlay">
-              <a-menu-item><a @click="handleEdit(record)">编辑</a></a-menu-item>
-              <a-menu-item>
-                <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
-                  <a>删除</a>
-                </a-popconfirm>
-              </a-menu-item>
-            </a-menu>
-          </a-dropdown>
-        </span>
-
-        <!-- 状态渲染模板 -->
-        <template slot="customRenderStatus" slot-scope="status">
-          <a-tag v-if="status==0" color="green">已启动</a-tag>
-          <a-tag v-if="status==-1" color="orange">已暂停</a-tag>
-        </template>
-      </a-table>
-    </div>
-    <!-- table区域-end -->
-
-    <!-- 表单区域 -->
-    <quartzJob-modal ref="modalForm" @ok="modalFormOk"></quartzJob-modal>
-  </a-card>
-</template>
-
-<script>
-  import QuartzJobModal from './modules/QuartzJobModal'
-  import { getAction } from '@/api/manage'
-  import { JeecgListMixin } from '@/mixins/JeecgListMixin'
-  import JEllipsis from "@/components/jeecg/JEllipsis";
-
-  export default {
-    name: "QuartzJobList",
-    mixins:[JeecgListMixin],
-    components: {
-      QuartzJobModal,
-      JEllipsis
-    },
-    data () {
-      return {
-        description: '定时任务在线管理',
-        // 查询条件
-        queryParam: {},
-        // 表头
-        columns: [
-          {
-            title: '#',
-            dataIndex: '',
-            key:'rowIndex',
-            width:60,
-            align:"center",
-            customRender:function (t,r,index) {
-              return parseInt(index)+1;
-            }
-          },
-          {
-            title: '任务类名',
-            align:"center",
-            dataIndex: 'jobClassName',
-            sorter: true,
-/*            customRender:function (text) {
-              return "*"+text.substring(9,text.length);
-            }*/
-          },
-          {
-            title: 'cron表达式',
-            align:"center",
-            dataIndex: 'cronExpression'
-          },
-          {
-            title: '参数',
-            align:"center",
-            width: 150,
-            dataIndex: 'parameter',
-            scopedSlots: {customRender: 'parameterRender'},
-          },
-          {
-            title: '描述',
-            align:"center",
-            width: 250,
-            dataIndex: 'description',
-            scopedSlots: {customRender: 'description'},
-          },
-          {
-            title: '状态',
-            align:"center",
-            dataIndex: 'status',
-            scopedSlots: { customRender: 'customRenderStatus' },
-            filterMultiple: false,
-            filters: [
-              { text: '已启动', value: '0' },
-              { text: '已暂停', value: '-1' },
-            ]
-          },
-          {
-            title: '操作',
-            dataIndex: 'action',
-            align:"center",
-            width:180,
-            scopedSlots: { customRender: 'action' },
-          }
-        ],
-		url: {
-          list: "/sys/quartzJob/list",
-          delete: "/sys/quartzJob/delete",
-          deleteBatch: "/sys/quartzJob/deleteBatch",
-          pause: "/sys/quartzJob/pause",
-          resume: "/sys/quartzJob/resume",
-          exportXlsUrl: "sys/quartzJob/exportXls",
-          importExcelUrl: "sys/quartzJob/importExcel",
-        },
-      }
-    },
-    computed: {
-      importExcelUrl: function () {
-        return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
-      }
-    },
-
-    methods: {
-
-      //筛选需要重写handleTableChange
-      handleTableChange(pagination, filters, sorter) {
-        //分页、排序、筛选变化时触发
-        //TODO 筛选
-        if (Object.keys(sorter).length > 0) {
-          this.isorter.column = sorter.field;
-          this.isorter.order = "ascend" == sorter.order ? "asc" : "desc"
-        }
-        //这种筛选方式只支持单选
-        this.filters.status = filters.status[0];
-        this.ipagination = pagination;
-        this.loadData();
-      },
-      pauseJob: function(record){
-        var that = this;
-        //暂停定时任务
-        this.$confirm({
-          title:"确认暂停",
-          content:"是否暂停选中任务?",
-          onOk: function(){
-            getAction(that.url.pause,{jobClassName:record.jobClassName}).then((res)=>{
-              if(res.success){
-                that.$message.success(res.message);
-                that.loadData();
-                that.onClearSelected();
-              }else{
-                that.$message.warning(res.message);
-              }
-            });
-          }
-        });
-
-      },
-      resumeJob: function(record){
-        var that = this;
-        //恢复定时任务
-        this.$confirm({
-          title:"确认启动",
-          content:"是否启动选中任务?",
-          onOk: function(){
-            getAction(that.url.resume,{jobClassName:record.jobClassName}).then((res)=>{
-              if(res.success){
-                that.$message.success(res.message);
-                that.loadData();
-                that.onClearSelected();
-              }else{
-                that.$message.warning(res.message);
-              }
-            });
-          }
-        });
-      },
-    }
-  }
-</script>
-<style scoped>
-  @import '~@assets/less/common.less'
-</style>
\ No newline at end of file
diff --git a/jshERP-web/src/views/system/RoleUserList.vue b/jshERP-web/src/views/system/RoleUserList.vue
deleted file mode 100644
index 593652e1..00000000
--- a/jshERP-web/src/views/system/RoleUserList.vue
+++ /dev/null
@@ -1,548 +0,0 @@
-<template>
-  <a-row :gutter="10">
-    <a-col :md="leftColMd" :sm="24" style="margin-bottom: 20px">
-      <a-card :bordered="false">
-        <!-- 查询区域 -->
-        <div class="table-page-search-wrapper">
-          <!-- 搜索区域 -->
-          <a-form layout="inline" @keyup.enter.native="searchQuery">
-            <a-row :gutter="24">
-              <a-col :md="12" :sm="8">
-                <a-form-item label="角色名称" :labelCol="{span: 5}" :wrapperCol="{span: 18, offset: 1}">
-                  <a-input placeholder="" v-model="queryParam.roleName"></a-input>
-                </a-form-item>
-              </a-col>
-              <!--
-              <a-col :md="11" :sm="12">
-                <a-form-item label="创建时间" :labelCol="{span: 5}" :wrapperCol="{span: 18, offset: 1}">
-                  <j-date v-model="queryParam.createTime_begin" :showTime="true" date-format="YYYY-MM-DD HH:mm:ss" style="width:45%" placeholder="请选择开始时间" ></j-date>
-                  <span style="width: 10px;">~</span>
-                  <j-date v-model="queryParam.createTime_end" :showTime="true" date-format="YYYY-MM-DD HH:mm:ss" style="width:45%" placeholder="请选择结束时间"></j-date>
-                </a-form-item>
-              </a-col>
-              -->
-              <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
-            <a-col :md="12" :sm="24">
-               <a-button type="primary" @click="searchQuery" icon="search" style="margin-left: 21px">查询</a-button>
-              <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
-            </a-col>
-          </span>
-            </a-row>
-          </a-form>
-        </div>
-        <!-- 操作按钮区域 -->
-        <div class="table-operator" style="margin: 5px 0 10px 2px">
-          <a-button @click="handleAdd" type="primary" icon="plus">新建角色</a-button>
-          <!--<a-button @click="handleEdit(model1)" type="primary" icon="plus">角色编辑</a-button>-->
-          <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
-            <a-button type="primary" icon="import">导入</a-button>
-          </a-upload>
-          <a-button type="primary" icon="download" @click="handleExportXls('角色管理')">导出</a-button>
-        </div>
-
-        <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
-          <i class="anticon anticon-info-circle ant-alert-icon">
-          </i> 已选择 <a><b>{{ selectedRowKeys1.length }}</b></a>项
-          <a style="margin-left: 24px" @click="onClearSelected1">清空</a>
-        </div>
-
-        <div style="margin-top: 15px">
-          <a-table
-            style="height:500px"
-            ref="table"
-            size="middle"
-            bordered
-            rowKey="id"
-            :columns="columns"
-            :dataSource="dataSource"
-            :pagination="ipagination"
-            :loading="loading"
-            :rowSelection="{selectedRowKeys: selectedRowKeys1, onChange: onSelectChange1, type:'radio'}"
-            @change="handleTableChange">
-          <span slot="action" slot-scope="text, record">
-            <a @click="handleOpen(record)">用户</a>
-            <a-divider type="vertical"/>
-
-
-            <a-dropdown>
-              <a class="ant-dropdown-link">
-                更多 <a-icon type="down"/>
-              </a>
-              <a-menu slot="overlay">
-                <a-menu-item>
-                  <a @click="handlePerssion(record.id)">授权</a>
-                </a-menu-item>
-                <a-menu-item>
-                  <a @click="handleEdit(record)">编辑</a>
-                </a-menu-item>
-                <a-menu-item>
-                  <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete1(record.id)">
-                    <a>删除</a>
-                  </a-popconfirm>
-                </a-menu-item>
-              </a-menu>
-            </a-dropdown>
-        </span>
-          </a-table>
-        </div>
-        <!-- 右侧的角色权限配置 -->
-        <user-role-modal ref="modalUserRole"></user-role-modal>
-        <role-modal ref="modalForm" @ok="modalFormOk"></role-modal>
-      </a-card>
-    </a-col>
-    <a-col :md="rightColMd" :sm="24" v-if="this.rightcolval == 1">
-      <a-card :bordered="false">
-        <div style="text-align: right;">
-          <a-icon type="close-circle" @click="hideUserList" />
-        </div>
-        <!-- 查询区域 -->
-        <div class="table-page-search-wrapper">
-          <a-form layout="inline">
-            <a-row :gutter="24">
-
-              <a-col :md="12" :sm="12">
-                <a-form-item label="用户账号">
-                  <a-input placeholder="" v-model="queryParam2.username"></a-input>
-                </a-form-item>
-              </a-col>
-              <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
-            <a-col :md="9" :sm="24">
-             <a-button type="primary" @click="searchQuery2" icon="search" style="margin-left: 21px">查询</a-button>
-              <a-button type="primary" @click="searchReset2" icon="reload" style="margin-left: 8px">重置</a-button>
-
-            </a-col>
-          </span>
-            </a-row>
-          </a-form>
-        </div>
-        <!-- 操作按钮区域 -->
-        <div class="table-operator" :md="24" :sm="24">
-          <a-button @click="handleAdd2" type="primary" icon="plus" style="margin-top: 16px">新增用户</a-button>
-          <!--<a-button @click="handleEdit2" type="primary" icon="edit" style="margin-top: 16px">用户编辑</a-button>-->
-          <a-button @click="handleAddUserRole" type="primary" icon="plus" style="margin-top: 16px">已有用户</a-button>
-
-          <a-dropdown v-if="selectedRowKeys2.length > 0">
-            <a-menu slot="overlay">
-              <a-menu-item key="1" @click="batchDel2">
-                <a-icon type="delete"/>
-                删除
-              </a-menu-item>
-            </a-menu>
-            <a-button style="margin-left: 8px"> 批量操作
-              <a-icon type="down"/>
-            </a-button>
-          </a-dropdown>
-        </div>
-        <!-- table区域-begin -->
-        <div>
-          <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
-            <i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a style="font-weight: 600">{{
-            selectedRowKeys2.length }}</a>项
-            <a style="margin-left: 24px" @click="onClearSelected2">清空</a>
-          </div>
-          <a-table
-            style="height:500px"
-            ref="table2"
-            bordered
-            size="middle"
-            rowKey="id"
-            :columns="columns2"
-            :dataSource="dataSource2"
-            :pagination="ipagination2"
-            :loading="loading2"
-            :rowSelection="{selectedRowKeys: selectedRowKeys2, onChange: onSelectChange2}"
-            @change="handleTableChange2">
-           <span slot="action" slot-scope="text, record">
-           <a @click="handleEdit2(record)">编辑</a>
-          <a-divider type="vertical"/>
-          <a-dropdown>
-            <a class="ant-dropdown-link">
-              更多 <a-icon type="down"/>
-            </a>
-            <a-menu slot="overlay">
-              <a-menu-item>
-                <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete2(record.id)">
-                  <a>删除</a>
-                </a-popconfirm>
-              </a-menu-item>
-            </a-menu>
-          </a-dropdown>
-        </span>
-          </a-table>
-        </div>
-        <!-- 表单区域 -->
-        <role-modal ref="modalForm" @ok="modalFormOk"></role-modal>
-        <user-modal ref="modalForm2" @ok="modalFormOk2"></user-modal>
-        <Select-User-Modal ref="selectUserModal" @selectFinished="selectOK"></Select-User-Modal>
-      </a-card>
-    </a-col>
-  </a-row>
-</template>
-<script>
-  import { JeecgListMixin } from '@/mixins/JeecgListMixin'
-  import { deleteAction, postAction, getAction } from '@/api/manage'
-  import SelectUserModal from './modules/SelectUserModal'
-  import RoleModal from './modules/RoleModal'
-  import UserModal from './modules/UserModal'
-  import { filterObj } from '@/utils/util'
-  import UserRoleModal from './modules/UserRoleModal'
-  import moment from 'moment'
-
-  export default {
-    name: 'RoleUserList',
-    mixins: [JeecgListMixin],
-    components: {
-      UserRoleModal,
-      SelectUserModal,
-      RoleModal,
-      UserModal,
-      moment
-    },
-    data() {
-      return {
-        model1: {},
-        model2: {},
-        currentRoleId: '',
-        queryParam1: {},
-        queryParam2: {},
-        dataSource1: [],
-        dataSource2: [],
-        ipagination1: {
-          current: 1,
-          pageSize: 10,
-          pageSizeOptions: ['10', '20', '30'],
-          showTotal: (total, range) => {
-            return range[0] + '-' + range[1] + ' 共' + total + '条'
-          },
-          showQuickJumper: true,
-          showSizeChanger: true,
-          total: 0
-        },
-        ipagination2: {
-          current: 1,
-          pageSize: 10,
-          pageSizeOptions: ['10', '20', '30'],
-          showTotal: (total, range) => {
-            return range[0] + '-' + range[1] + ' 共' + total + '条'
-          },
-          showQuickJumper: true,
-          showSizeChanger: true,
-          total: 0
-        },
-        isorter1: {
-          column: 'createTime',
-          order: 'desc'
-        },
-        isorter2: {
-          column: 'createTime',
-          order: 'desc'
-        },
-        filters1: {},
-        filters2: {},
-        loading1: false,
-        loading2: false,
-        selectedRowKeys1: [],
-        selectedRowKeys2: [],
-        selectionRows1: [],
-        selectionRows2: [],
-        test:{},
-        rightcolval:0,
-        columns:
-          [
-            {
-              title: '角色编码',
-              align: 'center',
-              dataIndex: 'roleCode'
-            },
-            {
-              title: '角色名称',
-              align: 'center',
-              dataIndex: 'roleName'
-            },
-            {
-              title: '创建时间',
-              dataIndex: 'createTime',
-              align:"center",
-              sorter: true,
-              customRender: (text) => {
-                return moment(text).format('YYYY-MM-DD')
-              }
-            },
-            {
-              title: '操作',
-              dataIndex: 'action',
-              align: 'center',
-              scopedSlots: { customRender: 'action' }
-            }
-          ],
-        columns2: [{
-          title: '用户账号',
-          align: 'center',
-          dataIndex: 'username',
-          width: 120
-        },
-          {
-            title: '用户名称',
-            align: 'center',
-            width: 100,
-            dataIndex: 'realname'
-          },
-          {
-            title: '状态',
-            align: 'center',
-            width: 80,
-            dataIndex: 'status_dictText'
-          },
-
-          {
-            title: '操作',
-            dataIndex: 'action',
-            scopedSlots: { customRender: 'action' },
-            align: 'center',
-            width: 120
-          }],
-
-        // 高级查询参数
-        superQueryParams2: '',
-        // 高级查询拼接条件
-        superQueryMatchType2: 'and',
-        url: {
-          list: '/sys/role/list',
-          delete: '/sys/role/delete',
-          list2: '/sys/user/userRoleList',
-          addUserRole: '/sys/user/addSysUserRole',
-          delete2: '/sys/user/deleteUserRole',
-          deleteBatch2: '/sys/user/deleteUserRoleBatch',
-          exportXlsUrl: 'sys/role/exportXls',
-          importExcelUrl: 'sys/role/importExcel'
-        }
-      }
-    },
-    computed: {
-      importExcelUrl: function() {
-        return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`
-      },
-      leftColMd() {
-        return this.selectedRowKeys1.length === 0 ? 24 : 12
-      },
-      rightColMd() {
-        return this.selectedRowKeys1.length === 0 ? 0 : 12
-      }
-    },
-    methods: {
-      onSelectChange2(selectedRowKeys, selectionRows) {
-        this.selectedRowKeys2 = selectedRowKeys
-        this.selectionRows2 = selectionRows
-      },
-      onClearSelected2() {
-        this.selectedRowKeys2 = []
-        this.selectionRows2 = []
-      },
-      onClearSelected1() {
-        this.selectedRowKeys1 = []
-        this.selectionRows1 = []
-      },
-      onSelectChange1(selectedRowKeys, selectionRows) {
-        this.rightcolval = 1
-        this.selectedRowKeys1 = selectedRowKeys
-        this.selectionRows1 = selectionRows
-        this.model1 = Object.assign({}, selectionRows[0])
-        console.log(this.model1)
-        this.currentRoleId = selectedRowKeys[0]
-        this.loadData2()
-      },
-      onClearSelected() {
-      },
-
-      getQueryParams2() {
-        //获取查询条件
-        let sqp = {}
-        if (this.superQueryParams2) {
-          sqp['superQueryParams'] = encodeURI(this.superQueryParams2)
-          sqp['superQueryMatchType'] = this.superQueryMatchType2
-        }
-        var param = Object.assign(sqp, this.queryParam2, this.isorter2, this.filters2)
-        param.field = this.getQueryField2()
-        param.pageNo = this.ipagination2.current
-        param.pageSize = this.ipagination2.pageSize
-        return filterObj(param)
-      },
-      getQueryField2() {
-        //TODO 字段权限控制
-        var str = 'id,'
-        this.columns2.forEach(function(value) {
-          str += ',' + value.dataIndex
-        })
-        return str
-      },
-      handleEdit2: function(record) {
-        this.$refs.modalForm2.title = '编辑'
-        this.$refs.modalForm2.roleDisabled = true
-        this.$refs.modalForm2.edit(record)
-      },
-      handleAdd2: function() {
-        if (this.currentRoleId == '') {
-          this.$message.error('请选择一个角色!')
-        } else {
-          this.$refs.modalForm2.roleDisabled = true
-          this.$refs.modalForm2.selectedRole = [this.currentRoleId]
-
-          this.$refs.modalForm2.add()
-
-          this.$refs.modalForm2.title = '新增'
-        }
-      },
-      modalFormOk2() {
-        // 新增/修改 成功时，重载列表
-        this.loadData2()
-      },
-      loadData2(arg) {
-        if (!this.url.list2) {
-          this.$message.error('请设置url.list2属性!')
-          return
-        }
-        //加载数据 若传入参数1则加载第一页的内容
-        if (arg === 1) {
-          this.ipagination2.current = 1
-        }
-        if (this.currentRoleId === '') return
-        let params = this.getQueryParams2()//查询条件
-        params.roleId = this.currentRoleId
-        this.loading2 = true
-        getAction(this.url.list2, params).then((res) => {
-          if (res.success) {
-            this.dataSource2 = res.result.records
-            this.ipagination2.total = res.result.total
-
-          }
-          this.loading2 = false
-        })
-
-      },
-      handleDelete1: function(id) {
-        this.handleDelete(id)
-        this.dataSource2 = []
-        this.currentRoleId = ''
-      },
-      handleDelete2: function(id) {
-        if (!this.url.delete2) {
-          this.$message.error('请设置url.delete2属性!')
-          return
-        }
-        var that = this
-        deleteAction(that.url.delete2, { roleId: this.currentRoleId, userId: id }).then((res) => {
-          if (res.success) {
-            that.$message.success(res.message)
-            that.loadData2()
-          } else {
-            that.$message.warning(res.message)
-          }
-        })
-      },
-      batchDel2: function() {
-
-        if (!this.url.deleteBatch2) {
-          this.$message.error('请设置url.deleteBatch2属性!')
-          return
-        }
-        if (this.selectedRowKeys2.length <= 0) {
-          this.$message.warning('请选择一条记录！')
-          return
-        } else {
-          var ids = ''
-          for (var a = 0; a < this.selectedRowKeys2.length; a++) {
-            ids += this.selectedRowKeys2[a] + ','
-          }
-          var that = this
-          console.log(this.currentDeptId)
-          this.$confirm({
-            title: '确认删除',
-            content: '是否删除选中数据?',
-            onOk: function() {
-              deleteAction(that.url.deleteBatch2, { roleId: that.currentRoleId, userIds: ids }).then((res) => {
-                if (res.success) {
-                  that.$message.success(res.message)
-                  that.loadData2()
-                  that.onClearSelected()
-                } else {
-                  that.$message.warning(res.message)
-                }
-              })
-            }
-          })
-        }
-      },
-      selectOK(data) {
-        let params = {}
-        params.roleId = this.currentRoleId
-        params.userIdList = []
-        for (var a = 0; a < data.length; a++) {
-          params.userIdList.push(data[a])
-        }
-        console.log(params)
-        postAction(this.url.addUserRole, params).then((res) => {
-          if (res.success) {
-            this.loadData2()
-            this.$message.success(res.message)
-          } else {
-            this.$message.warning(res.message)
-          }
-        })
-      },
-
-      handleAddUserRole() {
-        if (this.currentRoleId == '') {
-          this.$message.error('请选择一个角色!')
-        } else {
-          this.$refs.selectUserModal.visible = true
-        }
-      },
-      handleOpen(record) {
-        this.rightcolval = 1
-        this.selectedRowKeys1 = [record.id]
-        this.model1 = Object.assign({}, record)
-        this.currentRoleId = record.id
-        this.onClearSelected2()
-        this.loadData2()
-      },
-      /*handleEdit: function(record) {
-        if (this.currentRoleId == '') {
-          this.$message.error('请选择一个角色!')
-        } else {
-          this.$refs.modalForm.edit(record)
-          this.$refs.modalForm.title = '编辑'
-        }
-      },*/
-      searchQuery2() {
-        this.loadData2(1)
-      },
-      searchReset2() {
-        this.queryParam2 = {}
-        this.loadData2(1)
-      },
-      handleTableChange2(pagination, filters, sorter) {
-        //分页、排序、筛选变化时触发
-        //TODO 筛选
-        if (Object.keys(sorter).length > 0) {
-          this.isorter2.column = sorter.field
-          this.isorter2.order = 'ascend' == sorter.order ? 'asc' : 'desc'
-        }
-        this.ipagination2 = pagination
-        this.loadData2()
-      },
-      hideUserList(){
-        //this.rightcolval = 0
-        this.selectedRowKeys1 = []
-      },
-      handlePerssion(roleId){
-        this.$refs.modalUserRole.show(roleId);
-      },
-    }
-  }
-</script>
-<style scoped>
-  /** Button按钮间距 */
-  .ant-btn {
-    margin-left: 8px
-  }
-</style>
\ No newline at end of file
diff --git a/jshERP-web/src/views/system/SysAnnouncementList.vue b/jshERP-web/src/views/system/SysAnnouncementList.vue
deleted file mode 100644
index 274c4c66..00000000
--- a/jshERP-web/src/views/system/SysAnnouncementList.vue
+++ /dev/null
@@ -1,291 +0,0 @@
-<template>
-  <a-card :bordered="false">
-
-    <!-- 查询区域 -->
-    <div class="table-page-search-wrapper">
-      <a-form layout="inline" @keyup.enter.native="searchQuery">
-        <a-row :gutter="24">
-
-          <a-col :span="6">
-            <a-form-item label="标题">
-              <a-input placeholder="请输入标题" v-model="queryParam.titile"></a-input>
-            </a-form-item>
-          </a-col>
-          <!--<a-col :span="6">
-            <a-form-item label="内容">
-              <a-input placeholder="请输入内容" v-model="queryParam.msgContent"></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">查询</a-button>
-              <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
-            </span>
-          </a-col>
-
-        </a-row>
-      </a-form>
-    </div>
-
-    <!-- 操作按钮区域 -->
-    <div class="table-operator">
-      <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
-      <a-button type="primary" icon="download" @click="handleExportXls('系统通告')">导出</a-button>
-      <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
-        <a-button type="primary" icon="import">导入</a-button>
-      </a-upload>
-      <a-dropdown v-if="selectedRowKeys.length > 0">
-        <a-menu slot="overlay">
-          <a-menu-item key="1" @click="batchDel">
-            <a-icon type="delete"/>
-            删除
-          </a-menu-item>
-        </a-menu>
-        <a-button style="margin-left: 8px"> 批量操作
-          <a-icon type="down"/>
-        </a-button>
-      </a-dropdown>
-    </div>
-
-    <!-- table区域-begin -->
-    <div>
-      <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
-        <i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a style="font-weight: 600">{{ selectedRowKeys.length }}</a>项
-        <a style="margin-left: 24px" @click="onClearSelected">清空</a>
-      </div>
-
-      <a-table
-        ref="table"
-        size="middle"
-        bordered
-        rowKey="id"
-        :columns="columns"
-        :dataSource="dataSource"
-        :pagination="ipagination"
-        :loading="loading"
-        :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
-        @change="handleTableChange">
-
-        <span slot="action" slot-scope="text, record">
-          <a  v-if="record.sendStatus == 0" @click="handleEdit(record)">编辑</a>
-
-          <a-divider type="vertical" v-if="record.sendStatus == 0"/>
-          <a-dropdown>
-            <a class="ant-dropdown-link">更多 <a-icon type="down"/></a>
-            <a-menu slot="overlay">
-              <a-menu-item v-if="record.sendStatus != 1">
-                <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
-                  <a>删除</a>
-                </a-popconfirm>
-              </a-menu-item>
-              <a-menu-item v-if="record.sendStatus == 0">
-                <a-popconfirm title="确定发布吗?" @confirm="() => releaseData(record.id)">
-                  <a>发布</a>
-                </a-popconfirm>
-              </a-menu-item>
-              <a-menu-item v-if="record.sendStatus == 1">
-                <a-popconfirm title="确定撤销吗?" @confirm="() => reovkeData(record.id)">
-                  <a>撤销</a>
-                </a-popconfirm>
-              </a-menu-item>
-              <a-menu-item>
-                  <a @click="handleDetail(record)">查看</a>
-              </a-menu-item>
-            </a-menu>
-          </a-dropdown>
-        </span>
-
-      </a-table>
-    </div>
-    <!-- table区域-end -->
-
-    <!-- 表单区域 -->
-    <sysAnnouncement-modal ref="modalForm" @ok="modalFormOk"></sysAnnouncement-modal>
-  </a-card>
-</template>
-
-<script>
-  import SysAnnouncementModal from './modules/SysAnnouncementModal'
-  import {doReleaseData, doReovkeData} from '@/api/api'
-  import {getAction} from '@/api/manage'
-  import {JeecgListMixin} from '@/mixins/JeecgListMixin'
-
-  export default {
-    name: "SysAnnouncementList",
-    mixins: [JeecgListMixin],
-    components: {
-      SysAnnouncementModal
-    },
-    data() {
-      return {
-        description: '系统通告表管理页面',
-        // 查询条件
-        queryParam: {},
-        // 表头
-        columns: [
-          {
-            title: '#',
-            dataIndex: '',
-            key: 'rowIndex',
-            width: 60,
-            align: "center",
-            customRender: function (t, r, index) {
-              return parseInt(index) + 1;
-            }
-          },
-
-          {
-            title: '标题',
-            align: "center",
-            dataIndex: 'titile'
-          },
-          {
-            title: '消息类型',
-            align: "center",
-            dataIndex: 'msgCategory',
-            customRender: function (text) {
-              if (text == '1') {
-                return "通知公告";
-              } else if (text == "2") {
-                return "系统消息";
-              } else {
-                return text;
-              }
-            }
-          },
-          /*{
-            title: '开始时间',
-            align: "center",
-            dataIndex: 'startTime'
-          },
-          {
-            title: '结束时间',
-            align: "center",
-            dataIndex: 'endTime'
-          },*/
-          {
-            title: '发布人',
-            align: "center",
-            dataIndex: 'sender'
-          },
-          {
-            title: '优先级',
-            align: "center",
-            dataIndex: 'priority',
-            customRender: function (text) {
-              if (text == 'L') {
-                return "低";
-              } else if (text == "M") {
-                return "中";
-              } else if (text == "H") {
-                return "高";
-              } else {
-                return text;
-              }
-            }
-          },
-          {
-            title: '通告对象',
-            align: "center",
-            dataIndex: 'msgType',
-            customRender: function (text) {
-              if (text == 'USER') {
-                return "指定用户";
-              } else if (text == "ALL") {
-                return "全体用户";
-              } else {
-                return text;
-              }
-            }
-          },
-          {
-            title: '发布状态',
-            align: "center",
-            dataIndex: 'sendStatus',
-            customRender: function (text) {
-              if (text == 0) {
-                return "未发布";
-              } else if (text == 1) {
-                return "已发布";
-              } else if (text == 2) {
-                return "已撤销";
-              } else {
-                return text;
-              }
-            }
-          },
-          {
-            title: '发布时间',
-            align: "center",
-            dataIndex: 'sendTime'
-          },
-          {
-            title: '撤销时间',
-            align: "center",
-            dataIndex: 'cancelTime'
-          },
-          /*{
-                title: '删除状态（0，正常，1已删除）',
-                align:"center",
-                dataIndex: 'delFlag'
-              },*/
-          {
-            title: '操作',
-            dataIndex: 'action',
-            align: "center",
-            scopedSlots: {customRender: 'action'},
-          }
-        ],
-        url: {
-          list: "/sys/annountCement/list",
-          delete: "/sys/annountCement/delete",
-          deleteBatch: "/sys/annountCement/deleteBatch",
-          releaseDataUrl: "/sys/annountCement/doReleaseData",
-          reovkeDataUrl: "sys/annountCement/doReovkeData",
-          exportXlsUrl: "sys/annountCement/exportXls",
-          importExcelUrl: "sys/annountCement/importExcel",
-        },
-      }
-    },
-    computed: {
-      importExcelUrl: function(){
-        return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
-      }
-    },
-    methods: {
-      //执行发布操作
-      releaseData: function (id) {
-        console.log(id);
-        var that = this;
-        doReleaseData({id: id}).then((res) => {
-          if (res.success) {
-            that.$message.success(res.message);
-            that.loadData(1);
-          } else {
-            that.$message.warning(res.message);
-          }
-        });
-      },
-      //执行撤销操作
-      reovkeData: function (id) {
-        var that = this;
-        doReovkeData({id: id}).then((res) => {
-          if (res.success) {
-            that.$message.success(res.message);
-            that.loadData(1);
-            this.syncHeadNotic(id)
-          } else {
-            that.$message.warning(res.message);
-          }
-        });
-      },
-      syncHeadNotic(anntId){
-        getAction("sys/annountCement/syncNotic",{anntId:anntId})
-      },
-    }
-  }
-</script>
-<style scoped>
-  @import '~@assets/less/common.less'
-</style>
\ No newline at end of file
diff --git a/jshERP-web/src/views/system/SysCategoryList.vue b/jshERP-web/src/views/system/SysCategoryList.vue
deleted file mode 100644
index 91afddaa..00000000
--- a/jshERP-web/src/views/system/SysCategoryList.vue
+++ /dev/null
@@ -1,302 +0,0 @@
-<template>
-  <a-card :bordered="false">
-    
-    <!-- 操作按钮区域 -->
-    <div class="table-operator">
-      <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
-      <!--<a-button type="primary" icon="download" @click="handleExportXls('分类字典')">导出</a-button>
-      <a-upload name="file" :showUploadList="false" :multiple="false" :action="importExcelUrl" @change="handleImportExcel">
-        <a-button type="primary" icon="import">导入</a-button>
-      </a-upload>-->
-      <a-dropdown v-if="selectedRowKeys.length > 0">
-        <a-menu slot="overlay">
-          <a-menu-item key="1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item>
-        </a-menu>
-        <a-button style="margin-left: 8px"> 批量操作 <a-icon type="down" /></a-button>
-      </a-dropdown>
-    </div>
-
-    <!-- table区域-begin -->
-    <div>
-      <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
-        <i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a style="font-weight: 600">{{ selectedRowKeys.length }}</a>项
-        <a style="margin-left: 24px" @click="onClearSelected">清空</a>
-      </div>
-
-      <a-table
-        ref="table"
-        size="middle"
-        rowKey="id"
-        :columns="columns"
-        :dataSource="dataSource"
-        :pagination="ipagination"
-        :loading="loading"
-        :expandedRowKeys="expandedRowKeys"
-        @change="handleTableChange"
-        @expand="handleExpand"
-        v-bind="tableProps">
-        
-        <span slot="action" slot-scope="text, record">
-          <a @click="handleEdit(record)">编辑</a>
-          <a-divider type="vertical" />
-          <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record)">
-            <a>删除</a>
-          </a-popconfirm>
-          <a-divider type="vertical" />
-          <a @click="handleAddSub(record)">添加下级</a>
-        </span>
-
-      </a-table>
-    </div>
-
-    <sysCategory-modal ref="modalForm" @ok="modalFormOk"></sysCategory-modal>
-  </a-card>
-</template>
-
-<script>
-
-  import { getAction } from '@/api/manage'
-  import { JeecgListMixin } from '@/mixins/JeecgListMixin'
-  import SysCategoryModal from './modules/SysCategoryModal'
-  import { deleteAction } from '@/api/manage'
-  
-  export default {
-    name: "SysCategoryList",
-    mixins:[JeecgListMixin],
-    components: {
-      SysCategoryModal
-    },
-    data () {
-      return {
-        description: '分类字典管理页面',
-        // 表头
-        columns: [
-          {
-            title:'分类名称',
-            align:"left",
-            dataIndex: 'name'
-          },
-          {
-            title:'分类编码',
-            align:"left",
-            dataIndex: 'code'
-          },
-          {
-            title: '操作',
-            dataIndex: 'action',
-            align:"center",
-            scopedSlots: { customRender: 'action' },
-          }
-        ],
-        url: {
-          list: "/sys/category/rootList",
-          childList: "/sys/category/childList",
-          delete: "/sys/category/delete",
-          deleteBatch: "/sys/category/deleteBatch",
-          exportXlsUrl: "/sys/category/exportXls",
-          importExcelUrl: "sys/category/importExcel",
-        },
-        expandedRowKeys:[],
-        hasChildrenField:"hasChild",
-        pidField:"pid",
-        dictOptions:{
-        },
-        subExpandedKeys:[],
-      }
-    },
-    computed: {
-      importExcelUrl(){
-        return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
-      },
-      tableProps() {
-        let _this = this
-        return {
-          // 列表项是否可选择
-          rowSelection: {
-            selectedRowKeys: _this.selectedRowKeys,
-            onChange: (selectedRowKeys) => _this.selectedRowKeys = selectedRowKeys
-          }
-        }
-      }
-    },
-    methods: {
-      loadData(arg){
-        if(arg==1){
-          this.ipagination.current=1
-        }
-        this.loading = true
-        this.expandedRowKeys = []
-        let params = this.getQueryParams()
-        return new Promise((resolve) => {
-          getAction(this.url.list,params).then(res=>{
-            if(res.success){
-              let result = res.result
-              if(Number(result.total)>0){
-                this.ipagination.total = Number(result.total)
-                this.dataSource = this.getDataByResult(res.result.records)
-                resolve()
-              }else{
-                this.ipagination.total=0
-                this.dataSource=[]
-              }
-            }else{
-              this.$message.warning(res.message)
-            }
-            this.loading = false
-          })
-        })
-      },
-      getDataByResult(result){
-        return result.map(item=>{
-          //判断是否标记了带有子节点
-          if(item[this.hasChildrenField]=='1'){
-            let loadChild = { id: item.id+'_loadChild', name: 'loading...', isLoading: true }
-            item.children = [loadChild]
-          }
-          return item
-        })
-      },
-      handleExpand(expanded, record){
-        // 判断是否是展开状态
-        if (expanded) {
-          this.expandedRowKeys.push(record.id)
-          if (record.children.length>0 && record.children[0].isLoading === true) {
-            let params = this.getQueryParams();//查询条件
-            params[this.pidField] = record.id
-            getAction(this.url.childList,params).then((res)=>{
-              if(res.success){
-                if(res.result && res.result.length>0){
-                  record.children = this.getDataByResult(res.result)
-                  this.dataSource = [...this.dataSource]
-                }else{
-                  record.children=''
-                  record.hasChildrenField='0'
-                }
-              }else{
-                this.$message.warning(res.message)
-              }
-            })
-          }
-        }else{
-          let keyIndex = this.expandedRowKeys.indexOf(record.id)
-          if(keyIndex>=0){
-            this.expandedRowKeys.splice(keyIndex, 1);
-          }
-        }
-      },
-      initDictConfig(){
-      },
-      modalFormOk(formData,arr){
-        if(!formData.id){
-          this.addOk(formData,arr)
-        }else{
-          this.editOk(formData,this.dataSource)
-          this.dataSource=[...this.dataSource]
-        }
-      },
-      editOk(formData,arr){
-        if(arr && arr.length>0){
-          for(let i=0;i<arr.length;i++){
-            if(arr[i].id==formData.id){
-              arr[i]=formData
-              break
-            }else{
-              this.editOk(formData,arr[i].children)
-            }
-          }
-        }
-      },
-      async addOk(formData,arr){
-        if(!formData[this.pidField]){
-          this.loadData()
-        }else{
-          this.expandedRowKeys=[]
-          console.log("22222",arr)
-          for(let i of arr){
-            await this.expandTreeNode(i)
-          }
-        }
-      },
-      expandTreeNode(nodeId){
-        return new Promise((resolve,reject)=>{
-          this.getFormDataById(nodeId,this.dataSource)
-          let row = this.parentFormData
-          this.expandedRowKeys.push(nodeId)
-          let params = this.getQueryParams();//查询条件
-          params[this.pidField] = nodeId
-          getAction(this.url.childList,params).then((res)=>{
-            console.log("11111",res)
-            if(res.success){
-              if(res.result && res.result.length>0){
-                row.children = this.getDataByResult(res.result)
-                this.dataSource = [...this.dataSource]
-                resolve()
-              }else{
-                row.children=''
-                row.hasChildrenField='0'
-                reject()
-              }
-            }else{
-              reject()
-            }
-          })
-        })
-      },
-      getFormDataById(id,arr){
-        if(arr && arr.length>0){
-          for(let i=0;i<arr.length;i++){
-            if(arr[i].id==id){
-              this.parentFormData = arr[i]
-            }else{
-              this.getFormDataById(id,arr[i].children)
-            }
-          }
-        }
-      },
-      handleAddSub(record){
-        this.subExpandedKeys = [];
-        this.getExpandKeysByPid(record.id,this.dataSource,this.dataSource)
-        this.$refs.modalForm.subExpandedKeys = this.subExpandedKeys;
-        this.$refs.modalForm.title = "添加子分类";
-        this.$refs.modalForm.edit({'pid':record.id});
-        this.$refs.modalForm.disableSubmit = false;
-      },
-      handleDelete: function (record) {
-        let that = this;
-        deleteAction(that.url.delete, {id: record.id}).then((res) => {
-          if (res.success) {
-            if (record.pid && record.pid!='0') {
-              let formData = {pid: record.pid};
-              that.$message.success(res.message);
-              that.subExpandedKeys = [];
-              that.getExpandKeysByPid(record.pid, this.dataSource, this.dataSource)
-              that.addOk(formData, this.subExpandedKeys.reverse())
-            } else {
-              that.loadData();
-            }
-          } else {
-            that.$message.warning(res.message);
-          }
-        });
-      },
-      // 添加子分类时获取所有父级id
-      getExpandKeysByPid(pid,arr,all){
-        if(pid && arr && arr.length>0){
-          for(let i=0;i<arr.length;i++){
-            if(arr[i].id==pid){
-              this.subExpandedKeys.push(arr[i].id)
-              this.getExpandKeysByPid(arr[i]['pid'],all,all)
-            }else{
-              this.getExpandKeysByPid(pid,arr[i].children,all)
-            }
-          }
-        }
-      },
-      
-       
-    }
-  }
-</script>
-<style scoped>
-  @import '~@assets/less/common.less'
-</style>
\ No newline at end of file
diff --git a/jshERP-web/src/views/system/SysCheckRuleList.vue b/jshERP-web/src/views/system/SysCheckRuleList.vue
deleted file mode 100644
index 783eb7d2..00000000
--- a/jshERP-web/src/views/system/SysCheckRuleList.vue
+++ /dev/null
@@ -1,178 +0,0 @@
-<template>
-  <a-card :bordered="false">
-
-    <!-- 查询区域 -->
-    <div class="table-page-search-wrapper">
-      <a-form layout="inline" @keyup.enter.native="searchQuery">
-        <a-row :gutter="24">
-
-          <a-col :md="6" :sm="8">
-            <a-form-item label="规则名称">
-              <a-input placeholder="请输入规则名称" v-model="queryParam.ruleName"/>
-            </a-form-item>
-          </a-col>
-          <a-col :md="6" :sm="8">
-            <a-form-item label="规则Code">
-              <a-input placeholder="请输入规则Code" v-model="queryParam.ruleCode"/>
-            </a-form-item>
-          </a-col>
-          <template v-if="toggleSearchStatus">
-          </template>
-          <a-col :md="6" :sm="8">
-            <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
-              <a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
-              <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
-              <a @click="handleToggleSearch" style="margin-left: 8px">
-                {{ toggleSearchStatus ? '收起' : '展开' }}
-                <a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>
-              </a>
-            </span>
-          </a-col>
-
-        </a-row>
-      </a-form>
-    </div>
-
-    <!-- 操作按钮区域 -->
-    <div class="table-operator">
-      <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
-      <a-button type="primary" icon="download" @click="handleExportXls('编码校验规则')">导出</a-button>
-      <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
-        <a-button type="primary" icon="import">导入</a-button>
-      </a-upload>
-      <a-dropdown v-if="selectedRowKeys.length > 0">
-        <a-menu slot="overlay">
-          <a-menu-item key="1" @click="batchDel">
-            <a-icon type="delete"/>
-            删除
-          </a-menu-item>
-        </a-menu>
-        <a-button style="margin-left: 8px"> 批量操作
-          <a-icon type="down"/>
-        </a-button>
-      </a-dropdown>
-    </div>
-
-    <!-- table区域-begin -->
-    <a-alert type="info" showIcon style="margin-bottom: 16px;">
-      <template slot="message">
-        <span>已选择</span>
-        <a style="font-weight: 600;padding: 0 4px;">{{ selectedRowKeys.length }}</a>
-        <span>项</span>
-        <template v-if="selectedRowKeys.length>0">
-          <a-divider type="vertical"/>
-          <a @click="onClearSelected">清空</a>
-        </template>
-      </template>
-    </a-alert>
-
-    <a-table
-      ref="table"
-      size="middle"
-      bordered
-      rowKey="id"
-      :columns="columns"
-      :dataSource="dataSource"
-      :pagination="ipagination"
-      :loading="loading"
-      :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
-      @change="handleTableChange">
-
-      <template slot="action" slot-scope="text, record">
-        <a @click="handleEdit(record)">编辑</a>
-        <a-divider type="vertical"/>
-        <a @click="handleTest(record)">功能测试</a>
-        <a-divider type="vertical"/>
-        <a-dropdown>
-          <a class="ant-dropdown-link">
-            <span>更多</span>
-            <a-icon type="down"/>
-          </a>
-          <a-menu slot="overlay">
-            <a-menu-item>
-              <a-popconfirm title="确定删除吗？" @confirm="handleDelete(record.id)">删除</a-popconfirm>
-            </a-menu-item>
-          </a-menu>
-        </a-dropdown>
-      </template>
-
-    </a-table>
-    <!-- table区域-end -->
-
-    <!-- 表单区域 -->
-    <sys-check-rule-modal ref="modalForm" @ok="modalFormOk"/>
-
-    <sys-check-rule-test-modal ref="testModal"/>
-
-  </a-card>
-</template>
-
-<script>
-  import JEllipsis from '@/components/jeecg/JEllipsis'
-  import { JeecgListMixin } from '@/mixins/JeecgListMixin'
-  import SysCheckRuleModal from './modules/SysCheckRuleModal'
-  import SysCheckRuleTestModal from './modules/SysCheckRuleTestModal'
-
-  export default {
-    name: 'SysCheckRuleList',
-    mixins: [JeecgListMixin],
-    components: { SysCheckRuleModal, SysCheckRuleTestModal, JEllipsis },
-    data() {
-      return {
-        description: '编码校验规则管理页面',
-        // 表头
-        columns: [
-          {
-            title: '#',
-            key: 'rowIndex',
-            width: 60,
-            align: 'center',
-            customRender: (t, r, i) => i + 1
-          },
-          {
-            title: '规则名称',
-            align: 'center',
-            dataIndex: 'ruleName'
-          },
-          {
-            title: '规则Code',
-            align: 'center',
-            dataIndex: 'ruleCode'
-          },
-          {
-            title: '规则描述',
-            align: 'center',
-            dataIndex: 'ruleDescription',
-            customRender: (t) => (<j-ellipsis value={t} length={48}/>)
-          },
-          {
-            title: '操作',
-            dataIndex: 'action',
-            align: 'center',
-            scopedSlots: { customRender: 'action' },
-          }
-        ],
-        url: {
-          list: '/sys/checkRule/list',
-          delete: '/sys/checkRule/delete',
-          deleteBatch: '/sys/checkRule/deleteBatch',
-          exportXlsUrl: 'sys/checkRule/exportXls',
-          importExcelUrl: 'sys/checkRule/importExcel',
-        },
-      }
-    },
-    computed: {
-      importExcelUrl: function () {
-        return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`
-      }
-    },
-    methods: {
-      handleTest(record) {
-        this.$refs.testModal.open(record.ruleCode)
-      }
-    }
-  }
-</script>
-<style scoped>
-  @import '~@assets/less/common.less';
-</style>
\ No newline at end of file
diff --git a/jshERP-web/src/views/system/SysDataSourceList.vue b/jshERP-web/src/views/system/SysDataSourceList.vue
deleted file mode 100644
index 5fc63172..00000000
--- a/jshERP-web/src/views/system/SysDataSourceList.vue
+++ /dev/null
@@ -1,188 +0,0 @@
-<template>
-  <a-card :bordered="false">
-
-    <!-- 查询区域 -->
-    <div class="table-page-search-wrapper">
-      <a-form layout="inline" @keyup.enter.native="searchQuery">
-        <a-row :gutter="24">
-
-          <a-col :md="6" :sm="8">
-            <a-form-item label="数据源名称">
-              <a-input placeholder="请输入数据源名称" v-model="queryParam.name"/>
-            </a-form-item>
-          </a-col>
-
-          <a-col :md="6" :sm="8">
-            <a-form-item label="数据库类型">
-              <j-dict-select-tag v-model="queryParam.dbType" placeholder="请选择数据库类型" dict-code="database_type"/>
-            </a-form-item>
-          </a-col>
-
-          <a-col :md="6" :sm="8">
-            <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
-              <a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
-              <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
-            </span>
-          </a-col>
-
-        </a-row>
-      </a-form>
-    </div>
-
-    <!-- 操作按钮区域 -->
-    <div class="table-operator">
-      <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
-      <a-button type="primary" icon="download" @click="handleExportXls('多数据源管理')">导出</a-button>
-      <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
-        <a-button type="primary" icon="import">导入</a-button>
-      </a-upload>
-      <a-dropdown v-if="selectedRowKeys.length > 0">
-        <a-menu slot="overlay">
-          <a-menu-item key="1" @click="batchDel">
-            <a-icon type="delete"/>
-            删除
-          </a-menu-item>
-        </a-menu>
-        <a-button style="margin-left: 8px"> 批量操作
-          <a-icon type="down"/>
-        </a-button>
-      </a-dropdown>
-    </div>
-
-    <!-- table区域-begin -->
-    <div>
-
-      <a-alert type="info" showIcon style="margin-bottom: 16px;">
-        <template slot="message">
-          <span>已选择</span>
-          <a style="font-weight: 600;padding: 0 4px;">{{ selectedRowKeys.length }}</a>
-          <span>项</span>
-          <a style="margin-left: 24px" @click="onClearSelected">清空</a>
-        </template>
-      </a-alert>
-
-      <a-table
-        ref="table"
-        size="middle"
-        bordered
-        rowKey="id"
-        :columns="columns"
-        :dataSource="dataSource"
-        :pagination="ipagination"
-        :loading="loading"
-        :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
-        @change="handleTableChange">
-
-        <span slot="action" slot-scope="text, record">
-          <a @click="handleEdit(record)">编辑</a>
-
-          <a-divider type="vertical"/>
-          <a-dropdown>
-            <a class="ant-dropdown-link">更多 <a-icon type="down"/></a>
-            <a-menu slot="overlay">
-              <a-menu-item>
-                <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
-                  <a>删除</a>
-                </a-popconfirm>
-              </a-menu-item>
-            </a-menu>
-          </a-dropdown>
-        </span>
-
-      </a-table>
-    </div>
-    <!-- table区域-end -->
-
-    <!-- 表单区域 -->
-    <sys-data-source-modal ref="modalForm" @ok="modalFormOk"/>
-
-  </a-card>
-</template>
-
-<script>
-  import JEllipsis from '@/components/jeecg/JEllipsis'
-  import { JeecgListMixin } from '@/mixins/JeecgListMixin'
-  import SysDataSourceModal from './modules/SysDataSourceModal'
-
-  export default {
-    name: 'SysDataSourceList',
-    mixins: [JeecgListMixin],
-    components: { JEllipsis, SysDataSourceModal },
-    data() {
-      let ellipsis = (v, l = 20) => (<j-ellipsis value={v} length={l}/>)
-      return {
-        description: '多数据源管理管理页面',
-        // 表头
-        columns: [
-          {
-            title: '#',
-            dataIndex: '',
-            key: 'rowIndex',
-            width: 60,
-            align: 'center',
-            customRender: (t, r, index) => index + 1
-          },
-          {
-            title: '数据源编码',
-            align: 'center',
-            dataIndex: 'code'
-          },
-          {
-            title: '数据源名称',
-            align: 'center',
-            dataIndex: 'name'
-          },
-          {
-            title: '数据库类型',
-            align: 'center',
-            dataIndex: 'dbType_dictText'
-          },
-          {
-            title: '驱动类',
-            align: 'center',
-            dataIndex: 'dbDriver',
-            customRender: (t) => ellipsis(t)
-          },
-          {
-            title: '数据源地址',
-            align: 'center',
-            dataIndex: 'dbUrl',
-            customRender: (t) => ellipsis(t)
-          },
-          {
-            title: '数据库名称',
-            align: 'center',
-            dataIndex: 'dbName'
-          },
-          {
-            title: '用户名',
-            align: 'center',
-            dataIndex: 'dbUsername'
-          },
-          {
-            title: '操作',
-            dataIndex: 'action',
-            align: 'center',
-            scopedSlots: { customRender: 'action' },
-          }
-        ],
-        url: {
-          list: '/sys/dataSource/list',
-          delete: '/sys/dataSource/delete',
-          deleteBatch: '/sys/dataSource/deleteBatch',
-          exportXlsUrl: 'sys/dataSource/exportXls',
-          importExcelUrl: 'sys/dataSource/importExcel',
-        },
-      }
-    },
-    computed: {
-      importExcelUrl() {
-        return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`
-      }
-    },
-    methods: {}
-  }
-</script>
-<style scoped>
-  @import '~@assets/less/common.less';
-</style>
\ No newline at end of file
diff --git a/jshERP-web/src/views/system/SysFillRuleList.vue b/jshERP-web/src/views/system/SysFillRuleList.vue
deleted file mode 100644
index 324eea09..00000000
--- a/jshERP-web/src/views/system/SysFillRuleList.vue
+++ /dev/null
@@ -1,187 +0,0 @@
-<template>
-  <a-card :bordered="false">
-
-    <!-- 查询区域 -->
-    <div class="table-page-search-wrapper">
-      <a-form layout="inline" @keyup.enter.native="searchQuery">
-        <a-row :gutter="24">
-          <a-col :md="6" :sm="8">
-            <a-form-item label="规则名称">
-              <a-input placeholder="请输入规则名称" v-model="queryParam.ruleName"></a-input>
-            </a-form-item>
-          </a-col>
-          <a-col :md="6" :sm="8">
-            <a-form-item label="规则Code">
-              <a-input placeholder="请输入规则Code" v-model="queryParam.ruleCode"></a-input>
-            </a-form-item>
-          </a-col>
-          <a-col :md="6" :sm="8">
-            <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
-              <a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
-              <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
-            </span>
-          </a-col>
-        </a-row>
-      </a-form>
-    </div>
-
-    <!-- 操作按钮区域 -->
-    <div class="table-operator">
-      <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
-      <a-button type="primary" icon="download" @click="handleExportXls('填值规则')">导出</a-button>
-      <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
-        <a-button type="primary" icon="import">导入</a-button>
-      </a-upload>
-      <a-dropdown v-if="selectedRowKeys.length > 0">
-        <a-menu slot="overlay">
-          <a-menu-item key="1" @click="batchDel">
-            <a-icon type="delete"/>
-            删除
-          </a-menu-item>
-        </a-menu>
-        <a-button style="margin-left: 8px"> 批量操作
-          <a-icon type="down"/>
-        </a-button>
-      </a-dropdown>
-    </div>
-
-    <!-- table区域-begin -->
-    <a-alert type="info" showIcon style="margin-bottom: 16px;">
-      <template slot="message">
-        <span>已选择</span>
-        <a style="font-weight: 600;padding: 0 4px;">{{ selectedRowKeys.length }}</a>
-        <span>项</span>
-        <template v-if="selectedRowKeys.length>0">
-          <a-divider type="vertical"/>
-          <a @click="onClearSelected">清空</a>
-        </template>
-      </template>
-    </a-alert>
-
-    <a-table
-      ref="table"
-      size="middle"
-      bordered
-      rowKey="id"
-      :columns="columns"
-      :dataSource="dataSource"
-      :pagination="ipagination"
-      :loading="loading"
-      :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
-      @change="handleTableChange">
-
-        <span slot="action" slot-scope="text, record">
-          <a @click="handleEdit(record)">编辑</a>
-          <a-divider type="vertical"/>
-          <a-dropdown>
-            <a class="ant-dropdown-link">更多 <a-icon type="down"/></a>
-            <a-menu slot="overlay">
-              <a-menu-item @click="handleTest(record)">
-                功能测试
-              </a-menu-item>
-              <a-menu-item>
-                <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
-                  <a>删除</a>
-                </a-popconfirm>
-              </a-menu-item>
-            </a-menu>
-          </a-dropdown>
-        </span>
-
-    </a-table>
-    <!-- table区域-end -->
-
-    <!-- 表单区域 -->
-    <sys-fill-rule-modal ref="modalForm" @ok="modalFormOk"/>
-  </a-card>
-</template>
-
-<script>
-  import { getAction } from '@/api/manage'
-  import SysFillRuleModal from './modules/SysFillRuleModal'
-  import { JeecgListMixin } from '@/mixins/JeecgListMixin'
-
-  export default {
-    name: 'SysFillRuleList',
-    mixins: [JeecgListMixin],
-    components: { SysFillRuleModal },
-    data() {
-      return {
-        description: '填值规则管理页面',
-        // 表头
-        columns: [
-          {
-            title: '#',
-            dataIndex: '',
-            key: 'rowIndex',
-            width: 60,
-            align: 'center',
-            customRender: (t, r, index) => 1 + index
-          },
-          {
-            title: '规则名称',
-            align: 'center',
-            dataIndex: 'ruleName'
-          },
-          {
-            title: '规则Code',
-            align: 'center',
-            dataIndex: 'ruleCode'
-          },
-          {
-            title: '规则实现类',
-            align: 'center',
-            dataIndex: 'ruleClass'
-          },
-          {
-            title: '规则参数',
-            align: 'center',
-            dataIndex: 'ruleParams'
-          },
-          {
-            title: '操作',
-            dataIndex: 'action',
-            align: 'center',
-            scopedSlots: { customRender: 'action' },
-          }
-        ],
-        url: {
-          list: '/sys/fillRule/list',
-          test: '/sys/fillRule/testFillRule',
-          delete: '/sys/fillRule/delete',
-          deleteBatch: '/sys/fillRule/deleteBatch',
-          exportXlsUrl: '/sys/fillRule/exportXls',
-          importExcelUrl: '/sys/fillRule/importExcel',
-        },
-      }
-    },
-    computed: {
-      importExcelUrl() {
-        return `${window._CONFIG['domianURL']}${this.url.importExcelUrl}`
-      }
-    },
-    methods: {
-      handleTest(record) {
-        let closeLoading = this.$message.loading('生成中...', 0)
-
-        getAction(this.url.test, {
-          ruleCode: record.ruleCode
-        }).then(res => {
-          if (res.success) {
-            this.$info({
-              title: '填值规则功能测试',
-              content: '生成结果：' + res.result
-            })
-          } else {
-            this.$message.warn(res.message)
-          }
-        }).finally(() => {
-          closeLoading()
-        })
-      }
-    }
-  }
-</script>
-<style scoped>
-  @import '~@assets/less/common.less'
-</style>
\ No newline at end of file
diff --git a/jshERP-web/src/views/system/SysPositionList.vue b/jshERP-web/src/views/system/SysPositionList.vue
deleted file mode 100644
index 2b6864fb..00000000
--- a/jshERP-web/src/views/system/SysPositionList.vue
+++ /dev/null
@@ -1,178 +0,0 @@
-<template>
-  <a-card :bordered="false">
-
-    <!-- 查询区域 -->
-    <div class="table-page-search-wrapper">
-      <a-form layout="inline" @keyup.enter.native="searchQuery">
-        <a-row :gutter="24">
-
-          <a-col :md="6" :sm="8">
-            <a-form-item label="职务编码">
-              <a-input placeholder="请输入职务编码" v-model="queryParam.code"></a-input>
-            </a-form-item>
-          </a-col>
-          <a-col :md="6" :sm="8">
-            <a-form-item label="职务名称">
-              <a-input placeholder="请输入职务名称" v-model="queryParam.name"></a-input>
-            </a-form-item>
-          </a-col>
-          <template v-if="toggleSearchStatus">
-            <a-col :md="6" :sm="8">
-              <a-form-item label="职级">
-                <j-dict-select-tag v-model="queryParam.postRank" placeholder="请选择职级" dictCode="position_rank"/>
-              </a-form-item>
-            </a-col>
-
-          </template>
-          <a-col :md="6" :sm="8">
-            <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
-              <a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
-              <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
-              <a @click="handleToggleSearch" style="margin-left: 8px">
-                {{ toggleSearchStatus ? '收起' : '展开' }}
-                <a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>
-              </a>
-            </span>
-          </a-col>
-
-        </a-row>
-      </a-form>
-    </div>
-
-    <!-- 操作按钮区域 -->
-    <div class="table-operator">
-      <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
-      <a-button type="primary" icon="download" @click="handleExportXls('职务表')">导出</a-button>
-      <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
-        <a-button type="primary" icon="import">导入</a-button>
-      </a-upload>
-      <a-dropdown v-if="selectedRowKeys.length > 0">
-        <a-menu slot="overlay">
-          <a-menu-item key="1" @click="batchDel">
-            <a-icon type="delete"/>
-            删除
-          </a-menu-item>
-        </a-menu>
-        <a-button style="margin-left: 8px"> 批量操作
-          <a-icon type="down"/>
-        </a-button>
-      </a-dropdown>
-    </div>
-
-    <!-- table区域-begin -->
-    <div>
-      <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
-        <i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a style="font-weight: 600">{{ selectedRowKeys.length }}</a>项
-        <a style="margin-left: 24px" @click="onClearSelected">清空</a>
-      </div>
-
-      <a-table
-        ref="table"
-        size="middle"
-        bordered
-        rowKey="id"
-        :columns="columns"
-        :dataSource="dataSource"
-        :pagination="ipagination"
-        :loading="loading"
-        :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
-        @change="handleTableChange">
-
-        <span slot="action" slot-scope="text, record">
-          <a @click="handleEdit(record)">编辑</a>
-
-          <a-divider type="vertical"/>
-          <a-dropdown>
-            <a class="ant-dropdown-link">更多 <a-icon type="down"/></a>
-            <a-menu slot="overlay">
-              <a-menu-item>
-                <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
-                  <a>删除</a>
-                </a-popconfirm>
-              </a-menu-item>
-            </a-menu>
-          </a-dropdown>
-        </span>
-
-      </a-table>
-    </div>
-    <!-- table区域-end -->
-
-    <!-- 表单区域 -->
-    <sysPosition-modal ref="modalForm" @ok="modalFormOk"></sysPosition-modal>
-  </a-card>
-</template>
-
-<script>
-  import SysPositionModal from './modules/SysPositionModal'
-  import { JeecgListMixin } from '@/mixins/JeecgListMixin'
-  import JDictSelectTag from '@/components/dict/JDictSelectTag'
-
-  export default {
-    name: 'SysPositionList',
-    mixins: [JeecgListMixin],
-    components: {
-      SysPositionModal,
-      JDictSelectTag
-    },
-    data() {
-      return {
-        description: '职务表管理页面',
-        // 表头
-        columns: [
-          {
-            title: '#',
-            dataIndex: '',
-            key: 'rowIndex',
-            width: 60,
-            align: 'center',
-            customRender: function (t, r, index) {
-              return parseInt(index) + 1
-            }
-          },
-          {
-            title: '职务编码',
-            align: 'center',
-            dataIndex: 'code'
-          },
-          {
-            title: '职务名称',
-            align: 'center',
-            dataIndex: 'name'
-          },
-          {
-            title: '职级',
-            align: 'center',
-            dataIndex: 'postRank_dictText'
-          },
-          // {
-          //   title: '公司id',
-          //   align: 'center',
-          //   dataIndex: 'companyId'
-          // },
-          {
-            title: '操作',
-            dataIndex: 'action',
-            align: 'center',
-            scopedSlots: { customRender: 'action' },
-          }
-        ],
-        url: {
-          list: '/sys/position/list',
-          delete: '/sys/position/delete',
-          deleteBatch: '/sys/position/deleteBatch',
-          exportXlsUrl: '/sys/position/exportXls',
-          importExcelUrl: '/sys/position/importExcel',
-        },
-      }
-    },
-    computed: {
-      importExcelUrl: function () {
-        return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`
-      }
-    }
-  }
-</script>
-<style scoped>
-  @import '~@assets/less/common.less'
-</style>
\ No newline at end of file
diff --git a/jshERP-web/src/views/system/UserAnnouncementList.vue b/jshERP-web/src/views/system/UserAnnouncementList.vue
deleted file mode 100644
index 891880ef..00000000
--- a/jshERP-web/src/views/system/UserAnnouncementList.vue
+++ /dev/null
@@ -1,192 +0,0 @@
-<template>
-  <a-card :bordered="false">
-    <!-- 查询区域 -->
-    <div class="table-page-search-wrapper">
-      <a-form layout="inline" @keyup.enter.native="searchQuery">
-        <a-row :gutter="24">
-
-          <a-col :span="6">
-            <a-form-item label="标题">
-              <a-input placeholder="请输入标题" v-model="queryParam.titile"></a-input>
-            </a-form-item>
-          </a-col>
-          <a-col :span="6">
-            <a-form-item label="发布人">
-              <a-input placeholder="请输入发布人" v-model="queryParam.sender"></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">查询</a-button>
-              <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
-            </span>
-          </a-col>
-
-        </a-row>
-      </a-form>
-    </div>
-
-    <div class="table-operator">
-      <a-button type="primary" @click="readAll" icon="book">全部标注已读</a-button>
-    </div>
-
-    <a-table
-      ref="table"
-      size="default"
-      bordered
-      rowKey="id"
-      :columns="columns"
-      :dataSource="dataSource"
-      :pagination="ipagination"
-      :loading="loading"
-      @change="handleTableChange">
-      <span slot="action" slot-scope="text, record">
-        <a @click="showAnnouncement(record)">查看</a>
-      </span>
-    </a-table>
-    <show-announcement ref="ShowAnnouncement"></show-announcement>
-    <dynamic-notice ref="showDynamNotice" :path="openPath" :formData="formData"/>
-  </a-card>
-</template>
-
-<script>
-  import { filterObj } from '@/utils/util'
-  import { getAction,putAction } from '@/api/manage'
-  import ShowAnnouncement from '@/components/tools/ShowAnnouncement'
-  import {JeecgListMixin} from '@/mixins/JeecgListMixin'
-  import DynamicNotice from '../../components/tools/DynamicNotice'
-
-  export default {
-    name: "UserAnnouncementList",
-    mixins: [JeecgListMixin],
-    components: {
-      DynamicNotice,
-      ShowAnnouncement
-    },
-    data () {
-      return {
-        description: '系统通告表管理页面',
-        queryParam: {},
-        columns: [{
-          title: '标题',
-          align:"center",
-          dataIndex: 'titile'
-        },{
-          title: '消息类型',
-          align: "center",
-          dataIndex: 'msgCategory',
-          customRender: function (text) {
-            if (text == '1') {
-              return "通知公告";
-            } else if (text == "2") {
-              return "系统消息";
-            } else {
-              return text;
-            }
-          }
-        },{
-          title: '发布人',
-          align:"center",
-          dataIndex: 'sender'
-        },{
-          title: '发布时间',
-          align:"center",
-          dataIndex: 'sendTime'
-        },{
-          title: '优先级',
-          align:"center",
-          dataIndex: 'priority',
-          customRender:function (text) {
-            if(text=='L'){
-              return "低";
-            }else if(text=="M"){
-              return "中";
-            }else if(text=="H"){
-              return "高";
-            } else {
-              return text;
-            }
-          }
-        },{
-          title: '阅读状态',
-          align:"center",
-          dataIndex: 'readFlag',
-          customRender:function (text) {
-            if(text=='0'){
-              return "未读";
-            }else if(text=="1"){
-              return "已读";
-            } else {
-              return text;
-            }
-          }
-        },{
-          title: '操作',
-          dataIndex: 'action',
-          align:"center",
-          scopedSlots: { customRender: 'action' },
-        }],
-		    url: {
-          list: "/sys/sysAnnouncementSend/getMyAnnouncementSend",
-          editCementSend:"sys/sysAnnouncementSend/editByAnntIdAndUserId",
-          readAllMsg:"sys/sysAnnouncementSend/readAll",
-        },
-        loading:false,
-        openPath:'',
-        formData:''
-      }
-    },
-    methods: {
-      handleDetail: function(record){
-        this.$refs.sysAnnouncementModal.detail(record);
-        this.$refs.sysAnnouncementModal.title="查看";
-      },
-      showAnnouncement(record){
-        putAction(this.url.editCementSend,{anntId:record.anntId}).then((res)=>{
-          if(res.success){
-            this.loadData();
-            this.syncHeadNotic(record.anntId)
-          }
-        });
-        if(record.openType==='component'){
-          this.openPath = record.openPage;
-          this.formData = {id:record.busId};
-          this.$refs.showDynamNotice.detail();
-        }else{
-          this.$refs.ShowAnnouncement.detail(record);
-        }
-      },
-      syncHeadNotic(anntId){
-        getAction("sys/annountCement/syncNotic",{anntId:anntId})
-      },
-      readAll(){
-        var that = this;
-        that.$confirm({
-          title:"确认操作",
-          content:"是否全部标注已读?",
-          onOk: function(){
-            putAction(that.url.readAllMsg).then((res)=>{
-              if(res.success){
-                that.$message.success(res.message);
-                that.loadData();
-                that.syncHeadNotic();
-              }
-            });
-          }
-        });
-      },
-    }
-  }
-</script>
-<style scoped>
-  .ant-card-body .table-operator{
-    margin-bottom: 18px;
-  }
-  .anty-row-operator button{margin: 0 5px}
-  .ant-btn-danger{background-color: #ffffff}z
-
-  .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-content{height:90% !important;overflow-y: hidden}
-</style>
\ No newline at end of file
diff --git a/jshERP-web/src/views/system/UserList.vue b/jshERP-web/src/views/system/UserList.vue
index 2e2e14e4..dfd8a57c 100644
--- a/jshERP-web/src/views/system/UserList.vue
+++ b/jshERP-web/src/views/system/UserList.vue
@@ -93,18 +93,14 @@
   import {postAction,getFileAccessHttpUrl} from '@/api/manage';
   import {frozenBatch} from '@/api/api'
   import {JeecgListMixin} from '@/mixins/JeecgListMixin'
-  import SysUserAgentModal from "./modules/SysUserAgentModal";
   import JInput from '@/components/jeecg/JInput'
-  import UserRecycleBinModal from './modules/UserRecycleBinModal'
   export default {
     name: "UserList",
     mixins: [JeecgListMixin],
     components: {
-      SysUserAgentModal,
       UserModal,
       PasswordModal,
-      JInput,
-      UserRecycleBinModal
+      JInput
     },
     data() {
       return {
diff --git a/jshERP-web/src/views/system/modules/AddressListLeft.vue b/jshERP-web/src/views/system/modules/AddressListLeft.vue
deleted file mode 100644
index 028a4112..00000000
--- a/jshERP-web/src/views/system/modules/AddressListLeft.vue
+++ /dev/null
@@ -1,99 +0,0 @@
-<template>
-  <a-card :loading="cardLoading" :bordered="false" style="height: 100%;">
-    <a-spin :spinning="loading">
-      <a-input-search @search="handleSearch" style="width:100%;margin-top: 10px" placeholder="输入机构名称查询..." enterButton />
-
-      <a-tree
-        showLine
-        checkStrictly
-        :expandedKeys.sync="expandedKeys"
-        :selectedKeys="selectedKeys"
-        :dropdownStyle="{maxHeight:'200px',overflow:'auto'}"
-        :treeData="treeDataSource"
-        @select="handleTreeSelect"
-      />
-    </a-spin>
-  </a-card>
-</template>
-
-<script>
-  import { queryDepartTreeList, searchByKeywords } from '@/api/api'
-
-  export default {
-    name: 'AddressListLeft',
-    props: ['value'],
-    data() {
-      return {
-        cardLoading: true,
-        loading: false,
-        treeDataSource: [],
-        selectedKeys: [],
-        expandedKeys: []
-      }
-    },
-    created() {
-      this.queryTreeData()
-    },
-    methods: {
-
-      queryTreeData(keyword) {
-        this.commonRequestThen(queryDepartTreeList({
-          departName: keyword ? keyword : undefined
-        }))
-      },
-
-      handleSearch(value) {
-        if (value) {
-          this.commonRequestThen(searchByKeywords({ keyWord: value }))
-        } else {
-          this.queryTreeData()
-        }
-      },
-
-      handleTreeSelect(selectedKeys, event) {
-        if (selectedKeys.length > 0 && this.selectedKeys[0] !== selectedKeys[0]) {
-          this.selectedKeys = [selectedKeys[0]]
-          let orgCode = event.node.dataRef.orgCode
-          this.emitInput(orgCode)
-        }
-      },
-
-      emitInput(orgCode) {
-        this.$emit('input', orgCode)
-      },
-
-      commonRequestThen(promise) {
-        this.loading = true
-        promise.then(res => {
-          if (res.success) {
-            this.treeDataSource = res.result
-            // update-begin- --- author:wangshuai ------ date:20200102 ---- for:去除默认选中第一条数据、默认展开所有第一级
-            // 默认选中第一条数据、默认展开所有第一级
-            // if (res.result.length > 0) {
-            //   this.expandedKeys = []
-            //   res.result.forEach((item, index) => {
-            //     if (index === 0) {
-            //       this.selectedKeys = [item.id]
-            //       this.emitInput(item.orgCode)
-            //     }
-            //     this.expandedKeys.push(item.id)
-            //   })
-            // }
-           // update-end- --- author:wangshuai ------ date:20200102 ---- for:去除默认选中第一条数据、默认展开所有第一级
-          } else {
-            this.$message.warn(res.message)
-            console.error('组织机构查询失败:', res)
-          }
-        }).finally(() => {
-          this.loading = false
-          this.cardLoading = false
-        })
-      },
-
-    }
-  }
-</script>
-
-<style scoped>
-
-</style>
\ No newline at end of file
diff --git a/jshERP-web/src/views/system/modules/AddressListRight.vue b/jshERP-web/src/views/system/modules/AddressListRight.vue
deleted file mode 100644
index cad98eba..00000000
--- a/jshERP-web/src/views/system/modules/AddressListRight.vue
+++ /dev/null
@@ -1,211 +0,0 @@
-<template>
-  <a-card class="j-address-list-right-card-box" :loading="cardLoading" :bordered="false">
-    <div class="table-page-search-wrapper">
-      <a-form layout="inline">
-        <a-row :gutter="10">
-
-          <a-col :md="6" :sm="12">
-            <a-form-item label="姓名" style="margin-left:8px">
-              <a-input placeholder="请输入姓名查询" v-model="queryParam.realname"></a-input>
-            </a-form-item>
-          </a-col>
-
-
-          <a-col :md="6" :sm="12">
-            <a-form-item label="工号" style="margin-left:8px">
-              <a-input placeholder="请输入工号查询" v-model="queryParam.workNo"></a-input>
-            </a-form-item>
-          </a-col>
-
-          <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
-            <a-col :md="6" :sm="24">
-             <a-button type="primary" @click="searchQuery" icon="search" style="margin-left: 18px">查询</a-button>
-              <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
-            </a-col>
-          </span>
-        </a-row>
-      </a-form>
-    </div>
-
-    <a-table
-      ref="table"
-      size="middle"
-      bordered
-      rowKey="userId"
-      :pagination="ipagination"
-      :columns="columns"
-      :dataSource="dataSource"
-      :loading="loading"
-      @change="handleTableChange">
-    </a-table>
-
-  </a-card>
-</template>
-
-<script>
-  import { getAction } from '@/api/manage'
-  import { JeecgListMixin } from '@/mixins/JeecgListMixin'
-
-  export default {
-    name: 'AddressListRight',
-    mixins: [JeecgListMixin],
-    components: {},
-    props: ['value'],
-    data() {
-      return {
-        description: '用户信息',
-        cardLoading: true,
-        positionInfo: {},
-        columns: [
-          {
-            title: '#',
-            key: 'rowIndex',
-            dataIndex: '',
-            width: 60,
-            align: 'center',
-            customRender: (t, r, i) => parseInt(i) + 1
-          },
-          {
-            title: '姓名',
-            width: '15%',
-            align: 'center',
-            dataIndex: 'realname'
-          },
-          {
-            title: '工号',
-            width: '15%',
-            align: 'center',
-            dataIndex: 'workNo'
-          },
-          {
-            title: '部门',
-            width: '20%',
-            align: 'center',
-            dataIndex: 'departName'
-          },
-          {
-            title: '职务',
-            width: '15%',
-            align: 'center',
-            dataIndex: 'post',
-            customRender: (text) => (text || '').split(',').map(t => this.positionInfo[t] ? this.positionInfo[t] : t).join(',')
-          },
-          {
-            title: '手机',
-            width: '15%',
-            align: 'center',
-            dataIndex: 'telephone'
-          },
-          // {
-          //   title: '手机号',
-          //   width: '12%',
-          //   align: 'center',
-          //   dataIndex: 'phone'
-          // },
-          {
-            title: '公司邮箱',
-            width: '15%',
-            align: 'center',
-            dataIndex: 'email'
-          }
-        ],
-        url: {
-          list: '/sys/user/queryByOrgCodeForAddressList',
-          listByPosition: '/sys/position/list'
-        }
-      }
-    },
-    watch: {
-      value: {
-        immediate: true,
-        handler(orgCode) {
-          this.dataSource = []
-          this.loadData(1, orgCode)
-        }
-      },
-    },
-    created() {
-      this.queryPositionInfo()
-    },
-    methods: {
-
-      loadData(pageNum, orgCode) {
-        this.loading = true
-        if (pageNum === 1) {
-            this.ipagination.current = 1
-        }
-        // update-begin- --- author:wangshuai ------ date:20200102 ---- for:传过来的部门编码为空全查
-        if (!orgCode) {
-            getAction(this.url.list, {
-                ...this.getQueryParams()
-            }).then((res) => {
-                if (res.success) {
-                    this.dataSource = res.result.records
-                    this.ipagination.total = res.result.total
-                }
-            }).finally(() => {
-                this.loading = false
-                this.cardLoading = false
-            })
-          // update-end- --- author:wangshuai ------ date:20200102 ---- for:传过来的部门编码为空全查
-        }else{
-        //加载数据 若传入参数1则加载第一页的内容
-        getAction(this.url.list, {
-          orgCode,
-          ...this.getQueryParams()
-        }).then((res) => {
-          if (res.success) {
-            this.dataSource = res.result.records
-            this.ipagination.total = res.result.total
-          }
-        }).finally(() => {
-          this.loading = false
-          this.cardLoading = false
-        })
-        }
-      },
-
-      searchQuery() {
-        this.loadData(1, this.value)
-      },
-      searchReset() {
-        this.queryParam = {}
-        this.loadData(1, this.value)
-      },
-
-      handleTableChange(pagination, filters, sorter) {
-        if (Object.keys(sorter).length > 0) {
-          this.isorter.column = sorter.field
-          this.isorter.order = 'ascend' === sorter.order ? 'asc' : 'desc'
-        }
-        this.ipagination = pagination
-        this.loadData(null, this.value)
-      },
-
-      // 查询职务信息
-      queryPositionInfo() {
-        getAction(this.url.listByPosition, { pageSize: 99999 }).then(res => {
-          if (res.success) {
-            let positionInfo = {}
-            res.result.records.forEach(record => {
-              positionInfo[record['code']] = record['name']
-            })
-            this.positionInfo = positionInfo
-          }
-        })
-      }
-
-    }
-  }
-</script>
-<style>
-  .j-address-list-right-card-box .ant-table-placeholder {
-    min-height: 46px;
-  }
-</style>
-<style scoped>
-  .j-address-list-right-card-box {
-    height: 100%;
-    min-height: 300px;
-  }
-</style>
\ No newline at end of file
diff --git a/jshERP-web/src/views/system/modules/DataLogCompareModal.vue b/jshERP-web/src/views/system/modules/DataLogCompareModal.vue
deleted file mode 100644
index e02bb02c..00000000
--- a/jshERP-web/src/views/system/modules/DataLogCompareModal.vue
+++ /dev/null
@@ -1,163 +0,0 @@
-<template>
-  <a-modal
-    :width="modalWidth"
-    :visible="visible"
-    :footer="null"
-    @cancel="handleCancel"
-    cancelText="关闭">
-    <!--table区 -->
-    <div class="marginCss">
-      <a-table
-        ref="table"
-        size="small"
-        bordered
-        rowKey="id"
-        :columns="columns"
-        :dataSource="dataSource"
-        :rowClassName="setdataCss"
-        :loading="loading"
-        :scroll="{ y: 700 }"
-        :pagination="false">
-        <span slot="dataVersionTitle1"><a-icon type="smile-o" /> 版本:{{dataVersion1Num}}</span>
-        <span slot="dataVersionTitle2"><a-icon type="smile-o" /> 版本:{{dataVersion2Num}}</span>
-        <template slot="avatarslot" slot-scope="text, record">
-          <div class="anty-img-wrap">
-            <img :src="getAvatarView(record)"/>
-          </div>
-
-        </template>
-      </a-table>
-    </div>
-  </a-modal>
-</template>
-
-<script>
-  import {getAction} from '@/api/manage'
-
-  export default {
-    name: 'DataLogCompareModal',
-    data() {
-      return {
-        modalWidth: 1000,
-        modaltoggleFlag: true,
-        confirmDirty: false,
-        title: '操作',
-        visible: false,
-        model: {},
-        confirmLoading: false,
-        headers: {},
-        //版本号
-        dataVersion1Num:'',
-        dataVersion2Num:'',
-        //表头
-        columns: [
-          {
-            title: '字段名',
-            align: 'left',
-            dataIndex: 'code',
-            width: '30%',
-          }, {
-            align: 'left',
-            dataIndex: 'dataVersion1',
-            width: '30%',
-            slots: { title: 'dataVersionTitle1' },
-          }, {
-            title: '',
-            dataIndex: 'imgshow',
-            align: 'center',
-            scopedSlots: {customRender: "avatarslot"},
-            width: '10%',
-          }, {
-            align: 'left',
-            dataIndex: 'dataVersion2',
-            width: '30%',
-            slots: { title: 'dataVersionTitle2' },
-          }
-        ],
-        //数据集
-        dataSource: [],
-        loading: false,
-        url: {
-          queryCompareUrl: "/sys/dataLog/queryCompareList",
-        },
-      }
-    },
-    created() {
-
-    },
-    methods: {
-      loadData(dataId1, dataId2) {
-        this.dataSource = [];
-        let that = this;
-        getAction(that.url.queryCompareUrl, {dataId1: dataId1, dataId2: dataId2}).then((res) => {
-          if (res.success) {
-            that.dataVersion1Num = res.result[0].dataVersion;
-            that.dataVersion2Num = res.result[1].dataVersion;
-            let json1 = JSON.parse(res.result[0].dataContent);
-            let json2 = JSON.parse(res.result[1].dataContent);
-            for (var item1 in json1) {
-              for (var item2 in json2) {
-                if (item1 == item2) {
-                  this.dataSource.push({
-                    code: item1,
-                    imgshow: '',
-                    dataVersion1: json1[item1],
-                    dataVersion2: json2[item2],
-                  })
-                }
-              }
-            }
-          } else {
-            console.log(res.message);
-          }
-        })
-      },
-      compareModal(dataId1, dataId2) {
-        this.visible = true
-        this.loadData(dataId1, dataId2);
-      },
-      handleCancel() {
-        this.close()
-      },
-      modalFormOk() {
-      },
-      close() {
-        this.$emit('close');
-        this.visible = false;
-        this.disableSubmit = false;
-      },
-      setdataCss(record) {
-        let className = 'trcolor';
-        const dataVersion1 = record.dataVersion1;
-        const dataVersion2 = record.dataVersion2;
-        if (dataVersion1 != dataVersion2) {
-          return className;
-        }
-      },
-      getAvatarView: function (avatar) {
-        if (avatar.dataVersion1 != avatar.dataVersion2) {
-          return "/goright.png";
-        } else {
-          return "";
-        }
-      },
-    }
-  }
-</script>
-
-<style scoped>
-  .anty-img-wrap {
-    height: 25px;
-    position: relative;
-  }
-
-  .anty-img-wrap > img {
-    max-height: 100%;
-  }
-
-  .marginCss {
-    margin-top: 20px;
-  }
-
-  @import '../../../assets/less/index.less';
-</style>
\ No newline at end of file
diff --git a/jshERP-web/src/views/system/modules/DataLogModal.vue b/jshERP-web/src/views/system/modules/DataLogModal.vue
deleted file mode 100644
index c9f1e9c0..00000000
--- a/jshERP-web/src/views/system/modules/DataLogModal.vue
+++ /dev/null
@@ -1,153 +0,0 @@
-<template>
-  <div>
-    <a-modal
-      :width="modalWidth"
-      :visible="visible"
-      title="数据对比窗口"
-      :confirmLoading="confirmLoading"
-      @ok="handleOk"
-      @cancel="handleCancel"
-      cancelText="取消">
-
-      <a-spin :spinning="confirmLoading">
-        <a-form @submit="handleSubmit" :form="form" class="form">
-          <a-row class="form-row" :gutter="24">
-            <a-col :md="12" :sm="8">
-              <a-form-item label="数据库表名"  :label-col="{ span: 6 }" :wrapper-col="{ span: 15 }">
-                <a-input placeholder="请输入数据库表名" v-decorator="[ 'dataTale', {}]" @blur="handleTableBlur" disabled/>
-              </a-form-item>
-            </a-col>
-
-            <a-col :md="12" :sm="8">
-              <a-form-item label="数据ID"  :label-col="{ span: 5 }" :wrapper-col="{ span: 15 }">
-                <a-input placeholder="请输入数据ID" v-decorator="[ 'dataId', {}]" @blur="handleIdBlur" disabled/>
-              </a-form-item>
-            </a-col>
-          </a-row>
-
-          <a-row class="form-row" :gutter="24">
-            <a-col :md="12" :sm="8">
-              <a-form-item label="版本号1"  :label-col="{ span: 6 }" :wrapper-col="{ span: 15 }">
-                <a-select placeholder="请选择版本号" v-decorator="[ 'dataVersion1', {}]" @change="handleChange1">
-                  <a-select-option v-for="(log,logindex) in DataVersionList" :key="logindex.toString()" :value="log.id">
-                    {{ log.dataVersion }}
-                  </a-select-option>
-                </a-select>
-              </a-form-item>
-            </a-col>
-            <a-col :md="12" :sm="8">
-              <a-form-item label="版本号2"  :label-col="{ span: 5 }" :wrapper-col="{ span: 15 }">
-                <a-select placeholder="请选择版本号" v-decorator="[ 'dataVersion2', {}]" @change="handleChange2">
-                  <a-select-option v-for="(log,logindex) in DataVersionList" :key="logindex.toString()" :value="log.id">
-                    {{ log.dataVersion }}
-                  </a-select-option>
-                </a-select>
-              </a-form-item>
-            </a-col>
-          </a-row>
-        </a-form>
-      </a-spin>
-      <data-log-compare-modal ref="modal" @ok="modalFormOk" ></data-log-compare-modal>
-    </a-modal>
-  </div>
-</template>
-
-<script>
-  import { getAction } from '@/api/manage'
-  import DataLogCompareModal from './DataLogCompareModal'
-  export default {
-    name: 'DataLogModal',
-    components: { DataLogCompareModal },
-    dataId1:'',
-    dataId2: '',
-    dataTable1:'',
-    dataID3:'',
-
-    data () {
-      return {
-        modalWidth:700,
-        modaltoggleFlag:true,
-        confirmDirty: false,
-        title:"操作",
-        visible: false,
-        model: {},
-        confirmLoading: false,
-        headers:{},
-        form:this.$form.createForm(this),
-        url: {
-          queryDataVerListUrl:"/sys/dataLog/queryDataVerList",
-        },
-        DataVersionList:[],
-      }
-    },
-    created () {
-    },
-    methods: {
-      addModal(records){
-        const dataTable = records[0].dataTable
-        const dataId = records[0].dataId;
-        const dataVersion1 = records[0].dataVersion;
-        const dataVersion2 = records[1].dataVersion;
-        this.dataId1 = records[0].id;
-        this.dataId2 = records[1].id;
-        this.dataTable1 = records[0].dataTable
-        this.dataID3 =  records[0].dataId
-        this.initDataVersionList();
-        this.form.resetFields();
-        this.visible = true;
-        this.$nextTick(() => {
-          this.form.setFieldsValue({dataTale:dataTable,dataId:dataId,dataVersion1:dataVersion1,dataVersion2:dataVersion2});
-        });
-      },
-      handleOk () {
-        this.close();
-        this.$refs.modal.compareModal(this.dataId1  ,this.dataId2);
-        this.$refs.modal.title="数据比较";
-      },
-      handleCancel(){
-        this.close()
-      },
-      handleSubmit(){
-      },
-      close () {
-        this.$emit('close');
-        this.visible = false;
-        this.disableSubmit = false;
-      },
-      modalFormOk () {
-      },
-      initDataVersionList(){
-        let that = this;
-        getAction(that.url.queryDataVerListUrl,{dataTable:this.dataTable1,dataId:this.dataID3}).then((res)=>{
-          if(res.success){
-            this.DataVersionList = res.result;
-          }else{
-            this.DataVersionList=[];
-            this.dataId1 = '',
-            this.dataId2='',
-            console.log(res.message);
-
-          }
-        });
-      },
-      handleChange1(value) {
-        this.dataId1 = value;
-      },
-      handleChange2(value) {
-        this.dataId2 = value;
-      },
-      handleTableBlur(e){
-        this.dataTable1 = e.target.value;
-        this.initDataVersionList();
-      },
-      handleIdBlur(e){
-        this.dataID3 = e.target.value;
-        this.initDataVersionList();
-      }
-    }
-  }
-</script>
-
-<style scoped>
-
-</style>
\ No newline at end of file
diff --git a/jshERP-web/src/views/system/modules/DepartAuthModal.vue b/jshERP-web/src/views/system/modules/DepartAuthModal.vue
deleted file mode 100644
index 42b5f0f7..00000000
--- a/jshERP-web/src/views/system/modules/DepartAuthModal.vue
+++ /dev/null
@@ -1,188 +0,0 @@
-<template>
-  <a-card :bordered="false">
-    <template v-if="this.departId">
-      <a-form>
-        <a-form-item label='所拥有的权限'>
-          <a-tree
-            checkable
-            @check="onCheck"
-            :checkedKeys="checkedKeys"
-            :treeData="treeData"
-            @expand="onExpand"
-            @select="onTreeNodeSelect"
-            :selectedKeys="selectedKeys"
-            :expandedKeys="expandedKeysss"
-            :checkStrictly="checkStrictly"
-            style="height:500px;overflow: auto;">
-            <span slot="hasDatarule" slot-scope="{slotTitle,ruleFlag}">
-              {{ slotTitle }}
-              <a-icon v-if="ruleFlag" type="align-left" style="margin-left:5px;color: red;"></a-icon>
-            </span>
-          </a-tree>
-        </a-form-item>
-      </a-form>
-      <div class="anty-form-btn">
-        <a-dropdown style="float: left" :trigger="['click']" placement="topCenter">
-          <a-menu slot="overlay">
-            <!-- 简化Tree逻辑，使用默认checkStrictly为false的行为，即默认父子关联
-            <a-menu-item key="1" @click="switchCheckStrictly(1)">父子关联</a-menu-item>
-            <a-menu-item key="2" @click="switchCheckStrictly(2)">取消关联</a-menu-item>
-            -->
-            <a-menu-item key="3" @click="checkALL">全部勾选</a-menu-item>
-            <a-menu-item key="4" @click="cancelCheckALL">取消全选</a-menu-item>
-            <a-menu-item key="5" @click="expandAll">展开所有</a-menu-item>
-            <a-menu-item key="6" @click="closeAll">合并所有</a-menu-item>
-          </a-menu>
-          <a-button>
-            树操作 <a-icon type="up" />
-          </a-button>
-        </a-dropdown>
-        <a-button style="float: right" @click="handleSubmit" type="primary" htmlType="button" icon="form">保存</a-button>
-      </div>
-    </template>
-    <a-card v-else :bordered="false" style="height:200px">
-      <a-empty>
-        <span slot="description"> 请先选择一个部门! </span>
-      </a-empty>
-    </a-card>
-    <depart-datarule-modal ref="datarule"/>
-  </a-card>
-</template>
-
-<script>
-  import {queryTreeListForRole,queryDepartPermission,saveDepartPermission} from '@/api/api'
-  import DepartDataruleModal from './DepartDataruleModal'
-
-  export default {
-    name: 'DepartAuthModal',
-    components: { DepartDataruleModal },
-    data(){
-      return {
-        departId:"",
-        treeData: [],
-        defaultCheckedKeys:[],
-        checkedKeys:[],
-        halfCheckedKeys:[],
-        expandedKeysss:[],
-        allTreeKeys:[],
-        autoExpandParent: true,
-        checkStrictly: false,
-        title:"部门权限配置",
-        visible: false,
-        loading: false,
-        selectedKeys:[]
-      }
-    },
-    methods: {
-      onTreeNodeSelect(id){
-        if(id && id.length>0){
-          this.selectedKeys = id
-        }
-        this.$refs.datarule.show(this.selectedKeys[0],this.departId)
-      },
-      onCheck (checkedKeys, { halfCheckedKeys }) {
-        // 保存选中的和半选中的，后面保存的时候合并提交
-        this.checkedKeys = checkedKeys
-        this.halfCheckedKeys = halfCheckedKeys
-      },
-      show(departId){
-        this.departId=departId
-        this.loadData();
-      },
-      close () {
-        this.reset()
-        this.$emit('close');
-        this.visible = false;
-      },
-      onExpand(expandedKeys){
-        this.expandedKeysss = expandedKeys;
-        this.autoExpandParent = false
-      },
-      reset () {
-        this.expandedKeysss = []
-        this.checkedKeys = []
-        this.defaultCheckedKeys = []
-        this.loading = false
-      },
-      expandAll () {
-        this.expandedKeysss = this.allTreeKeys
-      },
-      closeAll () {
-        this.expandedKeysss = []
-      },
-      checkALL () {
-        this.checkedKeys = this.allTreeKeys
-      },
-      cancelCheckALL () {
-        this.checkedKeys = []
-      },
-      handleCancel () {
-        this.close()
-      },
-      handleSubmit() {
-        let that = this;
-        if(!that.departId){
-          this.$message.warning('请点击选择一个部门!')
-        }
-        let checkedKeys = [...that.checkedKeys, ...that.halfCheckedKeys]
-        const permissionIds = checkedKeys.join(",")
-        let params =  {
-          departId:that.departId,
-          permissionIds,
-          lastpermissionIds:that.defaultCheckedKeys.join(","),
-        };
-        that.loading = true;
-        saveDepartPermission(params).then((res)=>{
-          if(res.success){
-            that.$message.success(res.message);
-            that.loading = false;
-            that.loadData();
-          }else {
-            that.$message.error(res.message);
-            that.loading = false;
-          }
-        })
-      },
-      convertTreeListToKeyLeafPairs(treeList, keyLeafPair = []) {
-        for(const {key, isLeaf, children} of treeList) {
-          keyLeafPair.push({key, isLeaf})
-          if(children && children.length > 0) {
-            this.convertTreeListToKeyLeafPairs(children, keyLeafPair)
-          }
-        }
-        return keyLeafPair;
-      },
-      emptyCurrForm() {
-        this.form.resetFields()
-      },
-      loadData(){
-        queryTreeListForRole().then((res) => {
-          this.treeData = res.result.treeList
-          this.allTreeKeys = res.result.ids
-          const keyLeafPairs = this.convertTreeListToKeyLeafPairs(this.treeData)
-          queryDepartPermission({departId:this.departId}).then((res)=>{
-            // 过滤出 leaf node 即可，即选中的
-            // Tree组件中checkStrictly默认为false的时候，选中子节点，父节点会自动设置选中或半选中
-            // 保存 checkedKeys 以及 halfCheckedKeys 以便于未做任何操作时提交表单数据
-            const checkedKeys = [...res.result].filter(key => {
-              const keyLeafPair = keyLeafPairs.filter(item => item.key === key)[0]
-              return keyLeafPair && keyLeafPair.isLeaf
-            })
-            const halfCheckedKeys = [...res.result].filter(key => {
-              const keyLeafPair = keyLeafPairs.filter(item => item.key === key)[0]
-              return keyLeafPair && !keyLeafPair.isLeaf
-            })
-            this.checkedKeys = [...checkedKeys];
-            this.halfCheckedKeys = [...halfCheckedKeys]
-            this.defaultCheckedKeys = [...halfCheckedKeys, ...checkedKeys];
-            this.expandedKeysss = this.allTreeKeys;
-          })
-        })
-      }
-    },
-  }
-</script>
-
-<style scoped>
-
-</style>
\ No newline at end of file
diff --git a/jshERP-web/src/views/system/modules/DepartDataruleModal.vue b/jshERP-web/src/views/system/modules/DepartDataruleModal.vue
deleted file mode 100644
index 77298acd..00000000
--- a/jshERP-web/src/views/system/modules/DepartDataruleModal.vue
+++ /dev/null
@@ -1,116 +0,0 @@
-<template>
-  <a-drawer
-    title="数据规则/按钮权限配置"
-    width="365"
-    :closable="false"
-    @close="onClose"
-    :visible="visible"
-  >
-    <a-tabs defaultActiveKey="1">
-      <a-tab-pane tab="数据规则" key="1">
-
-        <a-checkbox-group v-model="dataruleChecked" v-if="dataruleList.length>0">
-          <a-row>
-            <a-col :span="24" v-for="(item,index) in dataruleList" :key=" 'dr'+index ">
-              <a-checkbox :value="item.id">{{ item.ruleName }}</a-checkbox>
-            </a-col>
-
-            <a-col :span="24">
-              <div style="width: 100%;margin-top: 15px">
-                <a-button @click="saveDataruleForRole" type="primary" size="small" icon="save">点击保存</a-button>
-              </div>
-            </a-col>
-          </a-row>
-        </a-checkbox-group>
-        <div v-else><h3>无配置信息!</h3></div>
-
-      </a-tab-pane>
-    </a-tabs>
-
-  </a-drawer>
-</template>
-
-<script>
-  import ARow from 'ant-design-vue/es/grid/Row'
-  import ACol from 'ant-design-vue/es/grid/Col'
-  import { getAction,postAction } from '@/api/manage'
-
-  export default {
-    name: 'DepartDataruleModal',
-    components: { ACol, ARow },
-    data(){
-      return {
-        functionId:'',
-        departId:'',
-        visible:false,
-        tabList: [{
-          key: '1',
-          tab: '数据规则',
-        }, {
-          key: '2',
-          tab: '按钮权限',
-        }],
-        activeTabKey: '1',
-        url:{
-          datarule:"/sys/sysDepartPermission/datarule",
-        },
-        dataruleList:[],
-        dataruleChecked:[]
-      }
-    },
-    methods:{
-      loadData(){
-        getAction(`${this.url.datarule}/${this.functionId}/${this.departId}`).then(res=>{
-          if(res.success){
-            this.dataruleList = res.result.datarule
-            let drChecked = res.result.drChecked
-            if(drChecked){
-              this.dataruleChecked = drChecked.split(",")
-            }
-          }
-        })
-      },
-      saveDataruleForRole(){
-        if(!this.dataruleChecked || this.dataruleChecked.length==0){
-          this.$message.warning("请注意，现未勾选任何数据权限!")
-        }
-        let params = {
-          permissionId:this.functionId,
-          departId:this.departId,
-          dataRuleIds:this.dataruleChecked.join(",")
-        }
-        postAction(this.url.datarule,params).then(res=>{
-          if(res.success){
-            this.$message.success(res.message)
-          }else{
-            this.$message.error(res.message)
-          }
-        })
-      },
-      show(functionId,departId){
-        this.onReset()
-        this.functionId = functionId
-        this.departId = departId
-        this.visible=true
-        this.loadData()
-      },
-      onClose(){
-        this.visible=false
-        this.onReset()
-      },
-      onTabChange (key) {
-        this.activeTabKey = key
-      },
-      onReset(){
-        this.functionId=''
-        this.departId=''
-        this.dataruleList=[]
-        this.dataruleChecked=[]
-      }
-    }
-  }
-</script>
-
-<style scoped>
-
-</style>
\ No newline at end of file
diff --git a/jshERP-web/src/views/system/modules/DepartModal.vue b/jshERP-web/src/views/system/modules/DepartModal.vue
deleted file mode 100644
index b0b26623..00000000
--- a/jshERP-web/src/views/system/modules/DepartModal.vue
+++ /dev/null
@@ -1,223 +0,0 @@
-<template>
-  <a-modal
-    :title="title"
-    :width="800"
-    :ok=false
-    :visible="visible"
-    :confirmLoading="confirmLoading"
-    :okButtonProps="{ props: {disabled: disableSubmit} }"
-    @ok="handleOk"
-    @cancel="handleCancel"
-    cancelText="关闭">
-
-    <a-spin :spinning="confirmLoading">
-      <a-form :form="form">
-        <a-form-item
-          :labelCol="labelCol"
-          :wrapperCol="wrapperCol"
-          label="机构名称"
-          :hidden="false"
-          hasFeedback >
-          <a-input id="departName" placeholder="请输入机构/部门名称" v-decorator="['departName', validatorRules.departName ]"/>
-        </a-form-item>
-        <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" :hidden="seen" label="上级部门" hasFeedback>
-        <a-tree-select
-          style="width:100%"
-          :dropdownStyle="{maxHeight:'200px',overflow:'auto'}"
-          :treeData="departTree"
-          v-model="model.parentId"
-          placeholder="请选择上级部门"
-          :disabled="condition">
-        </a-tree-select>
-        </a-form-item>
-        <a-form-item
-          :labelCol="labelCol"
-          :wrapperCol="wrapperCol"
-          label="机构类型">
-          <template v-if="seen">
-          <a-radio-group v-decorator="['orgCategory',validatorRules.orgCategory]" placeholder="请选择机构类型">
-            <a-radio value="1">
-              公司
-            </a-radio>
-          </a-radio-group>
-          </template>
-          <template v-else>
-            <a-radio-group v-decorator="['orgCategory',validatorRules.orgCategory]" placeholder="请选择机构类型">
-              <a-radio value="2">
-                部门
-              </a-radio>
-              <a-radio value="3">
-                岗位
-              </a-radio>
-            </a-radio-group>
-          </template>
-        </a-form-item>
-        <a-form-item
-          :labelCol="labelCol"
-          :wrapperCol="wrapperCol"
-          label="电话">
-          <a-input placeholder="请输入电话" v-decorator="['mobile',validatorRules.mobile]" />
-        </a-form-item>
-        <a-form-item
-          :labelCol="labelCol"
-          :wrapperCol="wrapperCol"
-          label="传真">
-          <a-input placeholder="请输入传真" v-decorator="['fax', {}]"  />
-        </a-form-item>
-        <a-form-item
-          :labelCol="labelCol"
-          :wrapperCol="wrapperCol"
-          label="地址">
-          <a-input placeholder="请输入地址" v-decorator="['address', {}]"  />
-        </a-form-item>
-        <a-form-item
-          :labelCol="labelCol"
-          :wrapperCol="wrapperCol"
-          label="排序">
-          <a-input-number v-decorator="[ 'departOrder',{'initialValue':0}]" />
-        </a-form-item>
-        <a-form-item
-          :labelCol="labelCol"
-          :wrapperCol="wrapperCol"
-          label="备注">
-          <a-textarea placeholder="请输入备注" v-decorator="['memo', {}]"  />
-        </a-form-item>
-
-      </a-form>
-    </a-spin>
-  </a-modal>
-</template>
-
-<script>
-  import { httpAction } from '@/api/manage'
-  import { queryIdTree } from '@/api/api'
-  import pick from 'lodash.pick'
-  import ATextarea from 'ant-design-vue/es/input/TextArea'
-  export default {
-    name: "SysDepartModal",
-    components: { ATextarea },
-    data () {
-      return {
-        departTree:[],
-        orgTypeData:[],
-        phoneWarning:'',
-        departName:"",
-        title:"操作",
-        seen:false,
-        visible: false,
-        condition:true,
-        disableSubmit:false,
-        model: {},
-        menuhidden:false,
-        menuusing:true,
-        labelCol: {
-          xs: { span: 24 },
-          sm: { span: 5 },
-        },
-        wrapperCol: {
-          xs: { span: 24 },
-          sm: { span: 16 },
-        },
-
-        confirmLoading: false,
-        form: this.$form.createForm(this),
-        validatorRules:{
-        departName:{rules: [{ required: true, message: '请输入机构/部门名称!' }]},
-        orgCode:{rules: [{ required: true, message: '请输入机构编码!' }]},
-         mobile:{rules: [{validator:this.validateMobile}]}
-        },
-        url: {
-          add: "/sys/sysDepart/add",
-        },
-        dictDisabled:true,
-      }
-    },
-    created () {
-    },
-    methods: {
-      loadTreeData(){
-        var that = this;
-        queryIdTree().then((res)=>{
-          if(res.success){
-            that.departTree = [];
-            for (let i = 0; i < res.result.length; i++) {
-              let temp = res.result[i];
-              that.departTree.push(temp);
-            }
-          }
-
-        })
-      },
-      add (depart) {
-        if(depart){
-          this.seen = false;
-          this.dictDisabled = false;
-        }else{
-          this.seen = true;
-          this.dictDisabled = true;
-        }
-        this.edit(depart);
-      },
-      edit (record) {
-          this.form.resetFields();
-          this.model = Object.assign({}, {});
-          this.visible = true;
-          this.loadTreeData();
-          this.model.parentId = record!=null?record.toString():null;
-          if(this.seen){
-            this.model.orgCategory = '1';
-          }else{
-            this.model.orgCategory = '2';
-          }
-          this.$nextTick(() => {
-            this.form.setFieldsValue(pick(this.model,'orgCategory','departName','departNameEn','departNameAbbr','departOrder','description','orgType','orgCode','mobile','fax','address','memo','status','delFlag'))
-          });
-      },
-      close () {
-        this.$emit('close');
-        this.disableSubmit = false;
-        this.visible = false;
-      },
-      handleOk () {
-        const that = this;
-        // 触发表单验证
-        this.form.validateFields((err, values) => {
-          if (!err) {
-            that.confirmLoading = true;
-            let formData = Object.assign(this.model, values);
-            //时间格式化
-            console.log(formData)
-            httpAction(this.url.add,formData,"post").then((res)=>{
-              if(res.success){
-                that.$message.success(res.message);
-                that.loadTreeData();
-                that.$emit('ok');
-              }else{
-                that.$message.warning(res.message);
-              }
-            }).finally(() => {
-              that.confirmLoading = false;
-              that.close();
-            })
-
-          }
-        })
-      },
-      handleCancel () {
-        this.close()
-      },
-      validateMobile(rule,value,callback){
-        if (!value || new RegExp(/^1([38][0-9]|4[579]|5[0-3,5-9]|6[6]|7[0135678]|9[89])\d{8}$/).test(value)){
-          callback();
-        }else{
-          callback("您的手机号码格式不正确!");
-        }
-
-      }
-    }
-  }
-</script>
-
-<style scoped>
-
-</style>
\ No newline at end of file
diff --git a/jshERP-web/src/views/system/modules/DepartWindow.vue b/jshERP-web/src/views/system/modules/DepartWindow.vue
deleted file mode 100644
index 7dea2fa2..00000000
--- a/jshERP-web/src/views/system/modules/DepartWindow.vue
+++ /dev/null
@@ -1,185 +0,0 @@
-<template>
-  <a-modal
-    :width="modalWidth"
-    :visible="visible"
-    title="部门搜索"
-    :confirmLoading="confirmLoading"
-    @ok="handleSubmit"
-    @cancel="handleCancel"
-    cancelText="关闭"
-    wrapClassName="ant-modal-cust-warp"
-    >
-    <!--部门树-->
-    <template>
-      <a-form :form="form">
-      <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="上级部门">
-      <a-tree
-        multiple
-        treeCheckable="tree"
-        checkable
-        @expand="onExpand"
-        :expandedKeys="expandedKeysss"
-        :checkedKeys="checkedKeys"
-        allowClear="true"
-        :checkStrictly="true"
-        @check="onCheck"
-        :dropdownStyle="{maxHeight:'200px',overflow:'auto'}"
-        :treeData="departTree"
-        placeholder="请选择上级部门"
-        >
-      </a-tree>
-      </a-form-item>
-      </a-form>
-    </template>
-  </a-modal>
-</template>
-
-<script>
-  import pick from 'lodash.pick'
-  import { getAction } from '@/api/manage'
-  import { queryIdTree } from '@/api/api'
-  import userModal from './UserModal'
-  export default {
-    name: "DepartWindow",
-    components: {
-      userModal,
-    },
-    data () {
-      return {
-        checkedKeys:[], // 存储选中的部门id
-        expandedKeysss:[],//展开的节点
-        userId:"", // 存储用户id
-        model:{}, // 存储SysUserDepartsVO表
-        userDepartModel:{userId:'',departIdList:[]}, // 存储用户id一对多部门信息的对象
-        departList:[], // 存储部门信息
-        modalWidth:400,
-        departTree:[],
-        title:"操作",
-        visible: false,
-        labelCol: {
-          xs: { span: 24 },
-          sm: { span: 5 },
-        },
-        wrapperCol: {
-          xs: { span: 24 },
-          sm: { span: 16 },
-        },
-        confirmLoading: false,
-        headers:{},
-        form:this.$form.createForm(this),
-        url: {
-          userId:"/sys/user/generateUserId", // 引入生成添加用户情况下的url
-        },
-      }
-    },
-    methods: {
-      add (checkedDepartKeys,userId) {
-        this.checkedKeys = checkedDepartKeys;
-        this.userId = userId;
-        this.edit({});
-      },
-      edit (record) {
-        this.departList = [];
-        this.queryDepartTree();
-        this.form.resetFields();
-        this.visible = true;
-        this.model = Object.assign({}, record);
-        let filedsVal = pick(this.model,'id','userId','departIdList');
-        this.$nextTick(() => {
-          this.form.setFieldsValue(filedsVal);
-        });
-      },
-      close () {
-        this.$emit('close');
-        this.visible = false;
-        this.departList = [];
-        this.checkedKeys = [];
-      },
-      handleSubmit () {
-        const that = this;
-        // 触发表单验证
-        this.form.validateFields((err) => {
-          if (!err) {
-            that.confirmLoading = true;
-            if(this.userId == null){
-              getAction(this.url.userId).then((res)=>{
-                if(res.success){
-                  let formData = {userId:res.result,
-                  departIdList:this.departList}
-                  console.log(formData)
-                  that.$emit('ok', formData);
-                }
-              }).finally(() => {
-                that.departList = [];
-                that.confirmLoading = false;
-                that.close();
-              })
-            }else {
-              let formData = {userId:this.userId,
-                departIdList:this.departList}
-              console.log(formData)
-              that.departList = [];
-              that.$emit('ok', formData);
-              that.confirmLoading = false;
-              that.close();
-            }
-          }
-        })
-      },
-      handleCancel () {
-        this.close()
-      },
-
-      // 选择部门时作用的API
-      onCheck(checkedKeys, info){
-        this.departList = [];
-        this.checkedKeys = checkedKeys.checked;
-        let checkedNodes = info.checkedNodes;
-        for (let i = 0; i < checkedNodes.length; i++) {
-          let de = checkedNodes[i].data.props;
-          let depart = {key:"",value:"",title:""};
-          depart.key = de.value;
-          depart.value = de.value;
-          depart.title = de.title;
-          this.departList.push(depart);
-        }
-        console.log('onCheck', checkedKeys, info);
-      },
-      queryDepartTree(){
-        queryIdTree().then((res)=>{
-          if(res.success){
-            this.departTree = res.result;
-            if(this.checkedKeys&&this.checkedKeys.length >0){
-              let treekey=[];
-              let arr=res.result;
-              if(arr&&arr.length>0){
-                arr.forEach(item => {
-                  treekey.push(item.key);
-             /*     if(item.children&&item.children.length>0){
-                    item.children.forEach(item1 => {
-                      treekey.push(item1.key);
-                    })
-                  }*/
-                })
-                this.expandedKeysss = treekey
-              }
-            }
-          }
-        })
-      },
-      onExpand(expandedKeys){
-        this.expandedKeysss = expandedKeys;
-      },
-      modalFormOk(){
-
-      }
-      },
-  }
-</script>
-
-<style scoped>
-  .ant-table-tbody .ant-table-row td{
-    padding-top:10px;
-    padding-bottom:10px;
-  }
-</style>
\ No newline at end of file
diff --git a/jshERP-web/src/views/system/modules/DeptBaseInfo.vue b/jshERP-web/src/views/system/modules/DeptBaseInfo.vue
deleted file mode 100644
index af1418f6..00000000
--- a/jshERP-web/src/views/system/modules/DeptBaseInfo.vue
+++ /dev/null
@@ -1,129 +0,0 @@
-<template>
-  <a-card :visible="visible">
-    <a-form :form="form">
-      <a-form-item
-        :labelCol="labelCol"
-        :wrapperCol="wrapperCol"
-        label="机构名称">
-        <a-input style="border:0px;" placeholder="" v-decorator="['departName', {}]"/>
-      </a-form-item>
-      <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="上级部门">
-        <a-tree-select
-          disabled
-          style="width:100%;border: 0px;border: none;outline:none;"
-          :dropdownStyle="{maxHeight:'200px',overflow:'auto'}"
-          :treeData="treeData"
-          v-model="model.parentId"
-          placeholder="无">
-        </a-tree-select>
-      </a-form-item>
-      <a-form-item
-        :labelCol="labelCol"
-        :wrapperCol="wrapperCol"
-        label="机构编码">
-        <a-input style="border:0px;" placeholder="" v-decorator="['orgCode', {}]"/>
-      </a-form-item>
-      <a-form-item
-        :labelCol="labelCol"
-        :wrapperCol="wrapperCol"
-        label="机构类型">
-          <a-radio-group :disabled="true" v-decorator="['orgCategory',{}]" placeholder="请选择机构类型">
-            <a-radio value="1">
-              公司
-            </a-radio>
-            <a-radio value="2">
-              部门
-            </a-radio>
-            <a-radio value="3">
-              岗位
-            </a-radio>
-          </a-radio-group>
-      </a-form-item>
-      <a-form-item
-        :labelCol="labelCol"
-        :wrapperCol="wrapperCol"
-        label="排序">
-        <a-input-number style="border:0px;" v-decorator="[ 'departOrder',{}]"/>
-      </a-form-item>
-      <a-form-item
-        :labelCol="labelCol"
-        :wrapperCol="wrapperCol"
-        label="手机号">
-        <a-input style="border:0px;" placeholder="" v-decorator="['mobile', {}]"/>
-      </a-form-item>
-      <a-form-item
-        :labelCol="labelCol"
-        :wrapperCol="wrapperCol"
-        label="地址">
-        <a-input style="border:0px;" placeholder="" v-decorator="['address', {}]"/>
-      </a-form-item>
-      <a-form-item
-        :labelCol="labelCol"
-        :wrapperCol="wrapperCol"
-        label="备注">
-        <a-textarea style="border:0px;" placeholder="" v-decorator="['memo', {}]"/>
-      </a-form-item>
-    </a-form>
-  </a-card>
-</template>
-<script>
-  import pick from 'lodash.pick'
-  import {queryIdTree} from '@/api/api'
-
-  export default {
-    name: 'DeptBaseInfo',
-    components: {},
-    data() {
-      return {
-        departTree: [],
-        id: '',
-        model: {},
-        visible: false,
-        disable: true,
-        treeData: [],
-        form: this.$form.createForm(this),
-        labelCol: {
-          xs: {span: 24},
-          sm: {span: 3}
-        },
-        wrapperCol: {
-          xs: {span: 24},
-          sm: {span: 16}
-        },
-      }
-    },
-    created() {
-      this.loadTreeData();
-    },
-    methods: {
-      loadTreeData() {
-        queryIdTree().then((res) => {
-          if (res.success) {
-            for (let i = 0; i < res.result.length; i++) {
-              let temp = res.result[i];
-              this.treeData.push(temp);
-            }
-          }
-
-        })
-      },
-      open(record) {
-        this.form.resetFields();
-        this.model = Object.assign({}, record);
-        this.visible = true;
-        console.log("record:");
-        console.log(record);
-        this.$nextTick(() => {
-          this.form.setFieldsValue(pick(record, 'orgCategory','departName', 'parentId', 'orgCode', 'departOrder', 'mobile', 'fax', 'address', 'memo'));
-        });
-      },
-      clearForm() {
-        this.form.resetFields();
-        this.treeData = [];
-      },
-    }
-  }
-</script>
-<style scoped>
-  @import '~@assets/less/common.less'
-</style>
\ No newline at end of file
diff --git a/jshERP-web/src/views/system/modules/DeptRoleAuthModal.vue b/jshERP-web/src/views/system/modules/DeptRoleAuthModal.vue
deleted file mode 100644
index 09b90fec..00000000
--- a/jshERP-web/src/views/system/modules/DeptRoleAuthModal.vue
+++ /dev/null
@@ -1,213 +0,0 @@
-<template>
-  <a-drawer
-    :title="title"
-    :maskClosable="true"
-    width=650
-    placement="right"
-    :closable="true"
-    @close="close"
-    :visible="visible"
-    style="height: calc(100% - 55px);overflow: auto;padding-bottom: 53px;">
-
-    <a-form>
-      <a-form-item label='所拥有的部门权限'>
-
-        <a-tree
-          v-if="treeData.length>0"
-          checkable
-          @check="onCheck"
-          :checkedKeys="checkedKeys"
-          :treeData="treeData"
-          @expand="onExpand"
-          @select="onTreeNodeSelect"
-          :selectedKeys="selectedKeys"
-          :expandedKeys="expandedKeysss"
-          :checkStrictly="checkStrictly">
-          <span slot="hasDatarule" slot-scope="{slotTitle,ruleFlag}">
-            {{ slotTitle }}<a-icon v-if="ruleFlag" type="align-left" style="margin-left:5px;color: red;"></a-icon>
-          </span>
-        </a-tree>
-        <div v-else><h3>无可配置部门权限!</h3></div>
-      </a-form-item>
-    </a-form>
-
-    <div class="drawer-bootom-button">
-      <a-dropdown style="float: left" :trigger="['click']" placement="topCenter">
-        <a-menu slot="overlay">
-          <a-menu-item key="1" @click="switchCheckStrictly(1)">父子关联</a-menu-item>
-          <a-menu-item key="2" @click="switchCheckStrictly(2)">取消关联</a-menu-item>
-          <a-menu-item key="3" @click="checkALL">全部勾选</a-menu-item>
-          <a-menu-item key="4" @click="cancelCheckALL">取消全选</a-menu-item>
-          <a-menu-item key="5" @click="expandAll">展开所有</a-menu-item>
-          <a-menu-item key="6" @click="closeAll">合并所有</a-menu-item>
-        </a-menu>
-        <a-button>
-          树操作 <a-icon type="up" />
-        </a-button>
-      </a-dropdown>
-      <a-popconfirm title="确定放弃编辑？" @confirm="close" okText="确定" cancelText="取消">
-        <a-button style="margin-right: .8rem">取消</a-button>
-      </a-popconfirm>
-      <a-button @click="handleSubmit(false)" type="primary" :loading="loading" ghost style="margin-right: 0.8rem">仅保存</a-button>
-      <a-button @click="handleSubmit(true)" type="primary" :loading="loading">保存并关闭</a-button>
-    </div>
-    <dept-role-datarule-modal ref="datarule"></dept-role-datarule-modal>
-  </a-drawer>
-
-</template>
-<script>
-  import {queryTreeListForDeptRole,queryDeptRolePermission,saveDeptRolePermission} from '@/api/api'
-  import RoleDataruleModal from './RoleDataruleModal.vue'
-  import DeptRoleDataruleModal from './DeptRoleDataruleModal'
-
-  export default {
-    name: "DeptRoleAuthModal",
-    components:{
-      DeptRoleDataruleModal,
-      RoleDataruleModal
-    },
-    data(){
-      return {
-        departId:"",
-        roleId:"",
-        treeData: [],
-        defaultCheckedKeys:[],
-        checkedKeys:[],
-        halfCheckedKeys:[],
-        expandedKeysss:[],
-        allTreeKeys:[],
-        autoExpandParent: true,
-        checkStrictly: true,
-        title:"部门角色权限配置",
-        visible: false,
-        loading: false,
-        selectedKeys:[]
-      }
-    },
-    methods: {
-      switchCheckStrictly (v) {
-        if(v==1){
-          this.checkStrictly = false
-        }else if(v==2){
-          this.checkStrictly = true
-        }
-      },
-      onTreeNodeSelect(id){
-        if(id && id.length>0){
-          this.selectedKeys = id
-        }
-        this.$refs.datarule.show(this.selectedKeys[0],this.departId,this.roleId)
-      },
-      onCheck (o) {
-        if(this.checkStrictly){
-          this.checkedKeys = o.checked;
-        }else{
-          this.checkedKeys = o
-        }
-      },
-      show(roleId,departId){
-        this.departId = departId
-        this.roleId=roleId
-        this.visible = true;
-      },
-      close () {
-        this.reset()
-        this.$emit('close');
-        this.visible = false;
-      },
-      onExpand(expandedKeys){
-        this.expandedKeysss = expandedKeys;
-        this.autoExpandParent = false
-      },
-      reset () {
-        this.expandedKeysss = []
-        this.checkedKeys = []
-        this.defaultCheckedKeys = []
-        this.loading = false
-      },
-      expandAll () {
-        this.expandedKeysss = this.allTreeKeys
-      },
-      closeAll () {
-        this.expandedKeysss = []
-      },
-      checkALL () {
-        this.checkedKeys = this.allTreeKeys
-      },
-      cancelCheckALL () {
-        this.checkedKeys = []
-      },
-      handleCancel () {
-        this.close()
-      },
-      handleSubmit(exit) {
-        let that = this;
-        let params =  {
-          roleId:that.roleId,
-          permissionIds:that.checkedKeys.join(","),
-          lastpermissionIds:that.defaultCheckedKeys.join(","),
-        };
-        that.loading = true;
-        console.log("请求参数：",params);
-        saveDeptRolePermission(params).then((res)=>{
-          if(res.success){
-            that.$message.success(res.message);
-            that.loading = false;
-            if (exit) {
-              that.close()
-            }
-          }else {
-            that.$message.error(res.message);
-            that.loading = false;
-            if (exit) {
-              that.close()
-            }
-          }
-          this.loadData();
-        })
-      },
-      convertTreeListToKeyLeafPairs(treeList, keyLeafPair = []) {
-        for(const {key, isLeaf, children} of treeList) {
-          keyLeafPair.push({key, isLeaf})
-          if(children && children.length > 0) {
-            this.convertTreeListToKeyLeafPairs(children, keyLeafPair)
-          }
-        }
-        return keyLeafPair;
-      },
-      loadData(){
-        queryTreeListForDeptRole({departId:this.departId}).then((res) => {
-          this.treeData = res.result.treeList
-          this.allTreeKeys = res.result.ids
-          queryDeptRolePermission({roleId:this.roleId}).then((res)=>{
-            this.checkedKeys = [...res.result];
-            this.defaultCheckedKeys = [...res.result];
-            this.expandedKeysss = this.allTreeKeys;
-          })
-        })
-      }
-    },
-    watch: {
-      visible () {
-        if (this.visible ) {
-          this.loadData();
-        }
-      }
-    }
-  }
-
-</script>
-<style lang="less" scoped>
-  .drawer-bootom-button {
-    position: absolute;
-    bottom: 0;
-    width: 100%;
-    border-top: 1px solid #e8e8e8;
-    padding: 10px 16px;
-    text-align: right;
-    left: 0;
-    background: #fff;
-    border-radius: 0 0 2px 2px;
-  }
-
-</style>
\ No newline at end of file
diff --git a/jshERP-web/src/views/system/modules/DeptRoleDataruleModal.vue b/jshERP-web/src/views/system/modules/DeptRoleDataruleModal.vue
deleted file mode 100644
index f3a12115..00000000
--- a/jshERP-web/src/views/system/modules/DeptRoleDataruleModal.vue
+++ /dev/null
@@ -1,122 +0,0 @@
-<template>
-  <a-drawer
-    title="数据规则/按钮权限配置"
-    width="365"
-    :closable="false"
-    @close="onClose"
-    :visible="visible"
-  >
-
-    <a-tabs defaultActiveKey="1">
-      <a-tab-pane tab="数据规则" key="1">
-
-        <a-checkbox-group v-model="dataruleChecked" v-if="dataruleList.length>0">
-          <a-row>
-            <a-col :span="24" v-for="(item,index) in dataruleList" :key=" 'dr'+index ">
-              <a-checkbox :value="item.id">{{ item.ruleName }}</a-checkbox>
-            </a-col>
-
-            <a-col :span="24">
-              <div style="width: 100%;margin-top: 15px">
-                <a-button @click="saveDataruleForRole" type="primary" size="small" icon="save">点击保存</a-button>
-              </div>
-            </a-col>
-          </a-row>
-        </a-checkbox-group>
-        <div v-else><h3>无配置信息!</h3></div>
-
-      </a-tab-pane>
-      <!--<a-tab-pane tab="按钮权限" key="2">敬请期待!!!</a-tab-pane>-->
-    </a-tabs>
-
-  </a-drawer>
-</template>
-
-<script>
-  import ARow from 'ant-design-vue/es/grid/Row'
-  import ACol from 'ant-design-vue/es/grid/Col'
-  import { getAction,postAction } from '@/api/manage'
-
-  export default {
-    name: 'DeptRoleDataruleModal',
-    components: { ACol, ARow },
-    data(){
-      return {
-        departId:'',
-        functionId:'',
-        roleId:'',
-        visible:false,
-        tabList: [{
-          key: '1',
-          tab: '数据规则',
-        }, {
-          key: '2',
-          tab: '按钮权限',
-        }],
-        activeTabKey: '1',
-        url:{
-          datarule:"/sys/sysDepartRole/datarule",
-        },
-        dataruleList:[],
-        dataruleChecked:[]
-      }
-    },
-    methods:{
-      loadData(){
-        getAction(`${this.url.datarule}/${this.functionId}/${this.departId}/${this.roleId}`).then(res=>{
-          console.log(res)
-          if(res.success){
-            this.dataruleList = res.result.datarule
-            let drChecked = res.result.drChecked
-            if(drChecked){
-              this.dataruleChecked = drChecked.split(",")
-            }
-          }
-        })
-      },
-      saveDataruleForRole(){
-        if(!this.dataruleChecked || this.dataruleChecked.length==0){
-          this.$message.warning("请注意，现未勾选任何数据权限!")
-        }
-        let params = {
-          permissionId:this.functionId,
-          roleId:this.roleId,
-          dataRuleIds:this.dataruleChecked.join(",")
-        }
-        console.log("保存数据权限",params)
-        postAction(this.url.datarule,params).then(res=>{
-          if(res.success){
-            this.$message.success(res.message)
-          }else{
-            this.$message.error(res.message)
-          }
-        })
-      },
-      show(functionId,departId,roleId){
-        this.onReset()
-        this.departId = departId
-        this.functionId = functionId
-        this.roleId = roleId
-        this.visible=true
-        this.loadData()
-      },
-      onClose(){
-        this.visible=false
-        this.onReset()
-      },
-      onTabChange (key) {
-        this.activeTabKey = key
-      },
-      onReset(){
-        this.functionId=''
-        this.roleId=''
-        this.dataruleList=[]
-        this.dataruleChecked=[]
-      }
-    }
-  }
-</script>
-
-<style scoped>
-
-</style>
\ No newline at end of file
diff --git a/jshERP-web/src/views/system/modules/DeptRoleInfo.vue b/jshERP-web/src/views/system/modules/DeptRoleInfo.vue
deleted file mode 100644
index faace530..00000000
--- a/jshERP-web/src/views/system/modules/DeptRoleInfo.vue
+++ /dev/null
@@ -1,191 +0,0 @@
-<template>
-  <a-card :bordered="false">
-    <!-- 查询区域 -->
-    <div class="table-page-search-wrapper">
-      <!-- 搜索区域 -->
-      <a-form layout="inline">
-        <a-row :gutter="10">
-          <a-col :md="10" :sm="12">
-            <a-form-item label="部门角色名称" style="margin-left:8px">
-              <a-input placeholder="请输入部门角色" v-model="queryParam.roleName"></a-input>
-            </a-form-item>
-          </a-col>
-          <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
-            <a-col :md="6" :sm="24">
-              <a-button type="primary" @click="searchQuery" icon="search" style="margin-left: 18px">查询</a-button>
-              <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
-            </a-col>
-          </span>
-        </a-row>
-      </a-form>
-    </div>
-    <!-- 操作按钮区域 -->
-    <div class="table-operator" :md="24" :sm="24">
-      <a-button @click="handleAdd" type="primary" icon="plus">新建部门角色</a-button>
-      <a-dropdown v-if="selectedRowKeys.length > 0">
-        <a-menu slot="overlay">
-          <a-menu-item key="1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item>
-        </a-menu>
-        <a-button style="margin-left: 8px"> 批量操作 <a-icon type="down" /></a-button>
-      </a-dropdown>
-    </div>
-    <!-- table区域-begin -->
-    <div>
-      <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
-        <i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a style="font-weight: 600">
-          {{selectedRowKeys.length }}</a>项
-        <a style="margin-left: 24px" @click="onClearSelected">清空</a>
-      </div>
-      <a-table
-        ref="table"
-        size="middle"
-        bordered
-        rowKey="id"
-        :columns="columns"
-        :dataSource="dataSource"
-        :pagination="ipagination"
-        :loading="loading"
-        :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
-        @change="handleTableChange">
-        <span slot="action" slot-scope="text, record">
-          <a @click="handleEdit(record)">编辑</a>
-          <a-divider type="vertical"/>
-          <a-dropdown>
-            <a class="ant-dropdown-link">
-              更多 <a-icon type="down"/>
-            </a>
-            <a-menu slot="overlay">
-              <a-menu-item>
-                <a @click="handlePerssion(record)">授权</a>
-              </a-menu-item>
-              <a-menu-item>
-                <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
-                  <a>删除</a>
-                </a-popconfirm>
-              </a-menu-item>
-             </a-menu>
-          </a-dropdown>
-        </span>
-      </a-table>
-    </div>
-    <!-- table区域-end -->
-    <!-- 表单区域 -->
-    <sys-depart-role-modal ref="modalForm" @ok="modalFormOk"/>
-    <dept-role-auth-modal ref="modalDeptRole" />
-  </a-card>
-</template>
-
-<script>
-  import {JeecgListMixin} from '@/mixins/JeecgListMixin'
-  import {getAction} from '@/api/manage'
-  import SysDepartRoleModal from './SysDepartRoleModal'
-  import DeptRoleAuthModal from './DeptRoleAuthModal'
-
-  export default {
-    name: 'DeptRoleInfo',
-    components: { DeptRoleAuthModal, SysDepartRoleModal },
-    mixins: [JeecgListMixin],
-    data() {
-      return {
-        description: '部门角色信息',
-        currentDeptId: '',
-        // 表头
-        columns: [{
-          title: '部门角色名称',
-          align: "center",
-          dataIndex: 'roleName'
-        },
-        {
-          title: '部门角色编码',
-          align: "center",
-          dataIndex: 'roleCode'
-        },
-        {
-          title: '部门',
-          align: "center",
-          dataIndex: 'departId_dictText'
-        },
-        {
-          title: '备注',
-          align: "center",
-          dataIndex: 'description'
-        },
-        {
-          title: '操作',
-          dataIndex: 'action',
-          scopedSlots: {customRender: 'action'},
-          align: "center",
-          width: 170
-        }],
-        url: {
-          list: "/sys/sysDepartRole/list",
-          delete: "/sys/sysDepartRole/delete",
-          deleteBatch: "/sys/sysDepartRole/deleteBatch",
-        }
-      }
-    },
-    created() {
-    },
-    methods: {
-      searchReset() {
-        this.queryParam = {}
-        this.loadData(1);
-      },
-      loadData(arg) {
-        if (!this.url.list) {
-          this.$message.error("请设置url.list属性!")
-          return
-        }
-        //加载数据 若传入参数1则加载第一页的内容
-        if (arg === 1) {
-          this.ipagination.current = 1;
-        }
-        let params = this.getQueryParams();//查询条件
-        params.deptId = this.currentDeptId;
-        getAction(this.url.list, params).then((res) => {
-          if (res.success && res.result) {
-            this.dataSource = res.result.records;
-            this.ipagination.total = res.result.total;
-          }
-        })
-      },
-      open(record) {
-        this.currentDeptId = record.id;
-        this.loadData(1);
-      },
-      clearList() {
-        this.currentDeptId = '';
-        this.dataSource = [];
-      },
-      hasSelectDept() {
-        if (this.currentDeptId == '') {
-          this.$message.error("请选择一个部门!")
-          return false;
-        }
-        return true;
-      },
-      handleEdit: function (record) {
-        this.$refs.modalForm.title = "编辑";
-        this.$refs.modalForm.departDisabled = true;
-        this.$refs.modalForm.disableSubmit = false;
-        this.$refs.modalForm.edit(record,record.departId);
-      },
-      handleAdd: function () {
-        if (this.currentDeptId == '') {
-          this.$message.error("请选择一个部门!")
-        } else {
-          this.$refs.modalForm.departDisabled = true;
-          this.$refs.modalForm.add(this.currentDeptId);
-          this.$refs.modalForm.title = "新增";
-        }
-      },
-      handlePerssion: function(record){
-        this.$refs.modalDeptRole.show(record.id,record.departId);
-      },
-    }
-  }
-</script>
-
-<style scoped>
-
-</style>
\ No newline at end of file
diff --git a/jshERP-web/src/views/system/modules/DeptRoleUserModal.vue b/jshERP-web/src/views/system/modules/DeptRoleUserModal.vue
deleted file mode 100644
index 943f5740..00000000
--- a/jshERP-web/src/views/system/modules/DeptRoleUserModal.vue
+++ /dev/null
@@ -1,200 +0,0 @@
-<template>
-  <a-drawer
-    :title="title"
-    :maskClosable="true"
-    width=600
-    placement="right"
-    :closable="true"
-    @close="close"
-    :visible="visible"
-    style="height: calc(100% - 55px);overflow: auto;padding-bottom: 53px;">
-
-    <a-spin :spinning="confirmLoading">
-
-      <a-form :form="form" v-if="designNameOption.length>0">
-        <a-form-item label=''>
-          <a-col :xl="24" :lg="24" :md="24" :sm="24" :xs="24">
-            <a-card :style="{ marginTop: '12px',height:'auto' }">
-              <a-checkbox-group @change="designNameChange" v-model="designNameValue" style="width: 100%">
-                <a-row>
-                  <template v-for="(des) in designNameOption">
-                    <a-col :span="6">
-                      <a-checkbox :value="des.value">{{ des.text }}</a-checkbox>
-                    </a-col>
-                  </template>
-                </a-row>
-              </a-checkbox-group>
-            </a-card>
-          </a-col>
-        </a-form-item>
-      </a-form>
-      <div v-else><h3>无可配置角色!</h3></div>
-    </a-spin>
-    <div class="drawer-bootom-button">
-      <a-dropdown style="float: left" :trigger="['click']" placement="topCenter">
-        <a-menu slot="overlay">
-          <a-menu-item key="1" @click="checkALL">全部勾选</a-menu-item>
-          <a-menu-item key="2" @click="cancelCheckALL">取消全选</a-menu-item>
-        </a-menu>
-        <a-button>
-          操作 <a-icon type="up" />
-        </a-button>
-      </a-dropdown>
-      <a-popconfirm  title="确定放弃编辑？" @confirm="close" okText="确定" cancelText="取消">
-        <a-button style="margin-right: .8rem">取消</a-button>
-      </a-popconfirm>
-      <a-button @click="handleSubmit(true)" type="primary">保存</a-button>
-    </div>
-  </a-drawer>
-</template>
-
-<script>
-  import {httpAction, getAction} from '@/api/manage'
-  import  JEllipsis  from '@/components/jeecg/JEllipsis'
-  import {initDictOptions} from '@/components/dict/JDictSelectUtil'
-
-  export default {
-    name: 'DeptRoleUserModal',
-    components: {
-      JEllipsis
-    },
-    data() {
-      return {
-        currentDeptId:"",
-        title: "部门角色分配",
-        visible: false,
-        model: {},
-        labelCol: {
-          xs: {span: 24},
-          sm: {span: 5},
-        },
-        wrapperCol: {
-          xs: {span: 24},
-          sm: {span: 16},
-        },
-        confirmLoading: false,
-        form: this.$form.createForm(this),
-        validatorRules: {},
-        url: {
-          add: "/sys/sysDepartRole/deptRoleUserAdd",
-          getDeptRoleList:"/sys/sysDepartRole/getDeptRoleList",
-          getDeptRoleByUserId:"/sys/sysDepartRole/getDeptRoleByUserId"
-        },
-        designNameOption: [],
-        userId: "",
-        newRoleId:"",
-        oldRoleId:"",
-        designNameValue:[],
-        desformList: [],
-      }
-    },
-    created() {
-
-    },
-    methods: {
-      add(record,departId) {
-        this.userId = record.id;
-        this.currentDeptId = departId;
-        this.loadDesformList();
-        this.edit({});
-      },
-      edit(record) {
-        this.form.resetFields();
-        this.model = Object.assign({}, record);
-        this.visible = true;
-        getAction(this.url.getDeptRoleByUserId,{userId:this.userId}).then((res) => {
-          if (res.success) {
-            var designName = [];
-            for (let value of res.result) {
-              designName.push(value.droleId)
-            }
-            this.oldRoleId=designName.join(",");
-            this.designNameValue = designName;
-            this.newRoleId = designName.join(",");
-          }
-        });
-      },
-      close() {
-        this.$emit('close');
-        this.visible = false;
-      },
-      handleSubmit() {
-        const that = this;
-        // 触发表单验证
-        that.confirmLoading = true;
-        let  httpurl = this.url.add;
-        let  method = 'post';
-        let formData = Object.assign(this.model, {});
-        //时间格式化
-        formData.userId = this.userId;
-        formData.newRoleId=this.newRoleId;
-        formData.oldRoleId=this.oldRoleId;
-        httpAction(httpurl, formData, method).then((res) => {
-          if (res.success) {
-            that.$message.success(res.message);
-            that.$emit('reload');
-            that.$emit('ok');
-          } else {
-            that.$message.warning(res.message);
-          }
-        }).finally(() => {
-          that.confirmLoading = false;
-          that.close();
-        })
-      },
-      handleCancel() {
-        this.designNameOption=[];
-        this.designNameValue=[];
-        this.close()
-      },
-      designNameChange(selectedValue) {
-        this.newRoleId=selectedValue.join(",");
-      },
-      checkALL(){
-        var designName = [];
-        for (let value of this.desformList) {
-          designName.push(
-            value.id
-          )
-        }
-        this.designNameValue = designName;
-        this.newRoleId=designName.join(",");
-      },
-      cancelCheckALL(){
-        this.designNameValue=[];
-        this.newRoleId="";
-      },
-      /** 加载desform */
-      loadDesformList() {
-        getAction(this.url.getDeptRoleList, { departId: this.currentDeptId, userId:this.userId }).then((res) => {
-          if (res.success) {
-            this.desformList = res.result
-            var designName = [];
-            for (let value of this.desformList) {
-              designName.push({
-                value: value.id,
-                text: value.roleName,
-              })
-            }
-            this.designNameOption = designName;
-          }
-        });
-      },
-    }
-
-  }
-</script>
-
-<style scoped>
-  .drawer-bootom-button {
-    position: absolute;
-    bottom: 0;
-    width: 100%;
-    border-top: 1px solid #e8e8e8;
-    padding: 10px 16px;
-    text-align: right;
-    left: 0;
-    background: #fff;
-    border-radius: 0 0 2px 2px;
-  }
-</style>
\ No newline at end of file
diff --git a/jshERP-web/src/views/system/modules/DeptUserInfo.vue b/jshERP-web/src/views/system/modules/DeptUserInfo.vue
deleted file mode 100644
index 6868b507..00000000
--- a/jshERP-web/src/views/system/modules/DeptUserInfo.vue
+++ /dev/null
@@ -1,342 +0,0 @@
-<template>
-  <a-card :bordered="false">
-    <!-- 查询区域 -->
-    <div class="table-page-search-wrapper">
-      <!-- 搜索区域 -->
-      <a-form layout="inline">
-        <a-row :gutter="10">
-          <a-col :md="10" :sm="12">
-            <a-form-item label="用户账号" style="margin-left:8px">
-              <a-input placeholder="请输入账号" v-model="queryParam.username"></a-input>
-            </a-form-item>
-          </a-col>
-          <!--<a-col :md="8" :sm="8">-->
-          <!--<a-form-item label="用户名称" :labelCol="{span: 5}" :wrapperCol="{span: 18, offset: 1}">-->
-          <!--<a-input placeholder="请输入名称查询" v-model="queryParam.realname"></a-input>-->
-          <!--</a-form-item>-->
-          <!--</a-col>-->
-          <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
-            <a-col :md="6" :sm="24">
-             <a-button type="primary" @click="searchQuery" icon="search" style="margin-left: 18px">查询</a-button>
-              <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
-            </a-col>
-          </span>
-        </a-row>
-      </a-form>
-    </div>
-    <!-- 操作按钮区域 -->
-    <div class="table-operator" :md="24" :sm="24" style="margin-top: -15px">
-      <!--<a-button @click="handleEdit" type="primary" icon="edit" style="margin-top: 16px">用户编辑</a-button>-->
-      <a-button @click="handleAddUserDepart" type="primary" icon="plus">添加已有用户</a-button>
-      <a-button @click="handleAdd" type="primary" icon="plus" style="margin-top: 16px">新建用户</a-button>
-
-      <a-dropdown v-if="selectedRowKeys.length > 0">
-        <a-menu slot="overlay">
-          <a-menu-item key="1" @click="batchDel">
-            <a-icon type="delete"/>
-            取消关联
-          </a-menu-item>
-        </a-menu>
-        <a-button style="margin-left: 8px"> 批量操作
-          <a-icon type="down"/>
-        </a-button>
-      </a-dropdown>
-    </div>
-
-    <!-- table区域-begin -->
-    <div>
-      <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
-        <i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a style="font-weight: 600">{{
-        selectedRowKeys.length }}</a>项
-        <a style="margin-left: 24px" @click="onClearSelected">清空</a>
-      </div>
-
-      <a-table
-        ref="table"
-        size="middle"
-        bordered
-        rowKey="id"
-        :columns="columns"
-        :dataSource="dataSource"
-        :pagination="ipagination"
-        :loading="loading"
-        :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
-        @change="handleTableChange">
-
-
-
-        <span slot="action" slot-scope="text, record">
-          <a @click="handleEdit(record)">编辑</a>
-
-          <a-divider type="vertical"/>
-
-          <a-dropdown>
-            <a class="ant-dropdown-link">
-              更多 <a-icon type="down"/>
-            </a>
-            <a-menu slot="overlay">
-                <a-menu-item>
-                <a href="javascript:;" @click="handleDeptRole(record)">分配部门角色</a>
-              </a-menu-item>
-
-              <a-menu-item>
-                <a href="javascript:;" @click="handleDetail(record)">用户详情</a>
-              </a-menu-item>
-
-              <a-menu-item>
-                <a-popconfirm title="确定取消与选中部门关联吗?" @confirm="() => handleDelete(record.id)">
-                  <a>取消关联</a>
-                </a-popconfirm>
-              </a-menu-item>
-            </a-menu>
-          </a-dropdown>
-        </span>
-
-
-      </a-table>
-    </div>
-    <!-- table区域-end -->
-
-    <!-- 表单区域 -->
-    <user-modal ref="modalForm" @ok="modalFormOk"></user-modal>
-    <Select-User-Modal ref="selectUserModal" @selectFinished="selectOK"></Select-User-Modal>
-    <dept-role-user-modal ref="deptRoleUser"></dept-role-user-modal>
-  </a-card>
-</template>
-
-<script>
-  import {JeecgListMixin} from '@/mixins/JeecgListMixin'
-  import {getAction, postAction, deleteAction} from '@/api/manage'
-  import SelectUserModal from './SelectUserModal'
-  import UserModal from './UserModal'
-  import DeptRoleUserModal from './DeptRoleUserModal'
-
-  export default {
-    name: "DeptUserInfo",
-    mixins: [JeecgListMixin],
-    components: {
-      DeptRoleUserModal,
-      SelectUserModal,
-      UserModal
-    },
-    data() {
-      return {
-        description: '用户信息',
-        currentDeptId: '',
-        // 表头
-        columns: [{
-            title: '用户账号',
-            align: "center",
-            dataIndex: 'username'
-          },
-          {
-            title: '用户名称',
-            align: "center",
-            dataIndex: 'realname'
-          },
-          {
-            title: '部门',
-            align: "center",
-            dataIndex: 'orgCode'
-          },
-          {
-            title: '性别',
-            align: "center",
-            dataIndex: 'sex_dictText'
-          },
-          {
-            title: '电话',
-            align: "center",
-            dataIndex: 'phone'
-          },
-          {
-            title: '操作',
-            dataIndex: 'action',
-            scopedSlots: {customRender: 'action'},
-            align: "center",
-            width: 150
-          }],
-        url: {
-          list: "/sys/user/departUserList",
-          edit: "/sys/user/editSysDepartWithUser",
-          delete: "/sys/user/deleteUserInDepart",
-          deleteBatch: "/sys/user/deleteUserInDepartBatch",
-        }
-      }
-    },
-    created() {
-    },
-
-    methods: {
-      searchReset() {
-        this.queryParam = {}
-        this.loadData(1);
-      },
-      loadData(arg) {
-        if (!this.url.list) {
-          this.$message.error("请设置url.list属性!")
-          return
-        }
-        //加载数据 若传入参数1则加载第一页的内容
-        if (arg === 1) {
-          this.ipagination.current = 1;
-        }
-        //if (this.currentDeptId === '') return;
-        let params = this.getQueryParams();//查询条件
-        params.depId = this.currentDeptId;
-        getAction(this.url.list, params).then((res) => {
-          if (res.success && res.result) {
-            this.dataSource = res.result.records;
-            this.ipagination.total = res.result.total;
-          }
-        })
-      },
-      batchDel: function () {
-
-        if (!this.url.deleteBatch) {
-          this.$message.error("请设置url.deleteBatch属性!")
-          return
-        }
-        if (!this.currentDeptId) {
-          this.$message.error("未选中任何部门，无法取消部门与用户的关联!")
-          return
-        }
-
-        if (this.selectedRowKeys.length <= 0) {
-          this.$message.warning('请选择一条记录！');
-          return;
-        } else {
-          var ids = "";
-          for (var a = 0; a < this.selectedRowKeys.length; a++) {
-            ids += this.selectedRowKeys[a] + ",";
-          }
-          var that = this;
-          console.log(this.currentDeptId);
-          this.$confirm({
-            title: "确认取消",
-            content: "是否取消用户与选中部门的关联?",
-            onOk: function () {
-              deleteAction(that.url.deleteBatch, {depId: that.currentDeptId, userIds: ids}).then((res) => {
-                if (res.success) {
-                  that.$message.success("删除用户与选中部门关系成功！");
-                  that.loadData();
-                  that.onClearSelected();
-                } else {
-                  that.$message.warning(res.message);
-                }
-              });
-            }
-          });
-        }
-      },
-      handleDelete: function (id) {
-        if (!this.url.delete) {
-          this.$message.error("请设置url.delete属性!")
-          return
-        }
-        if (!this.currentDeptId) {
-          this.$message.error("未选中任何部门，无法取消部门与用户的关联!")
-          return
-        }
-
-        var that = this;
-        deleteAction(that.url.delete, {depId: this.currentDeptId, userId: id}).then((res) => {
-          if (res.success) {
-            that.$message.success("删除用户与选中部门关系成功！");
-            if (this.selectedRowKeys.length>0){
-               for(let i =0; i<this.selectedRowKeys.length;i++){
-                   if (this.selectedRowKeys[i] == id){
-                     this.selectedRowKeys.splice(i,1);
-                     break;
-                   }
-               }
-            }
-            that.loadData();
-          } else {
-            that.$message.warning(res.message);
-          }
-        });
-      },
-      open(record) {
-        //console.log(record);
-        this.currentDeptId = record.id;
-        this.loadData(1);
-      },
-      clearList() {
-        this.currentDeptId = '';
-        this.dataSource = [];
-      },
-      hasSelectDept() {
-        if (this.currentDeptId == '') {
-          this.$message.error("请选择一个部门!")
-          return false;
-        }
-        return true;
-      },
-      handleAddUserDepart() {
-        if (this.currentDeptId == '' ) {
-          this.$message.error("请选择一个部门!")
-        } else {
-          this.$refs.selectUserModal.visible = true;
-        }
-      },
-      handleEdit: function (record) {
-        this.$refs.modalForm.title = "编辑";
-        this.$refs.modalForm.departDisabled = true;
-        this.$refs.modalForm.disableSubmit = false;
-        this.$refs.modalForm.edit(record);
-      },
-      handleAdd: function () {
-        if (this.currentDeptId == '') {
-          this.$message.error("请选择一个部门!")
-        } else {
-          this.$refs.modalForm.departDisabled = true;
-          this.$refs.modalForm.userDepartModel.departIdList = [this.currentDeptId];  //传入一个部门id
-          this.$refs.modalForm.add();
-          this.$refs.modalForm.title = "新增";
-        }
-      },
-      selectOK(data) {
-        let params = {};
-        params.depId = this.currentDeptId;
-        params.userIdList = [];
-        for (var a = 0; a < data.length; a++) {
-          params.userIdList.push(data[a]);
-        }
-        console.log(params);
-        postAction(this.url.edit, params).then((res) => {
-          if (res.success) {
-            this.$message.success(res.message);
-            this.loadData();
-          } else {
-            this.$message.warning(res.message);
-          }
-        })
-      },
-      handleDeptRole(record){
-        if(this.currentDeptId != ''){
-          this.$refs.deptRoleUser.add(record,this.currentDeptId);
-          this.$refs.deptRoleUser.title = "部门角色分配";
-        }else{
-          this.$message.warning("请先选择一个部门!");
-        }
-      }
-    }
-  }
-</script>
-<style scoped>
-  /** Button按钮间距 */
-  .ant-btn {
-    margin-left: 3px
-  }
-
-  .ant-card {
-    margin-left: -30px;
-    margin-right: -30px;
-  }
-
-  .table-page-search-wrapper {
-    margin-top: -16px;
-    margin-bottom: 16px;
-  }
-</style>
\ No newline at end of file
diff --git a/jshERP-web/src/views/system/modules/DictItemModal.vue b/jshERP-web/src/views/system/modules/DictItemModal.vue
deleted file mode 100644
index 70052353..00000000
--- a/jshERP-web/src/views/system/modules/DictItemModal.vue
+++ /dev/null
@@ -1,158 +0,0 @@
-<template>
-  <a-modal
-    :title="title"
-    :width="800"
-    :visible="visible"
-    :confirmLoading="confirmLoading"
-    @ok="handleOk"
-    @cancel="handleCancel"
-    cancelText="关闭"
-  >
-    <a-spin :spinning="confirmLoading">
-      <a-form :form="form">
-
-        <a-form-item
-          :labelCol="labelCol"
-          :wrapperCol="wrapperCol"
-          label="名称">
-          <a-input placeholder="请输入名称" v-decorator.trim="['itemText', validatorRules.itemText]"/>
-        </a-form-item>
-
-        <a-form-item
-          :labelCol="labelCol"
-          :wrapperCol="wrapperCol"
-          label="数据值">
-          <a-input placeholder="请输入数据值" v-decorator.trim="['itemValue', validatorRules.itemValue]"/>
-        </a-form-item>
-
-        <a-form-item
-          :labelCol="labelCol"
-          :wrapperCol="wrapperCol"
-          label="描述">
-          <a-input v-decorator="['description']"/>
-        </a-form-item>
-
-        <a-form-item
-          :labelCol="labelCol"
-          :wrapperCol="wrapperCol"
-          label="排序值">
-          <a-input-number :min="1" v-decorator="['sortOrder',{'initialValue':1}]"/>
-          值越小越靠前，支持小数
-        </a-form-item>
-
-        <a-form-item
-          :labelCol="labelCol"
-          :wrapperCol="wrapperCol"
-          label="是否启用"
-          hasFeedback>
-          <a-switch checkedChildren="启用" unCheckedChildren="禁用" @change="onChose" v-model="visibleCheck"/>
-        </a-form-item>
-
-      </a-form>
-    </a-spin>
-  </a-modal>
-</template>
-
-<script>
-  import pick from 'lodash.pick'
-  import {addDictItem, editDictItem} from '@/api/api'
-
-  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,
-        form: this.$form.createForm(this),
-        validatorRules: {
-          itemText: {rules: [{required: true, message: '请输入名称!'}]},
-          itemValue: {rules: [{required: true, message: '请输入数据值!'}]},
-        },
-      }
-    },
-    created() {
-    },
-    methods: {
-      add(dictId) {
-        this.dictId = dictId;
-        this.edit({});
-      },
-      edit(record) {
-        if (record.id) {
-          this.dictId = record.dictId;
-          this.visibleCheck = (record.status == 1) ? true : false;
-        }
-        this.form.resetFields();
-        this.model = Object.assign({}, record);
-        this.model.dictId = this.dictId;
-        this.model.status = this.status;
-        this.visible = true;
-        this.$nextTick(() => {
-          this.form.setFieldsValue(pick(this.model, 'itemText', 'itemValue', 'description', 'sortOrder'))
-        });
-      },
-      onChose(checked) {
-        if (checked) {
-          this.status = 1;
-          this.visibleCheck = true;
-        } else {
-          this.status = 0;
-          this.visibleCheck = false;
-        }
-      },
-      // 确定
-      handleOk() {
-        const that = this;
-        // 触发表单验证
-        this.form.validateFields((err, values) => {
-          if (!err) {
-            that.confirmLoading = true;
-            values.itemText = (values.itemText || '').trim()
-            values.itemValue = (values.itemValue || '').trim()
-            values.description = (values.description || '').trim()
-            let formData = Object.assign(this.model, values);
-            formData.status = this.status;
-            let obj;
-            if (!this.model.id) {
-              obj = addDictItem(formData);
-            } else {
-              obj = editDictItem(formData);
-            }
-            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();
-            })
-          }
-        })
-      },
-      // 关闭
-      handleCancel() {
-        this.close();
-      },
-      close() {
-        this.$emit('close');
-        this.visible = false;
-      },
-    }
-  }
-</script>
\ No newline at end of file
diff --git a/jshERP-web/src/views/system/modules/DictModal.vue b/jshERP-web/src/views/system/modules/DictModal.vue
deleted file mode 100644
index 2de7e667..00000000
--- a/jshERP-web/src/views/system/modules/DictModal.vue
+++ /dev/null
@@ -1,151 +0,0 @@
-<template>
-  <a-modal
-    :title="title"
-    :width="600"
-    :visible="visible"
-    :confirmLoading="confirmLoading"
-    @ok="handleOk"
-    @cancel="handleCancel"
-    cancelText="关闭"
-  >
-    <a-spin :spinning="confirmLoading">
-      <a-form :form="form">
-
-        <a-form-item
-          :labelCol="labelCol"
-          :wrapperCol="wrapperCol"
-          label="字典名称">
-          <a-input placeholder="请输入字典名称" v-decorator.trim="[ 'dictName', validatorRules.dictName]"/>
-        </a-form-item>
-
-        <a-form-item
-          :labelCol="labelCol"
-          :wrapperCol="wrapperCol"
-          label="字典编码">
-          <a-input placeholder="请输入字典编码" v-decorator.trim="[ 'dictCode', validatorRules.dictCode]"/>
-        </a-form-item>
-
-        <a-form-item
-          :labelCol="labelCol"
-          :wrapperCol="wrapperCol"
-          label="描述">
-          <a-input v-decorator="[ 'description']"/>
-        </a-form-item>
-
-      </a-form>
-    </a-spin>
-  </a-modal>
-</template>
-
-<script>
-  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,
-        form: this.$form.createForm(this),
-        validatorRules: {
-          dictName: { rules: [{ required: true, message: '请输入字典名称!' }] },
-          dictCode: {
-            rules: [{ required: true, message: '请输入字典编码!' },
-              { validator: this.validateDictCode }]
-          }
-        }
-      }
-    },
-    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
-        } else {
-          this.visiblekey = false
-        }
-        this.form.resetFields()
-        this.model = Object.assign({}, record)
-        this.visible = true
-        this.$nextTick(() => {
-          this.form.setFieldsValue(pick(this.model, 'dictName', 'dictCode', 'description'))
-        })
-      },
-      // 确定
-      handleOk() {
-        const that = this
-        // 触发表单验证
-        this.form.validateFields((err, values) => {
-          if (!err) {
-            that.confirmLoading = true
-            values.dictName = (values.dictName || '').trim()
-            values.dictCode = (values.dictCode || '').trim()
-            values.description = (values.description || '').trim()
-            let formData = Object.assign(this.model, values)
-            let obj
-            console.log(formData)
-            if (!this.model.id) {
-              obj = addDict(formData)
-            } else {
-              obj = editDict(formData)
-            }
-            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()
-            })
-          }
-        })
-      },
-      // 关闭
-      handleCancel() {
-        this.close()
-      },
-      close() {
-        this.$emit('close')
-        this.visible = false
-      }
-    }
-  }
-</script>
\ No newline at end of file
diff --git a/jshERP-web/src/views/system/modules/PermissionDataRuleModal.vue b/jshERP-web/src/views/system/modules/PermissionDataRuleModal.vue
deleted file mode 100644
index cd7921fb..00000000
--- a/jshERP-web/src/views/system/modules/PermissionDataRuleModal.vue
+++ /dev/null
@@ -1,179 +0,0 @@
-<template>
-  <a-modal
-    :title="title"
-    :width="1000"
-    :visible="visible"
-    :confirmLoading="confirmLoading"
-    @ok="handleOk"
-    @cancel="handleCancel"
-    cancelText="关闭">
-
-    <a-spin :spinning="confirmLoading">
-      <a-form :form="form">
-
-        <a-form-item
-          :labelCol="labelCol"
-          :wrapperCol="wrapperCol"
-          label="规则名称">
-          <a-input placeholder="请输入规则名称" v-decorator="['ruleName', validatorRules.ruleName]"/>
-        </a-form-item>
-        <a-form-item
-          v-show="showRuleColumn"
-          :labelCol="labelCol"
-          :wrapperCol="wrapperCol"
-          label="规则字段">
-          <a-input placeholder="请输入规则字段" v-decorator="['ruleColumn', validatorRules.ruleColumn]"/>
-        </a-form-item>
-        <a-form-item
-          :labelCol="labelCol"
-          :wrapperCol="wrapperCol"
-          label="条件规则">
-          <j-dict-select-tag @change="handleChangeRuleCondition" v-decorator="['ruleConditions', validatorRules.ruleConditions]" placeholder="请输入条件规则" :triggerChange="true" dictCode="rule_conditions"/>
-        </a-form-item>
-        <a-form-item
-          :labelCol="labelCol"
-          :wrapperCol="wrapperCol"
-          label="规则值">
-          <a-input placeholder="请输入规则值" v-decorator="['ruleValue', validatorRules.ruleValue]"/>
-        </a-form-item>
-
-        <a-form-item
-          :labelCol="labelCol"
-          :wrapperCol="wrapperCol"
-          label="状态">
-          <a-radio-group buttonStyle="solid" v-decorator="['status',{initialValue:'1'}]">
-            <a-radio-button value="1">有效</a-radio-button>
-            <a-radio-button value="0">无效</a-radio-button>
-          </a-radio-group>
-        </a-form-item>
-
-      </a-form>
-    </a-spin>
-  </a-modal>
-</template>
-<script>
-  import { httpAction } from '@/api/manage'
-  import pick from 'lodash.pick'
-
-  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,
-        form: this.$form.createForm(this),
-        permissionId: '',
-        validatorRules: {
-          ruleConditions: {rules: [{required: true, message: '请选择条件!'}]},
-          ruleName: {rules: [{required: true, message: '请输入规则名称!'}]},
-          ruleValue: {rules: [{required: true, message: '请输入规则值!'}]},
-          ruleColumn: {rules: []}
-        },
-        url: {
-          list: '/sys/dictItem/list',
-          add: '/sys/permission/addPermissionRule',
-          edit: '/sys/permission/editPermissionRule'
-        },
-        showRuleColumn:true
-      }
-    },
-    created() {
-    },
-    methods: {
-      add(permId) {
-        this.permissionId = permId
-        this.edit({})
-      },
-      edit(record) {
-        this.form.resetFields()
-        this.model = Object.assign({}, record)
-        if (record.permissionId) {
-          this.model.permissionId = record.permissionId
-        } else {
-          this.model.permissionId = this.permissionId
-        }
-        this.visible = true
-        this.initRuleCondition()
-        this.$nextTick(() => {
-          this.form.setFieldsValue(pick(this.model, 'status','ruleName', 'ruleColumn', 'ruleConditions', 'ruleValue'))
-        })
-      },
-      close() {
-        this.$emit('close')
-        this.visible = false
-      },
-      handleOk() {
-        const that = this
-        // 触发表单验证
-        this.form.validateFields((err, values) => {
-          if (!err) {
-            that.confirmLoading = true
-            let httpurl = ''
-            let method = ''
-            if (!this.model.id) {
-              httpurl += this.url.add
-              method = 'post'
-            } else {
-              httpurl += this.url.edit
-              method = 'put'
-            }
-            let formData = Object.assign(this.model, values)
-            if(formData.ruleColumn && formData.ruleColumn.length>0){
-              formData.ruleColumn = formData.ruleColumn.trim()
-            }
-            if(formData.ruleValue && formData.ruleValue.length>0){
-              formData.ruleValue = formData.ruleValue.trim()
-            }
-            httpAction(httpurl, formData, method).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()
-            })
-          }
-        })
-      },
-      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.form.setFieldsValue({
-            ruleColumn:''
-          })
-          this.showRuleColumn = false
-        }else{
-          this.showRuleColumn = true
-        }
-      }
-    }
-  }
-</script>
-
-<style scoped>
-
-</style>
\ No newline at end of file
diff --git a/jshERP-web/src/views/system/modules/PermissionModal.vue b/jshERP-web/src/views/system/modules/PermissionModal.vue
deleted file mode 100644
index a6178d03..00000000
--- a/jshERP-web/src/views/system/modules/PermissionModal.vue
+++ /dev/null
@@ -1,430 +0,0 @@
-<template>
-  <a-drawer
-    :title="title"
-    :width="drawerWidth"
-    @close="handleCancel"
-    :visible="visible"
-    :confirmLoading="confirmLoading">
-
-    <div :style="{width: '100%',border: '1px solid #e9e9e9',padding: '10px 16px',background: '#fff',}">
-    <a-spin :spinning="confirmLoading">
-      <a-form :form="form">
-
-        <a-form-item label="菜单类型" :labelCol="labelCol" :wrapperCol="wrapperCol" >
-          <a-radio-group @change="onChangeMenuType" v-decorator="['menuType',{'initialValue':localMenuType}]">
-            <a-radio :value="0">一级菜单</a-radio>
-            <a-radio :value="1">子菜单</a-radio>
-            <a-radio :value="2">按钮/权限</a-radio>
-          </a-radio-group>
-        </a-form-item>
-
-        <a-form-item
-          :labelCol="labelCol"
-          :wrapperCol="wrapperCol"
-          :label="menuLabel"
-          hasFeedback >
-          <a-input placeholder="请输入菜单名称" v-decorator="[ 'name', validatorRules.name]" :readOnly="disableSubmit"/>
-        </a-form-item>
-
-
-        <a-form-item
-          v-show="localMenuType!=0"
-          label="上级菜单"
-          :labelCol="labelCol"
-          :wrapperCol="wrapperCol"
-          :validate-status="validateStatus"
-          :hasFeedback="true"
-          :required="true">
-          <span slot="help">{{ validateStatus=='error'?'请选择上级菜单':'&nbsp;&nbsp;' }}</span>
-          <a-tree-select
-            style="width:100%"
-            :dropdownStyle="{ maxHeight: '200px', overflow: 'auto' }"
-            :treeData="treeData"
-            v-model="model.parentId"
-            placeholder="请选择父级菜单"
-            :disabled="disableSubmit"
-            @change="handleParentIdChange">
-          </a-tree-select>
-        </a-form-item>
-
-        <a-form-item
-          :labelCol="labelCol"
-          :wrapperCol="wrapperCol"
-          label="菜单路径">
-          <a-input placeholder="请输入菜单路径" v-decorator="[ 'url',validatorRules.url]" :readOnly="disableSubmit"/>
-        </a-form-item>
-
-        <a-form-item
-          v-show="show"
-          :labelCol="labelCol"
-          :wrapperCol="wrapperCol"
-          label="前端组件">
-          <a-input placeholder="请输入前端组件" v-decorator="[ 'component',validatorRules.component]" :readOnly="disableSubmit"/>
-        </a-form-item>
-
-        <a-form-item
-          v-show="localMenuType==0"
-          :labelCol="labelCol"
-          :wrapperCol="wrapperCol"
-          label="默认跳转地址">
-          <a-input placeholder="请输入路由参数 redirect" v-decorator="[ 'redirect',{}]" :readOnly="disableSubmit"/>
-        </a-form-item>
-
-        <a-form-item
-          v-show="!show"
-          :labelCol="labelCol"
-          :wrapperCol="wrapperCol"
-          label="授权标识">
-          <a-input placeholder="多个用逗号分隔, 如: user:list,user:create" v-decorator="[ 'perms', {rules:[{ required: false, message: '请输入授权标识!' },{validator: this.validatePerms }]}]" :readOnly="disableSubmit"/>
-        </a-form-item>
-
-        <a-form-item
-          v-show="!show"
-          :labelCol="labelCol"
-          :wrapperCol="wrapperCol"
-          label="授权策略">
-          <j-dict-select-tag  v-decorator="['permsType', {}]" placeholder="请选择授权策略" :type="'radio'" :triggerChange="true" dictCode="global_perms_type"/>
-
-
-        </a-form-item>
-        <a-form-item
-          v-show="!show"
-          :labelCol="labelCol"
-          :wrapperCol="wrapperCol"
-          label="状态">
-          <j-dict-select-tag  v-decorator="['status', {}]" placeholder="请选择状态" :type="'radio'" :triggerChange="true" dictCode="valid_status"/>
-
-        </a-form-item>
-
-        <a-form-item
-          v-show="show"
-          :labelCol="labelCol"
-          :wrapperCol="wrapperCol"
-          label="菜单图标">
-          <a-input placeholder="点击选择图标" v-model="model.icon" :readOnly="disableSubmit">
-            <a-icon slot="addonAfter" type="setting" @click="selectIcons" />
-          </a-input>
-        </a-form-item>
-
-        <a-form-item
-          v-show="show"
-          :labelCol="labelCol"
-          :wrapperCol="wrapperCol"
-          label="排序">
-          <a-input-number placeholder="请输入菜单排序" style="width: 200px" v-decorator="[ 'sortNo',validatorRules.sortNo]" :readOnly="disableSubmit"/>
-        </a-form-item>
-
-        <a-form-item
-          v-show="show"
-          :labelCol="labelCol"
-          :wrapperCol="wrapperCol"
-          label="是否路由菜单">
-          <a-switch checkedChildren="是" unCheckedChildren="否" v-model="routeSwitch"/>
-        </a-form-item>
-
-        <a-form-item
-          v-show="show"
-          :labelCol="labelCol"
-          :wrapperCol="wrapperCol"
-          label="隐藏路由">
-          <a-switch checkedChildren="是" unCheckedChildren="否" v-model="menuHidden"/>
-        </a-form-item>
-
-        <a-form-item
-          v-show="show"
-          :labelCol="labelCol"
-          :wrapperCol="wrapperCol"
-          label="是否缓存路由">
-          <a-switch checkedChildren="是" unCheckedChildren="否" v-model="isKeepalive"/>
-        </a-form-item>
-
-
-        <a-form-item
-          v-show="show"
-          :labelCol="labelCol"
-          :wrapperCol="wrapperCol"
-          label="聚合路由">
-          <a-switch checkedChildren="是" unCheckedChildren="否" v-model="alwaysShow"/>
-        </a-form-item>
-
-        <!--update_begin author:wuxianquan date:20190908 for:增加组件，外链打开方式可选 -->
-        <a-form-item
-          v-show="show"
-          :labelCol="labelCol"
-          :wrapperCol="wrapperCol"
-          label="打开方式">
-          <a-switch checkedChildren="外部" unCheckedChildren="内部" v-model="internalOrExternal"/>
-        </a-form-item>
-        <!--update_end author:wuxianquan date:20190908 for:增加组件，外链打开方式可选 -->
-
-
-      </a-form>
-
-      <!-- 选择图标 -->
-      <icons @choose="handleIconChoose" @close="handleIconCancel" :iconChooseVisible="iconChooseVisible"></icons>
-    </a-spin>
-      <a-row :style="{textAlign:'right'}">
-        <a-button :style="{marginRight: '8px'}" @click="handleCancel">
-          关闭
-        </a-button>
-        <a-button :disabled="disableSubmit" @click="handleOk" type="primary">确定</a-button>
-      </a-row>
-    </div>
-  </a-drawer>
-</template>
-
-<script>
-  import {addPermission,editPermission,queryTreeList, duplicateCheck} from '@/api/api'
-  import Icons from './icon/Icons'
-  import pick from 'lodash.pick'
-
-  export default {
-    name: "PermissionModal",
-    components: {Icons},
-    data () {
-      return {
-        drawerWidth:700,
-        treeData:[],
-        treeValue: '0-0-4',
-        title:"操作",
-        visible: false,
-        disableSubmit:false,
-        model: {},
-        localMenuType:0,
-        alwaysShow:false,//表单元素-聚合路由
-        menuHidden:false,//表单元素-隐藏路由
-        routeSwitch:true, //是否路由菜单
-        /*update_begin author:wuxianquan date:20190908 for:定义变量，初始值代表内部打开*/
-        internalOrExternal:false,//菜单打开方式
-        /*update_end author:wuxianquan date:20190908 for:定义变量，初始值代表内部打开*/
-        isKeepalive:true, //是否缓存路由
-        show:true,//根据菜单类型，动态显示隐藏表单元素
-        menuLabel:'菜单名称',
-        isRequrie:true,  // 是否需要验证
-        labelCol: {
-          xs: { span: 24 },
-          sm: { span: 5 },
-        },
-        wrapperCol: {
-          xs: { span: 24 },
-          sm: { span: 16 },
-        },
-
-        confirmLoading: false,
-        form: this.$form.createForm(this),
-
-        iconChooseVisible: false,
-        validateStatus:""
-      }
-    },
-    computed:{
-      validatorRules:function() {
-        return {
-          name:{rules: [{ required: true, message: '请输入菜单标题!' }]},
-          component:{rules: [{ required: this.show, message: '请输入前端组件!' }]},
-          url:{rules: [{ required: this.show, message: '请输入菜单路径!' }]},
-          permsType:{rules: [{ required: true, message: '请输入授权策略!' }]},
-          sortNo:{initialValue:1.0},
-        }
-      }
-    },
-    created () {
-      this.initDictConfig();
-    },
-    methods: {
-      loadTree(){
-        var that = this;
-        queryTreeList().then((res)=>{
-          if(res.success){
-            console.log('----queryTreeList---')
-            console.log(res)
-            that.treeData = [];
-            let treeList = res.result.treeList
-            for(let a=0;a<treeList.length;a++){
-              let temp = treeList[a];
-              temp.isLeaf = temp.leaf;
-              that.treeData.push(temp);
-            }
-          }
-        });
-      },
-      add () {
-        // 默认值
-        this.edit({status:'1',permsType:'1',route:true});
-      },
-      edit (record) {
-        this.resetScreenSize(); // 调用此方法,根据屏幕宽度自适应调整抽屉的宽度
-        this.form.resetFields();
-        this.model = Object.assign({}, record);
-        //--------------------------------------------------------------------------------------------------
-        //根据菜单类型，动态展示页面字段
-        console.log(record)
-        this.alwaysShow = !record.alwaysShow?false:true;
-        this.menuHidden = !record.hidden?false:true;
-
-        if(record.route!=null){
-          this.routeSwitch = record.route?true:false;
-        }
-
-        if(record.keepAlive!=null){
-          this.isKeepalive = record.keepAlive?true:false;
-        }else{
-          this.isKeepalive = false; // 升级兼容 如果没有（后台没有传过来、或者是新建）默认为false
-        }
-
-        /*update_begin author:wuxianquan date:20190908 for:编辑初始化数据*/
-        if(record.internalOrExternal!=null){
-          this.internalOrExternal = record.internalOrExternal?true:false;
-        }else{
-          this.internalOrExternal = false;
-        }
-        /*update_end author:wuxianquan date:20190908 for:编辑初始化数据*/
-
-
-        //console.log('record.menuType', record.menuType);
-        this.show = record.menuType==2?false:true;
-        this.menuLabel = record.menuType==2?'按钮/权限':'菜单名称';
-
-        if(this.model.parentId){
-          this.localMenuType = 1;
-        }else{
-          this.localMenuType = 0;
-        }
-        //----------------------------------------------------------------------------------------------
-
-        this.visible = true;
-        this.loadTree();
-        let fieldsVal = pick(this.model,'name','perms','permsType','component','url','sortNo','menuType','status');
-        this.$nextTick(() => {
-          this.form.setFieldsValue(fieldsVal)
-        });
-      },
-      close () {
-        this.$emit('close');
-        this.disableSubmit = false;
-        this.visible = false;
-      },
-      handleOk () {
-        const that = this;
-        // 触发表单验证
-        this.form.validateFields((err, values) => {
-          if (!err) {
-            this.model.alwaysShow = this.alwaysShow;
-            this.model.hidden = this.menuHidden;
-            this.model.route = this.routeSwitch;
-            this.model.keepAlive = this.isKeepalive;
-            /*update_begin author:wuxianquan date:20190908 for:获取值*/
-            this.model.internalOrExternal = this.internalOrExternal;
-            /*update_end author:wuxianquan date:20190908 for:获取值*/
-
-            let formData = Object.assign(this.model, values);
-            if ((formData.menuType == 1 || formData.menuType == 2) && !formData.parentId) {
-              that.validateStatus = 'error';
-              that.$message.error("请检查你填的类型以及信息是否正确！");
-              return;
-            } else {
-              that.validateStatus = 'success';
-            }
-            that.confirmLoading = true;
-            console.log(formData);
-            let obj;
-            if (!this.model.id) {
-              obj = addPermission(formData);
-            } else {
-              obj = editPermission(formData);
-            }
-            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();
-            });
-          }
-        })
-      },
-      handleCancel () {
-        this.close()
-      },
-      validateNumber(rule, value, callback){
-        if(!value || new RegExp(/^[0-9]*[1-9][0-9]*$/).test(value)){
-          callback();
-        }else{
-          callback("请输入正整数!");
-        }
-      },
-      validatePerms(rule, value, callback){
-        if(value && value.length>0){
-          //校验授权标识是否存在
-          var params = {
-            tableName: 'sys_permission',
-            fieldName: 'perms',
-            fieldVal: value,
-            dataId: this.model.id
-          };
-          duplicateCheck(params).then((res) => {
-            if (res.success) {
-              callback()
-            } else {
-              callback("授权标识已存在!")
-            }
-          })
-        }else{
-          callback()
-        }
-      },
-      onChangeMenuType(e) {
-        //console.log('localMenuType checked', e.target.value)
-        this.localMenuType=e.target.value
-        if(e.target.value == 2){
-          this.show = false;
-          this.menuLabel = '按钮/权限';
-        }else{
-          this.show = true;
-          this.menuLabel = '菜单名称';
-        }
-        this.$nextTick(() => {
-          this.form.validateFields(['url','component'], { force: true });
-        });
-      },
-      selectIcons(){
-        this.iconChooseVisible = true
-      },
-      handleIconCancel () {
-        this.iconChooseVisible = false
-      },
-      handleIconChoose (value) {
-        console.log(value)
-        this.model.icon = value
-        this.form.icon = value
-        this.iconChooseVisible = false
-      },
-      // 根据屏幕变化,设置抽屉尺寸
-      resetScreenSize(){
-        let screenWidth = document.body.clientWidth;
-        if(screenWidth < 500){
-          this.drawerWidth = screenWidth;
-        }else{
-          this.drawerWidth = 700;
-        }
-      },
-      initDictConfig() {
-      },
-      handleParentIdChange(value){
-        if(!value){
-          this.validateStatus="error"
-        }else{
-          this.validateStatus="success"
-        }
-      }
-    }
-  }
-</script>
-
-<style scoped>
-
-</style>
\ No newline at end of file
diff --git a/jshERP-web/src/views/system/modules/QuartzJobModal.vue b/jshERP-web/src/views/system/modules/QuartzJobModal.vue
deleted file mode 100644
index 8be01719..00000000
--- a/jshERP-web/src/views/system/modules/QuartzJobModal.vue
+++ /dev/null
@@ -1,190 +0,0 @@
-<template>
-  <a-modal
-    :title="title"
-    :width="800"
-    :visible="visible"
-    :confirmLoading="confirmLoading"
-    @ok="handleOk"
-    @cancel="handleCancel"
-    okText="保存并安排任务"
-    cancelText="关闭">
-
-    <a-spin :spinning="confirmLoading">
-      <a-form :form="form">
-
-        <a-form-item
-          :labelCol="labelCol"
-          :wrapperCol="wrapperCol"
-          label="任务类名"
-          hasFeedback >
-          <a-input placeholder="请输入任务类名" v-decorator="['jobClassName', {rules: [{ required: true, message: '请输入任务类名!' }]}]" />
-        </a-form-item>
-        <a-form-item
-          :labelCol="labelCol"
-          :wrapperCol="wrapperCol"
-          label="cron表达式">
-<!--                    <a-input placeholder="请输入cron表达式" v-decorator="['cronExpression', {'initialValue':'0/1 * * * * ?',rules: [{ required: true, message: '请输入任务类名!' }]}]" />-->
-<!--                    <a target="_blank" href="http://cron.qqe2.com/">-->
-<!--                      <a-icon type="share-alt" />-->
-<!--                      在线cron表达式生成-->
-<!--                    </a>-->
-<!--          <j-cron ref="innerVueCron" v-decorator="['cronExpression', {'initialValue':'0/1 * * * * ?',rules: [{ required: true, message: '请输入cron表达式!' }]}]"  @change="setCorn"></j-cron>-->
-          <j-cron ref="innerVueCron" v-decorator="['cronExpression', { initialValue: '* * * * * ? *' }]" @change="setCorn"></j-cron>
-        </a-form-item>
-        <a-form-item
-          :labelCol="labelCol"
-          :wrapperCol="wrapperCol"
-          label="参数">
-          <a-textarea placeholder="请输入参数" :rows="5" v-decorator="['parameter', {}]" />
-        </a-form-item>
-        <a-form-item
-          :labelCol="labelCol"
-          :wrapperCol="wrapperCol"
-          label="描述">
-          <a-textarea placeholder="请输入描述" :rows="3" v-decorator="['description', {}]" />
-        </a-form-item>
-        <a-form-item
-          :labelCol="labelCol"
-          :wrapperCol="wrapperCol"
-          label="状态">
-          <j-dict-select-tag type="radioButton"  v-decorator="[ 'status', {'initialValue':0}]" :trigger-change="true" dictCode="quartz_status"/>
-        </a-form-item>
-      </a-form>
-    </a-spin>
-  </a-modal>
-</template>
-
-<script>
-  import { httpAction } from '@/api/manage'
-  import JCron from "@/components/jeecg/JCron";
-  import pick from 'lodash.pick'
-  // import moment from "moment"
-
-  export default {
-    name: "QuartzJobModal",
-    components: {
-      JCron
-    },
-    data () {
-      return {
-        title:"操作",
-        buttonStyle: 'solid',
-        visible: false,
-        model: {},
-        labelCol: {
-          xs: { span: 24 },
-          sm: { span: 5 },
-        },
-        wrapperCol: {
-          xs: { span: 24 },
-          sm: { span: 16 },
-        },
-        cron: {
-          label: '',
-          value: ''
-        },
-        confirmLoading: false,
-        form: this.$form.createForm(this),
-        validatorRules: {
-          cron: {
-            rules: [{
-              required: true, message: '请输入cron表达式!'
-            }]
-          }
-        },
-        url: {
-          add: "/sys/quartzJob/add",
-          edit: "/sys/quartzJob/edit",
-        },
-      }
-    },
-    created () {
-    },
-    methods: {
-      add () {
-        this.edit({});
-      },
-      edit (record) {
-        let that = this;
-        that.form.resetFields();
-        this.model = Object.assign({},record);
-        console.log(this.model)
-        this.visible = true;
-        this.$nextTick(() => {
-          this.form.setFieldsValue(pick(this.model,'jobClassName','cronExpression','parameter','description','status'));
-        });
-
-      },
-      close () {
-        this.$emit('close');
-        this.visible = false;
-      },
-      handleOk () {
-        const that = this;
-        // 触发表单验证
-        this.form.validateFields((err, values) => {
-          console.log('values',values)
-          if (!err) {
-            if (typeof values.cronExpression == "undefined" || Object.keys(values.cronExpression).length==0 ) {
-              this.$message.warning('请输入cron表达式!');
-              return false;
-            }
-
-            that.confirmLoading = true;
-            let httpurl = '';
-            let method = '';
-            if(!this.model.id){
-              httpurl+=this.url.add;
-              method = 'post';
-            }else{
-              httpurl+=this.url.edit;
-              method = 'put';
-            }
-            let formData = Object.assign(this.model, values);
-            //时间格式化
-
-            console.log('提交参数',formData)
-            httpAction(httpurl,formData,method).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();
-            })
-
-          }
-        })
-      },
-      handleCancel () {
-        this.close()
-      },
-      setCorn(data){
-        console.log('data)',data);
-        this.$nextTick(() => {
-          this.model.cronExpression = data;
-        })
-
-        // console.log(Object.keys(data).length==0);
-        if (Object.keys(data).length==0) {
-          this.$message.warning('请输入cron表达式!');
-        }
-      },
-      validateCron(rule, value, callback){
-        if(!value){
-          callback()
-        }else if (Object.keys(value).length==0) {
-          callback("请输入cron表达式!");
-        }
-      },
-
-    }
-  }
-</script>
-
-<style scoped>
-
-</style>
\ No newline at end of file
diff --git a/jshERP-web/src/views/system/modules/RoleDataruleModal.vue b/jshERP-web/src/views/system/modules/RoleDataruleModal.vue
deleted file mode 100644
index bb5b75b1..00000000
--- a/jshERP-web/src/views/system/modules/RoleDataruleModal.vue
+++ /dev/null
@@ -1,120 +0,0 @@
-<template>
-  <a-drawer
-    title="数据规则/按钮权限配置"
-    width="365"
-    :closable="false"
-    @close="onClose"
-    :visible="visible"
-  >
-
-    <a-tabs defaultActiveKey="1">
-      <a-tab-pane tab="数据规则" key="1">
-
-        <a-checkbox-group v-model="dataruleChecked" v-if="dataruleList.length>0">
-          <a-row>
-            <a-col :span="24" v-for="(item,index) in dataruleList" :key=" 'dr'+index ">
-              <a-checkbox :value="item.id">{{ item.ruleName }}</a-checkbox>
-            </a-col>
-
-            <a-col :span="24">
-              <div style="width: 100%;margin-top: 15px">
-                <a-button @click="saveDataruleForRole" type="primary" size="small" icon="save">点击保存</a-button>
-              </div>
-            </a-col>
-          </a-row>
-        </a-checkbox-group>
-        <div v-else><h3>无配置信息!</h3></div>
-
-      </a-tab-pane>
-      <!--<a-tab-pane tab="按钮权限" key="2">敬请期待!!!</a-tab-pane>-->
-    </a-tabs>
-
-  </a-drawer>
-</template>
-
-<script>
-  import ARow from 'ant-design-vue/es/grid/Row'
-  import ACol from 'ant-design-vue/es/grid/Col'
-  import { getAction,postAction } from '@/api/manage'
-
-  export default {
-    name: 'RoleDataruleModal',
-    components: { ACol, ARow },
-    data(){
-      return {
-        functionId:'',
-        roleId:'',
-        visible:false,
-        tabList: [{
-          key: '1',
-          tab: '数据规则',
-        }, {
-          key: '2',
-          tab: '按钮权限',
-        }],
-        activeTabKey: '1',
-        url:{
-          datarule:"/sys/role/datarule",
-        },
-        dataruleList:[],
-        dataruleChecked:[]
-      }
-    },
-    methods:{
-      loadData(){
-        getAction(`${this.url.datarule}/${this.functionId}/${this.roleId}`).then(res=>{
-          console.log(res)
-          if(res.success){
-            this.dataruleList = res.result.datarule
-            let drChecked = res.result.drChecked
-            if(drChecked){
-              this.dataruleChecked = drChecked.split(",")
-            }
-          }
-        })
-      },
-      saveDataruleForRole(){
-        if(!this.dataruleChecked || this.dataruleChecked.length==0){
-          this.$message.warning("请注意，现未勾选任何数据权限!")
-        }
-        let params = {
-          permissionId:this.functionId,
-          roleId:this.roleId,
-          dataRuleIds:this.dataruleChecked.join(",")
-        }
-        console.log("保存数据权限",params)
-        postAction(this.url.datarule,params).then(res=>{
-          if(res.success){
-            this.$message.success(res.message)
-          }else{
-            this.$message.error(res.message)
-          }
-        })
-      },
-      show(functionId,roleId){
-        this.onReset()
-        this.functionId = functionId
-        this.roleId = roleId
-        this.visible=true
-        this.loadData()
-      },
-      onClose(){
-        this.visible=false
-        this.onReset()
-      },
-      onTabChange (key) {
-        this.activeTabKey = key
-      },
-      onReset(){
-        this.functionId=''
-        this.roleId=''
-        this.dataruleList=[]
-        this.dataruleChecked=[]
-      }
-    }
-  }
-</script>
-
-<style scoped>
-
-</style>
\ No newline at end of file
diff --git a/jshERP-web/src/views/system/modules/SelectUserListModal.vue b/jshERP-web/src/views/system/modules/SelectUserListModal.vue
deleted file mode 100644
index a1e15c70..00000000
--- a/jshERP-web/src/views/system/modules/SelectUserListModal.vue
+++ /dev/null
@@ -1,290 +0,0 @@
-<template>
-  <a-modal
-    :title="title"
-    :width="1200"
-    :visible="visible"
-    @ok="handleOk"
-    @cancel="handleCancel"
-    cancelText="关闭">
-
-    <div class="table-page-search-wrapper">
-      <a-form layout="inline">
-        <a-row :gutter="24">
-
-          <a-col :span="6">
-            <a-form-item label="账号">
-              <a-input placeholder="请输入账号" v-model="queryParam.username"></a-input>
-            </a-form-item>
-          </a-col>
-
-          <a-col :span="6">
-            <a-form-item label="性别">
-              <a-select v-model="queryParam.sex" placeholder="请选择性别">
-                <a-select-option value="">请选择性别查询</a-select-option>
-                <a-select-option value="1">男性</a-select-option>
-                <a-select-option value="2">女性</a-select-option>
-              </a-select>
-            </a-form-item>
-          </a-col>
-
-
-          <template v-if="toggleSearchStatus">
-            <a-col :span="6">
-              <a-form-item label="邮箱">
-                <a-input placeholder="请输入邮箱" v-model="queryParam.email"></a-input>
-              </a-form-item>
-            </a-col>
-
-            <a-col :span="6">
-              <a-form-item label="手机号码">
-                <a-input placeholder="请输入手机号码" v-model="queryParam.phone"></a-input>
-              </a-form-item>
-            </a-col>
-
-            <a-col :span="6">
-              <a-form-item label="状态">
-                <a-select v-model="queryParam.status" placeholder="请选择状态">
-                  <a-select-option value="">请选择状态</a-select-option>
-                  <a-select-option value="1">正常</a-select-option>
-                  <a-select-option value="2">解冻</a-select-option>
-                </a-select>
-              </a-form-item>
-            </a-col>
-          </template>
-
-          <a-col :span="6" >
-            <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
-              <a-button type="primary" @click="searchByquery" icon="search">查询</a-button>
-              <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
-              <a @click="handleToggleSearch" style="margin-left: 8px">
-                {{ toggleSearchStatus ? '收起' : '展开' }}
-                <a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>
-              </a>
-            </span>
-          </a-col>
-
-        </a-row>
-      </a-form>
-    </div>
- <!--    update-begin author:kangxiaolin   date:20190921   for:系统发送通知 用户多选失败 #513  -->
-    <a-table
-      ref="table"
-      rowKey="id"
-      :columns="columns"
-      :dataSource="dataSource"
-      :pagination="ipagination"
-      :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange,onSelect:onSelect}"
-      @change="handleTableChange"
-    >
-<!--     update-end   author:kangxiaolin  date:20190921     for:系统发送通知 用户多选失败 #513 -->
-    </a-table>
-  </a-modal>
-</template>
-
-<script>
-  import { filterObj } from '@/utils/util';
-
-  import { getUserList } from '@/api/api'
-
-  export default {
-    name: "SelectUserListModal",
-    components: {
-    },
-    data () {
-      return {
-        title:"选择用户",
-        queryParam: {},
-        columns: [{
-          title: '用户账号',
-          align:"center",
-          dataIndex: 'username',
-          fixed:'left',
-          width:200
-        },{
-          title: '用户名称',
-          align:"center",
-          dataIndex: 'realname',
-        },{
-          title: '性别',
-          align:"center",
-          dataIndex: 'sex',
-          customRender:function (text) {
-            if(text==1){
-              return "男";
-            }else if(text==2){
-              return "女";
-            }else{
-              return text;
-            }
-          }
-        },{
-          title: '手机号码',
-          align:"center",
-          dataIndex: 'phone'
-        },{
-          title: '邮箱',
-          align:"center",
-          dataIndex: 'email'
-        },{
-          title: '状态',
-          align:"center",
-          dataIndex: 'status',
-          customRender:function (text) {
-            if(text==1){
-              return "正常";
-            }else if(text==2){
-              return "冻结";
-            }else{
-              return text;
-            }
-          }
-        }],
-        dataSource:[],
-        ipagination:{
-          current: 1,
-          pageSize: 5,
-          pageSizeOptions: ['5', '10', '20'],
-          showTotal: (total, range) => {
-            return range[0] + "-" + range[1] + " 共" + total + "条"
-          },
-          showQuickJumper: true,
-          showSizeChanger: true,
-          total: 0
-        },
-        isorter:{
-          column: 'createTime',
-          order: 'desc',
-        },
-        selectedRowKeys: [],
-        selectionRows: [],
-        visible:false,
-        toggleSearchStatus:false,
-      }
-    },
-    created() {
-      this.loadData();
-    },
-    methods: {
-      add (selectUser,userIds) {
-        this.visible = true;
-        this.edit(selectUser,userIds);
-      },
-      edit(selectUser,userIds){
-        //控制台报错
-        if(userIds&&userIds.length>0){
-          this.selectedRowKeys = userIds.split(',');
-        }else{
-          this.selectedRowKeys = []
-        }
-        if(!selectUser){
-          this.selectionRows=[]
-        }else{
-          var that=this;
-          that.selectionRows=[];
-          selectUser.forEach(function(record,index){
-            console.log(record)
-            that.selectionRows.push({id: that.selectedRowKeys[index],realname:record})
-          })
-          // this.selectionRows = selectUser;
-        }
-      },
-      loadData (arg){
-        if(arg===1){
-          this.ipagination.current = 1;
-        }
-        let params = this.getQueryParams();//查询条件
-        getUserList(params).then((res)=>{
-          if(res.success){
-            this.dataSource = res.result.records;
-            this.ipagination.total = res.result.total;
-          }
-        })
-      },
-      getQueryParams(){
-        let param = Object.assign({}, this.queryParam,this.isorter);
-        param.field = this.getQueryField();
-        //--update-begin----author:scott---date:20190818------for:新建公告时指定特定用户翻页错误SelectUserListModal #379----
-        // param.current = this.ipagination.current;
-        // param.pageSize = this.ipagination.pageSize;
-        param.pageNo = this.ipagination.current;
-        param.pageSize = this.ipagination.pageSize;
-        //--update-end----author:scott---date:20190818------for:新建公告时指定特定用户翻页错误SelectUserListModal #379---
-        return filterObj(param);
-      },
-      getQueryField(){
-        let str = "id,";
-        for(let a = 0;a<this.columns.length;a++){
-          str+=","+this.columns[a].dataIndex;
-        }
-        return str;
-      },
-      //--update-begin----author:kangxiaolin---date:20190921------for:系统发送通知 用户多选失败 #513----
-      onSelectChange (selectedRowKeys) {
-        this.selectedRowKeys = selectedRowKeys;
-      },
-      onSelect(record, selected){
-        if(selected == true ){
-          this.selectionRows.push(record);
-        }else {
-          this.selectionRows.forEach(function(item,index,arr){
-            if(item.id == record.id) {
-              arr.splice(index, 1);
-            }
-          })
-        }
-        //--update-end----author:kangxiaolin---date:20190921------for:系统发送通知 用户多选失败 #513----
-      },
-
-      searchReset(){
-        let that = this;
-        Object.keys(that.queryParam).forEach(function(key){
-          that.queryParam[key] = '';
-        });
-        that.loadData(1);
-      },
-      handleTableChange(pagination, filters, 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();
-      },
-      handleCancel () {
-        this.selectionRows = [];
-        this.selectedRowKeys = [];
-        this.visible = false;
-      },
-      handleOk () {
-        this.$emit("choseUser",this.selectionRows);
-        this.handleCancel();
-      },
-      searchByquery(){
-        this.loadData(1);
-      },
-      handleToggleSearch(){
-        this.toggleSearchStatus = !this.toggleSearchStatus;
-      },
-    }
-  }
-</script>
-<style scoped>
-  .ant-card-body .table-operator{
-    margin-bottom: 18px;
-  }
-
-  .ant-table-tbody .ant-table-row td{
-    padding-top:15px;
-    padding-bottom:15px;
-  }
-  .anty-row-operator button{margin: 0 5px}
-  .ant-btn-danger{background-color: #ffffff}
-
-  .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-content{height:90% !important;overflow-y: hidden}
-
-  .anty-img-wrap{height:25px;position: relative;}
-  .anty-img-wrap > img{max-height:100%;}
-</style>
\ No newline at end of file
diff --git a/jshERP-web/src/views/system/modules/SelectUserModal.vue b/jshERP-web/src/views/system/modules/SelectUserModal.vue
deleted file mode 100644
index 0dc51f9d..00000000
--- a/jshERP-web/src/views/system/modules/SelectUserModal.vue
+++ /dev/null
@@ -1,287 +0,0 @@
-<template>
-  <div>
-    <a-modal
-      centered
-      :title="title"
-      :width="1000"
-      :visible="visible"
-      @ok="handleOk"
-      @cancel="handleCancel"
-      cancelText="关闭">
-
-
-      <!-- 查询区域 -->
-      <div class="table-page-search-wrapper">
-        <a-form layout="inline"  @keyup.enter.native="searchQuery">
-          <a-row :gutter="24">
-
-            <a-col :span="10">
-              <a-form-item label="用户账号">
-                <a-input placeholder="请输入用户账号" 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">查询</a-button>
-                      <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
-                    </span>
-            </a-col>
-
-          </a-row>
-        </a-form>
-      </div>
-      <!-- table区域-begin -->
-      <div>
-        <a-table
-          size="small"
-          bordered
-          rowKey="id"
-          :columns="columns1"
-          :dataSource="dataSource1"
-          :pagination="ipagination"
-          :loading="loading"
-          :scroll="{ y: 240 }"
-          :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'
-
-  export default {
-    name: "SelectUserModal",
-    data() {
-      return {
-        title: "添加已有用户",
-        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: '用户账号',
-            align: "center",
-            width: 100,
-            dataIndex: 'username'
-          },
-          {
-            title: '用户名称',
-            align: "center",
-            width: 100,
-            dataIndex: 'realname'
-          },
-          {
-            title: '性别',
-            align: "center",
-            width: 100,
-            dataIndex: 'sex_dictText'
-          },
-          {
-            title: '电话',
-            align: "center",
-            width: 100,
-            dataIndex: 'phone'
-          },
-          {
-            title: '部门',
-            align: "center",
-            width: 150,
-            dataIndex: 'orgCode'
-          }
-        ],
-        columns2: [
-          {
-            title: '用户账号',
-            align: "center",
-            dataIndex: 'username',
-
-          },
-          {
-            title: '用户名称',
-            align: "center",
-            dataIndex: 'realname',
-          },
-          {
-            title: '操作',
-            dataIndex: 'action',
-            align: "center",
-            width: 100,
-            scopedSlots: {customRender: 'action'},
-          }
-        ],
-        //数据集
-        dataSource1: [],
-        dataSource2: [],
-        // 分页参数
-        ipagination: {
-          current: 1,
-          pageSize: 10,
-          pageSizeOptions: ['10', '20', '30'],
-          showTotal: (total, range) => {
-            return range[0] + "-" + range[1] + " 共" + total + "条"
-          },
-          showQuickJumper: true,
-          showSizeChanger: true,
-          total: 0
-        },
-        isorter: {
-          column: 'createTime',
-          order: 'desc',
-        },
-        loading: false,
-        selectedRowKeys: [],
-        selectedRows: [],
-        url: {
-          list: "/sys/user/list",
-        }
-      }
-    },
-    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-table-tbody .ant-table-row td {
-    padding-top: 15px;
-    padding-bottom: 15px;
-  }
-
-  .anty-row-operator button {
-    margin: 0 5px
-  }
-
-  .ant-btn-danger {
-    background-color: #ffffff
-  }
-
-  .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-content {
-    height: 90% !important;
-    overflow-y: hidden
-  }
-</style>
\ No newline at end of file
diff --git a/jshERP-web/src/views/system/modules/SysAnnouncementModal.vue b/jshERP-web/src/views/system/modules/SysAnnouncementModal.vue
deleted file mode 100644
index 44b3a89d..00000000
--- a/jshERP-web/src/views/system/modules/SysAnnouncementModal.vue
+++ /dev/null
@@ -1,332 +0,0 @@
-<template>
-  <a-modal
-    :title="title"
-
-    :width="900"
-    :visible="visible"
-    :confirmLoading="confirmLoading"
-    @ok="handleOk"
-    @cancel="handleCancel"
-    :okButtonProps="{ props: {disabled: disabled} }"
-    cancelText="关闭">
-
-    <a-spin :spinning="confirmLoading">
-      <a-form :form="form">
-        <a-row style="width: 100%;">
-          <a-col :span="24/2">
-            <a-form-item
-              :labelCol="labelCol"
-              :wrapperCol="wrapperCol"
-              label="标题">
-              <a-input placeholder="请输入标题" v-decorator="['titile', validatorRules.title]" :readOnly="disableSubmit"/>
-            </a-form-item>
-          </a-col>
-          <a-col :span="24/2">
-            <a-form-item
-              :labelCol="labelCol"
-              :wrapperCol="wrapperCol"
-              label="消息类型">
-              <a-select
-                v-decorator="[ 'msgCategory', validatorRules.msgCategory]"
-                placeholder="请选择消息类型"
-                :disabled="disableSubmit"
-                :getPopupContainer = "(target) => target.parentNode">
-                <a-select-option value="1">通知公告</a-select-option>
-                <a-select-option value="2">系统消息</a-select-option>
-              </a-select>
-            </a-form-item>
-          </a-col>
-        </a-row>
-        <a-row style="width: 100%;">
-          <a-col :span="24/2">
-            <a-form-item
-              :labelCol="labelCol"
-              :wrapperCol="wrapperCol"
-              label="开始时间:">
-              <j-date style="width: 100%" :getCalendarContainer="node => node.parentNode" v-decorator="[ 'startTime', validatorRules.startTime]" placeholder="请选择开始时间" showTime dateFormat="YYYY-MM-DD HH:mm:ss" ></j-date>
-            </a-form-item>
-          </a-col>
-          <a-col :span="24/2">
-            <a-form-item
-              :labelCol="labelCol"
-              :wrapperCol="wrapperCol"
-              label="结束时间"
-              class="endTime">
-              <j-date style="width: 100%" :getCalendarContainer="node => node.parentNode" v-decorator="[ 'endTime', validatorRules.endTime]" placeholder="请选择结束时间" showTime dateFormat="YYYY-MM-DD HH:mm:ss"></j-date>
-            </a-form-item>
-          </a-col>
-        </a-row>
-        <a-row style="width: 100%;">
-          <a-col :span="24/2">
-            <a-form-item
-              :labelCol="labelCol"
-              :wrapperCol="wrapperCol"
-              label="优先级">
-              <a-select
-                v-decorator="[ 'priority', {}]"
-                placeholder="请选择优先级"
-                :disabled="disableSubmit"
-                :getPopupContainer = "(target) => target.parentNode">
-                <a-select-option value="L">低</a-select-option>
-                <a-select-option value="M">中</a-select-option>
-                <a-select-option value="H">高</a-select-option>
-              </a-select>
-            </a-form-item>
-          </a-col>
-          <a-col :span="24/2">
-            <a-form-item
-              :labelCol="labelCol"
-              :wrapperCol="wrapperCol"
-              label="通告类型">
-              <a-select
-                v-decorator="[ 'msgType', validatorRules.msgType]"
-                placeholder="请选择通告类型"
-                :disabled="disableSubmit"
-                @change="chooseMsgType"
-                :getPopupContainer = "(target) => target.parentNode">
-                <a-select-option value="USER">指定用户</a-select-option>
-                <a-select-option value="ALL">全体用户</a-select-option>
-              </a-select>
-            </a-form-item>
-          </a-col>
-        </a-row>
-        <a-row style="width: 100%;">
-          <a-col :span="24/2">
-            <a-form-item
-              :labelCol="labelCol"
-              :wrapperCol="wrapperCol"
-              label="摘要">
-              <a-textarea placeholder="请输入摘要" v-decorator="['msgAbstract',validatorRules.msgAbstract]" />
-            </a-form-item>
-          </a-col>
-          <a-col :span="24/2">
-            <a-form-item
-              :labelCol="labelCol"
-              :wrapperCol="wrapperCol"
-              label="指定用户"
-              v-if="userType">
-              <a-select
-                mode="multiple"
-                placeholder="请选择用户"
-                v-model="selectedUser"
-                @dropdownVisibleChange="selectUserIds"
-              >
-              </a-select>
-            </a-form-item>
-          </a-col>
-        </a-row>
-        <a-row style="width: 100%;">
-          <a-col :span="24">
-            <a-form-item
-              :labelCol="labelColX1"
-              :wrapperCol="wrapperColX1"
-              label="内容"
-              class="j-field-content">
-              <j-editor v-decorator="[ 'msgContent', {} ]" triggerChange></j-editor>
-            </a-form-item>
-          </a-col>
-        </a-row>
-      </a-form>
-    </a-spin>
-    <select-user-list-modal ref="UserListModal" @choseUser="choseUser"></select-user-list-modal>
-  </a-modal>
-</template>
-
-<script>
-  import { httpAction } from '@/api/manage'
-  import pick from 'lodash.pick'
-  import { getAction } from '@/api/manage'
-  import JDate from '@/components/jeecg/JDate'
-  import JEditor from '@/components/jeecg/JEditor'
-  import SelectUserListModal from "./SelectUserListModal";
-  import moment from 'moment'
-
-  export default {
-    components: { JEditor, JDate, SelectUserListModal},
-    name: "SysAnnouncementModal",
-    data () {
-      return {
-        title:"操作",
-        visible: false,
-        disableSubmit:false,
-        model: {},
-        labelCol: {
-          xs: { span: 24 },
-          sm: { span: 6 },
-        },
-        wrapperCol: {
-          xs: { span: 24 },
-          sm: { span: 18 },
-        },
-        labelColX1: {
-          xs: { span: 24 },
-          sm: { span: 3 },
-        },
-        wrapperColX1: {
-          xs: { span: 24 },
-          sm: { span: 21 },
-        },
-
-        confirmLoading: false,
-        form: this.$form.createForm(this),
-        validatorRules:{
-          title:{rules: [{ required: true, message: '请输入标题!' }]},
-          msgCategory:{rules: [{ required: true, message: '请选择消息类型!' }]},
-          msgType:{rules: [{ required: true, message: '请选择通告对象类型!' }]},
-          endTime:{rules:[{ required: true, message: '请选择结束时间!'} ,{validator: this.endTimeValidate}]},
-          startTime:{rules:[{required: true, message: '请选择开始时间!'},{validator: this.startTimeValidate}]},
-          msgAbstract:{rules: [{ required: true, message: '请输入摘要!' }]},
-        },
-        url: {
-          queryByIds: "/sys/user/queryByIds",
-          add: "/sys/annountCement/add",
-          edit: "/sys/annountCement/edit",
-        },
-        userType:false,
-        userIds:[],
-        selectedUser:[],
-        disabled:false,
-        msgContent:"",
-      }
-    },
-    created () {
-    },
-    methods: {
-      add () {
-        this.edit({});
-      },
-      edit (record) {
-        this.form.resetFields();
-        this.model = {}
-        this.disable = false;
-        this.visible = true;
-        this.getUser(record);
-      },
-      getUser(record){
-        this.model = Object.assign({}, record);
-        // 指定用户
-        if(record&&record.msgType === "USER"){
-          this.userType =  true;
-          this.userIds = record.userIds;
-          getAction(this.url.queryByIds,{userIds:this.userIds}).then((res)=>{
-            if(res.success){
-              for(var i=0;i<res.result.length;i++){
-                this.selectedUser.push(res.result[i].realname);
-              }
-              this.$refs.UserListModal.edit(res.result,this.userIds);
-            }
-          });
-        }
-        this.$nextTick(() => {
-          this.form.setFieldsValue(pick(this.model,'endTime','startTime','titile','msgContent','sender','priority','msgCategory','msgType','sendStatus','delFlag','msgAbstract'))
-        });
-      },
-      close () {
-        this.$emit('close');
-        this.selectedUser = [];
-        this.visible = false;
-      },
-      handleOk () {
-        const that = this;
-        //当设置指定用户类型，但用户为空时，后台报错
-        if(this.userType &&!(this.userIds!=null && this.userIds.length >0)){
-            this.$message.warning('指定用户不能为空！')
-            return;
-          }
-        // 触发表单验证
-        this.form.validateFields((err, values) => {
-          if (!err) {
-            that.confirmLoading = true;
-            let httpurl = '';
-            let method = '';
-            if(!this.model.id){
-              httpurl+=this.url.add;
-              method = 'post';
-            }else{
-              httpurl+=this.url.edit;
-               method = 'put';
-            }
-            let formData = Object.assign(this.model, values);
-            if(this.userType){
-              formData.userIds =  this.userIds;
-            }
-            console.log(formData)
-            httpAction(httpurl,formData,method).then((res)=>{
-              if(res.success){
-                that.$message.success(res.message);
-                that.$emit('ok');
-                that.resetUser();
-              }else{
-                that.$message.warning(res.message);
-              }
-            }).finally(() => {
-              that.confirmLoading = false;
-              that.close();
-            })
-
-
-
-          }
-        })
-      },
-      handleCancel () {
-        this.visible = false;
-        this.$emit('close');
-        this.resetUser();
-      },
-      resetUser (){
-        this.userType =  false;
-        this.userIds = [];
-        this.selectedUser = [];
-        this.disabled = false;
-        this.$refs.UserListModal.edit(null,null);
-      },
-      selectUserIds() {
-        this.$refs.UserListModal.add(this.selectedUser,this.userIds);
-      },
-      chooseMsgType(value) {
-        if("USER" == value) {
-          this.userType = true;
-        } else {
-          this.userType = false;
-          this.selectedUser = [];
-          this.userIds = [];
-        }
-      },
-      // 子modal回调
-      choseUser:function(userList){
-        this.selectedUser = [];
-        this.userIds = [];
-        for(var i=0;i<userList.length;i++){
-          this.selectedUser.push(userList[i].realname);
-          this.userIds += userList[i].id+","
-        }
-      },
-      startTimeValidate(rule,value,callback){
-        let endTime = this.form.getFieldValue("endTime")
-        if(!value || !endTime){
-          callback()
-        }else if(moment(value).isBefore(endTime)){
-          callback()
-        }else{
-          callback("开始时间需小于结束时间")
-        }
-      },
-      endTimeValidate(rule,value,callback){
-        let startTime = this.form.getFieldValue("startTime")
-        if(!value || !startTime){
-          callback()
-        }else if(moment(startTime).isBefore(value)){
-          callback()
-        }else{
-          callback("结束时间需大于开始时间")
-        }
-      }
-
-    }
-  }
-</script>
-
-<style scoped>
-
-</style>
\ No newline at end of file
diff --git a/jshERP-web/src/views/system/modules/SysCategoryModal.vue b/jshERP-web/src/views/system/modules/SysCategoryModal.vue
deleted file mode 100644
index 88bac3b2..00000000
--- a/jshERP-web/src/views/system/modules/SysCategoryModal.vue
+++ /dev/null
@@ -1,194 +0,0 @@
-<template>
-  <a-modal
-    :title="title"
-    :width="width"
-    :visible="visible"
-    :confirmLoading="confirmLoading"
-    @ok="handleOk"
-    @cancel="handleCancel"
-    :destroyOnClose="true"
-    cancelText="关闭">
-    <a-spin :spinning="confirmLoading">
-      <a-form :form="form">
-
-        <a-form-item label="父级节点" :labelCol="labelCol" :wrapperCol="wrapperCol">
-          <j-tree-select
-            ref="treeSelect"
-            placeholder="请选择父级节点"
-            v-decorator="['pid', validatorRules.pid]"
-            dict="sys_category,name,id"
-            pidField="pid"
-            pidValue="0">
-          </j-tree-select>
-        </a-form-item>
-          
-        <a-form-item label="分类名称" :labelCol="labelCol" :wrapperCol="wrapperCol">
-          <a-input v-decorator="[ 'name', validatorRules.name]" placeholder="请输入分类名称"></a-input>
-        </a-form-item>
-          
-        <!--<a-form-item label="类型编码" :labelCol="labelCol" :wrapperCol="wrapperCol">
-          <a-input v-decorator="[ 'code', validatorRules.code]" placeholder="请输入类型编码"></a-input>
-        </a-form-item>-->
-
-        <!--<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol">
-          <span style="font-size: 12px;color:red" slot="label">编码规则(注)</span>
-          <span style="font-size: 12px;color:red">
-            编码值前缀需和父节点保持一致,比如父级节点编码是A01则当前编码必须以A01开头
-          </span>
-        </a-form-item>-->
-          
-        
-      </a-form>
-    </a-spin>
-  </a-modal>
-</template>
-
-<script>
-
-  import { httpAction,getAction } from '@/api/manage'
-  import pick from 'lodash.pick'
-  import JTreeSelect from '@/components/jeecg/JTreeSelect'
-  
-  export default {
-    name: "SysCategoryModal",
-    components: { 
-      JTreeSelect
-    },
-    data () {
-      return {
-        form: this.$form.createForm(this),
-        title:"操作",
-        width:800,
-        visible: false,
-        model: {},
-        labelCol: {
-          xs: { span: 24 },
-          sm: { span: 5 },
-        },
-        wrapperCol: {
-          xs: { span: 24 },
-          sm: { span: 16 },
-        },
-
-        confirmLoading: false,
-        validatorRules:{
-          code:{
-            rules: [{
-              required: true, message: '请输入类型编码!'
-            },{
-              validator: this.validateMyCode
-            }]
-          },
-          pid:{},
-          name:{rules: [{ required: true, message: '请输入类型名称!' }]}
-        },
-        url: {
-          add: "/sys/category/add",
-          edit: "/sys/category/edit",
-          checkCode:"/sys/category/checkCode",
-        },
-        expandedRowKeys:[],
-        pidField:"pid",
-        subExpandedKeys:[]
-     
-      }
-    },
-    created () {
-    },
-    methods: {
-      add () {
-        this.edit({});
-      },
-      edit (record) {
-        this.form.resetFields();
-        this.model = Object.assign({}, record);
-        this.visible = true;
-        this.$nextTick(() => {
-          this.form.setFieldsValue(pick(this.model,'pid','name','code'))
-        })
-      },
-      close () {
-        this.$emit('close');
-        this.visible = false;
-      },
-      handleOk () {
-        const that = this;
-        // 触发表单验证
-        this.form.validateFields((err, values) => {
-          if (!err) {
-            that.confirmLoading = true;
-            let httpurl = '';
-            let method = '';
-            if(!this.model.id){
-              httpurl+=this.url.add;
-              method = 'post';
-            }else{
-              httpurl+=this.url.edit;
-               method = 'put';
-            }
-            let formData = Object.assign(this.model, values);
-            console.log("表单提交数据",formData)
-            httpAction(httpurl,formData,method).then((res)=>{
-              if(res.success){
-                that.$message.success(res.message);
-                that.submitSuccess(formData)
-              }else{
-                that.$message.warning(res.message);
-              }
-            }).finally(() => {
-              that.confirmLoading = false;
-              that.close();
-            })
-          }
-         
-        })
-      },
-      handleCancel () {
-        this.close()
-      },
-      popupCallback(row){
-        this.form.setFieldsValue(pick(row,'pid','name','code'))
-      },
-      submitSuccess(formData){
-        if(!formData.id){
-          let treeData = this.$refs.treeSelect.getCurrTreeData()
-          this.expandedRowKeys=[]
-          this.getExpandKeysByPid(formData[this.pidField],treeData,treeData)
-          if(formData.pid && this.expandedRowKeys.length==0){
-            this.expandedRowKeys = this.subExpandedKeys;
-          }
-          this.$emit('ok',formData,this.expandedRowKeys.reverse());
-        }else{
-          this.$emit('ok',formData);
-      }
-      },
-      getExpandKeysByPid(pid,arr,all){
-        if(pid && arr && arr.length>0){
-          for(let i=0;i<arr.length;i++){
-            if(arr[i].key==pid){
-              this.expandedRowKeys.push(arr[i].key)
-              this.getExpandKeysByPid(arr[i]['parentId'],all,all)
-            }else{
-              this.getExpandKeysByPid(pid,arr[i].children,all)
-            }
-          }
-        }
-      },
-      validateMyCode(rule, value, callback){
-        let params = {
-          pid: this.form.getFieldValue('pid'),
-          code: value
-        }
-        getAction(this.url.checkCode,params).then((res) => {
-          if (res.success) {
-            callback()
-          } else {
-            callback(res.message)
-          }
-        })
-      },
-      
-      
-    }
-  }
-</script>
\ No newline at end of file
diff --git a/jshERP-web/src/views/system/modules/SysCheckRuleModal.vue b/jshERP-web/src/views/system/modules/SysCheckRuleModal.vue
deleted file mode 100644
index d906a738..00000000
--- a/jshERP-web/src/views/system/modules/SysCheckRuleModal.vue
+++ /dev/null
@@ -1,379 +0,0 @@
-<template>
-  <a-modal
-    :title="title"
-    :width="1000"
-    :visible="visible"
-    :confirmLoading="confirmLoading"
-    @ok="handleOk"
-    @cancel="handleCancel"
-    cancelText="关闭">
-
-    <a-spin :spinning="confirmLoading">
-      <a-form :form="form">
-
-        <a-form-item
-          :labelCol="labelCol"
-          :wrapperCol="wrapperCol"
-          label="规则名称">
-          <a-input placeholder="请输入规则名称" v-decorator="['ruleName', validatorRules.ruleName]"/>
-        </a-form-item>
-        <a-form-item
-          :labelCol="labelCol"
-          :wrapperCol="wrapperCol"
-          label="规则Code">
-          <a-input placeholder="请输入规则Code" v-decorator="['ruleCode', validatorRules.ruleCode]"/>
-        </a-form-item>
-        <a-form-item
-          :labelCol="labelCol"
-          :wrapperCol="wrapperCol"
-          label="规则描述">
-          <a-textarea placeholder="请输入规则描述" v-decorator="['ruleDescription', {}]"/>
-        </a-form-item>
-
-      </a-form>
-      <!-- 规则设计 -->
-      <a-tabs v-model="tabs.activeKey">
-        <a-tab-pane tab="局部规则" :key="tabs.design.key" forceRender>
-          <a-alert type="info" showIcon message="局部规则按照你输入的位数有序的校验。"/>
-          <j-editable-table
-            ref="designTable"
-            dragSort
-            rowNumber
-            :maxHeight="240"
-            :columns="tabs.design.columns"
-            :dataSource="tabs.design.dataSource"
-            style="margin-top: 8px;"
-          >
-
-            <template #action="props">
-              <my-action-button :rowEvent="props"/>
-            </template>
-
-          </j-editable-table>
-        </a-tab-pane>
-        <a-tab-pane tab="全局规则" :key="tabs.global.key" forceRender>
-          <j-editable-table
-            ref="globalTable"
-            dragSort
-            rowNumber
-            actionButton
-            :maxHeight="240"
-            :columns="tabs.global.columns"
-            :dataSource="tabs.global.dataSource"
-          >
-
-            <template #actionButtonAfter>
-              <a-alert type="info" showIcon message="全局规则可校验用户输入的所有字符；全局规则的优先级比局部规则的要高。" style="margin-bottom: 8px;"/>
-            </template>
-
-            <template #action="props">
-              <my-action-button :rowEvent="props" allowEmpty/>
-            </template>
-
-          </j-editable-table>
-        </a-tab-pane>
-      </a-tabs>
-    </a-spin>
-  </a-modal>
-</template>
-
-<script>
-  import pick from 'lodash.pick'
-  import { httpAction } from '@/api/manage'
-  import { validateDuplicateValue, alwaysResolve, failedSymbol } from '@/utils/util'
-  import { FormTypes } from '@/utils/JEditableTableUtil'
-  import JEditableTable from '@comp/jeecg/JEditableTable'
-
-  export default {
-    name: 'SysCheckRuleModal',
-    components: {
-      JEditableTable,
-      'my-action-button': {
-        props: { rowEvent: Object, allowEmpty: Boolean },
-        methods: {
-          confirmIsShow() {
-            const { index, allValues: { inputValues } } = this.rowEvent
-            let value = inputValues[index]
-            return value.digits || value.pattern
-          },
-          handleLineAdd() {
-            const { target } = this.rowEvent
-            target.add()
-          },
-          handleLineDelete() {
-            const { rowId, target } = this.rowEvent
-            target.removeRows(rowId)
-          },
-          renderDeleteButton() {
-            if (this.allowEmpty || this.rowEvent.index > 0) {
-              if (this.confirmIsShow()) {
-                return (
-                  <a-popconfirm title="确定要删除吗？" onConfirm={this.handleLineDelete}>
-                    <a-button icon="minus"/>
-                  </a-popconfirm>
-                )
-              } else {
-                return (
-                  <a-button icon="minus" onClick={this.handleLineDelete}/>
-                )
-              }
-            }
-            return ''
-          },
-        },
-        render() {
-          return (
-            <div>
-              <a-button onClick={this.handleLineAdd} icon="plus"/>
-              &nbsp;
-              {this.renderDeleteButton()}
-            </div>
-          )
-        }
-      }
-    },
-    data() {
-      return {
-        title: '操作',
-        visible: false,
-        model: {},
-        labelCol: {
-          xs: { span: 24 },
-          sm: { span: 5 },
-        },
-        wrapperCol: {
-          xs: { span: 24 },
-          sm: { span: 16 },
-        },
-        confirmLoading: false,
-        form: this.$form.createForm(this),
-        validatorRules: {
-          ruleName: { rules: [{ required: true, message: '请输入规则名称!' },] },
-          ruleCode: {
-            rules: [
-              { required: true, message: '请输入规则Code!' },
-              { validator: (rule, value, callback) => validateDuplicateValue('sys_check_rule', 'rule_code', value, this.model.id, callback) }
-    ]
-          },
-        },
-        tabs: {
-          activeKey: 'design',
-          global: {
-            key: 'global',
-            columns: [
-              {
-                title: '优先级',
-                key: 'priority',
-                width: '15%',
-                type: FormTypes.select,
-                defaultValue: '1',
-                options: [
-                  { title: '优先运行', value: '1' },
-                  { title: '最后运行', value: '0' },
-                ],
-                validateRules: []
-              },
-              {
-                title: '规则（正则表达式）',
-                key: 'pattern',
-                width: '50%',
-                type: FormTypes.input,
-                validateRules: [
-                  { required: true, message: '规则不能为空' },
-                  { handler: this.validatePatternHandler },
-                ]
-              },
-              {
-                title: '提示文本',
-                key: 'message',
-                width: '20%',
-                type: FormTypes.input,
-                validateRules: [
-                  { required: true, message: '${title}不能为空' },
-                ]
-              },
-              {
-                title: '操作',
-                key: 'action',
-                width: '15%',
-                slotName: 'action',
-                type: FormTypes.slot
-              }
-            ],
-            dataSource: [],
-          },
-          design: {
-            key: 'design',
-            columns: [
-              {
-                title: '位数',
-                key: 'digits',
-                width: '15%',
-                type: FormTypes.inputNumber,
-                validateRules: [
-                  { required: true, message: '${title}不能为空' },
-                  { pattern: /^[1-9]\d*$/, message: '请输入零以上的正整数' },
-                ]
-              },
-              {
-                title: '规则（正则表达式）',
-                key: 'pattern',
-                width: '50%',
-                type: FormTypes.input,
-                validateRules: [
-                  { required: true, message: '规则不能为空' },
-                  { handler: this.validatePatternHandler }
-                ]
-              },
-              {
-                title: '提示文本',
-                key: 'message',
-                width: '20%',
-                type: FormTypes.input,
-                validateRules: [
-                  { required: true, message: '${title}不能为空' },
-                ]
-              },
-              {
-                title: '操作',
-                key: 'action',
-                width: '15%',
-                slotName: 'action',
-                type: FormTypes.slot
-              },
-            ],
-            dataSource: [],
-          }
-        },
-        url: {
-          add: '/sys/checkRule/add',
-          edit: '/sys/checkRule/edit',
-        },
-      }
-    },
-    created() {
-    },
-    methods: {
-
-      validatePatternHandler(type, value, row, column, callback, target) {
-        if (type === 'blur' || type === 'getValues') {
-          try {
-            new RegExp(value)
-            callback(true)
-          } catch (e) {
-            callback(false, '请输入正确的正则表达式')
-          }
-        } else {
-          callback(true) // 不填写或者填写 null 代表不进行任何操作
-        }
-      },
-
-      add() {
-        this.edit({})
-      },
-      edit(record) {
-        this.form.resetFields()
-        this.tabs.activeKey = this.tabs.design.key
-        this.tabs.global.dataSource = []
-        this.tabs.design.dataSource = [{ digits: '', pattern: '', message: '' }]
-        this.model = Object.assign({}, record)
-        this.visible = true
-        this.$nextTick(() => {
-          this.form.setFieldsValue(pick(this.model, 'ruleName', 'ruleCode', 'ruleDescription'))
-          // 子表数据
-          let ruleJson = this.model.ruleJson
-          if (ruleJson) {
-            let ruleList = JSON.parse(ruleJson)
-            // 筛选出全局规则和局部规则
-            let global = [], design = [], priority = '1'
-            ruleList.forEach(rule => {
-              if (rule.digits === '*') {
-                global.push(Object.assign(rule, { priority }))
-              } else {
-                priority = '0'
-                design.push(rule)
-              }
-            })
-            this.tabs.global.dataSource = global
-            this.tabs.design.dataSource = design
-          }
-        })
-      },
-      close() {
-        this.$emit('close')
-        this.visible = false
-      },
-      handleOk() {
-        Promise.all([
-          // 主表单校验
-          alwaysResolve(new Promise((resolve, reject) => {
-            this.form.validateFields((error, values) => error ? reject(error) : resolve(values))
-          })),
-          // 局部规则子表校验
-          alwaysResolve(this.$refs.designTable.getValuesPromise),
-          // 全局规则子表校验
-          alwaysResolve(this.$refs.globalTable.getValuesPromise),
-        ]).then(results => {
-          let [mainResult, designResult, globalResult] = results
-
-          if (mainResult.type === failedSymbol) {
-            return Promise.reject('主表校验未通过')
-          } else if (designResult.type === failedSymbol) {
-            this.tabs.activeKey = this.tabs.design.key
-            return Promise.reject('局部规则子表校验未通过')
-          } else if (globalResult.type === failedSymbol) {
-            this.tabs.activeKey = this.tabs.global.key
-            return Promise.reject('全局规则子表校验未通过')
-          } else {
-            // 所有校验已通过，这一步是整合数据
-            let mainValues = mainResult.data, globalValues = globalResult.data, designValues = designResult.data
-
-            // 整合两个子表的数据
-            let firstGlobal = [], afterGlobal = []
-            globalValues.forEach(v => {
-              v.digits = '*'
-              if (v.priority === '1') {
-                firstGlobal.push(v)
-              } else {
-                afterGlobal.push(v)
-              }
-            })
-            let concatValues = firstGlobal.concat(designValues).concat(afterGlobal)
-            let subValues = concatValues.map(i => pick(i, 'digits', 'pattern', 'message'))
-
-            // 生成 formData，用于传入后台
-            let ruleJson = JSON.stringify(subValues)
-            let formData = Object.assign(this.model, mainValues, { ruleJson })
-
-            // 判断请求方式和请求地址，并发送请求
-            let method = 'post', httpUrl = this.url.add
-            if (this.model.id) {
-              method = 'put'
-              httpUrl = this.url.edit
-            }
-            this.confirmLoading = true
-            return httpAction(httpUrl, formData, method)
-          }
-        }).then((res) => {
-          if (res.success) {
-            this.$message.success(res.message)
-            this.$emit('ok')
-            this.close()
-          } else {
-            this.$message.warning(res.message)
-          }
-        }).catch(e => {
-          console.error(e)
-        }).finally(() => {
-          this.confirmLoading = false
-        })
-      },
-      handleCancel() {
-        this.close()
-      },
-
-    }
-  }
-</script>
-
-<style lang="less" scoped></style>
\ No newline at end of file
diff --git a/jshERP-web/src/views/system/modules/SysCheckRuleTestModal.vue b/jshERP-web/src/views/system/modules/SysCheckRuleTestModal.vue
deleted file mode 100644
index 89b76915..00000000
--- a/jshERP-web/src/views/system/modules/SysCheckRuleTestModal.vue
+++ /dev/null
@@ -1,58 +0,0 @@
-<template>
-  <a-modal
-    title="功能测试"
-    :width="800"
-    :visible="visible"
-    @ok="visible=false"
-    @cancel="visible=false"
-  >
-    <a-form :form="form">
-      <a-form-item label="功能测试">
-        <a-input placeholder="请输入" v-decorator="['test', validatorRules.test]" @change="e=>testValue=e.target.value"/>
-      </a-form-item>
-    </a-form>
-    <a-row type="flex" :gutter="8">
-      <a-col v-for="(str,index) of testValue" :key="index">
-        <a-row>
-          <a-col>
-            <a-input :value="str" style="text-align: center;width: 40px;"/>
-          </a-col>
-          <a-col style="text-align: center;">{{index+1}}</a-col>
-        </a-row>
-      </a-col>
-    </a-row>
-
-  </a-modal>
-</template>
-
-<script>
-  import { validateCheckRule } from '@/utils/util'
-
-  export default {
-    name: 'SysCheckRuleModal',
-    data() {
-      return {
-        title: '操作',
-        visible: false,
-        ruleCode: '',
-        testValue: '',
-        form: this.$form.createForm(this),
-        validatorRules: {
-          test: {
-            rules: [{ validator: (rule, value, callback) => validateCheckRule(this.ruleCode, value, callback) }]
-          }
-        },
-      }
-    },
-    methods: {
-      open(ruleCode) {
-        this.ruleCode = ruleCode
-        this.form.resetFields()
-        this.testValue = ''
-        this.visible = true
-      },
-    }
-  }
-</script>
-
-<style lang="less" scoped></style>
\ No newline at end of file
diff --git a/jshERP-web/src/views/system/modules/SysDataSourceModal.vue b/jshERP-web/src/views/system/modules/SysDataSourceModal.vue
deleted file mode 100644
index cbd9ebe1..00000000
--- a/jshERP-web/src/views/system/modules/SysDataSourceModal.vue
+++ /dev/null
@@ -1,239 +0,0 @@
-<template>
-  <a-modal
-    :title="title"
-    :width="800"
-    :visible="visible"
-    :confirmLoading="confirmLoading"
-    @ok="handleOk"
-    @cancel="handleCancel"
-    cancelText="关闭">
-
-    <a-spin :spinning="confirmLoading">
-      <a-form :form="form">
-
-        <a-form-item
-          :labelCol="labelCol"
-          :wrapperCol="wrapperCol"
-          label="数据源编码">
-          <a-input placeholder="请输入数据源编码" :disabled="!!model.id" v-decorator="['code', validatorRules.code]"/>
-        </a-form-item>
-        <a-form-item
-          :labelCol="labelCol"
-          :wrapperCol="wrapperCol"
-          label="数据源名称">
-          <a-input placeholder="请输入数据源名称" v-decorator="['name', validatorRules.name]"/>
-        </a-form-item>
-        <a-form-item
-          :labelCol="labelCol"
-          :wrapperCol="wrapperCol"
-          label="数据库类型">
-          <j-dict-select-tag placeholder="请选择数据库类型" dict-code="database_type" triggerChange v-decorator="['dbType', validatorRules.dbType]" @change="handleDbTypeChange"/>
-        </a-form-item>
-        <a-form-item
-          :labelCol="labelCol"
-          :wrapperCol="wrapperCol"
-          label="驱动类">
-          <a-input placeholder="请输入驱动类" v-decorator="['dbDriver', validatorRules.dbDriver]"/>
-        </a-form-item>
-        <a-form-item
-          :labelCol="labelCol"
-          :wrapperCol="wrapperCol"
-          label="数据源地址">
-          <a-input placeholder="请输入数据源地址" v-decorator="['dbUrl', validatorRules.dbUrl]"/>
-        </a-form-item>
-        <a-form-item
-          :labelCol="labelCol"
-          :wrapperCol="wrapperCol"
-          label="数据库名称">
-          <a-input placeholder="请输入数据库名称" v-decorator="['dbName', validatorRules.dbName]"/>
-        </a-form-item>
-        <a-form-item
-          :labelCol="labelCol"
-          :wrapperCol="wrapperCol"
-          label="用户名">
-          <a-input placeholder="请输入用户名" v-decorator="['dbUsername', validatorRules.dbUsername]"/>
-        </a-form-item>
-        <a-form-item
-          :labelCol="labelCol"
-          :wrapperCol="wrapperCol"
-          label="密码">
-          <a-row :gutter="8">
-            <a-col :span="21">
-              <a-input-password placeholder="请输入密码" v-decorator="['dbPassword', validatorRules.dbPassword]"/>
-            </a-col>
-            <a-col :span="3">
-              <a-button type="primary" size="small" style="width: 100%" @click="handleTest">测试</a-button>
-            </a-col>
-          </a-row>
-        </a-form-item>
-        <a-form-item
-          :labelCol="labelCol"
-          :wrapperCol="wrapperCol"
-          label="备注">
-          <a-textarea placeholder="请输入备注" v-decorator="['remark', {}]"/>
-        </a-form-item>
-      </a-form>
-    </a-spin>
-  </a-modal>
-</template>
-
-<script>
-  import pick from 'lodash.pick'
-  import { httpAction, postAction } from '@/api/manage'
-  import { validateDuplicateValue } from '@/utils/util'
-
-  export default {
-    name: 'SysDataSourceModal',
-    components: {},
-    data() {
-      return {
-        title: '操作',
-        visible: false,
-        model: {},
-        labelCol: {
-          xs: { span: 24 },
-          sm: { span: 5 },
-        },
-        wrapperCol: {
-          xs: { span: 24 },
-          sm: { span: 16 },
-        },
-
-        confirmLoading: false,
-        form: this.$form.createForm(this),
-        validatorRules: {
-          code: {
-            validateFirst: true,
-            rules: [
-              { required: true, message: '请输入数据源编码!' },
-              {
-                validator: (rule, value, callback) => {
-                  let pattern = /^[a-z|A-Z][a-z|A-Z\d_-]{0,}$/
-                  if (!pattern.test(value)) {
-                    callback('编码必须以字母开头，可包含数字、下划线、横杠')
-                  } else {
-                    validateDuplicateValue('sys_data_source', 'code', value, this.model.id, callback)
-                  }
-                }
-              }
-            ]
-          },
-          name: { rules: [{ required: true, message: '请输入数据源名称!' }] },
-          dbType: { rules: [{ required: true, message: '请选择数据库类型!' }] },
-          dbDriver: { rules: [{ required: true, message: '请输入驱动类!' }] },
-          dbUrl: { rules: [{ required: true, message: '请输入数据源地址!' }] },
-          dbName: { rules: [{ required: true, message: '请输入数据库名称!' }] },
-          dbUsername: { rules: [{ required: true, message: '请输入用户名!' }] },
-          dbPassword: { rules: [{ required: true, message: '请输入密码!' }] }
-        },
-        url: {
-          add: '/sys/dataSource/add',
-          edit: '/sys/dataSource/edit',
-        },
-        dbDriverMap: {
-          // MySQL 数据库
-          '1': { dbDriver: 'com.mysql.jdbc.Driver' },
-          // Oracle
-          '2': { dbDriver: 'oracle.jdbc.OracleDriver' },
-          // SQLServer 数据库
-          '3': { dbDriver: 'com.microsoft.sqlserver.jdbc.SQLServerDriver' },
-        },
-        dbUrlMap: {
-          // MySQL 数据库
-          '1': { dbUrl: 'jdbc:mysql://127.0.0.1:3306/jshERP-boot?characterEncoding=UTF-8&useUnicode=true&useSSL=false' },
-          // Oracle
-          '2': { dbUrl: 'jdbc:oracle:thin:@127.0.0.1:1521:ORCL' },
-          // SQLServer 数据库
-          '3': { dbUrl: 'jdbc:sqlserver://127.0.0.1:1433;SelectMethod=cursor;DatabaseName=jeecgboot' }
-        }
-      }
-    },
-    created() {
-    },
-    methods: {
-      add() {
-        this.edit({})
-      },
-      edit(record) {
-        this.form.resetFields()
-        this.model = Object.assign({}, record)
-        this.visible = true
-        this.$nextTick(() => {
-          this.form.setFieldsValue(pick(this.model, 'code', 'name', 'remark', 'dbType', 'dbDriver', 'dbUrl', 'dbName', 'dbUsername', 'dbPassword'))
-        })
-      },
-      close() {
-        this.$emit('close')
-        this.visible = false
-      },
-      handleOk() {
-        // 触发表单验证
-        this.form.validateFields((err, values) => {
-          if (!err) {
-            this.confirmLoading = true
-            let formData = Object.assign(this.model, values)
-            let httpUrl = this.url.add, method = 'post'
-            if (this.model.id) {
-              httpUrl = this.url.edit
-              method = 'put'
-              // 由于编码的特殊性，所以不能更改
-              formData['code'] = undefined
-            }
-            httpAction(httpUrl, formData, method).then((res) => {
-              if (res.success) {
-                this.$message.success(res.message)
-                this.$emit('ok')
-                this.close()
-              } else {
-                this.$message.warning(res.message)
-              }
-            }).finally(() => {
-              this.confirmLoading = false
-            })
-          }
-        })
-      },
-      handleCancel() {
-        this.close()
-      },
-      // 测试数据源配置是否可以正常连接
-      handleTest() {
-        let keys = ['dbType', 'dbDriver', 'dbUrl', 'dbName', 'dbUsername', 'dbPassword']
-        // 获取以上字段的值，并清除校验状态
-        let fieldsValues = this.form.getFieldsValue(keys)
-        let setFields = {}
-        keys.forEach(key => setFields[key] = { value: fieldsValues[key], errors: null })
-        // 清除校验状态，目的是可以让错误文字闪烁
-        this.form.setFields(setFields)
-        // 重新校验
-        this.$nextTick(() => {
-          this.form.validateFields(keys, (errors, values) => {
-            if (!errors) {
-              let loading = this.$message.loading('连接中……', 0)
-              postAction('/online/cgreport/api/testConnection', fieldsValues).then(res => {
-                if (res.success) {
-                  this.$message.success('连接成功')
-                } else throw new Error(res.message)
-              }).catch(error => {
-                this.$warning({ title: '连接失败', content: error.message || error })
-              }).finally(() => loading())
-            }
-          })
-        })
-      },
-      // 数据库类型更改时，联动更改数据库驱动
-      handleDbTypeChange(val) {
-        let dbDriver = this.dbDriverMap[val]
-        let dbUrl = this.dbUrlMap[val]
-        if (dbDriver) {
-          this.form.setFieldsValue(dbDriver)
-        }
-        if (dbUrl) {
-          this.form.setFieldsValue(dbUrl)
-        }
-      },
-    }
-  }
-</script>
-
-<style lang="less" scoped></style>
\ No newline at end of file
diff --git a/jshERP-web/src/views/system/modules/SysDepartRoleModal.vue b/jshERP-web/src/views/system/modules/SysDepartRoleModal.vue
deleted file mode 100644
index ac982f83..00000000
--- a/jshERP-web/src/views/system/modules/SysDepartRoleModal.vue
+++ /dev/null
@@ -1,162 +0,0 @@
-<template>
-  <a-modal
-    :title="title"
-    :width="800"
-    :visible="visible"
-    :confirmLoading="confirmLoading"
-    @ok="handleOk"
-    @cancel="handleCancel"
-    cancelText="关闭">
-    
-    <a-spin :spinning="confirmLoading">
-      <a-form :form="form">
-      
-        <a-form-item
-          :labelCol="labelCol"
-          :wrapperCol="wrapperCol"
-          label="部门角色名称">
-          <a-input placeholder="请输入部门角色名称" v-decorator="['roleName', validatorRules.roleName]" />
-        </a-form-item>
-        <a-form-item
-          :labelCol="labelCol"
-          :wrapperCol="wrapperCol"
-          label="部门角色编码">
-          <a-input placeholder="请输入部门角色编码" v-decorator="['roleCode', validatorRules.roleCode]" />
-        </a-form-item>
-        <a-form-item
-          :labelCol="labelCol"
-          :wrapperCol="wrapperCol"
-          label="描述">
-          <a-input placeholder="请输入描述" v-decorator="['description', validatorRules.description]" />
-        </a-form-item>
-		
-      </a-form>
-    </a-spin>
-  </a-modal>
-</template>
-
-<script>
-  import { httpAction } from '@/api/manage'
-  import pick from 'lodash.pick'
-  import {duplicateCheck } from '@/api/api'
-
-  export default {
-    name: "SysDepartRoleModal",
-    data () {
-      return {
-        title:"操作",
-        visible: false,
-        model: {},
-        labelCol: {
-          xs: { span: 24 },
-          sm: { span: 5 },
-        },
-        wrapperCol: {
-          xs: { span: 24 },
-          sm: { span: 16 },
-        },
-
-        confirmLoading: false,
-        form: this.$form.createForm(this),
-        validatorRules:{
-          roleName:{
-            rules: [
-              { required: true, message: '请输入部门角色名称!' },
-              { min: 2, max: 30, message: '长度在 2 到 30 个字符', trigger: 'blur' }
-            ]},
-          roleCode:{
-            rules: [
-              { required: true, message: '请输入部门角色编码!'},
-              { min: 0, max: 64, message: '长度不超过 64 个字符', trigger: 'blur' },
-              { validator: this.validateRoleCode}
-            ]},
-          description:{
-            rules: [
-              { min: 0, max: 126, message: '长度不超过 126 个字符', trigger: 'blur' }
-            ]}
-        },
-        url: {
-          add: "/sys/sysDepartRole/add",
-          edit: "/sys/sysDepartRole/edit",
-        },
-      }
-    },
-    created () {
-    },
-    methods: {
-      add (departId) {
-        this.edit({},departId);
-      },
-      edit (record,departId) {
-        this.departId = departId;
-        this.form.resetFields();
-        this.model = Object.assign({}, record);
-        this.visible = true;
-        this.$nextTick(() => {
-          this.form.setFieldsValue(pick(this.model,'roleName','roleCode','description'))
-        });
-      },
-      close () {
-        this.$emit('close');
-        this.visible = false;
-      },
-      handleOk () {
-        const that = this;
-        // 触发表单验证
-        this.form.validateFields((err, values) => {
-          if (!err) {
-            that.confirmLoading = true;
-            let httpurl = '';
-            let method = '';
-            if(!this.model.id){
-              httpurl+=this.url.add;
-              method = 'post';
-            }else{
-              httpurl+=this.url.edit;
-               method = 'put';
-            }
-            let formData = Object.assign(this.model, values);
-            formData.departId = this.departId;
-            httpAction(httpurl,formData,method).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();
-            })
-          }
-        })
-      },
-      handleCancel () {
-        this.close()
-      },
-      validateRoleCode(rule, value, callback){
-        if(/[\u4E00-\u9FA5]/g.test(value)){
-          callback("部门角色编码不可输入汉字!");
-        }else{
-          var params = {
-            tableName: "sys_depart_role",
-            fieldName: "role_code",
-            fieldVal: value,
-            dataId: this.model.id,
-          };
-          duplicateCheck(params).then((res)=>{
-            if(res.success){
-              callback();
-            }else{
-              callback(res.message);
-            }
-          });
-        }
-      }
-    }
-  }
-</script>
-
-<style lang="less" scoped>
-
-</style>
\ No newline at end of file
diff --git a/jshERP-web/src/views/system/modules/SysFillRuleModal.vue b/jshERP-web/src/views/system/modules/SysFillRuleModal.vue
deleted file mode 100644
index f1344f65..00000000
--- a/jshERP-web/src/views/system/modules/SysFillRuleModal.vue
+++ /dev/null
@@ -1,158 +0,0 @@
-<template>
-  <a-modal
-    :title="title"
-    :width="800"
-    :visible="visible"
-    :maskClosable="false"
-    :confirmLoading="confirmLoading"
-    @ok="handleOk"
-    @cancel="handleCancel"
-    cancelText="关闭">
-
-    <a-spin :spinning="confirmLoading">
-      <a-form :form="form">
-
-        <a-form-item
-          :labelCol="labelCol"
-          :wrapperCol="wrapperCol"
-          label="规则名称">
-          <a-input placeholder="请输入规则名称" v-decorator="['ruleName', validatorRules.ruleName]"/>
-        </a-form-item>
-        <a-form-item
-          :labelCol="labelCol"
-          :wrapperCol="wrapperCol"
-          label="规则Code">
-          <a-input placeholder="请输入规则Code" :disabled="disabledCode" v-decorator="['ruleCode', validatorRules.ruleCode]"/>
-        </a-form-item>
-        <a-form-item
-          :labelCol="labelCol"
-          :wrapperCol="wrapperCol"
-          label="规则实现类">
-          <a-input placeholder="请输入规则实现类" v-decorator="['ruleClass', validatorRules.ruleClass]"/>
-        </a-form-item>
-        <a-form-item
-          :labelCol="labelCol"
-          :wrapperCol="wrapperCol"
-          label="规则参数">
-          <a-textarea placeholder="请输入规则参数" :rows="5" v-decorator="['ruleParams', validatorRules.ruleParams]"/>
-        </a-form-item>
-
-      </a-form>
-    </a-spin>
-  </a-modal>
-</template>
-
-<script>
-  import pick from 'lodash.pick'
-  import { httpAction } from '@/api/manage'
-  import { validateDuplicateValue } from '@/utils/util'
-
-  export default {
-    name: 'SysFillRuleModal',
-    components: {},
-    data() {
-      return {
-        title: '操作',
-        visible: false,
-        model: {},
-        labelCol: { xs: { span: 24 }, sm: { span: 5 } },
-        wrapperCol: { xs: { span: 24 }, sm: { span: 16 } },
-
-        confirmLoading: false,
-        form: this.$form.createForm(this),
-        validatorRules: {
-          ruleName: { rules: [{ required: true, message: '规则名称不能为空' }] },
-          ruleCode: {
-            rules: [
-              { required: true, message: '规则Code不能为空' },
-              { validator: (rule, value, callback) => validateDuplicateValue('sys_fill_rule', 'rule_code', value, this.model.id, callback) }
-            ]
-          },
-          ruleClass: { rules: [{ required: true, message: '规则实现类不能为空' }] },
-          ruleParams: {
-            rules: [{
-              validator: (rule, value, callback) => {
-
-                try {
-                  let json = JSON.parse(value)
-                  if (json instanceof Array) {
-                    callback('只能传递JSON对象，不能传递JSON数组')
-                  } else if (json instanceof Object) {
-                    callback()
-                  } else {
-                    callback('请输入JSON字符串')
-                  }
-                } catch {
-                  callback('请输入JSON字符串')
-                }
-              }
-            }]
-          },
-        },
-        url: {
-          add: '/sys/fillRule/add',
-          edit: '/sys/fillRule/edit',
-        },
-      }
-    },
-    computed: {
-      disabledCode() {
-        return !!this.model.id
-      }
-    },
-    created() {
-    },
-    methods: {
-      add() {
-        this.edit({})
-      },
-      edit(record) {
-        this.form.resetFields()
-        this.model = Object.assign({}, record)
-        this.visible = true
-        this.$nextTick(() => {
-          this.form.setFieldsValue(pick(this.model, 'ruleName', 'ruleCode', 'ruleClass', 'ruleParams'))
-        })
-      },
-      close() {
-        this.$emit('close')
-        this.visible = false
-      },
-      handleOk() {
-        const that = this
-        // 触发表单验证
-        this.form.validateFields((err, values) => {
-          if (!err) {
-            that.confirmLoading = true
-            let httpUrl = this.url.add, method = 'post'
-            if (this.model.id) {
-              httpUrl = this.url.edit
-              method = 'put'
-            }
-
-            let formData = Object.assign(this.model, values)
-            httpAction(httpUrl, formData, method).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()
-            })
-          }
-        })
-      },
-      handleCancel() {
-        this.close()
-      }
-
-    }
-  }
-</script>
-
-<style lang="less" scoped>
-
-</style>
\ No newline at end of file
diff --git a/jshERP-web/src/views/system/modules/SysPositionModal.vue b/jshERP-web/src/views/system/modules/SysPositionModal.vue
deleted file mode 100644
index fa9f8b47..00000000
--- a/jshERP-web/src/views/system/modules/SysPositionModal.vue
+++ /dev/null
@@ -1,180 +0,0 @@
-<template>
-  <a-modal
-    :title="title"
-    :width="800"
-    :visible="visible"
-    :maskClosable="false"
-    :confirmLoading="confirmLoading"
-    @ok="handleOk"
-    @cancel="handleCancel"
-    cancelText="关闭">
-
-    <a-spin :spinning="confirmLoading">
-      <a-form :form="form">
-
-        <a-form-item
-          :labelCol="labelCol"
-          :wrapperCol="wrapperCol"
-          label="职务编码">
-          <a-input placeholder="请输入职务编码" v-decorator="['code', validatorRules.code]"/>
-        </a-form-item>
-        <a-form-item
-          :labelCol="labelCol"
-          :wrapperCol="wrapperCol"
-          label="职务名称">
-          <a-input placeholder="请输入职务名称" v-decorator="['name', validatorRules.name]"/>
-        </a-form-item>
-        <a-form-item
-          :labelCol="labelCol"
-          :wrapperCol="wrapperCol"
-          label="职级"
-        >
-          <j-dict-select-tag
-            placeholder="请选择职级"
-            :triggerChange="true"
-            dictCode="position_rank"
-            v-decorator="['postRank', validatorRules.postRank]"
-          />
-        </a-form-item>
-        <!--<a-form-item-->
-        <!--  :labelCol="labelCol"-->
-        <!--  :wrapperCol="wrapperCol"-->
-        <!--  label="公司id">-->
-        <!--  <a-input placeholder="请输入公司id" v-decorator="['companyId', {}]"/>-->
-        <!--</a-form-item>-->
-
-      </a-form>
-    </a-spin>
-  </a-modal>
-</template>
-
-<script>
-  import pick from 'lodash.pick'
-  import { httpAction } from '@/api/manage'
-  import { duplicateCheck } from '@/api/api'
-  import JDictSelectTag from '@/components/dict/JDictSelectTag'
-
-  let validatorCodeTimer = null
-
-  export default {
-    name: 'SysPositionModal',
-    components: { JDictSelectTag },
-    data() {
-      return {
-        title: '操作',
-        visible: false,
-        model: {},
-        labelCol: {
-          xs: { span: 24 },
-          sm: { span: 5 },
-        },
-        wrapperCol: {
-          xs: { span: 24 },
-          sm: { span: 16 },
-        },
-        confirmLoading: false,
-        form: this.$form.createForm(this),
-        validatorRules: {
-          code: {
-            rules: [
-              { required: true, message: '请输入职务编码' },
-              {
-                validator: (rule, value, callback) => {
-                  // 函数消抖的简单实现，防止一段时间内发送多次请求
-                  if (validatorCodeTimer) {
-                    // 停止上次开启的定时器
-                    clearTimeout(validatorCodeTimer)
-                  }
-                  validatorCodeTimer = setTimeout(() => {
-                    duplicateCheck({
-                      tableName: 'sys_position',
-                      fieldName: 'code',
-                      fieldVal: value,
-                      dataId: this.model.id
-                    }).then((res) => {
-                      if (res.success) {
-                        callback()
-                      } else {
-                        callback(res.message)
-                      }
-                    }).catch(console.error)
-                  }, 300)
-                }
-              }
-            ]
-          },
-          name: { rules: [{ required: true, message: '请输入职务名称' }] },
-          postRank: { rules: [{ required: true, message: '请选择职级' }] },
-        },
-        url: {
-          add: '/sys/position/add',
-          edit: '/sys/position/edit',
-        },
-      }
-    },
-    created() {
-    },
-    methods: {
-      add() {
-        this.edit({})
-      },
-      edit(record) {
-        this.form.resetFields()
-        this.model = Object.assign({}, record)
-        this.visible = true
-        this.$nextTick(() => {
-          this.form.setFieldsValue(pick(this.model,
-            'code',
-            'name',
-            'postRank',
-            // 'companyId'
-          ))
-        })
-      },
-      close() {
-        this.$emit('close')
-        this.visible = false
-      },
-      handleOk() {
-        const that = this
-        // 触发表单验证
-        this.form.validateFields((err, values) => {
-          if (!err) {
-            that.confirmLoading = true
-            let httpurl = ''
-            let method = ''
-            if (!this.model.id) {
-              httpurl += this.url.add
-              method = 'post'
-            } else {
-              httpurl += this.url.edit
-              method = 'put'
-            }
-
-            let formData = Object.assign(this.model, values)
-            httpAction(httpurl, formData, method).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()
-            })
-          }
-        })
-      },
-      handleCancel() {
-        this.close()
-      },
-
-
-    }
-  }
-</script>
-
-<style lang="less" scoped>
-
-</style>
\ No newline at end of file
diff --git a/jshERP-web/src/views/system/modules/SysUserAgentModal.vue b/jshERP-web/src/views/system/modules/SysUserAgentModal.vue
deleted file mode 100644
index 2c40ac43..00000000
--- a/jshERP-web/src/views/system/modules/SysUserAgentModal.vue
+++ /dev/null
@@ -1,181 +0,0 @@
-<template>
-  <a-modal
-    :title="title"
-    :width="800"
-    :visible="visible"
-    :confirmLoading="confirmLoading"
-    @ok="handleOk"
-    @cancel="handleCancel"
-    cancelText="关闭">
-
-    <a-spin :spinning="confirmLoading">
-      <a-form :form="form">
-
-        <a-form-item
-          :labelCol="labelCol"
-          :wrapperCol="wrapperCol"
-          label="用户名">
-          <a-input placeholder="请输入用户名" v-decorator="['userName', {}]" readOnly/>
-        </a-form-item>
-        <a-form-item
-          :labelCol="labelCol"
-          :wrapperCol="wrapperCol"
-          label="代理人用户名">
-          <j-select-user-by-dep placeholder="请输入代理人用户名" v-decorator="['agentUserName', validatorRules.agentUserName]" :trigger-change="true"></j-select-user-by-dep>
-        </a-form-item>
-        <a-form-item
-          :labelCol="labelCol"
-          :wrapperCol="wrapperCol"
-          label="代理开始时间">
-          <j-date
-            v-decorator="[ 'startTime', validatorRules.startTime]"
-            :trigger-change="true"
-            :showTime="true"
-            date-format="YYYY-MM-DD HH:mm:ss"
-            style="width:100%"
-            placeholder="请选择开始时间" >
-          </j-date>
-        </a-form-item>
-        <a-form-item
-          :labelCol="labelCol"
-          :wrapperCol="wrapperCol"
-          label="代理结束时间">
-          <j-date
-            v-decorator="[ 'endTime', validatorRules.endTime]"
-            :trigger-change="true"
-            :showTime="true"
-            date-format="YYYY-MM-DD HH:mm:ss"
-            style="width:100%"
-            placeholder="请选择结束时间" >
-          </j-date>
-        </a-form-item>
-        <a-form-item
-          :labelCol="labelCol"
-          :wrapperCol="wrapperCol"
-          label="状态">
-          <a-radio-group class="fontiframe" name="radioGroup" v-decorator="[ 'status', {}]">
-            <a-radio class="radioGroup" value="1">有效</a-radio>
-            <a-radio class="radioGroup" value="0">无效</a-radio>
-          </a-radio-group>
-        </a-form-item>
-
-      </a-form>
-
-    </a-spin>
-  </a-modal>
-</template>
-
-<script>
-  import pick from 'lodash.pick'
-  import { httpAction, getAction } from '@/api/manage'
-  import JDate from '@/components/jeecg/JDate.vue';
-  import JSelectUserByDep from '@/components/jeecgbiz/JSelectUserByDep'
-
-  export default {
-    name: "SysUserAgentModal",
-    components: {
-      JDate,
-      JSelectUserByDep
-    },
-    data () {
-      return {
-        title:"操作",
-        visible: false,
-        model: {},
-        labelCol: {
-          xs: { span: 24 },
-          sm: { span: 5 },
-        },
-        wrapperCol: {
-          xs: { span: 24 },
-          sm: { span: 16 },
-        },
-        username:"",
-        confirmLoading: false,
-        form: this.$form.createForm(this),
-        validatorRules:{
-          agentUserName:{rules: [{ required: true, message: '请输入代理人用户名!' }]},
-          startTime:{rules: [{ required: true, message: '请输入代理开始时间!' }]},
-          endTime:{rules: [{ required: true, message: '请输入代理结束时间!' }]},
-        },
-        url: {
-          add: "/sys/sysUserAgent/add",
-          edit: "/sys/sysUserAgent/edit",
-          queryByUserName:"/sys/sysUserAgent/queryByUserName",
-        },
-      }
-    },
-    created () {
-    },
-    methods: {
-      agentSettings(username){
-        this.username = username;
-        this.init();
-
-      },
-      init () {
-        var params = {userName:this.username};//查询条件
-        getAction(this.url.queryByUserName,params).then((res)=>{
-          if(res.success){
-            console.log("获取流程节点信息",res);
-            this.edit (res.result);
-          }else{
-            this.edit({userName:this.username,status:"0"});
-          }
-        })
-      },
-      edit (record) {
-        this.form.resetFields();
-        this.model = Object.assign({}, record);
-        this.visible = true;
-        this.$nextTick(() => {
-          this.form.setFieldsValue(pick(this.model,'userName','agentUserName','status','startTime','endTime'))
-        });
-      },
-      close () {
-        this.$emit('close');
-        this.visible = false;
-      },
-      handleOk () {
-        const that = this;
-        // 触发表单验证
-        this.form.validateFields((err, values) => {
-          if (!err) {
-            that.confirmLoading = true;
-            let httpurl = '';
-            let method = '';
-            if(!this.model.id){
-              httpurl+=this.url.add;
-              method = 'post';
-            }else{
-              httpurl+=this.url.edit;
-               method = 'put';
-            }
-            let formData = Object.assign(this.model, values);
-            httpAction(httpurl,formData,method).then((res)=>{
-              if(res.success){
-                that.$message.success(res.message);
-                //this.init();
-              }else{
-                that.$message.warning(res.message);
-              }
-            }).finally(() => {
-              that.confirmLoading = false;
-              that.close();
-            })
-
-
-
-          }
-        })
-      },
-      handleCancel () {
-        this.close()
-      }
-    }
-  }
-</script>
-
-<style scoped>
-
-</style>
\ No newline at end of file
diff --git a/jshERP-web/src/views/system/modules/UserModal.vue b/jshERP-web/src/views/system/modules/UserModal.vue
index 1bb97081..21b85346 100644
--- a/jshERP-web/src/views/system/modules/UserModal.vue
+++ b/jshERP-web/src/views/system/modules/UserModal.vue
@@ -53,7 +53,6 @@
 <script>
   import pick from 'lodash.pick'
   import Vue from 'vue'
-  import departWindow from './DepartWindow'
   import JSelectPosition from '@/components/jeecgbiz/JSelectPosition'
   import { ACCESS_TOKEN } from "@/store/mutation-types"
   import { getAction } from '@/api/manage'
@@ -65,7 +64,6 @@
     name: "UserModal",
     components: {
       JImageUpload,
-      departWindow,
       JSelectPosition
     },
     data () {
diff --git a/jshERP-web/src/views/system/modules/UserRecycleBinModal.vue b/jshERP-web/src/views/system/modules/UserRecycleBinModal.vue
deleted file mode 100644
index 0e042207..00000000
--- a/jshERP-web/src/views/system/modules/UserRecycleBinModal.vue
+++ /dev/null
@@ -1,193 +0,0 @@
-<template>
-  <a-modal
-    :width="1000"
-    :title="title"
-    :visible="innerVisible"
-    @cancel="handleCancel"
-    cancelText="关闭"
-    :okButtonProps="{style:{display:'none'}}"
-  >
-    <a-alert type="info" showIcon style="margin-bottom: 16px;">
-      <template slot="message">
-        <span>已选择</span>
-        <a style="font-weight: 600;padding: 0 4px;">{{ selectedRowKeys.length }}</a>
-        <span>项</span>
-        <template v-if="selectedRowKeys.length>0">
-          <a-divider type="vertical"/>
-          <a @click="handleClearSelection">清空选择</a>
-          <a-divider type="vertical"/>
-          <a @click="handleRevertBatch">批量还原</a>
-          <a-divider type="vertical"/>
-          <a @click="handleDeleteBatch">批量删除</a>
-        </template>
-      </template>
-    </a-alert>
-
-    <a-table
-      ref="table"
-      rowKey="id"
-      size="middle"
-      bordered
-      :columns="columns"
-      :loading="loading"
-      :dataSource="dataSource"
-      :pagination="false"
-      :rowSelection="{selectedRowKeys, onChange: handleTableSelectChange}"
-    >
-
-      <!-- 显示头像 -->
-      <template slot="avatarslot" slot-scope="text, record, index">
-        <div class="anty-img-wrap">
-          <a-avatar shape="square" :src="url.getAvatar(record.avatar)" icon="user"/>
-        </div>
-      </template>
-
-      <span slot="action" slot-scope="text, record">
-        <a @click="handleRevert([record.id])"><a-icon type="redo"/> 还原用户</a>
-        <a-divider type="vertical"/>
-        <a @click="handleDelete([record.id])"><a-icon type="delete"/> 彻底删除</a>
-      </span>
-    </a-table>
-
-  </a-modal>
-</template>
-
-<script>
-  import { putAction,deleteAction,getFileAccessHttpUrl } from "@/api/manage"
-
-  // 高度封装的请求，请务必使用 superRequest.call(this,{}) 的方式调用
-  function superRequest(options) {
-    this.loading = !!options.loading
-    options.promise.then(res => {
-      if (res.success && typeof options.success === 'function') {
-        options.success(res)
-      } else {
-        throw new Error(res.message)
-      }
-    }).catch(e => {
-      console.error('查询已删除的用户失败：', e)
-      this.$message.warning('查询已删除的用户失败：' + (e.message || e))
-    }).finally(() => {
-      this.loading = false
-    })
-  }
-
-  export default {
-    name: 'UserRecycleBinModal',
-    props: {
-      visible: {
-        type: Boolean,
-        default: false
-      },
-    },
-    data() {
-      return {
-        title: '用户回收站',
-        loading: false,
-        innerVisible: false,
-        selectedRowKeys: [],
-        dataSource: [],
-        columns: [
-          { title: '#', align: 'center', key: 'rowIndex', width: 80, customRender: (t, r, i) => i + 1 },
-          { title: '账号', align: 'center', dataIndex: 'username' },
-          { title: '姓名', align: 'center', dataIndex: 'realname', },
-          { title: '头像', align: 'center', dataIndex: 'avatar', scopedSlots: { customRender: 'avatarslot' } },
-          { title: '部门', align: 'center', dataIndex: 'orgCode' },
-          { title: '操作', align: 'center', dataIndex: 'action', width: 200, scopedSlots: { customRender: 'action' } }
-        ],
-        url: {
-          getAvatar: (path) => getFileAccessHttpUrl(`${path}`),
-          // 回收站操作，get = 获取列表；put = 取回；delete = 彻底删除
-          recycleBin: '/sys/user/recycleBin',
-          putRecycleBin: '/sys/user/putRecycleBin',
-          deleteRecycleBin: '/sys/user/deleteRecycleBin',
-        },
-      }
-    },
-    watch: {
-      visible: {
-        immediate: true,
-        handler(val) {
-          if (val) {
-            this.loadData()
-          }
-          this.innerVisible = val
-        }
-      },
-      innerVisible(val) {
-        this.$emit('update:visible', val)
-      },
-    },
-    methods: {
-      loadData() {
-        superRequest.call(this, {
-          loading: true,
-          promise: this.$http.get(this.url.recycleBin),
-          success: res => this.dataSource = res.result
-        })
-      },
-      handleOk() {
-        this.loadData()
-        this.$emit('ok')
-      },
-      handleCancel() {
-        this.innerVisible = false
-      },
-      // 还原用户
-      handleRevert(userIds) {
-        this.$confirm({
-          title: '恢复用户',
-          content: `您确定要恢复这 ${userIds.length} 个用户吗？`,
-          centered: true,
-          onOk: () => {
-            putAction(this.url.putRecycleBin,{userIds:userIds.join(',')}).then((res)=>{
-              if(res.success){
-                this.handleOk()
-                this.handleClearSelection()
-                this.$message.success(`还原 ${userIds.length} 个用户成功！`)
-              }
-            })
-          }
-        })
-      },
-      // 彻底删除用户
-      handleDelete(userIds) {
-        this.$confirm({
-          title: '彻底删除用户',
-          content: (<div>
-            <p>您确定要彻底删除这 {userIds.length} 个用户吗？</p>
-            <p style="color:red;">注意：彻底删除后将无法恢复，请谨慎操作！</p>
-          </div>),
-          centered: true,
-          onOk: () => {
-            var that = this;
-            deleteAction(that.url.deleteRecycleBin, {userIds: userIds.join(',')}).then((res) => {
-              if (res.success) {
-                this.loadData()
-                this.handleClearSelection()
-                this.$message.success(`彻底删除 ${userIds.length} 个用户成功！`)
-              } else {
-                that.$message.warning(res.message);
-              }
-            });
-          },
-        })
-      },
-      handleRevertBatch() {
-        this.handleRevert(this.selectedRowKeys)
-      },
-      handleDeleteBatch() {
-        this.handleDelete(this.selectedRowKeys)
-      },
-      handleClearSelection() {
-        this.handleTableSelectChange([], [])
-      },
-      handleTableSelectChange(selectedRowKeys, selectionRows) {
-        this.selectedRowKeys = selectedRowKeys
-        this.selectionRows = selectionRows
-      },
-    }
-  }
-</script>
-
-<style lang="less" scoped></style>
\ No newline at end of file
diff --git a/jshERP-web/src/views/system/modules/UserRoleModal.vue b/jshERP-web/src/views/system/modules/UserRoleModal.vue
deleted file mode 100644
index b9f04de6..00000000
--- a/jshERP-web/src/views/system/modules/UserRoleModal.vue
+++ /dev/null
@@ -1,200 +0,0 @@
-<template>
-  <a-drawer
-    :title="title"
-    :maskClosable="true"
-    width=650
-    placement="right"
-    :closable="true"
-    @close="close"
-    :visible="visible"
-    style="height: calc(100% - 55px);overflow: auto;padding-bottom: 53px;">
-
-    <a-form>
-      <a-form-item label='所拥有的权限'>
-        <a-tree
-          checkable
-          @check="onCheck"
-          :checkedKeys="checkedKeys"
-          :treeData="treeData"
-          @expand="onExpand"
-          @select="onTreeNodeSelect"
-          :selectedKeys="selectedKeys"
-          :expandedKeys="expandedKeysss"
-          :checkStrictly="checkStrictly">
-          <span slot="hasDatarule" slot-scope="{slotTitle,ruleFlag}">
-            {{ slotTitle }}<a-icon v-if="ruleFlag" type="align-left" style="margin-left:5px;color: red;"></a-icon>
-          </span>
-        </a-tree>
-      </a-form-item>
-    </a-form>
-
-    <div class="drawer-bootom-button">
-      <a-dropdown style="float: left" :trigger="['click']" placement="topCenter">
-        <a-menu slot="overlay">
-          <a-menu-item key="1" @click="switchCheckStrictly(1)">父子关联</a-menu-item>
-          <a-menu-item key="2" @click="switchCheckStrictly(2)">取消关联</a-menu-item>
-          <a-menu-item key="3" @click="checkALL">全部勾选</a-menu-item>
-          <a-menu-item key="4" @click="cancelCheckALL">取消全选</a-menu-item>
-          <a-menu-item key="5" @click="expandAll">展开所有</a-menu-item>
-          <a-menu-item key="6" @click="closeAll">合并所有</a-menu-item>
-        </a-menu>
-        <a-button>
-          树操作 <a-icon type="up" />
-        </a-button>
-      </a-dropdown>
-      <a-popconfirm title="确定放弃编辑？" @confirm="close" okText="确定" cancelText="取消">
-        <a-button style="margin-right: .8rem">取消</a-button>
-      </a-popconfirm>
-      <a-button @click="handleSubmit(false)" type="primary" :loading="loading" ghost style="margin-right: 0.8rem">仅保存</a-button>
-      <a-button @click="handleSubmit(true)" type="primary" :loading="loading">保存并关闭</a-button>
-    </div>
-
-    <role-datarule-modal ref="datarule"></role-datarule-modal>
-
-  </a-drawer>
-
-</template>
-<script>
-  import {queryTreeListForRole,queryRolePermission,saveRolePermission} from '@/api/api'
-  import RoleDataruleModal from './RoleDataruleModal.vue'
-
-  export default {
-    name: "RoleModal",
-    components:{
-      RoleDataruleModal
-    },
-    data(){
-      return {
-        roleId:"",
-        treeData: [],
-        defaultCheckedKeys:[],
-        checkedKeys:[],
-        expandedKeysss:[],
-        allTreeKeys:[],
-        autoExpandParent: true,
-        checkStrictly: true,
-        title:"角色权限配置",
-        visible: false,
-        loading: false,
-        selectedKeys:[]
-      }
-    },
-    methods: {
-      onTreeNodeSelect(id){
-        if(id && id.length>0){
-          this.selectedKeys = id
-        }
-        this.$refs.datarule.show(this.selectedKeys[0],this.roleId)
-      },
-      onCheck (o) {
-        if(this.checkStrictly){
-          this.checkedKeys = o.checked;
-        }else{
-          this.checkedKeys = o
-        }
-      },
-      show(roleId){
-        this.roleId=roleId
-        this.visible = true;
-      },
-      close () {
-        this.reset()
-        this.$emit('close');
-        this.visible = false;
-      },
-      onExpand(expandedKeys){
-        this.expandedKeysss = expandedKeys;
-        this.autoExpandParent = false
-      },
-      reset () {
-        this.expandedKeysss = []
-        this.checkedKeys = []
-        this.defaultCheckedKeys = []
-        this.loading = false
-      },
-      expandAll () {
-        this.expandedKeysss = this.allTreeKeys
-      },
-      closeAll () {
-        this.expandedKeysss = []
-      },
-      checkALL () {
-        this.checkedKeys = this.allTreeKeys
-      },
-      cancelCheckALL () {
-        //this.checkedKeys = this.defaultCheckedKeys
-        this.checkedKeys = []
-      },
-      switchCheckStrictly (v) {
-        if(v==1){
-          this.checkStrictly = false
-        }else if(v==2){
-          this.checkStrictly = true
-        }
-      },
-      handleCancel () {
-        this.close()
-      },
-      handleSubmit(exit) {
-        let that = this;
-        let params =  {
-          roleId:that.roleId,
-          permissionIds:that.checkedKeys.join(","),
-          lastpermissionIds:that.defaultCheckedKeys.join(","),
-        };
-        that.loading = true;
-        console.log("请求参数：",params);
-        saveRolePermission(params).then((res)=>{
-          if(res.success){
-            that.$message.success(res.message);
-            that.loading = false;
-            if (exit) {
-              that.close()
-            }
-          }else {
-            that.$message.error(res.message);
-            that.loading = false;
-            if (exit) {
-              that.close()
-            }
-          }
-          this.loadData();
-        })
-      },
-      loadData(){
-        queryTreeListForRole().then((res) => {
-          this.treeData = res.result.treeList
-          this.allTreeKeys = res.result.ids
-          queryRolePermission({roleId:this.roleId}).then((res)=>{
-              this.checkedKeys = [...res.result];
-              this.defaultCheckedKeys = [...res.result];
-              this.expandedKeysss = this.allTreeKeys;
-              console.log(this.defaultCheckedKeys)
-          })
-        })
-      }
-    },
-  watch: {
-    visible () {
-      if (this.visible) {
-        this.loadData();
-      }
-    }
-  }
-  }
-
-</script>
-<style lang="less" scoped>
-  .drawer-bootom-button {
-    position: absolute;
-    bottom: 0;
-    width: 100%;
-    border-top: 1px solid #e8e8e8;
-    padding: 10px 16px;
-    text-align: right;
-    left: 0;
-    background: #fff;
-    border-radius: 0 0 2px 2px;
-  }
-
-</style>
\ No newline at end of file
diff --git a/jshERP-web/src/views/user/Register.vue b/jshERP-web/src/views/user/Register.vue
index efa796bd..eed0be61 100644
--- a/jshERP-web/src/views/user/Register.vue
+++ b/jshERP-web/src/views/user/Register.vue
@@ -155,9 +155,9 @@
       handlePasswordLevel(rule, value, callback) {
 
         let level = 0
-        let reg = /^(?=.*[a-zA-Z])(?=.*\d)(?=.*[~!@#$%^&*()_+`\-={}:";'<>?,./]).{8,}$/;
+        let reg = /^(?=.*[a-z])(?=.*\d).{8,}$/;
         if (!reg.test(value)) {
-          callback(new Error('密码由8位数字、大小写字母和特殊符号组成!'))
+          callback(new Error('密码由8位数字、小写字母组成!'))
         }
         // 判断这个字符串中有没有数字
         if (/[0-9]/.test(value)) {
diff --git a/jshERP-web/src/views/user/RegisterResult.vue b/jshERP-web/src/views/user/RegisterResult.vue
deleted file mode 100644
index 389e140c..00000000
--- a/jshERP-web/src/views/user/RegisterResult.vue
+++ /dev/null
@@ -1,52 +0,0 @@
-<template>
-  <result
-    :isSuccess="true"
-    :content="false"
-    :title="email">
-
-    <template slot="action">
-      <a-button size="large" style="margin-left: 8px" @click="goHomeHandle">返回首页</a-button>
-    </template>
-
-  </result>
-</template>
-
-<script>
-  import Result from '@/views/result/Result'
-
-  export default {
-    name: "RegisterResult",
-    components: {
-      Result
-    },
-    data () {
-      return {
-        form: {},
-      }
-    },
-    computed: {
-      email () {
-        let v = this.form ? this.form.username || this.form.mobile : ' XXX '
-        let title = `你的账户：${v} 注册成功`
-        this.username = v;
-        return title
-      }
-    },
-    created () {
-      this.form = this.$route.params
-    },
-    methods: {
-      goHomeHandle () {
-        let params={};
-        params.username=this.form.username;
-        params.password=this.form.password;
-        console.log(params);
-        this.$router.push({name:'login',params})
-      },
-    }
-  }
-</script>
-
-<style scoped>
-
-</style>
\ No newline at end of file