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/workorderPutRecordExt.vue | 13 ++++++-------
1 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/web_standard/src/views/ext/workorderPutRecordExt.vue b/web_standard/src/views/ext/workorderPutRecordExt.vue
index 4debc12..b618fe0 100644
--- a/web_standard/src/views/ext/workorderPutRecordExt.vue
+++ b/web_standard/src/views/ext/workorderPutRecordExt.vue
@@ -120,19 +120,18 @@
<span class="long-title-style">{{ row.procedureName }}</span>
</template>
</el-table-column>
- <el-table-column prop="doneType" label="璐ㄩ噺灞炴��" min-width="100px">
+ <el-table-column prop="qualifiedNum" 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-if="row.doneType==2" class="scrap-style">鎶ュ簾</span> -->
- <span v-else>-</span>
+ <span class="valid-style">{{ row.qualifiedNum + row.umodel.name }}</span>
</template>
</el-table-column>
- <el-table-column prop="num" label="鏁伴噺" min-width="100px">
+ <el-table-column prop="unqualifiedNum" label="涓嶈壇鏁伴噺" min-width="100px">
<template slot-scope="{row}">
- <span :class="row.materialDonetype==0 ? 'valid-style' : 'unvalid-style'">{{ row.num + row.umodel.name }}</span>
+ <span class="unvalid-style">{{ row.num + 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"></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">
<template slot-scope="{row}">
--
Gitblit v1.9.3