From 482847fc97748b67fd8ab93b5b589ab3824f6d02 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Wed, 07 Apr 2021 10:28:56 +0800
Subject: [PATCH] 20210407 签到
---
zq-erp/src/main/resources/templates/views/admin/fenxiao/fenxiao-order.html | 84 ++++++++++++++++++++++++++---------------
1 files changed, 53 insertions(+), 31 deletions(-)
diff --git a/zq-erp/src/main/resources/templates/views/admin/fenxiao/fenxiao-order.html b/zq-erp/src/main/resources/templates/views/admin/fenxiao/fenxiao-order.html
index e51082a..d3566c6 100644
--- a/zq-erp/src/main/resources/templates/views/admin/fenxiao/fenxiao-order.html
+++ b/zq-erp/src/main/resources/templates/views/admin/fenxiao/fenxiao-order.html
@@ -23,39 +23,48 @@
<script type="text/javascript" charset="utf-8"
th:src="@{/plugin/beditor/lang/zh-cn/zh-cn.js}"></script>
<style>
+ .panel-body{
+ overflow: hidden;
+ }
.paginationStyle{
background: #ffffff;
padding: 10px 10px;
margin: 0px 0px 10px 0px;
text-align: right;
}
+
+ .box-card {
+ width: 240px;
+ border-radius: 5px;
+ color: #ffffff;
+ padding: 2px 0px;
+ margin-right: 20px;
+ cursor: pointer;
+ float: left;
+ text-align: center;
+ }
+ .el-card__body {
+ padding: 0px;
+ }
</style>
</head>
<body>
-<div class="ibox-content" id="app" v-cloak>
- <el-row style="padding: 10px;">
- <el-row :gutter="100">
- <el-col class="line" :span="8" style="text-align: center">
- <el-card class="box-card" style="background-color: #eee;border-radius: 30px;">
+<div class="panel-body" id="app" v-cloak>
+ <el-row>
+ <el-card class="box-card" style="background-color: #0f9aef;">
+ <div style="padding:10px;font-size: 20px;">￥{{basicdetail.balance}}</div>
<div>待计算金额</div>
- <div style="padding: 5px;font-size: 30px;">￥{{basicdetail.balance}}</div>
</el-card >
- </el-col>
- <el-col class="line" :span="8" style="text-align: center">
- <el-card class="box-card" style="background-color: #eee;border-radius: 30px;">
+ <el-card class="box-card" style="background: #67C23A;">
+ <div style="padding:10px;font-size: 20px;">{{basicdetail.waitNum}}人</div>
<div>待结算人数</div>
- <div style="padding: 5px;font-size: 30px;">{{basicdetail.waitNum}}人</div>
</el-card >
- </el-col>
- <el-col class="line" :span="8" style="text-align: center">
- <el-card class="box-card" style="background-color: #eee;border-radius: 30px;">
+ <el-card class="box-card" style="background: rgb(121, 187, 255);">
+ <div style="padding:10px;font-size: 20px;">{{basicdetail.waitOrderNum}}笔</div>
<div>待结算订单</div>
- <div style="padding: 5px;font-size: 30px;">{{basicdetail.waitOrderNum}}笔</div>
</el-card >
- </el-col>
</el-row>
- </el-row>
<el-row>
<el-tabs v-model="activeName" >
<el-tab-pane label="分销订单" name="first">
@@ -155,7 +164,8 @@
</el-table-column>
<el-table-column
prop="orderNo"
- label="订单编号">
+ label="订单编号"
+ show-overflow-tooltip>
</el-table-column>
<el-table-column
prop="actualBalance"
@@ -177,15 +187,18 @@
</el-table-column>
<el-table-column
prop="address"
- label="下单门店">
+ label="下单门店"
+ show-overflow-tooltip>
</el-table-column>
<el-table-column
prop="custom"
- label="客户">
+ label="客户"
+ show-overflow-tooltip>
</el-table-column>
<el-table-column
prop="parentSale"
- label="推广员">
+ label="推广员"
+ show-overflow-tooltip>
</el-table-column>
<el-table-column
label="收益类型">
@@ -208,15 +221,19 @@
</el-table-column>
<el-table-column
prop="settleNo"
- label="结算编号" width="150">
+ label="结算编号"
+ show-overflow-tooltip
+ width="150">
</el-table-column>
<el-table-column
prop="settleTime"
- label="结算时间">
+ label="结算时间"
+ show-overflow-tooltip>
</el-table-column>
<el-table-column
prop="settler"
- label="结算人">
+ label="结算人"
+ show-overflow-tooltip>
</el-table-column>
<el-table-column label="操作">
</el-table-column>
@@ -262,7 +279,8 @@
<el-table :data="orderLevelList.rows" :height="height" stripe:true @sort-change="sortChange">
<el-table-column
prop="orderNo"
- label="结算编号">
+ label="结算编号"
+ show-overflow-tooltip>
</el-table-column>
<el-table-column
prop="actualBalance"
@@ -278,11 +296,13 @@
</el-table-column>
<el-table-column
prop="setTime"
- label="结算时间">
+ label="结算时间"
+ show-overflow-tooltip>
</el-table-column>
<el-table-column
prop="setMan"
- label="结算人">
+ label="结算人"
+ show-overflow-tooltip>
</el-table-column>
<el-table-column
label="结算方式">
@@ -293,7 +313,8 @@
</el-table-column>
<el-table-column
prop="remark"
- label="备注">
+ label="备注"
+ show-overflow-tooltip>
</el-table-column>
</el-table>
</el-row>
@@ -332,7 +353,7 @@
el: '#app',
data: {
activeName: 'first',
- height:'calc(100vh - 240px)',
+ height:'calc(100vh - 340px)',
//--基本数据
basicdetail:{},
//--时间选择
@@ -374,7 +395,7 @@
jsje: '',
jsdds: '',
jsrs: '',
- jsfs: 1,
+ jsfs: 2,
bz: ''
},
formLabelWidth: '120px',
@@ -588,7 +609,8 @@
let order = _this.multipleSelection[i];
//待审核的计算到弹出框
let orderState = order.orderState;
- if(orderState == 4 || orderState == 5){
+ let settleType = order.settleType;
+ if((orderState == 4 || orderState == 5) && settleType == 1){
let orderId = order.id;
name.push(order.customUserId);
orderNum = orderNum + 1;
@@ -626,7 +648,7 @@
setOrderDone() {
if(this.orderNumsDones > 0){
this.$message({
- message: '订单状态【待评价】和【已评价】才允许结算',
+ message: '【待评价】和【已评价】状态下的【待结算】订单,才允许结算',
type: 'warning'
});
}else if(this.orderNums > 0){
--
Gitblit v1.9.1