From 93b80ffb7f7ffc02bc414271b8ebeac82be6bcb9 Mon Sep 17 00:00:00 2001
From: huang <1532065656@qq.com>
Date: 星期一, 11 十一月 2024 16:29:00 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10105/r/ERP_override

---
 north-glass-erp/northglass-erp/src/views/pp/processCard/SelectPrintProject.vue |   44 +++++++++++++++++++++++++++++++++++---------
 1 files changed, 35 insertions(+), 9 deletions(-)

diff --git a/north-glass-erp/northglass-erp/src/views/pp/processCard/SelectPrintProject.vue b/north-glass-erp/northglass-erp/src/views/pp/processCard/SelectPrintProject.vue
index bde9919..fb05fc3 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/processCard/SelectPrintProject.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/processCard/SelectPrintProject.vue
@@ -12,6 +12,7 @@
 import PrintCustomLabelXJTwo from '@/components/pp/PrintCustomLabelXJTwo.vue'
 import {Printer} from "@element-plus/icons-vue/global";
 import companyInfo from "@/stores/sd/companyInfo"
+import {remove} from "xe-utils";
 //璇█鑾峰彇
 const {t} = useI18n()
 
@@ -24,6 +25,7 @@
 //瀹氫箟鏁版嵁杩斿洖缁撴灉
 let produceList = ref([])
 let titleStyleVisible = ref(false)
+let print = ref("1")
 
 //鏍囩
 let labelRow = ref({
@@ -45,7 +47,12 @@
 const getTableRow = (row, type) => {
   switch (type) {
     case 'edit' :{
-      router.push({path: '/main/processCard/PrintLabel', query: { projectNo: row.project_no,type:1 }})
+      if(parseInt(print.value)==1){
+        router.push({path: '/main/processCard/PrintLabel', query: { projectNo: row.project_no,type:1 }})
+      }else{
+        router.push({path: '/main/processCard/PrintCustomLabelSemi2', query: { projectNo: row.project_no,type:1 }})
+      }
+
       break
     }
     case 'edit1' :{
@@ -76,11 +83,11 @@
 
 //鑾峰彇涓冨ぉ鍓嶅埌褰撳墠鏃堕棿
 function getNowTime() {
-  const start = new Date(new Date().getTime() - 3600 * 1000 * 24 * 15)
+  const start = new Date(new Date().getTime() - 3600 * 1000 * 24 * 14)
       .toISOString()
       .replace('T', ' ')
       .slice(0, 10) //榛樿寮�濮嬫椂闂�7澶╁墠
-  const end = new Date(new Date().getTime() + 3600 * 1000 * 24)
+  const end = new Date(new Date().getTime())
       .toISOString()
       .replace('T', ' ')
       .slice(0, 10)//榛樿缁撴潫鏃堕棿褰撳墠鏃堕棿
@@ -100,15 +107,18 @@
 
   if (res.code == 200) {
     if(hidePrintLabels=="true"){
+      //鍒犻櫎涓嬫媺妗�
+      remove(gridOptions.toolbarConfig.slots)
       const button = {'code': 'printLabel',
         status: 'primary',
-        'name': "鎴愬搧鎵撳嵃2"}
+        'name': t('processCard.finishedProductPrinting2')}
       gridOptions.toolbarConfig.buttons.push(button)
 
       const button2 = {'code': 'detailPrinting',
         status: 'primary',
-        'name': "鏄庣粏鎵撳嵃"}
+        'name': t('processCard.detailPrinting')}
       gridOptions.toolbarConfig.buttons.push(button2)
+
     }
     produceList.value = deepClone(res.data.data)
     xGrid.value.reloadData(produceList.value)
@@ -197,7 +207,9 @@
   toolbarConfig: {
     buttons: [
     ],
-
+    slots:{
+      buttons: "toolbar_buttons"
+    },
     zoom: true,
     custom: true
   },
@@ -231,7 +243,7 @@
         }
         case 'printLabel': {
           if(rowClickIndex.value===null){
-            ElMessage.warning(t('璇烽�夋嫨宸ョ▼'))
+            ElMessage.warning(t('processCard.pleaseSelectProject'))
             return
           }
           labelRow.value.type = '鎭掗懌'
@@ -244,7 +256,7 @@
         }
         case 'detailPrinting': {
           if(rowClickIndex.value===null){
-            ElMessage.warning(t('璇烽�夋嫨宸ョ▼'))
+            ElMessage.warning(t('processCard.pleaseSelectProject'))
             return
           }
           router.push({path: '/main/processCard/PrintProjectDetails', query: {projectNo: rowClickIndex.value.project_no}})
@@ -263,6 +275,7 @@
 const printContentLabel = ref({
   id: 'childLabel',
 })
+
 
 </script>
 
@@ -316,10 +329,21 @@
       <template #num1_filter="{ column, $panel }">
         <div>
           <div v-for="(option, index) in column.filters" :key="index">
-            <input v-model="option.data" type="text" @input="changeFilterEvent($event, option, $panel)"/>
+            <input v-model="option.data" type="text"
+                   @keyup.enter.native="$panel.confirmFilter()"
+                   @input="changeFilterEvent($event, option, $panel)"/>
           </div>
         </div>
       </template>
+
+      <template #toolbar_buttons>
+        <vxe-select @change="changeOrderType" v-model="print" >
+          <vxe-option value="1" label="EPSON LQ-82KF ESC/P2"></vxe-option>
+          <vxe-option value="2" label="TSC TTP-244Pro"></vxe-option>
+        </vxe-select>
+      </template>
+
+
 
 
     </vxe-grid>
@@ -352,6 +376,8 @@
   </div>
 </template>
 
+
+
 <style scoped>
 .main-div-customer {
   width: 99%;

--
Gitblit v1.8.0