From 2f0300262d41b2fc3669b93c2e03cfc2586d2b9e Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期二, 04 六月 2024 16:09:41 +0800
Subject: [PATCH] Merge branch 'master' of http://bore.pub:10439/r/ERP_override
---
north-glass-erp/northglass-erp/src/views/sd/order/CreateOrder.vue | 37 ++++++++++++++++++++++++++++++++-----
1 files changed, 32 insertions(+), 5 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 e90865b..fa63aea 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
@@ -2,7 +2,7 @@
import {onMounted, reactive, ref, watch} from "vue"
import {useRouter,useRoute} from "vue-router"
import * as XLXS from "xlsx"
-import {ElMessage} from "element-plus"
+import {ElMessage, ElMessageBox} from "element-plus"
import request from "@/utils/request"
import deepClone from "@/utils/deepClone"
import useUserInfoStore from '@/stores/userInfo'
@@ -93,7 +93,7 @@
importConfig: {},
exportConfig: {},
scrollY:{ enabled: true,gt:13 },//寮�鍚櫄鎷熸粴鍔�
- //scrollX:{ enabled: true,gt:15 },//寮�鍚櫄鎷熸粴鍔�
+ scrollX:{ enabled: true,gt:7 },//寮�鍚櫄鎷熸粴鍔�
showOverflow:true,
menuConfig: {
body: {
@@ -327,12 +327,40 @@
ElMessage.error(t('basicData.msg.checkoutLose'))
return
}
+
let order ={
title:titleUploadData.value,
- detail:$grid.getTableData().tableData,
+ detail:$grid.getTableData().fullData,
otherMoney:otherMoney.value
}
- saveOrder(order)
+ const errorAreaList = $grid.getTableData().fullData.filter(
+ item=>item.computeArea*1 < errorArea.value*1
+ )
+ if(errorAreaList.length){
+ ElMessageBox.confirm(
+ `瀛樺湪
+ ${errorAreaList.length}
+ 鏉＄粨绠楀崟鐗囬潰绉皬浜�
+ ${errorArea.value}鏄惁鎸夌収${errorArea.value}璁＄畻`,
+ 'Warning',
+ {
+ confirmButtonText: '纭畾',
+ cancelButtonText: '鍙栨秷',
+ type: 'warning',
+ }
+ ).then(()=>{
+ errorAreaComputed()
+ saveOrder(order)
+ }).catch(()=>{
+ saveOrder(order)
+ })
+
+ }
+
+
+
+
+
}
break
}
@@ -1096,7 +1124,6 @@
id="sizeCheck"
v-model="sizeCheckVisible"
:title="'灏哄鏍￠獙'"
- destroy-on-close
:close-on-click-modal="false"
:close-on-press-escape="false"
style="width: 614px;height:445px "
--
Gitblit v1.8.0