|
|
|
@ -420,6 +420,7 @@
|
|
|
|
|
:viewType="viewType"
|
|
|
|
|
:curBustype="curAction"
|
|
|
|
|
v-if="isBizDetailAlive"
|
|
|
|
|
ref="IoCreateOrderCodeDetail"
|
|
|
|
|
></biz-detail-panel>
|
|
|
|
|
</el-tab-pane>
|
|
|
|
|
<el-tab-pane label="扫码详情" v-if="viewCodeVisible">
|
|
|
|
@ -556,7 +557,7 @@ import {
|
|
|
|
|
submitOrderWeb,
|
|
|
|
|
saveOrderWeb,
|
|
|
|
|
updateCodeBindSup,
|
|
|
|
|
enterCodeWeb, submitAllocateBiz, rollbackWaitcheck, submitCodeResult, submitCheckResult,
|
|
|
|
|
enterCodeWeb, submitAllocateBiz, rollbackWaitcheck, submitCodeResult, submitCheckResult, delmitBiz,
|
|
|
|
|
} from "../../api/inout/order";
|
|
|
|
|
import {filterSubAll, findByFrom, findInvByUser} from "../../api/system/invSubWarehouse";
|
|
|
|
|
import {parseTime} from "../../utils/coTools";
|
|
|
|
@ -575,6 +576,7 @@ import DialogSelectUnit from "./DialogSelectUnit";
|
|
|
|
|
import selectRlDialog from "./DialogSelectRl";
|
|
|
|
|
import DialogSelectSpace from "./DialogSelectSpace";
|
|
|
|
|
import {isBlank} from "@/utils/strUtil";
|
|
|
|
|
import {getDetailBizs} from "@/api/inout/orderDetailCode";
|
|
|
|
|
|
|
|
|
|
export default {
|
|
|
|
|
name: "ioCreateOrder",
|
|
|
|
@ -619,6 +621,9 @@ export default {
|
|
|
|
|
preCurSpaceCode: null, //单据
|
|
|
|
|
|
|
|
|
|
},
|
|
|
|
|
|
|
|
|
|
detailList: [],
|
|
|
|
|
total: 0,
|
|
|
|
|
checkPreInArray: [],
|
|
|
|
|
errView: 0,
|
|
|
|
|
//选入相关
|
|
|
|
@ -726,6 +731,7 @@ export default {
|
|
|
|
|
DialogSelectUnit, DialogSelectSpace, selectRlDialog
|
|
|
|
|
},
|
|
|
|
|
methods: {
|
|
|
|
|
|
|
|
|
|
//获取用户仓库列表
|
|
|
|
|
findInvListByUser() {
|
|
|
|
|
this.curInvOptions = [];
|
|
|
|
@ -825,7 +831,27 @@ export default {
|
|
|
|
|
.catch(() => {
|
|
|
|
|
});
|
|
|
|
|
},
|
|
|
|
|
delorderData(){
|
|
|
|
|
//执行清空业务单据详情
|
|
|
|
|
let tQuery = Object.assign(
|
|
|
|
|
JSON.parse(JSON.stringify(this.orderFormData))
|
|
|
|
|
);
|
|
|
|
|
tQuery.orderId = this.orderFormData.billNo;
|
|
|
|
|
console.log(tQuery.orderId);
|
|
|
|
|
delmitBiz(tQuery).then((response) => {
|
|
|
|
|
if (response.code === 20000) {
|
|
|
|
|
// this.$message.success("成功");
|
|
|
|
|
const codeDetailComponent = this.$refs.IoCreateOrderCodeDetail.getOrderDetails();
|
|
|
|
|
this.closeDialog();
|
|
|
|
|
} else {
|
|
|
|
|
// this.$message.error(response.message);
|
|
|
|
|
const codeDetailComponent = this.$refs.IoCreateOrderCodeDetail.getOrderDetails();
|
|
|
|
|
}
|
|
|
|
|
});
|
|
|
|
|
const codeDetailComponent = this.$refs.IoCreateOrderCodeDetail.getOrderDetails();
|
|
|
|
|
console.log("66:"+codeDetailComponent);
|
|
|
|
|
|
|
|
|
|
},
|
|
|
|
|
//获取往来单位候选列表
|
|
|
|
|
findMethod(query) {
|
|
|
|
|
this.fromOptions = [];
|
|
|
|
@ -847,7 +873,7 @@ export default {
|
|
|
|
|
} else if (this.curAction.corpType == 1) {
|
|
|
|
|
cQuery.corpType = 1;
|
|
|
|
|
cQuery.outType = 2;
|
|
|
|
|
}else if (this.curAction.corpType == 4) {
|
|
|
|
|
} else if (this.curAction.corpType == 4) {
|
|
|
|
|
//供应商信息
|
|
|
|
|
cQuery.corpType = 4;
|
|
|
|
|
} else
|
|
|
|
@ -861,10 +887,8 @@ export default {
|
|
|
|
|
this.loading = false;
|
|
|
|
|
});
|
|
|
|
|
},
|
|
|
|
|
|
|
|
|
|
//单据类型改变
|
|
|
|
|
actionChange(item) {
|
|
|
|
|
|
|
|
|
|
this.orderFormData.checkPreInOption = null;
|
|
|
|
|
this.orderFormData.checkPreInOrders = null;
|
|
|
|
|
this.checkPreInArray = [];
|
|
|
|
@ -884,6 +908,9 @@ export default {
|
|
|
|
|
) {
|
|
|
|
|
//1.切换往来单位
|
|
|
|
|
this.orderFormData.fromCorp = null;
|
|
|
|
|
|
|
|
|
|
this.delorderData();
|
|
|
|
|
|
|
|
|
|
this.findMethod();
|
|
|
|
|
} else if (this.curAction.corpType == 3) {
|
|
|
|
|
//2. 切换往来仓库
|
|
|
|
@ -1139,13 +1166,13 @@ export default {
|
|
|
|
|
this.$message.error(response.message);
|
|
|
|
|
this.selectRlTitle = response.message;
|
|
|
|
|
//判断是出库需要选择供应商的时候把供应商值传过去
|
|
|
|
|
if(tQuery.selectSupId!=null){
|
|
|
|
|
this.codeFormData.selectSupId=tQuery.selectSupId
|
|
|
|
|
}else{
|
|
|
|
|
this.codeFormData.selectSupId=false
|
|
|
|
|
if (tQuery.selectSupId != null) {
|
|
|
|
|
this.codeFormData.selectSupId = tQuery.selectSupId
|
|
|
|
|
} else {
|
|
|
|
|
this.codeFormData.selectSupId = false
|
|
|
|
|
}
|
|
|
|
|
//DI绑定多个产品,请指定对应产品 时候传递关键字做过滤
|
|
|
|
|
this.codeFormData.key ="key";
|
|
|
|
|
this.codeFormData.key = "key";
|
|
|
|
|
this.selectRlVisible = true;
|
|
|
|
|
} else if (response.code == 503) {
|
|
|
|
|
//该产品绑定多个供应商处理
|
|
|
|
@ -1345,6 +1372,7 @@ export default {
|
|
|
|
|
JSON.parse(JSON.stringify(this.orderFormData))
|
|
|
|
|
);
|
|
|
|
|
tQuery.orderId = this.orderFormData.billNo;
|
|
|
|
|
console.log(tQuery.orderId);
|
|
|
|
|
if (this.viewType == 2) { //扫码单据立即提交
|
|
|
|
|
submitCodes(tQuery).then((response) => {
|
|
|
|
|
if (response.code === 20000) {
|
|
|
|
|