From 8fa629065d3a98451b9e399d2f596b9e12aad287 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=88=86=E7=B1=B3=E8=8A=B1?= <417727563@qq.com>
Date: Mon, 16 Jan 2023 09:03:49 +0800
Subject: [PATCH] 2023-01-16-01

---
 ant-design-vue-jeecg/public/index.html        |  33 +-
 .../src/views/system/Depart3List.vue          |  38 ++-
 .../src/views/zyWorkProduct/ZyProductList.vue |  60 ++--
 .../ZyProductionOrderList.vue                 | 310 +++++++++---------
 .../zyWorkorderManagement/ZyWorkOrderList.vue |  48 ++-
 .../org/jeecg/JeecgSystemApplication.java     |   2 +-
 .../controller/WorkOrderController.java       |  16 +-
 7 files changed, 274 insertions(+), 233 deletions(-)
diff --git a/ant-design-vue-jeecg/public/index.html b/ant-design-vue-jeecg/public/index.html
index 2ea92aad..0abf6db9 100644
--- a/ant-design-vue-jeecg/public/index.html
+++ b/ant-design-vue-jeecg/public/index.html
@@ -8,6 +8,12 @@
   <title>黄淮学院服装智能制造管理平台</title>
   <link rel="icon" href="<%= BASE_URL %>logohuanghuai.png">
   <script src="<%= BASE_URL %>cdn/babel-polyfill/polyfill_7_2_5.js"></script>
+
+  <!--<script src="https://cdn.bootcss.com/vue/2.6.10/vue.min.js"></script>-->
+  <!--<script src="https://cdn.bootcss.com/axios/0.19.0-beta.1/axios.min.js"></script>-->
+  <!--<script src="https://cdn.bootcss.com/vuex/3.1.0/vuex.min.js"></script>-->
+  <!--<script src="https://cdn.bootcss.com/vue-router/3.0.1/vue-router.min.js"></script>-->
+  <!--<script src="https://cdn.bootcss.com/element-ui/2.6.1/index.js"></script>-->
   <style>
     html,
     body,
@@ -268,7 +274,7 @@
   <!-- 全局配置 -->
   <script>
     window._CONFIG = {};
-    window._CONFIG['domianURL'] = 'http://localhost:8081/jeecg-boot';
+    window._CONFIG['domianURL'] = 'http://localhost:10085/jeecg-boot';
     window._CONFIG['casPrefixUrl'] = 'http://cas.example.org:8443/cas';
     window._CONFIG['imgDomainURL'] = window._CONFIG['domianURL'] + '/sys/common/view';
     window._CONFIG['downloadUrl'] = window._CONFIG['domianURL'] + '/sys/common/download';
@@ -278,11 +284,28 @@
 
 <body>
   <div id="app">
+
+
+
+    <!--<script src="https://cdn.bootcdn.net/ajax/libs/vue/2.6.12/vue.min.js"></script>-->
+    <!--<script src="https://cdn.bootcdn.net/ajax/libs/vue-router/3.1.6/vue-router.min.js"></script>-->
+    <!--<script src="https://cdn.bootcdn.net/ajax/libs/axios/0.18.1/axios.min.js"></script>-->
+    <!--<link href="https://cdn.bootcdn.net/ajax/libs/ant-design-vue/1.7.2/antd.min.css" rel="stylesheet">-->
+    <!--<script src="https://cdn.bootcdn.net/ajax/libs/ant-design-vue/1.7.2/antd.min.js"></script>-->
+    <!--<script src="https://cdn.bootcdn.net/ajax/libs/moment.js/2.29.1/moment.min.js"></script>-->
+    <!--<script src="https://cdn.bootcdn.net/ajax/libs/moment.js/2.29.1/locale/zh-cn.min.js"></script>-->
+    <!--<script src="https://cdn.bootcdn.net/ajax/libs/vuex/3.1.2/vuex.min.js"></script>-->
+    <!--<script src="https://cdn.bootcdn.net/ajax/libs/jsoneditor/9.0.0/jsoneditor.min.js"></script>-->
+    <!--<link href="https://cdn.bootcdn.net/ajax/libs/jsoneditor/9.0.0/jsoneditor.min.css" rel="stylesheet">-->
+    <!--<script src="https://cdn.bootcdn.net/ajax/libs/echarts/4.9.0-rc.1/echarts.min.js"></script>-->
+
+
     <div id="loader-wrapper">
-      <div id="loader"></div>
-      <div class="loader-section section-left"></div>
-      <div class="loader-section section-right"></div>
-      <div class="load_title">正在加载 服装智能制造软件平台V3.0,请耐心等待
+
+      <!--<div id="loader"></div>-->
+      <!--<div class="loader-section section-left"></div>-->
+      <!--<div class="loader-section section-right"></div>-->
+      <!--<div class="load_title">正在加载 服装智能制造软件平台V3.0,请耐心等待-->
 
       </div>
     </div>
diff --git a/ant-design-vue-jeecg/src/views/system/Depart3List.vue b/ant-design-vue-jeecg/src/views/system/Depart3List.vue
index 25469952..4cd0e77f 100644
--- a/ant-design-vue-jeecg/src/views/system/Depart3List.vue
+++ b/ant-design-vue-jeecg/src/views/system/Depart3List.vue
@@ -81,7 +81,7 @@
                 label="部门名称">
                 <a-input placeholder="请输入机构/部门名称" v-decorator="['departName', validatorRules.departName ]"/>
               </a-form-item>
-              <template v-if="!orgCategoryDisabled">
+              <template v-if="!orgCategory">
               <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="上级部门">
                 <a-tree-select
                   style="width:100%"
@@ -99,7 +99,19 @@
                 label="部门编码">
                 <a-input disabled placeholder="请输入部门编码" v-decorator="['orgCode', validatorRules.orgCode ]"/>
               </a-form-item>
-              <template v-if="orgCategoryDisabled">
+              <template v-if="orgCategory">
+              <a-form-item
+                :labelCol="labelCol"
+                :wrapperCol="wrapperCol"
+                label="排序">
+                <a-input-number v-decorator="[ 'departOrder',{'initialValue':0}]"/>
+              </a-form-item>
+              <a-form-item
+                :labelCol="labelCol"
+                :wrapperCol="wrapperCol"
+                label="排序">
+                <a-input-number v-decorator="[ 'departOrder',{'initialValue':0}]"/>
+              </a-form-item>
               <a-form-item
                 :labelCol="labelCol"
                 :wrapperCol="wrapperCol"
@@ -135,14 +147,9 @@
                 <!--</template>-->
               </a-form-item>
               </template>
-              <a-form-item
-                :labelCol="labelCol"
-                :wrapperCol="wrapperCol"
-                label="排序">
-                <a-input-number v-decorator="[ 'departOrder',{'initialValue':0}]"/>
-              </a-form-item>
 
-              <template v-if="orgCategoryDisabled">
+
+              <template v-if="orgTypeDisabled">
                 <a-form-item
                   :labelCol="labelCol"
                   :wrapperCol="wrapperCol"
@@ -164,6 +171,12 @@
                 <!--label="备注">-->
                 <!--<a-textarea placeholder="请输入备注" v-decorator="['memo', {'initialValue':''}]"/>-->
               <!--</a-form-item>-->
+              <a-form-item
+                :labelCol="labelCol"
+                :wrapperCol="wrapperCol"
+                label="排序">
+                <a-input-number v-decorator="[ 'departOrder',{'initialValue':0}]"/>
+              </a-form-item>
             </a-form>
             <div class="anty-form-btn">
               <a-button @click="emptyCurrForm" type="default" htmlType="button" icon="sync">重置</a-button>
@@ -292,6 +305,7 @@
           importExcelUrl: "sys/sysDepart/importExcel",
         },
         orgCategoryDisabled:false,
+        orgTypeDisabled:false,
       }
     },
     computed: {
@@ -458,6 +472,12 @@
         }else{
           this.orgCategoryDisabled =true;
         }
