jeecg-boot 1.0版本发布

ant-design-jeecg-vue/src/views/jeecg/FlowTest.vue

@@ -0,0 +1,93 @@
+<template>
+  <a-card :bordered="false">
+    <a-row>
+      <a-col :span="2">
+        <a-select defaultValue="POST" style="width: 90px" @change="handleChange" size="large">
+          <a-select-option value="POST">POST</a-select-option>
+          <!--<a-select-option value="GET">GET</a-select-option>-->
+        </a-select>
+      </a-col>
+      <a-col :span="22">
+        <a-input-search
+          placeholder="input send url"
+          v-model="url"
+          @search="onSearch"
+          enterButton="Send"
+          size="large" />
+      </a-col>
+    </a-row>
+
+    <a-tabs defaultActiveKey="2">
+      <a-tab-pane tab="params" key="2">
+        <textarea style="width:100%;font-size: 16px;font-weight:500" :rows="13" @input="changeVal">
+        </textarea>
+      </a-tab-pane>
+    </a-tabs>
+
+    <a-tabs defaultActiveKey="1">
+      <a-tab-pane tab="response" key="1">
+        <textarea style="width:100%;font-size: 16px;font-weight:500" :rows="10" v-html="resultJson" readonly>
+        </textarea>
+      </a-tab-pane>
+    </a-tabs>
+  </a-card>
+</template>
+<script>
+  import { postAction,getAction } from '@/api/manage'
+  import { ACCESS_TOKEN } from "@/store/mutation-types"
+  import Vue from 'vue'
+  export default {
+    name: 'FlowTest',
+    data(){
+      return {
+        url:"",
+        paramJson:"",
+        resultJson:{},
+        requestMethod:"POST"
+      }
+    },
+    methods: {
+      onSearch (value) {
+        let that = this
+        this.resultJson = {};
+        if("POST"===this.requestMethod.toUpperCase()){
+          postAction(value,this.paramJson).then((res)=>{
+            console.log(res)
+            this.resultJson = res
+          }).catch((err) => {
+            that.$message.error("请求异常："+err)
+          })
+        }else {
+          getAction(value,this.paramJson).then((res)=>{
+            console.log(res)
+            this.resultJson = res;
+          }).catch((err) => {
+            that.$message.error("请求异常："+err)
+          })
+        }
+      },
+      changeVal(e){
+        try {
+          let json = e.target.value;
+          json = json.replace(/\n/g,"");
+          json = json.replace(/\s*/g,"");
+          if(json.indexOf(",}")>0){
+            json = json.replace(",}","}");
+          }
+          this.paramJson = JSON.parse(json);
+        }catch (e) {
+          console.log(e);
+          this.$message.error("非法的JSON字符串")
+        }
+      },
+      handleChange(value) {
+        this.requestMethod = value;
+      },
+      created () {
+        const token = Vue.ls.get(ACCESS_TOKEN);
+        this.headers = {"X-Access-Token":token}
+
+      }
+    }
+  }
+</script>

ant-design-jeecg-vue/src/views/jeecg/JeecgDemoList.vue

@@ -0,0 +1,404 @@
+<template>
+  <a-card :bordered="false">
+
+    <!-- 查询区域 -->
+    <div class="table-page-search-wrapper">
+      <a-form layout="inline">
+        <a-row :gutter="24">
+
+          <a-col :span="6">
+            <a-form-item label="名称">
+              <a-input placeholder="请输入名称查询" v-model="queryParam.name"></a-input>
+            </a-form-item>
+          </a-col>
+          <a-col :span="6">
+            <a-form-item label="年龄">
+              <a-input placeholder="请输入名称查询" v-model="queryParam.age"></a-input>
+            </a-form-item>
+          </a-col>
+          <a-col :span="6">
+            <a-form-item label="性别">
+              <DictSelectTag v-model="queryParam.sex" placeholder="请输入用户性别" dictCode="sex"/>
+            </a-form-item>
+          </a-col>
+
+          <a-col :span="6" >
+            <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
+              <a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
+              <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
+              <a-button type="primary" @click="superQuery" icon="filter" style="margin-left: 8px">高级查询</a-button>
+            </span>
+          </a-col>
+
+        </a-row>
+      </a-form>
+    </div>
+
+    <!-- 操作按钮区域 -->
+    <div class="table-operator">
+      <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
+      <a-button type="primary" icon="plus" @click="jump">创建单据</a-button>
+      <a-button type="primary" icon="plus" @click="onetomany">一对多</a-button>
+
+      <a-dropdown v-if="selectedRowKeys.length > 0">
+        <a-menu slot="overlay">
+          <a-menu-item key="1" @click="batchDel">
+            <a-icon type="delete"/>
+            删除
+          </a-menu-item>
+        </a-menu>
+        <a-button style="margin-left: 8px"> 批量操作
+          <a-icon type="down"/>
+        </a-button>
+      </a-dropdown>
+    </div>
+
+    <!-- table区域-begin -->
+    <div>
+      <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
+        <i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a style="font-weight: 600">{{
+          selectedRowKeys.length }}</a>项
+        <a style="margin-left: 24px" @click="onClearSelected">清空</a>
+      </div>
+
+      <a-table
+        ref="table"
+        size="middle"
+        bordered
+        rowKey="id"
+        :columns="columns"
+        :dataSource="dataSource"
+        :pagination="ipagination"
+        :loading="loading"
+        :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
+        @change="handleTableChange">
+
+        <span slot="action" slot-scope="text, record">
+          <a @click="handleEdit(record)">编辑</a>
+
+          <a-divider type="vertical"/>
+          <a-dropdown>
+            <a class="ant-dropdown-link">更多 <a-icon type="down"/></a>
+            <a-menu slot="overlay">
+              <a-menu-item>
+                <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
+                  <a>删除</a>
+                </a-popconfirm>
+              </a-menu-item>
+            </a-menu>
+          </a-dropdown>
+        </span>
+
+      </a-table>
+    </div>
+    <!-- table区域-end -->
+
+    <!-- 表单区域 -->
+    <jeecgDemo-modal ref="jeecgDemoModal" @ok="modalFormOk"></jeecgDemo-modal>
+
+    <!-- 一对多表单区域 -->
+    <JeecgDemoTabsModal ref="jeecgDemoTabsModal" @ok="modalFormOk"></JeecgDemoTabsModal>
+
+    <!-- 高级查询区域 -->
+    <superQueryModal ref="superQueryModal" @ok="modalFormOk" @handleSuperQuery="handleSuperQuery"></superQueryModal>
+  </a-card>
+</template>
+
+<script>
+  import JeecgDemoModal from './modules/JeecgDemoModal'
+  import SuperQueryModal from './modules/SuperQueryModal'
+  import JeecgDemoTabsModal from './modules/JeecgDemoTabsModal'
+  import {filterObj} from '@/utils/util'
+  import {deleteAction, getAction, postAction} from '@/api/manage'
+  import {initDictOptions, filterDictText} from '@/components/dict/DictSelectUtil'
+
+  export default {
+    name: "JeecgDemoList",
+    components: {
+      JeecgDemoModal,
+      SuperQueryModal,
+      JeecgDemoTabsModal,
+    },
+    data() {
+      return {
+        description: '用户管理页面',
+        // 查询条件
+        queryParam: {},
+        //字典数组缓存
+        sexDictOptions: [],
+        // 表头
+        columns: [
+          {
+            title: '#',
+            dataIndex: '',
+            key: 'rowIndex',
+            width: 60,
+            align: "center",
+            customRender: function (t, r, index) {
+              return parseInt(index) + 1;
+            }
+          },
+          {
+            title: '姓名',
+            align: "center",
+            dataIndex: 'name'
+          },
+          {
+            title: '关键词',
+            align: "center",
+            dataIndex: 'keyWord'
+          },
+          {
+            title: '打卡时间',
+            align: "center",
+            dataIndex: 'punchTime'
+          },
+          {
+            title: '性别',
+            align: "center",
+            dataIndex: 'sex',
+            customRender: (text, record, index) => {
+              //字典值替换通用方法
+              return filterDictText(this.sexDictOptions, text);
+            }
+          },
+          {
+            title: '年龄',
+            align: "center",
+            dataIndex: 'age'
+          },
+          {
+            title: '生日',
+            align: "center",
+            dataIndex: 'birthday'
+          },
+          {
+            title: '邮箱',
+            align: "center",
+            dataIndex: 'email'
+          },
+          {
+            title: '个人简介',
+            align: "center",
+            dataIndex: 'content'
+          },
+          {
+            title: '操作',
+            dataIndex: 'action',
+            align: "center",
+            scopedSlots: {customRender: 'action'},
+          }
+        ],
+        //数据集
+        dataSource: [],
+        // 分页参数
+        ipagination: {
+          current: 1,
+          pageSize: 10,
+          pageSizeOptions: ['10', '20', '30'],
+          showTotal: (total, range) => {
+            return range[0] + "-" + range[1] + " 共" + total + "条"
+          },
+          showQuickJumper: true,
+          showSizeChanger: true,
+          total: 0
+        },
+        isorter: {
+          column: 'createTime',
+          order: 'desc',
+        },
+        loading: false,
+        selectedRowKeys: [],
+        selectedRows: [],
+        url: {
+          list: "/test/jeecgDemo/list",
+          delete: "/test/jeecgDemo/delete",
+          deleteBatch: "/test/jeecgDemo/deleteBatch",
+        },
+
+      }
+    },
+    created() {
+      this.loadData();
+      //初始化字典配置
+      this.initDictConfig();
+    },
+    methods: {
+      loadData(arg) {
+        //加载数据 若传入参数1则加载第一页的内容
+        if (arg === 1) {
+          this.ipagination.current = 1;
+        }
+        var params = this.getQueryParams();//查询条件
+        getAction(this.url.list, params).then((res) => {
+          if (res.success) {
+            this.dataSource = res.result.records;
+            this.ipagination.total = res.result.total;
+          }
+        })
+      },
+      handleSuperQuery(arg) {//高级查询方法
+        let params = {'superQueryParams':encodeURI(JSON.stringify(arg))};
+        getAction(this.url.list, params).then((res) => {
+          if (res.success) {
+            this.dataSource = res.result.records;
+            this.ipagination.total = res.result.total;
+          }else{
+            that.$message.warn(res.message);
+          }
+        })
+      },
+      initDictConfig() {
+        //初始化字典 - 性别
+        initDictOptions('sex').then((res) => {
+          if (res.success) {
+            this.sexDictOptions = res.result;
+          }
+        });
+      },
+      getQueryParams() {
+        var param = Object.assign({}, this.queryParam, this.isorter);
+        param.field = this.getQueryField();
+        param.pageNo = this.ipagination.current;
+        param.pageSize = this.ipagination.pageSize;
+        return filterObj(param);
+      },
+      getQueryField() {
+        //TODO 字段权限控制
+        var str = "id,";
+        this.columns.forEach(function (value, index) {
+          str += "," + value.dataIndex;
+        });
+        return str;
+      },
+      onSelectChange(selectedRowKeys, selectionRows) {
+        this.selectedRowKeys = selectedRowKeys;
+        this.selectionRows = selectionRows;
+      },
+      onClearSelected() {
+        this.selectedRowKeys = [];
+        this.selectionRows = [];
+      },
+      searchQuery() {
+        this.loadData(1);
+      },
+      superQuery() {
+        this.$refs.superQueryModal.show();
+      },
+      searchReset() {
+        var that = this;
+        that.queryParam = {}
+        that.loadData(1);
+      },
+      batchDel: function () {
+        if (this.selectedRowKeys.length <= 0) {
+          this.$message.warning('请选择一条记录！');
+          return;
+        } else {
+          var ids = "";
+          for (var a = 0; a < this.selectedRowKeys.length; a++) {
+            ids += this.selectedRowKeys[a] + ",";
+          }
+          var that = this;
+          this.$confirm({
+            title: "确认删除",
+            content: "是否删除选中数据?",
+            onOk: function () {
+              deleteAction(that.url.deleteBatch, {ids: ids}).then((res) => {
+                if (res.success) {
+                  that.$message.success(res.message);
+                  that.loadData();
+                  that.onClearSelected();
+                } else {
+                  that.$message.warning(res.message);
+                }
+              });
+            }
+          });
+        }
+      },
+      handleDelete: function (id) {
+        var that = this;
+        deleteAction(that.url.delete, {id: id}).then((res) => {
+          if (res.success) {
+            that.$message.success(res.message);
+            that.loadData();
+          } else {
+            that.$message.warning(res.message);
+          }
+        });
+      },
+      handleEdit: function (record) {
+        this.$refs.jeecgDemoModal.edit(record);
+        this.$refs.jeecgDemoModal.title = "编辑";
+      },
+      onetomany: function (record) {
+        this.$refs.jeecgDemoTabsModal.add();
+        this.$refs.jeecgDemoTabsModal.title = "编辑";
+      },
+      handleAdd: function () {
+        this.$refs.jeecgDemoModal.add();
+        this.$refs.jeecgDemoModal.title = "新增";
+      },
+      handleTableChange(pagination, filters, sorter) {
+        //分页、排序、筛选变化时触发
+        console.log(sorter);
+        //TODO 筛选
+        if (Object.keys(sorter).length > 0) {
+          this.isorter.column = sorter.field;
+          this.isorter.order = "ascend" == sorter.order ? "asc" : "desc"
+        }
+        this.ipagination = pagination;
+        this.loadData();
+      },
+      modalFormOk() {
+        // 新增/修改 成功时，重载列表
+        this.loadData();
+      },
+      //跳转单据页面
+      jump() {
+        this.$router.push({path: '/jeecg/helloworld'})
+      }
+    }
+  }
+</script>
+<style>
+  .ant-card-body .table-operator {
+    margin-bottom: 18px;
+  }
+
+  .ant-layout-content {
+    margin: 12px 16px 0 !important;
+  }
+
+  .ant-table-tbody .ant-table-row td {
+    padding-top: 15px;
+    padding-bottom: 15px;
+  }
+
+  .anty-row-operator button {
+    margin: 0 5px
+  }
+
+  .ant-btn-danger {
+    background-color: #ffffff
+  }
+
+  .ant-modal-cust-warp {
+    height: 100%
+  }
+
+  .ant-modal-cust-warp .ant-modal-body {
+    height: calc(100% - 110px) !important;
+    overflow-y: auto
+  }
+
+  .ant-modal-cust-warp .ant-modal-content {
+    height: 90% !important;
+    overflow-y: hidden
+  }
+  /** Button按钮间距 */
+  .ant-btn {
+    margin-left: 3px
+  }
+</style>

