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-14 21:12:32 +08:00
parent 1baad3e64b
commit 38eb8050bd
21 changed files with 412 additions and 212 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,8 +1,8 @@
<!--
* @Author: zwq
* @Date: 2021-11-19 11:23:44
* @LastEditors: zwq
* @LastEditTime: 2021-12-08 10:38:21
* @LastEditors: gtz
* @LastEditTime: 2021-12-14 20:32:36
* @Description:
-->
<template>
@@ -11,105 +11,131 @@
:close-on-click-modal="false"
:visible.sync="visible"
>
<el-form :model="dataForm" ref="dataForm" label-width="100px">
<el-form v-loading="formLoading" :model="dataForm" ref="dataForm" label-width="100px">
<el-row :gutter="20">
<el-col :span="12">
<el-form-item label="任务编码" prop="taskCode">
<el-col :span="8">
<el-form-item label="标识卡号" prop="idenCardNum">
<el-input
v-model="dataForm.taskCode"
placeholder="任务编码"
v-model="dataForm.idenCardNum"
placeholder="标识卡号"
readonly
></el-input>
</el-form-item>
<el-form-item label="任务类型" prop="taskType">
<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-select>
</el-form-item>
<el-form-item label="产品名称" prop="productName">
<el-input
v-model="dataForm.taskType"
placeholder="任务类型"
v-model="dataForm.productName"
placeholder="产品名称"
readonly
></el-input>
</el-form-item>
<el-form-item label="开始位置" prop="startPosition">
<el-input
v-model="dataForm.startPosition"
placeholder="开始位置"
readonly
></el-input>
</el-form-item>
<el-form-item label="托盘编号" prop="paramKey">
<el-form-item label="物料名称" prop="paramKey">
<el-input
v-model="dataForm.paramKey"
placeholder="托盘编号"
placeholder="物料名称"
readonly
></el-input>
</el-form-item>
<el-form-item label="当前工序" prop="paramKey">
<el-form-item label="物料重量" prop="paramKey">
<el-input
v-model="dataForm.paramKey"
placeholder="当前工序"
placeholder="物料重量"
readonly
></el-input>
</el-form-item>
<el-form-item label="是否到缓存区" prop="paramKey">
<el-form-item label="获取时间" prop="createTime">
<el-input
v-model="dataForm.paramKey"
placeholder="是否到缓存区"
readonly
></el-input>
</el-form-item>
<el-form-item label="任务状态" prop="status">
<el-input
v-model="dataForm.status"
placeholder="任务状态"
v-model="dataForm.createTime"
placeholder="获取时间"
readonly
></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="任务执行时间" prop="createTime">
<el-col :span="8">
<el-form-item label="订单号" prop="orderNo">
<el-input
v-model="dataForm.createTime"
placeholder="任务执行时间"
v-model="dataForm.orderNo"
placeholder="订单号"
readonly
></el-input>
</el-form-item>
<el-form-item label="运行车辆名" prop="vehicleName">
<el-form-item label="客户名称" prop="customerName">
<el-input
v-model="dataForm.vehicleName"
placeholder="运行车辆名"
v-model="dataForm.customerName"
placeholder="客户名称"
readonly
></el-input>
</el-form-item>
<el-form-item label="目标位位置" prop="targetPosition">
<el-form-item label="材料牌号" prop="materialDes">
<el-input
v-model="dataForm.targetPosition"
placeholder="目标位位置"
v-model="dataForm.materialDes"
placeholder="材料牌号"
readonly
></el-input>
</el-form-item>
<el-form-item label="任务执行时间" prop="updateTime">
<el-input
v-model="dataForm.updateTime"
placeholder="任务执行时间"
readonly
></el-input>
</el-form-item>
<el-form-item label="下一个工序" prop="paramKey">
<el-form-item label="物料数量" prop="paramKey">
<el-input
v-model="dataForm.paramKey"
placeholder="下一个工序"
placeholder="物料数量"
readonly
></el-input>
</el-form-item>
<el-form-item label="窑炉名称" prop="kilnName">
<el-form-item label="实际加工数量" prop="finishQuantity">
<el-input
v-model="dataForm.kilnName"
placeholder="窑炉名称"
v-model="dataForm.finishQuantity"
placeholder="实际加工数量"
readonly
></el-input>
</el-form-item>
<el-form-item label="任务完成时间" prop="paramKey">
<el-form-item label="任务发起时间" prop="abeginTime">
<el-input
v-model="dataForm.paramKey"
v-model="dataForm.abeginTime"
placeholder="任务发起时间"
readonly
></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="订单来源" prop="orderSource">
<el-input
v-model="dataForm.orderSource"
placeholder="订单来源"
readonly
></el-input>
</el-form-item>
<el-form-item label="任务状态" prop="status">
<el-select v-model="dataForm.status" disabled placeholder="任务状态">
<el-option v-for="item in statusList" :key="item.value" :value="item.value" :label="item.label" />
</el-select>
</el-form-item>
<el-form-item label="生产工艺要求" prop="craftIll">
<el-input
v-model="dataForm.craftIll"
placeholder="生产工艺要求"
readonly
></el-input>
</el-form-item>
<el-form-item label="单位" prop="unit">
<el-input
v-model="dataForm.unit"
placeholder="单位"
readonly
></el-input>
</el-form-item>
<el-form-item label="实际加工重量" prop="finishWeight">
<el-input
v-model="dataForm.finishWeight"
placeholder="实际加工重量"
readonly
></el-input>
</el-form-item>
<el-form-item label="任务完成时间" prop="aendTime">
<el-input
v-model="dataForm.aendTime"
placeholder="任务完成时间"
readonly
></el-input>
@@ -124,11 +150,28 @@
</template>
<script>
// 任务状态列表
const statusList = [
{ value: 0, label: '等待执行' },
{ value: 1, label: '执行中' },
{ value: 2, label: '执行完成' },
{ value: 3, label: '追加后完成' }
]
// 订单状态列表
const validList = [
{ value: 0, label: '不可用' },
{ value: 1, label: '可用' },
{ value: 2, label: '停止' }
]
export default {
data () {
return {
visible: false,
dataForm: {}
dataForm: {},
formLoading: false,
statusList,
validList
}
},
methods: {
@@ -136,6 +179,7 @@ export default {
this.visible = true
this.$nextTick(() => {
this.$refs['dataForm'].resetFields()
this.formLoading = true
this.$http({
url: this.$http.adornUrl(`/orderInfoHis/getDet`),
method: 'post',
@@ -143,7 +187,10 @@ export default {
}).then(({ data }) => {
if (data && data.code === 0) {
this.dataForm = data.data
} else {
this.$message.error(data.msg)
}
this.formLoading = false
})
})
}

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

@@ -45,7 +45,7 @@
>
</el-table-column>
<el-table-column
prop="paramKey"
prop="orderSource"
header-align="center"
align="center"
label="任务来源"
@@ -59,7 +59,7 @@
>
</el-table-column>
<el-table-column
prop="remark"
prop="paramKey"
header-align="center"
align="center"
label="当前工序"
@@ -73,14 +73,14 @@
>
</el-table-column>
<el-table-column
prop="quantity"
prop="finishQuantity"
header-align="center"
align="center"
label="数量"
>
</el-table-column>
<el-table-column
prop="weight"
prop="finishWeight"
header-align="center"
align="center"
label="重量"

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

@@ -30,7 +30,7 @@
label="订单名">
</el-table-column>
<el-table-column
prop="customerName"
prop="customer"
header-align="center"
align="center"
label="客户名称">

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

@@ -69,23 +69,29 @@
align="center"
label="完成时间">
</el-table-column>
<el-table-column
<!-- <el-table-column
prop="orderSource"
header-align="center"
align="center"
label="任务来源">
</el-table-column>
</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="paramKey"
prop="valid"
header-align="center"
align="center"
label="订单状态">
<template slot-scope="scope">
{{ scope.row.valid >= 0 ? validList[scope.row.valid] : '' }}
</template>
</el-table-column>
<el-table-column
prop="customerName"
@@ -148,6 +154,20 @@
<script>
import orderDetail from './components/order-history-detail'
// 任务状态列表
const statusList = {
0: '等待执行',
1: '执行中',
2: '执行完成',
3: '追加后完成'
}
// 订单状态列表
const validList = {
0: '不可用',
1: '可用',
2: '停止'
}
export default {
data () {
return {
@@ -162,7 +182,9 @@
pageSize: 10,
totalPage: 0,
dataListLoading: false,
orderDetailVisible: false
orderDetailVisible: false,
statusList,
validList
}
},
components: {

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

@@ -76,6 +76,9 @@
align="center"
label="任务状态"
>
<template slot-scope="scope">
{{ scope.row.status >= 0 ? statusList[scope.row.status] : '' }}
</template>
</el-table-column>
<el-table-column
prop="taskType"
@@ -144,6 +147,14 @@
</template>
<script>
// 任务状态列表
const statusList = {
0: '等待执行',
1: '执行中',
2: '执行完成',
3: '追加后完成'
}
export default {
data () {
return {
@@ -157,7 +168,8 @@ export default {
pageSize: 10,
totalPage: 0,
dataListLoading: false,
orderDetailVisible: false
orderDetailVisible: false,
statusList
}
},
activated () {