Commit d5115a51 authored by Mac's avatar Mac

1

parent c7d28c24
...@@ -53,13 +53,13 @@ ...@@ -53,13 +53,13 @@
</el-option> </el-option>
</el-select> </el-select>
</el-input> </el-input>
</div> </div>
<div> <div>
<span >主播名称:</span> <span >主播名称:</span>
<el-input @clear="msg.pageIndex=1,getList()" @keyup.enter.native="msg.pageIndex=1,getList()" clearable style="margin-top:10px;width:200px" class="input-with-select" <el-input @clear="msg.pageIndex=1,getList()" @keyup.enter.native="msg.pageIndex=1,getList()" clearable style="margin-top:10px;width:200px" class="input-with-select"
placeholder="请输入主播名称" v-model="msg.AnchorName" size="small"> placeholder="请输入主播名称" v-model="msg.AnchorName" size="small">
</el-input> </el-input>
</div> </div>
<div> <div>
...@@ -122,10 +122,11 @@ ...@@ -122,10 +122,11 @@
</div> </div>
</div> </div>
<div class="app-order-body"> <div class="app-order-body">
<div class="goods-item" style="width: 55%;"> <div class="goods-item" style="width: 65%;">
<div v-for="(list,index2) in item.DetailList" :key="index2" class="goods"> <div v-for="(list,index2) in item.DetailList" :key="index2" class="goods">
<el-image :src="list.CoverImagePath" class="goods-image" :preview-src-list="[list.CoverImagePath]"></el-image> <div>
<div flex="dir:left"> <el-image :src="list.CoverImagePath" class="goods-image" :preview-src-list="[list.CoverImagePath]"></el-image>
<div flex="dir:left">
<div class="goods-info"> <div class="goods-info">
<div class="goods-name"> <div class="goods-name">
<div class="app-ellipsis"> <div class="app-ellipsis">
...@@ -154,7 +155,7 @@ ...@@ -154,7 +155,7 @@
<span>货号:{{list.ProductCode!=null && list.ProductCode!=''?list.ProductCode:'无'}}</span> <span>货号:{{list.ProductCode!=null && list.ProductCode!=''?list.ProductCode:'无'}}</span>
<span style="margin-left:20px" v-if='list.FreeShippingRemarks!=null'>{{list.FreeShippingRemarks}}</span> <span style="margin-left:20px" v-if='list.FreeShippingRemarks!=null'>{{list.FreeShippingRemarks}}</span>
</div> </div>
</div> </div>
<div flex="dir:left box:mean" style="width: 300px;"> <div flex="dir:left box:mean" style="width: 300px;">
<div flex="cross:center main:center" style="display: flex;flex-direction: column;align-items: flex-start;"> <div flex="cross:center main:center" style="display: flex;flex-direction: column;align-items: flex-start;">
...@@ -176,11 +177,39 @@ ...@@ -176,11 +177,39 @@
</span> </span>
</div> </div>
<div flex="cross:center main:center">数量:x {{list.Number}}</div> <div flex="cross:center main:center">数量:x {{list.Number}}</div>
<div flex="cross:center main:center">
<el-dropdown trigger="click" >
<span class="el-dropdown-link">制单</span>
<el-dropdown-menu slot="dropdown" class="TC-dropdown">
<el-dropdown-item @click.native="goCollection(item,list)">
收入制单
</el-dropdown-item>
<el-dropdown-item @click.native="goPayment(item,list)">
付款制单
</el-dropdown-item>
</el-dropdown-menu>
</el-dropdown>
</div>
</div>
</div>
</div>
<div class="billStyle">
<div class="billStyle_item" style="border-right: 1px solid #EBEEF5">
收入单据:
<span class="billtext">12345</span>
<span class="billtext">12345</span>
<span class="billtext">12345</span>
</div>
<div class="billStyle_item">
支出单据:
<span class="billtext">12345</span>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
<div flex="cross:center" class="app-order-info" style="width: 20%;"> <div flex="cross:center" class="app-order-info" style="width: 15%;">
<div flex="dir:top"> <div flex="dir:top">
<div> <div>
<span style="font-size: 16px;">{{item.Income}}</span> <span style="font-size: 16px;">{{item.Income}}</span>
...@@ -200,6 +229,7 @@ ...@@ -200,6 +229,7 @@
</div> </div>
</div> </div>
</div> </div>
<div class="app-order-info" style="padding: 10px; border-right: 0px; width: 20%;"> <div class="app-order-info" style="padding: 10px; border-right: 0px; width: 20%;">
<div flex="wrap:wrap cross:center"> <div flex="wrap:wrap cross:center">
<template v-if="msg.Recycled==2"> <template v-if="msg.Recycled==2">
...@@ -1419,6 +1449,32 @@ ...@@ -1419,6 +1449,32 @@
} }
}); });
},
goCollection(item,list){//跳到erp收款单
console.log(item)
console.log(list)
let currentUser = this.getLocalStorage()
let companyID =currentUser.ERPBranchId
let orderObj = {
OrderSource:16,
OtherType:21,
ReFinanceId:item.OrderId,//订单id
ReFinanceId2:list.Id,//订单商品id
ECOrderList:[{ECOrderId:item.OrderId,ECOrderDetailId:list.Id}]
}
window.open('http://www.test.com:8081/#/ChoiceAddFinancialDocuments?Type=1&companyID='+companyID+'&orderObj='+JSON.stringify(orderObj))
},
goPayment(item,list){//跳到erp付款单
let currentUser = this.getLocalStorage()
let companyID =currentUser.ERPBranchId
let orderObj = {
OrderSource:16,
OtherType:22,
ReFinanceId:item.OrderId,
ReFinanceId2:list.Id,
ECOrderList:[{ECOrderId:item.OrderId,ECOrderDetailId:list.Id}]
}
window.open('http://www.test.com:8081/#/ChoiceAddFinancialDocuments?Type=2&companyID='+companyID+'&orderObj='+JSON.stringify(orderObj))
} }
}, },
}; };
...@@ -1650,5 +1706,34 @@ ...@@ -1650,5 +1706,34 @@
padding: 20px; padding: 20px;
box-sizing: border-box; box-sizing: border-box;
} }
.orderList .billStyle{
width: 100%;
display: flex;flex-direction: row;
align-items: center;
border: 1px solid #EBEEF5;
margin-top: 5px;
}
.orderList .billStyle .billStyle_item{
width: 50%;
padding: 5px;
}
.orderList .billStyle .billtext{
font-size: 14px;
cursor: pointer;
color: #409EFF;
margin-right: 5px;
text-decoration:underline;
}
.orderList .el-dropdown-link{
height: 30px;
line-height: 30px;
background-color: #409EFF;
color: #fff;
font-size: 12px;
width: 60px;
text-align: center;
border-radius: 4px;
cursor: pointer;
display: inline-block;
}
</style> </style>
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