From 4aff3b8d0640e9a84f7408100551e740bacaa2a0 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期五, 09 八月 2024 11:24:28 +0800
Subject: [PATCH] Merge branch 'master' of http://bore.pub:10439/r/ERP_override

---
 north-glass-erp/northglass-erp/src/components/pp/SelectSortDetailProcessCard.vue |   31 ++++++++++++++++++++-----------
 1 files changed, 20 insertions(+), 11 deletions(-)

diff --git a/north-glass-erp/northglass-erp/src/components/pp/SelectSortDetailProcessCard.vue b/north-glass-erp/northglass-erp/src/components/pp/SelectSortDetailProcessCard.vue
index 0152f3b..0fe33d8 100644
--- a/north-glass-erp/northglass-erp/src/components/pp/SelectSortDetailProcessCard.vue
+++ b/north-glass-erp/northglass-erp/src/components/pp/SelectSortDetailProcessCard.vue
@@ -25,7 +25,8 @@
 let router = useRouter()
 let props = defineProps({
   processId:null,
-  technologyNumber:null
+  technologyNumber:null,
+  process:null
 })
 domZindex.setCurrent(3000)
 
@@ -66,7 +67,7 @@
 })
 
 //绗竴娆″姞杞芥暟鎹�
-request.post(`/processCard/printFlowCardDetails/${props.processId}/${props.technologyNumber}`,filterData.value).then((res) => {
+request.post(`/processCard/printFlowCardDetails/${props.processId}/${props.technologyNumber}/${props.process}`,filterData.value).then((res) => {
   if (res.code == 200) {
     produceDetailList.value = (res.data.data)
     xGridDetail.value.reloadData(produceDetailList.value)
@@ -180,7 +181,7 @@
     {type: 'seq', fixed: "left", title: t('basicData.Number'), width: 50},
     {
       field: 'sort',
-      width: 80,
+      width: 70,
       editRender: {name: 'input', attrs: {placeholder: ''}},
       title: t('processCard.sorting'),
     },
@@ -189,42 +190,42 @@
       title: t('processCard.processId'),
       filters: [{data: ''}],
       slots: {filter: 'num1_filter'},
-      filterMethod: filterChanged
+      filterMethod: filterChanged,width: 130
     },
     {
       field: 'order_number',
       title: t('order.OrderNum'),
       filters: [{data: ''}],
       slots: {filter: 'num1_filter'},
-      filterMethod: filterChanged
+      filterMethod: filterChanged,width: 100
     },
     {
       field: 'technology_number',
       title: t('processCard.technologyNumber'),
       filters: [{data: ''}],
       slots: {filter: 'num1_filter'},
-      filterMethod: filterChanged
+      filterMethod: filterChanged,width: 100
     },
     {
       field: 'glass_address',
       title: t('processCard.glassAddress'),
       filters: [{data: ''}],
       slots: {filter: 'num1_filter'},
-      filterMethod: filterChanged
+      filterMethod: filterChanged,width: 100
     },
     {
       field: 'glass_child',
       title: t('reportingWorks.glassChild'),
       filters: [{data: ''}],
       slots: {filter: 'num1_filter'},
-      filterMethod: filterChanged
+      filterMethod: filterChanged,width: 120
     },
     {
       field: 'quantity',
       title: t('order.quantity'),
       filters: [{data: ''}],
       slots: {filter: 'num1_filter'},
-      filterMethod: filterChanged
+      filterMethod: filterChanged,width: 70
     },
     {
       field: 'child_width',
@@ -233,6 +234,7 @@
       slots: {filter: 'num1_filter'},
       filterMethod: filterChanged,
       sortable: true,
+      width: 100
     },
     {
       field: 'child_height',
@@ -240,14 +242,21 @@
       filters: [{data: ''}],
       slots: {filter: 'num1_filter'},
       filterMethod: filterChanged,
-      sortable: true,
+      sortable: true,width: 100
     },
     {
       field: 'area',
       title: t('order.area'),
       filters: [{data: ''}],
       slots: {filter: 'num1_filter'},
-      filterMethod: filterChanged
+      filterMethod: filterChanged,width: 100
+    },
+    {
+      field: 'process',
+      title: t('craft.process'),
+      filters: [{data: ''}],
+      slots: {filter: 'num1_filter'},
+      filterMethod: filterChanged,width: 120
     },
 
   ],

--
Gitblit v1.8.0