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/SelectPrintProject.vue |   65 ++++++++++++++++++++++++++++++--
 1 files changed, 60 insertions(+), 5 deletions(-)

diff --git a/north-glass-erp/northglass-erp/src/views/pp/processCard/SelectPrintProject.vue b/north-glass-erp/northglass-erp/src/views/pp/processCard/SelectPrintProject.vue
index dc747c2..2ad40e7 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/processCard/SelectPrintProject.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/processCard/SelectPrintProject.vue
@@ -14,12 +14,14 @@
 import companyInfo from "@/stores/sd/companyInfo"
 import {remove} from "xe-utils";
 import PrintProcess from "@/components/pp/PrintProcess.vue";
+import PrintProcessStraight from "@/components/pp/PrintProcessStraight.vue";
 //璇█鑾峰彇
 const {t} = useI18n()
 
 let router = useRouter()
 const dialogTableVisible = ref(false)
 const dialogTableVisibleLabelXJTwo = ref(false)
+const dialogTableVisibleStraight = ref(false)
 let rowClickIndex = ref(null)
 
 
@@ -52,7 +54,8 @@
   list: null,
   printMergeVal: null,
   like: null,
-  project:null
+  project:null,
+  merge: null
 })
 const getTableRow = (row, type) => {
   switch (type) {
@@ -66,7 +69,11 @@
       break
     }
     case 'edit1' :{
-      router.push({path: '/main/processCard/PrintLabel', query: { projectNo: row.project_no,type:2 }})
+      if(parseInt(print.value)==1){
+        router.push({path: '/main/processCard/PrintLabel', query: { projectNo: row.project_no,type:2 }})
+      }else{
+        router.push({path: '/main/processCard/PrintCustomLabelSemi2', query: { projectNo: row.project_no,type:2 }})
+      }
       break
     }
     case 'edit2' :{
@@ -75,7 +82,12 @@
     }
     case 'edit3' :{
       printRow.value.project=row.project_no
-      dialogTableVisible.value = true
+      printRow.value.merge = company.flowCardMerge
+      if(company.companyName=='甯稿窞甯傚悏鍒╃幓鐠冩湁闄愬叕鍙�'){
+        dialogTableVisibleStraight.value = true
+      }else{
+        dialogTableVisible.value = true
+      }
     }
   }
 }
@@ -225,6 +237,14 @@
       slots: {filter: 'num1_filter'},
       filterMethod: filterChanged
     },
+    {
+      field: 'labelPrintNum',
+      title: t('鏍囩鎵撳嵃娆℃暟')
+    },
+    {
+      field: 'processPrintNum',
+      title: t('娴佺▼鍗℃墦鍗版鏁�')
+    },
   ],//琛ㄥご鎸夐挳
 
   toolbarConfig: {
@@ -313,6 +333,15 @@
   id: 'child',
 
 })
+const printCount = ()=>{
+  request.post(`/processCard/updateProjectProcessPrintCount/${printRow.value.project}`).then((res) => {
+    if(res.code==='200'){
+      ElMessage.info(t('order.printingNumber')+':'+res.data)
+      getWorkOrder()
+    }
+  })
+}
+
 </script>
 
 <template>
@@ -402,7 +431,9 @@
         destroy-on-close
         style="width: 80%;height:75%;overflow: auto ">
       <template #header="{ close, titleId, titleClass }">
-        <el-button v-print="printContentLabel" :icon="Printer" circle/>
+        <el-button
+            v-print="printContentLabel"
+            :icon="Printer" circle/>
       </template>
       <print-custom-label-x-j-two id="childLabel"
                                   :faceOrientation="labelRow.faceOrientation"
@@ -419,7 +450,10 @@
         destroy-on-close
         style="width: 75%;height:75% ">
       <template #header="{ close, titleId, titleClass }">
-        <el-button v-print="printContent" :icon="Printer" circle />
+        <el-button
+            v-print="printContent"
+            @click="printCount"
+            :icon="Printer" circle />
       </template>
       <print-process
           id="child"
@@ -427,6 +461,26 @@
           :printList="printRow.list"
           :printMerge="printRow.printMergeVal"
           :printProject="printRow.project"
+          :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"
+          :printProject="printRow.project"
+          :merges="printRow.merge"
           style="width: 100%;height: 100%"/>
     </el-dialog>
   </div>
@@ -455,4 +509,5 @@
   overflow-y: auto;
 }
 
+
 </style>
\ No newline at end of file

--
Gitblit v1.8.0