From ae36dc20aea3d2f74d893305d9f94a1845d8fa20 Mon Sep 17 00:00:00 2001
From: zhouwx <1175765986@qq.com>
Date: Fri, 06 Sep 2024 10:17:50 +0800
Subject: [PATCH] 增加公司编号
---
src/views/hazardousChemicals/electronicWarehouse/components/rawTable.vue | 31 ++++++++++++++++++-------------
1 files changed, 18 insertions(+), 13 deletions(-)
diff --git a/src/views/hazardousChemicals/electronicWarehouse/components/rawTable.vue b/src/views/hazardousChemicals/electronicWarehouse/components/rawTable.vue
index 6b2befb..0be5cc3 100644
--- a/src/views/hazardousChemicals/electronicWarehouse/components/rawTable.vue
+++ b/src/views/hazardousChemicals/electronicWarehouse/components/rawTable.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,18 @@
<span>{{scope.row.hazmatBasic.metering}}{{scope.row.hazmatBasic.unit}} / {{scope.row.hazmatBasic.minPackage == 0 ? '瓶' :scope.row.hazmatBasic.minPackage == 1?'袋':scope.row.hazmatBasic.minPackage == 2?'桶 ':scope.row.hazmatBasic.minPackage == 3?'盒':scope.row.hazmatBasic.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="missStock" align="center" width="120" />
<el-table-column label="安全库存" prop="hazmatBasic.safeNum" align="center" width="120" />
<el-table-column label="所在仓库" prop="warehouseName" align="center" >
</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="hazmatBasic.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="200" >
<template #default="scope">
<el-button link type="primary" @click="getProRecord(scope.row)" >动库记录</el-button>
@@ -88,8 +89,10 @@
queryParams: {
pageNum: 1,
pageSize: 10,
- name: '',
- productSn: ''
+ params :{
+ name: '',
+ productSn: ''
+ }
},
total: 0,
dataList: []
@@ -135,8 +138,10 @@
data.queryParams = {
pageNum: 1,
pageSize: 10,
- name: '',
- productSn: ''
+ params :{
+ name: '',
+ productSn: ''
+ }
}
getList()
}
@@ -184,7 +189,7 @@
}
for (var i = 0; i <= arr.length; i++) {
if (arr[i] == row.basicId) {
- if (columnIndex === 9 || columnIndex === 10 || columnIndex === 11){
+ if (columnIndex === 8 || columnIndex === 9 || columnIndex === 10){
return { backgroundColor: '#FFD7CC !important',color:' red' }
}
--
Gitblit v1.9.2