mt-ck/mt-qj-wms-ui
5
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

update

Browse Source
This commit is contained in:
gtz217
2021-12-15 19:36:23 +08:00
parent 38eb8050bd
commit 7f4d5b0ff8
40 changed files with 631 additions and 413 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
src/views/basic/alarmInfo.vue
View File

@@ -1,8 +1,8 @@
<template>
<div class="mod-config">
<el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
<el-form style="display: flex; align-items: center; justify-content: right;" :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
<el-form-item>
<el-select v-model="dataForm.paramKey" filterable placeholder="报警编码">
<!-- <el-select size="small" v-model="dataForm.paramKey" clearable filterable placeholder="报警编码">
<el-option
v-for="item in dataList"
:key="item.id"
@@ -10,16 +10,24 @@
:value="item.code"
>
</el-option>
</el-select>
</el-select> -->
<el-input size="small" v-model="dataForm.paramKey" placeholder="报警编码" />
</el-form-item>
<el-form-item>
<el-button @click="getDataList()">查询</el-button>
<el-button type="primary" @click="addOrUpdateHandle()">新增</el-button>
<el-button size="small" @click="getDataList()">
<icon-svg class="iconClass" name="sousuo"></icon-svg>
查询
</el-button>
<el-button size="small" type="primary" @click="addOrUpdateHandle()">
<icon-svg class="iconClass" name="新建"></icon-svg>
新增
</el-button>
</el-form-item>
</el-form>
<el-table
:data="dataList"
border
:stripe="true"
:header-cell-style="{background:'#eef1f6',color:'#606266',height: '56px'}"
v-loading="dataListLoading"
style="width: 100%;">
<el-table-column
@@ -37,20 +45,14 @@
</el-table-column> -->
<el-table-column
prop="alarmClass"
header-align="center"
align="center"
label="报警类型">
</el-table-column>
<el-table-column
prop="code"
header-align="center"
align="center"
label="报警编码">
</el-table-column>
<el-table-column
prop="alarmInfo"
header-align="center"
align="center"
label="报警内容">
</el-table-column>
<el-table-column
@@ -60,8 +62,16 @@
width="150"
label="操作">
<template slot-scope="scope">
<el-button type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">修改</el-button>
<el-button type="text" style="color:red" size="small" @click="deleteHandle(scope.row.id)">删除</el-button>
<el-button type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">
<el-tooltip class="item" effect="dark" content="修改" placement="top">
<icon-svg class="iconClass" name="编辑"></icon-svg>
</el-tooltip>
</el-button>
<el-button type="text" style="color:red" size="small" @click="deleteHandle(scope.row.id)">
<el-tooltip class="item" effect="dark" content="删除" placement="top">
<icon-svg class="iconClass" name="删除"></icon-svg>
</el-tooltip>
</el-button>
</template>
</el-table-column>
</el-table>

39
src/views/basic/cache.vue
View File

@@ -1,17 +1,24 @@
<template>
<div class="mod-config">
<el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
<el-form :inline="true" style="display: flex; align-items: center; justify-content: right;" :model="dataForm" @keyup.enter.native="getDataList()">
<el-form-item>
<el-input v-model="dataForm.paramKey" placeholder="名称或编码" clearable></el-input>
<el-input size="small" v-model="dataForm.paramKey" placeholder="名称或编码" clearable></el-input>
</el-form-item>
<el-form-item>
<el-button @click="getDataList()">查询</el-button>
<el-button type="primary" @click="addOrUpdateHandle()">新增</el-button>
<el-button size="small" @click="getDataList()">
<icon-svg class="iconClass" name="sousuo"></icon-svg>
查询
</el-button>
<el-button size="small" type="primary" @click="addOrUpdateHandle()">
<icon-svg class="iconClass" name="新建"></icon-svg>
新增
</el-button>
</el-form-item>
</el-form>
<el-table
:data="dataList"
border
:stripe="true"
:header-cell-style="{background:'#eef1f6',color:'#606266',height: '56px'}"
v-loading="dataListLoading"
style="width: 100%;">
<el-table-column
@@ -29,32 +36,22 @@
</el-table-column> -->
<el-table-column
prop="warehouseName"
header-align="center"
align="center"
label="缓存区名称">
</el-table-column>
<el-table-column
prop="code"
header-align="center"
align="center"
label="编码">
</el-table-column>
<el-table-column
prop="englishName"
header-align="center"
align="center"
label="英文名">
</el-table-column>
<el-table-column
prop="number"
header-align="center"
align="center"
label="库位数量">
</el-table-column>
<el-table-column
prop="status"
header-align="center"
align="center"
label="状态">
</el-table-column>
<el-table-column
@@ -74,8 +71,16 @@
width="150"
label="操作">
<template slot-scope="scope">
<el-button type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">修改</el-button>
<el-button type="text" size="small" @click="deleteHandle(scope.row.id)">删除</el-button>
<el-button type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">
<el-tooltip class="item" effect="dark" content="修改" placement="top">
<icon-svg class="iconClass" name="编辑"></icon-svg>
</el-tooltip>
</el-button>
<el-button type="text" style="color:red" size="small" @click="deleteHandle(scope.row.id)">
<el-tooltip class="item" effect="dark" content="删除" placement="top">
<icon-svg class="iconClass" name="删除"></icon-svg>
</el-tooltip>
</el-button>
</template>
</el-table-column>
</el-table>

42
src/views/basic/carInfo.vue
View File