+        if(record.orgType == '1'){
+          this.orgTypeDisabled =true ;
+        }else{
+          this.orgTypeDisabled =false;
+        }
+
         this.$nextTick(() => {
           // this.form.getFieldDecorator('fax', {initialValue: ''})
           this.form.setFieldsValue(pick(record, 'departName','orgCategory', 'orgCode', 'departOrder', 'mobile', 'fax', 'address', 'memo'))
diff --git a/ant-design-vue-jeecg/src/views/zyWorkProduct/ZyProductList.vue b/ant-design-vue-jeecg/src/views/zyWorkProduct/ZyProductList.vue
index cf817114..2c5bdcc2 100644
--- a/ant-design-vue-jeecg/src/views/zyWorkProduct/ZyProductList.vue
+++ b/ant-design-vue-jeecg/src/views/zyWorkProduct/ZyProductList.vue
@@ -11,27 +11,27 @@
 
     <!-- 操作按钮区域 -->
     <div class="table-operator">
-      <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
-      <a-button type="primary" icon="download" @click="handleExportXls('产品表')">导出</a-button>
-      <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
-        <a-button type="primary" icon="import">导入</a-button>
-      </a-upload>
+      <!--<a-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>-->
       <!-- 高级查询区域 -->
       <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>
+      <!--<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>
+      <!--<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"
@@ -68,22 +68,22 @@
         </template>
 
         <span slot="action" slot-scope="text, record">
-          <a @click="handleEdit(record)">编辑</a>
+            <a @click="handleDetail(record)">详情</a>
 
-          <a-divider type="vertical" />
-          <a-dropdown>
-            <a class="ant-dropdown-link">更多 <a-icon type="down" /></a>
-            <a-menu slot="overlay">
-              <a-menu-item>
-                <a @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>
+          <!--<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-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>
diff --git a/ant-design-vue-jeecg/src/views/zyWorkorderManagement/ZyProductionOrderList.vue b/ant-design-vue-jeecg/src/views/zyWorkorderManagement/ZyProductionOrderList.vue
index 89ea75bf..c33f1c8a 100644
--- a/ant-design-vue-jeecg/src/views/zyWorkorderManagement/ZyProductionOrderList.vue
+++ b/ant-design-vue-jeecg/src/views/zyWorkorderManagement/ZyProductionOrderList.vue
@@ -4,11 +4,11 @@
     <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-dict-select-tag placeholder="请选择是否子单" v-model="queryParam.ischild" dictCode="ischild"/>
-            </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.ischild" dictCode="ischild"/>-->
+            <!--</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.ordersNum"></a-input>
@@ -19,46 +19,46 @@
                 <j-dict-select-tag placeholder="请选择订单类型" v-model="queryParam.ordersType" dictCode="orders_type"/>
               </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.paymentMethod" dictCode="payment_method"/>
-              </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.paymentStatus" dictCode="payment_status"/>
-              </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.accountNo"></a-input>
-              </a-form-item>
-            </a-col>
-            <a-col :xl="6" :lg="7" :md="8" :sm="24">
-              <a-form-item label="城市">
-                <j-area-linkage type="cascader" v-model="queryParam.cityId" placeholder="请选择省市区"/>
-              </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.invoiceCustomerType" dictCode="invoice_customer_type"/>
-              </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.invoiceType" dictCode="invoice_type"/>
-              </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.accountNumber"></a-input>
-              </a-form-item>
-            </a-col>
-            <a-col :xl="6" :lg="7" :md="8" :sm="24">
-              <a-form-item label="物流企业">
-                <j-select-depart placeholder="请选择物流企业" v-model="queryParam.logisticsEnterprisesId"/>
-              </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.paymentMethod" dictCode="payment_method"/>-->
+              <!--</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.paymentStatus" dictCode="payment_status"/>-->
+              <!--</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.accountNo"></a-input>-->
+              <!--</a-form-item>-->
+            <!--</a-col>-->
+            <!--<a-col :xl="6" :lg="7" :md="8" :sm="24">-->
+              <!--<a-form-item label="城市">-->
+                <!--<j-area-linkage type="cascader" v-model="queryParam.cityId" placeholder="请选择省市区"/>-->
+              <!--</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.invoiceCustomerType" dictCode="invoice_customer_type"/>-->
+              <!--</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.invoiceType" dictCode="invoice_type"/>-->
+              <!--</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.accountNumber"></a-input>-->
+              <!--</a-form-item>-->
+            <!--</a-col>-->
+            <!--<a-col :xl="6" :lg="7" :md="8" :sm="24">-->
+              <!--<a-form-item label="物流企业">-->
+                <!--<j-select-depart placeholder="请选择物流企业" v-model="queryParam.logisticsEnterprisesId"/>-->
+              <!--</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.deliveryStatus" dictCode="delivery_status"/>
@@ -94,10 +94,10 @@
 
     <!-- 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>
+      <!--<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"
@@ -210,31 +210,31 @@
               return !text?"":(text.length>10?text.substr(0,10):text)
             }
           },
