Merge branch 'develop' of http://172.16.29.40:8010/wms/wms4 into develop

肖超群
2 parents c2463d1f 33f00e5b
Showing 3 changed files with 5 additions and 6 deletions
ant-design-vue-jeecg/src/views/system/receipt/ReceiptDetailList.vue
ant-design-vue-jeecg/src/views/system/receipt/ReceiptHeaderList.vue
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/inventory/inventoryAge/entity/InventoryAgeAlarm.java
@@ -4,7 +4,7 @@
     <div class="table-operator" v-if="mainId">
       <a-button v-has="'receiptDetail:add'" @click="handleAdd" type="primary" icon="plus">新增</a-button>
       <a-button v-has="'receiptDetail:export'" type="primary" icon="download" @click="handleExportXls('入库单详情')">导出</a-button>
-      <a-button  @click="batchPrint()" type="primary">打印</a-button>
+      <!-- <a-button  @click="batchPrint()" type="primary">打印</a-button> -->
       <a-upload
         v-has="'receiptDetail:import'"
         name="file"
@@ -49,8 +49,6 @@
         :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
         @change="handleTableChange">
-
-
         <span slot="status_dictText" slot-scope="status_dictText">
             <a-tag :key="status_dictText" :color="getStatusColor(status_dictText)">
               {{ status_dictText }}
@@ -97,11 +97,10 @@
     <div class="table-operator">
       <a-button v-has="'receiptHeader:add'" @click="handleAdd" type="primary" icon="plus">新增</a-button>
       <a-button v-has="'receiptHeader:export'" type="primary" icon="download" @click="handleExportXls('入库表主表')">导出</a-button>
-      <a-upload v-has="'receiptHeader:import'" name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl"
-                @change="handleImportExcel">
+      <a-upload v-has="'receiptHeader:import'" name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
         <a-button type="primary" icon="import">导入</a-button>
-        <a-button v-has="'receiptHeader:print'" @click="batchPrint()" type="primary">打印</a-button>
       </a-upload>
+      <a-button v-has="'receiptHeader:print'" @click="batchPrint()" type="primary">打印</a-button>
       <j-super-query :fieldList="superFieldList" v-has="'receiptHeader:superQuery'" @handleSuperQuery="handleSuperQuery"/>
     </div>
 package org.jeecg.modules.wms.inventory.inventoryAge.entity;
+import lombok.Data;
 import org.jeecg.modules.wms.inventory.inventoryHeader.entity.InventoryDetail;
+@Data
 public class InventoryAgeAlarm extends InventoryDetail {
     private static final long serialVersionUID = -4357432402431852770L;