UDI
/
spms-vue
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

去除仓库功能

Browse Source
featFunction
zhengmingliang 3 years ago
parent 3af256aa28
commit 7fa36313b8
14 changed files with 88 additions and 371 deletions
Show Stats Download Patch File Download Diff File

7
src/api/basic/invSubWarehouse.js
Unescape Escape View File

@ -16,6 +16,13 @@ export function filterSubByInv(query) {
params: query params: query
}); });
} }
export function filterSub(query) {
return axios({
url: "/spms/sub/inv/warehouse/filterSub",
method: "get",
params: query
});
}

59
src/views/basic/BasicEntrutsReceModify.vue
Unescape Escape View File

@ -1,36 +1,15 @@
<template> <template>
<div> <div>
<el-form :model="inputQuery" :rules="formRules" ref="dataForm"> <el-form :model="inputQuery" :rules="formRules" ref="dataForm">
<el-row :gutter="20" class="el-row" type="flex"> <el-row :gutter="20" class="el-row" type="flex">
<el-col :span="10" class="el-col">
<div class="text item">
<div class="itemTag">
<span>委托仓库:&nbsp;</span>
</div>
<el-select v-model="inputQuery.curInv" placeholder="当前仓库" @change="invChange" clearable>
<el-option
v-for="item in storageList"
:key="item.code"
:label="item.name"
:value="item.code">
<span style="float: left">{{ item.name }}</span>
</el-option>
</el-select>
</div>
</el-col>
<el-col :span="10" class="el-col"> <el-col :span="10" class="el-col">
<div class="text item"> <div class="text item">
<div class="itemTag"> <div class="itemTag">
<span>当前分库:&nbsp;</span> <span>当前分库:&nbsp;</span>
</div> </div>
<el-select v-model="inputQuery.invWarehouseCode" placeholder="当前分库" <el-select v-model="inputQuery.invWarehouseCode" placeholder="当前分库"
@change="subInvChange" @change="entrustInvChange"
filterable
clearable> clearable>
<el-option <el-option
v-for="item in subInvList" v-for="item in subInvList"
@ -38,6 +17,7 @@
: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>
@ -73,27 +53,6 @@
</el-row> </el-row>
<el-row :gutter="20" class="el-row" type="flex"> <el-row :gutter="20" class="el-row" type="flex">
<el-col :span="10" class="el-col">
<div class="text item">
<div class="itemTag">
<span>接受委托仓库:&nbsp;</span>
</div>
<el-select v-model="inputQuery.entrustInv" placeholder="接受委托仓库" @change="entrustInvChange"
clearable>
<el-option
v-for="item in entrustStorageList"
:key="item.code"
:label="item.name"
:value="item.code">
<span style="float: left">{{ item.name }}</span>
</el-option>
</el-select>
</div>
</el-col>
<el-col :span="10" class="el-col"> <el-col :span="10" class="el-col">
<div class="text item"> <div class="text item">
<div class="itemTag"> <div class="itemTag">
@ -101,6 +60,7 @@
</div> </div>
<el-select v-model="inputQuery.entrustSubInv" placeholder="接受委托分库" <el-select v-model="inputQuery.entrustSubInv" placeholder="接受委托分库"
@change="entrustSubInvChange" @change="entrustSubInvChange"
filterable
clearable> clearable>
<el-option <el-option
v-for="item in entrustSubInvList" v-for="item in entrustSubInvList"
@ -108,6 +68,7 @@
: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>
@ -173,7 +134,7 @@ import {
import {filterAll, filterNext, warehouseBussinessTypeList, warehouseUserList} from "@/api/basic/invWarehouse"; import {filterAll, filterNext, warehouseBussinessTypeList, warehouseUserList} from "@/api/basic/invWarehouse";
import {getBasicUnitMaintains} from "@/api/basic/basicUnitMaintain"; import {getBasicUnitMaintains} from "@/api/basic/basicUnitMaintain";
import {filterNoUseBusType} from "@/api/basic/EntrustRece"; import {filterNoUseBusType} from "@/api/basic/EntrustRece";
import {filterSubByInv} from "@/api/basic/invSubWarehouse"; import {filterSubByInv,filterSub} from "@/api/basic/invSubWarehouse";
export default { export default {
@ -268,12 +229,13 @@ export default {
findEntrustSubInvByInv() { findEntrustSubInvByInv() {
this.entrustSubInvList = []; this.entrustSubInvList = [];
let query = { let query = {
pcode: this.inputQuery.entrustInv, code: this.inputQuery.invWarehouseCode,
filter: 2,
}; };
filterSubByInv(query) filterSub(query)
.then((response) => { .then((response) => {
this.entrustSubInvList = response.data || []; this.entrustSubInvList = response.data || [];
this.entrustSubInvChange(); this.entrustSubInvChange();
@ -295,6 +257,7 @@ export default {
}); });
}, },
getOrderType() { getOrderType() {
let query = { let query = {
locSubInvCode: this.inputQuery.invWarehouseCode locSubInvCode: this.inputQuery.invWarehouseCode
} }

4
src/views/basic/invWarehouse.vue
Unescape Escape View File

@ -1457,9 +1457,7 @@ export default {
this.currentCode = row.code; this.currentCode = row.code;
this.currentRow = row; this.currentRow = row;
this.loadLinkData(row); this.loadLinkData(row);
if (this.currentCode == null || this.currentCode == '') { if (this.currentCode != row.code) {
this.$message.error('请先选择仓库');
} else if (this.currentCode != row.code) {
this.$message.error("请先选择当前分库！") this.$message.error("请先选择当前分库！")
} else { } else {
this.bussinessTypeFormVisible = true; this.bussinessTypeFormVisible = true;

46
src/views/home/index.vue
Unescape Escape View File

@ -202,30 +202,6 @@
v-if="selInvVisible" v-if="selInvVisible"
> >
<el-form :model="userInfo"> <el-form :model="userInfo">
<el-row :gutter="20">
<el-col :span="4">
<div class="ao-text">
<span>仓库：</span>
</div>
</el-col>
<el-col :span="16">
<el-form-item prop="locStorageCode">
<el-select v-model="userInfo.locInvCode" placeholder="仓库信息" clearable
@change="locCHange"
>
<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-col>
</el-row>
<el-row :gutter="20"> <el-row :gutter="20">
<el-col :span="4"> <el-col :span="4">
<div class="ao-text"> <div class="ao-text">
@ -234,15 +210,15 @@
</el-col> </el-col>
<el-col :span="16"> <el-col :span="16">
<el-form-item prop="locInvCode"> <el-form-item prop="locInvCode">
<el-select v-model="userInfo.locSubInvCode" placeholder="分库信息" clearable <el-select v-model="userInfo.locSubInvCode" filterable placeholder="分库信息" clearable
> >
<el-option <el-option
v-for="item in subInvList" v-for="item in subInvList"
: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>
<span style="float: right; color: #8492a6; font-size: 13px">{{ item.warehouseName }}</span>
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
@ -250,7 +226,7 @@
</el-row> </el-row>
<div style="margin-top: 8px ; color: #F71616;"> <div style="margin-top: 8px ; color: #F71616;">
<span>提示：进入系统前请选择您默认所在仓库与分库&nbsp;</span> <span>提示：进入系统前请选择您默认所在分库&nbsp;</span>
</div> </div>
<div style='text-align: center; margin-bottom: 10px;margin-top: 18px ;'> <div style='text-align: center; margin-bottom: 10px;margin-top: 18px ;'>
<el-button type="primary" @click="submitInv" style="width: 150px">提交</el-button> <el-button type="primary" @click="submitInv" style="width: 150px">提交</el-button>
@ -445,14 +421,12 @@ export default {
findSubInvByInv() { findSubInvByInv() {
this.subInvList = []; this.subInvList = [];
let query = {
pcode: this.userInfo.locInvCode filterSubByInv()
};
filterSubByInv(query)
.then((response) => { .then((response) => {
this.subInvList = response.data || []; this.subInvList = response.data || [];
if (this.subInvList != null && this.subInvList.length == 1) { if (this.subInvList != null && this.subInvList.length == 1) {
this.userInfo.locSubInvCode = this.subInvList[0].code; this.userInfo.locSubInvCode = this.subInvList[subInvList.length].code;
} }
}) })
.catch(() => { .catch(() => {
@ -472,7 +446,7 @@ export default {
} }
if (this.$isBlank(this.userInfo.locInvCode) || this.$isBlank(this.userInfo.locSubInvCode)) { if (this.$isBlank(this.userInfo.locSubInvCode)) {
this.selInvVisible = true; this.selInvVisible = true;
} else { } else {
this.$store.commit(types.RECEIVE_LOCINVCODE, this.userInfo.locInvCode); this.$store.commit(types.RECEIVE_LOCINVCODE, this.userInfo.locInvCode);
@ -501,11 +475,6 @@ export default {
}, },
submitInv() { submitInv() {
if (this.$isBlank(this.userInfo.locInvCode)) {
this.$message.error("仓库不能为空！");
return;
}
if (this.$isBlank(this.userInfo.locSubInvCode)) { if (this.$isBlank(this.userInfo.locSubInvCode)) {
this.$message.error("分库不能为空！"); this.$message.error("分库不能为空！");
return; return;
@ -582,6 +551,7 @@ export default {
// this.getStorage(); // this.getStorage();
// this.findSubInvByInv(); // this.findSubInvByInv();
this.getUserInfo(); this.getUserInfo();
this.locCHange();
bus.$on("collapse-content", (msg) => { bus.$on("collapse-content", (msg) => {
this.collapse = msg; this.collapse = msg;
}); });

4
src/views/thrsys/ThrInvWarehouse.vue
Unescape Escape View File

@ -368,9 +368,7 @@ export default {
thirdSysFk: [ thirdSysFk: [
{required: true, message: "请选择第三方系统", trigger: "blur"} {required: true, message: "请选择第三方系统", trigger: "blur"}
], ],
advanceType: [
{required: true, message: "请选择仓库类型", trigger: "blur"}
]
}, },
pidData: {}, pidData: {},
deleteLoading: false, deleteLoading: false,

26
src/views/thrsys/thrOrderNew.vue
Unescape Escape View File

@ -88,7 +88,7 @@
remote remote
clearable="true" clearable="true"
reserve-keyword reserve-keyword
placeholder="请输入仓库信息" placeholder="请输入往来单位"
:remote-method="findStorageMethod" :remote-method="findStorageMethod"
:loading="loading" :loading="loading"
@change="storageChange" @change="storageChange"
@ -109,26 +109,7 @@
</el-row> </el-row>
<el-row :gutter="20" style="margin-top: -10px"> <el-row :gutter="20" style="margin-top: -10px">
<el-col :span="3">
<div class="ao-text">
<span>当前仓库：</span>
</div>
</el-col>
<el-col :span="7">
<el-form-item prop="locStorageCode">
<el-select v-model="formData.locStorageCode" 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-form-item>
</el-col>
<el-col :span="3"> <el-col :span="3">
<div class="ao-text"> <div class="ao-text">
@ -146,6 +127,7 @@
: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-form-item>
@ -381,9 +363,7 @@ export default {
billType: [ billType: [
{required: true, message: "请选择业务类型", trigger: "blur"} {required: true, message: "请选择业务类型", trigger: "blur"}
], ],
locStorageCode: [
{required: true, message: "请选择当前仓库", trigger: "blur"}
],
invWarehouseCode: [ invWarehouseCode: [
{required: true, message: "请选择当前分库", trigger: "blur"} {required: true, message: "请选择当前分库", trigger: "blur"}
], ],

54
src/views/warehouse/DialogcChangeNewOrder.vue
Unescape Escape View File

@ -66,19 +66,21 @@
<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="8"> <el-col :span="8">
<el-form-item prop="locStorageCode"> <el-form-item prop="invWarehouseCode">
<el-select v-model="formData.locStorageCode" placeholder="当前仓库信息" @change="locCHange"> <el-select v-model="formData.invWarehouseCode" placeholder="当前分库信息" @change="findSubStorageMethod"
>
<el-option <el-option
v-for="item in storageList" v-for="item in subInvList"
: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>
<span style="float: right; color: #8492a6; font-size: 13px">{{ item.warehouseName }}</span>
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
@ -120,26 +122,6 @@
</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 ==1"> v-if="curAction.corpType ==1">
<el-select
v-model="formData.fromCorp"
filterable
remote
clearable="true"
reserve-keyword
placeholder="请输入仓库信息"
:remote-method="findStorageMethod"
:loading="loading"
@change="storageChange"
>
<el-option
v-for="item in fromStorageOptions"
:key="item.value"
:label="item.code"
:value="item">
<span style="float: left">{{ item.name }}</span>
<span style="float: right; color: #8492a6; font-size: 13px">{{ item.code }}</span>
</el-option>
</el-select>
<el-select v-model="formData.fromSubInvCode" placeholder="请选择分库" clearable="true" <el-select v-model="formData.fromSubInvCode" placeholder="请选择分库" clearable="true"
> >
@ -149,7 +131,7 @@
: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.code }}</span> <span style="float: right; color: #8492a6; font-size: 13px">{{ item.warehouseName }}</span>
<!--<span style="float: right; color: #8492a6; font-size: 13px">{{ item.action }}</span>--> <!--<span style="float: right; color: #8492a6; font-size: 13px">{{ item.action }}</span>-->
</el-option> </el-option>
</el-select> </el-select>
@ -164,26 +146,7 @@
</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>
@ -383,7 +346,7 @@ export default {
}, },
findSubStorageMethod() { findSubStorageMethod() {
let cQuery = { let cQuery = {
pcode: this.formData.fromCorpId, code: this.formData.invWarehouseCode,
filter: 2, filter: 2,
}; };
filterSubByInv(cQuery) filterSubByInv(cQuery)
@ -508,6 +471,7 @@ export default {
this.formData.corpOrderId = parseTime(date, '{y}{m}{d}{h}{i}{s}') + Math.ceil(Math.random() * 89 + 10); this.formData.corpOrderId = parseTime(date, '{y}{m}{d}{h}{i}{s}') + Math.ceil(Math.random() * 89 + 10);
} }
this.getBusType(); this.getBusType();
this.findSubInvByInv(this.formData.locStorageCode);
this.getStorage(); this.getStorage();
this.getStockOrderDetailList(this.curRow.id); this.getStockOrderDetailList(this.curRow.id);
} }

15
src/views/warehouse/IOErrorOrder.vue
Unescape Escape View File

@ -24,19 +24,7 @@
</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="invChangetwo"
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.invWarehouseCode" placeholder="请选择当前分库" clearable="true" <el-select v-model="filterQuery.invWarehouseCode" placeholder="请选择当前分库" clearable="true"
size="mini"> size="mini">
@ -46,6 +34,7 @@
: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-form-item>

7
src/views/warehouse/IOWaitOrder.vue
Unescape Escape View File

@ -560,12 +560,7 @@ export default {
this.filterQuery.endTime = null; this.filterQuery.endTime = null;
} }
if (!isBlank(this.filterQuery.invWarehouseCode)) {
if (isBlank(this.filterQuery.locStorageCode)) {
this.$message.warning("请选择仓库！");
return;
}
}
this.getList(); this.getList();
}, },
handleSizeChange(val) { handleSizeChange(val) {

78
src/views/warehouse/addHosOrder.vue
Unescape Escape View File

@ -70,20 +70,21 @@
<el-col :span="2"> <el-col :span="2">
<div class="ao-text"> <div class="ao-text">
<span>当前仓库：</span> <span>当前分库：</span>
</div> </div>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<el-form-item prop="locStorageCode"> <el-form-item prop="invWarehouseCode">
<el-select v-model="formData.locStorageCode" placeholder="当前仓库信息" @change="locCHange" <el-select v-model="formData.invWarehouseCode" placeholder="当前分库信息"
:disabled="corpOrderIdDisabled"> :disabled="corpOrderIdDisabled" @change="findSubStorageMethod" filterable>
<el-option <el-option
v-for="item in storageList" v-for="item in subInvList"
: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>
<span style="float: right; color: #8492a6; font-size: 13px">{{ item.warehouseName }}</span>
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
@ -130,30 +131,11 @@
<el-form-item class="query-form-item" prop="fromCorp" <el-form-item class="query-form-item" prop="fromCorp"
v-if="curAction.corpType ==1" v-if="curAction.corpType ==1"
> >
<el-select
v-model="formData.fromCorp"
filterable
remote
clearable="true"
reserve-keyword
placeholder="请输入仓库信息"
:remote-method="findStorageMethod"
:loading="loading" :disabled="corpOrderIdDisabled"
@change="storageChange"
>
<el-option
v-for="item in fromStorageOptions"
:key="item.value"
:label="item.code"
:value="item">
<span style="float: left">{{ item.name }}</span>
<span style="float: right; color: #8492a6; font-size: 13px">{{ item.code }}</span>
</el-option>
</el-select>
<el-select v-model="formData.fromSubInvCode" placeholder="请选择分库" clearable="true" <el-select v-model="formData.fromSubInvCode" placeholder="请选择分库" clearable="true"
:disabled="corpOrderIdDisabled" :disabled="corpOrderIdDisabled" filterable
> >
<el-option <el-option
v-for="item in fromSubStorageOptions" v-for="item in fromSubStorageOptions"
@ -161,7 +143,7 @@
: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.code }}</span> <span style="float: right; color: #8492a6; font-size: 13px">{{ item.warehouseName }}</span>
<!--<span style="float: right; color: #8492a6; font-size: 13px">{{ item.action }}</span>--> <!--<span style="float: right; color: #8492a6; font-size: 13px">{{ item.action }}</span>-->
</el-option> </el-option>
</el-select> </el-select>
@ -178,26 +160,7 @@
</el-col> </el-col>
<el-col :span="2">
<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="当前分库信息"
:disabled="corpOrderIdDisabled" @change="subStorageChange">
<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-row :gutter="20" v-if="enableDept"> <el-row :gutter="20" v-if="enableDept">
@ -607,10 +570,7 @@ export default {
this.$message.error('未选择扫码单据类型'); this.$message.error('未选择扫码单据类型');
return return
} }
if (this.formData.locStorageCode == null || this.formData.locStorageCode == '') {
this.$message.error('当前仓库不能为空');
return;
}
if (this.formData.invWarehouseCode == null || this.formData.invWarehouseCode == '') { if (this.formData.invWarehouseCode == null || this.formData.invWarehouseCode == '') {
this.$message.error('当前分库不能为空'); this.$message.error('当前分库不能为空');
@ -719,10 +679,7 @@ export default {
this.$message.warning("请选择单据类型！"); this.$message.warning("请选择单据类型！");
return; return;
} }
if (this.$isBlank(this.formData.locStorageCode)) {
this.$message.error('当前仓库不能为空');
return;
}
if (this.formData.invWarehouseCode == null || this.formData.invWarehouseCode == '') { if (this.formData.invWarehouseCode == null || this.formData.invWarehouseCode == '') {
this.$message.error('当前分库不能为空'); this.$message.error('当前分库不能为空');
return; return;
@ -968,6 +925,7 @@ export default {
this.getBusType(); this.getBusType();
}, },
findMethod(query) { findMethod(query) {
this.fromOptions = []; this.fromOptions = [];
let cQuery = { let cQuery = {
key: query, key: query,
@ -1021,6 +979,7 @@ export default {
findStorageMethod() { findStorageMethod() {
if (this.formData.locStorageCode == null) if (this.formData.locStorageCode == null)
return; return;
this.fromStorageOptions = []; this.fromStorageOptions = [];
@ -1037,11 +996,12 @@ export default {
findSubStorageMethod(val) { findSubStorageMethod(val) {
let cQuery = { let cQuery = {
pcode: this.formData.fromCorpId, code: this.formData.invWarehouseCode,
filter: 2, filter: 2,
}; };
filterSubByInv(cQuery) filterSubByInv(cQuery)
.then((response) => { .then((response) => {
this.fromSubStorageOptions = response.data || []; this.fromSubStorageOptions = response.data || [];
if (val == 1) { if (val == 1) {
@ -1054,14 +1014,14 @@ export default {
findSubInvByInv(invCode) { findSubInvByInv(invCode) {
this.subInvList = []; this.subInvList = [];
let query = { let query = {
pcode: invCode
}; };
filterSubByInv(query) filterSubByInv(query)
.then((response) => { .then((response) => {
this.subInvList = response.data || []; this.subInvList = response.data || [];
this.fromSubStorageOptions = response.data || [];
if (this.subInvList != null && this.subInvList.length == 1) { if (this.subInvList != null && this.subInvList.length == 1) {
this.formData.invWarehouseCode = this.subInvList[0].code; this.formData.invWarehouseCode = this.subInvList[0].code;
this.getBusType(); this.getBusType();
@ -1217,6 +1177,7 @@ export default {
}, },
created() { created() {
this.formData.code = ''; this.formData.code = '';
this.formData.actDate = new Date(); this.formData.actDate = new Date();
this.codeArray = []; this.codeArray = [];
@ -1235,7 +1196,6 @@ export default {
this.formData.preCheck = this.idQuery.preCheck; this.formData.preCheck = this.idQuery.preCheck;
this.actionEnable = true; this.actionEnable = true;
this.getCodeList(); this.getCodeList();
this.findSubStorageMethod(1); this.findSubStorageMethod(1);
} else { } else {
this.corpOrderIdDisabled = false; this.corpOrderIdDisabled = false;
@ -1258,7 +1218,7 @@ export default {
} }
} }
this.findSubInvByInv(this.formData.locStorageCode); this.findSubInvByInv(this.formData.locStorageCode);
// this.findSubStorageMethod(); this.findSubStorageMethod();
this.getBusType(); this.getBusType();
//查询是否启用多级仓库，判断是否启用部门 //查询是否启用多级仓库，判断是否启用部门

32
src/views/warehouse/addOrder.vue
Unescape Escape View File

@ -84,28 +84,7 @@
</el-row> </el-row>
<el-row :gutter="20"> <el-row :gutter="20">
<el-col :span="2">
<div class="ao-text">
<span>当前仓库：</span>
</div>
</el-col>
<el-col :span="8">
<el-form-item prop="locStorageCode">
<el-select v-model="formData.locStorageCode" placeholder="当前仓库信息" clearable
@change="locCHange"
:disabled="corpOrderIdDisabled">
<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-col>
<el-col :span="2"> <el-col :span="2">
<div class="ao-text"> <div class="ao-text">
@ -124,6 +103,7 @@
: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-form-item>
@ -465,10 +445,7 @@ export default {
this.$message.error('未选择扫码单据类型'); this.$message.error('未选择扫码单据类型');
return return
} }
if (this.formData.locStorageCode == null || this.formData.locStorageCode == '') {
this.$message.error('当前仓库不能为空');
return;
}
if (this.formData.invWarehouseCode == null || this.formData.invWarehouseCode == '') { if (this.formData.invWarehouseCode == null || this.formData.invWarehouseCode == '') {
this.$message.error('当前分库不能为空'); this.$message.error('当前分库不能为空');
return; return;
@ -599,10 +576,7 @@ export default {
this.$message.warning("请选择单据类型！"); this.$message.warning("请选择单据类型！");
return; return;
} }
if (this.$isBlank(this.formData.locStorageCode)) {
this.$message.error('当前仓库不能为空');
return;
}
if (this.formData.invWarehouseCode == null || this.formData.invWarehouseCode == '') { if (this.formData.invWarehouseCode == null || this.formData.invWarehouseCode == '') {
this.$message.error('当前分库不能为空'); this.$message.error('当前分库不能为空');
return; return;

66
src/views/warehouse/stockHospOrderNew.vue
Unescape Escape View File

@ -116,39 +116,19 @@
</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 ==1"> v-if="curAction.corpType ==1">
<el-select
v-model="formData.corpName"
filterable
remote
clearable="true" :disabled="codeArray.length>0"
reserve-keyword
placeholder="请输入仓库信息"
:remote-method="findStorageMethod"
:loading="loading"
@change="storageChange"
>
<el-option
v-for="item in fromStorageOptions"
:key="item.value"
:label="item.code"
:value="item">
<span style="float: left">{{ item.name }}</span>
<span style="float: right; color: #8492a6; font-size: 13px">{{
item.code
}}</span>
</el-option>
</el-select>
<el-select v-model="formData.fromSubInvCode" placeholder="请选择分库" clearable="true"
<el-select v-model="formData.fromSubInvCode" placeholder="请选择分库" filterable clearable="true"
:disabled="codeArray.length>0" :disabled="codeArray.length>0"
> >
<el-option <el-option
v-for="item in fromSubStorageOptions" v-for="item in fromSubStorageOptions"
:key="item.code" :key="item.code"
filterable
:label="item.name" :disabled="codeArray.length>0" :label="item.name" :disabled="codeArray.length>0"
: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.code }}</span> <span style="float: right; color: #8492a6; font-size: 13px">{{ item.warehouseName }}</span>
</el-option> </el-option>
</el-select> </el-select>
@ -164,28 +144,6 @@
</el-row> </el-row>
<el-row :gutter="20" style="margin-top: 5px"> <el-row :gutter="20" style="margin-top: 5px">
<el-col :span="3">
<div class="ao-text">
<span>当前仓库：</span>
</div>
</el-col>
<el-col :span="7">
<el-form-item prop="locStorageCode">
<el-select v-model="formData.locStorageCode" placeholder="当前仓库信息" @change="locInChange"
:disabled="codeArray.length>0"
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-form-item>
</el-col>
<el-col :span="3"> <el-col :span="3">
<div class="ao-text"> <div class="ao-text">
@ -195,7 +153,7 @@
<el-col :span="7"> <el-col :span="7">
<el-form-item prop="invWarehouseCode"> <el-form-item prop="invWarehouseCode">
<el-select v-model="formData.invWarehouseCode" placeholder="当前分库信息" <el-select v-model="formData.invWarehouseCode" filterable placeholder="当前分库信息"
:disabled="codeArray.length>0" :disabled="codeArray.length>0"
@change="subStorageChange" @change="subStorageChange"
clearable> clearable>
@ -205,6 +163,7 @@
: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-form-item>
@ -665,7 +624,7 @@ export default {
filterAllByUser() filterAllByUser()
.then((response) => { .then((response) => {
this.storageList = response.data || []; this.storageList = response.data || [];
this.findSubInvs();
}) })
.catch(() => { .catch(() => {
}); });
@ -716,7 +675,7 @@ export default {
findSubStorageMethod() { findSubStorageMethod() {
let cQuery = { let cQuery = {
pcode: this.formData.corpId, code: this.formData.invWarehouseCode,
filter: 2, filter: 2,
}; };
filterSubByInv(cQuery) filterSubByInv(cQuery)
@ -734,6 +693,7 @@ export default {
}; };
filterSubByInv(query) filterSubByInv(query)
.then((response) => { .then((response) => {
this.subInvList = response.data || []; this.subInvList = response.data || [];
if (this.subInvList != null && this.subInvList.length == 1) { if (this.subInvList != null && this.subInvList.length == 1) {
this.formData.invWarehouseCode = this.subInvList[0].code; this.formData.invWarehouseCode = this.subInvList[0].code;
@ -813,8 +773,8 @@ export default {
this.$message.error("往来信息和单据类型不能为空！") this.$message.error("往来信息和单据类型不能为空！")
return; return;
} }
if (this.$isBlank(this.formData.locStorageCode) || this.$isBlank(this.formData.invWarehouseCode)) { if (this.$isBlank(this.formData.invWarehouseCode)) {
this.$message.error("当前仓库和当前分库不能为空！"); this.$message.error("当前分库不能为空！");
return; return;
} }
this.code = ""; this.code = "";
@ -1288,12 +1248,13 @@ export default {
locInChange() { locInChange() {
this.$forceUpdate(); this.$forceUpdate();
// this.getBusType(); // this.getBusType();
this.invChange(); // this.invChange();
this.findStorageMethod(); this.findStorageMethod();
}, },
subStorageChange() { subStorageChange() {
this.getBusType(); this.getBusType();
this.findSubStorageMethod();
}, },
invChange() { invChange() {
/*if (this.$isNotBlank(this.formData.invWarehouseCode)) /*if (this.$isNotBlank(this.formData.invWarehouseCode))
@ -1308,6 +1269,7 @@ export default {
}; };
filterSubByInv(query) filterSubByInv(query)
.then((response) => { .then((response) => {
this.subInvList = response.data || []; this.subInvList = response.data || [];
if (this.subInvList != null && this.subInvList.length == 1) { if (this.subInvList != null && this.subInvList.length == 1) {
this.formData.invWarehouseCode = this.subInvList[0].code; this.formData.invWarehouseCode = this.subInvList[0].code;

23
src/views/warehouse/stockOrderEditDistribution.vue
Unescape Escape View File

@ -89,28 +89,6 @@
</el-row> </el-row>
<el-row :gutter="20" style="margin-top: -10px;"> <el-row :gutter="20" style="margin-top: -10px;">
<el-col :span="3">
<div class="ao-text">
<span>当前仓库：</span>
</div>
</el-col>
<el-col :span="7">
<el-form-item prop="locStorageCode">
<el-select v-model="formData.locStorageCode" placeholder="当前仓库信息"
@change="invChange"
disabled>
<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-col>
<el-col :span="3"> <el-col :span="3">
<div class="ao-text"> <div class="ao-text">
@ -129,6 +107,7 @@
: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-form-item>

24
src/views/warehouse/stockOrderNewDistribution.vue
Unescape Escape View File

@ -100,29 +100,6 @@
<el-row :gutter="20" style="margin-top: 5px"> <el-row :gutter="20" style="margin-top: 5px">
<el-col :span="3">
<div class="ao-text">
<span>当前仓库：</span>
</div>
</el-col>
<el-col :span="7">
<el-form-item prop="locStorageCode">
<el-select v-model="formData.locStorageCode" placeholder="当前仓库信息" clearable
:disabled="codeArray.length>0"
@change="invChange">
<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-col>
<el-col :span="3"> <el-col :span="3">
<div class="ao-text"> <div class="ao-text">
<span>当前分库：</span> <span>当前分库：</span>
@ -140,6 +117,7 @@
: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-form-item>

Write Preview
Loading…
Cancel
Save