From 76aee3bfa5a1e703fde16408d92b71c4fe2cdeb8 Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期一, 08 九月 2025 20:28:22 +0800
Subject: [PATCH] 增加过程卡号显示
---
src/views/statreport/confirmTablePrint.vue | 9 +++-
src/views/flow/components/TodolistRightTop.vue | 4 +-
src/views/flow/donelist.vue | 4 +-
src/views/flowmgr/processQuery3.vue | 9 +++-
src/views/flowmgr/processQuery1.vue | 23 ++++++-----
src/views/flowmgr/processQuery2.vue | 14 +++++-
src/views/wel/components/TodolistRightTop.vue | 6 +-
7 files changed, 43 insertions(+), 26 deletions(-)
diff --git a/src/views/flow/components/TodolistRightTop.vue b/src/views/flow/components/TodolistRightTop.vue
index c912f51..2830f27 100644
--- a/src/views/flow/components/TodolistRightTop.vue
+++ b/src/views/flow/components/TodolistRightTop.vue
@@ -46,7 +46,7 @@
<el-input v-model="formInline.machineCode" placeholder="" style="width: 200px"></el-input>
</el-form-item>
<el-form-item label="杩囩▼鍗″彿">
- <el-input v-model="formInline.empty" placeholder="" style="width: 200px"></el-input>
+ <el-input v-model="formInline.processCard" placeholder="" style="width: 200px"></el-input>
</el-form-item>
<el-form-item label="鍒涘缓鏃堕棿">
<el-input v-model="formInline.createTime" placeholder="" style="width: 200px"></el-input>
@@ -102,7 +102,7 @@
programPackageName: this.row.variables.programPackageName || '',
workshop: this.row.variables.workshop || '',
drawingNo: this.row.variables.drawingNo || '',
-
+ processCard: this.row.variables.processCard || '',
}
}
}
diff --git a/src/views/flow/donelist.vue b/src/views/flow/donelist.vue
index ef9df3b..2cd3bb5 100644
--- a/src/views/flow/donelist.vue
+++ b/src/views/flow/donelist.vue
@@ -116,9 +116,9 @@
},
{
label: '杩囩▼鍗″彿',
- prop: 'empty',
+ prop: '',
render: ({ row }) => {
- return h('p',{'class': 'margin0'}, row?.variables?.empty || '');
+ return h('p',{'class': 'margin0'}, row?.variables?.processCard || '');
}
},
{
diff --git a/src/views/flowmgr/processQuery1.vue b/src/views/flowmgr/processQuery1.vue
index 6d917fb..a5b093b 100644
--- a/src/views/flowmgr/processQuery1.vue
+++ b/src/views/flowmgr/processQuery1.vue
@@ -89,7 +89,7 @@
border: true,
index: true,
selection: false,
- menuWidth: 100,
+ menuWidth: 110,
dialogClickModal: false,
column: [
{
@@ -160,7 +160,7 @@
{
label: '闆剁粍浠跺彿',
- prop: 'drawingNo',
+ prop: '',
width: 82,
render: ({ row }) => {
return h('span', {}, row?.variables?.drawingNo || '');
@@ -168,7 +168,7 @@
},
{
label: '宸ュ簭鍙�',
- prop: 'processNo',
+ prop: '',
width: 80,
render: ({ row }) => {
return h('span', {}, row?.variables?.processNo || '');
@@ -176,7 +176,7 @@
},
{
label: '宸ュ簭鍚嶇О',
- prop: 'processName',
+ prop: '',
width: 82,
render: ({ row }) => {
return h('span', {}, row?.variables?.processName || '');
@@ -184,7 +184,7 @@
},
{
label: '宸ュ簭鐗堟',
- prop: 'processEdition',
+ prop: '',
width: 82,
render: ({ row }) => {
return h('span', {}, row?.variables?.processEdition || '');
@@ -192,7 +192,7 @@
},
{
label: '鎵规鍙�',
- prop: 'variables.craftEdition',
+ prop: '',
width: 70,
render: ({ row }) => {
return h('span', {}, row?.variables?.craftEdition || '');
@@ -200,7 +200,7 @@
},
{
label: '浠诲姟杞﹂棿',
- prop: 'workshop',
+ prop: '',
width: 82,
render: ({ row }) => {
return h('p',{'class': 'margin0'}, row?.variables?.workshop || '');
@@ -208,8 +208,11 @@
},
{
label: '杩囩▼鍗″彿',
- prop: 'empty',
+ prop: '',
width: 82,
+ render: ({ row }) => {
+ return h('p',{'class': 'margin0'}, row?.variables?.processCard || '');
+ }
},
{
@@ -362,9 +365,9 @@
},
{
label: '杩囩▼鍗″彿',
- prop: 'empty',
+ prop: '',
render: ({ row }) => {
- return h('p',{'class': 'margin0'}, row?.variables?.empty || '');
+ return h('p',{'class': 'margin0'}, row?.variables?.processCard || '');
}
},
{
diff --git a/src/views/flowmgr/processQuery2.vue b/src/views/flowmgr/processQuery2.vue
index 75fa687..25ddf93 100644
--- a/src/views/flowmgr/processQuery2.vue
+++ b/src/views/flowmgr/processQuery2.vue
@@ -202,8 +202,16 @@
},
{
label: '杩囩▼鍗″彿',
- prop: 'empty',
+ prop: '',
width: 80,
+ render: ({ row }) => {
+ return h('p',
+ {
+ attrs: {},
+ class: {},
+ style: {},
+ }, row?.variables?.processCard)
+ },
},
{
label: '鍥惧彿',
@@ -370,9 +378,9 @@
},
{
label: '杩囩▼鍗″彿',
- prop: 'empty',
+ prop: '',
render: ({ row }) => {
- return h('p',{'class': 'margin0'}, row?.variables?.empty || '');
+ return h('p',{'class': 'margin0'}, row?.variables?.processCard || '');
}
},
{
diff --git a/src/views/flowmgr/processQuery3.vue b/src/views/flowmgr/processQuery3.vue
index e9ce7ea..7ac53e6 100644
--- a/src/views/flowmgr/processQuery3.vue
+++ b/src/views/flowmgr/processQuery3.vue
@@ -211,8 +211,11 @@
},
{
label: '杩囩▼鍗″彿',
- prop: 'empty',
+ prop: '',
width: 80,
+ render: ({ row }) => {
+ return h('p',{'class': 'margin0'}, row?.variables?.processCard || '');
+ }
},
{
label: '鍥惧彿',
@@ -385,9 +388,9 @@
},
{
label: '杩囩▼鍗″彿',
- prop: 'empty',
+ prop: '',
render: ({ row }) => {
- return h('p',{'class': 'margin0'}, row?.variables?.empty || '');
+ return h('p',{'class': 'margin0'}, row?.variables?.processCard || '');
}
},
{
diff --git a/src/views/statreport/confirmTablePrint.vue b/src/views/statreport/confirmTablePrint.vue
index c4cf54d..974078f 100644
--- a/src/views/statreport/confirmTablePrint.vue
+++ b/src/views/statreport/confirmTablePrint.vue
@@ -139,8 +139,11 @@
},
{
label: '杩囩▼鍗″彿',
- prop: 'empty',
+ prop: '',
width: 80,
+ render: ({ row }) => {
+ return h('p',{'class': 'margin0'}, row?.variables?.processCard || '');
+ },
},
{
label: '鍥惧彿',
@@ -281,9 +284,9 @@
},
{
label: '杩囩▼鍗″彿',
- prop: 'empty',
+ prop: '',
render: ({ row }) => {
- return h('p',{'class': 'margin0'}, row?.variables?.empty || '');
+ return h('p',{'class': 'margin0'}, row?.variables?.processCard || '');
}
},
{
diff --git a/src/views/wel/components/TodolistRightTop.vue b/src/views/wel/components/TodolistRightTop.vue
index fab6c8d..d7d25cb 100644
--- a/src/views/wel/components/TodolistRightTop.vue
+++ b/src/views/wel/components/TodolistRightTop.vue
@@ -34,11 +34,11 @@
<el-form-item label="鍔犲伐鏈哄簥">
<el-input v-model="formInline.machineCode" placeholder=""></el-input>
</el-form-item>
- <!--
+
<el-form-item label="杩囩▼鍗″彿">
- <el-input v-model="formInline.empty" placeholder=""></el-input>
+ <el-input v-model="formInline.processCard" placeholder=""></el-input>
</el-form-item>
- -->
+
<el-form-item label="鍒涘缓鏃堕棿">
<el-input v-model="formInline.createTime" placeholder=""></el-input>
</el-form-item>
--
Gitblit v1.9.3