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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
config/index.js
View File

@ -2,7 +2,7 @@
* @Author: gtz
* @Date: 2021-11-19 10:10:51
* @LastEditors: gtz
* @LastEditTime: 2021-12-10 09:04:19
* @LastEditTime: 2021-12-14 18:43:02
* @Description: file content
* @FilePath: \mt-qj-wms-ui\config\index.js
*/
@ -22,7 +22,7 @@ module.exports = {
// 代理列表, 是否开启代理通过[./dev.env.js]配置
proxyTable: devEnv.OPEN_PROXY === false ? {} : {
'/proxyApi': {
target: 'http://192.168.0.134:8080',
target: 'http://192.168.0.189:8080',
changeOrigin: true,
pathRewrite: {
'^/proxyApi': '/api'

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

@ -29,12 +29,12 @@
label="序号"
width="50">
</el-table-column>
<el-table-column
<!-- <el-table-column
prop="createTime"
header-align="center"
align="center"
label="添加时间">
</el-table-column>
</el-table-column> -->
<el-table-column
prop="alarmClass"
header-align="center"

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

@ -21,12 +21,12 @@
label="序号"
width="50">
</el-table-column>
<el-table-column
<!-- <el-table-column
prop="createTime"
header-align="center"
align="center"
label="添加时间">
</el-table-column>
</el-table-column> -->
<el-table-column
prop="warehouseName"
header-align="center"

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

@ -29,12 +29,12 @@
label="序号"
width="50">
</el-table-column>
<el-table-column
<!-- <el-table-column
prop="createTime"
header-align="center"
align="center"
label="添加时间">
</el-table-column>
</el-table-column> -->
<el-table-column
prop="vehicleName"
header-align="center"
@ -53,6 +53,18 @@
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
fixed="right"
header-align="center"

18
src/views/basic/components/alarmInfo-add.vue
View File

@ -2,7 +2,7 @@
* @Author: zwq
* @Date: 2021-11-18 14:16:25
* @LastEditors: gtz
* @LastEditTime: 2021-12-09 11:21:14
* @LastEditTime: 2021-12-13 17:01:47
* @Description:
-->
<template>
@ -10,7 +10,7 @@
:title="!dataForm.id ? '新增' : '修改'"
:close-on-click-modal="false"
:visible.sync="visible">
<el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmit()" label-width="80px">
<el-form :model="dataForm" :rules="dataRule" v-loading="formLoading" ref="dataForm" @keyup.enter.native="dataFormSubmit()" label-width="80px">
<el-form-item label="报警编码" prop="code">
<el-input v-model="dataForm.code" placeholder="报警编码"></el-input>
</el-form-item>
@ -46,7 +46,8 @@
alarmInfo: [
{ required: true, message: '报警内容不能为空', trigger: 'blur' }
]
}
},
formLoading: false
}
},
methods: {
@ -55,6 +56,7 @@
this.visible = true
this.$nextTick(() => {
this.$refs['dataForm'].resetFields()
this.formLoading = true
if (this.dataForm.id) {
this.$http({
url: this.$http.adornUrl(`/alarmBase/get`),
@ -63,15 +65,23 @@
}).then(({data}) => {
if (data && data.code === 0) {
this.dataForm = data.data
} else {
this.$message.error(data.msg)
}
this.formLoading = false
})
} else {
this.$http({
url: this.$http.adornUrl(`/alarmBase/codeGenerator`),
method: 'post',
data: this.$http.adornData()
}).then((data) => {
}).then(({data}) => {
if (data && data.code === 0) {
this.dataForm.code = data.data
} else {
this.$message.error('编码生成失败')
}
this.formLoading = false
})
}
})

18
src/views/basic/components/cache-add.vue
View File

@ -2,7 +2,7 @@
* @Author: zwq
* @Date: 2021-11-18 14:16:25
* @LastEditors: gtz
* @LastEditTime: 2021-12-10 11:33:59
* @LastEditTime: 2021-12-13 16:38:53
* @Description:
-->
<template>
@ -15,6 +15,7 @@
:model="dataForm"
:rules="dataRule"
ref="dataForm"
v-loading="formLoading"
@keyup.enter.native="dataFormSubmit()"
label-width="100px"
>
@ -91,7 +92,8 @@ export default {
warehouseName: [
{ required: true, message: '缓存区名称不能为空', trigger: 'blur' }
]
}
},
formLoading: false
}
},
methods: {
@ -100,6 +102,7 @@ export default {
this.visible = true
this.$nextTick(() => {
this.$refs['dataForm'].resetFields()
this.formLoading = true
if (this.dataForm.id) {
this.$http({
url: this.$http.adornUrl(`/warehouse/get`),
@ -108,15 +111,24 @@ export default {
}).then(({ data }) => {
if (data && data.code === 0) {
this.dataForm = data.data
} else {
this.$message.error(data.msg)
}
this.formLoading = false
})
} else {
this.formLoading = true
this.$http({
url: this.$http.adornUrl(`/warehouse/codeGenerator`),
method: 'post',
data: this.$http.adornData()
}).then(data => {
}).then(({data}) => {
if (data && data.code === 0) {
this.dataForm.code = data.data
} else {
this.$message.error('编码生成失败')
}
this.formLoading = false
})
}
})

27
src/views/basic/components/carInfo-add.vue
View File

@ -2,7 +2,7 @@
* @Author: zwq
* @Date: 2021-11-18 14:16:25
* @LastEditors: gtz
* @LastEditTime: 2021-12-09 11:21:23
* @LastEditTime: 2021-12-13 16:56:03
* @Description:
-->
<template>
@ -10,7 +10,7 @@
:title="!dataForm.id ? '新增' : '修改'"
:close-on-click-modal="false"
:visible.sync="visible">
<el-form :model="dataForm" ref="dataForm" @keyup.enter.native="dataFormSubmit()" label-width="80px">
<el-form :model="dataForm" ref="dataForm" v-loading="formLoading" @keyup.enter.native="dataFormSubmit()" label-width="80px">
<el-form-item label="车辆编码" prop="code">
<el-input v-model="dataForm.code" placeholder="车辆编码"></el-input>
</el-form-item>
@ -23,6 +23,9 @@
<el-form-item label="IP地址" prop="ip">
<el-input v-model="dataForm.ip" placeholder="IP地址"></el-input>
</el-form-item>
<el-form-item label="备注" prop="note">
<el-input v-model="dataForm.note" placeholder="备注"></el-input>
</el-form-item>
</el-form>
<span slot="footer" class="dialog-footer">
<el-button @click="visible = false">取消</el-button>
@ -41,8 +44,10 @@
code: '',
ip: '',
vehicleName: '',
vehicleAlias: ''
}
vehicleAlias: '',
note: ''
},
formLoading: false
}
},
methods: {
@ -51,6 +56,7 @@
this.visible = true
this.$nextTick(() => {
this.$refs['dataForm'].resetFields()
this.formLoading = true
if (this.dataForm.id) {
this.$http({
url: this.$http.adornUrl(`/vehicle/get`),
@ -59,15 +65,23 @@
}).then(({data}) => {
if (data && data.code === 0) {
this.dataForm = data.data
} else {
this.$message.error(data.msg)
}
this.formLoading = false
})
} else {
this.$http({
url: this.$http.adornUrl(`/vehicle/codeGenerator`),
method: 'post',
data: this.$http.adornData()
}).then((data) => {
}).then(({data}) => {
if (data && data.code === 0) {
this.dataForm.code = data.data
} else {
this.$message.error('编码生成失败')
}
this.formLoading = false
})
}
})
@ -84,7 +98,8 @@
'code': this.dataForm.code,
'vehicleName': this.dataForm.vehicleName,
'ip': this.dataForm.ip,
'vehicleAlias': this.dataForm.vehicleAlias
'vehicleAlias': this.dataForm.vehicleAlias,
'note': this.dataForm.note
})
}).then(({data}) => {
if (data && data.code === 0) {

18
src/views/basic/components/equipmentInfo-add.vue
View File

@ -2,7 +2,7 @@
* @Author: gtz
* @Date: 2021-11-19 10:10:52
* @LastEditors: gtz
* @LastEditTime: 2021-12-10 17:07:37
* @LastEditTime: 2021-12-13 17:00:12
* @Description: file content
* @FilePath: \mt-qj-wms-ui\src\views\basic\components\equipmentInfo-add.vue
-->
@ -11,7 +11,7 @@
:title="!dataForm.id ? '新增' : '修改'"
:close-on-click-modal="false"
:visible.sync="visible">
<el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmit()" label-width="80px">
<el-form :model="dataForm" :rules="dataRule" v-loading="formLoading" ref="dataForm" @keyup.enter.native="dataFormSubmit()" label-width="80px">
<el-form-item label="名称" prop="kilnName">
<el-input v-model="dataForm.kilnName" placeholder="名称"></el-input>
</el-form-item>
@ -67,7 +67,8 @@
portNumber: [
{ required: true, message: '端口号不能为空', trigger: 'blur' }
]
}
},
formLoading: true
}
},
methods: {
@ -76,6 +77,7 @@
this.visible = true
this.$nextTick(() => {
this.$refs['dataForm'].resetFields()
this.formLoading = true
if (this.dataForm.id) {
this.$http({
url: this.$http.adornUrl(`/kilnInfo/get`),
@ -84,15 +86,23 @@
}).then(({ data }) => {
if (data && data.code === 0) {
this.dataForm = data.data
} else {
this.$message.error(data.msg)
}
this.formLoading = false
})
} else {
this.$http({
url: this.$http.adornUrl(`/kilnInfo/codeGenerator`),
method: 'post',
data: this.$http.adornData()
}).then(data => {
}).then(({data}) => {
if (data && data.code === 0) {
this.dataForm.code = data.data
} else {
this.$message.error('编码生成失败')
}
this.formLoading = false
})
}
})

18
src/views/basic/components/location-add.vue
View File

@ -2,7 +2,7 @@
* @Author: zwq
* @Date: 2021-11-18 14:16:25
* @LastEditors: gtz
* @LastEditTime: 2021-12-10 11:17:20
* @LastEditTime: 2021-12-13 17:03:41
* @Description:
-->
<template>
@ -10,7 +10,7 @@
:title="!dataForm.id ? '新增' : '修改'"
:close-on-click-modal="false"
:visible.sync="visible">
<el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmit()" label-width="80px">
<el-form :model="dataForm" :rules="dataRule" v-loading="formLoading" ref="dataForm" @keyup.enter.native="dataFormSubmit()" label-width="80px">
<el-form-item label="库位名称" prop="locationName">
<el-input v-model="dataForm.locationName" placeholder="库位名称"></el-input>
</el-form-item>
@ -56,7 +56,8 @@
code: [
{ required: true, message: '编码不能为空', trigger: 'blur' }
]
}
},
formLoading: false
}
},
methods: {
@ -66,6 +67,7 @@
this.visible = true
this.$nextTick(() => {
this.$refs['dataForm'].resetFields()
this.formLoading = true
if (this.dataForm.id) {
this.$http({
url: this.$http.adornUrl(`/locationInfo/get`),
@ -74,15 +76,23 @@
}).then(({data}) => {
if (data && data.code === 0) {
this.dataForm = data.data
} else {
this.$message.error(data.msg)
}
this.formLoading = false
})
} else {
this.$http({
url: this.$http.adornUrl(`/locationInfo/codeGenerator`),
method: 'post',
data: this.$http.adornData()
}).then((data) => {
}).then(({data}) => {
if (data && data.code === 0) {
this.dataForm.code = data.data
} else {
this.$message.error('编码生成失败')
}
this.formLoading = false
})
}
})

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

@ -18,12 +18,12 @@
label="序号"
width="50">
</el-table-column>
<el-table-column
<!-- <el-table-column
prop="createTime"
header-align="center"
align="center"
label="添加时间">
</el-table-column>
</el-table-column> -->
<el-table-column
prop="locationName"
header-align="center"

18
src/views/basic/components/processInfo-add.vue
View File

@ -2,7 +2,7 @@
* @Author: zwq
* @Date: 2021-11-18 14:16:25
* @LastEditors: gtz
* @LastEditTime: 2021-12-09 11:21:56
* @LastEditTime: 2021-12-13 17:05:54
* @Description:
-->
<template>
@ -10,7 +10,7 @@
:title="!dataForm.id ? '新增' : '修改'"
:close-on-click-modal="false"
:visible.sync="visible">
<el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmit()" label-width="100px">
<el-form :model="dataForm" :rules="dataRule" v-loading="formLoading" ref="dataForm" @keyup.enter.native="dataFormSubmit()" label-width="100px">
<el-form-item label="工艺编码" prop="code">
<el-input v-model="dataForm.code" placeholder="工艺编码"></el-input>
</el-form-item>
@ -60,7 +60,8 @@
alarmInfo: [
{ required: true, message: '对应PLC值不能为空', trigger: 'blur' }
]
}
},
formLoading: false
}
},
methods: {
@ -69,6 +70,7 @@
this.visible = true
this.$nextTick(() => {
this.$refs['dataForm'].resetFields()
this.formLoading = true
if (this.dataForm.id) {
this.$http({
url: this.$http.adornUrl(`/alarmBase/get`),
@ -77,15 +79,23 @@
}).then(({data}) => {
if (data && data.code === 0) {
this.dataForm = data.data
} else {
this.$message.error(data.msg)
}
this.formLoading = false
})
} else {
this.$http({
url: this.$http.adornUrl(`/alarmBase/codeGenerator`),
method: 'post',
data: this.$http.adornData()
}).then((data) => {
}).then(({data}) => {
if (data && data.code === 0) {
this.dataForm.code = data.data
} else {
this.$message.error('编码生成失败')
}
this.formLoading = false
})
}
})

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

@ -29,12 +29,12 @@
label="序号"
width="50">
</el-table-column>
<el-table-column
<!-- <el-table-column
prop="createTime"
header-align="center"
align="center"
label="添加时间">
</el-table-column>
</el-table-column> -->
<el-table-column
prop="alarmClass"
header-align="center"

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

@ -2,7 +2,7 @@
* @Author: zwq
* @Date: 2021-11-19 11:23:44
* @LastEditors: gtz
* @LastEditTime: 2021-12-09 11:22:40
* @LastEditTime: 2021-12-14 19:08:20
* @Description:
-->
<template>
@ -11,7 +11,7 @@
: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="8">
<el-form-item label="标识卡号" prop="idenCardNum">
@ -21,12 +21,10 @@
readonly
></el-input>
</el-form-item>
<el-form-item label="订单状态" prop="taskType">
<el-input
v-model="dataForm.taskType"
placeholder="订单状态"
readonly
></el-input>
<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="startPosition">
<el-input
@ -49,13 +47,6 @@
readonly
></el-input>
</el-form-item>
<el-form-item label="任务状态" prop="status">
<el-input
v-model="dataForm.status"
placeholder="任务状态"
readonly
></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="订单号" prop="orderNo">
@ -93,22 +84,8 @@
readonly
></el-input>
</el-form-item>
<el-form-item label="物料重量" prop="weight">
<el-input
v-model="dataForm.weight"
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="unit">
<el-input
v-model="dataForm.unit"
@ -123,6 +100,13 @@
readonly
></el-input>
</el-form-item>
<el-form-item label="物料重量" prop="weight">
<el-input
v-model="dataForm.weight"
placeholder="物料重量"
readonly
></el-input>
</el-form-item>
<el-form-item label="实际加工重量" prop="finishWeight">
<el-input
v-model="dataForm.finishWeight"
@ -130,6 +114,11 @@
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-col>
</el-row>
</el-form>
@ -140,11 +129,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: {
@ -152,6 +158,7 @@ export default {
this.visible = true
this.$nextTick(() => {
this.$refs['dataForm'].resetFields()
this.formLoading = true
this.$http({
url: this.$http.adornUrl(`/orderInfo/getDet`),
method: 'post',
@ -159,7 +166,10 @@ export default {
}).then(({ data }) => {
if (data && data.code === 0) {
this.dataForm = data.data
} else {
this.$message.error(data.msg)
}
this.formLoading = false
})
})
}

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

@ -14,6 +14,15 @@
<el-input v-model="dataForm.remark" placeholder="备注"></el-input>
</el-form-item>
</el-form> -->
<el-form :inline="true">
<el-form-item>
<el-button
type="success"
@click="$router.push({ name: 'order-current-task' })"
>返回当前执行任务列表</el-button
>
</el-form-item>
</el-form>
<el-table
:data="dataList"
border
@ -39,7 +48,7 @@
label="订单名">
</el-table-column>
<el-table-column
prop="customerName"
prop="customer"
header-align="center"
align="center"
label="客户名称">

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

@ -1,27 +1,11 @@
<template>
<div class="mod-config">
<el-form :inline="true" ref="dataForm" :rules="dataRule" :model="dataForm" @keyup.enter.native="getDataList()">
<el-form-item>
<el-select v-model="dataForm.idenCardNum" 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 label="标识卡号卡号">
<el-input v-model="dataForm.idenCardNum" placeholder="标识卡号" />
</el-form-item>
<el-form-item>
<el-select v-model="dataForm.orderNo" 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 label="订单号">
<el-input v-model="dataForm.idenCardNum" placeholder="订单号" />
</el-form-item>
<el-form-item>
<el-button @click="getDataList()">查询</el-button>
@ -57,23 +41,23 @@
align="center"
label="订单号">
</el-table-column>
<el-table-column
prop="orderSource"
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="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"
@ -138,8 +122,8 @@
width="150"
label="操作">
<template slot-scope="scope">
<el-button type="text" size="small" @click="completeOrder(scope.row.id)">完成</el-button>
<el-button type="text" size="small" @click="deleteHandle(scope.row.id)">作废</el-button>
<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>
</template>
</el-table-column>
</el-table>
@ -159,6 +143,21 @@
<script>
import orderDetail from './components/current-order-detail'
// 任务状态列表
const statusList = {
0: '等待执行',
1: '执行中',
2: '执行完成',
3: '追加后完成'
}
// 订单状态列表
const validList = {
0: '不可用',
1: '可用',
2: '停止'
}
export default {
data () {
return {
@ -181,18 +180,20 @@
orderNo: [
{ required: true, message: '订单号不能为空', trigger: 'change' }
]
}
},
statusList,
validList
}
},
components: {
orderDetail
},
created () {
this.getDataList()
},
methods: {
// 获取数据列表
getDataList () {
this.$refs['dataForm'].validate((valid) => {
console.log(valid)
if (valid) {
this.dataListLoading = true
this.$http({
url: this.$http.adornUrl('/orderInfo/page'),
@ -205,16 +206,14 @@
})
}).then(({data}) => {
if (data && data.code === 0) {
this.dataList = data.page.list
this.totalPage = data.page.totalCount
this.dataList = data.data.records
this.totalPage = data.data.total
} else {
this.dataList = []
this.totalPage = 0
}
this.dataListLoading = false
})
}
})
},
// 每页数
sizeChangeHandle (val) {
@ -228,23 +227,30 @@
this.getDataList()
},
completeOrder (id) { // 完成订单
this.$confirm(`确定对[id=${id}]进行完成操作?`, '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
this.$http({
url: this.$http.adornUrl('/orderInfo/completeOrder'),
method: 'post',
data: this.$http.adornData({
'id': id
})
data: this.$http.adornData({ id })
}).then(({data}) => {
if (data && data.code === 0) {
this.$message({
message: '操作成功',
type: 'success',
duration: 1500
duration: 1500,
onClose: () => {
this.getDataList()
}
})
} else {
this.$message.error(data.msg)
}
})
})
},
// 新增 / 修改
addOrUpdateHandle (id) {
@ -258,7 +264,7 @@
},
// 删除
deleteHandle (id) {
this.$confirm(`确定对[id=${id}]进行删除操作?`, '提示', {
this.$confirm(`确定对[id=${id}]进行作废操作?`, '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
@ -266,7 +272,7 @@
this.$http({
url: this.$http.adornUrl('/orderInfo/voidOrder'),
method: 'post',
data: this.$http.adornData(id, false)
data: this.$http.adornData({ id })
}).then(({data}) => {
if (data && data.code === 0) {
this.$message({

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

@ -52,6 +52,9 @@
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"
@ -123,6 +126,13 @@
</template>
<script>
// 任务状态列表
const statusList = {
0: '等待执行',
1: '执行中',
2: '执行完成',
3: '追加后完成'
}
export default {
data () {
return {
@ -134,7 +144,8 @@
pageIndex: 1,
pageSize: 10,
totalPage: 0,
dataListLoading: false
dataListLoading: false,
statusList
}
},
activated () {
@ -180,6 +191,10 @@
handTask () {
this.$router.push({name: 'orderProcess'})
},
// 执行
addOrUpdateHandle (id) {
console.log('执行')
},
// 删除
deleteHandle (sheetNo) {
this.$confirm(`确定对[生产单编号=${sheetNo}]进行删除操作?`, '提示', {

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 () {