YiWuProject.git

			@@ -94,7 +94,7 @@
			<div style="margin-left: 87%;">{{$t('hellow.pairsnumbertotal')}}{{ pairTotal }}</div>
			<el-table
			ref="table"
			style="margin-top: 20px; height: 700px;"
			style="margin-top: 20px; height: 650px;"
			:data="tableDatab"
			:row-class-name="tableRowClassName"
			:header-cell-style="{ background: '#F2F3F5', color: '#1D2129' }"
			@@ -300,6 +300,12 @@
			/>
			</el-select>
			</el-form-item>
			<el-form-item :label="$t('hellow.coatingtypes')" style="width: 25vw;">
			<el-select v-model="selectedFilmRemove" filterable clearable :placeholder="$t('basicData.selectcoatingtypes')"
			style="width: 270px">
			<el-option v-for="item in filmRemoveList" :key="item" :label="item" :value="item" />
			</el-select>
			</el-form-item>
			<!-- <el-form-item :label="$t('hellow.hollowformulp')" :required="true" style="width: 25vw;">
			<el-select
			v-model="selectedFormulaName"
			@@ -349,6 +355,12 @@
			:label="item.label"
			:value="item.value"
			/>
			</el-select>
			</el-form-item>
			<el-form-item :label="$t('hellow.coatingtypes')" style="width: 25vw;">
			<el-select v-model="selectedFilmRemove" filterable clearable :placeholder="$t('basicData.selectcoatingtypes')"
			style="width: 270px">
			<el-option v-for="item in filmRemoveList" :key="item" :label="item" :value="item" />
			</el-select>
			</el-form-item>
			<!-- <el-form-item :label="$t('hellow.hollowformulp')" :required="true" style="width: 25vw;">
			@@ -545,7 +557,7 @@
			import { ElMessage, ElMessageBox } from 'element-plus'
			import {onBeforeUnmount, onMounted, onUnmounted, ref, reactive, watch, computed, getCurrentInstance} from "vue";
			import request from "@/utils/request"
			import {host, WebSocketHost} from '@/utils/constants'
			// import {host, WebSocketHost} from '@/utils/constants'
			import {closeWebSocket, initializeWebSocket} from '@/utils/WebSocketService';
			import {useI18n} from 'vue-i18n'
			const {t} = useI18n()
			@@ -556,6 +568,8 @@
			const isLoading = ref(true)
			const isSubmitting = ref(false)
			const activeTab = ref('')
			const filmRemoveList = ref([])
			const selectedFilmRemove = ref('')
			const tabList = ref([])
			const internalInstance = getCurrentInstance()
			const tableDataa = ref([])
			@@ -763,6 +777,13 @@
			window.localStorage.setItem('flowCardId', row.flowCardId)
			dialogFormVisiblec.value = true;
			isSubmitting.value = false
			if (row.flowCardGlassInfoDTOList && row.flowCardGlassInfoDTOList.length) {
			const films = row.flowCardGlassInfoDTOList.map(item => item.filmsId).filter(Boolean)
			// 去重
			filmRemoveList.value = [...new Set(films)]
			} else {
			filmRemoveList.value = []
			}
			fetchmulan()
			};
			// 强制出片
			@@ -770,6 +791,13 @@
			window.localStorage.setItem('flowCardId', row.flowCardId)
			dialogFormVisibled.value = true;
			fetchmulan()
			if (row.flowCardGlassInfoDTOList && row.flowCardGlassInfoDTOList.length) {
			const films = row.flowCardGlassInfoDTOList.map(item => item.filmsId).filter(Boolean)
			// 去重
			filmRemoveList.value = [...new Set(films)]
			} else {
			filmRemoveList.value = []
			}
			};
			// 创建任务
			const fetchFlowCardId = async () => {
			@@ -1086,7 +1114,7 @@
			}
			isSubmitting.value = true
			try {
			var url="/hollowGlass/hollowGlassOutRelationInfo/receiveTask?cell="+ 932 + "&flowCardId=" + flowCardId + "&totalPairQuantity=" + totalPairQuantity.value+ "&formulaId=" + -1;
			const url = `/hollowGlass/hollowGlassOutRelationInfo/receiveTask?cell=${932}&flowCardId=${flowCardId}&totalPairQuantity=${totalPairQuantity.value}&formulaId=${-1}&filmRemove=${selectedFilmRemove.value}`
			const response = await request.post(url)
			if (response.code == 200) {
			ElMessage.success(response.message);
			@@ -1112,7 +1140,7 @@
			return
			}
			try {
			var url="/hollowGlass/hollowGlassOutRelationInfo/forceOutGlass?cell="+ 932 + "&flowCardId=" + flowCardId + "&totalPairQuantity=" + totalPairQuantitya.value+ "&formulaId=" + -1;
			var url="/hollowGlass/hollowGlassOutRelationInfo/forceOutGlass?cell="+ 932 + "&flowCardId=" + flowCardId + "&totalPairQuantity=" + totalPairQuantitya.value+ "&formulaId=" + -1 + "&filmRemove=" + selectedFilmRemove.value;
			const response = await request.post(url)
			if (response.code == 200) {
			ElMessage.success(response.message);