This commit is contained in:
2024-01-23 15:11:43 +08:00
parent dc406786e7
commit 49bbd6fcda
12 changed files with 955 additions and 295 deletions

View File

@@ -25,6 +25,7 @@ import basicPage from '../mixins/basic-page';
import { parseTime } from '../mixins/code-filter';
import codeFilter from '../mixins/code-filter';
import { getMainTaskHistoryPage } from '@/api/oth/mainTaskHistory';
import point from './point';
const tableProps = [
{
@@ -51,13 +52,18 @@ const tableProps = [
width:110
},
{
prop: 'trayCode',
prop: 'barCode',
label: '托盘编码',
},
{
prop: 'agv',
label: 'agv',
},
{
prop: 'agvPoint',
label: 'AGV起终点',
subcomponent: point,
},
{
prop: 'mainTaskState',
label: '状态',
@@ -246,7 +252,7 @@ export default {
this.listQuery.pageSize = 10;
this.listQuery.mainTaskCode = val.code;
this.listQuery.mainTaskType = val.taskType;
this.listQuery.trayCode = val.tcode;
this.listQuery.barCode = val.tcode;
// this.listQuery.mainTaskState = val.status;
this.listQuery.mainTaskState = 5;
this.listQuery.stacker = val.stacker;

View File

@@ -0,0 +1,32 @@
<!--
* @Author: zwq
* @Date: 2023-09-22 15:36:40
* @LastEditors: zwq
* @LastEditTime: 2023-09-26 15:59:57
* @Description:
-->
<template>
<div>
{{ injectData.mainTaskType===1? injectData.agvStartPoint:injectData.agvEndPoint}}
</div>
</template>
<script>
export default {
name: "point",
props: {
injectData: {
type: Object,
default: () => ({}),
},
},
data() {
return {
list: this.injectData,
};
},
methods: {
},
};
</script>
<style scoped>
</style>