|
|
|
@ -14,9 +14,7 @@
|
|
|
|
<span
|
|
|
|
<span
|
|
|
|
style="margin: 10px;color: #2d8cf0;font-size: 14px;"
|
|
|
|
style="margin: 10px;color: #2d8cf0;font-size: 14px;"
|
|
|
|
>部门 : {{ this.userInfo.deptName }}</span>
|
|
|
|
>部门 : {{ this.userInfo.deptName }}</span>
|
|
|
|
<span
|
|
|
|
|
|
|
|
style="margin-right: 18px;margin-left:8px;color: #2d8cf0;font-size: 14px;"
|
|
|
|
|
|
|
|
>仓库 : {{ this.userInfo.inv }}</span>
|
|
|
|
|
|
|
|
<span style="font-weight: 500;color:rgb(51 48 48); font-size: 14px;">用户 : {{
|
|
|
|
<span style="font-weight: 500;color:rgb(51 48 48); font-size: 14px;">用户 : {{
|
|
|
|
this.userInfo.companyName
|
|
|
|
this.userInfo.companyName
|
|
|
|
}}</span>
|
|
|
|
}}</span>
|
|
|
|
@ -45,11 +43,11 @@
|
|
|
|
<!-->草稿保存-->
|
|
|
|
<!-->草稿保存-->
|
|
|
|
<!--</el-button>-->
|
|
|
|
<!--</el-button>-->
|
|
|
|
<el-button size="mini" type="primary" @click.native="chooseDraftOrder()" :loading="submitLoading"
|
|
|
|
<el-button size="mini" type="primary" @click.native="chooseDraftOrder()" :loading="submitLoading"
|
|
|
|
v-if="splitType=='out'"style="margin-right: 8px;border-radius: 5%;"
|
|
|
|
v-if="splitType=='out'" style="margin-right: 8px;border-radius: 5%;"
|
|
|
|
>选入草稿单据
|
|
|
|
>选入草稿单据
|
|
|
|
</el-button>
|
|
|
|
</el-button>
|
|
|
|
<el-button size="mini" type="primary" @click.native="draftOrder()" :loading="submitLoading"
|
|
|
|
<el-button size="mini" type="primary" @click.native="draftOrder()" :loading="submitLoading"
|
|
|
|
v-if="splitType=='out'"style="margin-right: 8px;border-radius: 5%;"
|
|
|
|
v-if="splitType=='out'" style="margin-right: 8px;border-radius: 5%;"
|
|
|
|
>草稿保存
|
|
|
|
>草稿保存
|
|
|
|
</el-button>
|
|
|
|
</el-button>
|
|
|
|
<el-button size="mini" type="primary" @click.native="submit()" :loading="submitLoading"
|
|
|
|
<el-button size="mini" type="primary" @click.native="submit()" :loading="submitLoading"
|
|
|
|
@ -157,7 +155,7 @@
|
|
|
|
</el-col>
|
|
|
|
</el-col>
|
|
|
|
<el-col :span="8" v-if="splitType=='out'">
|
|
|
|
<el-col :span="8" v-if="splitType=='out'">
|
|
|
|
<el-form-item prop="fifoSplit" class="query-form-item" label="上货方式:">
|
|
|
|
<el-form-item prop="fifoSplit" class="query-form-item" label="上货方式:">
|
|
|
|
<el-radio-group v-model="orderFormData.fifoSplit">
|
|
|
|
<el-radio-group v-model="orderFormData.fifoSplit" :disabled="fifoSplitEnable">
|
|
|
|
<el-radio :label="1">拆零上货</el-radio>
|
|
|
|
<el-radio :label="1">拆零上货</el-radio>
|
|
|
|
<el-radio :label="2">整取上货</el-radio>
|
|
|
|
<el-radio :label="2">整取上货</el-radio>
|
|
|
|
</el-radio-group>
|
|
|
|
</el-radio-group>
|
|
|
|
@ -314,6 +312,7 @@ import {listPage} from "@/api/basic/workPlace/sysWorkplaceManage";
|
|
|
|
import {printSplitLabel} from "@/api/collect/splitCreateOrder";
|
|
|
|
import {printSplitLabel} from "@/api/collect/splitCreateOrder";
|
|
|
|
import {findInvRemind} from "@/api/inout/splitCode";
|
|
|
|
import {findInvRemind} from "@/api/inout/splitCode";
|
|
|
|
import chooseDraftOrderDialog from "./chooseDraftOrderDialog"
|
|
|
|
import chooseDraftOrderDialog from "./chooseDraftOrderDialog"
|
|
|
|
|
|
|
|
import {getUserBindWork} from '@/api/basic/collectPoint/userWorkplace'
|
|
|
|
|
|
|
|
|
|
|
|
export default {
|
|
|
|
export default {
|
|
|
|
name: "ioCreateOrder",
|
|
|
|
name: "ioCreateOrder",
|
|
|
|
@ -368,6 +367,7 @@ export default {
|
|
|
|
inv: this.$store.getters.locInvName,
|
|
|
|
inv: this.$store.getters.locInvName,
|
|
|
|
deptName: this.$store.getters.locDeptName,
|
|
|
|
deptName: this.$store.getters.locDeptName,
|
|
|
|
userName: this.$store.getters.name,
|
|
|
|
userName: this.$store.getters.name,
|
|
|
|
|
|
|
|
userId: this.$store.getters.userId,
|
|
|
|
companyName: this.$store.getters.companyName,
|
|
|
|
companyName: this.$store.getters.companyName,
|
|
|
|
},
|
|
|
|
},
|
|
|
|
workplaceId: null,
|
|
|
|
workplaceId: null,
|
|
|
|
@ -518,7 +518,9 @@ export default {
|
|
|
|
scanResultType: "success",
|
|
|
|
scanResultType: "success",
|
|
|
|
msgTip: "当前工位存量提醒：",
|
|
|
|
msgTip: "当前工位存量提醒：",
|
|
|
|
splitType: null,
|
|
|
|
splitType: null,
|
|
|
|
rowData: {}
|
|
|
|
rowData: {},
|
|
|
|
|
|
|
|
curWorkPlace: null,
|
|
|
|
|
|
|
|
fifoSplitEnable: false,
|
|
|
|
};
|
|
|
|
};
|
|
|
|
},
|
|
|
|
},
|
|
|
|
components: {
|
|
|
|
components: {
|
|
|
|
@ -526,23 +528,20 @@ export default {
|
|
|
|
codeDetailPanel,
|
|
|
|
codeDetailPanel,
|
|
|
|
editCodeDialog,
|
|
|
|
editCodeDialog,
|
|
|
|
DialogCreateOrderSelect,
|
|
|
|
DialogCreateOrderSelect,
|
|
|
|
DialogSelectUnit, DialogSelectSpace, selectRlDialog, dialogInvProduct,chooseDraftOrderDialog
|
|
|
|
DialogSelectUnit, DialogSelectSpace, selectRlDialog, dialogInvProduct, chooseDraftOrderDialog
|
|
|
|
},
|
|
|
|
},
|
|
|
|
methods: {
|
|
|
|
methods: {
|
|
|
|
changeInvRemind(val) {
|
|
|
|
changeInvRemind(val) {
|
|
|
|
let post = {
|
|
|
|
let post = {
|
|
|
|
workPlaceCode: val
|
|
|
|
workPlaceCode: val
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
this.defaultSplitType()
|
|
|
|
findInvRemind(post).then((response) => {
|
|
|
|
findInvRemind(post).then((response) => {
|
|
|
|
if (response.code === 20000) {
|
|
|
|
if (response.code === 20000) {
|
|
|
|
this.msgTip = response.data
|
|
|
|
this.msgTip = response.data
|
|
|
|
} else {
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
})
|
|
|
|
}).catch(() => {
|
|
|
|
.catch(() => {
|
|
|
|
});
|
|
|
|
|
|
|
|
|
|
|
|
});
|
|
|
|
|
|
|
|
},
|
|
|
|
},
|
|
|
|
successCloseData() {
|
|
|
|
successCloseData() {
|
|
|
|
let workPlaceCode = this.orderFormData.workPlaceCode
|
|
|
|
let workPlaceCode = this.orderFormData.workPlaceCode
|
|
|
|
@ -567,10 +566,21 @@ export default {
|
|
|
|
sickerAdNum: null,
|
|
|
|
sickerAdNum: null,
|
|
|
|
workPlaceCode: null,
|
|
|
|
workPlaceCode: null,
|
|
|
|
fifoSplit: 1,
|
|
|
|
fifoSplit: 1,
|
|
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
this.orderFormData.workPlaceCode = workPlaceCode
|
|
|
|
this.orderFormData.workPlaceCode = workPlaceCode
|
|
|
|
this.scanCode = "";
|
|
|
|
this.scanCode = "";
|
|
|
|
this.corpOrderIdDisabled = false;
|
|
|
|
this.corpOrderIdDisabled = false;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
this.splitType = this.$route.query.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()
|
|
|
|
},
|
|
|
|
},
|
|
|
|
//获取用户仓库列表
|
|
|
|
//获取用户仓库列表
|
|
|
|
@ -593,6 +603,16 @@ export default {
|
|
|
|
.catch(() => {
|
|
|
|
.catch(() => {
|
|
|
|
});
|
|
|
|
});
|
|
|
|
},
|
|
|
|
},
|
|
|
|
|
|
|
|
defaultSplitType() {
|
|
|
|
|
|
|
|
this.curWorkPlace = this.curWorkPlaces.find(item => item.workplaceId == this.orderFormData.workPlaceCode);
|
|
|
|
|
|
|
|
this.orderFormData.fifoSplit = this.curWorkPlace.workplaceType
|
|
|
|
|
|
|
|
if (this.curWorkPlace.workplaceType == 1 || this.curWorkPlace.workplaceType == 2) {
|
|
|
|
|
|
|
|
this.fifoSplitEnable = true;
|
|
|
|
|
|
|
|
} else {
|
|
|
|
|
|
|
|
this.orderFormData.fifoSplit = 1;
|
|
|
|
|
|
|
|
this.fifoSplitEnable = false;
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
},
|
|
|
|
//仓库改变
|
|
|
|
//仓库改变
|
|
|
|
changeInv(row) {
|
|
|
|
changeInv(row) {
|
|
|
|
this.orderFormData.action = null;
|
|
|
|
this.orderFormData.action = null;
|
|
|
|
@ -935,16 +955,17 @@ export default {
|
|
|
|
//获取当前货位
|
|
|
|
//获取当前货位
|
|
|
|
findCurWorkPlaces(val) {
|
|
|
|
findCurWorkPlaces(val) {
|
|
|
|
let query = {
|
|
|
|
let query = {
|
|
|
|
key: val,
|
|
|
|
// key: val,
|
|
|
|
status: 1,
|
|
|
|
// status: 1,
|
|
|
|
// invCode: this.orderFormData.invCode,
|
|
|
|
userId: this.userInfo.userId,
|
|
|
|
page: 1,
|
|
|
|
page: 1,
|
|
|
|
limit: 100,
|
|
|
|
limit: 100,
|
|
|
|
}
|
|
|
|
}
|
|
|
|
listPage(query).then((res) => {
|
|
|
|
getUserBindWork(query).then((res) => {
|
|
|
|
this.curWorkPlaces = res.data.list || [];
|
|
|
|
this.curWorkPlaces = res.data.list || [];
|
|
|
|
if (this.curWorkPlaces.length == 1) {
|
|
|
|
if (this.curWorkPlaces.length == 1 && this.$isNotBlank(this.orderFormData.workPlaceCode)) {
|
|
|
|
this.orderFormData.workPlaceCode = this.curWorkPlaces[0].workplaceId;
|
|
|
|
this.orderFormData.workPlaceCode = this.curWorkPlaces[0].workplaceId;
|
|
|
|
|
|
|
|
this.defaultSplitType()
|
|
|
|
}
|
|
|
|
}
|
|
|
|
})
|
|
|
|
})
|
|
|
|
},
|
|
|
|
},
|
|
|
|
@ -1221,6 +1242,10 @@ export default {
|
|
|
|
|
|
|
|
|
|
|
|
refreshOrder(orderQuery) {
|
|
|
|
refreshOrder(orderQuery) {
|
|
|
|
this.orderFormData = orderQuery;
|
|
|
|
this.orderFormData = orderQuery;
|
|
|
|
|
|
|
|
this.scanCode = "";
|
|
|
|
|
|
|
|
this.result = "";
|
|
|
|
|
|
|
|
this.refreshCodesPanel()
|
|
|
|
|
|
|
|
this.init();
|
|
|
|
},
|
|
|
|
},
|
|
|
|
|
|
|
|
|
|
|
|
//撤回单据
|
|
|
|
//撤回单据
|
|
|
|
@ -1445,7 +1470,7 @@ export default {
|
|
|
|
}
|
|
|
|
}
|
|
|
|
},
|
|
|
|
},
|
|
|
|
//选入草稿单据
|
|
|
|
//选入草稿单据
|
|
|
|
chooseDraftOrder(){
|
|
|
|
chooseDraftOrder() {
|
|
|
|
if (this.$isBlank(this.orderFormData.workPlaceCode)) {
|
|
|
|
if (this.$isBlank(this.orderFormData.workPlaceCode)) {
|
|
|
|
this.$message.warning("请选择工位！");
|
|
|
|
this.$message.warning("请选择工位！");
|
|
|
|
return;
|
|
|
|
return;
|
|
|
|
@ -1454,12 +1479,12 @@ export default {
|
|
|
|
this.rowData.fifoSplit = this.orderFormData.fifoSplit
|
|
|
|
this.rowData.fifoSplit = this.orderFormData.fifoSplit
|
|
|
|
this.chooseDraftOrderVisible = true
|
|
|
|
this.chooseDraftOrderVisible = true
|
|
|
|
},
|
|
|
|
},
|
|
|
|
closeChooseDialog(){
|
|
|
|
closeChooseDialog() {
|
|
|
|
this.chooseDraftOrderVisible = false
|
|
|
|
this.chooseDraftOrderVisible = false
|
|
|
|
},
|
|
|
|
},
|
|
|
|
handleChoose(billNo){
|
|
|
|
handleChoose(currentRow) {
|
|
|
|
this.orderFormData.billNo = billNo
|
|
|
|
this.orderQuery = currentRow
|
|
|
|
this.refreshCodesPanel();
|
|
|
|
this.refreshOrder(this.orderQuery)
|
|
|
|
},
|
|
|
|
},
|
|
|
|
draftOrder() {
|
|
|
|
draftOrder() {
|
|
|
|
let tQuery = Object.assign(
|
|
|
|
let tQuery = Object.assign(
|
|
|
|
@ -1721,8 +1746,6 @@ export default {
|
|
|
|
init() {
|
|
|
|
init() {
|
|
|
|
//页面初始化
|
|
|
|
//页面初始化
|
|
|
|
this.codeFormData.code = "";
|
|
|
|
this.codeFormData.code = "";
|
|
|
|
|
|
|
|
|
|
|
|
this.splitType = this.$route.query.splitType;
|
|
|
|
|
|
|
|
if (this.splitType == "search") {
|
|
|
|
if (this.splitType == "search") {
|
|
|
|
} else if (this.splitType == "out") {
|
|
|
|
} else if (this.splitType == "out") {
|
|
|
|
this.orderFormData.action = 'SC72197936495755';
|
|
|
|
this.orderFormData.action = 'SC72197936495755';
|
|
|
|
@ -1796,6 +1819,7 @@ export default {
|
|
|
|
inputer.focus();
|
|
|
|
inputer.focus();
|
|
|
|
},
|
|
|
|
},
|
|
|
|
created() {
|
|
|
|
created() {
|
|
|
|
|
|
|
|
this.splitType = this.$route.query.splitType;
|
|
|
|
this.init();
|
|
|
|
this.init();
|
|
|
|
if (this.$route.query.workplaceId != null) {
|
|
|
|
if (this.$route.query.workplaceId != null) {
|
|
|
|
this.corpOrderIdDisabled = true
|
|
|
|
this.corpOrderIdDisabled = true
|
|
|
|
|
wangwei
10 months ago