-          // {
-          //   title:'订单编号',
-          //   align:"center",
-          //   dataIndex: 'ordersNum'
-          // },
-          {
-            title:'总金额(元)',
-            align:"center",
-            dataIndex: 'money'
-          },
-          {
-            title:'运费',
-            align:"center",
-            dataIndex: 'freight'
-          },
-          {
-            title:'促销',
-            align:"center",
-            dataIndex: 'promotionPrice'
-          },
           {
-            title:'实付款',
+            title:'订单编号',
             align:"center",
-            dataIndex: 'actualPayment'
+            dataIndex: 'ordersNum'
           },
+          // {
+          //   title:'总金额(元)',
+          //   align:"center",
+          //   dataIndex: 'money'
+          // },
+          // {
+          //   title:'运费',
+          //   align:"center",
+          //   dataIndex: 'freight'
+          // },
+          // {
+          //   title:'促销',
+          //   align:"center",
+          //   dataIndex: 'promotionPrice'
+          // },
+          // {
+          //   title:'实付款',
+          //   align:"center",
+          //   dataIndex: 'actualPayment'
+          // },
           {
             title:'交货期(天)',
             align:"center",
@@ -245,60 +245,60 @@
             align:"center",
             dataIndex: 'ordersType_dictText'
           },
-          {
-            title:'顾客',
-            align:"center",
-            dataIndex: 'userId_dictText'
-          },
+          // {
+          //   title:'顾客',
+          //   align:"center",
+          //   dataIndex: 'userId_dictText'
+          // },
           // {
           //   title:'商品条目数量',
           //   align:"center",
           //   dataIndex: 'goodsQuantity'
           // },
-          {
-            title:'支付方式',
-            align:"center",
-            dataIndex: 'paymentMethod_dictText'
-          },
+          // {
+          //   title:'支付方式',
+          //   align:"center",
+          //   dataIndex: 'paymentMethod_dictText'
+          // },
           {
             title:'支付状态',
             align:"center",
             dataIndex: 'paymentStatus_dictText'
           },
-          {
-            title:'账号/卡号',
-            align:"center",
-            dataIndex: 'accountNo'
-          },
-          {
-            title:'开户银行',
-            align:"center",
-            dataIndex: 'bankDeposit'
-          },
-          {
-            title:'支付时间',
-            align:"center",
-            dataIndex: 'paymentTime',
-            customRender:function (text) {
-              return !text?"":(text.length>10?text.substr(0,10):text)
-            }
-          },
-          {
-            title:'城市',
-            align:"center",
-            dataIndex: 'cityId',
-            scopedSlots: {customRender: 'pcaSlot'}
-          },
-          {
-            title:'地址',
-            align:"center",
-            dataIndex: 'address'
-          },
-          {
-            title:'邮编',
-            align:"center",
-            dataIndex: 'zipCode'
-          },
+          // {
+          //   title:'账号/卡号',
+          //   align:"center",
+          //   dataIndex: 'accountNo'
+          // },
+          // {
+          //   title:'开户银行',
+          //   align:"center",
+          //   dataIndex: 'bankDeposit'
+          // },
+          // {
+          //   title:'支付时间',
+          //   align:"center",
+          //   dataIndex: 'paymentTime',
+          //   customRender:function (text) {
+          //     return !text?"":(text.length>10?text.substr(0,10):text)
+          //   }
+          // },
+          // {
+          //   title:'城市',
+          //   align:"center",
+          //   dataIndex: 'cityId',
+          //   scopedSlots: {customRender: 'pcaSlot'}
+          // },
+          // {
+          //   title:'地址',
+          //   align:"center",
+          //   dataIndex: 'address'
+          // },
+          // {
+          //   title:'邮编',
+          //   align:"center",
+          //   dataIndex: 'zipCode'
+          // },
           {
             title:'收货人',
             align:"center",
@@ -309,41 +309,41 @@
             align:"center",
             dataIndex: 'mobile'
           },
