From 12f2fd73462da331478fabc7eaa79fc35b1a59b3 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期五, 19 七月 2024 16:41:17 +0800
Subject: [PATCH] Merge branch 'master' of http://bore.pub:10439/r/ERP_override
---
north-glass-erp/northglass-erp/src/views/pp/processCard/SelectPrintProject.vue | 17 ++++++++---------
1 files changed, 8 insertions(+), 9 deletions(-)
diff --git a/north-glass-erp/northglass-erp/src/views/pp/processCard/SelectPrintProject.vue b/north-glass-erp/northglass-erp/src/views/pp/processCard/SelectPrintProject.vue
index 2e69436..15e3a5b 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/processCard/SelectPrintProject.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/processCard/SelectPrintProject.vue
@@ -29,7 +29,7 @@
const getTableRow = (row, type) => {
switch (type) {
case 'edit' :{
- router.push({path: '/main/processCard/PrintFlowCard', query: { orderId: row.order_id }})
+ router.push({path: '/main/processCard/PrintLabel', query: { projectNo: row.project_no }})
break
}
}
@@ -56,7 +56,7 @@
//鑾峰彇涓冨ぉ鍓嶅埌褰撳墠鏃堕棿
function getNowTime() {
- const start = new Date(new Date().getTime() - 3600 * 1000 * 24 * 7)
+ const start = new Date(new Date().getTime() - 3600 * 1000 * 24 * 15)
.toISOString()
.replace('T', ' ')
.slice(0, 10) //榛樿寮�濮嬫椂闂�7澶╁墠
@@ -79,8 +79,8 @@
request.post(`/processCard/selectPrintPrintProject/${startTime}/${endTime}`, filterData.value).then((res) => {
if (res.code == 200) {
- produceList = produceList.value.concat(deepClone(res.data.data))
- xGrid.value.reloadData(produceList)
+ produceList.value = deepClone(res.data.data)
+ xGrid.value.reloadData(produceList.value)
gridOptions.loading = false
} else {
ElMessage.warning(res.msg)
@@ -112,7 +112,7 @@
align: 'center',//鏂囧瓧灞呬腑
stripe: true,//鏂戦┈绾�
rowConfig: {isCurrent: true, isHover: true, height: 30},//榧犳爣绉诲姩鎴栭�夋嫨楂樹寒
- id: 'CustomerList',
+ id: 'SelectPrintProject',
showFooter: true,//鏄剧ず鑴�
printConfig: {},
importConfig: {},
@@ -141,21 +141,21 @@
{title: t('basicData.operate'), width: 80, slots: { default: 'button_slot' },fixed:"left"},
{type: 'seq', fixed: "left", title: t('basicData.Number'), width: 50},
{
- field: 'order_id',
+ field: 'project_no',
title: '宸ョ▼鍙�',
filters: [{data: ''}],
slots: {filter: 'num1_filter'},
filterMethod: filterChanged
},
{
- field: 'quantity',
+ field: 'glass_total',
title: t('order.quantity'),
filters: [{data: ''}],
slots: {filter: 'num1_filter'},
filterMethod: filterChanged
},
{
- field: 'area',
+ field: 'glass_total_area',
title: t('order.area'),
filters: [{data: ''}],
slots: {filter: 'num1_filter'},
@@ -165,7 +165,6 @@
toolbarConfig: {
buttons: [
- {code: 'printLabel', name: t('processCard.printLabel'), status: 'primary'},
],
zoom: true,
--
Gitblit v1.8.0