From 39ae83445d16d37a3c02e0dfdeb1be15eac0e2c2 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Mon, 15 Mar 2021 21:36:12 +0800
Subject: [PATCH] 分销员后台0315

---
 zq-erp/src/main/resources/templates/views/admin/fenxiao/fenxiao-order.html |   97 ++++++++++++++++++++++++++++++++++++------------
 1 files changed, 73 insertions(+), 24 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 4f2f4e6..09b2b96 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
@@ -39,19 +39,19 @@
             <el-col class="line" :span="8" style="text-align: center">
                 <el-card class="box-card" style="background-color: #eee;border-radius: 30px;">
                     <div>待计算金额</div>
-                    <div style="padding: 5px;font-size: 18px;">¥{{basicdetail.balance}}</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;">
                     <div>待结算人数</div>
-                    <div style="padding: 5px;font-size: 18px;">{{basicdetail.waitNum}}人</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;">
                     <div>待结算订单</div>
-                    <div style="padding: 5px;font-size: 18px;">{{basicdetail.waitOrderNum}}笔</div>
+                    <div style="padding: 5px;font-size: 30px;">{{basicdetail.waitOrderNum}}笔</div>
                 </el-card >
             </el-col>
         </el-row>
@@ -63,6 +63,32 @@
                     <el-col :span="6">
                         <el-button type="primary" @click="setOrderDone()">批量结算</el-button>
                     </el-col>
+                    <el-dialog title="本次结算分销订单" :visible.sync="dialogFormVisible">
+                        <el-form :model="formSelect">
+                            <el-form-item label="结算金额:" :label-width="formLabelWidth">
+                                <div style="font-size: 30px;color: red">¥{{formSelect.jsje}}</div>
+                            </el-form-item>
+                            <el-form-item label="结算订单:" :label-width="formLabelWidth">
+                                <div style="font-size: 20px;">{{formSelect.jsdds}}单</div>
+                            </el-form-item>
+                            <el-form-item label="结算人数:" :label-width="formLabelWidth">
+                                <div style="font-size: 20px;">{{formSelect.jsrs}}人</div>
+                            </el-form-item>
+                            <el-form-item label="结算方式:" :label-width="formLabelWidth">
+                                <el-radio-group v-model="formSelect.jsfs">
+                                    <el-radio-button label="1">线下结算</el-radio-button>
+                                    <el-radio-button label="2">微信余额支付</el-radio-button>
+                                </el-radio-group>
+                            </el-form-item>
+                            <el-form-item label="备注:" :label-width="formLabelWidth">
+                                <el-input type="textarea" :rows="3" v-model="formSelect.bz" autocomplete="off"></el-input>
+                            </el-form-item>
+                        </el-form>
+                        <div slot="footer" class="dialog-footer">
+                            <el-button @click="dialogFormVisible = false">取 消</el-button>
+                            <el-button type="primary" @click="updateSetOrderDone()">确 定</el-button>
+                        </div>
+                    </el-dialog>
                     <el-col>
                         <el-form ref="form" :model="form" inline >
                             <el-form-item label="结算状态" prop="orderType">
@@ -271,11 +297,22 @@
             height:'calc(100vh - 240px)',
             //基本数据
             basicdetail:{},
-            //--分销订单
+
+
             //选中操作
             multipleSelection: [],
             orderIds:"",
             orderNums:0,
+            dialogFormVisible: false,
+            formSelect: {
+                jsje: '',
+                jsdds: '',
+                jsrs: '',
+                jsfs: 2,
+                bz: ''
+            },
+            formLabelWidth: '120px',
+            //--分销订单
             // 条件查询结算状态
             orderTypeList:[
                 {value:'',label:'全部'},
@@ -436,35 +473,47 @@
                 //拼接出一个逗号隔开的字符串
                 let submitDate = "";
                 let orderNum = 0;
+                let orderBalance = 0;
+                let name = [];
                 for (let i = 0; i < _this.multipleSelection.length; i++) {
                     let order = _this.multipleSelection[i];
-                    let orderId = order.id;
-                    orderNum = orderNum + 1;
-                    submitDate = submitDate +orderId+",";
+                    //待审核的计算到弹出框
+                    let ordersetType = order.settleType;
+                    if(ordersetType == 1){
+                        let orderId = order.id;
+                        name.push(order.customUserId);
+                        orderNum = orderNum + 1;
+                        orderBalance = orderBalance + order.profitBalance;
+                        submitDate = submitDate +orderId+",";
+                    }
                 }
                 _this.orderIds = submitDate;
                 _this.orderNums = orderNum;
+                _this.formSelect.jsdds = orderNum;
+                _this.formSelect.jsje = orderBalance;
+                _this.formSelect.jsrs = _this.distinctFunction(name).length;
+            },
+            //去重
+            distinctFunction(name){
+                var arr = name,
+                    result = [],
+                    i,
+                    j,
+                    len = arr.length;
+                for(i = 0; i < len; i++){
+                    for(j = i + 1; j < len; j++){
+                        if(arr[i] === arr[j]){
+                            j = ++i;
+                        }
+                    }
+                    result.push(arr[i]);
+                }
+                return result;
             },
             //批量结算
             setOrderDone() {
                 if(this.orderNums > 0){
-                    this.$confirm('是否结算选中的'+this.orderNums+'条数据?', '批量结算', {
-                        distinguishCancelAndClose: true,//设置关闭按钮和不通过按钮的区别
-                        confirmButtonText: '确认',
-                        cancelButtonText: '取消',
-                        type: 'info'
-                    }).then(() => {
-                        //通过
-                        this.updateSetOrderDone();
-                    }).catch(action => {
-                        //不通过
-                        if(action === 'cancel'){
-                            console.log("cancel");
-                        }else{
-                            //关闭按钮
-                            console.log("close");
-                        }
-                    });
+                    this.dialogFormVisible = true;
                 }else{
                     this.$message({
                         message: '至少需要选中一条数据',

--
Gitblit v1.9.1