~admin/ERP_override.git

			@@ -1,13 +1,22 @@
			<script setup>
			import {Search} from "@element-plus/icons-vue";
			import {reactive} from "vue";
			import {reactive, ref} from "vue";
			import {useRouter} from "vue-router"
			import request from "@/utils/request"
			import deepClone from "@/utils/deepClone"
			import VXETable from "vxe-table";
			import useUserInfoStore from "@/stores/userInfo";
			import {ElMessage} from "element-plus";
			const router = useRouter()
			const userStore = useUserInfoStore()
			const username = userStore.user.userName
			const userid = userStore.user.userId
			let produceList = ref([])
			const getTableRow = (row,type) =>{
			switch (type) {
			case 'edit' :{
			//alert('我接收到子组件传送的编辑信息')
			router.push({path: '/main/delivery/createDelivery', query: { deliveryID: 'JG24010101' }})
			console.log(row)
			router.push({path: '/main/delivery/createDelivery', query: { deliveryID: row.deliveryId }})
			break
			}
			case 'delete':{
			@@ -15,6 +24,86 @@
			break
			}
			}
			}


			const hasDecimal=(value)=>{
			const regex=/\./ // 定义正则表达式，查找小数点
			return regex.test(value) //返回true/false
			}

			const hasDecimalhtml=(item,row)=>{
			let aa=item.split('.').length
			if (aa===2){
			return row[item.split('.')[0]][item.split('.')[1]]
			}else if(aa===3){
			return row[item.split('.')[0]][item.split('.')[1]][item.split('.')[2]]
			}


			}


			//筛选条件，有外键需要先定义明细里面的数据
			let filterData = ref({})

			const xGrid = ref();

			//第一次调用
			request.post("/Delivery/getseletShippingOrder/1/100",filterData.value).then((res) => {

			if(res.code==200){
			console.log(res.data)
			pageTotal.value=res.data.total
			pageNum=1
			produceList = deepClone(res.data.data)
			xGrid.value.loadData(produceList)
			gridOptions.loading=false
			}else{
			ElMessage.warning(res.msg)
			router.push("/login")
			}
			})


			//定义页面总页数
			let pageTotal=ref('')
			//定义当前页数
			let pageNum=$ref(1)

			/使用筛选，后端获取数据/
			const changeFilterEvent = (event, option, $panel,) => {
			// 手动触发筛选
			$panel.changeOption(event, !!option.data, option)
			}
			function filterChanged(column){
			gridOptions.loading=true
			//筛选条件发生变化条件发生变化
			let value = column.datas[0]!=undefined?column.datas[0]:''
			value = value.trim()
			//判断是否存在外键
			if (column.property.indexOf('.')>-1){
			const columnArr = column.property.split('.')
			filterData.value[columnArr[0]] = {
			[columnArr[1]]:value
			}
			}else{
			filterData.value[column.property] = value
			}
			request.post("/Delivery/getseletShippingOrder/1/100",filterData.value).then((res) => {

			if(res.code==200){
			console.log(res.data)
			pageTotal.value=res.data.total
			pageNum=1
			produceList = deepClone(res.data.data)
			xGrid.value.loadData(produceList)
			gridOptions.loading=false
			}else{
			ElMessage.warning(res.msg)
			router.push("/login")
			}
			})
			}

			const gridOptions = reactive({
			@@ -46,24 +135,24 @@
			showStatus: true
			},//表头参数
			columns:[
			{type:'expand',slots: { content:'content' },width: 50},
			{type:'expand',slots: { content:'content' },width: 60},
			{title: '操作', width: 110, slots: { default: 'button_slot' }},
			{type: 'seq', title: '自序', width: 80 },

			{title: '审核', width: 40, slots: { default: 'state' }},
			{title: '出库', width: 40, slots: { default: 'state' }},
			{field: '3',width:120, title: '发货单号',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
			{field: '4',width:120, title: '发货员',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
			{field: '5',width:120, title: '发货日期',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
			{field: '6',width:120, title: '客户编号',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
			{field: '7',width:120, title: '客户名称',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
			{field: '8',width:120, title: '批次',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
			{field: '9',width:120, title: '项目名称',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
			{field: '10',width:120, title: '订单编号',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
			{field: '11',width:120, title: '付款条件',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
			{field: '12',width:120, title: '付款方式',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
			{field: '13',width:120, title: '总数量',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
			{field: '14',width:120, title: '总面积',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true}
			{field: 'deliveryState',title: '审核', width: 40, slots: { default: 'state' }},
			{field: 'stockState',title: '出库', 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' }}


			],//表头按钮
			@@ -75,31 +164,12 @@
			zoom: true,
			custom: true
			},
			data: [{
			'3': 'JG23120801',
			'4': '郑珊珊',
			'5': '2023-12-08',
			'6': '310',
			'7': '上海里诺建筑工程有限公司',
			'8': '补1-2',
			'9': '宿迁某某项目',
			'10': 'NG23112304',
			'11': '按合同',
			'12': '',
			'13': '8',
			'14': '15.68',
			'15': '11912.05',
			'16': '2023-11-24',
			'17': '王龙',
			'18': '宿迁某某地址',
			'19': '2023-12-08'
			}
			],//table body实际数据

			footerMethod ({ columns, data }) {//页脚函数
			return[
			columns.map((column, columnIndex) => {
			if (columnIndex === 0) {
			return '合计:'
			return `页数:${pageNum}/${pageTotal.value}`
			}
			// if (props.tableProp.footList.includes(column.field)) {
			// return sumNum(data, column.field)
			@@ -123,6 +193,8 @@
			<el-button style="margin-top: -5px" id="searchButton" type="primary" :icon="Search">查询</el-button>
			<vxe-grid
			max-height="97%"
			@filter-change="filterChanged"
			@cell-dblclick="cellClickEvent"
			class="mytable-scrollbar"
			ref="xGrid"
			v-bind="gridOptions"
			@@ -133,15 +205,18 @@
			<ul class="expand-wrapper">
			<li v-for="(item,index) in gridOptions.columns" v-show="item.field!=undefined ">
			<span style="font-weight: bold">{{item.title+': '}}</span>
			<span>{{ row[item.field] }}</span>
			<span v-if="hasDecimal(item.field)">{{ hasDecimalhtml(item.field,row) }}</span>
			<span v-else>{{ row[item.field] }}</span>
			</li>
			</ul>
			</template>

			<template #state="{ row}">
			<el-checkbox checked/>
			<template #state="{ row,column}">
			<el-checkbox @click.native.prevent :checked="row[column.field]===1"/>
			</template>



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