-          {
-            title:'发票客户类型',
-            align:"center",
-            dataIndex: 'invoiceCustomerType_dictText'
-          },
-          {
-            title:'发票类型',
-            align:"center",
-            dataIndex: 'invoiceType_dictText'
-          },
-          {
-            title:'纳税人识别号',
-            align:"center",
-            dataIndex: 'taxIdentificationNumber'
-          },
-          {
-            title:'开票地址',
-            align:"center",
-            dataIndex: 'addressBilling'
-          },
-          {
-            title:'电话',
-            align:"center",
-            dataIndex: 'telephone'
-          },
-          {
-            title:'公户开户行',
-            align:"center",
-            dataIndex: 'bankPublic'
-          },
-          {
-            title:'公户账号',
-            align:"center",
-            dataIndex: 'accountNumber'
-          },
+          // {
+          //   title:'发票客户类型',
+          //   align:"center",
+          //   dataIndex: 'invoiceCustomerType_dictText'
+          // },
+          // {
+          //   title:'发票类型',
+          //   align:"center",
+          //   dataIndex: 'invoiceType_dictText'
+          // },
+          // {
+          //   title:'纳税人识别号',
+          //   align:"center",
+          //   dataIndex: 'taxIdentificationNumber'
+          // },
+          // {
+          //   title:'开票地址',
+          //   align:"center",
+          //   dataIndex: 'addressBilling'
+          // },
+          // {
+          //   title:'电话',
+          //   align:"center",
+          //   dataIndex: 'telephone'
+          // },
+          // {
+          //   title:'公户开户行',
+          //   align:"center",
+          //   dataIndex: 'bankPublic'
+          // },
+          // {
+          //   title:'公户账号',
+          //   align:"center",
+          //   dataIndex: 'accountNumber'
+          // },
           {
             title:'销售门店',
             align:"center",
@@ -354,11 +354,11 @@
             align:"center",
             dataIndex: 'salespersonId_dictText'
           },
