盘点为有货无货

增加随行功能
淮阴-烟草
LAPTOP-S9HJSOEB\昊天 8 months ago
parent 534470cb70
commit 8465766e9c

Binary file not shown.

@ -29,44 +29,44 @@ const routes = [{
}, },
component: () => import('@/views/index'), component: () => import('@/views/index'),
children: [ children: [
// { {
// path: 'videoWall1`', path: 'videoWall1`',
// name: 'videoWall1`', name: 'videoWall1`',
// meta: { meta: {
// icon: 'desktop', icon: 'desktop',
// name: '视频墙1' name: '视频墙1'
// }, },
// component: () => import('@/views/videoWall/index'), component: () => import('@/views/videoWall/index'),
// }, },
// { {
// path: 'videoWall2', path: 'videoWall2',
// name: 'videoWall2', name: 'videoWall2',
// meta: { meta: {
// icon: 'desktop', icon: 'desktop',
// name: '视频墙2' name: '视频墙2'
// }, },
// component: () => import('@/views/videoWall2/index'), component: () => import('@/views/videoWall2/index'),
// }, },
// { {
// path: 'realTimeMonitoring', path: 'realTimeMonitoring',
// name: 'realTimeMonitoring', name: 'realTimeMonitoring',
// meta: { meta: {
// icon: 'video-camera', icon: 'video-camera',
// name: '实时视频流' name: '实时视频流'
// }, },
// component: () => import('@/views/realTimeMonitoring/index'), component: () => import('@/views/realTimeMonitoring/index'),
// }, },
// { {
// path: 'historyMonitoring', path: 'historyMonitoring',
// name: 'historyMonitoring', name: 'historyMonitoring',
// meta: { meta: {
// icon: 'book', icon: 'book',
// name: '历史数据' name: '历史数据'
// }, },
// component: () => import('@/views/historyMonitoring/index') component: () => import('@/views/historyMonitoring/index')
// }, },
// { // {
// path: 'alarmLog', // path: 'alarmLog',
// name: 'alarmLog', // name: 'alarmLog',
@ -128,15 +128,15 @@ const routes = [{
}, },
component: () => import('@/views/roadwayManage/index') component: () => import('@/views/roadwayManage/index')
}, },
// { {
// path: 'cameraManage', path: 'cameraManage',
// name: 'cameraManage', name: 'cameraManage',
// meta: { meta: {
// icon: 'camera', icon: 'camera',
// name: '球机管理' name: '球机管理'
// }, },
// component: () => import('@/views/cameraManage/index') component: () => import('@/views/cameraManage/index')
// }, },
// { // {
// path: 'cameraManage/model', // path: 'cameraManage/model',
// name: 'cameraManageModel', // name: 'cameraManageModel',

@ -246,11 +246,11 @@ export default {
var color; var color;
if(status == -1){ if(status == -1){
color = '#f2ed48' color = '#f2ed48'
}else if(status ==1){
color = '#1afa29'
}else if(status ==2){ }else if(status ==2){
color = '#1afa29'
}else if( status == 3){
color = '#4c71d8' color = '#4c71d8'
}else if(status == 2 ||status == 5 || status == 6 ){ }else if(status == 1 ||status == 5 || status == 6 ){
color = '#d81e06' color = '#d81e06'
}else if(status == 4){ }else if(status == 4){
color = '#bc55cf' color = '#bc55cf'

@ -276,8 +276,8 @@ export default {
], ],
statusMap: { statusMap: {
0: "未盘点", 0: "未盘点",
1: "无货", 2: "盘点正确",
2: "有货", 1: "盘点异常",
3: "人工核对正确", 3: "人工核对正确",
4: "空托盘", 4: "空托盘",
5: "品规失败", 5: "品规失败",

@ -60,15 +60,15 @@
color="#1afa29" color="#1afa29"
style="width: 30px; height: 20px; margin-right: 6px" style="width: 30px; height: 20px; margin-right: 6px"
></a-tag> ></a-tag>
有货 盘点正常
</span> </span>
<span class="info-text"> <!-- <span class="info-text">
<a-tag <a-tag
color="#bfbfbf" color="#bfbfbf"
style="width: 30px; height: 20px; margin-right: 6px" style="width: 30px; height: 20px; margin-right: 6px"
></a-tag> ></a-tag>
无货 盘点异常
</span> </span> -->
<span class="info-text"> <span class="info-text">
<a-tag <a-tag
color="#4c71d8" color="#4c71d8"

@ -111,10 +111,10 @@
未盘点 未盘点
</a-select-option> --> </a-select-option> -->
<a-select-option :value=1> <a-select-option :value=1>
有货 盘点正常
</a-select-option> </a-select-option>
<a-select-option :value=2> <a-select-option :value=2>
无货 盘点异常
</a-select-option> </a-select-option>
<!-- <a-select-option :value=3> <!-- <a-select-option :value=3>
人工核对正确 人工核对正确
@ -178,7 +178,13 @@
slot="goodsLocation" slot="goodsLocation"
slot-scope="text" slot-scope="text"
> >
{{ text.direction }}-{{ text.row}}-{{ text.column}} {{ text.direction==1?"左侧":"右侧" }}-{{ text.side==1?"浅":"深" }}-{{ text.row +"行"}}-{{ text.column +"列"}}
</span>
<span
slot="trayCode"
slot-scope="text"
>
{{ text.wmsTrayCode==='0'?"无货":"有货" }}
</span> </span>
<span <span
slot="status" slot="status"
@ -235,8 +241,8 @@ export default {
return { return {
statusMap: { statusMap: {
0: "未盘点", 0: "未盘点",
1: "有货", 1: "盘点异常",
2: "无货", 2: "盘点正常",
3: "人工核对正确", 3: "人工核对正确",
4: "空托盘", 4: "空托盘",
5: "品规失败", 5: "品规失败",
@ -279,15 +285,19 @@ export default {
width: 200, width: 200,
}, },
{
title: "上位有无货物",
scopedSlots: { customRender: "trayCode" },
},
{ {
title: "盘点状态", title: "盘点状态",
scopedSlots: { customRender: "status" }, scopedSlots: { customRender: "status" },
}, },
// { {
// title: "", title: "照片",
// scopedSlots: { customRender: "pic" }, scopedSlots: { customRender: "pic" },
// width: 320, width: 320,
// }, },
{ {
title: "更新时间", title: "更新时间",
dataIndex: "createTime", dataIndex: "createTime",

Loading…
Cancel
Save