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/PrintCustomLabelSemi.vue |   71 +++++++++++++++++++++++++++--------
 1 files changed, 55 insertions(+), 16 deletions(-)

diff --git a/north-glass-erp/northglass-erp/src/views/pp/processCard/PrintCustomLabelSemi.vue b/north-glass-erp/northglass-erp/src/views/pp/processCard/PrintCustomLabelSemi.vue
index 8bab46d..6627a8a 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/processCard/PrintCustomLabelSemi.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/processCard/PrintCustomLabelSemi.vue
@@ -35,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)
@@ -102,17 +102,15 @@
 
 <template>
   <el-button id="printButton" @click="printFlowCard();">{{ $t('basicData.print') }}</el-button>
-  <div class="printFlowCard_semi" id="print">
-    <div v-for="(item1,id) in lastList"   class="entirety_semi">
-        <div class="row4">{{faceOrientation}}</div>
-        <div v-for="(item,id) in labelList"  class="contentRow">
-          <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 id="print" :class="company.printLabel.className.semi.printFlowCardName()">
+    <div v-for="(item1,id) in lastList" :class="company.printLabel.className.semi.entiretyName()">
+      <div class="row4">{{ faceOrientation }}</div>
+      <div v-for="(item,id) in labelList" :class="company.printLabel.className.semi.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.customSemi(item1)"></div>
-
     </div>
   </div>
 
@@ -169,24 +167,24 @@
   font-weight: bolder;
 }
 
-.row1{
+.contentRow .row1{
   width: 30%;
   font-weight: bolder;
 }
 
-.row4{
+.entirety_semi .row4{
   font-weight: bolder;
   text-align: right;
 }
 
-.row1,.row2{
+.contentRow .row1,.contentRow .row2{
   text-align: left;
   font-weight: bolder;
 }
 
 @page {
-  size: auto;  /* auto is the initial value */
-  margin: 0mm 2mm 2mm 2mm;  /* this affects the margin in the printer settings */
+  size: auto;
+  margin: 2mm 2mm 0mm 2mm;
 
 }
 
@@ -196,4 +194,45 @@
   }
 }
 
+.printFlowCard_semi1 {
+  flex-wrap: wrap;
+  font-size: 8pt;
+  display: flex;
+}
+
+
+/*鎴�*/
+.entirety_semi1 {
+  width: 50%;
+  display: flex;
+  text-align: center;
+  flex-direction: column;
+  margin-left: -10px;
+  height: 80px;
+
+}
+
+.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