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

feat: 采购管理税率+分开单价总价列 + 按单出/借库锁定扫描 + 含税法计算

Browse Source 
- purchase: 新增tax_rate字段(model+service+frontend), 表格拆分为不含税单价/总价/税率三列
- buy.vue: 含税法计算(含税总价=数量×含税单价), 含税总价自动计算可手动覆盖
- create.vue: 按单出库模式下未选审批单时锁定摄像头和SKU输入
- borrow.vue: 未选审批单时锁定摄像头和SKU输入
- deploy_production.sql: 整合全部数据库变更(表结构+权限码+角色分配)
This commit is contained in:
yueli
2026-07-15 16:07:59 +08:00
parent 4b1a86a870
commit 4934cd4d8f
8 changed files with 240 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
inventory-web/src/api/purchase.ts
View File

@ -13,6 +13,7 @@ export interface PurchaseItem {
images?: string[]
unit_price?: number
total_price?: number
tax_rate?: number
status: number
status_text?: string
requester_id?: number

51
inventory-web/src/views/outbound/create.vue
View File

@ -79,25 +79,37 @@
<div class="scan-section">
<div v-if="userStore.hasPermission('outbound_create:operation')" class="camera-placeholder" @click="showCamera = true">
<el-icon :size="40" color="#409EFF"><CameraFilled /></el-icon>
<span class="text">点击开启全屏扫码</span>
</div>
<div v-else class="camera-placeholder" style="background-color: #f5f5f5; cursor: not-allowed;">
<el-icon :size="40" color="#909399"><CameraFilled /></el-icon>
<span class="text">无扫码权限</span>
</div>
<div class="input-box">
<el-input
v-model="barcodeInput"
placeholder="扫描或输入条码回车"
@keyup.enter="handleManualInput"
clearable
ref="barcodeRef"
size="large"
:disabled="!userStore.hasPermission('outbound_create:operation')"
>
<template v-if="outboundMode === 'by-request' && !selectedRequestId">
<div class="camera-placeholder" style="background-color: #f5f5f5; cursor: not-allowed;">
<el-icon :size="40" color="#909399"><CameraFilled /></el-icon>
<span class="text">请先选择审批单</span>
</div>
<div class="input-box">
<el-input v-model="barcodeInput" placeholder="请先选择审批单" disabled size="large">
<template #prefix><el-icon><Scissor /></el-icon></template>
<template #append><el-button disabled>添加</el-button></template>
</el-input>
</div>
</template>
<template v-else>
<div v-if="userStore.hasPermission('outbound_create:operation')" class="camera-placeholder" @click="showCamera = true">
<el-icon :size="40" color="#409EFF"><CameraFilled /></el-icon>
<span class="text">点击开启全屏扫码</span>
</div>
<div v-else class="camera-placeholder" style="background-color: #f5f5f5; cursor: not-allowed;">
<el-icon :size="40" color="#909399"><CameraFilled /></el-icon>
<span class="text">无扫码权限</span>
</div>
<div class="input-box">
<el-input
v-model="barcodeInput"
placeholder="扫描或输入条码回车"
@keyup.enter="handleManualInput"
clearable
ref="barcodeRef"
size="large"
:disabled="!userStore.hasPermission('outbound_create:operation')"
>
<template #prefix>
<el-icon><Scissor /></el-icon>
</template>
@ -106,6 +118,7 @@
</template>
</el-input>
</div>
</template>
</div>
<div class="cart-section">

47
inventory-web/src/views/purchase/index.vue
View File

@ -24,12 +24,19 @@
<el-table-column prop="spec_model" label="规格型号" min-width="120" show-overflow-tooltip />
<el-table-column prop="quantity" label="数量" width="80" align="center" />
<el-table-column prop="purchase_date" label="采购日期" width="110" />
<el-table-column label="单价/总价" width="120" align="right">
<el-table-column label="不含税单价" width="110" align="right">
<template #default="{ row }">
<span v-if="row.unit_price || row.total_price">
{{ row.unit_price || '-' }} / {{ row.total_price || '-' }}
</span>
<span v-else>-</span>
{{ row.unit_price ? '¥' + Number(row.unit_price).toFixed(2) : '-' }}
</template>
</el-table-column>
<el-table-column label="不含税总价" width="120" align="right">
<template #default="{ row }">
{{ row.total_price ? '¥' + Number(row.total_price).toFixed(2) : '-' }}
</template>
</el-table-column>
<el-table-column prop="tax_rate" label="税率" width="70" align="center">
<template #default="{ row }">
{{ row.tax_rate != null ? row.tax_rate + '%' : '-' }}
</template>
</el-table-column>
<el-table-column prop="requester_name" label="申请人" width="100" />
@ -126,16 +133,26 @@
</el-select>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="单价">
<el-col :span="8">
<el-form-item label="不含税单价">
<el-input-number v-model="form.unit_price" :min="0" :precision="2" style="width: 100%;" @change="onUnitPriceChange" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="总价">
<el-col :span="8">
<el-form-item label="不含税总价">
<el-input-number v-model="form.total_price" :min="0" :precision="2" style="width: 100%;" @change="onTotalPriceChange" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="税率">
<el-select v-model="form.tax_rate" style="width: 100%;" @change="onTaxRateChange">
<el-option label="0%" :value="0" />
<el-option label="1%" :value="1" />
<el-option label="6%" :value="6" />
<el-option label="13%" :value="13" />
</el-select>
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="商家链接">
<el-input v-model="form.supplier_link" placeholder="商家地址链接" clearable />
@ -311,6 +328,7 @@ const form = ref({
remark: '',
unit_price: undefined as number | undefined,
total_price: undefined as number | undefined,
tax_rate: 0,
approver_id: undefined as number | undefined,
images: [] as string[]
})
@ -381,7 +399,7 @@ const openCreateDialog = (prefill?: { materialId?: number; name?: string; spec?:
quantity: 1,
purchase_date: new Date().toISOString().split('T')[0],
supplier_link: '', remark: '',
unit_price: undefined, total_price: undefined,
unit_price: undefined, total_price: undefined, tax_rate: 0,
approver_id: undefined, images: []
}
@ -506,11 +524,16 @@ const onUnitPriceChange = (val: number | undefined) => {
}
const onTotalPriceChange = (_val: number | undefined) => {
// 用户手动修改总价时：标记为已手动修改，不再反向强制覆盖单价
// 允许用户输入打包一口价（如单价3元，买2个算5元），保留用户填入的单价和总价
totalPriceManuallyEdited.value = true
}
const onTaxRateChange = () => {
// 税率变化时：保持不含税单价不变，重算不含税总价 = 单价×数量
if (form.value.unit_price && form.value.quantity) {
form.value.total_price = Number((form.value.unit_price * form.value.quantity).toFixed(2))
}
}
// --- 上传 ---
const beforeAvatarUpload = (rawFile: any) => {
const isTypeValid = ['image/jpeg', 'image/png', 'image/gif', 'image/webp', 'image/bmp'].includes(rawFile.type)

110
inventory-web/src/views/stock/inbound/buy.vue
View File

@ -580,14 +580,18 @@
<el-col :span="8">
<el-form-item label="含税总价">
<el-input-number
v-model="form._post_tax_total_price"
v-model="postTaxTotalInput"
:precision="2"
:controls="false"
style="width:100%"
class="total-price-input"
placeholder="输入含税总价反算"
@change="updatePrices('post_total')"
:placeholder="postTaxTotalAuto > 0 ? '自动: ¥' + postTaxTotalAuto.toFixed(2) : '自动计算'"
@change="onPostTaxTotalChange"
@clear="onPostTaxTotalClear"
/>
<span v-if="postTaxTotalAuto > 0 && !postTaxTotalManuallySet" style="font-size:11px;color:#909399;">
自动计算，点击输入可覆盖
</span>
</el-form-item>
</el-col>
</el-row>
@ -1178,8 +1182,7 @@ const form = reactive({
supplier_name: '', purchaser: '', purchaser_email: '', source_link: '', detail_link: '',
arrival_photo: [] as string[], inspection_report: [] as string[],
print_copies: 1,
request_id: undefined as number | undefined, // [新增] 关联采购申请单
_post_tax_total_price: undefined as number | undefined // 含税总价（仅前端输入用，不提交后端）
request_id: undefined as number | undefined // [新增] 关联采购申请单
})
// ------------------------------------
@ -1382,15 +1385,49 @@ const handleEntryModeChange = (val: string) => {
if(formRef.value) formRef.value.clearValidate('batch_number')
}
}
// 价格联动：含税单价为主输入，不含税价格自动反算
// 追踪用户最后编辑的是含税还是不含税（'pre' | 'post'）
const lastPriceEdit = ref<'pre' | 'post'>('post') // 默认以含税为主
// 价格联动：含税法计算
// 含税总价 = 数量 × 含税单价
// 不含税总价 = 含税总价 ÷ (1 + 税率)
// 不含税单价 = 不含税总价 ÷ 数量
const lastPriceEdit = ref<'pre' | 'post'>('post')
// 含税总价：自动计算（含税单价 × 数量）+ 支持手动覆盖
const postTaxTotalManuallySet = ref(false)
const postTaxTotalInput = ref<number | undefined>(undefined)
const postTaxTotalAuto = computed(() => {
if (form.post_tax_unit_price != null && form.in_quantity > 0) {
return Number((form.post_tax_unit_price * form.in_quantity).toFixed(2))
}
return 0
})
const onPostTaxTotalChange = (val: number | undefined) => {
if (val != null && val > 0 && form.in_quantity > 0) {
postTaxTotalManuallySet.value = true
// 含税总价 → 含税单价 → 不含税单价/总价
form.post_tax_unit_price = Number((val / form.in_quantity).toFixed(2))
const taxMultiplier = 1 + (form.tax_rate || 0) / 100
form.unit_price = Number((form.post_tax_unit_price / taxMultiplier).toFixed(4))
form.total_price = Number((form.unit_price * form.in_quantity).toFixed(2))
}
}
const onPostTaxTotalClear = () => {
postTaxTotalManuallySet.value = false
postTaxTotalInput.value = undefined
// 重新用含税单价反算
if (form.post_tax_unit_price != null && form.in_quantity > 0) {
const taxMultiplier = 1 + (form.tax_rate || 0) / 100
form.unit_price = Number((form.post_tax_unit_price / taxMultiplier).toFixed(4))
form.total_price = Number((form.unit_price * form.in_quantity).toFixed(2))
}
}
const updatePrices = (source: string) => {
const taxMultiplier = 1 + (form.tax_rate || 0) / 100;
if (source === 'pre') {
// 用户编辑了不含税单价 → 反推含税
// 编辑了不含税单价 → 反推含税单价
lastPriceEdit.value = 'pre'
if (form.unit_price != null) {
form.post_tax_unit_price = Number((form.unit_price * taxMultiplier).toFixed(2));
@ -1398,7 +1435,7 @@ const updatePrices = (source: string) => {
form.post_tax_unit_price = undefined;
}
} else if (source === 'post') {
// 用户编辑了含税单价 → 反推不含税
// 编辑了含税单价 → 反推不含税
lastPriceEdit.value = 'post'
if (form.post_tax_unit_price != null) {
form.unit_price = Number((form.post_tax_unit_price / taxMultiplier).toFixed(4));
@ -1406,43 +1443,51 @@ const updatePrices = (source: string) => {
form.unit_price = undefined;
}
} else if (source === 'tax') {
// 税率变化：保持用户最后编辑的那个价格不变，重算另一个
// 税率变化：保持最后编辑的价格不变，重算另一个
if (lastPriceEdit.value === 'post' && form.post_tax_unit_price != null) {
form.unit_price = Number((form.post_tax_unit_price / taxMultiplier).toFixed(4));
} else if (form.unit_price != null) {
form.post_tax_unit_price = Number((form.unit_price * taxMultiplier).toFixed(2));
}
} else if (source === 'post_total') {
// 用户输入了含税总价 → 反推不含税总价和单价
lastPriceEdit.value = 'post'
const postTaxTotal = form._post_tax_total_price
if (postTaxTotal != null && form.in_quantity > 0) {
const preTaxTotal = postTaxTotal / taxMultiplier
form.total_price = Number(preTaxTotal.toFixed(2))
form.unit_price = Number((preTaxTotal / form.in_quantity).toFixed(4))
form.post_tax_unit_price = Number((form.unit_price * taxMultiplier).toFixed(2))
}
return // 已完整计算，跳过下面的总价逻辑
}
// 计算不含税总价
if (form.in_quantity > 0 && form.unit_price != null) {
// 含税单价优先计算总价
// 不含税总价 = (含税单价 / (1+税率)) × 数量
if (form.in_quantity > 0 && form.post_tax_unit_price != null) {
const preTax = form.post_tax_unit_price / taxMultiplier
form.unit_price = Number(preTax.toFixed(4))
form.total_price = Number((preTax * form.in_quantity).toFixed(2))
} else if (form.in_quantity > 0 && form.unit_price != null) {
form.total_price = Number((form.in_quantity * form.unit_price).toFixed(2));
} else {
form.total_price = undefined;
}
if (postTaxTotalManuallySet.value && postTaxTotalInput.value != null) {
onPostTaxTotalChange(postTaxTotalInput.value)
return
}
if (!postTaxTotalManuallySet.value) {
postTaxTotalInput.value = undefined
}
}
// 数量或不含税单价变化 → 自动推总价和含税单价
watch(() => [form.in_quantity, form.unit_price], () => {
if (form.unit_price != null && form.in_quantity > 0) {
form.total_price = Number((form.in_quantity * form.unit_price).toFixed(2));
const taxMultiplier = 1 + (form.tax_rate || 0) / 100;
form.post_tax_unit_price = Number((form.unit_price * taxMultiplier).toFixed(2));
// 数量或单价变化 → 以含税单价为主计算
watch(() => [form.in_quantity, form.post_tax_unit_price], () => {
if (form.post_tax_unit_price != null && form.in_quantity > 0) {
const taxMultiplier = 1 + (form.tax_rate || 0) / 100
form.unit_price = Number((form.post_tax_unit_price / taxMultiplier).toFixed(4))
form.total_price = Number((form.unit_price * form.in_quantity).toFixed(2))
} else if (form.unit_price != null && form.in_quantity > 0) {
form.total_price = Number((form.in_quantity * form.unit_price).toFixed(2))
form.post_tax_unit_price = Number((form.unit_price * (1 + (form.tax_rate || 0) / 100)).toFixed(2))
} else {
form.total_price = undefined;
form.post_tax_unit_price = undefined;
}
if (!postTaxTotalManuallySet.value) {
postTaxTotalInput.value = undefined
}
})
// 注意：入库数量和打印份数现在是独立的字段，不再自动同步
@ -2046,9 +2091,10 @@ const resetForm = () => {
tax_rate: 0,
currency: 'CNY', exchange_rate: 1.00, supplier_name: '', purchaser: '', purchaser_email: '', source_link: '', detail_link: '', arrival_photo: [], inspection_report: [],
print_copies: 1,
request_id: undefined,
_post_tax_total_price: undefined
request_id: undefined
})
postTaxTotalInput.value = undefined
postTaxTotalManuallySet.value = false
}
const getStatusType = (status: string) => { const map: any = {'在库': 'success', '出库': 'info', '损耗': 'danger'}; return map[status] || 'warning' }

51
inventory-web/src/views/transaction/borrow.vue
View File

@ -64,25 +64,37 @@
</div>
<div class="scan-section">
<div v-if="userStore.hasPermission('op_borrow:operation')" class="camera-placeholder" @click="showCamera = true">
<el-icon :size="40" color="#409EFF"><CameraFilled /></el-icon>
<span class="text">点击开启全屏扫码</span>
</div>
<div v-else class="camera-placeholder" style="background-color: #f5f5f5; cursor: not-allowed;">
<el-icon :size="40" color="#909399"><CameraFilled /></el-icon>
<span class="text">无扫码权限</span>
</div>
<div class="input-box">
<el-input
v-model="barcodeInput"
placeholder="扫描或输入条码回车"
@keyup.enter="handleManualInput"
clearable
ref="barcodeRef"
size="large"
:disabled="!userStore.hasPermission('op_borrow:operation')"
>
<template v-if="!selectedApprovalId">
<div class="camera-placeholder" style="background-color: #f5f5f5; cursor: not-allowed;">
<el-icon :size="40" color="#909399"><CameraFilled /></el-icon>
<span class="text">请先选择审批单</span>
</div>
<div class="input-box">
<el-input v-model="barcodeInput" placeholder="请先选择审批单" disabled size="large">
<template #prefix><el-icon><Scissor /></el-icon></template>
<template #append><el-button disabled>添加</el-button></template>
</el-input>
</div>
</template>
<template v-else>
<div v-if="userStore.hasPermission('op_borrow:operation')" class="camera-placeholder" @click="showCamera = true">
<el-icon :size="40" color="#409EFF"><CameraFilled /></el-icon>
<span class="text">点击开启全屏扫码</span>
</div>
<div v-else class="camera-placeholder" style="background-color: #f5f5f5; cursor: not-allowed;">
<el-icon :size="40" color="#909399"><CameraFilled /></el-icon>
<span class="text">无扫码权限</span>
</div>
<div class="input-box">
<el-input
v-model="barcodeInput"
placeholder="扫描或输入条码回车"
@keyup.enter="handleManualInput"
clearable
ref="barcodeRef"
size="large"
:disabled="!userStore.hasPermission('op_borrow:operation')"
>
<template #prefix>
<el-icon><Scissor /></el-icon>
</template>
@ -91,6 +103,7 @@
</template>
</el-input>
</div>
</template>
</div>
<div class="cart-section">