服务商修改

src/main/resources/templates/supplier-center/order/detail.html

@@ -41,7 +41,7 @@
                     <div class="product-info">
                         <div class="price">
                             <p class="protitle">商品金额：<span class="red">￥{{order.productAmount | amountfilters}}</span></p>
-                            <p class="price-right">结算商品金额：<span class="red">￥{{order.shopProductAmount | amountfilters}}</span></p>
+<!--                            <p class="price-right">结算商品金额：<span class="red">￥{{order.shopProductAmount | amountfilters}}</span></p>-->
                         </div>
                         <div class="product" >
                             <ul class="product-title">
@@ -80,7 +80,7 @@
                                 </div>
                                 <div class="order-item">
                                     <p>商品金额：<span class="red">￥{{ order.productAmount | amountfilters }}</span> </p>
-                                    <p>结算商品金额：<span class="red">￥{{ order.shopProductAmount | amountfilters }}</span> </p>
+<!--                                    <p>结算商品金额：<span class="red">￥{{ order.shopProductAmount | amountfilters }}</span> </p>-->
                                     <!--                            <p>结算税费：<span class="red">￥{{ order.shopTaxFee | amountfilters }}</span> </p>-->
                                     <p  v-if="order.status !== 0">
                                         订单来源：
@@ -94,8 +94,8 @@
                                     <p v-if="order.presentNum > 0">赠品数：<span class="red">{{order.presentNum }}</span> </p>
                                 </div>
                                 <div class="order-item">
-                                    <p>总结算金额：<span class="red">￥{{ order.shouldPayShopAmount | amountfilters }}</span> </p>
-                                    <p>已结算金额：<span class="red">￥{{ order.payedShopAmount | amountfilters }}</span> </p>
+<!--                                    <p>总结算金额：<span class="red">￥{{ order.shouldPayShopAmount | amountfilters }}</span> </p>-->
+<!--                                    <p>已结算金额：<span class="red">￥{{ order.payedShopAmount | amountfilters }}</span> </p>-->
                                 </div>
                             </div>
                             <div class="order-info">

src/main/resources/templates/supplier-center/order/list.html

@@ -134,7 +134,7 @@
                                 </div>
                                 <div class="order-item">
                                     <p>商品金额：<span class="red">￥{{order.productAmount| amountfilters}}</span> </p>
-                                    <p>结算商品金额：<span class="red">￥{{order.shopProductAmount | amountfilters}}</span> </p>
+<!--                                    <p>结算商品金额：<span class="red">￥{{order.shopProductAmount | amountfilters}}</span> </p>-->
                                     <!--                             <p>结算税费：<span class="red">￥{{order.shopTaxFee| amountfilters}}</span> </p>-->
                                     <p  v-if="order.status !== 0">
                                         订单来源：
@@ -148,8 +148,8 @@
                                     <p v-if="order.presentNum > 0">赠品数：<span class="red">{{order.presentNum }}</span> </p>
                                 </div>
                                 <div class="order-item">
-                                    <p>总结算金额：<span class="red">￥{{order.shouldPayShopAmount| amountfilters}}</span> </p>
-                                    <p>已结算金额：<span class="red">￥{{order.payedShopAmount| amountfilters}}</span> </p>
+<!--                                    <p>总结算金额：<span class="red">￥{{order.shouldPayShopAmount| amountfilters}}</span> </p>-->
+<!--                                    <p>已结算金额：<span class="red">￥{{order.payedShopAmount| amountfilters}}</span> </p>-->
                                 </div>
                                 <div class="order-product" v-for="proitem in order.orderProductList">
                                     <div class="product-img">

src/main/resources/templates/supplier-center/order/settlement.html

@@ -40,11 +40,11 @@
                             ></el-input>
                         </div>
                         <div class='form-row low'>
-                            <span v-if="isPC">买家名称：</span>
+                            <span v-if="isPC">机构名称：</span>
                             <el-input
                                     v-model="listQuery.name"
                                     class="state"
-                                    placeholder="请输入买家名称"
+                                    placeholder="请输入机构名称"
                                     clearable
                                     @keyup.enter.native="getList"
                                     @clear="getList"
@@ -114,63 +114,78 @@
                                     {{ row.orderTime}}
                                 </template>
                             </el-table-column>
-                            <el-table-column label="买家" align="center" prop="name" width="200">
+                            <el-table-column label="机构名称" align="center" prop="clubName" width="200">
                                 <template slot-scope="{row}">
-                                    {{ row.name}}
+                                    {{ row.clubName}}
                                 </template>
                             </el-table-column>
-                            <el-table-column label="商品信息" align="center" prop="status" width="250">
+                            <el-table-column label="销售名称" align="center" prop="spName" width="200">
                                 <template slot-scope="{row}">
-                                    <p v-for="item in row.orderProductList">{{ item.name }}</p>
+                                    {{ row.spName ? row.spName : '无' }}
                                 </template>
                             </el-table-column>
-                            <el-table-column label="订单金额" align="center" prop="payTotalFee" width="120">
+                            <el-table-column label="服务商名称" align="center" prop="cpName" width="200">
                                 <template slot-scope="{row}">
