diff --git a/dist.zip b/dist.zip
deleted file mode 100644
index e1473f9..0000000
Binary files a/dist.zip and /dev/null differ
diff --git a/public/antd_color.less b/public/antd_color.less
index 08c925d..b746b9c 100644
--- a/public/antd_color.less
+++ b/public/antd_color.less
@@ -1395,7 +1395,7 @@ tr.ant-table-expanded-row:hover {background: #fbfbfb;}
.ant-tag-green-inverse {color: #fff;background: #52c41a;border-color: #52c41a;}
.ant-tag-blue {color: #1890ff;background: #e6f7ff;border-color: #91d5ff;}
.ant-tag-blue-inverse {color: #fff;background: #1890ff;border-color: #1890ff;}
-.ant-tag-geekblue {color: #2f54eb;background: color(~`colorPalette("@{heading-color}", 1)`);border-color: #adc6ff;}
+.ant-tag-geekblue {color: #2f54eb;background: #f0f5ff;border-color: #adc6ff;}
.ant-tag-geekblue-inverse {color: #fff;background: #2f54eb;border-color: #2f54eb;}
.ant-tag-purple {color: #722ed1;background: #f9f0ff;border-color: #d3adf7;}
.ant-tag-purple-inverse {color: #fff;background: #722ed1;border-color: #722ed1;}
diff --git a/src/api/http/http-api.js b/src/api/http/http-api.js
index 23d1a0c..8cb84cf 100644
--- a/src/api/http/http-api.js
+++ b/src/api/http/http-api.js
@@ -208,6 +208,12 @@ export default {
name: '盘点历史',
method: 'POST'
},
+
+ KuKouControllerlist: {
+ url: '/KuKouController/list',
+ name: '站台盘点历史',
+ method: 'POST'
+ },
stockLog: {
url: '/stockLog',
name: '库存历史',
diff --git a/src/router/index.js b/src/router/index.js
index 09504a8..d1b32bb 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -90,7 +90,7 @@ const routes = [{
name: 'platformCheckManage',
meta: {
icon: 'form',
- name: '站点盘点',
+ name: '站台盘点',
},
component: () => import('@/views/platformCheck/index'),
},
@@ -99,7 +99,7 @@ const routes = [{
name: 'platformCheckManageOld',
meta: {
icon: 'form',
- name: '站点盘点历史',
+ name: '站台盘点历史',
},
component: () => import('@/views/platformCheck/old/index'),
},
diff --git a/src/views/platformCheck/index.vue b/src/views/platformCheck/index.vue
index 6444f89..b1c2992 100644
--- a/src/views/platformCheck/index.vue
+++ b/src/views/platformCheck/index.vue
@@ -4,99 +4,43 @@
+
-
- {{street.name}}-{{realCheck.direction == ''?'左右':(realCheck.direction == 1?"左":"右")}}-{{realCheck.side == ''?'深浅':(realCheck.side == 1?"浅":"深")}}-{{realCheck.row}}层-{{realCheck.column}}列
+ 核对状态:{{realCheck.flag == 1?"盘点正确":"盘点异常"}}
-
- 核对状态:{{realCheck.status == 1?"盘点正确":"盘点异常"}}
+ 系统条码:{{realCheck.code}}
-
- 系统条码:{{realCheck.WMSCode}}
-
-
- -
-
- 盘点结果条码:{{realCheck.checkCode}}
-
-
- -
-
- 系统品规:
+ 系统品规:{{realCheck.categoryName}}
-
- 盘点结果品规:
-
-
- -
-
- 系统数量:{{realCheck.WMSCount}}
-
-
- -
-
- 盘点结果数量:{{realCheck.checkCode}}
+ 盘点结果数量:{{realCheck.count}}
-
- 盘点时间:{{realCheck.time}}
+ 盘点时间:{{realCheck.createTime}}
-
+
- 顶部图片1
-
-
-
-
-
- 顶部图片2
-
+
-
-
-
-
- 侧面图片1
-
-
-
-
-
- 侧面图片2
-
-
-
-
-
-
-
-
- 侧面图片3
-
-
-
-
-
- 侧面图片4
-
-
-
-
@@ -186,16 +130,16 @@ export default {
},
handleChange(value) {
- this.street = value
+ //this.street = value
console.log("street:"+this.street);
this.getRealTimeCheck();
},
getRealTimeCheck(){
- console.log("SRMNUmber:"+this.SRMNumber);
- this.$axios.get('/clientTest/realtimeCheck', {
- params: {SRMNumber:this.SRMNumber}
+ //console.log("SRMNUmber:"+this.SRMNumber);
+ this.$axios.get('/KuKouController/latest', {
+ params: {}
}).then(res => {
if (res.code == 200) {
if(res.data != null){
diff --git a/src/views/platformCheck/old/index.vue b/src/views/platformCheck/old/index.vue
index c707256..a41aab5 100644
--- a/src/views/platformCheck/old/index.vue
+++ b/src/views/platformCheck/old/index.vue
@@ -1,89 +1,6 @@
-
+
-
- {{ text }}
-
-
- {{ text.direction == 1 ?"左":"右"}}-{{ text.side == 1 ?"浅":"深"}}-{{ text.row}}-{{ text.column}}
-
+
- {{ statusMap[text.status] }}
+ {{realCheck.flag == 1?"盘点正确":"盘点异常"}}
-
+
+
+
@@ -147,25 +62,18 @@ export default {
},
imgUrl: imgUrl,
columns: [
+
{
- title: "盘点批次号",
- dataIndex: "lotnum",
- },
- {
- title: "货位({左右}-{深浅}-{行}-{列})",
- scopedSlots: {customRender: 'goodsLocation'},
- },
- {
- title: "系统托盘条码号",
- dataIndex: "wmsTrayCode",
+ title: "条码",
+ dataIndex: "code",
},
{
- title: "扫描托盘条码号",
- dataIndex: "trayCode",
+ title: "品规",
+ dataIndex: "categoryName",
},
{
- title: "盘点状态",
- scopedSlots: {customRender: 'status'},
+ title: "数量",
+ dataIndex: "count",
},
{
title: "照片",
@@ -181,7 +89,7 @@ export default {
}
},
mounted() {
- this.getStreetList();
+ //this.getStreetList();
this.handleSearch();
},
methods: {
@@ -249,7 +157,7 @@ export default {
this.request();
},
request() {
- this.$api.httpApi.checkLog({
+ this.$api.httpApi.KuKouControllerlist({
data: {
pageNum: this.pageNum,
pageSize: this.pageSize,