From 25cc86fd8a2fb3b2bb6b385cba0adaf89ff3dcdc Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期四, 18 十二月 2025 16:39:32 +0800
Subject: [PATCH] 流程卡进度打印部分代码

---
 north-glass-erp/northglass-erp/src/views/pp/processCard/SelectPrintFlowCard.vue |   35 +++++++++++++++++++----------------
 1 files changed, 19 insertions(+), 16 deletions(-)

diff --git a/north-glass-erp/northglass-erp/src/views/pp/processCard/SelectPrintFlowCard.vue b/north-glass-erp/northglass-erp/src/views/pp/processCard/SelectPrintFlowCard.vue
index 952d75c..2381dce 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/processCard/SelectPrintFlowCard.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/processCard/SelectPrintFlowCard.vue
@@ -22,7 +22,7 @@
 const printVisible= ref(false)
 const orderInfo = useOrderInfoStore()
 
-
+let printNumberFc = company.printNumber;
 const userStore = useUserInfoStore()
 const userId = userStore.user.userId
 
@@ -49,11 +49,11 @@
 const options = [
   {
     value: '0',
-    label: '鏈垎鏋�',
+    label: t('processCard.noFlowCard'),
   },
   {
     value: '1',
-    label: '宸插垎鏋�',
+    label: t('processCard.okFlowCard'),
   },
 ]
 
@@ -127,16 +127,16 @@
 
 //绗竴娆″姞杞芥暟鎹�
 
-request.post(`/processCard/selectPrintFlowCard/${startTime}/${endTime}/${orderId}/${project}/${userId}/${state}`, filterData.value).then((res) => {
+request.post(`/processCard/selectPrintFlowCard/${orderInfo.workOrderDate}/${orderId}/${project}/${userId}/${state}`, filterData.value).then((res) => {
 
   if (res.code == 200) {
     produceList = produceList.value.concat(deepClone(res.data.data))
-    gridOptions.toolbarConfig.buttons[2].visible=false
+    /*gridOptions.toolbarConfig.buttons[2].visible=false
     let roleId=res.data.user
     if (roleId=='1' || roleId=='17'){
       gridOptions.toolbarConfig.buttons[2].visible=true
-    }
-
+    }*/
+    orderInfo.workOrderDate = res.data.selectDate
     xGrid.value.reloadData(produceList)
     gridOptions.loading = false
   } else {
@@ -147,8 +147,7 @@
 //鐐瑰嚮鏌ヨ
 const getWorkOrder = () => {
 
-  let startTime = orderInfo.workOrderDate[0]
-  let endTime = orderInfo.workOrderDate[1]
+
   let orderId=form.orderId
   let project=form.project
 
@@ -160,9 +159,9 @@
   }
   let state = optionVal.value
 
-  request.post(`/processCard/selectPrintFlowCard/${startTime}/${endTime}/${orderId}/${project}/${userId}/${state}`, filterData.value).then((res) => {
+  request.post(`/processCard/selectPrintFlowCard/${orderInfo.workOrderDate}/${orderId}/${project}/${userId}/${state}`, filterData.value).then((res) => {
     if (res.code == 200) {
-
+      orderInfo.workOrderDate = res.data.selectDate
       xGrid.value.loadData(res.data.data)
       gridOptions.loading = false
     } else {
@@ -225,6 +224,7 @@
       slots: {filter: 'num1_filter'},
       filterMethod: filterChanged
     },
+    {field: 'batch', title: t('order.batch'), filters: [{data: ''}], slots: {filter: 'num1_filter'}, width: 110,filterMethod: filterChanged},
     {
       field: 'quantity',
       title: t('order.quantity'),
@@ -289,7 +289,7 @@
             return
           }
           if (optionVal.value != '1'){
-            ElMessage.warning('璇烽�夋嫨宸插垎鏋惰鍗曟墦鍗�')
+            ElMessage.warning(t('processCard.addFlowCardMsg1'))
             return
           }
           let orderIdList = ""
@@ -301,7 +301,10 @@
             }
           }
           let array = orderIdList.split('|');
-         router.push({path: '/main/processCard/PrintFlowCard', query: {printList: JSON.stringify(selectRecords),checkedValue:checkedValue.value.value}})
+          if (selectRecords.length==1){
+            printNumberFc = true
+          }
+         router.push({path: '/main/processCard/PrintFlowCard', query: {printList: JSON.stringify(selectRecords),checkedValue:checkedValue.value.value,printNumberFc:printNumberFc}})
           return;
 
         }
@@ -313,7 +316,7 @@
             return
           }
           if (optionVal.value != '1'){
-            ElMessage.warning('璇烽�夋嫨宸插垎鏋惰鍗曟墦鍗�')
+            ElMessage.warning(t('processCard.addFlowCardMsg1'))
             return
           }
           let orderIdList = ""
@@ -337,7 +340,7 @@
             return
           }
           if (optionVal.value != '1'){
-            ElMessage.warning('璇烽�夋嫨宸插垎鏋惰鍗曟墦鍗�')
+            ElMessage.warning(t('processCard.addFlowCardMsg1'))
             return
           }
           let orderIdList = ""
@@ -361,7 +364,7 @@
             return
           }
           if (optionVal.value != '0'){
-            ElMessage.warning('璇烽�夋嫨鏈垎鏋惰鍗曟墦鍗�')
+            ElMessage.warning(t('processCard.addFlowCardMsg2'))
             return
           }
           let orderIdList = ""

--
Gitblit v1.8.0