From 8945c8c27ad64da1dbf1477d6bd53a5ac7abb32d Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期一, 17 三月 2025 13:32:08 +0800
Subject: [PATCH] 修改库存以及标签打印部分

---
 north-glass-erp/northglass-erp/src/views/pp/processCard/PrintCustomLabelSemi2.vue      |   27 ++++++++++++++++++++-------
 north-glass-erp/northglass-erp/src/views/mm/ingredientStock/SelectIngredientsStock.vue |    2 ++
 2 files changed, 22 insertions(+), 7 deletions(-)

diff --git a/north-glass-erp/northglass-erp/src/views/mm/ingredientStock/SelectIngredientsStock.vue b/north-glass-erp/northglass-erp/src/views/mm/ingredientStock/SelectIngredientsStock.vue
index ccebe23..5964f67 100644
--- a/north-glass-erp/northglass-erp/src/views/mm/ingredientStock/SelectIngredientsStock.vue
+++ b/north-glass-erp/northglass-erp/src/views/mm/ingredientStock/SelectIngredientsStock.vue
@@ -141,6 +141,7 @@
       total.pageTotal= res.data.total.pageTotal
       pageNum.value=1
       selectDate.value = res.data.selectDate
+      gridOptions.toolbarConfig.buttons[2].disabled = false
       produceList = deepClone(materialStore.value)
       xGrid.value.loadData(produceList)
       gridOptions.loading=false
@@ -199,6 +200,7 @@
         total.pageTotal= res.data.total.pageTotal
         pageNum.value=1
         selectDate.value = res.data.selectDate
+        gridOptions.toolbarConfig.buttons[2].disabled = true
         produceList = deepClone(materialStore.value)
         xGrid.value.loadData(produceList)
         gridOptions.loading=false
diff --git a/north-glass-erp/northglass-erp/src/views/pp/processCard/PrintCustomLabelSemi2.vue b/north-glass-erp/northglass-erp/src/views/pp/processCard/PrintCustomLabelSemi2.vue
index 668b153..e0d4c89 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/processCard/PrintCustomLabelSemi2.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/processCard/PrintCustomLabelSemi2.vue
@@ -150,24 +150,20 @@
     <div id="entirety" >
 
       <div class="row1" v-if="item.heat_layout_id!=null">
-        <div class="cell" v-if="item.heat_layout_id!=null">{{ item.heat_layout_id }}/{{ item.heat_layout_sort }}</div>
         <span>{{ item.customer_name }}</span>&nbsp;
         <span>{{ item.order_id }}</span>&nbsp;
         <span v-if="item.process.includes('澶硅兌')||item.process.includes('澶瑰眰')">鑳剁墖</span>
         <span v-else-if="item.process.includes('涓┖')">涓┖</span>
         <span v-else-if="item.process.includes('鐧惧彾')">鐧惧彾</span>
         <span v-else></span>
-        <div class="cell1" v-if="item.stock_id!=null">{{ item.stock_id }}</div>
       </div>
       <div class="row6" v-else>
-        <div class="cell" v-if="item.heat_layout_id!=null">{{ item.heat_layout_id }}/{{ item.heat_layout_sort }}</div>
         <span>{{ item.customer_name }}</span>&nbsp;
         <span>{{ item.order_id }}</span>&nbsp;
         <span v-if="item.process.includes('澶硅兌')||item.process.includes('澶瑰眰')">鑳剁墖</span>
         <span v-else-if="item.process.includes('涓┖')">涓┖</span>
         <span v-else-if="item.process.includes('鐧惧彾')">鐧惧彾</span>
         <span v-else></span>
-        <div class="cell1" v-if="item.stock_id!=null">{{ item.stock_id }}</div>
       </div>
 
 
@@ -176,8 +172,25 @@
         <span>{{ item.building_number }}</span>
         <span v-if="item.bend_radius!=null">R={{item.bend_radius}}</span>
       </div>
-      <div class="row3" v-if="item.other_columns!=null&&(JSON.parse(item.other_columns).S02!=null)"> <span>{{JSON.parse(item.other_columns).S02}}={{item.quantity}}</span>&nbsp;</div>
-      <div class="row3" v-else><span>{{Math.round(item.width)}}x{{Math.round(item.height)}}={{item.quantity}}</span></div>
+      <div class="row3" v-if="item.other_columns!=null&&(JSON.parse(item.other_columns).S02!=null)">
+        <span v-if="item.heat_layout_id!==undefined && company.showDeliveryCreator"  style="font-size: 7pt;">
+          ({{ item.stock_id }}) {{ item.heat_layout_id }}/{{ item.heat_layout_sort }}
+        </span>
+        <span v-if="item.stock_id!==undefined && !company.showDeliveryCreator"  style="font-size: 7pt">
+              {{ item.stock_id }}/{{ item.polys_id }}
+        </span>
+        {{JSON.parse(item.other_columns).S02}}={{item.quantity}}
+
+      </div>
+      <div class="row3" v-else>
+         <span v-if="item.heat_layout_id!==undefined && company.showDeliveryCreator"  style="font-size: 7pt;">
+          ({{ item.stock_id }}) {{ item.heat_layout_id }}/{{ item.heat_layout_sort }}
+        </span>
+        <span v-if="item.stock_id!==undefined && !company.showDeliveryCreator"  style="font-size: 7pt">
+              {{ item.stock_id }}/{{ item.polys_id }}
+        </span>
+        {{Math.round(item.width)}}x{{Math.round(item.height)}}={{item.quantity}}
+      </div>
       <div class="row5">
         <span>{{item.glass_child}}</span>&nbsp;
         <span>{{item.processing_note}}</span>
@@ -240,7 +253,7 @@
 .row3 {
   margin-top: -5px;
   height: 35px;
-  font-size: 22pt;
+  font-size: 20pt;
   font-weight: bolder;
   line-height: 35px;
 }

--
Gitblit v1.8.0