From bd03748adb5b9fda8ac4b52c8de93062eaa8ee72 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期三, 22 五月 2024 10:26:09 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override

---
 north-glass-erp/northglass-erp/src/views/pp/processCard/PrintFlowCard.vue |   32 ++++++++++++++++++++++++--------
 1 files changed, 24 insertions(+), 8 deletions(-)

diff --git a/north-glass-erp/northglass-erp/src/views/pp/processCard/PrintFlowCard.vue b/north-glass-erp/northglass-erp/src/views/pp/processCard/PrintFlowCard.vue
index 283b366..7b03e20 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/processCard/PrintFlowCard.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/processCard/PrintFlowCard.vue
@@ -14,7 +14,7 @@
 const {t} = useI18n()
 let router = useRouter()
 const dialogTableVisible = ref(false)
-let rowClickIndex = ref(null)
+let selectRecords = ref(null)
 
 //瀹氫箟婊氬姩鏉¢珮搴�
 let scrollTop = ref(null)
@@ -185,17 +185,33 @@
 })
 
 const gridEvents = {
-  async toolbarButtonClick({code}) {
+  toolbarButtonClick ({ code}) {
     const $grid = xGrid.value
+     selectRecords = $grid.getCheckboxRecords()
     if ($grid) {
       switch (code) {
         case 'print': {
-          const $table = xGrid.value
-          const selectRecords = $table.getCheckboxRecords()
-          console.log(selectRecords.order_id)
-          dialogTableVisible.value = true
-          return;
+          if(selectRecords===null ||selectRecords===''||selectRecords.length===0){
+            ElMessage.warning(t('searchOrder.msgList.checkOrder'))
+            return
+          }
+
+          let id = ""
+          for (let i = 0; i < selectRecords.length; i++) {
+            if (i + 1 === selectRecords.length) {
+              id += selectRecords[i].id
+            } else {
+              id += selectRecords[i].id + "|"
+            }
+          }
+          router.push({path: '/main/processCard/printProcess', query: {printList: JSON.stringify(selectRecords)}})
+
+          // let routeData = router.resolve({path: '/main/processCard/printProcess', query: {printList: JSON.stringify(selectRecords)}});
+          // window.open(routeData.href, '_blank');
+          //dialogTableVisible.value = true
+          break
         }
+
       }
     }
   },
@@ -252,7 +268,7 @@
         destroy-on-close
         title="娴佺▼鍗℃墦鍗�"
         style="width: 80%;height:75% ">
-      <PrintProcess
+      <PrintProcess :printList="selectRecords"
           style="width: 100%;height: 100%" />
     </el-dialog>
   </div>

--
Gitblit v1.8.0