diff --git a/src/router/index.js b/src/router/index.js
index 79362cf..51c73c7 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -29,15 +29,15 @@ const routes = [{
},
component: () => import('@/views/index'),
children: [
- {
- path: 'videoWall',
- name: 'videoWall',
- meta: {
- icon: 'desktop',
- name: '视频墙'
- },
- component: () => import('@/views/videoWall/index'),
- },
+ // {
+ // path: 'videoWall',
+ // name: 'videoWall',
+ // meta: {
+ // icon: 'desktop',
+ // name: '视频墙'
+ // },
+ // component: () => import('@/views/videoWall/index'),
+ // },
{
path: 'realTimeMonitoring',
name: 'realTimeMonitoring',
@@ -93,23 +93,23 @@ const routes = [{
},
component: () => import('@/views/historyCheck/index'),
},
- {
- path: 'stockHistory',
- name: 'stockHistory',
- meta: {
- icon: 'file-excel',
- name: '库位历史',
- },
- component: () => import('@/views/stockLog/index'),
- },
- {
- path: 'stockLogDetail',
- name: 'stockLogDetail',
- meta: {
- name: '库位历史详情',
- },
- component: () => import('@/views/stockLog/logPage'),
- },
+ // {
+ // path: 'stockHistory',
+ // name: 'stockHistory',
+ // meta: {
+ // icon: 'file-excel',
+ // name: '库位历史',
+ // },
+ // component: () => import('@/views/stockLog/index'),
+ // },
+ // {
+ // path: 'stockLogDetail',
+ // name: 'stockLogDetail',
+ // meta: {
+ // name: '库位历史详情',
+ // },
+ // component: () => import('@/views/stockLog/logPage'),
+ // },
{
path: 'roadwayManage',
name: 'roadwayManage',
@@ -136,24 +136,24 @@ const routes = [{
},
component: () => import('@/views/cameraManage/model')
},
- {
- path: 'productSpecManage',
- name: 'productSpecManage',
- meta: {
- icon: 'pushpin',
- name: '品规管理'
- },
- component: () => import('@/views/productSpecManage/index')
- },
- {
- path: 'repertoryManage',
- name: 'repertoryManage',
- meta: {
- icon: 'wallet',
- name: '库存管理'
- },
- component: () => import('@/views/repertoryManage/index')
- },
+ // {
+ // path: 'productSpecManage',
+ // name: 'productSpecManage',
+ // meta: {
+ // icon: 'pushpin',
+ // name: '品规管理'
+ // },
+ // component: () => import('@/views/productSpecManage/index')
+ // },
+ // {
+ // path: 'repertoryManage',
+ // name: 'repertoryManage',
+ // meta: {
+ // icon: 'wallet',
+ // name: '库存管理'
+ // },
+ // component: () => import('@/views/repertoryManage/index')
+ // },
{
path: 'cameraManage/ioTable',
diff --git a/src/views/checkManage/checkOperation.vue b/src/views/checkManage/checkOperation.vue
index d5012ec..9715c9f 100644
--- a/src/views/checkManage/checkOperation.vue
+++ b/src/views/checkManage/checkOperation.vue
@@ -71,7 +71,13 @@
type="primary"
style="background:#29c12b;border-color:#29c12b;"
@click="checkSure(checkObj.row,checkObj.column,checkObj.shelveId,index)"
- >核对
+ >核对正确
+
+ 核对错误
@@ -109,23 +115,13 @@ export default {
label:'盘点批次号',
key: 'lotnum'
},
- {
- label:'随行工单号',
- key: 'orderNum'
- },
+
{
label:'盘点任务号',
key: 'checkNum'
},
- {
- label:'托盘系统条码号',
- key: 'wmsTrayCode'
- },
- {
- label:'托盘扫描条码号',
- key: 'trayCode'
- },
+
{
label:'盘点时间',
key: 'exportTime'
@@ -207,7 +203,30 @@ export default {
data: {
row: Number(row),
column: Number(column),
- shelveId: shelveId,
+ side: Number(this.side),
+ streetId: Number(this.streetId),
+ direction: Number(this.direction),
+ ok: 1
+ }
+ }).then(res => {
+ if (res.code == 200) {
+ this.$message.success('操作成功');
+ this.getStockInfo(this.row,this.column)
+ }
+
+ }).catch(err => {
+
+ });
+ },
+ checkfalse(row, column, shelveId, index) {
+ this.$api.httpApi.stockCheckCorrect({
+ data: {
+ row: Number(row),
+ column: Number(column),
+ side: Number(this.side),
+ streetId: Number(this.streetId),
+ direction: Number(this.direction),
+ ok: 0
}
}).then(res => {
if (res.code == 200) {
diff --git a/src/views/historyCheck/index.vue b/src/views/historyCheck/index.vue
index c707256..2b51168 100644
--- a/src/views/historyCheck/index.vue
+++ b/src/views/historyCheck/index.vue
@@ -16,7 +16,7 @@
-
+
未选择
@@ -32,7 +32,7 @@
-
+
未选择
@@ -127,8 +127,8 @@ export default {
statusMap: {0:"未盘点",1:"盘点异常",2:"核对正确",3:"人工核对正确"},
queryParam: {
lotnum: '',
- side : -1,
- leftRight : -1
+ side : '',
+ leftRight : ''
},
listData:[],
time:[],
@@ -152,17 +152,14 @@ export default {
dataIndex: "lotnum",
},
{
- title: "货位({左右}-{深浅}-{行}-{列})",
- scopedSlots: {customRender: 'goodsLocation'},
- },
- {
- title: "系统托盘条码号",
- dataIndex: "wmsTrayCode",
+ title: "巷道名称",
+ dataIndex: "streetName",
},
{
- title: "扫描托盘条码号",
- dataIndex: "trayCode",
+ title: "货位({左右}-{深浅}-{行}-{列})",
+ scopedSlots: {customRender: 'goodsLocation'},
},
+
{
title: "盘点状态",
scopedSlots: {customRender: 'status'},
@@ -173,7 +170,7 @@ export default {
width:320,
},
{
- title: "时间",
+ title: "更新时间",
dataIndex: "createTime",
},
@@ -209,8 +206,8 @@ export default {
},
handleChange(value) {
this.getStreetDetail(value)
- this.queryParam.leftRight = -1
- this.queryParam.side = -1
+ this.queryParam.leftRight = ''
+ this.queryParam.side = ''
},
// 左右货架切换
@@ -218,19 +215,19 @@ export default {
if (value == 1) {
//单伸
if(this.streetDetail.leftType == 0){
- this.queryParam.side = -1
+ this.queryParam.side = ''
}else{
this.queryParam.side = 0
}
} else if (value == 2) {
if(this.streetDetail.rightType == 0){
- this.queryParam.side = -1
+ this.queryParam.side = ''
}else{
this.queryParam.side = 0
}
} else{
- this.queryParam.side = -1
+ this.queryParam.side = ''
}
},
handleSearch() {
@@ -285,10 +282,9 @@ export default {
this.queryParam.startTimestamp = ""
this.queryParam.endTimestamp = ""
this.queryParam.lotnum = ""
- this.queryParam.side = -1
- this.queryParam.leftRight = -1
+ this.queryParam.side = ''
+ this.queryParam.leftRight = ''
this.queryParam.streetId = 0
-
this.select = null;
this.time = []
this.pageNum = 1