出库逻辑添加,扫码识别编码成功,后续对应逻辑没有完成

This commit is contained in:
dxc
2026-02-04 17:22:20 +08:00
parent 596f366fc4
commit 797b611530
12 changed files with 919 additions and 28 deletions

View File

@ -43,7 +43,7 @@ def create_app():
print(f"❌ 错误: Auth 模块导入失败: {e}") print(f"❌ 错误: Auth 模块导入失败: {e}")
# ----------------------------------------------------- # -----------------------------------------------------
# 2.1 注册入库聚合模块 (Inbound) - 【核心修复点】 # 2.1 注册入库聚合模块 (Inbound)
# ----------------------------------------------------- # -----------------------------------------------------
try: try:
from app.api.v1.inbound import inbound_bp from app.api.v1.inbound import inbound_bp
@ -79,7 +79,7 @@ def create_app():
print(f"❌ 错误: Upload 模块导入失败: {e}") print(f"❌ 错误: Upload 模块导入失败: {e}")
# ----------------------------------------------------- # -----------------------------------------------------
# 2.4 注册业务操作模块 (Transactions) # 2.4 注册业务操作模块 (Transactions - 借还/维修/报废)
# ----------------------------------------------------- # -----------------------------------------------------
try: try:
from app.api.v1.transactions import trans_bp from app.api.v1.transactions import trans_bp
@ -90,6 +90,19 @@ def create_app():
# 允许模块不存在时不崩溃 # 允许模块不存在时不崩溃
print(f"⚠️ 提示: Transaction 模块尚未创建或导入失败: {e}") print(f"⚠️ 提示: Transaction 模块尚未创建或导入失败: {e}")
# -----------------------------------------------------
# 2.5 ★ [新增] 注册出库模块 (Outbound)
# -----------------------------------------------------
try:
from app.api.v1.outbound import outbound_bp
# 标准: /api/v1/outbound
app.register_blueprint(outbound_bp, url_prefix='/api/v1/outbound')
# 兼容: /api/outbound
app.register_blueprint(outbound_bp, url_prefix='/api/outbound', name='outbound_legacy')
print("✅ Outbound 模块注册成功")
except ImportError as e:
print(f"❌ 错误: Outbound 模块导入失败: {e}")
# ========================================================= # =========================================================
# 3. 预加载数据模型 # 3. 预加载数据模型
# ========================================================= # =========================================================
@ -101,6 +114,9 @@ def create_app():
from app.models.inbound.semi import StockSemi from app.models.inbound.semi import StockSemi
from app.models.inbound.product import StockProduct from app.models.inbound.product import StockProduct
# ★ [新增] 出库模型 (确保迁移工具能检测到 trans_outbound 表)
from app.models.outbound import TransOutbound
# 系统与业务模型 # 系统与业务模型
from app.models.system import SysUser, SysLog from app.models.system import SysUser, SysLog
from app.models.transaction import TransBorrow, TransRepair, TransScrap from app.models.transaction import TransBorrow, TransRepair, TransScrap

View File

