CY_ECommercePlatform/CY.WebForm/js/Inquiry/Inquiry.js
@@ -263,7 +263,7 @@
                }
            }
        }
        else if (Nianji == "三年级" || Nianji == "四年级" || Nianji == "五年级" || Nianji == "六年级") {
        else if (Nianji == "三年级" || Nianji == "四年级" || Nianji == "五年级" ) {
            var numnn = $("input[name='yuwencheckboxinput'][value_id='" + (i + 1) + "']").val();
            var yuwenselect = $("select[name='yuwenselect'][value_id='" + (i + 1) + "']").val();
            if (numnn != "") {
@@ -366,6 +366,152 @@
                    shijuanpshu = shijuanpshu + 12;
                }
            }
        }
        else if (Nianji == "六年级") {
            var numnn = $("input[name='yuwencheckboxinput'][value_id='" + (i + 1) + "']").val();
            var yuwenselect = $("select[name='yuwenselect'][value_id='" + (i + 1) + "']").val();
            if (numnn != "") {
                num = num + parseInt(numnn);
                shijuannum = shijuannum + parseInt(numnn);
                if (yuwenselect == "4P") {
                    shijuanpshu = shijuanpshu + 4;
                } else if (yuwenselect == "6P") {
                    shijuanpshu = shijuanpshu + 6;
                } else if (yuwenselect == "8P") {
                    shijuanpshu = shijuanpshu + 8;
                } else if (yuwenselect == "6+4P") {
                    shijuanpshu = shijuanpshu + 10;
                } else if (yuwenselect == "6+6P") {
                    shijuanpshu = shijuanpshu + 12;
                } else if (yuwenselect == "8+4P") {
                    shijuanpshu = shijuanpshu + 12;
                }
            }
            var numnnshuxue = $("input[name='shuxuecheckboxinput'][value_id='" + (i + 1) + "']").val();
            var shuxueselect = $("select[name='shuxueselect'][value_id='" + (i + 1) + "']").val();
            if (numnnshuxue != "") {
                num = num + parseInt(numnnshuxue);
                shijuannum = shijuannum + parseInt(numnnshuxue);
                if (shuxueselect == "4P") {
                    shijuanpshu = shijuanpshu + 4;
                } else if (shuxueselect == "6P") {
                    shijuanpshu = shijuanpshu + 6;
                } else if (shuxueselect == "8P") {
                    shijuanpshu = shijuanpshu + 8;
                } else if (shuxueselect == "6+4P") {
                    shijuanpshu = shijuanpshu + 10;
                } else if (shuxueselect == "6+6P") {
                    shijuanpshu = shijuanpshu + 12;
                } else if (shuxueselect == "8+4P") {
                    shijuanpshu = shijuanpshu + 12;
                }
            }
            var numnnyingyu = $("input[name='yingyucheckboxinput'][value_id='" + (i + 1) + "']").val();
            var yingyuselect = $("select[name='yingyuselect'][value_id='" + (i + 1) + "']").val();
            if (numnnyingyu != "") {
                num = num + parseInt(numnnyingyu);
                shijuannum = shijuannum + parseInt(numnnyingyu);
                if (yingyuselect == "4P") {
                    shijuanpshu = shijuanpshu + 4;
                } else if (yingyuselect == "6P") {
                    shijuanpshu = shijuanpshu + 6;
                } else if (yingyuselect == "8P") {
                    shijuanpshu = shijuanpshu + 8;
                } else if (yingyuselect == "6+4P") {
                    shijuanpshu = shijuanpshu + 10;
                } else if (yingyuselect == "6+6P") {
                    shijuanpshu = shijuanpshu + 12;
                } else if (yingyuselect == "8+4P") {
                    shijuanpshu = shijuanpshu + 12;
                }
            }
            var numnnpingde = $("input[name='pingdecheckboxinput'][value_id='" + (i + 1) + "']").val();
            var pingdeselect = $("select[name='pingdeselect'][value_id='" + (i + 1) + "']").val();
            if (numnnpingde != "") {
                num = num + parseInt(numnnpingde);
                shijuannum = shijuannum + parseInt(numnnyingyu);
                if (pingdeselect == "4P") {
                    shijuanpshu = shijuanpshu + 4;
                } else if (pingdeselect == "6P") {
                    shijuanpshu = shijuanpshu + 6;
                } else if (pingdeselect == "8P") {
                    shijuanpshu = shijuanpshu + 8;
                } else if (pingdeselect == "6+4P") {
                    shijuanpshu = shijuanpshu + 10;
                } else if (pingdeselect == "6+6P") {
                    shijuanpshu = shijuanpshu + 12;
                } else if (pingdeselect == "8+4P") {
                    shijuanpshu = shijuanpshu + 12;
                }
            }
            var numnnkexue = $("input[name='kexuecheckboxinput'][value_id='" + (i + 1) + "']").val();
            var kexueselect = $("select[name='kexueselect'][value_id='" + (i + 1) + "']").val();
            if (numnnkexue != "") {
                num = num + parseInt(numnnkexue);
                shijuannum = shijuannum + parseInt(numnnkexue);
                if (kexueselect == "4P") {
                    shijuanpshu = shijuanpshu + 4;
                } else if (kexueselect == "6P") {
                    shijuanpshu = shijuanpshu + 6;
                } else if (kexueselect == "8P") {
                    shijuanpshu = shijuanpshu + 8;
                } else if (kexueselect == "6+4P") {
                    shijuanpshu = shijuanpshu + 10;
                } else if (kexueselect == "6+6P") {
                    shijuanpshu = shijuanpshu + 12;
                } else if (kexueselect == "8+4P") {
                    shijuanpshu = shijuanpshu + 12;
                }
            }
            var numnnyuwendatika = $("input[name='yuwendatikacheckboxinput'][value_id='" + (i + 1) + "']").val();
            if (numnnyuwendatika != "") {
                num = num + parseInt(numnnyuwendatika);
                datikanum = datikanum + parseInt(numnnyuwendatika);
                datikakshu = datikakshu + 1;
            }
            var numnnshuxuedatika = $("input[name='shuxuedatikacheckboxinput'][value_id='" + (i + 1) + "']").val();
            if (numnnshuxuedatika != "") {
                num = num + parseInt(numnnshuxuedatika);
                datikanum = datikanum + parseInt(numnnshuxuedatika);
                datikakshu = datikakshu + 1;
            }
            var numnnyingyudatika = $("input[name='yingyudatikacheckboxinput'][value_id='" + (i + 1) + "']").val();
            if (numnnyingyudatika != "") {
                num = num + parseInt(numnnyingyudatika);
                datikanum = datikanum + parseInt(numnnyingyudatika);
                datikakshu = datikakshu + 1;
            }
            var numnnkexuedatika = $("input[name='kexuedatikacheckboxinput'][value_id='" + (i + 1) + "']").val();
            if (numnnkexuedatika != "") {
                num = num + parseInt(numnnkexuedatika);
                datikanum = datikanum + parseInt(numnnkexuedatika);
                datikakshu = datikakshu + 1;
            }
            var numnnpingdedatika = $("input[name='pingdedatikacheckboxinput'][value_id='" + (i + 1) + "']").val();
            if (numnnpingdedatika != "") {
                num = num + parseInt(numnnpingdedatika);
                datikanum = datikanum + parseInt(numnnpingdedatika);
            }
        }
        else if (Nianji == "七年级") {
            var numnn = $("input[name='yuwencheckboxinput'][value_id='" + (i + 1) + "']").val();
@@ -2604,6 +2750,7 @@
        }
    }
    else {
        $(".Brand" + index).hide();
        if (paperId == "0") {
            $(".Brand" + index).hide();
            $(".gramWeight" + index).hide();
@@ -2614,7 +2761,7 @@
            $(".Qitazhi" + index).show();
        }
        else {
            $(".Brand" + index).show();
            //$(".Brand" + index).show();
            $(".gramWeight" + index).show();
            $(".Qitazhi" + index).hide();
            if (printTypeId == 27) {
@@ -3104,7 +3251,10 @@
        }
    }
    //报纸
    if (printTypeId == 7) {
        $("[name='printColor1']").val(dataJson.printColor1);
    }
    //作业本
    if (printTypeId == 37) {
        var insideArry = dataJson.InquiryWorkBookList;