From 46bf33053daa5f2bfe163822ce4f793f669024f8 Mon Sep 17 00:00:00 2001
From: guoyuji <guoyujie@ng.com>
Date: 星期一, 10 三月 2025 08:28:13 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override
---
north-glass-erp/northglass-erp/src/views/pp/processCard/SplittingDetails.vue | 19 ++++++++-----------
1 files changed, 8 insertions(+), 11 deletions(-)
diff --git a/north-glass-erp/northglass-erp/src/views/pp/processCard/SplittingDetails.vue b/north-glass-erp/northglass-erp/src/views/pp/processCard/SplittingDetails.vue
index cc40845..35635da 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/processCard/SplittingDetails.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/processCard/SplittingDetails.vue
@@ -19,7 +19,7 @@
//alert('鎴戞帴鏀跺埌瀛愮粍浠朵紶閫佺殑缂栬緫淇℃伅')
router.push({
path: '/main/processCard/AddProcessCard',
- query: {orderId: row.order_id, productionId: row.production_id}
+ query: {orderId: row.order_id, productionId: row.production_id, quantity:row.quantity}
})
break
}
@@ -99,7 +99,7 @@
align: 'center',//鏂囧瓧灞呬腑
stripe: true,//鏂戦┈绾�
rowConfig: {isCurrent: true, isHover: true, height: 30},//榧犳爣绉诲姩鎴栭�夋嫨楂樹寒
- id: 'demo_1',
+ id: 'SplittingDetails',
showFooter: true,//鏄剧ず鑴�
printConfig: {},
importConfig: {},
@@ -161,12 +161,9 @@
],//琛ㄥご鎸夐挳
toolbarConfig: {
- // buttons: [{
- //
- // }],
- // import: false,
- // export: true,
- // print: true,
+ // buttons: [
+ // {code: 'editCheckbox', name: t('basicData.edit'), status: 'primary'},
+ // ],
zoom: true,
custom: true
},
@@ -197,8 +194,7 @@
<vxe-grid
ref="xGrid"
class="mytable-scrollbar"
- height="600px"
- max-height="100%"
+ height="100%"
v-bind="gridOptions"
@@ -221,7 +217,7 @@
<!-- <el-button link size="small" type="primary" @click="getTableRow(row,'edit')">{{ $t('basicData.edit') }}-->
<!-- </el-button>-->
<el-button @click="getTableRow(row,'edit')"
- v-if="userStore.user.permissions.indexOf('SplittingDetails.edit') > -1"
+ v-if="userStore.user.permissions.indexOf('splittingDetails.edit') > -1"
link
type="primary"
size="small">
@@ -234,6 +230,7 @@
<div v-for="(option, index) in column.filters" :key="index">
<input type="text"
v-model="option.data"
+ @keyup.enter.native="$panel.confirmFilter()"
@input="changeFilterEvent($event, option, $panel)"/>
</div>
</div>
--
Gitblit v1.8.0