From 99d0bb96043ba5d6db66bbfb00f67ca4e09f3ffb Mon Sep 17 00:00:00 2001
From: guoyuji <guoyujie@ng.com>
Date: 星期五, 07 三月 2025 09:08:33 +0800
Subject: [PATCH] 小片尺寸和成品尺寸不相同时，打印显示小片信息

---
 north-glass-erp/northglass-erp/src/views/pp/processCard/PrintFlowCard.vue |   74 ++++++++++++++++++++++++++++++++-----
 1 files changed, 64 insertions(+), 10 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 b9e8424..caf1689 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
@@ -10,6 +10,7 @@
 import {VXETable} from "vxe-table";
 import {addListener, toolbarButtonClickEvent} from "@/hook/mouseMove";
 import PrintProcess from '@/components/pp/PrintProcess.vue'
+import PrintProcessStraight from '@/components/pp/PrintProcessStraight.vue'
 import PrintLabel from '@/views/pp/processCard/PrintLabel.vue'
 import PrintCustomLabel from '@/components/pp/PrintCustomLabel.vue'
 import PrintCustomLabelXJ from '@/components/pp/PrintCustomLabelXJ.vue'
@@ -33,6 +34,7 @@
 const dialogTableVisibleLabel = ref(false)
 const dialogTableVisibleLabelXJ = ref(false)
 const dialogTableVisibleCustomLabel = ref(false)
+const dialogTableVisibleStraight = ref(false)
 const printVisible = ref(false)
 let selectRecords = ref(null)
 let titleStyleVisible = ref(false)
@@ -59,7 +61,8 @@
 let printRow = ref({
   list: null,
   printMergeVal: null,
-  like: null
+  like: null,
+  merge: null
 })
 
 //鏍囩
@@ -144,6 +147,7 @@
   },
 ]
 let hidePrintLabels = company.printLabel.hideButton;
+let btnType = company.printBtn;
 
 if (hidePrintLabels == 'true') {
   filteredOptions = lableTypeOptions.filter((option, index) => index !== 2);
@@ -188,6 +192,7 @@
 data.value.printList = JSON.parse(route.query.printList)
 
 let inquiryMode = route.query.checkedValue
+
 // 绗竴娆″姞杞芥煡璇�
 request.post(`/processCard/selectPrint/${inquiryMode}`, data.value).then((res) => {
 
@@ -204,7 +209,8 @@
     gridOptions.loading = false
 
 
-    hideButton()
+    hideButton();
+    hideHead()
   } else {
     ElMessage.warning(res.msg)
   }
@@ -398,8 +404,14 @@
           printRow.value.list = JSON.stringify(selectRecords)
           printRow.value.printMergeVal = printMerge.value
           printRow.value.like = null
+          printRow.value.merge = company.flowCardMerge
           // router.push({path: '/main/processCard/printProcess', query: {printList: JSON.stringify(selectRecords),printMerge:printMergeVal}})
-          dialogTableVisible.value = true
+          if(company.companyName=='甯稿窞甯傚悏鍒╃幓鐠冩湁闄愬叕鍙�'){
+            dialogTableVisibleStraight.value = true
+          }else{
+            dialogTableVisible.value = true
+          }
+
           break
         }
 
@@ -576,7 +588,11 @@
           printRow.value.printMergeVal = printMerge.value
           printRow.value.like = "1"
           // router.push({path: '/main/processCard/printProcess', query: {printList: JSON.stringify(selectRecords),printMerge:printMergeVal}})
-          dialogTableVisible.value = true
+          if(company.companyName=='甯稿窞甯傚悏鍒╃幓鐠冩湁闄愬叕鍙�'){
+            dialogTableVisibleStraight.value = true
+          }else{
+            dialogTableVisible.value = true
+          }
           break
         }
         case 'sortTable': {
@@ -627,15 +643,34 @@
 const hideButton = () => {
   // 鏍规嵁鏉′欢鍊� hidePrintLabels 杩囨护鎸夐挳鏁扮粍
   gridOptions.toolbarConfig.buttons = gridOptions.toolbarConfig.buttons.filter(button => {
-    // 杩欓噷鏍规嵁 hidePrintLabels 鐨勫�煎喅瀹氭槸鍚﹂殣钘� printLabel 鍜� printLabel2
-    if (hidePrintLabels == 'true') {
-      return button.code !== 'printLabel' && button.code !== 'printLabel2' && button.code !== 'customLabel';
-    } else {
-      return true && button.code !== 'printLike'; // 鏄剧ず璇ユ寜閽�
+    // 鏍规嵁 hidePrintLabels 杩囨护 printLabel 鍜� printLabel2 鎸夐挳
+    if (hidePrintLabels === 'true') {
+      if (button.code === 'printLabel' || button.code === 'printLabel2') {
+        return false; // 闅愯棌 printLabel 鍜� printLabel2
+      }
     }
-  })
+    // 濡傛灉 printBtn 涓� '1'锛屽垯闅愯棌 customLabel 鎸夐挳
+    if (btnType == 1 && button.code === 'customLabel') {
+      console.log('Hiding customLabel button');
+      return false; // 闅愯棌 customLabel 鎸夐挳
+    }
+
+    // 榛樿鎯呭喌涓嬭繑鍥� true锛屼繚鐣欏叾浠栨寜閽�
+    return true;
+  });
 }
 
+
+const hideHead = () => {
+
+  // 鍒ゆ柇 btnType 鏄惁绛変簬 '1' (鍙互鏍规嵁闇�瑕佽皟鏁翠负鏁板瓧 1)
+  if (btnType == 1) {
+    const headDiv = document.querySelector('.head');
+    if (headDiv) {
+      headDiv.style.display = 'none'; // 闅愯棌 class="head" 鐨� div
+    }
+  }
+}
 
 // 鐩戝惉鎵撳嵃瀹屾垚浜嬩欢
 const printNumber = () => {
@@ -756,6 +791,25 @@
           :printLike="printRow.like"
           :printList="printRow.list"
           :printMerge="printRow.printMergeVal"
+          :merges="printRow.merge"
+          style="width: 100%;height: 100%"/>
+    </el-dialog>
+
+    <el-dialog
+        id="sizePrintCalrd"
+        v-model="dialogTableVisibleStraight"
+        :title="$t('processCard.print')"
+        destroy-on-close
+        style="width: 75%;height:75% ">
+      <template #header="{ close, titleId, titleClass }">
+        <el-button v-print="printContent" :icon="Printer" circle @click="printNumber"/>
+      </template>
+      <print-process-straight
+          id="child"
+          :printLike="printRow.like"
+          :printList="printRow.list"
+          :printMerge="printRow.printMergeVal"
+          :merges="printRow.merge"
           style="width: 100%;height: 100%"/>
     </el-dialog>
 

--
Gitblit v1.8.0