@@ -1,8 +1,8 @@
<template>
<div class="mod-config">
<el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
<el-form style="display: flex; align-items: center; justify-content: right;" :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
<el-form-item>
<el-select v-model="dataForm.paramKey" filterable placeholder="名称">
<!-- <el-select size="small" v-model="dataForm.paramKey" filterable placeholder="名称">
<el-option
v-for="item in dataList"
:key="item.id"
@@ -10,16 +10,24 @@
:value="item.vehicleName"
>
</el-option>
</el-select>
</el-select> -->
<el-input size="small" v-model="dataForm.paramKey" placeholder="名称" />
</el-form-item>
<el-form-item>
<el-button @click="getDataList()">查询</el-button>
<el-button type="primary" @click="addOrUpdateHandle()">新增</el-button>
<el-button size="small" @click="getDataList()">
<icon-svg class="iconClass" name="sousuo"></icon-svg>
查询
</el-button>
<el-button size="small" type="primary" @click="addOrUpdateHandle()">
<icon-svg class="iconClass" name="新建"></icon-svg>
新增
</el-button>
</el-form-item>
</el-form>
<el-table
:data="dataList"
border
:stripe="true"
:header-cell-style="{background:'#eef1f6',color:'#606266',height: '56px'}"
v-loading="dataListLoading"
style="width: 100%;">
<el-table-column
@@ -37,32 +45,22 @@
</el-table-column> -->
<el-table-column
prop="vehicleName"
header-align="center"
align="center"
label="车辆名称">
</el-table-column>
<el-table-column
prop="code"
header-align="center"
align="center"
label="编码">
</el-table-column>
<el-table-column
prop="vehicleAlias"
header-align="center"
align="center"
label="缩写">
</el-table-column>
<el-table-column
prop="ip"
header-align="center"
align="center"
label="ip">
</el-table-column>
<el-table-column
prop="note"
header-align="center"
align="center"
label="备注">
</el-table-column>
<el-table-column
@@ -72,8 +70,16 @@
width="150"
label="操作">
<template slot-scope="scope">
<el-button type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">修改</el-button>
<el-button type="text" size="small" @click="deleteHandle(scope.row.id)">删除</el-button>
<el-button type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">
<el-tooltip class="item" effect="dark" content="修改" placement="top">
<icon-svg class="iconClass" name="编辑"></icon-svg>
</el-tooltip>
</el-button>
<el-button type="text" style="color:red" size="small" @click="deleteHandle(scope.row.id)">
<el-tooltip class="item" effect="dark" content="删除" placement="top">
<icon-svg class="iconClass" name="删除"></icon-svg>
</el-tooltip>
</el-button>
</template>
</el-table-column>
</el-table>

17
src/views/basic/components/location.vue
View File

@@ -1,14 +1,15 @@
<template>
<div class="mod-config">
<el-form :inline="true">
<el-form style="display: flex; align-items: center; justify-content: right;" :inline="true">
<el-form-item>
<el-button type="success" @click="$router.push({ name: 'basic-cache' })">返回缓存区</el-button>
<el-button type="primary" @click="addOrUpdateHandle()">新增</el-button>
<el-button size="small" type="success" @click="$router.push({ name: 'basic-cache' })">返回缓存区</el-button>
<el-button size="small" type="primary" @click="addOrUpdateHandle()">新增</el-button>
</el-form-item>
</el-form>
<el-table
:data="dataList"
border
:stripe="true"
:header-cell-style="{background:'#eef1f6',color:'#606266',height: '56px'}"
v-loading="dataListLoading"
style="width: 100%;">
<el-table-column
@@ -26,20 +27,14 @@
</el-table-column> -->
<el-table-column
prop="locationName"
header-align="center"
align="center"
label="库位名称">
</el-table-column>
<el-table-column
prop="code"
header-align="center"
align="center"
label="编码">
</el-table-column>
<el-table-column
prop="locationNameAlias"
header-align="center"
align="center"
label="别名">
</el-table-column>
<!-- <el-table-column
@@ -50,8 +45,6 @@
</el-table-column> -->
<el-table-column
prop="status"
header-align="center"
align="center"
label="状态">
<template slot-scope="scope">
<span>{{scope.row.status === 0?'空闲':scope.row.status === 1?'使用中':'不可使用'}}</span>

48
src/views/basic/equipmentInfo.vue
View File

@@ -4,6 +4,7 @@
:inline="true"
:model="dataForm"
@keyup.enter.native="getDataList()"
style="display: flex; align-items: center; justify-content: right;"
>
<!-- <el-form-item>
<el-select v-model="dataForm.paramKey" filterable placeholder="名称">
@@ -17,13 +18,20 @@
</el-select>
</el-form-item> -->
<el-form-item>
<el-button @click="getDataList()">查询</el-button>
<el-button type="primary" @click="addOrUpdateHandle()">新增</el-button>
<el-button size="small" @click="getDataList()">
<icon-svg class="iconClass" name="sousuo"></icon-svg>
查询
</el-button>
<el-button size="small" type="primary" @click="addOrUpdateHandle()">
<icon-svg class="iconClass" name="新建"></icon-svg>
新增
</el-button>
</el-form-item>
</el-form>
<el-table
:data="dataList"
border
:stripe="true"
:header-cell-style="{background:'#eef1f6',color:'#606266',height: '56px'}"
v-loading="dataListLoading"
style="width: 100%;"
>
@@ -37,15 +45,11 @@
</el-table-column>
<el-table-column
prop="kilnName"
header-align="center"
align="center"
label="名称"
>
</el-table-column>
<el-table-column
prop="code"
header-align="center"
align="center"
label="编码"
>
</el-table-column>
@@ -58,29 +62,21 @@
</el-table-column> -->
<el-table-column
prop="en"
header-align="center"
align="center"
label="英文名"
>
</el-table-column>
<el-table-column
prop="kilnAlias"
header-align="center"
align="center"
label="别名"
>
</el-table-column>
<el-table-column
prop="ip"
header-align="center"
align="center"
label="ip"
>
</el-table-column>
<el-table-column
prop="portNumber"
header-align="center"
align="center"
label="端口号"
>
</el-table-column>
@@ -92,18 +88,16 @@
label="操作"
>
<template slot-scope="scope">
<el-button
type="text"
size="small"
@click="addOrUpdateHandle(scope.row.id)"
>修改</el-button
>
<el-button
type="text"
size="small"
@click="deleteHandle(scope.row.id)"
>删除</el-button
>
<el-button type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">
<el-tooltip class="item" effect="dark" content="修改" placement="top">
<icon-svg class="iconClass" name="编辑"></icon-svg>
</el-tooltip>
</el-button>
<el-button type="text" style="color:red" size="small" @click="deleteHandle(scope.row.id)">
<el-tooltip class="item" effect="dark" content="删除" placement="top">
<icon-svg class="iconClass" name="删除"></icon-svg>
</el-tooltip>
</el-button>
</template>
</el-table-column>
</el-table>

42
src/views/basic/processInfo.vue
View File

