|
|
|
|
@ -5,7 +5,7 @@
|
|
|
|
|
:model="orderFormData"
|
|
|
|
|
:rules="formRules"
|
|
|
|
|
ref="dataForm"
|
|
|
|
|
label-width="100px"
|
|
|
|
|
label-width="110px"
|
|
|
|
|
style="margin-bottom: -15px"
|
|
|
|
|
>
|
|
|
|
|
<el-button-group
|
|
|
|
|
@ -210,20 +210,18 @@
|
|
|
|
|
</el-form-item>
|
|
|
|
|
</el-col>
|
|
|
|
|
</el-row>
|
|
|
|
|
|
|
|
|
|
<el-row v-if="preSpaceShow">
|
|
|
|
|
<el-row v-if="curSpaceShow">
|
|
|
|
|
<el-col :span="11">
|
|
|
|
|
<el-form-item prop="checkPreInInvCode" label="预验收仓库:">
|
|
|
|
|
<el-form-item prop="curSpaceCode" label="当前货位:">
|
|
|
|
|
<el-select
|
|
|
|
|
v-model="orderFormData.checkPreInInvCode"
|
|
|
|
|
placeholder="预验收仓库"
|
|
|
|
|
v-model="orderFormData.curSpaceCode"
|
|
|
|
|
placeholder="当前货位"
|
|
|
|
|
style="width: 90%"
|
|
|
|
|
:disabled="corpOrderIdDisabled"
|
|
|
|
|
@change="changePreInInv"
|
|
|
|
|
filterable
|
|
|
|
|
>
|
|
|
|
|
<el-option
|
|
|
|
|
v-for="item in curPreInInvOptions"
|
|
|
|
|
v-for="item in curSpaceOptions"
|
|
|
|
|
:key="item.name"
|
|
|
|
|
:label="item.name"
|
|
|
|
|
:value="item.code"
|
|
|
|
|
@ -236,8 +234,34 @@
|
|
|
|
|
</el-select>
|
|
|
|
|
</el-form-item>
|
|
|
|
|
</el-col>
|
|
|
|
|
</el-row>
|
|
|
|
|
<el-row v-if="preInSpaceShow">
|
|
|
|
|
<!-- <el-col :span="11">-->
|
|
|
|
|
<!-- <el-form-item prop="checkPreInInvCode" label="预验收出库仓库:">-->
|
|
|
|
|
<!-- <el-select-->
|
|
|
|
|
<!-- v-model="orderFormData.checkPreInInvCode"-->
|
|
|
|
|
<!-- placeholder="预验收仓库"-->
|
|
|
|
|
<!-- style="width: 90%"-->
|
|
|
|
|
<!-- :disabled="corpOrderIdDisabled"-->
|
|
|
|
|
<!-- @change="changePreInInv"-->
|
|
|
|
|
<!-- filterable-->
|
|
|
|
|
<!-- >-->
|
|
|
|
|
<!-- <el-option-->
|
|
|
|
|
<!-- v-for="item in curPreInInvOptions"-->
|
|
|
|
|
<!-- :key="item.name"-->
|
|
|
|
|
<!-- :label="item.name"-->
|
|
|
|
|
<!-- :value="item.code"-->
|
|
|
|
|
<!-- >-->
|
|
|
|
|
<!-- <span style="float: left">{{ item.name }}</span>-->
|
|
|
|
|
<!-- <span style="float: right; color: #8492a6; font-size: 13px">{{-->
|
|
|
|
|
<!-- item.code-->
|
|
|
|
|
<!-- }}</span>-->
|
|
|
|
|
<!-- </el-option>-->
|
|
|
|
|
<!-- </el-select>-->
|
|
|
|
|
<!-- </el-form-item>-->
|
|
|
|
|
<!-- </el-col>-->
|
|
|
|
|
<el-col :span="11">
|
|
|
|
|
<el-form-item prop="checkPreInSpaceCode" label="预验收货位:">
|
|
|
|
|
<el-form-item prop="checkPreInSpaceCode" label="预验收出库货位:">
|
|
|
|
|
<el-select
|
|
|
|
|
v-model="orderFormData.checkPreInSpaceCode"
|
|
|
|
|
placeholder="预验收货位"
|
|
|
|
|
@ -261,6 +285,59 @@
|
|
|
|
|
</el-col>
|
|
|
|
|
|
|
|
|
|
</el-row>
|
|
|
|
|
<el-row v-if="preSpaceShow">
|
|
|
|
|
|
|
|
|
|
<!-- <el-col :span="11">-->
|
|
|
|
|
<!-- <el-form-item prop="checkPreInInvCode" label="预验收仓库:">-->
|
|
|
|
|
<!-- <el-select-->
|
|
|
|
|
<!-- v-model="orderFormData.checkPreInInvCode"-->
|
|
|
|
|
<!-- placeholder="预验收仓库"-->
|
|
|
|
|
<!-- style="width: 90%"-->
|
|
|
|
|
<!-- :disabled="corpOrderIdDisabled"-->
|
|
|
|
|
<!-- @change="changePreInInv"-->
|
|
|
|
|
<!-- filterable-->
|
|
|
|
|
<!-- >-->
|
|
|
|
|
<!-- <el-option-->
|
|
|
|
|
<!-- v-for="item in curPreInInvOptions"-->
|
|
|
|
|
<!-- :key="item.name"-->
|
|
|
|
|
<!-- :label="item.name"-->
|
|
|
|
|
<!-- :value="item.code"-->
|
|
|
|
|
<!-- >-->
|
|
|
|
|
<!-- <span style="float: left">{{ item.name }}</span>-->
|
|
|
|
|
<!-- <span style="float: right; color: #8492a6; font-size: 13px">{{-->
|
|
|
|
|
<!-- item.code-->
|
|
|
|
|
<!-- }}</span>-->
|
|
|
|
|
<!-- </el-option>-->
|
|
|
|
|
<!-- </el-select>-->
|
|
|
|
|
<!-- </el-form-item>-->
|
|
|
|
|
<!-- </el-col>-->
|
|
|
|
|
<el-col :span="11">
|
|
|
|
|
<el-form-item prop="preCurSpaceCode" label="寄售出库货位:">
|
|
|
|
|
<el-select
|
|
|
|
|
v-model="orderFormData.preCurSpaceCode"
|
|
|
|
|
placeholder="寄售出库货位"
|
|
|
|
|
style="width: 90%"
|
|
|
|
|
:disabled="corpOrderIdDisabled"
|
|
|
|
|
filterable
|
|
|
|
|
>
|
|
|
|
|
<el-option
|
|
|
|
|
v-for="item in curPreSpaceOptions"
|
|
|
|
|
:key="item.name"
|
|
|
|
|
:label="item.name"
|
|
|
|
|
:value="item.code"
|
|
|
|
|
>
|
|
|
|
|
<span style="float: left">{{ item.name }}</span>
|
|
|
|
|
<span style="float: right; color: #8492a6; font-size: 13px">{{
|
|
|
|
|
item.code
|
|
|
|
|
}}</span>
|
|
|
|
|
</el-option>
|
|
|
|
|
</el-select>
|
|
|
|
|
</el-form-item>
|
|
|
|
|
</el-col>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
</el-row>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
<el-row v-if="errView == 1">
|
|
|
|
|
<el-col :span="20">
|
|
|
|
|
@ -379,6 +456,21 @@
|
|
|
|
|
></DialogSelectUnit>
|
|
|
|
|
</el-dialog>
|
|
|
|
|
|
|
|
|
|
<el-dialog
|
|
|
|
|
title="请指定当前产品所在货位"
|
|
|
|
|
:visible.sync="selectSpaceVisible"
|
|
|
|
|
:close-on-click-modal="false"
|
|
|
|
|
:close-on-press-escape="false"
|
|
|
|
|
v-if="selectSpaceVisible"
|
|
|
|
|
width="80%"
|
|
|
|
|
append-to-body
|
|
|
|
|
>
|
|
|
|
|
<DialogSelectSpace
|
|
|
|
|
:spaceCodeList="spaceCodeList"
|
|
|
|
|
v-on:selectSpaceBind="selectSpaceBind"
|
|
|
|
|
></DialogSelectSpace>
|
|
|
|
|
</el-dialog>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
</div>
|
|
|
|
|
</template>
|
|
|
|
|
@ -406,6 +498,7 @@ import A from "../../plugins/KeyScaner";
|
|
|
|
|
import {findByInvUser} from "@/api/basic/busType";
|
|
|
|
|
import {getInvSpaceList} from "@/api/inventory/invSpace";
|
|
|
|
|
import DialogSelectUnit from "./DialogSelectUnit";
|
|
|
|
|
import DialogSelectSpace from "./DialogSelectSpace";
|
|
|
|
|
|
|
|
|
|
export default {
|
|
|
|
|
name: "ioCreateOrder",
|
|
|
|
|
@ -444,6 +537,10 @@ export default {
|
|
|
|
|
checkPreInOrders: null,
|
|
|
|
|
checkPreInInvCode: null,
|
|
|
|
|
checkPreInSpaceCode: null,
|
|
|
|
|
curSpaceCode: null,
|
|
|
|
|
preSpaceCode: null,
|
|
|
|
|
preCurSpaceCode: null, //单据
|
|
|
|
|
|
|
|
|
|
},
|
|
|
|
|
checkPreInArray: [],
|
|
|
|
|
errView: 0,
|
|
|
|
|
@ -463,9 +560,11 @@ export default {
|
|
|
|
|
busTypeOptions: [],
|
|
|
|
|
fromInvOptions: [],
|
|
|
|
|
|
|
|
|
|
preSpaceShow: false, //是否显示选择预验收界面
|
|
|
|
|
|
|
|
|
|
curPreInInvOptions: [], //预验收仓库
|
|
|
|
|
curPreInSpaceOptions: [], //预验收货位
|
|
|
|
|
curPreSpaceOptions: [], //寄售货位
|
|
|
|
|
curSpaceOptions: [], //当前货位
|
|
|
|
|
|
|
|
|
|
curAction: {
|
|
|
|
|
corpType: 0,
|
|
|
|
|
@ -512,6 +611,7 @@ export default {
|
|
|
|
|
fromStorageOptions: [],
|
|
|
|
|
curRow: null,
|
|
|
|
|
dialogTableVisible: false,
|
|
|
|
|
selectSpaceVisible: false,
|
|
|
|
|
sitcomScan: false,
|
|
|
|
|
selectRlTitle: "绑定产品",
|
|
|
|
|
selectUnitTitle: "绑定供应商",
|
|
|
|
|
@ -526,7 +626,12 @@ export default {
|
|
|
|
|
viewBizVisible: false,
|
|
|
|
|
viewCodeVisible: false,
|
|
|
|
|
viewCodeDetailVisible: false,
|
|
|
|
|
documentShow: false, //控制预选单显示隐藏
|
|
|
|
|
documentShow: false, //控制预验收选入单据界面
|
|
|
|
|
curSpaceShow: false, //正常出入库选入出库界面
|
|
|
|
|
preInSpaceShow: false, //是否显示选择预验收界面
|
|
|
|
|
preSpaceShow: false, //寄售，预验收仓库界面
|
|
|
|
|
|
|
|
|
|
spaceCodeList: [],
|
|
|
|
|
};
|
|
|
|
|
},
|
|
|
|
|
components: {
|
|
|
|
|
@ -535,7 +640,7 @@ export default {
|
|
|
|
|
bizDetailPanel,
|
|
|
|
|
editCodeDialog,
|
|
|
|
|
DialogCreateOrderSelect,
|
|
|
|
|
DialogSelectUnit
|
|
|
|
|
DialogSelectUnit, DialogSelectSpace
|
|
|
|
|
},
|
|
|
|
|
methods: {
|
|
|
|
|
//获取用户仓库列表
|
|
|
|
|
@ -549,8 +654,9 @@ export default {
|
|
|
|
|
this.curInvOptions.length > 0 &&
|
|
|
|
|
this.orderFormData.invWarehouseCode == null
|
|
|
|
|
) {
|
|
|
|
|
this.orderFormData.invWarehouseCode = this.curInvOptions[0].code;
|
|
|
|
|
this.orderFormData.invCode = this.curInvOptions[0].code;
|
|
|
|
|
this.getBusTypeByInv();
|
|
|
|
|
this.findCurSpaceList(this.orderFormData.invCode);
|
|
|
|
|
}
|
|
|
|
|
})
|
|
|
|
|
.catch(() => {
|
|
|
|
|
@ -566,14 +672,22 @@ export default {
|
|
|
|
|
// this.orderFormData.checkPreInOrders = JSON.parse(JSON.stringify(val));
|
|
|
|
|
},
|
|
|
|
|
//仓库改变
|
|
|
|
|
changeInv() {
|
|
|
|
|
changeInv(row) {
|
|
|
|
|
this.orderFormData.action = null;
|
|
|
|
|
this.orderFormData.checkPreInOrders = null;
|
|
|
|
|
this.checkPreInArray = [];
|
|
|
|
|
if (this.documentShow) {
|
|
|
|
|
this.documentShow = false;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
this.curSpaceShow = false;
|
|
|
|
|
this.preInSpaceShow = false;
|
|
|
|
|
this.preSpaceShow = false;
|
|
|
|
|
this.orderFormData.curSpaceCode = false;
|
|
|
|
|
this.orderFormData.checkPreInSpaceCode = false;
|
|
|
|
|
this.orderFormData.preCurSpaceCode = false;
|
|
|
|
|
this.getBusTypeByInv();
|
|
|
|
|
this.findCurSpaceList(row);
|
|
|
|
|
},
|
|
|
|
|
|
|
|
|
|
//根据仓库,用户获取单据类型
|
|
|
|
|
@ -677,11 +791,43 @@ export default {
|
|
|
|
|
if (this.curAction.scanPreIn && this.curAction.backPreinType == 1 && this.curAction.preInBack) {
|
|
|
|
|
this.documentShow = true;
|
|
|
|
|
} else if (this.curAction.scanPreIn && this.curAction.backPreinType == 2 && this.curAction.preInBack) {
|
|
|
|
|
this.preSpaceShow = true;
|
|
|
|
|
this.preInSpaceShow = true;
|
|
|
|
|
this.findPreInInvList();
|
|
|
|
|
} else {
|
|
|
|
|
this.documentShow = false;
|
|
|
|
|
this.preInSpaceShow = false;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (this.curAction.scanPreIn && this.curAction.spaceOut == 1) {
|
|
|
|
|
this.preInSpaceShow = true;
|
|
|
|
|
this.curSpaceShow = false;
|
|
|
|
|
this.preSpaceShow = false;
|
|
|
|
|
this.orderFormData.curSpaceCode = null;
|
|
|
|
|
this.orderFormData.checkPreInSpaceCode = null;
|
|
|
|
|
this.orderFormData.preCurSpaceCode = null;
|
|
|
|
|
this.findPreInSpaceList();
|
|
|
|
|
} else if (this.curAction.advancePreIn && this.curAction.spaceOut == 1) {
|
|
|
|
|
this.preInSpaceShow = false;
|
|
|
|
|
this.curSpaceShow = false;
|
|
|
|
|
this.preSpaceShow = true;
|
|
|
|
|
this.orderFormData.curSpaceCode = null;
|
|
|
|
|
this.orderFormData.checkPreInSpaceCode = null;
|
|
|
|
|
this.orderFormData.preCurSpaceCode = null;
|
|
|
|
|
this.findPreSpaceList()
|
|
|
|
|
} else if (this.curAction.spaceOut == 1) {
|
|
|
|
|
this.curSpaceShow = true;
|
|
|
|
|
this.preInSpaceShow = false;
|
|
|
|
|
this.preSpaceShow = false;
|
|
|
|
|
this.orderFormData.curSpaceCode = null;
|
|
|
|
|
this.orderFormData.checkPreInSpaceCode = null;
|
|
|
|
|
this.orderFormData.preCurSpaceCode = null;
|
|
|
|
|
} else {
|
|
|
|
|
this.curSpaceShow = false;
|
|
|
|
|
this.preInSpaceShow = false;
|
|
|
|
|
this.preSpaceShow = false;
|
|
|
|
|
this.orderFormData.curSpaceCode = null;
|
|
|
|
|
this.orderFormData.checkPreInSpaceCode = null;
|
|
|
|
|
this.orderFormData.preCurSpaceCode = null;
|
|
|
|
|
}
|
|
|
|
|
},
|
|
|
|
|
|
|
|
|
|
@ -712,6 +858,7 @@ export default {
|
|
|
|
|
|
|
|
|
|
//切换预验收仓库
|
|
|
|
|
changePreInInv(row) {
|
|
|
|
|
this.orderFormData.checkPreInSpaceCode = null;
|
|
|
|
|
this.findPreInSpaceList(row.code);
|
|
|
|
|
},
|
|
|
|
|
|
|
|
|
|
@ -732,7 +879,7 @@ export default {
|
|
|
|
|
//获取预验收货位
|
|
|
|
|
findPreInSpaceList(val) {
|
|
|
|
|
let query = {
|
|
|
|
|
invStorageCode: val,
|
|
|
|
|
filterType: "preIn",
|
|
|
|
|
status: 1,
|
|
|
|
|
code: this.orderFormData.checkPreInSpaceCode,
|
|
|
|
|
}
|
|
|
|
|
@ -742,6 +889,32 @@ export default {
|
|
|
|
|
},
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
//获取寄售
|
|
|
|
|
findPreSpaceList(val) {
|
|
|
|
|
let query = {
|
|
|
|
|
filterType: "pre",
|
|
|
|
|
status: 1,
|
|
|
|
|
code: this.orderFormData.preSpaceCode,
|
|
|
|
|
}
|
|
|
|
|
getInvSpaceList(query).then((res) => {
|
|
|
|
|
this.curPreSpaceOptions = res.data.list || [];
|
|
|
|
|
})
|
|
|
|
|
},
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
//获取当前货位
|
|
|
|
|
findCurSpaceList(val) {
|
|
|
|
|
let query = {
|
|
|
|
|
invWarehouseCode: val,
|
|
|
|
|
status: 1,
|
|
|
|
|
code: this.orderFormData.curSpaceCode,
|
|
|
|
|
}
|
|
|
|
|
getInvSpaceList(query).then((res) => {
|
|
|
|
|
this.curSpaceOptions = res.data.list || [];
|
|
|
|
|
})
|
|
|
|
|
},
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
//添加条码
|
|
|
|
|
addCode(event) {
|
|
|
|
|
this.originCode = "";
|
|
|
|
|
@ -831,12 +1004,14 @@ export default {
|
|
|
|
|
this.$refs.inputRef.select();
|
|
|
|
|
} else {
|
|
|
|
|
if (response.code == 502) {
|
|
|
|
|
//该产品绑定多个产品ID处理
|
|
|
|
|
this.curRow = response.data;
|
|
|
|
|
this.orderFormData.billNo = this.curRow.orderId;
|
|
|
|
|
this.refreshCodesPanel();
|
|
|
|
|
this.$message.error(response.message);
|
|
|
|
|
this.selectRlTitle = response.message;
|
|
|
|
|
} else if (response.code == 503) {
|
|
|
|
|
//该产品绑定多个供应商处理
|
|
|
|
|
this.curRow = response.data;
|
|
|
|
|
this.orderFormData.billNo = this.curRow.orderId;
|
|
|
|
|
this.codeFormData.relId = this.curRow.relId,
|
|
|
|
|
@ -902,6 +1077,10 @@ export default {
|
|
|
|
|
message: "提交失败！" + this.editTitle,
|
|
|
|
|
customClass: "messageIndex",
|
|
|
|
|
});
|
|
|
|
|
} else if (response.code == 511) {
|
|
|
|
|
//该UDI码绑定多个货位处理
|
|
|
|
|
this.spaceCodeList = response.data;
|
|
|
|
|
this.selectSpaceVisible = true;
|
|
|
|
|
} else {
|
|
|
|
|
this.$alert(response.message, "提示", {
|
|
|
|
|
confirmButtonText: "确定",
|
|
|
|
|
@ -1087,6 +1266,20 @@ export default {
|
|
|
|
|
this.orderFormData.selectSupId = row.erpId;
|
|
|
|
|
this.addCode();
|
|
|
|
|
},
|
|
|
|
|
|
|
|
|
|
selectSpaceBind(val) {
|
|
|
|
|
if (this.curAction.scanPreIn) {
|
|
|
|
|
this.orderFormData.checkPreInSpaceCode = val;
|
|
|
|
|
} else if (this.curAction.advancePreIn) {
|
|
|
|
|
this.orderFormData.preCurSpaceCode = val;
|
|
|
|
|
} else {
|
|
|
|
|
this.orderFormData.curSpaceCode = val;
|
|
|
|
|
}
|
|
|
|
|
this.addCode();
|
|
|
|
|
this.selectSpaceVisible = false;
|
|
|
|
|
},
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
closeCodeDialog() {
|
|
|
|
|
this.editOriginCodeVisible = false;
|
|
|
|
|
this.refreshCodesPanel();
|
|
|
|
|
|
CTP
2 years ago