ERP_override.git

			@@ -9,11 +9,13 @@
			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'
			import useUserInfoStore from '@/stores/userInfo'
			//语言获取
			const { t } = useI18n()
			const userStore = useUserInfoStore()
			let productGlassTypeStore = useProductGlassTypeStore()
			let router = useRouter()
			let props = defineProps({
			@@ -24,7 +26,6 @@
			let endTime = form.date1[1]
			switch (type) {
			case 'select' : {
			console.log(row.processId)
			router.push({path: '/main/processCard/SelectDetailProcessCard', query: { processId: row.processId }})
			break
			}
			@@ -63,10 +64,12 @@
			ElMessage.success(t('workOrder.deleteOk'))
			router.push({path: '/main/processCard/SelectProcessCard', query: {random:Math.random()}})
			} else {

			console.log(111)
			ElMessage.warning(res.msg)

			}
			}).catch((err) =>{
			ElMessage.warning('删除失败，检查是否已报工')
			})
			break
			}
			@@ -379,7 +382,14 @@
			<!--左边固定显示的插槽-->

			<template #button_slot="{ row }" >
			<el-button @click="getTableRow(row,'select')" link type="primary" size="small">{{$t('basicData.edit')}}
			<!-- <el-button @click="getTableRow(row,'select')" link type="primary" size="small">{{$t('basicData.edit')}}-->
			<!-- </el-button>-->
			<el-button @click="getTableRow(row,'select')"
			v-if="userStore.user.permissions.indexOf('SelectProcessCard.edit') > -1"
			link
			type="primary"
			size="small">
			{{ $t('basicData.edit') }}
			</el-button>
			<el-button v-if="row.layoutStatus=='可排版'" @click="getTableRow(row,'setType')" link type="primary" size="small">{{$t('processCard.composing')}}</el-button>
			<el-button v-else-if="row.layoutStatus=='不可排版'" @click="getTableRow(row,'setType')" link type="primary" size="small">{{$t('processCard.composingOk')}}</el-button>