username@email.com
2022-11-10 b453cf9981a555261a589862f19ce26be18aee22
提交
3个文件已修改
1个文件已添加
245 ■■■■■ 已修改文件
zhengcaioa/zhengcaioa/Controllers/BusinessOrder/OrderBanciOrderController.cs 64 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
zhengcaioa/zhengcaioa/Views/CooperatecustomCustomer/Edit.cshtml 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
zhengcaioa/zhengcaioa/Views/FiOrderrecievemoney/Edit.cshtml 14 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
zhengcaioa/zhengcaioa/Views/OrderBanciOrder/IndexGuwen.cshtml 165 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
zhengcaioa/zhengcaioa/Controllers/BusinessOrder/OrderBanciOrderController.cs
@@ -179,7 +179,7 @@
            var pageEntities2 = pageEntities.Where(x => x.PageMethod == "02").ToList();
            ViewData["ActionInfo2"] = pageEntities2;
            ViewBag.kechengleixing = _liaotianService.GetSYScode("order_banci_order", "kechengleixing_id").Where(x => x.CodeSn != "3").Select(x => new { code = x.CodeSn, label = x.Comments }).ToList();
            ViewBag.kechengleixing = _liaotianService.GetSYScode("order_banci_order", "kechengleixing_id").Where(x => x.CodeSn != "3" && x.CodeSn != "7").Select(x => new { code = x.CodeSn, label = x.Comments }).ToList();
            ViewBag.Baomingtimebegin = DateTime.Now.AddYears(-1).ToString("yyyy-MM-dd");
            ViewBag.Baomingtimeend = DateTime.Now.ToString("yyyy-MM-dd");
