From d7c8e07d5e7dca7582f019fd4a8283a28f8fe027 Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期二, 10 九月 2024 10:26:38 +0800
Subject: [PATCH] 报工新增流程卡查询语句修改,一行两列打印标签修改

---
 north-glass-erp/northglass-erp/src/components/sd/order/OrderProcess.vue |   32 ++++++++++++++++++--------------
 1 files changed, 18 insertions(+), 14 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 b83e218..212fd0c 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
@@ -3,7 +3,7 @@
 import {changeFilterEvent, filterChanged} from "@/hook"
 import {useI18n} from "vue-i18n"
 import request from "@/utils/request"
-import {ElMessage} from "element-plus";
+import {ElMessage} from "element-plus"
 const { t } = useI18n()
 const xGrid = ref()
 const gridOptions = reactive({
@@ -15,7 +15,7 @@
   showOverflow:true,
   rowConfig: {isCurrent: true, isHover: true,height: 30},//榧犳爣绉诲姩鎴栭�夋嫨楂樹寒
   virtualScroll: true, // 寮�鍚櫄鎷熸粴鍔ㄥ姛鑳�
-  id: 'OrderList',
+  id: 'OrderProcess',
   printConfig: {},
   importConfig: {},
   exportConfig: {},
@@ -35,7 +35,11 @@
   columns:[
 
   ],
-  mergeCells:[]
+  mergeCells:[],
+  toolbarConfig: {
+    zoom: true,
+    custom: true
+  }
 
 
 })
@@ -44,19 +48,19 @@
   orderId:null
 })
 const columns = [
-  {field: 'order_number',fixed:"left", width: 90,title: '璁㈠崟搴忓彿',showOverflow:"ellipsis"},
+  {field: 'order_number',fixed:"left", width: 90,title: t('order.OrderNum'),showOverflow:"ellipsis"},
   // {type:'expand',fixed:"left",slots: { content:'content' },width: 50},
-  {field: 'product_name', width: 150, title: '浜у搧鍚嶇О',filters:[{ data: '' }],slots: { filter: 'num1_filter' },filterMethod: filterChanged},
-  {field: 'glass_child',width: 130, title: '鍗曠墖鍚嶇О' ,filters:[{ data: '' }],slots: { filter: 'num1_filter' },filterMethod: filterChanged},
-  {field: 'order_type', width: 120,title: '璁㈠崟绫诲瀷',filters:[{ data: '' }],slots: { filter: 'num1_filter' },filterMethod: filterChanged},
-  {field: 'process_id',width: 110, title: '娴佺▼鍗″彿',filters:[{ data: '' }],slots: { filter: 'num1_filter' },filterMethod: filterChanged},
+  {field: 'product_name', width: 150, title: t('order.product'),filters:[{ data: '' }],slots: { filter: 'num1_filter' },filterMethod: filterChanged},
+  {field: 'glass_child',width: 130, title: t('reportingWorks.glassChild') ,filters:[{ data: '' }],slots: { filter: 'num1_filter' },filterMethod: filterChanged},
+  {field: 'order_type', width: 120,title: t('order.orderType'),filters:[{ data: '' }],slots: { filter: 'num1_filter' },filterMethod: filterChanged},
+  {field: 'process_id',width: 110, title: t('processCard.processId'),filters:[{ data: '' }],slots: { filter: 'num1_filter' },filterMethod: filterChanged},
 
-  {field: 'technology_number', width: 90,title: '灏忕墖椤哄簭',showOverflow:"ellipsis"},
-  {field: 'quantity', width: 90,title: '鏁伴噺'},
-  {field: 'shippedQuantity',width: 120, title: '鍙戣揣鏁伴噺'},
-  {field: 'inventory',width: 120, title: '搴撳瓨鏁伴噺'},
-  {field: 'inventoryArea',width: 120, title: '搴撳瓨闈㈢Н'},
-  {field: 'broken_num',width: 90, title: '娆$牬鏁伴噺'},
+  {field: 'technology_number', width: 90,title:  t('processCard.technologyNumber'),showOverflow:"ellipsis"},
+  {field: 'quantity', width: 90,title: t('order.quantity')},
+  {field: 'shippedQuantity',width: 120, title: t('delivery.deliveryQuantity')},
+  {field: 'inventory',width: 120, title: t('productStock.inventoryQuantity')},
+  {field: 'inventoryArea',width: 120, title: t('report.inventoryArea')},
+  {field: 'broken_num',width: 90, title: t('reportingWorks.quantityBroken')},
 ]
 let column = [0,1,3,6,7,8,9]
 

--
Gitblit v1.8.0