Skip to content

A
assets
Commit d9984cb1 authored by 黄媛媛's avatar 黄媛媛
Browse files
Options

盘点中仓库的判断

parent 1a9ee2ec
Hide whitespace changes
Inline Side-by-side
Showing with 256 additions and 109 deletions
src/components/Materialman/chukudan.vue
View file @ d9984cb1
...@@ -150,7 +150,7 @@ ...@@ -150,7 +150,7 @@
<div class="basefix"> <div class="basefix">
<el-form-item label="" prop="WarehouseId"> <el-form-item label="" prop="WarehouseId">
<span class="label">仓库</span> <span class="label">仓库</span>
<el-select size="mini" v-model="addMsg.WarehouseId" placeholder="请选择"> <el-select size="mini" v-model="addMsg.WarehouseId" placeholder="请选择" @change="getWarehouseL">
<el-option <el-option
v-for="item in getWareHouseList" v-for="item in getWareHouseList"
:key="item.Id" :key="item.Id"
...@@ -233,7 +233,8 @@ ...@@ -233,7 +233,8 @@
</div> </div>
<div class="btnformItem"> <div class="btnformItem">
<span class="submitBtn" type="primary" @click="submitForm('addMsg')">确定出库</span> <span class="submitBtn" type="primary" @click="submitForm('addMsg')" v-if="ISoperation == false">确定出库</span>
<span class="submitBtn" type="primary" style=" background:#909399;" v-if="ISoperation == true">确定出库</span>
<span class="exitBtn" @click="dialogState=false">取消</span> <span class="exitBtn" @click="dialogState=false">取消</span>
</div> </div>
</el-form> </el-form>
...@@ -394,6 +395,8 @@ export default { ...@@ -394,6 +395,8 @@ export default {
EmployeeList2:[], EmployeeList2:[],
EmName:'', EmName:'',
jumptype:1, jumptype:1,
WarehouseList:[],
ISoperation:false,
} }
}, },
created(){ created(){
...@@ -406,6 +409,7 @@ export default { ...@@ -406,6 +409,7 @@ export default {
} }
}, },
mounted(){ mounted(){
this.getSuppliesCheckList()
this.getList(); this.getList();
this.getWareHouse(); this.getWareHouse();
// this.getEmployee(); // this.getEmployee();
...@@ -595,6 +599,7 @@ export default { ...@@ -595,6 +599,7 @@ export default {
} }
this.wlItemList=[]; this.wlItemList=[];
this.dialogState=true; this.dialogState=true;
this.ISoperation = false
}, },
submitForm(formName) { submitForm(formName) {
this.$refs[formName].validate((valid) => { this.$refs[formName].validate((valid) => {
...@@ -654,6 +659,19 @@ export default { ...@@ -654,6 +659,19 @@ export default {
if (res.data.resultCode === 1) { if (res.data.resultCode === 1) {
this.tableData=res.data.data.pageData; this.tableData=res.data.data.pageData;
this.total=res.data.data.count; this.total=res.data.data.count;
if( this.WarehouseList.length>0 ){
this.tableData.forEach(x=>{
x.itemOperation = false;
for (let index = 0; index< this.WarehouseList.length; index++) {
const j = this.WarehouseList[index];
if(x.WarehouseId == j.WarehouseId){
x.itemOperation= true;
break
}
}
})
}
} else { } else {
this.Error(res.data.message); this.Error(res.data.message);
} }
...@@ -662,65 +680,102 @@ export default { ...@@ -662,65 +680,102 @@ export default {
); );
}, },
Edit(item){ Edit(item){
this.dialogState=true; if(item.itemOperation == true){
this.addMsg={ this.Error('此仓库在盘点中，无法操作！')
Id:item.Id, }else{
WarehouseId:item.WarehouseId, this.dialogState=true;
Remark:item.Remark, this.addMsg={
EmployeeId:item.EmployeeId, Id:item.Id,
StockOutDate:item.StockOutDate, WarehouseId:item.WarehouseId,
DetailList:[], Remark:item.Remark,
EmployeeId:item.EmployeeId,
StockOutDate:item.StockOutDate,
DetailList:[],
}
this.wlItemList=item.DetailList;
this.EmName=item.EmName;
this.getEmployee(2);
} }
this.wlItemList=item.DetailList;
this.EmName=item.EmName;
this.getEmployee(2);
}, },
Delete(item){ Delete(item){
let Id=item.Id; if(item.itemOperation == true){
this.$confirm("确认删除？","提示", { this.Error('此仓库在盘点中，无法操作！')
confirmButtonText:"确定", }else{
cancelButtonText: "取消", let Id=item.Id;
type: 'warning' this.$confirm("确认删除？","提示", {
}).then(() => { confirmButtonText:"确定",
this.apiJavaPost("/api/Supplies/DelStockOutInfo",{StockOutId:Id}, cancelButtonText: "取消",
res => { type: 'warning'
if (res.data.resultCode === 1) { }).then(() => {
this.getList(); this.apiJavaPost("/api/Supplies/DelStockOutInfo",{StockOutId:Id},
this.Success(res.data.message) res => {
} else { if (res.data.resultCode === 1) {
this.Error(res.data.message); this.getList();
} this.Success(res.data.message)
}, } else {
null this.Error(res.data.message);
); }
},
null
);
}).catch(() => { }).catch(() => {
this.$message.info('已取消删除！') this.$message.info('已取消删除！')
}); });
}
}, },
Quxiao(item){ Quxiao(item){
let Id=item.Id; if(item.itemOperation == true){
this.$confirm("确认取消入库单？","提示", { this.Error('此仓库在盘点中，无法操作！')
confirmButtonText:"确定", }else{
cancelButtonText: "取消", let Id=item.Id;
type: 'warning' this.$confirm("确认取消入库单？","提示", {
}).then(() => { confirmButtonText:"确定",
this.apiJavaPost("/api/Supplies/CancelStockOutInfo",{StockOutId:Id}, cancelButtonText: "取消",
res => { type: 'warning'
if (res.data.resultCode === 1) { }).then(() => {
this.getList(); this.apiJavaPost("/api/Supplies/CancelStockOutInfo",{StockOutId:Id},
this.Success(res.data.message) res => {
} else { if (res.data.resultCode === 1) {
this.Error(res.data.message); this.getList();
} this.Success(res.data.message)
}, } else {
null this.Error(res.data.message);
); }
},
null
);
}).catch(() => { }).catch(() => {
this.$message.info('已取消删除！') this.$message.info('已取消删除！')
}); });
}
}, },
//获取盘点仓库的列表
getSuppliesCheckList(){
this.apiJavaPost("/api/WarehouseOut/GetSuppliesCheckList", {},
res => {
if (res.data.resultCode === 1) {
this.WarehouseList = res.data.data && res.data.data.length>0 ? res.data.data:[]
} else {
this.Error(res.data.message);
}
},
null
);
},
getWarehouseL(){
this.ISoperation = false
for (let index = 0; index < this.WarehouseList.length; index++) {
const x = this.WarehouseList[index];
if(x.WarehouseId == this.addMsg.WarehouseId){
this.ISoperation = true;
this.Error('此仓库正在盘点，无法操作！')
break
}
}
},
}, },
......
src/components/Materialman/rukudan.vue
View file @ d9984cb1
...@@ -144,7 +144,7 @@ ...@@ -144,7 +144,7 @@
<div class="basefix"> <div class="basefix">
<el-form-item label="" prop="WarehouseId"> <el-form-item label="" prop="WarehouseId">
<span class="label">仓库</span> <span class="label">仓库</span>
<el-select size="mini" v-model="addMsg.WarehouseId" placeholder="请选择"> <el-select size="mini" v-model="addMsg.WarehouseId" placeholder="请选择" @change="getWarehouseL">
<el-option <el-option
v-for="item in getWareHouseList" v-for="item in getWareHouseList"
:key="item.Id" :key="item.Id"
...@@ -226,7 +226,8 @@ ...@@ -226,7 +226,8 @@
</div> </div>
<div class="btnformItem"> <div class="btnformItem">
<span class="submitBtn" type="primary" @click="submitForm('addMsg')">确定入库</span> <span class="submitBtn" type="primary" @click="submitForm('addMsg')" v-if="ISoperation == false">确定入库</span>
<span class="submitBtn" type="primary" style=" background:#909399;" v-if="ISoperation == true">确定入库</span>
<span class="exitBtn" @click="dialogState=false">取消</span> <span class="exitBtn" @click="dialogState=false">取消</span>
</div> </div>
</el-form> </el-form>
...@@ -386,15 +387,19 @@ export default { ...@@ -386,15 +387,19 @@ export default {
　　　　return time.getTime() < Date.now() - 24 * 60 * 60 * 1000 　　　　return time.getTime() < Date.now() - 24 * 60 * 60 * 1000
} }
}, },
WarehouseList:[],
ISoperation:false,
} }
}, },
created(){ created(){
this.tableHeight=document.body.clientHeight-40-66-87; this.tableHeight=document.body.clientHeight-40-66-87;
}, },
mounted(){ mounted(){
this.getSuppliesCheckList()
this.getList(); this.getList();
this.getWareHouse(); this.getWareHouse();
this.getWuliao(); this.getWuliao();
}, },
...@@ -408,17 +413,22 @@ export default { ...@@ -408,17 +413,22 @@ export default {
); );
}, },
Huifu(item){ Huifu(item){
this.apiJavaPost("/api/Supplies/RecoverStockInInfo",{StockInId:item.Id}, if(item.itemOperation == true){
res => { this.Error('此仓库在盘点中，无法操作！')
if (res.data.resultCode === 1) { }else{
this.getList(); this.apiJavaPost("/api/Supplies/RecoverStockInInfo",{StockInId:item.Id},
this.Success(res.data.message) res => {
} else { if (res.data.resultCode === 1) {
this.Error(res.data.message); this.getList();
} this.Success(res.data.message)
}, } else {
null this.Error(res.data.message);
); }
},
null
);
}
}, },
UnitPriceChange(item,index){ UnitPriceChange(item,index){
if(item.Number!='0' && item.Number!='' && item.UnitPrice!='0' && item.UnitPrice!=''){ if(item.Number!='0' && item.Number!='' && item.UnitPrice!='0' && item.UnitPrice!=''){
...@@ -582,6 +592,7 @@ export default { ...@@ -582,6 +592,7 @@ export default {
} }
this.wlItemList=[]; this.wlItemList=[];
this.dialogState=true; this.dialogState=true;
this.ISoperation =false
}, },
submitForm(formName) { submitForm(formName) {
this.$refs[formName].validate((valid) => { this.$refs[formName].validate((valid) => {
...@@ -646,6 +657,19 @@ export default { ...@@ -646,6 +657,19 @@ export default {
this.loading=false; this.loading=false;
if (res.data.resultCode === 1) { if (res.data.resultCode === 1) {
this.tableData=res.data.data.pageData; this.tableData=res.data.data.pageData;
if( this.WarehouseList.length>0 ){
this.tableData.forEach(x=>{
x.itemOperation = false;
for (let index = 0; index< this.WarehouseList.length; index++) {
const j = this.WarehouseList[index];
if(x.WarehouseId == j.WarehouseId){
x.itemOperation= true;
break
}
}
})
}
this.total=res.data.data.count; this.total=res.data.data.count;
} else { } else {
this.Error(res.data.message); this.Error(res.data.message);
...@@ -655,49 +679,62 @@ export default { ...@@ -655,49 +679,62 @@ export default {
); );
}, },
Edit(item){ Edit(item){
if(item.StockInState==1){ if(item.itemOperation == true){
this.Error("入库单已完成，无法修改！") this.Error('此仓库在盘点中，无法操作！')
return; }else{
} if(item.StockInState==1){
this.dialogState=true; this.Error("入库单已完成，无法修改！")
this.addMsg={ return;
Id:item.Id, }
WarehouseId:item.WarehouseId, this.dialogState=true;
Remark:item.Remark, this.addMsg={
StockInDate:item.StockInDate, Id:item.Id,
Money:item.Money, WarehouseId:item.WarehouseId,
SupplierName:item.SupplierName, Remark:item.Remark,
SuppliesId:item.SuppliesId, StockInDate:item.StockInDate,
DetailList:[], Money:item.Money,
SupplierName:item.SupplierName,
SuppliesId:item.SuppliesId,
DetailList:[],
}
this.wlItemList=item.DetailList;
} }
this.wlItemList=item.DetailList;
}, },
Delete(item){ Delete(item){
let Id=item.Id; if(item.itemOperation == true){
this.$confirm("确认删除？","提示", { this.Error('此仓库在盘点中，无法操作！')
confirmButtonText:"确定", }else{
cancelButtonText: "取消", let Id=item.Id;
type: 'warning' this.$confirm("确认删除？","提示", {
}).then(() => { confirmButtonText:"确定",
this.apiJavaPost("/api/Supplies/DelStockInInfo",{StockInId:Id}, cancelButtonText: "取消",
res => { type: 'warning'
if (res.data.resultCode === 1) { }).then(() => {
this.getList(); this.apiJavaPost("/api/Supplies/DelStockInInfo",{StockInId:Id},
this.Success(res.data.message) res => {
} else { if (res.data.resultCode === 1) {
this.Error(res.data.message); this.getList();
} this.Success(res.data.message)
}, } else {
null this.Error(res.data.message);
); }
},
null
);
}).catch(() => { }).catch(() => {
this.$message.info('已取消删除！') this.$message.info('已取消删除！')
}); });
}
}, },
Quxiao(item){ Quxiao(item){
let Id=item.Id; if(item.itemOperation == true){
this.$confirm("确认取消入库单？","提示", { this.Error('此仓库在盘点中，无法操作！')
}else{
let Id=item.Id;
this.$confirm("确认取消入库单？","提示", {
confirmButtonText:"确定", confirmButtonText:"确定",
cancelButtonText: "取消", cancelButtonText: "取消",
type: 'warning' type: 'warning'
...@@ -714,10 +751,37 @@ export default { ...@@ -714,10 +751,37 @@ export default {
null null
); );
}).catch(() => { }).catch(() => {
this.$message.info('已取消删除！') this.$message.info('已取消删除！')
}); });
}
}, },
//获取盘点仓库的列表
getSuppliesCheckList(){
this.apiJavaPost("/api/WarehouseOut/GetSuppliesCheckList", {},
res => {
if (res.data.resultCode === 1) {
this.WarehouseList = res.data.data && res.data.data.length>0 ? res.data.data:[]
} else {
this.Error(res.data.message);
}
},
null
);
},
getWarehouseL(){
this.ISoperation = false
for (let index = 0; index < this.WarehouseList.length; index++) {
const x = this.WarehouseList[index];
if(x.WarehouseId == this.addMsg.WarehouseId){
this.ISoperation = true;
this.Error('此仓库正在盘点，无法操作！')
break
}
}
},
}, },
......
src/components/assetsman/outboundOperate.vue
View file @ d9984cb1
...@@ -20,7 +20,8 @@ ...@@ -20,7 +20,8 @@
<div class="outbound_Main"> <div class="outbound_Main">
<div class="routerTitle" style="padding:17px 30px;"> <div class="routerTitle" style="padding:17px 30px;">
<span class="pageTitle" style="margin-top:-5px;">商品出库</span> <span class="pageTitle" style="margin-top:-5px;">商品出库</span>
<span @click="sureOutband()" class="chaxunSpan">确认出库</span> <span @click="sureOutband()" class="chaxunSpan" v-if="ISoperation == false" >确认出库</span>
<span class="chaxunSpan" style=" background:#909399;" v-if="ISoperation == true" >确认出库</span>
</div> </div>
<ul class="queryul" style="margin-left:20px;"> <ul class="queryul" style="margin-left:20px;">
扫码出库 扫码出库
...@@ -64,12 +65,15 @@ ...@@ -64,12 +65,15 @@
<ul class="queryul" style="margin:30px 0 25px 0;"> <ul class="queryul" style="margin:30px 0 25px 0;">
选择仓库 选择仓库
<li style="margin-bottom:0;"> <li style="margin-bottom:0;">
<el-select size="mini" v-model="msg.WarehouseId" @change="getData()" placeholder="请选择"> <el-select size="mini" v-model="msg.WarehouseId" @change="getWarehouseL(),getData()" placeholder="请选择">
<el-option :key="0" label="不限" :value="0"></el-option> <el-option :key="0" label="不限" :value="0"></el-option>
<el-option v-for="item in getWareHouseList" :key="item.Id" :label="item.Name" :value="item.Id"> <el-option v-for="item in getWareHouseList" :key="item.Id" :label="item.Name" :value="item.Id">
</el-option> </el-option>
</el-select> </el-select>
</li> </li>
<li v-if="ISoperation == true">
<span style="color:#F56C6C;font-size: 16px;padding:0 10px">此仓库正在盘点中，暂不支持出库功能！</span>
</li>
</ul> </ul>
<vxe-table stripe style="margin-top:15px;width:100%" :loading="loading" :data="tableData"> <vxe-table stripe style="margin-top:15px;width:100%" :loading="loading" :data="tableData">
<vxe-table-column field="OrderNo" title="订单号"></vxe-table-column> <vxe-table-column field="OrderNo" title="订单号"></vxe-table-column>
...@@ -114,13 +118,16 @@ ...@@ -114,13 +118,16 @@
WarehouseId: 0, WarehouseId: 0,
WarehouseOutGoodsDetailList: [] WarehouseOutGoodsDetailList: []
}, },
orderNum:0 orderNum:0,
ISoperation:false,
WarehouseList:[]
}; };
}, },
mounted() { mounted() {
this.msg.ID = this.$route.query.ID; this.msg.ID = this.$route.query.ID;
this.getWareHouse(); this.getWareHouse();
this.getData(); this.getData();
this.getSuppliesCheckList()
// var myInput = document.getElementById('myCode'); // var myInput = document.getElementById('myCode');
// myInput.focus(); // myInput.focus();
// myInput.onblur = function() { // myInput.onblur = function() {
...@@ -133,6 +140,14 @@ ...@@ -133,6 +140,14 @@
this.msg.pageIndex = val; this.msg.pageIndex = val;
this.getList(); this.getList();
}, },
getWarehouseL(){
this.ISoperation = false
this.WarehouseList.forEach(x=>{
if(x.WarehouseId == this.msg.WarehouseId){
this.ISoperation = true
}
})
},
// 仓库列表 // 仓库列表
getWareHouse() { getWareHouse() {
this.apiJavaPost("/api/Supplies/GetWareHouseList", { this.apiJavaPost("/api/Supplies/GetWareHouseList", {
...@@ -149,6 +164,19 @@ ...@@ -149,6 +164,19 @@
null null
); );
}, },
//获取盘点仓库的列表
getSuppliesCheckList(){
this.apiJavaPost("/api/WarehouseOut/GetSuppliesCheckList", {},
res => {
if (res.data.resultCode === 1) {
this.WarehouseList = res.data.data && res.data.data.length>0 ? res.data.data:[]
} else {
this.Error(res.data.message);
}
},
null
);
},
//获取数据 //获取数据
getData() { getData() {
this.loading = true; this.loading = true;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment