~admin/ERP_override.git

			@@ -26,13 +26,17 @@
			break
			}
			case 'delete': {
			request.post(`/workOrder/deleteOrderWork/${row.orderId}/${row.orderDetail.productName}`).then((res) => {
			let startTime = form.date1[0]
			let endTime = form.date1[1]
			let state = optionVal.value
			console.log(startTime, endTime, state)
			request.post(`/workOrder/deleteOrderWork/${row.orderId}/${row.productionId}`).then((res) => {
			if (res.code == 200) {
			ElMessage.success(t('workOrder.deleteOk'))
			location.reload();
			//location.reload();
			router.push({path: '/main/workOrder/SelectWorkOrder', query: {startTime:startTime,endTime:endTime,state:state,random:Math.random()}})
			} else {
			ElMessage.warning(res.msg)
			router.push("/login")
			}
			})
			break
			@@ -103,7 +107,7 @@
			let pageNum = $ref(1)
			let pageState = null

			//获取七天前到当前时间
			//获取3天前到当前时间
			function getNowTime() {
			const start = new Date(new Date().getTime() - 3600 * 1000 * 24 * 3)
			.toISOString()
			@@ -117,14 +121,14 @@
			}


			//第一次加载获取近七天时间和默认状态
			//第一次加载获取近3天时间和默认状态
			form.date1 = getNowTime()
			let startTime = form.date1[0]
			let endTime = form.date1[1]
			let state = optionVal.value

			//第一次加载数据

			console.log('第一次加载数据:',state,startTime,endTime)
			request.post(`/workOrder/orderGlassDetail/${startTime}/${endTime}/${state}`, filterData.value).then((res) => {

			if (res.code == 200) {
			@@ -247,13 +251,11 @@
			, width: 130
			},
			{field: 'order.batch', title: t('order.batch'), filters: [{data: ''}], slots: {filter: 'num1_filter'}, width: 110},
			{field: 'orderDetail.productName', title: t('order.product'), filters: [{data: ''}], slots: {filter: 'num1_filter'}, width: 210},
			{field: 'orderDetail.computeArea', title: t('order.computeArea'), showOverflow: "ellipsis", width: 110},
			{field: 'orderDetail.quantity', title: t('order.quantity'), width: 70},
			{field: 'orderDetail.computeGrossArea', title: t('order.trueGrossArea'),},
			{field: 'orderDetail.perimeter', title: t('workOrder.perimeter'), showOverflow: "ellipsis"},
			{field: 'orderDetail.bendRadius', title: t('order.bendRadius'),},
			{field: 'orderDetail.processingNote', title: t('order.processingNote'),}
			{field: 'order.project', title: '项目名称', filters: [{data: ''}], slots: {filter: 'num1_filter'}, width: 210},
			{field: 'order.orderType', title: '订单类型', showOverflow: "ellipsis", width: 110},
			{field: 'orderDetail.grossArea', title: '面积', width: 70},
			{field: 'orderDetail.quantity', title: '数量',},
			{field: 'order.creator', title: '创建人',},
			],//表头按钮
			data: null,//表格数据
			toolbarConfig: {