From ed6f35069824d71ee6da599a328d865eb0c58550 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期四, 25 四月 2024 09:16:26 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/a1536384743/erp_-override
---
north-glass-erp/northglass-erp/src/views/sd/order/CreateOrder.vue | 36 ++++++++++++++++++++++++++++++------
1 files changed, 30 insertions(+), 6 deletions(-)
diff --git a/north-glass-erp/northglass-erp/src/views/sd/order/CreateOrder.vue b/north-glass-erp/northglass-erp/src/views/sd/order/CreateOrder.vue
index 906d786..2a5597d 100644
--- a/north-glass-erp/northglass-erp/src/views/sd/order/CreateOrder.vue
+++ b/north-glass-erp/northglass-erp/src/views/sd/order/CreateOrder.vue
@@ -75,6 +75,8 @@
const gridOptions = reactive({
loading:false,
+ showHeaderOverflow: false,
+ showFooterOverflow: false,
border: "full",//琛ㄦ牸鍔犺竟妗�
keepSource: true,//淇濇寔婧愭暟鎹�
align: 'center',//鏂囧瓧灞呬腑
@@ -86,8 +88,8 @@
printConfig: {},
importConfig: {},
exportConfig: {},
- scrollY:{ enabled: true,gt:15 },//寮�鍚櫄鎷熸粴鍔�
- scrollX:{ enabled: true,gt:30 },//寮�鍚櫄鎷熸粴鍔�
+ scrollY:{ enabled: true,gt:13 },//寮�鍚櫄鎷熸粴鍔�
+ //scrollX:{ enabled: true,gt:15 },//寮�鍚櫄鎷熸粴鍔�
showOverflow:true,
menuConfig: {
body: {
@@ -208,7 +210,7 @@
}
}
}
- ]
+ ],
},
toolbarConfig: {
buttons: [
@@ -531,9 +533,27 @@
otherMoney.value = titleSelectJson.value.orderOtherMoney[0]
//let columns = []
otherMoney.value.forEach(item => {
- let column = {field: `otherColumns.${item.column}`,width:50, title: item.alias,editRender: { name: 'input'}}
+ let column = {
+ field: `otherColumns.${item.column}`,
+ width:50, title: item.alias,
+ editRender: {
+ name: 'input',
+ }
+ }
+ gridOptions.editRules[`otherColumns.${item.column}`] = [
+ {
+ validator ({ cellValue }) {
+ const regex = /^(0|[1-9][0-9]{0,4}([.][0-9]{1,2})?)$/
+ if (cellValue && !regex.test(cellValue)) {
+ return new Error(t('basicData.msg.range99999Dec2'))
+ }
+ }
+ }
+ ]
+
//columns.push(column)
gridOptions.columns.push(column)
+
})
//杩涘叆椤甸潰涓嬫媺妗嗚缃粯璁ゅ��
@@ -922,8 +942,8 @@
:autosize="{ minRows: 2, maxRows: 20 }"
/>
</el-dialog>
- <el-dialog v-model="productVisible" style="width: 80%;height:75% ">
- <select-product :rowIndex="rowIndex" @getProductRow="getProductRow" style="width: 1188px;height: 500px" />
+ <el-dialog id="product" v-model="productVisible" style="width: 80%;height:75% ">
+ <select-product :rowIndex="rowIndex" @getProductRow="getProductRow" style="width: 100%;height: 100%" />
</el-dialog>
<!--璇樊缁撶畻-->
<el-dialog v-model="errorAreaVisible" style="width: 300px;height:150px ">
@@ -983,5 +1003,9 @@
-ms-user-select: none;
user-select: none;
}
+ :deep(#product .el-dialog__body){
+ height: 90%;
+ width: 100%;
+ }
</style>
\ No newline at end of file
--
Gitblit v1.8.0