-          {
-            title:'物流企业',
-            align:"center",
-            dataIndex: 'logisticsEnterprisesId_dictText'
-          },
+          // {
+          //   title:'物流企业',
+          //   align:"center",
+          //   dataIndex: 'logisticsEnterprisesId_dictText'
+          // },
           {
             title:'交付状态',
             align:"center",
diff --git a/ant-design-vue-jeecg/src/views/zyWorkorderManagement/ZyWorkOrderList.vue b/ant-design-vue-jeecg/src/views/zyWorkorderManagement/ZyWorkOrderList.vue
index 3515ade4..f46163cc 100644
--- a/ant-design-vue-jeecg/src/views/zyWorkorderManagement/ZyWorkOrderList.vue
+++ b/ant-design-vue-jeecg/src/views/zyWorkorderManagement/ZyWorkOrderList.vue
@@ -14,21 +14,19 @@
               <a-input placeholder="请输入订单编号" v-model="queryParam.orderCode"></a-input>
             </a-form-item>
           </a-col>
-          <template v-if="toggleSearchStatus">
-            <a-col :xl="6" :lg="7" :md="8" :sm="24">
-              <a-form-item label="客户名称">
-                <a-input placeholder="请输入客户名称" v-model="queryParam.customerName"></a-input>
-              </a-form-item>
-            </a-col>
-          </template>
+          <a-col :xl="6" :lg="7" :md="8" :sm="24">
+            <a-form-item label="客户名称">
+              <a-input placeholder="请输入客户名称" v-model="queryParam.customerName"></a-input>
+            </a-form-item>
+          </a-col>
           <a-col :xl="6" :lg="7" :md="8" :sm="24">
             <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
               <a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
               <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
-              <a @click="handleToggleSearch" style="margin-left: 8px">
-                {{ toggleSearchStatus ? '收起' : '展开' }}
-                <a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>
-              </a>
+              <!--<a @click="handleToggleSearch" style="margin-left: 8px">-->
+                <!--{{ toggleSearchStatus ? '收起' : '展开' }}-->
+                <!--<a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>-->
+              <!--</a>-->
             </span>
           </a-col>
         </a-row>
@@ -38,25 +36,25 @@
 
     <!-- 操作按钮区域 -->
     <div class="table-operator">
-      <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
+      <!--<a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>-->
       <a-button type="primary" icon="download" @click="handleExportXls('工单订单完工')">导出</a-button>
-      <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
-        <a-button type="primary" icon="import">导入</a-button>
-      </a-upload>
-      <a-dropdown v-if="selectedRowKeys.length > 0">
-        <a-menu slot="overlay">
-          <a-menu-item key="1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item>
-        </a-menu>
-        <a-button style="margin-left: 8px"> 批量操作 <a-icon type="down" /></a-button>
-      </a-dropdown>
+      <!--<a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">-->
+        <!--<a-button type="primary" icon="import">导入</a-button>-->
+      <!--</a-upload>-->
+      <!--<a-dropdown v-if="selectedRowKeys.length > 0">-->
+        <!--<a-menu slot="overlay">-->
+          <!--<a-menu-item key="1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item>-->
+        <!--</a-menu>-->
+        <!--<a-button style="margin-left: 8px"> 批量操作 <a-icon type="down" /></a-button>-->
+      <!--</a-dropdown>-->
     </div>
 
     <!-- table区域-begin -->
     <div>
-      <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
-        <i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a style="font-weight: 600">{{ selectedRowKeys.length }}</a>项
-        <a style="margin-left: 24px" @click="onClearSelected">清空</a>
-      </div>
+      <!--<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"
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/JeecgSystemApplication.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/JeecgSystemApplication.java
index c2326c8b..dcfda4f7 100644
--- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/JeecgSystemApplication.java
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/JeecgSystemApplication.java
@@ -29,7 +29,7 @@ import java.net.UnknownHostException;
 @Slf4j
 @SpringBootApplication(exclude = {org.springframework.boot.autoconfigure.security.servlet.SecurityAutoConfiguration.class,
         org.springframework.boot.actuate.autoconfigure.security.servlet.ManagementWebSecurityAutoConfiguration.class
-        ,org.activiti.spring.boot.SecurityAutoConfiguration.class
+//        ,org.activiti.spring.boot.SecurityAutoConfiguration.class
 })
 @EnableScheduling
 @EnableTransactionManagement
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/workorder/controller/WorkOrderController.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/workorder/controller/WorkOrderController.java
index 4a265df2..96d08761 100644
--- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/workorder/controller/WorkOrderController.java
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/workorder/controller/WorkOrderController.java
@@ -332,11 +332,11 @@ public class WorkOrderController extends JeecgController<WorkOrder, IWorkOrderSe
 					 csWrapper.eq("style_id",ogModel.getStyleId());
 					 csWrapper.eq("stylemodel_id",ogModel.getModelId());
 					 List<ZyClothSample>  csList=zyClothSampleService.list(csWrapper);
-//					 if(csList.size()<=0)
-//					 {
-//						 return Result.error("商品成衣样板不存在,请检查后在操作!");
-//					 }
-//					 ZyClothSample cSampleModel=csList.get(0);
+					 if(csList.size()<=0)
+					 {
+						 return Result.error("商品成衣样板不存在,请检查后在操作!");
+					 }
+					 ZyClothSample cSampleModel=csList.get(0);
 
 					 int goodNum=ogModel.getGoodsNum();
 					 WorkOrder workOrder=new WorkOrder();
@@ -372,9 +372,9 @@ public class WorkOrderController extends JeecgController<WorkOrder, IWorkOrderSe
 //							productModel.setTotalMachine("");//	合计（设备秒）
 //							productModel.setEnterprisesId("");//_id	企业id
 							productModel.setUserId(zyOrders.getUserId());//_id	用户id
-//							productModel.setStructureDiagram(cSampleModel.getStructureDiagram());//_diagram 结构图
-//							productModel.setLayoutDiagram(cSampleModel.getLayoutDiagram());//_diagram	排料图
-//							productModel.setProductPicture(cSampleModel.getUrl());//_picture	产品图片
+							productModel.setStructureDiagram(cSampleModel.getStructureDiagram());//_diagram 结构图
+							productModel.setLayoutDiagram(cSampleModel.getLayoutDiagram());//_diagram	排料图
+							productModel.setProductPicture(cSampleModel.getUrl());//_picture	产品图片
 							productModel.setHeight(mesureModel.getHeight());//	身高
 							productModel.setWeight(mesureModel.getWeight());//	体重
 							productModel.setHem(mesureModel.getHem());//	下摆