ant-design-jeecg-vue/src/views/jeecg/JeecgOrderMainList.vue

@@ -0,0 +1,316 @@
+<template>
+  <a-card :bordered="false">
+
+    <!-- 查询区域 -->
+    <div class="table-page-search-wrapper">
+      <a-form layout="inline">
+        <a-row :gutter="24">
+
+          <a-col :span="6">
+            <a-form-item label="订单号">
+              <a-input placeholder="请输入订单号" v-model="queryParam.orderCode"></a-input>
+            </a-form-item>
+          </a-col>
+          <a-col :span="6">
+            <a-form-item label="订单类型">
+              <a-select placeholder="请输入订单类型"  v-model="queryParam.ctype">
+                <a-select-option value="1">国内订单</a-select-option>
+                <a-select-option value="2">国际订单</a-select-option>
+              </a-select>
+            </a-form-item>
+          </a-col>
+
+          <a-col :span="8" >
+            <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
+              <a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
+              <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
+            </span>
+          </a-col>
+
+        </a-row>
+      </a-form>
+    </div>
+
+    <!-- 操作按钮区域 -->
+    <div class="table-operator">
+      <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
+
+      <a-dropdown v-if="selectedRowKeys.length > 0">
+        <a-menu slot="overlay">
+          <a-menu-item key="1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item>
+        </a-menu>
+        <a-button style="margin-left: 8px"> 批量操作 <a-icon type="down" /></a-button>
+      </a-dropdown>
+    </div>
+
+    <!-- table区域-begin -->
+    <div>
+      <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
+        <i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a style="font-weight: 600">{{ selectedRowKeys.length }}</a>项
+        <a style="margin-left: 24px" @click="onClearSelected">清空</a>
+      </div>
+
+      <a-table
+        ref="table"
+        size="middle"
+        bordered
+        rowKey="id"
+        :columns="columns"
+        :dataSource="dataSource"
+        :pagination="ipagination"
+        :loading="loading"
+        :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
+        @change="handleTableChange">
+
+        <span slot="action" slot-scope="text, record">
+          <a @click="handleEdit(record)">编辑</a>
+
+          <a-divider type="vertical" />
+          <a-dropdown>
+            <a class="ant-dropdown-link">更多 <a-icon type="down" /></a>
+            <a-menu slot="overlay">
+              <a-menu-item>
+                <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
+                  <a>删除</a>
+                </a-popconfirm>
+              </a-menu-item>
+            </a-menu>
+          </a-dropdown>
+        </span>
+
+      </a-table>
+    </div>
+    <!-- table区域-end -->
+
+    <!-- 表单区域 -->
+    <jeecgOrderMain-modal ref="jeecgOrderMainModal" @ok="modalFormOk"></jeecgOrderMain-modal>
+  </a-card>
+</template>
+
+<script>
+  import JeecgOrderMainModal from './modules/JeecgOrderMainModal'
+  import { filterObj } from '@/utils/util'
+  import { deleteAction,getAction } from '@/api/manage'
+
+  export default {
+    name: "JeecgOrderMainList",
+    components: {
+      JeecgOrderMainModal
+    },
+    data () {
+      return {
+        description: '订单管理页面',
+        // 查询条件
+        queryParam: {},
+        // 表头
+        columns: [
+          {
+            title: '#',
+            dataIndex: '',
+            key:'rowIndex',
+            width:60,
+            align:"center",
+            customRender:function (t,r,index) {
+              return parseInt(index)+1;
+            }
+          },
+		  {
+            title: '订单号',
+            align:"center",
+            dataIndex: 'orderCode'
+          },
+		  {
+            title: '订单类型',
+            align:"center",
+            dataIndex: 'ctype',
+            customRender: (text, record, index) => {
+              let re = "";
+              if (text === '1') {
+                re = "国内订单";
+              } else if (text === '2') {
+                re = "国际订单";
+              }
+              return re;
+            }
+          },
+		  {
+            title: '订单日期',
+            align:"center",
+            dataIndex: 'orderDate'
+          },
+		  {
+            title: '订单金额',
+            align:"center",
+            dataIndex: 'orderMoney'
+          },
+		  {
+            title: '订单备注',
+            align:"center",
+            dataIndex: 'content'
+          },
+          {
+            title: '操作',
+            dataIndex: 'action',
+            align:"center",
+            scopedSlots: { customRender: 'action' },
+          }
+        ],
+        //数据集
+        dataSource:[],
+        // 分页参数
+        ipagination:{
+          current: 1,
+          pageSize: 10,
+          pageSizeOptions: ['10', '20', '30'],
+          showTotal: (total, range) => {
+            return range[0] + "-" + range[1] + " 共" + total + "条"
+          },
+          showQuickJumper: true,
+          showSizeChanger: true,
+          total: 0
+        },
+        isorter:{
+          column: 'createTime',
+          order: 'desc',
+        },
+        loading:false,
+        selectedRowKeys: [],
+        selectedRows: [],
+		url: {
+          list: "/test/jeecgOrderMain/list",
+          delete: "/test/jeecgOrderMain/delete",
+          deleteBatch: "/test/jeecgOrderMain/deleteBatch",
+        },
+        
+      }
+    },
+    created() {
+      this.loadData();
+    },
+    methods: {
+      loadData (arg){
+        //加载数据 若传入参数1则加载第一页的内容
+        if(arg===1){
+          this.ipagination.current = 1;
+        }
+        var params = this.getQueryParams();//查询条件
+        getAction(this.url.list,params).then((res)=>{
+          if(res.success){
+            this.dataSource = res.result.records;
+            this.ipagination.total = res.result.total;
+          }
+        })
+      },
+      getQueryParams(){
+        var param = Object.assign({}, this.queryParam,this.isorter);
+        param.field = this.getQueryField();
+        param.pageNo = this.ipagination.current;
+        param.pageSize = this.ipagination.pageSize;
+        return filterObj(param);
+      },
+      getQueryField(){
+        //TODO 字段权限控制
+        var str = "id,";
+        for(var a = 0;a<this.columns.length;a++){
+          str+=","+this.columns[a].dataIndex;
+        }
+        return str;
+      },
+      onSelectChange (selectedRowKeys,selectionRows) {
+        this.selectedRowKeys = selectedRowKeys;
+        this.selectionRows = selectionRows;
+      },
+      onClearSelected(){
+        this.selectedRowKeys = [];
+        this.selectionRows = [];
+      },
+      searchQuery(){
+        this.loadData(1);
+      },
+      searchReset(){
+        var that = this;
+        that.queryParam={};
+        that.loadData(1);
+      },
+      batchDel: function(){
+        if(this.selectedRowKeys.length<=0){
+          this.$message.warning('请选择一条记录！');
+          return ;
+        }else{
+          var ids = "";
+          for(var a =0;a<this.selectedRowKeys.length;a++){
+            ids+=this.selectedRowKeys[a]+",";
+          }
+          var that = this;
+          this.$confirm({
+            title:"确认删除",
+            content:"是否删除选中数据?",
+            onOk: function(){
+              deleteAction(that.url.deleteBatch,{ids: ids}).then((res)=>{
+                if(res.success){
+                  that.$message.success(res.message);
+                  that.loadData();
+                  that.onClearSelected();
+                }else{
+                  that.$message.warning(res.message);
+                }
+              });
+            }
+          });
+        }
+      },
+      handleDelete: function(id){
+        var that = this;
+        deleteAction(that.url.delete,{id: id}).then((res)=>{
+          if(res.success){
+            that.$message.success(res.message);
+            that.loadData();
+          }else{
+            that.$message.warning(res.message);
+          }
+        });
+      },
+      handleEdit: function(record){
+        this.$refs.jeecgOrderMainModal.edit(record);
+        this.$refs.jeecgOrderMainModal.title="编辑";
+      },
+      handleAdd: function(){
+        this.$refs.jeecgOrderMainModal.add();
+        this.$refs.jeecgOrderMainModal.title="新增";
+      },
+      handleTableChange(pagination, filters, sorter){
+        //分页、排序、筛选变化时触发
+        console.log(sorter);
+        //TODO 筛选
+        if (Object.keys(sorter).length>0){
+          this.isorter.column = sorter.field;
+          this.isorter.order = "ascend"==sorter.order?"asc":"desc"
+        }
+        this.ipagination = pagination;
+        this.loadData();
+      },
+      modalFormOk () {
+        // 新增/修改 成功时，重载列表
+        this.loadData();
+      }
+    }
+  }
+</script>
+<style>
+  .ant-card-body .table-operator{
+    margin-bottom: 18px;
+  }
+  .ant-layout-content{
+    margin:12px 16px 0 !important;
+  }
+  .ant-table-tbody .ant-table-row td{
+    padding-top:15px;
+    padding-bottom:15px;
+  }
+  .anty-row-operator button{margin: 0 5px}
+  .ant-btn-danger{background-color: #ffffff}
+
+  .ant-modal-cust-warp{height: 100%}
+  .ant-modal-cust-warp .ant-modal-body{height:calc(100% - 110px) !important;overflow-y: auto}
+  .ant-modal-cust-warp .ant-modal-content{height:90% !important;overflow-y: hidden}
+</style>

ant-design-jeecg-vue/src/views/jeecg/PrintDemoList.vue

@@ -0,0 +1,208 @@
+<template>
+  <a-card :bordered="false" :class="{'abcdefg':true}">
+    <div class="no-print" style="text-align: right">
+      <a-button v-print="'#acceptProof'" ghost type="primary">打印</a-button>
+    </div>
+    <section ref="print" id="acceptProof" class="abcdefg">
+      <div style="text-align: center">
+        <p style="font-size: 24px;font-weight: 800">打印测试表单</p>
+      </div>
+      <!--签字-->
+      <div class="sign" style="text-align: left">
+        <a-form-item label="打印员：" :labelCol="labelCol" :wrapperCol="wrapperCol" hasFeedback>
+          <a-input placeholder="请输入您的名字"/>
+        </a-form-item>
+        <a-form-item label="打印日期：" :labelCol="labelCol" :wrapperCol="wrapperCol" hasFeedback>
+          <a-date-picker></a-date-picker>
+        </a-form-item>
+        <a-form-item label="打印内容：" :labelCol="labelCol" :wrapperCol="wrapperCol" hasFeedback>
+          <a-textarea placeholder="请输入打印内容..."/>
+        </a-form-item>
+        <a-form-item label="打印目的：" :labelCol="labelCol" :wrapperCol="wrapperCol" hasFeedback>
+          <a-textarea placeholder="请输入打印目的..."/>
+        </a-form-item>
+        <a-form-item label="打印说明：" :labelCol="labelCol" :wrapperCol="wrapperCol" hasFeedback>
+          <a-textarea placeholder="请输入打印说明..."/>
+        </a-form-item>
+        <a-form-item label="打印图片：" :labelCol="labelCol" :wrapperCol="wrapperCol" hasFeedback>
+          <a-upload
+            action="//jsonplaceholder.typicode.com/posts/"
+            listType="picture-card"
+            :fileList="fileList"
+            @preview="handlePreview"
+            @change="handleChange">
+            <div v-if="fileList.length < 3">
+              <a-icon type="plus" />
+              <div class="ant-upload-text">Upload</div>
+            </div>
+          </a-upload>
+          <a-modal :visible="previewVisible" :footer="null" @cancel="handleCancel">
+            <img alt="example" style="width: 100%" :src="previewImage" />
+          </a-modal>
+        </a-form-item>
+      </div>
+    </section>
+  </a-card>
+  <!--</page-layout>-->
+</template>
+<script>
+  import ACol from "ant-design-vue/es/grid/Col";
+  import ARow from "ant-design-vue/es/grid/Row";
+  import {getAction} from '@/api/manage';
+  import ATextarea from 'ant-design-vue/es/input/TextArea'
+
+  export default {
+    components: {
+      ATextarea,
+      ARow,
+      ACol,
+    },
+    name: 'Printgzsld',
+    props:{
+      reBizCode:{
+        type: String,
+        default: ''
+      }
+    },
+    data(){
+      return {
+        columns: [
+/*          {
+            title: '已提交的文件资料',
+            dataIndex: 'fileCategoryName',
+            align:"center",
+          },
+          {
+            title: '份数',
+            dataIndex: 'fileNum',
+            align:"center",
+          },
+          {
+            title: '材料介质',
+            dataIndex: 'fileType',
+            align:"center",
+          },*/
+        ],
+        dataSource:[],
+        applicantName:"",
+        labelCol: {
+          xs: { span: 24 },
+          sm: { span: 2 },
+        },
+        wrapperCol: {
+          xs: { span: 24 },
+          sm: { span: 8 },
+        },
+        beginYear:"",
+        beginMonth:"",
+        beginDay:"",
+        endYear:"",
+        endMonth:"",
+        endDay:"",
+        ipagination:{
+          hideOnSinglePage:false,
+        },
+        previewVisible: false,
+        previewImage: '',
+        fileList: [{
+          uid: '-1',
+          name: 'xxx.png',
+          status: 'done',
+          url: 'https://zos.alipayobjects.com/rmsportal/jkjgkEfvpUPVyRjUImniVslZfWPnJuuZ.png',
+        },
+          {
+            uid:'-2',
+            name:'pic1.png',
+            status:'done',
+            url:'https://www.gizbot.com/img/2016/11/whatsapp-error-lead-image-08-1478607387.jpg',
+          }
+        ],
+        url:{
+          loadApplicant:"/sps/register/loadApplicants",
+          loadRegisterFiles:"/sps/register/getRegisterFilesConfig",
+        }
+      }
+    },
+    created() {
+      this.getDate();
+    },
+    methods: {
+      loadData(reBizCode){
+        // 获取材料文件
+        getAction(this.url.loadRegisterFiles,{reBizCode:reBizCode}).then((res)=>{
+          if(res.success){
+            console.log(res.result)
+            this.dataSource = res.result;
+          }
+        });
+        // 获取申请人信息
+        getAction(this.url.loadApplicant,{reBizCode:reBizCode}).then((res)=>{
+          if(res.success){
+            this.applicant = res.result;
+            var name ="";
+            for(var i=0;i<res.result.length;i++){
+              if(i==res.result.length-1){
+                name = name+res.result[i].name;
+              }else{
+                name = name+res.result[i].name+",";
+              }
+            }
+            if(name=="" || name==null ||name=="null"){
+              this.applicantName = "";
+            }else{
+              this.applicantName = name;
+            }
+
+          }
+        });
+
+      },
+      getDate(){
+        // 当前时间
+      },
+      handleCancel () {
+        this.previewVisible = false
+      },
+      handlePreview (file) {
+        this.previewImage = file.url || file.thumbUrl
+        this.previewVisible = true
+      },
+      handleChange ({ fileList }) {
+        this.fileList = fileList
+      }
+    }
+  }
+</script>
+<style scoped>
+  .abcdefg .ant-card-body{
+    margin-left: 0%;
+    margin-right: 0%;
+    margin-bottom: 1%;
+    border:0px solid black;
+    min-width: 800px;
+  }
+  .explain{
+    text-align: left;
+    margin-left: 50px;
+  }
+  .explain .ant-input,.sign .ant-input{
+    font-weight:bolder;
+    text-align:center;
+    border-left-width:0px!important;
+    border-top-width:0px!important;;
+    border-right-width:0px!important;;
+  }
+  .explain div{
+    margin-bottom: 10px;
+  }
+  /* you can make up upload button and sample style by using stylesheets */
+  .ant-upload-select-picture-card i {
+    font-size: 32px;
+    color: #999;
+  }
+
+  .ant-upload-select-picture-card .ant-upload-text {
+    margin-top: 8px;
+    color: #666;
+  }
+</style>

ant-design-jeecg-vue/src/views/jeecg/helloworld.vue

@@ -0,0 +1,66 @@
+<template>
+  <a-form @submit="handleSubmit" :form="form">
+    <a-form-item
+      label="Note"
+      :labelCol="{ span: 5 }"
+      :wrapperCol="{ span: 12 }"
+    >
+      <a-input
+        v-decorator="[
+          'note',
+          {rules: [{ required: true, message: 'Please input your note!' }]}
+        ]"
+      />
+    </a-form-item>
+    <a-form-item
+      label="Gender"
+      :labelCol="{ span: 5 }"
+      :wrapperCol="{ span: 12 }"
+    >
+      <a-select
+        v-decorator="[
+          'gender',
+          {rules: [{ required: true, message: 'Please select your gender!' }]}
+        ]"
+        placeholder="Select a option and change input text above"
+        @change="this.handleSelectChange"
+      >
+        <a-select-option value="male">male</a-select-option>
+        <a-select-option value="female">female</a-select-option>
+      </a-select>
+    </a-form-item>
+    <a-form-item
+      :wrapperCol="{ span: 12, offset: 5 }">
+      <a-button type="primary" htmlType="submit">
+        Submit
+      </a-button>
+    </a-form-item>
+  </a-form>
+</template>
+
+<script>
+  export default {
+    data () {
+      return {
+        formLayout: 'horizontal',
+        form: this.$form.createForm(this),
+      }
+    },
+    methods: {
+      handleSubmit (e) {
+        e.preventDefault()
+        this.form.validateFields((err, values) => {
+          if (!err) {
+            console.log('Received values of form: ', values)
+          }
+        })
+      },
+      handleSelectChange (value) {
+        console.log(value)
+        this.form.setFieldsValue({
+          note: `Hi, ${value === 'male' ? 'man' : 'lady'}!`,
+        })
+      },
+    },
+  }
+</script>

