diff --git a/ant-design-vue-jeecg/src/views/system/receipt/ReceiptDetailList.vue b/ant-design-vue-jeecg/src/views/system/receipt/ReceiptDetailList.vue index 61d637f..279479c 100644 --- a/ant-design-vue-jeecg/src/views/system/receipt/ReceiptDetailList.vue +++ b/ant-design-vue-jeecg/src/views/system/receipt/ReceiptDetailList.vue @@ -49,6 +49,12 @@ :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}" @change="handleTableChange"> + <span slot="inventoryStatus_dictText" slot-scope="inventoryStatus_dictText"> + <a-tag :key="inventoryStatus_dictText" :color="getStatusColor(inventoryStatus_dictText)"> + {{ inventoryStatus_dictText }} + </a-tag> + </span> + <template slot="htmlSlot" slot-scope="text"> <div v-html="text"></div> </template> @@ -161,6 +167,7 @@ export default { title: '库存状态', align: "center", dataIndex: 'inventoryStatus_dictText', + scopedSlots: {customRender: 'inventoryStatus_dictText'} }, { title: '批次', @@ -222,6 +229,16 @@ export default { } }, methods: { + getStatusColor(status) { + const colors = { + '良品': 'green', + '报废品': 'purple', + '待确认 ': 'grey', + '次品': 'red', + default: 'default' + }; + return colors[status] || colors.default; + }, clearList() { this.dataSource = [] this.selectedRowKeys = [] diff --git a/ant-design-vue-jeecg/src/views/system/receipt/ReceiptHeaderList.vue b/ant-design-vue-jeecg/src/views/system/receipt/ReceiptHeaderList.vue index 1732974..1bd3121 100644 --- a/ant-design-vue-jeecg/src/views/system/receipt/ReceiptHeaderList.vue +++ b/ant-design-vue-jeecg/src/views/system/receipt/ReceiptHeaderList.vue @@ -194,6 +194,7 @@ </a-menu-item> </a-menu> </a-dropdown> + </span> </a-table> diff --git a/ant-design-vue-jeecg/src/views/system/shipment/ShipmentDetailList.vue b/ant-design-vue-jeecg/src/views/system/shipment/ShipmentDetailList.vue index 491ff85..0936070 100644 --- a/ant-design-vue-jeecg/src/views/system/shipment/ShipmentDetailList.vue +++ b/ant-design-vue-jeecg/src/views/system/shipment/ShipmentDetailList.vue @@ -48,6 +48,12 @@ :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}" @change="handleTableChange"> + <span slot="inventoryStatus_dictText" slot-scope="inventoryStatus_dictText"> + <a-tag :key="inventoryStatus_dictText" :color="getStatusColor(inventoryStatus_dictText)"> + {{ inventoryStatus_dictText }} + </a-tag> + </span> + <template slot="htmlSlot" slot-scope="text"> <div v-html="text"></div> </template> @@ -72,11 +78,26 @@ <span slot="action" slot-scope="text, record"> <a @click="combine(record)"><a-button type="primary">配盘</a-button></a> <a-divider type="vertical"/> - <a v-has="'shipmentDetail:edit'" @click="edit(record)">编辑</a> - <a-divider type="vertical"/> - <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)"> - <a v-has="'shipmentDetail:delete'">删除</a> - </a-popconfirm> + + <a-dropdown> + <a class="ant-dropdown-link">更多 <a-icon type="down"/></a> + <a-menu slot="overlay"> + <a-menu-item v-has="'shipmentDetail:edit'"> + <a @click="handleEdit(record)">编辑</a> + </a-menu-item> + <a-menu-item v-has="'shipmentDetail:delete'"> + <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)"> + <a>删除</a> + </a-popconfirm> + </a-menu-item> + </a-menu> + </a-dropdown> + +<!-- <a v-has="'shipmentDetail:edit'" @click="edit(record)">编辑</a>--> +<!-- <a-divider type="vertical"/>--> +<!-- <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">--> +<!-- <a v-has="'shipmentDetail:delete'">删除</a>--> +<!-- </a-popconfirm>--> </span> </a-table> @@ -177,6 +198,7 @@ export default { title: '库存状态', align: "center", dataIndex: 'inventoryStatus_dictText', + scopedSlots: {customRender: 'inventoryStatus_dictText'} }, { title: '批次', @@ -238,6 +260,16 @@ export default { } }, methods: { + getStatusColor(status) { + const colors = { + '良品': 'green', + '报废品': 'purple', + '待确认 ': 'grey', + '次品': 'red', + default: 'default' + }; + return colors[status] || colors.default; + }, clearList() { this.dataSource = [] this.selectedRowKeys = []