ERP_override.git

			@@ -228,6 +228,7 @@
			const getWorkOrder = () => {
			let startTime = form.date1[0]
			let endTime = form.date1[1]
			gridOptions.loading=true
			// 第一次加载查询
			request.post(`/Replenish/selectPrint/${startTime}/${endTime}`, filterData.value).then((res) => {

			@@ -339,8 +340,11 @@
			filterMethod: filterChanged,
			width:100
			},
			{field: 'technology_number', title: t('processCard.technologyNumber'), showOverflow: "ellipsis",
			width:90},
			{field: 'technology_number', title: t('processCard.technologyNumber'),
			filters: [{data: ''}],
			slots: {filter: 'num1_filter'},
			filterMethod: filterChanged, showOverflow: "ellipsis",
			width:100},
			{field: 'child_width', title: t('order.width'), width:90,filters: [{data: ''}],slots: {filter: 'num1_filter'}, filterMethod: filterChanged,},
			{field: 'child_height', title: t('order.height'), width:90,filters: [{data: ''}],slots: {filter: 'num1_filter'}, filterMethod: filterChanged,},
			{
			@@ -366,6 +370,11 @@
			{field: 'glass_child', title: t('reportingWorks.glassChild'),width:110,filters: [{data: ''}],slots: {filter: 'num1_filter'}, filterMethod: filterChanged},
			{field: 'reporting_work_id', title: t('reportingWorks.reportingWorkId'),width:120,filters: [{data: ''}],slots: {filter: 'num1_filter'}, filterMethod: filterChanged},
			{field: 'create_time', title: t('basicData.reportData'),width:120},
			{
			field: 'print_num',
			title: t('processCard.printStatus'),
			width: 120
			},
			],//表头按钮

			toolbarConfig: {
			@@ -428,7 +437,6 @@
			}

			printRow.value.list = JSON.stringify(selectRecords)
			console.log(printRow.value.list)
			printRow.value.printMergeVal=printMerge.value
			printRow.value.mergeTechnologyNumber=technologyNumber
			// router.push({path: '/main/processCard/printProcess', query: {printList: JSON.stringify(selectRecords),printMerge:printMergeVal}})
			@@ -712,10 +720,9 @@

			// 监听打印完成事件
			const printNumber = () =>{

			selectRecordsData.value.printList=selectRecords
			let printState=0
			request.post(`/processCard/updatePrintState/${printState}`, selectRecordsData.value).then((res) => {
			const $grid = xGrid.value
			selectRecords = $grid.getCheckboxRecords()
			request.post(`/Replenish/updatePrintNum`, selectRecords).then((res) => {
			if (res.code == 200 && res.data === true) {
			} else {

			@@ -848,7 +855,7 @@
			destroy-on-close
			style="width: 75%;height:75% ">
			<template #header="{ close, titleId, titleClass }">
			<el-button v-print="printContent" :icon="Printer" circle />
			<el-button v-print="printContent" :icon="Printer" circle @click="printNumber"/>
			</template>
			<print-process id="child" :printList="printRow.list" :printMerge="printRow.printMergeVal" :printLike="printRow.like"
			:mergeTechnologyNumber="printRow.mergeTechnologyNumber"