|
|
|
@ -62,7 +62,6 @@
|
|
|
|
<el-form-item class="query-form-item" prop="targetInvCode" label="领用仓库:">
|
|
|
|
<el-form-item class="query-form-item" prop="targetInvCode" label="领用仓库:">
|
|
|
|
<el-select v-model="formData.targetInvCode" placeholder="请选择领用仓库" @change="getTargerType"
|
|
|
|
<el-select v-model="formData.targetInvCode" placeholder="请选择领用仓库" @change="getTargerType"
|
|
|
|
clearable="true"
|
|
|
|
clearable="true"
|
|
|
|
:disabled="true"
|
|
|
|
|
|
|
|
style="width: 100%"
|
|
|
|
style="width: 100%"
|
|
|
|
>
|
|
|
|
>
|
|
|
|
<el-option
|
|
|
|
<el-option
|
|
|
|
@ -140,10 +139,12 @@
|
|
|
|
<el-table-column label="供应商" prop="supName"></el-table-column>
|
|
|
|
<el-table-column label="供应商" prop="supName"></el-table-column>
|
|
|
|
<el-table-column label="操作" width="150">
|
|
|
|
<el-table-column label="操作" width="150">
|
|
|
|
<template slot-scope="scope">
|
|
|
|
<template slot-scope="scope">
|
|
|
|
<el-button type="text" size="small" :disabled="!ischeck" @click.stop="true"
|
|
|
|
<el-button type="text" size="small" :disabled="!ischeck || scope.row.index != selectedIndex"
|
|
|
|
|
|
|
|
@click.stop="true"
|
|
|
|
@click.native="save(scope.row)">保存
|
|
|
|
@click.native="save(scope.row)">保存
|
|
|
|
</el-button>
|
|
|
|
</el-button>
|
|
|
|
<el-button type="text" size="small" :disabled="scope.row.index === selectedIndex" @click.stop="true"
|
|
|
|
<el-button type="text" size="small" :disabled="scope.row.index == selectedIndex || ischeck"
|
|
|
|
|
|
|
|
@click.stop="true"
|
|
|
|
@click.native="rowChange(scope.row)">编辑
|
|
|
|
@click.native="rowChange(scope.row)">编辑
|
|
|
|
</el-button>
|
|
|
|
</el-button>
|
|
|
|
<el-button type="text" size="small" @click.stop="true"
|
|
|
|
<el-button type="text" size="small" @click.stop="true"
|
|
|
|
@ -157,7 +158,7 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
<el-dialog
|
|
|
|
<el-dialog
|
|
|
|
title="库存设备录入"
|
|
|
|
title="库存物资录入"
|
|
|
|
:visible.sync="selectInvProductVisible"
|
|
|
|
:visible.sync="selectInvProductVisible"
|
|
|
|
:close-on-click-modal="false"
|
|
|
|
:close-on-click-modal="false"
|
|
|
|
:close-on-press-escape="false"
|
|
|
|
:close-on-press-escape="false"
|
|
|
|
@ -178,7 +179,7 @@
|
|
|
|
<script>
|
|
|
|
<script>
|
|
|
|
import {getBusChange} from "@/api/basic/busTypeChange";
|
|
|
|
import {getBusChange} from "@/api/basic/busTypeChange";
|
|
|
|
import {inserThrOrderWeb, updateReceive, updateReceiveDetail, delReceiveDetail} from "@/api/thrsys/thrOrderReceive";
|
|
|
|
import {inserThrOrderWeb, updateReceive, updateReceiveDetail, delReceiveDetail} from "@/api/thrsys/thrOrderReceive";
|
|
|
|
import {filterSubByInv, findByFrom, findByUp, findInvByUser} from "@/api/system/invSubWarehouse";
|
|
|
|
import {filterSubByInv, findByFrom, findByUp, findInvByUser, findLyInv} from "@/api/system/invSubWarehouse";
|
|
|
|
import dialogInvProduct from "../DialogSelectInvProduct";
|
|
|
|
import dialogInvProduct from "../DialogSelectInvProduct";
|
|
|
|
import {getOrderDetail} from "@/api/inout/receiveOrder";
|
|
|
|
import {getOrderDetail} from "@/api/inout/receiveOrder";
|
|
|
|
import {parseTime} from "@/utils/coTools";
|
|
|
|
import {parseTime} from "@/utils/coTools";
|
|
|
|
@ -209,8 +210,8 @@ export default {
|
|
|
|
code: "",
|
|
|
|
code: "",
|
|
|
|
query: {
|
|
|
|
query: {
|
|
|
|
orderIdFk: "",
|
|
|
|
orderIdFk: "",
|
|
|
|
page: 1,
|
|
|
|
// page: 1,
|
|
|
|
limit: 10,
|
|
|
|
// limit: 10,
|
|
|
|
},
|
|
|
|
},
|
|
|
|
formData: {
|
|
|
|
formData: {
|
|
|
|
invCode: null,
|
|
|
|
invCode: null,
|
|
|
|
@ -258,13 +259,13 @@ export default {
|
|
|
|
sLoading: false,
|
|
|
|
sLoading: false,
|
|
|
|
busTypes: [],
|
|
|
|
busTypes: [],
|
|
|
|
currentRow: {},
|
|
|
|
currentRow: {},
|
|
|
|
selectedIndex: "",
|
|
|
|
selectedIndex: null,
|
|
|
|
selectInvProductVisible: false,
|
|
|
|
selectInvProductVisible: false,
|
|
|
|
thisData: {},
|
|
|
|
thisData: {},
|
|
|
|
storageList: [],
|
|
|
|
storageList: [],
|
|
|
|
invQueryData: {},
|
|
|
|
invQueryData: {},
|
|
|
|
type: 1,
|
|
|
|
type: 1,
|
|
|
|
Receive: {},
|
|
|
|
Receive: null,
|
|
|
|
ischeck: false,
|
|
|
|
ischeck: false,
|
|
|
|
};
|
|
|
|
};
|
|
|
|
},
|
|
|
|
},
|
|
|
|
@ -290,7 +291,7 @@ export default {
|
|
|
|
let cQuery = {
|
|
|
|
let cQuery = {
|
|
|
|
locInvCode: this.formData.invCode,
|
|
|
|
locInvCode: this.formData.invCode,
|
|
|
|
};
|
|
|
|
};
|
|
|
|
findByUp(cQuery)
|
|
|
|
findLyInv(cQuery)
|
|
|
|
.then((response) => {
|
|
|
|
.then((response) => {
|
|
|
|
this.fromOptions = response.data || [];
|
|
|
|
this.fromOptions = response.data || [];
|
|
|
|
if (this.fromOptions != null && this.fromOptions.length > 0) {
|
|
|
|
if (this.fromOptions != null && this.fromOptions.length > 0) {
|
|
|
|
@ -420,8 +421,6 @@ export default {
|
|
|
|
},
|
|
|
|
},
|
|
|
|
save() {
|
|
|
|
save() {
|
|
|
|
if (this.$isNotBlank(this.Receive)) {
|
|
|
|
if (this.$isNotBlank(this.Receive)) {
|
|
|
|
console.log("this.Receive:")
|
|
|
|
|
|
|
|
console.log(this.Receive)
|
|
|
|
|
|
|
|
this.Receive.targetInvCode = this.formData.targetInvCode
|
|
|
|
this.Receive.targetInvCode = this.formData.targetInvCode
|
|
|
|
this.Receive.advanceType = this.formData.advanceType
|
|
|
|
this.Receive.advanceType = this.formData.advanceType
|
|
|
|
updateReceiveDetail(this.Receive).then(res => {
|
|
|
|
updateReceiveDetail(this.Receive).then(res => {
|
|
|
|
@ -429,6 +428,7 @@ export default {
|
|
|
|
this.loading = false;
|
|
|
|
this.loading = false;
|
|
|
|
this.ischeck = false;
|
|
|
|
this.ischeck = false;
|
|
|
|
this.selectedIndex = null;
|
|
|
|
this.selectedIndex = null;
|
|
|
|
|
|
|
|
this.getOrderDetailList()
|
|
|
|
this.$message.success('修改成功');
|
|
|
|
this.$message.success('修改成功');
|
|
|
|
} else {
|
|
|
|
} else {
|
|
|
|
this.$message.error(res.message);
|
|
|
|
this.$message.error(res.message);
|
|
|
|
@ -438,14 +438,18 @@ export default {
|
|
|
|
}
|
|
|
|
}
|
|
|
|
},
|
|
|
|
},
|
|
|
|
rowChange(val) {
|
|
|
|
rowChange(val) {
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// if(this.Receive!=null){
|
|
|
|
|
|
|
|
// this.save()
|
|
|
|
|
|
|
|
// }
|
|
|
|
this.Receive = val;
|
|
|
|
this.Receive = val;
|
|
|
|
console.log("var:")
|
|
|
|
|
|
|
|
console.log(this.Receive)
|
|
|
|
|
|
|
|
this.ischeck = true;
|
|
|
|
this.ischeck = true;
|
|
|
|
this.currentRow = val;
|
|
|
|
this.currentRow = val;
|
|
|
|
this.selectedIndex = val.index;
|
|
|
|
this.selectedIndex = val.index;
|
|
|
|
this.iCount = val.count;
|
|
|
|
this.iCount = val.count;
|
|
|
|
this.focusNext('iCount');
|
|
|
|
// this.focusNext('iCount');
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
this.getOrderDetailList()
|
|
|
|
},
|
|
|
|
},
|
|
|
|
tableCountChange(row) {
|
|
|
|
tableCountChange(row) {
|
|
|
|
this.Receive = row;
|
|
|
|
this.Receive = row;
|
|
|
|
|
anthonywj
2 years ago