UDI
/
udiwms-vue-frame
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

工位上货问题

Browse Source
20240912_adapter_z
yewj 8 months ago
parent 2a39d0724a
commit 2e40ee4406
3 changed files with 136 additions and 135 deletions
Show Stats Download Patch File Download Diff File

109
src/views/collect/CollectOrderTabs.vue
Unescape Escape View File

@ -1,7 +1,7 @@
<template> <template>
<el-row class="tac"> <el-row class="tac">
<el-col :span="2"> <el-col :span="2">
<!-- <h5>默认颜色</h5>--> <!-- <h5>默认颜色</h5>-->
<el-menu <el-menu
:default-active="menuActive" :default-active="menuActive"
class="el-menu-vertical-demo" class="el-menu-vertical-demo"
@ -42,53 +42,51 @@
:name="item.name" :name="item.name"
> >
<component :is="item.component" v-bind="item.componentProps" /> <component :is="item.component" v-bind="item.componentProps"/>
</el-tab-pane> </el-tab-pane>
</el-tabs> </el-tabs>
<!-- <el-tabs :tab-position="tabPosition" style="height: 100%">--> <!-- <el-tabs :tab-position="tabPosition" style="height: 100%">-->
<!-- <el-tab-pane label="处理单据" style="height: 100%" @click="addTab('DealOrderBlank')">--> <!-- <el-tab-pane label="处理单据" style="height: 100%" @click="addTab('DealOrderBlank')">-->
<!-- <DealOrderBlank>--> <!-- <DealOrderBlank>-->
<!-- </DealOrderBlank>--> <!-- </DealOrderBlank>-->
<!-- </el-tab-pane>--> <!-- </el-tab-pane>-->
<!-- <el-tab-pane label="工位上货"style="height: 100%" @click="addTab('IoCreateOrderBlankReturn')">--> <!-- <el-tab-pane label="工位上货"style="height: 100%" @click="addTab('IoCreateOrderBlankReturn')">-->
<!-- <IoCreateOrderBlankReturn--> <!-- <IoCreateOrderBlankReturn-->
<!-- :splitType="'return'"--> <!-- :splitType="'return'"-->
<!-- >--> <!-- >-->
<!-- </IoCreateOrderBlankReturn>--> <!-- </IoCreateOrderBlankReturn>-->
<!-- </el-tab-pane>--> <!-- </el-tab-pane>-->
<!-- <el-tab-pane label="工位退货" style="height: 100%" @click="addTab('IoCreateOrderBlankOut')">--> <!-- <el-tab-pane label="工位退货" style="height: 100%" @click="addTab('IoCreateOrderBlankOut')">-->
<!-- <IoCreateOrderBlankOut--> <!-- <IoCreateOrderBlankOut-->
<!-- :splitType="'out'"--> <!-- :splitType="'out'"-->
<!-- >--> <!-- >-->
<!-- </IoCreateOrderBlankOut>--> <!-- </IoCreateOrderBlankOut>-->
<!-- </el-tab-pane>--> <!-- </el-tab-pane>-->
<!-- <el-tab-pane label="工位存量" style="height: 100%" @click="addTab('ioSplitFifoCodeBlank')">--> <!-- <el-tab-pane label="工位存量" style="height: 100%" @click="addTab('ioSplitFifoCodeBlank')">-->
<!-- <ioSplitFifoCodeBlank>--> <!-- <ioSplitFifoCodeBlank>-->
<!-- </ioSplitFifoCodeBlank>--> <!-- </ioSplitFifoCodeBlank>-->
<!-- </el-tab-pane>--> <!-- </el-tab-pane>-->
<!-- <el-tab-pane label="待处理单" style="height: 100%" @click="addTab('CollectOrderAllotBlank')">--> <!-- <el-tab-pane label="待处理单" style="height: 100%" @click="addTab('CollectOrderAllotBlank')">-->
<!-- <CollectOrderAllotBlank>--> <!-- <CollectOrderAllotBlank>-->
<!-- </CollectOrderAllotBlank>--> <!-- </CollectOrderAllotBlank>-->
<!-- </el-tab-pane>--> <!-- </el-tab-pane>-->
<!-- <el-tab-pane label="已完成单" style="height: 100%" @click="addTab('CollectOrderEndBlank')">--> <!-- <el-tab-pane label="已完成单" style="height: 100%" @click="addTab('CollectOrderEndBlank')">-->
<!-- <CollectOrderEndBlank>--> <!-- <CollectOrderEndBlank>-->
<!-- </CollectOrderEndBlank>--> <!-- </CollectOrderEndBlank>-->
<!-- </el-tab-pane>--> <!-- </el-tab-pane>-->
<!-- </el-tabs>--> <!-- </el-tabs>-->
</el-col> </el-col>
</el-row> </el-row>
</template> </template>
<script> <script>
@ -101,8 +99,13 @@ import ioSplitFifoCodeBlank from "@/views/collect/ioSplitFifoCodeBlank.vue";
export default { export default {
components:{ components: {
DealOrderBlank,IoCreateOrderBlankReturn,IoCreateOrderBlankOut,ioSplitFifoCodeBlank,CollectOrderAllotBlank,CollectOrderEndBlank DealOrderBlank,
IoCreateOrderBlankReturn,
IoCreateOrderBlankOut,
ioSplitFifoCodeBlank,
CollectOrderAllotBlank,
CollectOrderEndBlank
}, },
name: 'CollectOrderTabs', name: 'CollectOrderTabs',
data() { data() {
@ -127,7 +130,7 @@ export default {
component: IoCreateOrderBlankOut, component: IoCreateOrderBlankOut,
// 假设你需要传递的参数 // 假设你需要传递的参数
componentProps: { componentProps: {
splitType: 'out' fromSplitType: 'out'
} }
}, },
{ {
@ -137,7 +140,7 @@ export default {
component: IoCreateOrderBlankReturn, component: IoCreateOrderBlankReturn,
// 假设你需要传递的参数 // 假设你需要传递的参数
componentProps: { componentProps: {
splitType: 'return' fromSplitType: 'return'
} }
}, },
{ {
@ -146,9 +149,7 @@ export default {
name: 'ioSplitFifoCodeBlank', name: 'ioSplitFifoCodeBlank',
component: ioSplitFifoCodeBlank, component: ioSplitFifoCodeBlank,
// 假设你需要传递的参数 // 假设你需要传递的参数
componentProps: { componentProps: {}
}
}, },
{ {
number: 4, number: 4,
@ -156,9 +157,7 @@ export default {
name: 'CollectOrderAllotBlank', name: 'CollectOrderAllotBlank',
component: CollectOrderAllotBlank, component: CollectOrderAllotBlank,
// 假设你需要传递的参数 // 假设你需要传递的参数
componentProps: { componentProps: {}
}
}, },
{ {
number: 5, number: 5,
@ -166,9 +165,7 @@ export default {
name: 'CollectOrderEndBlank', name: 'CollectOrderEndBlank',
component: CollectOrderEndBlank, component: CollectOrderEndBlank,
// 假设你需要传递的参数 // 假设你需要传递的参数
componentProps: { componentProps: {}
}
}], }],
editableTabs: [{ editableTabs: [{
number: 0, number: 0,
@ -186,14 +183,14 @@ export default {
} }
}, },
methods: { methods: {
upodateMenuActive(tab, event){ upodateMenuActive(tab, event) {
const foundTab = this.findTabByName(tab.name); const foundTab = this.findTabByName(tab.name);
if (foundTab) { if (foundTab) {
// 如果找到了，执行一些操作 // 如果找到了，执行一些操作
this.menuActive = foundTab.number; this.menuActive = foundTab.number;
} }
}, },
clickMenuItem(val){ clickMenuItem(val) {
//分两种 一种已存在 一种未存在 //分两种 一种已存在 一种未存在
let item = this.componentTables[(val)] let item = this.componentTables[(val)]
@ -238,7 +235,7 @@ export default {
this.editableTabs = tabs.filter(tab => tab.name !== targetName); this.editableTabs = tabs.filter(tab => tab.name !== targetName);
} }
} }
} }
</script> </script>
<style scoped> <style scoped>

28
src/views/collect/IoCreateOrder.vue
Unescape Escape View File

@ -362,7 +362,7 @@ export default {
type: Object, type: Object,
required: true, required: true,
}, },
splitType: {//splitType fromSplitType: {//splitType
type: Object, type: Object,
required: true, required: true,
}, },
@ -559,7 +559,7 @@ export default {
this.$refs.inputRef.focus(); this.$refs.inputRef.focus();
}, },
successCloseData() { successCloseData() {
let workPlaceCode = this.orderFormData.workPlaceCode let tempData = JSON.parse(JSON.stringify(this.orderFormData));
this.orderFormData = { this.orderFormData = {
billNo: null, billNo: null,
corpOrderId: null, corpOrderId: null,
@ -583,19 +583,18 @@ export default {
fifoSplit: 1, fifoSplit: 1,
} }
this.orderFormData.workPlaceCode = workPlaceCode this.orderFormData.workPlaceCode = tempData.workPlaceCode
this.orderFormData.mainAction = tempData.mainAction
this.orderFormData.action = tempData.action
this.orderFormData.fromCorp = tempData.fromCorp
this.orderFormData.fromDeptCode = tempData.fromDeptCode
this.orderFormData.fromInvCode = tempData.fromInvCode
this.orderFormData.fromInvCode = tempData.fromInvCode
this.orderFormData.deptCode = tempData.deptCode
this.orderFormData.invCode = tempData.invCode
this.scanCode = ""; this.scanCode = "";
this.corpOrderIdDisabled = false; this.corpOrderIdDisabled = false;
this.splitType = this.splitType;
if (this.splitType == "search") {
} else if (this.splitType == "out") {
this.orderFormData.action = 'SC72197936495755';
} else if (this.splitType == "return") {
this.orderFormData.action = 'SC72249388338364';
}
this.orderFormData.fromCorp = "72198012799726";
this.refreshCodesPanel() this.refreshCodesPanel()
}, },
//获取用户仓库列表 //获取用户仓库列表
@ -1761,6 +1760,7 @@ export default {
init() { init() {
//页面初始化 //页面初始化
this.codeFormData.code = ""; this.codeFormData.code = "";
if (this.splitType == "search") { if (this.splitType == "search") {
} else if (this.splitType == "out") { } else if (this.splitType == "out") {
@ -1835,7 +1835,9 @@ export default {
inputer.focus(); inputer.focus();
}, },
created() { created() {
this.splitType = this.splitType; this.splitType = this.$route.query.splitType;
if (this.splitType == null)
this.splitType = this.fromSplitType
this.init(); this.init();
if (this.$route.query.workplaceId != null) { if (this.$route.query.workplaceId != null) {
this.corpOrderIdDisabled = true this.corpOrderIdDisabled = true

30
src/views/collect/IoCreateOrderBlank.vue
Unescape Escape View File

@ -362,7 +362,7 @@ export default {
type: Object, type: Object,
required: true, required: true,
}, },
splitType: {//splitType fromSplitType: {//splitType
type: Object, type: Object,
required: true, required: true,
}, },
@ -559,7 +559,7 @@ export default {
this.$refs.inputRef.focus(); this.$refs.inputRef.focus();
}, },
successCloseData() { successCloseData() {
let workPlaceCode = this.orderFormData.workPlaceCode let tempData = JSON.parse(JSON.stringify(this.orderFormData));
this.orderFormData = { this.orderFormData = {
billNo: null, billNo: null,
corpOrderId: null, corpOrderId: null,
@ -583,19 +583,18 @@ export default {
fifoSplit: 1, fifoSplit: 1,
} }
this.orderFormData.workPlaceCode = workPlaceCode this.orderFormData.workPlaceCode = tempData.workPlaceCode
this.orderFormData.mainAction = tempData.mainAction
this.orderFormData.action = tempData.action
this.orderFormData.fromCorp = tempData.fromCorp
this.orderFormData.fromDeptCode = tempData.fromDeptCode
this.orderFormData.fromInvCode = tempData.fromInvCode
this.orderFormData.fromInvCode = tempData.fromInvCode
this.orderFormData.deptCode = tempData.deptCode
this.orderFormData.invCode = tempData.invCode
this.scanCode = ""; this.scanCode = "";
this.corpOrderIdDisabled = false; this.corpOrderIdDisabled = false;
this.splitType = this.splitType;
if (this.splitType == "search") {
} else if (this.splitType == "out") {
this.orderFormData.action = 'SC72197936495755';
} else if (this.splitType == "return") {
this.orderFormData.action = 'SC72249388338364';
}
this.orderFormData.fromCorp = "72198012799726";
this.refreshCodesPanel() this.refreshCodesPanel()
}, },
//获取用户仓库列表 //获取用户仓库列表
@ -610,7 +609,7 @@ export default {
this.orderFormData.invWarehouseCode == null this.orderFormData.invWarehouseCode == null
) { ) {
//this.orderFormData.invCode = this.curInvOptions[0].code; //this.orderFormData.invCode = this.curInvOptions[0].code;
// this.getBusTypeByInv(); this.getBusTypeByInv();
this.findCurSpaceList(this.orderFormData.invCode); this.findCurSpaceList(this.orderFormData.invCode);
this.findCurWorkPlaces(); this.findCurWorkPlaces();
} }
@ -1761,6 +1760,7 @@ export default {
init() { init() {
//页面初始化 //页面初始化
this.codeFormData.code = ""; this.codeFormData.code = "";
if (this.splitType == "search") { if (this.splitType == "search") {
} else if (this.splitType == "out") { } else if (this.splitType == "out") {
@ -1835,7 +1835,9 @@ export default {
inputer.focus(); inputer.focus();
}, },
created() { created() {
this.splitType = this.splitType; this.splitType = this.$route.query.splitType;
if (this.splitType == null)
this.splitType = this.fromSplitType
this.init(); this.init();
if (this.$route.query.workplaceId != null) { if (this.$route.query.workplaceId != null) {
this.corpOrderIdDisabled = true this.corpOrderIdDisabled = true

Write Preview
Loading…
Cancel
Save