~admin/ERP_override.git

			@@ -11,6 +11,9 @@
			import Sortable from 'sortablejs'
			import BasicTable from '@/components/basic/BasicTable.vue'
			import {VXETable} from "vxe-table";
			import { useI18n } from 'vue-i18n'
			//语言获取
			const { t } = useI18n()
			let router=useRouter()
			const getTableRow = (row,type) =>{
			switch (type) {
			@@ -163,15 +166,15 @@
			},//表头参数
			columns:[
			{type:'expand',fixed:"left",slots: { content:'content' },width: 50},
			{title: '操作', width: 80, slots: { default: 'button_slot' },fixed:"left"},
			{ type: 'seq',fixed:"left", title: '自序', width: 50 },
			{field: 'orderId', title: '销售单号',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, },
			{field: 'orderGlassDetail.productionId', title: '生产订单号', showOverflow:"ellipsis" ,filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
			{field: 'orderDetail.productId', title: '产品编号',filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
			{field: 'orderDetail.productName', title: '产品名称',filters:[{ data: '' }],slots: { filter: 'num1_filter' },},
			{field: 'orderDetail.quantity', title: '总数量',showOverflow:"ellipsis"},
			{field: 'orderDetail.computeGrossArea', title: '总面积', },
			{field: 'orderDetail.perimeter', title: '周长',},
			{title: t('basicData.operate'), width: 80, slots: { default: 'button_slot' },fixed:"left"},
			{ type: 'seq',fixed:"left", title: t('basicData.Number'), width: 50 },
			{field: 'orderId', title: t('order.orderId'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, },
			{field: 'orderGlassDetail.productionId', title: t('workOrder.productionId'), showOverflow:"ellipsis" ,filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
			{field: 'orderDetail.productId', title: t('order.productId'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
			{field: 'orderDetail.productName', title: t('order.product'),filters:[{ data: '' }],slots: { filter: 'num1_filter' },},
			{field: 'orderDetail.quantity', title: t('order.quantity'),showOverflow:"ellipsis"},
			{field: 'orderDetail.computeGrossArea', title: t('order.area'), },
			{field: 'orderDetail.perimeter', title: t('workOrder.perimeter'),},
			],//表头按钮

			toolbarConfig: {
			@@ -191,7 +194,7 @@
			return[
			columns.map((column, columnIndex) => {
			if (columnIndex === 0) {
			return '合计:'
			return t('basicData.total')
			}
			if (footList.includes(column.field)) {
			return sumNum(data, column.field)
			@@ -232,7 +235,7 @@

			<!--左边固定显示的插槽-->
			<template #button_slot="{ row }">
			<el-button @click="getTableRow(row,'edit')" link type="primary" size="small">编辑</el-button>
			<el-button @click="getTableRow(row,'edit')" link type="primary" size="small">{{$t('basicData.edit')}}</el-button>

			</template>