|
|
@ -258,86 +258,6 @@
|
|
|
|
>
|
|
|
|
>
|
|
|
|
</pagination>
|
|
|
|
</pagination>
|
|
|
|
</el-tab-pane>
|
|
|
|
</el-tab-pane>
|
|
|
|
<!--<el-tab-pane>-->
|
|
|
|
|
|
|
|
<!-- <!– {{ workplaceName }}-–>-->
|
|
|
|
|
|
|
|
<!-- <span slot="label">货位</span>-->
|
|
|
|
|
|
|
|
<!-- <el-form :inline="true" :model="queueQuery" class="query-form" size="mini"-->
|
|
|
|
|
|
|
|
<!-- style="margin-bottom: 10px"-->
|
|
|
|
|
|
|
|
<!-- >-->
|
|
|
|
|
|
|
|
<!-- <el-form-item class="query-form-item" label="名称/编号:">-->
|
|
|
|
|
|
|
|
<!-- <el-input-->
|
|
|
|
|
|
|
|
<!-- v-model="queueQuery.key"-->
|
|
|
|
|
|
|
|
<!-- placeholder="请输入货位名称或货位编号"-->
|
|
|
|
|
|
|
|
<!-- clearable-->
|
|
|
|
|
|
|
|
<!-- ></el-input>-->
|
|
|
|
|
|
|
|
<!-- </el-form-item>-->
|
|
|
|
|
|
|
|
<!-- <el-form-item>-->
|
|
|
|
|
|
|
|
<!-- <el-button-group>-->
|
|
|
|
|
|
|
|
<!-- <el-button-->
|
|
|
|
|
|
|
|
<!-- type="primary"-->
|
|
|
|
|
|
|
|
<!-- icon="el-icon-refresh"-->
|
|
|
|
|
|
|
|
<!-- @click="onQueueList"-->
|
|
|
|
|
|
|
|
<!-- >重置-->
|
|
|
|
|
|
|
|
<!-- </el-button>-->
|
|
|
|
|
|
|
|
<!-- <el-button type="primary" @click="loadQueueList"-->
|
|
|
|
|
|
|
|
<!-- icon="el-icon-search"-->
|
|
|
|
|
|
|
|
<!-- >查询-->
|
|
|
|
|
|
|
|
<!-- </el-button-->
|
|
|
|
|
|
|
|
<!-- >-->
|
|
|
|
|
|
|
|
<!-- <el-button type="primary" @click="addPlaid"-->
|
|
|
|
|
|
|
|
<!-- icon="el-icon-plus"-->
|
|
|
|
|
|
|
|
<!-- >新增货位-->
|
|
|
|
|
|
|
|
<!-- </el-button-->
|
|
|
|
|
|
|
|
<!-- >-->
|
|
|
|
|
|
|
|
<!-- <!–<el-button type="primary" @click="choosePlaid"–>-->
|
|
|
|
|
|
|
|
<!-- <!– icon="el-icon-plus"–>-->
|
|
|
|
|
|
|
|
<!-- <!–>选入工位分格–>-->
|
|
|
|
|
|
|
|
<!-- <!–</el-button–>-->
|
|
|
|
|
|
|
|
<!-- <!–>–>-->
|
|
|
|
|
|
|
|
<!-- </el-button-group>-->
|
|
|
|
|
|
|
|
<!-- </el-form-item>-->
|
|
|
|
|
|
|
|
<!-- </el-form>-->
|
|
|
|
|
|
|
|
<!-- <el-table :data="queueList" style="width: 100%;" :row-style="{height: '32px' }"-->
|
|
|
|
|
|
|
|
<!-- highlight-current-row-->
|
|
|
|
|
|
|
|
<!-- >-->
|
|
|
|
|
|
|
|
<!-- <el-table-column type="index" label="序号"></el-table-column>-->
|
|
|
|
|
|
|
|
<!-- <!– <el-table-column label="业务类型编码 " prop="documentTypeCode" width="100"></el-table-column>–>-->
|
|
|
|
|
|
|
|
<!-- <el-table-column label="货位名称" prop="name"></el-table-column>-->
|
|
|
|
|
|
|
|
<!-- <el-table-column label="货位编号 " prop="code"></el-table-column>-->
|
|
|
|
|
|
|
|
<!-- <el-table-column label="产品名称" prop="productName"></el-table-column>-->
|
|
|
|
|
|
|
|
<!-- <el-table-column label="产品规格" prop="productSpec"></el-table-column>-->
|
|
|
|
|
|
|
|
<!-- <el-table-column label="备注" prop="remark"></el-table-column>-->
|
|
|
|
|
|
|
|
<!-- <el-table-column label="操作" fixed="right" width="120">-->
|
|
|
|
|
|
|
|
<!-- <template slot-scope="scope">-->
|
|
|
|
|
|
|
|
<!-- <el-button-->
|
|
|
|
|
|
|
|
<!-- type="text"-->
|
|
|
|
|
|
|
|
<!-- size="small"-->
|
|
|
|
|
|
|
|
<!-- @click.native.stop="printQueue(scope.row)"-->
|
|
|
|
|
|
|
|
<!-- >打印-->
|
|
|
|
|
|
|
|
<!-- </el-button>-->
|
|
|
|
|
|
|
|
<!-- <el-button-->
|
|
|
|
|
|
|
|
<!-- type="text"-->
|
|
|
|
|
|
|
|
<!-- size="small"-->
|
|
|
|
|
|
|
|
<!-- @click.native.stop="updateQueue(scope.row)"-->
|
|
|
|
|
|
|
|
<!-- >编辑-->
|
|
|
|
|
|
|
|
<!-- </el-button>-->
|
|
|
|
|
|
|
|
<!-- <el-button-->
|
|
|
|
|
|
|
|
<!-- type="text"-->
|
|
|
|
|
|
|
|
<!-- size="small"-->
|
|
|
|
|
|
|
|
<!-- @click.native.stop="removeQueue(scope.row)"-->
|
|
|
|
|
|
|
|
<!-- >删除-->
|
|
|
|
|
|
|
|
<!-- </el-button>-->
|
|
|
|
|
|
|
|
<!-- </template>-->
|
|
|
|
|
|
|
|
<!-- </el-table-column>-->
|
|
|
|
|
|
|
|
<!-- </el-table>-->
|
|
|
|
|
|
|
|
<!-- <pagination-->
|
|
|
|
|
|
|
|
<!-- :total="collectTotal"-->
|
|
|
|
|
|
|
|
<!-- :limit.sync="cargowQuery.limit"-->
|
|
|
|
|
|
|
|
<!-- :page.sync="cargowQuery.page"-->
|
|
|
|
|
|
|
|
<!-- @pagination="getCargowBindCollectList()"-->
|
|
|
|
|
|
|
|
<!-- >-->
|
|
|
|
|
|
|
|
<!-- </pagination>-->
|
|
|
|
|
|
|
|
<!--</el-tab-pane>-->
|
|
|
|
|
|
|
|
<el-tab-pane label="取货架" name="huojia">
|
|
|
|
<el-tab-pane label="取货架" name="huojia">
|
|
|
|
<!-- {{ workplaceName }}--->
|
|
|
|
<!-- {{ workplaceName }}--->
|
|
|
|
<freightManage
|
|
|
|
<freightManage
|
|
|
@ -942,15 +862,7 @@ export default {
|
|
|
|
|
|
|
|
|
|
|
|
})
|
|
|
|
})
|
|
|
|
},
|
|
|
|
},
|
|
|
|
getQueueList() {
|
|
|
|
|
|
|
|
this.queueQuery.workPlaceIdFk = this.rowData.workplaceId
|
|
|
|
|
|
|
|
getQueueList(this.queueQuery).then(res => {
|
|
|
|
|
|
|
|
if (res.code == 20000) {
|
|
|
|
|
|
|
|
this.queueList = res.data.list || []
|
|
|
|
|
|
|
|
this.queueTotal = res.data.total || 0
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
})
|
|
|
|
|
|
|
|
},
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
onCollectList() {
|
|
|
|
onCollectList() {
|
|
|
|
if (this.rowData.workplaceId == null) {
|
|
|
|
if (this.rowData.workplaceId == null) {
|
|
|
@ -967,21 +879,6 @@ export default {
|
|
|
|
}
|
|
|
|
}
|
|
|
|
this.getCargowBindCollectList()
|
|
|
|
this.getCargowBindCollectList()
|
|
|
|
},
|
|
|
|
},
|
|
|
|
onQueueList() {
|
|
|
|
|
|
|
|
if (this.rowData.workplaceId == null) {
|
|
|
|
|
|
|
|
return this.$message.error('请选择上货工位')
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
this.$router.push({
|
|
|
|
|
|
|
|
path: ''
|
|
|
|
|
|
|
|
})
|
|
|
|
|
|
|
|
this.queueQuery = {
|
|
|
|
|
|
|
|
page: 1,
|
|
|
|
|
|
|
|
limit: 10,
|
|
|
|
|
|
|
|
key: null,
|
|
|
|
|
|
|
|
workPlaceIdFk: null
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
this.getQueueList()
|
|
|
|
|
|
|
|
},
|
|
|
|
|
|
|
|
loadCollectList() {
|
|
|
|
loadCollectList() {
|
|
|
|
if (this.rowData.workplaceId == null) {
|
|
|
|
if (this.rowData.workplaceId == null) {
|
|
|
|
return this.$message.error('请选择上货工位')
|
|
|
|
return this.$message.error('请选择上货工位')
|
|
|
@ -994,7 +891,6 @@ export default {
|
|
|
|
return this.$message.error('请选择上货工位')
|
|
|
|
return this.$message.error('请选择上货工位')
|
|
|
|
}
|
|
|
|
}
|
|
|
|
this.queueQuery.page = 1
|
|
|
|
this.queueQuery.page = 1
|
|
|
|
this.getQueueList()
|
|
|
|
|
|
|
|
},
|
|
|
|
},
|
|
|
|
chooseCollect() {
|
|
|
|
chooseCollect() {
|
|
|
|
if (this.rowData.workplaceId == null) {
|
|
|
|
if (this.rowData.workplaceId == null) {
|
|
|
@ -1262,22 +1158,6 @@ export default {
|
|
|
|
this.queueData = null
|
|
|
|
this.queueData = null
|
|
|
|
this.plaidDialogVisible = true
|
|
|
|
this.plaidDialogVisible = true
|
|
|
|
},
|
|
|
|
},
|
|
|
|
removeQueue(row) {
|
|
|
|
|
|
|
|
this.$confirm('此操作将永久删除该工位分格, 是否继续?', '提示', {
|
|
|
|
|
|
|
|
confirmButtonText: '确定',
|
|
|
|
|
|
|
|
cancelButtonText: '取消',
|
|
|
|
|
|
|
|
type: 'warning'
|
|
|
|
|
|
|
|
}).then(() => {
|
|
|
|
|
|
|
|
deleteQueue(row).then(res => {
|
|
|
|
|
|
|
|
if (res.code == 20000) {
|
|
|
|
|
|
|
|
this.$message.success('删除成功')
|
|
|
|
|
|
|
|
this.getQueueList()
|
|
|
|
|
|
|
|
} else {
|
|
|
|
|
|
|
|
this.$message.error(res.message)
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
})
|
|
|
|
|
|
|
|
})
|
|
|
|
|
|
|
|
},
|
|
|
|
|
|
|
|
updateQueue(row) {
|
|
|
|
updateQueue(row) {
|
|
|
|
this.queueData = row
|
|
|
|
this.queueData = row
|
|
|
|
this.plaidName = 'edit'
|
|
|
|
this.plaidName = 'edit'
|
|
|
@ -1285,7 +1165,6 @@ export default {
|
|
|
|
},
|
|
|
|
},
|
|
|
|
closePlaidDialog() {
|
|
|
|
closePlaidDialog() {
|
|
|
|
this.plaidDialogVisible = false
|
|
|
|
this.plaidDialogVisible = false
|
|
|
|
this.getQueueList()
|
|
|
|
|
|
|
|
},
|
|
|
|
},
|
|
|
|
printQueue(row) {
|
|
|
|
printQueue(row) {
|
|
|
|
row.labelId = 8
|
|
|
|
row.labelId = 8
|
|
|
|