From 612254a4c651f79676fab4c925bfdb16e64b58e8 Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期三, 19 六月 2024 09:45:32 +0800
Subject: [PATCH] 自定义标签样式调整，添加根据状态显示不同数据

---
 north-glass-erp/northglass-erp/src/views/pp/processCard/PrintFlowCard.vue |   78 +++++++++++++++++++++++++-------------
 1 files changed, 51 insertions(+), 27 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 7c02c89..5319bfb 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
@@ -86,6 +86,19 @@
   },
 ]
 
+//瀹ゅ唴瀹ゅ闈�
+const lableType = ref('1')
+const lableTypeOptions = [
+  {
+    value: '1',
+    label: '鎴愬搧鏍囩',
+  },
+  {
+    value: '2',
+    label: '鍗婂搧鏍囩',
+  },
+]
+
 
 //鎵撳嵃绫诲瀷
 const printType = ref()
@@ -181,14 +194,6 @@
       filterMethod: filterChanged
     },
     {
-      field: 'order_number',
-      title: '搴忓彿',
-      showOverflow: "ellipsis",
-      filters: [{data: ''}],
-      slots: {filter: 'num1_filter'},
-      filterMethod: filterChanged
-    },
-    {
       field: 'customer_name',
       title: t('customer.customerName'),
       filters: [{data: ''}],
@@ -216,7 +221,7 @@
     buttons: [
       {code: 'print', name: t('processCard.print'), status: 'primary'},
       {code: 'printLabel', name: t('processCard.printLabel'), status: 'primary'},
-      // {code: 'customLabel', name: '鑷畾涔夋爣绛炬墦鍗�', status: 'primary'},
+      {code: 'customLabel', name: '鑷畾涔夋爣绛炬墦鍗�', status: 'primary'},
 
     ],
     // import: false,
@@ -249,6 +254,7 @@
     selectRecords = $grid.getCheckboxRecords()
     let type=printType.value
     let faceOrientation=stateValue.value
+    let lableTypes=lableType.value
     if ($grid) {
       switch (code) {
         case 'print': {
@@ -329,7 +335,15 @@
             }
           }
 
-          router.push({path: '/main/processCard/PrintCustomLabel', query: {type:type,faceOrientation:faceOrientation,  printList: JSON.stringify(selectRecords)}})
+          if (lableTypes==1){
+            router.push({path: '/main/processCard/PrintCustomLabel', query: {type:type,faceOrientation:faceOrientation,lableType:lableTypes,  printList: JSON.stringify(selectRecords)}})
+
+          }
+          else {
+            router.push({path: '/main/processCard/PrintCustomLabelSemi', query: {type:type,faceOrientation:faceOrientation,lableType:lableTypes,  printList: JSON.stringify(selectRecords)}})
+
+          }
+
 
           break
         }
@@ -474,23 +488,33 @@
 
 <template>
   <div class="main-div-customer">
-<!--    <label>鏍囩鏍峰紡锛�</label>-->
-<!--    <el-select v-model="printType" clearable default-value="default_city" style="width: 120px">-->
-<!--      <el-option-->
-<!--          v-for="item in titleSelectJson['dataType']"-->
-<!--          :key="item.id"-->
-<!--          :label="item.name"-->
-<!--          :value="item.name"-->
-<!--      />-->
-<!--    </el-select>-->
-<!--    <el-select v-model="stateValue" class="m-2" placeholder="瀹ゅ唴澶栭潰" style="width: 140px">-->
-<!--      <el-option-->
-<!--          v-for="item in stateOptions"-->
-<!--          :key="item.value"-->
-<!--          :label="item.label"-->
-<!--          :value="item.value"-->
-<!--      />-->
-<!--    </el-select>-->
+    <label>鏍囩鏍峰紡锛�</label>
+    <el-select v-model="printType" clearable default-value="default_city" style="width: 120px">
+      <el-option
+          v-for="item in titleSelectJson['dataType']"
+          :key="item.id"
+          :label="item.name"
+          :value="item.name"
+      />
+    </el-select>
+    &nbsp;
+    <el-select v-model="lableType" class="m-2" placeholder="鎴愬搧鏍囩" style="width: 140px">
+      <el-option
+          v-for="item in lableTypeOptions"
+          :key="item.value"
+          :label="item.label"
+          :value="item.value"
+      />
+    </el-select>
+    &nbsp;
+    <el-select v-model="stateValue" class="m-2" placeholder="瀹ゅ唴澶栭潰" style="width: 140px">
+      <el-option
+          v-for="item in stateOptions"
+          :key="item.value"
+          :label="item.label"
+          :value="item.value"
+      />
+    </el-select>
     <vxe-grid
         ref="xGrid"
         class="mytable-scrollbar"

--
Gitblit v1.8.0