From c0f69dde93c782f61075977e8089a14b8195caeb Mon Sep 17 00:00:00 2001 From: yiming Date: Fri, 12 Aug 2022 13:46:14 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8E=BB=E6=8E=89=E8=B4=A7=E6=9E=B6=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/antd_color.less | 2 +- src/views/checkManage/Subsection.vue | 65 ++++++------- src/views/checkManage/checkOperation.vue | 115 +---------------------- src/views/checkManage/index.vue | 88 +++++------------ src/views/historyCheck/index.vue | 56 +++++------ src/views/roadwayManage/model.vue | 46 +-------- src/views/stockLog/Subsection.vue | 24 ++--- src/views/stockLog/index.vue | 90 +++++++++--------- src/views/stockLog/logPage.vue | 13 ++- 9 files changed, 154 insertions(+), 345 deletions(-) diff --git a/public/antd_color.less b/public/antd_color.less index b746b9c..4524b4e 100644 --- a/public/antd_color.less +++ b/public/antd_color.less @@ -1397,7 +1397,7 @@ tr.ant-table-expanded-row:hover {background: #fbfbfb;} .ant-tag-blue-inverse {color: #fff;background: #1890ff;border-color: #1890ff;} .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 {color: #722ed1;background: color(~`colorPalette("@{text-color}", 1)`);border-color: #d3adf7;} .ant-tag-purple-inverse {color: #fff;background: #722ed1;border-color: #722ed1;} .ant-time-picker-panel {color: @text-color;} .ant-time-picker-panel-inner {background-color: #fff;background-clip: padding-box;border-radius: 4px;box-shadow: 0 2px 8px rgba(0, 0, 0, 0.15);} diff --git a/src/views/checkManage/Subsection.vue b/src/views/checkManage/Subsection.vue index 552a41d..2e8dc8f 100644 --- a/src/views/checkManage/Subsection.vue +++ b/src/views/checkManage/Subsection.vue @@ -28,7 +28,7 @@ {{ random.row[0] + random.row[1] - rowIndex - 1}}-{{column}} @@ -90,37 +90,33 @@ export default { } } }, - shelveId: { - type: String, - default: () => { - return {} - } - }, - streetId: { + direction: { type: Number, default: () => { return {} } }, - streetName: { - type: String, + side: { + type: Number, default: () => { return {} } }, - type: { - type: String, + + streetId: { + type: Number, default: () => { return {} } }, - inOut: { + streetName: { type: String, default: () => { return {} } }, + }, computed: { // 应有的格子数 @@ -138,15 +134,20 @@ export default { column: this.getRandomColumn(this.select.column), } }, - watchShelveIdInfo(){ - return this.shelveId; - }, + watchDirection(){ + return this.direction; + }, + watchSide(){ + return this.side; + }, }, watch: { - watchShelveIdInfo() { + watchDirection() { + this.getStatus(); + }, + watchSide() { this.getStatus(); }, - immediate: true, }, @@ -215,25 +216,23 @@ export default { }, getStatusBg(row,column,status) { - var dom = document.getElementById(this.shelveId+"-"+row+'-'+column); + var dom = document.getElementById(this.direction+"-"+this.side+"-"+row+'-'+column); var color = status == 1 ?'#d81e06': (status == 2|| status == 3) ? '#1afa29': '#bfbfbf'; dom.style.background = color }, - getStatusTab(tab,status,rowColumn){ - var dom = document.getElementById(this.shelveId+'-'+rowColumn+'-'+tab); - console.log(dom) - console.log(this.shelveId+'-'+rowColumn+'-'+tab) - dom.style.type ="close-circle" + // getStatusTab(tab,status,rowColumn){ + // var dom = document.getElementById(this.shelveId+'-'+rowColumn+'-'+tab); + // console.log(dom) + // console.log(this.shelveId+'-'+rowColumn+'-'+tab) + // dom.style.type ="close-circle" - var color = status == 1 ?'#d81e06': status == 2 ? '#1afa29': '#bfbfbf'; - dom.style.color = color - console.log(dom) - }, + // var color = status == 1 ?'#d81e06': status == 2 ? '#1afa29': '#bfbfbf'; + // dom.style.color = color + // console.log(dom) + // }, getStatus(){ - if(JSON.stringify(this.shelveId) == "{}"){ - return; - } + var columnTab = [] for(let c = 1; c <= this.latticeColumn ;c++){ let tab = this.getRandom(c,this.latticeColumn,this.nums.column,this.total.column) @@ -250,7 +249,9 @@ export default { columnEnd: this.random.column[1], rowStart: this.random.row[0], rowEnd: this.random.row[1], - shelveId: this.shelveId, + streetId: this.streetId, + direction: this.direction, + side: this.side, rowTabs: rowTab, columnTabs: columnTab } diff --git a/src/views/checkManage/checkOperation.vue b/src/views/checkManage/checkOperation.vue index 73d07e9..aaf06bc 100644 --- a/src/views/checkManage/checkOperation.vue +++ b/src/views/checkManage/checkOperation.vue @@ -162,12 +162,14 @@ export default { created() { this.imgUrl = imgUrl console.log(this.$route.query.id) - this.getStreetList(); + //this.getStreetList(); if (this.$route.query.row && this.$route.query.column && this.$route.query.shelveId && this.$route.query.id && this.$route.query.name) { this.id = this.$route.query.id this.row = this.$route.query.row this.column = this.$route.query.column - this.shelveId = this.$route.query.shelveId + this.direction = this.$route.query.direction + this.side = this.$route.query.side + this.streetId = this.$route.query.streetId this.selectName = this.$route.query.name this.selectType = this.$route.query.type this.selectType2 = this.$route.query.type2 @@ -184,35 +186,6 @@ export default { Model }, methods: { - - //获取巷道列表 - getStreetList() { - this.$api.httpApi.getStreetList({ - data: { - pageNum: 1, - pageSize: 50, - } - }).then(res => { - this.listData = res.data.list; - this.select = this.id - this.getStreetDetail(this.id) - //this.getStockInfo(this.row,this.column,this.id) - //this.getStockList(this.id) - }).catch(err => { - console.error(err); - }); - }, - //获取巷道详情 - getStreetDetail(id) { - this.$axios.get('/street/' + id, { - data: {} - }).then(res => { - this.streetDetail = res.data - this.getRowColumnCounts() - }).catch(err => { - - }) - }, //获取总行列数 getRowColumnCounts(){ @@ -272,86 +245,6 @@ export default { } this.getStockInfo(1, 1, this.shelveId) }, - // 左右货架切换 需要更新行列数 - handleTypeChange(value) { - this.selectType = value - this.updateShleveAndRowColumnCount(value) - this.row = 1 - this.column = 1 - this.getStockInfo(this.row, this.column, this.shelveId) - - }, - //根据streetDetail更新货架及该货架的总行列数 - //direction : left right - updateShleveAndRowColumnCount(direction){ - if (direction == 'left') { - this.rowCount = this.streetDetail.leftRow - this.columnCount = this.streetDetail.leftColumn - if(this.streetDetail.leftType == 0){ - this.shelveId = this.streetDetail.leftShelveId - this.selectType2 = '' - }else{ - if(this.selectType2 == 'inside'){ - this.shelveId = this.streetDetail.leftInsideShelveId - }else if(this.selectType2 == 'outside'){ - this.shelveId = this.streetDetail.leftOutsideShelveId - }else{ - this.selectType2 = 'inside' - this.shelveId = this.streetDetail.leftInsideShelveId - } - } - - } else if (direction == 'right') { - this.rowCount = this.streetDetail.rightRow - this.columnCount = this.streetDetail.rightColumn - if(this.streetDetail.rightType == 0){ - this.shelveId = this.streetDetail.rightShelveId - this.selectType2 = '' - }else{ - if(this.selectType2 == 'inside'){ - this.shelveId = this.streetDetail.rightInsideShelveId - }else if(this.selectType2 == 'outside'){ - this.shelveId = this.streetDetail.rightOutsideShelveId - }else{ - this.selectType2 = 'inside' - this.shelveId = this.streetDetail.rightInsideShelveId - } - } - } - - }, - //内外货架切换 - sideStreetChange(value) { - - this.selectType2 = value - if (this.selectType == 'left' && value == 'none') { - this.shelveId = this.streetDetail.leftShelveId - this.rowCount = this.streetDetail.leftRow - this.columnCount = this.streetDetail.leftColumn - } else if (this.selectType == 'right' && value == 'none') { - this.rowCount = this.streetDetail.rightRow - this.columnCount = this.streetDetail.rightColumn - this.shelveId = this.streetDetail.rightShelveId - } else if (this.selectType == 'left' && value == 'inside') { - this.rowCount = this.streetDetail.leftRow - this.columnCount = this.streetDetail.leftColumn - this.shelveId = this.streetDetail.leftInsideShelveId - } else if (this.selectType == 'left' && value == 'out') { - this.rowCount = this.streetDetail.leftRow - this.columnCount = this.streetDetail.leftColumn - this.shelveId = this.streetDetail.leftOutsideShelveId - } else if (this.selectType == 'right' && value == 'inside') { - this.rowCount = this.streetDetail.rightRow - this.columnCount = this.streetDetail.rightColumn - this.shelveId = this.streetDetail.rightInsideShelveId - } else if (this.selectType == 'right' && value == 'out') { - this.rowCount = this.streetDetail.rightRow - this.columnCount = this.streetDetail.rightColumn - this.shelveId = this.streetDetail.rightOutsideShelveId - } - this.getStockInfo(this.row, this.column, this.shelveId) - - }, prev() { if(this.column > 1){ this.column = this.column - 1 diff --git a/src/views/checkManage/index.vue b/src/views/checkManage/index.vue index a960556..2a0e7a4 100644 --- a/src/views/checkManage/index.vue +++ b/src/views/checkManage/index.vue @@ -36,23 +36,24 @@
- 左货架号: {{leftShelveId.shelveId}} + 左侧货架 - - - 外 + + + 浅侧货架 - - 内 + + 深侧货架 +
- +
@@ -60,24 +61,26 @@
- 右货架号: {{rightShelveId.shelveId}} + 右侧货架 - - - 外 + + + + 浅侧货架 - - 内 + + 深测货架 +
- +
@@ -88,20 +91,12 @@ export default { name:'checkManage', data() { return { - size: 'leftOutsideShelveId', - size2: 'rightOutsideShelveId', + leftSide: 1, + rightSide: 1, data: [], select: '', streetId: 0, streetDetail: {}, - checkList: [], - stockInfo: { - left: {}, - right: {} - }, - - leftShelveId:{}, - rightShelveId:{} } }, computed: { @@ -143,43 +138,6 @@ export default { }); }, - // 获取盘点状态 - async getStockRowColumn() { - this.rightShelveChange(); - this.leftShelveChange(); - - }, - rightShelveChange() { - let shelveId; - let shelveType = 'none'; - if(this.streetDetail.rightShelveId) { - shelveId = this.streetDetail.rightShelveId; - }else if(this.streetDetail.rightInsideShelveId && this.size2 =='rightInsideShelveId'){ - shelveId = this.streetDetail.rightInsideShelveId; - shelveType = 'inside'; - }else if(this.streetDetail.rightOutsideShelveId && this.size2 == 'rightOutsideShelveId'){ - shelveId = this.streetDetail.rightOutsideShelveId; - shelveType = 'out'; - }; - this.rightShelveId.shelveId = shelveId; - this.rightShelveId.shelveType = shelveType; - - }, - leftShelveChange() { - let shelveId; - let shelveType = 'none'; - if(this.streetDetail.leftShelveId) { - shelveId = this.streetDetail.leftShelveId; - }else if(this.streetDetail.leftInsideShelveId && this.size =='leftInsideShelveId'){ - shelveId = this.streetDetail.leftInsideShelveId; - shelveType = 'inside'; - }else if(this.streetDetail.leftOutsideShelveId && this.size== 'leftOutsideShelveId'){ - shelveId = this.streetDetail.leftOutsideShelveId; - shelveType = 'out'; - }; - this.leftShelveId.shelveId = shelveId; - this.leftShelveId.shelveType = shelveType; - }, getStatus(data, rowCol) { return (data[rowCol] || {}).status; }, @@ -194,7 +152,7 @@ export default { data: {} }).then(res => { this.streetDetail = res.data - this.getStockRowColumn() + //this.getStockRowColumn() }).catch(err => { }) @@ -205,8 +163,6 @@ export default { this.select = value this.getStreetDetail(value) - this.leftShelveChange(); - this.rightShelveChange(); }, tocheckOperation(checkObj, item) { console.log(checkObj) diff --git a/src/views/historyCheck/index.vue b/src/views/historyCheck/index.vue index 372dfee..c707256 100644 --- a/src/views/historyCheck/index.vue +++ b/src/views/historyCheck/index.vue @@ -5,7 +5,7 @@ - + {{i.name}} @@ -14,15 +14,15 @@ - - - + + + 未选择 - + 左侧 - + 右侧 @@ -30,16 +30,16 @@ - - - + + + 未选择 - - 内 + + 浅 - - 外 + + 深 @@ -49,17 +49,17 @@ - + - + - + @@ -96,7 +96,7 @@ {{ text }} - {{ text.shelveId}}-{{ text.row}}-{{ text.column}} + {{ text.direction == 1 ?"左":"右"}}-{{ text.side == 1 ?"浅":"深"}}-{{ text.row}}-{{ text.column}} {{ statusMap[text.status] }} @@ -127,16 +127,15 @@ export default { statusMap: {0:"未盘点",1:"盘点异常",2:"核对正确",3:"人工核对正确"}, queryParam: { lotnum: '', - shelveId:'', - side : "-1", - leftRight : "0" + side : -1, + leftRight : -1 }, listData:[], time:[], pageNum: 1, pageSize: 10, data: [], - shelveId: '', + select: '', pagination:{ total: 0, @@ -153,8 +152,7 @@ export default { dataIndex: "lotnum", }, { - title: "货位({货架}-{行}-{列})", - // dataIndex: "goodsLocation", + title: "货位({左右}-{深浅}-{行}-{列})", scopedSlots: {customRender: 'goodsLocation'}, }, { @@ -211,8 +209,8 @@ export default { }, handleChange(value) { this.getStreetDetail(value) - this.queryParam.leftRight = "0" - this.queryParam.side = "-1" + this.queryParam.leftRight = -1 + this.queryParam.side = -1 }, // 左右货架切换 @@ -235,10 +233,6 @@ export default { this.queryParam.side = -1 } }, - // 里外切换 - sideStreetChange(value) { - this.queryParam.side = value - }, handleSearch() { console.log(this.queryParam) this.pageNum = 1 @@ -291,8 +285,8 @@ export default { this.queryParam.startTimestamp = "" this.queryParam.endTimestamp = "" this.queryParam.lotnum = "" - this.queryParam.side = "-1" - this.queryParam.leftRight = "0" + this.queryParam.side = -1 + this.queryParam.leftRight = -1 this.queryParam.streetId = 0 this.select = null; diff --git a/src/views/roadwayManage/model.vue b/src/views/roadwayManage/model.vue index 24b667c..b8d4c05 100644 --- a/src/views/roadwayManage/model.vue +++ b/src/views/roadwayManage/model.vue @@ -99,25 +99,6 @@ -
- - - -
-
- - - - - - -
-
- - - -
-
- - - - - - -
- + + + + {{ random.row[0] + random.row[1] - rowIndex - 1}}-{{column}} @@ -83,31 +83,27 @@ export default { } } }, - shelveId: { - type: String, - default: () => { - return {} - } - }, - streetId: { + //左右 + direction:{ type: Number, default: () => { return {} } }, - streetName: { - type: String, + //深浅 + side:{ + type: Number, default: () => { return {} } }, - type: { - type: String, + streetId: { + type: Number, default: () => { return {} } }, - inOut: { + streetName: { type: String, default: () => { return {} @@ -187,7 +183,7 @@ export default { toStockPage(row,column){ this.$router.push({ name: 'stockLogDetail', - query: {row: row, column: column, shelveId: this.shelveId} + query: {row: row, column: column, direction: this.direction,side:this.side,streetId:this.streetId} }) } } diff --git a/src/views/stockLog/index.vue b/src/views/stockLog/index.vue index aae7143..01bdfdc 100644 --- a/src/views/stockLog/index.vue +++ b/src/views/stockLog/index.vue @@ -13,23 +13,24 @@
- 右货架 + 左侧货架 - - - 外 + + + 浅货架 - - 内 + + 深货架 +
- +
@@ -37,24 +38,25 @@
- 左货架 + 右侧货架 - - - 外 + + + 浅货架 - - 内 + + 深货架 +
- +
@@ -65,8 +67,8 @@ export default { name:'checkManage', data() { return { - size: 'leftOutsideShelveId', - size2: 'rightOutsideShelveId', + leftSide: 1, + rightSide: 1, data: [], select: '', streetId: 0, @@ -126,35 +128,35 @@ export default { }, rightShelveChange() { - let shelveId; - let shelveType = 'none'; - if(this.streetDetail.rightShelveId) { - shelveId = this.streetDetail.rightShelveId; - }else if(this.streetDetail.rightInsideShelveId && this.size2 =='rightInsideShelveId'){ - shelveId = this.streetDetail.rightInsideShelveId; - shelveType = 'inside'; - }else if(this.streetDetail.rightOutsideShelveId && this.size2 == 'rightOutsideShelveId'){ - shelveId = this.streetDetail.rightOutsideShelveId; - shelveType = 'out'; - }; - this.rightShelveId.shelveId = shelveId; - this.rightShelveId.shelveType = shelveType; + // let shelveId; + // let shelveType = 'none'; + // if(this.streetDetail.rightShelveId) { + // shelveId = this.streetDetail.rightShelveId; + // }else if(this.streetDetail.rightInsideShelveId && this.size2 =='rightInsideShelveId'){ + // shelveId = this.streetDetail.rightInsideShelveId; + // shelveType = 'inside'; + // }else if(this.streetDetail.rightOutsideShelveId && this.size2 == 'rightOutsideShelveId'){ + // shelveId = this.streetDetail.rightOutsideShelveId; + // shelveType = 'out'; + // }; + // this.rightShelveId.shelveId = shelveId; + // this.rightShelveId.shelveType = shelveType; }, leftShelveChange() { - let shelveId; - let shelveType = 'none'; - if(this.streetDetail.leftShelveId) { - shelveId = this.streetDetail.leftShelveId; - }else if(this.streetDetail.leftInsideShelveId && this.size =='leftInsideShelveId'){ - shelveId = this.streetDetail.leftInsideShelveId; - shelveType = 'inside'; - }else if(this.streetDetail.leftOutsideShelveId && this.size== 'leftOutsideShelveId'){ - shelveId = this.streetDetail.leftOutsideShelveId; - shelveType = 'out'; - }; - this.leftShelveId.shelveId = shelveId; - this.leftShelveId.shelveType = shelveType; + // let shelveId; + // let shelveType = 'none'; + // if(this.streetDetail.leftShelveId) { + // shelveId = this.streetDetail.leftShelveId; + // }else if(this.streetDetail.leftInsideShelveId && this.size =='leftInsideShelveId'){ + // shelveId = this.streetDetail.leftInsideShelveId; + // shelveType = 'inside'; + // }else if(this.streetDetail.leftOutsideShelveId && this.size== 'leftOutsideShelveId'){ + // shelveId = this.streetDetail.leftOutsideShelveId; + // shelveType = 'out'; + // }; + // this.leftShelveId.shelveId = shelveId; + // this.leftShelveId.shelveType = shelveType; }, //获取巷道详情 diff --git a/src/views/stockLog/logPage.vue b/src/views/stockLog/logPage.vue index 32a900f..f711cfd 100644 --- a/src/views/stockLog/logPage.vue +++ b/src/views/stockLog/logPage.vue @@ -75,7 +75,8 @@ export default { }, row: 0, column: 0, - shelveId: '', + direction:0, + side:0, columns, statusMap: {0:"未知",1:"取货到位",2:"取货完成",3:"放货到位",4:"放货完成"}, @@ -93,11 +94,13 @@ export default { }, created() { this.imgUrl = imgUrl - if (this.$route.query.row && this.$route.query.column && this.$route.query.shelveId ) { + if (this.$route.query.row && this.$route.query.column && this.$route.query.side && this.$route.query.direction && this.$route.query.streetId) { this.row = this.$route.query.row this.column = this.$route.query.column - this.shelveId = this.$route.query.shelveId + this.side = this.$route.query.side + this.direction = this.$route.query.direction + this.streetId = this.$route.query.streetId } }, mounted() { @@ -125,7 +128,9 @@ export default { pageSize:this.pageSize, row:this.row, column:this.column, - shelveId:this.shelveId + side:this.side, + direction:this.direction, + streetId:this.streetId } }).then(res => { const pagination = { ...this.pagination };