~admin/ERP_override.git

			@@ -1,7 +1,7 @@
			<script setup>
			import {Search} from "@element-plus/icons-vue"
			import {useRouter} from "vue-router"
			import {reactive, ref} from "vue"
			import {computed, reactive, ref} from "vue"
			import ProcessCardProgress from '@/views/pp/report/ProcessCardProgress.vue'
			import request from "@/utils/request";
			import deepClone from "@/utils/deepClone"
			@@ -166,6 +166,7 @@
			}
			request.post(`/order/getOrderList/1/${total.pageSize}/${orderType.value}/${selectDate.value}`,filterData.value).then((res) => {
			if(res.code==200){
			total.dataTotal = res.data.total.total*1
			total.pageTotal=parseInt(res.data.total)
			pageNum.value=1
			orderList.value = deepClone(res.data.data)
			@@ -186,10 +187,12 @@
			request.post(`/order/getOrderList/${pageNum.value}/${total.pageSize}/${orderType.value}/${selectDate.value}`
			,filterData).then((res) => {
			if(res.code==200){
			//total.pageTotal = res.data.total.pageTotal
			total.dataTotal = res.data.total.total*1
			total.pageTotal = res.data.total.pageTotal
			selectDate.value=res.data.selectDate
			orderList.value = deepClone(res.data.data)
			xGrid.value.loadData(orderList.value)
			console.log(xGrid.value.getTableData().fullData)
			}else{
			ElMessage.warning(res.msg)
			}
			@@ -238,6 +241,10 @@
			}
			}

			const showCheckbox = computed(()=>(item)=>{ //计算属性传递参数
			return 2 === item
			})


			</script>

			@@ -265,7 +272,7 @@
			<!-- 下拉显示所有信息插槽-->
			<template #content="{ row }">
			<ul class="expand-wrapper">
			<li v-for="(item,index) in gridOptions.columns" v-show="item.field!=undefined && index>9">
			<li v-for="(item,index) in gridOptions.columns" v-show="item.field!==undefined && index>9">
			<span style="font-weight: bold">{{item.title+': '}}</span>
			<span>{{ row[item.field] }}</span>
			</li>
			@@ -273,13 +280,22 @@
			</template>

			<template #state="{ row,column}">
			<el-checkbox @click.native.prevent :indeterminate="row[column.field]===1" :checked="row[column.field]===2"/>
			<el-checkbox
			v-if="row[column.field] === 2"
			@click.native.prevent
			:indeterminate="row[column.field]===1"
			:checked="true"/>
			<el-checkbox
			v-else
			@click.native.prevent
			:indeterminate="row[column.field]===1"
			:checked="false"/>
			</template>

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