ERP_override.git

			@@ -6,6 +6,7 @@
			import request from "@/utils/request"
			import deepClone from "@/utils/deepClone"
			import useUserInfoStore from '@/stores/userInfo'
			import companyInfo from "@/stores/sd/companyInfo"
			import SelectProduct from "@/views/sd/product/SelectProduct.vue"
			import OrderOtherMoney from "@/components/sd/order/OrderOtherMoney.vue"
			import OrderSizeCheck from "@/components/sd/order/OrderSizeCheck.vue"
			@@ -24,6 +25,7 @@
			const maxTableLen =ref(150)
			let errorArea = ref(0.4)
			const userStore = useUserInfoStore()
			const company = companyInfo()
			const router = useRouter()
			const route = useRoute()
			const xGrid = ref()
			@@ -219,9 +221,9 @@
			{
			validator ({ cellValue }) {
			//const regex = /^(0(\.\d{1,2})?\|([1-9]\d{0,4})(\.\d{1,2})?\|99999(\.9{1,2})?)$/
			const regex = /^(0\|[1-9][0-9]{0,4}([.][0-9]{1,2})?)$/
			const regex = company.widHeiLength.regexp
			if (!regex.test(cellValue)) {
			return new Error(t('basicData.msg.range99999Dec2'))
			return new Error(t(company.widHeiLength.msg))
			}
			}
			}
			@@ -229,9 +231,9 @@
			height:[
			{
			validator ({ cellValue }) {
			const regex = /^(0\|[1-9][0-9]{0,4}([.][0-9]{1,2})?)$/
			const regex = company.widHeiLength.regexp
			if ( !regex.test(cellValue)) {
			return new Error(t('basicData.msg.range99999Dec2'))
			return new Error(t(t(company.widHeiLength.msg)))
			}
			}
			}
			@@ -652,9 +654,15 @@
			titleUploadData.value.delivery=null
			titleUploadData.value.createTime=null

			const orderDetails = res.data.orderDetails
			orderDetails.forEach(item => {
			item.otherColumns = JSON.parse(item.otherColumns)
			})

			if(history.state.type=='copy'){
			xGrid.value.reloadData(res.data.orderDetails)
			xGrid.value.reloadData(orderDetails)
			}

			gridOptions.loading = false
			return
			}
			@@ -786,7 +794,6 @@

			//查询重复订单方法
			const selectOrder = (order) => {
			console.log(order)
			request.post(`/order/selectOrder`,order).then((res) => {
			if(res.code==200){
			if(res.data.data>0){
			@@ -1319,6 +1326,7 @@
			>
			<order-size-check
			@getParent="gaveOrderSizeCheck"
			:orderId="titleUploadData.orderId"
			:OrderDetail="xGrid"/>
			</el-dialog>