upright
/
duoji-frontend
mirror of https://gitlab.hzleaper.com:81/duoji/duoji-frontend.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

去掉货架号

Browse Source
merge-requests/7/head
yiming 4 years ago
parent 65d123c406
commit c0f69dde93
9 changed files with 154 additions and 345 deletions
Show Stats Download Patch File Download Diff File

2
public/antd_color.less
Unescape Escape View File

@ -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-blue-inverse {color: #fff;background: #1890ff;border-color: #1890ff;}
.ant-tag-geekblue {color: #2f54eb;background: #f0f5ff;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-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-tag-purple-inverse {color: #fff;background: #722ed1;border-color: #722ed1;}
.ant-time-picker-panel {color: @text-color;} .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);} .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);}

63
src/views/checkManage/Subsection.vue
Unescape Escape View File

@ -28,7 +28,7 @@
<!--渲染默认巷道框架规格 定位浮在 已有巷道上做对应--> <!--渲染默认巷道框架规格 定位浮在 已有巷道上做对应-->
<span <span
class="default" 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)"> @click="tocheckPage(random.row[0] + random.row[1] - rowIndex - 1,column)">
{{ random.row[0] + random.row[1] - rowIndex - 1}}-{{column}} {{ random.row[0] + random.row[1] - rowIndex - 1}}-{{column}}
</span> </span>
@ -90,37 +90,33 @@ export default {
} }
} }
}, },
shelveId: { direction: {
type: String,
default: () => {
return {}
}
},
streetId: {
type: Number, type: Number,
default: () => { default: () => {
return {} return {}
} }
}, },
streetName: { side: {
type: String, type: Number,
default: () => { default: () => {
return {} return {}
} }
}, },
type: {
type: String, streetId: {
type: Number,
default: () => { default: () => {
return {} return {}
} }
}, },
inOut: { streetName: {
type: String, type: String,
default: () => { default: () => {
return {} return {}
} }
}, },
}, },
computed: { computed: {
// 应有的格子数 // 应有的格子数
@ -138,15 +134,20 @@ export default {
column: this.getRandomColumn(this.select.column), column: this.getRandomColumn(this.select.column),
} }
}, },
watchShelveIdInfo(){ watchDirection(){
return this.shelveId; return this.direction;
},
watchSide(){
return this.side;
}, },
}, },
watch: { watch: {
watchShelveIdInfo() { watchDirection() {
this.getStatus();
},
watchSide() {
this.getStatus(); this.getStatus();
}, },
immediate: true, immediate: true,
}, },
@ -215,25 +216,23 @@ export default {
}, },
getStatusBg(row,column,status) { 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'; var color = status == 1 ?'#d81e06': (status == 2|| status == 3) ? '#1afa29': '#bfbfbf';
dom.style.background = color dom.style.background = color
}, },
getStatusTab(tab,status,rowColumn){ // getStatusTab(tab,status,rowColumn){
var dom = document.getElementById(this.shelveId+'-'+rowColumn+'-'+tab); // var dom = document.getElementById(this.shelveId+'-'+rowColumn+'-'+tab);
console.log(dom) // console.log(dom)
console.log(this.shelveId+'-'+rowColumn+'-'+tab) // console.log(this.shelveId+'-'+rowColumn+'-'+tab)
dom.style.type ="close-circle" // dom.style.type ="close-circle"
var color = status == 1 ?'#d81e06': status == 2 ? '#1afa29': '#bfbfbf'; // var color = status == 1 ?'#d81e06': status == 2 ? '#1afa29': '#bfbfbf';
dom.style.color = color // dom.style.color = color
console.log(dom) // console.log(dom)
}, // },
getStatus(){ getStatus(){
if(JSON.stringify(this.shelveId) == "{}"){
return;
}
var columnTab = [] var columnTab = []
for(let c = 1; c <= this.latticeColumn ;c++){ for(let c = 1; c <= this.latticeColumn ;c++){
let tab = this.getRandom(c,this.latticeColumn,this.nums.column,this.total.column) let tab = this.getRandom(c,this.latticeColumn,this.nums.column,this.total.column)
@ -250,7 +249,9 @@ export default {
columnEnd: this.random.column[1], columnEnd: this.random.column[1],
rowStart: this.random.row[0], rowStart: this.random.row[0],
rowEnd: this.random.row[1], rowEnd: this.random.row[1],
shelveId: this.shelveId, streetId: this.streetId,
direction: this.direction,
side: this.side,
rowTabs: rowTab, rowTabs: rowTab,
columnTabs: columnTab columnTabs: columnTab
} }

115
src/views/checkManage/checkOperation.vue
Unescape Escape View File

@ -162,12 +162,14 @@ export default {
created() { created() {
this.imgUrl = imgUrl this.imgUrl = imgUrl
console.log(this.$route.query.id) 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) { 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
this.column = this.$route.query.column 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.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
@ -184,35 +186,6 @@ export default {
Model Model
}, },
methods: { 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(){ getRowColumnCounts(){
@ -272,86 +245,6 @@ export default {
} }
this.getStockInfo(1, 1, this.shelveId) 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() { prev() {
if(this.column > 1){ if(this.column > 1){
this.column = this.column - 1 this.column = this.column - 1

88
src/views/checkManage/index.vue
Unescape Escape View File

@ -36,23 +36,24 @@
<!--左货架DOM--> <!--左货架DOM-->
<div class="center-box"> <div class="center-box">
<span class="shelf-number"> <span class="shelf-number">
左货架号: {{leftShelveId.shelveId}} 左侧货架
</span> </span>
<a-radio-group v-model="size" style="margin:10px 0" @change="getStockRowColumn" <a-radio-group v-model="leftSide" style="margin:10px 0"
v-if="streetDetail.leftInsideShelveId && streetDetail.leftOutsideShelveId"> v-if="streetDetail.leftType == 1">
<a-radio-button value="leftOutsideShelveId"> <a-radio-button :value=1>
外 浅侧货架
</a-radio-button> </a-radio-button>
<a-radio-button value="leftInsideShelveId"> <a-radio-button :value=2>
内 深侧货架
</a-radio-button> </a-radio-button>
</a-radio-group> </a-radio-group>
</div> </div>
<div class="check-content" v-for="item in data" :key="item.id"> <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> </subsection>
</div> </div>
@ -60,24 +61,26 @@
<!--单伸类型右货架DOM--> <!--单伸类型右货架DOM-->
<div class="center-box"> <div class="center-box">
<span class="shelf-number"> <span class="shelf-number">
右货架号: {{rightShelveId.shelveId}} 右侧货架
</span> </span>
<a-radio-group v-model="size2" style="margin:10px 0" @change="getStockRowColumn" <a-radio-group v-model="rightSide" style="margin:10px 0"
v-if="streetDetail.rightInsideShelveId && streetDetail.rightOutsideShelveId"> v-if="streetDetail.rightType == 1">
<a-radio-button value="rightOutsideShelveId">
外 <a-radio-button :value=1>
浅侧货架
</a-radio-button> </a-radio-button>
<a-radio-button value="rightInsideShelveId"> <a-radio-button :value=2>
内 深测货架
</a-radio-button> </a-radio-button>
</a-radio-group> </a-radio-group>
</div> </div>
<div class="check-content" v-for="item in data" :key="item.name"> <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> </subsection>
</div> </div>
</div> </div>
@ -88,20 +91,12 @@ export default {
name:'checkManage', name:'checkManage',
data() { data() {
return { return {
size: 'leftOutsideShelveId', leftSide: 1,
size2: 'rightOutsideShelveId', rightSide: 1,
data: [], data: [],
select: '', select: '',
streetId: 0, streetId: 0,
streetDetail: {}, streetDetail: {},
checkList: [],
stockInfo: {
left: {},
right: {}
},
leftShelveId:{},
rightShelveId:{}
} }
}, },
computed: { 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) { getStatus(data, rowCol) {
return (data[rowCol] || {}).status; return (data[rowCol] || {}).status;
}, },
@ -194,7 +152,7 @@ export default {
data: {} data: {}
}).then(res => { }).then(res => {
this.streetDetail = res.data this.streetDetail = res.data
this.getStockRowColumn() //this.getStockRowColumn()
}).catch(err => { }).catch(err => {
}) })
@ -205,8 +163,6 @@ export default {
this.select = value this.select = value
this.getStreetDetail(value) this.getStreetDetail(value)
this.leftShelveChange();
this.rightShelveChange();
}, },
tocheckOperation(checkObj, item) { tocheckOperation(checkObj, item) {
console.log(checkObj) console.log(checkObj)

56
src/views/historyCheck/index.vue
Unescape Escape View File

@ -5,7 +5,7 @@
<a-row :gutter="24"> <a-row :gutter="24">
<a-col :span="4"> <a-col :span="4">
<a-form-item label="巷道"> <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"> <a-select-option v-for="i in listData" :key="i.name" :value="i.id">
{{i.name}} {{i.name}}
</a-select-option> </a-select-option>
@ -14,15 +14,15 @@
</a-col> </a-col>
<a-col :span="2"> <a-col :span="2">
<a-form-item label="左右货架"> <a-form-item label="左右">
<a-select @change="leftRightChange" style="width: 80px" v-model="queryParam.leftRight"> <a-select v-model="queryParam.leftRight" @change="leftRightChange" >
<a-select-option value="0"> <a-select-option :value=-1>
未选择 未选择
</a-select-option> </a-select-option>
<a-select-option value="1"> <a-select-option :value=1>
左侧 左侧
</a-select-option> </a-select-option>
<a-select-option value="2"> <a-select-option :value=2>
右侧 右侧
</a-select-option> </a-select-option>
</a-select> </a-select>
@ -30,16 +30,16 @@
</a-col> </a-col>
<a-col :span="2"> <a-col :span="2">
<a-form-item label="内外货架" v-if="queryParam.side >= 0"> <a-form-item label="深浅" v-if="queryParam.side >= 0">
<a-select style="width: 80px" :key="queryParam.side" > <a-select style="width: 50px" :key="queryParam.side" >
<a-select-option key="0"> <a-select-option :key=-1>
未选择 未选择
</a-select-option> </a-select-option>
<a-select-option key="1"> <a-select-option :key=1>
内 浅
</a-select-option> </a-select-option>
<a-select-option key="2"> <a-select-option :key=2>
外 深
</a-select-option> </a-select-option>
</a-select> </a-select>
@ -49,17 +49,17 @@
</a-col> </a-col>
<a-col :span="2" style="text-align: left"> <a-col :span="2" style="text-align: left">
<a-form-item label="行号"> <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-form-item>
</a-col> </a-col>
<a-col :span="2" style="text-align: left"> <a-col :span="2" style="text-align: left">
<a-form-item label="列号"> <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-form-item>
</a-col> </a-col>
<a-col :span="4" style="text-align: left"> <a-col :span="4" style="text-align: left">
<a-form-item label="盘点号"> <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-form-item>
</a-col> </a-col>
<a-col :span="4"> <a-col :span="4">
@ -96,7 +96,7 @@
{{ text }} {{ text }}
</span> </span>
<span slot="goodsLocation" slot-scope="text"> <span slot="goodsLocation" slot-scope="text">
{{ text.shelveId}}-{{ text.row}}-{{ text.column}} {{ text.direction == 1 ?"左":"右"}}-{{ text.side == 1 ?"浅":"深"}}-{{ text.row}}-{{ text.column}}
</span> </span>
<span slot="status" slot-scope="text"> <span slot="status" slot-scope="text">
{{ statusMap[text.status] }} {{ statusMap[text.status] }}
@ -127,16 +127,15 @@ export default {
statusMap: {0:"未盘点",1:"盘点异常",2:"核对正确",3:"人工核对正确"}, statusMap: {0:"未盘点",1:"盘点异常",2:"核对正确",3:"人工核对正确"},
queryParam: { queryParam: {
lotnum: '', lotnum: '',
shelveId:'', side : -1,
side : "-1", leftRight : -1
leftRight : "0"
}, },
listData:[], listData:[],
time:[], time:[],
pageNum: 1, pageNum: 1,
pageSize: 10, pageSize: 10,
data: [], data: [],
shelveId: '',
select: '', select: '',
pagination:{ pagination:{
total: 0, total: 0,
@ -153,8 +152,7 @@ export default {
dataIndex: "lotnum", dataIndex: "lotnum",
}, },
{ {
title: "货位({货架}-{行}-{列})", title: "货位({左右}-{深浅}-{行}-{列})",
// dataIndex: "goodsLocation",
scopedSlots: {customRender: 'goodsLocation'}, scopedSlots: {customRender: 'goodsLocation'},
}, },
{ {
@ -211,8 +209,8 @@ export default {
}, },
handleChange(value) { handleChange(value) {
this.getStreetDetail(value) this.getStreetDetail(value)
this.queryParam.leftRight = "0" this.queryParam.leftRight = -1
this.queryParam.side = "-1" this.queryParam.side = -1
}, },
// 左右货架切换 // 左右货架切换
@ -235,10 +233,6 @@ export default {
this.queryParam.side = -1 this.queryParam.side = -1
} }
}, },
// 里外切换
sideStreetChange(value) {
this.queryParam.side = value
},
handleSearch() { handleSearch() {
console.log(this.queryParam) console.log(this.queryParam)
this.pageNum = 1 this.pageNum = 1
@ -291,8 +285,8 @@ export default {
this.queryParam.startTimestamp = "" this.queryParam.startTimestamp = ""
this.queryParam.endTimestamp = "" this.queryParam.endTimestamp = ""
this.queryParam.lotnum = "" this.queryParam.lotnum = ""
this.queryParam.side = "-1" this.queryParam.side = -1
this.queryParam.leftRight = "0" this.queryParam.leftRight = -1
this.queryParam.streetId = 0 this.queryParam.streetId = 0
this.select = null; this.select = null;

46
src/views/roadwayManage/model.vue
Unescape Escape View File

@ -99,25 +99,6 @@
</a-form-item> </a-form-item>
</div> </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"> <div class="across-layout">
<a-form-item label="扫码枪IP" :label-col="formItemAcrossLayout.labelCol"> <a-form-item label="扫码枪IP" :label-col="formItemAcrossLayout.labelCol">
<a-input <a-input
@ -166,25 +147,6 @@
/> />
</a-form-item> </a-form-item>
</div> </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"> <div class="across-layout">
<a-form-item label="扫码枪IP" :label-col="formItemAcrossLayout.labelCol"> <a-form-item label="扫码枪IP" :label-col="formItemAcrossLayout.labelCol">
<a-input <a-input
@ -200,7 +162,7 @@
<a-divider></a-divider> <a-divider></a-divider>
</div> </div>
<div v-if="cameraList.length>0"> <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 <a-select
v-decorator="[ v-decorator="[
'camera1Id', 'camera1Id',
@ -213,7 +175,7 @@
</a-select-option> </a-select-option>
</a-select> </a-select>
</a-form-item> </a-form-item>
<a-form-item label="球机2" :label-col="formItemVerticalLayout.labelCol"> <a-form-item label="右侧球机" :label-col="formItemVerticalLayout.labelCol">
<a-select <a-select
v-decorator="[ v-decorator="[
'camera2Id', 'camera2Id',
@ -227,7 +189,7 @@
</a-form-item> </a-form-item>
</div> </div>
<div v-else> <div v-else>
<a-form-item label="球机1" :label-col="formItemVerticalLayout.labelCol"> <a-form-item label="左侧球机" :label-col="formItemVerticalLayout.labelCol">
<a-select <a-select
v-decorator="[ v-decorator="[
'camera1Name', 'camera1Name',
@ -240,7 +202,7 @@
</a-select-option> </a-select-option>
</a-select> </a-select>
</a-form-item> </a-form-item>
<a-form-item label="球机2" :label-col="formItemVerticalLayout.labelCol"> <a-form-item label="右侧球机" :label-col="formItemVerticalLayout.labelCol">
<a-select <a-select
v-decorator="[ v-decorator="[
'camera2Name', 'camera2Name',

24
src/views/stockLog/Subsection.vue
Unescape Escape View File

@ -25,7 +25,7 @@
<!--渲染默认巷道框架规格 定位浮在 已有巷道上做对应--> <!--渲染默认巷道框架规格 定位浮在 已有巷道上做对应-->
<span style="background:#bfbfbf;" <span style="background:#bfbfbf;"
class="default" 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)"> @click="toStockPage(random.row[0] + random.row[1] - rowIndex - 1,column)">
{{ random.row[0] + random.row[1] - rowIndex - 1}}-{{column}} {{ random.row[0] + random.row[1] - rowIndex - 1}}-{{column}}
</span> </span>
@ -83,31 +83,27 @@ export default {
} }
} }
}, },
shelveId: { //左右
type: String, direction:{
default: () => {
return {}
}
},
streetId: {
type: Number, type: Number,
default: () => { default: () => {
return {} return {}
} }
}, },
streetName: { //深浅
type: String, side:{
type: Number,
default: () => { default: () => {
return {} return {}
} }
}, },
type: { streetId: {
type: String, type: Number,
default: () => { default: () => {
return {} return {}
} }
}, },
inOut: { streetName: {
type: String, type: String,
default: () => { default: () => {
return {} return {}
@ -187,7 +183,7 @@ export default {
toStockPage(row,column){ toStockPage(row,column){
this.$router.push({ this.$router.push({
name: 'stockLogDetail', name: 'stockLogDetail',
query: {row: row, column: column, shelveId: this.shelveId} query: {row: row, column: column, direction: this.direction,side:this.side,streetId:this.streetId}
}) })
} }
} }

90
src/views/stockLog/index.vue
Unescape Escape View File

@ -13,23 +13,24 @@
<!--左货架DOM--> <!--左货架DOM-->
<div class="center-box"> <div class="center-box">
<span class="shelf-number"> <span class="shelf-number">
右货架 左侧货架
</span> </span>
<a-radio-group v-model="size" style="margin:10px 0" @change="getStockRowColumn" <a-radio-group v-model="leftSide" style="margin:10px 0" @change="getStockRowColumn"
v-if="streetDetail.leftInsideShelveId && streetDetail.leftOutsideShelveId"> v-if="streetDetail.leftType==1">
<a-radio-button value="leftOutsideShelveId"> <a-radio-button :value=1>
外 浅货架
</a-radio-button> </a-radio-button>
<a-radio-button value="leftInsideShelveId"> <a-radio-button :value=2>
内 深货架
</a-radio-button> </a-radio-button>
</a-radio-group> </a-radio-group>
</div> </div>
<div class="check-content" v-for="item in data" :key="item.id"> <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> </subsection>
</div> </div>
@ -37,24 +38,25 @@
<!--单伸类型右货架DOM--> <!--单伸类型右货架DOM-->
<div class="center-box"> <div class="center-box">
<span class="shelf-number"> <span class="shelf-number">
左货架 右侧货架
</span> </span>
<a-radio-group v-model="size2" style="margin:10px 0" @change="getStockRowColumn" <a-radio-group v-model="rightSide" style="margin:10px 0" @change="getStockRowColumn"
v-if="streetDetail.rightInsideShelveId && streetDetail.rightOutsideShelveId"> v-if="streetDetail.rightType==1">
<a-radio-button value="rightOutsideShelveId"> <a-radio-button :value=1>
外 浅货架
</a-radio-button> </a-radio-button>
<a-radio-button value="rightInsideShelveId"> <a-radio-button :value=2>
内 深货架
</a-radio-button> </a-radio-button>
</a-radio-group> </a-radio-group>
</div> </div>
<div class="check-content" v-for="item in data" :key="item.name"> <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> </subsection>
</div> </div>
</div> </div>
@ -65,8 +67,8 @@ export default {
name:'checkManage', name:'checkManage',
data() { data() {
return { return {
size: 'leftOutsideShelveId', leftSide: 1,
size2: 'rightOutsideShelveId', rightSide: 1,
data: [], data: [],
select: '', select: '',
streetId: 0, streetId: 0,
@ -126,35 +128,35 @@ export default {
}, },
rightShelveChange() { rightShelveChange() {
let shelveId; // let shelveId;
let shelveType = 'none'; // let shelveType = 'none';
if(this.streetDetail.rightShelveId) { // if(this.streetDetail.rightShelveId) {
shelveId = this.streetDetail.rightShelveId; // shelveId = this.streetDetail.rightShelveId;
}else if(this.streetDetail.rightInsideShelveId && this.size2 =='rightInsideShelveId'){ // }else if(this.streetDetail.rightInsideShelveId && this.size2 =='rightInsideShelveId'){
shelveId = this.streetDetail.rightInsideShelveId; // shelveId = this.streetDetail.rightInsideShelveId;
shelveType = 'inside'; // shelveType = 'inside';
}else if(this.streetDetail.rightOutsideShelveId && this.size2 == 'rightOutsideShelveId'){ // }else if(this.streetDetail.rightOutsideShelveId && this.size2 == 'rightOutsideShelveId'){
shelveId = this.streetDetail.rightOutsideShelveId; // shelveId = this.streetDetail.rightOutsideShelveId;
shelveType = 'out'; // shelveType = 'out';
}; // };
this.rightShelveId.shelveId = shelveId; // this.rightShelveId.shelveId = shelveId;
this.rightShelveId.shelveType = shelveType; // this.rightShelveId.shelveType = shelveType;
}, },
leftShelveChange() { leftShelveChange() {
let shelveId; // let shelveId;
let shelveType = 'none'; // let shelveType = 'none';
if(this.streetDetail.leftShelveId) { // if(this.streetDetail.leftShelveId) {
shelveId = this.streetDetail.leftShelveId; // shelveId = this.streetDetail.leftShelveId;
}else if(this.streetDetail.leftInsideShelveId && this.size =='leftInsideShelveId'){ // }else if(this.streetDetail.leftInsideShelveId && this.size =='leftInsideShelveId'){
shelveId = this.streetDetail.leftInsideShelveId; // shelveId = this.streetDetail.leftInsideShelveId;
shelveType = 'inside'; // shelveType = 'inside';
}else if(this.streetDetail.leftOutsideShelveId && this.size== 'leftOutsideShelveId'){ // }else if(this.streetDetail.leftOutsideShelveId && this.size== 'leftOutsideShelveId'){
shelveId = this.streetDetail.leftOutsideShelveId; // shelveId = this.streetDetail.leftOutsideShelveId;
shelveType = 'out'; // shelveType = 'out';
}; // };
this.leftShelveId.shelveId = shelveId; // this.leftShelveId.shelveId = shelveId;
this.leftShelveId.shelveType = shelveType; // this.leftShelveId.shelveType = shelveType;
}, },
//获取巷道详情 //获取巷道详情

13
src/views/stockLog/logPage.vue
Unescape Escape View File

@ -75,7 +75,8 @@ export default {
}, },
row: 0, row: 0,
column: 0, column: 0,
shelveId: '', direction:0,
side:0,
columns, columns,
statusMap: {0:"未知",1:"取货到位",2:"取货完成",3:"放货到位",4:"放货完成"}, statusMap: {0:"未知",1:"取货到位",2:"取货完成",3:"放货到位",4:"放货完成"},
@ -93,11 +94,13 @@ export default {
}, },
created() { created() {
this.imgUrl = imgUrl 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.row = this.$route.query.row
this.column = this.$route.query.column 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() { mounted() {
@ -125,7 +128,9 @@ export default {
pageSize:this.pageSize, pageSize:this.pageSize,
row:this.row, row:this.row,
column:this.column, column:this.column,
shelveId:this.shelveId side:this.side,
direction:this.direction,
streetId:this.streetId
} }
}).then(res => { }).then(res => {
const pagination = { ...this.pagination }; const pagination = { ...this.pagination };

Write Preview
Loading…
Cancel
Save