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

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>