From ce70bd97c7f2577f0978b39b9da1ccdd8d5b768f Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期五, 19 九月 2025 22:50:14 +0800
Subject: [PATCH] 机床增加设备编号
---
src/views/flowmgr/processQuery1.vue | 169 +++++++++++++++++++++++++++-----------------------------
1 files changed, 81 insertions(+), 88 deletions(-)
diff --git a/src/views/flowmgr/processQuery1.vue b/src/views/flowmgr/processQuery1.vue
index 3563c50..15ed4d5 100644
--- a/src/views/flowmgr/processQuery1.vue
+++ b/src/views/flowmgr/processQuery1.vue
@@ -20,16 +20,16 @@
<!-- <el-button type="primary" plain @click="exportWebSite">瀵煎嚭鍥炰紶娑夊瘑缃�</el-button> -->
<!-- <el-button type="primary" plain @click="reassign">鎸傝浇杞﹀簥绋嬪簭搴�</el-button> -->
<!-- <el-button type="primary" plain @click="exportExcel">瀵煎嚭鍒癊XCEL</el-button> -->
- <el-button type="primary" plain @click="reassign">閲嶆柊鎸囨淳
- </el-button>
+ <!-- <el-button type="primary" plain @click="reassign">閲嶆柊鎸囨淳</el-button>-->
</template>
<template #menu="scope">
<el-button type="primary" text size="default" @click.stop="customView(scope.row, scope.index, 0)">鏌ョ湅
</el-button>
- <el-button type="primary" text size="default" v-if="scope.row.processDefinitionKey === 'dispatch'"
- @click.stop="handleAction(scope.row, scope.index, 1)">瀹℃壒琛ㄦ墦鍗�
- </el-button>
- <el-button type="danger" text size="default" @click.stop="handleAction(scope.row, scope.index, 0)">鍒犻櫎
+ <!--
+ <el-button type="primary" text size="default" v-if="scope.row.processDefinitionKey === 'dispatch' || scope.row.processDefinitionKey === 'program-cure'"
+ @click.stop="handleApproveTable(scope.row, scope.index)">瀹℃壒琛�
+ </el-button>-->
+ <el-button type="danger" text size="default" @click.stop="handleDelete(scope.row, scope.index, 0)">鍒犻櫎
</el-button>
</template>
@@ -82,18 +82,14 @@
viewBtn: false,
columnBtn: false,
tip: false,
- // simplePage: true,
searchShow: true,
searchMenuSpan: 7,
searchEnter:true,
dialogWidth: '70%',
- // tree: true,
border: true,
index: true,
- selection: true,
-
- menuWidth: 200,
- // menu: false,
+ selection: false,
+ menuWidth: 110,
dialogClickModal: false,
column: [
{
@@ -129,6 +125,7 @@
{
label: '鏍囬',
prop: 'variables.title',
+ showOverflowTooltip:true,
width: 150,
render: ({ row }) => {
return h('p',
@@ -149,7 +146,8 @@
{
label: '娴佺▼鍚嶇О',
prop: '',
- width: 80,
+ width: 85,
+ showOverflowTooltip:true,
render: ({ row }) => {
return h('p',
{
@@ -159,17 +157,18 @@
}, row?.variables?.myProcessName)
}
},
+
{
- label: '宸ヨ壓鐗堟',
- prop: 'variables.craftEdition',
- width: 80,
+ label: '闆剁粍浠跺彿',
+ prop: '',
+ width: 82,
render: ({ row }) => {
- return h('span', {}, row?.variables?.craftEdition || '');
+ return h('span', {}, row?.variables?.drawingNo || '');
}
},
{
label: '宸ュ簭鍙�',
- prop: 'processNo',
+ prop: '',
width: 80,
render: ({ row }) => {
return h('span', {}, row?.variables?.processNo || '');
@@ -177,61 +176,45 @@
},
{
label: '宸ュ簭鍚嶇О',
- prop: 'processName',
- width: 80,
+ prop: '',
+ width: 82,
render: ({ row }) => {
return h('span', {}, row?.variables?.processName || '');
}
},
{
label: '宸ュ簭鐗堟',
- prop: 'processEdition',
- width: 80,
+ prop: '',
+ width: 82,
render: ({ row }) => {
return h('span', {}, row?.variables?.processEdition || '');
}
},
- {
- label: '闆剁粍浠跺彿',
- prop: 'drawingNo',
- width: 80,
+ {
+ label: '鎵规鍙�',
+ prop: '',
+ width: 70,
render: ({ row }) => {
- return h('span', {}, row?.variables?.drawingNo || '');
+ return h('span', {}, row?.variables?.craftEdition || '');
}
},
{
label: '浠诲姟杞﹂棿',
- prop: 'workshop',
- width: 80,
+ prop: '',
+ width: 82,
render: ({ row }) => {
return h('p',{'class': 'margin0'}, row?.variables?.workshop || '');
}
},
{
label: '杩囩▼鍗″彿',
- prop: 'empty',
- width: 80,
- },
- {
- label: '鍥惧彿',
prop: '',
- width: 100,
- render: ({ row }) => {
- return h('p',
- {
- attrs: {},
- class: {},
- style: {},
- }, row?.variables?.drawingNo)
- },
- renderForm: ({ row }) => {
- return h('span', {
- attrs: {},
- class: {},
- style: {},
- }, row?.variables?.drawingNo || '');
+ width: 82,
+ render: ({ row }) => {
+ return h('p',{'class': 'margin0'}, row?.variables?.processCard || '');
}
},
+
{
label: '浜у搧鍨嬪彿',
prop: '',
@@ -256,6 +239,7 @@
{
label: '鏈哄簥',
prop: '',
+ showOverflowTooltip:true,
render: ({ row }) => {
return h('p',
{
@@ -280,16 +264,19 @@
{
label: '鍒涘缓鏃堕棿',
prop: 'processCreateTime',
+ showOverflowTooltip:true,
+ width: 82,
},
{
label: '褰撳墠鑺傜偣',
prop: 'taskName',
- width: 90
+ showOverflowTooltip:true,
+ width: 110
},
{
label: '璁″垝鍔犲伐鏃堕棿',
prop: 'planStartTime',
- width: 180,
+ width: 110,
render: ({ row }) => {
return h('span', {}, row?.variables?.planStartTime || '');
}
@@ -334,8 +321,9 @@
},
{
- label: '宸ヨ壓鐗堟',
+ label: '鎵规鍙�',
prop: 'variables.craftEdition',
+
render: ({ row }) => {
return h('p',{'class': 'margin0'}, row?.variables?.craftEdition || '');
}
@@ -377,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 || '');
}
},
{
@@ -439,7 +427,7 @@
}
},
{
- label: '鍋忕鍗曞彿',
+ label: '涓存椂鏇存敼鍗曞彿',
prop: '',
render: ({ row }) => {
return h('p',{'class': 'margin0'}, row?.variables?.deviation || '');
@@ -536,41 +524,46 @@
});
done();
},
- handleAction(row, index, flag) {
- if (flag === 0) {
- // 澶勭悊鎺ュ彈鎴栨嫆缁濇搷浣�
- let ids = [row.id].toString();
- this.$confirm('纭畾灏嗛�夋嫨鏁版嵁鍒犻櫎?', {
- confirmButtonText: '纭畾',
- cancelButtonText: '鍙栨秷',
- type: 'warning',
- })
- .then(() => {
- deleteRow({ processInstanceId: row.processInstanceId,id:row.processInstanceId }).then(res => {
- this.onLoad(this.page, this.query);
- })
+ handleDelete(row, index, flag) {
+
+ // 澶勭悊鎺ュ彈鎴栨嫆缁濇搷浣�
+ let ids = [row.id].toString();
+ this.$confirm('纭畾灏嗛�夋嫨鏁版嵁鍒犻櫎?', {
+ confirmButtonText: '纭畾',
+ cancelButtonText: '鍙栨秷',
+ type: 'warning',
+ })
+ .then(() => {
+ deleteRow({ processInstanceId: row.processInstanceId,id:row.processInstanceId }).then(res => {
+ this.onLoad(this.page, this.query);
})
- } else if (flag === 1) {
- printRow({ processInstanceId: row.processInstanceId })
- this.$confirm('鏄惁瀵煎嚭?', '鎻愮ず', {
- confirmButtonText: '纭畾',
- cancelButtonText: '鍙栨秷',
- type: 'warning',
- }).then(() => {
- console.log(this.selection)
- NProgress.start();
- exportBlobPost(
- `/blade-mdm/flow/mgr/export-approve-table`,
- { processInstanceId: row.processInstanceId },
- { processInstanceId: row.processInstanceId },
- ).then(res => {
- let name = res.headers['content-disposition'].split('filename=')[1]
- console.log(res.headers['content-disposition'].split('filename=')[1]);
- downloadFile(res.data, `瀹℃壒鎵撳嵃-${name}`);
- NProgress.done();
- });
+ })
+
+
+ },
+ handleApproveTable(row, index,) {
+ //瀹℃壒琛ㄤ笅杞�
+
+ this.$confirm('鏄惁瀵煎嚭瀹℃壒琛�?', '鎻愮ず', {
+ confirmButtonText: '纭畾',
+ cancelButtonText: '鍙栨秷',
+ type: 'warning',
+ }).then(() => {
+ console.log(this.selection)
+ NProgress.start();
+ exportBlobPost(
+ `/blade-mdm/flow/mgr/export-approve-table`,
+ { processInstanceId: row.processInstanceId },
+ { processInstanceId: row.processInstanceId },
+ ).then(res => {
+ let name = res.headers['content-disposition'].split('filename=')[1]
+ console.log(res.headers['content-disposition'].split('filename=')[1]);
+ name = decodeURI(name)
+ downloadFile(res.data, `${name}`);
+ NProgress.done();
});
- }
+ });
+
},
selectionChange(list) {
--
Gitblit v1.9.3