~admin/ERP_override.git

			@@ -72,17 +72,20 @@
			let otherMoney = ref(null)

			const gridOptions = reactive({
			loading:false,
			border: "full",//表格加边框
			keepSource: true,//保持源数据
			align: 'center',//文字居中
			stripe:true,//斑马纹
			rowConfig: {isCurrent: true, isHover: true,height: 30},//鼠标移动或选择高亮
			//virtualScroll: true, // 开启虚拟滚动功能
			id: 'OrderList',
			showFooter: true,//显示脚
			printConfig: {},
			importConfig: {},
			exportConfig: {},
			scrollY:{ enabled: true },//开启虚拟滚动
			scrollY:{ enabled: true,gt:15 },//开启虚拟滚动
			scrollX:{ enabled: true,gt:30 },//开启虚拟滚动
			showOverflow:true,
			menuConfig: {
			body: {
			@@ -435,6 +438,7 @@

			//初始化判断是否有id传入
			onMounted(()=>{
			gridOptions.loading=true
			//启用表格拖动选中
			addListener(xGrid.value,gridOptions)
			const str = route.query.orderId \|\| history.state.orderId
			@@ -495,15 +499,17 @@
			orderDetails.forEach(item => {
			item.otherColumns = JSON.parse(item.otherColumns)
			})

			//加载副表数据
			otherMoney.value =res.data.orderOtherMoneyList
			//加载副表数据
			xGrid.value.reloadData(orderDetails)
			gridOptions.loading=false
			}else{
			ElMessage.error(res.msg)
			}
			})
			})

			//作废订单
			const cancelOrder = () => {
			request.post(`/order/cancelOrder/${titleUploadData.value.orderId}`).then((res) =>{
			if (res.code== 200){
			@@ -695,7 +701,9 @@
			}else if(column.property.indexOf('otherColumns.M')>-1){
			let quantity = 0
			xGrid.value.getTableData().fullData.forEach(item => {
			quantity += item.quantity(getNestedProperty(item,column.property)1)
			let orderQuantity = isNaN(item.quantity) ? 0 : item.quantity
			let value = isNaN((getNestedProperty(item,column.property)1)) ? 0 : (getNestedProperty(item,column.property)1)
			quantity += orderQuantity*value
			})
			if(!isNaN(quantity)){
			otherMoney.value.forEach(item => {