From 1c13bd7a2cd2c8ba69a185da69344c8b59f4e561 Mon Sep 17 00:00:00 2001
From: guoyuji <guoyujie@ng.com>
Date: 星期四, 04 七月 2024 09:29:15 +0800
Subject: [PATCH] 选中求和功能以及还原双击回车才能点击单元格

---
 north-glass-erp/northglass-erp/src/views/pp/processCard/PrintCustomLabel.vue |  105 ++++++++++++++++++++++++++++++++++++----------------
 1 files changed, 73 insertions(+), 32 deletions(-)

diff --git a/north-glass-erp/northglass-erp/src/views/pp/processCard/PrintCustomLabel.vue b/north-glass-erp/northglass-erp/src/views/pp/processCard/PrintCustomLabel.vue
index 6e6c272..221eaba 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/processCard/PrintCustomLabel.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/processCard/PrintCustomLabel.vue
@@ -7,6 +7,9 @@
 import {changeFilterEvent, filterChanged} from "@/hook"
 import {useI18n} from 'vue-i18n'
 import deepClone from "@/utils/deepClone";
+import companyInfo from "@/stores/sd/companyInfo"
+
+const company = companyInfo()
 //璇█鑾峰彇
 const {t} = useI18n()
 let router = useRouter()
@@ -15,7 +18,7 @@
 let titleList = ref([])
 let dataList = ref([])
 let list = ref([])
-let lastList=ref([])
+let lastList = ref([])
 
 let filterData = ref({})
 
@@ -32,7 +35,7 @@
 const lableType = route.query.lableType
 
 onMounted(() => {
-      request.post(`/processCard/getSelectPrintCustomLabel/${type}`, data.value).then((res) => {
+      request.post(`/processCard/getSelectPrintCustomLabel/${type}/${lableType}`, data.value).then((res) => {
         if (res.code == 200) {
 
           produceList.value = deepClone(res.data.title)
@@ -41,9 +44,9 @@
           dataList = JSON.parse(`[${data}]`);
           labelList = dataList[0]
           for (let i = 0; i < list.value.length; i++) {
-            let count= list.value[i].data.length
-            for (let j = 0; j < 1; j++) {
-              for (let k = 0; k < list.value[i].data[j].quantity; k++){
+            let count = list.value[i].data.length
+            for (let j = 0; j < count; j++) {
+              for (let k = 0; k < list.value[i].data[j].quantity; k++) {
                 lastList.value.push(list.value[i].data[j])
               }
             }
@@ -55,8 +58,9 @@
       })
 
     }
-
 )
+
+
 
 
 // 鎵撳嵃鏂规硶
@@ -99,20 +103,15 @@
 
 <template>
   <el-button id="printButton" @click="printFlowCard();">{{ $t('basicData.print') }}</el-button>
-  <div class="printFlowCard_finished" id="print">
-    <div v-for="(item1,id) in lastList"   class="entirety_finished">
-        <div class="row4">{{faceOrientation}}</div>
-        <div v-for="(item,id) in labelList"  class="contentRow">
-          <div class="row1">{{ item.title }}:</div>
-          <div class="row2">{{ item1.order[item.name] }}</div>
-
-        </div>
-        <div class="row3">
-          <label>W:{{ item1.width }}</label>
-          &nbsp;&nbsp;
-          <label>H:{{ item1.height }}</label>
-        </div>
-
+  <div id="print" :class="company.printLabel.className.custom.printFlowCardName()">
+    <div v-for="(item1,id) in lastList" :class="company.printLabel.className.custom.entiretyName()">
+      <div class="row4">{{ faceOrientation }}</div>
+      <div v-for="(item,id) in labelList" :class="company.printLabel.className.custom.contentRowName()">
+        <div v-if="item.title==null" class="row1">{{ item.title }}</div>
+        <div v-else class="row1">{{ item.title }}:</div>
+        <div class="row2">{{ item1[item.name] }}</div>
+      </div>
+      <div v-html="company.printLabel.custom(item1)"></div>
     </div>
   </div>
 
@@ -124,7 +123,7 @@
   padding: 0;
 }
 
-body{
+body {
   font-weight: bolder;
   overflow: hidden;
 }
@@ -142,7 +141,7 @@
   flex-wrap: wrap;
   font-size: 12pt;
   display: flex;
-  flex-direction:column;
+  flex-direction: column;
 }
 
 
@@ -150,7 +149,7 @@
 .entirety_finished {
   display: flex;
   text-align: center;
-  flex-direction:column;
+  flex-direction: column;
   margin-left: 10px;
   width: 100%;
   height: 100%;
@@ -161,7 +160,7 @@
   font-family: 'Microsoft YaHei', '寰蒋闆呴粦', sans-serif;
 }*/
 
-.row3{
+.row3 {
   text-align: center;
   font-weight: bolder;
   font-size: 22px;
@@ -169,35 +168,35 @@
   justify-content:space-evenly;*/
 }
 
-.row3 label{
+.row3 label {
   font-size: 22px;
   margin-top: 28px;
 }
 
-.contentRow{
+.contentRow {
   font-weight: bolder;
   display: flex;
   text-align: center;
   width: 100%;
 }
 
-label{
+label {
   font-weight: bolder;
   /*font-family: 'Microsoft YaHei', '寰蒋闆呴粦', sans-serif;*/
 }
 
-.row1{
+.contentRow .row1 {
   width: 30%;
   font-weight: bolder;
 }
 
-.row4{
+.entirety_finished .row4 {
   font-weight: bolder;
   text-align: right;
   margin-right: 10px;
 }
 
-.row1,.row2{
+.contentRow .row1, .contentRow .row2 {
   text-align: left;
   font-weight: bolder;
 }
@@ -213,10 +212,52 @@
     page-break-inside: avoid;
   }
 
-.entirety_finished{
-  page-break-before: always;
+  .entirety_finished {
+    page-break-before: always;
+  }
+
 }
 
+.printFlowCard_finished1 {
+  flex-wrap: wrap;
+  font-size: 8pt;
+  display: flex;
+  flex-direction: column;
+}
+
+
+/*鎴�*/
+.entirety_finished1 {
+  display: flex;
+  text-align: center;
+  flex-direction: column;
+  margin-left: 10px;
+  width: 337px;
+  height: 120px;
+
+}
+
+.contentRow1 {
+  font-weight: bolder;
+  display: flex;
+  text-align: center;
+  width: 100%;
+}
+
+.contentRow1 .row1 {
+  width: 30%;
+  font-weight: bolder;
+}
+
+.entirety_finished1 .row4 {
+  font-weight: bolder;
+  text-align: right;
+  margin-right: 10px;
+}
+
+.contentRow1 .row1, .contentRow1 .row2 {
+  text-align: left;
+  font-weight: bolder;
 }
 
 </style>
\ No newline at end of file

--
Gitblit v1.8.0