From 07196688890590e282fd5cce5ff1270e57133908 Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期一, 22 一月 2024 10:27:18 +0800
Subject: [PATCH] 模具使用记录修改
---
src/views/quality/rawMaterial/rawMaterial-form.vue | 4 ++--
src/views/equipment/mouldrecord/index.vue | 25 ++++++++++++++++++++-----
2 files changed, 22 insertions(+), 7 deletions(-)
diff --git a/src/views/equipment/mouldrecord/index.vue b/src/views/equipment/mouldrecord/index.vue
index cc335db..1bb7756 100644
--- a/src/views/equipment/mouldrecord/index.vue
+++ b/src/views/equipment/mouldrecord/index.vue
@@ -51,14 +51,29 @@
column: [
{
minWidth: '140',
- prop: 'packageNo',
+ prop: 'mouldCode',
+ label: '妯″叿缂栫爜',
+ isTrue: true,
+ isSearch: true,
+ searchInfoType: 'text',
+ },{
+ minWidth: '140',
+ prop: 'mouldName',
+ label: '妯″叿鍚嶇О',
+ isTrue: true,
+ isSearch: true,
+ searchInfoType: 'text',
+ },
+ {
+ minWidth: '140',
+ prop: 'productNo',
label: '鎶ュ伐鍗曞彿',
isTrue: true,
isSearch: true,
searchInfoType: 'text',
},{
minWidth: '140',
- prop: 'outBatchNo',
+ prop: 'batchNo',
label: '鎵瑰彿',
isTrue: true,
isSearch: true,
@@ -66,7 +81,7 @@
},
{
minWidth: '140',
- prop: 'partNo',
+ prop: 'optaskNo',
label: '宸ュ崟缂栧彿',
isTrue: true,
isSearch: true,
@@ -74,7 +89,7 @@
},
{
minWidth: '140',
- prop: 'partName',
+ prop: 'workstationName',
label: '宸ヤ綔绔欏悕绉�',
isTrue: true,
isSearch: true,
@@ -82,7 +97,7 @@
},
{
minWidth: '140',
- prop: 'specs',
+ prop: 'staffNo',
label: '浣跨敤浜虹紪鍙�',
isTrue: true,
isSearch: true,
diff --git a/src/views/quality/rawMaterial/rawMaterial-form.vue b/src/views/quality/rawMaterial/rawMaterial-form.vue
index 14790b0..3bbd00e 100644
--- a/src/views/quality/rawMaterial/rawMaterial-form.vue
+++ b/src/views/quality/rawMaterial/rawMaterial-form.vue
@@ -340,8 +340,8 @@
<el-table-column prop="userName" label="妫�楠屽憳"></el-table-column>
<el-table-column prop="judgeState" label="妫�楠岀粨璁�">
<template slot-scope="scope">
- <el-tag type="success" v-if="scope.row.testState == '1'">鍚堟牸</el-tag>
- <el-tag type="danger" v-else-if="scope.row.testState == '0'">涓嶅悎鏍�</el-tag>
+ <el-tag type="success" v-if="scope.row.testState == 1">鍚堟牸</el-tag>
+ <el-tag type="danger" v-else-if="scope.row.testState == 0">涓嶅悎鏍�</el-tag>
</template>
</el-table-column>
<el-table-column label="鎿嶄綔">
--
Gitblit v1.9.3