From 69d8c54fe4d0c90de196f3d92f74933d06529902 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Mon, 11 Jan 2021 18:36:37 +0800
Subject: [PATCH] modify

---
 zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/order-form.html |   43 +++++++++++++++++++++++++++++++++++++++----
 1 files changed, 39 insertions(+), 4 deletions(-)

diff --git a/zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/order-form.html b/zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/order-form.html
index 351359d..a87b6c8 100644
--- a/zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/order-form.html
+++ b/zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/order-form.html
@@ -414,14 +414,34 @@
                                 prop="orderItem.payMoney"
                                 label="收款">
                         </el-table-column>
+
                         <el-table-column
-                                label="业绩">
+                                label="业绩类型" width="150">
+                            <template slot-scope="scope">
+                                <el-select v-model="scope.row.t3" placeholder="请选择业绩类型">
+                                    <el-option
+                                            v-for="item in achieveTypeList"
+                                            :key="item.key"
+                                            :label="item.value"
+                                            :value="item.key">
+                                    </el-option>
+                                </el-select>
+                            </template>
+                        </el-table-column>
+                        <el-table-column
+                                label="业绩" width="100">
                             <template slot-scope="scope">
                                 <el-input v-model="scope.row.achieveMoney"></el-input>
                             </template>
                         </el-table-column>
                         <el-table-column
-                                label="员工">
+                                label="提成">
+                            <template slot-scope="scope">
+                                <el-input v-model="scope.row.commission"></el-input>
+                            </template>
+                        </el-table-column>
+                        <el-table-column
+                                label="员工" width="130">
                             <template slot-scope="scope">
                                 <el-select v-model="scope.row.saleId" placeholder="请选择员工">
                                     <el-option
@@ -434,7 +454,7 @@
                             </template>
                         </el-table-column>
                         <el-table-column
-                                width="200"
+                                width="150"
                                 label="操作">
                             <template slot-scope="scope">
                                 <el-button type="primary" v-if="scope.row.isShare"
@@ -583,6 +603,15 @@
                 type: '欠款'
             },],
             achieveList: [],
+            achieveTypeList : [
+                {
+                    "key" : "现金业绩",
+                    "value" : "现金业绩"
+                },{
+                    "key" : "划扣业绩",
+                    "value" : "划扣业绩"
+                },
+            ],
             //会员可用的充值卡
             moneyCards: [],
             //门店信息
@@ -652,6 +681,8 @@
                                         staff: _this.loginUser,
                                         saleId: _this.loginUser.suId,
                                         achieveMoney: item.payMoney,
+                                        commission : 0,
+                                        t3 : '现金业绩',
                                         isShare: false,
                                     });
                                 });
@@ -790,6 +821,8 @@
                         staff: this.loginUser,
                         saleId: this.loginUser.suId,
                         achieveMoney: item.payMoney,
+                        t3 : '现金业绩',
+                        commission : 0,
                         isShare: false,
                     });
                     this.order.items.push(item);
@@ -912,7 +945,9 @@
                             if (item.uuid == achieve.orderItem.uuid) {
                                 let achieveNew = {
                                     beaultId: achieve.saleId,
-                                    t1: achieve.achieveMoney
+                                    t1: achieve.achieveMoney,
+                                    t3: achieve.t3,
+                                    projPercentage: achieve.commission,
                                 };
                                 item.achaeveList.push(achieveNew);
                                 break;

--
Gitblit v1.9.1