去掉货架号

merge-requests/7/head
yiming 4 years ago
parent 65d123c406
commit c0f69dde93

@ -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);}

@ -28,7 +28,7 @@
<!--渲染默认巷道框架规格 定位浮在 已有巷道上做对应-->
<span
class="default"
:id="`${shelveId}-${random.row[0] + random.row[1] - rowIndex - 1}-${column}`"
:id="`${direction}-${side}-${random.row[0] + random.row[1] - rowIndex - 1}-${column}`"
@click="tocheckPage(random.row[0] + random.row[1] - rowIndex - 1,column)">
{{ random.row[0] + random.row[1] - rowIndex - 1}}-{{column}}
</span>
@ -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
}

@ -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

@ -36,23 +36,24 @@
<!--左货架DOM-->
<div class="center-box">
<span class="shelf-number">
货架: {{leftShelveId.shelveId}}
货架
</span>
<a-radio-group v-model="size" style="margin:10px 0" @change="getStockRowColumn"
v-if="streetDetail.leftInsideShelveId && streetDetail.leftOutsideShelveId">
<a-radio-button value="leftOutsideShelveId">
<a-radio-group v-model="leftSide" style="margin:10px 0"
v-if="streetDetail.leftType == 1">
<a-radio-button :value=1>
浅侧货架
</a-radio-button>
<a-radio-button value="leftInsideShelveId">
<a-radio-button :value=2>
深侧货架
</a-radio-button>
</a-radio-group>
</div>
<div class="check-content" v-for="item in data" :key="item.id">
<subsection v-if="item.id == select" :total="{row: item.leftRow, column: item.leftColumn}" :shelveId="leftShelveId.shelveId" :streetId="item.id" :streetName="item.name" type="left" :inOut="leftShelveId.shelveType" >
<subsection v-if="item.id == select" :total="{row: item.leftRow, column: item.leftColumn}" :side="leftSide" :direction=1 :streetId="item.id" :streetName="item.name">
</subsection>
</div>
@ -60,24 +61,26 @@
<!--单伸类型右货架DOM-->
<div class="center-box">
<span class="shelf-number">
货架: {{rightShelveId.shelveId}}
货架
</span>
<a-radio-group v-model="size2" style="margin:10px 0" @change="getStockRowColumn"
v-if="streetDetail.rightInsideShelveId && streetDetail.rightOutsideShelveId">
<a-radio-button value="rightOutsideShelveId">
<a-radio-group v-model="rightSide" style="margin:10px 0"
v-if="streetDetail.rightType == 1">
<a-radio-button :value=1>
浅侧货架
</a-radio-button>
<a-radio-button value="rightInsideShelveId">
<a-radio-button :value=2>
深测货架
</a-radio-button>
</a-radio-group>
</div>
<div class="check-content" v-for="item in data" :key="item.name">
<subsection v-if="item.id == select" :total="{row:item.rightRow, column: item.rightColumn}" :shelveId="rightShelveId.shelveId" :streetId="item.id" :streetName="item.name" type="right" :inOut="rightShelveId.shelveType">
<subsection v-if="item.id == select" :total="{row:item.rightRow, column: item.rightColumn}" :side="rightSide" :direction=2 :streetId="item.id" :streetName="item.name">
</subsection>
</div>
</div>
@ -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)