@@ -1,8 +1,8 @@
<template>
<div class="mod-config">
<el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
<el-form :inline="true" style="display: flex; align-items: center; justify-content: right;" :model="dataForm" @keyup.enter.native="getDataList()">
<el-form-item>
<el-select v-model="dataForm.paramKey" filterable placeholder="工艺号">
<!-- <el-select size="small" v-model="dataForm.paramKey" filterable placeholder="工艺号">
<el-option
v-for="item in dataList"
:key="item.id"
@@ -10,16 +10,24 @@
:value="item.code"
>
</el-option>
</el-select>
</el-select> -->
<el-input size="small" v-model="dataForm.paramKey" placeholder="工艺号" />
</el-form-item>
<el-form-item>
<el-button @click="getDataList()">查询</el-button>
<el-button type="primary" @click="addOrUpdateHandle()">新增</el-button>
<el-button size="small" @click="getDataList()">
<icon-svg class="iconClass" name="sousuo"></icon-svg>
查询
</el-button>
<el-button size="small" type="primary" @click="addOrUpdateHandle()">
<icon-svg class="iconClass" name="新建"></icon-svg>
新增
</el-button>
</el-form-item>
</el-form>
<el-table
:data="dataList"
border
:stripe="true"
:header-cell-style="{background:'#eef1f6',color:'#606266',height: '56px'}"
v-loading="dataListLoading"
style="width: 100%;">
<el-table-column
@@ -37,32 +45,22 @@
</el-table-column> -->
<el-table-column
prop="alarmClass"
header-align="center"
align="center"
label="工艺号">
</el-table-column>
<el-table-column
prop="code"
header-align="center"
align="center"
label="工艺编码">
</el-table-column>
<el-table-column
prop="alarmInfo"
header-align="center"
align="center"
label="对应PLC值">
</el-table-column>
<el-table-column
prop="alarmInfo"
header-align="center"
align="center"
label="状态">
</el-table-column>
<el-table-column
prop="alarmInfo"
header-align="center"
align="center"
label="说明">
</el-table-column>
<el-table-column
@@ -72,8 +70,16 @@
width="150"
label="操作">
<template slot-scope="scope">
<el-button type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">修改</el-button>
<el-button type="text" style="color:red" size="small" @click="deleteHandle(scope.row.id)">删除</el-button>
<el-button type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">
<el-tooltip class="item" effect="dark" content="修改" placement="top">
<icon-svg class="iconClass" name="编辑"></icon-svg>
</el-tooltip>
</el-button>
<el-button type="text" style="color:red" size="small" @click="deleteHandle(scope.row.id)">
<el-tooltip class="item" effect="dark" content="删除" placement="top">
<icon-svg class="iconClass" name="删除"></icon-svg>
</el-tooltip>
</el-button>
</template>
</el-table-column>
</el-table>

133
src/views/common/home.vue
View File

