|
|
|
|
@ -56,42 +56,28 @@
|
|
|
|
|
<el-row :gutter="20" style="margin-top: -10px">
|
|
|
|
|
<el-col :span="3">
|
|
|
|
|
<div class="ao-text">
|
|
|
|
|
<span>当前仓库：</span>
|
|
|
|
|
<span>业务类型：</span>
|
|
|
|
|
</div>
|
|
|
|
|
</el-col>
|
|
|
|
|
|
|
|
|
|
<el-col :span="7">
|
|
|
|
|
<el-form-item prop="locStorageCode">
|
|
|
|
|
<el-select v-model="formData.locStorageCode" style="width: 50%;" placeholder="当前仓库信息"
|
|
|
|
|
@change="locInChange"
|
|
|
|
|
clearable>
|
|
|
|
|
<el-option
|
|
|
|
|
v-for="item in storageList"
|
|
|
|
|
:key="item.name"
|
|
|
|
|
:label="item.name"
|
|
|
|
|
|
|
|
|
|
:value="item.code">
|
|
|
|
|
<span style="float: left">{{ item.name }}</span>
|
|
|
|
|
</el-option>
|
|
|
|
|
</el-select>
|
|
|
|
|
<el-select v-model="formData.invWarehouseCode" placeholder="当前分库信息" style="width: 50%;"
|
|
|
|
|
clearable>
|
|
|
|
|
<el-form-item prop="billType">
|
|
|
|
|
<el-select v-model="formData.billType" placeholder="请选择业务类型"
|
|
|
|
|
@change="actionChange" clearable>
|
|
|
|
|
<el-option
|
|
|
|
|
v-for="item in subInvList"
|
|
|
|
|
:key="item.name"
|
|
|
|
|
|
|
|
|
|
:label="item.name"
|
|
|
|
|
:value="item.code">
|
|
|
|
|
<span style="float: left">{{ item.name }}</span>
|
|
|
|
|
v-for="item in busTypes"
|
|
|
|
|
:key="item.thirdAction"
|
|
|
|
|
:label="item.thirdName"
|
|
|
|
|
:value="item.thirdAction">
|
|
|
|
|
<span style="float: left">{{ item.thirdName }}</span>
|
|
|
|
|
</el-option>
|
|
|
|
|
</el-select>
|
|
|
|
|
</el-form-item>
|
|
|
|
|
|
|
|
|
|
</el-col>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
<el-col :span="3">
|
|
|
|
|
<div class="ao-text">
|
|
|
|
|
<span>往来信息：</span>
|
|
|
|
|
<span>往来单位：</span>
|
|
|
|
|
</div>
|
|
|
|
|
</el-col>
|
|
|
|
|
<el-col :span="7">
|
|
|
|
|
@ -100,10 +86,9 @@
|
|
|
|
|
v-model="formData.corpName"
|
|
|
|
|
filterable
|
|
|
|
|
remote
|
|
|
|
|
style="width: 50%"
|
|
|
|
|
clearable="true"
|
|
|
|
|
reserve-keyword
|
|
|
|
|
placeholder="请输入仓库信息"
|
|
|
|
|
placeholder="请输入往来单位"
|
|
|
|
|
:remote-method="findStorageMethod"
|
|
|
|
|
:loading="loading"
|
|
|
|
|
@change="storageChange"
|
|
|
|
|
@ -119,58 +104,35 @@
|
|
|
|
|
}}</span>
|
|
|
|
|
</el-option>
|
|
|
|
|
</el-select>
|
|
|
|
|
<el-select v-model="formData.fromSubInvCode" placeholder="请选择分库" clearable="true"
|
|
|
|
|
style="width: 50%"
|
|
|
|
|
>
|
|
|
|
|
<el-option
|
|
|
|
|
v-for="item in fromSubStorageOptions"
|
|
|
|
|
:key="item.code"
|
|
|
|
|
: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 :gutter="20" style="margin-top: -10px">
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
<el-col :span="3">
|
|
|
|
|
<div class="ao-text">
|
|
|
|
|
<span>领用类型：</span>
|
|
|
|
|
<span>当前分库：</span>
|
|
|
|
|
</div>
|
|
|
|
|
</el-col>
|
|
|
|
|
|
|
|
|
|
<el-col :span="7">
|
|
|
|
|
<el-form-item prop="billType">
|
|
|
|
|
<el-select v-model="formData.billType" placeholder="请选择领用类型" style="width: 100%"
|
|
|
|
|
<el-form-item prop="invWarehouseCode">
|
|
|
|
|
<el-select v-model="formData.invWarehouseCode" placeholder="当前分库信息"
|
|
|
|
|
clearable>
|
|
|
|
|
<el-option
|
|
|
|
|
v-for="item in busTypes"
|
|
|
|
|
:key="item.originAction"
|
|
|
|
|
:label="item.originName"
|
|
|
|
|
:value="item.originAction">
|
|
|
|
|
<span style="float: left">{{ item.originName }}</span>
|
|
|
|
|
v-for="item in subInvList"
|
|
|
|
|
: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.warehouseName }}</span>
|
|
|
|
|
</el-option>
|
|
|
|
|
</el-select>
|
|
|
|
|
</el-form-item>
|
|
|
|
|
</el-col>
|
|
|
|
|
|
|
|
|
|
<el-col :span="3">
|
|
|
|
|
<div class="ao-text">
|
|
|
|
|
<span>备注：</span>
|
|
|
|
|
</div>
|
|
|
|
|
</el-col>
|
|
|
|
|
|
|
|
|
|
<el-col :span="7">
|
|
|
|
|
<el-form-item prop="remark">
|
|
|
|
|
<el-input v-model="formData.remark" auto-complete="off"></el-input>
|
|
|
|
|
</el-form-item>
|
|
|
|
|
</el-col>
|
|
|
|
|
|
|
|
|
|
</el-row>
|
|
|
|
|
</el-card>
|
|
|
|
|
|
|
|
|
|
@ -294,6 +256,20 @@
|
|
|
|
|
</el-card>
|
|
|
|
|
</el-form>
|
|
|
|
|
|
|
|
|
|
<el-dialog
|
|
|
|
|
title="产品录入"
|
|
|
|
|
:visible.sync="selectProductVisible"
|
|
|
|
|
:close-on-click-modal="false"
|
|
|
|
|
:close-on-press-escape="false"
|
|
|
|
|
width="85%"
|
|
|
|
|
v-if="selectProductVisible"
|
|
|
|
|
:append-to-body='true'
|
|
|
|
|
>
|
|
|
|
|
<stockOrderNewSelectProduct
|
|
|
|
|
:closeDialog="closeDialogC2"
|
|
|
|
|
:data="thisData"
|
|
|
|
|
></stockOrderNewSelectProduct>
|
|
|
|
|
</el-dialog>
|
|
|
|
|
|
|
|
|
|
<el-dialog
|
|
|
|
|
title="库存产品录入"
|
|
|
|
|
@ -308,7 +284,6 @@
|
|
|
|
|
:closeDialog="closeDialogC2"
|
|
|
|
|
:data="thisData"
|
|
|
|
|
:invQueryData="invQueryData"
|
|
|
|
|
:type="1"
|
|
|
|
|
></dialogInvProduct>
|
|
|
|
|
</el-dialog>
|
|
|
|
|
</div>
|
|
|
|
|
@ -337,8 +312,8 @@ import {getBussinessType} from "../../api/basic/bussinessType";
|
|
|
|
|
import {getLocalBusType, getLocalJoinBusType, getLocalJoinByUser} from "../../api/basic/busLocalType";
|
|
|
|
|
import {filterAll, filterAllByLoc, filterAllByUser} from "@/api/basic/invWarehouse";
|
|
|
|
|
import dialogInvProduct from "../inventory/DialogInvProduct"
|
|
|
|
|
import {getBusChange} from "@/api/basic/busTypeChange";
|
|
|
|
|
import {inserThrOrderWeb, updateReceive} from "@/api/thrsys/thrOrderReceive";
|
|
|
|
|
import {getOriginJoinBusType} from "@/api/basic/busOriginType";
|
|
|
|
|
import {inserThrOrderWeb} from "@/api/thrsys/thrOrderReceive";
|
|
|
|
|
import {getThrOrderDetails, delThrOrders, delOrderDetail} from "@/api/thrsys/thrOrder";
|
|
|
|
|
import {filterSubByInv} from "@/api/basic/invSubWarehouse";
|
|
|
|
|
|
|
|
|
|
@ -357,10 +332,6 @@ export default {
|
|
|
|
|
type: Function,
|
|
|
|
|
required: true,
|
|
|
|
|
},
|
|
|
|
|
editType: {
|
|
|
|
|
type: Object,
|
|
|
|
|
required: true,
|
|
|
|
|
},
|
|
|
|
|
},
|
|
|
|
|
data() {
|
|
|
|
|
return {
|
|
|
|
|
@ -406,7 +377,6 @@ export default {
|
|
|
|
|
subInvList: [],
|
|
|
|
|
fromOptions: [],
|
|
|
|
|
fromStorageOptions: [],
|
|
|
|
|
fromSubStorageOptions: [],
|
|
|
|
|
total: 0,
|
|
|
|
|
loading: false,
|
|
|
|
|
index: null,
|
|
|
|
|
@ -428,6 +398,10 @@ export default {
|
|
|
|
|
1: "预入库",
|
|
|
|
|
2: "普通采购",
|
|
|
|
|
},
|
|
|
|
|
curAction: {
|
|
|
|
|
corpType: 0,
|
|
|
|
|
genUnit: false,
|
|
|
|
|
},
|
|
|
|
|
orderEditor: true,
|
|
|
|
|
iCount: 0,
|
|
|
|
|
sOptions: [],
|
|
|
|
|
@ -437,11 +411,11 @@ export default {
|
|
|
|
|
busTypes: [],
|
|
|
|
|
currentRow: {},
|
|
|
|
|
selectedIndex: "",
|
|
|
|
|
selectProductVisible: false,
|
|
|
|
|
selectInvProductVisible: false,
|
|
|
|
|
thisData: {},
|
|
|
|
|
storageList: [],
|
|
|
|
|
invQueryData: {},
|
|
|
|
|
type: 1,
|
|
|
|
|
|
|
|
|
|
};
|
|
|
|
|
},
|
|
|
|
|
@ -475,7 +449,7 @@ export default {
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (status === '2') {
|
|
|
|
|
if (status === '0') {
|
|
|
|
|
for (let i = 0; i < this.codeArray.length; i++) {
|
|
|
|
|
if (this.$isBlank(this.codeArray[i].count) || this.codeArray[i].count == "0") {
|
|
|
|
|
return this.$message.error('单据数量不能为0');
|
|
|
|
|
@ -518,11 +492,8 @@ export default {
|
|
|
|
|
console.log(row);
|
|
|
|
|
this.formData.corpId = row.code;
|
|
|
|
|
this.formData.corpName = row.name;
|
|
|
|
|
this.findSubStorageMethod();
|
|
|
|
|
},
|
|
|
|
|
|
|
|
|
|
//当前仓库
|
|
|
|
|
getStorage() {
|
|
|
|
|
getStorage(event) {
|
|
|
|
|
this.storageList = [];
|
|
|
|
|
filterAllByUser()
|
|
|
|
|
.then((response) => {
|
|
|
|
|
@ -533,23 +504,6 @@ export default {
|
|
|
|
|
});
|
|
|
|
|
},
|
|
|
|
|
|
|
|
|
|
//当前分库
|
|
|
|
|
findSubInvs() {
|
|
|
|
|
this.subInvList = [];
|
|
|
|
|
let query = {
|
|
|
|
|
pcode: this.formData.locStorageCode
|
|
|
|
|
};
|
|
|
|
|
filterSubByInv(query)
|
|
|
|
|
.then((response) => {
|
|
|
|
|
this.subInvList = response.data || [];
|
|
|
|
|
if (this.subInvList != null && this.subInvList.length == 1) {
|
|
|
|
|
this.formData.invWarehouseCode = this.subInvList[0].code;
|
|
|
|
|
}
|
|
|
|
|
})
|
|
|
|
|
.catch(() => {
|
|
|
|
|
});
|
|
|
|
|
},
|
|
|
|
|
|
|
|
|
|
getActionName(action) {
|
|
|
|
|
for (let i = 0; i < this.busTypes.length; i++) {
|
|
|
|
|
if (this.busTypes[i].action === action) {
|
|
|
|
|
@ -557,9 +511,7 @@ export default {
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
},
|
|
|
|
|
|
|
|
|
|
//往来仓库
|
|
|
|
|
findStorageMethod() {
|
|
|
|
|
findStorageMethod(query) {
|
|
|
|
|
if (this.formData.locStorageCode == null)
|
|
|
|
|
return;
|
|
|
|
|
this.fromStorageOptions = [];
|
|
|
|
|
@ -579,22 +531,6 @@ export default {
|
|
|
|
|
.catch(() => {
|
|
|
|
|
});
|
|
|
|
|
},
|
|
|
|
|
|
|
|
|
|
//往来分库
|
|
|
|
|
findSubStorageMethod() {
|
|
|
|
|
let cQuery = {
|
|
|
|
|
pcode: this.formData.corpId,
|
|
|
|
|
filter: 2,
|
|
|
|
|
};
|
|
|
|
|
filterSubByInv(cQuery)
|
|
|
|
|
.then((response) => {
|
|
|
|
|
this.fromSubStorageOptions = response.data || [];
|
|
|
|
|
})
|
|
|
|
|
.catch(() => {
|
|
|
|
|
});
|
|
|
|
|
},
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
submitFunction(status) {
|
|
|
|
|
let tMessage = status === '501' ? '保存' : '提交';
|
|
|
|
|
this.loading = true;
|
|
|
|
|
@ -602,7 +538,10 @@ export default {
|
|
|
|
|
tQuery.editStatus = status;
|
|
|
|
|
tQuery.subErpOrders = this.codeArray;
|
|
|
|
|
tQuery.thirdPartyDate = 2;
|
|
|
|
|
if (this.editType === "add") {
|
|
|
|
|
|
|
|
|
|
// tQuery.billType = this.formData.bi;
|
|
|
|
|
console.log(tQuery);
|
|
|
|
|
|
|
|
|
|
inserThrOrderWeb(tQuery)
|
|
|
|
|
.then(response => {
|
|
|
|
|
this.loading = false;
|
|
|
|
|
@ -616,23 +555,6 @@ export default {
|
|
|
|
|
.catch(() => {
|
|
|
|
|
this.loading = false;
|
|
|
|
|
})
|
|
|
|
|
} else if (this.editType === "update") {
|
|
|
|
|
updateReceive(tQuery)
|
|
|
|
|
.then(response => {
|
|
|
|
|
this.loading = false;
|
|
|
|
|
if (response.code === 20000) {
|
|
|
|
|
this.$message.success(tMessage + "成功");
|
|
|
|
|
this.closeDialog(true);
|
|
|
|
|
} else {
|
|
|
|
|
this.$message.error(response.message);
|
|
|
|
|
}
|
|
|
|
|
})
|
|
|
|
|
.catch(() => {
|
|
|
|
|
this.loading = false;
|
|
|
|
|
})
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
},
|
|
|
|
|
selectProductFunction(event) {
|
|
|
|
|
|
|
|
|
|
@ -658,20 +580,25 @@ export default {
|
|
|
|
|
if (this.orderEditor) {
|
|
|
|
|
this.thisData.orderId = this.formData.id
|
|
|
|
|
}
|
|
|
|
|
this.curAction = this.getActionItem(this.formData.billType);
|
|
|
|
|
this.thisData.stockOrderLists = this.codeArray;
|
|
|
|
|
this.thisData.formData = this.formData;
|
|
|
|
|
this.thisData.formData.thirdSysFk = this.curAction.thirdSys;
|
|
|
|
|
this.thisData.billType = this.curAction.localAction;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
this.invQueryData = {
|
|
|
|
|
locStorageCode: this.formData.locStorageCode,
|
|
|
|
|
};
|
|
|
|
|
this.selectInvProductVisible = true;
|
|
|
|
|
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
},
|
|
|
|
|
closeDialogC2(rData) {
|
|
|
|
|
this.selectProductVisible = false;
|
|
|
|
|
this.selectInvProductVisible = false;
|
|
|
|
|
this.thisData = {};
|
|
|
|
|
|
|
|
|
|
@ -920,12 +847,13 @@ export default {
|
|
|
|
|
},
|
|
|
|
|
getBusType() {
|
|
|
|
|
let query = {
|
|
|
|
|
enable: false,
|
|
|
|
|
type: 1,
|
|
|
|
|
enabled: true,
|
|
|
|
|
corpType: 1,
|
|
|
|
|
};
|
|
|
|
|
getBusChange(query)
|
|
|
|
|
getOriginJoinBusType(query)
|
|
|
|
|
.then((response) => {
|
|
|
|
|
this.busTypes = response.data.list || [];
|
|
|
|
|
this.curAction = this.busTypes[0];
|
|
|
|
|
})
|
|
|
|
|
.catch(() => {
|
|
|
|
|
});
|
|
|
|
|
@ -936,6 +864,42 @@ export default {
|
|
|
|
|
this.formData.corpId = event.erpId;
|
|
|
|
|
this.formData.unitIdFk = event.erpId;
|
|
|
|
|
},
|
|
|
|
|
findMethod(query) {
|
|
|
|
|
console.log(query);
|
|
|
|
|
this.fromOptions = [];
|
|
|
|
|
let cQuery = {
|
|
|
|
|
key: query,
|
|
|
|
|
corpType: null,
|
|
|
|
|
outType: null,
|
|
|
|
|
};
|
|
|
|
|
if (this.curAction.corpType == 3) {//特殊往来
|
|
|
|
|
cQuery.corpType = 4;
|
|
|
|
|
this.formData.corpId = this.curAction.defaultUnit;
|
|
|
|
|
} else if (this.curAction.corpType == 2)//客户
|
|
|
|
|
{
|
|
|
|
|
cQuery.corpType = 4;
|
|
|
|
|
cQuery.outType = 2;
|
|
|
|
|
|
|
|
|
|
} else if (this.curAction.corpType == 0) {
|
|
|
|
|
cQuery.corpType = 2;
|
|
|
|
|
} else return;
|
|
|
|
|
|
|
|
|
|
getBasicUnitMaintains(cQuery)
|
|
|
|
|
.then((response) => {
|
|
|
|
|
this.loading = false;
|
|
|
|
|
this.fromOptions = response.data.page.list || [];
|
|
|
|
|
if (this.curAction.corpType == 3) {
|
|
|
|
|
for (let i = 0; i < this.fromOptions.length; i++) {
|
|
|
|
|
if (this.fromOptions[i].erpId == this.formData.corpId) {
|
|
|
|
|
this.formData.corpName = this.fromOptions[i].name;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
})
|
|
|
|
|
.catch(() => {
|
|
|
|
|
this.loading = false;
|
|
|
|
|
});
|
|
|
|
|
},
|
|
|
|
|
getActionItem(action) {
|
|
|
|
|
for (let i = 0; i < this.busTypes.length; i++) {
|
|
|
|
|
if (this.busTypes[i].thirdAction === action) {
|
|
|
|
|
@ -943,15 +907,38 @@ export default {
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
},
|
|
|
|
|
actionChange(item) {
|
|
|
|
|
console.log(item);
|
|
|
|
|
this.curAction = this.getActionItem(item);
|
|
|
|
|
this.locInChange();
|
|
|
|
|
this.findMethod();
|
|
|
|
|
|
|
|
|
|
},
|
|
|
|
|
locInChange(item) {
|
|
|
|
|
if (this.formData.invWarehouseCode != null) {
|
|
|
|
|
this.formData.invWarehouseCode = "";
|
|
|
|
|
}
|
|
|
|
|
this.formData.locStorageCode = item;
|
|
|
|
|
this.$forceUpdate();
|
|
|
|
|
this.getBusType(item);
|
|
|
|
|
this.findStorageMethod();
|
|
|
|
|
this.findSubInvs();
|
|
|
|
|
},
|
|
|
|
|
findSubInvs() {
|
|
|
|
|
this.subInvList = [];
|
|
|
|
|
let query = {
|
|
|
|
|
pcode: this.formData.locStorageCode
|
|
|
|
|
};
|
|
|
|
|
filterSubByInv(query)
|
|
|
|
|
.then((response) => {
|
|
|
|
|
this.subInvList = response.data || [];
|
|
|
|
|
if (this.subInvList != null && this.subInvList.length == 1) {
|
|
|
|
|
this.formData.invWarehouseCode = this.subInvList[0].code;
|
|
|
|
|
}
|
|
|
|
|
})
|
|
|
|
|
.catch(() => {
|
|
|
|
|
});
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
},
|
|
|
|
|
@ -991,10 +978,8 @@ export default {
|
|
|
|
|
|
|
|
|
|
this.getBusType();
|
|
|
|
|
this.getStorage();
|
|
|
|
|
this.findSubInvs();
|
|
|
|
|
this.findStorageMethod();
|
|
|
|
|
this.findSubInvByInv();
|
|
|
|
|
this.findSubStorageMethod();
|
|
|
|
|
// this.findSubInvByInv();
|
|
|
|
|
this.codeArray = [];
|
|
|
|
|
this.closeConfirmFunction(false);
|
|
|
|
|
},
|
|
|
|
|
|
zhengmingliang
3 years ago
committed by
郑明梁