Skip to content

E
ElectricitySheep
Commit c9c84034 authored by Mac's avatar Mac
Browse files
Options

1

parent c5696f2b
Hide whitespace changes
Inline Side-by-side
Showing with 111 additions and 73 deletions
src/components/orderMan/CostManagement.vue
View file @ c9c84034
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
</el-button> </el-button>
</div> </div>
<div class="content"> <div class="content">
<div style="margin-bottom:20px"> <div >
<span>供应商</span> <span>供应商</span>
<el-select style="margin:0 10px" class="w100" @change="msg.pageIndex=1,getList()" v-model="msg.SupplierId" size="small" <el-select style="margin:0 10px" class="w100" @change="msg.pageIndex=1,getList()" v-model="msg.SupplierId" size="small"
placeholder="请选择"> placeholder="请选择">
...@@ -31,6 +31,31 @@ ...@@ -31,6 +31,31 @@
<el-date-picker v-model="dateList" @change="msg.pageIndex=1,getList()" size="small" type="datetimerange" range-separator="至" <el-date-picker v-model="dateList" @change="msg.pageIndex=1,getList()" size="small" type="datetimerange" range-separator="至"
value-format="yyyy-MM-dd HH:mm:ss" start-placeholder="开始日期" end-placeholder="结束日期"> value-format="yyyy-MM-dd HH:mm:ss" start-placeholder="开始日期" end-placeholder="结束日期">
</el-date-picker> </el-date-picker>
<span style="margin-left: 5px">商品名称</span>
<div class="searchInput" style="width:250px">
<el-input @keyup.enter.native="msg.pageIndex=1,getList()" style="display:inline-block;width:225px;height:30px"
placeholder="请输入商品名称搜索"
v-model="msg.GoodsName"
@clear="msg.pageIndex=1,getList()"
size="small"
clearable>
</el-input>
<span @click="msg.pageIndex=1,getList()" class="el-icon-search" style="color:#979dad;font-size:14px;position:relative;top:1px"></span>
</div>
</div>
<div style="margin-bottom:20px;margin-top: 5px">
<span >订单号</span>
<div class="searchInput" style="width:200px">
<el-input @keyup.enter.native="msg.pageIndex=1,getList()" style="display:inline-block;width:175px;height:30px"
placeholder="请输入订单号搜索"
v-model="msg.OrderNo"
@clear="msg.pageIndex=1,getList()"
size="small"
clearable>
</el-input>
<span @click="msg.pageIndex=1,getList()" class="el-icon-search" style="color:#979dad;font-size:14px;position:relative;top:1px"></span>
</div>
</div> </div>
<el-table :data="tableData" v-loading="loading" border style="width: 100%" <el-table :data="tableData" v-loading="loading" border style="width: 100%"
@selection-change="handleSelectionChange"> @selection-change="handleSelectionChange">
...@@ -83,6 +108,8 @@ ...@@ -83,6 +108,8 @@
StartTime: '', StartTime: '',
EndTime: '', EndTime: '',
IsSelectAll:0, IsSelectAll:0,
GoodsName:'',
OrderNo:'',
}, },
SupplierData: [], //供应商data SupplierData: [], //供应商data
MakingType:[ MakingType:[
......
src/components/orderMan/orderList.vue
View file @ c9c84034
...@@ -180,45 +180,45 @@ ...@@ -180,45 +180,45 @@
</div> </div>
<div flex="cross:center main:center"> <!-- <div flex="cross:center main:center">-->
<el-dropdown trigger="click" > <!-- <el-dropdown trigger="click" >-->
<span class="el-dropdown-link">制单</span> <!-- <span class="el-dropdown-link">制单</span>-->
<el-dropdown-menu slot="dropdown" class="TC-dropdown"> <!-- <el-dropdown-menu slot="dropdown" class="TC-dropdown">-->
<el-dropdown-item @click.native="goCollection(item,list)"> <!-- <el-dropdown-item @click.native="goCollection(item,list)">-->
收入制单 <!-- 收入制单-->
</el-dropdown-item> <!-- </el-dropdown-item>-->
<el-dropdown-item @click.native="goPayment(item,list)"> <!-- <el-dropdown-item @click.native="goPayment(item,list)">-->
付款制单 <!-- 付款制单-->
</el-dropdown-item> <!-- </el-dropdown-item>-->
</el-dropdown-menu> <!-- </el-dropdown-menu>-->
</el-dropdown> <!-- </el-dropdown>-->
</div> <!-- </div>-->
</div>
</div> </div>
<div class="billStyle" v-if="list.SFinanceList.length>0|| list.ZFinanceList.length >0">
<div class="billStyle_item" style="border-right: 1px solid #EBEEF5">
收入单据:
<span v-for="(item,index2) in list.SFinanceList" :key="index2" @click="goSF(item)">
<span class="billtext" v-if="item.Status == 0" :style="{color:'#00FFFF'}">{{item.FrID}}</span>
<span class="billtext" v-if="item.Status == 1" :style="{color:'#0080FF'}">{{item.FrID}}</span>
<span class="billtext" v-if="item.Status == 2&&item.Is_Cashier==1" :style="{color:'#FF4048'}">{{item.FrID}}</span>
<span class="billtext" v-if="item.Status == 3" :style="{color:'#FFF100'}">{{item.FrID}}</span>
<span class="billtext" v-if="item.Status == 4" :style="{color:'#800080'}">{{item.FrID}}</span>
</span>
</div>
<div class="billStyle_item">
支出单据:
<span v-for="(item,index2) in list.ZFinanceList" :key="index2" @click="goZF(item)">
<span class="billtext" v-if="item.Status == 0" :style="{color:'#00FFFF'}">{{item.FrID}}</span>
<span class="billtext" v-if="item.Status == 1" :style="{color:'#0080FF'}">{{item.FrID}}</span>
<span class="billtext" v-if="item.Status == 2&&item.Is_Cashier==1" :style="{color:'#FF4048'}">{{item.FrID}}</span>
<span class="billtext" v-if="item.Status == 3" :style="{color:'#FFF100'}">{{item.FrID}}</span>
<span class="billtext" v-if="item.Status == 4" :style="{color:'#800080'}">{{item.FrID}}</span>
</span>
</div>
</div> </div>
<!-- <div class="billStyle" v-if="list.SFinanceList.length>0|| list.ZFinanceList.length >0">-->
<!-- <div class="billStyle_item" style="border-right: 1px solid #EBEEF5">-->
<!-- 收入单据:-->
<!-- <span v-for="(item,index2) in list.SFinanceList" :key="index2" @click="goSF(item)">-->
<!-- <span class="billtext" v-if="item.Status == 0" :style="{color:'#00FFFF'}">{{item.FrID}}</span>-->
<!-- <span class="billtext" v-if="item.Status == 1" :style="{color:'#0080FF'}">{{item.FrID}}</span>-->
<!-- <span class="billtext" v-if="item.Status == 2&&item.Is_Cashier==1" :style="{color:'#FF4048'}">{{item.FrID}}</span>-->
<!-- <span class="billtext" v-if="item.Status == 3" :style="{color:'#FFF100'}">{{item.FrID}}</span>-->
<!-- <span class="billtext" v-if="item.Status == 4" :style="{color:'#800080'}">{{item.FrID}}</span>-->
<!-- </span>-->
<!-- </div>-->
<!-- <div class="billStyle_item">-->
<!-- 支出单据:-->
<!-- <span v-for="(item,index2) in list.ZFinanceList" :key="index2" @click="goZF(item)">-->
<!-- <span class="billtext" v-if="item.Status == 0" :style="{color:'#00FFFF'}">{{item.FrID}}</span>-->
<!-- <span class="billtext" v-if="item.Status == 1" :style="{color:'#0080FF'}">{{item.FrID}}</span>-->
<!-- <span class="billtext" v-if="item.Status == 2&&item.Is_Cashier==1" :style="{color:'#FF4048'}">{{item.FrID}}</span>-->
<!-- <span class="billtext" v-if="item.Status == 3" :style="{color:'#FFF100'}">{{item.FrID}}</span>-->
<!-- <span class="billtext" v-if="item.Status == 4" :style="{color:'#800080'}">{{item.FrID}}</span>-->
<!-- </span>-->
<!-- </div>-->
<!-- </div>-->
</div> </div>
</div> </div>
<div flex="cross:center" class="app-order-info" style="width: 15%;"> <div flex="cross:center" class="app-order-info" style="width: 15%;">
......
src/components/orderMan/outboundManage.vue
View file @ c9c84034
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
<el-option v-for="item in SupplierData" :key="item.Id" :label="item.Name" :value="item.ID"> <el-option v-for="item in SupplierData" :key="item.Id" :label="item.Name" :value="item.ID">
</el-option> </el-option>
</el-select> </el-select>
<span>订单号</span> <span>订单号</span>
<div class="searchInput" style="width:250px"> <div class="searchInput" style="width:250px">
<el-input @keyup.enter.native="msg.pageIndex=1,getList()" style="display:inline-block;width:225px;height:30px" <el-input @keyup.enter.native="msg.pageIndex=1,getList()" style="display:inline-block;width:225px;height:30px"
...@@ -30,6 +30,17 @@ ...@@ -30,6 +30,17 @@
<el-date-picker v-model="dateList" @change="msg.pageIndex=1,getList()" size="small" type="datetimerange" range-separator="至" <el-date-picker v-model="dateList" @change="msg.pageIndex=1,getList()" size="small" type="datetimerange" range-separator="至"
value-format="yyyy-MM-dd HH:mm:ss" start-placeholder="开始日期" end-placeholder="结束日期"> value-format="yyyy-MM-dd HH:mm:ss" start-placeholder="开始日期" end-placeholder="结束日期">
</el-date-picker> </el-date-picker>
<span style="margin-left: 5px">商品名称</span>
<div class="searchInput" style="width:250px">
<el-input @keyup.enter.native="msg.pageIndex=1,getList()" style="display:inline-block;width:225px;height:30px"
placeholder="请输入商品名称搜索"
v-model="msg.GoodsName"
@clear="msg.pageIndex=1,getList()"
size="small"
clearable>
</el-input>
<span @click="msg.pageIndex=1,getList()" class="el-icon-search" style="color:#979dad;font-size:14px;position:relative;top:1px"></span>
</div>
</div> </div>
<el-table :data="tableData" v-loading="loading" border style="width: 100%" <el-table :data="tableData" v-loading="loading" border style="width: 100%"
@selection-change="handleSelectionChange"> @selection-change="handleSelectionChange">
...@@ -37,7 +48,7 @@ ...@@ -37,7 +48,7 @@
</el-table-column> </el-table-column>
<el-table-column prop="OrderNo" label="订单号" width="220"> <el-table-column prop="OrderNo" label="订单号" width="220">
</el-table-column> </el-table-column>
<el-table-column prop="GoodsName" label="商品名称" width="300px" style="font-size:11px"> <el-table-column prop="GoodsName" label="商品名称" width="300px" style="font-size:11px">
<template slot-scope="scope"> <template slot-scope="scope">
<div> <div>
...@@ -66,7 +77,7 @@ ...@@ -66,7 +77,7 @@
<span style="font-size:11px"> <span style="font-size:11px">
{{scope.row.NewGoodsName}} {{scope.row.NewGoodsName}}
</span> </span>
<el-tooltip class="item" effect="dark" content="修改商品" placement="top" > <el-tooltip class="item" effect="dark" content="修改商品" placement="top" >
<img @click="editGoods(scope.row,scope.$index)" <img @click="editGoods(scope.row,scope.$index)"
...@@ -82,7 +93,7 @@ ...@@ -82,7 +93,7 @@
<span class="el-tag el-tag--small el-tag--light" style="top: 5px; position: relative; margin-right: 5px;max-width:250px; overflow: hidden; white-space: nowrap; text-overflow: ellipsis; "> <span class="el-tag el-tag--small el-tag--light" style="top: 5px; position: relative; margin-right: 5px;max-width:250px; overflow: hidden; white-space: nowrap; text-overflow: ellipsis; ">
{{scope.row.NewSpecification}} {{scope.row.NewSpecification}}
</span> </span>
<el-tooltip class="item" effect="dark" content="修改规格" placement="top" > <el-tooltip class="item" effect="dark" content="修改规格" placement="top" >
<img @click="costBtn(scope.row,scope.$index)" <img @click="costBtn(scope.row,scope.$index)"
src="../../assets/img/userman/edit1.png" alt=""> src="../../assets/img/userman/edit1.png" alt="">
...@@ -97,7 +108,7 @@ ...@@ -97,7 +108,7 @@
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
<el-pagination style="text-align:right" background @current-change="handleCurrentChange" :page-size="msg.pageSize" :current-page.sync="msg.pageIndex" <el-pagination style="text-align:right" background @current-change="handleCurrentChange" :page-size="msg.pageSize" :current-page.sync="msg.pageIndex"
layout="prev, pager, next" :total="total"> layout="prev, pager, next" :total="total">
...@@ -106,8 +117,8 @@ ...@@ -106,8 +117,8 @@
<!-- 规格选择 --> <!-- 规格选择 -->
<el-dialog custom-class="app-add-cat" title="出库规格选择" :visible.sync="AtterDig" width="1100px"> <el-dialog custom-class="app-add-cat" title="出库规格选择" :visible.sync="AtterDig" width="1100px">
<div class="temp_content" v-if="SpecList.length>0"> <div class="temp_content" v-if="SpecList.length>0">
<span class="el-tag el-tag--small el-tag--light AttrList" :style="{color: item.IScheck == true?'#409eff':'#000'}" <span class="el-tag el-tag--small el-tag--light AttrList" :style="{color: item.IScheck == true?'#409eff':'#000'}"
v-for="(item,index) in SpecList" :key="index" v-for="(item,index) in SpecList" :key="index"
@click="chooseAttr(index)" @click="chooseAttr(index)"
> >
...@@ -131,12 +142,12 @@ ...@@ -131,12 +142,12 @@
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-form> </el-form>
<el-form :inline="true" label-width="80px" > <el-form :inline="true" label-width="80px" >
<el-form-item label="商品规格"> <el-form-item label="商品规格">
<el-select size="small" v-model="Goodsobj.NewSpecificationSort" @change="getSort" <el-select size="small" v-model="Goodsobj.NewSpecificationSort" @change="getSort"
style="display:inline-block;width:300px;" style="display:inline-block;width:300px;"
placeholder="请选择"> placeholder="请选择">
<el-option v-for="item in SpecificationList" :key="item.SpecificationKey" :label="item.SpecificationName" :value="item.SpecificationKey"> <el-option v-for="item in SpecificationList" :key="item.SpecificationKey" :label="item.SpecificationName" :value="item.SpecificationKey">
...@@ -147,11 +158,11 @@ ...@@ -147,11 +158,11 @@
<el-form-item> <el-form-item>
<el-button type="primary" size="small" @click="addGoods">添加</el-button> <el-button type="primary" size="small" @click="addGoods">添加</el-button>
</el-form-item> </el-form-item>
</el-form> </el-form>
<el-table :data="tableData2" v-loading="loading" border style="width: 100%"> <el-table :data="tableData2" v-loading="loading" border style="width: 100%">
<el-table-column prop="NewGoodsName" label="商品名称"> <el-table-column prop="NewGoodsName" label="商品名称">
</el-table-column> </el-table-column>
<el-table-column prop="Number" label="出库规格" width="250px"> <el-table-column prop="Number" label="出库规格" width="250px">
...@@ -172,7 +183,7 @@ ...@@ -172,7 +183,7 @@
<el-table-column prop="Number" label="操作" width="100px"> <el-table-column prop="Number" label="操作" width="100px">
<template slot-scope="scope"> <template slot-scope="scope">
<div> <div>
<el-tooltip class="item" effect="dark" content="删除" placement="top" > <el-tooltip class="item" effect="dark" content="删除" placement="top" >
<img @click="editGoods2(scope.row,scope.$index)" <img @click="editGoods2(scope.row,scope.$index)"
src="../../assets/img/userman/del.png" alt=""> src="../../assets/img/userman/del.png" alt="">
...@@ -207,9 +218,9 @@ ...@@ -207,9 +218,9 @@
pageSize: 15, pageSize: 15,
SupplierId:0, SupplierId:0,
OrderNo:'', OrderNo:'',
StartTime:'', StartTime:'',
EndTime:'', EndTime:'',
GoodsName:'',
}, },
goodsmsg:{ goodsmsg:{
pageIndex:1, pageIndex:1,
...@@ -230,7 +241,7 @@ ...@@ -230,7 +241,7 @@
SupplierData: [], //供应商data SupplierData: [], //供应商data
dateList: [], //日期 dateList: [], //日期
GoodsList:[],//商品列表 GoodsList:[],//商品列表
Goodsobj:{ Goodsobj:{
Id:0, Id:0,
OrderNo:0, OrderNo:0,
...@@ -258,7 +269,7 @@ ...@@ -258,7 +269,7 @@
this.getAllSupplier() this.getAllSupplier()
}, },
methods: { methods: {
getList() { getList() {
if (this.dateList && this.dateList.length > 0) { if (this.dateList && this.dateList.length > 0) {
this.msg.StartTime = this.dateList[0]; this.msg.StartTime = this.dateList[0];
...@@ -283,7 +294,7 @@ ...@@ -283,7 +294,7 @@
this.msg.pageIndex = val; this.msg.pageIndex = val;
this.getList(); this.getList();
}, },
handleSelectionChange(val) { handleSelectionChange(val) {
var selectRow = JSON.parse(JSON.stringify(val)); var selectRow = JSON.parse(JSON.stringify(val));
let array= []; let array= [];
...@@ -301,7 +312,7 @@ ...@@ -301,7 +312,7 @@
if (arr[i].NewGoodsId === arr[j].NewGoodsId && arr[i].NewSpecificationSort === arr[j].NewSpecificationSort) { if (arr[i].NewGoodsId === arr[j].NewGoodsId && arr[i].NewSpecificationSort === arr[j].NewSpecificationSort) {
arr.splice(j, 1); arr.splice(j, 1);
j--; // 每删除一个数j的值就减1 j--; // 每删除一个数j的值就减1
len--; // j值减小时len也要相应减1（减少循环次数，节省性能） len--; // j值减小时len也要相应减1（减少循环次数，节省性能）
} }
} }
} }
...@@ -315,7 +326,7 @@ ...@@ -315,7 +326,7 @@
if (that.outobj.WarehouseOutGoodsList.length == 0) { if (that.outobj.WarehouseOutGoodsList.length == 0) {
that.Info('请选择商品'); that.Info('请选择商品');
return return
} }
let array=[] let array=[]
let showtip = false let showtip = false
this.outobj.WarehouseOutGoodsList.forEach(x=>{ this.outobj.WarehouseOutGoodsList.forEach(x=>{
...@@ -333,7 +344,7 @@ ...@@ -333,7 +344,7 @@
} }
} }
}) })
}) })
if(showtip == true){ if(showtip == true){
that.Error('出库数量大于0'); that.Error('出库数量大于0');
...@@ -360,9 +371,9 @@ ...@@ -360,9 +371,9 @@
}).catch(() => { }).catch(() => {
}); });
} }
}, },
...@@ -370,13 +381,13 @@ ...@@ -370,13 +381,13 @@
if(val=='' || val == 0 ){//当输入 空和0 的时候做的处理 if(val=='' || val == 0 ){//当输入 空和0 的时候做的处理
this.tableData.forEach(x => { this.tableData.forEach(x => {
if(x.Id==row.Id){ if(x.Id==row.Id){
x.NewNumber=0 x.NewNumber=0
} }
}); });
} }
}, },
costBtn(obj,index){ costBtn(obj,index){
this.outindex = index this.outindex = index
if(this.ERPEmpId==0){ if(this.ERPEmpId==0){
this.Error('您还未授权，不能修改规格'); this.Error('您还未授权，不能修改规格');
...@@ -387,11 +398,11 @@ ...@@ -387,11 +398,11 @@
this.SpecList.forEach(x=>{ this.SpecList.forEach(x=>{
x.IScheck=false; x.IScheck=false;
if(x.SpecificationKey == obj.NewSpecificationSort){ if(x.SpecificationKey == obj.NewSpecificationSort){
x.IScheck=true; x.IScheck=true;
} }
}) })
this.AtterDig = true this.AtterDig = true
}else{ }else{
...@@ -402,10 +413,10 @@ ...@@ -402,10 +413,10 @@
}, },
getSpecification(val){ getSpecification(val){
//给Goodsobj赋值 //给Goodsobj赋值
this.GoodsList.forEach(x=>{ this.GoodsList.forEach(x=>{
if(x.Id == val){ if(x.Id == val){
this.Goodsobj.NewGoodsId = x.Id; this.Goodsobj.NewGoodsId = x.Id;
this.Goodsobj.NewGoodsName = x.Name; this.Goodsobj.NewGoodsName = x.Name;
} }
...@@ -419,7 +430,7 @@ ...@@ -419,7 +430,7 @@
this.Error(res.data.message); this.Error(res.data.message);
} }
}) })
}, },
getSort(val){ getSort(val){
this.SpecificationList.forEach(x=>{ this.SpecificationList.forEach(x=>{
...@@ -437,7 +448,7 @@ ...@@ -437,7 +448,7 @@
this.editGoodsindex = index this.editGoodsindex = index
this.Goodsobj = obj this.Goodsobj = obj
this.Goodsobj.NewGoodsId = ''; this.Goodsobj.NewGoodsId = '';
this.Goodsobj.NewSpecificationSort = ''; this.Goodsobj.NewSpecificationSort = '';
} }
}, },
...@@ -462,13 +473,13 @@ ...@@ -462,13 +473,13 @@
this.tableData2.unshift(this.editGoodsindex,0) this.tableData2.unshift(this.editGoodsindex,0)
this.tableData.splice(this.editGoodsindex,1) this.tableData.splice(this.editGoodsindex,1)
Array.prototype.splice.apply(this.tableData, this.tableData2); Array.prototype.splice.apply(this.tableData, this.tableData2);
this.Egoods = false; this.Egoods = false;
this.tableData2=[] this.tableData2=[]
}, },
chooseAttr(index){ chooseAttr(index){
this.SpecList.forEach((x,i)=>{ this.SpecList.forEach((x,i)=>{
x.IScheck=false; x.IScheck=false;
if(index == i){ if(index == i){
x.IScheck=true; x.IScheck=true;
} }
...@@ -513,7 +524,7 @@ ...@@ -513,7 +524,7 @@
} }
}) })
}, },
} }
}; };
......
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