@ -5,7 +5,7 @@
<a-row :gutter="24">
<a-col :span="4">
<a-form-item label="巷道">
<a-select @change="handleChange" :value="select" style="width:250px">
<a-select @change="handleChange" :value="select" style="width:100px">
<a-select-option v-for="i in listData" :key="i.name" :value="i.id">
{{i.name}}
</a-select-option>
@ -14,15 +14,15 @@
</a-col>
<a-col :span="2">
<a-form-item label="左右货架">
<a-select @change="leftRightChange" style="width: 80px" v-model="queryParam.leftRight">
<a-select-option value="0">
<a-form-item label="左右">
<a-select v-model="queryParam.leftRight" @change="leftRightChange" >
<a-select-option :value=-1>
未选择
</a-select-option>
<a-select-option value="1">
<a-select-option :value=1>
左侧
</a-select-option>
<a-select-option value="2">
<a-select-option :value=2>
右侧
</a-select-option>
</a-select>
@ -30,16 +30,16 @@
</a-col>
<a-col :span="2">
<a-form-item label="内外货架" v-if="queryParam.side >= 0">
<a-select style="width: 80px" :key="queryParam.side" >
<a-select-option key="0">
<a-form-item label="深浅" v-if="queryParam.side >= 0">
<a-select style="width: 50px" :key="queryParam.side" >
<a-select-option :key=-1>
未选择
</a-select-option>
<a-select-option key="1">
<a-select-option :key=1>
</a-select-option>
<a-select-option key="2">
<a-select-option :key=2>
</a-select-option>
</a-select>
@ -49,17 +49,17 @@
</a-col>
<a-col :span="2" style="text-align: left">
<a-form-item label="行号">
<a-input v-model="queryParam.row" placeholder="请输入" style="width:70px;" type="number"/>
<a-input v-model="queryParam.row" placeholder="请输入" style="width:50px;" type="number"/>
</a-form-item>
</a-col>
<a-col :span="2" style="text-align: left">
<a-form-item label="列号">
<a-input v-model="queryParam.column" placeholder="请输入" style="width:70px;" type="number"/>
<a-input v-model="queryParam.column" placeholder="请输入" style="width:50px;" type="number"/>
</a-form-item>
</a-col>
<a-col :span="4" style="text-align: left">
<a-form-item label="盘点号">
<a-input v-model="queryParam.lotnum" placeholder="请输入" style="width:270px;"/>
<a-input v-model="queryParam.lotnum" placeholder="请输入" />
</a-form-item>
</a-col>
<a-col :span="4">
@ -96,7 +96,7 @@
{{ text }}
</span>
<span slot="goodsLocation" slot-scope="text">
{{ text.shelveId}}-{{ text.row}}-{{ text.column}}
{{ text.direction == 1 ?"左":"右"}}-{{ text.side == 1 ?"浅":"深"}}-{{ text.row}}-{{ text.column}}
</span>
<span slot="status" slot-scope="text">
{{ 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;

@ -99,25 +99,6 @@
</a-form-item>
</div>
<div class="across-layout" v-if="leftType =='0'">
<a-form-item label="货架号" :label-col="formItemAcrossLayout.labelCol">
<a-input
v-decorator="['leftShelveId', { rules: [{ required: true, message: '请输入货架号!' }] }]"
/>
</a-form-item>
</div>
<div class="across-layout" v-if="leftType =='1'">
<a-form-item label="浅货架号" :label-col="formItemAcrossLayout.labelCol">
<a-input
v-decorator="['leftInsideShelveId', { rules: [{ required: true, message: '请输入内货架号!' }] }]"
/>
</a-form-item>
<a-form-item label="深货架号" :label-col="formItemAcrossLayout.labelCol">
<a-input
v-decorator="['leftOutsideShelveId', { rules: [{ required: true, message: '请输入外货架号!' }] }]"
/>
</a-form-item>
</div>
<div class="across-layout">
<a-form-item label="扫码枪IP" :label-col="formItemAcrossLayout.labelCol">
<a-input
@ -166,25 +147,6 @@
/>
</a-form-item>
</div>
<div class="across-layout" v-if="rightType =='0'">
<a-form-item label="货架号" :label-col="formItemAcrossLayout.labelCol">
<a-input
v-decorator="['rightShelveId', { rules: [{ required: true, message: '请输入货架号!' }] }]"
/>
</a-form-item>
</div>
<div class="across-layout" v-if="rightType =='1'">
<a-form-item label="浅货架号" :label-col="formItemAcrossLayout.labelCol">
<a-input
v-decorator="['rightInsideShelveId', { rules: [{ required: true, message: '请输入内货架号!' }] }]"
/>
</a-form-item>
<a-form-item label="深货架号" :label-col="formItemAcrossLayout.labelCol">
<a-input
v-decorator="['rightOutsideShelveId', { rules: [{ required: true, message: '请输入外货架号!' }] }]"
/>
</a-form-item>
</div>
<div class="across-layout">
<a-form-item label="扫码枪IP" :label-col="formItemAcrossLayout.labelCol">
<a-input
@ -200,7 +162,7 @@
<a-divider></a-divider>
</div>
<div v-if="cameraList.length>0">
<a-form-item label="球机1" :label-col="formItemVerticalLayout.labelCol">
<a-form-item label="左侧球机" :label-col="formItemVerticalLayout.labelCol">
<a-select
v-decorator="[
'camera1Id',
@ -213,7 +175,7 @@
</a-select-option>
</a-select>
</a-form-item>
<a-form-item label="球机2" :label-col="formItemVerticalLayout.labelCol">
<a-form-item label="右侧球机" :label-col="formItemVerticalLayout.labelCol">
<a-select
v-decorator="[
'camera2Id',
@ -227,7 +189,7 @@
</a-form-item>
</div>
<div v-else>
<a-form-item label="球机1" :label-col="formItemVerticalLayout.labelCol">
<a-form-item label="左侧球机" :label-col="formItemVerticalLayout.labelCol">
<a-select
v-decorator="[
'camera1Name',
@ -240,7 +202,7 @@
</a-select-option>
</a-select>
</a-form-item>
<a-form-item label="球机2" :label-col="formItemVerticalLayout.labelCol">
<a-form-item label="右侧球机" :label-col="formItemVerticalLayout.labelCol">
<a-select
v-decorator="[
'camera2Name',

@ -25,7 +25,7 @@
<!--渲染默认巷道框架规格 定位浮在 已有巷道上做对应-->
<span style="background:#bfbfbf;"
class="default"
:id="`${shelveId}-${random.row[0] + random.row[1] - rowIndex - 1}-${column}`"
:id="`${direction}-${side}-${random.row[0] + random.row[1] - rowIndex - 1}-${column}`"
@click="toStockPage(random.row[0] + random.row[1] - rowIndex - 1,column)">
{{ random.row[0] + random.row[1] - rowIndex - 1}}-{{column}}
</span>
@ -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}
})
}
}

