From c46cb6a71c35f38c7f23a2d01ad686f46a3d0e0b Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期三, 26 六月 2024 15:14:44 +0800
Subject: [PATCH] Merge branch 'master' of http://bore.pub:10439/r/ERP_override

---
 north-glass-erp/northglass-erp/src/views/pp/Replenish/PrintRepairFlowCard.vue |   15 ++++++++++-----
 1 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/north-glass-erp/northglass-erp/src/views/pp/Replenish/PrintRepairFlowCard.vue b/north-glass-erp/northglass-erp/src/views/pp/Replenish/PrintRepairFlowCard.vue
index 4dfb984..95c8ae0 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/Replenish/PrintRepairFlowCard.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/Replenish/PrintRepairFlowCard.vue
@@ -99,6 +99,10 @@
   },
 ]
 
+//鍚堢墖娴佺▼鍗℃墦鍗颁笅鎷夐�夐」
+const printMerge = ref('')
+const printMergeOptions=[{}]
+
 
 //鎵撳嵃绫诲瀷
 const printType = ref()
@@ -163,7 +167,7 @@
     useKey: true
   },
   filterConfig: {   //绛涢�夐厤缃」
-                    // remote: true
+    // remote: true
   },
   customConfig: {
     storage: true
@@ -220,7 +224,6 @@
   toolbarConfig: {
     buttons: [
       {code: 'print', name: t('processCard.print'), status: 'primary'},
-      {code: 'printLabel', name: t('processCard.printLabel'), status: 'primary'},
       {code: 'customLabel', name: t('processCard.customLabelPrinting'), status: 'primary'},
 
     ],
@@ -271,7 +274,7 @@
               id += selectRecords[i].id + "|"
             }
           }
-          router.push({path: '/main/processCard/printProcess', query: {printList: JSON.stringify(selectRecords)}})
+          router.push({path: '/main/processCard/printProcess', query: {printList: JSON.stringify(selectRecords),printMerge:printMerge.value}})
 
           break
         }
@@ -373,7 +376,7 @@
     useKey: true
   },
   filterConfig: {   //绛涢�夐厤缃」
-                    // remote: true
+    // remote: true
   },
   customConfig: {
     storage: true
@@ -488,6 +491,8 @@
 
 <template>
   <div class="main-div-customer">
+    <el-input clearable placeholder="鍚堝苟鎵撳嵃" v-model="printMerge" style="width: 90px"></el-input>
+    &nbsp;
     <label>{{$t('processCard.labelStyle')}}锛�</label>
     <el-select v-model="printType" clearable default-value="default_city" :placeholder="$t('processCard.pleaseSelect')" style="width: 120px">
       <el-option
@@ -539,7 +544,7 @@
       </template>
 
       <!--宸﹁竟鍥哄畾鏄剧ず鐨勬彃妲�-->
-<!--      v-if="userStore.user.permissions.indexOf('SelectProductionBasicData.edit') > -1"-->
+      <!--      v-if="userStore.user.permissions.indexOf('SelectProductionBasicData.edit') > -1"-->
       <template #button_slot="{ row }">
         <el-button @click="getTableRow(row,'edit')"
                    link

--
Gitblit v1.8.0