Compare commits
14 Commits
6ac3fcb572
...
f219b55d0c
Author | SHA1 | Date | |
---|---|---|---|
|
f219b55d0c | ||
|
79b7fe0eec | ||
2329a20c4f | |||
7aba931c94 | |||
176fd99cd1 | |||
77fbbb630b | |||
18b932afa1 | |||
251d507db7 | |||
8502f5d7d1 | |||
9eea286c08 | |||
d4e0384e10 | |||
983be7801c | |||
d725cb7a0c | |||
ef8a7ef497 |
@ -3,10 +3,10 @@
|
|||||||
* @Date: 2021-03-04 16:13:51
|
* @Date: 2021-03-04 16:13:51
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
* @LastEditors: fzq
|
* @LastEditors: fzq
|
||||||
* @LastEditTime: 2022-03-14 16:22:38
|
* @LastEditTime: 2022-03-15 18:33:48
|
||||||
=======
|
=======
|
||||||
* @LastEditors: zwq
|
* @LastEditors: zwq
|
||||||
* @LastEditTime: 2022-03-14 10:58:20
|
* @LastEditTime: 2022-03-15 10:17:01
|
||||||
>>>>>>> develop
|
>>>>>>> develop
|
||||||
* @Description: file content
|
* @Description: file content
|
||||||
*/
|
*/
|
||||||
@ -174,7 +174,13 @@ export default {
|
|||||||
processEquipment: 'Process Equipment',
|
processEquipment: 'Process Equipment',
|
||||||
sheCode: 'Shelf Code',
|
sheCode: 'Shelf Code',
|
||||||
sheName: 'Shelf Name',
|
sheName: 'Shelf Name',
|
||||||
locaNum: 'Location Number'
|
locaNum: 'Location Number',
|
||||||
|
addLocation: 'Add Location',
|
||||||
|
columnMark: 'Column Mark',
|
||||||
|
rowMark: 'Row Mark',
|
||||||
|
status: 'Status',
|
||||||
|
man: 'Man',
|
||||||
|
woman: 'Woman'
|
||||||
},
|
},
|
||||||
storageBox: {
|
storageBox: {
|
||||||
name: 'Name',
|
name: 'Name',
|
||||||
|
16
src/lang/i18n/en/module/dashboard.js
Normal file
16
src/lang/i18n/en/module/dashboard.js
Normal file
@ -0,0 +1,16 @@
|
|||||||
|
/*
|
||||||
|
* @Author: gtz
|
||||||
|
* @Date: 2022-03-15 16:42:34
|
||||||
|
* @LastEditors: zwq
|
||||||
|
* @LastEditTime: 2022-03-16 08:57:49
|
||||||
|
* @Description: file content
|
||||||
|
* @FilePath: \mt-ck-wms-ui\src\lang\i18n\en\module\dashboard.js
|
||||||
|
*/
|
||||||
|
|
||||||
|
export default {
|
||||||
|
first: 'First Row',
|
||||||
|
second: 'Second Row',
|
||||||
|
title: 'WMS Inventory Information',
|
||||||
|
pageHeader: 'No.',
|
||||||
|
pageFooter: ' Page'
|
||||||
|
}
|
@ -2,7 +2,7 @@
|
|||||||
* @Author: gtz
|
* @Author: gtz
|
||||||
* @Date: 2021-03-04 16:12:46
|
* @Date: 2021-03-04 16:12:46
|
||||||
* @LastEditors: gtz
|
* @LastEditors: gtz
|
||||||
* @LastEditTime: 2021-04-22 19:49:39
|
* @LastEditTime: 2022-03-15 16:44:11
|
||||||
* @Description: file content
|
* @Description: file content
|
||||||
*/
|
*/
|
||||||
|
|
||||||
@ -17,6 +17,7 @@ import quality from './quality'
|
|||||||
import factory from './factory'
|
import factory from './factory'
|
||||||
import formManage from './formManage'
|
import formManage from './formManage'
|
||||||
import report from './report'
|
import report from './report'
|
||||||
|
import dashboard from './dashboard'
|
||||||
|
|
||||||
export default {
|
export default {
|
||||||
basicData,
|
basicData,
|
||||||
@ -29,5 +30,6 @@ export default {
|
|||||||
quality,
|
quality,
|
||||||
factory,
|
factory,
|
||||||
formManage,
|
formManage,
|
||||||
report
|
report,
|
||||||
|
dashboard
|
||||||
}
|
}
|
||||||
|
@ -3,11 +3,11 @@
|
|||||||
* @Date: 2021-03-04 16:13:51
|
* @Date: 2021-03-04 16:13:51
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
* @LastEditors: fzq
|
* @LastEditors: fzq
|
||||||
* @LastEditTime: 2022-03-14 16:22:20
|
* @LastEditTime: 2022-03-15 18:33:24
|
||||||
* @Description: file content
|
* @Description: file content
|
||||||
=======
|
=======
|
||||||
* @LastEditors: zwq
|
* @LastEditors: zwq
|
||||||
* @LastEditTime: 2022-03-14 10:58:12
|
* @LastEditTime: 2022-03-15 10:16:52
|
||||||
>>>>>>> develop
|
>>>>>>> develop
|
||||||
*/
|
*/
|
||||||
export default {
|
export default {
|
||||||
@ -165,7 +165,9 @@ export default {
|
|||||||
processEquipment: '工艺设备',
|
processEquipment: '工艺设备',
|
||||||
sheCode: '货架编码',
|
sheCode: '货架编码',
|
||||||
sheName: '货架名',
|
sheName: '货架名',
|
||||||
locaNum: '库存数量'
|
locaNum: '库存数量',
|
||||||
|
man: '男',
|
||||||
|
woman: '女'
|
||||||
},
|
},
|
||||||
storageBox: {
|
storageBox: {
|
||||||
name: '存储箱名称',
|
name: '存储箱名称',
|
||||||
|
16
src/lang/i18n/zh/module/dashboard.js
Normal file
16
src/lang/i18n/zh/module/dashboard.js
Normal file
@ -0,0 +1,16 @@
|
|||||||
|
/*
|
||||||
|
* @Author: gtz
|
||||||
|
* @Date: 2022-03-15 16:42:34
|
||||||
|
* @LastEditors: gtz
|
||||||
|
* @LastEditTime: 2022-03-15 16:58:30
|
||||||
|
* @Description: file content
|
||||||
|
* @FilePath: \mt-ck-wms-ui\src\lang\i18n\zh\module\dashboard.js
|
||||||
|
*/
|
||||||
|
|
||||||
|
export default {
|
||||||
|
first: '第一排',
|
||||||
|
second: '第二排',
|
||||||
|
title: 'WMS库存信息',
|
||||||
|
pageHeader: '第',
|
||||||
|
pageFooter: '页'
|
||||||
|
}
|
@ -2,7 +2,7 @@
|
|||||||
* @Author: gtz
|
* @Author: gtz
|
||||||
* @Date: 2021-03-04 16:12:46
|
* @Date: 2021-03-04 16:12:46
|
||||||
* @LastEditors: gtz
|
* @LastEditors: gtz
|
||||||
* @LastEditTime: 2021-04-22 19:49:47
|
* @LastEditTime: 2022-03-15 16:44:05
|
||||||
* @Description: file content
|
* @Description: file content
|
||||||
*/
|
*/
|
||||||
|
|
||||||
@ -17,6 +17,7 @@ import quality from './quality'
|
|||||||
import factory from './factory'
|
import factory from './factory'
|
||||||
import formManage from './formManage'
|
import formManage from './formManage'
|
||||||
import report from './report'
|
import report from './report'
|
||||||
|
import dashboard from './dashboard'
|
||||||
|
|
||||||
export default {
|
export default {
|
||||||
basicData,
|
basicData,
|
||||||
@ -29,5 +30,6 @@ export default {
|
|||||||
quality,
|
quality,
|
||||||
factory,
|
factory,
|
||||||
formManage,
|
formManage,
|
||||||
report
|
report,
|
||||||
|
dashboard
|
||||||
}
|
}
|
||||||
|
@ -1,8 +1,8 @@
|
|||||||
<!--
|
<!--
|
||||||
* @Author: DY
|
* @Author: DY
|
||||||
* @Date: 2021-12-16 15:41:11
|
* @Date: 2021-12-16 15:41:11
|
||||||
* @LastEditors: DY
|
* @LastEditors: zwq
|
||||||
* @LastEditTime: 2022-03-03 15:26:05
|
* @LastEditTime: 2022-03-04 09:04:30
|
||||||
* @Description: E10
|
* @Description: E10
|
||||||
-->
|
-->
|
||||||
<template>
|
<template>
|
||||||
@ -84,18 +84,18 @@ export default {
|
|||||||
},
|
},
|
||||||
created() {
|
created() {
|
||||||
// this.getEqList()
|
// this.getEqList()
|
||||||
this.getList()
|
// this.getList()
|
||||||
},
|
},
|
||||||
methods: {
|
methods: {
|
||||||
async getEqList() {
|
// async getEqList() {
|
||||||
const res = await equipmentList({
|
// const res = await equipmentList({
|
||||||
current: 1,
|
// current: 1,
|
||||||
size: 999
|
// size: 999
|
||||||
})
|
// })
|
||||||
if (res.code === 0) {
|
// if (res.code === 0) {
|
||||||
this.eqList = res.data
|
// this.eqList = res.data
|
||||||
}
|
// }
|
||||||
},
|
// },
|
||||||
toE10() {
|
toE10() {
|
||||||
this.$router.push({
|
this.$router.push({
|
||||||
name: 'E10'
|
name: 'E10'
|
||||||
|
@ -1,8 +1,8 @@
|
|||||||
<!--
|
<!--
|
||||||
* @Author: DY
|
* @Author: DY
|
||||||
* @Date: 2021-12-16 15:41:11
|
* @Date: 2021-12-16 15:41:11
|
||||||
* @LastEditors: DY
|
* @LastEditors: zwq
|
||||||
* @LastEditTime: 2022-03-03 15:26:28
|
* @LastEditTime: 2022-03-04 09:04:19
|
||||||
* @Description: MCBF
|
* @Description: MCBF
|
||||||
-->
|
-->
|
||||||
<template>
|
<template>
|
||||||
@ -83,18 +83,18 @@ export default {
|
|||||||
},
|
},
|
||||||
created() {
|
created() {
|
||||||
// this.getEqList()
|
// this.getEqList()
|
||||||
this.getList()
|
// this.getList()
|
||||||
},
|
},
|
||||||
methods: {
|
methods: {
|
||||||
async getEqList() {
|
// async getEqList() {
|
||||||
const res = await equipmentList({
|
// const res = await equipmentList({
|
||||||
current: 1,
|
// current: 1,
|
||||||
size: 999
|
// size: 999
|
||||||
})
|
// })
|
||||||
if (res.code === 0) {
|
// if (res.code === 0) {
|
||||||
this.eqList = res.data
|
// this.eqList = res.data
|
||||||
}
|
// }
|
||||||
},
|
// },
|
||||||
toE10() {
|
toE10() {
|
||||||
this.$router.push({
|
this.$router.push({
|
||||||
name: 'E10'
|
name: 'E10'
|
||||||
|
@ -1,8 +1,8 @@
|
|||||||
<!--
|
<!--
|
||||||
* @Author: DY
|
* @Author: DY
|
||||||
* @Date: 2021-12-16 15:41:11
|
* @Date: 2021-12-16 15:41:11
|
||||||
* @LastEditors: DY
|
* @LastEditors: zwq
|
||||||
* @LastEditTime: 2022-03-03 15:26:44
|
* @LastEditTime: 2022-03-04 09:04:09
|
||||||
* @Description: MTTR
|
* @Description: MTTR
|
||||||
-->
|
-->
|
||||||
<template>
|
<template>
|
||||||
@ -83,18 +83,18 @@ export default {
|
|||||||
},
|
},
|
||||||
created() {
|
created() {
|
||||||
// this.getEqList()
|
// this.getEqList()
|
||||||
this.getList()
|
// this.getList()
|
||||||
},
|
},
|
||||||
methods: {
|
methods: {
|
||||||
async getEqList() {
|
// async getEqList() {
|
||||||
const res = await equipmentList({
|
// const res = await equipmentList({
|
||||||
current: 1,
|
// current: 1,
|
||||||
size: 999
|
// size: 999
|
||||||
})
|
// })
|
||||||
if (res.code === 0) {
|
// if (res.code === 0) {
|
||||||
this.eqList = res.data
|
// this.eqList = res.data
|
||||||
}
|
// }
|
||||||
},
|
// },
|
||||||
toE10() {
|
toE10() {
|
||||||
this.$router.push({
|
this.$router.push({
|
||||||
name: 'E10'
|
name: 'E10'
|
||||||
|
@ -1,8 +1,8 @@
|
|||||||
<!--
|
<!--
|
||||||
* @Author: DY
|
* @Author: DY
|
||||||
* @Date: 2021-12-16 15:41:11
|
* @Date: 2021-12-16 15:41:11
|
||||||
* @LastEditors: DY
|
* @LastEditors: zwq
|
||||||
* @LastEditTime: 2022-03-03 15:26:56
|
* @LastEditTime: 2022-03-04 09:03:58
|
||||||
* @Description: OEE
|
* @Description: OEE
|
||||||
-->
|
-->
|
||||||
<template>
|
<template>
|
||||||
@ -83,18 +83,18 @@ export default {
|
|||||||
},
|
},
|
||||||
created() {
|
created() {
|
||||||
// this.getEqList()
|
// this.getEqList()
|
||||||
this.getList()
|
// this.getList()
|
||||||
},
|
},
|
||||||
methods: {
|
methods: {
|
||||||
async getEqList() {
|
// async getEqList() {
|
||||||
const res = await equipmentList({
|
// const res = await equipmentList({
|
||||||
current: 1,
|
// current: 1,
|
||||||
size: 999
|
// size: 999
|
||||||
})
|
// })
|
||||||
if (res.code === 0) {
|
// if (res.code === 0) {
|
||||||
this.eqList = res.data
|
// this.eqList = res.data
|
||||||
}
|
// }
|
||||||
},
|
// },
|
||||||
toE10() {
|
toE10() {
|
||||||
this.$router.push({
|
this.$router.push({
|
||||||
name: 'E10'
|
name: 'E10'
|
||||||
|
@ -1,8 +1,8 @@
|
|||||||
<!--
|
<!--
|
||||||
* @Author: zwq
|
* @Author: zwq
|
||||||
* @Date: 2020-12-29 15:41:11
|
* @Date: 2020-12-29 15:41:11
|
||||||
* @LastEditors: DY
|
* @LastEditors: zwq
|
||||||
* @LastEditTime: 2022-03-03 16:22:24
|
* @LastEditTime: 2022-03-04 09:03:35
|
||||||
* @Description: E10详情表格
|
* @Description: E10详情表格
|
||||||
-->
|
-->
|
||||||
<template>
|
<template>
|
||||||
@ -108,15 +108,15 @@ export default {
|
|||||||
this.listQuery.startTime = this.time1
|
this.listQuery.startTime = this.time1
|
||||||
this.listQuery.endTime = this.time2
|
this.listQuery.endTime = this.time2
|
||||||
this.listQuery.equipmentName = this.equipmentName
|
this.listQuery.equipmentName = this.equipmentName
|
||||||
getE10StackDetail(this.listQuery).then(res => {
|
// getE10StackDetail(this.listQuery).then(res => {
|
||||||
if (res.data !== []) {
|
// if (res.data !== []) {
|
||||||
this.list = res.data.detail.records
|
// this.list = res.data.detail.records
|
||||||
this.total = res.data.detail.total
|
// this.total = res.data.detail.total
|
||||||
this.list.forEach(item => {
|
// this.list.forEach(item => {
|
||||||
item.equipmentName = this.equipmentName
|
// item.equipmentName = this.equipmentName
|
||||||
})
|
// })
|
||||||
}
|
// }
|
||||||
})
|
// })
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -1,8 +1,8 @@
|
|||||||
<!--
|
<!--
|
||||||
* @Author: zwq
|
* @Author: zwq
|
||||||
* @Date: 2020-12-29 15:41:11
|
* @Date: 2020-12-29 15:41:11
|
||||||
* @LastEditors: DY
|
* @LastEditors: zwq
|
||||||
* @LastEditTime: 2022-03-03 16:46:06
|
* @LastEditTime: 2022-03-04 09:03:23
|
||||||
* @Description: Mttr详情表格
|
* @Description: Mttr详情表格
|
||||||
-->
|
-->
|
||||||
<template>
|
<template>
|
||||||
@ -109,12 +109,12 @@ export default {
|
|||||||
this.listQuery.startTime = this.time1
|
this.listQuery.startTime = this.time1
|
||||||
this.listQuery.endTime = this.time2
|
this.listQuery.endTime = this.time2
|
||||||
this.listQuery.equipmentName = this.equipmentName
|
this.listQuery.equipmentName = this.equipmentName
|
||||||
getMttrDetail(this.listQuery).then(res => {
|
// getMttrDetail(this.listQuery).then(res => {
|
||||||
if (res.data !== []) {
|
// if (res.data !== []) {
|
||||||
this.list = res.data.detail.records
|
// this.list = res.data.detail.records
|
||||||
this.total = res.data.detail.total
|
// this.total = res.data.detail.total
|
||||||
}
|
// }
|
||||||
})
|
// })
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -1,8 +1,8 @@
|
|||||||
<!--
|
<!--
|
||||||
* @Author: zwq
|
* @Author: zwq
|
||||||
* @Date: 2020-12-29 16:37:56
|
* @Date: 2020-12-29 16:37:56
|
||||||
* @LastEditors: zwq
|
* @LastEditors: fzq
|
||||||
* @LastEditTime: 2022-03-04 10:06:01
|
* @LastEditTime: 2022-03-15 18:33:01
|
||||||
* @Description:
|
* @Description:
|
||||||
-->
|
-->
|
||||||
<template>
|
<template>
|
||||||
@ -169,10 +169,10 @@ export default {
|
|||||||
}]
|
}]
|
||||||
},
|
},
|
||||||
sexOptions: [{
|
sexOptions: [{
|
||||||
'label': '男',
|
'label': this.$t('module.basicData.cache.man'),
|
||||||
'value': 1
|
'value': 1
|
||||||
}, {
|
}, {
|
||||||
'label': '女',
|
'label': this.$t('module.basicData.cache.woman'),
|
||||||
'value': 0
|
'value': 0
|
||||||
}],
|
}],
|
||||||
onDutyOptions: [{
|
onDutyOptions: [{
|
||||||
|
@ -2,7 +2,7 @@
|
|||||||
* @Author: zwq
|
* @Author: zwq
|
||||||
* @Date: 2020-12-29 15:41:11
|
* @Date: 2020-12-29 15:41:11
|
||||||
* @LastEditors: zwq
|
* @LastEditors: zwq
|
||||||
* @LastEditTime: 2022-03-11 16:29:46
|
* @LastEditTime: 2022-03-15 14:15:30
|
||||||
* @Description:
|
* @Description:
|
||||||
-->
|
-->
|
||||||
<template>
|
<template>
|
||||||
@ -33,7 +33,6 @@ import { locationByProcessList } from '@/api/basicData/Warehouse/StorageBoxInfo'
|
|||||||
import i18n from '@/lang'
|
import i18n from '@/lang'
|
||||||
import BaseTable from '@/components/BaseTable'
|
import BaseTable from '@/components/BaseTable'
|
||||||
// import MethodBtn from '@/components/BaseTable/subcomponents/MethodBtn'
|
// import MethodBtn from '@/components/BaseTable/subcomponents/MethodBtn'
|
||||||
import { timeFormatter } from '@/filters'
|
|
||||||
/**
|
/**
|
||||||
* 表格表头配置项 TypeScript接口注释
|
* 表格表头配置项 TypeScript接口注释
|
||||||
* tableConfig<ConfigItem> = []
|
* tableConfig<ConfigItem> = []
|
||||||
@ -60,7 +59,6 @@ const tableProps = [
|
|||||||
{
|
{
|
||||||
prop: 'code',
|
prop: 'code',
|
||||||
label: i18n.t('module.basicData.cache.LocationCode'),
|
label: i18n.t('module.basicData.cache.LocationCode'),
|
||||||
filter: timeFormatter,
|
|
||||||
align: 'center'
|
align: 'center'
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
|
@ -2,7 +2,7 @@
|
|||||||
* @Author: gtz
|
* @Author: gtz
|
||||||
* @Date: 2022-03-03 09:16:10
|
* @Date: 2022-03-03 09:16:10
|
||||||
* @LastEditors: zwq
|
* @LastEditors: zwq
|
||||||
* @LastEditTime: 2022-03-11 16:33:41
|
* @LastEditTime: 2022-03-15 17:03:28
|
||||||
* @Description: file content
|
* @Description: file content
|
||||||
* @FilePath: \mt-ck-wms-ui\src\views\dashboard\index.vue
|
* @FilePath: \mt-ck-wms-ui\src\views\dashboard\index.vue
|
||||||
-->
|
-->
|
||||||
@ -11,7 +11,7 @@
|
|||||||
<el-card class="dashboard-main">
|
<el-card class="dashboard-main">
|
||||||
<el-row class="dashboard-title">
|
<el-row class="dashboard-title">
|
||||||
<div class="dashboard-header-line" />
|
<div class="dashboard-header-line" />
|
||||||
<div class="dashboard-header-title">WMS库存信息</div>
|
<div class="dashboard-header-title">{{ $t('module.dashboard.title') }}</div>
|
||||||
</el-row>
|
</el-row>
|
||||||
<el-row class="dashboard-legend">
|
<el-row class="dashboard-legend">
|
||||||
<div
|
<div
|
||||||
@ -47,13 +47,7 @@
|
|||||||
size="mini"
|
size="mini"
|
||||||
placeholder="请选择库存范围"
|
placeholder="请选择库存范围"
|
||||||
@change="handleChange"
|
@change="handleChange"
|
||||||
>
|
><el-option v-for="item in totalPage" :key="'select' + item" :label="$t('module.dashboard.pageHeader') + item + $t('module.dashboard.pageFooter')" :value="item" />
|
||||||
<el-option
|
|
||||||
v-for="item in totalPage"
|
|
||||||
:key="'select' + item"
|
|
||||||
:label="'第' + item + '页'"
|
|
||||||
:value="item"
|
|
||||||
/>
|
|
||||||
</el-select>
|
</el-select>
|
||||||
</div>
|
</div>
|
||||||
</el-row>
|
</el-row>
|
||||||
@ -117,33 +111,13 @@
|
|||||||
)
|
)
|
||||||
"
|
"
|
||||||
>
|
>
|
||||||
<div
|
<div v-if="z.portList[(current - 1) * 80 + (item - 1) * 20 + (x - 1)].attribute !== 3" class="dashboard-layout-item-cricle" :style="{background: z.portList[(current - 1) * 80 + (item - 1) * 20 + (x - 1)].cassetteList[0] ? cassetteStatusObj[z.portList[(current - 1) * 80 + (item - 1) * 20 + (x - 1)].cassetteList[0].status] : ''}" />
|
||||||
v-if="
|
{{ z.portList[(current - 1) * 80 + (item - 1) * 20 + (x - 1)].attribute !== 3 ? z.portList[(current - 1) * 80 + (item - 1) * 20 + (x - 1)].name : 'XXXX' }}
|
||||||
z.portList[
|
|
||||||
(current - 1) * 80 + (item - 1) * 20 + (x - 1)
|
|
||||||
].attribute !== 3
|
|
||||||
"
|
|
||||||
class="dashboard-layout-item-cricle"
|
|
||||||
:style="{
|
|
||||||
background:
|
|
||||||
cassetteStatusObj[
|
|
||||||
z.portList[
|
|
||||||
(current - 1) * 80 + (item - 1) * 20 + (x - 1)
|
|
||||||
].cassetteList[0].status
|
|
||||||
]
|
|
||||||
}"
|
|
||||||
/>
|
|
||||||
{{
|
|
||||||
z.portList[(current - 1) * 80 + (item - 1) * 20 + (x - 1)]
|
|
||||||
.name
|
|
||||||
}}
|
|
||||||
</div>
|
</div>
|
||||||
</el-col>
|
</el-col>
|
||||||
</el-row>
|
</el-row>
|
||||||
<div class="dashboard-layout-footer">
|
<div class="dashboard-layout-footer">
|
||||||
{{
|
{{ $t(bottomIndex[index]) + '(' + ((current - 1) * 4 + item) + ')' }}
|
||||||
"第" + bottomIndex[index] + "排(" + ((current - 1) * 4 + item) + ")"
|
|
||||||
}}
|
|
||||||
</div>
|
</div>
|
||||||
</el-col>
|
</el-col>
|
||||||
</el-row>
|
</el-row>
|
||||||
@ -216,26 +190,8 @@
|
|||||||
)
|
)
|
||||||
"
|
"
|
||||||
>
|
>
|
||||||
<div
|
<div v-if="z.portList[(current - 1) * 80 + (item - 1) * 20 + (x - 1)].attribute !== 3" class="dashboard-layout-item-cricle" :style="{background: z.portList[(current - 1) * 80 + (item - 1) * 20 + (x - 1)].cassetteList[0] ? cassetteStatusObj[z.portList[(current - 1) * 80 + (item - 1) * 20 + (x - 1)].cassetteList[0].status] : ''}" />
|
||||||
v-if="
|
{{ z.portList[(current - 1) * 80 + (item - 1) * 20 + (x - 1)].attribute !== 3 ? z.portList[(current - 1) * 80 + (item - 1) * 20 + (x - 1)].name : 'XXXX' }}
|
||||||
z.portList[
|
|
||||||
(current - 1) * 80 + (item - 1) * 20 + (x - 1)
|
|
||||||
].attribute !== 3
|
|
||||||
"
|
|
||||||
class="dashboard-layout-item-cricle"
|
|
||||||
:style="{
|
|
||||||
background:
|
|
||||||
cassetteStatusObj[
|
|
||||||
z.portList[
|
|
||||||
(current - 1) * 80 + (item - 1) * 20 + (x - 1)
|
|
||||||
].cassetteList[0].status
|
|
||||||
]
|
|
||||||
}"
|
|
||||||
/>
|
|
||||||
{{
|
|
||||||
z.portList[(current - 1) * 80 + (item - 1) * 20 + (x - 1)]
|
|
||||||
.name
|
|
||||||
}}
|
|
||||||
</div>
|
</div>
|
||||||
</el-col>
|
</el-col>
|
||||||
</el-row>
|
</el-row>
|
||||||
@ -283,33 +239,13 @@
|
|||||||
)
|
)
|
||||||
"
|
"
|
||||||
>
|
>
|
||||||
<div
|
<div v-if="z.portList[(current - 1) * 80 + (item - 1) * 20 + (x - 1)].attribute !== 3" class="dashboard-layout-item-cricle" :style="{background: z.portList[(current - 1) * 80 + (item - 1) * 20 + (x - 1)].cassetteList[0] ? cassetteStatusObj[z.portList[(current - 1) * 80 + (item - 1) * 20 + (x - 1)].cassetteList[0].status] : ''}" />
|
||||||
v-if="
|
{{ z.portList[(current - 1) * 80 + (item - 1) * 20 + (x - 1)].attribute !== 3 ? z.portList[(current - 1) * 80 + (item - 1) * 20 + (x - 1)].name : 'XXXX' }}
|
||||||
z.portList[
|
|
||||||
(current - 1) * 80 + (item - 1) * 20 + (x - 1)
|
|
||||||
].attribute !== 3
|
|
||||||
"
|
|
||||||
class="dashboard-layout-item-cricle"
|
|
||||||
:style="{
|
|
||||||
background:
|
|
||||||
cassetteStatusObj[
|
|
||||||
z.portList[
|
|
||||||
(current - 1) * 80 + (item - 1) * 20 + (x - 1)
|
|
||||||
].cassetteList[0].status
|
|
||||||
]
|
|
||||||
}"
|
|
||||||
/>
|
|
||||||
{{
|
|
||||||
z.portList[(current - 1) * 80 + (item - 1) * 20 + (x - 1)]
|
|
||||||
.name
|
|
||||||
}}
|
|
||||||
</div>
|
</div>
|
||||||
</el-col>
|
</el-col>
|
||||||
</el-row>
|
</el-row>
|
||||||
<div class="dashboard-layout-footer">
|
<div class="dashboard-layout-footer">
|
||||||
{{
|
{{ $t(bottomIndex[index]) + '(' + ((current - 1) * 4 + item) + ')' }}
|
||||||
"第" + bottomIndex[index] + "排(" + ((current - 1) * 4 + item) + ")"
|
|
||||||
}}
|
|
||||||
</div>
|
</div>
|
||||||
</el-col>
|
</el-col>
|
||||||
</el-row>
|
</el-row>
|
||||||
@ -330,7 +266,7 @@ import testdata from './testdata'
|
|||||||
import processStorageType from './processStorageType'
|
import processStorageType from './processStorageType'
|
||||||
|
|
||||||
export default {
|
export default {
|
||||||
name: 'Dashboard',
|
name: 'ProcessStorageLink1',
|
||||||
components: { processStorageType },
|
components: { processStorageType },
|
||||||
data() {
|
data() {
|
||||||
return testdata
|
return testdata
|
||||||
@ -353,13 +289,13 @@ export default {
|
|||||||
} else {
|
} else {
|
||||||
this.typeVisible = true
|
this.typeVisible = true
|
||||||
this.$nextTick(() => {
|
this.$nextTick(() => {
|
||||||
this.$refs.typeRef.init(item.id)
|
this.$refs.typeRef.init(item.id, item.name)
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
setStorageList(locationId, dataForm) {
|
setStorageList(locationId, locationName, dataForm) {
|
||||||
const obj = Object.assign({ locationId }, dataForm)
|
const obj = Object.assign({ locationId, locationName }, dataForm)
|
||||||
this.selectStorageList.push(obj)
|
this.selectStorageList.push(obj)
|
||||||
},
|
},
|
||||||
handleChange(v) {
|
handleChange(v) {
|
||||||
@ -367,10 +303,10 @@ export default {
|
|||||||
},
|
},
|
||||||
submitLinkList() {
|
submitLinkList() {
|
||||||
const tipArr = this.selectStorageList.map(item => {
|
const tipArr = this.selectStorageList.map(item => {
|
||||||
return item.locationId
|
return item.locationName
|
||||||
})
|
})
|
||||||
const obj = {
|
const obj = {
|
||||||
id: this.id,
|
workSequenId: this.id,
|
||||||
processLocationStorageList: this.selectStorageList
|
processLocationStorageList: this.selectStorageList
|
||||||
}
|
}
|
||||||
this.$confirm(`${this.$t('module.basicData.visual.TipsStorageBefore')}[${tipArr.join(',')}]?`, this.$t('module.basicData.visual.Tips'), {
|
this.$confirm(`${this.$t('module.basicData.visual.TipsStorageBefore')}[${tipArr.join(',')}]?`, this.$t('module.basicData.visual.Tips'), {
|
||||||
|
@ -2,7 +2,7 @@
|
|||||||
* @Author: zwq
|
* @Author: zwq
|
||||||
* @Date: 2020-12-29 16:37:56
|
* @Date: 2020-12-29 16:37:56
|
||||||
* @LastEditors: zwq
|
* @LastEditors: zwq
|
||||||
* @LastEditTime: 2022-03-11 14:48:18
|
* @LastEditTime: 2022-03-15 11:02:46
|
||||||
* @Description:
|
* @Description:
|
||||||
-->
|
-->
|
||||||
<template>
|
<template>
|
||||||
@ -49,6 +49,7 @@ export default {
|
|||||||
return {
|
return {
|
||||||
visible: false,
|
visible: false,
|
||||||
locationId: '',
|
locationId: '',
|
||||||
|
locationName: '',
|
||||||
dataForm: {
|
dataForm: {
|
||||||
portAttrId: 1,
|
portAttrId: 1,
|
||||||
storageId: ''
|
storageId: ''
|
||||||
@ -65,8 +66,9 @@ export default {
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
methods: {
|
methods: {
|
||||||
init(id) {
|
init(id, name) {
|
||||||
this.locationId = id
|
this.locationId = id
|
||||||
|
this.locationName = name
|
||||||
const listQuery = {
|
const listQuery = {
|
||||||
current: 1,
|
current: 1,
|
||||||
size: 999
|
size: 999
|
||||||
@ -78,6 +80,9 @@ export default {
|
|||||||
this.storageBoxArr.splice(0, this.list.length)
|
this.storageBoxArr.splice(0, this.list.length)
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
|
this.$nextTick(() => {
|
||||||
|
this.$refs['dataForm'].resetFields()
|
||||||
|
})
|
||||||
this.visible = true
|
this.visible = true
|
||||||
},
|
},
|
||||||
// 表单提交
|
// 表单提交
|
||||||
@ -85,7 +90,7 @@ export default {
|
|||||||
this.$refs['dataForm'].validate((valid) => {
|
this.$refs['dataForm'].validate((valid) => {
|
||||||
if (valid) {
|
if (valid) {
|
||||||
this.visible = false
|
this.visible = false
|
||||||
this.$emit('refreshDataList', this.locationId, this.dataForm)
|
this.$emit('refreshDataList', this.locationId, this.locationName, this.dataForm)
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
File diff suppressed because it is too large
Load Diff
@ -2,7 +2,7 @@
|
|||||||
* @Author: gtz
|
* @Author: gtz
|
||||||
* @Date: 2022-03-03 09:16:10
|
* @Date: 2022-03-03 09:16:10
|
||||||
* @LastEditors: gtz
|
* @LastEditors: gtz
|
||||||
* @LastEditTime: 2022-03-14 16:03:15
|
* @LastEditTime: 2022-03-15 16:47:57
|
||||||
* @Description: file content
|
* @Description: file content
|
||||||
* @FilePath: \mt-ck-wms-ui\src\views\dashboard\index.vue
|
* @FilePath: \mt-ck-wms-ui\src\views\dashboard\index.vue
|
||||||
-->
|
-->
|
||||||
@ -11,7 +11,7 @@
|
|||||||
<el-card class="dashboard-main">
|
<el-card class="dashboard-main">
|
||||||
<el-row class="dashboard-title">
|
<el-row class="dashboard-title">
|
||||||
<div class="dashboard-header-line" />
|
<div class="dashboard-header-line" />
|
||||||
<div class="dashboard-header-title">WMS库存信息</div>
|
<div class="dashboard-header-title">{{ $t('module.dashboard.title') }}</div>
|
||||||
</el-row>
|
</el-row>
|
||||||
<el-row class="dashboard-legend">
|
<el-row class="dashboard-legend">
|
||||||
<div v-for="item in cassetteStatusList" :key="'cassette' + item.id" class="dashboard-legend-cassette">
|
<div v-for="item in cassetteStatusList" :key="'cassette' + item.id" class="dashboard-legend-cassette">
|
||||||
@ -24,7 +24,7 @@
|
|||||||
</div>
|
</div>
|
||||||
<div class="dashboard-legend-search">
|
<div class="dashboard-legend-search">
|
||||||
<el-select v-model="current" size="mini" placeholder="请选择库存范围" @change="handleChange">
|
<el-select v-model="current" size="mini" placeholder="请选择库存范围" @change="handleChange">
|
||||||
<el-option v-for="item in totalPage" :key="'select' + item" :label="'第' + item + '页'" :value="item" />
|
<el-option v-for="item in totalPage" :key="'select' + item" :label="$t('module.dashboard.pageHeader') + item + $t('module.dashboard.pageFooter')" :value="item" />
|
||||||
</el-select>
|
</el-select>
|
||||||
</div>
|
</div>
|
||||||
</el-row>
|
</el-row>
|
||||||
@ -41,7 +41,7 @@
|
|||||||
</el-col>
|
</el-col>
|
||||||
</el-row>
|
</el-row>
|
||||||
<div class="dashboard-layout-footer">
|
<div class="dashboard-layout-footer">
|
||||||
{{ '第' + rowIndex[index] + '排(' + ((current - 1) * 4 + item) + ')' }}
|
{{ $t(rowIndex[index]) + '(' + ((current - 1) * 4 + item) + ')' }}
|
||||||
</div>
|
</div>
|
||||||
</el-col>
|
</el-col>
|
||||||
</el-row>
|
</el-row>
|
||||||
@ -68,7 +68,7 @@
|
|||||||
</el-col>
|
</el-col>
|
||||||
</el-row>
|
</el-row>
|
||||||
<div class="dashboard-layout-footer">
|
<div class="dashboard-layout-footer">
|
||||||
{{ '第' + rowIndex[index] + '排(' + ((current - 1) * 4 + item) + ')' }}
|
{{ $t(rowIndex[index]) + '(' + ((current - 1) * 4 + item) + ')' }}
|
||||||
</div>
|
</div>
|
||||||
</el-col>
|
</el-col>
|
||||||
</el-row>
|
</el-row>
|
||||||
|
@ -2,7 +2,7 @@
|
|||||||
* @Author: gtz
|
* @Author: gtz
|
||||||
* @Date: 2022-03-03 15:47:47
|
* @Date: 2022-03-03 15:47:47
|
||||||
* @LastEditors: gtz
|
* @LastEditors: gtz
|
||||||
* @LastEditTime: 2022-03-14 16:00:03
|
* @LastEditTime: 2022-03-15 16:46:04
|
||||||
* @Description: file content
|
* @Description: file content
|
||||||
* @FilePath: \mt-ck-wms-ui\src\views\dashboard\testdata.js
|
* @FilePath: \mt-ck-wms-ui\src\views\dashboard\testdata.js
|
||||||
*/
|
*/
|
||||||
@ -2604,5 +2604,5 @@ export default {
|
|||||||
},
|
},
|
||||||
current: 1,
|
current: 1,
|
||||||
totalPage: 1,
|
totalPage: 1,
|
||||||
rowIndex: ['一', '二']
|
rowIndex: ['module.dashboard.first', 'module.dashboard.second']
|
||||||
}
|
}
|
||||||
|
@ -2,7 +2,7 @@
|
|||||||
* @Author: zwq
|
* @Author: zwq
|
||||||
* @Date: 2020-12-29 16:37:56
|
* @Date: 2020-12-29 16:37:56
|
||||||
* @LastEditors: zwq
|
* @LastEditors: zwq
|
||||||
* @LastEditTime: 2022-03-11 09:05:38
|
* @LastEditTime: 2022-03-15 10:50:00
|
||||||
* @Description:
|
* @Description:
|
||||||
-->
|
-->
|
||||||
<template>
|
<template>
|
||||||
@ -114,7 +114,7 @@
|
|||||||
</template>
|
</template>
|
||||||
|
|
||||||
<script>
|
<script>
|
||||||
import { ProcessInfoDetail } from '@/api/orderManage/00A'
|
import { ExecutionInfoDetail } from '@/api/orderManage/00A'
|
||||||
|
|
||||||
export default {
|
export default {
|
||||||
data() {
|
data() {
|
||||||
@ -146,7 +146,7 @@ export default {
|
|||||||
this.$nextTick(() => {
|
this.$nextTick(() => {
|
||||||
this.$refs['dataForm'].resetFields()
|
this.$refs['dataForm'].resetFields()
|
||||||
if (this.dataForm.id) {
|
if (this.dataForm.id) {
|
||||||
ProcessInfoDetail(this.dataForm.id).then(res => {
|
ExecutionInfoDetail(this.dataForm.id).then(res => {
|
||||||
res.data.status = this.statusfilter('orderStatus', res.data.status)
|
res.data.status = this.statusfilter('orderStatus', res.data.status)
|
||||||
res.data.type = this.statusfilter('orderType', res.data.type)
|
res.data.type = this.statusfilter('orderType', res.data.type)
|
||||||
res.data.priority = this.statusfilter('priority', res.data.priority)
|
res.data.priority = this.statusfilter('priority', res.data.priority)
|
||||||
|
Loading…
Reference in New Issue
Block a user