@ -0,0 +1,82 @@
from flask import Blueprint, request, jsonify
from app.services.outbound_service import OutboundService
from flask_jwt_extended import jwt_required, get_jwt_identity
outbound_bp = Blueprint('outbound', __name__, url_prefix='/outbound')
# --------------------------------------------------------
# 1. 扫码查询库存接口
# GET /api/v1/outbound/scan?barcode=...
# --------------------------------------------------------
@outbound_bp.route('/scan', methods=['GET'])
@jwt_required()
def scan_barcode():
barcode = request.args.get('barcode')
if not barcode:
return jsonify({'code': 400, 'msg': '请提供条码'}), 400
try:
result = OutboundService.get_stock_by_barcode(barcode)
if result:
return jsonify({'code': 200, 'data': result, 'msg': '扫描成功'})
else:
return jsonify({'code': 404, 'msg': '未找到对应的库存记录'}), 404
except Exception as e:
return jsonify({'code': 500, 'msg': str(e)}), 500
# --------------------------------------------------------
# 2. 提交出库单接口
# POST /api/v1/outbound
# --------------------------------------------------------
@outbound_bp.route('', methods=['POST'])
@jwt_required()
def create_outbound():
data = request.get_json()
if not data:
return jsonify({'code': 400, 'msg': '无有效数据'}), 400
current_user = get_jwt_identity() # 获取当前登录用户作为操作员
# 简单的必填校验 (更复杂的校验可放入 Schema)
required_fields = ['stock_id', 'source_table', 'quantity', 'consumer_name', 'signature_path']
for field in required_fields:
if field not in data or not data[field]:
return jsonify({'code': 400, 'msg': f'缺少必填字段: {field}'}), 400
try:
outbound_record = OutboundService.create_outbound(data, operator_name=current_user)
return jsonify({
'code': 200,
'msg': '出库成功',
'data': outbound_record.to_dict()
})
except ValueError as e:
return jsonify({'code': 400, 'msg': str(e)}), 400
except Exception as e:
return jsonify({'code': 500, 'msg': f'服务器内部错误: {str(e)}'}), 500
# --------------------------------------------------------
# 3. 获取出库记录列表
# GET /api/v1/outbound
# --------------------------------------------------------
@outbound_bp.route('', methods=['GET'])
@jwt_required()
def get_outbound_list():
try:
page = int(request.args.get('page', 1))
per_page = int(request.args.get('limit', 10))
keyword = request.args.get('keyword', '')
# 日期范围处理可根据前端传参格式调整
result = OutboundService.get_list(page, per_page, keyword)
return jsonify({
'code': 200,
'msg': '获取成功',
'data': result
})
except Exception as e:
return jsonify({'code': 500, 'msg': str(e)}), 500

View File

@ -0,0 +1,42 @@
from app.extensions import db
from datetime import datetime
class TransOutbound(db.Model):
__tablename__ = 'trans_outbound'
id = db.Column(db.Integer, primary_key=True)
outbound_no = db.Column(db.String(100), unique=True, nullable=False) # 出库单号
# 关联源库存信息
sku = db.Column(db.String(100))
source_table = db.Column(db.String(50)) # 'stock_buy', 'stock_product', etc.
stock_id = db.Column(db.Integer) # 对应源表的主键ID
barcode = db.Column(db.String(100)) # 实际扫码内容
# 业务信息
outbound_type = db.Column(db.String(50), default='SALES') # SALES, USE, TRANSFER
quantity = db.Column(db.Numeric(19, 4), nullable=False)
# 签字与追溯
consumer_name = db.Column(db.String(100)) # 领用人/客户
signature_path = db.Column(db.Text) # 签名图片路径
outbound_time = db.Column(db.DateTime, default=datetime.now)
operator_name = db.Column(db.String(100)) # 操作员
remark = db.Column(db.Text)
def to_dict(self):
return {
'id': self.id,
'outbound_no': self.outbound_no,
'sku': self.sku,
'source_table': self.source_table,
'outbound_type': self.outbound_type,
'quantity': float(self.quantity) if self.quantity else 0,
'consumer_name': self.consumer_name,
'signature_path': self.signature_path,
'outbound_time': self.outbound_time.strftime('%Y-%m-%d %H:%M:%S') if self.outbound_time else None,
'operator_name': self.operator_name,
'remark': self.remark
}

View File

