ERP_override.git

			@@ -27,7 +27,9 @@
			case 'delete':{
			let userId=user.user.userId;
			let userName=user.user.userName;
			request.post(`/reportingWork/deleteWork/${row.reportingWorkId}/${row.processId}/${row.thisProcess}/${userId}/${userName}`).then((res) => {
			const str=row.processId
			let processId=str.split('/')[0];
			request.post(`/reportingWork/deleteWork/${row.reportingWorkId}/${processId}/${row.thisProcess}/${userId}/${userName}`).then((res) => {
			if (res.code == 200 && res.data===true) {
			ElMessage.success(t('workOrder.deleteOk'))
			router.push({path: '/main/reportingWorks/SelectReportingWorks', query: {random:Math.random()}})
			@@ -87,7 +89,7 @@

			//获取七天前到当前时间
			function getNowTime() {
			const start = new Date(new Date().getTime()- 3600 * 1000 * 24 * 7)
			const start = new Date(new Date().getTime()- 3600 * 1000 * 24 * 3)
			.toISOString()
			.replace('T', ' ')
			.slice(0,10) //默认开始时间7天前
			@@ -324,8 +326,8 @@
			{field: 'reportingWorkId', width: 120, title: t('reportingWorks.reportingWorkId'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, },
			{field: 'reportingWorkTime',width: 120, title: t('reportingWorks.reportingWorkTime') ,showOverflow:"ellipsis" ,filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
			{field: 'orderId', width: 130,title: t('order.orderId') ,filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
			{field: 'processId', width: 130,title: t('processCard.processId') ,filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
			{field: 'order.project',width: 120, title: t('order.project'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, },
			{field: 'processId', width: 160,title: t('processCard.processId') ,filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
			{field: 'order.project',width: 150, title: t('order.project'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, },
			{field: 'order.batch', width: 100,title: t('order.batch') ,filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
			{field: 'thisProcess',width: 100, title: t('reportingWorks.thisProcess'),filters:[{ data: '' }],slots: { filter: 'num1_filter' } },
			{field: 'thisCompletedQuantity',width: 120, title: t('reportingWorks.thisCompletedQuantity') },
			@@ -335,6 +337,7 @@
			{field: 'deviceName', width: 100,title: t('reportingWorks.deviceType'),filters:[{ data: '' }],slots: { filter: 'num1_filter' } },
			{field: 'teamsGroupsName',width: 120, title: t('reportingWorks.teamsType'),filters:[{ data: '' }],slots: { filter: 'num1_filter' } },
			{field: 'reviewedState',width: 120, title: t('processCard.reviewedState'), },
			{field: 'reviewed',width: 120, title: '审核人', },
			{field: 'notes',width: 120, title: t('basicData.remarks'), },

			],//表头按钮