From 7d424aa8aa7c9dce34ad20651189dff523052dce Mon Sep 17 00:00:00 2001
From: loulijun2021 <1694218219@qq.com>
Date: 星期二, 31 十月 2023 16:49:19 +0800
Subject: [PATCH] 1.模具出入库记录
---
src/views/mouldManager/mouldList.vue | 22 ++++++++++++++++------
1 files changed, 16 insertions(+), 6 deletions(-)
diff --git a/src/views/mouldManager/mouldList.vue b/src/views/mouldManager/mouldList.vue
index 6bbe285..90c620e 100644
--- a/src/views/mouldManager/mouldList.vue
+++ b/src/views/mouldManager/mouldList.vue
@@ -135,7 +135,8 @@
sortable="custom"
>
<template slot-scope="{row}">
- {{ onstateArr.find(i => parseFloat(i.code) === parseFloat(row.usestatus)).name }}
+ {{ row.usestatus?onstateArr.find(i => parseFloat(i.code) === parseFloat(row.usestatus)).name:'/' }}
+ <!-- {{ onstateArr.find(i => parseFloat(i.code) === parseFloat(row.usestatus)).name }}-->
</template>
</el-table-column>
<el-table-column
@@ -167,10 +168,14 @@
</template>
</el-table-column>
<el-table-column
- prop="surp_life"
- label="棰勮瀵垮懡"
+ prop="location_name"
+ label="搴撲綅鍚嶇О"
sortable="custom"
- />
+ >
+ <template slot-scope="{row}">
+ {{ row.location_name ? row.location_name : '/' }}
+ </template>
+ </el-table-column>
<el-table-column
prop="is_part"
label="浜у搧鍏宠仈"
@@ -194,6 +199,11 @@
/>
</template>
</el-table-column>
+ <el-table-column
+ prop="surp_life"
+ label="棰勮瀵垮懡"
+ sortable="custom"
+ />
<el-table-column
prop="serlife"
label="浣跨敤瀵垮懡"
@@ -287,7 +297,7 @@
<el-input v-model="dialogForm.mouldspec" style="width: 200px" />
</el-form-item>
- <el-form-item required label="浣跨敤鐘舵��">
+ <el-form-item required label="妯″叿鐘舵��">
<el-radio-group v-model="dialogForm.status">
<el-radio label="Y">姝ｅ父</el-radio>
<el-radio label="N">鏁呴殰</el-radio>
@@ -391,7 +401,7 @@
createuser: '', // 鍒涘缓浜哄憳
createdate: '', // 鍗曟嵁鏃ユ湡
- prop: 'code', // 鎺掑簭瀛楁
+ prop: 'lm_date', // 鎺掑簭瀛楁
order: 'desc', // 鎺掑簭瀛楁
page: 1, // 绗嚑椤�
rows: 20 // 姣忛〉澶氬皯鏉�
--
Gitblit v1.9.3