Merge remote-tracking branch 'origin/score_shop' into score_shop

li-guang

2021-04-07 050ff0dfc04d4ca2a33ac0e97c98f042b9f95df6

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

@@ -314,9 +314,22 @@
                                prop="zkTotal"
                                label="收款">
                        </el-table-column>

                        <el-table-column
                                prop="payMethod"
                                label="支付方式">
                                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
                                prop="t3"
@@ -501,6 +514,13 @@
            isRefund : false,
            isReturnAchieve : false,
            totalRefund : "",
            itemSimplePayMethods:[{
                value: '现金',
                label:'现金',
            },{
                value: '划扣',
                label:'划扣',
            }],
            payMethods: [{
                value: '现金支付',
                img: '/images/pay/cash.png',