ERP_override.git

			@@ -2,7 +2,7 @@

			import request from "@/utils/request"
			import deepClone from "@/utils/deepClone"
			import {ElDatePicker, ElMessage} from "element-plus"
			import {ElCheckbox, ElDatePicker, ElMessage} from "element-plus"
			import {nextTick, onMounted, onUnmounted, reactive, ref, watch} from "vue"
			import {useRouter} from 'vue-router'
			import {useI18n} from 'vue-i18n'
			@@ -50,7 +50,8 @@
			technologyNumber: null,
			process: null
			})

			//落架顺序
			let landingSequence= ref(1)
			//打印
			let printRow = ref({
			list: null,
			@@ -64,7 +65,8 @@
			faceOrientation: null,//内外面
			type: null,//标签模板
			lableType: null,//标签类型
			dataType: null//标签类型
			dataType: null,
			landingSequence:null
			})


			@@ -223,6 +225,7 @@
			hiprintTemplate.value.print(object)

			}
			const orderOtherMoney = ref(null)

			const {currentRoute} = useRouter()
			const route = currentRoute.value
			@@ -241,7 +244,21 @@
			newDataCollection.push(item);
			})
			}
			orderOtherMoney.value = res.data.orderOtherMoney
			orderOtherMoney.value.forEach(item => {
			let column = {
			field: `${item.column}`,
			width: 100,
			title: item.alias,
			filters: [{data: ''}],
			slots: {filter: 'num1_filter'},
			filterMethod: filterChanged,
			sortable: true
			}

			gridOptions.columns.push(column)

			})
			titleSelectJson.value.dataType = res.data.type
			xGrid.value.reloadData(newDataCollection)
			gridOptions.loading = false
			@@ -338,14 +355,16 @@
			title: t('order.OrderNum'),
			filters: [{data: ''}],
			slots: {filter: 'num1_filter'},
			filterMethod: filterChanged, width: 100
			filterMethod: filterChanged, width: 120
			, sortable: true
			},
			{
			field: 'technology_number',
			title: t('processCard.technologyNumber'),
			filters: [{data: ''}],
			slots: {filter: 'num1_filter'},
			filterMethod: filterChanged, width: 100
			filterMethod: filterChanged, width: 120
			, sortable: true
			},
			{
			field: 'width',
			@@ -698,7 +717,7 @@
			id += selectRecords[i].id + "\|"
			}
			}

			labelRow.value.landingSequence = landingSequence
			labelRow.value.list = JSON.stringify(selectRecords)
			labelRow.value.faceOrientation = faceOrientation
			labelRow.value.type = type
			@@ -803,6 +822,10 @@
			}
			})
			}

			function onlandingSequenceChange(checked) {
			landingSequence.value = checked ? 0 : 1
			}
			</script>

			<template>
			@@ -839,6 +862,13 @@
			:value="item.value"
			/>
			</el-select>

			<el-checkbox
			:model-value="landingSequence === 0"
			@change="onlandingSequenceChange"
			>
			{{ t('processCard.landingSequence') }}
			</el-checkbox>
			</div>

			<div class="main-table">
			@@ -974,6 +1004,7 @@
			:lableType="labelRow.lableType"
			:list="labelRow.list"
			:type="labelRow.type"
			:landingSequence="labelRow.landingSequence"
			style="width: 100%;height: 100%"/>
			</el-dialog>