ERP_override.git

			@@ -8,7 +8,7 @@
			import GlassType from "@/components/sd/product/GlassType.vue"
			import {useRouter} from 'vue-router'
			import Sortable from 'sortablejs'
			import BasicTable from '@/components/basic/BasicTable.vue'
			import BasicTable from '@/components/sd/product/BasicTable.vue'
			import {VXETable} from "vxe-table";
			import { useI18n } from 'vue-i18n'
			//语言获取
			@@ -29,7 +29,6 @@
			let startTime = form.date1[0]
			let endTime = form.date1[1]
			let state = optionVal.value
			console.log(startTime, endTime, state)
			request.post(`/workOrder/deleteOrderWork/${row.orderId}/${row.productionId}`).then((res) => {
			if (res.code == 200) {
			ElMessage.success(t('workOrder.deleteOk'))
			@@ -37,7 +36,6 @@
			router.push({path: '/main/workOrder/SelectWorkOrder', query: {startTime:startTime,endTime:endTime,state:state,random:Math.random()}})
			} else {
			ElMessage.warning(res.msg)
			router.push("/login")
			}
			})
			break
			@@ -129,7 +127,6 @@
			let state = optionVal.value

			//第一次加载数据
			console.log('第一次加载数据:',state,startTime,endTime)
			request.post(`/workOrder/orderGlassDetail/${startTime}/${endTime}/${state}`, filterData.value).then((res) => {

			if (res.code == 200) {
			@@ -348,7 +345,12 @@
			<!--左边固定显示的插槽-->
			<template #button_slot="{ row }">
			<el-button :class="{disable: optionVal== 0}" :disabled="optionVal == 0" @click="getTableRow(row,'edit')" link type="primary" size="small">{{$t('workOrder.transferOrder')}}</el-button>
			<el-button :class="{disable: optionVal== 1}" :disabled="optionVal == 1" @click="getTableRow(row,'delete')" link type="primary" size="small">{{$t('basicData.delete')}}</el-button>
			<!-- <el-button :class="{disable: optionVal== 1}" :disabled="optionVal == 1" @click="getTableRow(row,'delete')" link type="primary" size="small">{{$t('basicData.delete')}}</el-button>-->
			<el-popconfirm @confirm="getTableRow(row,'delete')" :title="$t('searchOrder.deleteConfirm')">
			<template #reference>
			<el-button :class="{disable: optionVal== 1}" :disabled="optionVal == 1" link type="primary" size="small">{{ $t('basicData.delete') }}</el-button>
			</template>
			</el-popconfirm>
			</template>

			<template #num1_filter="{ column, $panel }">