ERP_override.git

			@@ -6,6 +6,9 @@
			import deepClone from "@/utils/deepClone";
			import {ElDatePicker, ElMessage} from "element-plus";
			import {Search} from "@element-plus/icons-vue";
			import { useI18n } from 'vue-i18n'
			//语言获取
			const { t } = useI18n()
			let router=useRouter()
			const getTableRow = (row,type) =>{
			switch (type) {
			@@ -79,7 +82,7 @@
			.toISOString()
			.replace('T', ' ')
			.slice(0, 10) //默认开始时间7天前
			const end = new Date(new Date().getTime())
			const end = new Date(new Date().getTime()+ 3600 * 1000 * 24)
			.toISOString()
			.replace('T', ' ')
			.slice(0, 10)//默认结束时间当前时间
			@@ -97,7 +100,6 @@
			request.post(`/processCard/selectAddProcess/${startTime}/${endTime}`, filterData.value).then((res) => {

			if (res.code == 200) {
			console.log(res.data.data)
			pageTotal.value = res.data.total
			produceList = produceList.value.concat(deepClone(res.data.data))
			xGrid.value.reloadData(produceList)
			@@ -203,27 +205,27 @@
			},//表头参数
			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' }, sortable: true, },
			{field: 'customerName', title: '客户名称', sortable: true,showOverflow:"ellipsis" ,filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
			{field: 'project', title: '项目名称', sortable: true,filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
			{field: 'batch', title: '批次',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
			{field: 'otherRemarks', title: '原片要求', sortable: true,showOverflow:"ellipsis"},
			{field: 'icon', title: '商标选项', sortable: true},
			{field: 'orderType', title: '订单类型', sortable: true},
			{field: 'salesman', title: '业务员', sortable: true},
			{field: 'processingNote', title: '加工要求', sortable: true,showOverflow:"ellipsis"},
			{field: 'deliveryAddress', title: '送货地址', sortable: true},
			{title: t('basicData.operate'), width: 80, slots: { default: 'button_slot' },fixed:"left"},
			{ type: 'seq',fixed:"left", title: t('basicData.Number'), width: 50 },
			{field: 'order.orderId', title: t('order.orderId'),filters:[{ data: '' }],slots: { filter: 'num1_filter' } , },
			{field: 'order.customerName', title: t('processCard.customerName'),showOverflow:"ellipsis" ,filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
			{field: 'order.project', title: t('order.project'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
			{field: 'order.batch', title: t('order.batch'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, },
			{field: 'order.otherRemarks', title: t('processCard.otherRemarks') ,showOverflow:"ellipsis",filters:[{ data: '' },],slots: { filter: 'num1_filter' }},
			{field: 'order.icon', title:t('order.icon'),filters:[{ data: '' }],slots: { filter: 'num1_filter' } },
			{field: 'order.orderType', title: t('order.orderType'),filters:[{ data: '' }],slots: { filter: 'num1_filter' } },
			{field: 'order.salesman', title: t('order.salesman'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
			{field: 'order.processingNote', title: t('order.processingNote'),showOverflow:"ellipsis"},
			{field: 'order.deliveryAddress', title: t('order.deliveryAddress'),},
			],//表头按钮

			toolbarConfig: {
			// buttons: [{
			//
			// }],
			import: false,
			export: true,
			print: true,
			// import: false,
			// export: true,
			// print: true,
			zoom: true,
			custom: true
			},
			@@ -234,7 +236,7 @@
			return[
			columns.map((column, columnIndex) => {
			if (columnIndex === 0) {
			return '合计:'
			return t('basicData.total')
			}
			// if (footList.includes(column.field)) {
			// return sumNum(data, column.field)
			@@ -259,8 +261,8 @@
			type="daterange"
			format="YYYY/MM/DD"
			value-format="YYYY-MM-DD"
			start-placeholder="开始时间"
			end-placeholder="结束时间"
			:start-placeholder="$t('basicData.startDate')"
			:end-placeholder="$t('basicData.endDate')"
			:default-time="defaultTime"

			/>
			@@ -269,13 +271,14 @@
			<el-button
			@click="getWorkOrder"
			id="select"
			type="primary" :icon="Search">查询
			type="primary" :icon="Search">{{$t('basicData.search')}}
			</el-button>
			</el-row>

			</div>
			<vxe-grid
			max-height="100%"
			height="600px"
			@filter-change="filterChanged"
			class="mytable-scrollbar"
			ref="xGrid"
			@@ -284,18 +287,20 @@
			>
			<!-- @toolbar-button-click="toolbarButtonClickEvent"-->
			<!-- 下拉显示所有信息插槽-->
			<template #content="{ row}">
			<template #content="{ row }">
			<ul class="expand-wrapper">
			<li v-for="(item,key,index) in row">
			<span style="font-weight: bold">{{key+': '}}</span>
			<span>{{ item }}</span>
			<li v-for="(item,index) in gridOptions.columns" v-show="item.field!=undefined ">
			<span style="font-weight: bold">{{ item.title + ': ' }}</span>
			<span v-if="hasDecimal(item.field)">{{ row[item.field.split('.')[0]][item.field.split('.')[1]] }}</span>
			<span v-else>{{ row[item.field] }}</span>

			</li>
			</ul>
			</template>

			<!--左边固定显示的插槽-->
			<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>

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