From 33dbc6a161554f3a897f9e9273feb4f2c1b47381 Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期一, 15 十二月 2025 17:04:27 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10105/r/ERP_override
---
north-glass-erp/northglass-erp/src/views/sd/delivery/CreateDelivery.vue | 10 ++++++----
1 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/north-glass-erp/northglass-erp/src/views/sd/delivery/CreateDelivery.vue b/north-glass-erp/northglass-erp/src/views/sd/delivery/CreateDelivery.vue
index ffbf370..4f080d7 100644
--- a/north-glass-erp/northglass-erp/src/views/sd/delivery/CreateDelivery.vue
+++ b/north-glass-erp/northglass-erp/src/views/sd/delivery/CreateDelivery.vue
@@ -333,6 +333,9 @@
resizable: true,
useKey: true
},
+ sortConfig: {
+ multiple: true,
+ },
filterConfig: { //绛涢�夐厤缃」
//remote: true
},
@@ -387,7 +390,7 @@
{'code': 'addToExamine', 'name': t('reportingWorks.saveAndReview'),status: 'primary',icon: 'vxe-icon-save'},
{'code': 'toExamine', 'name': t('basicData.review'),status: 'primary'},
{'code': 'CounterExamination', 'name': t('basicData.cancelReview'),status: 'primary'},
- //{'code': 'addOtherOrders','name': t('璁㈠崟娣诲姞'),'status': 'primary'}
+ //{'code': 'addOtherOrders','name': t('delivery.orderAdd'),'status': 'primary'}
//{'code': 'glassShelf', 'name': t('finishedGlassShelf.finishedGlassShelfEmit'),status: 'primary'}
],
/*import: false,
@@ -465,7 +468,7 @@
otherMoney:otherMoney.value,
deliveryIdType:company.deliveryIdType,
deliveryOutbound:company.deliveryOutbound,
- type:2
+ type:1
})
gridOptions.toolbarConfig.buttons[0].disabled = true
@@ -1101,12 +1104,11 @@
<el-dialog
v-model="dialogSelectOrderVisible"
- :title="t('璁㈠崟娣诲姞')"
+ :title="t('delivery.orderAdd')"
style="width: 70%;height:75% "
destroy-on-close
:close-on-click-modal="false"
:close-on-press-escape="false">
- >
<SelectOrderList
style="width: 100%;height: 600px"
:customer-id="titleUploadData.customerId"
--
Gitblit v1.8.0