Commit eea30dcfac40e6a34c7a5a42b6f39a4b52590d6e
Merge branch 'develop' of http://172.16.29.40:8010/wms/wms4 into develop
Showing
3 changed files
with
5 additions
and
6 deletions
ant-design-vue-jeecg/src/views/system/receipt/ReceiptDetailList.vue
| ... | ... | @@ -4,7 +4,7 @@ |
| 4 | 4 | <div class="table-operator" v-if="mainId"> |
| 5 | 5 | <a-button v-has="'receiptDetail:add'" @click="handleAdd" type="primary" icon="plus">新增</a-button> |
| 6 | 6 | <a-button v-has="'receiptDetail:export'" type="primary" icon="download" @click="handleExportXls('入库单详情')">导出</a-button> |
| 7 | - <a-button @click="batchPrint()" type="primary">打印</a-button> | |
| 7 | + <!-- <a-button @click="batchPrint()" type="primary">打印</a-button> --> | |
| 8 | 8 | <a-upload |
| 9 | 9 | v-has="'receiptDetail:import'" |
| 10 | 10 | name="file" |
| ... | ... | @@ -49,8 +49,6 @@ |
| 49 | 49 | :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}" |
| 50 | 50 | @change="handleTableChange"> |
| 51 | 51 | |
| 52 | - | |
| 53 | - | |
| 54 | 52 | <span slot="status_dictText" slot-scope="status_dictText"> |
| 55 | 53 | <a-tag :key="status_dictText" :color="getStatusColor(status_dictText)"> |
| 56 | 54 | {{ status_dictText }} |
| ... | ... |
ant-design-vue-jeecg/src/views/system/receipt/ReceiptHeaderList.vue
| ... | ... | @@ -97,11 +97,10 @@ |
| 97 | 97 | <div class="table-operator"> |
| 98 | 98 | <a-button v-has="'receiptHeader:add'" @click="handleAdd" type="primary" icon="plus">新增</a-button> |
| 99 | 99 | <a-button v-has="'receiptHeader:export'" type="primary" icon="download" @click="handleExportXls('入库表主表')">导出</a-button> |
| 100 | - <a-upload v-has="'receiptHeader:import'" name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" | |
| 101 | - @change="handleImportExcel"> | |
| 100 | + <a-upload v-has="'receiptHeader:import'" name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel"> | |
| 102 | 101 | <a-button type="primary" icon="import">导入</a-button> |
| 103 | - <a-button v-has="'receiptHeader:print'" @click="batchPrint()" type="primary">打印</a-button> | |
| 104 | 102 | </a-upload> |
| 103 | + <a-button v-has="'receiptHeader:print'" @click="batchPrint()" type="primary">打印</a-button> | |
| 105 | 104 | <j-super-query :fieldList="superFieldList" v-has="'receiptHeader:superQuery'" @handleSuperQuery="handleSuperQuery"/> |
| 106 | 105 | |
| 107 | 106 | </div> |
| ... | ... |
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/inventory/inventoryAge/entity/InventoryAgeAlarm.java
| 1 | 1 | package org.jeecg.modules.wms.inventory.inventoryAge.entity; |
| 2 | 2 | |
| 3 | +import lombok.Data; | |
| 3 | 4 | import org.jeecg.modules.wms.inventory.inventoryHeader.entity.InventoryDetail; |
| 4 | 5 | |
| 6 | +@Data | |
| 5 | 7 | public class InventoryAgeAlarm extends InventoryDetail { |
| 6 | 8 | |
| 7 | 9 | private static final long serialVersionUID = -4357432402431852770L; |
| ... | ... |