From 99d0bb96043ba5d6db66bbfb00f67ca4e09f3ffb Mon Sep 17 00:00:00 2001
From: guoyuji <guoyujie@ng.com>
Date: 星期五, 07 三月 2025 09:08:33 +0800
Subject: [PATCH] 小片尺寸和成品尺寸不相同时，打印显示小片信息

---
 north-glass-erp/northglass-erp/src/views/pp/report/ProcessCardProgress.vue |   55 ++++++++++++++++++++++++++++++++++++++++++++-----------
 1 files changed, 44 insertions(+), 11 deletions(-)

diff --git a/north-glass-erp/northglass-erp/src/views/pp/report/ProcessCardProgress.vue b/north-glass-erp/northglass-erp/src/views/pp/report/ProcessCardProgress.vue
index 8e65a26..6583a68 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/report/ProcessCardProgress.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/report/ProcessCardProgress.vue
@@ -4,7 +4,7 @@
 import {ElDatePicker, ElMessage} from "element-plus"
 import {nextTick, onMounted, onUnmounted, reactive, ref, watch} from "vue"
 import {Search} from "@element-plus/icons-vue"
-import {useRouter} from 'vue-router'
+import {useRoute, useRouter} from 'vue-router'
 import {changeFilterEvent, filterChanged} from "@/hook"
 
 import { useI18n } from 'vue-i18n'
@@ -12,16 +12,25 @@
 //璇█鑾峰彇
 const { t } = useI18n()
 let router=useRouter()
+const route = useRoute()
 
 let props = defineProps({
   orderId:null
 })
 onMounted(()=>{
   if(props.orderId===null  || props.orderId===undefined || props.orderId===''){
-    return
+
+  }else{
+    form.orderId = props.orderId
+    getWorkOrder()
   }
-  form.orderId = props.orderId
-  getWorkOrder()
+  if(route.query.orderId===null  || route.query.orderId===undefined || route.query.orderId===''){
+
+  }else {
+    form.orderId = route.query.orderId
+    getWorkOrder()
+  }
+
 })
 
 
@@ -48,21 +57,24 @@
   }
 })
 
+
 //闇�瑕佸悎骞剁殑鍒�
 let column = [1,3,8]
 //鐐瑰嚮鏌ヨ
 const getWorkOrder = () => {
+  gridOptions.columns = gridOptions.columns.slice(0, 11); //娓呴櫎鍔ㄦ�佺敓鎴愮殑鍒楅噸鏂版煡璇�
   request.post(`/report/processCardProgress/${form.orderId}`, column).then((res) => {
     if (res.code == 200) {
       if (res.data.data.length === 0) {
         ElMessage.warning(t('report.noDataFoundForThisOrder'))
         return
       }
+
       // 鍔ㄦ�佹坊鍔犲垪
       res.data.title.forEach((item, index) => {
         let column = {
           slots: { default: 'quantitySum' },
-          width: 90,
+          width: 150,
           title: item.process,
           field: `dynamicColumn${index}` // 涓哄姩鎬佸垪娣诲姞鍞竴鐨� field
         }
@@ -71,6 +83,7 @@
       res.data.data.forEach(item => {
         item.reportWorkQuantity = JSON.parse(item.reportWorkQuantity)
         item.reportWorkQuantityCount = JSON.parse(item.reportWorkQuantityCount)
+        //item.reportWorkTime = JSON.parse(item.reportWorkTime)
       })
       mergeCells.value = res.data.mergeCell
       xGrid.value.loadData(res.data.data)
@@ -92,14 +105,34 @@
 const quantitySum = ( row,column )=>{
   const reportWorkQuantity = row.reportWorkQuantity[column.title] || 0
   const reportWorkQuantityCount = row.reportWorkQuantityCount[column.title] || 0
-  if(reportWorkQuantity===reportWorkQuantityCount){
-    return reportWorkQuantity
+  const reportWorkTime = row.reportWorkTime[column.title] || 0
+  if (reportWorkTime===0){
+    if(reportWorkQuantity===reportWorkQuantityCount){
+      return reportWorkQuantity
+    }
+
+    return (reportWorkQuantity
+        +'('
+        +reportWorkQuantityCount
+        +')' )
+  }
+  else {
+    if(reportWorkQuantity===reportWorkQuantityCount){
+      return (reportWorkQuantity+'['
+          +reportWorkTime
+          +']')
+    }
+
+    return (reportWorkQuantity
+        +'('
+        +reportWorkQuantityCount
+        +')'
+        +'['
+        +reportWorkTime
+        +']'
+    )
   }
 
-  return (reportWorkQuantity
-      +'('
-      +reportWorkQuantityCount
-      +')' )
   //return
 }
 

--
Gitblit v1.8.0