前端升级到2.4.3版本

jero-web/README.md

@@ -1,7 +1,7 @@
 Jero-Web
 ====
 
-当前最新版本： 2.4.2
+当前最新版本： 2.4.3
 
 Overview
 ----

jero-web/package.json

@@ -1,6 +1,6 @@
 {
   "name": "jero-web",
-  "version": "2.4.2",
+  "version": "2.4.3",
   "private": true,
   "scripts": {
     "pre": "cnpm install || yarn --registry https://registry.npm.taobao.org || npm install --registry https://registry.npm.taobao.org ",

jero-web/src/api/api.js

@@ -38,6 +38,7 @@ const queryPermissionRule = (params)=>getAction("/sys/permission/queryPermission
 
 // 部门管理
 const queryDepartTreeList = (params)=>getAction("/sys/sysDepart/queryTreeList",params);
+const queryDepartTreeSync = (params)=>getAction("/sys/sysDepart/queryDepartTreeSync",params);
 const queryIdTree = (params)=>getAction("/sys/sysDepart/queryIdTree",params);
 const queryParentName   = (params)=>getAction("/sys/sysDepart/queryParentName",params);
 const searchByKeywords   = (params)=>getAction("/sys/sysDepart/searchBy",params);
@@ -52,7 +53,6 @@ const saveDeptRolePermission = (params)=>postAction("/sys/sysDepartPermission/sa
 const queryMyDepartTreeList = (params)=>getAction("/sys/sysDepart/queryMyDeptTreeList",params);
 
 //日志管理
-//const getLogList = (params)=>getAction("/sys/log/page",params);
 const deleteLog = (params)=>deleteAction("/sys/log/delete",params);
 const deleteLogList = (params)=>deleteAction("/sys/log/deleteBatch",params);
 
@@ -123,6 +123,7 @@ export {
   getPermissionRuleList,
   queryPermissionRule,
   queryDepartTreeList,
+  queryDepartTreeSync,
   queryIdTree,
   queryParentName,
   searchByKeywords,

jero-web/src/components/_util/Area.js

@@ -12,13 +12,13 @@ export default class Area {
     let arr = []
     const province = pcaa['86']
     Object.keys(province).map(key=>{
-      arr.push({id:key, text:province[key], pid:'86'});
+      arr.push({id:key, text:province[key], pid:'86', index:1});
       const city = pcaa[key];
       Object.keys(city).map(key2=>{
-        arr.push({id:key2, text:city[key2], pid:key});
+        arr.push({id:key2, text:city[key2], pid:key, index:2});
         const qu = pcaa[key2];
         Object.keys(qu).map(key3=>{
-          arr.push({id:key3, text:qu[key3], pid:key2});
+          arr.push({id:key3, text:qu[key3], pid:key2, index:3});
         })
       })
     })
@@ -45,33 +45,34 @@ export default class Area {
       return ''
     }
     let arr = []
-    this.getAreaBycode(code,arr);
+    this.getAreaBycode(code, arr, 3);
     return arr.join('/')
   }
 
   getRealCode(code){
     let arr = []
-    this.getPcode(code, arr)
+    this.getPcode(code, arr, 3)
     return arr;
   }
 
-  getPcode(id, arr){
+  getPcode(id, arr, index){
     for(let item of this.all){
-      if(item.id === id){
+      if(item.id === id && item.index == index){
         arr.unshift(id)
         if(item.pid != '86'){
-          this.getPcode(item.pid,arr)
+          this.getPcode(item.pid, arr, --index)
         }
       }
     }
   }
 
-  getAreaBycode(code,arr){
-    //console.log("this.all.length",this.all)
+  getAreaBycode(code, arr, index){
     for(let item of this.all){
-      if(item.id === code){
+      if(item.id === code && item.index == index){
         arr.unshift(item.text);
-        this.getAreaBycode(item.pid,arr)
+        if(item.pid != '86'){
+          this.getAreaBycode(item.pid, arr, --index)
+        }
       }
     }
   }

jero-web/src/components/jero/JEditor.vue

@@ -128,6 +128,9 @@
               this.reload()
             }
           })
+          //update--begin--autor:liusq-----date:20210316------for：富文本编辑器tab父组件可能导致的赋值问题------
+          this.reload()
+          //update--end--autor:liusq-----date:20210316------for：富文本编辑器tab父组件可能导致的赋值问题------
         }else{
           //update--begin--autor:wangshuai-----date:20200724------for：富文本编辑器切换tab无法修改------
           let tabLayout = getVmParentByName(this, 'TabLayout')

jero-web/src/components/jero/JModal/index.vue

@@ -8,10 +8,11 @@
     v-on="$listeners"
     @ok="handleOk"
     @cancel="handleCancel"
+    destroyOnClose
   >
 
     <slot></slot>
-
+    <!--有设置标题-->
     <template v-if="!isNoTitle" slot="title">
       <a-row class="j-modal-title-row" type="flex">
         <a-col class="left">
@@ -22,6 +23,14 @@
         </a-col>
       </a-row>
     </template>
+     <!--没有设置标题-->
+    <template v-else slot="title">
+      <a-row class="j-modal-title-row" type="flex">
+        <a-col v-if="switchFullscreen" class="right" @click="toggleFullscreen">
+          <a-button class="ant-modal-close ant-modal-close-x" ghost type="link" :icon="fullscreenButtonIcon"/>
+        </a-col>
+      </a-row>
+    </template>
 
     <!-- 处理 scopedSlots -->
     <template v-for="slotName of scopedSlotsKeys" :slot="slotName">
@@ -161,7 +170,6 @@
 
 <style lang="less">
   .j-modal-box {
-
     &.fullscreen {
       top: 0;
       left: 0;
@@ -217,6 +225,14 @@
         }
       }
     }
+
+    &.no-title{
+      .ant-modal-header {
+        padding: 0px 24px;
+        border-bottom: 0px !important;
+      }
+    }
+
   }
 
   @media (max-width: 767px) {

jero-web/src/components/jero/JVxeTable/mixins/JVxeCellMixins.js

@@ -298,7 +298,11 @@ export function dispatchEvent({cell, $event}, className, handler) {
         handler(element[0])
       } else {
         // 模拟触发点击事件
-        element[0].dispatchEvent($event)
+        console.log($event)
+        if($event){
+          console.log("$event===>",$event)
+          element[0].dispatchEvent($event)
+        }
       }
     }
   }, 10)

jero-web/src/components/jero/JVxeTable/utils/vxeUtils.js

@@ -141,6 +141,33 @@ export async function validateFormAndTables(form, cases, autoJumpTab) {
   return dataMap
 }
 
+/**
+ * 一次性验证主表单和所有的次表单
+ * @param form 主表单 form 对象
+ * @param cases 接收一个数组，每项都是一个JVxeTable实例
+ * @param autoJumpTab
+ * @returns {Promise<any>}
+ * @author sunjianlei
+ */
+export async function validateFormModelAndTables(form,formData, cases, autoJumpTab) {
+  if (!(form && typeof form.validate === 'function')) {
+    throw `form 参数需要的是一个form对象，而传入的却是${typeof form}`
+  }
+  let dataMap = {}
+  let values = await new Promise((resolve, reject) => {
+    // 验证主表表单
+    form.validate((valid,obj) => {
+      valid ?resolve(formData): reject({error: VALIDATE_FAILED, originError: valid})
+    })
+  })
+  Object.assign(dataMap, {formValue: values})
+  // 验证所有子表的表单
+  let subData = await validateTables(cases, autoJumpTab)
+  // 合并最终数据
+  dataMap = Object.assign(dataMap, {tablesValue: subData})
+  return dataMap
+}
+
 /**
  * 验证并获取一个或多个表格的所有值
  *

jero-web/src/components/jero/modal/JPopupOnlReport.vue

@@ -341,9 +341,15 @@
       },
       combineRowKey(record){
         let res = ''
-         Object.keys(record).forEach(key=>{
-           res+=record[key]
-         })
+        Object.keys(record).forEach(key=>{
+          //update-begin---author:liusq   Date:20210203  for：pop选择器列主键问题 issues/I29P9Q------------
+          if(key=='id'){
+            res=record[key]+res
+          }else{
+            res+=record[key]
+          }
+          //update-end---author:liusq     Date:20210203  for：pop选择器列主键问题 issues/I29P9Q------------
+        })
         if(res.length>50){
           res = res.substring(0,50)
         }

jero-web/src/components/jerobiz/JSelectDepart.vue

@@ -93,8 +93,6 @@
             return data.length > 0 ? data[0].id : ''
           }).join(',')
         }
-        //update-end-author:lvdandan date:20200513 for:TESTA-438 部门选择组件自定义返回值，数据无法回填
-        this.backDeparInfo()
       },
       //返回选中的部门信息
       backDeparInfo(){
@@ -127,6 +125,7 @@
           this.departIds = idstr
         }
         this.$emit("change", value)
+        this.backDeparInfo()
       },
       getDepartNames(){
         return this.departNames

jero-web/src/components/jerobiz/modal/JSelectDepartModal.vue

@@ -167,7 +167,9 @@
         if(!this.checkedKeys || this.checkedKeys.length==0){
           this.$emit("ok",'')
         }else{
-          this.$emit("ok",this.checkedRows,this.checkedKeys.join(","))
+          let checkRow = this.getCheckedRows(this.checkedKeys)
+          let keyStr = this.checkedKeys.join(",")
+          this.$emit("ok", checkRow, keyStr)
         }
         this.handleClear()
       },

jero-web/src/components/jerobiz/thirdApp/JThirdAppButton.vue

@@ -0,0 +1,214 @@
+<template>
+  <span v-if="syncToApp || syncToLocal">
+    <j-third-app-dropdown v-if="enabledTypes.wechatEnterprise" type="wechatEnterprise" name="企微" v-bind="bindAttrs" v-on="bindEvents"/>
+    <j-third-app-dropdown v-if="enabledTypes.dingtalk" type="dingtalk" name="钉钉" v-bind="bindAttrs" v-on="bindEvents"/>
+  </span>
+  <span v-else>未设置任何同步方向</span>
+</template>
+
+<script>
+import { getAction } from '@/api/manage'
+import { cloneObject } from '@/utils/util'
+import JThirdAppDropdown from './JThirdAppDropdown'
+
+const backEndUrl = {
+  // 获取启用的第三方App
+  getEnabledType: '/sys/thirdApp/getEnabledType',
+  // 企业微信
+  wechatEnterprise: {
+    user: '/sys/thirdApp/sync/wechatEnterprise/user',
+    depart: '/sys/thirdApp/sync/wechatEnterprise/depart',
+  },
+  // 钉钉
+  dingtalk: {
+    user: '/sys/thirdApp/sync/dingtalk/user',
+    depart: '/sys/thirdApp/sync/dingtalk/depart',
+  }
+}
+
+export default {
+  name: 'JThirdAppButton',
+  components: {JThirdAppDropdown},
+  props: {
+    // 同步类型，可以是 user、depart
+    bizType: {
+      type: String,
+      required: true,
+    },
+    // 是否允许同步到第三方APP
+    syncToApp: Boolean,
+    // 是否允许第三方APP同步到本地
+    syncToLocal: Boolean,
+    // 选择的行
+    selectedRowKeys: Array,
+  },
+  data() {
+    return {
+      enabledTypes: {},
+      attrs: {
+        dingtalk: {},
+      },
+    }
+  },
+  computed: {
+    bindAttrs() {
+      return {
+        syncToApp: this.syncToApp,
+        syncToLocal: this.syncToLocal
+      }
+    },
+    bindEvents() {
+      return {
+        'to-app': this.onToApp,
+        'to-local': this.onToLocal,
+      }
+    },
+  },
+  created() {
+    this.loadEnabledTypes()
+  },
+  methods: {
+    handleMenuClick() {
+      console.log(arguments)
+    },
+    onToApp(e) {
+      this.doSync(e.type, '/toApp')
+    },
+    onToLocal(e) {
+      this.doSync(e.type, '/toLocal')
+    },
+    // 获取启用的第三方App
+    async loadEnabledTypes() {
+      this.enabledTypes = await loadEnabledTypes()
+    },
+    // 开始同步第三方App
+    doSync(type, direction) {
+      let urls = backEndUrl[type]
+      if (!(urls && urls[this.bizType])) {
+        console.warn('配置出错')
+        return
+      }
+      let url = urls[this.bizType] + direction
+
+      let selectedRowKeys = this.selectedRowKeys
+      let content = '确定要开始同步全部数据吗？可能花费较长时间！'
+      if (Array.isArray(selectedRowKeys) && selectedRowKeys.length > 0) {
+        content = `确定要开始同步这 ${selectedRowKeys.length} 项吗？`
+      } else {
+        selectedRowKeys = []
+      }
+      return new Promise((resolve, reject) => {
+        let model = this.$confirm({
+          title: '同步',
+          content,
+          onOk: () => {
+            model.update({
+              keyboard: false,
+              okText: '同步中…',
+              cancelButtonProps: {props: {disabled: true}}
+            })
+            return getAction(url, {
+              ids: selectedRowKeys.join(',')
+            }).then(res => {
+              let options = null
+              if (res.result) {
+                options = {
+                  width: 600,
+                  title: res.message,
+                  content: (h) => {
+                    let nodes
+                    let successInfo = [
+                      `成功信息如下：`,
+                      this.renderTextarea(h, res.result.successInfo.map((v, i) => `${i + 1}. ${v}`).join('\n')),
+                    ]
+                    if (res.success) {
+                      nodes = [
+                        ...successInfo,
+                        h('br'),
+                        `无失败信息！`,
+                      ]
+                    } else {
+                      nodes = [
+                        `失败信息如下：`,
+                        this.renderTextarea(h, res.result.failInfo.map((v, i) => `${i + 1}. ${v}`).join('\n')),
+                        h('br'),
+                        ...successInfo,
+                      ]
+                    }
+                    return nodes
+                  }
+                }
+              }
+              if (res.success) {
+                if (options != null) {
+                  this.$success(options)
+                } else {
+                  this.$message.success(res.message)
+                }
+                this.$emit('sync-ok')
+              } else {
+                if (options != null) {
+                  this.$warning(options)
+                } else {
+                  this.$message.warning(res.message)
+                }
+                this.$emit('sync-error')
+              }
+            }).catch(() => model.destroy()).finally(() => {
+              resolve()
+              this.$emit('sync-finally', {
+                type,
+                direction,
+                isToApp: direction === '/toApp',
+                isToLocal: direction === '/toLocal',
+              })
+            })
+          },
+          onCancel() {
+            resolve()
+          },
+        })
+      })
+    },
+    renderTextarea(h, value) {
+      return h('a-textarea', {
+        props: {
+          value: value,
+          readOnly: true,
+          autosize: {minRows: 5, maxRows: 10},
+        },
+        style: {
+          // 关闭textarea的自动换行，使其可以左右滚动
+          whiteSpace: 'pre',
+          overflow: 'auto',
+        }
+      })
+    }
+  },
+}
+
+// 启用了哪些第三方App（在此缓存）
+let enabledTypes = null
+
+// 获取启用的第三方App
+export async function loadEnabledTypes() {
+  // 获取缓存
+  if (enabledTypes != null) {
+    return cloneObject(enabledTypes)
+  } else {
+    let {success, result} = await getAction(backEndUrl.getEnabledType)
+    if (success) {
+      // 在此缓存
+      enabledTypes = cloneObject(result)
+      return result
+    } else {
+      console.warn('getEnabledType查询失败：', res)
+    }
+  }
+  return {}
+}
+</script>
+
+<style scoped>
+
+</style>

jero-web/src/components/jerobiz/thirdApp/JThirdAppDropdown.vue

@@ -0,0 +1,34 @@
+<template>
+  <a-dropdown v-if="syncToApp && syncToLocal">
+    <a-button type="primary" icon="sync">同步{{name}}</a-button>
+    <a-menu slot="overlay" @click="handleMenuClick">
+      <a-menu-item v-if="syncToApp" key="to-app">同步到{{name}}</a-menu-item>
+      <a-menu-item v-if="syncToLocal" key="to-local">同步到本地</a-menu-item>
+    </a-menu>
+  </a-dropdown>
+  <a-button v-else-if="syncToApp" type="primary" icon="sync" @click="handleMenuClick({key:'to-app'})">同步{{name}}</a-button>
+  <a-button v-else type="primary" icon="sync" @click="handleMenuClick({key:'to-local'})">同步{{name}}到本地</a-button>
+</template>
+
+<script>
+
+/* JThirdAppButton 的子组件，不可单独使用 */
+export default {
+  name: 'JThirdAppDropdown',
+  props: {
+    type: String,
+    name: String,
+    syncToApp: Boolean,
+    syncToLocal: Boolean,
+  },
+  methods: {
+    handleMenuClick(event) {
+      this.$emit(event.key, {type: this.type})
+    },
+  },
+}
+</script>
+
+<style scoped>
+
+</style>

jero-web/src/components/page/GlobalHeader.vue

@@ -50,7 +50,6 @@
   import UserMenu from '../tools/UserMenu'
   import SMenu from '../menu/'
   import Logo from '../tools/Logo'
-
   import { mixin } from '@/utils/mixin.js'
 
   export default {

jero-web/src/main.js

@@ -22,7 +22,6 @@ import 'ant-design-vue/dist/antd.less'; // or 'ant-design-vue/dist/antd.less'
 import '@/permission' // permission control
 import '@/utils/filter' // base filtermybatis-plus
 import Print from 'vue-print-nb-jeecg'
-/*import '@babel/polyfill'*/
 import preview from 'vue-photo-preview'
 import 'vue-photo-preview/dist/skin.css'
 import SSO from '@/cas/sso.js'
@@ -49,7 +48,9 @@ import '@/assets/less/JAreaLinkage.less'
 import VueAreaLinkage from 'vue-area-linkage'
 import '@/components/jero/JVxeTable/install'
 import '@/components/JVxeCells/install'
-
+//表单验证
+import { rules } from '@/utils/rules'
+Vue.prototype.rules = rules
 Vue.config.productionTip = false
 Vue.use(Storage, config.storageOptions)
 Vue.use(Antd)

jero-web/src/mixins/JEditableTableModelMixin.js

@@ -0,0 +1,191 @@
+import JEditableTable from '@/components/jero/JEditableTable'
+import { VALIDATE_NO_PASSED, getRefPromise,validateFormModelAndTables} from '@/utils/JEditableTableUtil'
+import { httpAction, getAction } from '@/api/manage'
+
+export const JEditableTableModelMixin = {
+  components: {
+    JEditableTable
+  },
+  data() {
+    return {
+      title: '操作',
+      visible: false,
+      confirmLoading: false,
+      model:{},
+      labelCol: {
+        xs: { span: 24 },
+        sm: { span: 6 }
+      },
+      wrapperCol: {
+        xs: { span: 24 },
+        sm: { span: 18 }
+      }
+    }
+  },
+  methods: {
+
+    /** 获取所有的editableTable实例 */
+    getAllTable() {
+      if (!(this.refKeys instanceof Array)) {
+        throw this.throwNotArray('refKeys')
+      }
+      let values = this.refKeys.map(key => getRefPromise(this, key))
+      return Promise.all(values)
+    },
+
+    /** 遍历所有的JEditableTable实例 */
+    eachAllTable(callback) {
+      // 开始遍历
+      this.getAllTable().then(tables => {
+        tables.forEach((item, index) => {
+          if (typeof callback === 'function') {
+            callback(item, index)
+          }
+        })
+      })
+    },
+    /** 当点击新增按钮时调用此方法 */
+    add() {
+      //update-begin-author:lvdandan date:20201113 for:LOWCOD-1049 JEditaTable,子表默认添加一条数据，addDefaultRowNum设置无效 #1930
+      return new Promise((resolve) => {
+        this.tableReset();
+        resolve();
+      }).then(() => {
+        if (typeof this.addBefore === 'function') this.addBefore()
+        // 默认新增空数据
+        let rowNum = this.addDefaultRowNum
+        if (typeof rowNum !== 'number') {
+          rowNum = 1
+          console.warn('由于你没有在 data 中定义 addDefaultRowNum 或 addDefaultRowNum 不是数字，所以默认添加一条空数据，如果不想默认添加空数据，请将定义 addDefaultRowNum 为 0')
+        }
+        this.eachAllTable((item) => {
+          item.add(rowNum)
+        })
+        if (typeof this.addAfter === 'function') this.addAfter(this.model)
+        this.edit(this.model)
+      })
+      //update-end-author:lvdandan date:20201113 for:LOWCOD-1049 JEditaTable,子表默认添加一条数据，addDefaultRowNum设置无效 #1930
+    },
+    /** 当点击了编辑（修改）按钮时调用此方法 */
+    edit(record) {
+      if(record && '{}'!=JSON.stringify(record)&&record.id){
+        this.tableReset();
+      }
+      if (typeof this.editBefore === 'function') this.editBefore(record)
+      this.visible = true
+      this.activeKey = this.refKeys[0]
+      this.$refs.form.resetFields()
+      this.model = Object.assign({}, record)
+      if (typeof this.editAfter === 'function') this.editAfter(this.model)
+    },
+    /** 关闭弹窗，并将所有JEditableTable实例回归到初始状态 */
+    close() {
+      this.visible = false
+      this.$emit('close')
+    },
+    //清空子表table的数据
+    tableReset(){
+      this.eachAllTable((item) => {
+        item.clearRow()
+      })
+    },
+    /** 查询某个tab的数据 */
+    requestSubTableData(url, params, tab, success) {
+      tab.loading = true
+      getAction(url, params).then(res => {
+        let { result } = res
+        let dataSource = []
+        if (result) {
+          if (Array.isArray(result)) {
+            dataSource = result
+          } else if (Array.isArray(result.records)) {
+            dataSource = result.records
+          }
+        }
+        tab.dataSource = dataSource
+        typeof success === 'function' ? success(res) : ''
+      }).finally(() => {
+        tab.loading = false
+      })
+    },
+    /** 发起请求，自动判断是执行新增还是修改操作 */
+    request(formData) {
+      let url = this.url.add, method = 'post'
+      if (this.model.id) {
+        url = this.url.edit
+        method = 'put'
+      }
+      this.confirmLoading = true
+      httpAction(url, 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
+      })
+    },
+
+    /* --- handle 事件 --- */
+
+    /** ATab 选项卡切换事件 */
+    handleChangeTabs(key) {
+      // 自动重置scrollTop状态，防止出现白屏
+      getRefPromise(this, key).then(editableTable => {
+        editableTable.resetScrollTop()
+      })
+    },
+    /** 关闭按钮点击事件 */
+    handleCancel() {
+      this.close()
+    },
+    /** 确定按钮点击事件 */
+    handleOk() {
+      /** 触发表单验证 */
+      this.getAllTable().then(tables => {
+        /** 一次性验证主表和所有的次表 */
+        return validateFormModelAndTables(this.$refs.form,this.model, tables)
+      }).then(allValues => {
+        /** 一次性验证一对一的所有子表 */
+        return this.validateSubForm(allValues)
+      }).then(allValues => {
+        if (typeof this.classifyIntoFormData !== 'function') {
+          throw this.throwNotFunction('classifyIntoFormData')
+        }
+        let formData = this.classifyIntoFormData(allValues)
+        // 发起请求
+        return this.request(formData)
+      }).catch(e => {
+        if (e.error === VALIDATE_NO_PASSED) {
+          // 如果有未通过表单验证的子表，就自动跳转到它所在的tab
+          //update--begin--autor:liusq-----date:20210316------for：未通过表单验证跳转tab问题------
+          this.activeKey = e.index == null ? this.activeKey : (e.paneKey?e.paneKey:this.refKeys[e.index])
+          //update--end--autor:liusq-----date:20210316------for：未通过表单验证跳转tab问题------
+        } else {
+          console.error(e)
+        }
+      })
+    },
+    //校验所有子表表单
+    validateSubForm(allValues){
+      return new Promise((resolve) => {
+        resolve(allValues)
+      })
+    },
+    /* --- throw --- */
+
+    /** not a function */
+    throwNotFunction(name) {
+      return `${name} 未定义或不是一个函数`
+    },
+
+    /** not a array */
+    throwNotArray(name) {
+      return `${name} 未定义或不是一个数组`
+    }
+
+  }
+}

jero-web/src/mixins/JVxeTableMixin.js

@@ -53,8 +53,9 @@ export const JVxeTableMixin = {
         console.warn('由于你没有在 data 中定义 addDefaultRowNum 或 addDefaultRowNum 不是数字，所以默认添加一条空数据，如果不想默认添加空数据，请将定义 addDefaultRowNum 为 0')
       }
       this.eachAllTable((item) => {
-        item.addRows()
-        //item.add(rowNum)
+        setTimeout(()=>{
+          item.addRows()
+        }, 30)
       })
       if (typeof this.addAfter === 'function') this.addAfter(this.model)
       this.edit({})

jero-web/src/mixins/JVxeTableModelMixin.js

@@ -0,0 +1,181 @@
+import { VALIDATE_FAILED, getRefPromise, validateFormAndTables,validateFormModelAndTables} from '@/components/jero/JVxeTable/utils/vxeUtils.js'
+import { httpAction, getAction } from '@/api/manage'
+
+export const JVxeTableModelMixin = {
+  data() {
+    return {
+      title: '操作',
+      visible: false,
+      confirmLoading: false,
+      scrolling: true,
+      model: {},
+      labelCol: {
+        xs: { span: 24 },
+        sm: { span: 6 }
+      },
+      wrapperCol: {
+        xs: { span: 24 },
+        sm: { span: 18 }
+      }
+    }
+  },
+  methods: {
+
+    /** 获取所有的JVxeTable实例 */
+    getAllTable() {
+      if (!(this.refKeys instanceof Array)) {
+        throw this.throwNotArray('refKeys')
+      }
+      let values = this.refKeys.map(key => getRefPromise(this, key))
+      return Promise.all(values)
+    },
+
+    /** 遍历所有的JVxeTable实例 */
+    eachAllTable(callback) {
+      // 开始遍历
+      this.getAllTable().then(tables => {
+        console.log("tables",tables)
+        tables.forEach((item, index) => {
+          if (typeof callback === 'function') {
+            callback(item, index)
+          }
+        })
+      })
+    },
+
+    /** 当点击新增按钮时调用此方法 */
+    add() {
+      if (typeof this.addBefore === 'function') this.addBefore()
+      // 默认新增空数据
+      let rowNum = this.addDefaultRowNum
+      if (typeof rowNum !== 'number') {
+        rowNum = 1
+        console.warn('由于你没有在 data 中定义 addDefaultRowNum 或 addDefaultRowNum 不是数字，所以默认添加一条空数据，如果不想默认添加空数据，请将定义 addDefaultRowNum 为 0')
+      }
+      this.eachAllTable((item) => {
+        //update-begin-author:taoyan date:20210315 for: 一对多jvex 默认几行不好使了 LOWCOD-1349
+        setTimeout(()=>{
+          item.addRows()
+        }, 30)
+        //update-end-author:taoyan date:20210315 for: 一对多jvex 默认几行不好使了 LOWCOD-1349
+      })
+      if (typeof this.addAfter === 'function') this.addAfter(this.model)
+      this.edit(this.model)
+    },
+    /** 当点击了编辑（修改）按钮时调用此方法 */
+    edit(record) {
+      if (typeof this.editBefore === 'function') this.editBefore(record)
+      this.visible = true
+      this.activeKey = this.refKeys[0]
+      this.$refs.form.resetFields()
+      this.model = Object.assign({}, record)
+      if (typeof this.editAfter === 'function') this.editAfter(this.model)
+    },
+    /** 关闭弹窗，并将所有JVxeTable实例回归到初始状态 */
+    close() {
+      this.visible = false
+      this.eachAllTable((item) => {
+        item._remove()
+      })
+      this.$emit('close')
+    },
+
+    /** 查询某个tab的数据 */
+    requestSubTableData(url, params, tab, success) {
+      tab.loading = true
+      getAction(url, params).then(res => {
+        let { result } = res
+        let dataSource = []
+        if (result) {
+          if (Array.isArray(result)) {
+            dataSource = result
+          } else if (Array.isArray(result.records)) {
+            dataSource = result.records
+          }
+        }
+        tab.dataSource = dataSource
+        typeof success === 'function' ? success(res) : ''
+      }).finally(() => {
+        tab.loading = false
+      })
+    },
+    /** 发起请求，自动判断是执行新增还是修改操作 */
+    request(formData) {
+      let url = this.url.add, method = 'post'
+      if (this.model.id) {
+        url = this.url.edit
+        method = 'put'
+      }
+      this.confirmLoading = true
+      console.log("formData===>",formData);
+      httpAction(url, 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
+      })
+    },
+
+    /* --- handle 事件 --- */
+
+    /** ATab 选项卡切换事件 */
+    handleChangeTabs(key) {
+      // 自动重置scrollTop状态，防止出现白屏
+      getRefPromise(this, key).then(vxeTable => {
+        vxeTable.resetScrollTop()
+      })
+    },
+    /** 关闭按钮点击事件 */
+    handleCancel() {
+      this.close()
+    },
+    /** 确定按钮点击事件 */
+    handleOk() {
+      /** 触发表单验证 */
+      this.getAllTable().then(tables => {
+        /** 一次性验证主表和所有的次表 */
+        return validateFormModelAndTables(this.$refs.form,this.model, tables)
+      }).then(allValues => {
+        /** 一次性验证一对一的所有子表 */
+        return this.validateSubForm(allValues)
+      }).then(allValues => {
+        if (typeof this.classifyIntoFormData !== 'function') {
+          throw this.throwNotFunction('classifyIntoFormData')
+        }
+        let formData = this.classifyIntoFormData(allValues)
+        // 发起请求
+        return this.request(formData)
+      }).catch(e => {
+        if (e.error === VALIDATE_FAILED) {
+          // 如果有未通过表单验证的子表，就自动跳转到它所在的tab
+          this.activeKey = e.index == null ? this.activeKey : this.refKeys[e.index]
+        } else {
+          console.error(e)
+        }
+      })
+    },
+//校验所有子表表单
+    validateSubForm(allValues){
+      return new Promise((resolve) => {
+        resolve(allValues)
+      })
+    },
+    /* --- throw --- */
+
+    /** not a function */
+    throwNotFunction(name) {
+      return `${name} 未定义或不是一个函数`
+    },
+
+    /** not a array */
+    throwNotArray(name) {
+      return `${name} 未定义或不是一个数组`
+    }
+
+  }
+}

jero-web/src/mixins/JeroListMixin.js

@@ -65,7 +65,7 @@ export const JeroListMixin = {
       let head = {'X-Access-Token': Vue.ls.get(ACCESS_TOKEN)}
       let tenantid = Vue.ls.get(TENANT_ID)
       if(tenantid){
-        head['tenant_id'] = tenantid
+        head['tenant-id'] = tenantid
       }
       return head;
     }
@@ -175,7 +175,9 @@ export const JeroListMixin = {
           onOk: function () {
             that.loading = true;
             deleteAction(that.url.deleteBatch, {ids: ids}).then((res) => {
-              if (res.success) {
+              if (res.success){
+                //重新计算分页问题
+                that.reCalculatePage(that.selectedRowKeys.length)
                 that.$message.success(res.message);
                 that.loadData();
                 that.onClearSelected();
@@ -197,6 +199,8 @@ export const JeroListMixin = {
       var that = this;
       deleteAction(that.url.delete, {id: id}).then((res) => {
         if (res.success) {
+          //重新计算分页问题
+          that.reCalculatePage(1)
           that.$message.success(res.message);
           that.loadData();
         } else {
@@ -204,6 +208,17 @@ export const JeroListMixin = {
         }
       });
     },
+    reCalculatePage(count){
+      //总数量-count
+      let total=this.ipagination.total-count;
+      //获取删除后的分页数
+      let currentIndex=Math.ceil(total/this.ipagination.pageSize);
+      //删除后的分页数<所在当前页
+      if(currentIndex<this.ipagination.current){
+        this.ipagination.current=currentIndex;
+      }
+      console.log('currentIndex',currentIndex)
+    },
     handleEdit: function (record) {
       this.$refs.modalForm.edit(record);
       this.$refs.modalForm.title = "编辑";
@@ -216,7 +231,6 @@ export const JeroListMixin = {
     },
     handleTableChange(pagination, filters, sorter) {
       //分页、排序、筛选变化时触发
-      //TODO 筛选
       if (Object.keys(sorter).length > 0) {
         this.isorter.column = sorter.field;
         this.isorter.order = "ascend" == sorter.order ? "asc" : "desc"

jero-web/src/utils/JEditableTableUtil.js

@@ -78,6 +78,37 @@ export function validateFormAndTables(form, cases) {
 
 }
 
+/**
+ * 一次性验证主表单和所有的次表单(新版本)
+ * @param form 主表单 form 对象
+ * @param cases 接收一个数组，每项都是一个JEditableTable实例
+ * @returns {Promise<any>}
+ * @author sunjianlei
+ */
+export function validateFormModelAndTables(form,values, cases) {
+
+  if (!(form && typeof form.validate === 'function')) {
+    throw `form 参数需要的是一个form对象，而传入的却是${typeof form}`
+  }
+  let options = {}
+  return new Promise((resolve, reject) => {
+    // 验证主表表单
+    form.validate((valid,obj) => {
+      valid ?resolve(values):reject({ error: VALIDATE_NO_PASSED })
+    })
+  }).then(values => {
+    Object.assign(options, { formValue: values })
+    // 验证所有子表的表单
+    return validateTables(cases)
+  }).then(all => {
+    Object.assign(options, { tablesValue: all })
+    return Promise.resolve(options)
+  }).catch(error => {
+    return Promise.reject(error)
+  })
+
+}
+
 /**
  * 验证并获取一个或多个表格的所有值
  * @param cases 接收一个数组，每项都是一个JEditableTable实例

jero-web/src/utils/authFilter.js

@@ -9,10 +9,8 @@ export function disabledAuthFilter(code,formData) {
 }
 
 function nodeDisabledAuth(code,formData){
-  console.log("页面权限禁用--NODE--开始");
   let permissionList = [];
   try {
-    console.log("页面权限禁用--NODE--开始",formData);
     if (formData) {
       let bpmList = formData.permissionList;
       permissionList = bpmList.filter(item=>item.type=='2')
@@ -53,7 +51,6 @@ function nodeDisabledAuth(code,formData){
 }
 
 function globalDisabledAuth(code){
-  console.log("全局页面禁用权限--Global--开始");
 
   let permissionList = [];
   let allPermissionList = [];
@@ -106,7 +103,6 @@ function globalDisabledAuth(code){
   }else{
     for (let item2 of permissionList) {
       if(code === item2.action){
-        console.log("全局页面权限解除禁用--Global--生效");
         gFlag = false;
       }
     }

jero-web/src/utils/hasPermission.js

@@ -4,7 +4,6 @@ const hasPermission = {
     install (Vue, options) {
           Vue.directive('has', {
             inserted: (el, binding, vnode)=>{
-                console.log("页面权限控制----");
                 //console.time()
                 //节点权限处理，如果命中则不进行全局权限处理
                 if(!filterNodePermission(el, binding, vnode)){
@@ -66,7 +65,6 @@ export function filterNodePermission(el, binding, vnode) {
  * 全局权限控制
  */
 export function filterGlobalPermission(el, binding, vnode) {
-  console.log("全局页面权限--Global--");
 
   let permissionList = [];
   let allPermissionList = [];

jero-web/src/utils/request.js

@@ -104,7 +104,7 @@ service.interceptors.request.use(config => {
   if (!tenantid) {
     tenantid = 0;
   }
-  config.headers[ 'tenant_id' ] = tenantid
+  config.headers[ 'tenant-id' ] = tenantid
   //update-end-author:taoyan date:2020707 for:多租户
   if(config.method=='get'){
     if(config.url.indexOf("sys/dict/getDictItems")<0){

jero-web/src/utils/rules.js

@@ -0,0 +1,110 @@
+const validateMobile = (rule, value, callback) => {
+  let reg = /^1(3|4|5|7|8)\d{9}$/
+  if (!reg.test(value)) {
+    callback('请输入正确手机号')
+  } else {
+    callback()
+  }
+}
+const validateEn = (rule, value, callback) => {
+  let reg = /^[_a-zA-Z0-9]+$/
+  let reg2 = /^.{4,18}$/
+  // 长度为6到18个字符
+  if (value !== '' && !reg.test(value)) {
+    callback('只允许字母、数字、下划线')
+  } else if (value !== '' && !reg2.test(value)) {
+    callback('长度6到18个字符')
+  } else {
+    callback()
+  }
+}
+export const rules = {
+  mobile: [{
+    required: true,
+    message: '请输入手机号',
+    trigger: 'blur'
+  }, { validator: validateMobile, trigger: 'blur' }],
+  userName: [{
+    required: true, message: '请输入用户名', trigger: 'blur'
+  }, { validator: validateEn }],
+  email: [
+    { required: false, type: 'email', message: '邮箱格式不正确', trigger: 'blur' }
+  ],
+  // 验证自然数
+  naturalNumber: /^(([0-9]*[1-9][0-9]*)|(0+))$/,
+  naturalNumberMsg: '请输入自然数',
+  // 英文
+  english: /^.[A-Za-z]+$/,
+  englishMsg: '请输入英文字符',
+  // 座机
+  telephone: /^\d{3}-\d{7,8}|\d{4}-\d{7,8}$/,
+  telephoneMsg: '请输入正确的座机号',
+  // 银行卡号码
+  bankCard: /^[1-9]\d{9,19}$/,
+  bankCardMsg: '请输入正确的银行卡号码',
+  // 证件号码
+  IDNumber: /^[a-z0-9A-Z]{0,50}$/,
+  IDNumberMsg: '请输入正确的证件号码',
+  // 身份证号码,包括15位和18位的
+  IDCard: /(^[1-9]\d{5}(18|19|([23]\d))\d{2}((0[1-9])|(10|11|12))(([0-2][1-9])|10|20|30|31)\d{3}[0-9Xx]$)|(^[1-9]\d{7}((0[1-9])|(10|11|12))(([0-2][1-9])|10|20|30|31)\d{3}$)/,
+  IDCardMsg: '请输入正确的身份证号码',
+  // QQ号码
+  qq: /^[1-9]\d{4,11}$/,
+  qqMsg: '请输入正确的QQ号码',
+  // 网址, 仅支持http和https开头的
+  url: /^(http|https):\/\/[\w\-_]+(\.[\w\-_]+)+([\w\-.,@?^=%&:/~+#]*[\w\-@?^=%&/~+#])?$/,
+  urlMsg: '请输入以http和https开头的网址',
+  // 0到20位的英文字符和数字
+  enNum0to20: /^[a-z0-9A-Z]{0,20}$/,
+  enNum0to20Msg: '请输入20位以内的英文字符和数字',
+  // 2到100位的中英文字符和空格
+  cnEnSpace2to100: /^[a-zA-Z\u4E00-\u9FA5\s*]{2,100}$/,
+  cnEnSpace2to100Msg: '请输入2到100位的中英文字符和空格',
+  // 数字和换行符
+  numLinefeed: /^[0-9\n*]+$/,
+  numLinefeedMsg: '请输入数字和换行符',
+  // 255位以内的字符
+  char0to255: /^.{0,255}$/,
+  char0to255Msg: '请输入255位以内的字符',
+  required: function(min, max) {
+    let rule = [{ required: true, message: '', trigger: 'blur' }]
+    if (min) {
+      let r = { min: min, message: '最小长度' + min + '位字符' }
+      rule.push(r)
+    }
+    if (max) {
+      let m = { max: max, message: '最大长度' + max + '位字符' }
+      rule.push(m)
+    }
+    return rule
+  },
+  select: function() {
+    let rule = [{ required: true, message: '', trigger: 'change' }]
+    return rule
+  },
+  checked: function(min, max) {
+    let rule = [{ required: true, type: 'array', message: '', trigger: 'change' }]
+    if (min) {
+      let r = { type: 'array', min: min, message: '最少选择' + min + '项' }
+      rule.push(r)
+    }
+    if (max) {
+      let m = { type: 'array', max: max, message: '最多选择' + max + '项' }
+      rule.push(m)
+    }
+    return rule
+  }
+}
+/**
+ * @description 排序值验证，排序值不可以大于255
+ */
+export const validateOrder = function(rule, value, callback) {
+  if (parseInt(value) > 255) {
+    return callback(new Error('排序值不可以大于255'))
+  } else {
+    callback()
+  }
+}
+
+
+

jero-web/src/utils/util.js

@@ -146,7 +146,6 @@ function  generateChildRouters (data) {
       component: componentPath,
       //component: resolve => require(['@/' + component+'.vue'], resolve),
       hidden:item.hidden,
-      //component:()=> import(`@/views/${item.component}.vue`),
       meta: {
         title:item.meta.title ,
         icon: item.meta.icon,

jero-web/src/views/demo/JVXETableDemo.vue

@@ -10,6 +10,10 @@
         <j-vxe-demo2/>
       </a-tab-pane>
 
+      <a-tab-pane tab="联动示例" key="3" forceRender>
+        <j-vxe-demo3/>
+      </a-tab-pane>
+
     </a-tabs>
   </a-card>
 </template>
@@ -17,6 +21,7 @@
 <script>
   import JVxeDemo1 from '@views/demo/JVxeDemo/JVxeDemo1'
   import JVxeDemo2 from '@views/demo/JVxeDemo/JVxeDemo2'
+  import JVxeDemo3 from '@views/demo/JVxeDemo/JVxeDemo3'
 
   export default {
     name: 'JVXETableDemo',

jero-web/src/views/demo/JVxeDemo/JVxeDemo3.vue

@@ -0,0 +1,182 @@
+<template>
+  <j-vxe-table
+    ref="vTable"
+    toolbar
+    row-number
+    row-selection
+    keep-source
+    :height="484"
+    :dataSource="dataSource"
+    :columns="columns"
+    :linkage-config="linkageConfig"
+  />
+</template>
+
+<script>
+import { JVXETypes } from '@/components/jero/JVxeTable'
+
+export default {
+  name: 'JVxeDemo3',
+  data() {
+    return {
+      // 联动配置
+      linkageConfig: [
+        {requestData: this.requestData, key: 's1'},
+        // 可配置多个联动
+        {requestData: this.loadData, key: 'level1',},
+      ],
+      columns: [
+        {
+          title: '性别',
+          key: 'sex',
+          type: JVXETypes.select,
+          dictCode: 'sex',
+          width: '180px',
+          placeholder: '请选择${title}',
+        },
+        {
+          title: '省/直辖市/自治区',
+          key: 's1',
+          type: JVXETypes.select,
+          width: '180px',
+          placeholder: '请选择${title}',
+          // 联动字段（即下一级的字段）
+          linkageKey: 's2',
+        },
+        {
+          title: '市',
+          key: 's2',
+          type: JVXETypes.select,
+          width: '180px',
+          placeholder: '请选择${title}',
+          // 联动字段（即下一级的字段）
+          linkageKey: 's3',
+        },
+        {
+          title: '县/区',
+          key: 's3',
+          type: JVXETypes.select,
+          width: '180px',
+          options: [],
+          placeholder: '请选择${title}',
+        },
+        {
+          title: '一级',
+          key: 'level1',
+          type: JVXETypes.select,
+          width: '180px',
+          placeholder: '请选择${title}',
+          // 联动字段（即下一级的字段）
+          linkageKey: 'level2',
+        },
+        {
+          title: '二级',
+          key: 'level2',
+          type: JVXETypes.select,
+          width: '180px',
+          placeholder: '请选择${title}',
+          // 联动字段（即下一级的字段）
+          linkageKey: 'level3',
+        },
+        {
+          title: '三级',
+          key: 'level3',
+          type: JVXETypes.select,
+          width: '180px',
+          placeholder: '请选择${title}',
+        }
+      ],
+      dataSource: [
+        {sex: '1', s1: '110000', s2: '110100', s3: '110101', level1: '1', level2: '3', level3: '7'},
+        {sex: '2', s1: '130000', s2: '130300', s3: '130303', level1: '2', level2: '6', level3: '14'},
+      ],
+      // 模拟数据
+      mockData: [
+        {text: '北京市', value: '110000', parent: ''},
+        {text: '天津市', value: '120000', parent: ''},
+        {text: '河北省', value: '130000', parent: ''},
+        {text: '上海市', value: '310000', parent: ''},
+
+        {text: '北京市', value: '110100', parent: '110000'},
+        {text: '天津市市', value: '120100', parent: '120000'},
+        {text: '石家庄市', value: '130100', parent: '130000'},
+        {text: '唐山市', value: '130200', parent: '130000'},
+        {text: '秦皇岛市', value: '130300', parent: '130000'},
+        {text: '上海市', value: '310100', parent: '310000'},
+
+        {text: '东城区', value: '110101', parent: '110100'},
+        {text: '西城区', value: '110102', parent: '110100'},
+        {text: '朝阳区', value: '110105', parent: '110100'},
+        {text: '和平区', value: '120101', parent: '120100'},
+        {text: '河东区', value: '120102', parent: '120100'},
+        {text: '河西区', value: '120103', parent: '120100'},
+        {text: '黄浦区', value: '310101', parent: '310100'},
+        {text: '徐汇区', value: '310104', parent: '310100'},
+        {text: '长宁区', value: '310105', parent: '310100'},
+        {text: '长安区', value: '130102', parent: '130100'},
+        {text: '桥西区', value: '130104', parent: '130100'},
+        {text: '新华区', value: '130105', parent: '130100'},
+        {text: '路南区', value: '130202', parent: '130200'},
+        {text: '路北区', value: '130203', parent: '130200'},
+        {text: '古冶区', value: '130204', parent: '130200'},
+        {text: '海港区', value: '130302', parent: '130300'},
+        {text: '山海关区', value: '130303', parent: '130300'},
+        {text: '北戴河区', value: '130304', parent: '130300'},
+      ],
+      mockData1: [
+        {id: '1', name: '图书馆', parentId: '0'},
+        {id: '2', name: '电影院', parentId: '0'},
+
+        {id: '3', name: '一楼', parentId: '1'},
+        {id: '4', name: '二楼', parentId: '1'},
+        {id: '5', name: '中影星美', parentId: '2'},
+        {id: '6', name: '万达国际', parentId: '2'},
+
+        {id: '7', name: '技术图书', parentId: '3'},
+        {id: '8', name: '财务图书', parentId: '3'},
+        {id: '9', name: '儿童图书', parentId: '4'},
+        {id: '10', name: '励志图书', parentId: '4'},
+        {id: '11', name: '1号厅', parentId: '5'},
+        {id: '12', name: '2号厅', parentId: '5'},
+        {id: '13', name: 'I-MAX厅', parentId: '6'},
+        {id: '14', name: '3D厅', parentId: '6'},
+      ],
+    }
+  },
+  methods: {
+    /**
+     * 模拟从后台查询数据
+     */
+    requestData(parent) {
+      return new Promise((resolve, reject) => {
+        let data = this.mockData.filter(i => i.parent === parent)
+        setTimeout(() => {
+          resolve(data)
+        }, 500)
+      })
+    },
+
+    // 模拟加载数据，模拟数据格式不同的情况下如何组装数据
+    async loadData(parent) {
+      return new Promise((resolve, reject) => {
+        let parentId = parent === '' ? '0' : parent
+        let data = this.mockData1.filter(i => i.parentId === parentId)
+        data = data.map(item => {
+          return {
+            // 必须包含以下两个字段
+            value: item.id,
+            text: item.name,
+          }
+        })
+        setTimeout(() => {
+          resolve(data)
+        }, 500)
+      })
+    },
+  }
+}
+</script>
+
+<style scoped>
+
+</style>

jero-web/src/views/demo/JeroOrderModalForJVexTable.vue

@@ -0,0 +1,312 @@
+<template>
+  <a-modal
+    :title="title"
+    :width="1200"
+    :visible="visible"
+    :destroyOnClose="true"
+    :maskClosable="false"
+    :confirmLoading="confirmLoading"
+    @ok="handleOk"
+    @cancel="handleCancel">
+
+    <a-spin :spinning="confirmLoading">
+      <a-form-model ref="form" :label-col="labelCol" :wrapper-col="wrapperCol"  :model="model" >
+        <!-- 主表单区域 -->
+        <a-row class="form-row" :gutter="0">
+          <a-col :lg="8">
+            <a-form-model-item  label="订单号" prop="orderCode" :rules="[{ required: true, message: '请输入订单号!' }]">
+              <a-input placeholder="请输入订单号" v-model="model.orderCode"/>
+            </a-form-model-item>
+          </a-col>
+          <a-col :lg="8">
+            <a-form-model-item  label="订单类型">
+              <a-select placeholder="请选择订单类型" v-model="model.ctype">
+                <a-select-option value="1">国内订单</a-select-option>
+                <a-select-option value="2">国际订单</a-select-option>
+              </a-select>
+            </a-form-model-item>
+          </a-col>
+          <a-col :lg="8">
+            <a-form-model-item  label="订单日期">
+              <a-date-picker showTime valueFormat="YYYY-MM-DD HH:mm:ss" style="width: 100%" v-model="model.orderDate"/>
+            </a-form-model-item>
+          </a-col>
+        </a-row>
+        <a-row class="form-row" :gutter="0">
+          <a-col :lg="8">
+            <a-form-model-item  label="订单金额">
+              <a-input-number placeholder="请输入订单金额" style="width: 100%" v-model="model.orderMoney"/>
+            </a-form-model-item>
+          </a-col>
+          <a-col :lg="8">
+            <a-form-model-item  label="订单备注">
+              <a-input placeholder="请输入订单备注" v-model="model.content"/>
+            </a-form-model-item>
+          </a-col>
+        </a-row>
+      </a-form-model>
+
+      <!-- 子表单区域 -->
+      <a-tabs v-model="activeKey" @change="handleChangeTabs">
+        <a-tab-pane tab="客户信息" key="1" :forceRender="true">
+          <j-vxe-table
+            ref="editableTable1"
+            toolbar
+            row-number
+            row-selection
+            keep-source
+            :height="300"
+            :loading="table1.loading"
+            :dataSource="table1.dataSource"
+            :columns="table1.columns"
+            style="margin-top: 8px;"/>
+
+        </a-tab-pane>
+
+        <a-tab-pane tab="机票信息" key="2" :forceRender="true">
+          <j-vxe-table
+            ref="editableTable2"
+            toolbar
+            row-number
+            row-selection
+            keep-source
+            :height="300"
+            :loading="table2.loading"
+            :dataSource="table2.dataSource"
+            :columns="table2.columns"
+            style="margin-top: 8px;"/>
+        </a-tab-pane>
+      </a-tabs>
+
+    </a-spin>
+  </a-modal>
+</template>
+
+<script>
+
+  import JEditableTable from '@/components/jero/JEditableTable'
+  import { VALIDATE_FAILED, getRefPromise, validateFormModelAndTables } from '@/components/jero/JVxeTable/utils/vxeUtils'
+  import { httpAction, getAction } from '@/api/manage'
+  import { JVXETypes } from '@/components/jero/JVxeTable'
+  import JDate from '@/components/jero/JDate'
+
+  export default {
+    name: 'jeroOrderModalForJvexTable',
+    components: {
+      JDate, JEditableTable
+    },
+    data() {
+      return {
+        title: '操作',
+        visible: false,
+        confirmLoading: false,
+        model: {},
+        labelCol: {
+          xs: { span: 24 },
+          sm: { span: 6 }
+        },
+        wrapperCol: {
+          xs: { span: 24 },
+          sm: { span: 24 - 6 }
+        },
+        activeKey: '1',
+        // 客户信息
+        table1: {
+          loading: false,
+          dataSource: [],
+          columns: [
+            {
+              title: '客户名',
+              key: 'name',
+              width: '24%',
+              type: JVXETypes.input,
+              defaultValue: '',
+              placeholder: '请输入${title}',
+              validateRules: [{ required: true, message: '${title}不能为空' }]
+            },
+            {
+              title: '性别',
+              key: 'sex',
+              width: '18%',
+              type: JVXETypes.select,
+              options: [ // 下拉选项
+                { title: '男', value: '1' },
+                { title: '女', value: '2' }
+              ],
+              defaultValue: '',
+              placeholder: '请选择${title}'
+            },
+            {
+              title: '身份证号',
+              key: 'idcard',
+              width: '24%',
+              type: JVXETypes.input,
+              defaultValue: '',
+              placeholder: '请输入${title}',
+              validateRules: [{
+                pattern: '^\\d{6}(18|19|20)?\\d{2}(0[1-9]|1[012])(0[1-9]|[12]\\d|3[01])\\d{3}(\\d|[xX])$',
+                message: '${title}格式不正确'
+              }]
+            },
+            {
+              title: '手机号',
+              key: 'telphone',
+              width: '24%',
+              type: JVXETypes.input,
+              defaultValue: '',
+              placeholder: '请输入${title}',
+              validateRules: [{
+                pattern: '^1(3|4|5|7|8)\\d{9}$',
+                message: '${title}格式不正确'
+              }]
+            }
+          ]
+        },
+        // 机票信息
+        table2: {
+          loading: false,
+          dataSource: [],
+          columns: [
+            {
+              title: '航班号',
+              key: 'ticketCode',
+              width: '40%',
+              type: JVXETypes.input,
+              defaultValue: '',
+              placeholder: '请输入${title}',
+              validateRules: [{ required: true, message: '${title}不能为空' }]
+            },
+            {
+              title: '航班时间',
+              key: 'tickectDate',
+              width: '30%',
+              type: JVXETypes.date,
+              placeholder: '请选择${title}',
+              defaultValue: ''
+            }
+          ]
+        },
+        url: {
+          add: '/test/jeroOrderMain/add',
+          edit: '/test/jeroOrderMain/edit',
+          orderCustomerList: '/test/jeroOrderMain/queryOrderCustomerListByMainId',
+          orderTicketList: '/test/jeroOrderMain/queryOrderTicketListByMainId'
+        }
+      }
+    },
+    created() {
+    },
+    methods: {
+
+      // 获取所有的editableTable实例
+      getAllTable() {
+        return Promise.all([
+          getRefPromise(this, 'editableTable1'),
+          getRefPromise(this, 'editableTable2')
+        ])
+      },
+
+      add() {
+        // 默认新增一条数据
+        this.getAllTable().then(editableTables => {
+          //editableTables[0].add()
+          //editableTables[1].add()
+        })
+        this.edit({})
+      },
+      edit(record) {
+        this.visible = true
+        this.activeKey = '1'
+        this.model = Object.assign({}, record)
+        // 加载子表数据
+        if (this.model.id) {
+          let params = { id: this.model.id }
+          this.requestTableData(this.url.orderCustomerList, params, this.table1)
+          this.requestTableData(this.url.orderTicketList, params, this.table2)
+        }
+
+      },
+      close() {
+        this.visible = false
+        this.getAllTable().then(editableTables => {
+          this.table1.dataSource=[];
+          this.table2.dataSource=[];
+        })
+        this.$emit('close')
+      },
+      /** 查询某个tab的数据 */
+      requestTableData(url, params, tab) {
+        tab.loading = true
+        getAction(url, params).then(res => {
+          tab.dataSource = res.result || []
+        }).finally(() => {
+          tab.loading = false
+        })
+      },
+      handleOk() {
+        this.validateFields()
+      },
+      handleCancel() {
+        this.close()
+      },
+      /** ATab 选项卡切换事件 */
+      handleChangeTabs(key) {
+        getRefPromise(this, `editableTable${key}`).then(editableTable => {
+          editableTable.resetScrollTop()
+        })
+      },
+
+      /** 触发表单验证 */
+      validateFields() {
+        this.getAllTable().then(tables => {
+          /** 一次性验证主表和所有的次表 */
+          return validateFormModelAndTables(this.$refs.form,this.model, tables)
+        }).then(allValues => {
+          let formData = this.classifyIntoFormData(allValues)
+          // 发起请求
+          return this.requestAddOrEdit(formData)
+        }).catch(e => {
+          if (e.error === VALIDATE_FAILED) {
+            // 如果有未通过表单验证的子表，就自动跳转到它所在的tab
+            this.activeKey = e.index == null ? this.activeKey : (e.index + 1).toString()
+          } else {
+            console.error(e)
+          }
+        })
+      },
+      /** 整理成formData */
+      classifyIntoFormData(allValues) {
+        let orderMain = Object.assign(this.model, allValues.formValue)
+        return {
+          ...orderMain, // 展开
+          jeroOrderCustomerList: allValues.tablesValue[0].tableData,
+          jeroOrderTicketList: allValues.tablesValue[1].tableData
+        }
+      },
+      /** 发起新增或修改的请求 */
+      requestAddOrEdit(formData) {
+        let url = this.url.add, method = 'post'
+        if (this.model.id) {
+          url = this.url.edit
+          method = 'put'
+        }
+        this.confirmLoading = true
+        httpAction(url, 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
+        })
+      }
+
+    }
+  }
+</script>
+
+<style scoped>
+</style>

jero-web/src/views/demo/modules/JEditableTable/JeroOrderModalForJVexTable.vue

@@ -0,0 +1,312 @@
+<template>
+  <a-modal
+    :title="title"
+    :width="1200"
+    :visible="visible"
+    :destroyOnClose="true"
+    :maskClosable="false"
+    :confirmLoading="confirmLoading"
+    @ok="handleOk"
+    @cancel="handleCancel">
+
+    <a-spin :spinning="confirmLoading">
+      <a-form-model ref="form" :label-col="labelCol" :wrapper-col="wrapperCol"  :model="model" >
+        <!-- 主表单区域 -->
+        <a-row class="form-row" :gutter="0">
+          <a-col :lg="8">
+            <a-form-model-item  label="订单号" prop="orderCode" :rules="[{ required: true, message: '请输入订单号!' }]">
+              <a-input placeholder="请输入订单号" v-model="model.orderCode"/>
+            </a-form-model-item>
+          </a-col>
+          <a-col :lg="8">
+            <a-form-model-item  label="订单类型">
+              <a-select placeholder="请选择订单类型" v-model="model.ctype">
+                <a-select-option value="1">国内订单</a-select-option>
+                <a-select-option value="2">国际订单</a-select-option>
+              </a-select>
+            </a-form-model-item>
+          </a-col>
+          <a-col :lg="8">
+            <a-form-model-item  label="订单日期">
+              <a-date-picker showTime valueFormat="YYYY-MM-DD HH:mm:ss" style="width: 100%" v-model="model.orderDate"/>
+            </a-form-model-item>
+          </a-col>
+        </a-row>
+        <a-row class="form-row" :gutter="0">
+          <a-col :lg="8">
+            <a-form-model-item  label="订单金额">
+              <a-input-number placeholder="请输入订单金额" style="width: 100%" v-model="model.orderMoney"/>
+            </a-form-model-item>
+          </a-col>
+          <a-col :lg="8">
+            <a-form-model-item  label="订单备注">
+              <a-input placeholder="请输入订单备注" v-model="model.content"/>
+            </a-form-model-item>
+          </a-col>
+        </a-row>
+      </a-form-model>
+
+      <!-- 子表单区域 -->
+      <a-tabs v-model="activeKey" @change="handleChangeTabs">
+        <a-tab-pane tab="客户信息" key="1" :forceRender="true">
+          <j-vxe-table
+            ref="editableTable1"
+            toolbar
+            row-number
+            row-selection
+            keep-source
+            :height="300"
+            :loading="table1.loading"
+            :dataSource="table1.dataSource"
+            :columns="table1.columns"
+            style="margin-top: 8px;"/>
+
+        </a-tab-pane>
+
+        <a-tab-pane tab="机票信息" key="2" :forceRender="true">
+          <j-vxe-table
+            ref="editableTable2"
+            toolbar
+            row-number
+            row-selection
+            keep-source
+            :height="300"
+            :loading="table2.loading"
+            :dataSource="table2.dataSource"
+            :columns="table2.columns"
+            style="margin-top: 8px;"/>
+        </a-tab-pane>
+      </a-tabs>
+
+    </a-spin>
+  </a-modal>
+</template>
+
+<script>
+
+  import JEditableTable from '@/components/jero/JEditableTable'
+  import { VALIDATE_FAILED, getRefPromise, validateFormModelAndTables } from '@/components/jero/JVxeTable/utils/vxeUtils'
+  import { httpAction, getAction } from '@/api/manage'
+  import { JVXETypes } from '@/components/jero/JVxeTable'
+  import JDate from '@/components/jero/JDate'
+
+  export default {
+    name: 'JeroOrderModalForJvexTable',
+    components: {
+      JDate, JEditableTable
+    },
+    data() {
+      return {
+        title: '操作',
+        visible: false,
+        confirmLoading: false,
+        model: {},
+        labelCol: {
+          xs: { span: 24 },
+          sm: { span: 6 }
+        },
+        wrapperCol: {
+          xs: { span: 24 },
+          sm: { span: 24 - 6 }
+        },
+        activeKey: '1',
+        // 客户信息
+        table1: {
+          loading: false,
+          dataSource: [],
+          columns: [
+            {
+              title: '客户名',
+              key: 'name',
+              width: '24%',
+              type: JVXETypes.input,
+              defaultValue: '',
+              placeholder: '请输入${title}',
+              validateRules: [{ required: true, message: '${title}不能为空' }]
+            },
+            {
+              title: '性别',
+              key: 'sex',
+              width: '18%',
+              type: JVXETypes.select,
+              options: [ // 下拉选项
+                { title: '男', value: '1' },
+                { title: '女', value: '2' }
+              ],
+              defaultValue: '',
+              placeholder: '请选择${title}'
+            },
+            {
+              title: '身份证号',
+              key: 'idcard',
+              width: '24%',
+              type: JVXETypes.input,
+              defaultValue: '',
+              placeholder: '请输入${title}',
+              validateRules: [{
+                pattern: '^\\d{6}(18|19|20)?\\d{2}(0[1-9]|1[012])(0[1-9]|[12]\\d|3[01])\\d{3}(\\d|[xX])$',
+                message: '${title}格式不正确'
+              }]
+            },
+            {
+              title: '手机号',
+              key: 'telphone',
+              width: '24%',
+              type: JVXETypes.input,
+              defaultValue: '',
+              placeholder: '请输入${title}',
+              validateRules: [{
+                pattern: '^1(3|4|5|7|8)\\d{9}$',
+                message: '${title}格式不正确'
+              }]
+            }
+          ]
+        },
+        // 机票信息
+        table2: {
+          loading: false,
+          dataSource: [],
+          columns: [
+            {
+              title: '航班号',
+              key: 'ticketCode',
+              width: '40%',
+              type: JVXETypes.input,
+              defaultValue: '',
+              placeholder: '请输入${title}',
+              validateRules: [{ required: true, message: '${title}不能为空' }]
+            },
+            {
+              title: '航班时间',
+              key: 'tickectDate',
+              width: '30%',
+              type: JVXETypes.date,
+              placeholder: '请选择${title}',
+              defaultValue: ''
+            }
+          ]
+        },
+        url: {
+          add: '/test/jeecgOrderMain/add',
+          edit: '/test/jeecgOrderMain/edit',
+          orderCustomerList: '/test/jeecgOrderMain/queryOrderCustomerListByMainId',
+          orderTicketList: '/test/jeecgOrderMain/queryOrderTicketListByMainId'
+        }
+      }
+    },
+    created() {
+    },
+    methods: {
+
+      // 获取所有的editableTable实例
+      getAllTable() {
+        return Promise.all([
+          getRefPromise(this, 'editableTable1'),
+          getRefPromise(this, 'editableTable2')
+        ])
+      },
+
+      add() {
+        // 默认新增一条数据
+        this.getAllTable().then(editableTables => {
+          //editableTables[0].add()
+          //editableTables[1].add()
+        })
+        this.edit({})
+      },
+      edit(record) {
+        this.visible = true
+        this.activeKey = '1'
+        this.model = Object.assign({}, record)
+        // 加载子表数据
+        if (this.model.id) {
+          let params = { id: this.model.id }
+          this.requestTableData(this.url.orderCustomerList, params, this.table1)
+          this.requestTableData(this.url.orderTicketList, params, this.table2)
+        }
+
+      },
+      close() {
+        this.visible = false
+        this.getAllTable().then(editableTables => {
+          this.table1.dataSource=[];
+          this.table2.dataSource=[];
+        })
+        this.$emit('close')
+      },
+      /** 查询某个tab的数据 */
+      requestTableData(url, params, tab) {
+        tab.loading = true
+        getAction(url, params).then(res => {
+          tab.dataSource = res.result || []
+        }).finally(() => {
+          tab.loading = false
+        })
+      },
+      handleOk() {
+        this.validateFields()
+      },
+      handleCancel() {
+        this.close()
+      },
+      /** ATab 选项卡切换事件 */
+      handleChangeTabs(key) {
+        getRefPromise(this, `editableTable${key}`).then(editableTable => {
+          editableTable.resetScrollTop()
+        })
+      },
+
+      /** 触发表单验证 */
+      validateFields() {
+        this.getAllTable().then(tables => {
+          /** 一次性验证主表和所有的次表 */
+          return validateFormModelAndTables(this.$refs.form,this.model, tables)
+        }).then(allValues => {
+          let formData = this.classifyIntoFormData(allValues)
+          // 发起请求
+          return this.requestAddOrEdit(formData)
+        }).catch(e => {
+          if (e.error === VALIDATE_FAILED) {
+            // 如果有未通过表单验证的子表，就自动跳转到它所在的tab
+            this.activeKey = e.index == null ? this.activeKey : (e.index + 1).toString()
+          } else {
+            console.error(e)
+          }
+        })
+      },
+      /** 整理成formData */
+      classifyIntoFormData(allValues) {
+        let orderMain = Object.assign(this.model, allValues.formValue)
+        return {
+          ...orderMain, // 展开
+          jeecgOrderCustomerList: allValues.tablesValue[0].tableData,
+          jeecgOrderTicketList: allValues.tablesValue[1].tableData
+        }
+      },
+      /** 发起新增或修改的请求 */
+      requestAddOrEdit(formData) {
+        let url = this.url.add, method = 'post'
+        if (this.model.id) {
+          url = this.url.edit
+          method = 'put'
+        }
+        this.confirmLoading = true
+        httpAction(url, 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
+        })
+      }
+
+    }
+  }
+</script>
+
+<style scoped>
+</style>

jero-web/src/views/demo/modules/JeroDemoModal.vue

@@ -9,78 +9,46 @@
     cancelText="关闭">
 
     <a-spin :spinning="confirmLoading">
-      <a-form :form="form">
+      <a-form-model ref="form"  :label-col="labelCol" :wrapper-col="wrapperCol"  :model="model" :rules="validatorRules">
+        <a-form-model-item label="姓名" required prop="name" hasFeedback>
+          <a-input v-model="model.name"    placeholder="请输入姓名"/>
+        </a-form-model-item>
 
-        <a-form-item
-          :labelCol="labelCol"
-          :wrapperCol="wrapperCol"
-          label="姓名"
-          hasFeedback >
-          <a-input placeholder="请输入姓名" v-decorator="['name', {}]" />
-        </a-form-item>
-        <a-form-item
-          :labelCol="labelCol"
-          :wrapperCol="wrapperCol"
-          label="关键词"
-          hasFeedback >
-          <a-input placeholder="请输入关键词" v-decorator="['keyWord', {}]" />
-        </a-form-item>
-        <a-form-item
-          :labelCol="labelCol"
-          :wrapperCol="wrapperCol"
-          label="打卡时间"
-          hasFeedback >
-          <a-date-picker showTime format="YYYY-MM-DD HH:mm:ss" v-decorator="[ 'punchTime', {}]" />
-        </a-form-item>
-        <a-form-item
-          :labelCol="labelCol"
-          :wrapperCol="wrapperCol"
-          label="性别">
-         <!-- <a-select v-decorator="['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>-->
-          <j-dict-select-tag type="radio" v-decorator="['sex', {}]" :trigger-change="true" dictCode="sex"/>
-        </a-form-item>
-        <a-form-item
-          :labelCol="labelCol"
-          :wrapperCol="wrapperCol"
-          label="年龄"
-          hasFeedback >
-          <a-input placeholder="请输入年龄" v-decorator="['age', {}]" />
-        </a-form-item>
-        <a-form-item
-          :labelCol="labelCol"
-          :wrapperCol="wrapperCol"
-          label="生日"
-          hasFeedback >
-          <a-date-picker v-decorator="[ 'birthday', {}]" />
-        </a-form-item>
-        <a-form-item
-          :labelCol="labelCol"
-          :wrapperCol="wrapperCol"
-          label="邮箱"
-          hasFeedback >
-          <a-input placeholder="请输入邮箱" v-decorator="['email', {}]" />
-        </a-form-item>
-        <a-form-item
-          :labelCol="labelCol"
-          :wrapperCol="wrapperCol"
-          label="个人简介"
-          hasFeedback >
-          <a-input placeholder="请输入个人简介" v-decorator="['content', {}]" />
-        </a-form-item>
+        <a-form-model-item label="关键词"  prop="keyWord" hasFeedback>
+          <a-input v-model="model.keyWord"    placeholder="请输入关键词"/>
+        </a-form-model-item>
 
-      </a-form>
+        <a-form-model-item label="打卡时间"  prop="punchTime" hasFeedback>
+          <a-date-picker showTime valueFormat="YYYY-MM-DD HH:mm:ss" v-model="model.punchTime" />
+        </a-form-model-item>
+
+        <a-form-model-item label="性别"  prop="sex" hasFeedback>
+          <j-dict-select-tag type="radio" v-model="model.sex"  :trigger-change="true" dictCode="sex"/>
+        </a-form-model-item>
+
+        <a-form-model-item label="年龄"  prop="age" hasFeedback>
+          <a-input placeholder="请输入年龄" v-model="model.age"/>
+        </a-form-model-item>
+
+        <a-form-model-item label="生日"  prop="age" hasFeedback>
+          <a-date-picker valueFormat="YYYY-MM-DD"  v-model="model.birthday"/>
+        </a-form-model-item>
+
+        <a-form-model-item label="邮箱"  prop="email" hasFeedback >
+          <a-input  placeholder="请输入邮箱"  v-model="model.email"/>
+        </a-form-model-item>
+
+        <a-form-model-item label="个人简介"  prop="content" hasFeedback>
+          <a-input  type="textarea" placeholder="请输入个人简介"  v-model="model.content"/>
+        </a-form-model-item>
+
+      </a-form-model>
     </a-spin>
   </a-modal>
 </template>
 
 <script>
   import { httpAction } from '@/api/manage'
-  import pick from 'lodash.pick'
-  import moment from "moment"
 
   export default {
     name: "JeroDemoModal",
@@ -89,18 +57,28 @@
         title:"操作",
         visible: false,
         model: {},
+        layout: {
+          labelCol: { span: 3 },
+          wrapperCol: { span: 14 },
+        },
         labelCol: {
           xs: { span: 24 },
-          sm: { span: 5 },
+          sm: { span: 3 },
         },
         wrapperCol: {
           xs: { span: 24 },
           sm: { span: 16 },
         },
-
         confirmLoading: false,
         form: this.$form.createForm(this),
         validatorRules:{
+          name: [
+            { required: true, message: '请输入姓名!' },
+            { min: 2, max: 30, message: '长度在 2 到 30 个字符', trigger: 'blur' }
+          ],
+          email: [
+            { required: false, type: 'email', message: '邮箱格式不正确', trigger: 'blur' }
+          ]
         },
         url: {
           add: "/test/jeroDemo/add",
@@ -115,26 +93,19 @@
         this.edit({});
       },
       edit (record) {
-        this.form.resetFields();
         this.model = Object.assign({}, record);
         this.visible = true;
-        this.$nextTick(() => {
-          this.form.setFieldsValue(pick(this.model,'name','keyWord','sex','age','email','content'))
-		      //时间格式化
-          this.form.setFieldsValue({punchTime:this.model.punchTime?moment(this.model.punchTime,'YYYY-MM-DD HH:mm:ss'):null})
-          this.form.setFieldsValue({birthday:this.model.birthday?moment(this.model.birthday):null})
-        });
-
       },
       close () {
+        this.$refs.form.resetFields();
         this.$emit('close');
         this.visible = false;
       },
       handleOk () {
         const that = this;
         // 触发表单验证
-        this.form.validateFields((err, values) => {
-          if (!err) {
+        this.$refs.form.validate(valid => {
+          if (valid) {
             that.confirmLoading = true;
             let httpurl = '';
             let method = '';
@@ -145,13 +116,8 @@
               httpurl+=this.url.edit;
                method = 'put';
             }
-            let formData = Object.assign(this.model, values);
-            //时间格式化
-            formData.punchTime = formData.punchTime?formData.punchTime.format('YYYY-MM-DD HH:mm:ss'):null;
-            formData.birthday = formData.birthday?formData.birthday.format():null;
 
-            console.log(formData)
-            httpAction(httpurl,formData,method).then((res)=>{
+            httpAction(httpurl,this.model,method).then((res)=>{
               if(res.success){
                 that.$message.success(res.message);
                 that.$emit('ok');
@@ -171,8 +137,6 @@
       handleCancel () {
         this.close()
       },
-
-
     }
   }
 </script>

jero-web/src/views/demo/modules/JeroDemoTabsModal.vue

@@ -63,7 +63,7 @@
 
             <a-table :columns="columns" :dataSource="data" :pagination="false" size="middle">
               <template v-for="(col, i) in ['name', 'workId', 'department']" :slot="col" slot-scope="text, record, index">
-                <a-tooltip  title="必填项" :defaultVisible="false" overlayStyle="{ color: 'red' }">
+                <a-tooltip  title="必填项" :defaultVisible="false" :overlayStyle="{ color: 'red' }">
                   <a-input :key="col" v-if="record.editable" style="margin: -5px 0"  :value="text" :placeholder="columns[i].title" @change="e => handlerRowChange(e.target.value, record.key, col)"/>
                 <template v-else>{{ text }}</template>
                 </a-tooltip>

jero-web/src/views/demo/modules/JeroOrderMainModal.vue

@@ -8,53 +8,38 @@
     @cancel="handleCancel">
 
     <a-spin :spinning="confirmLoading">
-      <a-form :form="form">
+      <a-form-model ref="form" :label-col="labelCol" :wrapper-col="wrapperCol"  :model="orderMainModel" :rules="validatorRules">
         <!-- 主表单区域 -->
         <a-row class="form-row" :gutter="16">
           <a-col :lg="8">
-            <a-form-item
-              :labelCol="labelCol"
-              :wrapperCol="wrapperCol"
-              label="订单号">
-              <a-input placeholder="请输入订单号" v-decorator="['orderCode', {rules: [{ required: true, message: '请输入订单号!' }]}]" />
-            </a-form-item>
+            <a-form-model-item label="订单号" required prop="orderCode">
+              <a-input v-model="orderMainModel.orderCode"  placeholder="请输入订单号"/>
+            </a-form-model-item>
           </a-col>
           <a-col :lg="8">
-            <a-form-item
-              :labelCol="labelCol"
-              :wrapperCol="wrapperCol"
-              label="订单类型">
-              <a-select placeholder="请输入订单类型" v-decorator="['ctype',{}]">
+            <a-form-model-item label="订单类型" prop="ctype">
+              <a-select placeholder="请选择订单类型" v-model="orderMainModel.ctype" >
                 <a-select-option value="1">国内订单</a-select-option>
                 <a-select-option value="2">国际订单</a-select-option>
               </a-select>
-            </a-form-item>
+            </a-form-model-item>
           </a-col>
           <a-col :lg="8">
-            <a-form-item
-              :labelCol="labelCol"
-              :wrapperCol="wrapperCol"
-              label="订单日期">
-              <a-date-picker showTime format="YYYY-MM-DD HH:mm:ss" v-decorator="[ 'orderDate',{}]"/>
-            </a-form-item>
+            <a-form-model-item label="订单日期" prop="orderDate">
+              <a-date-picker showTime valueFormat="YYYY-MM-DD HH:mm:ss" v-model="orderMainModel.orderDate"/>
+            </a-form-model-item>
           </a-col>
         </a-row>
         <a-row class="form-row" :gutter="16">
           <a-col :lg="8">
-            <a-form-item
-              :labelCol="labelCol"
-              :wrapperCol="wrapperCol"
-              label="订单金额">
-              <a-input-number style="width: 200px" v-decorator="[ 'orderMoney', {}]" />
-            </a-form-item>
+            <a-form-model-item label="订单金额" prop="orderMoney">
+              <a-input-number style="width: 200px" v-model="orderMainModel.orderMoney"/>
+            </a-form-model-item>
           </a-col>
           <a-col :lg="8">
-            <a-form-item
-              :labelCol="labelCol"
-              :wrapperCol="wrapperCol"
-              label="订单备注">
-              <a-input placeholder="请输入订单备注" v-decorator="['content', {}]" />
-            </a-form-item>
+            <a-form-model-item label="订单备注" prop="content">
+              <a-input placeholder="请输入订单备注" v-model="orderMainModel.content"  />
+            </a-form-model-item>
           </a-col>
         </a-row>
 
@@ -65,47 +50,49 @@
               <a-row type="flex" style="margin-bottom:10px" :gutter="16">
                 <a-col :span="5">客户名</a-col>
                 <a-col :span="5">性别</a-col>
-                <a-col :span="5">身份证号码</a-col>
-                <a-col :span="5">手机号</a-col>
-                <a-col :span="4">操作</a-col>
+                <a-col :span="6">身份证号码</a-col>
+                <a-col :span="6">手机号</a-col>
+                <a-col :span="2">操作</a-col>
               </a-row>
 
-              <a-row type="flex" style="margin-bottom:10px" :gutter="16" v-for="(item, index) in orderMainModel.jeroOrderCustomerList" :key="index">
+              <a-row type="flex" style="margin-bottom:10px" :gutter="16" v-for="(item, index) in orderMainModel.jeecgOrderCustomerList" :key="index">
                 <a-col :span="6" style="display: none">
-                  <a-form-item>
-                    <a-input placeholder="id" v-decorator="['jeroOrderCustomerList['+index+'].id', {'initialValue':item.id}]" />
-                  </a-form-item>
+                  <a-form-model-item>
+                    <a-input placeholder="id" v-model="item.id" />
+                  </a-form-model-item>
                 </a-col>
                 <a-col :span="5">
-                  <a-form-item>
-                    <a-input placeholder="客户名" v-decorator="['jeroOrderCustomerList['+index+'].name', {'initialValue':item.name,rules: [{ required: true, message: '请输入用户名!' }]}]" />
-                  </a-form-item>
+                  <a-form-model-item>
+                    <a-input placeholder="客户名" v-model="item.name" />
+                  </a-form-model-item>
                 </a-col>
                 <a-col :span="5">
-                  <a-form-item>
-                    <a-select placeholder="性别" v-decorator="['jeroOrderCustomerList['+index+'].sex', {'initialValue':item.sex}]">
+                  <a-form-model-item>
+                    <a-select placeholder="性别" v-model="item.sex" >
                       <a-select-option value="1">男</a-select-option>
                       <a-select-option value="2">女</a-select-option>
                     </a-select>
-                  </a-form-item>
+                  </a-form-model-item>
                 </a-col>
-                <a-col :span="5">
-                  <a-form-item>
-                    <a-input placeholder="身份证号" v-decorator="['jeroOrderCustomerList['+index+'].idcard', {'initialValue':item.idcard,rules: [{ pattern: '^\\d{6}(18|19|20)?\\d{2}(0[1-9]|1[012])(0[1-9]|[12]\\d|3[01])\\d{3}(\\d|[xX])$', message: '身份证号格式不对!' }]}]"/>
-                  </a-form-item>
+                <a-col :span="6">
+                  <a-form-model-item :prop="'jeecgOrderCustomerList.' + index + '.idcard'" :rules="[{required: true,message: '请输入身份证号',trigger: 'blur'},{ pattern: rules.IDCard, message: '身份证号格式不对!' }]">
+                    <a-input placeholder="身份证号" v-model="item.idcard" />
+                  </a-form-model-item>
                 </a-col>
-                <a-col :span="5">
-                  <a-form-item>
-                    <a-input placeholder="手机号" v-decorator="['jeroOrderCustomerList['+index+'].telphone', {'initialValue':item.telphone,rules: [{ pattern: '^1(3|4|5|7|8)\\d{9}$', message: '手机号格式不对!' }]}]"/>
-                  </a-form-item>
+                <a-col :span="6">
+                  <a-form-model-item  :prop="'jeecgOrderCustomerList.' + index + '.telphone'" :rules="rules.mobile">
+                    <a-input placeholder="手机号" v-model="item.telphone"/>
+                  </a-form-model-item>
                 </a-col>
-                <a-col :span="4">
-                  <a-form-item>
-                    <a-button @click="addRowCustom" icon="plus"></a-button>&nbsp;
-                    <a-button @click="delRowCustom(index)" icon="minus"></a-button>
-                  </a-form-item>
+                <a-col :span="2">
+                  <a-form-model-item>
+                    <a-icon  type="minus-circle" @click="delRowCustom(index)"  style="fontSize :20px"/>
+                  </a-form-model-item>
                 </a-col>
               </a-row>
+              <a-button type="dashed" style="width: 98%;margin-top: 10px" @click="addRowCustom">
+                <a-icon type="plus" /> 添加客户信息
+              </a-button>
             </div>
           </a-tab-pane>
 
@@ -116,34 +103,36 @@
                 <a-col :span="6">航班时间</a-col>
                 <a-col :span="6">操作</a-col>
               </a-row>
-              <a-row type="flex" style="margin-bottom:10px" :gutter="16" v-for="(item, index) in orderMainModel.jeroOrderTicketList" :key="index">
+              <a-row type="flex" style="margin-bottom:10px" :gutter="16" v-for="(item, index) in orderMainModel.jeecgOrderTicketList" :key="index">
                 <a-col :span="6" style="display: none">
-                  <a-form-item>
-                    <a-input placeholder="id" v-decorator="['jeroOrderTicketList['+index+'].id', {'initialValue':item.id}]" />
-                  </a-form-item>
+                  <a-form-model-item>
+                    <a-input placeholder="id" v-model="item.id" />
+                  </a-form-model-item>
                 </a-col>
                 <a-col :span="6">
-                  <a-form-item>
-                    <a-input placeholder="航班号" v-decorator="['jeroOrderTicketList['+index+'].ticketCode', {'initialValue':item.ticketCode,rules: [{ required: true, message: '请输入航班号!' }]}]" />
-                  </a-form-item>
+                  <a-form-model-item  :prop="'jeecgOrderTicketList.' + index + '.ticketCode'" :rules="{required: true,message: '请输入航班号',trigger: 'blur'}">
+                    <a-input placeholder="航班号" v-model="item.ticketCode"/>
+                  </a-form-model-item>
                 </a-col>
                 <a-col :span="6">
-                  <a-form-item>
-                    <j-date placeholder="航班时间" :trigger-change="true" v-decorator="['jeroOrderTicketList['+index+'].tickectDate', {'initialValue':item.tickectDate}]"></j-date>
-                  </a-form-item>
+                  <a-form-model-item>
+                    <a-date-picker placeholder="航班时间" valueFormat="YYYY-MM-DD"  v-model="item.tickectDate" />
+                  </a-form-model-item>
                 </a-col>
                 <a-col :span="6">
-                  <a-form-item>
-                    <a-button @click="addRowTicket" icon="plus"></a-button>&nbsp;
-                    <a-button @click="delRowTicket(index)" icon="minus"></a-button>
-                  </a-form-item>
+                  <a-form-model-item>
+                    <a-icon   type="minus-circle" @click="delRowTicket(index)"  style="fontSize :20px"/>
+                  </a-form-model-item>
                 </a-col>
               </a-row>
+              <a-button type="dashed" style="width: 98%;margin-top: 10px" @click="addRowTicket">
+                <a-icon type="plus" /> 添加机票信息
+              </a-button>
             </div>
           </a-tab-pane>
         </a-tabs>
 
-      </a-form>
+      </a-form-model>
     </a-spin>
   </a-modal>
 </template>
@@ -151,8 +140,6 @@
 <script>
   import { httpAction,getAction } from '@/api/manage'
   import JDate from '@/components/jero/JDate'
-  import pick from 'lodash.pick'
-  import moment from "moment"
 
   export default {
     name: "JeroOrderMainModal",
@@ -163,8 +150,10 @@
       return {
         title:"操作",
         visible: false,
-        orderMainModel: {jeroOrderCustomerList: [{}],
-                           jeroOrderTicketList: [{}]},
+        orderMainModel: {
+          jeroOrderCustomerList: [{}],
+          jeroOrderTicketList: [{}]
+        },
         labelCol: {
           xs: { span: 24 },
           sm: { span: 5 },
@@ -173,10 +162,12 @@
           xs: { span: 24 },
           sm: { span: 16 },
         },
-
         confirmLoading: false,
         form: this.$form.createForm(this),
         validatorRules:{
+          orderCode: [
+            { required: true,  message: '订单号不能为空', trigger: 'blur' }
+          ]
         },
         url: {
           add: "/test/jeroOrderMain/add",
@@ -193,10 +184,10 @@
         this.edit({});
       },
       edit (record) {
-        this.form.resetFields();
-        this.orderMainModel = Object.assign({}, record);
-        this.orderMainModel.jeroOrderCustomerList = [{}];
-        this.orderMainModel.jeroOrderTicketList = [{}];
+        this.orderMainModel = Object.assign({
+          jeroOrderCustomerList: [{}],
+          jeroOrderTicketList: [{}]
+        }, record);
         //--------------------------------------------------------
         //初始化明细表数据
         console.log(this.orderMainModel.id)
@@ -217,12 +208,7 @@
             }
           })
         }
-        //--------------------------------------------------------
         this.visible = true;
-        this.$nextTick(() => {
-          this.form.setFieldsValue(pick(this.orderMainModel,'orderCode','ctype','orderMoney','content'))
-          this.form.setFieldsValue({orderDate:this.orderMainModel.orderDate?moment(this.orderMainModel.orderDate):null}) //时间格式化
-        });
       },
       close () {
         this.$emit('close');
@@ -231,8 +217,8 @@
       handleOk () {
         const that = this;
         // 触发表单验证
-        this.form.validateFields((err, values) => {
-          if (!err) {
+        this.$refs.form.validate(valid => {
+          if (valid) {
             that.confirmLoading = true;
             let httpurl = '';
             let method = '';
@@ -241,18 +227,10 @@
               method = 'post';
             }else{
               httpurl+=this.url.edit;
-               method = 'put';
+              method = 'put';
             }
-            let orderMainData = Object.assign(this.orderMainModel, values);
-            //时间格式化
-            orderMainData.orderDate = orderMainData.orderDate?orderMainData.orderDate.format('YYYY-MM-DD HH:mm:ss'):null;
-            let formData = {
-              ...orderMainData,
-              jeroOrderCustomerList: orderMainData.jeroOrderCustomerList,
-              jeroOrderTicketList: orderMainData.jeroOrderTicketList
-            }
-            console.log(formData)
-            httpAction(httpurl,formData,method).then((res)=>{
+
+            httpAction(httpurl,this.orderMainModel,method).then((res)=>{
               if(res.success){
                 that.$message.success(res.message);
                 that.$emit('ok');
@@ -276,9 +254,8 @@
       },
       delRowCustom (index) {
         console.log(index)
-        let all = this.form.getFieldsValue()
+        let all = this.orderMainModel
         all['jeroOrderCustomerList'].splice(index,1);
-        this.form.setFieldsValue(all)
         this.orderMainModel.jeroOrderCustomerList.splice(index,1);
         this.$forceUpdate();
       },
@@ -289,14 +266,11 @@
       },
       delRowTicket (index) {
         console.log(index)
-        let all = this.form.getFieldsValue()
+        let all = this.orderMainModel
         all['jeroOrderTicketList'].splice(index,1);
-        this.form.setFieldsValue(all)
         this.orderMainModel.jeroOrderTicketList.splice(index,1);
         this.$forceUpdate();
       },
-
-
     }
   }
 </script>

jero-web/src/views/demo/modules/JeroOrderModalForJEditableTable.vue

@@ -9,58 +9,41 @@
     @cancel="handleCancel">
 
     <a-spin :spinning="confirmLoading">
-      <a-form :form="form">
+      <a-form-model ref="form" :label-col="labelCol" :wrapper-col="wrapperCol"  :model="model" >
         <!-- 主表单区域 -->
         <a-row class="form-row" :gutter="0">
           <a-col :lg="8">
-            <a-form-item
-              :labelCol="labelCol"
-              :wrapperCol="wrapperCol"
-              label="订单号">
-              <a-input
-                placeholder="请输入订单号"
-                v-decorator="['orderCode', {rules: [{ required: true, message: '请输入订单号!' }]}]"/>
-            </a-form-item>
+            <a-form-model-item  label="订单号" prop="orderCode" :rules="[{ required: true, message: '请输入订单号!' }]">
+              <a-input placeholder="请输入订单号" v-model="model.orderCode"/>
+            </a-form-model-item>
           </a-col>
           <a-col :lg="8">
-            <a-form-item
-              :labelCol="labelCol"
-              :wrapperCol="wrapperCol"
-              label="订单类型">
-              <a-select placeholder="请选择订单类型" v-decorator="['ctype',{}]">
+            <a-form-model-item  label="订单类型">
+              <a-select placeholder="请选择订单类型" v-model="model.ctype">
                 <a-select-option value="1">国内订单</a-select-option>
                 <a-select-option value="2">国际订单</a-select-option>
               </a-select>
-            </a-form-item>
+            </a-form-model-item>
           </a-col>
           <a-col :lg="8">
-            <a-form-item
-              :labelCol="labelCol"
-              :wrapperCol="wrapperCol"
-              label="订单日期">
-              <a-date-picker showTime format="YYYY-MM-DD HH:mm:ss" style="width: 100%" v-decorator="[ 'orderDate',{}]"/>
-            </a-form-item>
+            <a-form-model-item  label="订单日期">
+              <a-date-picker showTime valueFormat="YYYY-MM-DD HH:mm:ss" style="width: 100%" v-model="model.orderDate"/>
+            </a-form-model-item>
           </a-col>
         </a-row>
         <a-row class="form-row" :gutter="0">
           <a-col :lg="8">
-            <a-form-item
-              :labelCol="labelCol"
-              :wrapperCol="wrapperCol"
-              label="订单金额">
-              <a-input-number placeholder="请输入订单金额" style="width: 100%" v-decorator="[ 'orderMoney', {}]"/>
-            </a-form-item>
+            <a-form-model-item  label="订单金额">
+              <a-input-number placeholder="请输入订单金额" style="width: 100%" v-model="model.orderMoney"/>
+            </a-form-model-item>
           </a-col>
           <a-col :lg="8">
-            <a-form-item
-              :labelCol="labelCol"
-              :wrapperCol="wrapperCol"
-              label="订单备注">
-              <a-input placeholder="请输入订单备注" v-decorator="['content', {}]"/>
-            </a-form-item>
+            <a-form-model-item  label="订单备注">
+              <a-input placeholder="请输入订单备注" v-model="model.content"/>
+            </a-form-model-item>
           </a-col>
         </a-row>
-      </a-form>
+      </a-form-model>
 
       <!-- 子表单区域 -->
       <a-tabs v-model="activeKey" @change="handleChangeTabs">
@@ -100,11 +83,9 @@
 <script>
 
   import JEditableTable from '@/components/jero/JEditableTable'
-  import { FormTypes, VALIDATE_NO_PASSED, getRefPromise, validateFormAndTables } from '@/utils/JEditableTableUtil'
+  import { FormTypes, VALIDATE_NO_PASSED, getRefPromise, validateFormModelAndTables } from '@/utils/JEditableTableUtil'
   import { httpAction, getAction } from '@/api/manage'
   import JDate from '@/components/jero/JDate'
-  import pick from 'lodash.pick'
-  import moment from 'moment'
 
   export default {
     name: 'JeroOrderModalForJEditableTable',
@@ -115,7 +96,6 @@
       return {
         title: '操作',
         visible: false,
-        form: this.$form.createForm(this),
         confirmLoading: false,
         model: {},
         labelCol: {
@@ -235,15 +215,7 @@
       edit(record) {
         this.visible = true
         this.activeKey = '1'
-        this.form.resetFields()
         this.model = Object.assign({}, record)
-
-        this.$nextTick(() => {
-          this.form.setFieldsValue(pick(this.model, 'orderCode', 'ctype', 'orderMoney', 'content'))
-          //时间格式化
-          this.form.setFieldsValue({ orderDate: this.model.orderDate ? moment(this.model.orderDate) : null })
-        })
-
         // 加载子表数据
         if (this.model.id) {
           let params = { id: this.model.id }
@@ -259,6 +231,7 @@
           editableTables[1].initialize()
         })
         this.$emit('close')
+        this.$refs.form.resetFields();
       },
       /** 查询某个tab的数据 */
       requestTableData(url, params, tab) {
@@ -286,7 +259,7 @@
       validateFields() {
         this.getAllTable().then(tables => {
           /** 一次性验证主表和所有的次表 */
-          return validateFormAndTables(this.form, tables)
+          return validateFormModelAndTables(this.$refs.form,this.model, tables)
         }).then(allValues => {
           let formData = this.classifyIntoFormData(allValues)
           // 发起请求
@@ -303,8 +276,6 @@
       /** 整理成formData */
       classifyIntoFormData(allValues) {
         let orderMain = Object.assign(this.model, allValues.formValue)
-        //时间格式化
-        orderMain.orderDate = orderMain.orderDate ? orderMain.orderDate.format('YYYY-MM-DD HH:mm:ss') : null
         return {
           ...orderMain, // 展开
           jeroOrderCustomerList: allValues.tablesValue[0].values,

jero-web/src/views/demo/tablist/form/JeroOrderCustomerModal.vue

@@ -11,64 +11,64 @@
 
     <!-- 编辑 -->
     <a-spin :spinning="confirmLoading" v-if="editStatus">
-      <a-form :form="form">
-
-        <a-form-item
+      <a-form-model ref="form" :model="model" :rules="validatorRules">
+        <a-form-model-item
           :labelCol="labelCol"
           :wrapperCol="wrapperCol"
           label="客户姓名"
+          prop="name"
+          required
           hasFeedback>
-          <a-input placeholder="请输入客户姓名" v-decorator="['name', {rules: [{ required: true, message: '请输入客户姓名!' }]}]"
-                   :readOnly="disableSubmit"/>
-        </a-form-item>
-        <a-form-item
+          <a-input placeholder="请输入客户姓名" v-model="model.name" :readOnly="disableSubmit"/>
+        </a-form-model-item>
+        <a-form-model-item
           :labelCol="labelCol"
           :wrapperCol="wrapperCol"
           label="性别"
           hasFeedback>
-          <a-select v-decorator="['sex', {}]" placeholder="请选择性别">
+          <a-select v-model="model.sex" placeholder="请选择性别">
             <a-select-option value="1">男性</a-select-option>
             <a-select-option value="2">女性</a-select-option>
           </a-select>
-        </a-form-item>
-        <a-form-item
+        </a-form-model-item>
+        <a-form-model-item
           :labelCol="labelCol"
           :wrapperCol="wrapperCol"
           label="身份证号码"
+          prop="idcard"
           hasFeedback>
-          <a-input placeholder="请输入身份证号码" v-decorator="['idcard', validatorRules.idcard]" :readOnly="disableSubmit"/>
-        </a-form-item>
-        <a-form-item
+          <a-input placeholder="请输入身份证号码" v-model="model.idcard" :readOnly="disableSubmit"/>
+        </a-form-model-item>
+        <a-form-model-item
           :labelCol="labelCol"
           :wrapperCol="wrapperCol"
           label="身份证扫描件"
           hasFeedback>
           <j-image-upload text="上传" v-model="fileList" :isMultiple="true"></j-image-upload>
-        </a-form-item>
-        <a-form-item
+        </a-form-model-item>
+        <a-form-model-item
           :labelCol="labelCol"
           :wrapperCol="wrapperCol"
           label="联系方式"
+          prop="telphone"
           hasFeedback>
-          <a-input v-decorator="[ 'telphone', validatorRules.telphone]" :readOnly="disableSubmit"/>
-        </a-form-item>
-        <a-form-item
+          <a-input v-model="model.telphone" :readOnly="disableSubmit"/>
+        </a-form-model-item>
+        <a-form-model-item
           :labelCol="labelCol"
           :wrapperCol="wrapperCol"
           label="订单号码"
-          v-model="this.orderId"
           :hidden="hiding"
           hasFeedback>
-          <a-input v-decorator="[ 'orderId', {}]" disabled="disabled"/>
-        </a-form-item>
-      </a-form>
+          <a-input v-model="model.orderId" disabled="disabled"/>
+        </a-form-model-item>
+      </a-form-model>
     </a-spin>
   </a-modal>
 </template>
 
 <script>
   import {httpAction} from '@/api/manage'
-  import pick from 'lodash.pick'
   import Vue from 'vue'
   import {ACCESS_TOKEN} from "@/store/mutation-types"
   import JImageUpload from '../../../../components/jero/JImageUpload'
@@ -89,59 +89,6 @@
           xs: {span: 24},
           sm: {span: 16},
         },
-        // 表头
-        columns: [
-          {
-            title: '客户名',
-            align: "center",
-            dataIndex: 'name',
-          },
-          {
-            title: '性别',
-            align: "center",
-            dataIndex: 'sex',
-          },
-          {
-            title: '身份证号码',
-            align: "center",
-            dataIndex: 'idcard',
-          },
-          {
-            title: '身份证扫描件',
-            align: "center",
-            dataIndex: 'idcardPic',
-          },
-          {
-            title: '电话',
-            dataIndex: 'telphone',
-            align: "center",
-          },
-          {
-            title: '订单号码',
-            dataIndex: 'orderId',
-            align: "center",
-          },
-          {
-            title: '创建人',
-            dataIndex: 'createBy',
-            align: "center",
-          },
-          {
-            title: '创建时间',
-            dataIndex: 'createTime',
-            align: "center",
-          },
-          {
-            title: '更新时间',
-            dataIndex: 'updateBy',
-            align: "center",
-          },
-          {
-            title: '更新人',
-            dataIndex: 'updateTime',
-            align: "center",
-          },
-        ],
         fileList: [],
         disableSubmit: false,
         selectedRowKeys: [],
@@ -155,7 +102,6 @@
         addStatus: false,
         editStatus: false,
         confirmLoading: false,
-        form: this.$form.createForm(this),
         url: {
           add: "/test/order/addCustomer",
           edit: "/test/order/editCustomer",
@@ -163,8 +109,9 @@
           getOrderCustomerList: "/test/order/listOrderCustomerByMainId",
         },
         validatorRules: {
-          telphone: {rules: [{validator: this.validateMobile}]},
-          idcard: {rules: [{validator: this.validateIdCard}]}
+          name :[{required: true, message: '请输入客户姓名!'}],
+          telphone: [{validator: this.validateMobile}],
+          idcard: [{validator: this.validateIdCard}]
         },
       }
     },
@@ -181,7 +128,6 @@
       add(orderId) {
         this.hiding = true;
         if (orderId) {
-          this.orderId = orderId;
           this.edit({orderId}, '');
         } else {
           this.$message.warning("请选择一个客户信息");
@@ -202,16 +148,11 @@
           this.disableSubmit = false;
         }
 
-        this.form.resetFields();
-        this.orderId = record.orderId;
         this.model = Object.assign({}, record);
         if (record.id) {
           this.hiding = false;
           this.addStatus = false;
           this.editStatus = true;
-          this.$nextTick(() => {
-            this.form.setFieldsValue(pick(this.model, 'id', 'name', 'sex', 'idcard','telphone', 'orderId', 'createBy', 'createTime', 'updateBy', 'updateTime'))
-          });
           setTimeout(() => {
             this.fileList = record.idcardPic
           }, 5)
@@ -226,12 +167,13 @@
         this.visible = false;
         this.picUrl = "";
         this.fileList=[];
+        this.$refs.form.resetFields();
       },
       handleOk() {
         const that = this;
         // 触发表单验证
-        this.form.validateFields((err, values) => {
-          if (!err) {
+        this.$refs.form.validate(valid => {
+          if (valid) {
             that.confirmLoading = true;
             let httpurl = '';
             let method = '';
@@ -242,9 +184,7 @@
               httpurl += this.url.edit;
               method = 'put';
             }
-            let formData = Object.assign(this.model, values);
-            console.log(formData);
-            formData.orderId = this.orderId;
+            let formData = Object.assign({}, this.model);
             if(this.fileList != '') {
               formData.idcardPic = this.fileList;
             }else{
@@ -261,6 +201,8 @@
               that.confirmLoading = false;
               that.close();
             })
+          }else{
+            return false;
           }
         })
       },

jero-web/src/views/demo/tablist/form/JeroOrderDMainModal.vue

@@ -8,46 +8,45 @@
     @cancel="handleCancel">
 
     <a-spin :spinning="confirmLoading">
-      <a-form :form="form">
+      <a-form-model ref="form" :model="orderMainModel" :rules="validatorRules">
         <!-- 主表单区域 -->
-        <a-form-item
+        <a-form-model-item
           :labelCol="labelCol"
           :wrapperCol="wrapperCol"
+          prop="orderCode"
           label="订单号"
+          required
           hasFeedback>
-          <a-input
-            placeholder="请输入订单号"
-            v-decorator="['orderCode', {rules: [{ required: true, message: '请输入订单号!' }]}]"
-          />
-        </a-form-item>
-        <a-form-item
+          <a-input placeholder="请输入订单号" v-model="orderMainModel.orderCode"  />
+        </a-form-model-item>
+        <a-form-model-item
           :labelCol="labelCol"
           :wrapperCol="wrapperCol"
           label="订单类型">
-          <a-select placeholder="请输入订单类型" v-decorator="['ctype',{}]">
+          <a-select placeholder="请输入订单类型" v-model="orderMainModel.ctype">
             <a-select-option value="1">国内订单</a-select-option>
             <a-select-option value="2">国际订单</a-select-option>
           </a-select>
-        </a-form-item>
-        <a-form-item
+        </a-form-model-item>
+        <a-form-model-item
           :labelCol="labelCol"
           :wrapperCol="wrapperCol"
           label="订单日期">
-          <a-date-picker showTime format='YYYY-MM-DD HH:mm:ss' v-decorator="[ 'orderDate',{}]"/>
-        </a-form-item>
-        <a-form-item
+          <a-date-picker showTime valueFormat='YYYY-MM-DD HH:mm:ss' v-model="orderMainModel.orderDate"/>
+        </a-form-model-item>
+        <a-form-model-item
           :labelCol="labelCol"
           :wrapperCol="wrapperCol"
           label="订单金额">
-          <a-input-number style="width: 200px" v-decorator="[ 'orderMoney', {}]"/>
-        </a-form-item>
-        <a-form-item
+          <a-input-number style="width: 200px" v-model="orderMainModel.orderMoney" />
+        </a-form-model-item>
+        <a-form-model-item
           :labelCol="labelCol"
           :wrapperCol="wrapperCol"
           label="订单备注">
-          <a-input placeholder="请输入订单备注" v-decorator="['content', {}]"/>
-        </a-form-item>
-      </a-form>
+          <a-input placeholder="请输入订单备注" v-model="orderMainModel.content"/>
+        </a-form-model-item>
+      </a-form-model>
     </a-spin>
   </a-modal>
 </template>
@@ -81,7 +80,11 @@
         },
         confirmLoading: false,
         form: this.$form.createForm(this),
-        validatorRules: {},
+        validatorRules: {
+          orderCode: [
+            { required: true, message: '请输入订单号!' }
+          ]
+        },
         url: {
           add: "/test/order/add",
           edit: "/test/order/edit",
@@ -95,16 +98,15 @@
         this.edit({});
       },
       edit(record) {
-        this.form.resetFields();
         this.orderMainModel = Object.assign({}, record);
-        //初始化明细表数据
-        console.log(this.orderMainModel.id)
-        this.visible = true;
-        this.$nextTick(() => {
-          this.form.setFieldsValue(pick(this.orderMainModel, 'orderCode', 'ctype', 'orderMoney', 'content'))
-          this.form.setFieldsValue({orderDate: this.orderMainModel.orderDate ? moment(this.orderMainModel.orderDate) : null}) //时间格式化
-        });
         console.log(this.orderMainModel)
+        //初始化明细表数据
+        this.visible = true;
+      },
+      close() {
+        this.$emit('close');
+        this.visible = false;
+        this.$refs.form.resetFields();
       },
       close() {
         this.$emit('close');
@@ -113,8 +115,8 @@
       handleOk() {
         const that = this;
         // 触发表单验证
-        this.form.validateFields((err, values) => {
-          if (!err) {
+        this.$refs.form.validate(valid => {
+          if (valid) {
             that.confirmLoading = true;
             let httpurl = '';
             let method = '';
@@ -125,15 +127,8 @@
               httpurl += this.url.edit;
               method = 'put';
             }
-            let orderMainData = Object.assign(this.orderMainModel, values);
-            //时间格式化
-            orderMainData.orderDate = orderMainData.orderDate ? orderMainData.orderDate.format('YYYY-MM-DD HH:mm:ss') : null;
-            let formData = {
-              ...orderMainData
-            }
 
-            console.log(formData)
-            httpAction(httpurl, formData, method).then((res) => {
+            httpAction(httpurl, this.orderMainModel, method).then((res) => {
               if (res.success) {
                 that.$message.success(res.message);
                 that.$emit('ok');
@@ -144,6 +139,8 @@
               that.confirmLoading = false;
               that.close();
             })
+          }else{
+            return false;
           }
         })
       },

jero-web/src/views/demo/tablist/form/JeroOrderTicketModal.vue

@@ -10,58 +10,56 @@
     cancelText="关闭">
 
     <a-spin :spinning="confirmLoading">
-      <a-form :form="form">
+      <a-form-model ref="form" :model="model" :rules="validatorRules">
 
-        <a-form-item
+        <a-form-model-item
           :labelCol="labelCol"
           :wrapperCol="wrapperCol"
           label="航班号"
+          prop="ticketCode"
           hasFeedback>
-          <a-input
-            placeholder="请输入航班号"
-            :readOnly="disableSubmit"
-            v-decorator="['ticketCode', {rules:[{ required: true,message: '请输入航班号!'}]}]"/>
-        </a-form-item>
-        <a-form-item
+          <a-input placeholder="请输入航班号" :readOnly="disableSubmit" v-model="model.ticketCode"></a-input>
+        </a-form-model-item>
+        <a-form-model-item
           :labelCol="labelCol"
           :wrapperCol="wrapperCol"
           label="航班时间"
+          prop="tickectDate"
           hasFeedback>
-          <j-date :trigger-change="true"  v-decorator="['tickectDate',{rules:[{ required: true,message: '请输入航班号!'}]}]"></j-date>
-        </a-form-item>
-        <a-form-item
+          <j-date v-model="model.tickectDate"></j-date>
+        </a-form-model-item>
+        <a-form-model-item
           :labelCol="labelCol"
           :wrapperCol="wrapperCol"
           label="订单号码"
           v-model="this.orderId"
           :hidden="hiding"
           hasFeedback>
-          <a-input v-decorator="[ 'orderId', {}]" disabled="disabled"/>
-        </a-form-item>
-        <a-form-item
+          <a-input v-model="model.orderId" disabled="disabled"/>
+        </a-form-model-item>
+        <a-form-model-item
           :labelCol="labelCol"
           :wrapperCol="wrapperCol"
           label="创建人"
           :hidden="hiding"
           hasFeedback>
-          <a-input v-decorator="[ 'createBy', {}]" :readOnly="disableSubmit"/>
-        </a-form-item>
-        <a-form-item
+          <a-input v-model="model.createBy" :readOnly="disableSubmit"/>
+        </a-form-model-item>
+        <a-form-model-item
           :labelCol="labelCol"
           :wrapperCol="wrapperCol"
           label="创建时间"
           :hidden="hiding"
           hasFeedback>
-          <a-input v-decorator="[ 'createTime', {}]" :readOnly="disableSubmit"/>
-        </a-form-item>
-      </a-form>
+          <a-input v-model="model.createTime" :readOnly="disableSubmit"/>
+        </a-form-model-item>
+      </a-form-model>
     </a-spin>
   </a-modal>
 </template>
 
 <script>
   import {httpAction} from '@/api/manage'
-  import pick from 'lodash.pick'
   import moment from 'moment'
   import JDate from '@/components/jero/JDate'
 
@@ -90,7 +88,10 @@
         hiding: false,
         confirmLoading: false,
         form: this.$form.createForm(this),
-        validatorRules: {},
+        validatorRules: {
+          ticketCode:[{required : true, message: '请输入航班号!'}],
+          tickectDate:[{required : true, message: '请输入航班时间!'}]
+        },
         url: {
           add: '/test/order/addTicket',
           edit: '/test/order/editTicket'
@@ -121,23 +122,19 @@
           this.hiding = true;
           this.disableSubmit = false;
         }
-        this.form.resetFields();
-        this.orderId = record.orderId;
         this.model = Object.assign({}, record);
         this.visible = true;
-        this.$nextTick(() => {
-          this.form.setFieldsValue(pick(this.model, 'ticketCode', 'tickectDate', 'orderId', 'createBy', 'createTime', 'updateBy', 'updateTime'))
-        })
       },
       close() {
         this.$emit('close');
         this.visible = false;
+        this.$refs.form.resetFields();
       },
       handleOk() {
         const that = this;
         // 触发表单验证
-        this.form.validateFields((err, values) => {
-          if (!err) {
+        this.$refs.form.validate(valid => {
+          if (valid) {
             that.confirmLoading = true;
             let httpurl = '';
             let method = '';
@@ -148,9 +145,8 @@
               httpurl += this.url.edit;
               method = 'put';
             }
-            let formData = Object.assign(this.model, values);
-            formData.mainId = this.orderId;
-            httpAction(httpurl, formData, method).then((res) => {
+            this.model.mainId = this.model.orderId;
+            httpAction(httpurl, this.model, method).then((res) => {
               if (res.success) {
                 that.$message.success(res.message);
                 that.$emit('ok')
@@ -161,6 +157,8 @@
               that.confirmLoading = false;
               that.close();
             })
+          }else{
+            return false;
           }
         })
       },

jero-web/src/views/system/DepartList.vue

@@ -1,7 +1,8 @@
 <template xmlns:background-color="http://www.w3.org/1999/xhtml">
   <a-row :gutter="10">
-    <a-col :md="10" :sm="24" >
-      <a-card :bordered="false" style="padding: 12px 0;">
+    <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>
@@ -55,8 +56,8 @@
       <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="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>
@@ -69,18 +70,15 @@
       </div>
       <!---- author:os_chengtgen -- date:20190827 --  for:切换父子勾选模式 =======------>
     </a-col>
-    <a-col :md="14" :sm="24" style="background: #fff;padding: 24px;">
+    <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-form-model ref="form" :model="model" :rules="validatorRules">
+              <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="departName" label="机构名称">
+                <a-input placeholder="请输入机构/部门名称" v-model="model.departName" />
+              </a-form-model-item>
+              <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="上级部门">
                 <a-tree-select
                   style="width:100%"
                   :dropdownStyle="{maxHeight:'200px',overflow:'auto'}"
@@ -89,26 +87,20 @@
                   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="机构类型">
+              </a-form-model-item>
+              <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="orgCode" label="机构编码">
+                <a-input disabled placeholder="请输入机构编码" v-model="model.orgCode" />
+              </a-form-model-item>
+              <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="orgCategory" label="机构类型">
                 <template v-if="orgCategoryDisabled">
-                  <a-radio-group v-decorator="['orgCategory',validatorRules.orgCategory]" placeholder="请选择机构类型">
+                  <a-radio-group v-model="model.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-group v-model="model.orgCategory" placeholder="请选择机构类型">
                     <a-radio value="2">
                       部门
                     </a-radio>
@@ -117,38 +109,26 @@
                     </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>
+              </a-form-model-item>
+              <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="排序">
+                <a-input-number v-model="model.departOrder" />
+              </a-form-model-item>
+              <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="手机号">
+                <a-input placeholder="请输入手机号" v-model="model.mobile" />
+              </a-form-model-item>
+              <a-form-model-item  :labelCol="labelCol" :wrapperCol="wrapperCol"  label="地址">
+                <a-input placeholder="请输入地址" v-model="model.address"/>
+              </a-form-model-item>
+              <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="备注">
+                <a-textarea placeholder="请输入备注" v-model="model.memo"/>
+              </a-form-model-item>
+            </a-form-model>
             <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 :bordered="false" style="height:248px !important;">
+          <a-card v-else >
             <a-empty>
               <span slot="description"> 请先选择一个部门! </span>
             </a-empty>
@@ -157,18 +137,14 @@
         <a-tab-pane tab="部门权限" key="2" forceRender>
           <depart-auth-modal ref="departAuth"/>
         </a-tab-pane>
-        <a-tab-pane tab="用户信息" key="3">
-          <Dept-User-Info ref="DeptUserInfo"></Dept-User-Info>
-        </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 DeptUserInfo from './modules/DeptUserInfo'
-  import pick from 'lodash.pick'
   import {queryDepartTreeList, searchByKeywords, deleteByDepartId} from '@/api/api'
   import {httpAction, deleteAction} from '@/api/manage'
   import {JeroListMixin} from '@/mixins/JeroListMixin'
@@ -217,8 +193,7 @@
     mixins: [JeroListMixin],
     components: {
       DepartAuthModal,
-      DepartModal,
-      DeptUserInfo
+      DepartModal
     },
     data() {
       return {
@@ -243,11 +218,8 @@
         selectedKeys: [],
         autoIncr: 1,
         currSelected: {},
-
         allTreeKeys:[],
         checkStrictly: true,
-
-        form: this.$form.createForm(this),
         labelCol: {
           xs: {span: 24},
           sm: {span: 5}
@@ -261,10 +233,10 @@
           edges: []
         },
         validatorRules: {
-          departName: {rules: [{required: true, message: '请输入机构/部门名称!'}]},
-          orgCode: {rules: [{required: true, message: '请输入机构编码!'}]},
-          orgCategory: {rules: [{required: true, message: '请输入机构类型!'}]},
-          mobile: {rules: [{validator: this.validateMobile}]}
+          departName: [{required: true, message: '请输入机构/部门名称!'}],
+          orgCode: [{required: true, message: '请输入机构编码!'}],
+          orgCategory:[{required: true, message: '请输入机构类型!'}],
+          mobile:[{validator: this.validateMobile}]
         },
         url: {
           delete: '/sys/sysDepart/delete',
@@ -326,8 +298,6 @@
       },
       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
       },
@@ -340,7 +310,7 @@
           this.dropTrigger = ''
         }
       },
-      // 右键店家下拉关闭下拉框
+      // 右键下拉关闭下拉框
       closeDrop() {
         this.dropTrigger = ''
       },
@@ -405,14 +375,13 @@
       onCheck(checkedKeys, info) {
         console.log('onCheck', checkedKeys, info)
         this.hiding = false
-        //this.checkedKeys = checkedKeys.checked
-        // <!---- author:os_chengtgen -- date:20190827 --  for:切换父子勾选模式 =======------>
+        //---- author:os_chengtgen -- date:20190827 --  for:切换父子勾选模式 =======------
         if(this.checkStrictly){
           this.checkedKeys = checkedKeys.checked;
         }else{
           this.checkedKeys = checkedKeys
         }
-        // <!---- author:os_chengtgen -- date:20190827 --  for:切换父子勾选模式 =======------>
+        //---- author:os_chengtgen -- date:20190827 --  for:切换父子勾选模式 =======------
       },
       onSelect(selectedKeys, e) {
         console.log('selected', selectedKeys, e)
@@ -425,8 +394,6 @@
         this.model.parentId = record.parentId
         this.setValuesToForm(record)
         this.$refs.departAuth.show(record.id);
-        // 传用户信息参数
-        this.$refs.DeptUserInfo.open(record)
 
       },
       // 触发onSelect事件时,为部门树右侧的form表单赋值
@@ -436,10 +403,6 @@
         }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
@@ -448,7 +411,6 @@
         this.hiding = true
         this.checkedKeys = []
         this.currSelected = {}
-        this.form.resetFields()
         this.selectedKeys = []
         this.$refs.departAuth.departId = ''
       },
@@ -462,16 +424,14 @@
         this.currSelected.receiptTriggerType = value
       },
       submitCurrForm() {
-        this.form.validateFields((err, values) => {
-          if (!err) {
+        this.$refs.form.validate(valid => {
+          if (valid) {
             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) => {
+            httpAction(this.url.edit, this.currSelected, 'put').then((res) => {
               if (res.success) {
                 this.$message.success('保存成功!')
                 this.loadTree()
@@ -483,12 +443,13 @@
         })
       },
       emptyCurrForm() {
-        this.form.resetFields()
+        this.$refs.form.resetFields();
+        this.model={}
       },
       nodeSettingFormSubmit() {
-        this.form.validateFields((err, values) => {
-          if (!err) {
-            console.log('Received values of form: ', values)
+        this.$refs.form.validate(valid => {
+          if (valid) {
+            console.log('Received values of form: ', this.model)
           }
         })
       },
@@ -525,7 +486,7 @@
                 that.$message.success('删除成功!')
                 that.loadTree()
                 //删除后同步清空右侧基本信息内容
-                let orgCode=that.form.getFieldValue("orgCode");
+                let orgCode=that.model.orgCode;
                 if(orgCode && orgCode === that.rightClickSelectedOrgCode){
                   that.onClearSelected()
                 }
@@ -557,7 +518,7 @@
           }
         }
       },
-     // <!---- author:os_chengtgen -- date:20190827 --  for:切换父子勾选模式 =======------>
+     //---- author:os_chengtgen -- date:20190827 --  for:切换父子勾选模式 =======------
       expandAll () {
         this.iExpandedKeys = this.allTreeKeys
       },
@@ -572,13 +533,13 @@
         //this.checkedKeys = this.defaultCheckedKeys
         this.checkedKeys = []
       },
-      // switchCheckStrictly (v) {
-      //   if(v==1){
-      //     this.checkStrictly = false
-      //   }else if(v==2){
-      //     this.checkStrictly = true
-      //   }
-      // },
+      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)
@@ -588,8 +549,8 @@
           }
         }
       }
-      // <!---- author:os_chengtgen -- date:20190827 --  for:切换父子勾选模式 =======------>
-
+      //---- author:os_chengtgen -- date:20190827 --  for:切换父子勾选模式 =======------
+      
     },
     created() {
       this.currFlowId = this.$route.params.id

jero-web/src/views/system/DepartListSync.vue

@@ -0,0 +1,680 @@
+<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: 0 0 0 14px" class="table-operator">
+          <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>
+          <j-third-app-button biz-type="depart" :selected-row-keys="selectedRowKeys" syncToApp @sync-finally="onSyncFinally"/>
+          <a-button title="删除多条数据" @click="batchDel" type="default">批量删除</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
+              v-if="loading"
+              checkable
+              multiple
+              @select="onSelect"
+              @check="onCheck"
+              @rightClick="rightHandle"
+              :selectedKeys="selectedKeys"
+              :checkedKeys="checkedKeys"
+              :treeData="departTree"
+              :checkStrictly="checkStrictly"
+              :expandedKeys.sync="iExpandedKeys"
+              :load-data="loadSubTree"
+              @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-model ref="form" :model="model" :rules="validatorRules">
+              <a-form-model-item :labelCol="labelCol"  :wrapperCol="wrapperCol"  label="机构名称" prop="departName" >
+                <a-input placeholder="请输入机构/部门名称" v-model="model.departName"/>
+              </a-form-model-item>
+              <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="上级部门" prop="parentId">
+                <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-model-item>
+              <a-form-model-item  :labelCol="labelCol" :wrapperCol="wrapperCol" label="机构编码" prop="orgCode">
+                <a-input disabled placeholder="请输入机构编码" v-model="model.orgCode"/>
+              </a-form-model-item>
+              <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="机构类型" prop="orgCategory">
+                <template v-if="orgCategoryDisabled">
+                  <a-radio-group v-model="model.orgCategory" placeholder="请选择机构类型">
+                    <a-radio value="1">
+                      公司
+                    </a-radio>
+                  </a-radio-group>
+                </template>
+                <template v-else>
+                  <a-radio-group v-model="model.orgCategory" placeholder="请选择机构类型">
+                    <a-radio value="2">
+                      部门
+                    </a-radio>
+                    <a-radio value="3">
+                      岗位
+                    </a-radio>
+                  </a-radio-group>
+                </template>
+              </a-form-model-item>
+              <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol"  label="排序"  prop="departOrder">
+                <a-input-number v-model="model.departOrder"/>
+              </a-form-model-item>
+              <a-form-model-item :labelCol="labelCol"  :wrapperCol="wrapperCol" label="手机号" prop="mobile">
+                <a-input placeholder="请输入手机号" v-model="model.mobile"/>
+              </a-form-model-item>
+              <a-form-model-item :labelCol="labelCol"  :wrapperCol="wrapperCol"  label="地址"  prop="address">
+                <a-input placeholder="请输入地址" v-model="model.address"/>
+              </a-form-model-item>
+              <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol"  label="备注"  prop="memo">
+                <a-textarea placeholder="请输入备注" v-model="model.memo"/>
+              </a-form-model-item>
+            </a-form-model>
+            <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 { deleteByDepartId, queryDepartTreeSync, searchByKeywords } from '@/api/api'
+  import { deleteAction, httpAction } from '@/api/manage'
+  import { JeroListMixin } from '@/mixins/JeroListMixin'
+  import DepartAuthModal from './modules/DepartAuthModal'
+  import { cloneObject } from '@/utils/util'
+  import JThirdAppButton from '@comp/jerobiz/thirdApp/JThirdAppButton'
+  // 表头
+  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: [JeroListMixin],
+    components: {
+      JThirdAppButton,
+      DepartAuthModal,
+      DepartModal
+    },
+    data() {
+      return {
+        iExpandedKeys: [],
+        loading: true,
+        autoExpandParent: false,
+        currFlowId: '',
+        currFlowName: '',
+        disable: true,
+        treeData: [],
+        visible: false,
+        departTree: [],
+        departTreeAll: [],
+        loadedKeys: [],
+        allIds: [],
+        rightClickSelectedKey: '',
+        rightClickSelectedOrgCode: '',
+        hiding: true,
+        model: {},
+        dropTrigger: '',
+        depart: {},
+        columns: columns,
+        disableSubmit: false,
+        checkedKeys: [],
+        selectedKeys: [],
+        autoIncr: 1,
+        currSelected: {},
+
+        allTreeKeys:[],
+        loadTreeKeys:[],
+        checkStrictly: true,
+        labelCol: {
+          xs: {span: 24},
+          sm: {span: 5}
+        },
+        wrapperCol: {
+          xs: {span: 24},
+          sm: {span: 16}
+        },
+        graphDatasource: {
+          nodes: [],
+          edges: []
+        },
+        validatorRules: {
+          departName: [{required: true, message: '请输入机构/部门名称!'}],
+          orgCode: [{required: true, message: '请输入机构编码!'}],
+          orgCategory: [{required: true, message: '请输入机构类型!'}],
+          mobile: [{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.departTreeAll = []
+        //所有的树信息
+        that.departTree = []
+        //所有的树节点key信息
+        that.allIds = []
+        
+        that.iExpandedKeys = []
+        
+        that.loading = false
+        queryDepartTreeSync().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.departTreeAll.push(temp)
+              that.departTree.push(temp)
+              that.allIds.push(temp.key)
+              that.allTreeKeys.push(temp.key)
+              if(that.loadTreeKeys.indexOf(temp.key)>=0){
+                that.iExpandedKeys.push(temp.key)
+              }
+            }
+            that.$nextTick(()=>{
+              that.loading = true
+            })
+          }
+        })
+      },
+      loadSubTree(treeNode) {
+        var that = this;
+        return new Promise(resolve => {
+          queryDepartTreeSync({pid:treeNode.dataRef.id}).then((res) =>  {
+            if (res.success) {
+              //判断chidlren是否为空，并修改isLeaf属性值
+              if(res.result.length == 0){
+                treeNode.dataRef['isLeaf']=true
+                return;
+              }else{
+                treeNode.dataRef['children']= res.result;
+              }
+              for (let i = 0; i < res.result.length; i++) {
+                let temp = res.result[i]
+                that.allIds.push(temp.key)
+                if(that.loadTreeKeys.indexOf(temp.key)>0){
+                  that.iExpandedKeys.push(temp.key)
+                }
+              }
+            }
+          })
+          resolve();
+        });
+        //保存全部部门信息，方便后面搜索使用
+        that.departTreeAll=that.departTree
+      },
+      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)
+        this.iExpandedKeys = expandedKeys
+        this.autoExpandParent = false
+        this.allTreeKeys=expandedKeys
+        this.loadTreeKeys=expandedKeys
+      },
+      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.departTree=that.departTreeAll
+        }
+
+      },
+      nodeModalOk() {
+        this.loadTree()
+      },
+      nodeModalClose() {
+      },
+      hide() {
+        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.model = cloneObject(record)
+        })
+      },
+      getCurrSelectedTitle() {
+        return !this.currSelected.title ? '' : this.currSelected.title
+      },
+      onClearSelected() {
+        this.hiding = true
+        this.checkedKeys = []
+        this.currSelected = {}
+        this.model = cloneObject(this.currSelected)
+        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.$refs.form.validate((ok, err) => {
+          if (ok) {
+            if (!this.currSelected.id) {
+              this.$message.warning('请点击选择要修改部门!')
+              return
+            }
+
+            let formData = Object.assign(this.currSelected, this.model)
+            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.model = this.currSelected
+      },
+      nodeSettingFormSubmit() {
+        this.$refs.form.validate((ok, err) => {
+          if (ok) {
+            console.log('Received values of form: ', this.model)
+          }
+        })
+      },
+      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[0])
+          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.model.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
+        //this.loadTree()
+      },
+      closeAll () {
+        this.iExpandedKeys = []
+      },
+      checkALL () {
+        this.checkStriccheckStrictlytly = false
+        //this.checkedKeys = this.allTreeKeys
+        this.checkedKeys = this.allIds
+      },
+      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:切换父子勾选模式 =======------>
+
+      // 验证手机号
+      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("您的手机号码格式不正确!");
+        }
+
+      },
+      onSyncFinally({isToLocal}) {
+        // 同步到本地时刷新下数据
+        if (isToLocal) {
+          this.loadData()
+        }
+      },
+    },
+    created() {
+      this.currFlowId = this.$route.params.id
+      this.currFlowName = this.$route.params.name
+      // this.loadTree()
+    },
+
+  }
+</script>
+<style scoped>
+  @import '~@assets/less/common.less';
+</style>
+<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按钮间距 */
+  .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>

jero-web/src/views/system/NewPermissionList.vue

@@ -214,9 +214,8 @@
       },
       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});
+        this.$refs.modalForm.edit({status:'1',permsType:'1',route:true,'parentId':record.id,menuType:1});
       },
       handleExpandedRowsChange(expandedRows) {
         this.expandedRowKeys = expandedRows

jero-web/src/views/system/PermissionList.vue

@@ -181,9 +181,8 @@
       },
       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});
+        this.$refs.modalForm.edit({status:'1',permsType:'1',route:true,'parentId':record.id,menuType:1});
       },
       handleExpandedRowsChange(expandedRows) {
         this.expandedRowKeys = expandedRows

jero-web/src/views/system/RoleUserList.vue

@@ -384,11 +384,8 @@
           this.$message.error('请选择一个角色!')
         } else {
           this.$refs.modalForm2.roleDisabled = true
-          this.$refs.modalForm2.selectedRole = [this.currentRoleId]
-
-          this.$refs.modalForm2.add()
-
           this.$refs.modalForm2.title = '新增'
+          this.$refs.modalForm2.edit({activitiSync:'1',userIdentity:1,selectedroles:this.currentRoleId})
         }
       },
       modalFormOk2() {

jero-web/src/views/system/SysCategoryList.vue

@@ -150,14 +150,16 @@
         })
       },
       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
-        })
+        if(result && result.length>0){
+          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){
         // 判断是否是展开状态

jero-web/src/views/system/UserList.vue

@@ -64,7 +64,7 @@
 
     <!-- 操作按钮区域 -->
     <div class="table-operator" style="border-top: 5px">
-      <a-button @click="handleAdd" type="primary" icon="plus" >添加用户</a-button>
+      <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>
@@ -119,7 +119,7 @@
         </template>
 
         <span slot="action" slot-scope="text, record">
-          <a @click="handleEdit(record)" >编辑</a>
+          <a @click="handleEdit(record)">编辑</a>
 
           <a-divider type="vertical"/>
 

jero-web/src/views/system/modules/DepartModal.vue

@@ -11,16 +11,17 @@
     cancelText="关闭">
 
     <a-spin :spinning="confirmLoading">
-      <a-form :form="form">
-        <a-form-item
+      <a-form-model ref="form" :model="model" :rules="validatorRules">
+        <a-form-model-item
           :labelCol="labelCol"
           :wrapperCol="wrapperCol"
           label="机构名称"
+          prop="departName"
           :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-input id="departName" placeholder="请输入机构/部门名称" v-model="model.departName"/>
+        </a-form-model-item>
+        <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" :hidden="seen" label="上级部门" hasFeedback>
         <a-tree-select
           style="width:100%"
           :dropdownStyle="{maxHeight:'200px',overflow:'auto'}"
@@ -29,20 +30,20 @@
           placeholder="请选择上级部门"
           :disabled="condition">
         </a-tree-select>
-        </a-form-item>
-        <a-form-item
+        </a-form-model-item>
+        <a-form-model-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 v-if="seen">
+            <a-radio-group v-model="model.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-group v-model="model.orgCategory" placeholder="请选择机构类型">
               <a-radio value="2">
                 部门
               </a-radio>
@@ -50,40 +51,41 @@
                 岗位
               </a-radio>
             </a-radio-group>
-          </template>
-        </a-form-item>
-        <a-form-item
+       </template>
+        </a-form-model-item>
+        <a-form-model-item
           :labelCol="labelCol"
           :wrapperCol="wrapperCol"
+          prop="mobile"
           label="电话">
-          <a-input placeholder="请输入电话" v-decorator="['mobile',validatorRules.mobile]" />
-        </a-form-item>
-        <a-form-item
+          <a-input placeholder="请输入电话" v-model="model.mobile"/>
+        </a-form-model-item>
+        <a-form-model-item
           :labelCol="labelCol"
           :wrapperCol="wrapperCol"
           label="传真">
-          <a-input placeholder="请输入传真" v-decorator="['fax', {}]"  />
-        </a-form-item>
-        <a-form-item
+          <a-input placeholder="请输入传真" v-model="model.fax"/>
+        </a-form-model-item>
+        <a-form-model-item
           :labelCol="labelCol"
           :wrapperCol="wrapperCol"
           label="地址">
-          <a-input placeholder="请输入地址" v-decorator="['address', {}]"  />
-        </a-form-item>
-        <a-form-item
+          <a-input placeholder="请输入地址" v-model="model.address"/>
+        </a-form-model-item>
+        <a-form-model-item
           :labelCol="labelCol"
           :wrapperCol="wrapperCol"
           label="排序">
-          <a-input-number v-decorator="[ 'departOrder',{'initialValue':0}]" />
-        </a-form-item>
-        <a-form-item
+          <a-input-number v-model="model.departOrder"/>
+        </a-form-model-item>
+        <a-form-model-item
           :labelCol="labelCol"
           :wrapperCol="wrapperCol"
           label="备注">
-          <a-textarea placeholder="请输入备注" v-decorator="['memo', {}]"  />
-        </a-form-item>
+          <a-textarea placeholder="请输入备注" v-model="model.memo"/>
+        </a-form-model-item>
 
-      </a-form>
+      </a-form-model>
     </a-spin>
   </a-modal>
 </template>
@@ -107,7 +109,10 @@
         visible: false,
         condition:true,
         disableSubmit:false,
-        model: {},
+        model: {
+          departOrder:0,
+          orgCategory:'1'
+        },
         menuhidden:false,
         menuusing:true,
         labelCol: {
@@ -120,11 +125,11 @@
         },
 
         confirmLoading: false,
-        form: this.$form.createForm(this),
         validatorRules:{
-        departName:{rules: [{ required: true, message: '请输入机构/部门名称!' }]},
-        orgCode:{rules: [{ required: true, message: '请输入机构编码!' }]},
-         mobile:{rules: [{validator:this.validateMobile}]}
+          departName:[{ required: true, message: '请输入机构/部门名称!' }],
+          orgCode:[{ required: true, message: '请输入机构编码!' }],
+          mobile: [{validator:this.validateMobile}],
+          orgCategory:[{required: true, message: '请输入机构类型!'}]
         },
         url: {
           add: "/sys/sysDepart/add",
@@ -159,8 +164,6 @@
         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;
@@ -169,25 +172,20 @@
           }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;
+        this.$refs.form.resetFields();
       },
       handleOk () {
         const that = this;
         // 触发表单验证
-        this.form.validateFields((err, values) => {
-          if (!err) {
+        this.$refs.form.validate(valid => {
+          if (valid) {
             that.confirmLoading = true;
-            let formData = Object.assign(this.model, values);
-            //时间格式化
-            console.log(formData)
-            httpAction(this.url.add,formData,"post").then((res)=>{
+            httpAction(this.url.add,this.model,"post").then((res)=>{
               if(res.success){
                 that.$message.success(res.message);
                 that.loadTreeData();
@@ -199,7 +197,8 @@
               that.confirmLoading = false;
               that.close();
             })
-
+          }else{
+            return false;
           }
         })
       },

jero-web/src/views/system/modules/DepartWindow.vue

@@ -38,11 +38,9 @@
   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 {

jero-web/src/views/system/modules/DeptUserInfo.vue

@@ -10,11 +10,6 @@
               <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>
@@ -76,7 +71,7 @@
             </a>
             <a-menu slot="overlay">
                 <a-menu-item>
-                <a href="javascript:;" @click="handleDeptRole(record)">分配部门角色</a>
+                <a href="javascript:;" @click="handleDeptRole(record)">部门角色</a>
               </a-menu-item>
 
               <a-menu-item>
@@ -294,12 +289,9 @@
         } else {
           this.$refs.modalForm.departDisabled = true;
           //初始化负责部门
-          this.$refs.modalForm.userDepartModel.departIdList = [this.currentDeptId];  //传入一个部门id
-          this.$refs.modalForm.add();
-          //update-begin---author:liusq   Date:20210223  for：https://gitee.com/jeecg/jeecg-boot/issues/I2SDU1------------
-          this.$refs.modalForm.resultDepartOptions=[{key:this.currentDept.key,title:this.currentDept.title}]
-          //update-end---author:liusq   Date:20210223  for：https://gitee.com/jeecg/jeecg-boot/issues/I2SDU1------------
+          this.$refs.modalForm.nextDepartOptions=[{value:this.currentDept.key,label:this.currentDept.title}]
           this.$refs.modalForm.title = "新增";
+          this.$refs.modalForm.edit({activitiSync:'1',userIdentity:1,selecteddeparts:this.currentDeptId})
         }
       },
       selectOK(data) {

jero-web/src/views/system/modules/DictItemModal.vue

@@ -9,46 +9,48 @@
     cancelText="关闭"
   >
     <a-spin :spinning="confirmLoading">
-      <a-form :form="form">
+      <a-form-model  ref="form" :model="model" :rules="validatorRules">
 
-        <a-form-item
+        <a-form-model-item
           :labelCol="labelCol"
           :wrapperCol="wrapperCol"
+          prop="itemText"
           label="名称">
-          <a-input placeholder="请输入名称" v-decorator.trim="['itemText', validatorRules.itemText]"/>
-        </a-form-item>
+          <a-input placeholder="请输入名称" v-model="model.itemText"/>
+        </a-form-model-item>
 
-        <a-form-item
+        <a-form-model-item
           :labelCol="labelCol"
           :wrapperCol="wrapperCol"
+          prop="itemValue"
           label="数据值">
-          <a-input placeholder="请输入数据值" v-decorator.trim="['itemValue', validatorRules.itemValue]"/>
-        </a-form-item>
+          <a-input placeholder="请输入数据值" v-model="model.itemValue" />
+        </a-form-model-item>
 
-        <a-form-item
+        <a-form-model-item
           :labelCol="labelCol"
           :wrapperCol="wrapperCol"
           label="描述">
-          <a-input v-decorator="['description']"/>
-        </a-form-item>
+          <a-input v-model="model.description" />
+        </a-form-model-item>
 
-        <a-form-item
+        <a-form-model-item
           :labelCol="labelCol"
           :wrapperCol="wrapperCol"
           label="排序值">
-          <a-input-number :min="1" v-decorator="['sortOrder',{'initialValue':1}]"/>
-          值越小越靠前，支持小数
-        </a-form-item>
+          <a-input-number :min="1" v-model="model.sortOrder" />
+          值越小越靠前
+        </a-form-model-item>
 
-        <a-form-item
+        <a-form-model-item
           :labelCol="labelCol"
           :wrapperCol="wrapperCol"
           label="是否启用"
           hasFeedback>
           <a-switch checkedChildren="启用" unCheckedChildren="禁用" @change="onChose" v-model="visibleCheck"/>
-        </a-form-item>
+        </a-form-model-item>
 
-      </a-form>
+      </a-form-model>
     </a-spin>
   </a-modal>
 </template>
@@ -77,10 +79,9 @@
           sm: {span: 16},
         },
         confirmLoading: false,
-        form: this.$form.createForm(this),
         validatorRules: {
-          itemText: {rules: [{required: true, message: '请输入名称!'}]},
-          itemValue: {rules: [{required: true, message: '请输入数据值!'},{validator: this.validateItemValue}]},
+          itemText:  [{required: true, message: '请输入名称!'}],
+          itemValue:  [{required: true, message: '请输入数据值!'},{validator: this.validateItemValue}],
         },
       }
     },
@@ -89,22 +90,19 @@
     methods: {
       add(dictId) {
         this.dictId = dictId;
-        this.edit({});
+        //初始化默认值
+        this.edit({sortOrder:1,status:1});
       },
       edit(record) {
         if (record.id) {
           this.dictId = record.dictId;
-          this.status = record.status;
-          this.visibleCheck = (record.status == 1) ? true : false;
         }
-        this.form.resetFields();
+        this.status = record.status;
+        this.visibleCheck = (record.status == 1) ? true : false;
         this.model = Object.assign({}, record);
         this.model.dictId = this.dictId;
         this.model.status = this.status;
         this.visible = true;
-        this.$nextTick(() => {
-          this.form.setFieldsValue(pick(this.model, 'itemText', 'itemValue', 'description', 'sortOrder'))
-        });
       },
       onChose(checked) {
         if (checked) {
@@ -119,19 +117,18 @@
       handleOk() {
         const that = this;
         // 触发表单验证
-        this.form.validateFields((err, values) => {
-          if (!err) {
+        this.$refs.form.validate(valid => {
+          if (valid) {
             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;
+            this.model.itemText = (this.model.itemText || '').trim()
+            this.model.itemValue = (this.model.itemValue || '').trim()
+            this.model.description = (this.model.description || '').trim()
+            this.model.status = this.status;
             let obj;
             if (!this.model.id) {
-              obj = addDictItem(formData);
+              obj = addDictItem(this.model);
             } else {
-              obj = editDictItem(formData);
+              obj = editDictItem(this.model);
             }
             obj.then((res) => {
               if (res.success) {
@@ -144,6 +141,8 @@
               that.confirmLoading = false;
               that.close();
             })
+          }else{
+            return false;
           }
         })
       },
@@ -154,6 +153,7 @@
       close() {
         this.$emit('close');
         this.visible = false;
+        this.$refs.form.resetFields();
       },
       validateItemValue(rule, value, callback){
         let param = {

jero-web/src/views/system/modules/DictModal.vue

@@ -9,30 +9,34 @@
     cancelText="关闭"
   >
     <a-spin :spinning="confirmLoading">
-      <a-form :form="form">
+      <a-form-model ref="form" :model="model" :rules="validatorRules">
 
-        <a-form-item
+        <a-form-model-item
           :labelCol="labelCol"
           :wrapperCol="wrapperCol"
+          prop="dictName"
+          required
           label="字典名称">
-          <a-input placeholder="请输入字典名称" v-decorator.trim="[ 'dictName', validatorRules.dictName]"/>
-        </a-form-item>
+          <a-input placeholder="请输入字典名称" v-model="model.dictName"/>
+        </a-form-model-item>
 
-        <a-form-item
+        <a-form-model-item
           :labelCol="labelCol"
           :wrapperCol="wrapperCol"
+          prop="dictCode"
+          required
           label="字典编码">
-          <a-input placeholder="请输入字典编码" v-decorator.trim="[ 'dictCode', validatorRules.dictCode]"/>
-        </a-form-item>
+          <a-input placeholder="请输入字典编码" v-model="model.dictCode"/>
+        </a-form-model-item>
 
-        <a-form-item
+        <a-form-model-item
           :labelCol="labelCol"
           :wrapperCol="wrapperCol"
           label="描述">
-          <a-input v-decorator="[ 'description']"/>
-        </a-form-item>
+          <a-input v-model="model.description"/>
+        </a-form-model-item>
 
-      </a-form>
+      </a-form-model>
     </a-spin>
   </a-modal>
 </template>
@@ -58,13 +62,11 @@
           sm: { span: 16 }
         },
         confirmLoading: false,
-        form: this.$form.createForm(this),
         validatorRules: {
-          dictName: { rules: [{ required: true, message: '请输入字典名称!' }] },
-          dictCode: {
-            rules: [{ required: true, message: '请输入字典编码!' },
-              { validator: this.validateDictCode }]
-          }
+          dictName: [{ required: true, message: '请输入字典名称!' }],
+          dictCode: [
+            { required: true, message: '请输入字典编码!' },
+            { validator: this.validateDictCode }]
         }
       }
     },
@@ -99,30 +101,26 @@
         } 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) {
+        this.$refs.form.validate(valid => {
+          if (valid) {
             that.confirmLoading = true
-            values.dictName = (values.dictName || '').trim()
-            values.dictCode = (values.dictCode || '').trim()
-            values.description = (values.description || '').trim()
+            this.model.dictName = (this.model.dictName || '').trim()
+            this.model.dictCode = (this.model.dictCode || '').trim()
+            this.model.description = (this.model.description || '').trim()
             let formData = Object.assign(this.model, values)
             let obj
             console.log(formData)
             if (!this.model.id) {
-              obj = addDict(formData)
+              obj = addDict(this.model)
             } else {
-              obj = editDict(formData)
+              obj = editDict(this.model)
             }
             obj.then((res) => {
               if (res.success) {
@@ -135,6 +133,8 @@
               that.confirmLoading = false
               that.close()
             })
+          }else{
+            return false;
           }
         })
       },
@@ -145,6 +145,7 @@
       close() {
         this.$emit('close')
         this.visible = false
+        this.$refs.form.resetFields();
       }
     }
   }

jero-web/src/views/system/modules/PermissionDataRuleModal.vue

@@ -9,51 +9,55 @@
     cancelText="关闭">
 
     <a-spin :spinning="confirmLoading">
-      <a-form :form="form">
+      <a-form-model ref="form" :model="model" :rules="validatorRules">
 
-        <a-form-item
+        <a-form-model-item
           :labelCol="labelCol"
           :wrapperCol="wrapperCol"
+          prop="ruleName"
           label="规则名称">
-          <a-input placeholder="请输入规则名称" v-decorator="['ruleName', validatorRules.ruleName]"/>
-        </a-form-item>
-        <a-form-item
+          <a-input placeholder="请输入规则名称" v-model="model.ruleName"/>
+        </a-form-model-item>
+        <a-form-model-item
           v-show="showRuleColumn"
           :labelCol="labelCol"
           :wrapperCol="wrapperCol"
+          prop="ruleColumn"
           label="规则字段">
-          <a-input placeholder="请输入规则字段" v-decorator="['ruleColumn', validatorRules.ruleColumn]"/>
-        </a-form-item>
-        <a-form-item
+          <a-input placeholder="请输入规则字段" v-model.trim="model.ruleColumn"/>
+        </a-form-model-item>
+        <a-form-model-item
           :labelCol="labelCol"
           :wrapperCol="wrapperCol"
+          prop="ruleConditions"
           label="条件规则">
-          <j-dict-select-tag @change="handleChangeRuleCondition" v-decorator="['ruleConditions', validatorRules.ruleConditions]" placeholder="请输入条件规则" :triggerChange="true" dictCode="rule_conditions"/>
-        </a-form-item>
-        <a-form-item
+          <j-dict-select-tag @input="handleChangeRuleCondition" v-model="model.ruleConditions" placeholder="请输入条件规则" dictCode="rule_conditions"/>
+        </a-form-model-item>
+        <a-form-model-item
           :labelCol="labelCol"
           :wrapperCol="wrapperCol"
+          prop="ruleValue"
           label="规则值">
-          <a-input placeholder="请输入规则值" v-decorator="['ruleValue', validatorRules.ruleValue]"/>
-        </a-form-item>
+          <a-input placeholder="请输入规则值" v-model.trim="model.ruleValue"/>
+        </a-form-model-item>
 
-        <a-form-item
+        <a-form-model-item
           :labelCol="labelCol"
           :wrapperCol="wrapperCol"
           label="状态">
-          <a-radio-group buttonStyle="solid" v-decorator="['status',{initialValue:'1'}]">
+          <a-radio-group buttonStyle="solid" v-model="model.status">
             <a-radio-button value="1">有效</a-radio-button>
             <a-radio-button value="0">无效</a-radio-button>
           </a-radio-group>
-        </a-form-item>
+        </a-form-model-item>
 
-      </a-form>
+      </a-form-model>
     </a-spin>
   </a-modal>
 </template>
+
 <script>
   import { httpAction } from '@/api/manage'
-  import pick from 'lodash.pick'
 
   export default {
     name: 'PermissionDataRuleModal',
@@ -73,13 +77,12 @@
           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: []}
+          ruleConditions:  [{required: true, message: '请选择条件!'}],
+          ruleName:[{required: true, message: '请输入规则名称!'}],
+          ruleValue:  [{required: true, message: '请输入规则值!'}],
+          ruleColumn: []
         },
         url: {
           list: '/sys/dictItem/page',
@@ -94,10 +97,10 @@
     methods: {
       add(permId) {
         this.permissionId = permId
-        this.edit({})
+        //初始化默认值
+        this.edit({status:'1'})
       },
       edit(record) {
-        this.form.resetFields()
         this.model = Object.assign({}, record)
         if (record.permissionId) {
           this.model.permissionId = record.permissionId
@@ -106,19 +109,17 @@
         }
         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
+        this.$refs.form.resetFields()
       },
       handleOk() {
         const that = this
         // 触发表单验证
-        this.form.validateFields((err, values) => {
-          if (!err) {
+        this.$refs.form.validate(valid => {
+          if (valid) {
             that.confirmLoading = true
             let httpurl = ''
             let method = ''
@@ -129,14 +130,8 @@
               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) => {
+
+            httpAction(httpurl, this.model, method).then((res) => {
               if (res.success) {
                 that.$message.success(res.message)
                 that.$emit('ok')
@@ -147,6 +142,8 @@
               that.confirmLoading = false
               that.close()
             })
+          }else{
+            return false;
           }
         })
       },
@@ -162,9 +159,7 @@
       },
       handleChangeRuleCondition(val){
         if(val=='USE_SQL_RULES'){
-          this.form.setFieldsValue({
-            ruleColumn:''
-          })
+          this.model.ruleColumn=''
           this.showRuleColumn = false
         }else{
           this.showRuleColumn = true

jero-web/src/views/system/modules/PermissionModal.vue

@@ -8,27 +8,28 @@
 
     <div :style="{width: '100%',border: '1px solid #e9e9e9',padding: '10px 16px',background: '#fff',}">
     <a-spin :spinning="confirmLoading">
-      <a-form :form="form">
+      <a-form-model ref="form" :model="model" :rules="validatorRules">
 
-        <a-form-item label="菜单类型" :labelCol="labelCol" :wrapperCol="wrapperCol" >
-          <a-radio-group @change="onChangeMenuType" v-decorator="['menuType',{'initialValue':localMenuType}]">
+        <a-form-model-item label="菜单类型" :labelCol="labelCol" :wrapperCol="wrapperCol" >
+          <a-radio-group @change="onChangeMenuType" v-model="model.menuType">
             <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-model-item>
 
-        <a-form-item
+        <a-form-model-item
           :labelCol="labelCol"
           :wrapperCol="wrapperCol"
           :label="menuLabel"
+          prop="name"
           hasFeedback >
-          <a-input placeholder="请输入菜单名称" v-decorator="[ 'name', validatorRules.name]" :readOnly="disableSubmit"/>
-        </a-form-item>
+          <a-input placeholder="请输入菜单名称" v-model="model.name" :readOnly="disableSubmit"/>
+        </a-form-model-item>
 
 
-        <a-form-item
-          v-show="localMenuType!=0"
+        <a-form-model-item
+          v-show="model.menuType!=0"
           label="上级菜单"
           :labelCol="labelCol"
           :wrapperCol="wrapperCol"
@@ -45,58 +46,61 @@
             :disabled="disableSubmit"
             @change="handleParentIdChange">
           </a-tree-select>
-        </a-form-item>
+        </a-form-model-item>
 
-        <a-form-item
+        <a-form-model-item
           :labelCol="labelCol"
           :wrapperCol="wrapperCol"
+          prop="url"
           label="菜单路径">
-          <a-input placeholder="请输入菜单路径" v-decorator="[ 'url',validatorRules.url]" :readOnly="disableSubmit"/>
-        </a-form-item>
+          <a-input placeholder="请输入菜单路径" v-model="model.url" :readOnly="disableSubmit"/>
+        </a-form-model-item>
 
-        <a-form-item
+        <a-form-model-item
           v-show="show"
           :labelCol="labelCol"
           :wrapperCol="wrapperCol"
+          prop="component"
           label="前端组件">
-          <a-input placeholder="请输入前端组件" v-decorator="[ 'component',validatorRules.component]" :readOnly="disableSubmit"/>
-        </a-form-item>
+          <a-input placeholder="请输入前端组件" v-model="model.component" :readOnly="disableSubmit"/>
+        </a-form-model-item>
 
-        <a-form-item
-          v-show="localMenuType==0"
+        <a-form-model-item
+          v-show="model.menuType==0"
           :labelCol="labelCol"
           :wrapperCol="wrapperCol"
           label="默认跳转地址">
-          <a-input placeholder="请输入路由参数 redirect" v-decorator="[ 'redirect',{}]" :readOnly="disableSubmit"/>
-        </a-form-item>
+          <a-input placeholder="请输入路由参数 redirect" v-model="model.redirect" :readOnly="disableSubmit"/>
+        </a-form-model-item>
 
-        <a-form-item
+        <a-form-model-item
           v-show="!show"
           :labelCol="labelCol"
           :wrapperCol="wrapperCol"
+          prop="perms"
           label="授权标识">
-          <a-input placeholder="请输入授权标识, 如: user:list" v-decorator="[ 'perms', {rules:[{ required: false, message: '请输入授权标识!' },{validator: this.validatePerms }]}]" :readOnly="disableSubmit"/>
-        </a-form-item>
+          <a-input placeholder="请输入授权标识, 如: user:list" v-model="model.perms" :readOnly="disableSubmit"/>
+        </a-form-model-item>
 
-        <a-form-item
+        <a-form-model-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"/>
+          <j-dict-select-tag  v-model="model.permsType" placeholder="请选择授权策略" :type="'radio'"  dictCode="global_perms_type"/>
 
 
-        </a-form-item>
-        <a-form-item
+        </a-form-model-item>
+        <a-form-model-item
           v-show="!show"
           :labelCol="labelCol"
           :wrapperCol="wrapperCol"
           label="状态">
-          <j-dict-select-tag  v-decorator="['status', {}]" placeholder="请选择状态" :type="'radio'" :triggerChange="true" dictCode="valid_status"/>
+          <j-dict-select-tag v-model="model.status" placeholder="请选择状态" :type="'radio'" dictCode="valid_status"/>
 
-        </a-form-item>
+        </a-form-model-item>
 
-        <a-form-item
+        <a-form-model-item
           v-show="show"
           :labelCol="labelCol"
           :wrapperCol="wrapperCol"
@@ -104,61 +108,59 @@
           <a-input placeholder="点击选择图标" v-model="model.icon" :readOnly="disableSubmit">
             <a-icon slot="addonAfter" type="setting" @click="selectIcons" />
           </a-input>
-        </a-form-item>
+        </a-form-model-item>
 
-        <a-form-item
+        <a-form-model-item
           v-show="show"
           :labelCol="labelCol"
           :wrapperCol="wrapperCol"
+          prop="sortNo"
           label="排序">
-          <a-input-number placeholder="请输入菜单排序" style="width: 200px" v-decorator="[ 'sortNo',validatorRules.sortNo]" :readOnly="disableSubmit"/>
-        </a-form-item>
+          <a-input-number placeholder="请输入菜单排序" v-model="model.sortNo" style="width: 200px" :readOnly="disableSubmit"/>
+        </a-form-model-item>
 
-        <a-form-item
+        <a-form-model-item
           v-show="show"
           :labelCol="labelCol"
           :wrapperCol="wrapperCol"
           label="是否路由菜单">
-          <a-switch checkedChildren="是" unCheckedChildren="否" v-model="routeSwitch"/>
-        </a-form-item>
+          <a-switch checkedChildren="是" unCheckedChildren="否" v-model="model.route"/>
+        </a-form-model-item>
 
-        <a-form-item
+        <a-form-model-item
           v-show="show"
           :labelCol="labelCol"
           :wrapperCol="wrapperCol"
           label="隐藏路由">
-          <a-switch checkedChildren="是" unCheckedChildren="否" v-model="menuHidden"/>
-        </a-form-item>
+          <a-switch checkedChildren="是" unCheckedChildren="否" v-model="model.hidden"/>
+        </a-form-model-item>
 
-        <a-form-item
+        <a-form-model-item
           v-show="show"
           :labelCol="labelCol"
           :wrapperCol="wrapperCol"
           label="是否缓存路由">
-          <a-switch checkedChildren="是" unCheckedChildren="否" v-model="isKeepalive"/>
-        </a-form-item>
+          <a-switch checkedChildren="是" unCheckedChildren="否" v-model="model.keepAlive"/>
+        </a-form-model-item>
 
 
-        <a-form-item
+        <a-form-model-item
           v-show="show"
           :labelCol="labelCol"
           :wrapperCol="wrapperCol"
           label="聚合路由">
-          <a-switch checkedChildren="是" unCheckedChildren="否" v-model="alwaysShow"/>
-        </a-form-item>
+          <a-switch checkedChildren="是" unCheckedChildren="否" v-model="model.alwaysShow"/>
+        </a-form-model-item>
 
-        <!--update_begin author:wuxianquan date:20190908 for:增加组件，外链打开方式可选 -->
-        <a-form-item
+        <a-form-model-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-switch checkedChildren="外部" unCheckedChildren="内部" v-model="model.internalOrExternal"/>
+        </a-form-model-item>
 
-
-      </a-form>
+      </a-form-model>
 
       <!-- 选择图标 -->
       <icons @choose="handleIconChoose" @close="handleIconCancel" :iconChooseVisible="iconChooseVisible"></icons>
@@ -176,7 +178,6 @@
 <script>
   import {addPermission,editPermission,queryTreeList, duplicateCheck} from '@/api/api'
   import Icons from './icon/Icons'
-  import pick from 'lodash.pick'
 
   export default {
     name: "PermissionModal",
@@ -185,22 +186,12 @@
       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 },
@@ -209,10 +200,7 @@
           xs: { span: 24 },
           sm: { span: 16 },
         },
-
         confirmLoading: false,
-        form: this.$form.createForm(this),
-
         iconChooseVisible: false,
         validateStatus:""
       }
@@ -220,16 +208,15 @@
     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},
+          name:[{ required: true, message: '请输入菜单标题!' }],
+          component:[{ required: this.show, message: '请输入前端组件!' }],
+          url: [{ required: this.show, message: '请输入菜单路径!' }],
+          permsType: [{ required: true, message: '请输入授权策略!' }],
+          perms:[{ required: false, message: '请输入授权标识!' },{validator: this.validatePerms }]
         }
       }
     },
     created () {
-      this.initDictConfig();
     },
     methods: {
       loadTree(){
@@ -247,74 +234,34 @@
         });
       },
       add () {
-        // 默认值
-        this.edit({status:'1',permsType:'1',route:true});
+        //初始化默认值
+        this.edit({status:'1', permsType:'1', sortNo:1.0, route:true, menuType:0 });
       },
       edit (record) {
         this.resetScreenSize(); // 调用此方法,根据屏幕宽度自适应调整抽屉的宽度
-        this.form.resetFields();
         this.model = Object.assign({}, 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: ',record)
         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','redirect','url','sortNo','menuType','status');
-        this.$nextTick(() => {
-          this.form.setFieldsValue(fieldsVal)
-        });
       },
       close () {
         this.$emit('close');
         this.disableSubmit = false;
         this.visible = false;
+        this.$refs.form.resetFields();
       },
       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) {
+        this.$refs.form.validate(valid => {
+          if (valid) {
+            if ((this.model.menuType == 1 || this.model.menuType == 2) && !this.model.parentId) {
               that.validateStatus = 'error';
               that.$message.error("请检查你填的类型以及信息是否正确！");
               return;
@@ -324,9 +271,9 @@
             that.confirmLoading = true;
             let obj;
             if (!this.model.id) {
-              obj = addPermission(formData);
+              obj = addPermission(this.model);
             } else {
-              obj = editPermission(formData);
+              obj = editPermission(this.model);
             }
             obj.then((res) => {
               if (res.success) {
@@ -339,6 +286,8 @@
               that.confirmLoading = false;
               that.close();
             });
+          }else{
+            return false;
           }
         })
       },
@@ -373,8 +322,7 @@
         }
       },
       onChangeMenuType(e) {
-        this.localMenuType=e.target.value
-        if(e.target.value == 2){
+        if(this.model.menuType == 2){
           this.show = false;
           this.menuLabel = '按钮/权限';
         }else{
@@ -382,7 +330,7 @@
           this.menuLabel = '菜单名称';
         }
         this.$nextTick(() => {
-          this.form.validateFields(['url','component'], { force: true });
+          this.$refs.form.validateField(['url','component']);
         });
       },
       selectIcons(){
@@ -393,7 +341,6 @@
       },
       handleIconChoose (value) {
         this.model.icon = value
-        this.form.icon = value
         this.iconChooseVisible = false
       },
       // 根据屏幕变化,设置抽屉尺寸
@@ -405,8 +352,6 @@
           this.drawerWidth = 700;
         }
       },
-      initDictConfig() {
-      },
       handleParentIdChange(value){
         if(!value){
           this.validateStatus="error"

jero-web/src/views/system/modules/RoleModal.vue

@@ -11,38 +11,23 @@
     style="top:5%;height: 85%;overflow-y: hidden">
 
     <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="请输入角色编码" :disabled="roleDisabled" v-decorator="[ 'roleCode', validatorRules.roleCode]" />
-        </a-form-item>
-
-        <a-form-item
-          :labelCol="labelCol"
-          :wrapperCol="wrapperCol"
-          label="描述">
-          <a-textarea :rows="5" placeholder="..." v-decorator="[ 'description', validatorRules.description ]" />
-        </a-form-item>
-
-      </a-form>
+      <a-form-model ref="form"  v-bind="layout"  :model="model" :rules="validatorRules">
+        <a-form-model-item label="角色编码" required prop="roleCode">
+          <a-input v-model="model.roleCode" :disabled="roleDisabled"  placeholder="请输入角色编码"/>
+        </a-form-model-item>
+        <a-form-model-item label="角色名称" required prop="roleName">
+          <a-input v-model="model.roleName" placeholder="请输入角色名称"/>
+        </a-form-model-item>
+        <a-form-model-item label="描述" prop="description">
+          <a-textarea :rows="5" v-model="model.description" placeholder="请输入角色描述"/>
+        </a-form-model-item>
+      </a-form-model>
     </a-spin>
   </a-modal>
 </template>
 
 <script>
-  import pick from 'lodash.pick'
   import {addRole,editRole,duplicateCheck } from '@/api/api'
-
   export default {
     name: "RoleModal",
     data () {
@@ -51,76 +36,61 @@
         visible: false,
         roleDisabled: false,
         model: {},
-        labelCol: {
-          xs: { span: 24 },
-          sm: { span: 5 },
-        },
-        wrapperCol: {
-          xs: { span: 24 },
-          sm: { span: 16 },
+        layout: {
+          labelCol: { span: 3 },
+          wrapperCol: { span: 14 },
         },
         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' }
-            ]}
+          roleName: [
+            { required: true, message: '请输入角色名称!' },
+            { min: 2, max: 30, message: '长度在 2 到 30 个字符', trigger: 'blur' }
+          ],
+          roleCode: [
+            { required: true, message: '请输入角色名称!'},
+            { min: 0, max: 64, message: '长度不超过 64 个字符', trigger: 'blur' },
+            { validator: this.validateRoleCode}
+          ],
+          description: [
+            { min: 0, max: 126, message: '长度不超过 126 个字符', trigger: 'blur' }
+          ]
         },
       }
     },
     created () {
+      //备份model原始值
+      this.modelDefault = JSON.parse(JSON.stringify(this.model));
     },
     methods: {
       add () {
-        this.edit({});
+        this.edit(this.modelDefault);
       },
       edit (record) {
-        this.form.resetFields();
         this.model = Object.assign({}, record);
         this.visible = true;
-
         //编辑页面禁止修改角色编码
         if(this.model.id){
           this.roleDisabled = true;
         }else{
           this.roleDisabled = false;
         }
-        this.$nextTick(() => {
-          this.form.setFieldsValue(pick(this.model,'roleName', 'description','roleCode'))
-        });
-
       },
       close () {
+        this.$refs.form.clearValidate();
         this.$emit('close');
         this.visible = false;
       },
       handleOk () {
         const that = this;
         // 触发表单验证
-        this.form.validateFields((err, values) => {
-          if (!err) {
+        this.$refs.form.validate(valid => {
+          if (valid) {
             that.confirmLoading = true;
-            values.roleName = (values.roleName || '').trim()
-            values.roleCode = (values.roleCode || '').trim()
-            let formData = Object.assign(this.model, values);
             let obj;
-            console.log(formData)
             if(!this.model.id){
-              obj=addRole(formData);
+              obj=addRole(this.model);
             }else{
-              obj=editRole(formData);
+              obj=editRole(this.model);
             }
             obj.then((res)=>{
               if(res.success){
@@ -133,6 +103,8 @@
               that.confirmLoading = false;
               that.close();
             })
+          }else{
+            return false;
           }
         })
       },
@@ -143,7 +115,7 @@
         if(/[\u4E00-\u9FA5]/g.test(value)){
           callback("角色编码不可输入汉字!");
         }else{
-          var params = {
+          let params = {
             tableName: "sys_role",
             fieldName: "role_code",
             fieldVal: value,
@@ -158,7 +130,6 @@
           });
         }
       }
-
     }
   }
 </script>

jero-web/src/views/system/modules/SysAnnouncementModal.vue

@@ -11,59 +11,63 @@
     cancelText="关闭">
 
     <a-spin :spinning="confirmLoading">
-      <a-form :form="form">
+      <a-form-model ref="form" :model="model" :rules="validatorRules">
         <a-row style="width: 100%;">
           <a-col :span="24/2">
-            <a-form-item
+            <a-form-model-item
               :labelCol="labelCol"
               :wrapperCol="wrapperCol"
+              prop="titile"
               label="标题">
-              <a-input placeholder="请输入标题" v-decorator="['titile', validatorRules.title]" :readOnly="disableSubmit"/>
-            </a-form-item>
+              <a-input placeholder="请输入标题" v-model="model.titile" :readOnly="disableSubmit"/>
+            </a-form-model-item>
           </a-col>
           <a-col :span="24/2">
-            <a-form-item
+            <a-form-model-item
               :labelCol="labelCol"
               :wrapperCol="wrapperCol"
+              prop="msgCategory"
               label="消息类型">
               <a-select
-                v-decorator="[ 'msgCategory', validatorRules.msgCategory]"
+                v-model="model.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-form-model-item>
           </a-col>
         </a-row>
         <a-row style="width: 100%;">
           <a-col :span="24/2">
-            <a-form-item
+            <a-form-model-item
               :labelCol="labelCol"
               :wrapperCol="wrapperCol"
+              prop="startTime"
               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>
+              <j-date style="width: 100%" :getCalendarContainer="node => node.parentNode" v-model="model.startTime"  placeholder="请选择开始时间" showTime dateFormat="YYYY-MM-DD HH:mm:ss" ></j-date>
+            </a-form-model-item>
           </a-col>
           <a-col :span="24/2">
-            <a-form-item
+            <a-form-model-item
               :labelCol="labelCol"
               :wrapperCol="wrapperCol"
+              prop="endTime"
               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>
+              <j-date style="width: 100%" :getCalendarContainer="node => node.parentNode" v-model="model.endTime" placeholder="请选择结束时间" showTime dateFormat="YYYY-MM-DD HH:mm:ss"></j-date>
+            </a-form-model-item>
           </a-col>
         </a-row>
         <a-row style="width: 100%;">
           <a-col :span="24/2">
-            <a-form-item
+            <a-form-model-item
               :labelCol="labelCol"
               :wrapperCol="wrapperCol"
               label="优先级">
               <a-select
-                v-decorator="[ 'priority', {}]"
+                v-model="model.priority"
                 placeholder="请选择优先级"
                 :disabled="disableSubmit"
                 :getPopupContainer = "(target) => target.parentNode">
@@ -71,15 +75,16 @@
                 <a-select-option value="M">中</a-select-option>
                 <a-select-option value="H">高</a-select-option>
               </a-select>
-            </a-form-item>
+            </a-form-model-item>
           </a-col>
           <a-col :span="24/2">
-            <a-form-item
+            <a-form-model-item
               :labelCol="labelCol"
               :wrapperCol="wrapperCol"
+              prop="msgType"
               label="通告类型">
               <a-select
-                v-decorator="[ 'msgType', validatorRules.msgType]"
+                v-model="model.msgType"
                 placeholder="请选择通告类型"
                 :disabled="disableSubmit"
                 @change="chooseMsgType"
@@ -87,20 +92,21 @@
                 <a-select-option value="USER">指定用户</a-select-option>
                 <a-select-option value="ALL">全体用户</a-select-option>
               </a-select>
-            </a-form-item>
+            </a-form-model-item>
           </a-col>
         </a-row>
         <a-row style="width: 100%;">
           <a-col :span="24/2">
-            <a-form-item
+            <a-form-model-item
               :labelCol="labelCol"
               :wrapperCol="wrapperCol"
+              prop="msgAbstract"
               label="摘要">
-              <a-textarea placeholder="请输入摘要" v-decorator="['msgAbstract',validatorRules.msgAbstract]" />
-            </a-form-item>
+              <a-textarea placeholder="请输入摘要"  v-model="model.msgAbstract" />
+            </a-form-model-item>
           </a-col>
           <a-col :span="24/2">
-            <a-form-item
+            <a-form-model-item
               :labelCol="labelCol"
               :wrapperCol="wrapperCol"
               label="指定用户"
@@ -114,21 +120,21 @@
                 @change="handleChange"
               >
               </a-select>
-            </a-form-item>
+            </a-form-model-item>
           </a-col>
         </a-row>
         <a-row style="width: 100%;">
           <a-col :span="24">
-            <a-form-item
+            <a-form-model-item
               :labelCol="labelColX1"
               :wrapperCol="wrapperColX1"
               label="内容"
               class="j-field-content">
-              <j-editor v-decorator="[ 'msgContent', {} ]" triggerChange></j-editor>
-            </a-form-item>
+              <j-editor v-model="model.msgContent"></j-editor>
+            </a-form-model-item>
           </a-col>
         </a-row>
-      </a-form>
+      </a-form-model>
     </a-spin>
     <select-user-list-modal ref="UserListModal" @choseUser="choseUser"></select-user-list-modal>
   </a-modal>
@@ -169,14 +175,13 @@
           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: '请输入摘要!' }]},
+          titile: [{ required: true, message: '请输入标题!' }],
+          msgCategory: [{ required: true, message: '请选择消息类型!' }],
+          msgType:[{ required: true, message: '请选择通告对象类型!' }],
+          endTime:[{ required: true, message: '请选择结束时间!'} ,{validator: this.endTimeValidate}],
+          startTime:[{required: true, message: '请选择开始时间!'},{validator: this.startTimeValidate}],
+          msgAbstract: [{ required: true, message: '请输入摘要!' }],
         },
         url: {
           queryByIds: "/sys/user/queryByIds",
@@ -198,7 +203,6 @@
         this.edit({});
       },
       edit (record) {
-        this.form.resetFields();
         this.model = {}
         this.disable = false;
         this.visible = true;
@@ -226,25 +230,23 @@
             }
           });
         }
-        this.$nextTick(() => {
-          this.form.setFieldsValue(pick(this.model,'endTime','startTime','titile','msgContent','priority','msgCategory','msgType','sendStatus','msgAbstract'))
-        });
       },
       close () {
         this.$emit('close');
         this.selectedUser = [];
         this.visible = false;
+        this.$refs.form.resetFields();
       },
       handleOk () {
         const that = this;
         //当设置指定用户类型，但用户为空时，后台报错
         if(this.userType &&!(this.userIds!=null && this.userIds.length >0)){
-            this.$message.warning('指定用户不能为空！')
-            return;
-          }
+          this.$message.warning('指定用户不能为空！')
+          return;
+        }
         // 触发表单验证
-        this.form.validateFields((err, values) => {
-          if (!err) {
+        this.$refs.form.validate(valid => {
+          if (valid) {
             that.confirmLoading = true;
             let httpurl = '';
             let method = '';
@@ -255,12 +257,10 @@
               httpurl+=this.url.edit;
                method = 'put';
             }
-            let formData = Object.assign(this.model, values);
             if(this.userType){
-              formData.userIds =  this.userIds;
+              this.model.userIds =  this.userIds;
             }
-            console.log(formData)
-            httpAction(httpurl,formData,method).then((res)=>{
+            httpAction(httpurl,this.model,method).then((res)=>{
               if(res.success){
                 that.$message.success(res.message);
                 that.$emit('ok');
@@ -272,15 +272,15 @@
               that.confirmLoading = false;
               that.close();
             })
-
-
-
+          }else{
+            return false;
           }
         })
       },
       handleCancel () {
         this.visible = false;
         this.$emit('close');
+        this.$refs.form.resetFields();
         this.resetUser();
       },
       resetUser (){
@@ -317,7 +317,7 @@
         }
       },
       startTimeValidate(rule,value,callback){
-        let endTime = this.form.getFieldValue("endTime")
+        let endTime = this.model.endTime
         if(!value || !endTime){
           callback()
         }else if(moment(value).isBefore(endTime)){
@@ -327,7 +327,7 @@
         }
       },
       endTimeValidate(rule,value,callback){
-        let startTime = this.form.getFieldValue("startTime")
+        let startTime = this.model.startTime;
         if(!value || !startTime){
           callback()
         }else if(moment(startTime).isBefore(value)){

jero-web/src/views/system/modules/SysCategoryModal.vue

@@ -9,24 +9,25 @@
     :destroyOnClose="true"
     cancelText="关闭">
     <a-spin :spinning="confirmLoading">
-      <a-form :form="form">
+      <a-form-model ref="form" :model="model" :rules="validatorRules">
 
-        <a-form-item label="父级节点" :labelCol="labelCol" :wrapperCol="wrapperCol">
+        <a-form-model-item label="父级节点" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="pid">
           <j-tree-select
             ref="treeSelect"
-            placeholder="请选择父级节点，若没有可不选择"
-            v-decorator="['pid', validatorRules.pid]"
+            placeholder="请选择父级节点"
+            v-model="model.pid"
             dict="sys_category,name,id"
             pidField="pid"
-            pidValue="0">
+            pidValue="0"
+            :disabled="disabled">
           </j-tree-select>
-        </a-form-item>
+        </a-form-model-item>
 
-        <a-form-item label="分类名称" :labelCol="labelCol" :wrapperCol="wrapperCol">
-          <a-input v-decorator="[ 'name', validatorRules.name]" placeholder="请输入分类名称"></a-input>
-        </a-form-item>
+        <a-form-model-item label="分类名称" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="name">
+          <a-input v-model="model.name" placeholder="请输入分类名称"></a-input>
+        </a-form-model-item>
 
-      </a-form>
+      </a-form-model>
     </a-spin>
   </a-modal>
 </template>
@@ -34,7 +35,6 @@
 <script>
 
   import { httpAction,getAction } from '@/api/manage'
-  import pick from 'lodash.pick'
   import JTreeSelect from '@/components/jero/JTreeSelect'
 
   export default {
@@ -44,7 +44,6 @@
     },
     data () {
       return {
-        form: this.$form.createForm(this),
         title:"操作",
         width:800,
         visible: false,
@@ -60,15 +59,8 @@
 
         confirmLoading: false,
         validatorRules:{
-          code:{
-            rules: [{
-              required: true, message: '请输入类型编码!'
-            },{
-              validator: this.validateMyCode
-            }]
-          },
           pid:{},
-          name:{rules: [{ required: true, message: '请输入类型名称!' }]}
+          name: [{ required: true, message: '请输入类型名称!' }]
         },
         url: {
           add: "/sys/category/add",
@@ -83,27 +75,29 @@
     },
     created () {
     },
+    computed : {
+      disabled() {
+        return this.model.id ? true : false;
+      }
+    },
     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;
+        this.$refs.form.resetFields();
       },
       handleOk () {
         const that = this;
         // 触发表单验证
-        this.form.validateFields((err, values) => {
-          if (!err) {
+        this.$refs.form.validate(valid => {
+          if (valid) {
             that.confirmLoading = true;
             let httpurl = '';
             let method = '';
@@ -114,12 +108,10 @@
               httpurl+=this.url.edit;
                method = 'put';
             }
-            let formData = Object.assign(this.model, values);
-            console.log("表单提交数据",formData)
-            httpAction(httpurl,formData,method).then((res)=>{
+            httpAction(httpurl,this.model,method).then((res)=>{
               if(res.success){
                 that.$message.success(res.message);
-                that.submitSuccess(formData)
+                that.submitSuccess(this.model)
               }else{
                 that.$message.warning(res.message);
               }
@@ -127,16 +119,14 @@
               that.confirmLoading = false;
               that.close();
             })
+          }else{
+            return false;
           }
-
         })
       },
       handleCancel () {
         this.close()
       },
-      popupCallback(row){
-        this.form.setFieldsValue(pick(row,'pid','name','code'))
-      },
       submitSuccess(formData){
         if(!formData.id){
           let treeData = this.$refs.treeSelect.getCurrTreeData()
@@ -162,21 +152,6 @@
           }
         }
       },
-      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>

jero-web/src/views/system/modules/SysDepartRoleModal.vue

@@ -7,37 +7,39 @@
     @ok="handleOk"
     @cancel="handleCancel"
     cancelText="关闭">
-    
+
     <a-spin :spinning="confirmLoading">
-      <a-form :form="form">
-      
-        <a-form-item
+      <a-form-model  ref="form" :model="model" :rules="validatorRules">
+
+        <a-form-model-item
           :labelCol="labelCol"
           :wrapperCol="wrapperCol"
+          prop="roleName"
           label="部门角色名称">
-          <a-input placeholder="请输入部门角色名称" v-decorator="['roleName', validatorRules.roleName]" />
-        </a-form-item>
-        <a-form-item
+          <a-input placeholder="请输入部门角色名称" v-model="model.roleName"/>
+        </a-form-model-item>
+        <a-form-model-item
           :labelCol="labelCol"
           :wrapperCol="wrapperCol"
+          prop="roleCode"
           label="部门角色编码">
-          <a-input placeholder="请输入部门角色编码" v-decorator="['roleCode', validatorRules.roleCode]" />
-        </a-form-item>
-        <a-form-item
+          <a-input placeholder="请输入部门角色编码" v-model="model.roleCode"/>
+        </a-form-model-item>
+        <a-form-model-item
           :labelCol="labelCol"
           :wrapperCol="wrapperCol"
+          prop="description"
           label="描述">
-          <a-input placeholder="请输入描述" v-decorator="['description', validatorRules.description]" />
-        </a-form-item>
-		
-      </a-form>
+          <a-input placeholder="请输入描述" v-model="model.description"/>
+        </a-form-model-item>
+
+      </a-form-model>
     </a-spin>
   </a-modal>
 </template>
 
 <script>
   import { httpAction } from '@/api/manage'
-  import pick from 'lodash.pick'
   import {duplicateCheck } from '@/api/api'
 
   export default {
@@ -55,25 +57,20 @@
           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' }
-            ]}
+          roleName:[
+            { required: true, message: '请输入部门角色名称!' },
+            { min: 2, max: 30, message: '长度在 2 到 30 个字符', trigger: 'blur' }
+          ],
+          roleCode: [
+            { required: true, message: '请输入部门角色编码!'},
+            { min: 0, max: 64, message: '长度不超过 64 个字符', trigger: 'blur' },
+            { validator: this.validateRoleCode}
+          ],
+          description: [
+            { min: 0, max: 126, message: '长度不超过 126 个字符', trigger: 'blur' }
+          ]
         },
         url: {
           add: "/sys/sysDepartRole/add",
@@ -89,22 +86,19 @@
       },
       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;
+        this.$refs.form.resetFields()
       },
       handleOk () {
         const that = this;
         // 触发表单验证
-        this.form.validateFields((err, values) => {
-          if (!err) {
+        this.$refs.form.validate(valid => {
+          if (valid) {
             that.confirmLoading = true;
             let httpurl = '';
             let method = '';
@@ -115,9 +109,8 @@
               httpurl+=this.url.edit;
                method = 'put';
             }
-            let formData = Object.assign(this.model, values);
-            formData.departId = this.departId;
-            httpAction(httpurl,formData,method).then((res)=>{
+            this.model.departId = this.departId;
+            httpAction(httpurl,this.model,method).then((res)=>{
               if(res.success){
                 that.$message.success(res.message);
                 that.$emit('ok');
@@ -128,6 +121,8 @@
               that.confirmLoading = false;
               that.close();
             })
+          }else{
+            return false;
           }
         })
       },

jero-web/src/views/system/modules/SysPositionModal.vue

@@ -10,46 +10,44 @@
     cancelText="关闭">
 
     <a-spin :spinning="confirmLoading">
-      <a-form :form="form">
+      <a-form-model ref="form" :model="model" :rules="validatorRules">
 
-        <a-form-item
+        <a-form-model-item
           :labelCol="labelCol"
           :wrapperCol="wrapperCol"
+          prop="code"
+          required
           label="职务编码">
-          <a-input placeholder="请输入职务编码" v-decorator="['code', validatorRules.code]" :read-only="readOnly"/>
-        </a-form-item>
-        <a-form-item
+          <a-input placeholder="请输入职务编码" v-model="model.code" :read-only="readOnly"/>
+        </a-form-model-item>
+        <a-form-model-item
           :labelCol="labelCol"
           :wrapperCol="wrapperCol"
+          prop="name"
+          required
           label="职务名称">
-          <a-input placeholder="请输入职务名称" v-decorator="['name', validatorRules.name]"/>
-        </a-form-item>
-        <a-form-item
+          <a-input placeholder="请输入职务名称" v-model="model.name"/>
+        </a-form-model-item>
+        <a-form-model-item
           :labelCol="labelCol"
           :wrapperCol="wrapperCol"
+          prop="postRank"
+          required
           label="职级"
         >
           <j-dict-select-tag
             placeholder="请选择职级"
-            :triggerChange="true"
             dictCode="position_rank"
-            v-decorator="['postRank', validatorRules.postRank]"
+            v-model="model.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-model-item>
 
-      </a-form>
+      </a-form-model>
     </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'
@@ -73,38 +71,35 @@
           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)
+          code: [
+            { 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: '请选择职级' }] },
+            }
+          ],
+          name: [{ required: true, message: '请输入职务名称' }] ,
+          postRank:  [{ required: true, message: '请选择职级' }] ,
         },
         url: {
           add: '/sys/position/add',
@@ -120,7 +115,6 @@
         this.edit({})
       },
       edit(record) {
-        this.form.resetFields()
         this.model = Object.assign({}, record)
         this.visible = true
         if(record.id){
@@ -128,24 +122,17 @@
         }else{
           this.readOnly=false
         }
-        this.$nextTick(() => {
-          this.form.setFieldsValue(pick(this.model,
-            'code',
-            'name',
-            'postRank',
-            // 'companyId'
-          ))
-        })
       },
       close() {
         this.$emit('close')
         this.visible = false
+        this.$refs.form.resetFields();
       },
       handleOk() {
         const that = this
         // 触发表单验证
-        this.form.validateFields((err, values) => {
-          if (!err) {
+        this.$refs.form.validate(valid => {
+          if (valid) {
             that.confirmLoading = true
             let httpurl = ''
             let method = ''
@@ -157,8 +144,7 @@
               method = 'put'
             }
 
-            let formData = Object.assign(this.model, values)
-            httpAction(httpurl, formData, method).then((res) => {
+            httpAction(httpurl, this.model, method).then((res) => {
               if (res.success) {
                 that.$message.success(res.message)
                 that.$emit('ok')
@@ -169,14 +155,14 @@
               that.confirmLoading = false
               that.close()
             })
+          }else{
+            return false;
           }
         })
       },
       handleCancel() {
         this.close()
       },
-
-
     }
   }
 </script>

jero-web/src/views/system/modules/TenantForm.vue

@@ -1,56 +1,54 @@
 <template>
   <a-spin :spinning="confirmLoading">
     <j-form-container :disabled="formDisabled">
-      <a-form :form="form" slot="detail">
+      <a-form-model ref="form" :model="model" slot="detail" :rules="validatorRules">
         <a-row>
           <a-col :span="24">
-            <a-form-item label="租户名称" :labelCol="labelCol" :wrapperCol="wrapperCol">
-              <a-input v-decorator="['name']" placeholder="请输入租户名称"></a-input>
-            </a-form-item>
+            <a-form-model-item label="租户名称" :labelCol="labelCol" :wrapperCol="wrapperCol">
+              <a-input v-model="model.name" placeholder="请输入租户名称"></a-input>
+            </a-form-model-item>
           </a-col>
-
+          
           <a-col :span="24">
-            <a-form-item label="租户编号" :labelCol="labelCol" :wrapperCol="wrapperCol">
-              <a-input-number style="width: 100%" :min="1" v-decorator="['id',{rules: [{ required: true, message: '请输入租户编号'}]}]" placeholder="请输入租户编号"></a-input-number>
-            </a-form-item>
+            <a-form-model-item label="租户编号" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="id">
+              <a-input-number style="width: 100%" :min="1" v-model="model.id" placeholder="请输入租户编号" :disabled="disabledId"></a-input-number>
+            </a-form-model-item>
           </a-col>
-
+          
           <a-col :span="24">
-            <a-form-item label="开始时间" :labelCol="labelCol" :wrapperCol="wrapperCol">
-              <j-date placeholder="请选择开始时间" v-decorator="['beginDate']" :trigger-change="true" :show-time="true" date-format="YYYY-MM-DD HH:mm:ss" style="width: 100%"/>
-            </a-form-item>
+            <a-form-model-item label="开始时间" :labelCol="labelCol" :wrapperCol="wrapperCol">
+              <j-date placeholder="请选择开始时间" v-model="model.beginDate" :show-time="true" date-format="YYYY-MM-DD HH:mm:ss" style="width: 100%"/>
+            </a-form-model-item>
           </a-col>
           <a-col :span="24">
-            <a-form-item label="结束时间" :labelCol="labelCol" :wrapperCol="wrapperCol">
-              <j-date placeholder="请选择结束时间" v-decorator="['endDate']" :trigger-change="true" :show-time="true" date-format="YYYY-MM-DD HH:mm:ss" style="width: 100%"/>
-            </a-form-item>
+            <a-form-model-item label="结束时间" :labelCol="labelCol" :wrapperCol="wrapperCol">
+              <j-date placeholder="请选择结束时间" v-model="model.endDate" :show-time="true" date-format="YYYY-MM-DD HH:mm:ss" style="width: 100%"/>
+            </a-form-model-item>
           </a-col>
           <a-col :span="24">
-            <a-form-item label="状态" :labelCol="labelCol" :wrapperCol="wrapperCol">
-              <a-radio-group name="tenantStatus" v-decorator="[ 'status', {initialValue:1}]">
+            <a-form-model-item label="状态" :labelCol="labelCol" :wrapperCol="wrapperCol">
+              <a-radio-group name="tenantStatus" v-model="model.status">
                 <a-radio :value="1">正常</a-radio>
                 <a-radio :value="0">冻结</a-radio>
               </a-radio-group>
-            </a-form-item>
+            </a-form-model-item>
           </a-col>
           <a-col v-if="showFlowSubmitButton" :span="24" style="text-align: center">
             <a-button @click="submitForm">提 交</a-button>
           </a-col>
         </a-row>
-      </a-form>
+      </a-form-model>
     </j-form-container>
   </a-spin>
 </template>
 
 <script>
-
   import { httpAction, getAction } from '@/api/manage'
-  import pick from 'lodash.pick'
   import { validateDuplicateValue } from '@/utils/util'
   import JFormContainer from '@/components/jero/JFormContainer'
   import JDate from '@/components/jero/JDate'
   import JDictSelectTag from "@/components/dict/JDictSelectTag"
-
+  
   export default {
     name: "TenantForm",
     components: {
@@ -77,8 +75,8 @@
     },
     data () {
       return {
-        form: this.$form.createForm(this),
-        model: {},
+        model: {status:1},
+        id:'',
         labelCol: {
           xs: { span: 24 },
           sm: { span: 5 },
@@ -89,6 +87,7 @@
         },
         confirmLoading: false,
         validatorRules: {
+          id:[ { required: true, message: '请输入租户编号!' },]
         },
         url: {
           add: "/sys/tenant/add",
@@ -108,6 +107,9 @@
         }
         return this.disabled
       },
+      disabledId(){
+        return this.id?true : false;
+      },
       showFlowSubmitButton(){
         if(this.normal===false){
           if(this.formData.disabled===false){
@@ -124,16 +126,10 @@
       this.showFlowData();
     },
     methods: {
-      add () {
-        this.edit({});
-      },
-      edit (record) {
-        this.form.resetFields();
-        this.model = Object.assign({}, record);
+      show (record) {
+        this.model = record?Object.assign({}, record):this.model;
+        this.id = record?record.id:'';
         this.visible = true;
-        this.$nextTick(() => {
-          this.form.setFieldsValue(pick(this.model,'id','name','beginDate','endDate','status'))
-        })
       },
       showFlowData(){
         if(this.normal === false){
@@ -148,21 +144,19 @@
       submitForm () {
         const that = this;
         // 触发表单验证
-        this.form.validateFields((err, values) => {
-          if (!err) {
+        that.$refs.form.validate(valid => {
+          if (valid) {
             that.confirmLoading = true;
             let httpurl = '';
             let method = '';
-            if(!this.model.id){
+            if(!this.id){
               httpurl+=this.url.add;
               method = 'post';
             }else{
               httpurl+=this.url.edit;
-               method = 'put';
+              method = 'put';
             }
-            let formData = Object.assign(this.model, values);
-            console.log("表单提交数据",formData)
-            httpAction(httpurl,formData,method).then((res)=>{
+            httpAction(httpurl,this.model,method).then((res)=>{
               if(res.success){
                 that.$message.success(res.message);
                 that.$emit('ok');
@@ -175,12 +169,14 @@
             }).finally(() => {
               that.confirmLoading = false;
             })
+          }else{
+            return false;
           }
 
         })
       },
       popupCallback(row){
-        this.form.setFieldsValue(pick(row, 'id', 'name','beginDate','endDate','status'))
+        this.model = Object.assign(this.model, row);
       },
     }
   }

jero-web/src/views/system/modules/TenantModal.vue

@@ -13,7 +13,6 @@
 </template>
 
 <script>
-
   import TenantForm from './TenantForm'
   export default {
     name: "TenantModal",
@@ -32,13 +31,13 @@
       add () {
         this.visible=true
         this.$nextTick(()=>{
-          this.$refs.realForm.add();
+          this.$refs.realForm.show();
         })
       },
       edit (record) {
         this.visible=true
         this.$nextTick(()=>{
-          this.$refs.realForm.edit(record);
+          this.$refs.realForm.show(record);
         })
       },
       close () {

jero-web/src/views/system/modules/UserModal.vue

@@ -20,166 +20,124 @@
     </template>
 
     <a-spin :spinning="confirmLoading">
-      <a-form :form="form">
+      <a-form-model ref="form" :model="model" :rules="validatorRules">
 
-        <a-form-item label="用户账号" :labelCol="labelCol" :wrapperCol="wrapperCol">
-          <a-input placeholder="请输入用户账号" v-decorator.trim="[ 'username', validatorRules.username]" :readOnly="!!model.id"/>
-        </a-form-item>
+        <a-form-model-item label="用户账号" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="username">
+          <a-input placeholder="请输入用户账号" v-model="model.username" :readOnly="!!model.id"/>
+        </a-form-model-item>
 
         <template v-if="!model.id">
-          <a-form-item label="登录密码" :labelCol="labelCol" :wrapperCol="wrapperCol" >
-            <a-input type="password" placeholder="请输入登录密码" autocomplete = 'new-password' v-decorator="[ 'password',validatorRules.password]" />
-          </a-form-item>
+          <a-form-model-item label="登录密码" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="password" >
+            <a-input type="password" placeholder="请输入登录密码" v-model="model.password" />
+          </a-form-model-item>
 
-          <a-form-item label="确认密码" :labelCol="labelCol" :wrapperCol="wrapperCol" >
-            <a-input type="password" @blur="handleConfirmBlur" placeholder="请重新输入登录密码" v-decorator="[ 'confirmpassword', validatorRules.confirmpassword]"/>
-          </a-form-item>
+          <a-form-model-item label="确认密码" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="confirmpassword" >
+            <a-input type="password" @blur="handleConfirmBlur" placeholder="请重新输入登录密码" v-model="model.confirmpassword"/>
+          </a-form-model-item>
         </template>
 
-        <a-form-item label="用户姓名" :labelCol="labelCol" :wrapperCol="wrapperCol" >
-          <a-input placeholder="请输入用户姓名" v-decorator.trim="[ 'realname', validatorRules.realname]" />
-        </a-form-item>
+        <a-form-model-item label="用户姓名" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="realname">
+          <a-input placeholder="请输入用户姓名" v-model="model.realname" />
+        </a-form-model-item>
 
-        <!--<a-form-item label="工号" :labelCol="labelCol" :wrapperCol="wrapperCol">-->
+        <!--<a-form-model-item label="工号" :labelCol="labelCol" :wrapperCol="wrapperCol">-->
           <!--<a-input placeholder="请输入工号" v-decorator.trim="[ 'workNo', validatorRules.workNo]" />-->
-        <!--</a-form-item>-->
+        <!--</a-form-model-item>-->
 
-        <!--<a-form-item label="职务" :labelCol="labelCol" :wrapperCol="wrapperCol">-->
+        <!--<a-form-model-item label="职务" :labelCol="labelCol" :wrapperCol="wrapperCol">-->
           <!--<j-select-position placeholder="请选择职务" :multiple="false" v-decorator="['post', {}]"/>-->
-        <!--</a-form-item>-->
+        <!--</a-form-model-item>-->
 
-        <a-form-item label="角色分配" :labelCol="labelCol" :wrapperCol="wrapperCol" v-show="!roleDisabled" >
-          <a-select
-            mode="multiple"
-            :disabled="departDisabled"
-            style="width: 100%"
-            placeholder="请选择用户角色"
-            optionFilterProp = "children"
-            v-model="selectedRole"
-            :getPopupContainer= "(target) => target.parentNode">
-            <a-select-option v-for="(role,roleindex) in roleList" :key="roleindex.toString()" :value="role.id">
-              {{ role.roleName }}
-            </a-select-option>
-          </a-select>
-        </a-form-item>
+       <a-form-model-item label="角色分配" :labelCol="labelCol" :wrapperCol="wrapperCol" v-show="!roleDisabled" >
+          <j-multi-select-tag
+            :disabled="disableSubmit"
+            v-model="model.selectedroles"
+            :options="rolesOptions"
+            placeholder="请选择角色">
+          </j-multi-select-tag>
+        </a-form-model-item>
 
         <!--部门分配-->
-        <a-form-item label="部门分配" :labelCol="labelCol" :wrapperCol="wrapperCol" v-show="!departDisabled">
-          <a-input-search
-            placeholder="点击选择部门"
-            v-model="checkedDepartNameString"
-            readOnly
-            @search="onSearch">
-            <a-button slot="enterButton" icon="search">选择</a-button>
-          </a-input-search>
-        </a-form-item>
+        <a-form-model-item label="部门分配" :labelCol="labelCol" :wrapperCol="wrapperCol" v-show="!departDisabled">
+          <j-select-depart v-model="model.selecteddeparts" :multi="true" @back="backDepartInfo" :backDepart="true"></j-select-depart>
+        </a-form-model-item>
 
-        <!--租户分配-->
-        <!--<a-form-item label="租户分配" :labelCol="labelCol" :wrapperCol="wrapperCol" v-show="!departDisabled">-->
+        <!--租户分配
+        <a-form-model-item label="租户分配" :labelCol="labelCol" :wrapperCol="wrapperCol" v-show="!departDisabled">
+          <j-multi-select-tag
+            :disabled="disableSubmit"
+            v-model="model.relTenantIds"
+            :options="tenantsOptions"
+            placeholder="请选择租户">
+          </j-multi-select-tag>
+        </a-form-model-item>
+        -->
 
-          <!--<a-select-->
-            <!--mode="multiple"-->
-            <!--style="width: 100%"-->
-            <!--placeholder="请选择租户分配"-->
-            <!--:disabled="disableSubmit"-->
-            <!--v-model="currentTenant">-->
-            <!--<a-select-option v-for="(item, index) in tenantList" :key="index" :value="item.id">-->
-              <!--{{ item.name }}-->
-            <!--</a-select-option>-->
-          <!--</a-select>-->
-        <!--</a-form-item>-->
-
-       <!-- update--begin--autor:wangshuai-----date:20200108------for：新增身份和负责部门------ -->
-        <a-form-item label="身份" :labelCol="labelCol" :wrapperCol="wrapperCol">
-          <a-radio-group
-            v-model="identity"
-            @change="identityChange">
-            <a-radio value="1">普通用户</a-radio>
-            <a-radio value="2">上级</a-radio>
+       <a-form-model-item label="身份" :labelCol="labelCol" :wrapperCol="wrapperCol">
+          <a-radio-group  v-model="model.userIdentity"  @change="identityChange">
+            <a-radio :value="1">普通用户</a-radio>
+            <a-radio :value="2">上级</a-radio>
           </a-radio-group>
-        </a-form-item>
-        <a-form-item label="负责部门" :labelCol="labelCol" :wrapperCol="wrapperCol"  v-if="departIdShow==true">
-          <a-select
-            mode="multiple"
-            style="width: 100%"
-            placeholder="请选择负责部门"
-            v-model="departIds"
-            optionFilterProp = "children"
-            :getPopupContainer = "(target) => target.parentNode"
-            :dropdownStyle="{maxHeight:'200px',overflow:'auto'}"
-          >
-            <a-select-option v-for="item in resultDepartOptions" :key="item.key" :value="item.key"
-            >{{item.title}}</a-select-option
-            >
-          </a-select>
-        </a-form-item>
+        </a-form-model-item>
+        <a-form-model-item label="负责部门" :labelCol="labelCol" :wrapperCol="wrapperCol"  v-if="departIdShow==true">
+          <j-multi-select-tag
+            :disabled="disableSubmit"
+            v-model="model.departIds"
+            :options="nextDepartOptions"
+            placeholder="请选择负责部门">
+          </j-multi-select-tag>
+        </a-form-model-item>
         <!-- update--end--autor:wangshuai-----date:20200108------for：新增身份和负责部门------ -->
-        <a-form-item label="头像" :labelCol="labelCol" :wrapperCol="wrapperCol">
-          <j-image-upload class="avatar-uploader" text="上传" v-model="fileList" ></j-image-upload>
-        </a-form-item>
+          <a-form-model-item label="头像" :labelCol="labelCol" :wrapperCol="wrapperCol">
+          <j-image-upload class="avatar-uploader" text="上传" v-model="model.avatar" ></j-image-upload>
+        </a-form-model-item>
 
-        <!--<a-form-item label="生日" :labelCol="labelCol" :wrapperCol="wrapperCol">-->
-          <!--<a-date-picker-->
-            <!--style="width: 100%"-->
-            <!--placeholder="请选择生日"-->
-            <!--v-decorator="['birthday', {initialValue:!model.birthday?null:moment(model.birthday,dateFormat)}]"-->
-            <!--:getCalendarContainer="node => node.parentNode"/>-->
-        <!--</a-form-item>-->
-
-        <a-form-item label="性别" :labelCol="labelCol" :wrapperCol="wrapperCol">
-          <a-select v-decorator="[ 'sex', {}]" placeholder="请选择性别" :getPopupContainer= "(target) => target.parentNode">
+        <a-form-model-item label="性别" :labelCol="labelCol" :wrapperCol="wrapperCol">
+          <a-select  v-model="model.sex"  placeholder="请选择性别" :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-form-model-item>
 
-        <a-form-item label="邮箱" :labelCol="labelCol" :wrapperCol="wrapperCol">
-          <a-input placeholder="请输入邮箱" v-decorator="[ 'email', validatorRules.email]" />
-        </a-form-item>
+        <a-form-model-item label="邮箱" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="email">
+          <a-input placeholder="请输入邮箱" v-model="model.email" />
+        </a-form-model-item>
 
-        <a-form-item label="手机号码" :labelCol="labelCol" :wrapperCol="wrapperCol">
-          <a-input placeholder="请输入手机号码" :disabled="isDisabledAuth('user:form:phone')" v-decorator="[ 'phone', validatorRules.phone]" />
-        </a-form-item>
+        <a-form-model-item label="手机号码" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="phone">
+          <a-input placeholder="请输入手机号码" :disabled="isDisabledAuth('user:form:phone')" v-model="model.phone" />
+        </a-form-model-item>
 
-        <!--<a-form-item label="座机" :labelCol="labelCol" :wrapperCol="wrapperCol">-->
-          <!--<a-input placeholder="请输入座机" v-decorator="[ 'telephone', validatorRules.telephone]"/>-->
-        <!--</a-form-item>-->
+        <!--
+        <a-form-model-item label="工作流引擎" :labelCol="labelCol" :wrapperCol="wrapperCol">
+          <j-dict-select-tag  v-model="model.activitiSync"  placeholder="请选择是否同步工作流引擎" :type="'radio'" dictCode="activiti_sync"/>
+        </a-form-model-item>
+        -->
 
-        <a-form-item label="工作流引擎" :labelCol="labelCol" :wrapperCol="wrapperCol">
-          <j-dict-select-tag  v-decorator="['activitiSync', {}]" placeholder="请选择是否同步工作流引擎" :type="'radio'" :triggerChange="true" dictCode="activiti_sync"/>
-        </a-form-item>
-
-      </a-form>
+      </a-form-model>
     </a-spin>
-    <depart-window ref="departWindow" @ok="modalFormOk"></depart-window>
 
-    <div class="drawer-bootom-button" v-show="!disableSubmit">
+     <div class="drawer-bootom-button" v-show="!disableSubmit">
       <a-popconfirm title="确定放弃编辑？" @confirm="handleCancel" okText="确定" cancelText="取消">
         <a-button style="margin-right: .8rem">取消</a-button>
       </a-popconfirm>
       <a-button @click="handleSubmit" type="primary" :loading="confirmLoading">提交</a-button>
     </div>
+
   </a-drawer>
 </template>
 
 <script>
-  import pick from 'lodash.pick'
-  import moment from 'moment'
-  import Vue from 'vue'
-  // 引入搜索部门弹出框的组件
-  import departWindow from './DepartWindow'
-  import { ACCESS_TOKEN } from "@/store/mutation-types"
-  import { getAction } from '@/api/manage'
-  import {addUser,editUser,queryUserRole,queryall } from '@/api/api'
-  import { disabledAuthFilter } from "@/utils/authFilter"
-  import {duplicateCheck } from '@/api/api'
-  import JImageUpload from '../../../components/jero/JImageUpload'
+import moment from 'moment'
+import Vue from 'vue'
+import { ACCESS_TOKEN } from "@/store/mutation-types"
+import { getAction } from '@/api/manage'
+import { addUser,editUser,queryUserRole,queryall } from '@/api/api'
+import { disabledAuthFilter } from "@/utils/authFilter"
+import { duplicateCheck } from '@/api/api'
 
   export default {
     name: "UserModal",
     components: {
-      JImageUpload,
-      departWindow,
     },
     data () {
       return {
@@ -189,67 +147,27 @@
         drawerWidth:700,
         modaltoggleFlag:true,
         confirmDirty: false,
-        selectedDepartKeys:[], //保存用户选择部门id
-        checkedDepartKeys:[],
-        checkedDepartNames:[], // 保存部门的名称 =>title
-        checkedDepartNameString:"", // 保存部门的名称 =>title
-        resultDepartOptions:[],
         userId:"", //保存用户id
         disableSubmit:false,
-        userDepartModel:{userId:'',departIdList:[]}, // 保存SysUserDepart的用户部门中间表数据需要的对象
         dateFormat:"YYYY-MM-DD",
         validatorRules:{
-          username:{
-            rules: [{
-              required: true, message: '请输入用户账号!'
-            },{
-              validator: this.validateUsername,
-            }]
-          },
-          password:{
-            rules: [{
-              required: true,
-              pattern:/^(?=.*[a-zA-Z])(?=.*\d)(?=.*[~!@#$%^&*()_+`\-={}:";'<>?,./]).{8,}$/,
-              message: '密码由8位数字、大小写字母和特殊符号组成!'
-            }, {
-              validator: this.validateToNextPassword,
-            }],
-          },
-          confirmpassword:{
-            rules: [{
-              required: true, message: '请重新输入登录密码!',
-            }, {
-              validator: this.compareToFirstPassword,
-            }],
-          },
-          realname:{rules: [{ required: true, message: '请输入用户名称!' }]},
-          phone:{rules: [{validator: this.validatePhone}]},
-          email:{
-            rules: [{
-              validator: this.validateEmail
-            }],
-          },
+          username:[{required: true, message: '请输入用户账号!'},
+            {validator: this.validateUsername,}],
+          password: [{required: true,pattern:/^(?=.*[a-zA-Z])(?=.*\d)(?=.*[~!@#$%^&*()_+`\-={}:";'<>?,./]).{8,}$/,message: '密码由8位数字、大小写字母和特殊符号组成!'},
+            {validator: this.validateToNextPassword,trigger: 'change'}],
+          confirmpassword: [{required: true, message: '请重新输入登录密码!',},
+            { validator: this.compareToFirstPassword,}],
+          realname:[{ required: true, message: '请输入用户名称!' }],
+          phone: [{validator: this.validatePhone}],
+          email: [{validator: this.validateEmail}],
           roles:{},
-          //  sex:{initialValue:((!this.model.sex)?"": (this.model.sex+""))}
-          workNo: {
-            rules: [
-              { required: true, message: '请输入工号' },
-              { validator: this.validateWorkNo }
-            ]
-          },
-          telephone: {
-            rules: [
-              { pattern: /^0\d{2,3}-[1-9]\d{6,7}$/, message: '请输入正确的座机号码' },
-            ]
-          }
+          workNo:[ { required: true, message: '请输入工号' },
+            { validator: this.validateWorkNo }],
         },
         departIdShow:false,
-        departIds:[], //负责部门id
         title:"操作",
         visible: false,
         model: {},
-        roleList:[],
-        selectedRole:[],
         labelCol: {
           xs: { span: 24 },
           sm: { span: 5 },
@@ -261,8 +179,6 @@
         uploadLoading:false,
         confirmLoading: false,
         headers:{},
-        form:this.$form.createForm(this),
-        picUrl: "",
         url: {
           fileUpload: window._CONFIG['domianURL']+"/sys/common/upload",
           userWithDepart: "/sys/user/userDepartList", // 引入为指定用户查看部门信息需要的url
@@ -270,15 +186,15 @@
           syncUserByUserName:"/act/process/extActProcess/doSyncUserByUserName",//同步用户到工作流
           queryTenantList: '/sys/tenant/queryList'
         },
-        identity:"1",
-        fileList:[],
-        tenantList: [],
-        currentTenant:[]
+        tenantsOptions: [],
+        rolesOptions:[],
+        nextDepartOptions:[],
       }
     },
     created () {
       const token = Vue.ls.get(ACCESS_TOKEN);
       this.headers = {"X-Access-Token":token}
+      this.initRoleList()
       this.initTenantList()
 
     },
@@ -288,16 +204,33 @@
       }
     },
     methods: {
+      add () {
+        this.refresh();
+        this.edit({userIdentity:1});
+      },
+      edit (record) {
+        let that = this;
+        that.visible = true;
+        //根据屏幕宽度自适应抽屉宽度
+        this.resetScreenSize();
+        that.userId = record.id;
+        that.model = Object.assign({},{selectedroles:'',selecteddeparts:''}, record);
+        //身份为上级显示负责部门，否则不显示
+        if(this.model.userIdentity==2){
+          this.departIdShow=true;
+        }else{
+          this.departIdShow=false;
+        }
+
+        if(record.hasOwnProperty("id")){
+          that.getUserRoles(record.id);
+          that.getUserDeparts(record.id);
+        }
+        console.log('that.model=',that.model)
+      },
       isDisabledAuth(code){
         return disabledAuthFilter(code);
       },
-      initTenantList(){
-        getAction(this.url.queryTenantList).then(res=>{
-          if(res.success){
-            this.tenantList = res.result
-          }
-        })
-      },
       //窗口最大化切换
       toggleScreen(){
         if(this.modaltoggleFlag){
@@ -307,165 +240,104 @@
         }
         this.modaltoggleFlag = !this.modaltoggleFlag;
       },
-      initialRoleList(){
-        queryall().then((res)=>{
-          if(res.success){
-            this.roleList = res.result;
-          }else{
-            console.log(res.message);
-          }
-        });
-      },
-      loadUserRoles(userid){
-        queryUserRole({userid:userid}).then((res)=>{
-          if(res.success){
-            this.selectedRole = res.result;
-          }else{
-            console.log(res.message);
-          }
-        });
-      },
-      refresh () {
-          this.selectedDepartKeys=[];
-          this.checkedDepartKeys=[];
-          this.checkedDepartNames=[];
-          this.checkedDepartNameString = "";
-          this.userId=""
-          this.resultDepartOptions=[];
-          this.departId=[];
-          this.departIdShow=false;
-          this.currentTenant = []
-      },
-      add () {
-        this.picUrl = "";
-        this.refresh();
-        this.edit({activitiSync:'1'});
-      },
-      edit (record) {
-        this.resetScreenSize(); // 调用此方法,根据屏幕宽度自适应调整抽屉的宽度
-        let that = this;
-        that.initialRoleList();
-        that.checkedDepartNameString = "";
-        that.form.resetFields();
-        if(record.hasOwnProperty("id")){
-          that.loadUserRoles(record.id);
-          setTimeout(() => {
-            this.fileList = record.avatar;
-          }, 5)
-        }
-        that.userId = record.id;
-        that.visible = true;
-        that.model = Object.assign({}, record);
-        that.$nextTick(() => {
-          that.form.setFieldsValue(pick(this.model,'username','sex','realname','email','phone','activitiSync','workNo','telephone','post'))
-        });
-        //身份为上级显示负责部门，否则不显示
-        if(this.model.userIdentity=="2"){
-            this.identity="2";
-            this.departIdShow=true;
+      // 根据屏幕变化,设置抽屉尺寸
+      resetScreenSize(){
+        let screenWidth = document.body.clientWidth;
+        if(screenWidth < 500){
+          this.drawerWidth = screenWidth;
         }else{
-            this.identity="1";
-            this.departIdShow=false;
+          this.drawerWidth = 700;
         }
-        // 调用查询用户对应的部门信息的方法
-        that.checkedDepartKeys = [];
-        that.loadCheckedDeparts();
-
-        //update-begin-author:taoyan date:2020710 for:多租户配置
-        if(!record.relTenantIds || record.relTenantIds.length==0){
-          this.currentTenant = []
-        }else{
-          this.currentTenant = record.relTenantIds.split(',').map(Number);
-        }
-        //update-end-author:taoyan date:2020710 for:多租户配置
       },
-      //
-      loadCheckedDeparts(){
-        let that = this;
-        if(!that.userId){return}
-        getAction(that.url.userWithDepart,{userId:that.userId}).then((res)=>{
-          that.checkedDepartNames = [];
+      //初始化租户字典
+      initTenantList(){
+        getAction(this.url.queryTenantList).then(res=>{
           if(res.success){
-            var depart=[];
-            var departId=[];
-            for (let i = 0; i < res.result.length; i++) {
-              that.checkedDepartNames.push(res.result[i].title);
-              this.checkedDepartNameString = this.checkedDepartNames.join(",");
-              that.checkedDepartKeys.push(res.result[i].key);
-              //新增负责部门选择下拉框
-              depart.push({
-                  key:res.result[i].key,
-                  title:res.result[i].title
-              })
-              departId.push(res.result[i].key)
-            }
-            that.resultDepartOptions=depart;
-            //判断部门id是否存在，不存在择直接默认当前所在部门
-            if(this.model.departIds){
-                this.departIds=this.model.departIds.split(",");
-            }else{
-                this.departIds=departId;
-            }
-            that.userDepartModel.departIdList = that.checkedDepartKeys
-          }else{
-            console.log(res.message);
+            this.tenantsOptions = res.result.map((item,index,arr)=>{
+              let c = {label:item.name, value: item.id+""}
+              return c;
+            })
+            console.log('this.tenantsOptions: ',this.tenantsOptions)
           }
         })
       },
+      //初始化角色字典
+      initRoleList(){
+        queryall().then((res)=>{
+          if(res.success){
+            this.rolesOptions = res.result.map((item,index,arr)=>{
+              let c = {label:item.roleName, value:item.id}
+              return c;
+            })
+            console.log('this.rolesOptions: ',this.rolesOptions)
+          }
+        });
+      },
+      getUserRoles(userid){
+        queryUserRole({userid:userid}).then((res)=>{
+          if(res.success){
+            this.model.selectedroles = res.result.join(",");
+            console.log('that.model.selectedroles=',this.model.selectedroles)
+          }
+        });
+      },
+      getUserDeparts(userid){
+        let that = this;
+        getAction(that.url.userWithDepart,{userId:userid}).then((res)=>{
+          if(res.success){
+            let departOptions=[];
+            let selectDepartKeys=[]
+            for (let i = 0; i < res.result.length; i++) {
+              selectDepartKeys.push(res.result[i].key);
+              //新增负责部门选择下拉框
+              departOptions.push({
+                value: res.result[i].key,
+                label: res.result[i].title
+              })
+            }
+            that.model.selecteddeparts = selectDepartKeys.join(",")
+            that.nextDepartOptions=departOptions;
+            console.log('that.nextDepartOptions=',that.nextDepartOptions)
+          }
+        })
+      },
+      backDepartInfo(info) {
+        this.model.departIds = this.model.selecteddeparts;
+        this.nextDepartOptions = info.map((item,index,arr)=>{
+          let c = {label:item.text, value: item.value+""}
+          return c;
+        })
+      },
+      refresh () {
+        this.userId=""
+        this.nextDepartOptions=[];
+        this.departIdShow=false;
+      },
       close () {
         this.$emit('close');
         this.visible = false;
         this.disableSubmit = false;
-        this.selectedRole = [];
-        this.userDepartModel = {userId:'',departIdList:[]};
-        this.checkedDepartNames = [];
-        this.checkedDepartNameString='';
-        this.checkedDepartKeys = [];
-        this.selectedDepartKeys = [];
-        this.resultDepartOptions=[];
-        this.departIds=[];
+        this.nextDepartOptions=[];
         this.departIdShow=false;
-        this.identity="1";
-        this.fileList=[];
+        this.$refs.form.resetFields();
       },
       moment,
       handleSubmit () {
-
         const that = this;
         // 触发表单验证
-        this.form.validateFields((err, values) => {
-          if (!err) {
+        this.$refs.form.validate(valid => {
+          if (valid) {
             that.confirmLoading = true;
-            if(!values.birthday){
-              values.birthday = '';
-            }else{
-              values.birthday = values.birthday.format(this.dateFormat);
-            }
-            let formData = Object.assign(this.model, values);
-            if(that.fileList != ''){
-              formData.avatar = that.fileList;
-            }else{
-              formData.avatar = null;
-            }
-            //update-begin-author:taoyan date:2020710 for:多租户配置
-            formData.relTenantIds = this.currentTenant.length>0?this.currentTenant.join(','):''
-            //update-end-author:taoyan date:2020710 for:多租户配置
-            formData.selectedroles = this.selectedRole.length>0?this.selectedRole.join(","):'';
-            formData.selecteddeparts = this.userDepartModel.departIdList.length>0?this.userDepartModel.departIdList.join(","):'';
-            formData.userIdentity=this.identity;
             //如果是上级择传入departIds,否则为空
-            if(this.identity==="2"){
-              formData.departIds=this.departIds.join(",");
-            }else{
-              formData.departIds="";
+            if(this.model.userIdentity!==2){
+              this.model.departIds="";
             }
-            // that.addDepartsToUser(that,formData); // 调用根据当前用户添加部门信息的方法
             let obj;
             if(!this.model.id){
-              formData.id = this.userId;
-              obj=addUser(formData);
+              this.model.id = this.userId;
+              obj=addUser(this.model);
             }else{
-              obj=editUser(formData);
+              obj=editUser(this.model);
             }
             obj.then((res)=>{
               if(res.success){
@@ -476,32 +348,29 @@
               }
             }).finally(() => {
               that.confirmLoading = false;
-              that.checkedDepartNames = [];
-              that.userDepartModel.departIdList = {userId:'',departIdList:[]};
               that.close();
             })
-
+          }else{
+            return false;
           }
         })
       },
       handleCancel () {
         this.close()
       },
-      validateToNextPassword  (rule, value, callback) {
-        const form = this.form;
-        const confirmpassword=form.getFieldValue('confirmpassword');
+      validateToNextPassword (rule, value, callback) {
+        const confirmpassword=this.model.confirmpassword;
 
         if (value && confirmpassword && value !== confirmpassword) {
           callback('两次输入的密码不一样！');
         }
         if (value && this.confirmDirty) {
-          form.validateFields(['confirm'], { force: true })
+          this.$refs.form.validateField(['confirmpassword']);
         }
         callback();
       },
-      compareToFirstPassword  (rule, value, callback) {
-        const form = this.form;
-        if (value && value !== form.getFieldValue('password')) {
+      compareToFirstPassword (rule, value, callback) {
+        if (value && value !== this.model.password) {
           callback('两次输入的密码不一样！');
         } else {
           callback()
@@ -511,10 +380,7 @@
         if(!value){
           callback()
         }else{
-          //update-begin--Author:kangxiaolin  Date:20190826 for：[05] 手机号不支持199号码段--------------------
           if(new RegExp(/^1[3|4|5|7|8|9][0-9]\d{8}$/).test(value)){
-            //update-end--Author:kangxiaolin  Date:20190826 for：[05] 手机号不支持199号码段--------------------
-
             var params = {
               tableName: 'sys_user',
               fieldName: 'phone',
@@ -587,18 +453,10 @@
           }
         })
       },
-      handleConfirmBlur  (e) {
+      handleConfirmBlur(e) {
         const value = e.target.value;
         this.confirmDirty = this.confirmDirty || !!value
       },
-
-      normFile  (e) {
-        console.log('Upload event:', e);
-        if (Array.isArray(e)) {
-          return e
-        }
-        return e && e.fileList
-      },
       beforeUpload: function(file){
         var fileType = file.type;
         if(fileType.indexOf('image')<0){
@@ -607,63 +465,11 @@
         }
         //TODO 验证文件大小
       },
-      handleChange (info) {
-        this.picUrl = "";
-        if (info.file.status === 'uploading') {
-          this.uploadLoading = true;
-          return
-        }
-        if (info.file.status === 'done') {
-          var response = info.file.response;
-          this.uploadLoading = false;
-          console.log(response);
-          if(response.success){
-            this.model.avatar = response.message;
-            this.picUrl = "Has no pic url yet";
-          }else{
-            this.$message.warning(response.message);
-          }
-        }
-      },
+
       // 搜索用户对应的部门API
       onSearch(){
         this.$refs.departWindow.add(this.checkedDepartKeys,this.userId);
       },
-
-      // 获取用户对应部门弹出框提交给返回的数据
-      modalFormOk (formData) {
-        this.checkedDepartNames = [];
-        this.selectedDepartKeys = [];
-        this.checkedDepartNameString = '';
-        this.userId = formData.userId;
-        this.userDepartModel.userId = formData.userId;
-        this.departIds=[];
-        this.resultDepartOptions=[];
-        var depart=[];
-        for (let i = 0; i < formData.departIdList.length; i++) {
-          this.selectedDepartKeys.push(formData.departIdList[i].key);
-          this.checkedDepartNames.push(formData.departIdList[i].title);
-          this.checkedDepartNameString = this.checkedDepartNames.join(",");
-          //新增部门选择，如果上面部门选择后不为空直接付给负责部门
-          depart.push({
-              key:formData.departIdList[i].key,
-              title:formData.departIdList[i].title
-          })
-          this.departIds.push(formData.departIdList[i].key)
-        }
-        this.resultDepartOptions=depart;
-        this.userDepartModel.departIdList = this.selectedDepartKeys;
-        this.checkedDepartKeys = this.selectedDepartKeys  //更新当前的选择keys
-       },
-      // 根据屏幕变化,设置抽屉尺寸
-      resetScreenSize(){
-        let screenWidth = document.body.clientWidth;
-        if(screenWidth < 500){
-          this.drawerWidth = screenWidth;
-        }else{
-          this.drawerWidth = 700;
-        }
-      },
       identityChange(e){
         if(e.target.value==="1"){
             this.departIdShow=false;

jero-web/src/views/user/Login.vue

@@ -310,6 +310,7 @@
         );
       },
       handleChangeCheckCode(){
+        this.form.setFieldsValue({inputCode: ''});
         this.currdatetime = new Date().getTime();
         getAction(`/sys/randomImage/${this.currdatetime}`).then(res=>{
           if(res.success){