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

Compare commits

base: mt-ck:ab898dda04761a18356bf17bf31a9a2825080087
Branches Tags
mt-ck:master
mt-ck:zwq
mt-ck:gtz
..
compare: mt-ck:6073b6d43b5b95bd3e501ffefe2fe83f84ffafe3
Branches Tags
mt-ck:zwq
mt-ck:master
mt-ck:gtz

No commits in common. "ab898dda04761a18356bf17bf31a9a2825080087" and "6073b6d43b5b95bd3e501ffefe2fe83f84ffafe3" have entirely different histories.
ab898dda04 ... 6073b6d43b

16 changed files with 244 additions and 700 deletions
Show Stats Expand all files Collapse all files

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

@ -2,15 +2,7 @@
<div class="mod-config">
<el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
<el-form-item>
<el-select v-model="dataForm.paramKey" filterable placeholder="报警编码">
<el-option
v-for="item in options"
:key="item.value"
:label="item.label"
:value="item.value"
>
</el-option>
</el-select>
<el-input v-model="dataForm.paramKey" placeholder="名称或编码" clearable></el-input>
</el-form-item>
<el-form-item>
<el-button @click="getDataList()">查询</el-button>
@ -33,25 +25,19 @@
prop="paramKey"
header-align="center"
align="center"
label="添加时间">
label="参数名">
</el-table-column>
<el-table-column
prop="paramValue"
header-align="center"
align="center"
label="报警类型">
label="参数值">
</el-table-column>
<el-table-column
prop="remark"
header-align="center"
align="center"
label="报警编码">
</el-table-column>
<el-table-column
prop="remark"
header-align="center"
align="center"
label="报警内容">
label="备注">
</el-table-column>
<el-table-column
fixed="right"
@ -88,7 +74,6 @@
paramKey: ''
},
dataList: [],
options: [],
pageIndex: 1,
pageSize: 10,
totalPage: 0,

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

@ -25,31 +25,19 @@
prop="paramKey"
header-align="center"
align="center"
label="添加时间">
label="参数名">
</el-table-column>
<el-table-column
prop="paramValue"
header-align="center"
align="center"
label="缓存区名称">
label="参数值">
</el-table-column>
<el-table-column
prop="remark"
header-align="center"
align="center"
label="编码">
</el-table-column>
<el-table-column
prop="ename"
header-align="center"
align="center"
label="英文名">
</el-table-column>
<el-table-column
prop="status"
header-align="center"
align="center"
label="状态">
label="备注">
</el-table-column>
<el-table-column
fixed="right"

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

@ -2,15 +2,7 @@
<div class="mod-config">
<el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
<el-form-item>
<el-select v-model="dataForm.paramKey" filterable placeholder="名称">
<el-option
v-for="item in options"
:key="item.value"
:label="item.label"
:value="item.value"
>
</el-option>
</el-select>
<el-input v-model="dataForm.paramKey" placeholder="名称或编码" clearable></el-input>
</el-form-item>
<el-form-item>
<el-button @click="getDataList()">查询</el-button>
@ -33,25 +25,19 @@
prop="paramKey"
header-align="center"
align="center"
label="添加时间">
label="参数名">
</el-table-column>
<el-table-column
prop="paramValue"
header-align="center"
align="center"
label="车辆名称">
label="参数值">
</el-table-column>
<el-table-column
prop="remark"
header-align="center"
align="center"
label="编码">
</el-table-column>
<el-table-column
prop="suoxie"
header-align="center"
align="center"
label="缩写">
label="备注">
</el-table-column>
<el-table-column
fixed="right"
@ -88,7 +74,6 @@
paramKey: ''
},
dataList: [],
options: [],
pageIndex: 1,
pageSize: 10,
totalPage: 0,

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