@@ -188,6 +188,68 @@
        }
        [CheckLogin]
        public IActionResult IndexGuwen()
        {
            var curentuser = JsonConvert.DeserializeObject<PltUser>(HttpContext.Session.GetString("User"));
            ViewData["curentuser"] = curentuser;
            List<ActionEntity> actionlist = new List<ActionEntity>();
            ActionEntity actionEntity = new ActionEntity();
            actionEntity.OpenType = 0;
            actionEntity.ActionUrl = "";
            actionEntity.ActionFun = "Search";
            actionEntity.PageIco = "fa fa-search";
            actionEntity.ActionName = "查询";
            actionlist.Add(actionEntity);
            //ActionEntity actionEntity1 = new ActionEntity();
            //actionEntity1.OpenType = 0;
            //actionEntity1.ActionUrl = "";
            //actionEntity1.ActionFun = "Add";
            //actionEntity1.PageIco = "fa fa-plus";
            //actionEntity1.ActionName = "新增";
            //actionlist.Add(actionEntity1);
            //ActionEntity actionEntity3 = new ActionEntity();
            //actionEntity3.OpenType = 0;
            //actionEntity3.ActionUrl = "";
            //actionEntity3.ActionFun = "Print";
            //actionEntity3.PageIco = "fa fa-print";
            //actionEntity3.ActionName = "打印";
            //actionlist.Add(actionEntity3);
            //ActionEntity actionEntity4 = new ActionEntity();
            //actionEntity4.OpenType = 0;
            //actionEntity4.ActionUrl = "";
            //actionEntity4.ActionFun = "Duanxin";
            //actionEntity4.PageIco = "";
            //actionEntity4.ActionName = "发送短信";
            //actionlist.Add(actionEntity4);
            var pageEntities = _pltPageService.GetUserPage(curentuser.Id, "/OrderBanciOrder/IndexGuwen/");
            var pageEntities1 = pageEntities.Where(x => x.PageMethod == "01").ToList();
            foreach (var pageEntity in pageEntities1)
            {
                ActionEntity actionEntity1 = new ActionEntity();
                actionEntity1.OpenType = pageEntity.OpenType;
                actionEntity1.ActionUrl = "";
                actionEntity1.ActionFun = pageEntity.PageShortcut;
                actionEntity1.PageIco = pageEntity.PageIco;
                actionEntity1.ActionName = pageEntity.PageName;
                actionlist.Add(actionEntity1);
            }
            ViewData["ActionInfo"] = actionlist;
            ViewBag.kechengleixing = _liaotianService.GetSYScode("order_banci_order", "kechengleixing_id").Where(x => x.CodeSn == "7").Select(x => new { code = x.CodeSn, label = x.Comments }).ToList();
            ViewBag.Baomingtimebegin = DateTime.Now.AddYears(-1).ToString("yyyy-MM-dd");
            ViewBag.Baomingtimeend = DateTime.Now.ToString("yyyy-MM-dd");
            return View();
        }
        [CheckLogin]
        public IActionResult Printhetong(string id = null)
        {
zhengcaioa/zhengcaioa/Views/CooperatecustomCustomer/Edit.cshtml
@@ -361,7 +361,7 @@
                                    <label grouptype="Vdata" class="text-right col-sm-1 col-md-1 control-label">授信额度</label>
                                    <div class="col-sm-2 col-md-2" grouptype="Vdata">
                                        <input class="form-control" label="客户名称"  readonly="readonly" name="Shouxinedu" id="Shouxinedu" labtype="txt" addvisible="true" editvisible="true" reg="" ismust="true" type="number" value="@(Model.Shouxinedu.HasValue?Model.Shouxinedu.Value.ToString("f2"):"")" oninput="if(value.length>8)value=value.slice(0,18)" onkeyup="value=value.toString().match(/^\d+(?:\.\d{0,2})?/)">
                                        <input class="form-control" label="客户名称"   name="Shouxinedu" id="Shouxinedu" labtype="txt" addvisible="true" editvisible="true" reg="" ismust="true" type="number" value="@(Model.Shouxinedu.HasValue?Model.Shouxinedu.Value.ToString("f2"):"")" oninput="if(value.length>8)value=value.slice(0,18)" onkeyup="value=value.toString().match(/^\d+(?:\.\d{0,2})?/)">
                                    </div>
zhengcaioa/zhengcaioa/Views/FiOrderrecievemoney/Edit.cshtml
@@ -173,8 +173,8 @@
                                <div class="clearfix layer-area" style="padding-bottom:15px;" id="AccountSubject">
                                    <label grouptype="Vdata" class="text-right col-sm-1 col-md-1 control-label">账户名称<i class="red">*</i></label>
                                    <div class="col-sm-2 col-md-2" grouptype="Vdata">
                                    <label grouptype="Vdata" class="text-right col-sm-1 col-md-1 control-label"  id="AccountSubject1" >账户名称<i class="red">*</i></label>
                                    <div class="col-sm-2 col-md-2" grouptype="Vdata"  id="AccountSubject2" >
                                        <select id="AccountId" class="form-control" name="AccountId" data-placeholder="选择 序列 ...">
                                            <option value="" hassubinfo="true">请选择</option>
@@ -357,6 +357,14 @@
            } else {
                $("#AccountSubject").show();
            }
            if (PayType == "04" || PayType == "05") {
                $("#AccountSubject1").hide();
                $("#AccountSubject2").hide();
            } else {
                $("#AccountSubject1").show();
                $("#AccountSubject2").show();
            }
            $.ajax({
                type: "GET",
                url: "/FiAccountIncome/getAccount?Accounttype=" + PayType,
@@ -372,7 +380,7 @@
                    if (data.length > 0) {
                        for (var i = 0; i < data.length; i++) {
                            var o = '<option value="' + data[i].Id + '" hassubinfo="true">' + data[i].Accountname + '</option>';
                            var o = '<option value="' + data[i].Id + '" hassubinfo="true" selected="selected" >' + data[i].Accountname + '</option>';
                            city.append(o);
                        }
                    }
zhengcaioa/zhengcaioa/Views/OrderBanciOrder/IndexGuwen.cshtml
New file
@@ -0,0 +1,165 @@
@{
    ViewBag.Title = "OrderBanciOrder";
    Layout = "~/Views/Shared/_Layout_Search.cshtml";
}
@section headerStyle{
    <script type="text/javascript">
        var kechengleixing = '@Html.Raw(Newtonsoft.Json.JsonConvert.SerializeObject(ViewBag.kechengleixing))';
        var Baomingtimebegin = '@Html.Raw(ViewBag.Baomingtimebegin)';
        var Baomingtimeend = '@Html.Raw(ViewBag.Baomingtimeend)';
        gridConfig = { multiselect: true, selectcol: "Id" };
        loseherght = 40;
        dataCol = [
            { label: 'id', name: 'Id', labtype: 'txt', hidden: true },
            {
                label: '提交时间', name: 'BaomingtimeName', labtype: 'txt', hidden: false, width: 70
                //,
                //formatter: function (cellvalue, options, rowObject) {
                //    return "<a onclick=\"OpenWindow('" + cellvalue.replace(/'/g, '') + "','98%','100%', '/OrderBanciOrder/Edit?id=" + rowObject.Id + "')\"  >" + cellvalue + "</a>";
                //}
            },
            { label: '顾问名称', name: 'Peixunbanci', labtype: 'txt', hidden: false, width: 100 },
            { label: '顾问类型', name: 'Kechengleixing', labtype: 'txt', hidden: false, width: 300 },
            { label: '姓名', name: 'Xingming', labtype: 'txt', hidden: false, width: 70 },
            { label: '联系电话', name: 'Lianxidianhua', labtype: 'txt', hidden: false, width: 70 },
            { label: '身份证', name: 'Shenfenzheng', labtype: 'txt', hidden: true, width: 70 },
            { label: '学费', name: 'Xuefei', labtype: 'txt', hidden: true, width: 70 },
            { label: '报名人数', name: 'Baomingrenshu', labtype: 'txt', hidden: true, width: 50 },
            //{ label: '金额', name: 'Jine', labtype: 'txt', hidden: false, width: 100 },
            { label: '积分', name: 'Jifen', labtype: 'txt', hidden: true, width: 50 },
        ];
        dataUrl = "/OrderBanciOrder/GetList?Kechengleixings=7&Baomingtime=" + Baomingtimebegin + "|" + Baomingtimeend;
        searchCol = [
            { label: '提交时间', name: 'Baomingtime', labtype: 'datearea', hidden: false },
            { label: '顾问名称', name: 'Peixunbanci', labtype: 'txt', hidden: false },
            { label: '顾问类型', name: 'Kechengleixing', labtype: 'combox', hidden: false, data: JSON.parse(kechengleixing)/*, cwidth: '5%', cccwidth: '8%' */ },
            { label: '姓名', name: 'Xingming', labtype: 'txt', hidden: false },
            { label: '联系电话', name: 'Lianxidianhua', labtype: 'txt', hidden: false },
        ];
        //var _pageAdd = function () {
        //    OpenWindow("新增班次", "98%", "90%", "/OrderBanciOrder/Edit/");
        //}
        var _pageSearch = function () {
            $("#jqGrid").jqGrid('setGridParam', {
                url: '/OrderBanciOrder/GetList?Kechengleixings=7', postData: jsons, page: 1
            }); //重新载入
            var jsons = GetSearchEnd();
            if (jsons == false) {
                msg.info("请录入查询条件");
                return false;
            }
            LoadGrid(jsons);
        }
        var _afterLoadDataload = function (xhr) {
            //console.info(xhr);
            //var rows = jQuery("#jqGrid").jqGrid("getRowData"), total_Xuefei = 0, total_Baomingrenshu = 0;
            //for (var i = 0, l = rows.length; i < l; i++) {
            //    total_Xuefei += (rows[i].Xuefei - 0);
            //    total_Baomingrenshu += (rows[i].Baomingrenshu - 0);
            //}
            jQuery("#jqGrid").jqGrid("footerData", "set", { Shenfenzheng: "<font color='darkgoldenrod'>--当页合计--</font> </br>  <font color='darkgoldenrod'>--合计--</font>", Xuefei: "<font color='darkgoldenrod'>" + xhr.DangyeHeji1 + "</font></br><font color='darkgoldenrod'>" + xhr.Heji1 + "</font>", Baomingrenshu: "<font color='darkgoldenrod'>" + xhr.DangyeHeji2 + "</font></br><font color='darkgoldenrod'>" + xhr.Heji2 + "</font>" } );
        };
        var _afterSave = function (result) {
            if (result) {
                toastr.success("保存成功");
            } else {
                toastr.error("保存失败");
            }
        }
        var _afterDel = function (result) {
            if (result) {
                toastr.success("删除成功");
            } else {
                /**/
                toastr.error("删除成功");
        /**/
    }
        }
        var _pageDuanxin = function () {
            var duanxin = GetGridSelect();
            var baifangid = "";
            if (duanxin != '') {
                for (var i = 0; i < duanxin.length; i++) {
                    baifangid += duanxin[i] + ','
                }
                baifangid = baifangid.substring(0, baifangid.length - 1);
            } else {
                toastr.error("请选择订单");
                return;
            }
            OpenWindow("群发短信", "50%", "50%", "/OrderBanciOrder/Duanxin?id=" + baifangid);
        }
        var _pagePrint = function () {
            var Baomingtime = $("#PBSBaomingtime").val();
            var Peixunbanci = $("#PBSPeixunbanci").val();
            var Kechengleixing = $("#PBSKechengleixing").val();
            var Xingming = $("#PBSXingming").val();
            var Lianxidianhua = $("#PBSLianxidianhua").val();
            var Createtimestart = $("#PBSCreatetimestart").val();
            var Createtimeend = $("#PBSCreatetimeend").val();
            var Createtime = '';
            if (Createtimestart != '' && Createtimeend != '') {
                Createtime = Createtimestart + '|' + Createtimeend;
            }
            var url = "/OrderBanciOrder/print?Kechengleixings=7&Baomingtime=" + Baomingtime + "&Peixunbanci=" + Peixunbanci + "&Kechengleixing=" + Kechengleixing + "&Xingming=" + Xingming + "&Lianxidianhua=" + Lianxidianhua;
            var me = window.open(url, "打印");  //打开新窗口
        }
        $(function () {
            $("#PBSBaomingtimeend").val(Baomingtimeend);
            $("#PBSBaomingtimestart").val(Baomingtimebegin);
        });
    </script>
}
@section footerScripts{
    <script type="text/javascript">
    </script>
}