fix: correct targeted search logic for material/stock list to prevent unrelated results
This commit is contained in:
18
inventory-web/Dockerfile.prod
Normal file
18
inventory-web/Dockerfile.prod
Normal file
@ -0,0 +1,18 @@
|
||||
# 第一阶段：构建 (Build Stage)
|
||||
FROM node:20-alpine as build-stage
|
||||
WORKDIR /app
|
||||
COPY package*.json ./
|
||||
RUN npm install
|
||||
COPY . .
|
||||
# 执行构建，生成 dist 目录
|
||||
RUN npm run build
|
||||
|
||||
# 第二阶段：生产服务 (Production Stage)
|
||||
FROM nginx:stable-alpine as production-stage
|
||||
# 复制构建好的 dist 文件到 Nginx 目录
|
||||
COPY --from=build-stage /app/dist /usr/share/nginx/html
|
||||
# 复制我们自定义的 nginx 配置
|
||||
COPY nginx.conf /etc/nginx/conf.d/default.conf
|
||||
|
||||
EXPOSE 80
|
||||
CMD ["nginx", "-g", "daemon off;"]
|
||||
49
inventory-web/docker-compose.prod.yml
Normal file
49
inventory-web/docker-compose.prod.yml
Normal file
@ -0,0 +1,49 @@
|
||||
version: '3.8'
|
||||
|
||||
services:
|
||||
# --- 数据库 (保持不变) ---
|
||||
db:
|
||||
image: postgres:15-alpine
|
||||
container_name: inventory_db_prod
|
||||
restart: always
|
||||
environment:
|
||||
POSTGRES_USER: prod_user
|
||||
POSTGRES_PASSWORD: StrongPassword123!
|
||||
POSTGRES_DB: inventory_system
|
||||
volumes:
|
||||
- ./pgdata_prod:/var/lib/postgresql/data
|
||||
|
||||
# --- 后端 (Flask) (保持不变) ---
|
||||
backend:
|
||||
build:
|
||||
context: ./inventory-backend
|
||||
container_name: inventory_api_prod
|
||||
restart: always
|
||||
expose:
|
||||
- "8000"
|
||||
volumes:
|
||||
- ./uploads_prod:/app/uploads
|
||||
command: gunicorn -c gunicorn.conf.py run:app
|
||||
environment:
|
||||
DATABASE_URL: postgresql://prod_user:StrongPassword123!@db:5432/inventory_system
|
||||
depends_on:
|
||||
- db
|
||||
|
||||
# --- 前端 (Nginx + Vue) (这是需要修改的部分) ---
|
||||
frontend:
|
||||
build:
|
||||
context: ./inventory-web
|
||||
dockerfile: Dockerfile.prod
|
||||
container_name: inventory_ui_prod
|
||||
restart: always
|
||||
ports:
|
||||
- "80:80" # HTTP 端口
|
||||
- "443:443" # 【新增】HTTPS 端口
|
||||
volumes:
|
||||
# 【新增】挂载 SSL 证书
|
||||
# 左边是服务器路径 ./ssl/nginx.crt
|
||||
# 右边是容器内路径 /etc/nginx/ssl/nginx.crt (必须和报错日志里的一致)
|
||||
- ./ssl/nginx.crt:/etc/nginx/ssl/nginx.crt
|
||||
- ./ssl/nginx.key:/etc/nginx/ssl/nginx.key
|
||||
depends_on:
|
||||
- backend
|
||||
2650
inventory-web/package-lock.json
generated
Normal file
2650
inventory-web/package-lock.json
generated
Normal file
File diff suppressed because it is too large
Load Diff
28
inventory-web/src/api/scrap.ts
Normal file
28
inventory-web/src/api/scrap.ts
Normal file
@ -0,0 +1,28 @@
|
||||
import request from '@/utils/request'
|
||||
|
||||
// 1. 扫码查询库存
|
||||
export function scanBarcode(barcode: string) {
|
||||
return request({
|
||||
url: '/v1/scrap/scan',
|
||||
method: 'get',
|
||||
params: { barcode }
|
||||
})
|
||||
}
|
||||
|
||||
// 2. 提交报废单
|
||||
export function createScrap(data: any) {
|
||||
return request({
|
||||
url: '/v1/scrap',
|
||||
method: 'post',
|
||||
data
|
||||
})
|
||||
}
|
||||
|
||||
// 3. 报废记录列表查询
|
||||
export function getScrapRecords(params: any) {
|
||||
return request({
|
||||
url: '/v1/scrap/records',
|
||||
method: 'get',
|
||||
params
|
||||
})
|
||||
}
|
||||
138
inventory-web/src/views/operation/scrap/index.vue
Normal file
138
inventory-web/src/views/operation/scrap/index.vue
Normal file
@ -0,0 +1,138 @@
|
||||
<template>
|
||||
<div class="app-container">
|
||||
<div class="filter-container">
|
||||
<el-input v-model="sku" placeholder="SKU" style="width: 200px" @keyup.enter="fetchData" />
|
||||
<el-date-picker
|
||||
v-model="dateRange"
|
||||
type="daterange"
|
||||
range-separator="至"
|
||||
start-placeholder="开始日期"
|
||||
end-placeholder="结束日期"
|
||||
value-format="YYYY-MM-DD"
|
||||
style="margin-left: 10px; width: 240px"
|
||||
/>
|
||||
<el-button type="primary" @click="fetchData">查询</el-button>
|
||||
<el-button @click="resetFilter">重置</el-button>
|
||||
</div>
|
||||
|
||||
<el-table
|
||||
:data="list"
|
||||
border
|
||||
stripe
|
||||
style="margin-top: 20px"
|
||||
v-loading="loading"
|
||||
>
|
||||
<el-table-column prop="sku" label="SKU" width="140" show-overflow-tooltip />
|
||||
<el-table-column label="物料名称" min-width="160">
|
||||
<template #default="{ row }">
|
||||
{{ row.material_name || '-' }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="规格型号" min-width="140">
|
||||
<template #default="{ row }">
|
||||
{{ row.material_spec || '-' }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column prop="quantity" label="报废数量" width="100" align="right" />
|
||||
<el-table-column prop="reason" label="报废原因" min-width="160" show-overflow-tooltip />
|
||||
<el-table-column prop="operator_name" label="操作人" width="100" />
|
||||
<el-table-column prop="operation_time" label="报废时间" width="160" />
|
||||
<el-table-column label="损失金额" width="100" align="right">
|
||||
<template #default="{ row }">
|
||||
{{ row.total_loss ? `¥${row.total_loss}` : '-' }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column prop="approval_status" label="审批状态" width="100" align="center">
|
||||
<template #default="{ row }">
|
||||
<el-tag :type="getStatusType(row.approval_status)">
|
||||
{{ getStatusText(row.approval_status) }}
|
||||
</el-tag>
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
|
||||
<el-pagination
|
||||
background
|
||||
layout="prev, pager, next, total"
|
||||
:total="total"
|
||||
:page-size="pageSize"
|
||||
:current-page="page"
|
||||
@current-change="handlePage"
|
||||
style="margin-top: 10px; text-align: right"
|
||||
/>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<script setup lang="ts">
|
||||
import { ref, onMounted } from 'vue'
|
||||
import { getScrapRecords } from '@/api/scrap'
|
||||
|
||||
const list = ref<any[]>([])
|
||||
const total = ref(0)
|
||||
const page = ref(1)
|
||||
const pageSize = ref(50)
|
||||
const sku = ref('')
|
||||
const dateRange = ref<[string, string] | null>(null)
|
||||
const loading = ref(false)
|
||||
|
||||
const fetchData = async () => {
|
||||
loading.value = true
|
||||
try {
|
||||
const params: any = {
|
||||
page: page.value,
|
||||
pageSize: pageSize.value,
|
||||
sku: sku.value
|
||||
}
|
||||
if (dateRange.value && dateRange.value.length === 2) {
|
||||
params.start_date = dateRange.value[0]
|
||||
params.end_date = dateRange.value[1]
|
||||
}
|
||||
const res = await getScrapRecords(params)
|
||||
list.value = res.data.list || []
|
||||
total.value = res.data.total || 0
|
||||
} finally {
|
||||
loading.value = false
|
||||
}
|
||||
}
|
||||
|
||||
const handlePage = (val: number) => {
|
||||
page.value = val
|
||||
fetchData()
|
||||
}
|
||||
|
||||
const resetFilter = () => {
|
||||
sku.value = ''
|
||||
dateRange.value = null
|
||||
page.value = 1
|
||||
fetchData()
|
||||
}
|
||||
|
||||
const getStatusType = (status: string) => {
|
||||
const map: Record<string, string> = {
|
||||
approved: 'success',
|
||||
rejected: 'danger',
|
||||
pending: 'warning'
|
||||
}
|
||||
return map[status] || 'info'
|
||||
}
|
||||
|
||||
const getStatusText = (status: string) => {
|
||||
const map: Record<string, string> = {
|
||||
approved: '已审批',
|
||||
rejected: '已拒绝',
|
||||
pending: '待审批'
|
||||
}
|
||||
return map[status] || status
|
||||
}
|
||||
|
||||
onMounted(fetchData)
|
||||
</script>
|
||||
|
||||
<style scoped>
|
||||
.filter-container {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
flex-wrap: wrap;
|
||||
gap: 10px;
|
||||
}
|
||||
</style>
|
||||
Reference in New Issue
Block a user