From ace95320b2520e9c16cf09b7673ca52935756e97 Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期四, 25 七月 2024 16:56:47 +0800
Subject: [PATCH] 补片返工审核添加编号字段,标签打印打印方式修改成和流程卡打印相同,补片同步修改,修改流程卡打印查询和不同配置流程卡打印方式,添加部分字段

---
 north-glass-erp/northglass-erp/src/views/pp/processCard/ProductionScheduling.vue |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/north-glass-erp/northglass-erp/src/views/pp/processCard/ProductionScheduling.vue b/north-glass-erp/northglass-erp/src/views/pp/processCard/ProductionScheduling.vue
index f1fca12..24adc3c 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/processCard/ProductionScheduling.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/processCard/ProductionScheduling.vue
@@ -155,6 +155,7 @@
       total.dataTotal = res.data.total.total * 1
       total.pageTotal = res.data.total.pageTotal
       pageTotal.value = res.data.total
+      console.log(res.data.data)
       xGrid.value.loadData(res.data.data)
       gridOptions.loading = false
       if (selectState==1){
@@ -322,7 +323,7 @@
 
     // {field: '鎺掍骇缂栧彿', title: '鎺掍骇缂栧彿',  width: 120 },
     {
-      field: 'orderGlassDetail.orderId',
+      field: 'order.orderId',
       title: t('order.orderId'),
       filters: [{data: ''}],
       slots: {filter: 'num1_filter'},
@@ -690,8 +691,7 @@
     <vxe-grid
         ref="xGrid"
         class="mytable-scrollbar"
-        height="500px"
-        max-height="100%"
+        height="95%"
         v-bind="gridOptions"
         v-on="gridEvents"
         @filter-change="filterChanged"

--
Gitblit v1.8.0