@ -12,47 +12,29 @@
v-loading="dataListLoading"
style="width: 100%;">
<el-table-column
type="index"
prop="id"
header-align="center"
align="center"
label="序号"
width="50">
width="80"
label="ID">
</el-table-column>
<el-table-column
prop="paramKey"
header-align="center"
align="center"
label="添加时间">
label="参数名">
</el-table-column>
<el-table-column
prop="paramValue"
header-align="center"
align="center"
label="库位名称">
label="参数值">
</el-table-column>
<el-table-column
prop="remark"
header-align="center"
align="center"
label="编码">
</el-table-column>
<el-table-column
prop="rname"
header-align="center"
align="center"
label="别名">
</el-table-column>
<el-table-column
prop="ename"
header-align="center"
align="center"
label="英文名称">
</el-table-column>
<el-table-column
prop="status"
header-align="center"
align="center"
label="状态">
label="备注">
</el-table-column>
<el-table-column
fixed="right"

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

@ -1,20 +1,8 @@
<template>
<div class="mod-config">
<el-form
:inline="true"
:model="dataForm"
@keyup.enter.native="getDataList()"
>
<el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
<el-form-item>
<el-select v-model="dataForm.paramKey" filterable placeholder="名称">
<el-option
v-for="item in options"
:key="item.value"
:label="item.label"
:value="item.value"
>
</el-option>
</el-select>
<el-input v-model="dataForm.paramKey" placeholder="名称或编码" clearable></el-input>
</el-form-item>
<el-form-item>
<el-button @click="getDataList()">查询</el-button>
@ -25,78 +13,41 @@
:data="dataList"
border
v-loading="dataListLoading"
style="width: 100%;"
>
style="width: 100%;">
<el-table-column
type="index"
header-align="center"
align="center"
label="序号"
width="50"
>
width="50">
</el-table-column>
<el-table-column
prop="paramKey"
header-align="center"
align="center"
label="添加时间"
>
label="参数名">
</el-table-column>
<el-table-column
prop="paramValue"
header-align="center"
align="center"
label="设备名称"
>
label="参数值">
</el-table-column>
<el-table-column
prop="remark"
header-align="center"
align="center"
label="编码"
>
</el-table-column>
<el-table-column
prop="type"
header-align="center"
align="center"
label="类型"
>
</el-table-column>
<el-table-column
prop="ename"
header-align="center"
align="center"
label="英文名"
>
</el-table-column>
<el-table-column
prop="suoxie"
header-align="center"
align="center"
label="缩写"
>
label="备注">
</el-table-column>
<el-table-column
fixed="right"
header-align="center"
align="center"
width="150"
label="操作"
>
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-button>
<el-button type="text" size="small" @click="deleteHandle(scope.row.id)">删除</el-button>
</template>
</el-table-column>
</el-table>
@ -107,15 +58,10 @@
:page-sizes="[10, 20, 50, 100]"
:page-size="pageSize"
:total="totalPage"
layout="total, sizes, prev, pager, next, jumper"
>
layout="total, sizes, prev, pager, next, jumper">
</el-pagination>
<!-- 弹窗, 新增 / 修改 -->
<add-or-update
v-if="addOrUpdateVisible"
ref="addOrUpdate"
@refreshDataList="getDataList"
></add-or-update>
<add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="getDataList"></add-or-update>
</div>
</template>
@ -128,7 +74,6 @@ export default {
paramKey: ''
},
dataList: [],
options: [],
pageIndex: 1,
pageSize: 10,
totalPage: 0,
@ -150,9 +95,9 @@ export default {
url: this.$http.adornUrl('/sys/config/list'),
method: 'get',
params: this.$http.adornParams({
page: this.pageIndex,
limit: this.pageSize,
paramKey: this.dataForm.paramKey
'page': this.pageIndex,
'limit': this.pageSize,
'paramKey': this.dataForm.paramKey
})
}).then(({data}) => {
if (data && data.code === 0) {
@ -189,8 +134,7 @@ export default {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
})
.then(() => {
}).then(() => {
this.$http({
url: this.$http.adornUrl('/sys/config/delete'),
method: 'post',
@ -209,8 +153,7 @@ export default {
this.$message.error(data.msg)
}
})
})
.catch(() => {})
}).catch(() => {})
}
}
}

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