@ -0,0 +1,153 @@
import uuid
from datetime import datetime
from sqlalchemy import or_
from app.extensions import db
from app.models.outbound import TransOutbound
# 导入所有库存实体模型,用于查找和扣减
from app.models.inbound.buy import StockBuy
from app.models.inbound.semi import StockSemi
from app.models.inbound.product import StockProduct
class OutboundService:
@staticmethod
def generate_outbound_no():
"""生成出库单号: OUT-yyyyMMdd-随机码"""
date_str = datetime.now().strftime('%Y%m%d')
short_uuid = uuid.uuid4().hex[:6].upper()
return f"OUT-{date_str}-{short_uuid}"
@staticmethod
def get_stock_by_barcode(barcode):
"""
根据条码在各个库存表中查找
优先级: 成品 -> 半成品 -> 采购件
"""
if not barcode:
return None
# 1. 查成品
prod = StockProduct.query.filter_by(barcode=barcode).first()
if prod:
return OutboundService._format_scan_result(prod, 'stock_product', prod.sku)
# 2. 查半成品
semi = StockSemi.query.filter_by(barcode=barcode).first()
if semi:
return OutboundService._format_scan_result(semi, 'stock_semi', semi.sku)
# 3. 查采购件
buy = StockBuy.query.filter_by(barcode=barcode).first()
if buy:
# 采购件可能需要关联 material_base 获取名称,这里假设 base_id 关联已建立
name = buy.base.name if buy.base else "未知采购件"
spec = buy.base.spec_model if buy.base else ""
return OutboundService._format_scan_result(buy, 'stock_buy', buy.sku, name, spec)
return None
@staticmethod
def _format_scan_result(item, table_name, sku, name=None, spec=None):
"""格式化返回给前端的数据结构"""
# 如果没有传 name (例如成品/半成品),尝试通过关联获取,或者直接用 SKU 代替
item_name = name
item_spec = spec
if not item_name and hasattr(item, 'base') and item.base:
item_name = item.base.name
item_spec = item.base.spec_model
return {
'id': item.id,
'sku': sku,
'name': item_name or sku,
'spec_model': item_spec or '',
'source_table': table_name,
'stock_quantity': float(item.stock_quantity),
'available_quantity': float(item.available_quantity),
'batch_number': getattr(item, 'batch_number', ''),
'warehouse_location': getattr(item, 'warehouse_location', '')
}
@staticmethod
def create_outbound(data, operator_name='System'):
"""执行出库逻辑:扣减库存 + 记录日志"""
source_table = data.get('source_table')
stock_id = data.get('stock_id')
quantity = float(data.get('quantity', 0))
if quantity <= 0:
raise ValueError("出库数量必须大于0")
# 1. 获取对应的库存记录模型
model_map = {
'stock_buy': StockBuy,
'stock_semi': StockSemi,
'stock_product': StockProduct
}
ModelClass = model_map.get(source_table)
if not ModelClass:
raise ValueError(f"未知的库存来源表: {source_table}")
# 2. 锁定并查询库存 (使用 with_for_update 防止并发扣减)
stock_item = ModelClass.query.with_for_update().get(stock_id)
if not stock_item:
raise ValueError("库存记录不存在")
if stock_item.available_quantity < quantity:
raise ValueError(f"库存不足!当前可用: {stock_item.available_quantity}, 请求出库: {quantity}")
try:
# 3. 扣减库存
stock_item.stock_quantity -= quantity
stock_item.available_quantity -= quantity
# 4. 创建出库记录
new_outbound = TransOutbound(
outbound_no=OutboundService.generate_outbound_no(),
sku=data.get('sku'),
source_table=source_table,
stock_id=stock_id,
barcode=data.get('barcode'),
outbound_type=data.get('outbound_type', 'SALES'),
quantity=quantity,
consumer_name=data.get('consumer_name'),
signature_path=data.get('signature_path'), # 存储签名的 URL
operator_name=operator_name,
remark=data.get('remark')
)
db.session.add(new_outbound)
db.session.commit()
return new_outbound
except Exception as e:
db.session.rollback()
raise e
@staticmethod
def get_list(page=1, per_page=10, keyword=None, start_date=None, end_date=None):
query = TransOutbound.query.order_by(TransOutbound.outbound_time.desc())
if keyword:
query = query.filter(or_(
TransOutbound.outbound_no.ilike(f'%{keyword}%'),
TransOutbound.consumer_name.ilike(f'%{keyword}%'),
TransOutbound.sku.ilike(f'%{keyword}%')
))
if start_date and end_date:
# 假设传入的是 'YYYY-MM-DD',需要处理时间范围
query = query.filter(TransOutbound.outbound_time.between(start_date, end_date))
pagination = query.paginate(page=page, per_page=per_page, error_out=False)
return {
'items': [item.to_dict() for item in pagination.items],
'total': pagination.total,
'pages': pagination.pages,
'current_page': page
}

View File