ant-design-jeecg-vue/src/views/jeecg/helloworld2.vue

@@ -0,0 +1,31 @@
+<template>
+  <div>
+    hello world!
+  </div>
+</template>
+<script>
+  export default {
+    data () {
+      return {
+        description: '表单页用于向用户收集或验证信息，基础表单常见于数据项较少的表单场景。',
+        value: 1,
+
+        // form
+        form: this.$form.createForm(this),
+
+      }
+    },
+    methods: {
+      // handler
+      handleSubmit (e) {
+        e.preventDefault()
+        this.form.validateFields((err, values) => {
+          if (!err) {
+            // eslint-disable-next-line no-console
+            console.log('Received values of form: ', values)
+          }
+        })
+      }
+    }
+  }
+</script>

ant-design-jeecg-vue/src/views/jeecg/modules/JeecgDemoModal.vue

@@ -0,0 +1,181 @@
+<template>
+  <a-modal
+    :title="title"
+    :width="800"
+    :visible="visible"
+    :confirmLoading="confirmLoading"
+    @ok="handleOk"
+    @cancel="handleCancel"
+    cancelText="关闭">
+    
+    <a-spin :spinning="confirmLoading">
+      <a-form :form="form">
+      
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="姓名"
+          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="sex">
+          <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>
+        </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>
+    </a-spin>
+  </a-modal>
+</template>
+
+<script>
+  import { httpAction } from '@/api/manage'
+  import pick from 'lodash.pick'
+  import moment from "moment"
+
+  export default {
+    name: "JeecgDemoModal",
+    data () {
+      return {
+        title:"操作",
+        visible: false,
+        model: {},
+        labelCol: {
+          xs: { span: 24 },
+          sm: { span: 5 },
+        },
+        wrapperCol: {
+          xs: { span: 24 },
+          sm: { span: 16 },
+        },
+
+        confirmLoading: false,
+        form: this.$form.createForm(this),
+        validatorRules:{
+        },
+        url: {
+          add: "/test/jeecgDemo/add",
+          edit: "/test/jeecgDemo/edit",
+        },
+      }
+    },
+    created () {
+    },
+    methods: {
+      add () {
+        this.edit({});
+      },
+      edit (record) {
+        this.form.resetFields();
+        this.model = Object.assign({}, record);
+        this.visible = true;
+        this.$nextTick(() => {
+          this.form.setFieldsValue(pick(this.model,'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.$emit('close');
+        this.visible = false;
+      },
+      handleOk () {
+        const that = this;
+        // 触发表单验证
+        this.form.validateFields((err, values) => {
+          if (!err) {
+            that.confirmLoading = true;
+            let httpurl = '';
+            let method = '';
+            if(!this.model.id){
+              httpurl+=this.url.add;
+              method = 'post';
+            }else{
+              httpurl+=this.url.edit;
+               method = 'put';
+            }
+            let formData = Object.assign(this.model, values);
+            //时间格式化
+            formData.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)=>{
+              if(res.success){
+                that.$message.success(res.message);
+                that.$emit('ok');
+              }else{
+                that.$message.warning(res.message);
+              }
+            }).finally(() => {
+              that.confirmLoading = false;
+              that.close();
+            })
+
+
+
+          }
+        })
+      },
+      handleCancel () {
+        this.close()
+      },
+
+
+    }
+  }
+</script>
+
+<style scoped>
+
+</style>

ant-design-jeecg-vue/src/views/jeecg/modules/JeecgDemoTabsModal.vue

@@ -0,0 +1,285 @@
+<template>
+  <a-modal
+    :title="title"
+    :width="1200"
+    :visible="visible"
+    :confirmLoading="confirmLoading"
+    @ok="handleOk"
+    @cancel="handleCancel"
+    cancelText="关闭">
+
+    <a-spin :spinning="confirmLoading">
+      <a-form :form="form">
+
+        <a-card class="card"  :bordered="false">
+          <a-row class="form-row" :gutter="16">
+            <a-col :lg="8">
+              <a-form-item label="任务名">
+                <a-input placeholder="请输入任务名称"  v-decorator="[ 'task.name', {rules: [{ required: true, message: '请输入任务名称', whitespace: true}]} ]"/>
+              </a-form-item>
+            </a-col>
+            <a-col :lg="8">
+              <a-form-item label="任务描述">
+                <a-input placeholder="请输入任务描述"  v-decorator="['task.description', {rules: [{ required: true, message: '请输入任务描述', whitespace: true}]} ]"/>
+              </a-form-item>
+            </a-col>
+            <a-col :lg="8">
+              <a-form-item label="执行人">
+                <a-select placeholder="请选择执行人" v-decorator="['task.executor',{rules: [{ required: true, message: '请选择执行人'}]}  ]">
+                  <a-select-option value="黄丽丽">黄丽丽</a-select-option>
+                  <a-select-option value="李大刀">李大刀</a-select-option>
+                </a-select>
+              </a-form-item>
+            </a-col>
+          </a-row>
+          <a-row class="form-row" :gutter="16">
+            <a-col :lg="8">
+              <a-form-item label="责任人">
+                <a-select placeholder="请选择责任人" v-decorator="['task.manager',  {rules: [{ required: true, message: '请选择责任人'}]} ]">
+                  <a-select-option value="王伟">王伟</a-select-option>
+                  <a-select-option value="李红军">李红军</a-select-option>
+                </a-select>
+              </a-form-item>
+            </a-col>
+            <a-col :lg="8">
+              <a-form-item label="提醒时间">
+                <a-time-picker style="width: 100%" v-decorator="['task.time', {rules: [{ required: true, message: '请选择提醒时间'}]} ]"/>
+              </a-form-item>
+            </a-col>
+            <a-col :lg="8">
+              <a-form-item
+                label="任务类型">
+                <a-select placeholder="请选择任务类型" v-decorator="['task.type', {rules: [{ required: true, message: '请选择任务类型'}]} ]">
+                  <a-select-option value="定时执行">定时执行</a-select-option>
+                  <a-select-option value="周期执行">周期执行</a-select-option>
+                </a-select>
+              </a-form-item>
+            </a-col>
+          </a-row>
+        </a-card>
+
+        <a-tabs defaultActiveKey="1" >
+          <a-tab-pane tab="Tab 1" key="1">
+
+            <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-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>
+              </template>
+              <template slot="operation" slot-scope="text, record, index">
+                <template v-if="record.editable">
+                  <span v-if="record.isNew">
+                    <a @click="saveRow(record.key)">添加</a>
+                    <a-divider type="vertical"/>
+                    <a-popconfirm title="是否要删除此行？" @confirm="removeRow(record.key)"><a>删除</a></a-popconfirm>
+                  </span>
+                  <span v-else>
+                    <a @click="saveRow(record.key)">保存</a>
+                    <a-divider type="vertical"/>
+                    <a @click="cancelEditRow(record.key)">取消</a>
+                  </span>
+                </template>
+                <span v-else>
+                  <a @click="editRow(record.key)">编辑</a>
+                  <a-divider type="vertical"/>
+                  <a-popconfirm title="是否要删除此行？" @confirm="removeRow(record.key)"><a>删除</a></a-popconfirm>
+                </span>
+              </template>
+            </a-table>
+
+            <a-button style="width: 100%; margin-top: 16px; margin-bottom: 8px" type="dashed" icon="plus" @click="newRow">新增成员</a-button>
+          </a-tab-pane>
+          <a-tab-pane tab="Tab 2" key="2" forceRender>
+            Content of Tab Pane 2
+          </a-tab-pane>
+          <a-tab-pane tab="Tab 3" key="3">Content of Tab Pane 3</a-tab-pane>
+        </a-tabs>
+
+      </a-form>
+    </a-spin>
+  </a-modal>
+</template>
+
+<script>
+  import {httpAction} from '@/api/manage'
+  import pick from 'lodash.pick'
+  import moment from "moment"
+
+  export default {
+    name: "JeecgDemoTabsModal",
+    data() {
+      return {
+        title: "操作",
+        visible: false,
+        model: {},
+        // table
+        columns: [
+          {
+            title: '成员姓名',
+            dataIndex: 'name',
+            key: 'name',
+            width: '20%',
+            scopedSlots: {customRender: 'name'}
+          },
+          {
+            title: '工号',
+            dataIndex: 'workId',
+            key: 'workId',
+            width: '20%',
+            scopedSlots: {customRender: 'workId'}
+          },
+          {
+            title: '所属部门',
+            dataIndex: 'department',
+            key: 'department',
+            width: '40%',
+            scopedSlots: {customRender: 'department'}
+          },
+          {
+            title: '操作',
+            key: 'action',
+            scopedSlots: {customRender: 'operation'}
+          }
+        ],
+        data: [
+          {
+            key: '1',
+            name: '小明',
+            workId: '001',
+            editable: false,
+            department: '行政部'
+          },
+          {
+            key: '2',
+            name: '李莉',
+            workId: '002',
+            editable: false,
+            department: 'IT部'
+          },
+          {
+            key: '3',
+            name: '王小帅',
+            workId: '003',
+            editable: false,
+            department: '财务部'
+          }
+        ],
+
+        confirmLoading: false,
+        form: this.$form.createForm(this),
+        validatorRules: {},
+        url: {
+          add: "/test/jeecgDemo/add",
+          edit: "/test/jeecgDemo/edit",
+        },
+      }
+    },
+    created() {
+    },
+    methods: {
+      add() {
+        this.edit({});
+      },
+      edit(record) {
+        this.form.resetFields();
+        this.model = Object.assign({}, record);
+        this.visible = true;
+        this.$nextTick(() => {
+          this.form.setFieldsValue(pick(this.model, '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.$emit('close');
+        this.visible = false;
+      },
+      handleOk() {
+        const that = this;
+        // 触发表单验证
+        this.form.validateFields((err, values) => {
+          if (!err) {
+            that.confirmLoading = true;
+            let httpurl = '';
+            let method = '';
+            if (!this.model.id) {
+              httpurl += this.url.add;
+              method = 'post';
+            } else {
+              httpurl += this.url.edit;
+              method = 'put';
+            }
+            let formData = Object.assign(this.model, values);
+            //时间格式化
+            formData.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) => {
+              if (res.success) {
+                that.$message.success(res.message);
+                that.$emit('ok');
+              } else {
+                that.$message.warning(res.message);
+              }
+            }).finally(() => {
+              that.confirmLoading = false;
+              that.close();
+            })
+          }
+        })
+      },
+      handleCancel() {
+        this.close()
+      },
+      newRow () {
+        // 通过时间戳生成 UUID
+        let uuid = Math.round(new Date().getTime()).toString();
+        console.log('uuid: '+ uuid)
+        this.data.push({
+          key: uuid,
+          name: '',
+          workId: '',
+          department: '',
+          editable: true,
+          isNew: true
+        })
+      },
+      removeRow (key) {
+        const newData = this.data.filter(item => item.key !== key)
+        this.data = newData
+      },
+      saveRow (key) {
+        let target = this.data.filter(item => item.key === key)[0]
+        target.editable = false
+        target.isNew = false
+      },
+      handlerRowChange (value, key, column) {
+        const newData = [...this.data]
+        const target = newData.filter(item => key === item.key)[0]
+        if (target) {
+          target[column] = value
+          this.data = newData
+        }
+      },
+      editRow (key) {
+        let target = this.data.filter(item => item.key === key)[0]
+        target.editable = !target.editable
+      },
+      cancelEditRow (key) {
+        let target = this.data.filter(item => item.key === key)[0]
+        target.editable = false
+      },
+    }
+  }
+</script>
+
+<style scoped>
+  .ant-modal-body {
+    padding: 8px!important;
+  }
+</style>

ant-design-jeecg-vue/src/views/jeecg/modules/JeecgOrderMainModal.vue

@@ -0,0 +1,304 @@
+<template>
+  <a-modal
+    :title="title"
+    :width="1000"
+    :visible="visible"
+    :confirmLoading="confirmLoading"
+    @ok="handleOk"
+    @cancel="handleCancel">
+    
+    <a-spin :spinning="confirmLoading">
+      <a-form :form="form">
+        <!-- 主表单区域 -->
+        <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-col>
+          <a-col :lg="8">
+            <a-form-item
+              :labelCol="labelCol"
+              :wrapperCol="wrapperCol"
+              label="订单类型">
+              <a-select placeholder="请输入订单类型" v-decorator="['ctype',{}]">
+                <a-select-option value="1">国内订单</a-select-option>
+                <a-select-option value="2">国际订单</a-select-option>
+              </a-select>
+            </a-form-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-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-col>
+          <a-col :lg="8">
+            <a-form-item
+              :labelCol="labelCol"
+              :wrapperCol="wrapperCol"
+              label="订单备注">
+              <a-input placeholder="请输入订单备注" v-decorator="['content', {}]" />
+            </a-form-item>
+          </a-col>
+        </a-row>
+
+        <!-- 子表单区域 -->
+        <a-tabs defaultActiveKey="1" >
+          <a-tab-pane tab="客户信息" key="1">
+            <div>
+              <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-row>
+
+              <a-row type="flex" style="margin-bottom:10px" :gutter="16" v-for="(item, index) in orderMainModel.jeecgOrderCustomerList" :key="index">
+                <a-col :span="5">
+                  <a-form-item>
+                    <a-input placeholder="客户名" v-decorator="['jeecgOrderCustomerList['+index+'].name', {'initialValue':item.name,rules: [{ required: true, message: '请输入用户名!' }]}]" />
+                  </a-form-item>
+                </a-col>
+                <a-col :span="5">
+                  <a-form-item>
+                    <a-select placeholder="性别" v-decorator="['jeecgOrderCustomerList['+index+'].sex', {'initialValue':item.sex}]">
+                      <a-select-option value="1">男</a-select-option>
+                      <a-select-option value="2">女</a-select-option>
+                    </a-select>
+                  </a-form-item>
+                </a-col>
+                <a-col :span="5">
+                  <a-form-item>
+                    <a-input placeholder="身份证号" v-decorator="['jeecgOrderCustomerList['+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>
+                <a-col :span="5">
+                  <a-form-item>
+                    <a-input placeholder="手机号" v-decorator="['jeecgOrderCustomerList['+index+'].telphone', {'initialValue':item.telphone,rules: [{ pattern: '^1(3|4|5|7|8)\\d{9}$', message: '手机号格式不对!' }]}]"/>
+                  </a-form-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>
+              </a-row>
+            </div>
+          </a-tab-pane>
+
+          <a-tab-pane tab="机票信息" key="2" forceRender>
+            <div>
+              <a-row type="flex" style="margin-bottom:10px" :gutter="16">
+                <a-col :span="6">航班号</a-col>
+                <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.jeecgOrderTicketList" :key="index">
+                <a-col :span="6">
+                  <a-form-item>
+                    <a-input placeholder="航班号" v-decorator="['jeecgOrderTicketList['+index+'].ticketCode', {'initialValue':item.ticketCode,rules: [{ required: true, message: '请输入航班号!' }]}]" />
+                  </a-form-item>
+                </a-col>
+                <a-col :span="6">
+                  <a-form-item>
+                    <j-date placeholder="航班时间" :trigger-change="true" v-decorator="['jeecgOrderTicketList['+index+'].tickectDate', {'initialValue':item.tickectDate}]"></j-date>
+                  </a-form-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-col>
+              </a-row>
+            </div>
+          </a-tab-pane>
+        </a-tabs>
+
+      </a-form>
+    </a-spin>
+  </a-modal>
+</template>
+
+<script>
+  import { httpAction,getAction } from '@/api/manage'
+  import JDate from '@/components/jeecg/JDate'
+  import pick from 'lodash.pick'
+  import moment from "moment"
+
+  export default {
+    name: "JeecgOrderMainModal",
+    components: {
+      JDate
+    },
+    data () {
+      return {
+        title:"操作",
+        visible: false,
+        orderMainModel: {jeecgOrderCustomerList: [{}],
+                           jeecgOrderTicketList: [{}]},
+        labelCol: {
+          xs: { span: 24 },
+          sm: { span: 5 },
+        },
+        wrapperCol: {
+          xs: { span: 24 },
+          sm: { span: 16 },
+        },
+
+        confirmLoading: false,
+        form: this.$form.createForm(this),
+        validatorRules:{
+        },
+        url: {
+          add: "/test/jeecgOrderMain/add",
+          edit: "/test/jeecgOrderMain/edit",
+          orderCustomerList: "/test/jeecgOrderMain/queryOrderCustomerListByMainId",
+          orderTicketList: "/test/jeecgOrderMain/queryOrderTicketListByMainId",
+        },
+      }
+    },
+    created () {
+    },
+    methods: {
+      add () {
+        this.edit({});
+      },
+      edit (record) {
+        this.form.resetFields();
+        this.orderMainModel = Object.assign({}, record);
+        this.orderMainModel.jeecgOrderCustomerList = [{}];
+        this.orderMainModel.jeecgOrderTicketList = [{}];
+        //--------------------------------------------------------
+        //初始化明细表数据
+        console.log(this.orderMainModel.id)
+        if(this.orderMainModel.id){
+          let params = {id:this.orderMainModel.id}
+          //初始化订单机票列表
+          getAction(this.url.orderCustomerList,params).then((res)=>{
+            if(res.success){
+              this.orderMainModel.jeecgOrderCustomerList = res.result;
+              this.$forceUpdate()
+            }
+          })
+          //初始化订单客户列表
+          getAction(this.url.orderTicketList,params).then((res)=>{
+            if(res.success){
+              this.orderMainModel.jeecgOrderTicketList = res.result;
+              this.$forceUpdate()
+            }
+          })
+        }
+        //--------------------------------------------------------
+        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)
+      },
+      close () {
+        this.$emit('close');
+        this.visible = false;
+      },
+      handleOk () {
+        const that = this;
+        // 触发表单验证
+        this.form.validateFields((err, values) => {
+          if (!err) {
+            that.confirmLoading = true;
+            let httpurl = '';
+            let method = '';
+            if(!this.orderMainModel.id){
+              httpurl+=this.url.add;
+              method = 'post';
+            }else{
+              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 = {jeecgOrderMain:orderMainData,
+                            jeecgOrderCustomerList:orderMainData.jeecgOrderCustomerList,
+                            jeecgOrderTicketList:orderMainData.jeecgOrderTicketList}
+
+            console.log(formData)
+            httpAction(httpurl,formData,method).then((res)=>{
+              if(res.success){
+                that.$message.success(res.message);
+                that.$emit('ok');
+              }else{
+                that.$message.warning(res.message);
+              }
+            }).finally(() => {
+              that.confirmLoading = false;
+              that.close();
+            })
+
+          }
+        })
+      },
+      handleCancel () {
+        this.close()
+      },
+      addRowCustom () {
+        this.orderMainModel.jeecgOrderCustomerList.push({});
+        this.$forceUpdate();
+      },
+      delRowCustom (index) {
+        console.log(index)
+        this.orderMainModel.jeecgOrderCustomerList.splice(index,1);
+        this.$forceUpdate();
+      },
+      addRowTicket () {
+        this.orderMainModel.jeecgOrderTicketList.push({});
+        console.log(this.orderMainModel.jeecgOrderTicketList)
+        this.$forceUpdate();
+      },
+      delRowTicket (index) {
+        console.log(index)
+        this.orderMainModel.jeecgOrderTicketList.splice(index,1);
+        this.$forceUpdate();
+      },
+
+
+    }
+  }
+</script>
+
+<style scoped>
+  .ant-btn {
+    padding: 0 10px;
+    margin-left: 3px;
+  }
+  .ant-form-item-control {
+    line-height: 0px;
+  }
+  /** 主表单行间距 */
+  .ant-form .ant-form-item {
+    margin-bottom: 10px;
+  }
+  /** Tab页面行间距 */
+  .ant-tabs-content .ant-form-item {
+    margin-bottom: 0px;
+  }
+</style>

ant-design-jeecg-vue/src/views/jeecg/modules/SuperQueryModal.vue

@@ -0,0 +1,95 @@
+<template>
+  <a-modal
+    title="高级查询构造器"
+    :width="800"
+    :visible="visible"
+    :confirmLoading="confirmLoading"
+    @ok="handleOk"
+    :mask="false"
+    okText="查询"
+    @cancel="handleCancel"
+    cancelText="关闭">
+
+    <a-spin :spinning="confirmLoading">
+      <a-form>
+        <div>
+          <a-row type="flex" style="margin-bottom:10px" :gutter="16" v-for="(item, index) in queryParamsModel" :key="index">
+            <a-col :span="6">
+              <a-select  placeholder="选择查询字段" v-model="item.field">
+                <a-select-option value="name">用户名</a-select-option>
+                <a-select-option value="key_word">关键词</a-select-option>
+                <a-select-option value="birthday">生日</a-select-option>
+                <a-select-option value="age">年龄</a-select-option>
+              </a-select>
+            </a-col>
+            <a-col :span="6">
+              <a-select placeholder="选择匹配规则"  v-model="item.rule">
+                <a-select-option value="=">等于</a-select-option>
+                <a-select-option value="!=">不等于</a-select-option>
+                <a-select-option value=">">大于</a-select-option>
+                <a-select-option value=">=">大于等于</a-select-option>
+                <a-select-option value="<">小于</a-select-option>
+                <a-select-option value="<=">小于等于</a-select-option>
+                <a-select-option value="LEFT_LIKE">以..开始</a-select-option>
+                <a-select-option value="RIGHT_LIKE">以..结尾</a-select-option>
+                <a-select-option value="LIKE">包含</a-select-option>
+                <a-select-option value="IN">在...中</a-select-option>
+              </a-select>
+            </a-col>
+
+            <a-col :span="6"><a-input placeholder="请输入值" v-model="item.val"/></a-col>
+            <a-col :span="6">
+              <a-button @click="handleAdd"  icon="plus"></a-button>&nbsp;
+              <a-button @click="handleDel( index )"  icon="minus"></a-button>
+            </a-col>
+          </a-row>
+        </div>
+
+      </a-form>
+    </a-spin>
+  </a-modal>
+</template>
+
+<script>
+  import { httpAction } from '@/api/manage'
+
+  export default {
+    name: "SuperQueryModal",
+    data () {
+      return {
+        visible: false,
+        queryParamsModel: [{},{}],
+        confirmLoading: false
+      }
+    },
+    created () {
+    },
+    methods: {
+      show () {
+        this.visible = true;
+      },
+      close () {
+        this.$emit('close');
+        this.visible = false;
+      },
+      handleOk () {
+        console.log(this.queryParamsModel)
+        // 子组件中触发父组件方法ee并传值cc12345
+        this.$emit('handleSuperQuery', this.queryParamsModel)
+      },
+      handleCancel () {
+        this.close()
+      },
+      handleAdd () {
+        this.queryParamsModel.push({});
+      },
+      handleDel (index) {
+        console.log(index)
+        this.queryParamsModel.splice(index,1);
+      }
+    }
+  }
+</script>
+
+<style scoped>
+</style>

ant-design-jeecg-vue/src/views/jeecg/tablist/JeecgOrderCustomerList.vue

@@ -0,0 +1,293 @@
+<template>
+  <a-card :bordered="false">
+
+    <!-- 操作按钮区域 -->
+    <div class="table-operator">
+      <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
+
+      <a-dropdown v-if="selectedRowKeys.length > 0">
+        <a-menu slot="overlay">
+          <a-menu-item key="1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item>
+        </a-menu>
+        <a-button style="margin-left: 8px"> 批量操作 <a-icon type="down" /></a-button>
+      </a-dropdown>
+    </div>
+
+    <!-- table区域-begin -->
+    <div>
+      <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
+        <i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a style="font-weight: 600">{{ selectedRowKeys.length }}</a>项
+        <a style="margin-left: 24px" @click="onClearSelected">清空</a>
+      </div>
+
+      <a-table
+        ref="table"
+        size="default"
+        bordered
+        rowKey="id"
+        :columns="columns"
+        :dataSource="dataSource"
+        :pagination="ipagination"
+        :loading="loading"
+        :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
+        @change="handleTableChange">
+
+        <span slot="action" slot-scope="text, record">
+          <a @click="handleEdit(record)">编辑</a>
+          <a-divider type="vertical" />
+          <a-dropdown>
+            <a class="ant-dropdown-link">
+              更多 <a-icon type="down" />
+            </a>
+            <a-menu slot="overlay">
+              <a-menu-item >
+                <a href="javascript:;" @click="handleDetail(record)">详情</a>
+              </a-menu-item>
+              <a-menu-item>
+                <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
+                  <a>删除</a>
+                </a-popconfirm>
+              </a-menu-item>
+            </a-menu>
+          </a-dropdown>
+        </span>
+      </a-table>
+    </div>
+    <!-- table区域-end -->
+    <!-- 表单区域 -->
+    <jeecgOrderCustomer-modal ref="JeecgOrderCustomerModal" @ok="modalFormOk"></jeecgOrderCustomer-modal>
+  </a-card>
+</template>
+
+<script>
+  import JeecgOrderCustomerModal from './form/JeecgOrderCustomerModal'
+  import { filterObj } from '@/utils/util'
+  import { deleteAction,getAction } from '@/api/manage'
+  import JeecgOrderDMainList from './JeecgOrderDMainList'
+
+  export default {
+    name: "JeecgOrderCustomerList",
+    components: {
+      JeecgOrderDMainList,
+      JeecgOrderCustomerModal
+    },
+    data () {
+      return {
+        description: '订单客户信息',
+        // 查询条件
+        queryParam: {
+          orderId:null,
+        },
+        // 表头
+        columns: [
+          {
+            title: '客户名',
+            align:"center",
+            width: 100,
+            dataIndex: 'name',
+            key: 'name',
+            fixed: 'left'
+          },
+          {
+            title: '性别',
+            align:"center",
+            dataIndex: 'sex',
+            customRender:function (text) {
+              if(text==1){
+                return "男";
+              }else if(text==2){
+                return "女";
+              }else{
+                return text;
+              }
+            }
+          },
+          {
+            title: '身份证号码',
+            align:"center",
+            dataIndex: 'idcard',
+          },
+          {
+            title: '电话',
+            dataIndex: 'telphone',
+            align:"center",
+          },
+          {
+            title: '操作',
+            key: 'operation',
+            align: 'center',
+            fixed: 'right',
+            width: 130,
+            scopedSlots: { customRender: 'action' },
+          },
+        ],
+        //数据集
+        dataSource:[],
+        // 分页参数
+        ipagination:{
+          current: 1,
+          pageSize: 10,
+          pageSizeOptions: ['10', '20', '30'],
+          showTotal: (total, range) => {
+            return range[0] + "-" + range[1] + " 共" + total + "条"
+          },
+          showQuickJumper: true,
+          showSizeChanger: true,
+          total: 0
+        },
+        isorter:{
+          column: 'createTime',
+          order: 'desc',
+        },
+        loading:false,
+        selectedRowKeys: [],
+        selectedRows: [],
+        url: {
+          list: "/test/order/queryOrderCustomerListByMainId",
+          delete: "/test/order/deleteCustomer",
+          deleteBatch: "/test/order/deleteBatchCustomer",
+        },
+
+      }
+    },
+    created() {
+      this.loadData();
+    },
+    methods: {
+      loadData (arg){
+        //加载数据 若传入参数1则加载第一页的内容
+        if(arg===1){
+          this.ipagination.current = 1;
+        }
+        var params = this.getQueryParams();//查询条件
+        getAction(this.url.list,{id:params.orderId}).then((res)=>{
+          if(res.success){
+            this.dataSource = res.result;
+/*
+            this.ipagination.total = res.result.total;
+*/
+          }else{
+            this.dataSource = null;
+/*            this.ipagination.total = 0;*/
+          }
+        })
+      },
+      getQueryParams(){
+        var param = Object.assign({}, this.queryParam,this.isorter);
+        param.orderId = this.queryParam.orderId;
+        param.field = this.getQueryField();
+        param.pageNo = this.ipagination.current;
+        param.pageSize = this.ipagination.pageSize;
+        return filterObj(param);
+      },
+      getQueryField(){
+        //TODO 字段权限控制
+        var str = "id,";
+        for(var a = 0;a<this.columns.length;a++){
+          str+=","+this.columns[a].dataIndex;
+        }
+        return str;
+      },
+      onSelectChange (selectedRowKeys,selectionRows) {
+        this.selectedRowKeys = selectedRowKeys;
+        this.selectionRows = selectionRows;
+      },
+      onClearSelected(){
+        this.selectedRowKeys = [];
+        this.selectionRows = [];
+      },
+      searchQuery(){
+        this.loadData(1);
+      },
+      searchReset(){
+        var that = this;
+        for(var a in that.queryParam){
+          that.queryParam[a] = '';
+        }
+        that.loadData(1);
+      },
+      batchDel: function(){
+        if(this.selectedRowKeys.length<=0){
+          this.$message.warning('请选择一条记录！');
+          return ;
+        }else{
+          var ids = "";
+          for(var a =0;a<this.selectedRowKeys.length;a++){
+            ids+=this.selectedRowKeys[a]+",";
+          }
+          var that = this;
+          this.$confirm({
+            title:"确认删除",
+            content:"是否删除选中数据?",
+            onOk: function(){
+              deleteAction(that.url.deleteBatch,{ids: ids}).then((res)=>{
+                if(res.success){
+                  that.$message.success(res.message);
+                  that.loadData();
+                  that.onClearSelected();
+                }else{
+                  that.$message.warning(res.message);
+                }
+              });
+            }
+          });
+        }
+      },
+      handleDelete: function(id){
+        var that = this;
+        this.$confirm({
+          title:"确认删除",
+          content:"是否删除选中数据?",
+          onOk: function(){
+            deleteAction(that.url.delete,{id: id}).then((res)=>{
+              if(res.success){
+                that.$message.success(res.message);
+                that.loadData();
+              }else{
+                that.$message.warning(res.message);
+              }
+            });
+          }
+        });
+      },
+
+      handleEdit: function(record){
+        this.$refs.JeecgOrderCustomerModal.edit(record,'e');
+        this.$refs.JeecgOrderCustomerModal.title="编辑";
+      },
+      handleAdd: function(){
+        this.$refs.JeecgOrderCustomerModal.add(this.queryParam.orderId);
+        this.$refs.JeecgOrderCustomerModal.title="添加客户信息";
+      },
+      handleDetail: function(record){
+        this.$refs.JeecgOrderCustomerModal.detail(record);
+        this.$refs.JeecgOrderCustomerModal.title="添加客户信息";
+      },
+      handleTableChange(pagination, filters, sorter){
+        //分页、排序、筛选变化时触发
+        console.log(sorter);
+        //TODO 筛选
+        if (Object.keys(sorter).length>0){
+          this.isorter.column = sorter.field;
+          this.isorter.order = "ascend"==sorter.order?"asc":"desc"
+        }
+        this.ipagination = pagination;
+        this.loadData();
+      },
+      modalFormOk () {
+        // 新增/修改 成功时，重载列表
+        this.loadData();
+      },
+      getOrderMain(orderId){
+        this.queryParam.orderId = orderId.toString();
+        this.loadData(1);
+      }
+    }
+  }
+</script>
+<style>
+  .ant-card{
+    margin-left: -30px;
+    margin-right: -30px;
+  }
+</style>

ant-design-jeecg-vue/src/views/jeecg/tablist/JeecgOrderDMainList.vue

@@ -0,0 +1,347 @@
+<template>
+  <a-card :bordered="false">
+
+    <!-- 查询区域 -->
+    <div class="table-page-search-wrapper">
+      <a-form layout="inline">
+        <a-row :gutter="24">
+
+          <a-col :span="6">
+            <a-form-item label="订单号">
+              <a-input placeholder="请输入订单号" v-model="queryParam.orderCode"></a-input>
+            </a-form-item>
+          </a-col>
+          <a-col :span="6">
+            <a-form-item label="订单类型">
+              <a-select placeholder="请输入订单类型"  v-model="queryParam.ctype">
+                <a-select-option value="1">国内订单</a-select-option>
+                <a-select-option value="2">国际订单</a-select-option>
+              </a-select>
+            </a-form-item>
+          </a-col>
+
+          <a-col :span="8" >
+            <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
+              <a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
+              <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
+            </span>
+          </a-col>
+
+        </a-row>
+      </a-form>
+    </div>
+
+
+    <!-- 操作按钮区域 -->
+    <div class="table-operator">
+      <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
+
+      <a-dropdown v-if="selectedRowKeys.length > 0">
+        <a-menu slot="overlay">
+          <a-menu-item key="1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item>
+        </a-menu>
+        <a-button style="margin-left: 8px"> 批量操作 <a-icon type="down" /></a-button>
+      </a-dropdown>
+    </div>
+
+    <!-- table区域-begin -->
+    <div>
+      <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
+        <i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a style="font-weight: 600">{{ selectedRowKeys.length }}</a>项
+        <a style="margin-left: 24px" @click="onClearSelected">清空</a>
+      </div>
+
+      <a-table
+        ref="table"
+        size="default"
+        bordered
+        rowKey="id"
+        filterMultiple="filterMultiple"
+        :columns="columns"
+        :dataSource="dataSource"
+        :pagination="ipagination"
+        :loading="loading"
+        :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange,type:type}"
+        @change="handleTableChange"
+        :customRow="clickThenCheck"
+      >
+
+        <span slot="action" slot-scope="text, record">
+          <a @click="handleEdit(record)">编辑</a>
+          <a-divider type="vertical" />
+          <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
+            <a>删除</a>
+          </a-popconfirm>
+        </span>
+
+      </a-table>
+    </div>
+    <!-- table区域-end -->
+
+    <a-tabs defaultActiveKey="1">
+      <a-tab-pane tab="客户信息" key="1">
+        <Jeecg-Order-Customer-List ref="JeecgOrderCustomerList"></Jeecg-Order-Customer-List>
+      </a-tab-pane>
+      <a-tab-pane tab="机票信息" key="2" forceRender>
+        <Jeecg-Order-Ticket-List ref="JeecgOrderTicketList"></Jeecg-Order-Ticket-List>
+      </a-tab-pane>
+    </a-tabs>
+
+    <!-- 表单区域 -->
+    <jeecgOrderDMain-modal ref="JeecgOrderDMainModal" @ok="modalFormOk"></jeecgOrderDMain-modal>
+
+  </a-card>
+</template>
+
+<script>
+  import JeecgOrderDMainModal from './form/JeecgOrderDMainModal'
+  import JeecgOrderCustomerList from './JeecgOrderCustomerList'
+  import JeecgOrderTicketList from './JeecgOrderTicketList'
+  import { filterObj } from '@/utils/util'
+  import { deleteAction,getAction } from '@/api/manage'
+  import JeecgOrderCustomerModal from './form/JeecgOrderCustomerModal'
+  import JeecgOrderTicketModal from './form/JeecgOrderTicketModal'
+
+  export default {
+    name: "JeecgOrderDMainList",
+    components: {
+      JeecgOrderTicketModal,
+      JeecgOrderCustomerModal,
+      JeecgOrderDMainModal,
+      JeecgOrderCustomerList,
+      JeecgOrderTicketList,
+    },
+    data () {
+      return {
+        description: '订单管理页面',
+        // 查询条件
+        queryParam: {},
+        // 表头
+        columns: [          {
+          title: '#',
+          dataIndex: '',
+          key:'rowIndex',
+          width:60,
+          align:"center",
+          customRender:function (t,r,index) {
+            return parseInt(index)+1;
+          }
+        },
+          {
+            title: '订单号',
+            align:"center",
+            dataIndex: 'orderCode'
+          },
+          {
+            title: '订单类型',
+            align:"center",
+            dataIndex: 'ctype',
+            customRender: (text) => {
+              let re = "";
+              if (text === '1') {
+                re = "国内订单";
+              } else if (text === '2') {
+                re = "国际订单";
+              }
+              return re;
+            }
+          },
+          {
+            title: '订单日期',
+            align:"center",
+            dataIndex: 'orderDate'
+          },
+          {
+            title: '订单金额',
+            align:"center",
+            dataIndex: 'orderMoney'
+          },
+          {
+            title: '订单备注',
+            align:"center",
+            dataIndex: 'content'
+          },
+          {
+            title: '操作',
+            dataIndex: 'action',
+            align:"center",
+            scopedSlots: { customRender: 'action' },
+          }],
+        //数据集
+        dataSource:[],
+        // 分页参数
+        type: "radio",
+        ipagination:{
+          current: 1,
+          pageSize: 10,
+          pageSizeOptions: ['10', '20', '30'],
+          showTotal: (total, range) => {
+            return range[0] + "-" + range[1] + " 共" + total + "条"
+          },
+          showQuickJumper: true,
+          showSizeChanger: true,
+          total: 0
+        },
+        isorter:{
+          column: 'createTime',
+          order: 'desc',
+        },
+        loading:false,
+        selectedRowKeys: [],
+        selectedRows: [],
+        url: {
+          list: "/test/order/orderList",
+          delete: "/test/order/delete",
+          deleteBatch: "/test/order/deleteBatch",
+        },
+      }
+    },
+    created() {
+      this.loadData();
+    },
+    methods: {
+      loadData (arg){
+        //加载数据 若传入参数1则加载第一页的内容
+        if(arg===1){
+          this.ipagination.current = 1;
+        }
+        var params = this.getQueryParams();//查询条件
+        getAction(this.url.list,params).then((res)=>{
+          if(res.success){
+            this.dataSource = res.result.records;
+            this.ipagination.total = res.result.total;
+          }
+        })
+      },
+      getQueryParams(){
+        var param = Object.assign({}, this.queryParam,this.isorter);
+        param.field = this.getQueryField();
+        param.pageNo = this.ipagination.current;
+        param.pageSize = this.ipagination.pageSize;
+        return filterObj(param);
+      },
+      getQueryField(){
+        //TODO 字段权限控制
+        var str = "id,";
+        for(var a = 0;a<this.columns.length;a++){
+          str+=","+this.columns[a].dataIndex;
+        }
+        return str;
+      },
+      clickThenCheck(record){
+        return {
+          on: {
+            click: () => {
+              this.onSelectChange(record.id.split(","),[record]);
+            }
+          }
+        };
+      },
+      onSelectChange (selectedRowKeys,selectionRows) {
+        this.selectedRowKeys = selectedRowKeys;
+        this.selectionRows = selectionRows;
+        this.$refs.JeecgOrderCustomerList.getOrderMain(this.selectedRowKeys[0]);
+        this.$refs.JeecgOrderTicketList.getOrderMain(this.selectedRowKeys[0]);
+      },
+      onClearSelected(){
+        this.selectedRowKeys = [];
+        this.selectionRows = [];
+        this.$refs.JeecgOrderCustomerList.queryParam.orderId = null;
+        this.$refs.JeecgOrderTicketList.queryParam.orderId = null;
+        this.$refs.JeecgOrderCustomerList.loadData();
+        this.$refs.JeecgOrderTicketList.loadData();
+      },
+      searchQuery(){
+        this.loadData(1);
+      },
+      searchReset(){
+        var that = this;
+        that.queryParam={};
+        that.loadData(1);
+      },
+      batchDel: function(){
+        if(this.selectedRowKeys.length<=0){
+          this.$message.warning('请选择一条记录！');
+          return ;
+        }else{
+          var ids = "";
+          for(var a =0;a<this.selectedRowKeys.length;a++){
+            ids+=this.selectedRowKeys[a]+",";
+          }
+          var that = this;
+          this.$confirm({
+            title:"确认删除",
+            content:"是否删除选中数据?",
+            onOk: function(){
+              deleteAction(that.url.deleteBatch,{ids: ids}).then((res)=>{
+                if(res.success){
+                  that.$message.success(res.message);
+                  that.loadData();
+                  that.onClearSelected();
+                  this.$refs.JeecgOrderCustomerList.loadData();
+                  this.$refs.JeecgOrderTicketList.loadData();
+                }else{
+                  that.$message.warning(res.message);
+                }
+              });
+            }
+          });
+        }
+      },
+      handleDelete: function(id){
+        var that = this;
+        deleteAction(that.url.delete,{id: id}).then((res)=>{
+          if(res.success){
+            that.$message.success(res.message);
+            that.loadData();
+            this.$refs.JeecgOrderCustomerList.loadData();
+            this.$refs.JeecgOrderTicketList.loadData();
+          }else{
+            that.$message.warning(res.message);
+          }
+        });
+      },
+      handleEdit: function(record){
+        this.$refs.JeecgOrderDMainModal.edit(record);
+        this.$refs.JeecgOrderDMainModal.title="编辑";
+      },
+      handleAdd: function(){
+        this.$refs.JeecgOrderDMainModal.add();
+        this.$refs.JeecgOrderDMainModal.title="新增";
+      },
+      handleTableChange(pagination, filters, sorter){
+        //分页、排序、筛选变化时触发
+        console.log(sorter);
+        //TODO 筛选
+        if (Object.keys(sorter).length>0){
+          this.isorter.column = sorter.field;
+          this.isorter.order = "ascend"==sorter.order?"asc":"desc"
+        }
+        this.ipagination = pagination;
+        this.loadData();
+      },
+      modalFormOk () {
+        // 新增/修改 成功时，重载列表
+        this.loadData();
+      }
+    }
+  }
+</script>
+<style>
+  .ant-card-body .table-operator{
+    margin-bottom: 18px;
+  }
+  .ant-layout-content{
+    margin:12px 16px 0 !important;
+  }
+  .ant-table-tbody .ant-table-row td{
+    padding-top:15px;
+    padding-bottom:15px;
+  }
+  .anty-row-operator button{margin: 0 5px}
+  .ant-btn-danger{background-color: #ffffff}
+
+  .ant-modal-cust-warp{height: 100%}
+  .ant-modal-cust-warp .ant-modal-body{height:calc(100% - 110px) !important;overflow-y: auto}
+  .ant-modal-cust-warp .ant-modal-content{height:90% !important;overflow-y: hidden}
+</style>

ant-design-jeecg-vue/src/views/jeecg/tablist/JeecgOrderTicketList.vue

@@ -0,0 +1,273 @@
+<template>
+  <a-card :bordered="false">
+
+    <!-- 操作按钮区域 -->
+    <div class="table-operator">
+      <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
+
+      <a-dropdown v-if="selectedRowKeys.length > 0">
+        <a-menu slot="overlay">
+          <a-menu-item key="1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item>
+        </a-menu>
+        <a-button style="margin-left: 8px"> 批量操作 <a-icon type="down" /></a-button>
+      </a-dropdown>
+    </div>
+
+    <!-- table区域-begin -->
+    <div>
+      <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
+        <i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a style="font-weight: 600">{{ selectedRowKeys.length }}</a>项
+        <a style="margin-left: 24px" @click="onClearSelected">清空</a>
+      </div>
+
+      <a-table
+        ref="table"
+        size="default"
+        bordered
+        rowKey="id"
+        :columns="columns"
+        :dataSource="dataSource"
+        :pagination="ipagination"
+        :loading="loading"
+        :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
+        @change="handleTableChange">
+
+        <span slot="action" slot-scope="text, record">
+          <a @click="handleEdit(record)">编辑</a>
+          <a-divider type="vertical" />
+          <a-dropdown>
+            <a class="ant-dropdown-link">
+              更多 <a-icon type="down" />
+            </a>
+            <a-menu slot="overlay">
+              <a-menu-item >
+                <a href="javascript:;" @click="handleDetail(record)">详情</a>
+              </a-menu-item>
+
+              <a-menu-item>
+                <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
+                  <a>删除</a>
+                </a-popconfirm>
+              </a-menu-item>
+            </a-menu>
+          </a-dropdown>
+        </span>
+
+      </a-table>
+    </div>
+    <!-- table区域-end -->
+
+    <!-- 表单区域 -->
+    <JeecgOrderTicket-modal ref="JeecgOrderTicketModal" @ok="modalFormOk"></JeecgOrderTicket-modal>
+  </a-card>
+</template>
+
+<script>
+  import { filterObj } from '@/utils/util'
+  import { deleteAction,getAction } from '@/api/manage'
+  import JeecgOrderTicketModal from './form/JeecgOrderTicketModal'
+
+  export default {
+    name: "JeecgOrderTicketList",
+    components: {
+      JeecgOrderTicketModal,
+    },
+    data () {
+      return {
+        description: '机票信息',
+        // 查询条件
+        queryParam: {
+          orderId:null,
+        },
+        // 表头
+        columns: [{
+          title:'航班号',
+          align:"center",
+          dataIndex:'ticketCode'
+        },{
+          title:'航班时间',
+          align:"center",
+          dataIndex:'tickectDate'
+        },{
+          title:'订单号码',
+          align:"center",
+          dataIndex:'orderId',
+        },{
+          title:'创建人',
+          align:"center",
+          dataIndex:'createBy'
+        },{
+          title:'创建时间',
+          align:"center",
+          dataIndex:'createTime',
+          sorter:true
+        },{
+            title: '操作',
+            key: 'operation',
+            fixed:'right',
+            align:"center",
+            width:130,
+            scopedSlots: { customRender: 'action' },
+          }],
+        //数据集
+        dataSource:[],
+        // 分页参数
+        ipagination:{
+          current: 1,
+          pageSize: 5,
+          pageSizeOptions: ['5','10', '20'],
+          showTotal: (total, range) => {
+            return range[0] + "-" + range[1] + " 共" + total + "条"
+          },
+          showQuickJumper: true,
+          showSizeChanger: true,
+          total: 0
+        },
+        isorter:{
+          column: 'createTime',
+          order: 'asc',
+        },
+        loading:false,
+        selectedRowKeys: [],
+        selectedRows: [],
+        url: {
+          list: "/test/order/queryOrderTicketListByMainId",
+          delete: "/test/order/deleteTicket",
+          deleteBatch: "/test/order/deleteBatchTicket",
+        },
+
+      }
+    },
+    created() {
+      this.loadData();
+    },
+    methods: {
+      loadData (arg){
+        //加载数据 若传入参数1则加载第一页的内容
+        if(arg===1){
+          this.ipagination.current = 1;
+        }
+        var params = this.getQueryParams();//查询条件
+        getAction(this.url.list,{id:params.orderId}).then((res)=>{
+          if(res.success){
+            this.dataSource = res.result;
+/*            this.ipagination.total = res.result.total;*/
+          }else{
+            this.dataSource = null;
+/*            this.ipagination.total = 0;*/
+          }
+        })
+      },
+      getQueryParams(){
+        var param = Object.assign({}, this.queryParam,this.isorter);
+        param.field = this.getQueryField();
+        param.pageNo = this.ipagination.current;
+        param.pageSize = this.ipagination.pageSize;
+        return filterObj(param);
+      },
+      getQueryField(){
+        //TODO 字段权限控制
+        var str = "id,";
+        for(var a = 0;a<this.columns.length;a++){
+          str+=","+this.columns[a].dataIndex;
+        }
+        return str;
+      },
+      onSelectChange (selectedRowKeys,selectionRows) {
+        this.selectedRowKeys = selectedRowKeys;
+        this.selectionRows = selectionRows;
+      },
+      onClearSelected(){
+        this.selectedRowKeys = [];
+        this.selectionRows = [];
+      },
+      searchQuery(){
+        this.loadData(1);
+      },
+      searchReset(){
+        var that = this;
+        for(var a in that.queryParam){
+          that.queryParam[a] = '';
+        }
+        that.loadData(1);
+      },
+      batchDel: function(){
+        if(this.selectedRowKeys.length<=0){
+          this.$message.warning('请选择一条记录！');
+          return ;
+        }else{
+          var ids = "";
+          for(var a =0;a<this.selectedRowKeys.length;a++){
+            ids+=this.selectedRowKeys[a]+",";
+          }
+          var that = this;
+          this.$confirm({
+            title:"确认删除",
+            content:"是否删除选中数据?",
+            onOk: function(){
+              deleteAction(that.url.deleteBatch,{ids: ids}).then((res)=>{
+                if(res.success){
+                  that.$message.success(res.message);
+                  that.loadData();
+                  that.onClearSelected();
+                }else{
+                  that.$message.warning(res.message);
+                }
+              });
+            }
+          });
+        }
+      },
+      handleDelete: function(id){
+        var that = this;
+        this.$confirm({
+          title:"确认删除",
+          content:"是否删除选中数据?",
+          onOk: function(){
+            deleteAction(that.url.delete,{id: id}).then((res)=>{
+              if(res.success){
+                that.$message.success(res.message);
+                that.loadData();
+              }else{
+                that.$message.warning(res.message);
+              }
+            });
+          }
+        });
+      },
+      handleEdit: function(record){
+        this.$refs.JeecgOrderTicketModal.edit(record,'e');
+        this.$refs.JeecgOrderTicketModal.title="新增机票信息";
+      },
+      handleAdd: function(){
+        this.$refs.JeecgOrderTicketModal.add(this.queryParam.orderId);
+        this.$refs.JeecgOrderTicketModal.title="新增机票信息";
+      },
+      handleDetail: function(record){
+        this.$refs.JeecgOrderTicketModal.detail(record);
+        this.$refs.JeecgOrderTicketModal.title="新增机票信息";
+      },
+      handleTableChange(pagination, filters, sorter){
+        //分页、排序、筛选变化时触发
+        console.log(sorter);
+        //TODO 筛选
+        if (Object.keys(sorter).length>0){
+          this.isorter.column = sorter.field;
+          this.isorter.order = "ascend"==sorter.order?"asc":"desc"
+        }
+        this.ipagination = pagination;
+        this.loadData();
+      },
+      modalFormOk () {
+        // 新增/修改 成功时，重载列表
+        this.loadData();
+      },
+      getOrderMain(orderId){
+        this.queryParam.orderId = orderId;
+        this.loadData(1);
+      }
+    }
+  }
+</script>
+<style>
+</style>

ant-design-jeecg-vue/src/views/jeecg/tablist/form/JeecgOrderCustomerModal.vue

@@ -0,0 +1,383 @@
+<template>
+  <a-modal
+    :title="title"
+    :width="800"
+    :visible="visible"
+    :confirmLoading="confirmLoading"
+    :okButtonProps="{ props: {disabled: disableSubmit} }"
+    @ok="handleOk"
+    @cancel="handleCancel"
+    cancelText="关闭">
+
+    <!-- 编辑 -->
+    <a-spin :spinning="confirmLoading"  v-if="editStatus">
+      <a-form :form="form">
+
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="客户姓名"
+          hasFeedback >
+          <a-input placeholder="请输入客户姓名" v-decorator="['name', {rules: [{ required: true, message: '请输入客户姓名!' }]}]" :readOnly="disableSubmit" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="性别"
+          hasFeedback >
+          <a-select v-decorator="['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
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="身份证号码"
+          hasFeedback >
+          <a-input placeholder="请输入身份证号码" v-decorator="['idcard', validatorRules.idcard]" :readOnly="disableSubmit" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="身份证扫描件"
+          hasFeedback >
+          <a-upload
+            :action="uploadAction"
+            listType="picture-card"
+            :headers="headers"
+            :fileList="fileList"
+            @change="handleChange"
+            @preview="handlePreview"
+          >
+            <a-button>
+              <a-icon type="upload" /> upload
+            </a-button>
+          </a-upload>
+          <img v-if="model.idcardPic" :src="getIdCardView()" alt="头像" style="height:104px;max-width:300px"/>
+          <a-modal :visible="previewVisible" :footer="null" @cancel="handlePicCancel">
+            <img alt="example" style="width: 100%" :src="previewImage" />
+          </a-modal>
+          <br />
+      </a-form-item>
+      <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="联系方式"
+          hasFeedback >
+          <a-input v-decorator="[ 'telphone', validatorRules.telphone]" :readOnly="disableSubmit" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="订单号码"
+          :hidden="hiding"
+          hasFeedback >
+          <a-input v-decorator="[ 'orderId', {}]" disabled="disabled" />
+        </a-form-item>
+      </a-form>
+    </a-spin>
+
+    <!-- 新增 -->
+    <a-table
+      v-if="addStatus"
+      ref="table"
+      bordered
+      rowKey="id"
+      :columns="columns"
+      :dataSource="dataSource"
+      :pagination="ipagination"
+      :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
+      @change="handleTableChange"
+    >
+    </a-table>
+
+  </a-modal>
+</template>
+
+<script>
+  import { httpAction,getAction,postAction} from '@/api/manage'
+  import { doMian } from '@/api/api'
+  import pick from 'lodash.pick'
+  import Vue from 'vue'
+  import { ACCESS_TOKEN } from "@/store/mutation-types"
+
+  export default {
+    name: "JeecgOrderCustomerModal",
+    // 查询条件
+    data () {
+      return {
+        title:"操作",
+        visible: false,
+        model: {},
+        labelCol: {
+          xs: { span: 24 },
+          sm: { span: 5 },
+        },
+        wrapperCol: {
+          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",
+          },
+        ],
+        dataSource:[],
+        // 分页参数
+        ipagination:{
+          current: 1,
+          pageSize: 10,
+          pageSizeOptions: ['10', '20', '30'],
+          showTotal: (total, range) => {
+            return range[0] + "-" + range[1] + " 共" + total + "条"
+          },
+          showQuickJumper: true,
+          showSizeChanger: true,
+          total: 0
+        },
+        fileList:[],
+        disableSubmit:false,
+        selectedRowKeys: [],
+        orderId:"",
+        hiding:false,
+        headers:{},
+        picUrl:"",
+        previewVisible: false,
+        previewImage: '',
+        addStatus:false,
+        editStatus:false,
+        confirmLoading: false,
+        form: this.$form.createForm(this),
+        url: {
+          fileUpload:doMian+"sys/common/upload",
+          add: "/test/order/addCustomer",
+          edit: "/test/order/editCustomer",
+          imgerver:doMian+"sys/common/view",
+          getOrderCustomerList: "/test/order/queryOrderCustomerListByMainId",
+        },
+        validatorRules:{
+          telphone:{rules: [{ validator:this.validateMobile}]},
+          idcard:{rules:[{ validator:this.validateIdCard}]}
+        },
+      }
+    },
+    computed:{
+      uploadAction:function () {
+        return this.url.fileUpload;
+      }
+    },
+    created () {
+      const token = Vue.ls.get(ACCESS_TOKEN);
+      this.headers = {"X-Access-Token":token}
+    },
+    methods: {
+      add (orderId) {
+        this.hiding = true;
+        if(orderId){
+          this.orderId = orderId;
+          this.edit({},'');
+        }else{
+          this.$message.warning("请选择一个客户信息");
+        }
+      },
+      detail(record){
+        this.edit(record,'d');
+      },
+      edit (record,v) {
+        this.form.resetFields();
+        this.model = Object.assign({}, record);
+        if(record.id){
+          this.hiding = false;
+          if(v == 'e'){
+            this.disableSubmit = false;
+          }else {
+            this.disableSubmit = true;
+          }
+          this.addStatus = false;
+          this.editStatus = true;
+          this.$nextTick(() => {
+            this.form.setFieldsValue(pick(this.model,'id','name','sex','idcard','idcardPic','telphone','orderId','createBy','createTime','updateBy','updateTime'))
+          });
+        }else{
+          this.addStatus = false;
+          this.editStatus = true;
+        }
+        // 加载客户信息
+        let httpurl = this.url.getOrderCustomerList;
+        getAction(httpurl,{id:this.orderId}).then((res)=>{
+          if(res.success){
+            this.dataSource = res.result;
+          }else{
+            this.$message.warning(res.message);
+          }
+        });
+        this.visible = true;
+      },
+      close () {
+        this.$emit('close');
+        this.visible = false;
+      },
+      onSelectChange (selectedRowKeys,selectionRows) {
+        this.selectedRowKeys = selectedRowKeys;
+        console.log(selectionRows);
+      },
+      handleOk () {
+        const that = this;
+        this.form.validateFields((err, values) => {
+          if (!err) {
+            let httpurl = '';
+            let method = '';
+            if(!this.model.id){
+              httpurl+=this.url.add;
+              let formData = Object.assign(this.model, values);
+              formData.orderId = this.orderId;
+              formData.idcardPic = this.picUrl;
+              postAction(httpurl,formData).then((res)=>{
+                if(res.success){
+                  that.$message.success(res.message);
+                  that.$emit('ok');
+                  this.visible = false;
+                }else{
+                  this.$message.warning(res.message);
+                }
+              });
+            }else{
+              httpurl+=this.url.edit;
+              method = 'put';
+              let formData = Object.assign(this.model, values);
+              //时间格式化
+              httpAction(httpurl,formData,method).then((res)=>{
+                if(res.success){
+                  that.$message.success(res.message);
+                  that.$emit('ok');
+                }else{
+                  that.$message.warning(res.message);
+                }
+              }).finally(() => {
+                that.confirmLoading = false;
+                that.close();
+              })
+            }
+          }
+        })
+      },
+
+      handleTableChange(pagination, filters, sorter){
+        //TODO 筛选
+        if (Object.keys(sorter).length>0){
+          this.isorter.column = sorter.field;
+          this.isorter.order = "ascend"==sorter.order?"asc":"desc"
+        }
+        this.ipagination = pagination;
+        this.loadData();
+      },
+      handleCancel () {
+        this.close()
+      },
+      validateMobile(rule,value,callback){
+        if (!value || new RegExp(/^1([38][0-9]|4[579]|5[0-3,5-9]|6[6]|7[0135678]|9[89])\d{8}$/).test(value)){
+          callback();
+        }else{
+          callback("您的手机号码格式不正确!");
+        }
+      },
+      validateIdCard(rule,value,callback){
+        if (!value || new RegExp(/(^\d{15}$)|(^\d{18}$)|(^\d{17}(\d|X|x)$)/).test(value)){
+          callback();
+        }else{
+          callback("您的身份证号码格式不正确!");
+        }
+      },
+      handleChange (info) {
+        this.fileList = info.fileList;
+        if (info.file.status === 'uploading') {
+          return
+        }
+        if (info.file.status === 'done') {
+          var response = info.file.response;
+          console.log(response);
+          if(response.success){
+            this.picUrl += response.message + ",";
+          }else{
+            this.$message.warning(response.message);
+          }
+        }
+      },
+      handlePicCancel () {
+        this.previewVisible = false
+      },
+      handlePreview (file) {
+        this.previewImage = file.url || file.thumbUrl
+        this.previewVisible = true
+      },
+      getIdCardView(){
+        let pics = this.model.idcardPic.split(",");
+          return this.url.imgerver +"/"+ pics[0];
+      }
+  }
+  }
+</script>
+
+<style scoped>
+  /* tile uploaded pictures */
+  .upload-list-inline >>> .ant-upload-list-item {
+    float: left;
+    width: 200px;
+    margin-right: 8px;
+  }
+  .upload-list-inline >>> .ant-upload-animate-enter {
+    animation-name: uploadAnimateInlineIn;
+  }
+  .upload-list-inline >>> .ant-upload-animate-leave {
+    animation-name: uploadAnimateInlineOut;
+  }
+</style>

ant-design-jeecg-vue/src/views/jeecg/tablist/form/JeecgOrderDMainModal.vue

@@ -0,0 +1,304 @@
+<template>
+  <a-modal
+    :title="title"
+    :width="1000"
+    :visible="visible"
+    :confirmLoading="confirmLoading"
+    @ok="handleOk"
+    @cancel="handleCancel">
+
+    <a-spin :spinning="confirmLoading">
+      <a-form :form="form">
+        <!-- 主表单区域 -->
+        <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-col>
+          <a-col :lg="8">
+            <a-form-item
+              :labelCol="labelCol"
+              :wrapperCol="wrapperCol"
+              label="订单类型">
+              <a-select placeholder="请输入订单类型" v-decorator="['ctype',{}]">
+                <a-select-option value="1">国内订单</a-select-option>
+                <a-select-option value="2">国际订单</a-select-option>
+              </a-select>
+            </a-form-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-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-col>
+          <a-col :lg="8">
+            <a-form-item
+              :labelCol="labelCol"
+              :wrapperCol="wrapperCol"
+              label="订单备注">
+              <a-input placeholder="请输入订单备注" v-decorator="['content', {}]" />
+            </a-form-item>
+          </a-col>
+        </a-row>
+
+        <!-- 子表单区域 -->
+        <a-tabs defaultActiveKey="1" >
+          <a-tab-pane tab="客户信息" key="1">
+            <div>
+              <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-row>
+
+              <a-row type="flex" style="margin-bottom:10px" :gutter="16" v-for="(item, index) in orderMainModel.jeecgOrderCustomerList" :key="index">
+                <a-col :span="5">
+                  <a-form-item>
+                    <a-input placeholder="客户名" v-decorator="['jeecgOrderCustomerList['+index+'].name', {'initialValue':item.name,rules: [{ required: true, message: '请输入用户名!' }]}]" />
+                  </a-form-item>
+                </a-col>
+                <a-col :span="5">
+                  <a-form-item>
+                    <a-select placeholder="性别" v-decorator="['jeecgOrderCustomerList['+index+'].sex', {'initialValue':item.sex}]">
+                      <a-select-option value="1">男</a-select-option>
+                      <a-select-option value="2">女</a-select-option>
+                    </a-select>
+                  </a-form-item>
+                </a-col>
+                <a-col :span="5">
+                  <a-form-item>
+                    <a-input placeholder="身份证号" v-decorator="['jeecgOrderCustomerList['+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>
+                <a-col :span="5">
+                  <a-form-item>
+                    <a-input placeholder="手机号" v-decorator="['jeecgOrderCustomerList['+index+'].telphone', {'initialValue':item.telphone,rules: [{ pattern: '^1(3|4|5|7|8)\\d{9}$', message: '手机号格式不对!' }]}]"/>
+                  </a-form-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>
+              </a-row>
+            </div>
+          </a-tab-pane>
+
+          <a-tab-pane tab="机票信息" key="2" forceRender>
+            <div>
+              <a-row type="flex" style="margin-bottom:10px" :gutter="16">
+                <a-col :span="6">航班号</a-col>
+                <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.jeecgOrderTicketList" :key="index">
+                <a-col :span="6">
+                  <a-form-item>
+                    <a-input placeholder="航班号" v-decorator="['jeecgOrderTicketList['+index+'].ticketCode', {'initialValue':item.ticketCode,rules: [{ required: true, message: '请输入航班号!' }]}]" />
+                  </a-form-item>
+                </a-col>
+                <a-col :span="6">
+                  <a-form-item>
+                    <j-date placeholder="航班时间" :trigger-change="true" v-decorator="['jeecgOrderTicketList['+index+'].tickectDate', {'initialValue':item.tickectDate}]"></j-date>
+                  </a-form-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-col>
+              </a-row>
+            </div>
+          </a-tab-pane>
+        </a-tabs>
+
+      </a-form>
+    </a-spin>
+  </a-modal>
+</template>
+
+<script>
+  import { httpAction,getAction } from '@/api/manage'
+  import JDate from '@/components/jeecg/JDate'
+  import pick from 'lodash.pick'
+  import moment from "moment"
+
+  export default {
+    name: "JeecgOrderDMainModal",
+    components: {
+      JDate
+    },
+    data () {
+      return {
+        title:"操作",
+        visible: false,
+        orderMainModel: {jeecgOrderCustomerList: [{}],
+          jeecgOrderTicketList: [{}]},
+        labelCol: {
+          xs: { span: 24 },
+          sm: { span: 5 },
+        },
+        wrapperCol: {
+          xs: { span: 24 },
+          sm: { span: 16 },
+        },
+
+        confirmLoading: false,
+        form: this.$form.createForm(this),
+        validatorRules:{
+        },
+        url: {
+          add: "/test/order/add",
+          edit: "/test/order/edit",
+          orderCustomerList: "/test/order/queryOrderCustomerListByMainId",
+          orderTicketList: "/test/order/queryOrderTicketListByMainId",
+        },
+      }
+    },
+    created () {
+    },
+    methods: {
+      add () {
+        this.edit({});
+      },
+      edit (record) {
+        this.form.resetFields();
+        this.orderMainModel = Object.assign({}, record);
+        this.orderMainModel.jeecgOrderCustomerList = [{}];
+        this.orderMainModel.jeecgOrderTicketList = [{}];
+        //--------------------------------------------------------
+        //初始化明细表数据
+        console.log(this.orderMainModel.id)
+        if(this.orderMainModel.id){
+          let params = {id:this.orderMainModel.id}
+          //初始化订单机票列表
+          getAction(this.url.orderCustomerList,params).then((res)=>{
+            if(res.success){
+              this.orderMainModel.jeecgOrderCustomerList = res.result;
+              this.$forceUpdate()
+            }
+          })
+          //初始化订单客户列表
+          getAction(this.url.orderTicketList,params).then((res)=>{
+            if(res.success){
+              this.orderMainModel.jeecgOrderTicketList = res.result;
+              this.$forceUpdate()
+            }
+          })
+        }
+        //--------------------------------------------------------
+        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)
+      },
+      close () {
+        this.$emit('close');
+        this.visible = false;
+      },
+      handleOk () {
+        const that = this;
+        // 触发表单验证
+        this.form.validateFields((err, values) => {
+          if (!err) {
+            that.confirmLoading = true;
+            let httpurl = '';
+            let method = '';
+            if(!this.orderMainModel.id){
+              httpurl+=this.url.add;
+              method = 'post';
+            }else{
+              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 = {jeecgOrderMain:orderMainData,
+              jeecgOrderCustomerList:orderMainData.jeecgOrderCustomerList,
+              jeecgOrderTicketList:orderMainData.jeecgOrderTicketList}
+
+            console.log(formData)
+            httpAction(httpurl,formData,method).then((res)=>{
+              if(res.success){
+                that.$message.success(res.message);
+                that.$emit('ok');
+              }else{
+                that.$message.warning(res.message);
+              }
+            }).finally(() => {
+              that.confirmLoading = false;
+              that.close();
+            })
+
+          }
+        })
+      },
+      handleCancel () {
+        this.close()
+      },
+      addRowCustom () {
+        this.orderMainModel.jeecgOrderCustomerList.push({});
+        this.$forceUpdate();
+      },
+      delRowCustom (index) {
+        console.log(index)
+        this.orderMainModel.jeecgOrderCustomerList.splice(index,1);
+        this.$forceUpdate();
+      },
+      addRowTicket () {
+        this.orderMainModel.jeecgOrderTicketList.push({});
+        console.log(this.orderMainModel.jeecgOrderTicketList)
+        this.$forceUpdate();
+      },
+      delRowTicket (index) {
+        console.log(index)
+        this.orderMainModel.jeecgOrderTicketList.splice(index,1);
+        this.$forceUpdate();
+      },
+
+
+    }
+  }
+</script>
+
+<style scoped>
+  .ant-btn {
+    padding: 0 10px;
+    margin-left: 3px;
+  }
+  .ant-form-item-control {
+    line-height: 0px;
+  }
+  /** 主表单行间距 */
+  .ant-form .ant-form-item {
+    margin-bottom: 10px;
+  }
+  /** Tab页面行间距 */
+  .ant-tabs-content .ant-form-item {
+    margin-bottom: 0px;
+  }
+</style>

ant-design-jeecg-vue/src/views/jeecg/tablist/form/JeecgOrderTicketModal.vue

@@ -0,0 +1,184 @@
+<template>
+  <a-modal
+    :title="title"
+    :width="800"
+    :visible="visible"
+    :okButtonProps="{ props: {disabled: disableSubmit} }"
+    :confirmLoading="confirmLoading"
+    @ok="handleOk"
+    @cancel="handleCancel"
+    cancelText="关闭">
+
+    <a-spin :spinning="confirmLoading">
+      <a-form :form="form">
+
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="航班号"
+          hasFeedback >
+          <a-input placeholder="请输入航班号" v-decorator="['ticketCode', {rules:[{ required: true,message: '请输入航班号!'}]}]" :readOnly="disableSubmit"/>
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="航班时间"
+          hasFeedback >
+          <j-date v-decorator="['tickectDate',{trigger:'input',rules:[{ required: true,message: '请输入航班号!'}]}]"></j-date>
+        </a-form-item>
+        <a-form-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
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="创建人"
+          :hidden="hiding"
+          hasFeedback >
+          <a-input v-decorator="[ 'createBy', {}]" :readOnly="disableSubmit"/>
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="创建时间"
+          :hidden="hiding"
+          hasFeedback >
+          <a-input v-decorator="[ 'createTime', {}]" :readOnly="disableSubmit"/>
+        </a-form-item>
+      </a-form>
+    </a-spin>
+  </a-modal>
+</template>
+
+<script>
+  import { httpAction } from '@/api/manage'
+  import pick from 'lodash.pick'
+  import moment from 'moment'
+  import JDate from '@/components/jeecg/JDate'
+
+  export default {
+    components: {
+      JDate
+    },
+    name: "JeecgOrderTicketModal",
+    data () {
+      return {
+        title:"操作",
+        visible: false,
+        model: {},
+        labelCol: {
+          xs: { span: 24 },
+          sm: { span: 5 },
+        },
+        wrapperCol: {
+          xs: { span: 24 },
+          sm: { span: 16 },
+        },
+        moment,
+        format:"YYYY-MM-DD HH:mm:ss",
+        disableSubmit: false,
+        orderId:"",
+        hiding: false,
+        confirmLoading: false,
+        form: this.$form.createForm(this),
+        validatorRules:{
+        },
+        url: {
+          add: "/test/order/addTicket",
+          edit: "/test/order/editTicket",
+        },
+      }
+    },
+    created () {
+    },
+    methods: {
+      add (orderId) {
+        if(orderId){
+          this.orderId = orderId;
+          this.edit({},'');
+        }else{
+          this.$message.warning("请选择一条航班数据");
+        }
+      },
+      detail(record){
+        this.edit(record,'d');
+      },
+      edit (record,v) {
+        if(v == 'e'){
+          this.hiding = false;
+          this.disableSubmit = false;
+        }else if(v == 'd'){
+          this.hiding = false;
+          this.disableSubmit = true;
+        }else{
+          this.hiding = true;
+          this.disableSubmit = false;
+        }
+        this.form.resetFields();
+        this.model = Object.assign({}, record);
+        this.visible = true;
+        this.$nextTick(() => {
+          this.form.setFieldsValue(pick(this.model,'ticketCode','tickectDate','orderId','createBy','createTime','updateBy','updateTime'))
+        });
+      },
+      onChange(value, dateString) {
+        console.log('Selected Time: ', value);
+        console.log('Formatted Selected Time: ', dateString);
+        this.model.tickectDate = dateString;
+      },
+      onOk(value) {
+        console.log('onOk: ', value);
+      },
+      close () {
+        this.$emit('close');
+        this.visible = false;
+      },
+      handleOk () {
+        const that = this;
+        // 触发表单验证
+        this.form.validateFields((err, values) => {
+          if (!err) {
+            that.confirmLoading = true;
+            let httpurl = '';
+            let method = '';
+            if(!this.model.id){
+              httpurl+=this.url.add;
+              method = 'post';
+            }else{
+              httpurl+=this.url.edit;
+              method = 'put';
+            }
+            let formData = Object.assign(this.model, values);
+            //时间格式化
+            formData.orderId = this.orderId;
+            console.log(formData)
+            httpAction(httpurl,formData,method).then((res)=>{
+              if(res.success){
+                that.$message.success(res.message);
+                that.$emit('ok');
+              }else{
+                that.$message.warning(res.message);
+              }
+            }).finally(() => {
+              that.confirmLoading = false;
+              that.close();
+            })
+          }
+        })
+      },
+      handleCancel () {
+        this.close()
+      },
+    }
+  }
+</script>
+
+<style scoped>
+
+</style>