@ -32,6 +32,7 @@
prop="id"
header-align="center"
align="center"
width="80"
label="标识卡">
</el-table-column>
<el-table-column
@ -58,12 +59,6 @@
align="center"
label="材料号牌">
</el-table-column>
<el-table-column
prop="num"
header-align="center"
align="center"
label="已完成数">
</el-table-column>
<el-table-column
prop="number"
header-align="center"
@ -86,6 +81,7 @@
fixed="right"
header-align="center"
align="center"
width="150"
label="操作">
<template slot-scope="scope">
<el-button type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">修改</el-button>

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

@ -11,77 +11,29 @@
v-loading="dataListLoading"
style="width: 100%;">
<el-table-column
type="index"
prop="id"
header-align="center"
align="center"
label="序号"
width="50">
width="80"
label="ID">
</el-table-column>
<el-table-column
prop="paramKey"
header-align="center"
align="center"
label="任务编码">
label="参数名">
</el-table-column>
<el-table-column
prop="paramValue"
header-align="center"
align="center"
label="发起时间">
label="参数值">
</el-table-column>
<el-table-column
prop="remark"
header-align="center"
align="center"
label="完成时间">
</el-table-column>
<el-table-column
prop="type"
header-align="center"
align="center"
label="任务类型">
</el-table-column>
<el-table-column
prop="precess"
header-align="center"
align="center"
label="当前工序">
</el-table-column>
<el-table-column
prop="start"
header-align="center"
align="center"
label="开始位置">
</el-table-column>
<el-table-column
prop="end"
header-align="center"
align="center"
label="目标位置">
</el-table-column>
<el-table-column
prop="name"
header-align="center"
align="center"
label="车辆名称">
</el-table-column>
<el-table-column
prop="luzi"
header-align="center"
align="center"
label="加工炉">
</el-table-column>
<el-table-column
prop="num"
header-align="center"
align="center"
label="加工数量">
</el-table-column>
<el-table-column
prop="weight"
header-align="center"
align="center"
label="重量">
label="备注">
</el-table-column>
</el-table>
<el-pagination

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

@ -20,71 +20,29 @@
v-loading="dataListLoading"
style="width: 100%;">
<el-table-column
type="index"
prop="id"
header-align="center"
align="center"
label="序号"
width="50">
width="80"
label="ID">
</el-table-column>
<el-table-column
prop="paramKey"
header-align="center"
align="center"
label="标识卡号">
label="参数名">
</el-table-column>
<el-table-column
prop="paramValue"
header-align="center"
align="center"
label="订单名">
label="参数值">
</el-table-column>
<el-table-column
prop="remark"
header-align="center"
align="center"
label="客户名称">
</el-table-column>
<el-table-column
prop="name"
header-align="center"
align="center"
label="产品名称">
</el-table-column>
<el-table-column
prop="type"
header-align="center"
align="center"
label="产品型号">
</el-table-column>
<el-table-column
prop="card"
header-align="center"
align="center"
label="材料号牌">
</el-table-column>
<el-table-column
prop="need"
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="num"
header-align="center"
align="center"
label="数量">
</el-table-column>
<el-table-column
prop="weight"
header-align="center"
align="center"
label="重量">
label="备注">
</el-table-column>
</el-table>
<el-pagination

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