-                                    ¥{{ row.totalAmount | NumFormat }}
+                                    {{ row.cpName ? row.cpName : '无' }}
                                 </template>
                             </el-table-column>
-                            <el-table-column label="退款状态" align="center" prop="refundType" width="120">
+                            <el-table-column label="供应商结算金额" align="center" prop="shopSettleAmount" width="120">
                                 <template slot-scope="{row}">
-                                    <el-tag v-if="row.refundStatus*1===1" type="info" size="small">无退款</el-tag>
-                                    <el-tag v-else-if="row.refundStatus*1===2" type="warning" size="small">部分退款</el-tag>
-                                    <el-tag v-else-if="row.refundStatus*1===3" type="success" size="small">已退款</el-tag>
+                                    ¥{{ row.shopSettleAmount  | NumFormat }}
                                 </template>
                             </el-table-column>
-                            <el-table-column label="退款金额" align="center" prop="payTotalFee" width="120">
+                            <el-table-column label="采美结算金额" align="center" prop="cmSettleAmount" width="120">
                                 <template slot-scope="{row}">
-                                    ¥{{ row.refundAmount | NumFormat }}
+                                    ¥{{ row.cmSettleAmount  | NumFormat }}
                                 </template>
                             </el-table-column>
-                            <el-table-column label="收款手续费" align="center" prop="payTotalFee" width="120">
+                            <el-table-column label="服务商结算金额" align="center" prop="otherSettleAmount" width="120">
                                 <template slot-scope="{row}">
-                                    ¥{{ row.paymentCommission | NumFormat }}
+                                    ¥{{ row.otherSettleAmount  | NumFormat }}
                                 </template>
                             </el-table-column>
-                            <el-table-column label="结算手续费" align="center" prop="payTotalFee" width="120">
+                            <el-table-column label="商品信息" align="center" prop="status" width="250">
                                 <template slot-scope="{row}">
-                                    ¥{{ row.prorateCommission | NumFormat }}
+                                    <p v-for="item in row.orderProductList">{{ item.name }}</p>
                                 </template>
                             </el-table-column>
-                            <el-table-column label="结算状态" align="center" prop="receiptStatus" width="120">
+                            <el-table-column label="商品总数量" align="center" prop="spName" width="80">
                                 <template slot-scope="{row}">
-                                    <el-tag v-if="row.settlestatus*1===1" type="danger" size="small">待结算</el-tag>
-                                    <el-tag v-if="row.settlestatus*1===2" type="warning" size="small">部分结算</el-tag>
-                                    <el-tag v-if="row.settlestatus*1===3" type="success" size="small">已结算</el-tag>
+                                    {{ row.productNum }}
                                 </template>
                             </el-table-column>
-                            <el-table-column label="总结算金额" align="center" prop="payTotalFee" width="120">
+                            <el-table-column label="订单金额" align="center" prop="payTotalFee" width="120">
                                 <template slot-scope="{row}">
-                                    ¥{{ row.shouldPayShopAmount | NumFormat }}
+                                    ¥{{ row.totalAmount | NumFormat }}
                                 </template>
                             </el-table-column>
-                            <el-table-column label="已结算金额" align="center" prop="payTotalFee" width="120">
+                            <el-table-column label="支付手续费" align="center" prop="payTotalFee" width="120">
                                 <template slot-scope="{row}">
-                                    ¥{{ row.settleAmount  | NumFormat }}
+                                    ¥{{ row.paymentCommission | NumFormat }}
                                 </template>
                             </el-table-column>
-                            <el-table-column label="未结算金额" align="center" prop="payTotalFee" width="120">
+                            <el-table-column label="分账手续费" align="center" prop="payTotalFee" width="120">
                                 <template slot-scope="{row}">
-                                    ¥{{ (row.shouldPayShopAmount - row.settleAmount) | NumFormat }}
+                                    ¥{{ row.prorateCommission | NumFormat }}
+                                </template>
+                            </el-table-column>
+                            <el-table-column label="结算状态" align="center" prop="settleStatus" width="120">
+                                <template slot-scope="{row}">
+                                    <el-tag v-if="row.settleStatus*1===1" type="danger" size="small">待结算</el-tag>
+                                    <el-tag v-if="row.settleStatus*1===2" type="warning" size="small">部分结算</el-tag>
+                                    <el-tag v-if="row.settleStatus*1===3" type="success" size="small">已结算</el-tag>
+                                </template>
+                            </el-table-column>
+                            <el-table-column label="退款状态" align="center" prop="refundStatus" width="120">
+                                <template slot-scope="{row}">
+                                    <el-tag v-if="row.refundStatus*1===1" type="info" size="small">无退款</el-tag>
+                                    <el-tag v-else-if="row.refundStatus*1===2" type="warning" size="small">部分退款</el-tag>
+                                    <el-tag v-else-if="row.refundStatus*1===3" type="success" size="small">已退款</el-tag>
+                                </template>
+                            </el-table-column>
+                            <el-table-column label="退款金额" align="center" prop="payTotalFee" width="120">
+                                <template slot-scope="{row}">
+                                    ¥{{ row.refundAmount | NumFormat }}
                                 </template>
                             </el-table-column>
                         </el-table>