Merge branch 'score_shop' of http://120.27.238.55:7000/r/beauty-erp into sc...

xiaoyong931011

2021-04-06 162fd6cf9cc47858c29d0b488bd7f018b77a56b4

 zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/order-form.html

@@ -287,22 +287,7 @@
                            <el-input @change="calculationTotal" v-model="scope.row.zkPrice"></el-input>
                        </template>
                    </el-table-column>
                    <el-table-column
                            label="支付方式"
                            width="130">
                        <template slot-scope="scope">
                            <el-select  v-model="scope.row.payMethod"
                                        placeholder="请选择支付方式">
                                <el-option
                                        v-for="item in itemSimplePayMethods"
                                        :key="item.value"
                                        :label="item.label"
                                        :value="item.value"
                                        :disabled="item.disabled">
                                </el-option>
                            </el-select>
                        </template>
                    </el-table-column>

                    <el-table-column
                            label="小计">
                        <template slot-scope="scope">
@@ -431,6 +416,22 @@
                                label="收款">
                        </el-table-column>
                        <el-table-column
                                label="支付方式"
                                width="130">
                            <template slot-scope="scope">
                                <el-select  v-model="scope.row.payMethod"
                                            placeholder="请选择支付方式">
                                    <el-option
                                            v-for="item in itemSimplePayMethods"
                                            :key="item.value"
                                            :label="item.label"
                                            :value="item.value"
                                            :disabled="item.disabled">
                                    </el-option>
                                </el-select>
                            </template>
                        </el-table-column>
                        <el-table-column
                                label="业绩类型" width="150">
                            <template slot-scope="scope">
                                <el-select v-model="scope.row.achieveType" @change="calculationAchieve" placeholder="请选择业绩类型">
@@ -443,6 +444,7 @@
                                </el-select>
                            </template>
                        </el-table-column>

                        <el-table-column
                                label="业绩" >
                            <template slot-scope="scope">
@@ -748,6 +750,7 @@
                                                    commission : 0,
                                                    achieveType : _this.achieveTypeList[0].value,
                                                    isShare: false,
                                                    payMethod:item.payMethod,
                                                });
                                            });
                                            _this.order.payMoney = orderPayMoney;
@@ -852,7 +855,6 @@
                    item.price = goods.sealPice;
                    item.goodsId = goods.id;
                    item.isFree = '否';
                    item.payMethod = '现金';
                    if (type == BUY_TYPE_NOT_FREE) {
                        //购买
                        item.zkPrice = goods.sealPice;
@@ -875,6 +877,7 @@
                            achieveType : _this.achieveTypeList[0].value,
                            commission: 0,
                            isShare: false,
                            payMethod:'现金',
                        });
                    } else {
                        //加入业绩
@@ -886,6 +889,7 @@
                            achieveType : _this.achieveTypeList[0].value,
                            commission: 0,
                            isShare: false,
                            payMethod:'现金',
                        });
                    }
                    this.order.items.push(item);
@@ -924,10 +928,10 @@
                                let count = parseFloat(item.count);
                                let zkPrice = parseFloat(item.zkPrice);

                                if (optionType != 1) {
                                // if (optionType != 1) {
                                    //直接修改支付金额不重置支付金额
                                    item.payMoney = zkPrice * count;
                                }
                                // }
                                _this.order.payMoney += parseFloat(item.payMoney);

                                //重新计算业绩金额
@@ -1027,6 +1031,7 @@
                                    projPercentage: achieve.commission,
                                    achieveType: achieve.achieveType,
                                    goodsCash: achieve.goodsCash,
                                    payMethod: achieve.payMethod,
                                };
                               item.achieveList.push(achieveNew);
                                break;