~admin/ERP_override.git

			@@ -7,6 +7,10 @@
			import VXETable from "vxe-table";
			import useUserInfoStore from "@/stores/userInfo";
			import {ElMessage} from "element-plus";
			import { useI18n } from 'vue-i18n'

			//语言获取
			const { t } = useI18n()
			const router = useRouter()
			const userStore = useUserInfoStore()
			const username = userStore.user.userName
			@@ -19,8 +23,20 @@
			break
			}
			case 'delete':{
			alert('我接收到子组件传送的删除信息')
			break
			let flowData = ref({
			deliveryId:row.deliveryId
			})
			request.post("/Delivery/deleteDelivery",flowData.value).then((res) => {
			if(res.code==200){
			ElMessage.success(t('searchOrder.msgDeleteSuccess'))
			router.push({path:'/main/delivery/selectDelivery',query:{random:Math.random()}})
			}else{
			ElMessage.warning(res.msg)
			router.push("/login")
			}
			})

			return
			}
			}
			}
			@@ -172,24 +188,24 @@
			},//表头参数
			columns:[
			{type:'expand',slots: { content:'content' },width: 60},
			{title: '操作', width: 110, slots: { default: 'button_slot' }},
			{type: 'seq', title: '自序', width: 80 },
			{title: t('basicData.operate'), width: 110, slots: { default: 'button_slot' }},
			{type: 'seq', title: t('basicData.Number'), width: 80 },

			{field: 'deliveryState',title: '审核', width: 40, slots: { default: 'state' }},
			{field: 'stockState',title: '出库', width: 40, slots: { default: 'state' }},
			{field: 'deliveryState',title: t('basicData.review'), width: 40, slots: { default: 'state' }},
			{field: 'stockState',title: t('productStock.outbound'), width: 40, slots: { default: 'state' }},

			{field: 'deliveryId',width:120, title: '发货单号',filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
			{field: 'creator',width:120, title: '发货员',filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
			{field: 'deliveryDate',width:120, title: '发货日期',filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
			{field: 'customerId',width:120, title: '客户编号',filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
			{field: 'customerName',width:120, title: '客户名称',filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
			{field: 'project',width:120, title: '项目名称',filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
			{field: 'orderId',width:120, title: '订单编号',filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
			//{field: '11',width:120, title: '付款条件',filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
			{field: 'payMethod',width:120, title: '付款方式',filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
			{field: 'quantity',width:120, title: '总数量',filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
			{field: 'area',width:120, title: '总面积',filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
			{field: 'createTime',width:120, title: '创建日期',filters:[{ data: '' }],slots: { filter: 'num1_filter' }}
			{field: 'deliveryId',width:120, title: t('delivery.deliveryNoteNumber'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
			{field: 'creator',width:120, title: t('delivery.shipper'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
			{field: 'deliveryDate',width:120, title: t('delivery.deliveryDate'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
			{field: 'customerId',width:120, title: t('customer.customerNumber'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
			{field: 'customerName',width:120, title: t('customer.customerName'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
			{field: 'project',width:120, title: t('order.project'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
			{field: 'orderId',width:120, title: t('order.OrderNum'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
			{field: 'paymentTerms',width:120, title: t('delivery.paymentTerms'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
			{field: 'payMethod',width:120, title:t('delivery.paymentMethod'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
			{field: 'quantity',width:120, title: t('order.quantity'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
			{field: 'area',width:120, title: t('productStock.totalArea'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
			{field: 'createTime',width:120, title: t('productStock.statementDate'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }}


			],//表头按钮
			@@ -206,7 +222,7 @@
			return[
			columns.map((column, columnIndex) => {
			if (columnIndex === 0) {
			return `合计`
			return t('basicData.total')
			}
			// if (props.tableProp.footList.includes(column.field)) {
			// return sumNum(data, column.field)
			@@ -230,7 +246,7 @@
			value-format="YYYY-MM-DD"

			/>
			<el-button @click="changeDate" style="margin-top: -5px" id="searchButton" type="primary" :icon="Search">查询</el-button>
			<el-button @click="changeDate" style="margin-top: -5px" id="searchButton" type="primary" :icon="Search">{{$t('basicData.search')}}</el-button>
			<vxe-grid
			max-height="97%"
			@filter-change="filterChanged"
			@@ -259,8 +275,8 @@

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

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