Commit 6d88d199d260e9fc9cf691b1de323d146c2ba6fc
1 parent
a41890fe
出库单页重复注册事件BUG修复
Signed-off-by: TanYibin <5491541@qq.com>
Showing
2 changed files
with
7 additions
and
13 deletions
ant-design-vue-jeecg/src/views/system/shipment/ShipmentDetailList.vue
| ... | ... | @@ -17,8 +17,7 @@ |
| 17 | 17 | <a-dropdown v-if="selectedRowKeys.length > 0"> |
| 18 | 18 | <a-menu slot="overlay" v-has="'shipmentDetail:deleteBatch'"> |
| 19 | 19 | <a-menu-item key="1" @click="batchDel"> |
| 20 | - <a-icon type="delete"/> | |
| 21 | - 删除 | |
| 20 | + <a-icon type="delete"/> 删除 | |
| 22 | 21 | </a-menu-item> |
| 23 | 22 | </a-menu> |
| 24 | 23 | <a-button style="margin-left: 8px"> 批量操作 |
| ... | ... | @@ -72,8 +71,8 @@ |
| 72 | 71 | </div> |
| 73 | 72 | |
| 74 | 73 | <shipmentDetail-modal ref="modalForm" @ok="modalFormOk" :mainId="mainId"></shipmentDetail-modal> |
| 75 | - <shipment-detail-edit-modal ref="modalEditForm" @ok="modalFormOk" :mainId="mainId"></shipment-detail-edit-modal> | |
| 76 | - <shipment-detail-combine-modal ref="modalCombineForm" @ok="modalFormOk" :mainId="mainId"></shipment-detail-combine-modal> | |
| 74 | + <shipment-detail-edit-modal ref="modalEditForm" @ok="modalFormOk" @close="searchQuery" :mainId="mainId"></shipment-detail-edit-modal> | |
| 75 | + <shipment-detail-combine-modal ref="modalCombineForm" @ok="modalFormOk" @close="searchQuery" :mainId="mainId"></shipment-detail-combine-modal> | |
| 77 | 76 | |
| 78 | 77 | </a-card> |
| 79 | 78 | </template> |
| ... | ... | @@ -270,17 +269,11 @@ export default { |
| 270 | 269 | this.$refs.modalCombineForm.edit(record); |
| 271 | 270 | this.$refs.modalCombineForm.title = "配盘"; |
| 272 | 271 | this.$refs.modalCombineForm.disableSubmit = false; |
| 273 | - this.$refs.modalCombineForm.$on("close", () => { | |
| 274 | - this.searchQuery(); | |
| 275 | - }); | |
| 276 | 272 | }, |
| 277 | 273 | edit(record) { |
| 278 | 274 | this.$refs.modalEditForm.edit(record); |
| 279 | 275 | this.$refs.modalEditForm.title = "编辑"; |
| 280 | 276 | this.$refs.modalEditForm.disableSubmit = false; |
| 281 | - this.$refs.modalEditForm.$on("close", () => { | |
| 282 | - this.searchQuery(); | |
| 283 | - }); | |
| 284 | 277 | }, |
| 285 | 278 | } |
| 286 | 279 | } |
| ... | ... |
ant-design-vue-jeecg/src/views/system/shipment/modules/ShipmentDetailCombineModal.vue
| ... | ... | @@ -47,17 +47,18 @@ |
| 47 | 47 | :columns="columns" |
| 48 | 48 | :dataSource="dataSource" |
| 49 | 49 | :pagination="false" |
| 50 | - :loading="loading" | |
| 51 | - > | |
| 50 | + :loading="loading"> | |
| 51 | + | |
| 52 | 52 | <span slot="action" slot-scope="text, record"> |
| 53 | 53 | <a-button @click="combine(record)" type="primary">配盘</a-button> |
| 54 | 54 | </span> |
| 55 | 55 | |
| 56 | 56 | <span slot="inventoryStatus" slot-scope="inventoryStatus"> |
| 57 | - <a-tag :key="inventoryStatus" color="blue" :color="getStatusColor(inventoryStatus)"> | |
| 57 | + <a-tag :key="inventoryStatus" :color="getStatusColor(inventoryStatus)"> | |
| 58 | 58 | {{ solutionInvStatus(inventoryStatus) }} |
| 59 | 59 | </a-tag> |
| 60 | 60 | </span> |
| 61 | + | |
| 61 | 62 | </a-table> |
| 62 | 63 | </div> |
| 63 | 64 | </j-modal> |
| ... | ... |