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/processQuery2.vue |   58 ++++++++++++++++++++++++++++++++++++++++++++++------------
 1 files changed, 46 insertions(+), 12 deletions(-)

diff --git a/src/views/flowmgr/processQuery2.vue b/src/views/flowmgr/processQuery2.vue
index 16e6177..96977f9 100644
--- a/src/views/flowmgr/processQuery2.vue
+++ b/src/views/flowmgr/processQuery2.vue
@@ -12,16 +12,19 @@
             @selection-change="selectionChange">
             
             <template #menu-left>
-                <!-- <el-button type="primary" plain @click="exportWebSite">瀵煎嚭鍥炰紶娑夊瘑缃�</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="handleApproveTable(scope.row, scope.index)">瀹℃壒琛ㄦ墦鍗�
+                    @click.stop="handleApproveTable(scope.row, scope.index)">瀹℃壒琛�
                 </el-button>
-                
+                <el-button type="primary" text size="default" v-if="scope.row.processDefinitionKey === 'program-cure'"
+                    @click.stop="handleConfirmTable(scope.row, scope.index)">纭琛�
+                </el-button>
+                -->
             </template>
         </avue-crud>
         <el-dialog title="鎸囨淳" append-to-body v-model="reassignBox" width="30%">
@@ -79,7 +82,7 @@
                 // tree: true,
                 border: true,
                 index: true,
-                selection: true,
+                selection: false,
                 menuWidth: 80,
                 // menu: false,
                 labelWidth: 90,
@@ -150,7 +153,7 @@
                         }
                     },
                     {
-                        label: '宸ヨ壓鐗堟',
+                        label: '鎵规鍙�',
                         prop: 'variables.craftEdition',
                         width: 80,
                         render: ({ row }) => {
@@ -199,8 +202,16 @@
                     },
                     {
                         label: '杩囩▼鍗″彿',
-                        prop: 'empty',
+                        prop: '',
                         width: 80,
+						render: ({ row }) => {
+                            return h('p',
+                                {
+                                    attrs: {},
+                                    class: {},
+                                    style: {},
+                                }, row?.variables?.processCard)
+                        },
                     },
 					{
                         label: '鍥惧彿',
@@ -324,7 +335,7 @@
                     },
                     
                     {
-                        label: '宸ヨ壓鐗堟',
+                        label: '鎵规鍙�',
                         prop: 'variables.craftEdition',
                         render: ({ row }) => {
                             return h('p',{'class': 'margin0'}, row?.variables?.craftEdition || '');
@@ -367,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 || '');
                         }
                     },
                     {
@@ -429,7 +440,7 @@
                         }
                     },
                     {
-                        label: '鍋忕鍗曞彿',
+                        label: '涓存椂鏇存敼鍗曞彿',
                         prop: '',
                         render: ({ row }) => {
                             return h('p',{'class': 'margin0'}, row?.variables?.deviation || '');
@@ -565,7 +576,6 @@
         },
         handleApproveTable(row, index,) {
            //瀹℃壒琛ㄤ笅杞�
-            
             this.$confirm('鏄惁瀵煎嚭瀹℃壒琛�?', '鎻愮ず', {
                 confirmButtonText: '纭畾',
                 cancelButtonText: '鍙栨秷',
@@ -587,6 +597,30 @@
             
 
         },
+        handleConfirmTable(row, index,) {
+           //纭琛ㄤ笅杞�
+            this.$confirm('鏄惁瀵煎嚭纭琛�?', '鎻愮ず', {
+                confirmButtonText: '纭畾',
+                cancelButtonText: '鍙栨秷',
+                type: 'warning',
+            }).then(() => {
+                console.log(this.selection)
+                NProgress.start();
+                exportBlobPost(
+                    `/blade-mdm/flow/mgr/export-confirm-table`,
+                    { 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) {
             console.log('selectionChange', list);
             this.selectedList = list;

--
Gitblit v1.9.3