From 5af5cfaab5aa3c11ae1a4cb22dfaf808e12ed5e9 Mon Sep 17 00:00:00 2001
From: guoyuji <guoyujie@ng.com>
Date: 星期二, 04 三月 2025 11:03:32 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override

---
 north-glass-erp/northglass-erp/src/views/pp/processCard/SelectPrintFlowCard.vue |   77 +++++++++++++++++++++++++++++++++++---
 1 files changed, 70 insertions(+), 7 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 8d9f0b7..564d38c 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
@@ -44,6 +44,19 @@
 let produceList = ref([])
 let titleStyleVisible = ref(false)
 
+//瀹氫箟鍒嗘灦鐘舵��
+const optionVal = ref('1')
+const options = [
+  {
+    value: '0',
+    label: '鏈垎鏋�',
+  },
+  {
+    value: '1',
+    label: '宸插垎鏋�',
+  },
+]
+
 
 const form = reactive({
   date1: '',
@@ -104,7 +117,7 @@
 let endTime = orderInfo.workOrderDate[1]
 let orderId=form.orderId
 let project=form.project
-
+let state = optionVal.value
 if (orderId==''){
   orderId=null
 }
@@ -114,7 +127,7 @@
 
 //绗竴娆″姞杞芥暟鎹�
 
-request.post(`/processCard/selectPrintFlowCard/${startTime}/${endTime}/${orderId}/${project}/${userId}`, filterData.value).then((res) => {
+request.post(`/processCard/selectPrintFlowCard/${startTime}/${endTime}/${orderId}/${project}/${userId}/${state}`, filterData.value).then((res) => {
 
   if (res.code == 200) {
     produceList = produceList.value.concat(deepClone(res.data.data))
@@ -145,7 +158,9 @@
   if (project==''){
     project=null
   }
-  request.post(`/processCard/selectPrintFlowCard/${startTime}/${endTime}/${orderId}/${project}/${userId}`, filterData.value).then((res) => {
+  let state = optionVal.value
+
+  request.post(`/processCard/selectPrintFlowCard/${startTime}/${endTime}/${orderId}/${project}/${userId}/${state}`, filterData.value).then((res) => {
     if (res.code == 200) {
 
       xGrid.value.loadData(res.data.data)
@@ -232,7 +247,7 @@
       //{'code': 'titleStyle', 'name': t('processCard.labelStyle'),status: 'primary'},
       {code: 'detailsPrint', name: t('processCard.detailPrinting'), status: 'primary'},
       {code: 'detailsProcessPrint', name: t('processCard.detailsPrintedSeparately'), status: 'primary'},
-
+      {code: 'orderPrint', name: '璁㈠崟鎵撳嵃', status: 'primary'},
     ],
 
     zoom: true,
@@ -272,7 +287,10 @@
             ElMessage.warning(t('searchOrder.msgList.checkOrder'))
             return
           }
-
+          if (optionVal.value != '1'){
+            ElMessage.warning('璇烽�夋嫨宸插垎鏋惰鍗曟墦鍗�')
+            return
+          }
           let orderIdList = ""
           for (let i = 0; i < selectRecords.length; i++) {
             if (i + 1 === selectRecords.length) {
@@ -292,7 +310,10 @@
             ElMessage.warning(t('searchOrder.msgList.checkOrder'))
             return
           }
-
+          if (optionVal.value != '1'){
+            ElMessage.warning('璇烽�夋嫨宸插垎鏋惰鍗曟墦鍗�')
+            return
+          }
           let orderIdList = ""
           for (let i = 0; i < selectRecords.length; i++) {
             if (i + 1 === selectRecords.length) {
@@ -312,7 +333,10 @@
             ElMessage.warning(t('searchOrder.msgList.checkOrder'))
             return
           }
-
+          if (optionVal.value != '1'){
+            ElMessage.warning('璇烽�夋嫨宸插垎鏋惰鍗曟墦鍗�')
+            return
+          }
           let orderIdList = ""
           for (let i = 0; i < selectRecords.length; i++) {
             if (i + 1 === selectRecords.length) {
@@ -323,6 +347,29 @@
           }
           let array = orderIdList.split('|');
           router.push({path: '/main/processCard/PrintFlowCardDetails', query: {printList: JSON.stringify(selectRecords),checkedValue:checkedValue.value.value,type:2}})
+          return;
+
+        }
+        case 'orderPrint': {
+          const selectRecords = $grid.getCheckboxRecords()
+          if(selectRecords===null ||selectRecords===''||selectRecords.length===0){
+            ElMessage.warning(t('searchOrder.msgList.checkOrder'))
+            return
+          }
+          if (optionVal.value != '0'){
+            ElMessage.warning('璇烽�夋嫨鏈垎鏋惰鍗曟墦鍗�')
+            return
+          }
+          let orderIdList = ""
+          for (let i = 0; i < selectRecords.length; i++) {
+            if (i + 1 === selectRecords.length) {
+              orderIdList += selectRecords[i].order_id
+            } else {
+              orderIdList += selectRecords[i].order_id + "|"
+            }
+          }
+          let array = orderIdList.split('|');
+          router.push({path: '/main/processCard/PrintFlowCardDetails', query: {printList: JSON.stringify(selectRecords),checkedValue:checkedValue.value.value,type:3}})
           return;
 
         }
@@ -351,6 +398,22 @@
         &nbsp;&nbsp;
         <el-input v-model="form.project" clearable :placeholder="$t('order.project')" style="width: 110px"></el-input>
         &nbsp;&nbsp;
+
+      <el-select
+          :default-first-option="true"
+          ref="getSelect" style="width: 130px"
+          v-model="optionVal"
+          class="m-2"
+          @change="getWorkOrder"
+      >
+        <el-option
+            v-for="item in options"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"
+        />
+      </el-select>
+      &nbsp;&nbsp;
         <el-button
             id="select"
             :icon="Search"

--
Gitblit v1.8.0