From d7fe8ae3888c8e2b1eea3c1e3769be0d42a21cc9 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期一, 16 十月 2023 09:03:47 +0800
Subject: [PATCH] Merge branch '1.0.3' of http://139.186.142.91:10010/r/productDev/dmMes into 1.0.3
---
web_standard/src/views/ext/workorderRecordExt.vue | 10 ++++++++++
1 files changed, 10 insertions(+), 0 deletions(-)
diff --git a/web_standard/src/views/ext/workorderRecordExt.vue b/web_standard/src/views/ext/workorderRecordExt.vue
index efe86cf..e16e13e 100644
--- a/web_standard/src/views/ext/workorderRecordExt.vue
+++ b/web_standard/src/views/ext/workorderRecordExt.vue
@@ -146,6 +146,16 @@
<span>{{ timesToStr(row.duration) }}</span>
</template>
</el-table-column>
+ <el-table-column prop="salaryType" label="璁′环鏂瑰紡" min-width="100px">
+ <template slot-scope="{row}">
+ {{ row.salaryType == 0 ? '璁′欢' : (row.salaryType == 1 ? '璁℃椂' : '-') }}
+ </template>
+ </el-table-column>
+ <el-table-column prop="salary" label="璁′环宸ヨ祫(鍏�)" min-width="100px">
+ <template slot-scope="{row}">
+ <span>{{accDiv(Math.round(row.salary),1) }}</span>
+ </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>
--
Gitblit v1.9.3