From 40609a1bd11ce79445562ac23f16af23a48c3933 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 18 八月 2023 14:34:28 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/dmMes
---
web_standard/src/views/ext/workorderPutRecordExt.vue | 28 +++++++++++++++++++++-------
1 files changed, 21 insertions(+), 7 deletions(-)
diff --git a/web_standard/src/views/ext/workorderPutRecordExt.vue b/web_standard/src/views/ext/workorderPutRecordExt.vue
index b618fe0..b94d303 100644
--- a/web_standard/src/views/ext/workorderPutRecordExt.vue
+++ b/web_standard/src/views/ext/workorderPutRecordExt.vue
@@ -120,19 +120,33 @@
<span class="long-title-style">{{ row.procedureName }}</span>
</template>
</el-table-column>
- <el-table-column prop="qualifiedNum" label="鍚堟牸鏁伴噺" min-width="100px">
+ <!-- <el-table-column prop="qualifiedNum" label="鍚堟牸鏁伴噺" min-width="100px">
<template slot-scope="{row}">
<span class="valid-style">{{ row.qualifiedNum + row.umodel.name }}</span>
</template>
</el-table-column>
<el-table-column prop="unqualifiedNum" label="涓嶈壇鏁伴噺" min-width="100px">
<template slot-scope="{row}">
- <span class="unvalid-style">{{ row.num + row.umodel.name}}</span>
- <!-- <span :class="row.materialDonetype==0 ? 'valid-style' : ''">{{ row.num + row.umodel.name }}</span> -->
+ <span class="unvalid-style">{{ row.unqualifiedNum + row.umodel.name}}</span>
</template>
- </el-table-column>
- <el-table-column prop="num" label="鎶ュ伐鏁伴噺" min-width="100px"></el-table-column>
- <!-- <el-table-column prop="amodel.code" label="宸ヨ鍣ㄥ叿" min-width="100px"></el-table-column> -->
+ </el-table-column> -->
+ <el-table-column prop="doneType" label="璐ㄩ噺灞炴��" min-width="100px">
+ <template slot-scope="{row}">
+ <span v-if="row.materialDonetype==0" class="valid-style">鍚堟牸</span>
+ <span v-else-if="row.materialDonetype==1" class="unvalid-style">涓嶈壇</span>
+ <span v-else>-</span>
+ </template>
+ </el-table-column>
+ <el-table-column prop="num" label="鏁伴噺" min-width="100px">
+ <template slot-scope="{row}">
+ <span :class="row.materialDonetype==0 ? 'valid-style' : 'unvalid-style'">{{ row.num + row.umodel.name }}</span>
+ </template>
+ </el-table-column>
+ <!-- <el-table-column prop="num" label="鎶ュ伐鏁伴噺" min-width="100px">
+ <template slot-scope="{row}">
+ {{ row.num + row.umodel.name }}
+ </template>
+ </el-table-column> -->
<el-table-column prop="deviceCode" label="璁惧" show-overflow-tooltip min-width="100px">
<template slot-scope="{row}">
<span class="long-title-style" :title="row.deviceCode + ' | ' + row.deviceName">{{ row.deviceCode + ' | ' + row.deviceName}}</span>
@@ -264,7 +278,7 @@
if (index === 0) {
sums[index] = '鍚堣';
return;
- } else if (index === 4 || index === 6 || index === 8 || index === 10) {
+ } else if (index === 4 || index === 8 || index === 10) {
// || index === 8 || index === 9 || index === 16 || index === 17
sums[index] = '-';
return;
--
Gitblit v1.9.3