From 69a25cd577d5639f2869bcf80f498b373e80137e Mon Sep 17 00:00:00 2001
From: 于杰 <1210123631@qq.com>
Date: 星期三, 17 十二月 2025 10:43:44 +0800
Subject: [PATCH] 修改旋转逻辑，增加辅助旋转功能

---
 north-glass-erp/northglass-erp/src/views/pp/processCard/SelectPrintProject.vue |   57 +++++++++++++++++++++++++++++++++++++++++++++------------
 1 files changed, 45 insertions(+), 12 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 ed00652..fafb289 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
@@ -15,6 +15,8 @@
 import {remove} from "xe-utils";
 import PrintProcess from "@/components/pp/PrintProcess.vue";
 import PrintProcessStraight from "@/components/pp/PrintProcessStraight.vue";
+import useOrderInfoStore from "@/stores/sd/order/orderInfo"
+
 //璇█鑾峰彇
 const {t} = useI18n()
 
@@ -23,7 +25,7 @@
 const dialogTableVisibleLabelXJTwo = ref(false)
 const dialogTableVisibleStraight = ref(false)
 let rowClickIndex = ref(null)
-
+const orderInfo = useOrderInfoStore()
 
 
 //瀹氫箟鏁版嵁杩斿洖缁撴灉
@@ -46,6 +48,8 @@
 
 //鍊掑彊
 let  flashback = ref(1)
+//钀芥灦椤哄簭
+let landingSequence= ref(1)
 //鍚堟灦鎵撳嵃
 let compound = ref(null)
 
@@ -63,7 +67,8 @@
   project:null,
   merge: null,
   flashback:null,
-  compound:null
+  compound:null,
+  landingSequence:null,
 })
 const getTableRow = (row, type) => {
   switch (type) {
@@ -93,6 +98,7 @@
       printRow.value.merge = company.flowCardMerge
       printRow.value.flashback = flashback.value
       printRow.value.compound = compound.value
+      printRow.value.landingSequence=landingSequence.value
       if(company.companyName=='甯稿窞甯傚悏鍒╃幓鐠冩湁闄愬叕鍙�'){
         dialogTableVisibleStraight.value = true
       }else{
@@ -135,15 +141,17 @@
 }
 
 //绗竴娆″姞杞借幏鍙栬繎涓冨ぉ鏃堕棿鍜岄粯璁ょ姸鎬�
-form.date1 = getNowTime()
-let startTime = form.date1[0]
-let endTime = form.date1[1]
+if (orderInfo.workOrderDate[0]=="" && orderInfo.workOrderDate[1]==""){
+  orderInfo.workOrderDate=getNowTime()
+}
+let startTime = orderInfo.workOrderDate[0]
+let endTime = orderInfo.workOrderDate[1]
 let orderId=form.orderId
 let project=form.project
 
 //绗竴娆″姞杞芥暟鎹�
 
-request.post(`/processCard/selectPrintPrintProject/${startTime}/${endTime}`, filterData.value).then((res) => {
+request.post(`/processCard/selectPrintPrintProject/${orderInfo.workOrderDate}`, filterData.value).then((res) => {
 
   if (res.code == 200) {
     if(hidePrintLabels=="true"){
@@ -165,6 +173,7 @@
       gridOptions.toolbarConfig.buttons.push(button2)
 
     }
+    orderInfo.workOrderDate = res.data.selectDate
     produceList.value = deepClone(res.data.data)
     xGrid.value.reloadData(produceList.value)
     gridOptions.loading = false
@@ -179,9 +188,9 @@
   let startTime = form.date1[0]
   let endTime = form.date1[1]
 
-  request.post(`/processCard/selectPrintPrintProject/${startTime}/${endTime}`, filterData.value).then((res) => {
+  request.post(`/processCard/selectPrintPrintProject/${orderInfo.workOrderDate}`, filterData.value).then((res) => {
     if (res.code == 200) {
-
+      orderInfo.workOrderDate = res.data.selectDate
       xGrid.value.loadData(res.data.data)
       gridOptions.loading = false
     } else {
@@ -233,6 +242,13 @@
       slots: {filter: 'num1_filter'},
       filterMethod: filterChanged
     },
+    // {
+    //   field: 'order_id',
+    //   title: t('order.orderId'),
+    //   filters: [{data: ''}],
+    //   slots: {filter: 'num1_filter'},
+    //   filterMethod: filterChanged
+    // },
     {
       field: 'glass_thickness',
       title: t('order.totalThickness'),
@@ -372,7 +388,7 @@
   <div  style="width: 100%;height: 100%">
     <div class="head">
         <el-date-picker
-            v-model="form.date1"
+            v-model="orderInfo.workOrderDate"
             :start-placeholder="$t('basicData.startDate')"
             :end-placeholder="$t('basicData.endDate')"
             format="YYYY/MM/DD"
@@ -426,11 +442,27 @@
           </div>
         </template>
 
-        <template #toolbar_buttons>
+        <template #toolbar_buttons="{ $grid }">
           <vxe-select @change="changeOrderType" v-model="printStyle" >
-            <vxe-option value="1" label="11鍒�4琛�"></vxe-option>
-            <vxe-option value="2" label="6琛�3鍒�"></vxe-option>
+            <vxe-option value="1" :label="t('processCard.print1')"></vxe-option>
+            <vxe-option value="2" :label="t('processCard.print2')"></vxe-option>
           </vxe-select>
+          &nbsp;&nbsp;
+<!--          <el-button
+              v-if="hidePrintLabels=='true'"
+              type="primary"
+              @click="$grid.dispatchEvent('toolbar-button-click', { code: 'printLabel' })"
+          >
+            {{ t('processCard.finishedProductPrinting2') }}
+          </el-button>-->
+          &nbsp;&nbsp;
+          <el-button
+              v-if="hidePrintLabels=='true'"
+              type="primary"
+              @click="$grid.dispatchEvent('toolbar-button-click', { code: 'detailPrinting' })"
+          >
+            {{ t('processCard.detailPrinting') }}
+          </el-button>
         </template>
 
         <template #toolbar_button2>
@@ -496,6 +528,7 @@
           :merges="printRow.merge"
           :flashback = "printRow.flashback"
           :compound = "printRow.compound"
+          :landingSequence = "printRow.landingSequence"
           style="width: 100%;height: 100%"/>
     </el-dialog>
 

--
Gitblit v1.8.0