|
|
|
@ -10,7 +10,6 @@
|
|
|
|
{{i.name}}
|
|
|
|
{{i.name}}
|
|
|
|
</a-select-option>
|
|
|
|
</a-select-option>
|
|
|
|
</a-select>
|
|
|
|
</a-select>
|
|
|
|
|
|
|
|
|
|
|
|
<a-select
|
|
|
|
<a-select
|
|
|
|
@change="handleTypeChange"
|
|
|
|
@change="handleTypeChange"
|
|
|
|
style="width: 160px;margin-right:25px"
|
|
|
|
style="width: 160px;margin-right:25px"
|
|
|
|
@ -35,29 +34,29 @@
|
|
|
|
内
|
|
|
|
内
|
|
|
|
</a-select-option>
|
|
|
|
</a-select-option>
|
|
|
|
</a-select>
|
|
|
|
</a-select>
|
|
|
|
</div>
|
|
|
|
|
|
|
|
<div v-if="checkObj.id">
|
|
|
|
|
|
|
|
<div v-for="(key,value) in checkList" :key="value">
|
|
|
|
|
|
|
|
<div v-if="checkObj.shelveId == value">
|
|
|
|
|
|
|
|
<!--{{value}}{{key}}-->
|
|
|
|
|
|
|
|
<div v-for="(columnItem,index) in key" :key="index"
|
|
|
|
|
|
|
|
style="width:100%;display:flex;align-items:center;justify-content:space-between;flex-direction: column">
|
|
|
|
|
|
|
|
<div class="carousel-page"
|
|
|
|
|
|
|
|
v-if="columnItem.row == checkObj.row && columnItem.column == checkObj.column">
|
|
|
|
|
|
|
|
<p class="carousel-page-title" >
|
|
|
|
|
|
|
|
<span>
|
|
|
|
<span>
|
|
|
|
货架号 : {{ $route.query.shelveId }}
|
|
|
|
货架号 : {{ shelveId }} {{rowCount}} {{columnCount}}
|
|
|
|
</span>
|
|
|
|
</span>
|
|
|
|
<span @click="goHistory(checkObj.orderNum)" style="width: 400px;display: inline-block;cursor: pointer">
|
|
|
|
</div>
|
|
|
|
工单号：{{checkObj.orderNum}}
|
|
|
|
<div>
|
|
|
|
|
|
|
|
<div class="carousel-page"
|
|
|
|
|
|
|
|
>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
<div class="carousel-page-content">
|
|
|
|
|
|
|
|
<div class="img-box">
|
|
|
|
|
|
|
|
<ul>
|
|
|
|
|
|
|
|
<li v-for="item in params" :key="item.label">
|
|
|
|
|
|
|
|
<span class="img-box-title">
|
|
|
|
|
|
|
|
{{ item.label }}:
|
|
|
|
</span>
|
|
|
|
</span>
|
|
|
|
<span @click="goHistory()" style="width: 400px;display: inline-block;cursor: pointer">
|
|
|
|
<span class="img-box-value">
|
|
|
|
工单号：暂无
|
|
|
|
{{ scanAndCheck[item.key] }}
|
|
|
|
</span>
|
|
|
|
</span>
|
|
|
|
</p>
|
|
|
|
</li>
|
|
|
|
<!-- <p class="carousel-page-title" @click="goHistory(checkObj.orderNum)" v-if="checkObj.orderNum">工单号：{{checkObj.orderNum}}</p>-->
|
|
|
|
|
|
|
|
<!-- <p class="carousel-page-title" @click="goHistory()" v-else>工单号：暂无</p>-->
|
|
|
|
</ul>
|
|
|
|
<div class="carousel-page-content">
|
|
|
|
|
|
|
|
|
|
|
|
</div>
|
|
|
|
<div class="img-box">
|
|
|
|
<div class="img-box">
|
|
|
|
<img
|
|
|
|
<img
|
|
|
|
v-if="checkObj.preoperationPic"
|
|
|
|
v-if="checkObj.preoperationPic"
|
|
|
|
@ -84,33 +83,12 @@
|
|
|
|
</div>
|
|
|
|
</div>
|
|
|
|
<p>操作后照片</p>
|
|
|
|
<p>操作后照片</p>
|
|
|
|
</div>
|
|
|
|
</div>
|
|
|
|
<div class="img-box">
|
|
|
|
|
|
|
|
<ul>
|
|
|
|
|
|
|
|
<li v-for="item in params" :key="item.label">
|
|
|
|
|
|
|
|
<span class="img-box-title">
|
|
|
|
|
|
|
|
{{ item.label }}:
|
|
|
|
|
|
|
|
</span>
|
|
|
|
|
|
|
|
<span class="img-box-value">
|
|
|
|
|
|
|
|
{{ scanAndCheck[item.key] }}
|
|
|
|
|
|
|
|
</span>
|
|
|
|
|
|
|
|
</li>
|
|
|
|
|
|
|
|
</ul>
|
|
|
|
|
|
|
|
</div>
|
|
|
|
</div>
|
|
|
|
|
|
|
|
|
|
|
|
</div>
|
|
|
|
</div>
|
|
|
|
<div class="carousel-page-footer">
|
|
|
|
<div class="carousel-page-footer">
|
|
|
|
<div class="info-box">
|
|
|
|
|
|
|
|
<p>系统登记品规：{{checkObj.category}}</p>
|
|
|
|
|
|
|
|
<p>系统登记数量：{{checkObj.count}}</p>
|
|
|
|
|
|
|
|
</div>
|
|
|
|
|
|
|
|
<div class="status" v-if="checkObj.status == 0">
|
|
|
|
|
|
|
|
未核对
|
|
|
|
|
|
|
|
</div>
|
|
|
|
|
|
|
|
<div class="status" v-if="checkObj.status == 1">
|
|
|
|
|
|
|
|
已核对：<span style="color: #d81e06;">核对错误</span>
|
|
|
|
|
|
|
|
</div>
|
|
|
|
|
|
|
|
<div class="status" v-if="checkObj.status == 2">
|
|
|
|
|
|
|
|
已核对：<span style="color: #1afa29;">核对正确</span>
|
|
|
|
|
|
|
|
</div>
|
|
|
|
|
|
|
|
<div class="status-btn" v-if="checkObj.status == 0">
|
|
|
|
<div class="status-btn" v-if="checkObj.status == 0">
|
|
|
|
<a-button class="btn"
|
|
|
|
<a-button class="btn"
|
|
|
|
type="danger"
|
|
|
|
type="danger"
|
|
|
|
@ -138,108 +116,15 @@
|
|
|
|
</a-button>
|
|
|
|
</a-button>
|
|
|
|
</div>
|
|
|
|
</div>
|
|
|
|
</div>
|
|
|
|
</div>
|
|
|
|
</div>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
<div class="bottom-btn"
|
|
|
|
<div class="bottom-btn"
|
|
|
|
v-if="columnItem.row == checkObj.row && columnItem.column == checkObj.column">
|
|
|
|
>
|
|
|
|
<a-button class="btn" @click="prev(index > 0 ? index : 0)">＜上一个</a-button>
|
|
|
|
<a-button class="btn" @click="prev()">＜上一个</a-button>
|
|
|
|
<p>{{checkObj.row}}行{{checkObj.column}}列</p>
|
|
|
|
<p>{{checkObj.row}}行{{checkObj.column}}列</p>
|
|
|
|
<a-button class="btn" @click="next(index<=key.length ? index :index=key.length-1)">下一个＞
|
|
|
|
<a-button class="btn" @click="next()">下一个＞
|
|
|
|
</a-button>
|
|
|
|
|
|
|
|
</div>
|
|
|
|
|
|
|
|
</div>
|
|
|
|
|
|
|
|
</div>
|
|
|
|
|
|
|
|
</div>
|
|
|
|
|
|
|
|
</div>
|
|
|
|
|
|
|
|
<div v-else>
|
|
|
|
|
|
|
|
<div class="line" v-for="(listcolumn,index) in streetDetail.leftColumn" :key="index">
|
|
|
|
|
|
|
|
<div v-for="(listrow,i) in streetDetail.leftRow" :key="i" class="el"
|
|
|
|
|
|
|
|
style="width:100%;display:flex;align-items:center;justify-content:space-between;flex-direction: column">
|
|
|
|
|
|
|
|
<div class="carousel-page"
|
|
|
|
|
|
|
|
v-if="listrow == row && listcolumn == column">
|
|
|
|
|
|
|
|
<p class="carousel-page-title" >
|
|
|
|
|
|
|
|
<span>
|
|
|
|
|
|
|
|
货架号 : {{ $route.query.shelveId }}
|
|
|
|
|
|
|
|
</span>
|
|
|
|
|
|
|
|
<span @click="goHistory()" style="width: 400px;display: inline-block;cursor: pointer">
|
|
|
|
|
|
|
|
工单号：暂无
|
|
|
|
|
|
|
|
</span>
|
|
|
|
|
|
|
|
</p>
|
|
|
|
|
|
|
|
<div class="carousel-page-content">
|
|
|
|
|
|
|
|
<div class="img-box">
|
|
|
|
|
|
|
|
<div
|
|
|
|
|
|
|
|
style="display: flex;align-items: center;justify-content: center;width:500px;height:400px;background:#eaeaea">
|
|
|
|
|
|
|
|
<!-- <img v-if="row==4 && column==18" src="/red-test1.jpg" style="width: 100%;height: 358px" alt="">-->
|
|
|
|
|
|
|
|
<!-- <img v-else src="/test1.jpg" style="width: 100%;height: 358px" alt="">-->
|
|
|
|
|
|
|
|
<img
|
|
|
|
|
|
|
|
v-if="checkObj.preoperationPic"
|
|
|
|
|
|
|
|
:src="imgUrl+checkObj.preoperationPic"
|
|
|
|
|
|
|
|
style="width: 100%;height: 358px"
|
|
|
|
|
|
|
|
alt=""/>
|
|
|
|
|
|
|
|
<span v-else>暂无图片</span>
|
|
|
|
|
|
|
|
</div>
|
|
|
|
|
|
|
|
<p>操作前照片</p>
|
|
|
|
|
|
|
|
</div>
|
|
|
|
|
|
|
|
<div class="img-box">
|
|
|
|
|
|
|
|
<div
|
|
|
|
|
|
|
|
style="display: flex;align-items: center;justify-content: center;width:500px;height:400px;background:#eaeaea">
|
|
|
|
|
|
|
|
<!-- <img v-if="row==4 && column==18" src="/red-test2.jpg" style="width: 100%;height: 358px" alt="">-->
|
|
|
|
|
|
|
|
<!-- <img v-else src="/test2.jpg" style="width: 100%;height: 358px" alt="">-->
|
|
|
|
|
|
|
|
<img
|
|
|
|
|
|
|
|
v-if="checkObj.overoperationPic"
|
|
|
|
|
|
|
|
:src="imgUrl+checkObj.overoperationPic"
|
|
|
|
|
|
|
|
style="width: 100%;height: 358px"
|
|
|
|
|
|
|
|
alt=""/>
|
|
|
|
|
|
|
|
<span v-else>暂无图片</span>
|
|
|
|
|
|
|
|
</div>
|
|
|
|
|
|
|
|
<p>操作后照片</p>
|
|
|
|
|
|
|
|
</div>
|
|
|
|
|
|
|
|
<div class="img-box">
|
|
|
|
|
|
|
|
<ul>
|
|
|
|
|
|
|
|
<li v-for="item in params" :key="item.label">
|
|
|
|
|
|
|
|
<span class="img-box-title">
|
|
|
|
|
|
|
|
{{ item.label }}:
|
|
|
|
|
|
|
|
</span>
|
|
|
|
|
|
|
|
<span class="img-box-value">
|
|
|
|
|
|
|
|
{{ scanAndCheck[item.key] }}
|
|
|
|
|
|
|
|
</span>
|
|
|
|
|
|
|
|
</li>
|
|
|
|
|
|
|
|
</ul>
|
|
|
|
|
|
|
|
</div>
|
|
|
|
|
|
|
|
</div>
|
|
|
|
|
|
|
|
<div class="carousel-page-footer">
|
|
|
|
|
|
|
|
<div class="info-box">
|
|
|
|
|
|
|
|
<p>系统登记品规：暂无</p>
|
|
|
|
|
|
|
|
<p>系统登记数量：暂无</p>
|
|
|
|
|
|
|
|
</div>
|
|
|
|
|
|
|
|
<div class="status">
|
|
|
|
|
|
|
|
未核对
|
|
|
|
|
|
|
|
</div>
|
|
|
|
|
|
|
|
<div class="status-btn">
|
|
|
|
|
|
|
|
<a-button class="btn"
|
|
|
|
|
|
|
|
type="danger"
|
|
|
|
|
|
|
|
@click="showModel({},index)"
|
|
|
|
|
|
|
|
>人工复核
|
|
|
|
|
|
|
|
</a-button>
|
|
|
|
|
|
|
|
<a-button class="btn"
|
|
|
|
|
|
|
|
type="primary"
|
|
|
|
|
|
|
|
style="background:#29c12b;border-color:#29c12b;"
|
|
|
|
|
|
|
|
@click="checkSure(row,column,shelveId,index)"
|
|
|
|
|
|
|
|
>核对正确
|
|
|
|
|
|
|
|
</a-button>
|
|
|
|
|
|
|
|
</div>
|
|
|
|
|
|
|
|
<div class="bottom-btn"
|
|
|
|
|
|
|
|
v-if="listrow == row && listcolumn == column">
|
|
|
|
|
|
|
|
<a-button class="btn" @click="defaultPrev(listrow,listcolumn)">＜上一个</a-button>
|
|
|
|
|
|
|
|
<p>{{listrow}}行{{listcolumn}}列</p>
|
|
|
|
|
|
|
|
<a-button class="btn" @click="defaultNext(listrow,listcolumn)">下一个＞
|
|
|
|
|
|
|
|
</a-button>
|
|
|
|
</a-button>
|
|
|
|
</div>
|
|
|
|
</div>
|
|
|
|
</div>
|
|
|
|
</div>
|
|
|
|
</div>
|
|
|
|
|
|
|
|
</div>
|
|
|
|
|
|
|
|
</div>
|
|
|
|
|
|
|
|
</div>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
<Model
|
|
|
|
<Model
|
|
|
|
:visible.sync="visible"
|
|
|
|
:visible.sync="visible"
|
|
|
|
@ -264,9 +149,12 @@ export default {
|
|
|
|
id: 0,
|
|
|
|
id: 0,
|
|
|
|
row: 1,
|
|
|
|
row: 1,
|
|
|
|
column: 1,
|
|
|
|
column: 1,
|
|
|
|
|
|
|
|
//当前货架行列总数
|
|
|
|
|
|
|
|
rowCount: 0,
|
|
|
|
|
|
|
|
columnCount: 0,
|
|
|
|
selectName: '',
|
|
|
|
selectName: '',
|
|
|
|
shelveId: '',
|
|
|
|
shelveId: '',
|
|
|
|
selectType: '',
|
|
|
|
selectType: 'left',
|
|
|
|
selectType2: '',
|
|
|
|
selectType2: '',
|
|
|
|
visible: false,
|
|
|
|
visible: false,
|
|
|
|
category: '',
|
|
|
|
category: '',
|
|
|
|
@ -275,6 +163,14 @@ export default {
|
|
|
|
index: 0,
|
|
|
|
index: 0,
|
|
|
|
imgUrl: '',
|
|
|
|
imgUrl: '',
|
|
|
|
params:[
|
|
|
|
params:[
|
|
|
|
|
|
|
|
{
|
|
|
|
|
|
|
|
label:'核对状态',
|
|
|
|
|
|
|
|
key: 'orderNum'
|
|
|
|
|
|
|
|
},
|
|
|
|
|
|
|
|
{
|
|
|
|
|
|
|
|
label:'工单号',
|
|
|
|
|
|
|
|
key: 'orderNum'
|
|
|
|
|
|
|
|
},
|
|
|
|
{
|
|
|
|
{
|
|
|
|
label:'系统条码号',
|
|
|
|
label:'系统条码号',
|
|
|
|
key: 'SystemCode'
|
|
|
|
key: 'SystemCode'
|
|
|
|
@ -288,7 +184,7 @@ export default {
|
|
|
|
key: 'SystemNumber'
|
|
|
|
key: 'SystemNumber'
|
|
|
|
},
|
|
|
|
},
|
|
|
|
{
|
|
|
|
{
|
|
|
|
label:'检测数量',
|
|
|
|
label:'扫描数量',
|
|
|
|
key: 'CheckNumber'
|
|
|
|
key: 'CheckNumber'
|
|
|
|
}
|
|
|
|
}
|
|
|
|
]
|
|
|
|
]
|
|
|
|
@ -297,11 +193,12 @@ export default {
|
|
|
|
beforeRouteLeave(to ,form, next) {
|
|
|
|
beforeRouteLeave(to ,form, next) {
|
|
|
|
// 修复第二次进入界面不执行created
|
|
|
|
// 修复第二次进入界面不执行created
|
|
|
|
this.$destroy();
|
|
|
|
this.$destroy();
|
|
|
|
next();
|
|
|
|
//next();
|
|
|
|
},
|
|
|
|
},
|
|
|
|
created() {
|
|
|
|
created() {
|
|
|
|
this.imgUrl = imgUrl
|
|
|
|
this.imgUrl = imgUrl
|
|
|
|
console.log(this.$route.query.id)
|
|
|
|
console.log(this.$route.query.id)
|
|
|
|
|
|
|
|
this.getStreetList();
|
|
|
|
if (this.$route.query.row && this.$route.query.column && this.$route.query.shelveId && this.$route.query.id && this.$route.query.name) {
|
|
|
|
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.id = this.$route.query.id
|
|
|
|
this.row = this.$route.query.row
|
|
|
|
this.row = this.$route.query.row
|
|
|
|
@ -310,70 +207,16 @@ export default {
|
|
|
|
this.selectName = this.$route.query.name
|
|
|
|
this.selectName = this.$route.query.name
|
|
|
|
this.selectType = this.$route.query.type
|
|
|
|
this.selectType = this.$route.query.type
|
|
|
|
this.selectType2 = this.$route.query.type2
|
|
|
|
this.selectType2 = this.$route.query.type2
|
|
|
|
console.log(this.shelveId)
|
|
|
|
|
|
|
|
console.log(this.row)
|
|
|
|
|
|
|
|
console.log(this.column)
|
|
|
|
|
|
|
|
this.getStockInfo(this.row, this.column, this.shelveId);
|
|
|
|
this.getStockInfo(this.row, this.column, this.shelveId);
|
|
|
|
} else if (this.$route.query.checkObj && this.$route.query.item && this.$route.query.item.id && this.$route.query.item.name) {
|
|
|
|
|
|
|
|
this.checkObj = this.$route.query.checkObj
|
|
|
|
|
|
|
|
this.streetDetail = this.$route.query.item
|
|
|
|
|
|
|
|
this.id = this.$route.query.item.id
|
|
|
|
|
|
|
|
this.selectName = this.$route.query.item.name
|
|
|
|
|
|
|
|
this.getScanAndCheck();
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
},
|
|
|
|
},
|
|
|
|
mounted() {
|
|
|
|
mounted() {
|
|
|
|
this.getStreetList();
|
|
|
|
//this.getStreetList();
|
|
|
|
if (JSON.stringify(this.checkObj) !== '{}') {
|
|
|
|
|
|
|
|
if (this.checkObj.shelveId == this.streetDetail.leftShelveId) {
|
|
|
|
|
|
|
|
this.selectType = 'left'
|
|
|
|
|
|
|
|
} else {
|
|
|
|
|
|
|
|
this.selectType = 'right'
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
console.log(this.selectType2)
|
|
|
|
|
|
|
|
},
|
|
|
|
},
|
|
|
|
components: {
|
|
|
|
components: {
|
|
|
|
Model
|
|
|
|
Model
|
|
|
|
},
|
|
|
|
},
|
|
|
|
methods: {
|
|
|
|
methods: {
|
|
|
|
getScanAndCheck() {
|
|
|
|
|
|
|
|
this.$set(this, 'scanAndCheck', {
|
|
|
|
|
|
|
|
SystemCode: this.checkObj.category,
|
|
|
|
|
|
|
|
ScanCode: null,
|
|
|
|
|
|
|
|
SystemNumber: this.checkObj.count,
|
|
|
|
|
|
|
|
CheckNumber: null
|
|
|
|
|
|
|
|
})
|
|
|
|
|
|
|
|
if(this.checkObj.status == 2) {
|
|
|
|
|
|
|
|
this.scanAndCheck.ScanCode = this.scanAndCheck.SystemCode;
|
|
|
|
|
|
|
|
this.scanAndCheck.CheckNumber = this.scanAndCheck.SystemNumber;
|
|
|
|
|
|
|
|
}else {
|
|
|
|
|
|
|
|
this.$api.httpNodeApi.getStockRowColumnNesInfo({
|
|
|
|
|
|
|
|
params:{
|
|
|
|
|
|
|
|
row: Number(this.row),
|
|
|
|
|
|
|
|
column: Number(this.column),
|
|
|
|
|
|
|
|
shelveId: this.shelveId + ''
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
}).then(res=>{
|
|
|
|
|
|
|
|
if(res.code === 200) {
|
|
|
|
|
|
|
|
this.scanAndCheck.ScanCode = res.data.new_category;
|
|
|
|
|
|
|
|
this.scanAndCheck.CheckNumber = res.data.new_count;
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
})
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
// this.$api.httpApi.scanAndCheck({
|
|
|
|
|
|
|
|
// name: 'getData'
|
|
|
|
|
|
|
|
// }).then(res=>{
|
|
|
|
|
|
|
|
// // 如果还未执行完成 2秒后再次请求
|
|
|
|
|
|
|
|
// if(res.status === '0') {
|
|
|
|
|
|
|
|
// setTimeout(()=>{
|
|
|
|
|
|
|
|
// this.getScanAndCheck();
|
|
|
|
|
|
|
|
// }, 2000);
|
|
|
|
|
|
|
|
// }else{
|
|
|
|
|
|
|
|
// this.scanAndCheck = res.data[0];
|
|
|
|
|
|
|
|
// }
|
|
|
|
|
|
|
|
// })
|
|
|
|
|
|
|
|
},
|
|
|
|
|
|
|
|
//获取巷道列表
|
|
|
|
//获取巷道列表
|
|
|
|
getStreetList() {
|
|
|
|
getStreetList() {
|
|
|
|
this.$api.httpApi.getStreetList({
|
|
|
|
this.$api.httpApi.getStreetList({
|
|
|
|
@ -385,7 +228,8 @@ export default {
|
|
|
|
this.listData = res.data.list;
|
|
|
|
this.listData = res.data.list;
|
|
|
|
this.select = this.id
|
|
|
|
this.select = this.id
|
|
|
|
this.getStreetDetail(this.id)
|
|
|
|
this.getStreetDetail(this.id)
|
|
|
|
this.getStockList(this.id)
|
|
|
|
this.getStockInfo(this.row,this.column,this.id)
|
|
|
|
|
|
|
|
//this.getStockList(this.id)
|
|
|
|
}).catch(err => {
|
|
|
|
}).catch(err => {
|
|
|
|
console.error(err);
|
|
|
|
console.error(err);
|
|
|
|
});
|
|
|
|
});
|
|
|
|
@ -396,24 +240,19 @@ export default {
|
|
|
|
data: {}
|
|
|
|
data: {}
|
|
|
|
}).then(res => {
|
|
|
|
}).then(res => {
|
|
|
|
this.streetDetail = res.data
|
|
|
|
this.streetDetail = res.data
|
|
|
|
console.log(this.streetDetail)
|
|
|
|
this.getRowColumnCounts()
|
|
|
|
|
|
|
|
|
|
|
|
}).catch(err => {
|
|
|
|
}).catch(err => {
|
|
|
|
|
|
|
|
|
|
|
|
})
|
|
|
|
})
|
|
|
|
},
|
|
|
|
},
|
|
|
|
//获取盘点列表
|
|
|
|
//获取总行列数
|
|
|
|
getStockList(streetId) {
|
|
|
|
getRowColumnCounts(){
|
|
|
|
this.$api.httpApi.getStockList({
|
|
|
|
if(this.selectType != 'none' && this.selectType != ''){
|
|
|
|
params: {
|
|
|
|
this.handleTypeChange(this.selectType)
|
|
|
|
streetId: streetId,
|
|
|
|
}else{
|
|
|
|
|
|
|
|
this.handleTypeChange2(this.selectType2)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}).then(res => {
|
|
|
|
|
|
|
|
this.checkList = res.data
|
|
|
|
|
|
|
|
console.log(this.checkList)
|
|
|
|
|
|
|
|
}).catch(err => {
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
});
|
|
|
|
|
|
|
|
},
|
|
|
|
},
|
|
|
|
//获取复核页面的核对信息
|
|
|
|
//获取复核页面的核对信息
|
|
|
|
getStockInfo(row, column, shelveId) {
|
|
|
|
getStockInfo(row, column, shelveId) {
|
|
|
|
@ -426,147 +265,139 @@ export default {
|
|
|
|
}).then(res => {
|
|
|
|
}).then(res => {
|
|
|
|
if (res.data) {
|
|
|
|
if (res.data) {
|
|
|
|
this.checkObj = res.data;
|
|
|
|
this.checkObj = res.data;
|
|
|
|
this.shelveId = res.data.shelveId;
|
|
|
|
//this.shelveId = res.data.shelveId;
|
|
|
|
this.getScanAndCheck();
|
|
|
|
//this.getScanAndCheck();
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}).catch(err => {
|
|
|
|
}).catch(err => {
|
|
|
|
|
|
|
|
console.log(err)
|
|
|
|
});
|
|
|
|
});
|
|
|
|
},
|
|
|
|
},
|
|
|
|
handleChange(value) {
|
|
|
|
handleChange(value) {
|
|
|
|
console.log(value)
|
|
|
|
|
|
|
|
this.select = value
|
|
|
|
this.select = value
|
|
|
|
this.id = value
|
|
|
|
this.id = value
|
|
|
|
this.row = 1
|
|
|
|
this.row = 1
|
|
|
|
this.column =1
|
|
|
|
this.column =1
|
|
|
|
console.log(JSON.stringify(this.checkObj))
|
|
|
|
|
|
|
|
this.getStreetList()
|
|
|
|
this.getStreetList()
|
|
|
|
for (var i = 0; i < this.listData.length; i++) {
|
|
|
|
for (var i = 0; i < this.listData.length; i++) {
|
|
|
|
console.log(this.listData[i])
|
|
|
|
|
|
|
|
if (this.listData[i].id == value) {
|
|
|
|
if (this.listData[i].id == value) {
|
|
|
|
if (this.listData[i].leftShelveId) {
|
|
|
|
if (this.listData[i].leftShelveId) {
|
|
|
|
this.shelveId = this.listData[i].leftShelveId
|
|
|
|
this.shelveId = this.listData[i].leftShelveId
|
|
|
|
this.selectType = 'left'
|
|
|
|
this.selectType = 'left'
|
|
|
|
this.selectType2 = 'none'
|
|
|
|
this.selectType2 = 'none'
|
|
|
|
this.getStockInfo(1, 1, this.shelveId)
|
|
|
|
this.rowCount = this.listData[i].leftRow
|
|
|
|
|
|
|
|
this.columnCount = this.listData[i].leftColumn
|
|
|
|
|
|
|
|
|
|
|
|
} else if (this.listData[i].leftInsideShelveId) {
|
|
|
|
} else if (this.listData[i].leftInsideShelveId) {
|
|
|
|
this.shelveId = this.listData[i].leftInsideShelveId
|
|
|
|
this.shelveId = this.listData[i].leftInsideShelveId
|
|
|
|
this.selectType = 'left'
|
|
|
|
this.selectType = 'left'
|
|
|
|
this.selectType2 = 'inside'
|
|
|
|
this.selectType2 = 'inside'
|
|
|
|
this.getStockInfo(1, 1, this.shelveId)
|
|
|
|
this.rowCount = this.listData[i].leftRow
|
|
|
|
|
|
|
|
this.columnCount = this.listData[i].leftColumn
|
|
|
|
} else if (this.listData[i].leftOutsideShelveId) {
|
|
|
|
} else if (this.listData[i].leftOutsideShelveId) {
|
|
|
|
this.shelveId = this.listData[i].leftOutsideShelveId
|
|
|
|
this.shelveId = this.listData[i].leftOutsideShelveId
|
|
|
|
this.selectType = 'left'
|
|
|
|
this.selectType = 'left'
|
|
|
|
this.selectType2 = 'out'
|
|
|
|
this.selectType2 = 'out'
|
|
|
|
this.getStockInfo(1, 1, this.shelveId)
|
|
|
|
this.rowCount = this.listData[i].leftRow
|
|
|
|
|
|
|
|
this.columnCount = this.listData[i].leftColumn
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
this.getStockInfo(1, 1, this.shelveId)
|
|
|
|
},
|
|
|
|
},
|
|
|
|
handleTypeChange(value) {
|
|
|
|
handleTypeChange(value) {
|
|
|
|
console.log(this.streetDetail.leftShelveId)
|
|
|
|
this.row = 1
|
|
|
|
console.log(value)
|
|
|
|
this.column = 1
|
|
|
|
this.selectType = value
|
|
|
|
this.selectType = value
|
|
|
|
if (value == 'left') {
|
|
|
|
if (value == 'left') {
|
|
|
|
|
|
|
|
this.rowCount = this.streetDetail.leftRow
|
|
|
|
|
|
|
|
this.columnCount = this.streetDetail.leftColumn
|
|
|
|
if (this.streetDetail.leftShelveId) {
|
|
|
|
if (this.streetDetail.leftShelveId) {
|
|
|
|
this.getStockInfo(1, 1, this.streetDetail.leftShelveId)
|
|
|
|
this.shelveId = this.streetDetail.leftShelveId
|
|
|
|
|
|
|
|
|
|
|
|
} else if (this.streetDetail.leftInsideShelveId) {
|
|
|
|
} else if (this.streetDetail.leftInsideShelveId) {
|
|
|
|
this.getStockInfo(1, 1, this.streetDetail.leftInsideShelveId)
|
|
|
|
this.shelveId = this.streetDetail.leftInsideShelveId
|
|
|
|
|
|
|
|
|
|
|
|
} else if (this.streetDetail.leftOutsideShelveId) {
|
|
|
|
} else if (this.streetDetail.leftOutsideShelveId) {
|
|
|
|
this.getStockInfo(1, 1, this.streetDetail.leftOutsideShelveId)
|
|
|
|
this.shelveId = this.streetDetail.leftOutsideShelveId
|
|
|
|
}
|
|
|
|
}
|
|
|
|
} else if (value == 'right') {
|
|
|
|
} else if (value == 'right') {
|
|
|
|
|
|
|
|
this.rowCount = this.streetDetail.rightRow
|
|
|
|
|
|
|
|
this.columnCount = this.streetDetail.rightColumn
|
|
|
|
if (this.streetDetail.rightShelveId) {
|
|
|
|
if (this.streetDetail.rightShelveId) {
|
|
|
|
this.getStockInfo(1, 1, this.streetDetail.rightShelveId)
|
|
|
|
this.shelveId = this.streetDetail.rightShelveId
|
|
|
|
} else if (this.streetDetail.rightInsideShelveId) {
|
|
|
|
} else if (this.streetDetail.rightInsideShelveId) {
|
|
|
|
this.getStockInfo(1, 1, this.streetDetail.rightInsideShelveId)
|
|
|
|
this.shelveId = this.streetDetail.rightInsideShelveId
|
|
|
|
} else if (this.streetDetail.rightOutsideShelveId) {
|
|
|
|
} else if (this.streetDetail.rightOutsideShelveId) {
|
|
|
|
this.getStockInfo(1, 1, this.streetDetail.rightOutsideShelveId)
|
|
|
|
this.shelveId = this.streetDetail.rightOutsideShelveId
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
this.getStockInfo(this.row, this.column, this.shelveId)
|
|
|
|
|
|
|
|
|
|
|
|
},
|
|
|
|
},
|
|
|
|
handleTypeChange2(value) {
|
|
|
|
handleTypeChange2(value) {
|
|
|
|
console.log(this.streetDetail.leftShelveId)
|
|
|
|
this.row = 1
|
|
|
|
console.log(value)
|
|
|
|
this.column = 1
|
|
|
|
this.selectType2 = value
|
|
|
|
this.selectType2 = value
|
|
|
|
if (this.selectType == 'left' && value == 'none') {
|
|
|
|
if (this.selectType == 'left' && value == 'none') {
|
|
|
|
this.getStockInfo(1, 1, this.streetDetail.leftShelveId)
|
|
|
|
this.shelveId = this.streetDetail.leftShelveId
|
|
|
|
|
|
|
|
this.rowCount = this.streetDetail.leftRow
|
|
|
|
|
|
|
|
this.columnCount = this.streetDetail.leftColumn
|
|
|
|
} else if (this.selectType == 'right' && value == 'none') {
|
|
|
|
} else if (this.selectType == 'right' && value == 'none') {
|
|
|
|
this.getStockInfo(1, 1, this.streetDetail.rightShelveId)
|
|
|
|
this.rowCount = this.streetDetail.rightRow
|
|
|
|
|
|
|
|
this.columnCount = this.streetDetail.rightColumn
|
|
|
|
|
|
|
|
this.shelveId = this.streetDetail.rightShelveId
|
|
|
|
} else if (this.selectType == 'left' && value == 'inside') {
|
|
|
|
} else if (this.selectType == 'left' && value == 'inside') {
|
|
|
|
this.getStockInfo(1, 1, this.streetDetail.leftInsideShelveId)
|
|
|
|
this.rowCount = this.streetDetail.leftRow
|
|
|
|
|
|
|
|
this.columnCount = this.streetDetail.leftColumn
|
|
|
|
|
|
|
|
this.shelveId = this.streetDetail.leftInsideShelveId
|
|
|
|
} else if (this.selectType == 'left' && value == 'out') {
|
|
|
|
} else if (this.selectType == 'left' && value == 'out') {
|
|
|
|
this.getStockInfo(1, 1, this.streetDetail.leftOutsideShelveId)
|
|
|
|
this.rowCount = this.streetDetail.leftRow
|
|
|
|
|
|
|
|
this.columnCount = this.streetDetail.leftColumn
|
|
|
|
|
|
|
|
this.shelveId = this.streetDetail.leftOutsideShelveId
|
|
|
|
} else if (this.selectType == 'right' && value == 'inside') {
|
|
|
|
} else if (this.selectType == 'right' && value == 'inside') {
|
|
|
|
this.getStockInfo(1, 1, this.streetDetail.rightInsideShelveId)
|
|
|
|
this.rowCount = this.streetDetail.rightRow
|
|
|
|
|
|
|
|
this.columnCount = this.streetDetail.rightColumn
|
|
|
|
|
|
|
|
this.shelveId = this.streetDetail.rightInsideShelveId
|
|
|
|
} else if (this.selectType == 'right' && value == 'out') {
|
|
|
|
} else if (this.selectType == 'right' && value == 'out') {
|
|
|
|
this.getStockInfo(1, 1, this.streetDetail.rightOutsideShelveId)
|
|
|
|
this.rowCount = this.streetDetail.rightRow
|
|
|
|
|
|
|
|
this.columnCount = this.streetDetail.rightColumn
|
|
|
|
|
|
|
|
this.shelveId = this.streetDetail.rightOutsideShelveId
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
this.getStockInfo(this.row, this.column, this.shelveId)
|
|
|
|
|
|
|
|
|
|
|
|
},
|
|
|
|
},
|
|
|
|
prev(index) {
|
|
|
|
prev() {
|
|
|
|
index--
|
|
|
|
if(this.column > 1){
|
|
|
|
console.log(index)
|
|
|
|
this.column = this.column - 1
|
|
|
|
for (let x in this.checkList) {
|
|
|
|
}else{
|
|
|
|
if (this.checkObj.shelveId == this.checkList[x][index].shelveId) {
|
|
|
|
if(this.row > 1){
|
|
|
|
console.log(this.checkList[x][index].row)
|
|
|
|
this.row = this.row - 1
|
|
|
|
console.log(this.checkList[x][index].column)
|
|
|
|
this.column = this.columnCount
|
|
|
|
console.log(this.checkList[x][index].shelveId)
|
|
|
|
}else{
|
|
|
|
this.getStockInfo(this.checkList[x][index].row, this.checkList[x][index].column, this.checkList[x][index].shelveId)
|
|
|
|
this.row = this.rowCount
|
|
|
|
}
|
|
|
|
this.column = this.columnCount
|
|
|
|
}
|
|
|
|
|
|
|
|
},
|
|
|
|
|
|
|
|
next(index) {
|
|
|
|
|
|
|
|
index++
|
|
|
|
|
|
|
|
console.log(index)
|
|
|
|
|
|
|
|
for (let x in this.checkList) {
|
|
|
|
|
|
|
|
if (this.checkObj.shelveId == this.checkList[x][index].shelveId) {
|
|
|
|
|
|
|
|
console.log(this.checkList[x][index].row)
|
|
|
|
|
|
|
|
console.log(this.checkList[x][index].column)
|
|
|
|
|
|
|
|
console.log(this.checkList[x][index].shelveId)
|
|
|
|
|
|
|
|
this.getStockInfo(this.checkList[x][index].row, this.checkList[x][index].column, this.checkList[x][index].shelveId)
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
this.getStockInfo(this.row,this.column,this.shelveId)
|
|
|
|
},
|
|
|
|
},
|
|
|
|
defaultPrev(row, column) {
|
|
|
|
next() {
|
|
|
|
for (var i = 1; i < this.streetDetail.leftColumn + 1; i++) {
|
|
|
|
if(this.column < this.columnCount){
|
|
|
|
for (var j = 1; j < this.streetDetail.leftRow + 1; j++) {
|
|
|
|
this.column = this.column + 1
|
|
|
|
console.log(i)
|
|
|
|
}else{
|
|
|
|
console.log(j)
|
|
|
|
//最大列了 row+1
|
|
|
|
if (i == row && j == column) {
|
|
|
|
if(this.row < this.rowCount){
|
|
|
|
this.column = j - 1
|
|
|
|
this.row = this.row + 1
|
|
|
|
if (this.column < 1) {
|
|
|
|
|
|
|
|
this.row = i - 1
|
|
|
|
|
|
|
|
this.column = this.streetDetail.leftColumn
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
if (i == 1 && j == 1) {
|
|
|
|
|
|
|
|
this.row = 1
|
|
|
|
|
|
|
|
this.column = 1
|
|
|
|
this.column = 1
|
|
|
|
}
|
|
|
|
}else{
|
|
|
|
}
|
|
|
|
this.row = 1
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
},
|
|
|
|
|
|
|
|
defaultNext(row, column) {
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
for (var i = 1; i < this.streetDetail.leftColumn + 1; i++) {
|
|
|
|
|
|
|
|
for (var j = 1; j < this.streetDetail.leftRow + 1; j++) {
|
|
|
|
|
|
|
|
console.log(i)
|
|
|
|
|
|
|
|
console.log(j)
|
|
|
|
|
|
|
|
if (i == row && j == column) {
|
|
|
|
|
|
|
|
this.column = j + 1
|
|
|
|
|
|
|
|
if (this.column == this.streetDetail.leftColumn + 1) {
|
|
|
|
|
|
|
|
this.row = i + 1
|
|
|
|
|
|
|
|
this.column = 1
|
|
|
|
this.column = 1
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if (i == this.streetDetail.leftColumn && j == this.streetDetail.leftRow) {
|
|
|
|
|
|
|
|
this.row = this.streetDetail.leftRow
|
|
|
|
|
|
|
|
this.column = this.streetDetail.leftColumn
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
this.getStockInfo(this.row,this.column,this.shelveId)
|
|
|
|
},
|
|
|
|
},
|
|
|
|
checkSure(row, column, shelveId, index) {
|
|
|
|
checkSure(row, column, shelveId, index) {
|
|
|
|
this.$api.httpApi.stockCheckCorrect({
|
|
|
|
this.$api.httpApi.stockCheckCorrect({
|
|
|
|
@ -697,8 +528,8 @@ export default {
|
|
|
|
|
|
|
|
|
|
|
|
.status-btn {
|
|
|
|
.status-btn {
|
|
|
|
display: flex;
|
|
|
|
display: flex;
|
|
|
|
align-items: center;
|
|
|
|
align-items: flex-start;
|
|
|
|
justify-content: center;
|
|
|
|
justify-content: flex-start;
|
|
|
|
|
|
|
|
|
|
|
|
.btn {
|
|
|
|
.btn {
|
|
|
|
padding: 25px;
|
|
|
|
padding: 25px;
|
|
|
|
@ -716,7 +547,7 @@ export default {
|
|
|
|
.bottom-btn {
|
|
|
|
.bottom-btn {
|
|
|
|
width: 100%;
|
|
|
|
width: 100%;
|
|
|
|
display: flex;
|
|
|
|
display: flex;
|
|
|
|
align-items: center;
|
|
|
|
align-items: right;
|
|
|
|
justify-content: center;
|
|
|
|
justify-content: center;
|
|
|
|
|
|
|
|
|
|
|
|
p {
|
|
|
|
p {
|
|
|
|
|
qiushui
4 years ago