@ -13,23 +13,24 @@
<!--左货架DOM-->
<div class="center-box">
<span class="shelf-number">
货架
左侧货架
</span>
<a-radio-group v-model="size" style="margin:10px 0" @change="getStockRowColumn"
v-if="streetDetail.leftInsideShelveId && streetDetail.leftOutsideShelveId">
<a-radio-button value="leftOutsideShelveId">
<a-radio-group v-model="leftSide" style="margin:10px 0" @change="getStockRowColumn"
v-if="streetDetail.leftType==1">
<a-radio-button :value=1>
浅货架
</a-radio-button>
<a-radio-button value="leftInsideShelveId">
<a-radio-button :value=2>
深货架
</a-radio-button>
</a-radio-group>
</div>
<div class="check-content" v-for="item in data" :key="item.id">
<subsection v-if="item.id == select" :total="{row: item.leftRow, column: item.leftColumn}" :shelveId="leftShelveId.shelveId" :streetId="item.id" :streetName="item.name" type="left" :inOut="leftShelveId.shelveType" >
<subsection v-if="item.id == select" :total="{row: item.leftRow, column: item.leftColumn}" :direction=1 :side="leftSide" :streetId="item.id" :streetName="item.name">
</subsection>
</div>
@ -37,24 +38,25 @@
<!--单伸类型右货架DOM-->
<div class="center-box">
<span class="shelf-number">
货架
右侧货架
</span>
<a-radio-group v-model="size2" style="margin:10px 0" @change="getStockRowColumn"
v-if="streetDetail.rightInsideShelveId && streetDetail.rightOutsideShelveId">
<a-radio-button value="rightOutsideShelveId">
<a-radio-group v-model="rightSide" style="margin:10px 0" @change="getStockRowColumn"
v-if="streetDetail.rightType==1">
<a-radio-button :value=1>
浅货架
</a-radio-button>
<a-radio-button value="rightInsideShelveId">
<a-radio-button :value=2>
深货架
</a-radio-button>
</a-radio-group>
</div>
<div class="check-content" v-for="item in data" :key="item.name">
<subsection v-if="item.id == select" :total="{row:item.rightRow, column: item.rightColumn}" :shelveId="rightShelveId.shelveId" :streetId="item.id" :streetName="item.name" type="right" :inOut="rightShelveId.shelveType">
<subsection v-if="item.id == select" :total="{row:item.rightRow, column: item.rightColumn}" :direction=2 :side="rightSide" :streetId="item.id" :streetName="item.name" >
</subsection>
</div>
</div>
@ -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;
},
//

@ -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 };

Loading…
Cancel
Save