ERP_override.git

			@@ -30,6 +30,7 @@
			let produceList = ref([])
			let titleStyleVisible = ref(false)
			let print = ref("1")
			let printStyle = ref("1")

			//标签
			let labelRow = ref({
			@@ -61,7 +62,7 @@
			switch (type) {
			case 'edit' :{
			if(parseInt(print.value)==1){
			router.push({path: '/main/processCard/PrintLabel', query: { projectNo: row.project_no,type:1 }})
			router.push({path: '/main/processCard/PrintLabel', query: { projectNo: row.project_no,type:1,printStyle:parseInt(printStyle.value) }})
			}else{
			router.push({path: '/main/processCard/PrintCustomLabelSemi2', query: { projectNo: row.project_no,type:1 }})
			}
			@@ -70,14 +71,14 @@
			}
			case 'edit1' :{
			if(parseInt(print.value)==1){
			router.push({path: '/main/processCard/PrintLabel', query: { projectNo: row.project_no,type:2 }})
			router.push({path: '/main/processCard/PrintLabel', query: { projectNo: row.project_no,type:2,printStyle:parseInt(printStyle.value) }})
			}else{
			router.push({path: '/main/processCard/PrintCustomLabelSemi2', query: { projectNo: row.project_no,type:2 }})
			}
			break
			}
			case 'edit2' :{
			router.push({path: '/main/processCard/PrintLabel', query: { projectNo: row.project_no,type:3 }})
			router.push({path: '/main/processCard/PrintLabel', query: { projectNo: row.project_no,type:3,printStyle:parseInt(printStyle.value) }})
			break
			}
			case 'edit3' :{
			@@ -138,7 +139,7 @@
			if (res.code == 200) {
			if(hidePrintLabels=="true"){
			//删除下拉框
			remove(gridOptions.toolbarConfig.slots)
			//remove(gridOptions.toolbarConfig.slots)
			const button = {'code': 'printLabel',
			status: 'primary',
			'name': t('processCard.finishedProductPrinting2')}
			@@ -265,7 +266,7 @@
			buttons: [
			],
			slots:{
			buttons: "toolbar_buttons"
			buttons: "toolbar_buttons",
			},
			zoom: true,
			custom: true
			@@ -417,6 +418,13 @@
			</template>

			<template #toolbar_buttons>
			<vxe-select @change="changeOrderType" v-model="printStyle" >
			<vxe-option value="1" label="11列4行"></vxe-option>
			<vxe-option value="2" label="6行3列"></vxe-option>
			</vxe-select>
			</template>

			<template #toolbar_button2>
			<vxe-select @change="changeOrderType" v-model="print" >
			<vxe-option value="1" label="EPSON LQ-82KF ESC/P2"></vxe-option>
			<vxe-option value="2" label="TSC TTP-244Pro"></vxe-option>
			@@ -426,6 +434,7 @@




			</vxe-grid>
			</div>
			<el-dialog