@ -2,26 +2,7 @@
<div class="mod-config">
<el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
<el-form-item>
<el-select v-model="dataForm.card" filterable placeholder="标识卡号">
<el-option
v-for="item in options1"
:key="item.value"
:label="item.label"
:value="item.value"
>
</el-option>
</el-select>
</el-form-item>
<el-form-item>
<el-select v-model="dataForm.orderid" filterable placeholder="订单号">
<el-option
v-for="item in options2"
:key="item.value"
:label="item.label"
:value="item.value"
>
</el-option>
</el-select>
<el-input v-model="dataForm.paramKey" placeholder="名称或编码" clearable></el-input>
</el-form-item>
<el-form-item>
<el-button @click="getDataList()">查询</el-button>
@ -109,7 +90,7 @@
prop="paramKey"
header-align="center"
align="center"
label="实际重量">
label="实际加工重量">
</el-table-column>
<el-table-column
fixed="right"
@ -163,12 +144,9 @@
data () {
return {
dataForm: {
card: '',
orderid: ''
paramKey: ''
},
dataList: [],
options1: [],
options2: [],
pageIndex: 1,
pageSize: 10,
totalPage: 0,
@ -192,8 +170,7 @@
params: this.$http.adornParams({
'page': this.pageIndex,
'limit': this.pageSize,
'orderid': this.dataForm.orderid,
'card': this.dataForm.card
'paramKey': this.dataForm.paramKey
})
}).then(({data}) => {
if (data && data.code === 0) {

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

@ -2,15 +2,7 @@
<div class="mod-config">
<el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
<el-form-item>
<el-select v-model="dataForm.paramKey" filterable placeholder="车辆名称">
<el-option
v-for="item in options"
:key="item.value"
:label="item.label"
:value="item.value"
>
</el-option>
</el-select>
<el-input v-model="dataForm.paramKey" placeholder="名称或编码" clearable></el-input>
</el-form-item>
<el-form-item>
<el-button @click="getDataList()">查询</el-button>
@ -33,49 +25,19 @@
prop="paramKey"
header-align="center"
align="center"
label="任务编码">
label="参数名">
</el-table-column>
<el-table-column
prop="paramValue"
header-align="center"
align="center"
label="发起时间">
label="参数值">
</el-table-column>
<el-table-column
prop="remark"
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
prop="type"
header-align="center"
align="center"
label="任务类型">
</el-table-column>
<el-table-column
prop="start"
header-align="center"
align="center"
label="开始位置">
</el-table-column>
<el-table-column
prop="end"
header-align="center"
align="center"
label="目标位置">
</el-table-column>
<el-table-column
prop="name"
header-align="center"
align="center"
label="车辆名称">
label="备注">
</el-table-column>
<el-table-column
fixed="right"
@ -108,7 +70,6 @@
paramKey: ''
},
dataList: [],
options: [],
pageIndex: 1,
pageSize: 10,
totalPage: 0,

24
src/views/report/car-alarm.vue
View File

@ -2,25 +2,7 @@
<div class="mod-log">
<el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
<el-form-item>
<el-select v-model="dataForm.key" filterable placeholder="车辆名称">
<el-option
v-for="item in options"
:key="item.value"
:label="item.label"
:value="item.value"
>
</el-option>
</el-select>
</el-form-item>
<el-form-item>
<el-date-picker
v-model="dataForm.time"
type="daterange"
range-separator="至"
start-placeholder="开始日期"
end-placeholder="结束日期"
>
</el-date-picker>
<el-input v-model="dataForm.key" placeholder="用户名／用户操作" clearable></el-input>
</el-form-item>
<el-form-item>
<el-button @click="getDataList()">查询</el-button>
@ -80,11 +62,9 @@
data () {
return {
dataForm: {
key: '',
time: []
key: ''
},
dataList: [],
options: [],
pageIndex: 1,
pageSize: 10,
totalPage: 0,

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

@ -11,82 +11,29 @@
v-loading="dataListLoading"
style="width: 100%;">
<el-table-column
type="index"
prop="id"
header-align="center"
align="center"
label="序号"
width="50">
width="80"
label="ID">
</el-table-column>
<el-table-column
prop="paramKey"
header-align="center"
align="center"
label="任务编码">
</el-table-column><el-table-column
prop="start"
header-align="center"
align="center"
label="发起时间">
</el-table-column>
<el-table-column
prop="end"
header-align="center"
align="center"
label="完成时间">
</el-table-column>
<el-table-column
prop="paramKey"
header-align="center"
align="center"
label="任务来源">
label="参数名">
</el-table-column>
<el-table-column
prop="paramValue"
header-align="center"
align="center"
label="任务类型">
label="参数值">
</el-table-column>
<el-table-column
prop="remark"
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="num"
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="start"
header-align="center"
align="center"
label="开始位置">
</el-table-column>
<el-table-column
prop="end"
header-align="center"
align="center"
label="目标位置">
</el-table-column>
<el-table-column
prop="name"
header-align="center"
align="center"
label="车辆名称">
label="备注">
</el-table-column>
</el-table>
<el-pagination

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

@ -11,71 +11,29 @@
v-loading="dataListLoading"
style="width: 100%;">
<el-table-column
type="index"
prop="id"
header-align="center"
align="center"
label="序号"
width="50">
width="80"
label="ID">
</el-table-column>
<el-table-column
prop="paramKey"
header-align="center"
align="center"
label="标识卡号">
label="参数名">
</el-table-column>
<el-table-column
prop="paramValue"
header-align="center"
align="center"
label="订单名">
label="参数值">
</el-table-column>
<el-table-column
prop="remark"
header-align="center"
align="center"
label="客户名称">
</el-table-column>
<el-table-column
prop="name"
header-align="center"
align="center"
label="产品名称">
</el-table-column>
<el-table-column
prop="type"
header-align="center"
align="center"
label="产品型号">
</el-table-column>
<el-table-column
prop="card"
header-align="center"
align="center"
label="材料号牌">
</el-table-column>
<el-table-column
prop="need"
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="num"
header-align="center"
align="center"
label="数量">
</el-table-column>
<el-table-column
prop="weight"
header-align="center"
align="center"
label="重量">
label="备注">
</el-table-column>
</el-table>
<el-pagination

57
src/views/report/kiln-alarm.vue
View File

@ -1,30 +1,8 @@
<template>
<div class="mod-log">
<el-form
:inline="true"
:model="dataForm"
@keyup.enter.native="getDataList()"
>
<el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
<el-form-item>
<el-select v-model="dataForm.key" filterable placeholder="窑炉名称">
<el-option
v-for="item in options"
:key="item.value"
:label="item.label"
:value="item.value"
>
</el-option>
</el-select>
</el-form-item>
<el-form-item>
<el-date-picker
v-model="dataForm.time"
type="daterange"
range-separator="至"
start-placeholder="开始日期"
end-placeholder="结束日期"
>
</el-date-picker>
<el-input v-model="dataForm.key" placeholder="用户名／用户操作" clearable></el-input>
</el-form-item>
<el-form-item>
<el-button @click="getDataList()">查询</el-button>
@ -34,43 +12,37 @@
:data="dataList"
border
v-loading="dataListLoading"
style="width: 100%"
>
style="width: 100%">
<el-table-column
type="index"
header-align="center"
align="center"
label="序号"
width="50"
>
width="50">
</el-table-column>
<el-table-column
prop="username"
header-align="center"
align="center"
label="窑炉名称"
>
label="窑炉名称">
</el-table-column>
<el-table-column
prop="operation"
header-align="center"
align="center"
label="报警时间"
>
label="报警时间">
</el-table-column>
<el-table-column
prop="time"
header-align="center"
align="center"
label="报警级别"
>
label="报警级别">
</el-table-column>
<el-table-column
prop="ip"
header-align="center"
align="center"
label="报警内容"
>
label="报警内容">
</el-table-column>
</el-table>
<el-pagination
@ -80,8 +52,7 @@
:page-sizes="[10, 20, 50, 100]"
:page-size="pageSize"
:total="totalPage"
layout="total, sizes, prev, pager, next, jumper"
>
layout="total, sizes, prev, pager, next, jumper">
</el-pagination>
</div>
</template>
@ -91,11 +62,9 @@ export default {
data () {
return {
dataForm: {
key: '',
time: []
key: ''
},
dataList: [],
options: [],
pageIndex: 1,
pageSize: 10,
totalPage: 0,
@ -114,9 +83,9 @@ export default {
url: this.$http.adornUrl('/sys/log/list'),
method: 'get',
params: this.$http.adornParams({
page: this.pageIndex,
limit: this.pageSize,
key: this.dataForm.key
'page': this.pageIndex,
'limit': this.pageSize,
'key': this.dataForm.key
})
}).then(({data}) => {
if (data && data.code === 0) {

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

@ -2,26 +2,7 @@
<div class="mod-config">
<el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
<el-form-item>
<el-select v-model="dataForm.card" filterable placeholder="标识卡号">
<el-option
v-for="item in options1"
:key="item.value"
:label="item.label"
:value="item.value"
>
</el-option>
</el-select>
</el-form-item>
<el-form-item>
<el-select v-model="dataForm.orderid" filterable placeholder="订单号">
<el-option
v-for="item in options2"
:key="item.value"
:label="item.label"
:value="item.value"
>
</el-option>
</el-select>
<el-input v-model="dataForm.paramKey" placeholder="名称或编码" clearable></el-input>
</el-form-item>
<el-form-item>
<el-button @click="getDataList()">查询</el-button>
@ -57,18 +38,6 @@
align="center"
label="订单号">
</el-table-column>
<el-table-column
prop="start"
header-align="center"
align="center"
label="发起时间">
</el-table-column>
<el-table-column
prop="end"
header-align="center"
align="center"
label="完成时间">
</el-table-column>
<el-table-column
prop="paramKey"
header-align="center"
@ -100,16 +69,28 @@
label="产品名称">
</el-table-column>
<el-table-column
prop="card"
prop="paramKey"
header-align="center"
align="center"
label="材料号牌">
label="物料名称">
</el-table-column>
<el-table-column
prop="paramKey"
header-align="center"
align="center"
label="数量">
label="物料数量">
</el-table-column>
<el-table-column
prop="paramKey"
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
fixed="right"
@ -152,12 +133,9 @@
data () {
return {
dataForm: {
card: '',
orderid: ''
paramKey: ''
},
dataList: [],
options1: [],
options2: [],
pageIndex: 1,
pageSize: 10,
totalPage: 0,
@ -181,7 +159,7 @@
params: this.$http.adornParams({
'page': this.pageIndex,
'limit': this.pageSize,
'card': this.dataForm.card
'paramKey': this.dataForm.paramKey
})
}).then(({data}) => {
if (data && data.code === 0) {

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

@ -2,36 +2,7 @@
<div class="mod-config">
<el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
<el-form-item>
<el-select v-model="dataForm.card" filterable placeholder="标识卡号">
<el-option
v-for="item in options1"
:key="item.value"
:label="item.label"
:value="item.value"
>
</el-option>
</el-select>
</el-form-item>
<el-form-item>
<el-select v-model="dataForm.orderid" filterable placeholder="车辆名称">
<el-option
v-for="item in options2"
:key="item.value"
:label="item.label"
:value="item.value"
>
</el-option>
</el-select>
</el-form-item>
<el-form-item>
<el-date-picker
v-model="dataForm.time"
type="daterange"
range-separator="至"
start-placeholder="开始日期"
end-placeholder="结束日期"
>
</el-date-picker>
<el-input v-model="dataForm.paramKey" placeholder="名称或编码" clearable></el-input>
</el-form-item>
<el-form-item>
<el-button @click="getDataList()">查询</el-button>
@ -53,7 +24,7 @@
prop="paramKey"
header-align="center"
align="center"
label="任务编码">
label="获取时间">
</el-table-column>
<el-table-column
prop="paramValue"
@ -62,10 +33,10 @@
label="标识卡号">
</el-table-column>
<el-table-column
prop="start"
prop="paramKey"
header-align="center"
align="center"
label="发起时间">
label="订单号">
</el-table-column>
<el-table-column
prop="paramKey"
@ -83,25 +54,43 @@
prop="paramKey"
header-align="center"
align="center"
label="任务类型">
label="订单状态">
</el-table-column>
<el-table-column
prop="start"
prop="paramKey"
header-align="center"
align="center"
label="开始位置">
label="客户名称">
</el-table-column>
<el-table-column
prop="end"
prop="paramKey"
header-align="center"
align="center"
label="目标位置">
label="产品名称">
</el-table-column>
<el-table-column
prop="name"
prop="paramKey"
header-align="center"
align="center"
label="车辆名称">
label="物料名称">
</el-table-column>
<el-table-column
prop="paramKey"
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="paramKey"
header-align="center"
align="center"
label="实际加工重量">
</el-table-column>
<el-table-column
fixed="right"
@ -131,13 +120,9 @@
data () {
return {
dataForm: {
card: '',
orderid: '',
time: []
paramKey: ''
},
dataList: [],
options1: [],
options2: [],
pageIndex: 1,
pageSize: 10,
totalPage: 0,
@ -158,7 +143,7 @@
params: this.$http.adornParams({
'page': this.pageIndex,
'limit': this.pageSize,
'card': this.dataForm.card
'paramKey': this.dataForm.paramKey
})
}).then(({data}) => {
if (data && data.code === 0) {