@@ -1,52 +1,57 @@
<template>
<div>
<el-row type="flex" justify="space-around">
<el-col :span="6">
<el-card class="box-card" shadow="hover" @click.native="$router.push({ name: 'orderProcess' })">
<icon-svg class="iconClass" name="guolu"></icon-svg>
<h2>进工业炉加工</h2>
<el-row :gutter="20">
<el-col :span="8">
<el-card :style="{height: boxHeight + 'px'}" class="box-card box-card-jg" shadow="hover" @click.native="$router.push({ name: 'orderProcess' })">
<p class="box-card-header">
<icon-svg class="iconClass" name="进工业炉加工"></icon-svg>
进工业炉加工
</p>
<p class="box-card-footer">Processing</p>
</el-card>
</el-col>
<el-col :span="6">
<el-card class="box-card" shadow="hover" @click.native="$router.push({ name: 'exWarehouse' })">
<icon-svg class="iconClass" name="chuku"></icon-svg>
<h2>出库</h2>
<el-col :span="8">
<el-card :style="{height: boxHeight + 'px'}" class="box-card box-card-ck" shadow="hover" @click.native="$router.push({ name: 'exWarehouse' })">
<p class="box-card-header">
<icon-svg class="iconClass" name="出库"></icon-svg>
出库
</p>
<p class="box-card-footer">Warehouse</p>
</el-card>
</el-col>
<el-col :span="6">
<el-card class="box-card" shadow="hover" @click.native="$router.push({ name: 'addProcess' })">
<icon-svg class="iconClass" name="zaijiagong"></icon-svg>
<h2>追加加工</h2>
<el-col :span="8">
<el-card :style="{height: boxHeight + 'px'}" class="box-card box-card-zj" shadow="hover" @click.native="$router.push({ name: 'addProcess' })">
<p class="box-card-header">
<icon-svg class="iconClass" name="追加加工"></icon-svg>
追加加工
</p>
<p class="box-card-footer">Append</p>
</el-card>
</el-col>
</el-row>
<div class="mod-log">
<el-card class="mod-log">
<h3>当前任务列表</h3>
<el-table
:data="dataList"
border
height="500px"
:stripe="true"
:header-cell-style="{background:'#eef1f6',color:'#606266',height: '56px'}"
v-loading="dataListLoading"
style="width: 100%"
style="width: 100%; min-height: 500px"
>
<el-table-column
type="index"
label="序号"
header-align="center"
align="center"
label="序号"
width="50"
></el-table-column>
<el-table-column
prop="taskCode"
header-align="center"
align="center"
label="任务编号"
>
</el-table-column>
<el-table-column
prop="idens"
header-align="center"
align="center"
label="标识卡"
>
<template slot-scope="scope">
@@ -57,8 +62,6 @@
</el-table-column>
<el-table-column
prop="materials"
header-align="center"
align="center"
label="物料名"
>
<template slot-scope="scope">
@@ -69,8 +72,6 @@
</el-table-column>
<el-table-column
prop="customers"
header-align="center"
align="center"
label="客户"
>
<template slot-scope="scope">
@@ -81,22 +82,19 @@
</el-table-column>
<el-table-column
prop="kilnName"
header-align="center"
align="center"
label="窑炉"
>
</el-table-column>
<el-table-column
prop="status"
header-align="center"
align="center"
label="当前状态"
>
<template slot-scope="scope">
{{ scope.row.status >= 0 ? statusList[scope.row.status] : '' }}
</template>
</el-table-column>
<el-table-column
prop="taskType"
header-align="center"
align="center"
label="任务类型"
>
<template slot-scope="scope">
@@ -113,42 +111,59 @@
</el-table-column>
<el-table-column
prop="startPosition"
header-align="center"
align="center"
label="开始位置"
>
</el-table-column>
<el-table-column
prop="targetPosition"
header-align="center"
align="center"
label="目标位置"
>
</el-table-column>
<el-table-column
prop="locationName"
header-align="center"
align="center"
label="库位"
>
</el-table-column>
</el-table>
</div>
</el-card>
</div>
</template>
<script>
// 任务状态列表
const statusList = {
0: '等待执行',
1: '执行中',
2: '执行完成',
3: '追加后完成'
}
export default {
data () {
return {
dataList: [],
pageIndex: 1,
pageSize: 500,
dataListLoading: false
dataListLoading: false,
statusList,
boxHeight: 0
}
},
created () {
this.getDataList()
if (document.body.offsetWidth > 1180) {
this.boxHeight = (document.body.offsetWidth - 330) * 40 / 183
// * 320 / (3 * 488)
} else {
this.boxHeight = 186
}
window.addEventListener('resize', () => {
if (document.body.offsetWidth > 1180) {
this.boxHeight = (document.body.offsetWidth - 330) * 40 / 183
} else {
this.boxHeight = 186
}
})
},
methods: {
// 获取数据列表
@@ -174,17 +189,43 @@ export default {
}
</script>
<style scoped>
<style lang="scss" scoped>
.mod-log {
margin-top: 100px;
margin-top: 20px;
border-radius: 15px;
}
.box-card{
background-color: rgb(235, 254, 255);
text-align: center;
cursor: pointer;
background-repeat: no-repeat;
background-size: 100% 100%;
background-color: transparent;
border-radius: 25px;
padding-left: 20px;
padding-top: 40px;
.box-card-header{
font-size: 18px;
letter-spacing: 3px;
}
.box-card-footer{
font-size: 24px;
}
p {
margin: 10px 0;
}
}
.box-card-jg{
background-image: url('../../assets/img/进工业炉加工.png');
}
.box-card-ck{
background-image: url('../../assets/img/出库.png');
}
.box-card-zj{
background-image: url('../../assets/img/追加加工.png');
}
.iconClass{
width: 100px;
height: 100px;
/* width: 20px;
height: 20px; */
position: relative;
top: 2px;
}
</style>

103
src/views/common/order-process.vue
View File

@@ -1,30 +1,41 @@
<template>
<div class="mod-config">
<el-form :inline="true">
<el-form-item>
<el-button type="primary" @click="addOrUpdateHandle()">新增</el-button>
<el-form :inline="true" style="display: flex; align-items: center; justify-content: right;">
<el-form-item style="flex: 1;float: left">
<el-button size="small" type="primary" @click="addOrUpdateHandle()">
<icon-svg class="iconClass" name="新建"></icon-svg>
新增
</el-button>
</el-form-item>
<el-form-item label="加工类型">
<el-select v-model="processType" clearable>
<el-form-item>
<el-select v-model="processType" size="small" placeholder="加工类型" clearable>
<el-option :value="0" label="初始加工" />
<el-option :value="1" label="复加工" />
</el-select>
</el-form-item>
<el-form-item style="margin-left:2%">
任务起点位置 :
<el-button style="margin-left:10px" type="primary" @click="getPoint(0)">{{startPosition}}</el-button>
<el-form-item style="margin-left:1%">
<el-select v-model="startPosition" size="small" placeholder="任务起点位置" clearable>
<el-option :value="1" label="提升平台1" />
<el-option :value="2" label="提升平台2" />
<el-option :value="3" label="提升平台3" />
<el-option :value="4" label="提升平台4" />
</el-select>
<!-- <el-button style="margin-left:10px" type="primary" @click="getPoint(0)">{{startPosition}}</el-button> -->
</el-form-item>
<el-form-item style="margin-left:2%">
窑炉 :
<el-button style="margin-left:10px" type="primary" @click="getPoint(1)">{{kilnId}}</el-button>
<el-form-item style="margin-left:1%">
<el-select v-model="kilnId" size="small" placeholder="窑炉" clearable>
<el-option v-for="item in eqList" :key="item.id" :value="item.id" :label="item.kilnName" />
</el-select>
<!-- <el-button style="margin-left:10px" type="primary" @click="getPoint(1)">{{kilnId}}</el-button> -->
</el-form-item>
<el-form-item style="margin-left:2%">
<el-button type="primary" @click="submitTask()">提交任务</el-button>
<el-form-item style="margin-left:1%">
<el-button type="primary" size="small" @click="submitTask()">提交任务</el-button>
</el-form-item>
</el-form>
<el-table
:data="dataList"
border
:stripe="true"
:header-cell-style="{background:'#eef1f6',color:'#606266',height: '56px'}"
v-loading="dataListLoading"
style="width: 100%;">
<el-table-column
@@ -36,38 +47,26 @@
</el-table-column>
<el-table-column
prop="idenCardNum"
header-align="center"
align="center"
label="标识卡">
</el-table-column>
<el-table-column
prop="customerName"
header-align="center"
align="center"
label="客户名称">
</el-table-column>
<el-table-column
prop="orderNo"
header-align="center"
align="center"
label="订单号">
</el-table-column>
<el-table-column
prop="productName"
header-align="center"
align="center"
label="产品名称">
</el-table-column>
<el-table-column
prop="materialDes"
header-align="center"
align="center"
label="材料号牌">
</el-table-column>
<el-table-column
prop="finishQuantity"
header-align="center"
align="center"
label="已完成数">
<template slot-scope="scope">
{{ `${scope.row.finishQuantity}/${scope.row.targetQuantity}` }}
@@ -75,20 +74,14 @@
</el-table-column>
<el-table-column
prop="quantity"
header-align="center"
align="center"
label="数量">
</el-table-column>
<el-table-column
prop="weight"
header-align="center"
align="center"
label="重量">
</el-table-column>
<el-table-column
prop="unit"
header-align="center"
align="center"
label="单位">
</el-table-column>
<el-table-column
@@ -97,8 +90,16 @@
align="center"
label="操作">
<template slot-scope="scope">
<el-button type="text" size="small" @click="addOrUpdateHandle(scope.row, scope.$index)">修改</el-button>
<el-button type="text" size="small" @click="deleteHandle(scope.$index)">删除</el-button>
<el-button type="text" size="small" @click="addOrUpdateHandle(scope.row, scope.$index)">
<el-tooltip class="item" effect="dark" content="修改" placement="top">
<icon-svg class="iconClass" name="编辑"></icon-svg>
</el-tooltip>
</el-button>
<el-button type="text" style="color:red" size="small" @click="deleteHandle(scope.$index)">
<el-tooltip class="item" effect="dark" content="删除" placement="top">
<icon-svg class="iconClass" name="删除"></icon-svg>
</el-tooltip>
</el-button>
</template>
</el-table-column>
</el-table>
@@ -114,14 +115,15 @@
export default {
data () {
return {
startPosition: '选择起点',
kilnId: '选择窑炉',
startPosition: '',
kilnId: '',
targetPosition: '',
dataList: [],
processType: null,
dataListLoading: false,
addOrUpdateVisible: false,
processPointVisible: false
processPointVisible: false,
eqList: []
}
},
components: {
@@ -129,9 +131,27 @@
ProcessPoint
},
activated () {
this.getDataList()
this.getEqList()
},
methods: {
// 获取窑炉列表
getEqList () {
this.$http({
url: this.$http.adornUrl('/kilnInfo/page'),
method: 'post',
data: this.$http.adornData({
current: 1,
size: 999
})
}).then(({ data }) => {
if (data && data.code === 0) {
this.eqList = data.data.records
} else {
this.eqList = []
}
this.getDataList()
})
},
// 获取数据列表
getDataList () {
this.dataList = sessionStorage.getItem('taskList') ? JSON.parse(sessionStorage.getItem('taskList')) : []
@@ -169,12 +189,12 @@
message: '任务为空，请新增一条托盘信息',
type: 'warning'
})
} else if (this.startPosition === '选择起点') {
} else if (!this.startPosition) {
this.$message({
message: '请选择任务起点',
type: 'warning'
})
} else if (this.kilnId === '选择窑炉') {
} else if (!this.kilnId) {
this.$message({
message: '请选择窑炉',
type: 'warning'
@@ -196,7 +216,8 @@
kilnId: this.kilnId,
processType: this.processType,
startPosition: this.startPosition,
targetPosition: this.targetPosition
targetPosition: this.kilnId
// this.targetPosition
})
}).then(({data}) => {
console.log(data)

5
src/views/main-content.vue
View File

@@ -21,7 +21,7 @@
:key="item.name"
:label="item.title"
:name="item.name">
<el-card :body-style="siteContentViewHeight">
<el-card :body-style="siteContentViewHeight" style="background: transparent; border: 0; box-shadow: 0 0 0 0 rgba(0, 0, 0, 0)">
<iframe
v-if="item.type === 'iframe'"
:src="item.iframeUrl"
@@ -34,7 +34,7 @@
</el-tab-pane>
</el-tabs>
<!-- 主入口标签页 e -->
<el-card v-else :body-style="siteContentViewHeight">
<el-card v-else :body-style="siteContentViewHeight" style="background: transparent; border: 0; box-shadow: 0 0 0 0 rgba(0, 0, 0, 0)">
<keep-alive>
<router-view />
</keep-alive>
@@ -124,4 +124,3 @@
}
}
</script>

10
src/views/order/components/current-order-detail.vue
View File

@@ -21,9 +21,9 @@
readonly
></el-input>
</el-form-item>
<el-form-item label="订单状态" prop="valid">
<el-select v-model="dataForm.valid" disabled placeholder="订单状态">
<el-option v-for="item in validList" :key="item.value" :value="item.value" :label="item.label" />
<el-form-item label="订单状态" prop="orderVoid">
<el-select v-model="dataForm.orderVoid" disabled placeholder="订单状态">
<el-option v-for="item in orderVoidList" :key="item.value" :value="item.value" :label="item.label" />
</el-select>
</el-form-item>
<el-form-item label="物料名称" prop="startPosition">
@@ -137,7 +137,7 @@ const statusList = [
{ value: 3, label: '追加后完成' }
]
// 订单状态列表
const validList = [
const orderVoidList = [
{ value: 0, label: '不可用' },
{ value: 1, label: '可用' },
{ value: 2, label: '停止' }
@@ -150,7 +150,7 @@ export default {
dataForm: {},
formLoading: false,
statusList,
validList
orderVoidList
}
},
methods: {

28
src/views/order/components/current-order-task.vue
View File

@@ -1,8 +1,9 @@
<template>
<div class="mod-config">
<el-form :inline="true">
<el-form style="display: flex; align-items: center; justify-content: right;" :inline="true">
<el-form-item>
<el-button
size="small"
type="success"
@click="$router.push({ name: 'order-current-order' })"
>返回当前订单列表</el-button
@@ -11,7 +12,8 @@
</el-form>
<el-table
:data="dataList"
border
:stripe="true"
:header-cell-style="{background:'#eef1f6',color:'#606266',height: '56px'}"
v-loading="dataListLoading"
style="width: 100%;"
>
@@ -25,78 +27,56 @@
</el-table-column>
<el-table-column
prop="taskCode"
header-align="center"
align="center"
label="任务编码"
>
</el-table-column
><el-table-column
prop="abeginTime"
header-align="center"
align="center"
label="发起时间"
>
</el-table-column>
<el-table-column
prop="aendTime"
header-align="center"
align="center"
label="完成时间"
>
</el-table-column>
<el-table-column
prop="taskType"
header-align="center"
align="center"
label="任务类型"
>
</el-table-column>
<el-table-column
prop="remark"
header-align="center"
align="center"
label="当前工序"
>
</el-table-column>
<el-table-column
prop="startPosition"
header-align="center"
align="center"
label="开始位置"
>
</el-table-column>
<el-table-column
prop="targetPosition"
header-align="center"
align="center"
label="目标位置"
>
</el-table-column>
<el-table-column
prop="vehicleName"
header-align="center"
align="center"
label="车辆名称"
>
</el-table-column>
<el-table-column
prop="kilnName"
header-align="center"
align="center"
label="加工炉"
>
</el-table-column>
<el-table-column
prop="quantity"
header-align="center"
align="center"
label="加工数量"
>
</el-table-column>
<el-table-column
prop="weight"
header-align="center"
align="center"
label="重量"
>
</el-table-column>

26
src/views/order/components/current-task-detail.vue
View File

@@ -14,9 +14,10 @@
<el-input v-model="dataForm.remark" placeholder="备注"></el-input>
</el-form-item>
</el-form> -->
<el-form :inline="true">
<el-form style="display: flex; align-items: center; justify-content: right;" :inline="true">
<el-form-item>
<el-button
size="small"
type="success"
@click="$router.push({ name: 'order-current-task' })"
>返回当前执行任务列表</el-button
@@ -25,7 +26,8 @@
</el-form>
<el-table
:data="dataList"
border
:stripe="true"
:header-cell-style="{background:'#eef1f6',color:'#606266',height: '56px'}"
v-loading="dataListLoading"
style="width: 100%;">
<el-table-column
@@ -37,63 +39,43 @@
</el-table-column>
<el-table-column
prop="idenCardNum"
header-align="center"
align="center"
label="标识卡号">
</el-table-column>
<el-table-column
prop="orderNo"
header-align="center"
align="center"
label="订单名">
</el-table-column>
<el-table-column
prop="customer"
header-align="center"
align="center"
label="客户名称">
</el-table-column>
<el-table-column
prop="productName"
header-align="center"
align="center"
label="产品名称">
</el-table-column>
<el-table-column
prop="productModel"
header-align="center"
align="center"
label="产品型号">
</el-table-column>
<el-table-column
prop="materialDes"
header-align="center"
align="center"
label="材料号牌">
</el-table-column>
<el-table-column
prop="craftIll"
header-align="center"
align="center"
width="120"
label="生产工艺要求">
</el-table-column>
<el-table-column
prop="unit"
header-align="center"
align="center"
label="单位">
</el-table-column>
<el-table-column
prop="quantity"
header-align="center"
align="center"
label="数量">
</el-table-column>
<el-table-column
prop="weight"
header-align="center"
align="center"
label="重量">
</el-table-column>
</el-table>

55
src/views/order/current-order.vue
View File

@@ -1,19 +1,20 @@
<template>
<div class="mod-config">
<el-form :inline="true" ref="dataForm" :rules="dataRule" :model="dataForm" @keyup.enter.native="getDataList()">
<el-form-item label="标识卡号卡号">
<el-input v-model="dataForm.idenCardNum" placeholder="标识卡号" />
</el-form-item>
<el-form-item label="订单号">
<el-input v-model="dataForm.idenCardNum" placeholder="订单号" />
<el-form style="display: flex; align-items: center; justify-content: right;" :inline="true" ref="dataForm" :rules="dataRule" :model="dataForm" @keyup.enter.native="getDataList()">
<el-form-item>
<el-input size="small" v-model="dataForm.idenCardNum" placeholder="标识卡号" />
</el-form-item>
<el-form-item>
<el-button @click="getDataList()">查询</el-button>
<el-input size="small" v-model="dataForm.idenCardNum" placeholder="订单号" />
</el-form-item>
<el-form-item>
<el-button size="small" @click="getDataList()">查询</el-button>
</el-form-item>
</el-form>
<el-table
:data="dataList"
border
:stripe="true"
:header-cell-style="{background:'#eef1f6',color:'#606266',height: '56px'}"
v-loading="dataListLoading"
style="width: 100%;">
<el-table-column
@@ -25,74 +26,52 @@
</el-table-column>
<el-table-column
prop="createTime"
header-align="center"
align="center"
label="获取时间">
</el-table-column>
<el-table-column
prop="idenCardNum"
header-align="center"
align="center"
label="标识卡号">
</el-table-column>
<el-table-column
prop="orderNo"
header-align="center"
align="center"
label="订单号">
</el-table-column>
<el-table-column
prop="status"
header-align="center"
align="center"
label="任务状态">
<template slot-scope="scope">
{{ scope.row.status >= 0 ? statusList[scope.row.status] : '' }}
</template>
</el-table-column>
<el-table-column
prop="valid"
header-align="center"
align="center"
prop="orderVoid"
label="订单状态">
<template slot-scope="scope">
{{ scope.row.valid >= 0 ? validList[scope.row.valid] : '' }}
{{ scope.row.orderVoid >= 0 ? orderVoidList[scope.row.orderVoid] : '' }}
</template>
</el-table-column>
<el-table-column
prop="customerName"
header-align="center"
align="center"
label="客户名称">
</el-table-column>
<el-table-column
prop="productName"
header-align="center"
align="center"
label="产品名称">
</el-table-column>
<el-table-column
prop="materialDes"
header-align="center"
align="center"
label="物料名称">
</el-table-column>
<el-table-column
prop="quantity"
header-align="center"
align="center"
label="物料数量">
</el-table-column>
<el-table-column
prop="weight"
header-align="center"
align="center"
label="物料重量">
</el-table-column>
<el-table-column
prop="waitWeight"
header-align="center"
align="center"
label="实际重量">
</el-table-column>
<el-table-column
@@ -122,8 +101,12 @@
width="150"
label="操作">
<template slot-scope="scope">
<el-button v-if="scope.row.status < 2 && scope.row.valid === 1" type="text" size="small" @click="completeOrder(scope.row.id)">完成</el-button>
<el-button v-if="scope.row.valid !== 0" type="text" size="small" @click="deleteHandle(scope.row.id)">作废</el-button>
<el-button v-if="scope.row.status < 2 && scope.row.orderVoid === 1" type="text" size="small" @click="completeOrder(scope.row.id)">
<el-tooltip class="item" effect="dark" content="完成" placement="top">
<icon-svg class="iconClass" name="成功"></icon-svg>
</el-tooltip>
</el-button>
<!-- <el-button v-if="scope.row.orderVoid !== 0" type="text" size="small" @click="deleteHandle(scope.row.id)">作废</el-button> -->
</template>
</el-table-column>
</el-table>
@@ -152,7 +135,7 @@
3: '追加后完成'
}
// 订单状态列表
const validList = {
const orderVoidList = {
0: '不可用',
1: '可用',
2: '停止'
@@ -182,7 +165,7 @@
]
},
statusList,
validList
orderVoidList
}
},
components: {

37
src/views/order/current-task.vue
View File

@@ -1,8 +1,8 @@
<template>
<div class="mod-config">
<el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
<el-form style="display: flex; align-items: center; justify-content: right;" :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
<el-form-item>
<el-select v-model="dataForm.vehicleId" filterable placeholder="车辆名称">
<el-select size="small" v-model="dataForm.vehicleId" filterable placeholder="车辆名称">
<el-option
v-for="item in options"
:key="item.value"
@@ -13,13 +13,14 @@
</el-select>
</el-form-item>
<el-form-item>
<el-button @click="getDataList()">查询</el-button>
<el-button size="small" @click="getDataList()">查询</el-button>
<!-- <el-button type="primary" @click="handTask()">手动执行任务</el-button> -->
</el-form-item>
</el-form>
<el-table
:data="dataList"
border
:stripe="true"
:header-cell-style="{background:'#eef1f6',color:'#606266',height: '56px'}"
v-loading="dataListLoading"
style="width: 100%;">
<el-table-column
@@ -31,26 +32,18 @@
</el-table-column>
<el-table-column
prop="taskCode"
header-align="center"
align="center"
label="任务编码">
</el-table-column>
<el-table-column
prop="createTime"
header-align="center"
align="center"
label="发起时间">
</el-table-column>
<el-table-column
prop="taskSource"
header-align="center"
align="center"
label="任务来源">
</el-table-column>
<el-table-column
prop="status"
header-align="center"
align="center"
label="任务状态">
<template slot-scope="scope">
{{ scope.row.status >= 0 ? statusList[scope.row.status] : '' }}
@@ -58,8 +51,6 @@
</el-table-column>
<el-table-column
prop="taskType"
header-align="center"
align="center"
label="任务类型">
<template slot-scope="scope">
<span>{{
@@ -75,20 +66,14 @@
</el-table-column>
<el-table-column
prop="startPosition"
header-align="center"
align="center"
label="开始位置">
</el-table-column>
<el-table-column
prop="targetPosition"
header-align="center"
align="center"
label="目标位置">
</el-table-column>
<el-table-column
prop="vehicleName"
header-align="center"
align="center"
label="车辆名称">
</el-table-column>
<el-table-column
@@ -108,8 +93,16 @@
width="120"
label="操作">
<template slot-scope="scope">
<el-button type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">执行</el-button>
<el-button type="text" style="color:red" size="small" @click="deleteHandle(scope.row.sheetNo)">删除</el-button>
<el-button type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">
<el-tooltip class="item" effect="dark" content="执行" placement="top">
<icon-svg class="iconClass" name="维护开始"></icon-svg>
</el-tooltip>
</el-button>
<el-button type="text" style="color:red" size="small" @click="deleteHandle(scope.row.sheetNo)">
<el-tooltip class="item" effect="dark" content="删除" placement="top">
<icon-svg class="iconClass" name="删除"></icon-svg>
</el-tooltip>
</el-button>
</template>
</el-table-column>
</el-table>

12
src/views/report/components/order-history-detail.vue
View File

@@ -2,7 +2,7 @@
* @Author: zwq
* @Date: 2021-11-19 11:23:44
* @LastEditors: gtz
* @LastEditTime: 2021-12-14 20:32:36
* @LastEditTime: 2021-12-15 17:30:43
* @Description:
-->
<template>
@@ -21,9 +21,9 @@
readonly
></el-input>
</el-form-item>
<el-form-item label="订单状态" prop="valid">
<el-select v-model="dataForm.valid" disabled placeholder="任务状态">
<el-option v-for="item in validList" :key="item.value" :value="item.value" :label="item.label" />
<el-form-item label="订单状态" prop="orderVoid">
<el-select v-model="dataForm.orderVoid" disabled placeholder="订单状态">
<el-option v-for="item in orderVoidList" :key="item.value" :value="item.value" :label="item.label" />
</el-select>
</el-form-item>
<el-form-item label="产品名称" prop="productName">
@@ -158,7 +158,7 @@ const statusList = [
{ value: 3, label: '追加后完成' }
]
// 订单状态列表
const validList = [
const orderVoidList = [
{ value: 0, label: '不可用' },
{ value: 1, label: '可用' },
{ value: 2, label: '停止' }
@@ -171,7 +171,7 @@ export default {
dataForm: {},
formLoading: false,
statusList,
validList
orderVoidList
}
},
methods: {

30
src/views/report/components/order-history-task.vue
View File

@@ -1,8 +1,9 @@
<template>
<div class="mod-config">
<el-form :inline="true">
<el-form style="display: flex; align-items: center; justify-content: right;" :inline="true">
<el-form-item>
<el-button
size="small"
type="success"
@click="$router.push({ name: 'report-order-history' })"
>返回订单历史列表</el-button
@@ -11,7 +12,8 @@
</el-form>
<el-table
:data="dataList"
border
:stripe="true"
:header-cell-style="{background:'#eef1f6',color:'#606266',height: '56px'}"
v-loading="dataListLoading"
style="width: 100%;"
>
@@ -25,85 +27,61 @@
</el-table-column>
<el-table-column
prop="taskCode"
header-align="center"
align="center"
label="任务编码"
>
</el-table-column
><el-table-column
prop="abeginTime"
header-align="center"
align="center"
label="发起时间"
>
</el-table-column>
<el-table-column
prop="aendTime"
header-align="center"
align="center"
label="完成时间"
>
</el-table-column>
<el-table-column
prop="orderSource"
header-align="center"
align="center"
label="任务来源"
>
</el-table-column>
<el-table-column
prop="taskType"
header-align="center"
align="center"
label="任务类型"
>
</el-table-column>
<el-table-column
prop="paramKey"
header-align="center"
align="center"
label="当前工序"
>
</el-table-column>
<el-table-column
prop="unit"
header-align="center"
align="center"
label="单位"
>
</el-table-column>
<el-table-column
prop="finishQuantity"
header-align="center"
align="center"
label="数量"
>
</el-table-column>
<el-table-column
prop="finishWeight"
header-align="center"
align="center"
label="重量"
>
</el-table-column>
<el-table-column
prop="startPosition"
header-align="center"
align="center"
label="开始位置"
>
</el-table-column>
<el-table-column
prop="targetPosition"
header-align="center"
align="center"
label="目标位置"
>
</el-table-column>
<el-table-column
prop="vehicleName"
header-align="center"
align="center"
label="车辆名称"
>
</el-table-column>

27
src/views/report/components/task-history-detail.vue
View File

@@ -1,13 +1,14 @@
<template>
<div class="mod-config">
<el-form :inline="true">
<el-form style="display: flex; align-items: center; justify-content: right;" :inline="true">
<el-form-item>
<el-button type="success" @click="$router.push({ name: 'report-task-history' })">返回执行任务历史列表</el-button>
<el-button size="small" type="success" @click="$router.push({ name: 'report-task-history' })">返回执行任务历史列表</el-button>
</el-form-item>
</el-form>
<el-table
:data="dataList"
border
:stripe="true"
:header-cell-style="{background:'#eef1f6',color:'#606266',height: '56px'}"
v-loading="dataListLoading"
style="width: 100%;">
<el-table-column
@@ -19,63 +20,43 @@
</el-table-column>
<el-table-column
prop="idenCardNum"
header-align="center"
align="center"
label="标识卡号">
</el-table-column>
<el-table-column
prop="orderNo"
header-align="center"
align="center"
label="订单名">
</el-table-column>
<el-table-column
prop="customer"
header-align="center"
align="center"
label="客户名称">
</el-table-column>
<el-table-column
prop="productName"
header-align="center"
align="center"
label="产品名称">
</el-table-column>
<el-table-column
prop="productModel"
header-align="center"
align="center"
label="产品型号">
</el-table-column>
<el-table-column
prop="materialDes"
header-align="center"
align="center"
label="材料号牌">
</el-table-column>
<el-table-column
prop="craftIll"
header-align="center"
align="center"
width="120"
label="生产工艺要求">
</el-table-column>
<el-table-column
prop="unit"
header-align="center"
align="center"
label="单位">
</el-table-column>
<el-table-column
prop="quantity"
header-align="center"
align="center"
label="数量">
</el-table-column>
<el-table-column
prop="weight"
header-align="center"
align="center"
label="重量">
</el-table-column>
</el-table>

41
src/views/report/order-history.vue
View File

@@ -1,8 +1,8 @@
<template>
<div class="mod-config">
<el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
<el-form style="display: flex; align-items: center; justify-content: right;" :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
<el-form-item>
<el-select v-model="dataForm.idenCardNum" filterable placeholder="标识卡号">
<el-select size="small" v-model="dataForm.idenCardNum" filterable placeholder="标识卡号">
<el-option
v-for="item in options1"
:key="item.value"
@@ -13,7 +13,7 @@
</el-select>
</el-form-item>
<el-form-item>
<el-select v-model="dataForm.orderNo" filterable placeholder="订单号">
<el-select size="small" v-model="dataForm.orderNo" filterable placeholder="订单号">
<el-option
v-for="item in options2"
:key="item.value"
@@ -24,12 +24,13 @@
</el-select>
</el-form-item>
<el-form-item>
<el-button @click="getDataList()">查询</el-button>
<el-button size="small" @click="getDataList()">查询</el-button>
</el-form-item>
</el-form>
<el-table
:data="dataList"
border
:stripe="true"
:header-cell-style="{background:'#eef1f6',color:'#606266',height: '56px'}"
v-loading="dataListLoading"
style="width: 100%;">
<el-table-column
@@ -41,32 +42,22 @@
</el-table-column>
<el-table-column
prop="createTime"
header-align="center"
align="center"
label="获取时间">
</el-table-column>
<el-table-column
prop="idenCardNum"
header-align="center"
align="center"
label="标识卡号">
</el-table-column>
<el-table-column
prop="orderNo"
header-align="center"
align="center"
label="订单号">
</el-table-column>
<el-table-column
prop="abeginTime"
header-align="center"
align="center"
label="发起时间">
</el-table-column>
<el-table-column
prop="aendTime"
header-align="center"
align="center"
label="完成时间">
</el-table-column>
<!-- <el-table-column
@@ -77,44 +68,32 @@
</el-table-column> -->
<el-table-column
prop="status"
header-align="center"
align="center"
label="任务状态">
<template slot-scope="scope">
{{ scope.row.status >= 0 ? statusList[scope.row.status] : '' }}
</template>
</el-table-column>
<el-table-column
prop="valid"
header-align="center"
align="center"
prop="orderVoid"
label="订单状态">
<template slot-scope="scope">
{{ scope.row.valid >= 0 ? validList[scope.row.valid] : '' }}
{{ scope.row.orderVoid >= 0 ? orderVoidList[scope.row.orderVoid] : '' }}
</template>
</el-table-column>
<el-table-column
prop="customerName"
header-align="center"
align="center"
label="客户名称">
</el-table-column>
<el-table-column
prop="productName"
header-align="center"
align="center"
label="产品名称">
</el-table-column>
<el-table-column
prop="materialDes"
header-align="center"
align="center"
label="材料号牌">
</el-table-column>
<el-table-column
prop="quantity"
header-align="center"
align="center"
label="数量">
</el-table-column>
<el-table-column
@@ -162,7 +141,7 @@
3: '追加后完成'
}
// 订单状态列表
const validList = {
const orderVoidList = {
0: '不可用',
1: '可用',
2: '停止'
@@ -184,7 +163,7 @@
dataListLoading: false,
orderDetailVisible: false,
statusList,
validList
orderVoidList
}
},
components: {

24
src/views/report/task-history.vue
View File

@@ -1,12 +1,14 @@
<template>
<div class="mod-config">
<el-form
style="display: flex; align-items: center; justify-content: right;"
:inline="true"
:model="dataForm"
@keyup.enter.native="getDataList()"
>
<el-form-item>
<el-select
size="small"
v-model="dataForm.vehicleId"
filterable
placeholder="车辆名称"
@@ -22,6 +24,7 @@
</el-form-item>
<el-form-item>
<el-date-picker
size="small"
v-model="dataForm.time"
type="daterange"
value-format="yyyy-MM-dd"
@@ -32,12 +35,13 @@
</el-date-picker>
</el-form-item>
<el-form-item>
<el-button @click="getDataList()">查询</el-button>
<el-button size="small" @click="getDataList()">查询</el-button>
</el-form-item>
</el-form>
<el-table
:data="dataList"
border
:stripe="true"
:header-cell-style="{background:'#eef1f6',color:'#606266',height: '56px'}"
v-loading="dataListLoading"
style="width: 100%;"
>
@@ -51,29 +55,21 @@
</el-table-column>
<el-table-column
prop="taskCode"
header-align="center"
align="center"
label="任务编码"
>
</el-table-column>
<el-table-column
prop="createTime"
header-align="center"
align="center"
label="发起时间"
>
</el-table-column>
<el-table-column
prop="taskSource"
header-align="center"
align="center"
label="任务来源"
>
</el-table-column>
<el-table-column
prop="status"
header-align="center"
align="center"
label="任务状态"
>
<template slot-scope="scope">
@@ -82,8 +78,6 @@
</el-table-column>
<el-table-column
prop="taskType"
header-align="center"
align="center"
label="任务类型"
>
<template slot-scope="scope">
@@ -100,22 +94,16 @@
</el-table-column>
<el-table-column
prop="startPosition"
header-align="center"
align="center"
label="开始位置"
>
</el-table-column>
<el-table-column
prop="targetPosition"
header-align="center"
align="center"
label="目标位置"
>
</el-table-column>
<el-table-column
prop="vehicleName"
header-align="center"
align="center"
label="车辆名称"
>
</el-table-column>