|
|
|
@ -4,16 +4,16 @@
|
|
|
|
<el-row type="flex" justify="end">
|
|
|
|
<el-row type="flex" justify="end">
|
|
|
|
<el-button-group style="display: flex;margin-bottom: 15px; margin-right: 50px;margin-top: -5px">
|
|
|
|
<el-button-group style="display: flex;margin-bottom: 15px; margin-right: 50px;margin-top: -5px">
|
|
|
|
<el-button
|
|
|
|
<el-button
|
|
|
|
type="primary"
|
|
|
|
type="primary"
|
|
|
|
@click.native="saveOrder('1')"
|
|
|
|
@click.native="saveOrder('1')"
|
|
|
|
:loading="loading"
|
|
|
|
:loading="loading"
|
|
|
|
>草稿保存
|
|
|
|
>草稿保存
|
|
|
|
</el-button
|
|
|
|
</el-button
|
|
|
|
>
|
|
|
|
>
|
|
|
|
<el-button
|
|
|
|
<el-button
|
|
|
|
type="primary"
|
|
|
|
type="primary"
|
|
|
|
@click.native="saveOrder('2')"
|
|
|
|
@click.native="saveOrder('2')"
|
|
|
|
:loading="loading"
|
|
|
|
:loading="loading"
|
|
|
|
>提交单据
|
|
|
|
>提交单据
|
|
|
|
</el-button
|
|
|
|
</el-button
|
|
|
|
>
|
|
|
|
>
|
|
|
|
@ -29,13 +29,13 @@
|
|
|
|
<el-col :span="11">
|
|
|
|
<el-col :span="11">
|
|
|
|
<el-form-item prop="createTime" label="创建时间:">
|
|
|
|
<el-form-item prop="createTime" label="创建时间:">
|
|
|
|
<el-date-picker
|
|
|
|
<el-date-picker
|
|
|
|
:disabled="true"
|
|
|
|
:disabled="true"
|
|
|
|
v-model="formData.createTime"
|
|
|
|
v-model="formData.createTime"
|
|
|
|
type="datetime"
|
|
|
|
type="datetime"
|
|
|
|
placeholder="选择日期"
|
|
|
|
placeholder="选择日期"
|
|
|
|
style="width: 100%"
|
|
|
|
style="width: 100%"
|
|
|
|
:clearable="false"
|
|
|
|
:clearable="false"
|
|
|
|
value-format="yyyy-MM-dd HH:mm:ss"
|
|
|
|
value-format="yyyy-MM-dd HH:mm:ss"
|
|
|
|
>
|
|
|
|
>
|
|
|
|
</el-date-picker>
|
|
|
|
</el-date-picker>
|
|
|
|
</el-form-item>
|
|
|
|
</el-form-item>
|
|
|
|
@ -50,10 +50,10 @@
|
|
|
|
:disabled="codeArray.length>0"
|
|
|
|
:disabled="codeArray.length>0"
|
|
|
|
clearable>
|
|
|
|
clearable>
|
|
|
|
<el-option
|
|
|
|
<el-option
|
|
|
|
v-for="item in invList"
|
|
|
|
v-for="item in invList"
|
|
|
|
:key="item.name"
|
|
|
|
:key="item.name"
|
|
|
|
:label="item.name"
|
|
|
|
:label="item.name"
|
|
|
|
:value="item.code">
|
|
|
|
:value="item.code">
|
|
|
|
</el-option>
|
|
|
|
</el-option>
|
|
|
|
</el-select>
|
|
|
|
</el-select>
|
|
|
|
</el-form-item>
|
|
|
|
</el-form-item>
|
|
|
|
@ -62,14 +62,13 @@
|
|
|
|
<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
|
|
|
|
v-for="item in fromOptions"
|
|
|
|
v-for="item in fromOptions"
|
|
|
|
:key="item.code"
|
|
|
|
:key="item.code"
|
|
|
|
:label="item.name"
|
|
|
|
:label="item.name"
|
|
|
|
:value="item.code">
|
|
|
|
:value="item.code">
|
|
|
|
</el-option>
|
|
|
|
</el-option>
|
|
|
|
</el-select>
|
|
|
|
</el-select>
|
|
|
|
</el-form-item>
|
|
|
|
</el-form-item>
|
|
|
|
@ -107,10 +106,10 @@
|
|
|
|
<el-card>
|
|
|
|
<el-card>
|
|
|
|
<el-button-group style="display: flex">
|
|
|
|
<el-button-group style="display: flex">
|
|
|
|
<el-button
|
|
|
|
<el-button
|
|
|
|
type="primary"
|
|
|
|
type="primary"
|
|
|
|
@click.native.stop="selectProductFunction()"
|
|
|
|
@click.native.stop="selectProductFunction()"
|
|
|
|
style="margin: 0px 60px 10px auto; height: 35px"
|
|
|
|
style="margin: 0px 60px 10px auto; height: 35px"
|
|
|
|
:loading="loading"
|
|
|
|
:loading="loading"
|
|
|
|
>产品录入
|
|
|
|
>产品录入
|
|
|
|
</el-button
|
|
|
|
</el-button
|
|
|
|
>
|
|
|
|
>
|
|
|
|
@ -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,19 +158,19 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
<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"
|
|
|
|
width="85%"
|
|
|
|
width="85%"
|
|
|
|
v-if="selectInvProductVisible"
|
|
|
|
v-if="selectInvProductVisible"
|
|
|
|
:append-to-body='true'
|
|
|
|
:append-to-body='true'
|
|
|
|
>
|
|
|
|
>
|
|
|
|
<dialogInvProduct
|
|
|
|
<dialogInvProduct
|
|
|
|
:closeDialog="closeDialogC2"
|
|
|
|
:closeDialog="closeDialogC2"
|
|
|
|
:invQueryData="formData"
|
|
|
|
:invQueryData="formData"
|
|
|
|
:codeArray="codeArray"
|
|
|
|
:codeArray="codeArray"
|
|
|
|
:type="1"
|
|
|
|
:type="1"
|
|
|
|
></dialogInvProduct>
|
|
|
|
></dialogInvProduct>
|
|
|
|
</el-dialog>
|
|
|
|
</el-dialog>
|
|
|
|
</div>
|
|
|
|
</div>
|
|
|
|
@ -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,
|
|
|
|
};
|
|
|
|
};
|
|
|
|
},
|
|
|
|
},
|
|
|
|
@ -279,26 +280,26 @@ export default {
|
|
|
|
filter: 3
|
|
|
|
filter: 3
|
|
|
|
};
|
|
|
|
};
|
|
|
|
findInvByUser(query)
|
|
|
|
findInvByUser(query)
|
|
|
|
.then((response) => {
|
|
|
|
.then((response) => {
|
|
|
|
this.invList = response.data || [];
|
|
|
|
this.invList = response.data || [];
|
|
|
|
})
|
|
|
|
})
|
|
|
|
.catch(() => {
|
|
|
|
.catch(() => {
|
|
|
|
});
|
|
|
|
});
|
|
|
|
},
|
|
|
|
},
|
|
|
|
//往来分库
|
|
|
|
//往来分库
|
|
|
|
findFromInv() {
|
|
|
|
findFromInv() {
|
|
|
|
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) {
|
|
|
|
this.formData.targetInvCode = this.fromOptions[0].code;
|
|
|
|
this.formData.targetInvCode = this.fromOptions[0].code;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
})
|
|
|
|
})
|
|
|
|
.catch(() => {
|
|
|
|
.catch(() => {
|
|
|
|
});
|
|
|
|
});
|
|
|
|
},
|
|
|
|
},
|
|
|
|
//领用类型
|
|
|
|
//领用类型
|
|
|
|
getBusType() {
|
|
|
|
getBusType() {
|
|
|
|
@ -307,11 +308,11 @@ export default {
|
|
|
|
type: 1,
|
|
|
|
type: 1,
|
|
|
|
};
|
|
|
|
};
|
|
|
|
getBusChange(query)
|
|
|
|
getBusChange(query)
|
|
|
|
.then((response) => {
|
|
|
|
.then((response) => {
|
|
|
|
this.busTypes = response.data.list || [];
|
|
|
|
this.busTypes = response.data.list || [];
|
|
|
|
})
|
|
|
|
})
|
|
|
|
.catch(() => {
|
|
|
|
.catch(() => {
|
|
|
|
});
|
|
|
|
});
|
|
|
|
},
|
|
|
|
},
|
|
|
|
hideSearch() {
|
|
|
|
hideSearch() {
|
|
|
|
this.showSearch = !this.showSearch;
|
|
|
|
this.showSearch = !this.showSearch;
|
|
|
|
@ -389,17 +390,17 @@ export default {
|
|
|
|
tQuery.subErpOrders = this.codeArray;
|
|
|
|
tQuery.subErpOrders = this.codeArray;
|
|
|
|
tQuery.thirdPartyDate = 2;
|
|
|
|
tQuery.thirdPartyDate = 2;
|
|
|
|
updateReceive(tQuery)
|
|
|
|
updateReceive(tQuery)
|
|
|
|
.then(response => {
|
|
|
|
.then(response => {
|
|
|
|
if (response.code === 20000) {
|
|
|
|
if (response.code === 20000) {
|
|
|
|
this.$message.success(tMessage + "成功");
|
|
|
|
this.$message.success(tMessage + "成功");
|
|
|
|
this.closeDialog(true);
|
|
|
|
this.closeDialog(true);
|
|
|
|
} else {
|
|
|
|
} else {
|
|
|
|
this.$message.error(response.message);
|
|
|
|
this.$message.error(response.message);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
})
|
|
|
|
})
|
|
|
|
.catch(() => {
|
|
|
|
.catch(() => {
|
|
|
|
this.loading = false;
|
|
|
|
this.loading = false;
|
|
|
|
})
|
|
|
|
})
|
|
|
|
},
|
|
|
|
},
|
|
|
|
selectProductFunction(event) {
|
|
|
|
selectProductFunction(event) {
|
|
|
|
|
|
|
|
|
|
|
|
@ -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;
|
|
|
|
@ -477,17 +481,17 @@ export default {
|
|
|
|
_this.detailLoading = true;
|
|
|
|
_this.detailLoading = true;
|
|
|
|
if (_this.$isNotBlank(row.id)) {
|
|
|
|
if (_this.$isNotBlank(row.id)) {
|
|
|
|
delReceiveDetail({id: row.id})
|
|
|
|
delReceiveDetail({id: row.id})
|
|
|
|
.then(response => {
|
|
|
|
.then(response => {
|
|
|
|
_this.detailLoading = false;
|
|
|
|
_this.detailLoading = false;
|
|
|
|
if (response.code === 20000) {
|
|
|
|
if (response.code === 20000) {
|
|
|
|
_this.getOrderDetailList();
|
|
|
|
_this.getOrderDetailList();
|
|
|
|
} else {
|
|
|
|
} else {
|
|
|
|
_this.$message.error(response.message);
|
|
|
|
_this.$message.error(response.message);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
})
|
|
|
|
})
|
|
|
|
.catch(() => {
|
|
|
|
.catch(() => {
|
|
|
|
_this.detailLoading = false;
|
|
|
|
_this.detailLoading = false;
|
|
|
|
})
|
|
|
|
})
|
|
|
|
} else {
|
|
|
|
} else {
|
|
|
|
_this.$message.success('删除成功');
|
|
|
|
_this.$message.success('删除成功');
|
|
|
|
_this.codeArray.splice(index, 1);
|
|
|
|
_this.codeArray.splice(index, 1);
|
|
|
|
@ -510,16 +514,16 @@ export default {
|
|
|
|
this.loading = true;
|
|
|
|
this.loading = true;
|
|
|
|
this.query.orderIdFk = this.formData.billNo;
|
|
|
|
this.query.orderIdFk = this.formData.billNo;
|
|
|
|
getOrderDetail(this.query) //查找该单号下的所有条码
|
|
|
|
getOrderDetail(this.query) //查找该单号下的所有条码
|
|
|
|
.then((response) => {
|
|
|
|
.then((response) => {
|
|
|
|
this.codeArray = response.data.list || [];
|
|
|
|
this.codeArray = response.data.list || [];
|
|
|
|
this.total = response.data.total || 0;
|
|
|
|
this.total = response.data.total || 0;
|
|
|
|
this.loading = false;
|
|
|
|
this.loading = false;
|
|
|
|
})
|
|
|
|
})
|
|
|
|
.catch(() => {
|
|
|
|
.catch(() => {
|
|
|
|
this.loading = false;
|
|
|
|
this.loading = false;
|
|
|
|
this.list = [];
|
|
|
|
this.list = [];
|
|
|
|
this.total = 0;
|
|
|
|
this.total = 0;
|
|
|
|
});
|
|
|
|
});
|
|
|
|
},
|
|
|
|
},
|
|
|
|
},
|
|
|
|
},
|
|
|
|
filters: {},
|
|
|
|
filters: {},
|
|
|
|
@ -547,8 +551,8 @@ export default {
|
|
|
|
billType: "HCLY",
|
|
|
|
billType: "HCLY",
|
|
|
|
billNo: null,
|
|
|
|
billNo: null,
|
|
|
|
createTime: parseTime(
|
|
|
|
createTime: parseTime(
|
|
|
|
date,
|
|
|
|
date,
|
|
|
|
"{y}-{m}-{d} {h}:{i}:{s}"
|
|
|
|
"{y}-{m}-{d} {h}:{i}:{s}"
|
|
|
|
),
|
|
|
|
),
|
|
|
|
};
|
|
|
|
};
|
|
|
|
this.orderEditor = false;
|
|
|
|
this.orderEditor = false;
|
|
|
|
|
anthonywj
1 year ago