~zhoushihao/YiWuProject.git

			@@ -778,7 +778,7 @@
			<div style="width: 98%; height: calc(100% - 35px); overflow-y: auto;max-height: 100px;">
			<el-table height="100px" ref="table"
			:data="tableDatac" :header-cell-style="{background:'#F2F3F5 ',color:'#1D2129'}">
			<el-table-column prop="bigStorageCageOutTask.glassId" align="center" :label="$t('searchOrder.outputglassID')" min-width="120" />
			<el-table-column prop="bigStorageCageOutTask.glassId" align="center" :label="$t('searchOrder.outputglassID')" min-width="140" />
			<el-table-column prop="bigStorageCageOutTask.startSlot" align="center" :label="$t('searchOrder.startposition')" min-width="120" />
			<el-table-column prop="bigStorageCageOutTask.endSlot" align="center" :label="$t('searchOrder.targetlocation')" min-width="120" />
			<el-table-column prop="bigStorageCageOutTask.trainNumber" align="center" :label="$t('searchOrder.trips')" min-width="120" />
			@@ -791,7 +791,7 @@
			<el-table-column prop="id" align="center" :label="$t('searchOrder.tabid')" min-width="150"/>
			<el-table-column prop="deviceId" align="center" :label="$t('searchOrder.tid')" min-width="100"/>
			<el-table-column prop="slot" align="center" :label="$t('searchOrder.gridnumber')" min-width="100"/>
			<el-table-column prop="glassId" align="center" :label="$t('searchOrder.glassID')" min-width="120"/>
			<el-table-column prop="glassId" align="center" :label="$t('searchOrder.glassID')" min-width="140"/>
			<el-table-column prop="sequence" align="center" :label="$t('searchOrder.pieceingrid')" min-width="150"/>
			<el-table-column prop="flowCardId" align="center" :label="$t('searchOrder.cardnumber')" min-width="140"/>
			<el-table-column prop="glassType" align="center" :label="$t('searchOrder.typeglass')" min-width="100"/>
			@@ -814,7 +814,7 @@
			<el-table height="100px" ref="table"
			@selection-change="handleSelectionChange"
			:data="tableDatad" :header-cell-style="{background:'#F2F3F5 ',color:'#1D2129'}">
			<el-table-column prop="bigStorageCageFeedTask.glassId" align="center" :label="$t('searchOrder.intoglassid')" min-width="120" />
			<el-table-column prop="bigStorageCageFeedTask.glassId" align="center" :label="$t('searchOrder.intoglassid')" min-width="140" />
			<el-table-column prop="bigStorageCageFeedTask.targetSlot" align="center" :label="$t('searchOrder.targetlocation')" min-width="120" />
			<!-- <el-table-column prop="task_type" align="center" label="任务类型" min-width="120" />没有返回字段 -->
			<el-table-column prop="bigStorageCageFeedTask.taskState" align="center" :label="$t('searchOrder.taskstatus')" min-width="120">
			@@ -826,7 +826,7 @@
			<el-table-column prop="id" align="center" :label="$t('searchOrder.tabid')" min-width="150"/>
			<el-table-column prop="deviceId" align="center" :label="$t('searchOrder.tid')" min-width="100"/>
			<el-table-column prop="slot" align="center" :label="$t('searchOrder.gridnumber')" min-width="100"/>
			<el-table-column prop="glassId" align="center" :label="$t('searchOrder.glassID')" min-width="120"/>
			<el-table-column prop="glassId" align="center" :label="$t('searchOrder.glassID')" min-width="140"/>
			<el-table-column prop="sequence" align="center" :label="$t('searchOrder.pieceingrid')" min-width="150"/>
			<el-table-column prop="flowCardId" align="center" :label="$t('searchOrder.cardnumber')" min-width="140"/>
			<el-table-column prop="glassType" align="center" :label="$t('searchOrder.typeglass')" min-width="100"/>