From 287934f48daa9889f824e12d1af687bc5aa3bbe2 Mon Sep 17 00:00:00 2001
From: Mr.Zhang <710666463@qq.com>
Date: 星期一, 14 八月 2023 18:59:20 +0800
Subject: [PATCH] 工资
---
web_standard/src/views/ext/workorderRecordExt.vue | 18 +++++++++++++++++-
1 files changed, 17 insertions(+), 1 deletions(-)
diff --git a/web_standard/src/views/ext/workorderRecordExt.vue b/web_standard/src/views/ext/workorderRecordExt.vue
index 31273cf..02af8b7 100644
--- a/web_standard/src/views/ext/workorderRecordExt.vue
+++ b/web_standard/src/views/ext/workorderRecordExt.vue
@@ -112,7 +112,7 @@
</template>
</el-table-column>
<el-table-column prop="procedureName" label="鐢熶骇鍛樺伐" min-width="100px"></el-table-column>
- <el-table-column prop="doneType" label="鎶ュ伐绫诲瀷" min-width="100px">
+ <!-- <el-table-column prop="doneType" label="鎶ュ伐绫诲瀷" min-width="100px">
<template slot-scope="{row}">
<span v-if="row.doneType==0" class="valid-style">鍚堟牸</span>
<span v-else-if="row.doneType==1" class="unvalid-style">涓嶈壇</span>
@@ -124,6 +124,22 @@
<template slot-scope="{row}">
<span :class="row.doneType==0 ? 'valid-style' : (row.doneType==1 ? 'unvalid-style' : (row.doneType==2 ? 'scrap-style' : ''))">{{ row.num + row.umodel.name }}</span>
</template>
+ </el-table-column> -->
+ <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.unqualifiedNum + row.umodel.name}}</span>
+ <!-- <span :class="row.materialDonetype==0 ? 'valid-style' : ''">{{ row.num + row.umodel.name }}</span> -->
+ </template>
+ </el-table-column>
+ <el-table-column prop="num" label="鎶ュ伐鏁伴噺" min-width="100px">
+ <template slot-scope="{row}">
+ <span>{{ row.num + row.umodel.name}}</span>
+ </template>
</el-table-column>
<!-- <el-table-column prop="amodel.code" label="宸ヨ鍣ㄥ叿" min-width="100px"></el-table-column> -->
<el-table-column prop="deviceCode" label="璁惧" show-overflow-tooltip min-width="100px">
--
Gitblit v1.9.3