Skip to content

A
assets
Commit d8a307de authored by zhengke's avatar zhengke
Browse files
Options

修改

parent fc5000dd
Hide whitespace changes
Inline Side-by-side
Showing with 493 additions and 217 deletions
src/App.vue
View file @ d8a307de
......@@ -13,7 +13,7 @@ export default {
</script>
<style>
@import "//at.alicdn.com/t/font_1544586_kc9j119l3w.css";
@import "//at.alicdn.com/t/font_1544586_7izg0wp5b3o.css";
@import "./assets/css/common.css";
@import './assets/global/font.css';
@import "./assets/css/reset.css";
......
src/components/assetsman/outboundApplication.vue
View file @ d8a307de
......@@ -2,241 +2,260 @@
<div class="outboundApplication">
<div class="routerTitle">
<span class="pageTitle">出库申请</span>
<span
@click="morequery = !morequery"
style="display:inline-flex;align-items:center;cursor: pointer;"
class="f12 cd6"
>
<span @click="morequery = !morequery" style="display:inline-flex;align-items:center;cursor: pointer;"
class="f12 cd6">
<span style="margin-right:5px">高级查询</span>
<img
v-show="!morequery"
style="width:12px;height:12px;"
src="../../assets/img/more.png"
alt=""
/>
<img
v-show="morequery"
class="roatImg"
style="width:12px;height:12px"
src="../../assets/img/more.png"
alt=""
/>
<img v-show="!morequery" style="width:12px;height:12px;" src="../../assets/img/more.png" alt="" />
<img v-show="morequery" class="roatImg" style="width:12px;height:12px" src="../../assets/img/more.png" alt="" />
</span>
</div>
<div class="padContent">
<ul v-show="morequery" class="queryul">
<li>
<el-select size="small" v-model="msg.ApplyStatus" @change="msg.pageIndex=1,getList()">
<el-option
v-for="item in ApplyStatusList"
:key="item.Id"
:label="item.Name"
:value="item.Id"
>
</el-option>
</el-select>
</li>
<li>
<el-select size="small" v-model="msg.OutStatus" @change="msg.pageIndex=1,getList()">
<el-option
v-for="item in OutStatusList"
:key="item.Id"
:label="item.Name"
:value="item.Id"
>
</el-option>
</el-select>
</li>
</ul>
<div>
<vxe-table stripe style="margin-top:15px" :loading="loading"
:data="tableData">
<vxe-table-column field="Name" title="资产状态">
<template v-slot="{ row }">
<span class="commonStyle hoverSpan1"></span>
<span class="ColorSpan purpleSpan" v-if="row.ApplyStatus==1">待</span>
<span class="ColorSpan huangSpan" v-if="row.ApplyStatus==2">已</span>
<span class="ColorSpan purpleSpan" v-if="row.ApplyStatus==3">拒</span>
</template>
</vxe-table-column>
<vxe-table-column field="MallBaseName" title="小程序名称"></vxe-table-column>
<vxe-table-column field="TenantName" title="商户名称"></vxe-table-column>
<vxe-table-column field="OutNo" title="出库订单号"></vxe-table-column>
<vxe-table-column field="Delivered" title="已发货数"></vxe-table-column>
<vxe-table-column field="NotOutStock" title="未发货数"></vxe-table-column>
<vxe-table-column field="address" title="操作">
<template v-slot="{ row }">
<el-tooltip class="item" effect="dark" content="审批" placement="top">
<img @click="See(row,1)" style="width:24px;height:24px" src="../../assets/img/shenpi.png" alt="">
</el-tooltip>
<el-tooltip class="item" effect="dark" content="拒绝" placement="top">
<img @click="See(row,2)" style="width:24px;height:24px" src="../../assets/img/qx.png" alt="">
</el-tooltip>
</template>
</vxe-table-column>
<ul v-show="morequery" class="queryul">
<li>
<el-select size="small" v-model="msg.ApplyStatus" @change="msg.pageIndex=1,getList()">
<el-option v-for="item in ApplyStatusList" :key="item.Id" :label="item.Name" :value="item.Id">
</el-option>
</el-select>
</li>
<li>
<el-select size="small" v-model="msg.OutStatus" @change="msg.pageIndex=1,getList()">
<el-option v-for="item in OutStatusList" :key="item.Id" :label="item.Name" :value="item.Id">
</el-option>
</el-select>
</li>
</ul>
<div>
<vxe-table stripe style="margin-top:15px" :loading="loading" :data="tableData">
<vxe-table-column field="Name" title="资产状态">
<template v-slot="{ row }">
<span class="commonStyle hoverSpan1"></span>
<span class="ColorSpan purpleSpan" v-if="row.ApplyStatus==1">待</span>
<span class="ColorSpan huangSpan" v-if="row.ApplyStatus==2">已</span>
<span class="ColorSpan purpleSpan" v-if="row.ApplyStatus==3">拒</span>
</template>
</vxe-table-column>
<vxe-table-column field="MallBaseName" title="小程序名称"></vxe-table-column>
<vxe-table-column field="TenantName" title="商户名称"></vxe-table-column>
<vxe-table-column field="OutNo" title="出库订单号"></vxe-table-column>
<vxe-table-column field="Delivered" title="已发货数"></vxe-table-column>
<vxe-table-column field="NotOutStock" title="未发货数"></vxe-table-column>
<vxe-table-column field="address" title="操作">
<template v-slot="{ row }">
<el-tooltip class="item" effect="dark" content="审批" placement="top">
<img @click="See(row,1)" style="width:24px;height:24px;margin-right:10px;" src="../../assets/img/shenpi.png" alt="">
</el-tooltip>
<el-tooltip class="item" effect="dark" content="拒绝" placement="top">
<img @click="See(row,2)" style="width:24px;height:24px;margin-right:10px;" src="../../assets/img/qx.png" alt="">
</el-tooltip>
<el-tooltip class="item" effect="dark" content="出库" placement="top">
<span class="outBand_div" v-if="row.ApplyStatus==2&&(row.OutStatus==0||row.OutStatus==1)" @click="goUrl('outboundDetail',row.ID)">
<i class="iconfont icon-chuku"></i>
</span>
</el-tooltip>
</template>
</vxe-table-column>
</vxe-table>
<el-pagination
@current-change="currentChange"
background
:page-size="msg.pageSize"
layout="prev, pager, next"
:current-page.sync="msg.pageIndex"
:total="total"
>
<el-pagination @current-change="currentChange" background :page-size="msg.pageSize" layout="prev, pager, next"
:current-page.sync="msg.pageIndex" :total="total">
</el-pagination>
</div>
</div>
</div>
<el-dialog
:title="isagree==1?'同意申请':'拒绝申请'"
:close-on-click-modal="false"
top="0"
:visible.sync="dialogState"
width="400px">
<el-form class="MyEditForm" label-width="0">
<el-form-item prop="Name" style="margin-left:60px;">
<span class="label">理由</span>
<el-input v-model="Updatemsg.ExamineReason" type="textarea" placeholder="请输入"></el-input>
</el-form-item>
<div class="btnformItem">
<span class="submitBtn" type="primary" @click="submitForm()">确定</span>
<span class="exitBtn" @click="dialogState=false">取消</span>
</div>
</el-form>
</el-dialog>
<el-dialog :title="isagree==1?'同意申请':'拒绝申请'" :close-on-click-modal="false" top="0" :visible.sync="dialogState"
width="400px">
<el-form class="MyEditForm" label-width="0">
<el-form-item prop="Name" style="margin-left:60px;">
<span class="label">理由</span>
<el-input v-model="Updatemsg.ExamineReason" type="textarea" placeholder="请输入"></el-input>
</el-form-item>
<div class="btnformItem">
<span class="submitBtn" type="primary" @click="submitForm()">确定</span>
<span class="exitBtn" @click="dialogState=false">取消</span>
</div>
</el-form>
</el-dialog>
</div>
</template>
<script>
import "@riophae/vue-treeselect/dist/vue-treeselect.css";
export default {
name: "outboundApplication",
data() {
return {
import "@riophae/vue-treeselect/dist/vue-treeselect.css";
export default {
name: "outboundApplication",
data() {
return {
loading:false,
tableData:[],
morequery: false,
ApplyStatusList:[{Id:0,Name:'全部'},{Id:1,Name:'审核中'},{Id:2,Name:'通过'},{Id:3,Name:'拒绝'}],
OutStatusList:[{Id:0,Name:'全部'},{Id:1,Name:'未出库'},{Id:2,Name:'部分出库'},{Id:3,Name:'全部出库'}],
msg: {
pageIndex: 1,
pageSize: 15,
ApplyStatus: 0,
OutStatus: 0,
},
Updatemsg:{
ID:0,
ExamineReason:'',
ApplyStatus:0
},
total:0,
isagree:1, //同意为1 拒绝为2
dialogState:false,
};
},
mounted() {
this.getList();
},
methods: {
getList() {
this.loading = true;
this.apiJavaPost(
"/api/WarehouseOut/GetApplyPageList",
this.msg,
res => {
this.loading = false;
if (res.data.resultCode === 1) {
this.tableData = res.data.data.pageData;
this.total = res.data.data.count;
} else {
this.Error(res.data.message);
}
loading: false,
tableData: [],
morequery: false,
ApplyStatusList: [{
Id: 0,
Name: '全部'
}, {
Id: 1,
Name: '审核中'
}, {
Id: 2,
Name: '通过'
}, {
Id: 3,
Name: '拒绝'
}],
OutStatusList: [{
Id: 0,
Name: '全部'
}, {
Id: 1,
Name: '未出库'
}, {
Id: 2,
Name: '部分出库'
}, {
Id: 3,
Name: '全部出库'
}],
msg: {
pageIndex: 1,
pageSize: 15,
ApplyStatus: 0,
OutStatus: 0,
},
null
);
Updatemsg: {
ID: 0,
ExamineReason: '',
ApplyStatus: 0
},
total: 0,
isagree: 1, //同意为1 拒绝为2
dialogState: false,
};
},
mounted() {
this.getList();
},
currentChange(val) {
methods: {
getList() {
this.loading = true;
this.apiJavaPost(
"/api/WarehouseOut/GetApplyPageList",
this.msg,
res => {
this.loading = false;
if (res.data.resultCode === 1) {
console.log(res,'resss');
this.tableData = res.data.data.pageData;
this.total = res.data.data.count;
} else {
this.Error(res.data.message);
}
},
null
);
},
currentChange(val) {
this.msg.pageIndex = val;
this.getList();
},
See(row,type){
this.Updatemsg.ID = row.ID;
this.Updatemsg.ApplyStatus = row.ApplyStatus;
this.Updatemsg.ExamineReason = '';
this.isagree =type;
this.dialogState=true
},
submitForm(){
if(this.isagree==2 && this.Updatemsg.ExamineReason == ''){
this.Error('请填写理由');
return
},
See(row, type) {
this.Updatemsg.ID = row.ID;
this.Updatemsg.ApplyStatus = row.ApplyStatus;
this.Updatemsg.ExamineReason = '';
this.isagree = type;
this.dialogState = true
},
submitForm() {
if (this.isagree == 2 && this.Updatemsg.ExamineReason == '') {
this.Error('请填写理由');
return
}
this.apiJavaPost(
"/api/WarehouseOut/UpdateWarehouseOutApply",
this.msg,
res => {
if (res.data.resultCode === 1) {
this.dialogState=false;
this.getList()
} else {
this.Error(res.data.message);
}
},
null
);
this.apiJavaPost(
"/api/WarehouseOut/UpdateWarehouseOutApply",
this.msg,
res => {
if (res.data.resultCode === 1) {
this.dialogState = false;
this.getList()
} else {
this.Error(res.data.message);
}
},
null
);
},
//跳转
goUrl(path,ID) {
this.$router.push({
path: "/" + path,
query: {
ID:ID
}
});
}
}
}
};
};
</script>
<style>
.outboundApplication .MyEditForm .baseform .el-form-item:nth-child(4n) {
margin-right: 0;
}
.outboundApplication .zczt1 {
background: #ffe4d5;
color: #ffa87c;
}
.outboundApplication .zczt2 {
background: #beeff0;
color: #089bab;
}
.outboundApplication .zczt3 {
background: #ffd6d5;
color: #ff7874;
}
.outboundApplication .zczt4 {
background: #d7d6ff;
color: #7b78ff;
}
.outboundApplication .Commonzczt {
display: inline-block;
width: 24px;
height: 24px;
line-height: 24px;
text-align: center;
border-radius: 50%;
font-size: 12px;
font-family: "Microsoft YaHei";
}
.outboundApplication {
width: 100%;
height: 100%;
}
.outboundApplication .MyEditForm .baseform .el-form-item:nth-child(4n) {
margin-right: 0;
}
.outboundApplication .zczt1 {
background: #ffe4d5;
color: #ffa87c;
}
.outboundApplication .zczt2 {
background: #beeff0;
color: #089bab;
}
.outboundApplication .zczt3 {
background: #ffd6d5;
color: #ff7874;
}
.outboundApplication .zczt4 {
background: #d7d6ff;
color: #7b78ff;
}
.outboundApplication .Commonzczt {
display: inline-block;
width: 24px;
height: 24px;
line-height: 24px;
text-align: center;
border-radius: 50%;
font-size: 12px;
font-family: "Microsoft YaHei";
}
.outboundApplication {
width: 100%;
height: 100%;
}
.outBand_div{
width:24px;
height:24px;
border-radius: 6px;
text-align: center;
line-height: 24px;
background-color: #D7D6FF;
color:#7B78FF;
display:inline-block;
}
.outboundApplication .vxe-cell{
display: flex;
margin:5px 0;
}
</style>
src/components/assetsman/outboundDetail.vue 0 → 100644
View file @ d8a307de
<style>
.outbound_Main {
position: relative;
}
.outbound_Main .outBound_Cont {
min-height: 800px;
padding: 20px;
}
.outbound_Main .outbound_table {
width: 100%;
}
.outbound_Main .outbound_Gun {
width: 100%;
}
</style>
<template>
<div class="outbound_Main">
<div class="routerTitle" style="padding:17px 30px;">
<span class="pageTitle" style="margin-top:-5px;">商品出库</span>
<span @click="sureOutband()" class="chaxunSpan">确认出库</span>
</div>
<ul class="queryul" style="margin-left:20px;">
扫码出库
<li style="min-width: 364px;">
<el-input ref="barCodeInput" v-model="barCode" placeholder="商品出库条码"
@keyup.enter.native="payCode"></el-input>
</li>
</ul>
<div class="outBound_Cont">
<div class="outbound_Gun">
<vxe-table stripe style="margin-top:10px;width:100%" :loading="loadingSearch" :data="scanData">
<vxe-table-column field="ImageList" title="图片">
<template v-slot="{ row }">
<img style="width:100px;height:100px;" :src="row.ImageList[0]" />
</template>
</vxe-table-column>
<vxe-table-column field="Name" title="姓名"></vxe-table-column>
<vxe-table-column field="SuppliesNum" title="物料编码"></vxe-table-column>
<vxe-table-column field="SpecificationList" title="商品规格列表">
<template v-slot="{ row }">
<div v-for="(item,index) in row.SpecificationList" :key="index">
{{item}}
</div>
</template>
</vxe-table-column>
<vxe-table-column field="Units" title="单位"></vxe-table-column>
<vxe-table-column field="StockInNum" title="入库单号"></vxe-table-column>
<vxe-table-column field="StockInDate" title="入库时间"></vxe-table-column>
<vxe-table-column field="UnitPrice" title="价格"></vxe-table-column>
<vxe-table-column title="操作">
<template v-slot="{ row, rowIndex }">
<img @click="delBound(row,rowIndex)" style="width:24px;height:24px"
src="../../assets/img/delete.png" alt="">
</template>
</vxe-table-column>
</vxe-table>
</div>
<div class="outbound_table">
<ul class="queryul" style="margin:30px 0 25px 0;">
选择仓库
<li style="margin-bottom:0;">
<el-select size="mini" v-model="msg.WarehouseId" @change="getData()" placeholder="请选择">
<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>
</el-select>
</li>
</ul>
<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="GoodsName" title="商户名称"></vxe-table-column>
<vxe-table-column field="Specification" title="商品规格"></vxe-table-column>
<vxe-table-column field="Number" title="购买数量"></vxe-table-column>
<vxe-table-column field="nowBound" title="正在出库"></vxe-table-column>
</vxe-table>
</div>
</div>
</div>
</template>
<script>
export default {
data() {
return {
barCode: '',
getWareHouseList: [],
//数据
tableData: [],
//主要商品列表loading
loading: false,
//扫码枪loading
loadingSearch: false,
msg: {
ID: 0,
WarehouseId: 0
},
scanData: [],
//确认出库msg
sureMsg: {
ID: 0,
WarehouseId: 0,
WarehouseOutGoodsDetailList: []
},
orderNum:0
};
},
mounted() {
this.msg.ID = this.$route.query.ID;
this.getWareHouse();
this.getData();
// var myInput = document.getElementById('myCode');
// myInput.focus();
// myInput.onblur = function() {
// myInput.focus();
// }
this.$refs["barCodeInput"].focus();
},
methods: {
currentChange(val) {
this.msg.pageIndex = val;
this.getList();
},
// 仓库列表
getWareHouse() {
this.apiJavaPost("/api/Supplies/GetWareHouseList", {
Name: ''
},
res => {
if (res.data.resultCode === 1) {
this.getWareHouseList = res.data.data;
console.log(res,'res');
} else {
this.Error(res.data.message);
}
},
null
);
},
//获取数据
getData() {
this.loading = true;
this.apiJavaPost("/api/WarehouseOut/GetOuGoodsByWarehouseId", this.msg,
res => {
this.loading = false;
if (res.data.resultCode === 1) {
this.tableData = res.data.data;
if (this.tableData) {
this.tableData.forEach(x => {
x.nowBound = 0;
})
}
} else {
this.Error(res.data.message);
}
},
null
);
},
//扫码枪开始
payCode() {
let msg = {
Code: this.barCode,
WareHouseId: this.msg.WarehouseId
}
this.loadingSearch = true;
this.apiJavaPost("/api/Supplies/GetProcurementGoodsInfo", msg,
res => {
this.loadingSearch = false;
if (res.data.resultCode === 1) {
var myData = res.data.data.GoodsModel;
if(myData){
var scanMsg = {};
var data2 = JSON.parse(JSON.stringify(this.tableData));
this.orderNum=0;
data2.forEach(x => {
if ((myData.GoodsId == x.GoodsId) && (myData.SpecificationKey == x.SpecificationSort)) {
this.orderNum++;
if(x.nowBound<x.Number){
x.nowBound++;
this.tableData = data2;
this.scanData.unshift(myData);
scanMsg.MaterialId = myData.SuppliesId;
scanMsg.CostMoney = myData.UnitPrice;
scanMsg.OrderGoodsId = x.OrderGoodsId;
scanMsg.StockInId = myData.StockInId;
this.sureMsg.WarehouseOutGoodsDetailList.push(scanMsg);
}else{
this.Error('超过了购买数量');
}
}
})
this.getorderNum();
}else{
this.Error(res.data.data.Msg);
}
} else {
this.Error(res.data.message);
}
this.barCode = '';
},
null
);
},
getorderNum(){
if(this.orderNum==0){
this.Error('该商品未在出库列表中');
}
},
//删除扫描
delBound(row, index) {
this.scanData.splice(index, 1);
this.sureMsg.WarehouseOutGoodsDetailList.splice(index, 1);
this.tableData.forEach(x => {
if (x.GoodsId == row.GoodsId) {
x.nowBound--
}
})
},
//确认出库
sureOutband() {
var buyNum = 0;
this.tableData.forEach(x => {
buyNum += x.Number;
})
if (this.scanData.length != buyNum) {
this.Error('出库数量与列表数据不符');
return;
}
this.sureMsg.ID = this.msg.ID;
this.sureMsg.WarehouseId = this.msg.WarehouseId;
this.apiJavaPost("/api/WarehouseOut/SetStockOutInfo", this.sureMsg,
res => {
if (res.data.resultCode === 1) {
this.Success(res.data.message);
this.$router.push({
path: "/" + 'outboundApplication',
});
} else {
this.Error(res.data.message);
}
},
null
);
}
}
};
</script>
src/router/config.js
View file @ d8a307de
......@@ -81,7 +81,12 @@ export default {
name: 'outboundApplication',
component: resolve => require(['@/components/assetsman/outboundApplication'], resolve),
},
//出库详情
{
path: '/outboundDetail',
name: 'outboundDetail',
component: resolve => require(['@/components/assetsman/outboundDetail'], resolve),
},
// 派发&退库
{
path: '/PaiTui',
......
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