Skip to content

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

1

parent c5696f2b
Show 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 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 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
...@@ -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">
...@@ -209,7 +220,7 @@ ...@@ -209,7 +220,7 @@
OrderNo:'', OrderNo:'',
StartTime:'', StartTime:'',
EndTime:'', EndTime:'',
GoodsName:'',
}, },
goodsmsg:{ goodsmsg:{
pageIndex:1, pageIndex:1,
......
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