Merge remote-tracking branch 'origin/fencang' into fencang

fencang
x_z 3 years ago
commit f44c61dbc9

@ -176,6 +176,7 @@ export default {
data() { data() {
return { return {
filterQuery: { filterQuery: {
invWarehouseCode: null,
invStorageCode: null, invStorageCode: null,
productsName: null, productsName: null,
nameCode: null, nameCode: null,
@ -343,6 +344,8 @@ export default {
invChange() { invChange() {
// this.$set(this.filterQuery, "entrustUser", "");
this.filterQuery.invWarehouseCode = "";
this.subInvList = []; this.subInvList = [];
let query = { let query = {
pcode: this.filterQuery.invStorageCode pcode: this.filterQuery.invStorageCode
@ -357,7 +360,6 @@ export default {
intentDetail(row) { intentDetail(row) {
this.idQuery = row; this.idQuery = row;
// this.idQuery.supId = null;
this.idQuery.customerId = null; this.idQuery.customerId = null;
this.codeDetailVisible = true; this.codeDetailVisible = true;
}, },

@ -1,129 +1,141 @@
<template> <template>
<div> <div>
<el-card> <el-card>
<el-form :inline="true" :model="filterQuery" size="mini"> <el-form :inline="true" :model="filterQuery" size="mini">
<el-row style="width: 100%"> <el-row style="width: 100%">
<el-form-item class="query-form-item"> <el-form-item class="query-form-item">
<el-input v-model="filterQuery.nameCode" placeholder="产品标识DI" clearable></el-input> <el-input v-model="filterQuery.nameCode" placeholder="产品标识DI" clearable></el-input>
</el-form-item> </el-form-item>
<el-form-item class="query-form-item"> <el-form-item class="query-form-item">
<el-input v-model="filterQuery.cpmctymc" placeholder="产品名称" clearable></el-input> <el-input v-model="filterQuery.cpmctymc" placeholder="产品名称" clearable></el-input>
</el-form-item> </el-form-item>
<el-form-item class="query-form-item"> <el-form-item class="query-form-item">
<el-input v-model="filterQuery.batchNo" placeholder="批次号" clearable></el-input> <el-input v-model="filterQuery.batchNo" placeholder="批次号" clearable></el-input>
</el-form-item> </el-form-item>
<el-form-item class="query-form-item"> <el-form-item class="query-form-item">
<el-select <el-select
v-model="filterQuery.supId" v-model="filterQuery.supId"
filterable filterable
remote remote
clearable="true" clearable="true"
reserve-keyword reserve-keyword
placeholder="请输入供应商名称" placeholder="请输入供应商名称"
:remote-method="findMethod" :remote-method="findMethod"
size="mini" size="mini"
:loading="loading" :loading="loading"
> >
<el-option <el-option
v-for="item in fromOptions" v-for="item in fromOptions"
:key="item.name" :key="item.name"
:label="item.name" :label="item.name"
:value="item.erpId" :value="item.erpId"
> >
<span style="float: left">{{ item.name }}</span> <span style="float: left">{{ item.name }}</span>
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-row> </el-row>
<el-row style="width: 100%"> <el-row style="width: 100%">
<el-form-item class="query-form-item"> <el-form-item class="query-form-item">
<el-input v-model="filterQuery.ggxh" placeholder="规格型号" clearable></el-input> <el-input v-model="filterQuery.ggxh" placeholder="规格型号" clearable></el-input>
</el-form-item> </el-form-item>
<el-form-item class="query-form-item"> <el-form-item class="query-form-item">
<el-input v-model="filterQuery.zczbhhzbapzbh" placeholder="批准文号" clearable></el-input> <el-input v-model="filterQuery.zczbhhzbapzbh" placeholder="批准文号" clearable></el-input>
</el-form-item> </el-form-item>
<el-form-item class="query-form-item"> <el-form-item class="query-form-item">
<el-input v-model="filterQuery.ylqxzcrbarmc" placeholder="生产厂家" clearable></el-input> <el-input v-model="filterQuery.ylqxzcrbarmc" placeholder="生产厂家" clearable></el-input>
</el-form-item> </el-form-item>
<el-form-item class="query-form-item"> <el-form-item class="query-form-item">
<el-select v-model="filterQuery.invStorageCode" placeholder="请选择当前仓库" clearable="true" <el-select v-model="filterQuery.invStorageCode" placeholder="请选择当前仓库" clearable="true"
size="mini"> @change="invChange" size="mini">
<el-option <el-option
v-for="item in storageList" v-for="item in storageList"
:key="item.name" :key="item.name"
: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>
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item class="query-form-item">
<el-button-group> <el-select v-model="filterQuery.invWarehouseCode" placeholder="请选择当前分库" clearable="true"
<el-button size="mini">
type="primary" <el-option
icon="el-icon-refresh" v-for="item in subInvList"
@click="onReset" :key="item.name"
></el-button> :label="item.name"
<el-button type="primary" icon="search" @click="onSubmit" :value="item.code">
>统计 <span style="float: left">{{ item.name }}</span>
</el-button </el-option>
> </el-select>
</el-button-group> </el-form-item>
</el-form-item> <el-form-item>
</el-row> <el-button-group>
<el-button
type="primary"
icon="el-icon-refresh"
@click="onReset"
></el-button>
<el-button type="primary" icon="search" @click="onSubmit"
>统计
</el-button
>
</el-button-group>
</el-form-item>
</el-row>
</el-form> </el-form>
<el-table v-loading="loading" :data="list" style="width: 100%"> <el-table v-loading="loading" :data="list" style="width: 100%">
<el-table-column label="序号" type="index" fixed></el-table-column> <el-table-column label="序号" type="index" fixed></el-table-column>
<el-table-column label="产品标识" prop="nameCode" width="120"></el-table-column> <el-table-column label="产品标识" prop="nameCode" width="120"></el-table-column>
<el-table-column label="产品名称" prop="cpmctymc" width="180"> <el-table-column label="产品名称" prop="cpmctymc" width="180">
</el-table-column> </el-table-column>
<el-table-column label="规格型号" prop="ggxh" width="180"></el-table-column> <el-table-column label="规格型号" prop="ggxh" width="180"></el-table-column>
<el-table-column label="批次号" prop="batchNo" width="120"></el-table-column> <el-table-column label="批次号" prop="batchNo" width="120"></el-table-column>
<el-table-column label="生产日期" prop="productionDate" width="120"></el-table-column> <el-table-column label="生产日期" prop="productionDate" width="120"></el-table-column>
<el-table-column label="失效日期" prop="expireDate" width="120"></el-table-column> <el-table-column label="失效日期" prop="expireDate" width="120"></el-table-column>
<el-table-column label="入库数量" prop="inCount" width="120"></el-table-column> <el-table-column label="入库数量" prop="inCount" width="120"></el-table-column>
<el-table-column label="出库数量" prop="outCount" width="120"></el-table-column> <el-table-column label="出库数量" prop="outCount" width="120"></el-table-column>
<el-table-column label="结余数量" prop="reCount" width="120"> <el-table-column label="结余数量" prop="reCount" width="120">
<template slot-scope="scope"> <template slot-scope="scope">
{{ (scope.row.inCount - scope.row.outCount) }} {{ (scope.row.inCount - scope.row.outCount) }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="生产厂家" prop="ylqxzcrbarmc" v-if="showSup" show-overflow-tooltip <el-table-column label="生产厂家" prop="ylqxzcrbarmc" v-if="showSup" show-overflow-tooltip
width="120"></el-table-column> width="120"></el-table-column>
<el-table-column label="供应商" prop="companyName" v-if="showSup" show-overflow-tooltip <el-table-column label="供应商" prop="companyName" v-if="showSup" show-overflow-tooltip
width="120"></el-table-column> width="120"></el-table-column>
<!-- <el-table-column label="仓库" prop="invStorageName" v-if="showSup"--> <!-- <el-table-column label="仓库" prop="invStorageName" v-if="showSup"-->
<!-- show-overflow-tooltip width="120"></el-table-column>--> <!-- show-overflow-tooltip width="120"></el-table-column>-->
</el-table> </el-table>
</el-card> </el-card>
<el-dialog <el-dialog
title="库存详情" title="库存详情"
:visible.sync="codeDetailVisible" :visible.sync="codeDetailVisible"
width="85%" width="85%"
v-if="codeDetailVisible" v-if="codeDetailVisible"
> >
<codeDetail <codeDetail
:idQuery="idQuery" :idQuery="idQuery"
v-on:closeDetailDialog="closeDetailDialog" v-on:closeDetailDialog="closeDetailDialog"
></codeDetail> ></codeDetail>
</el-dialog> </el-dialog>
<el-pagination <el-pagination
:page-size="filterQuery.limit" :page-size="filterQuery.limit"
@current-change="handleCurrentChange" @current-change="handleCurrentChange"
layout="prev, pager, next" layout="prev, pager, next"
:total="total" :total="total"
></el-pagination> ></el-pagination>
</div> </div>
</template> </template>
<script> <script>
@ -134,209 +146,226 @@ import store from "../../store";
import {getBussinessType} from "../../api/basic/bussinessType"; import {getBussinessType} from "../../api/basic/bussinessType";
import {getBasicUnitMaintains} from "@/api/basic/basicUnitMaintain"; import {getBasicUnitMaintains} from "@/api/basic/basicUnitMaintain";
import {filterAllByUser, filterUplLocInv} from "@/api/basic/invWarehouse"; import {filterAllByUser, filterUplLocInv} from "@/api/basic/invWarehouse";
import {filterSubByInv} from "@/api/basic/invSubWarehouse";
export default { export default {
data() { data() {
return { return {
filterQuery: { filterQuery: {
cpmctymc: null, invWarehouseCode: null,
nameCode: null, cpmctymc: null,
relIdFk: null, nameCode: null,
batchNo: null, relIdFk: null,
page: 1, batchNo: null,
limit: 20, page: 1,
customerId: null, limit: 20,
invStorageCode: null, customerId: null,
supId: null, invStorageCode: null,
ggxh: null, supId: null,
zczbhhzbapzbh: null, ggxh: null,
ylqxzcrbarmc: null, zczbhhzbapzbh: null,
}, ylqxzcrbarmc: null,
detailQuery: { },
code: null, detailQuery: {
productIdFk: null, code: null,
page: 1, productIdFk: null,
limit: 20, page: 1,
}, limit: 20,
list: [], },
codeDetailVisible: false, list: [],
total: 0, codeDetailVisible: false,
loading: false, total: 0,
index: null, loading: false,
dialogTableVisible: false, index: null,
formLoading: false, dialogTableVisible: false,
dialogVisible: false, formLoading: false,
deleteLoading: false, dialogVisible: false,
busTypes: [], deleteLoading: false,
idQuery: null, busTypes: [],
showSup: false, idQuery: null,
fromOptions: [], showSup: false,
storageOptions: [], fromOptions: [],
storageList: [], storageOptions: [],
}; storageList: [],
}, subInvList: [],
components: { };
draggable,
codeDetail,
},
methods: {
onReset() {
this.$router.push({
path: "",
});
this.filterQuery = {
invStorageCode: null,
nameCode: null,
relIdFk: null,
batchNo: null,
customerId: null,
unitFk: null,
page: 1,
limit: 20,
};
this.getList();
}, },
onSubmit() { components: {
// draggable,
var param = this.filterQuery; codeDetail,
if (param.cpmctymc == null && param.ggxh == null && param.zczbhhzbapzbh == null && param.ylqxzcrbarmc == null
&& param.invStorageCode == null && param.nameCode == null && param.batchNo == null && param.supId == null) {
this.$message({
message: '统计条件不可为空',
type: 'warning'
});
} else {
this.loading = true;
this.getList();
}
},
handleSizeChange(val) {
this.filterQuery.limit = val;
this.getList();
},
handleCurrentChange(val) {
this.filterQuery.page = val;
this.getList();
},
handleUnitClick(row) {
this.curIndex = row.id;
this.dialogTableVisible = true;
},
closeDetailDialog(val) {
this.codeDetailVisible = false;
}, },
methods: {
onReset() {
this.$router.push({
path: "",
});
this.filterQuery = {
invStorageCode: null,
nameCode: null,
relIdFk: null,
batchNo: null,
customerId: null,
unitFk: null,
page: 1,
limit: 20,
};
this.getList();
},
onSubmit() {
//
var param = this.filterQuery;
if (param.cpmctymc == null && param.ggxh == null && param.zczbhhzbapzbh == null && param.ylqxzcrbarmc == null
&& param.invStorageCode == null && param.nameCode == null && param.batchNo == null && param.supId == null) {
this.$message({
message: '统计条件不可为空',
type: 'warning'
});
} else {
this.loading = true;
this.getList();
}
},
handleSizeChange(val) {
this.filterQuery.limit = val;
this.getList();
},
handleCurrentChange(val) {
this.filterQuery.page = val;
this.getList();
},
handleUnitClick(row) {
this.curIndex = row.id;
this.dialogTableVisible = true;
},
closeDetailDialog(val) {
this.codeDetailVisible = false;
},
closeDialog() { closeDialog() {
this.getList(); this.getList();
}, },
getList() { getList() {
this.loading = true; this.loading = true;
this.filterQuery.customerId = store.getters.customerId; this.filterQuery.customerId = store.getters.customerId;
stockStatistics(this.filterQuery) stockStatistics(this.filterQuery)
.then((response) => { .then((response) => {
this.showSup = response.data.showSup; this.showSup = response.data.showSup;
this.loading = false; this.loading = false;
this.list = response.data.list || []; this.list = response.data.list || [];
this.total = response.data.total || 0; this.total = response.data.total || 0;
}) })
.catch(() => { .catch(() => {
this.loading = false; this.loading = false;
this.list = []; this.list = [];
this.total = 0; this.total = 0;
}); });
}, },
// //
findMethod(query) { findMethod(query) {
this.fromOptions = []; this.fromOptions = [];
let cQuery = { let cQuery = {
key: query, key: query,
}; };
getBasicUnitMaintains(cQuery) getBasicUnitMaintains(cQuery)
.then((response) => { .then((response) => {
this.loading = false; this.loading = false;
this.fromOptions = response.data.page.list || []; this.fromOptions = response.data.page.list || [];
}) })
.catch(() => { .catch(() => {
this.loading = false; this.loading = false;
}); });
}, },
//ID //ID
findStorageCode(query) { findStorageCode(query) {
this.storageOptions = []; this.storageOptions = [];
let cQuery = { let cQuery = {
key: query, key: query,
}; };
getStorageCode(cQuery).then((response) => { getStorageCode(cQuery).then((response) => {
this.storageOptions = response.data.list; this.storageOptions = response.data.list;
}).catch(() => { }).catch(() => {
}) })
}, },
intentDetail(row) { intentDetail(row) {
this.idQuery = row; this.idQuery = row;
// this.idQuery.supId = null; // this.idQuery.supId = null;
this.idQuery.customerId = null; this.idQuery.customerId = null;
this.codeDetailVisible = true; this.codeDetailVisible = true;
},
getBusType() {
let query = {
enabled: true,
};
getBussinessType(query)
.then((response) => {
this.busTypes = response.data.list || [];
this.filterQuery.billAction = this.busTypes[0].action;
// this.getList();
})
.catch(() => {
});
},
getActionName(action) {
for (let i = 0; i < this.busTypes.length; i++) {
if (this.busTypes[i].action === action) {
return this.busTypes[i].name;
}
}
},
getStorage() {
this.storageList = [];
filterUplLocInv()
.then((response) => {
this.storageList = response.data || [];
})
.catch(() => {
});
},
invChange() {
// this.$set(this.filterQuery, "entrustUser", "");
this.filterQuery.invWarehouseCode = "";
this.subInvList = [];
let query = {
pcode: this.filterQuery.invStorageCode
};
filterSubByInv(query)
.then((response) => {
this.subInvList = response.data || [];
})
.catch(() => {
});
},
}, },
getBusType() { filters: {
let query = { statusFilterType(status) {
enabled: true, const statusMap = {
}; false: "success",
getBussinessType(query) true: "danger",
.then((response) => { };
this.busTypes = response.data.list || []; return statusMap[status];
this.filterQuery.billAction = this.busTypes[0].action; },
// this.getList();
})
.catch(() => {
});
}, },
getActionName(action) { mounted() {
for (let i = 0; i < this.busTypes.length; i++) { document.body.ondrop = function (event) {
if (this.busTypes[i].action === action) { event.preventDefault();
return this.busTypes[i].name; event.stopPropagation();
} };
}
}, },
getStorage() { created() {
this.storageList = []; this.getBusType();
filterUplLocInv() let query = this.$route.query;
.then((response) => { this.filterQuery = Object.assign(this.filterQuery, query);
this.storageList = response.data || []; this.filterQuery.limit = parseInt(this.filterQuery.limit);
}) this.loading = true;
.catch(() => { this.getList();
}); this.findStorageCode();
}, this.getStorage();
},
filters: {
statusFilterType(status) {
const statusMap = {
false: "success",
true: "danger",
};
return statusMap[status];
}, },
},
mounted() {
document.body.ondrop = function (event) {
event.preventDefault();
event.stopPropagation();
};
},
created() {
this.getBusType();
let query = this.$route.query;
this.filterQuery = Object.assign(this.filterQuery, query);
this.filterQuery.limit = parseInt(this.filterQuery.limit);
this.loading = true;
this.getList();
this.findStorageCode();
this.getStorage();
},
}; };
</script> </script>

@ -283,6 +283,8 @@ export default {
data() { data() {
return { return {
filterQuery: { filterQuery: {
locStorageCode:null,
invWarehouseCode:null,
id: "", id: "",
mainAction: null, mainAction: null,
action: null, action: null,

@ -72,9 +72,6 @@
<el-col :span="8"> <el-col :span="8">
<el-form-item prop="locStorageCode"> <el-form-item prop="locStorageCode">
<!--<el-select v-model="formData.billType" style="width: 100%" placeholder="业务类型" :disabled="true">-->
<!--<el-option label="送货单" value="deliveryNote"></el-option>-->
<!--</el-select>-->
<el-select v-model="formData.locStorageCode" placeholder="当前仓库信息" @change="locCHange"> <el-select v-model="formData.locStorageCode" placeholder="当前仓库信息" @change="locCHange">
<el-option <el-option
v-for="item in storageList" v-for="item in storageList"
@ -143,6 +140,19 @@
<span style="float: right; color: #8492a6; font-size: 13px">{{ item.code }}</span> <span style="float: right; color: #8492a6; font-size: 13px">{{ item.code }}</span>
</el-option> </el-option>
</el-select> </el-select>
<el-select v-model="formData.fromSubInvCode" placeholder="请选择分库" clearable="true"
>
<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>
<!--<span style="float: right; color: #8492a6; font-size: 13px">{{ item.action }}</span>-->
</el-option>
</el-select>
</el-form-item> </el-form-item>
<el-form-item class="query-form-item" prop="fromCorp" <el-form-item class="query-form-item" prop="fromCorp"
v-if="curAction.corpType ==2"> v-if="curAction.corpType ==2">
@ -152,6 +162,28 @@
></el-input> ></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="3">
<div class="ao-text">
<span>当前分库</span>
</div>
</el-col>
<el-col :span="8">
<el-form-item prop="invWarehouseCode">
<el-select v-model="formData.invWarehouseCode" placeholder="当前分库信息"
>
<el-option
v-for="item in subInvList"
:key="item.name"
:label="item.name"
:value="item.code">
<span style="float: left">{{ item.name }}</span>
</el-option>
</el-select>
</el-form-item>
</el-col>
</el-row> </el-row>
</el-form> </el-form>
@ -193,6 +225,7 @@ import {parseTime} from "@/filtres";
import {getLocalJoinByUser} from "@/api/basic/busLocalType"; import {getLocalJoinByUser} from "@/api/basic/busLocalType";
import {submitOrderWeb} from "@/api/warehouse/order"; import {submitOrderWeb} from "@/api/warehouse/order";
import {stockOrderChange, stockOrderDetail} from "@/api/warehouse/stockOrder"; import {stockOrderChange, stockOrderDetail} from "@/api/warehouse/stockOrder";
import {filterSubByInv} from "@/api/basic/invSubWarehouse";
export default { export default {
name: "DialogcChangeNewOrder", name: "DialogcChangeNewOrder",
@ -221,14 +254,19 @@ export default {
mainAction: null mainAction: null
}, },
fromStorageOptions: [], fromStorageOptions: [],
fromSubStorageOptions: [],
curAction: { curAction: {
corpType: 0, corpType: 0,
genUnit: false, genUnit: false,
}, },
busTypes: [], busTypes: [],
fromOptions: [], fromOptions: [],
loading:false, loading: false,
detailList: [] detailList: [],
storageList: [],
detailLoading: false,
subInvList: [],
} }
}, },
methods: { methods: {
@ -271,6 +309,9 @@ export default {
mainAction: this.formData.mainAction, mainAction: this.formData.mainAction,
fromCorp: this.formData.fromCorp, fromCorp: this.formData.fromCorp,
fromCorpId: this.formData.fromCorpId, fromCorpId: this.formData.fromCorpId,
invWarehouseCode: this.formData.invWarehouseCode,
fromSubInvCode: this.formData.fromSubInvCode,
products: products products: products
}; };
stockOrderChange(tQuery) stockOrderChange(tQuery)
@ -288,6 +329,21 @@ export default {
locCHange() { locCHange() {
this.findStorageMethod(); this.findStorageMethod();
this.findSubInvByInv(this.formData.locStorageCode);
},
findSubInvByInv(invCode) {
this.subInvList = [];
let query = {
pcode: invCode
};
filterSubByInv(query)
.then((response) => {
this.subInvList = response.data || [];
})
.catch(() => {
});
}, },
findStorageMethod(query) { findStorageMethod(query) {
@ -304,7 +360,18 @@ export default {
.catch(() => { .catch(() => {
}); });
}, },
findSubStorageMethod() {
let cQuery = {
pcode: this.formData.fromCorpId,
filter: 2,
};
filterSubByInv(cQuery)
.then((response) => {
this.fromSubStorageOptions = response.data || [];
})
.catch(() => {
});
},
findMethod(query) { findMethod(query) {
this.fromOptions = []; this.fromOptions = [];
let cQuery = { let cQuery = {
@ -345,6 +412,7 @@ export default {
storageChange(row) { storageChange(row) {
this.formData.fromCorpId = row.code; this.formData.fromCorpId = row.code;
this.formData.fromCorp = row.name; this.formData.fromCorp = row.name;
this.findSubStorageMethod();
}, },
unitChange(row) { unitChange(row) {

@ -782,7 +782,6 @@ export default {
this.curRow = row; this.curRow = row;
}, },
storageChange(row) { storageChange(row) {
console.log(row);
this.formData.fromCorpId = row.code; this.formData.fromCorpId = row.code;
this.formData.fromCorp = row.name; this.formData.fromCorp = row.name;
this.findSubStorageMethod(); this.findSubStorageMethod();

@ -178,8 +178,8 @@
</el-col> </el-col>
<el-col :span="7"> <el-col :span="7">
<el-form-item prop="locStorageCode"> <el-form-item prop="invWarehouseCode">
<el-select v-model="formData.invWarehouseCode" placeholder="当前库信息" <el-select v-model="formData.invWarehouseCode" placeholder="当前库信息"
clearable> clearable>
<el-option <el-option
v-for="item in subInvList" v-for="item in subInvList"
@ -193,7 +193,6 @@
</el-col> </el-col>
</el-row> </el-row>
<el-row :gutter="20" style="margin-top: -10px;"> <el-row :gutter="20" style="margin-top: -10px;">

@ -78,7 +78,7 @@
:key="item.name" :key="item.name"
:label="item.name" :label="item.name"
:value="item.localAction"> :value="item.localAction">
<span style="float: left">{{ item.localName }}</span> <span style="float: left">{{ item.localName }}</span>
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
@ -94,10 +94,9 @@
<el-col :span="7"> <el-col :span="7">
<el-form-item prop="locStorageCode"> <el-form-item prop="locStorageCode">
<!--<el-select v-model="formData.billType" style="width: 100%" placeholder="业务类型" :disabled="true">--> <el-select v-model="formData.locStorageCode" placeholder="当前仓库信息"
<!--<el-option label="送货单" value="deliveryNote"></el-option>--> @change="invChange"
<!--</el-select>--> disabled>
<el-select v-model="formData.locStorageCode" placeholder="当前仓库信息" disabled>
<el-option <el-option
v-for="item in storageList" v-for="item in storageList"
:key="item.name" :key="item.name"
@ -108,6 +107,30 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="3">
<div class="ao-text">
<span>当前分库</span>
</div>
</el-col>
<el-col :span="7">
<el-form-item prop="invWarehouseCode">
<el-select v-model="formData.invWarehouseCode" disabled
placeholder="当前分库信息"
clearable>
<el-option
v-for="item in subInvList"
:key="item.name"
:label="item.name"
:value="item.code">
<span style="float: left">{{ item.name }}</span>
</el-option>
</el-select>
</el-form-item>
</el-col>
</el-row> </el-row>
</el-card> </el-card>
@ -124,44 +147,44 @@
> >
</el-button-group> </el-button-group>
<!-- <el-row :gutter="20">--> <!-- <el-row :gutter="20">-->
<!-- <el-col :span="3">--> <!-- <el-col :span="3">-->
<!-- <div class="ao-text">--> <!-- <div class="ao-text">-->
<!-- <span>扫码录入</span>--> <!-- <span>扫码录入</span>-->
<!-- </div>--> <!-- </div>-->
<!-- </el-col>--> <!-- </el-col>-->
<!-- <el-col :span="10">--> <!-- <el-col :span="10">-->
<!-- <el-form-item prop="code">--> <!-- <el-form-item prop="code">-->
<!-- &lt;!&ndash; @keyup.native.enter="focusNext('iCount')" @focus="getInputFocus($event)"--> <!-- &lt;!&ndash; @keyup.native.enter="focusNext('iCount')" @focus="getInputFocus($event)"-->
<!-- @keypress.enter.native="selectProductFunction($event)"--> <!-- @keypress.enter.native="selectProductFunction($event)"-->
<!-- &ndash;&gt;--> <!-- &ndash;&gt;-->
<!-- <el-input--> <!-- <el-input-->
<!-- @keyup.enter.native="selectProductFunction($event)"--> <!-- @keyup.enter.native="selectProductFunction($event)"-->
<!-- v-model="code"--> <!-- v-model="code"-->
<!-- auto-complete="off"--> <!-- auto-complete="off"-->
<!-- ref='inputRef'--> <!-- ref='inputRef'-->
<!-- @focus="getInputFocus($event)"--> <!-- @focus="getInputFocus($event)"-->
<!-- ></el-input>--> <!-- ></el-input>-->
<!-- </el-form-item>--> <!-- </el-form-item>-->
<!-- </el-col>--> <!-- </el-col>-->
<!-- &lt;!&ndash; <el-col :span="3">&ndash;&gt;--> <!-- &lt;!&ndash; <el-col :span="3">&ndash;&gt;-->
<!-- &lt;!&ndash; <div class="ao-text">&ndash;&gt;--> <!-- &lt;!&ndash; <div class="ao-text">&ndash;&gt;-->
<!-- &lt;!&ndash; <span>数量</span>&ndash;&gt;--> <!-- &lt;!&ndash; <span>数量</span>&ndash;&gt;-->
<!-- &lt;!&ndash; </div>&ndash;&gt;--> <!-- &lt;!&ndash; </div>&ndash;&gt;-->
<!-- &lt;!&ndash; </el-col>&ndash;&gt;--> <!-- &lt;!&ndash; </el-col>&ndash;&gt;-->
<!-- &lt;!&ndash; <el-col :span="4">&ndash;&gt;--> <!-- &lt;!&ndash; <el-col :span="4">&ndash;&gt;-->
<!-- &lt;!&ndash; <el-form-item prop="iCount">&ndash;&gt;--> <!-- &lt;!&ndash; <el-form-item prop="iCount">&ndash;&gt;-->
<!-- &lt;!&ndash; &lt;!&ndash; @keypress.enter.native="addCode()"&ndash;&gt;&ndash;&gt;--> <!-- &lt;!&ndash; &lt;!&ndash; @keypress.enter.native="addCode()"&ndash;&gt;&ndash;&gt;-->
<!-- &lt;!&ndash; <el-input v-model="iCount" auto-complete="off" ref="iCount"&ndash;&gt;--> <!-- &lt;!&ndash; <el-input v-model="iCount" auto-complete="off" ref="iCount"&ndash;&gt;-->
<!-- &lt;!&ndash; @keypress.enter.native="iCountEnterFunction()"&ndash;&gt;--> <!-- &lt;!&ndash; @keypress.enter.native="iCountEnterFunction()"&ndash;&gt;-->
<!-- &lt;!&ndash; @focus="getInputFocus($event)"&ndash;&gt;--> <!-- &lt;!&ndash; @focus="getInputFocus($event)"&ndash;&gt;-->
<!-- &lt;!&ndash; @input="iCountChange"&ndash;&gt;--> <!-- &lt;!&ndash; @input="iCountChange"&ndash;&gt;-->
<!-- &lt;!&ndash; oninput="value=value.replace(/[^\d]/g,'')"></el-input>&ndash;&gt;--> <!-- &lt;!&ndash; oninput="value=value.replace(/[^\d]/g,'')"></el-input>&ndash;&gt;-->
<!-- &lt;!&ndash; </el-form-item>&ndash;&gt;--> <!-- &lt;!&ndash; </el-form-item>&ndash;&gt;-->
<!-- &lt;!&ndash; </el-col>&ndash;&gt;--> <!-- &lt;!&ndash; </el-col>&ndash;&gt;-->
<!-- </el-row>--> <!-- </el-row>-->
<!-- highlight-current-row--> <!-- highlight-current-row-->
<!-- @current-change="rowChange"--> <!-- @current-change="rowChange"-->
@ -421,6 +444,7 @@ import {getBasicUnitMaintains, getBasicUnitMaintains2} from "../../api/basic/bas
import {getBussinessType} from "../../api/basic/bussinessType"; import {getBussinessType} from "../../api/basic/bussinessType";
import {getLocalBusType, getLocalJoinBusType} from "../../api/basic/busLocalType"; import {getLocalBusType, getLocalJoinBusType} from "../../api/basic/busLocalType";
import {filterAll, filterAllByUser} from "@/api/basic/invWarehouse"; import {filterAll, filterAllByUser} from "@/api/basic/invWarehouse";
import {filterSubByInv} from "@/api/basic/invSubWarehouse";
export default { export default {
name: "idQuery", name: "idQuery",
@ -501,6 +525,7 @@ export default {
selectInvProductVisible: false, selectInvProductVisible: false,
thisData: {}, thisData: {},
storageList: [], storageList: [],
subInvList: [],
}; };
}, },
components: { components: {
@ -1075,6 +1100,19 @@ export default {
.catch(() => { .catch(() => {
}); });
}, },
invChange() {
// this.formData.invWarehouseCode = "";
this.subInvList = [];
let query = {
pcode: this.formData.locStorageCode
};
filterSubByInv(query)
.then((response) => {
this.subInvList = response.data || [];
})
.catch(() => {
});
},
getActionName(action) { getActionName(action) {
for (let i = 0; i < this.busTypes.length; i++) { for (let i = 0; i < this.busTypes.length; i++) {
if (this.busTypes[i].action === action) { if (this.busTypes[i].action === action) {
@ -1123,6 +1161,9 @@ export default {
this.orderEditor = true; this.orderEditor = true;
this.sValue = this.formData.corpName; this.sValue = this.formData.corpName;
this.getStockOrderDetailList(); this.getStockOrderDetailList();
this.invChange();
} else { } else {
this.formData = { this.formData = {
billdate: "", billdate: "",
@ -1137,6 +1178,8 @@ export default {
this.orderEditor = false; this.orderEditor = false;
this.generateBillNo(); this.generateBillNo();
} }
}, },
}; };
</script> </script>

@ -697,7 +697,7 @@ export default {
}, },
distributionForm(index, row) { distributionForm(index, row) {
this.idQuery.id = ''; this.idQuery.id = '';
console.log("row = " + row.id); console.log("row = " + row.invWarehouseCode);
if (this.$isNotBlank(row.id)) { if (this.$isNotBlank(row.id)) {
this.idQuery.id = row.id; this.idQuery.id = row.id;
this.idQuery.formData = row; this.idQuery.formData = row;

Loading…
Cancel
Save