申购单据审核与扫码单据业务单据只留一个仓库问题修改

ww
anthonywj 3 years ago committed by wangwei
parent cb1e27c381
commit d565bcdf6d

@ -27,21 +27,21 @@
<el-form-item class="query-form-item"> <el-form-item class="query-form-item">
<el-input v-model="query.corpName" placeholder="往来单位" clearable></el-input> <el-input v-model="query.corpName" placeholder="往来单位" clearable></el-input>
</el-form-item> </el-form-item>
<!-- <el-form-item class="query-form-item">-->
<!-- <el-select v-model="query.locStorageCode"-->
<!-- @change="invChange"-->
<!-- placeholder="请选择当前仓库" clearable="true" size="mini">-->
<!-- <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-form-item>-->
<el-form-item class="query-form-item"> <el-form-item class="query-form-item">
<el-select v-model="query.locStorageCode" <el-select v-model="query.invWarehouseCode" placeholder="请选择当前仓库" clearable="true"
@change="invChange"
placeholder="请选择当前仓库" clearable="true" size="mini">
<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-form-item>
<el-form-item class="query-form-item">
<el-select v-model="query.invWarehouseCode" placeholder="请选择当前分库" clearable="true"
@change="subInvChange" @change="subInvChange"
size="mini"> size="mini">
<el-option <el-option
@ -384,7 +384,7 @@ export default {
name: "stockOrder", name: "stockOrder",
data() { data() {
return { return {
convertDateFun:convertDate, convertDateFun: convertDate,
query: { query: {
billType: null, billType: null,
corpName: null, corpName: null,
@ -826,11 +826,14 @@ export default {
getSubInvList() { getSubInvList() {
let query = { let query = {
pcode: this.query.locStorageCode // pcode: this.query.locStorageCode
filter: 3
}; };
filterSubByInv(query) filterSubByInv(query)
.then((response) => { .then((response) => {
this.subInvList = response.data || []; this.subInvList = response.data || [];
this.getList();
}) })
.catch(() => { .catch(() => {
}); });
@ -898,7 +901,7 @@ export default {
}, },
created() { created() {
// //
this.getStorage(); this.getSubInvList();
this.getBusType(); this.getBusType();
let end = new Date(); let end = new Date();
let start = new Date(); let start = new Date();

@ -27,21 +27,21 @@
<el-form-item class="query-form-item"> <el-form-item class="query-form-item">
<el-input v-model="query.corpName" placeholder="往来单位" clearable></el-input> <el-input v-model="query.corpName" placeholder="往来单位" clearable></el-input>
</el-form-item> </el-form-item>
<!-- <el-form-item class="query-form-item">-->
<!-- <el-select v-model="query.locStorageCode"-->
<!-- @change="invChange"-->
<!-- placeholder="请选择当前仓库" clearable="true" size="mini">-->
<!-- <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-form-item>-->
<el-form-item class="query-form-item"> <el-form-item class="query-form-item">
<el-select v-model="query.locStorageCode" <el-select v-model="query.invWarehouseCode" placeholder="请选择当前仓库" clearable="true"
@change="invChange"
placeholder="请选择当前仓库" clearable="true" size="mini">
<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-form-item>
<el-form-item class="query-form-item">
<el-select v-model="query.invWarehouseCode" placeholder="请选择当前分库" clearable="true"
@change="subInvChange" @change="subInvChange"
size="mini"> size="mini">
<el-option <el-option
@ -879,11 +879,14 @@ export default {
getSubInvList() { getSubInvList() {
let query = { let query = {
pcode: this.query.locStorageCode // pcode: this.query.locStorageCode
filter:3,
}; };
filterSubByInv(query) filterSubByInv(query)
.then((response) => { .then((response) => {
this.subInvList = response.data || []; this.subInvList = response.data || [];
this.getList();
}) })
.catch(() => { .catch(() => {
}); });
@ -1035,7 +1038,7 @@ export default {
} }
}, },
created() { created() {
this.getStorage(); this.getSubInvList();
this.getBusType(); this.getBusType();
let end = new Date(); let end = new Date();
let start = new Date(); let start = new Date();

@ -26,21 +26,21 @@
<el-form-item class="query-form-item" v-if="isSp ==110"> <el-form-item class="query-form-item" v-if="isSp ==110">
<el-input v-model="query.corpName" placeholder="往来单位" clearable></el-input> <el-input v-model="query.corpName" placeholder="往来单位" clearable></el-input>
</el-form-item> </el-form-item>
<!-- <el-form-item class="query-form-item">-->
<!-- <el-select v-model="query.locStorageCode"-->
<!-- @change="invChange"-->
<!-- placeholder="请选择当前仓库" clearable="true" size="mini">-->
<!-- <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-form-item>-->
<el-form-item class="query-form-item"> <el-form-item class="query-form-item">
<el-select v-model="query.locStorageCode" <el-select v-model="query.invWarehouseCode" placeholder="请选择当前仓库" clearable="true"
@change="invChange"
placeholder="请选择当前仓库" clearable="true" size="mini">
<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-form-item>
<el-form-item class="query-form-item">
<el-select v-model="query.invWarehouseCode" placeholder="请选择当前分库" clearable="true"
@change="subInvChange" @change="subInvChange"
size="mini"> size="mini">
<el-option <el-option
@ -645,11 +645,11 @@ export default {
this.query.startTime = null; this.query.startTime = null;
this.query.endTime = null; this.query.endTime = null;
} }
this.query.page=1 this.query.page = 1
this.getList(); this.getList();
// //
this.detailQuery.page=1 this.detailQuery.page = 1
this.detailTotal=0 this.detailTotal = 0
if (this.query.status === "202") { if (this.query.status === "202") {
this.haveDistributionVisible = true; this.haveDistributionVisible = true;
} else { } else {
@ -979,11 +979,13 @@ export default {
getSubInvList() { getSubInvList() {
let query = { let query = {
pcode: this.query.locStorageCode // pcode: this.query.locStorageCode
filter: 3
}; };
filterSubByInv(query) filterSubByInv(query)
.then((response) => { .then((response) => {
this.subInvList = response.data || []; this.subInvList = response.data || [];
this.getList();
}) })
.catch(() => { .catch(() => {
}); });
@ -1025,7 +1027,7 @@ export default {
} }
}, },
created() { created() {
this.getStorage(); this.getSubInvList();
this.getSysParm(); this.getSysParm();
this.getBusType(); this.getBusType();
this.getList(); this.getList();

@ -26,23 +26,23 @@
<el-form-item class="query-form-item" v-if="isSp ==110"> <el-form-item class="query-form-item" v-if="isSp ==110">
<el-input v-model="query.corpName" placeholder="往来单位" clearable></el-input> <el-input v-model="query.corpName" 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="query.locStorageCode" <!-- <el-select v-model="query.locStorageCode"-->
placeholder="请选择当前仓库" clearable="true" size="mini" <!-- placeholder="请选择当前仓库" clearable="true" size="mini"-->
@change="invChange"> <!-- @change="invChange">-->
<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 class="query-form-item"> <el-form-item class="query-form-item">
<el-select v-model="query.invWarehouseCode" placeholder="请选择当前库" clearable="true" <el-select v-model="query.invWarehouseCode" placeholder="请选择当前库" clearable="true"
@change="subInvChange" @change="subInvChange"
size="mini"> size="mini">
<el-option <el-option
@ -603,7 +603,7 @@ export default {
this.query.endTime = null; this.query.endTime = null;
} }
// //
this.query.page=1 this.query.page = 1
this.getList(); this.getList();
if (this.query.status === "502") { if (this.query.status === "502") {
this.haveNewDistributionVisible = true; this.haveNewDistributionVisible = true;
@ -700,7 +700,7 @@ export default {
getStockOrderDetailList(row) { getStockOrderDetailList(row) {
if (this.$isNotBlank(row)) { if (this.$isNotBlank(row)) {
this.detailQuery.orderIdFk = row.id; this.detailQuery.orderIdFk = row.id;
this.detailQuery.page=1 this.detailQuery.page = 1
this.formData = row; this.formData = row;
} }
this.detailLoading = true; this.detailLoading = true;
@ -952,11 +952,13 @@ export default {
getSubInvList() { getSubInvList() {
let query = { let query = {
pcode: this.query.locStorageCode // pcode: this.query.locStorageCode
filter: 3
}; };
filterSubByInv(query) filterSubByInv(query)
.then((response) => { .then((response) => {
this.subInvList = response.data || []; this.subInvList = response.data || [];
this.getList();
}) })
.catch(() => { .catch(() => {
}); });
@ -997,7 +999,7 @@ export default {
}, },
created() { created() {
this.getBusType(); this.getBusType();
this.getStorage(); this.getSubInvList();
let end = new Date(); let end = new Date();
let start = new Date(); let start = new Date();
start.setTime(start.getTime() - 3600 * 1000 * 24 * 7); start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);

@ -27,21 +27,21 @@
<el-form-item class="query-form-item"> <el-form-item class="query-form-item">
<el-input v-model="query.corpName" placeholder="往来单位" clearable></el-input> <el-input v-model="query.corpName" placeholder="往来单位" clearable></el-input>
</el-form-item> </el-form-item>
<!-- <el-form-item class="query-form-item">-->
<!-- <el-select v-model="query.locStorageCode"-->
<!-- @change="invChange"-->
<!-- placeholder="请选择当前仓库" clearable="true" size="mini">-->
<!-- <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-form-item>-->
<el-form-item class="query-form-item"> <el-form-item class="query-form-item">
<el-select v-model="query.locStorageCode" <el-select v-model="query.invWarehouseCode" placeholder="请选择当前仓库" clearable="true"
@change="invChange"
placeholder="请选择当前仓库" clearable="true" size="mini">
<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-form-item>
<el-form-item class="query-form-item">
<el-select v-model="query.invWarehouseCode" placeholder="请选择当前分库" clearable="true"
@change="subInvChange" @change="subInvChange"
size="mini"> size="mini">
<el-option <el-option
@ -1002,11 +1002,13 @@ export default {
getSubInvList() { getSubInvList() {
let query = { let query = {
pcode: this.query.locStorageCode // pcode: this.query.locStorageCode
filter:3
}; };
filterSubByInv(query) filterSubByInv(query)
.then((response) => { .then((response) => {
this.subInvList = response.data || []; this.subInvList = response.data || [];
this.getList();
}) })
.catch(() => { .catch(() => {
}); });
@ -1120,7 +1122,7 @@ export default {
created() { created() {
this.isReceAble = true; this.isReceAble = true;
this.getStorage(); this.getSubInvList();
this.getBusType(); this.getBusType();
let end = new Date(); let end = new Date();
let start = new Date(); let start = new Date();

@ -27,21 +27,21 @@
<el-form-item class="query-form-item" v-if="isSp ==110"> <el-form-item class="query-form-item" v-if="isSp ==110">
<el-input v-model="query.corpName" placeholder="往来单位" clearable></el-input> <el-input v-model="query.corpName" placeholder="往来单位" clearable></el-input>
</el-form-item> </el-form-item>
<!-- <el-form-item class="query-form-item">-->
<!-- <el-select v-model="query.locStorageCode"-->
<!-- @change="invChange"-->
<!-- placeholder="请选择当前仓库" clearable="true" size="mini">-->
<!-- <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-form-item>-->
<el-form-item class="query-form-item"> <el-form-item class="query-form-item">
<el-select v-model="query.locStorageCode" <el-select v-model="query.invWarehouseCode" placeholder="请选择当前仓库" clearable="true"
@change="invChange"
placeholder="请选择当前仓库" clearable="true" size="mini">
<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-form-item>
<el-form-item class="query-form-item">
<el-select v-model="query.invWarehouseCode" placeholder="请选择当前分库" clearable="true"
@change="subInvChange" @change="subInvChange"
size="mini"> size="mini">
<el-option <el-option
@ -813,11 +813,13 @@ export default {
getSubInvList() { getSubInvList() {
let query = { let query = {
pcode: this.query.locStorageCode // pcode: this.query.locStorageCode
filter:3
}; };
filterSubByInv(query) filterSubByInv(query)
.then((response) => { .then((response) => {
this.subInvList = response.data || []; this.subInvList = response.data || [];
this.getList();
}) })
.catch(() => { .catch(() => {
}); });
@ -884,7 +886,7 @@ export default {
}, },
created() { created() {
// //
this.getStorage(); this.getSubInvList();
this.getBusType(); this.getBusType();
let end = new Date(); let end = new Date();
let start = new Date(); let start = new Date();

@ -33,21 +33,21 @@
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<!-- <el-form-item class="query-form-item">-->
<!-- <el-select v-model="filterQuery.locStorageCode" placeholder="请选择当前仓库" clearable="true"-->
<!-- @change="invChange"-->
<!-- size="mini">-->
<!-- <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-form-item>-->
<el-form-item class="query-form-item"> <el-form-item class="query-form-item">
<el-select v-model="filterQuery.locStorageCode" placeholder="请选择当前仓库" clearable="true" <el-select v-model="filterQuery.invWarehouseCode" placeholder="请选择当前仓库" clearable="true"
@change="invChange"
size="mini">
<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-form-item>
<el-form-item class="query-form-item">
<el-select v-model="filterQuery.invWarehouseCode" placeholder="请选择当前分库" clearable="true"
@change="subInvChange" @change="subInvChange"
size="mini"> size="mini">
<el-option <el-option
@ -514,7 +514,7 @@ export default {
data() { data() {
return { return {
convertDateFun:convertDate, convertDateFun: convertDate,
query: { query: {
page: 1, page: 1,
limit: 20, limit: 20,
@ -541,7 +541,7 @@ export default {
"6": "缺量补录单据", "6": "缺量补录单据",
"7": "UDI供应商平台", "7": "UDI供应商平台",
"8": "平衡补录单据", "8": "平衡补录单据",
"10":"手动补单", "10": "手动补单",
"11": "仓库盘点" "11": "仓库盘点"
}, },
busTypes: [], busTypes: [],
@ -781,7 +781,7 @@ export default {
this.list = response.data.list || []; this.list = response.data.list || [];
this.total = response.data.total || 0; this.total = response.data.total || 0;
}else { } else {
this.$message.error(response.message); this.$message.error(response.message);
} }
this.detailList = []; this.detailList = [];
@ -1131,11 +1131,13 @@ export default {
getSubInvList() { getSubInvList() {
let query = { let query = {
pcode: this.filterQuery.locStorageCode // pcode: this.filterQuery.locStorageCode
filter: 3
}; };
filterSubByInv(query) filterSubByInv(query)
.then((response) => { .then((response) => {
this.subInvList = response.data || []; this.subInvList = response.data || [];
this.getList();
}) })
.catch(() => { .catch(() => {
}); });
@ -1162,7 +1164,7 @@ export default {
}, },
created() { created() {
this.getStorage(); this.getSubInvList();
this.getBusType(); this.getBusType();
let query = this.$route.query; let query = this.$route.query;
this.query = Object.assign(this.query, query); this.query = Object.assign(this.query, query);

@ -33,21 +33,21 @@
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<!-- <el-form-item class="query-form-item">-->
<!-- <el-select v-model="filterQuery.locStorageCode" placeholder="请选择当前仓库" clearable="true"-->
<!-- @change="invChange"-->
<!-- size="mini">-->
<!-- <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-form-item>-->
<el-form-item class="query-form-item"> <el-form-item class="query-form-item">
<el-select v-model="filterQuery.locStorageCode" placeholder="请选择当前仓库" clearable="true" <el-select v-model="filterQuery.invWarehouseCode" placeholder="请选择当前仓库" clearable="true"
@change="invChange"
size="mini">
<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-form-item>
<el-form-item class="query-form-item">
<el-select v-model="filterQuery.invWarehouseCode" placeholder="请选择当前分库" clearable="true"
@change="subInvChange" @change="subInvChange"
size="mini"> size="mini">
<el-option <el-option
@ -883,11 +883,13 @@ export default {
getSubInvList() { getSubInvList() {
let query = { let query = {
pcode: this.filterQuery.locStorageCode // pcode: this.filterQuery.locStorageCode
filter: 3
}; };
filterSubByInv(query) filterSubByInv(query)
.then((response) => { .then((response) => {
this.subInvList = response.data || []; this.subInvList = response.data || [];
this.getList();
}) })
.catch(() => { .catch(() => {
}); });
@ -914,7 +916,7 @@ export default {
}, },
created() { created() {
this.getStorage(); this.getSubInvList();
this.getBusType(); this.getBusType();
let query = this.$route.query; let query = this.$route.query;
this.query = Object.assign(this.query, query); this.query = Object.assign(this.query, query);

@ -34,21 +34,21 @@
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<!-- <el-form-item class="query-form-item">-->
<!-- <el-select v-model="filterQuery.locStorageCode" placeholder="请选择当前仓库" clearable="true"-->
<!-- @change="invChange"-->
<!-- size="mini">-->
<!-- <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-form-item>-->
<el-form-item class="query-form-item"> <el-form-item class="query-form-item">
<el-select v-model="filterQuery.locStorageCode" placeholder="请选择当前仓库" clearable="true" <el-select v-model="filterQuery.invWarehouseCode" placeholder="请选择当前仓库" clearable="true"
@change="invChange"
size="mini">
<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-form-item>
<el-form-item class="query-form-item">
<el-select v-model="filterQuery.invWarehouseCode" placeholder="请选择当前分库" clearable="true"
@change="subInvChange" @change="subInvChange"
size="mini"> size="mini">
<el-option <el-option
@ -919,11 +919,13 @@ export default {
getSubInvList() { getSubInvList() {
let query = { let query = {
pcode: this.filterQuery.locStorageCode // pcode: this.filterQuery.locStorageCode
filter: 3
}; };
filterSubByInv(query) filterSubByInv(query)
.then((response) => { .then((response) => {
this.subInvList = response.data || []; this.subInvList = response.data || [];
this.getList();
}) })
.catch(() => { .catch(() => {
}); });
@ -954,7 +956,7 @@ export default {
, ,
created() { created() {
this.getStorage(); this.getSubInvList();
this.getBusType(); this.getBusType();
let query = this.$route.query; let query = this.$route.query;
this.query = Object.assign(this.query, query); this.query = Object.assign(this.query, query);

@ -28,21 +28,21 @@
</el-col> </el-col>
<el-col> <el-col>
<!-- <el-form-item class="query-form-item">-->
<!-- <el-select v-model="filterQuery.locStorageCode" placeholder="请选择当前仓库" clearable="true"-->
<!-- @change="invChange"-->
<!-- size="mini">-->
<!-- <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-form-item>-->
<el-form-item class="query-form-item"> <el-form-item class="query-form-item">
<el-select v-model="filterQuery.locStorageCode" placeholder="请选择当前仓库" clearable="true" <el-select v-model="filterQuery.invWarehouseCode" placeholder="请选择当前仓库" clearable="true"
@change="invChange"
size="mini">
<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-form-item>
<el-form-item class="query-form-item">
<el-select v-model="filterQuery.invWarehouseCode" placeholder="请选择当前分库" clearable="true"
size="mini" size="mini"
@change="subInvChange" @change="subInvChange"
> >
@ -682,11 +682,13 @@ export default {
getSubInvList() { getSubInvList() {
let query = { let query = {
pcode: this.filterQuery.locStorageCode // pcode: this.filterQuery.locStorageCode
filter: 3,
}; };
filterSubByInv(query) filterSubByInv(query)
.then((response) => { .then((response) => {
this.subInvList = response.data || []; this.subInvList = response.data || [];
this.getList();
}) })
.catch(() => { .catch(() => {
}); });
@ -720,7 +722,7 @@ export default {
}; };
}, },
created() { created() {
this.getStorage(); this.getSubInvList();
this.getBusType(); this.getBusType();
let query = this.$route.query; let query = this.$route.query;
this.filterQuery = Object.assign(this.filterQuery, query); this.filterQuery = Object.assign(this.filterQuery, query);

@ -1,11 +1,8 @@
<template> <template>
<div class="login-container"> <div class="login-container">
<div> <div>
<h3 class="toptitle">{{ hospName }}</h3> <h3 class="toptitle">{{ hospName }}</h3>
</div> </div>
<el-form <el-form
class="card-box login-form" class="card-box login-form"
autocomplete="on" autocomplete="on"

@ -61,20 +61,7 @@
</el-col> </el-col>
<el-col :span="7"> <el-col :span="7">
<el-form-item prop="locStorageCode"> <el-select v-model="formData.invWarehouseCode" placeholder="当前仓库信息" style="width: 100%"
<el-select v-model="formData.locStorageCode" placeholder="当前仓库信息"
:disabled="true"
style="width: 50%"
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%"
:disabled="true" :disabled="true"
clearable> clearable>
<el-option <el-option
@ -83,43 +70,15 @@
: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>
</el-option> </el-option>
</el-select> </el-select>
</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="targetInv">-->
<!-- <el-select v-model="formData.targetInv" placeholder="当前仓库信息" @change="locInChange"-->
<!-- style="width: 50%"-->
<!-- clearable>-->
<!-- <el-option-->
<!-- v-for="item in targetInvList"-->
<!-- :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.targetSubInv" placeholder="当前分库信息" style="width: 50%"-->
<!-- clearable>-->
<!-- <el-option-->
<!-- v-for="item in targetSubInvList"-->
<!-- :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-col :span="3"> <el-col :span="3">
<div class="ao-text"> <div class="ao-text">
<span>申购说明</span> <span>申购说明</span>
@ -133,7 +92,6 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
@ -180,12 +138,34 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row :gutter="20" v-if="formData.audtoPlan">
<el-col :span="3">
<div class="ao-text">
<span>采购科室</span>
</div>
</el-col>
<el-col :span="7">
<el-form-item prop="targetInv">
<el-select v-model="formData.targetSubInv" placeholder="当前采购科室信息" @change="setTargetInv"
style="width: 100%"
clearable>
<el-option
v-for="item in targetSubInvList"
: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-row>
</el-card> </el-card>
<el-card> <el-card>
<el-table v-loading="loading" :data="codeArray" style="width: 100%;" <el-table v-loading="loading" :data="codeArray" style="width: 100%;"
:row-class-name="tableRowClassName" :row-class-name="tableRowClassName"
max-height="300" height="300" ref="multipleTable"> max-height="300" height="300" ref="multipleTable">
@ -243,7 +223,6 @@
</el-table> </el-table>
</el-card> </el-card>
</el-form> </el-form>
<el-dialog <el-dialog
title="产品录入" title="产品录入"
:visible.sync="selectProductVisible" :visible.sync="selectProductVisible"
@ -340,11 +319,8 @@ export default {
thisData: {}, thisData: {},
storageList: [], storageList: [],
subInvList: [], subInvList: [],
targetInvList: [], targetInvList: [],
targetSubInvList: [], targetSubInvList: [],
invQueryData: {}, invQueryData: {},
}; };
@ -358,6 +334,12 @@ export default {
let tip = ""; let tip = "";
if (status == "3") { if (status == "3") {
tip = "是否确定通过该申购请求?"; tip = "是否确定通过该申购请求?";
if (this.formData.audtoPlan) {
if (this.$isBlank(this.formData.targetSubInv)) {
this.$message.warning("请选择当前采购科室!");
return;
}
}
} else { } else {
tip = "是否确定拒绝该申购请求?"; tip = "是否确定拒绝该申购请求?";
} }
@ -525,7 +507,7 @@ export default {
findTargetSubInvs() { findTargetSubInvs() {
this.targetSubInvList = []; this.targetSubInvList = [];
let query = { let query = {
pcode: this.formData.targetInv filter:3
}; };
filterSubByInv(query) filterSubByInv(query)
.then((response) => { .then((response) => {
@ -590,7 +572,9 @@ export default {
} }
this.getStorage(); this.getStorage();
this.findSubInvs(); this.findSubInvs();
this.getTargetStorage(); // this.getTargetStorage();
this.findTargetSubInvs();
this.codeArray = []; this.codeArray = [];
this.getBusType(); this.getBusType();
}, },

Loading…
Cancel
Save