@ -4,7 +4,7 @@
"version": "0.0.0", "version": "0.0.0",
"type": "module", "type": "module",
"scripts": { "scripts": {
"dev": "vite --host", "dev": "vite",
"build": "vue-tsc -b && vite build", "build": "vue-tsc -b && vite build",
"preview": "vite preview" "preview": "vite preview"
}, },
@ -12,6 +12,7 @@
"@element-plus/icons-vue": "^2.3.2", "@element-plus/icons-vue": "^2.3.2",
"axios": "^1.13.3", "axios": "^1.13.3",
"element-plus": "^2.13.1", "element-plus": "^2.13.1",
"html5-qrcode": "^2.3.8",
"pinia": "^3.0.4", "pinia": "^3.0.4",
"sass": "^1.97.3", "sass": "^1.97.3",
"vue": "^3.5.24", "vue": "^3.5.24",
@ -19,6 +20,7 @@
}, },
"devDependencies": { "devDependencies": {
"@types/node": "^24.10.1", "@types/node": "^24.10.1",
"@vitejs/plugin-basic-ssl": "^1.1.0",
"@vitejs/plugin-vue": "^6.0.1", "@vitejs/plugin-vue": "^6.0.1",
"@vue/tsconfig": "^0.8.1", "@vue/tsconfig": "^0.8.1",
"typescript": "~5.9.3", "typescript": "~5.9.3",
@ -28,4 +30,4 @@
"overrides": { "overrides": {
"vite": "npm:rolldown-vite@7.2.5" "vite": "npm:rolldown-vite@7.2.5"
} }
} }

View File

@ -0,0 +1,19 @@
import request from '@/utils/request'
/**
* 上传文件通用接口
* @param file File 对象
*/
export function uploadFile(file: File) {
const formData = new FormData()
formData.append('file', file)
return request({
url: '/api/v1/common/upload',
method: 'post',
data: formData,
headers: {
'Content-Type': 'multipart/form-data'
}
})
}

View File

@ -0,0 +1,59 @@
import request from '@/utils/request'
export interface OutboundSubmitData {
sku: string
source_table: string
stock_id: number
barcode: string
outbound_type: string
quantity: number
consumer_name: string
signature_path: string // 上传后返回的图片路径
remark?: string
}
export interface ScanResult {
id: number
sku: string
name: string
spec_model: string
source_table: string // 'stock_buy' | 'stock_product' ...
stock_quantity: number
available_quantity: number
batch_number?: string
warehouse_location?: string
}
/**
* 根据条码获取库存物品详情
* @param barcode 扫描到的条码
*/
export function getStockByBarcode(barcode: string) {
return request<any, ScanResult>({
url: '/api/v1/outbound/scan',
method: 'get',
params: { barcode }
})
}
/**
* 提交出库单
*/
export function submitOutbound(data: OutboundSubmitData) {
return request({
url: '/api/v1/outbound',
method: 'post',
data
})
}
/**
* 获取出库记录列表
*/
export function getOutboundList(params: any) {
return request({
url: '/api/v1/outbound',
method: 'get',
params
})
}

View File

@ -0,0 +1,135 @@
<template>
<div class="signature-container">
<canvas
ref="canvasRef"
@mousedown="startDrawing"
@mousemove="draw"
@mouseup="stopDrawing"
@mouseleave="stopDrawing"
@touchstart.prevent="startDrawing"
@touchmove.prevent="draw"
@touchend.prevent="stopDrawing"
></canvas>
<div class="actions">
<el-button size="small" @click="clear">重签</el-button>
</div>
</div>
</template>
<script setup lang="ts">
import { ref, onMounted } from 'vue'
const canvasRef = ref<HTMLCanvasElement | null>(null)
const isDrawing = ref(false)
const ctx = ref<CanvasRenderingContext2D | null>(null)
// 初始化 Canvas
onMounted(() => {
if (canvasRef.value) {
const canvas = canvasRef.value
// 设置画布大小 (可以根据父容器调整)
canvas.width = canvas.offsetWidth
canvas.height = 300 // 固定高度
ctx.value = canvas.getContext('2d')
if (ctx.value) {
ctx.value.lineWidth = 3
ctx.value.lineCap = 'round'
ctx.value.strokeStyle = '#000'
}
}
})
// 获取坐标 (兼容鼠标和触摸)
const getPos = (e: MouseEvent | TouchEvent) => {
const canvas = canvasRef.value
if (!canvas) return { x: 0, y: 0 }
const rect = canvas.getBoundingClientRect()
let clientX, clientY
if ('touches' in e) {
clientX = e.touches[0].clientX
clientY = e.touches[0].clientY
} else {
clientX = (e as MouseEvent).clientX
clientY = (e as MouseEvent).clientY
}
return {
x: clientX - rect.left,
y: clientY - rect.top
}
}
const startDrawing = (e: MouseEvent | TouchEvent) => {
isDrawing.value = true
const { x, y } = getPos(e)
ctx.value?.beginPath()
ctx.value?.moveTo(x, y)
}
const draw = (e: MouseEvent | TouchEvent) => {
if (!isDrawing.value) return
const { x, y } = getPos(e)
ctx.value?.lineTo(x, y)
ctx.value?.stroke()
}
const stopDrawing = () => {
isDrawing.value = false
}
const clear = () => {
if (canvasRef.value && ctx.value) {
ctx.value.clearRect(0, 0, canvasRef.value.width, canvasRef.value.height)
}
}
/**
* 导出签名为 File 对象
*/
const generateFile = (): Promise<File | null> => {
return new Promise((resolve) => {
if (!canvasRef.value) {
resolve(null)
return
}
canvasRef.value.toBlob((blob) => {
if (blob) {
const file = new File([blob], `sign_${Date.now()}.png`, { type: 'image/png' })
resolve(file)
} else {
resolve(null)
}
}, 'image/png')
})
}
// 暴露方法给父组件
defineExpose({
clear,
generateFile
})
</script>
<style scoped>
.signature-container {
border: 1px solid #dcdfe6;
border-radius: 4px;
background: #f5f7fa;
position: relative;
width: 100%;
}
canvas {
display: block;
width: 100%; /* 响应式宽度 */
height: 300px;
cursor: crosshair;
background: #fff;
}
.actions {
position: absolute;
bottom: 10px;
right: 10px;
}
</style>

