Merge remote-tracking branch 'origin/master'

luodangjia

2024-05-24 503bc89c55d675a27b689419aa906a070ca5cb03

 ManagementNTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tCompany/tCompany_edit.html

@@ -223,6 +223,46 @@
                                        包车
                                    </label>
                                </div>
                                <div class="checkbox checkbox-success">
                                    <input name="checkbox" id="checkbox7" type="checkbox" value="7" ${1 == item.isTransfer ? 'checked=checked' : ''} onclick="TCompanyInfoDlg.checkbox7()">
                                    <label for="checkbox7">
                                        接送机
                                    </label>
                                    <fieldset>
                                        <div class="row" style="display: none;" id="jsjDiv">
                                            <div class="col-sm-6">
                                                <div class="checkbox checkbox-circle">
                                                    <input type="radio" name="jsj" id="jsj1" value="1" ${1 == item.isTransferFixedOrProportional ? 'checked=checked' : ''}>
                                                    <label for="jsj1">
                                                        <div style="position: relative;top: -8px;">
                                                            <span>按比例抽成,每笔订单抽取</span>
                                                            <input style="width: 50%;display: inline-block;" type="text" class="form-control" id="jsjPercent" name="jsjPercent"
                                                                   @if(1 == item.isTransferFixedOrProportional){
                                                                   value="${item.transferMoney}"
                                                                   @}
                                                            >
                                                            <span>%</span>
                                                        </div>
                                                    </label>
                                                </div>
                                                <div class="checkbox checkbox-circle">
                                                    <input type="radio" name="jsj" id="jsj2" value="2" ${2 == item.isTransferFixedOrProportional ? 'checked=checked' : ''}>
                                                    <label for="jsj2">
                                                        <div style="position: relative;top: -8px;">
                                                            <span>按固定金额抽成,每笔订单抽取</span>
                                                            <input style="width: 50%;display: inline-block;" type="text" class="form-control" id="jsjMoney" name="jsjMoney"
                                                                   @if(2 == item.isTransferFixedOrProportional){
                                                                   value="${item.transferMoney}"
                                                                   @}
                                                            >
                                                            <span>元</span>
                                                        </div>
                                                    </label>
                                                </div>
                                            </div>
                                        </div>
                                    </fieldset>
                                </div>
                            </fieldset>
                        </div>
                    </div>
@@ -354,14 +394,19 @@
        TCompanyInfoDlg.checkbox4();
        TCompanyInfoDlg.checkbox5();
        TCompanyInfoDlg.checkbox6();
        TCompanyInfoDlg.checkbox7();

        var zc = $("input[name='zc']:checked").val();
        var jsj = $("input[name='jsj']:checked").val();
        var cz = $("input[name='cz']:checked").val();
        var tcx = $("input[name='tcx']:checked").val();
        var kcx = $("input[name='kcx']:checked").val();
        if (zc == "" || zc == null || zc == undefined){
            $("#zc1").attr("checked","checked")
        }
        if (jsj == "" || jsj == null || jsj == undefined){
            $("#jsj1").attr("checked","checked")
        }
        if (cz == "" || cz == null || cz == undefined){
            $("#cz1").attr("checked","checked")
        }