diff --git a/ant-design-vue-jeecg/src/config/router.config.js b/ant-design-vue-jeecg/src/config/router.config.js
index 9a5f5124..acb4c3bf 100644
--- a/ant-design-vue-jeecg/src/config/router.config.js
+++ b/ant-design-vue-jeecg/src/config/router.config.js
@@ -621,30 +621,43 @@ export const constantRouterMap = [
     path: '/404',
     component: () => import(/* webpackChunkName: "fail" */ '@/views/exception/404')
   },
-
   {
     path: '/atlas',
     component: () => import(/* webpackChunkName: "fail" */ '@/views/seknowgroup/SeKnowAtlasList')
   },
   {
-    path: '/shopping/shopHome',//这里是你需要设置新窗口打开的页面的路径s
-    component: () => import('@/views/shopping/shopHome'),
-  },
-  {
-    path: '/shopping/views/clothType',//这里是你需要设置新窗口打开的页面的路径s
-    component: () => import('@/views/shopping/pages/clothType'),
-  },
-  {
-    path: '/shopping/views/sirendingzhi',//这里是你需要设置新窗口打开的页面的路径s
-    component: () => import('@/views/shopping/pages/sirendingzhi'),
-  },
-  {
-    path: '/shopping/views/ClothDetail',//这里是你需要设置新窗口打开的页面的路径s
-    component: () => import('@/views/shopping/pages/clothDetail'),
-  },
-  {
-    path: '/shopping/views/person',//这里是你需要设置新窗口打开的页面的路径s
-    component: () => import('@/views/shopping/pages/gerenzhongxin'),
+    path: '/shopping',//这里是你需要设置新窗口打开的页面的路径s
+    component: () => import('@views/shopping/shopHome'),
+    redirect: '/shopping/shopHome',
+    hidden: true,
+    children: [
+      {
+        path: 'shopHome',
+        name: 'shopHome',
+        component: () => import('@views/shopping/shopHome'),
+      },
+      {
+        path: 'clothType',//这里是你需要设置新窗口打开的页面的路径s
+        name: 'clothType',
+        component: () => import('@/views/shopping/pages/clothType'),
+      },
+      {
+        path: 'sirendingzhi',//这里是你需要设置新窗口打开的页面的路径s
+        name: 'sirendingzhi',
+        component: () => import('@/views/shopping/pages/sirendingzhi'),
+      },
+      {
+        path: 'ClothDetail',//这里是你需要设置新窗口打开的页面的路径s
+        name: 'ClothDetail',
+        component: () => import('@/views/shopping/pages/clothDetail'),
+      },
+      {
+        path: 'person',//这里是你需要设置新窗口打开的页面的路径s
+        name: 'person',
+        component: () => import('@/views/shopping/pages/gerenzhongxin'),
+      },
+      ]
+
   },
   {
     path: '/shopping/views/order',//这里是你需要设置新窗口打开的页面的路径s
diff --git a/ant-design-vue-jeecg/src/permission.js b/ant-design-vue-jeecg/src/permission.js
index 255bc2dd..6ddfcb42 100644
--- a/ant-design-vue-jeecg/src/permission.js
+++ b/ant-design-vue-jeecg/src/permission.js
@@ -18,7 +18,7 @@ const whiteList = ['/user/login','/userequip/loginequip','/user/sgin',
   '/gygl/gyglzxt','/sykesjk/sykcsjkzxt','/scrysjk/scrysjkzxt','/jxrysjk/jxrysjkzxt','/jxzz/jxzzglsjkzxt','/scys/scyssjkzxt',
   '/sckz/sckzzxt','/sbjm/sbjmsjkzxt','/jxgl/jxglsjkzxt','/szls/szlssjkzxt','/jxdsj/jxdsjzszxt',
   '/ybgl/ybglsjkzxt','/mflgl/mflglsjkzxt','/ddcl/ddclzxt','/ddgl/ddglzxt','/dyhsc/dyhsczxt','/znyy/znyysczhgkzzrj',
-  '/znyyjc/znyycjrjxt','/gdgz/gdgzzxt'] // no redirect whitelist
+  '/znyyjc/znyycjrjxt','/gdgz/gdgzzxt','/shopping/shopHome','/shopping/clothType','/shopping/sirendingzhi','/shopping/ClothDetail','/shopping/person'] // no redirect whitelist
 
 router.beforeEach((to, from, next) => {
   NProgress.start() // start progress bar
diff --git a/ant-design-vue-jeecg/src/views/customerinvoice/admin/CustomerInvoiceList.vue b/ant-design-vue-jeecg/src/views/customerinvoice/admin/CustomerInvoiceList.vue
index 350151d8..06427403 100644
--- a/ant-design-vue-jeecg/src/views/customerinvoice/admin/CustomerInvoiceList.vue
+++ b/ant-design-vue-jeecg/src/views/customerinvoice/admin/CustomerInvoiceList.vue
@@ -105,28 +105,22 @@
         </template>
 
         <span slot="action" slot-scope="text, record">
-          <a @click="handleEdit(record)">编辑</a>
 
+         <a @click="paixu(record)">排序</a>
+          <a-divider type="vertical" />
+          <a @click="handleEdit(record)">编辑</a>
           <a-divider type="vertical" />
-<!--          <a-dropdown>
-            <a class="ant-dropdown-link">更多 <a-icon type="down" /></a>
-            <a-menu slot="overlay">
-              <a-menu-item>-->
-                <a @click="handleDetail(record)">详情</a>
-           <a-divider type="vertical" />
-<!--              </a-menu-item>
-              <a-menu-item>-->
-                <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
-                  <a>删除</a>
-                </a-popconfirm>
-<!--              </a-menu-item>
-            </a-menu>
-          </a-dropdown>-->
+          <a @click="handleDetail(record)">详情</a>
+          <a-divider type="vertical" />
+          <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
+            <a>删除</a>
+          </a-popconfirm>
         </span>
 
       </a-table>
     </div>
 
+    <customer-invoice-modal1 ref="modalFormpaixu" @ok="modalFormOk"></customer-invoice-modal1>
     <customer-invoice-modal ref="modalForm" @ok="modalFormOk"></customer-invoice-modal>
   </a-card>
 </template>
@@ -137,13 +131,15 @@
   import { mixinDevice } from '@/utils/mixin'
   import { JeecgListMixin } from '@/mixins/JeecgListMixin'
   import CustomerInvoiceModal from './modules/CustomerInvoiceModal'
+  import CustomerInvoiceModal1 from './modules/CustomerInvoiceModal1'
   import {filterMultiDictText} from '@/components/dict/JDictSelectUtil'
 
   export default {
     name: 'CustomerInvoiceList',
     mixins:[JeecgListMixin, mixinDevice],
     components: {
-      CustomerInvoiceModal
+      CustomerInvoiceModal,
+      CustomerInvoiceModal1
     },
     data () {
       return {
@@ -248,6 +244,11 @@
       },
     },
     methods: {
+      paixu: function (record) {
+        this.$refs.modalFormpaixu.edit(record.userId);
+        this.$refs.modalFormpaixu.title = record.userId_dictText+"测体管理";
+        this.$refs.modalFormpaixu.disableSubmit = false;
+      },
       initDictConfig(){
       },
       getSuperFieldList(){
diff --git a/ant-design-vue-jeecg/src/views/customerinvoice/admin/modules/CustomerInvoiceList1.vue b/ant-design-vue-jeecg/src/views/customerinvoice/admin/modules/CustomerInvoiceList1.vue
new file mode 100644
index 00000000..8e29d941
--- /dev/null
+++ b/ant-design-vue-jeecg/src/views/customerinvoice/admin/modules/CustomerInvoiceList1.vue
@@ -0,0 +1,300 @@
+<template>
+  <a-card :bordered="false">
+    <!-- 查询区域 -->
+    <div class="table-page-search-wrapper">
+      <a-form layout="inline" @keyup.enter.native="searchQuery">
+       <!-- <a-row :gutter="24">
+          <a-col :xl="6" :lg="7" :md="8" :sm="24">
+            <a-form-item label="用户">
+              <j-search-select-tag placeholder="请选择用户" v-model="queryParam.userId" dict="sys_user,realname,id"/>
+            </a-form-item>
+          </a-col>
+          <a-col :xl="6" :lg="7" :md="8" :sm="24">
+            <a-form-item label="客户类型">
+              <j-dict-select-tag placeholder="请选择客户类型" v-model="queryParam.customerType" dictCode="khlx"/>
+            </a-form-item>
+          </a-col>
+          <template v-if="toggleSearchStatus">
+            <a-col :xl="6" :lg="7" :md="8" :sm="24">
+              <a-form-item label="发票类型">
+                <j-dict-select-tag placeholder="请选择发票类型" v-model="queryParam.invoiceType" dictCode="fplx"/>
+              </a-form-item>
+            </a-col>
+            <a-col :xl="6" :lg="7" :md="8" :sm="24">
+              <a-form-item label="名称/姓名">
+                <a-input placeholder="请输入名称/姓名" v-model="queryParam.name"></a-input>
+              </a-form-item>
+            </a-col>
+            <a-col :xl="6" :lg="7" :md="8" :sm="24">
+              <a-form-item label="开户行">
+                <j-search-select-tag placeholder="请选择开户行" v-model="queryParam.bankDeposit" dict="zybank,bankname,id"/>
+              </a-form-item>
+            </a-col>
+          </template>
+          <a-col :xl="6" :lg="7" :md="8" :sm="24">
+            <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
+              <a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
+              <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
+              <a @click="handleToggleSearch" style="margin-left: 8px">
+                {{ toggleSearchStatus ? '收起' : '展开' }}
+                <a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>
+              </a>
+            </span>
+          </a-col>
+        </a-row>-->
+      </a-form>
+    </div>
+    <!-- 查询区域-END -->
+
+    <!-- 操作按钮区域 -->
+    <div class="table-operator">
+      <!--<a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>-->
+      <a-button type="primary" icon="download" @click="handleExportXls('客户发票信息')">导出</a-button>
+     <!-- <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
+        <a-button type="primary" icon="import">导入</a-button>
+      </a-upload>
+      &lt;!&ndash; 高级查询区域 &ndash;&gt;
+      <j-super-query :fieldList="superFieldList" ref="superQueryModal" @handleSuperQuery="handleSuperQuery"></j-super-query>
+      <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"
+        :scroll="{x:true}"
+        bordered
+        rowKey="id"
+        :columns="columns"
+        :dataSource="dataSource"
+        :pagination="ipagination"
+        :loading="loading"
+        :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
+        class="j-table-force-nowrap"
+        @change="handleTableChange">
+
+        <template slot="htmlSlot" slot-scope="text">
+          <div v-html="text"></div>
+        </template>
+        <template slot="imgSlot" slot-scope="text">
+          <span v-if="!text" style="font-size: 12px;font-style: italic;">无图片</span>
+          <img v-else :src="getImgView(text)" height="25px" alt="" style="max-width:80px;font-size: 12px;font-style: italic;"/>
+        </template>
+        <template slot="fileSlot" slot-scope="text">
+          <span v-if="!text" style="font-size: 12px;font-style: italic;">无文件</span>
+          <a-button
+            v-else
+            :ghost="true"
+            type="primary"
+            icon="download"
+            size="small"
+            @click="downloadFile(text)">
+            下载
+          </a-button>
+        </template>
+
+        <span slot="action" slot-scope="text, record">
+          <a @click="up(record.id)">升序</a>
+           <a-divider type="vertical" />
+           <a @click="down(record.id)">降序</a>
+          <a-divider type="vertical" />
+          <a @click="handleDetail(record)">详情</a>
+          <a-divider type="vertical" />
+          <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
+            <a>删除</a>
+          </a-popconfirm>
+        </span>
+
+      </a-table>
+    </div>
+
+    <customer-invoice-modal ref="modalForm" @ok="modalFormOk"></customer-invoice-modal>
+  </a-card>
+</template>
+
+<script>
+
+  import '@/assets/less/TableExpand.less'
+  import { mixinDevice } from '@/utils/mixin'
+  import { JeecgListMixin } from '@/mixins/JeecgListMixin'
+  import CustomerInvoiceModal from './CustomerInvoiceModal'
+  import {filterMultiDictText} from '@/components/dict/JDictSelectUtil'
+  import { getAction } from '@/api/manage'
+
+  export default {
+    name: 'CustomerInvoiceList1',
+    mixins:[JeecgListMixin, mixinDevice],
+    components: {
+      CustomerInvoiceModal
+    },
+    data () {
+      return {
+        description: '客户发票信息管理页面',
+        // 表头
+        columns: [
+          {
+            title: '#',
+            dataIndex: '',
+            key:'rowIndex',
+            width:60,
+            align:"center",
+            customRender:function (t,r,index) {
+              return parseInt(index)+1;
+            }
+          },
+
+          {
+            title:'用户',
+            align:"center",
+            dataIndex: 'userId_dictText'
+          },
+          {
+            title:'客户类型',
+            align:"center",
+            dataIndex: 'customerType_dictText'
+          },
+          {
+            title:'发票类型',
+            align:"center",
+            dataIndex: 'invoiceType_dictText'
+          },
+          {
+            title:'名称/姓名',
+            align:"center",
+            dataIndex: 'name'
+          },
+          {
+            title:'纳税人识别号',
+            align:"center",
+            dataIndex: 'taxIdentificationNumber'
+          },
+         /* {
+            title:'地址',
+            align:"center",
+            dataIndex: 'address'
+          },*/
+          {
+            title:'电话',
+            align:"center",
+            dataIndex: 'telephone'
+          },
+          {
+            title:'账号',
+            align:"center",
+            dataIndex: 'accountNumber'
+          },
+          {
+            title:'开户行',
+            align:"center",
+            dataIndex: 'bankDeposit_dictText'
+          },
+
+          {
+            title:'创建日期',
+            align:"center",
+            dataIndex: 'createTime'
+          },
+          {
+            title:'排序',
+            align:"center",
+            sorter: true,
+            dataIndex: 'sort'
+          },
+          {
+            title: '操作',
+            dataIndex: 'action',
+            align:"center",
+            fixed:"right",
+            width:147,
+            scopedSlots: { customRender: 'action' }
+          }
+        ],
+        url: {
+          up: "/customerinvoice/customerInvoice/up",
+          down: "/customerinvoice/customerInvoice/down",
+          list: "/customerinvoice/customerInvoice/list1",
+          delete: "/customerinvoice/customerInvoice/delete",
+          deleteBatch: "/customerinvoice/customerInvoice/deleteBatch",
+          exportXlsUrl: "/customerinvoice/customerInvoice/exportXls",
+          importExcelUrl: "customerinvoice/customerInvoice/importExcel",
+
+        },
+        dictOptions:{},
+        superFieldList:[],
+      }
+    },
+    created() {
+    this.getSuperFieldList();
+    },
+    computed: {
+      importExcelUrl: function(){
+        return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
+      },
+    },
+    methods: {
+
+
+      up(id){
+        getAction(this.url.up,{id:id}).then((res)=>{
+          if(res.success){
+            this.loadData();
+            this.$message.success(res.message);
+          }else{
+            this.$message.warning(res.message);
+          }
+        })},
+      down(id){
+        getAction(this.url.down,{id:id}).then((res)=>{
+          if(res.success){
+            this.loadData();
+            this.$message.success(res.message);
+          }else{
+            this.$message.warning(res.message);
+          }
+        })},
+
+
+
+
+      edit (id) {
+        /*this.queryParam.userId=this.id;*/
+        this.queryParam.userId=id,
+          this.url.list='/customerinvoice/customerInvoice/list1'
+        this.loadData();
+        this.visible = true;
+      },
+      initDictConfig(){
+      },
+      getSuperFieldList(){
+        let fieldList=[];
+        fieldList.push({type:'datetime',value:'createTime',text:'创建日期'})
+        fieldList.push({type:'sel_search',value:'userId',text:'用户',dictTable:'sys_user', dictText:'realname', dictCode:'id'})
+        fieldList.push({type:'popup',value:'username',text:'用户', popup:{code:'findcust',field:'id',orgFields:'id',destFields:'user_id'}})
+        fieldList.push({type:'string',value:'customerType',text:'客户类型',dictCode:'khlx'})
+        fieldList.push({type:'string',value:'invoiceType',text:'发票类型',dictCode:'fplx'})
+        fieldList.push({type:'string',value:'name',text:'名称/姓名',dictCode:''})
+        fieldList.push({type:'string',value:'taxIdentificationNumber',text:'纳税人识别号',dictCode:''})
+        fieldList.push({type:'string',value:'address',text:'地址',dictCode:''})
+        fieldList.push({type:'string',value:'telephone',text:'电话',dictCode:''})
+        fieldList.push({type:'string',value:'bankDeposit',text:'开户行',dictCode:''})
+        fieldList.push({type:'string',value:'accountNumber',text:'账号',dictCode:''})
+        fieldList.push({type:'int',value:'sort',text:'排序',dictCode:''})
+        this.superFieldList = fieldList
+      }
+    }
+  }
+</script>
+<style scoped>
+  @import '~@assets/less/common.less';
+</style>
\ No newline at end of file
diff --git a/ant-design-vue-jeecg/src/views/customerinvoice/admin/modules/CustomerInvoiceModal1.vue b/ant-design-vue-jeecg/src/views/customerinvoice/admin/modules/CustomerInvoiceModal1.vue
new file mode 100644
index 00000000..1510631e
--- /dev/null
+++ b/ant-design-vue-jeecg/src/views/customerinvoice/admin/modules/CustomerInvoiceModal1.vue
@@ -0,0 +1,60 @@
+<template>
+  <j-modal
+    :title="title"
+    :width="width"
+    :visible="visible"
+    switchFullscreen
+    @ok="handleOk"
+    :okButtonProps="{ class:{'jee-hidden': disableSubmit} }"
+    @cancel="handleCancel"
+    cancelText="关闭">
+    <customer-invoice-list1 ref="realForm" @ok="submitCallback" :disabled="disableSubmit"></customer-invoice-list1>
+  </j-modal>
+</template>
+
+<script>
+
+  import CustomerInvoiceList1 from "./CustomerInvoiceList1";
+  export default {
+    name: 'CustomerInvoiceModal1',
+    components: {
+      CustomerInvoiceList1
+    },
+    data () {
+      return {
+        title:'',
+        width:800,
+        visible: false,
+        disableSubmit: false
+      }
+    },
+    methods: {
+      add () {
+        this.visible=true
+        this.$nextTick(()=>{
+          this.$refs.realForm.add();
+        })
+      },
+      edit (record) {
+        this.visible=true
+        this.$nextTick(()=>{
+          this.$refs.realForm.edit(record);
+        })
+      },
+      close () {
+        this.$emit('close');
+        this.visible = false;
+      },
+      handleOk () {
+        this.$refs.realForm.submitForm();
+      },
+      submitCallback(){
+        this.$emit('ok');
+        this.visible = false;
+      },
+      handleCancel () {
+        this.close()
+      }
+    }
+  }
+</script>
\ No newline at end of file
diff --git a/ant-design-vue-jeecg/src/views/customerpayment/admin/modules/CustomerPaymentList1.vue b/ant-design-vue-jeecg/src/views/customerpayment/admin/modules/CustomerPaymentList1.vue
index a969c57a..f60e0c98 100644
--- a/ant-design-vue-jeecg/src/views/customerpayment/admin/modules/CustomerPaymentList1.vue
+++ b/ant-design-vue-jeecg/src/views/customerpayment/admin/modules/CustomerPaymentList1.vue
@@ -123,7 +123,7 @@
   import '@/assets/less/TableExpand.less'
   import { mixinDevice } from '@/utils/mixin'
   import { JeecgListMixin } from '@/mixins/JeecgListMixin'
-
+  import { getAction } from '@/api/manage'
   import {filterMultiDictText} from '@/components/dict/JDictSelectUtil'
 
   export default {
@@ -202,6 +202,7 @@
           exportXlsUrl: "/customerpayment/customerPayment/exportXls",
           importExcelUrl: "customerpayment/customerPayment/importExcel",
 
+
         },
         dictOptions:{},
         superFieldList:[],
diff --git a/ant-design-vue-jeecg/src/views/shopping/pages/clothDetail.vue b/ant-design-vue-jeecg/src/views/shopping/pages/clothDetail.vue
index 4b6d67cb..9ddbf7e3 100644
--- a/ant-design-vue-jeecg/src/views/shopping/pages/clothDetail.vue
+++ b/ant-design-vue-jeecg/src/views/shopping/pages/clothDetail.vue
@@ -1,4 +1,5 @@
 <template>
+<!--  服装详情页-->
   <div class="clothDetails">
     <Header fontColor="#000"></Header>
     <div class="jz menu d-flex">
diff --git a/ant-design-vue-jeecg/src/views/shopping/pages/clothType.vue b/ant-design-vue-jeecg/src/views/shopping/pages/clothType.vue
index 9ff5c7bd..03f94338 100644
--- a/ant-design-vue-jeecg/src/views/shopping/pages/clothType.vue
+++ b/ant-design-vue-jeecg/src/views/shopping/pages/clothType.vue
@@ -1,4 +1,5 @@
 <template>
+<!--  服装类型-->
   <div class="clothType">
 
       <Header fontColor="#000"></Header>
diff --git a/ant-design-vue-jeecg/src/views/shopping/pages/gerenzhongxin.vue b/ant-design-vue-jeecg/src/views/shopping/pages/gerenzhongxin.vue
index 64ce25d0..9c634626 100644
--- a/ant-design-vue-jeecg/src/views/shopping/pages/gerenzhongxin.vue
+++ b/ant-design-vue-jeecg/src/views/shopping/pages/gerenzhongxin.vue
@@ -1,4 +1,5 @@
 <template>
+<!--  个人中心-->
   <div class="gerenzhongxin">
     <Header></Header>
     <div class="bg"></div>
diff --git a/ant-design-vue-jeecg/src/views/shopping/pages/orderDetails.vue b/ant-design-vue-jeecg/src/views/shopping/pages/orderDetails.vue
index e2c370cd..8373aeda 100644
--- a/ant-design-vue-jeecg/src/views/shopping/pages/orderDetails.vue
+++ b/ant-design-vue-jeecg/src/views/shopping/pages/orderDetails.vue
@@ -1,4 +1,5 @@
 <template>
+<!--  订单详情-->
   <div class="orderDetails">
     <Header fontColor="#000"></Header>
     <div style="padding-top: 88px"></div>
diff --git a/ant-design-vue-jeecg/src/views/shopping/pages/sirendingzhi.vue b/ant-design-vue-jeecg/src/views/shopping/pages/sirendingzhi.vue
index c1544522..162fcb5e 100644
--- a/ant-design-vue-jeecg/src/views/shopping/pages/sirendingzhi.vue
+++ b/ant-design-vue-jeecg/src/views/shopping/pages/sirendingzhi.vue
@@ -1,4 +1,5 @@
 <template>
+<!--  私人定制-->
   <div class="sirendingzhi">
     <div class="stepsDiv">
       <Header fontColor="#fff"></Header>
diff --git a/ant-design-vue-jeecg/src/views/shopping/shopHome.vue b/ant-design-vue-jeecg/src/views/shopping/shopHome.vue
index fa8082ec..9bb5db88 100644
--- a/ant-design-vue-jeecg/src/views/shopping/shopHome.vue
+++ b/ant-design-vue-jeecg/src/views/shopping/shopHome.vue
@@ -1,4 +1,5 @@
 <template>
+<!--  首页-->
   <div>
     <Header/>
     <div class="lunbotu">
diff --git a/ant-design-vue-jeecg/src/views/system/Depart3List.vue b/ant-design-vue-jeecg/src/views/system/Depart3List.vue
index 5848e24d..1a7bb904 100644
--- a/ant-design-vue-jeecg/src/views/system/Depart3List.vue
+++ b/ant-design-vue-jeecg/src/views/system/Depart3List.vue
@@ -104,7 +104,7 @@
                 :labelCol="labelCol"
                 :wrapperCol="wrapperCol"
                 label="缩写">
-                <a-input placeholder="请输入手机号" v-decorator="['departNameAbbr', validatorRules.departNameAbbr  ]"/>
+                <a-input disabled placeholder="请输入缩写" v-decorator="['departNameAbbr', validatorRules.departNameAbbr  ]"/>
               </a-form-item>
 
 
@@ -114,7 +114,7 @@
                 label="部门编码">
                 <a-input disabled placeholder="请输入部门编码" v-decorator="['orgCode', validatorRules.orgCode ]"/>
               </a-form-item>
-              <template v-if="orgTypeDisabled">
+              <!--<template v-if="orgTypeDisabled">-->
               <a-form-item
                 :labelCol="labelCol"
                 :wrapperCol="wrapperCol"
@@ -126,7 +126,7 @@
                 :wrapperCol="wrapperCol"
                 label="部门类型">
 
-                  <a-radio-group v-decorator="['orgCategory',validatorRules.orgCategory]" placeholder="请选择部门类型">
+                  <a-radio-group disabled v-decorator="['orgCategory',validatorRules.orgCategory]" placeholder="请选择部门类型">
                     <a-radio value="1">
                       管理机构
                     </a-radio>
@@ -155,7 +155,7 @@
                   <!--</a-radio-group>-->
                 <!--</template>-->
               </a-form-item>
-              </template>
+              <!--</template>-->
 
 
               <template v-if="orgTypeDisabled">
@@ -277,6 +277,7 @@
         departTree: [],
         rightClickSelectedKey: '',
         rightClickSelectedOrgCode: '',
+        rightClickSelectedorgCategory: '',
         hiding: true,
         model: {},
         dropTrigger: '',
@@ -309,7 +310,8 @@
           orgCode: {rules: [{required: true, message: '请输入部门编码!'}]},
           orgCategory: {rules: [{required: true, message: '请输入部门类型!'}]},
           mobile: {rules: [{validator: this.validateMobile}]},
-          departNameAbbr: {rules: [{required: true,validator: this.validatedepartNameAbbr}]}
+          departNameAbbr: {rules: [{required: true, message: '请输入部门编码!'}]},
+          //departNameAbbr: {rules: [{required: true,validator: this.validatedepartNameAbbr}]}
         },
         url: {
           delete: '/sys/sysDepart/delete',
@@ -367,12 +369,13 @@
       // 右键操作方法
       rightHandle(node) {
         this.dropTrigger = 'contextmenu'
-        console.log(node.node.eventKey)
+        //console.log(node.node.eventKey)
         this.rightClickSelectedKey = node.node.eventKey
         this.rightClickSelectedOrgCode = node.node.dataRef.orgCode
+        this.rightClickSelectedorgCategory = node.node.dataRef.orgCategory
       },
       onExpand(expandedKeys) {
-        console.log('onExpand', expandedKeys)
+        //console.log('onExpand', expandedKeys)
         // if not set autoExpandParent to false, if children expanded, parent can not collapse.
         // or, you can remove all expanded children keys.
         this.iExpandedKeys = expandedKeys
@@ -395,7 +398,7 @@
         this.$refs.nodeModal.add(this.currFlowId, '')
       },
       batchDel: function () {
-        console.log(this.checkedKeys)
+        //console.log(this.checkedKeys)
         if (this.checkedKeys.length <= 0) {
           this.$message.warning('请选择一条记录！')
         } else {
@@ -449,11 +452,11 @@
       nodeModalClose() {
       },
       hide() {
-        console.log(111)
+        //console.log(111)
         this.visible = false
       },
       onCheck(checkedKeys, info) {
-        console.log('onCheck', checkedKeys, info)
+        //console.log('onCheck', checkedKeys, info)
         this.hiding = false
         //this.checkedKeys = checkedKeys.checked
         // <!---- author:os_chengtgen -- date:20190827 --  for:切换父子勾选模式 =======------>
@@ -465,10 +468,10 @@
         // <!---- author:os_chengtgen -- date:20190827 --  for:切换父子勾选模式 =======------>
       },
       onSelect(selectedKeys, e) {
-        console.log('selected', selectedKeys, e)
+        //console.log('selected', selectedKeys, e)
         this.hiding = false
         let record = e.node.dataRef
-        console.log('onSelect-record', record)
+        //console.log('onSelect-record-3', record)
         this.currSelected = Object.assign({}, record)
         this.model = this.currSelected
         this.selectedKeys = [record.key]
@@ -491,8 +494,19 @@
         }
 
         this.$nextTick(() => {
+
+          this.form.getFieldDecorator('departName', {initialValue: ''})
+          this.form.getFieldDecorator('departNameEn', {initialValue: ''})
+          this.form.getFieldDecorator('orgCode', {initialValue: ''})
+          this.form.getFieldDecorator('departNameAbbr', {initialValue: ''})
+          this.form.getFieldDecorator('orgCategory', {initialValue: 1})
+          this.form.getFieldDecorator('mobile', {initialValue: ''})
+          this.form.getFieldDecorator('departOrder', {initialValue: ''})
+          this.form.getFieldDecorator('address', {initialValue: ''})
+          this.form.getFieldDecorator('memo', {initialValue: ''})
           // this.form.getFieldDecorator('fax', {initialValue: ''})
-          this.form.setFieldsValue(pick(record, 'departName','orgCategory', 'orgCode', 'departOrder', 'mobile', 'fax', 'address', 'memo'))
+          // this.form.getFieldDecorator('fax', {initialValue: ''})
+          this.form.setFieldsValue(pick(record, 'departName','departNameEn','departNameAbbr','orgCategory', 'orgCode', 'departOrder', 'mobile', 'address', 'memo'))
         })
       },
       getCurrSelectedTitle() {
@@ -524,7 +538,7 @@
             }
 
             let formData = Object.assign(this.currSelected, values)
-            console.log('Received values of form: ', formData)
+            //console.log('Received values of form: ', formData)
             httpAction(this.url.edit, formData, 'put').then((res) => {
               if (res.success) {
                 this.$message.success('保存成功!')
@@ -542,7 +556,7 @@
       nodeSettingFormSubmit() {
         this.form.validateFields((err, values) => {
           if (!err) {
-            console.log('Received values of form: ', values)
+            //console.log('Received values of form: ', values)
           }
         })
       },
@@ -554,15 +568,25 @@
           this.$refs.departModal.add()
           this.$refs.departModal.title = '新增'
         } else if (num == 2) {
+          if(this.currSelected.orgCategory==3||this.currSelected.orgCategory==4||this.currSelected.orgCategory==5||this.currSelected.orgCategory==6||this.currSelected.orgCategory==7)
+          {
+            this.$message.warning('该部门不允许添加子部门！')
+            return false
+          }
           let key = this.currSelected.key
           if (!key) {
             this.$message.warning('请先点击选中上级部门！')
             return false
           }
-          this.$refs.departModal.add(this.selectedKeys)
+          this.$refs.departModal.add(this.selectedKeys,this.currSelected.orgCategory)
           this.$refs.departModal.title = '新增'
         } else {
-          this.$refs.departModal.add(this.rightClickSelectedKey)
+          if(this.rightClickSelectedorgCategory==3||this.rightClickSelectedorgCategory==4||this.rightClickSelectedorgCategory==5||this.rightClickSelectedorgCategory==6||this.rightClickSelectedorgCategory==7)
+          {
+            this.$message.warning('该部门不允许添加子部门！')
+            return false
+          }
+          this.$refs.departModal.add(this.rightClickSelectedKey,this.rightClickSelectedorgCategory)
           this.$refs.departModal.title = '新增'
         }
       },
@@ -616,7 +640,7 @@
 
       },
       selectDirectiveOk(record) {
-        console.log('选中指令数据', record)
+        //console.log('选中指令数据', record)
         this.nodeSettingForm.setFieldsValue({directiveCode: record.directiveCode})
         this.currSelected.sysCode = record.sysCode
       },
diff --git a/ant-design-vue-jeecg/src/views/system/DepartList.vue b/ant-design-vue-jeecg/src/views/system/DepartList.vue
index 1ae5de98..38f33200 100644
--- a/ant-design-vue-jeecg/src/views/system/DepartList.vue
+++ b/ant-design-vue-jeecg/src/views/system/DepartList.vue
@@ -474,7 +474,7 @@
         }
         this.$nextTick(() => {
           this.form.getFieldDecorator('fax', {initialValue: ''})
-          this.form.setFieldsValue(pick(record, 'departName','orgCategory', 'orgCode', 'departOrder', 'mobile', 'fax', 'address', 'memo'))
+          this.form.setFieldsValue(pick(record, 'departName','departNameEn','departNameAbbr','orgCategory', 'orgCode', 'departOrder', 'mobile', 'fax', 'address', 'memo'))
         })
       },
       getCurrSelectedTitle() {
diff --git a/ant-design-vue-jeecg/src/views/system/RoleUserList.vue b/ant-design-vue-jeecg/src/views/system/RoleUserList.vue
index e87b9915..df475c72 100644
--- a/ant-design-vue-jeecg/src/views/system/RoleUserList.vue
+++ b/ant-design-vue-jeecg/src/views/system/RoleUserList.vue
@@ -40,11 +40,11 @@
           <a-button type="primary" icon="download" @click="handleExportXls('角色管理')">导出</a-button>
         </div>
 
-        <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
-          <i class="anticon anticon-info-circle ant-alert-icon">
-          </i> 已选择 <a><b>{{ selectedRowKeys1.length }}</b></a>项
-          <a style="margin-left: 24px" @click="onClearSelected1">清空</a>
-        </div>
+        <!--<div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">-->
+          <!--<i class="anticon anticon-info-circle ant-alert-icon">-->
+          <!--</i> 已选择 <a><b>{{ selectedRowKeys1.length }}</b></a>项-->
+          <!--<a style="margin-left: 24px" @click="onClearSelected1">清空</a>-->
+        <!--</div>-->
 
         <div style="margin-top: 15px">
           <a-table
diff --git a/ant-design-vue-jeecg/src/views/system/User2List.vue b/ant-design-vue-jeecg/src/views/system/User2List.vue
index 489c9ef7..eb25adca 100644
--- a/ant-design-vue-jeecg/src/views/system/User2List.vue
+++ b/ant-design-vue-jeecg/src/views/system/User2List.vue
@@ -268,12 +268,12 @@
             width: 180,
             dataIndex: 'orgCodeTxt'
           },
-          {
+        /*  {
             title: '负责部门',
             align: "center",
             width: 180,
             dataIndex: 'departIds_dictText'
-          },
+          },*/
           {
             title: '状态',
             align: "center",
diff --git a/ant-design-vue-jeecg/src/views/system/modules/DepartModal.vue b/ant-design-vue-jeecg/src/views/system/modules/DepartModal.vue
index 79f4f0ff..50f82bcf 100644
--- a/ant-design-vue-jeecg/src/views/system/modules/DepartModal.vue
+++ b/ant-design-vue-jeecg/src/views/system/modules/DepartModal.vue
@@ -44,7 +44,7 @@
           <a-input placeholder="请输入手机号" v-decorator="['departNameAbbr', validatorRules.departNameAbbr  ]"/>
         </a-form-item>
 
-        <template v-if="seen">
+        <template v-if="orgCategoryDisabled">
           <a-form-item
             :labelCol="labelCol"
             :wrapperCol="wrapperCol"
@@ -71,7 +71,9 @@
               </a-radio-group>
           </a-form-item>
         </template>
-
+        <template v-else>
+          <a-input v-model="model.orgCategory" value="2" hidden />
+        </template>
         <!--<a-form-item-->
           <!--:labelCol="labelCol"-->
           <!--:wrapperCol="wrapperCol"-->
@@ -156,6 +158,7 @@
           validatedepartNameAbbrUrl: "sys/sysDepart/validatedepartNameAbbr",
         },
         dictDisabled: true,
+        orgCategoryDisabled: true,
       }
     },
     created() {
@@ -174,7 +177,7 @@
 
         })
       },
-      add(depart) {
+      add(depart,orgCategory) {
         if (depart) {
           this.seen = false;
           this.dictDisabled = false;
@@ -182,6 +185,10 @@
           this.seen = true;
           this.dictDisabled = true;
         }
+        if(orgCategory==2)
+        {
+          this.orgCategoryDisabled=false;
+        }
         this.edit(depart);
       },
       edit(record) {
diff --git a/ant-design-vue-jeecg/src/views/system/modules/UserModal.vue b/ant-design-vue-jeecg/src/views/system/modules/UserModal.vue
index 83aed35e..f3458012 100644
--- a/ant-design-vue-jeecg/src/views/system/modules/UserModal.vue
+++ b/ant-design-vue-jeecg/src/views/system/modules/UserModal.vue
@@ -40,13 +40,13 @@
           <a-input placeholder="请输入用户姓名" v-model="model.realname" />
         </a-form-model-item>
 
-        <a-form-model-item label="工号" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="workNo">
-          <a-input placeholder="请输入工号" v-model="model.workNo" />
-        </a-form-model-item>
+        <!--<a-form-model-item label="工号" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="workNo">-->
+          <!--<a-input placeholder="请输入工号" v-model="model.workNo" />-->
+        <!--</a-form-model-item>-->
 
-        <a-form-model-item label="职务" :labelCol="labelCol" :wrapperCol="wrapperCol">
+      <!--  <a-form-model-item label="职务" :labelCol="labelCol" :wrapperCol="wrapperCol">
           <j-select-position placeholder="请选择职务" :multiple="false" v-model="model.post"/>
-        </a-form-model-item>
+        </a-form-model-item>-->
 
         <a-form-model-item label="角色分配" :labelCol="labelCol" :wrapperCol="wrapperCol" v-show="!roleDisabled" >
           <j-multi-select-tag
@@ -63,30 +63,32 @@
         </a-form-model-item>
 
         <!--租户分配-->
-        <a-form-model-item label="租户分配" :labelCol="labelCol" :wrapperCol="wrapperCol" v-show="!departDisabled">
-          <j-multi-select-tag
-            :disabled="disableSubmit"
-            v-model="model.relTenantIds"
-            :options="tenantsOptions"
-            placeholder="请选择租户">
-          </j-multi-select-tag>
-        </a-form-model-item>
+        <!--<a-form-model-item label="租户分配" :labelCol="labelCol" :wrapperCol="wrapperCol" v-show="!departDisabled">-->
+          <!--<j-multi-select-tag-->
+            <!--:disabled="disableSubmit"-->
+            <!--v-model="model.relTenantIds"-->
+            <!--:options="tenantsOptions"-->
+            <!--placeholder="请选择租户">-->
+          <!--</j-multi-select-tag>-->
+        <!--</a-form-model-item>-->
 
-        <a-form-model-item label="身份" :labelCol="labelCol" :wrapperCol="wrapperCol">
-          <a-radio-group  v-model="model.userIdentity"  @change="identityChange">
-            <a-radio :value="1">普通用户</a-radio>
-            <a-radio :value="2">上级</a-radio>
-            <a-radio :value="3">员工</a-radio>
-          </a-radio-group>
-        </a-form-model-item>
-        <a-form-model-item label="负责部门" :labelCol="labelCol" :wrapperCol="wrapperCol"  v-if="departIdShow==true">
-          <j-multi-select-tag
-            :disabled="disableSubmit"
-            v-model="model.departIds"
-            :options="nextDepartOptions"
-            placeholder="请选择负责部门">
-          </j-multi-select-tag>
-        </a-form-model-item>
+        <a-input v-model="model.userIdentity" value="1" hidden />
+        <!--<a-form-model-item label="身份" :labelCol="labelCol" :wrapperCol="wrapperCol">-->
+          <!--<a-radio-group  v-model="model.userIdentity"  @change="identityChange">-->
+            <!--<a-radio :value="1">普通用户</a-radio>-->
+            <!--<a-radio :value="2">上级</a-radio>-->
+            <!--<a-radio :value="3">员工</a-radio>-->
+          <!--</a-radio-group>-->
+        <!--</a-form-model-item>-->
+
+        <!--<a-form-model-item label="负责部门" :labelCol="labelCol" :wrapperCol="wrapperCol"  v-if="departIdShow==true">-->
+          <!--<j-multi-select-tag-->
+            <!--:disabled="disableSubmit"-->
+            <!--v-model="model.departIds"-->
+            <!--:options="nextDepartOptions"-->
+            <!--placeholder="请选择负责部门">-->
+          <!--</j-multi-select-tag>-->
+        <!--</a-form-model-item>-->
 
         <a-form-model-item label="头像" :labelCol="labelCol" :wrapperCol="wrapperCol">
           <j-image-upload class="avatar-uploader" text="上传" v-model="model.avatar" ></j-image-upload>
@@ -120,9 +122,10 @@
           <a-input placeholder="请输入座机" v-model="model.telephone" />
         </a-form-model-item>
 
-        <a-form-model-item label="工作流引擎" :labelCol="labelCol" :wrapperCol="wrapperCol">
-          <j-dict-select-tag  v-model="model.activitiSync"  placeholder="请选择是否同步工作流引擎" :type="'radio'" dictCode="activiti_sync"/>
-        </a-form-model-item>
+        <a-input v-model="model.activitiSync" value="1" hidden />
+        <!--<a-form-model-item label="工作流引擎" :labelCol="labelCol" :wrapperCol="wrapperCol">-->
+          <!--<j-dict-select-tag  v-model="model.activitiSync"  placeholder="请选择是否同步工作流引擎" :type="'radio'" dictCode="activiti_sync"/>-->
+        <!--</a-form-model-item>-->
 
       </a-form-model>
     </a-spin>
@@ -172,8 +175,8 @@
           phone: [{required: true, message: '请输入手机号!'}, {validator: this.validatePhone}],
           email: [{validator: this.validateEmail}],
           roles:{},
-          workNo:[ { required: true, message: '请输入工号' },
-                  { validator: this.validateWorkNo }],
+          // workNo:[ { required: true, message: '请输入工号' },
+          //         { validator: this.validateWorkNo }],
           telephone: [{ pattern: /^0\d{2,3}-[1-9]\d{6,7}$/, message: '请输入正确的座机号码' },]
         },
         departIdShow:false,
diff --git a/ant-design-vue-jeecg/src/views/system/modules/UserRecycleBinModal.vue b/ant-design-vue-jeecg/src/views/system/modules/UserRecycleBinModal.vue
index 0e042207..70d89eb6 100644
--- a/ant-design-vue-jeecg/src/views/system/modules/UserRecycleBinModal.vue
+++ b/ant-design-vue-jeecg/src/views/system/modules/UserRecycleBinModal.vue
@@ -152,26 +152,51 @@
       },
       // 彻底删除用户
       handleDelete(userIds) {
-        this.$confirm({
-          title: '彻底删除用户',
-          content: (<div>
-            <p>您确定要彻底删除这 {userIds.length} 个用户吗？</p>
-            <p style="color:red;">注意：彻底删除后将无法恢复，请谨慎操作！</p>
-          </div>),
-          centered: true,
-          onOk: () => {
-            var that = this;
-            deleteAction(that.url.deleteRecycleBin, {userIds: userIds.join(',')}).then((res) => {
-              if (res.success) {
-                this.loadData()
-                this.handleClearSelection()
-                this.$message.success(`彻底删除 ${userIds.length} 个用户成功！`)
-              } else {
-                that.$message.warning(res.message);
-              }
-            });
-          },
-        })
+        // this.$confirm({
+        //   title: '彻底删除用户',
+        //   content: (<div>
+        //     <p>您确定要彻底删除这 {userIds.length} 个用户吗？</p>
+        //     <p style="color:red;">注意：彻底删除后将无法恢复，请谨慎操作！</p>
+        //   </div>),
+        //   centered: true,
+        //   onOk: () => {
+        //     var that = this;
+        //     deleteAction(that.url.deleteRecycleBin, {userIds: userIds.join(',')}).then((res) => {
+        //       if (res.success) {
+        //         this.loadData()
+        //         this.handleClearSelection()
+        //         this.$message.success(`彻底删除 ${userIds.length} 个用户成功！`)
+        //       } else {
+        //         that.$message.warning(res.message);
+        //       }
+        //     });
+        //   },
+        // })
+
+        let str= "您确定要彻底删除这" +userIds.length +"个用户吗？";
+        this.$confirm(str, '彻底删除用户', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+          var that = this;
+          deleteAction(that.url.deleteRecycleBin, {userIds: userIds.join(',')}).then((res) =>
+          {
+            if (res.success) {
+              this.loadData()
+              this.handleClearSelection()
+              this.$message.success(`彻底删除 ${userIds.length} 个用户成功！`)
+            } else {
+              that.$message.warning(res.message);
+            }
+          });
+        }).catch(() => {
+          this.$message({
+            type: 'info',
+            message: '已取消'
+          });
+        });
+
       },
       handleRevertBatch() {
         this.handleRevert(this.selectedRowKeys)
diff --git a/ant-design-vue-jeecg/src/views/zyWorkorderManagement/ZyWorkOrderList.vue b/ant-design-vue-jeecg/src/views/zyWorkorderManagement/ZyWorkOrderList.vue
index da8c5137..e5cdf913 100644
--- a/ant-design-vue-jeecg/src/views/zyWorkorderManagement/ZyWorkOrderList.vue
+++ b/ant-design-vue-jeecg/src/views/zyWorkorderManagement/ZyWorkOrderList.vue
@@ -37,7 +37,7 @@
     <!-- 操作按钮区域 -->
     <div class="table-operator">
       <!--<a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>-->
-      <a-button type="primary" icon="download" @click="handleExportXls('工单订单完工')">导出</a-button>
+      <!--<a-button type="primary" icon="download" @click="handleExportXls('工单订单完工')">导出</a-button>-->
       <!--<a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">-->
         <!--<a-button type="primary" icon="import">导入</a-button>-->
       <!--</a-upload>-->
@@ -188,7 +188,7 @@
           {
             title:'企业',
             align:"center",
-            dataIndex: 'enterprisesId'
+            dataIndex: 'departName'
           },
           {
             title: '操作',
diff --git a/ant-design-vue-jeecg/src/views/zyorders/ZyOrdersList.vue b/ant-design-vue-jeecg/src/views/zyorders/ZyOrdersList.vue
index 5bcc5c1d..f06c1dc6 100644
--- a/ant-design-vue-jeecg/src/views/zyorders/ZyOrdersList.vue
+++ b/ant-design-vue-jeecg/src/views/zyorders/ZyOrdersList.vue
@@ -59,7 +59,10 @@
                 <j-select-depart placeholder="请选择物流企业" v-model="queryParam.logisticsEnterprisesId"/>
               </a-form-item>
             </a-col>-->
-            <a-col :xl="3" :lg="5" :md="4" :sm="12">
+        </a-row>
+
+        <a-row :gutter="24">
+            <a-col :xl="4" :lg="5" :md="4" :sm="12">
               <a-form-item label="交付状态">
                 <j-dict-select-tag placeholder="请选择交付状态" v-model="queryParam.deliveryStatus" dictCode="delivery_status"/>
               </a-form-item>
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/customerinvoice/controller/CustomerInvoiceController.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/customerinvoice/controller/CustomerInvoiceController.java
index 4d479e21..7e731d06 100644
--- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/customerinvoice/controller/CustomerInvoiceController.java
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/customerinvoice/controller/CustomerInvoiceController.java
@@ -74,6 +74,29 @@ public class CustomerInvoiceController extends JeecgController<CustomerInvoice,
 		return Result.OK(pageList);
 	}
 
+	 /**
+	  * 分页列表查询
+	  *
+	  * @param customerInvoice
+	  * @param pageNo
+	  * @param pageSize
+	  * @param req
+	  * @return
+	  */
+	 @AutoLog(value = "客户发票信息-分页列表查询")
+	 @ApiOperation(value="客户发票信息-分页列表查询", notes="客户发票信息-分页列表查询")
+	 @GetMapping(value = "/list1")
+	 public Result<?> queryPageList1(CustomerInvoice customerInvoice,
+									@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+									@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+									HttpServletRequest req) {
+		 QueryWrapper<CustomerInvoice> queryWrapper = QueryGenerator.initQueryWrapper(customerInvoice, req.getParameterMap());
+		 queryWrapper.eq("user_id",customerInvoice.getUserId());
+		 Page<CustomerInvoice> page = new Page<CustomerInvoice>(pageNo, pageSize);
+		 IPage<CustomerInvoice> pageList = customerInvoiceService.page(page, queryWrapper);
+		 return Result.OK(pageList);
+	 }
+
 	/**
 	 *   添加
 	 *
@@ -243,7 +266,27 @@ public class CustomerInvoiceController extends JeecgController<CustomerInvoice,
     }
 
 
-
+	 @AutoLog(value = "排序")
+	 @ApiOperation(value="排序", notes="排序")
+	 @GetMapping(value = "/up")
+	 public Result<?> shang(@RequestParam(name="id",required=true) String id) {
+		 System.out.println(id);
+		 customerInvoiceService.up(id);
+		 return Result.ok("升序成功");
+	 }
+
+
+	 @AutoLog(value = "排序")
+	 @ApiOperation(value="排序", notes="排序")
+	 @GetMapping(value = "/down")
+	 public Result<?> xia(@RequestParam(name="id",required=true) String id) {
+		 int a=customerInvoiceService.findSort(id);
+		 if(a==0){
+			 return Result.error("当前已经是最低级别！！！");}else {
+			 customerInvoiceService.down(id);
+			 return Result.ok("降序成功");
+		 }
+	 }
 
 
  }
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/customerinvoice/mapper/CustomerInvoiceMapper.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/customerinvoice/mapper/CustomerInvoiceMapper.java
index 56b2e273..ee8d8130 100644
--- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/customerinvoice/mapper/CustomerInvoiceMapper.java
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/customerinvoice/mapper/CustomerInvoiceMapper.java
@@ -3,6 +3,8 @@ package org.jeecg.modules.demo.customerinvoice.mapper;
 import java.util.List;
 
 import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+import org.apache.ibatis.annotations.Update;
 import org.jeecg.modules.demo.customerinvoice.entity.CustomerInvoice;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
@@ -14,4 +16,20 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  */
 public interface CustomerInvoiceMapper extends BaseMapper<CustomerInvoice> {
 
+
+    @Select("select sort from customer_invoice where id=#{id} ")
+    Integer upfindsort(String id);
+
+    @Select("select id from customer_invoice where sort=#{i} ")
+    String findproid(int i);
+
+    @Update("update customer_invoice set sort =#{i} where id = #{id} ")
+    void innew(String id, int i);
+
+    @Update("update customer_invoice set sort =#{sort} where id = #{proid} ")
+    void innewpro(String proid, Integer sort);
+
+    @Select("select sort from customer_invoice where id=#{id} ")
+    int findSort(String id);
+
 }
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/customerinvoice/service/ICustomerInvoiceService.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/customerinvoice/service/ICustomerInvoiceService.java
index c8ac60f7..5988b99a 100644
--- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/customerinvoice/service/ICustomerInvoiceService.java
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/customerinvoice/service/ICustomerInvoiceService.java
@@ -11,4 +11,9 @@ import com.baomidou.mybatisplus.extension.service.IService;
  */
 public interface ICustomerInvoiceService extends IService<CustomerInvoice> {
 
+    void down(String id);
+
+    int findSort(String id);
+
+    void up(String id);
 }
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/customerinvoice/service/impl/CustomerInvoiceServiceImpl.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/customerinvoice/service/impl/CustomerInvoiceServiceImpl.java
index 47804111..9cade0cc 100644
--- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/customerinvoice/service/impl/CustomerInvoiceServiceImpl.java
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/customerinvoice/service/impl/CustomerInvoiceServiceImpl.java
@@ -3,6 +3,7 @@ package org.jeecg.modules.demo.customerinvoice.service.impl;
 import org.jeecg.modules.demo.customerinvoice.entity.CustomerInvoice;
 import org.jeecg.modules.demo.customerinvoice.mapper.CustomerInvoiceMapper;
 import org.jeecg.modules.demo.customerinvoice.service.ICustomerInvoiceService;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -16,4 +17,37 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 @Service
 public class CustomerInvoiceServiceImpl extends ServiceImpl<CustomerInvoiceMapper, CustomerInvoice> implements ICustomerInvoiceService {
 
+    @Autowired
+    CustomerInvoiceMapper customerInvoiceMapper;
+
+    @Override
+    public void up(String id) {
+        Integer sort = customerInvoiceMapper.upfindsort(id);
+        if (sort>0) {
+            //升序前找到后一个排序
+            String proid = customerInvoiceMapper.findproid(sort + 1);
+            if (proid!="") {
+                //调换排序
+                customerInvoiceMapper.innew(id,sort+1);
+                customerInvoiceMapper.innewpro(proid,sort);
+            }
+        }
+    }
+
+    @Override
+    public int findSort(String id) {
+        return customerInvoiceMapper.findSort(id);
+    }
+
+    @Override
+    public void down(String id) {
+        Integer sort = customerInvoiceMapper.upfindsort(id);
+        if (sort>0) {
+            String proid = customerInvoiceMapper.findproid(sort - 1);
+            if (proid!="") {
+                customerInvoiceMapper.innew(id,sort-1);
+                customerInvoiceMapper.innewpro(proid,sort);
+            }
+        }
+    }
 }
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/impl/SysDepartServiceImpl.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/impl/SysDepartServiceImpl.java
index e291b5b8..4915de3d 100644
--- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/impl/SysDepartServiceImpl.java
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/impl/SysDepartServiceImpl.java
@@ -77,7 +77,7 @@ public class SysDepartServiceImpl extends ServiceImpl<SysDepartMapper, SysDepart
 	/**
 	 * queryTreeList 对应 queryTreeList 查询所有的部门数据,以树结构形式响应给前端
 	 */
-	@Cacheable(value = CacheConstant.SYS_DEPARTS_CACHE)
+//	@Cacheable(value = CacheConstant.SYS_DEPARTS_CACHE)//缓存
 	@Override
 	public List<SysDepartTreeModel> queryTreeList() {
 		LambdaQueryWrapper<SysDepart> query = new LambdaQueryWrapper<SysDepart>();
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/workorder/entity/WorkOrder.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/workorder/entity/WorkOrder.java
index 688d576e..46179645 100644
--- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/workorder/entity/WorkOrder.java
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/workorder/entity/WorkOrder.java
@@ -93,6 +93,7 @@ public class WorkOrder implements Serializable {
     private Integer workOrderStatus;
 	/**企业*/
 	@Excel(name = "企业", width = 15)
+    @Dict(dictTable = "sys_depart",dicText = "depart_name", dicCode = "id")
     @ApiModelProperty(value = "企业")
     private String enterprisesId;
 }
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/workorder/service/impl/WorkOrderServiceImpl.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/workorder/service/impl/WorkOrderServiceImpl.java
index 2553db37..6d71b47c 100644
--- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/workorder/service/impl/WorkOrderServiceImpl.java
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/workorder/service/impl/WorkOrderServiceImpl.java
@@ -219,7 +219,7 @@ public class WorkOrderServiceImpl extends ServiceImpl<WorkOrderMapper, WorkOrder
                     return Result.error("未找到对客户量体数据！");
                 }
 
-
+                //商品数量对应产品
                 for(int i=0;i<goodNum;i++)
                 {
                     ZyProduct productModel=new  ZyProduct();
@@ -407,6 +407,9 @@ public class WorkOrderServiceImpl extends ServiceImpl<WorkOrderMapper, WorkOrder
     public Result<?> cancellationWorkOrder(WorkOrder woModel) {
 
         //ZyProduct
+        //工单
+            //-产品
+                //-工序
 
         return null;
     }