View File

@ -42,11 +42,11 @@ const routes: Array<RouteRecordRaw> = [
] ]
}, },
// 4. 库存管理 // 4. 库存管理 (入库)
{ {
path: '/inventory', path: '/inventory',
component: Layout, component: Layout,
meta: { title: '库管理', icon: 'Shop' }, meta: { title: '库管理', icon: 'Shop' }, // 修改标题以区分出库
redirect: '/inventory/buy', redirect: '/inventory/buy',
children: [ children: [
{ {
@ -76,11 +76,33 @@ const routes: Array<RouteRecordRaw> = [
] ]
}, },
// 5. 业务操作 // 5. ★ [新增] 出库管理
{
path: '/outbound', // 注意:这里使用了和你提供的文件路径一致的顶级路径
component: Layout,
meta: { title: '出库管理', icon: 'Van' }, // 推荐使用 Van 图标
redirect: '/outbound/index',
children: [
{
path: 'create',
name: 'OutboundCreate',
component: () => import('@/views/outbound/create.vue'),
meta: { title: '扫码出库' }
},
{
path: 'index',
name: 'OutboundList',
component: () => import('@/views/outbound/index.vue'),
meta: { title: '出库记录' }
}
]
},
// 6. 业务操作
{ {
path: '/operation', path: '/operation',
component: Layout, component: Layout,
meta: { title: '业务操作', icon: 'Operation' }, meta: { title: '其他业务', icon: 'Operation' },
redirect: '/operation/borrow', redirect: '/operation/borrow',
children: [ children: [
{ {
@ -104,7 +126,7 @@ const routes: Array<RouteRecordRaw> = [
] ]
}, },
// 6. 系统管理 // 7. 系统管理
{ {
path: '/system', path: '/system',
component: Layout, component: Layout,
@ -137,45 +159,35 @@ const router = createRouter({
}) })
// ========================================== // ==========================================
// [关键修改] 全局路由守卫 // 全局路由守卫
// ========================================== // ==========================================
router.beforeEach((to, from, next) => { router.beforeEach((to, from, next) => {
const userStore = useUserStore() const userStore = useUserStore()
// 1. 实时获取 Token (优先取 store防止 store 未初始化取 localStorage)
const token = userStore.token || localStorage.getItem('token') const token = userStore.token || localStorage.getItem('token')
const userRole = userStore.role || localStorage.getItem('role') || 'user' const userRole = userStore.role || localStorage.getItem('role') || 'user'
// 2. 如果要去的是登录页
if (to.path === '/login') { if (to.path === '/login') {
// 如果有 Token说明已登录踢回首页 (防止重复登录)
if (token) { if (token) {
next('/') next('/')
} else { } else {
// 没有 Token允许访问登录页
next() next()
} }
return return
} }
// 3. 如果去的不是登录页,但没有 Token
if (!token) { if (!token) {
// 强制重定向到登录页
// 使用 replace 防止用户点击浏览器“返回”按钮时进入死循环
next({ path: '/login', replace: true }) next({ path: '/login', replace: true })
return return
} }
// 4. 权限判断 (已有 Token)
if (to.meta.roles && Array.isArray(to.meta.roles)) { if (to.meta.roles && Array.isArray(to.meta.roles)) {
if (to.meta.roles.includes(userRole)) { if (to.meta.roles.includes(userRole)) {
next() next()
} else { } else {
// 权限不足,跳回首页
next('/dashboard') next('/dashboard')
} }
} else { } else {
// 无特殊权限要求,放行
next() next()
} }
}) })

View File

@ -0,0 +1,286 @@
<template>
<div class="app-container">
<el-card class="box-card">
<template #header>
<div class="card-header">
<span>扫码出库作业台</span>
<el-button type="primary" @click="toggleCamera">
{{ showCamera ? '关闭摄像头' : '打开摄像头扫码' }}
</el-button>
</div>
</template>
<div v-if="!currentItem" class="scan-area">
<div v-if="showCamera" id="reader" class="camera-box"></div>
<div class="input-box">
<el-input
v-model="barcodeInput"
placeholder="请扫描条码或手动输入后回车"
@keyup.enter="handleScan"
clearable
ref="barcodeRef"
>
<template #prefix>
<el-icon><Scissor /></el-icon>
</template>
<template #append>
<el-button @click="handleScan">确定</el-button>
</template>
</el-input>
</div>
</div>
<div v-else class="confirm-area">
<el-descriptions title="货物信息" border :column="1">
<el-descriptions-item label="名称">{{ currentItem.name }}</el-descriptions-item>
<el-descriptions-item label="规格/型号">{{ currentItem.spec_model }}</el-descriptions-item>
<el-descriptions-item label="当前库存">{{ currentItem.stock_quantity }}</el-descriptions-item>
<el-descriptions-item label="库位">{{ currentItem.warehouse_location || '暂无' }}</el-descriptions-item>
</el-descriptions>
<el-form :model="form" ref="formRef" :rules="rules" label-position="top" class="mt-20">
<el-row :gutter="20">
<el-col :span="12">
<el-form-item label="出库类型" prop="outbound_type">
<el-select v-model="form.outbound_type" placeholder="请选择">
<el-option label="销售出库" value="SALES" />
<el-option label="内部领用" value="USE" />
<el-option label="调拨" value="TRANSFER" />
</el-select>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="出库数量" prop="quantity">
<el-input-number v-model="form.quantity" :min="1" :max="currentItem.available_quantity" />
</el-form-item>
</el-col>
</el-row>
<el-form-item label="领用人/客户姓名" prop="consumer_name">
<el-input v-model="form.consumer_name" placeholder="请输入姓名" />
</el-form-item>
<el-form-item label="备注" prop="remark">
<el-input v-model="form.remark" type="textarea" />
</el-form-item>
<el-form-item label="电子签名 (请在下方区域签字)" required>
<Signature ref="signatureRef" />
</el-form-item>
<div class="form-actions">
<el-button @click="resetScan">取消 / 重新扫码</el-button>
<el-button type="primary" :loading="loading" @click="submitForm">确认出库</el-button>
</div>
</el-form>
</div>
</el-card>
</div>
</template>
<script setup lang="ts">
import { ref, reactive, nextTick, onUnmounted } from 'vue'
import { ElMessage } from 'element-plus'
// ★ [修改] 引入 Html5QrcodeSupportedFormats 以支持 Code 128
import { Html5Qrcode, Html5QrcodeSupportedFormats } from 'html5-qrcode'
import { getStockByBarcode, submitOutbound, type ScanResult } from '@/api/outbound'
import { uploadFile } from '@/api/common/upload'
import Signature from '@/components/Signature/index.vue'
// --- 状态定义 ---
const barcodeInput = ref('')
const currentItem = ref<ScanResult | null>(null)
const loading = ref(false)
const showCamera = ref(false)
const html5QrCode = ref<Html5Qrcode | null>(null)
const barcodeRef = ref()
const signatureRef = ref()
const formRef = ref() // ★ [修复] 补充 formRef 定义
const form = reactive({
outbound_type: 'SALES',
quantity: 1,
consumer_name: '',
remark: ''
})
const rules = {
consumer_name: [{ required: true, message: '请输入领用人姓名', trigger: 'blur' }],
quantity: [{ required: true, message: '请输入数量', trigger: 'blur' }]
}
// --- 扫码逻辑 ---
const handleScan = async () => {
if (!barcodeInput.value) return
try {
loading.value = true
const res = await getStockByBarcode(barcodeInput.value)
if (res.data) {
currentItem.value = res.data
// 停止摄像头
if (html5QrCode.value && html5QrCode.value.isScanning) {
await stopCamera()
}
} else {
ElMessage.warning('未找到对应库存条码')
}
} catch (error) {
console.error(error)
} finally {
loading.value = false
}
}
// --- 摄像头控制 ---
const toggleCamera = async () => {
if (showCamera.value) {
await stopCamera()
} else {
showCamera.value = true
nextTick(() => {
startCamera()
})
}
}
const startCamera = () => {
// ★ [关键修改] 初始化时指定只支持 CODE_128这是提高条码识别率的关键
html5QrCode.value = new Html5Qrcode("reader", {
formatsToSupport: [ Html5QrcodeSupportedFormats.CODE_128 ],
verbose: false
})
html5QrCode.value.start(
{ facingMode: "environment" }, // 后置摄像头
{
fps: 10,
// ★ [修改] 扫一维码时,扫描区域设置为长方形效果更好
qrbox: { width: 250, height: 150 },
aspectRatio: 1.0
},
(decodedText) => {
// 扫码成功回调
console.log("扫码成功:", decodedText)
barcodeInput.value = decodedText
handleScan() // 自动触发查询
},
(errorMessage) => {
// 扫描中错误忽略
}
).catch(err => {
// 如果还报错,大概率是因为没有使用 HTTPS 访问
ElMessage.error('无法启动摄像头: ' + err)
})
}
const stopCamera = async () => {
if (html5QrCode.value) {
try {
// 先判断是否在运行,避免报错
if (html5QrCode.value.isScanning) {
await html5QrCode.value.stop()
}
html5QrCode.value.clear()
showCamera.value = false
} catch (err) {
console.log('停止摄像头失败', err)
// 强制关闭 UI 状态
showCamera.value = false
}
}
}
// --- 提交逻辑 ---
const submitForm = async () => {
if (!formRef.value) return // 确保 formRef 存在
await formRef.value.validate(async (valid: boolean) => {
if (!valid) return
if (!currentItem.value) return
// 1. 获取签名图片
const file = await signatureRef.value.generateFile()
if (!file) {
ElMessage.error('请先进行电子签名')
return
}
try {
loading.value = true
// 2. 上传签名
const uploadRes = await uploadFile(file)
const signatureUrl = uploadRes.data.url
// 3. 提交业务单据
await submitOutbound({
sku: currentItem.value.sku,
source_table: currentItem.value.source_table,
stock_id: currentItem.value.id,
barcode: barcodeInput.value,
outbound_type: form.outbound_type,
quantity: form.quantity,
consumer_name: form.consumer_name,
remark: form.remark,
signature_path: signatureUrl
})
ElMessage.success('出库成功')
resetScan()
} catch (error) {
console.error(error)
} finally {
loading.value = false
}
})
}
const resetScan = () => {
currentItem.value = null
barcodeInput.value = ''
form.consumer_name = ''
form.quantity = 1
form.remark = ''
signatureRef.value?.clear() // 清空签名
// 重新聚焦输入框
nextTick(() => {
barcodeRef.value?.focus()
})
}
onUnmounted(() => {
stopCamera()
})
</script>
<style scoped>
.scan-area {
text-align: center;
padding: 20px;
}
.camera-box {
width: 100%; /* 响应式宽度 */
max-width: 400px; /* 限制最大宽度 */
height: 300px;
margin: 0 auto 20px;
background: #000;
overflow: hidden;
}
.confirm-area {
max-width: 600px;
margin: 0 auto;
}
.mt-20 {
margin-top: 20px;
}
.form-actions {
margin-top: 30px;
display: flex;
justify-content: space-between;
}
</style>

View File

@ -0,0 +1,87 @@
<template>
<div class="app-container">
<div class="filter-container">
<el-input v-model="listQuery.keyword" placeholder="单号/姓名/SKU" style="width: 200px;" class="filter-item" />
<el-date-picker
v-model="listQuery.dateRange"
type="daterange"
range-separator=""
start-placeholder="开始日期"
end-placeholder="结束日期"
class="filter-item"
style="margin-left: 10px;"
/>
<el-button type="primary" class="filter-item" style="margin-left: 10px;" @click="fetchData">查询</el-button>
<el-button type="success" class="filter-item" @click="$router.push('/stock/outbound/create')">新建出库</el-button>
</div>
<el-table :data="list" v-loading="loading" border style="width: 100%; margin-top: 20px;">
<el-table-column prop="outbound_no" label="出库单号" width="180" />
<el-table-column prop="outbound_time" label="出库时间" width="180" />
<el-table-column prop="outbound_type" label="类型" width="100">
<template #default="{ row }">
<el-tag>{{ formatType(row.outbound_type) }}</el-tag>
</template>
</el-table-column>
<el-table-column prop="sku" label="SKU" width="150" />
<el-table-column prop="quantity" label="数量" width="100" />
<el-table-column prop="consumer_name" label="领用/客户" width="120" />
<el-table-column prop="operator_name" label="操作员" width="120" />
<el-table-column label="签名" width="100" align="center">
<template #default="{ row }">
<el-button type="primary" link @click="viewSignature(row.signature_path)">查看</el-button>
</template>
</el-table-column>
</el-table>
<el-dialog v-model="dialogVisible" title="电子签名凭证" width="500px">
<img :src="currentSignature" style="width: 100%; border: 1px solid #eee;" alt="Signature" />
</el-dialog>
</div>
</template>
<script setup lang="ts">
import { ref, onMounted, reactive } from 'vue'
import { getOutboundList } from '@/api/outbound'
const list = ref([])
const loading = ref(false)
const dialogVisible = ref(false)
const currentSignature = ref('')
const listQuery = reactive({
keyword: '',
dateRange: []
})
const fetchData = async () => {
loading.value = true
try {
const res = await getOutboundList(listQuery)
list.value = res.data.items || [] // 假设后端返回 { items: [] }
} catch (e) {
console.error(e)
} finally {
loading.value = false
}
}
const formatType = (type: string) => {
const map: any = {
'SALES': '销售出库',
'USE': '内部领用',
'TRANSFER': '调拨',
'SCRAP': '报废'
}
return map[type] || type
}
const viewSignature = (url: string) => {
currentSignature.value = url // 这里可能需要拼接 BaseURL取决于你 upload 接口返回的是相对路径还是绝对路径
dialogVisible.value = true
}
onMounted(() => {
fetchData()
})
</script>

View File

@ -1,9 +1,13 @@
import { defineConfig } from 'vite' import { defineConfig } from 'vite'
import vue from '@vitejs/plugin-vue' import vue from '@vitejs/plugin-vue'
import basicSsl from '@vitejs/plugin-basic-ssl' // ★ [新增] 引入 SSL 插件
import { fileURLToPath, URL } from 'node:url' import { fileURLToPath, URL } from 'node:url'
export default defineConfig({ export default defineConfig({
plugins: [vue()], plugins: [
vue(),
basicSsl() // ★ [新增] 启用 HTTPS 证书生成
],
resolve: { resolve: {
alias: { alias: {
'@': fileURLToPath(new URL('./src', import.meta.url)) '@': fileURLToPath(new URL('./src', import.meta.url))
@ -13,19 +17,13 @@ export default defineConfig({
// 允许局域网访问前端页面 // 允许局域网访问前端页面
host: '0.0.0.0', host: '0.0.0.0',
port: 5173, port: 5173,
https: true, // ★ [新增] 强制开启 HTTPS否则浏览器会拦截摄像头
proxy: { proxy: {
// 拦截所有以 /api 开头的请求 // 拦截所有以 /api 开头的请求
'/api': { '/api': {
// 【关键修改】
// 你的截图显示后端容器名叫 inventory_api
// 在 Docker 内部,直接用这个名字作为域名,就能找到它 // 在 Docker 内部,直接用这个名字作为域名,就能找到它
target: 'http://inventory_api:8000', target: 'http://inventory_api:8000',
changeOrigin: true, changeOrigin: true,
// 【保持注释】
// 通常 Flask 后端都会把路由写全 (如 /api/v1/auth/login)
// 所以这里不需要 rewrite 去掉 /api直接原样转发过去最稳妥
// rewrite: (path) => path.replace(/^\/api/, '') // rewrite: (path) => path.replace(/^\/api/, '')
} }
} }