From f88d2029c7b2c66fcf0a9dffdc55da75b939c2ea Mon Sep 17 00:00:00 2001
From: zhouwx <1175765986@qq.com>
Date: Tue, 12 Aug 2025 10:55:54 +0800
Subject: [PATCH] 修改
---
src/views/hazardousChemicals/electronicWarehouse/components/productTable.vue | 37 ++++++++++++++++++++-----------------
1 files changed, 20 insertions(+), 17 deletions(-)
diff --git a/src/views/hazardousChemicals/electronicWarehouse/components/productTable.vue b/src/views/hazardousChemicals/electronicWarehouse/components/productTable.vue
index 5133541..3c51d8f 100644
--- a/src/views/hazardousChemicals/electronicWarehouse/components/productTable.vue
+++ b/src/views/hazardousChemicals/electronicWarehouse/components/productTable.vue
@@ -3,10 +3,10 @@
<div style="display: flex;justify-content: space-between">
<el-form :inline="true" style="display: flex;align-items: center;flex-wrap: wrap;" >
<el-form-item label="品名：" >
- <el-input v-model="data.queryParams.name" placeholder="请输入品名" clearable></el-input>
+ <el-input v-model="data.queryParams.params.name" placeholder="请输入品名" clearable></el-input>
</el-form-item>
<el-form-item label="产品编号：" >
- <el-input v-model="data.queryParams.productSn" placeholder="请输入产品编号" clearable></el-input>
+ <el-input v-model="data.queryParams.params.productSn" placeholder="请输入产品编号" clearable></el-input>
</el-form-item>
<el-form-item >
<el-button
@@ -35,17 +35,16 @@
<span>{{scope.row.productBasic.metering}}{{scope.row.productBasic.unit}} / {{scope.row.productBasic.minPackage == 0 ? '瓶' :scope.row.productBasic.minPackage == 1?'袋':scope.row.productBasic.minPackage == 2?'桶 ':scope.row.productBasic.minPackage == 3?'盒':scope.row.productBasic.minPackage == 4?'箱':'其他'}}</span>
</template>
</el-table-column>
- <el-table-column label="批号" prop="batchNo" align="center" width="120" />
+<!-- <el-table-column label="批号" prop="batchNo" align="center" width="120" />-->
+ <el-table-column label="当前库存" prop="stock" align="center" width="120" />
<el-table-column label="所在仓库" prop="warehouseName" align="center" >
- <template #default="scope">
- <span>{{scope.row.warehouse.name}}</span>
- </template>
</el-table-column>
- <el-table-column label="状态" prop="state" align="center">
- <template #default="scope">
- <span>{{scope.row.state === 0 ? '未入库' : '已入库'}}</span>
- </template>
- </el-table-column>
+ <el-table-column label="创建时间" prop="productBasic.createTime" align="center" width="120" />
+<!-- <el-table-column label="状态" prop="state" align="center">-->
+<!-- <template #default="scope">-->
+<!-- <span>{{scope.row.state === 0 ? '未入库' : '已入库'}}</span>-->
+<!-- </template>-->
+<!-- </el-table-column>-->
<el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="180" >
<template #default="scope">
<el-button link type="primary" @click="getProRecord(scope.row)" >动库记录</el-button>
@@ -72,7 +71,7 @@
import {
delProductRecord,
doEntryPro,
- getProductRecord,
+ getProductRecord, getProList,
getProWarehouseRecord
} from "@/api/hazardousChemicals/productRecord";
import {delRawRecord} from "@/api/hazardousChemicals/rawRecord";
@@ -87,8 +86,10 @@
queryParams: {
pageNum: 1,
pageSize: 10,
- name: '',
- productSn: ''
+ params :{
+ name: '',
+ productSn: ''
+ }
},
total: 0,
dataList: []
@@ -109,7 +110,7 @@
const getList = async () => {
loading.value = true
- const res = await getProductRecord(data.queryParams)
+ const res = await getProList(data.queryParams)
if(res.code == 200){
data.dataList = res.data.list
data.total = res.data.total
@@ -128,8 +129,10 @@
data.queryParams = {
pageNum: 1,
pageSize: 10,
- name: '',
- productSn: ''
+ params :{
+ name: '',
+ productSn: ''
+ }
}
getList()
}
--
Gitblit v1.9.2