From 60e36c367ccfb6382b29f02df97bebca76351235 Mon Sep 17 00:00:00 2001
From: zhouwx <1175765986@qq.com>
Date: 星期三, 14 八月 2024 17:30:08 +0800
Subject: [PATCH] 提交
---
src/views/hazardousChemicals/accessRecords/components/productTable.vue | 40 +++++++++++++++++++++++++++++++++-------
1 files changed, 33 insertions(+), 7 deletions(-)
diff --git a/src/views/hazardousChemicals/accessRecords/components/productTable.vue b/src/views/hazardousChemicals/accessRecords/components/productTable.vue
index a921cfa..82179ae 100644
--- a/src/views/hazardousChemicals/accessRecords/components/productTable.vue
+++ b/src/views/hazardousChemicals/accessRecords/components/productTable.vue
@@ -24,22 +24,25 @@
<!-- 表格数据 -->
<el-table v-loading="loading" :data="dataList" :border="true">
<el-table-column label="序号" type="index" align="center" width="80" />
- <el-table-column label="流转时间" prop="updateTime" align="center" />
+ <el-table-column label="流转时间" prop="updateTime" align="center" width="120"/>
<el-table-column label="品名" prop="productBasic.name" align="center" />
<el-table-column label="产品编号" prop="productBasic.productSn" align="center" />
- <el-table-column label="二维码识别号" prop="productBasic.code" align="center" />
+ <el-table-column label="二维码识别号" prop="code" align="center" />
<el-table-column label="类型" prop="productBasic.productSn" align="center" >
<template #default="scope">
<span>{{scope.row.state === 0 ? '入库' :scope.row.state === 3 ? '标签作废' :scope.row.state === 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="num" align="center" width="120" >
+ <template #default="scope">
+ <span>{{scope.row.num}}{{scope.row.productBasic.unit}}</span>
+ </template>
+ </el-table-column>
+ <el-table-column label="操作人" prop="user.name" align="center" width="120" />
<el-table-column label="人员所在部门" prop="user.departName" align="center" width="120" />
<el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="200" >
<template #default="scope">
- <el-button link type="primary" >查看完整记录</el-button>
+ <el-button link type="primary" @click="viewFlow(scope.row)">查看完整记录</el-button>
</template>
</el-table-column>
</el-table>
@@ -51,12 +54,22 @@
@pagination="getList"
/>
+ <el-dialog
+ v-model="dialogVisible"
+ width="600px"
+ :before-close="handleClose"
+ :close-on-press-escape="false"
+ :close-on-click-modal="false"
+ >
+ <flow-deail ref="flowRef"></flow-deail>
+ </el-dialog>
</div>
</template>
<script setup>
-import {getCurrentInstance, onMounted, onUnmounted, reactive, ref, toRefs} from "vue";
+import {getCurrentInstance, nextTick, onMounted, onUnmounted, reactive, ref, toRefs} from "vue";
import {ElMessage, ElMessageBox} from "element-plus";
+import flowDeail from '../../../components/flowDetail.vue'
import {delWarehouse, getWarehouse} from "@/api/hazardousChemicals/warehouse";
import {
delProductRecord,
@@ -69,6 +82,8 @@
const loading = ref(false);
const dialogRef = ref();
const codeRef = ref();
+const flowRef = ref();
+const dialogVisible = ref()
const data = reactive({
queryParams: {
pageNum: 1,
@@ -155,6 +170,17 @@
codeRef.value.openDialog('pro',val);
}
+
+const handleClose = () => {
+ dialogVisible.value = false
+}
+const viewFlow = (val) => {
+ dialogVisible.value = true
+ nextTick(() => {
+ flowRef.value.openDialog('proRecord',val)
+ })
+
+}
defineExpose({
getList
});
--
Gitblit v1.9.2