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

去除仓库功能

Browse Source
feature-order-fix
郑明梁 3 years ago
parent 2b4f37aaf0
commit 75605335a6
12 changed files with 109 additions and 462 deletions
Show Stats Download Patch File Download Diff File

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

@ -17,7 +17,13 @@ export function filterSubByInv(query) {
}); });
} }
export function filterSub(query) {
return axios({
url: "/spms/sub/inv/warehouse/filterSub",
method: "get",
params: query
});
}
// 保存 // 保存
export function saveSubWarehouse(data, formName, method = "post") { export function saveSubWarehouse(data, formName, method = "post") {

13
src/views/basic/BasicEntrutsRece.vue
Unescape Escape View File

@ -204,25 +204,18 @@ export default {
this.$message.error("单据类型不能为空！"); this.$message.error("单据类型不能为空！");
return; return;
} }
if (this.$isBlank(this.inputQuery.curInv)) {
this.$message.error("请输入委托仓库！");
return;
}
if (this.$isBlank(this.inputQuery.entrustInv)) {
this.$message.error("请输入接受委托仓库！");
return;
}
if (this.$isBlank(this.inputQuery.entrustUser)) { if (this.$isBlank(this.inputQuery.entrustUser)) {
this.$message.error("请输入接受委托人！"); this.$message.error("请输入接受委托人！");
return; return;
} }
if (this.$isBlank(this.inputQuery.invWarehouseCode)) { if (this.$isBlank(this.inputQuery.invWarehouseCode)) {
this.$message.error("当前分库不能为空！"); this.$message.error("当前仓库不能为空！");
return; return;
} }
if (this.$isBlank(this.inputQuery.entrustSubInv)) { if (this.$isBlank(this.inputQuery.entrustSubInv)) {
this.$message.error("请输入接受委托分库！"); this.$message.error("请输入接受委托仓库！");
return; return;
} }
// //

77
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"> <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.curInv" placeholder="当前仓库" @change="invChange" clearable> <el-select v-model="inputQuery.invWarehouseCode" placeholder="当前仓库"
<el-option @change="entrustInvChange"
v-for="item in storageList" filterable
: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">
<div class="text item">
<div class="itemTag">
<span>当前分库:&nbsp;</span>
</div>
<el-select v-model="inputQuery.invWarehouseCode" placeholder="当前分库"
@change="subInvChange"
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>
@ -78,29 +58,9 @@
<div class="itemTag"> <div class="itemTag">
<span>接受委托仓库:&nbsp;</span> <span>接受委托仓库:&nbsp;</span>
</div> </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">
<div class="text item">
<div class="itemTag">
<span>接受委托分库:&nbsp;</span>
</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 {
@ -240,22 +201,12 @@ export default {
this.localTypes = []; this.localTypes = [];
}); });
}, },
getStorage() {
this.storageList = [];
filterAll()
.then((response) => {
this.storageList = response.data || [];
this.findSubInvByInv();
this.getEntrustStorage();
})
.catch(() => {
});
},
findSubInvByInv() { findSubInvByInv() {
this.subInvList = []; this.subInvList = [];
let query = { let query = {
pcode: this.inputQuery.curInv filter:3
}; };
filterSubByInv(query) filterSubByInv(query)
.then((response) => { .then((response) => {
@ -270,10 +221,10 @@ export default {
findEntrustSubInvByInv() { findEntrustSubInvByInv() {
this.entrustSubInvList = []; this.entrustSubInvList = [];
let query = { let query = {
pcode: this.inputQuery.entrustInv, code: this.inputQuery.invWarehouseCode,
filter: 2, filter: 2,
}; };
filterSubByInv(query) filterSub(query)
.then((response) => { .then((response) => {
this.entrustSubInvList = response.data || []; this.entrustSubInvList = response.data || [];
this.entrustSubInvChange(); this.entrustSubInvChange();
@ -320,6 +271,7 @@ export default {
entrustInvChange() { entrustInvChange() {
this.inputQuery.entrustSubInv = null; this.inputQuery.entrustSubInv = null;
this.findEntrustSubInvByInv(); this.findEntrustSubInvByInv();
this.getOrderType();
this.$forceUpdate(); this.$forceUpdate();
}, },
@ -357,7 +309,8 @@ export default {
created() { created() {
this.getList(); this.getList();
this.getStorage(); this.findSubInvByInv();
this.getEntrustStorage();
// if (this.$isNotBlank(this.inputQuery.entrustInv)) { // if (this.$isNotBlank(this.inputQuery.entrustInv)) {
// this.entrustInvChange(this.inputQuery.entrustInv); // this.entrustInvChange(this.inputQuery.entrustInv);

26
src/views/business/stockOrderEditDistribution.vue
Unescape Escape View File

@ -95,33 +95,10 @@
</div> </div>
</el-col> </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">
<div class="ao-text">
<span>当前分库：</span>
</div>
</el-col>
<el-col :span="7"> <el-col :span="7">
<el-form-item prop="invWarehouseCode"> <el-form-item prop="invWarehouseCode">
<el-select v-model="formData.invWarehouseCode" disabled <el-select v-model="formData.invWarehouseCode" disabled
placeholder="当前分库信息" placeholder="当前仓库信息"
clearable> clearable>
<el-option <el-option
v-for="item in subInvList" v-for="item in subInvList"
@ -129,6 +106,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>

115
src/views/business/stockOrderNewDistribution.vue
Unescape Escape View File

@ -116,30 +116,8 @@
</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="请选择仓库" clearable="true"
:disabled="codeArray.length>0" :disabled="codeArray.length>0"
> >
<el-option <el-option
@ -148,7 +126,7 @@
: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>
<!--<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>
@ -171,32 +149,9 @@
</div> </div>
</el-col> </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">
<div class="ao-text">
<span>当前分库：</span>
</div>
</el-col>
<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" placeholder="当前仓库信息"
:disabled="codeArray.length>0" :disabled="codeArray.length>0"
@change="subStorageChange" @change="subStorageChange"
clearable> clearable>
@ -206,14 +161,12 @@
: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>
</el-col> </el-col>
</el-row>
<el-row :gutter="20">
<el-col :span="3"> <el-col :span="3">
<div class="ao-text"> <div class="ao-text">
<span>所属科室：</span> <span>所属科室：</span>
@ -244,8 +197,8 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row>
</el-row>
<el-row :gutter="20" style="margin-top: -5px;"> <el-row :gutter="20" style="margin-top: -5px;">
<el-col :span="3"> <el-col :span="3">
@ -525,7 +478,7 @@ export default {
}, },
codeArray: [], codeArray: [],
fromOptions: [], fromOptions: [],
fromStorageOptions: [],
fromSubStorageOptions: [], fromSubStorageOptions: [],
total: 0, total: 0,
loading: false, loading: false,
@ -674,16 +627,7 @@ export default {
this.findSubStorageMethod(); this.findSubStorageMethod();
}, },
getStorage(event) {
this.storageList = [];
filterAllByUser()
.then((response) => {
this.storageList = response.data || [];
this.findSubInvs();
})
.catch(() => {
});
},
getActionName(action) { getActionName(action) {
for (let i = 0; i < this.busTypes.length; i++) { for (let i = 0; i < this.busTypes.length; i++) {
@ -692,30 +636,11 @@ export default {
} }
} }
}, },
findStorageMethod(query) {
if (this.formData.locStorageCode == null)
return;
this.fromStorageOptions = [];
let cQuery = {
locInvCode: this.formData.locStorageCode,
};
filterAllByLoc(cQuery)
.then((response) => {
let temp = response.data || [];
for (let i = 0; i < temp.length; i++) {
if (temp[i].code != this.formData.locStorageCode) {
this.fromStorageOptions.push(temp[i]);
}
}
})
.catch(() => {
});
},
findSubStorageMethod() { findSubStorageMethod() {
let cQuery = { let cQuery = {
pcode: this.formData.corpId, code: this.formData.invWarehouseCode,
filter: 2, filter: 2,
}; };
filterSubByInv(cQuery) filterSubByInv(cQuery)
@ -726,22 +651,6 @@ export default {
}); });
}, },
findSubInvByInv(invCode) {
this.subInvList = [];
let query = {
pcode: invCode
};
filterSubByInv(query)
.then((response) => {
this.subInvList = response.data || [];
if (this.subInvList != null && this.subInvList.length == 1) {
this.formData.invWarehouseCode = this.subInvList[0].code;
this.getBusType();
}
})
.catch(() => {
});
},
submitFunction(status) { submitFunction(status) {
@ -1303,6 +1212,7 @@ export default {
}, },
subStorageChange() { subStorageChange() {
this.findSubStorageMethod();
this.getBusType(); this.getBusType();
}, },
invChange() { invChange() {
@ -1314,7 +1224,7 @@ export default {
findSubInvs() { findSubInvs() {
this.subInvList = []; this.subInvList = [];
let query = { let query = {
pcode: this.formData.locStorageCode filter: 3,
}; };
filterSubByInv(query) filterSubByInv(query)
.then((response) => { .then((response) => {
@ -1383,8 +1293,7 @@ export default {
if(this.formData.invWarehouseCode!=null){ if(this.formData.invWarehouseCode!=null){
this.getBusType(); this.getBusType();
} }
this.getStorage(); this.findSubInvs();
this.findSubInvByInv();
this.findSubStorageMethod(); this.findSubStorageMethod();
this.codeArray = []; this.codeArray = [];
this.closeConfirmFunction(false); this.closeConfirmFunction(false);

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

@ -190,7 +190,7 @@
<el-dialog <el-dialog
title="请选择当前仓库和分仓" title="请选择当前仓库"
:visible.sync="selInvVisible" :visible.sync="selInvVisible"
:close-on-click-modal="false" :close-on-click-modal="false"
:close-on-press-escape="false" :close-on-press-escape="false"
@ -205,47 +205,25 @@
<span>当前仓库：</span> <span>当前仓库：</span>
</div> </div>
</el-col> </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-col :span="4">
<div class="ao-text">
<span>当前分库：</span>
</div>
</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>
</el-col> </el-col>
</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>
@ -430,16 +408,12 @@ export default {
findSubInvByInv() { findSubInvByInv() {
this.subInvList = []; this.subInvList = [];
let query = { filterSubByInv({filter:3})
pcode: this.userInfo.locInvCode
};
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(() => {
}); });
@ -483,13 +457,10 @@ export default {
}, },
submitInv() { submitInv() {
if (this.$isBlank(this.userInfo.locInvCode)) {
this.$message.error("当前仓库不能为空！");
return;
}
if (this.userInfo.customerId == 110) { if (this.userInfo.customerId == 110) {
if (this.$isBlank(this.userInfo.locSubInvCode)) { if (this.$isBlank(this.userInfo.locSubInvCode)) {
this.$message.error("当前分库不能为空！"); this.$message.error("当前仓库库不能为空！");
return; return;
} }
} }
@ -557,9 +528,10 @@ export default {
console.log("监听变化。，，，，，，，，，，，，，，，，，，，，，，，，，，，"); console.log("监听变化。，，，，，，，，，，，，，，，，，，，，，，，，，，，");
this.getBreadcrumb(); this.getBreadcrumb();
this.getCompanyData(); this.getCompanyData();
this.getStorage(); // this.getStorage();
this.findSubInvByInv(); // this.findSubInvByInv();
this.getUserInfo(); this.getUserInfo();
this.locCHange();
socket.init(this) socket.init(this)
axios.get("./config.json").then(res => { axios.get("./config.json").then(res => {

86
src/views/inout/IOAddOrder.vue
Unescape Escape View File

@ -73,26 +73,28 @@
<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>
</el-col> </el-col>
</el-row> </el-row>
<el-row :gutter="20"> <el-row :gutter="20">
@ -132,37 +134,17 @@
<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" filterable
:disabled="corpOrderIdDisabled"> >
<el-option <el-option
v-for="item in fromSubStorageOptions" v-for="item in fromSubStorageOptions"
:key="item.code" :key="item.code"
: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>
@ -177,27 +159,6 @@
></el-input> ></el-input>
</el-form-item> </el-form-item>
</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">
@ -603,10 +564,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;
@ -717,20 +675,16 @@ 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;
} }
if (this.$isBlank(this.formData.fromCorp)) { // if (this.$isBlank(this.formData.fromCorp)) {
this.$message.error('当前往来单位不能为空'); // this.$message.error('当前往来单位不能为空');
return; // return;
} // }
if (this.curAction.corpType == 1) { if (this.curAction.corpType == 1) {
if (this.$isBlank(this.formData.fromSubInvCode)) { if (this.$isBlank(this.formData.fromSubInvCode)) {
@ -1026,8 +980,9 @@ export default {
, ,
findSubStorageMethod() { findSubStorageMethod() {
this.getBusType();
let cQuery = { let cQuery = {
pcode: this.formData.fromCorpId, code: this.formData.invWarehouseCode,
filter: 2, filter: 2,
}; };
filterSubByInv(cQuery) filterSubByInv(cQuery)
@ -1043,7 +998,7 @@ export default {
findSubInvByInv(invCode) { findSubInvByInv(invCode) {
this.subInvList = []; this.subInvList = [];
let query = { let query = {
pcode: invCode filter:3
}; };
filterSubByInv(query) filterSubByInv(query)
.then((response) => { .then((response) => {
@ -1072,8 +1027,6 @@ export default {
this.fromDeptOptions = []; this.fromDeptOptions = [];
}); });
}, },
getStorage(event) { getStorage(event) {
this.storageList = []; this.storageList = [];
filterAllByUser() filterAllByUser()
@ -1272,6 +1225,7 @@ export default {
} }
} }
this.findSubInvByInv(this.formData.locStorageCode); this.findSubInvByInv(this.formData.locStorageCode);
this.findSubStorageMethod();
if(this.formData.invWarehouseCode!=null){ if(this.formData.invWarehouseCode!=null){
this.getBusType(); this.getBusType();
} }

16
src/views/inout/IOErrorOrder.vue
Unescape Escape View File

@ -25,20 +25,7 @@
</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="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">
<el-option <el-option
v-for="item in subInvList" v-for="item in subInvList"
@ -46,6 +33,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>

42
src/views/purchase/purApplyEditDiaolog.vue
Unescape Escape View File

@ -62,18 +62,7 @@
<el-col :span="7"> <el-col :span="7">
<el-form-item prop="locStorageCode"> <el-form-item prop="locStorageCode">
<el-select v-model="formData.locStorageCode" placeholder="当前仓库信息" @change="locInChange" <el-select v-model="formData.invWarehouseCode" placeholder="当前分库信息" @change="setWarehouseName" style="width: 100%"
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%"
clearable> clearable>
<el-option <el-option
v-for="item in subInvList" v-for="item in subInvList"
@ -81,6 +70,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>
@ -362,6 +352,9 @@ export default {
this.loading = false; this.loading = false;
}) })
}, },
setWarehouseName(obj){
this.formData.locStorageCode= this.subInvList.find(item => item.code == obj).parentId;
},
selectProductFunction() { selectProductFunction() {
this.selectProductVisible = true; this.selectProductVisible = true;
this.thisData.stockOrderLists = this.codeArray; this.thisData.stockOrderLists = this.codeArray;
@ -458,24 +451,11 @@ export default {
}, },
getStorage() {
this.storageList = [];
filterAllByUser()
.then((response) => {
this.storageList = response.data || [];
if (this.storageList != null && this.storageList.length == 1) {
this.formData.locStorageCode = this.storageList[0].code;
}
this.findSubInvs();
})
.catch(() => {
});
},
findSubInvs() { findSubInvs() {
this.subInvList = []; this.subInvList = [];
let query = { let query = {
pcode: this.formData.locStorageCode filter:3
}; };
filterSubByInv(query) filterSubByInv(query)
.then((response) => { .then((response) => {
@ -487,13 +467,7 @@ export default {
.catch(() => { .catch(() => {
}); });
}, },
locInChange(item) {
if (this.formData.invWarehouseCode != null) {
this.formData.invWarehouseCode = "";
}
this.formData.locStorageCode = item;
this.findSubInvs();
},
}, },
filters: {}, filters: {},
mounted() { mounted() {
@ -523,7 +497,7 @@ export default {
}; };
this.orderEditor = false; this.orderEditor = false;
} }
this.getStorage(); this.findSubInvs();
this.codeArray = []; this.codeArray = [];
}, },
}; };

21
src/views/purchase/purPlanEditDialog.vue
Unescape Escape View File

@ -83,18 +83,7 @@
<el-col :span="7"> <el-col :span="7">
<el-form-item prop="locStorageCode"> <el-form-item prop="locStorageCode">
<el-select v-model="formData.locStorageCode" placeholder="采购仓库信息" @change="locInChange" <el-select v-model="formData.invWarehouseCode" @change="setWarehouseName" placeholder="采购仓库信息" style="width: 100%"
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%"
clearable> clearable>
<el-option <el-option
v-for="item in subInvList" v-for="item in subInvList"
@ -102,6 +91,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>
@ -403,6 +393,9 @@ export default {
this.thisData.stockOrderLists = this.codeArray; this.thisData.stockOrderLists = this.codeArray;
this.selectProductVisible = true; this.selectProductVisible = true;
}, },
setWarehouseName(obj){
this.formData.locStorageCode= this.subInvList.find(item => item.code == obj).parentId;
},
closeDialogC2(rData) { closeDialogC2(rData) {
this.selectProductVisible = false; this.selectProductVisible = false;
this.thisData = {}; this.thisData = {};
@ -513,7 +506,7 @@ export default {
findSubInvs() { findSubInvs() {
this.subInvList = []; this.subInvList = [];
let query = { let query = {
pcode: this.formData.locStorageCode filter:3
}; };
filterSubByInv(query) filterSubByInv(query)
.then((response) => { .then((response) => {
@ -573,7 +566,7 @@ export default {
}; };
this.orderEditor = false; this.orderEditor = false;
} }
this.getStorage(); this.findSubInvs();
this.getBusType(); this.getBusType();
this.codeArray = []; this.codeArray = [];
}, },

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

@ -370,9 +370,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,

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

@ -62,19 +62,7 @@
<el-col :span="7"> <el-col :span="7">
<el-form-item prop="locStorageCode"> <el-form-item prop="locStorageCode">
<el-select v-model="formData.locStorageCode" style="width: 50%;" placeholder="当前仓库信息" <el-select v-model="formData.invWarehouseCode" filterable @change="subStorageChange" placeholder="当前仓库信息" style="width: 100%;"
@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-select v-model="formData.invWarehouseCode" placeholder="当前分库信息" style="width: 50%;"
clearable> clearable>
<el-option <el-option
v-for="item in subInvList" v-for="item in subInvList"
@ -83,6 +71,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>
@ -95,32 +84,9 @@
</div> </div>
</el-col> </el-col>
<el-col :span="7"> <el-col :span="7">
<el-form-item class="query-form-item" prop="fromCorp"> <el-form-item>
<el-select <el-select v-model="formData.fromSubInvCode" @change="getFromSubStorageCode" filterable placeholder="请选择仓库" clearable="true"
v-model="formData.corpName" style="width: 100%"
filterable
remote
style="width: 50%"
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"
style="width: 50%"
> >
<el-option <el-option
v-for="item in fromSubStorageOptions" v-for="item in fromSubStorageOptions"
@ -128,7 +94,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>
</el-option> </el-option>
</el-select> </el-select>
@ -512,24 +478,18 @@ export default {
this.formData.corpName = row.name; this.formData.corpName = row.name;
this.findSubStorageMethod(); this.findSubStorageMethod();
}, },
subStorageChange(item) {
//当前仓库 this.formData.locStorageCode= this.subInvList.find(item => item.code == this.formData.invWarehouseCode).parentId
getStorage() { this.findSubStorageMethod();
this.storageList = []; this.getBusType();
filterAllByUser()
.then((response) => {
this.storageList = response.data || [];
this.findSubInvs();
})
.catch(() => {
});
}, },
//当前分库 //当前分库
findSubInvs() { findSubInvs() {
this.subInvList = []; this.subInvList = [];
let query = { let query = {
pcode: this.formData.locStorageCode filter: 3,
}; };
filterSubByInv(query) filterSubByInv(query)
.then((response) => { .then((response) => {
@ -550,32 +510,11 @@ export default {
} }
}, },
//往来仓库
findStorageMethod() {
if (this.formData.locStorageCode == null)
return;
this.fromStorageOptions = [];
let cQuery = {
locInvCode: this.formData.locStorageCode,
};
filterAllByLoc(cQuery)
.then((response) => {
let temp = response.data || [];
for (let i = 0; i < temp.length; i++) {
if (temp[i].code != this.formData.locStorageCode) {
this.fromStorageOptions.push(temp[i]);
}
}
})
.catch(() => {
});
},
//往来分库 //往来分库
findSubStorageMethod() { findSubStorageMethod() {
let cQuery = { let cQuery = {
pcode: this.formData.corpId, code: this.formData.invWarehouseCode,
filter: 2, filter: 2,
}; };
filterSubByInv(cQuery) filterSubByInv(cQuery)
@ -688,7 +627,8 @@ export default {
this.focusNext('iCount'); this.focusNext('iCount');
}, },
iCountChange() { getFromSubStorageCode(){
// this.formData.locStorageCode= this.fromSubStorageOptions.find(item => item.code == this.formData.fromSubInvCode).parentId
}, },
iCountEnterFunction() { iCountEnterFunction() {
if (this.$isNotBlank(this.currentRow)) { if (this.$isNotBlank(this.currentRow)) {
@ -935,15 +875,6 @@ export default {
} }
} }
}, },
locInChange(item) {
if (this.formData.invWarehouseCode != null) {
this.formData.invWarehouseCode = "";
}
this.formData.locStorageCode = item;
this.$forceUpdate();
this.findStorageMethod();
this.findSubInvs();
},
}, },
@ -982,9 +913,7 @@ export default {
} }
this.getBusType(); this.getBusType();
this.getStorage();
this.findSubInvs(); this.findSubInvs();
this.findStorageMethod();
this.findSubStorageMethod(); this.findSubStorageMethod();
// this.findSubInvByInv(); // this.findSubInvByInv();
this.codeArray = []; this.codeArray = [];

Write Preview
Loading…
Cancel
Save