Commit a3da76cb authored by zhengke's avatar zhengke

修改

parent 5c726100
......@@ -2,6 +2,10 @@
<div class="RecomBillDetail">
<div class="head-title">
账单明细
<el-button @click="goBackList" style="float:right;margin: -5px 0 0 5px;"
size="small" type="primary">
返回
</el-button>
</div>
<div class="content">
<div class="Tongji_info">
......@@ -19,27 +23,25 @@
</el-table-column>
<el-table-column prop="GoodsName" label="商品名称" min-width="300">
</el-table-column>
<el-table-column prop="SpecificationList" label="商品规格" width="150">
<el-table-column prop="SpecificationList" label="商品规格" width="200">
<template slot-scope="scope">
<div v-for="(item,index) in scope.row.SpecificationList" :key="index">{{item}}</div>
</template>
</el-table-column>
<el-table-column prop="ProductCode" label="货号" width="200">
</el-table-column>
<el-table-column prop="Final_Price" label="最终价格" width="120">
</el-table-column>
<el-table-column prop="Number" label="数量" width="100">
</el-table-column>
<el-table-column prop="Final_Price" label="价格" width="120">
</el-table-column>
<el-table-column label="状态" width="100">
<template slot-scope="scope">
<span style="color:red;" v-if="scope.row.OrderIntroduction.CommissionState==1">未结算</span>
<span style="color:green;" v-if="scope.row.OrderIntroduction.CommissionState==2">已结算</span>
</template>
<template slot-scope="scope">
<span style="color:red;" v-if="scope.row.OrderIntroduction.CommissionState==1">未结算</span>
<span style="color:green;" v-if="scope.row.OrderIntroduction.CommissionState==2">已结算</span>
</template>
</el-table-column>
<el-table-column label="佣金" width="100">
<template slot-scope="scope">
{{scope.row.OrderIntroduction.Commission}}
</template>
<template slot-scope="scope">
{{scope.row.OrderIntroduction.Commission}}
</template>
</el-table-column>
</el-table>
</div>
......@@ -60,6 +62,7 @@
},
methods: {
//获取数据
getList() {
this.loading = true;
this.apipost("/api/user/GetRecommendOrdersBillDetailList", this.msg, res => {
......@@ -71,6 +74,15 @@
}
})
},
//返回列表
goBackList(){
this.$router.push({
name: 'RecommendBill',
query: {
blank: "y"
}
});
}
},
mounted() {
this.msg.BillId = this.$route.query.BillId;
......
......@@ -3,7 +3,7 @@
<template>
<div class="head-title">
推荐账单
<el-button @click="choiceOrder=true,getUserId()" style="float:right;margin: -5px 0 0 5px;" size="small"
<el-button @click="choiceOrder=true,UserMsg.Name='',getUserId()" style="float:right;margin: -5px 0 0 5px;" size="small"
type="primary">
新增
</el-button>
......@@ -90,7 +90,7 @@
<el-dialog title="新增账单" :visible.sync="choiceOrder" width="1200px" @close='closeDialog'>
<el-form label-width="80px">
<el-form-item label="用户" style="display:inline-block;">
<el-select size="small" v-model="orderMsg.UserId" :filter-method="ChangeListName" filterable
<el-select size="small" v-model="orderMsg.UserId" @change="orderMsg.pageIndex=1,getOrderTable()" :filter-method="ChangeListName" filterable
placeholder="请选择">
<el-option label="不限" :value="0"></el-option>
<el-option v-for="item in searchUserTable" :key="item.Id" :label="item.Name" :value="item.Id">
......@@ -98,7 +98,7 @@
</el-select>
</el-form-item>
<el-form-item label="供应商" style="display:inline-block;">
<el-select class="w150" v-model="orderMsg.SupplierId" size="small" placeholder="请选择">
<el-select class="w150" v-model="orderMsg.SupplierId" @change="orderMsg.pageIndex=1,getOrderTable()" size="small" placeholder="请选择">
<el-option label="不限" :value="0"></el-option>
<el-option v-for="item in options" :key="item.ID" :label="item.Name" :value="item.ID">
</el-option>
......@@ -132,8 +132,8 @@
</div>
</template>
</el-table-column>
<el-table-column prop="Final_Price" label="最终价格" width="80"></el-table-column>
<el-table-column prop="Number" label="数量" width="70"></el-table-column>
<el-table-column prop="Final_Price" label="价格" width="80"></el-table-column>
<el-table-column prop="OrderIntroduction" label="返佣信息" width="100">
<template slot-scope="scope">
<div>姓名:{{scope.row.OrderIntroduction.Name}}</div>
......
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