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/workorderPutRecordExt.vue | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/web_standard/src/views/ext/workorderPutRecordExt.vue b/web_standard/src/views/ext/workorderPutRecordExt.vue
index b94d303..58a2f0e 100644
--- a/web_standard/src/views/ext/workorderPutRecordExt.vue
+++ b/web_standard/src/views/ext/workorderPutRecordExt.vue
@@ -111,9 +111,9 @@
<el-table-column prop="batch" label="鐢熶骇鎵规鍙�" min-width="100px"></el-table-column>
<el-table-column prop="promodel.name" label="宸ュ簭" min-width="100px"></el-table-column>
<el-table-column prop="omodel.planNum" label="璁″垝鏁伴噺" min-width="100px">
- <template slot-scope="{row}">
- <span>{{ row.omodel.planNum }}</span>
- </template>
+ <!-- <template slot-scope="{row}">
+ <span>{{ row.omodel.planNum + row.umodel.name }}</span>
+ </template> -->
</el-table-column>
<el-table-column prop="procedureName" label="鐢熶骇鍛樺伐" show-overflow-tooltip min-width="100px">
<template slot-scope="{row}">
@@ -218,7 +218,7 @@
created () {
this.config({
module: '鎶曟枡璁板綍',
- api: '/ext/workorderRecordExt',
+ api: '/ext/workorderRecordPutExt',
'field.id': 'id',
'field.main': 'name',
sorts: [{ direction: 'DESC', property: 'CREATE_TIME' }]
@@ -278,7 +278,7 @@
if (index === 0) {
sums[index] = '鍚堣';
return;
- } else if (index === 4 || index === 8 || index === 10) {
+ } else if (index === 4 || index === 7 || index === 8 || index === 10) {
// || index === 8 || index === 9 || index === 16 || index === 17
sums[index] = '-';
return;
--
Gitblit v1.9.3