From 282e032b5771da13d224214d3b0b71f3efde9a42 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 25 八月 2023 18:45:42 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/dmMes
---
web_standard/src/views/ext/workingorderExt.vue | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/web_standard/src/views/ext/workingorderExt.vue b/web_standard/src/views/ext/workingorderExt.vue
index 8fce261..62f8a6b 100644
--- a/web_standard/src/views/ext/workingorderExt.vue
+++ b/web_standard/src/views/ext/workingorderExt.vue
@@ -186,12 +186,12 @@
</el-table-column>
<el-table-column prop="qualifiedNum" label="鍚堟牸鏁伴噺" min-width="100px">
<template slot-scope="{row}">
- <span>{{row.qualifiedNum ? (row.qualifiedNum + row.umodel.name) : '-' }}</span>
+ <span class="valid-style">{{row.qualifiedNum ? (row.qualifiedNum + row.umodel.name) : '-' }}</span>
</template>
</el-table-column>
<el-table-column prop="unqualifiedNum" label="涓嶈壇鏁伴噺" min-width="100px">
<template slot-scope="{row}">
- <span>{{row.unqualifiedNum ? (row.unqualifiedNum + row.umodel.name) : '-' }}</span>
+ <span class="unvalid-style">{{row.unqualifiedNum ? (row.unqualifiedNum + row.umodel.name) : '-' }}</span>
</template>
</el-table-column>
<!-- <el-table-column prop="originWorkorderId" label="鍘熷伐鍗曠紪鐮�" min-width="100px">
@@ -210,9 +210,9 @@
fixed="right">
<template slot-scope="{row}">
<el-button type="text" v-if="containPermissions(['ext:barcodeparamext:query'])" @click="printLable(row)">鎵撳嵃鏍囩</el-button>
- <template v-if="row.status == '0' || row.status == '1'">
- <el-button v-if="row.status == '0'" type="text" @click="reDistribute(row)" v-permissions="['ext:workorderext:update']">閲嶅垎閰�</el-button>
- <el-button v-if="row.status == '0'" type="text" @click="prepare(row)" v-permissions="['ext:workorderext:preparationWTransfer']">澶囨枡</el-button>
+ <template v-if="row.status == '0' || row.status == '1' || row.status == '7'">
+ <el-button v-if="row.status != '1'" type="text" @click="reDistribute(row)" v-permissions="['ext:workorderext:update']">閲嶅垎閰�</el-button>
+ <!-- <el-button v-if="row.status !== '1'" type="text" @click="prepare(row)" v-permissions="['ext:workorderext:preparationWTransfer']">澶囨枡</el-button> -->
<span style="margin-left: 8px" v-permissions="['ext:workorderext:delete']">
<el-button type="text" @click="cancel(row)">鍙栨秷</el-button>
</span>
--
Gitblit v1.9.3