From a660db06773007b1be690e0674829c00a57aeb7b Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期三, 24 十二月 2025 16:21:23 +0800
Subject: [PATCH] 订单首页流程卡新增楼层编号显示

---
 north-glass-erp/northglass-erp/src/components/sd/order/OrderProcess.vue |   37 ++++++++++++++++++++++++++-----------
 1 files changed, 26 insertions(+), 11 deletions(-)

diff --git a/north-glass-erp/northglass-erp/src/components/sd/order/OrderProcess.vue b/north-glass-erp/northglass-erp/src/components/sd/order/OrderProcess.vue
index f4fa07f..a80a3f4 100644
--- a/north-glass-erp/northglass-erp/src/components/sd/order/OrderProcess.vue
+++ b/north-glass-erp/northglass-erp/src/components/sd/order/OrderProcess.vue
@@ -23,8 +23,8 @@
   printConfig: {},
   importConfig: {},
   exportConfig: {},
-  scrollY:{ enabled: true,gt:13 },//寮�鍚櫄鎷熸粴鍔�
-  scrollX:{ enabled: true,gt:15 },//寮�鍚櫄鎷熸粴鍔�
+  // scrollY:{ enabled: true,gt:13 },//寮�鍚櫄鎷熸粴鍔�
+  // scrollX:{ enabled: true,gt:15 },//寮�鍚櫄鎷熸粴鍔�
   filterConfig: {   //绛涢�夐厤缃」
     // remote: true
   },
@@ -97,11 +97,13 @@
 
 let props = defineProps({
   orderId:null,
-  row: {}
+  row: {},
+  processId:null//鐢ㄤ簬鍚庣鏁版嵁杩斿洖锛岀粨鏋滅瓫閫�
 })
 const columns = [
   {field: 'order_number',fixed:"left", width: 90,title: t('order.OrderNum'),showOverflow:"ellipsis",filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
   // {type:'expand',fixed:"left",slots: { content:'content' },width: 50},
+  {field: 'building_number', width: 150, title: t('order.buildingNumber'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
   {field: 'product_name', width: 150, title: t('order.product'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
   {field: 'glass_child',width: 130, title: t('reportingWorks.glassChild') ,filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
   {field: 'order_type', width: 120,title: t('order.orderType'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
@@ -119,7 +121,7 @@
   {field: 'StorageArea',slots: { default: 'show'},width: 120, title: t('report.StorageArea')},
   {field: 'broken_num',width: 90, title: t('reportingWorks.quantityBroken')},
 ]
-let column = ['order_number','product_name','order_type','quantity','grossArea','Storage','StorageArea']
+let column = ['order_number','building_number','product_name','order_type','quantity','grossArea','Storage','StorageArea']
 let orderType = ref(1)
 
 onMounted(()=>{
@@ -136,20 +138,17 @@
   switch (orderType.value)  {
     case 1 :{
       xGrid.value.loadData(data.value)
-      //xGrid.value.setMergeCells(mergeCells.value)
       xGrid.value.updateFooter()
       break
     }
     case 2 :{
       xGrid.value.loadData(data.value)
-      //xGrid.value.clearMergeCells()
       xGrid.value.clearMergeFooterItems()
       xGrid.value.updateFooter()
 
       break
     }
     case 3:{
-      //xGrid.value.clearMergeCells()
       xGrid.value.clearMergeFooterItems()
       xGrid.value.updateFooter()
       const lastProcess = title.value[title.value.length-1].process
@@ -202,7 +201,6 @@
       })
       orderType.value = 1
       await xGrid.value.loadData(res.data.data)
-      //await xGrid.value.setMergeCells(res.data.mergeCells)
       mergeCells.value = res.data.mergeCells
       data.value = res.data.data
       gridOptions.loading = false
@@ -219,7 +217,6 @@
       //xGrid.value.clearMergeCells()
       xGrid.value.clearMergeFooterItems()
     } else {
-      //xGrid.value.setMergeCells(mergeCells.value)
       xGrid.value.updateFooter()
     }
   }
@@ -239,7 +236,12 @@
       }
 
     }else {
-      count += Number(item[field])  || 0
+      if(xGrid.value.isFilter() || orderType.value!==1) {
+        count += Number(item[field+'Show']) || Number(item[field])   || 0
+      } else {
+        count += Number(item[field])  || 0
+      }
+
     }
   })
   return count.toFixed(2).replace(/\.?0+$/, '');
@@ -266,6 +268,16 @@
 const changeZoom = ()=> {
   showTitle.value = !showTitle.value
 }
+
+const rowStyle = ({ row,rowIndex  }) => {
+    if(row.termination_status==1){
+      return {
+        backgroundColor: 'rgb(186 188 192)'
+      }
+    }
+
+
+}
 </script>
 
 <template>
@@ -279,6 +291,7 @@
         ref="xGrid"
         v-bind="gridOptions"
         v-on="gridEvents"
+        :row-style="rowStyle"
     >
       <template #num1_filter="{ column, $panel }">
         <div>
@@ -303,7 +316,9 @@
       <template #title>
         <span style="font-weight: bold" v-show="showTitle">
           {{ row.orderId }}
-          {{ row.project?'--':'' }}
+          {{ row.customerName?'--':'' }}
+          {{ row.customerName}}
+          {{row.project?'--':'' }}
           {{row.project}}
           {{ row.batch?'--':'' }}
           {{row.batch}}

--
Gitblit v1.8.0