From 6365ab0a976afdd247742c9b3dca15deb3a7a7a1 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期四, 17 八月 2023 17:21:40 +0800
Subject: [PATCH] 初始化1.0.1

---
 web_standard/src/views/ext/workorderPutRecordExt.vue |   13 +++++++------
 1 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/web_standard/src/views/ext/workorderPutRecordExt.vue b/web_standard/src/views/ext/workorderPutRecordExt.vue
index b618fe0..4debc12 100644
--- a/web_standard/src/views/ext/workorderPutRecordExt.vue
+++ b/web_standard/src/views/ext/workorderPutRecordExt.vue
@@ -120,18 +120,19 @@
             <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="doneType" label="璐ㄩ噺灞炴��" min-width="100px">
           <template slot-scope="{row}">
-            <span class="valid-style">{{ row.qualifiedNum + row.umodel.name }}</span>
+            <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>
           </template>
         </el-table-column>
-        <el-table-column prop="unqualifiedNum" label="涓嶈壇鏁伴噺" min-width="100px">
+        <el-table-column prop="num" 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="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"></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