|
|
@ -71,7 +71,6 @@
|
|
|
|
:disabled="corpOrderIdDisabled"
|
|
|
|
:disabled="corpOrderIdDisabled"
|
|
|
|
clearable>
|
|
|
|
clearable>
|
|
|
|
<el-option
|
|
|
|
<el-option
|
|
|
|
|
|
|
|
|
|
|
|
v-for="item in busTypes"
|
|
|
|
v-for="item in busTypes"
|
|
|
|
:key="item.name"
|
|
|
|
:key="item.name"
|
|
|
|
:label="item.name"
|
|
|
|
:label="item.name"
|
|
|
@ -85,16 +84,15 @@
|
|
|
|
<el-row :gutter="20">
|
|
|
|
<el-row :gutter="20">
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
<el-col :span="2">
|
|
|
|
<el-col :span="2">
|
|
|
|
<div class="ao-text">
|
|
|
|
<div class="ao-text">
|
|
|
|
<span>当前分库:</span>
|
|
|
|
<span>当前仓库:</span>
|
|
|
|
</div>
|
|
|
|
</div>
|
|
|
|
</el-col>
|
|
|
|
</el-col>
|
|
|
|
|
|
|
|
|
|
|
|
<el-col :span="8">
|
|
|
|
<el-col :span="8">
|
|
|
|
<el-form-item prop="locStorageCode">
|
|
|
|
<el-form-item prop="locStorageCode">
|
|
|
|
<el-select v-model="formData.invWarehouseCode" placeholder="当前分库信息" clearable
|
|
|
|
<el-select v-model="formData.invWarehouseCode" placeholder="当前仓库信息" clearable
|
|
|
|
@change="getBusType"
|
|
|
|
@change="getBusType"
|
|
|
|
:disabled="corpOrderIdDisabled">
|
|
|
|
:disabled="corpOrderIdDisabled">
|
|
|
|
<el-option
|
|
|
|
<el-option
|
|
|
@ -104,7 +102,9 @@
|
|
|
|
:label="item.name"
|
|
|
|
:label="item.name"
|
|
|
|
:value="item.code">
|
|
|
|
:value="item.code">
|
|
|
|
<span style="float: left">{{ item.name }}</span>
|
|
|
|
<span style="float: left">{{ item.name }}</span>
|
|
|
|
<span style="float: right; color: #8492a6; font-size: 13px">{{ item.warehouseName }}</span>
|
|
|
|
<span style="float: right; color: #8492a6; font-size: 13px">{{
|
|
|
|
|
|
|
|
item.warehouseName
|
|
|
|
|
|
|
|
}}</span>
|
|
|
|
</el-option>
|
|
|
|
</el-option>
|
|
|
|
</el-select>
|
|
|
|
</el-select>
|
|
|
|
</el-form-item>
|
|
|
|
</el-form-item>
|
|
|
@ -112,7 +112,7 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
</el-row>
|
|
|
|
</el-row>
|
|
|
|
<!-- <el-row :gutter="20">-->
|
|
|
|
<!-- <el-row :gutter="20">-->
|
|
|
|
<!-- <el-col :span="12" class="el-col">-->
|
|
|
|
<!-- <el-col :span="12" class="el-col">-->
|
|
|
|
<!-- <div class="text item">-->
|
|
|
|
<!-- <div class="text item">-->
|
|
|
|
<!-- <el-checkbox v-model="formData.codeFillCheck"-->
|
|
|
|
<!-- <el-checkbox v-model="formData.codeFillCheck"-->
|
|
|
@ -310,7 +310,7 @@ import {getBussinessType} from "../../api/basic/bussinessType";
|
|
|
|
import {parseTime} from "../../filtres/index";
|
|
|
|
import {parseTime} from "../../filtres/index";
|
|
|
|
import store from "../../store";
|
|
|
|
import store from "../../store";
|
|
|
|
import {filterAll, filterAllByUser} from "@/api/basic/invWarehouse";
|
|
|
|
import {filterAll, filterAllByUser} from "@/api/basic/invWarehouse";
|
|
|
|
import {getLocalBusType, getLocalJoinBusType,getLocalJoinByUser} from "../../api/basic/busLocalType";
|
|
|
|
import {getLocalBusType, getLocalJoinBusType, getLocalJoinByUser} from "../../api/basic/busLocalType";
|
|
|
|
import DialogSelectUnit from "./DialogSelectUnit";
|
|
|
|
import DialogSelectUnit from "./DialogSelectUnit";
|
|
|
|
import selectRlDialog from "./DialogSelectRl";
|
|
|
|
import selectRlDialog from "./DialogSelectRl";
|
|
|
|
import editCodeDialog from "./editCode";
|
|
|
|
import editCodeDialog from "./editCode";
|
|
|
@ -448,7 +448,7 @@ export default {
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
if (this.formData.invWarehouseCode == null || this.formData.invWarehouseCode == '') {
|
|
|
|
if (this.formData.invWarehouseCode == null || this.formData.invWarehouseCode == '') {
|
|
|
|
this.$message.error('当前分库不能为空');
|
|
|
|
this.$message.error('当前仓库不能为空');
|
|
|
|
return;
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
let tQuery = Object.assign(JSON.parse(JSON.stringify(this.formData)));
|
|
|
|
let tQuery = Object.assign(JSON.parse(JSON.stringify(this.formData)));
|
|
|
@ -579,7 +579,7 @@ export default {
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
if (this.formData.invWarehouseCode == null || this.formData.invWarehouseCode == '') {
|
|
|
|
if (this.formData.invWarehouseCode == null || this.formData.invWarehouseCode == '') {
|
|
|
|
this.$message.error('当前分库不能为空');
|
|
|
|
this.$message.error('当前仓库不能为空');
|
|
|
|
return;
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
this.formData.corpOrderId = this.formData.corpOrderId.trim();
|
|
|
|
this.formData.corpOrderId = this.formData.corpOrderId.trim();
|
|
|
@ -751,20 +751,24 @@ export default {
|
|
|
|
});
|
|
|
|
});
|
|
|
|
},
|
|
|
|
},
|
|
|
|
getBusType() {
|
|
|
|
getBusType() {
|
|
|
|
this.formData.billType=null;
|
|
|
|
|
|
|
|
let query = {
|
|
|
|
let query = {
|
|
|
|
|
|
|
|
code: this.formData.invWarehouseCode,
|
|
|
|
enabled: true,
|
|
|
|
enabled: true,
|
|
|
|
invWarehouseCode: this.formData.invWarehouseCode
|
|
|
|
|
|
|
|
};
|
|
|
|
};
|
|
|
|
getLocalJoinByUser(query)
|
|
|
|
getLocalJoinByUser(query)
|
|
|
|
.then((response) => {
|
|
|
|
.then((response) => {
|
|
|
|
this.busTypes = response.data.list || [];
|
|
|
|
this.busTypes = response.data.list || [];
|
|
|
|
this.curAction = this.busTypes[0];
|
|
|
|
debugger
|
|
|
|
|
|
|
|
if (this.formData.action != null) {
|
|
|
|
|
|
|
|
this.curAction = this.getActionItem(this.formData.action);
|
|
|
|
if (this.curAction != null) {
|
|
|
|
if (this.curAction != null) {
|
|
|
|
this.formData.vailInv = this.curAction.vailInv;
|
|
|
|
this.formData.vailInv = this.curAction.vailInv;
|
|
|
|
this.formData.codeFillCheck = this.curAction.codeFillCheck;
|
|
|
|
this.formData.codeFillCheck = this.curAction.codeFillCheck;
|
|
|
|
|
|
|
|
} else {
|
|
|
|
|
|
|
|
this.curAction = {corpType: 0, genUnit: false, changeEnable: false,};
|
|
|
|
|
|
|
|
this.formData.action = null;
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
})
|
|
|
|
})
|
|
|
|
.catch(() => {
|
|
|
|
.catch(() => {
|
|
|
|
});
|
|
|
|
});
|
|
|
@ -773,7 +777,7 @@ export default {
|
|
|
|
findSubInvByInv(invCode) {
|
|
|
|
findSubInvByInv(invCode) {
|
|
|
|
this.subInvList = [];
|
|
|
|
this.subInvList = [];
|
|
|
|
let query = {
|
|
|
|
let query = {
|
|
|
|
filter:3
|
|
|
|
filter: 3
|
|
|
|
};
|
|
|
|
};
|
|
|
|
filterSubByInv(query)
|
|
|
|
filterSubByInv(query)
|
|
|
|
.then((response) => {
|
|
|
|
.then((response) => {
|
|
|
@ -931,9 +935,6 @@ export default {
|
|
|
|
this.findSubInvByInv(this.$store.getters.locInvCode);
|
|
|
|
this.findSubInvByInv(this.$store.getters.locInvCode);
|
|
|
|
this.formData.invWarehouseCode = this.$store.getters.locSubInvCode;
|
|
|
|
this.formData.invWarehouseCode = this.$store.getters.locSubInvCode;
|
|
|
|
this.corpOrderIdDisabled = false;
|
|
|
|
this.corpOrderIdDisabled = false;
|
|
|
|
if(this.formData.invWarehouseCode!=null){
|
|
|
|
|
|
|
|
this.getBusType();
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
if (JSON.stringify(this.$route.query) === '{}') {
|
|
|
|
if (JSON.stringify(this.$route.query) === '{}') {
|
|
|
|
// this.formData.corpOrderId = new Date().getTime() + (Math.ceil(Math.random() * 10 + 10) + '');
|
|
|
|
// this.formData.corpOrderId = new Date().getTime() + (Math.ceil(Math.random() * 10 + 10) + '');
|
|
|
|
let date = new Date();
|
|
|
|
let date = new Date();
|
|
|
@ -951,6 +952,9 @@ export default {
|
|
|
|
// this.getCodeList();
|
|
|
|
// this.getCodeList();
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if (this.formData.invWarehouseCode != null) {
|
|
|
|
|
|
|
|
this.getBusType();
|
|
|
|
|
|
|
|
}
|
|
|
|
},
|
|
|
|
},
|
|
|
|
};
|
|
|
|
};
|
|
|
|
</script>
|
|
|
|
</script>
|
|
|
|