ERP_override.git

			@@ -12,6 +12,7 @@
			import PrintCustomLabelXJTwo from '@/components/pp/PrintCustomLabelXJTwo.vue'
			import {Printer} from "@element-plus/icons-vue/global";
			import companyInfo from "@/stores/sd/companyInfo"
			import {remove} from "xe-utils";
			//语言获取
			const {t} = useI18n()

			@@ -24,6 +25,7 @@
			//定义数据返回结果
			let produceList = ref([])
			let titleStyleVisible = ref(false)
			let print = ref("1")

			//标签
			let labelRow = ref({
			@@ -45,7 +47,12 @@
			const getTableRow = (row, type) => {
			switch (type) {
			case 'edit' :{
			router.push({path: '/main/processCard/PrintLabel', query: { projectNo: row.project_no,type:1 }})
			if(parseInt(print.value)==1){
			router.push({path: '/main/processCard/PrintLabel', query: { projectNo: row.project_no,type:1 }})
			}else{
			router.push({path: '/main/processCard/PrintCustomLabelSemi2', query: { projectNo: row.project_no,type:1 }})
			}

			break
			}
			case 'edit1' :{
			@@ -100,6 +107,8 @@

			if (res.code == 200) {
			if(hidePrintLabels=="true"){
			//删除下拉框
			remove(gridOptions.toolbarConfig.slots)
			const button = {'code': 'printLabel',
			status: 'primary',
			'name': "成品打印2"}
			@@ -109,6 +118,7 @@
			status: 'primary',
			'name': "明细打印"}
			gridOptions.toolbarConfig.buttons.push(button2)

			}
			produceList.value = deepClone(res.data.data)
			xGrid.value.reloadData(produceList.value)
			@@ -197,7 +207,9 @@
			toolbarConfig: {
			buttons: [
			],

			slots:{
			buttons: "toolbar_buttons"
			},
			zoom: true,
			custom: true
			},
			@@ -264,6 +276,7 @@
			id: 'childLabel',
			})


			</script>

			<template>
			@@ -321,6 +334,15 @@
			</div>
			</template>

			<template #toolbar_buttons>
			<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>
			</vxe-select>
			</template>




			</vxe-grid>
			<el-dialog
			@@ -352,6 +374,8 @@
			</div>
			</template>



			<style scoped>
			.main-div-customer {
			width: 99%;