duxingchen/KCGL
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: add partial return support with returned_quantity tracking

Browse Source
This commit is contained in:
DXC
2026-03-18 10:41:19 +08:00
parent 63ea2a22a4
commit 79d4a365e0
4 changed files with 91 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
inventory-web/src/views/transaction/records.vue
View File

@ -22,6 +22,22 @@
<el-table-column v-if="hasColumnPermission('borrow_no')" prop="borrow_no" label="单号" width="180" show-overflow-tooltip />
<el-table-column v-if="hasColumnPermission('borrower_name')" prop="borrower_name" label="借用人" width="100" />
<el-table-column v-if="hasColumnPermission('sku')" prop="sku" label="SKU" width="120" show-overflow-tooltip />
<el-table-column label="借出数量" width="90" align="center">
<template #default="{row}">
<el-tag type="info">{{ row.quantity }}</el-tag>
</template>
</el-table-column>
<el-table-column label="已还数量" width="90" align="center">
<template #default="{row}">
<el-tag type="success">{{ row.returned_quantity || 0 }}</el-tag>
</template>
</el-table-column>
<el-table-column label="待还数量" width="90" align="center">
<template #default="{row}">
<el-tag v-if="row.pending_quantity > 0" type="warning">{{ row.pending_quantity }}</el-tag>
<el-tag v-else type="success">0</el-tag>
</template>
</el-table-column>
<el-table-column v-if="hasColumnPermission('borrow_time')" prop="borrow_time" label="借出时间" width="160" sortable />
<el-table-column v-if="hasColumnPermission('expected_return_time') || hasColumnPermission('return_time')" label="归还时间 / 预计" min-width="200">
@ -42,9 +58,9 @@
<el-table-column v-if="hasColumnPermission('status')" label="状态" width="100" align="center">
<template #default="{row}">
<el-tag :type="row.status==='returned'?'success':'warning'">
{{ row.status==='returned'?'已还':'借出中' }}
</el-tag>
<el-tag v-if="row.status === 'returned'" type="success">已还</el-tag>
<el-tag v-else-if="row.status === 'partial_returned'" type="warning">部分归还</el-tag>
<el-tag v-else type="danger">未还</el-tag>
</template>
</el-table-column>

29
inventory-web/src/views/transaction/return.vue
View File

@ -47,6 +47,33 @@
<el-table :data="returnList" border stripe style="width: 100%">
<el-table-column v-if="hasColumnPermission('borrower_name')" prop="borrower_name" label="借用人" width="90" show-overflow-tooltip />
<el-table-column v-if="hasColumnPermission('sku')" prop="sku" label="SKU" width="120" show-overflow-tooltip />
<el-table-column label="借出数量" width="80" align="center">
<template #default="{row}">
<el-tag type="info">{{ row.quantity }}</el-tag>
</template>
</el-table-column>
<el-table-column label="已还数量" width="80" align="center">
<template #default="{row}">
<el-tag type="success">{{ row.returned_quantity || 0 }}</el-tag>
</template>
</el-table-column>
<el-table-column label="待还数量" width="80" align="center">
<template #default="{row}">
<el-tag type="warning">{{ row.pending_quantity }}</el-tag>
</template>
</el-table-column>
<el-table-column label="本次归还数" width="120" align="center">
<template #default="{row}">
<el-input-number
v-model="row.return_qty"
:min="1"
:max="row.pending_quantity"
size="small"
:disabled="!userStore.hasPermission('op_return:operation')"
/>
</template>
</el-table-column>
<el-table-column v-if="hasColumnPermission('return_location')" label="归还库位(可改)" min-width="160">
<template #default="{row}">
@ -253,6 +280,8 @@ const scanItem = async () => {
const item = res.data
// 默认将归还库位填为当前库位
item.return_location = item.current_location || ''
// 默认归还数量为待还数量
item.return_qty = item.pending_quantity
returnList.value.push(item)
barcode.value = ''