username@email.com
2021-11-30 8878b4d2c65329d454688d306e9d692c760bffe5
提交
10个文件已修改
92 ■■■■■ 已修改文件
zhengcaioa/DTO/TChallengeletterDTO.cs 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
zhengcaioa/DTO/TComplaintletterDTO.cs 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
zhengcaioa/zhengcaioa/Controllers/BusinessOrder/CooperOrderController.cs 56 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
zhengcaioa/zhengcaioa/Controllers/BusinessOrder/OrderBanciOrderController.cs 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
zhengcaioa/zhengcaioa/Controllers/Customer/CooperVisitController.cs 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
zhengcaioa/zhengcaioa/Controllers/Customer/IntentionVisitController.cs 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
zhengcaioa/zhengcaioa/Controllers/Expert/ExpertController.cs 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
zhengcaioa/zhengcaioa/Views/CooperOrder/Edit.cshtml 16 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
zhengcaioa/zhengcaioa/Views/Shared/_Layout_Search.cshtml 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
zhengcaioa/zhengcaioa/wwwroot/js/plugins/search/search.js 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
zhengcaioa/DTO/TChallengeletterDTO.cs
@@ -36,5 +36,6 @@
        public DateTime? Modifytime { get; set; }
        public string Modifier { get; set; }
        public int? Status { get; set; }
        public List<TChallengeItemDTO> challengeItemDTOs { get; set; }
    }
}
zhengcaioa/DTO/TComplaintletterDTO.cs
@@ -47,5 +47,10 @@
        public DateTime? Modifytime { get; set; }
        public string Modifier { get; set; }
        public int? Status { get; set; }
        public List<TComplaintItemDTO> complaintItemDTOs { get; set; }
        public List<TComplaintRespondentDTO> complaintRespondentDTOs { get; set; }
    }
}
zhengcaioa/zhengcaioa/Controllers/BusinessOrder/CooperOrderController.cs
@@ -417,6 +417,48 @@
                dto = _cooperOrderService.Get(id);
                ViewBag.ShouliStatus = ShouliStatus;
                //ViewBag.YouHuiList = _askService.GetAskYouHuiList(dto.Khdw, dto.OrderType);
                //质疑函
                List<TChallengeletterDTO> challengeletterDTOs  = _cooperOrderService.GetListChallengeletter(id);
                TChallengeletterDTO challengeletterDTO = new TChallengeletterDTO();
                if (challengeletterDTOs!=null&& challengeletterDTOs.Count > 0)
                {
                    challengeletterDTO = challengeletterDTOs[0];
                    List<TChallengeItemDTO> challengeItemDTOs = _cooperOrderService.GetListChallengeItem(challengeletterDTO.Id);
                    if(challengeItemDTOs.Count>0)
                        challengeletterDTO.challengeItemDTOs = challengeItemDTOs;
                    else
                        challengeletterDTO.challengeItemDTOs = new List<TChallengeItemDTO>() { new TChallengeItemDTO() };
                }
                else
                {
                    challengeletterDTO.challengeItemDTOs = new List<TChallengeItemDTO>() { new TChallengeItemDTO() };
                }
                ViewBag.challengeletterDTO = challengeletterDTO;
                //投诉书
                List<TComplaintletterDTO> complaintletterDTOs = _cooperOrderService.GetListComplaintletter(id);
                TComplaintletterDTO complaintletterDTO = new TComplaintletterDTO();
                if (complaintletterDTOs != null && complaintletterDTOs.Count > 0)
                {
                    complaintletterDTO = complaintletterDTOs[0];
                    List<TComplaintItemDTO> complaintItemDTOs = _cooperOrderService.GetListComplaintItem(complaintletterDTO.Id);
                    if (complaintItemDTOs.Count > 0)
                        complaintletterDTO.complaintItemDTOs = complaintItemDTOs;
                    else
                        complaintletterDTO.complaintItemDTOs = new List<TComplaintItemDTO>() { new TComplaintItemDTO() };
                    List<TComplaintRespondentDTO> complaintRespondentDTOs = _cooperOrderService.GetListComplaintRespondent(complaintletterDTO.Id);
                    if (complaintRespondentDTOs.Count > 0)
                        complaintletterDTO.complaintRespondentDTOs = complaintRespondentDTOs;
                    else
                        complaintletterDTO.complaintRespondentDTOs = new List<TComplaintRespondentDTO>() { new TComplaintRespondentDTO() };
                }
                else
                {
                    complaintletterDTO.complaintItemDTOs = new List<TComplaintItemDTO>() { new TComplaintItemDTO() };
                    complaintletterDTO.complaintRespondentDTOs = new List<TComplaintRespondentDTO>() { new TComplaintRespondentDTO() };
                }
                ViewBag.complaintletterDTO = complaintletterDTO;
            }
            else
            {
@@ -425,8 +467,20 @@
                ViewBag.ShouliStatus = "1";
                dto.OrderNo = _cooperOrderService.GetOrderNo();
                //ViewBag.YouHuiList = new List<AdmAskYouHuiDTO>();
            }
                //质疑函
                TChallengeletterDTO challengeletterDTO = new TChallengeletterDTO();
                challengeletterDTO.challengeItemDTOs = new List<TChallengeItemDTO>() { new TChallengeItemDTO() };
                ViewBag.challengeletterDTO = challengeletterDTO;
                //投诉书
                TComplaintletterDTO complaintletterDTO = new TComplaintletterDTO();
                complaintletterDTO.complaintItemDTOs = new List<TComplaintItemDTO>() { new TComplaintItemDTO() };
                complaintletterDTO.complaintRespondentDTOs = new List<TComplaintRespondentDTO>() { new TComplaintRespondentDTO()};
                ViewBag.complaintletterDTO = complaintletterDTO;
            }
            ViewBag.request_info = _liaotianService.GetSYScode("t_challengeletter", "request_info");//质疑请求
            ViewBag.question = _liaotianService.GetSYScode("t_challenge_items", "question"); //    质疑事项
            ViewBag.law = _liaotianService.GetSYScode("t_complaint_items", "law");//法律依据
zhengcaioa/zhengcaioa/Controllers/BusinessOrder/OrderBanciOrderController.cs
@@ -160,7 +160,7 @@
                resultEntity.Message = "无联系人";
            }
            string sss = SMSHelper.PushWToUserMES(number.ToString(), "您好,客户. 详情见:" + neirong);
            string sss = SMSHelper.PushWToUserMES(number.ToString(), "您好," + neirong + " 详情见:http://51zhengcai.com/");
            if (int.Parse(sss) <= 0)
            {
                resultEntity.Result = false;
zhengcaioa/zhengcaioa/Controllers/Customer/CooperVisitController.cs
@@ -212,7 +212,7 @@
                resultEntity.Message = "无联系人";
            }
            string sss   = SMSHelper.PushWToUserMES(number.ToString(), "您好,客户. 详情见:" + neirong);
            string sss   = SMSHelper.PushWToUserMES(number.ToString(), "您好," + neirong + " 详情见:http://51zhengcai.com/");
            if (int.Parse(sss) <= 0)
            {
                resultEntity.Result = false;
zhengcaioa/zhengcaioa/Controllers/Customer/IntentionVisitController.cs
@@ -247,7 +247,7 @@
                    IntentionCustomerDTO intentionCustomerDTO = _intentionCustomerService.Get(data.Viscustomer);
                    if(intentionCustomerDTO!=null && ( !string.IsNullOrEmpty(intentionCustomerDTO.Phone) ||  !string.IsNullOrEmpty(intentionCustomerDTO.Tel)))
                    {
                        string sss = SMSHelper.PushWToUserMES(string.IsNullOrEmpty(intentionCustomerDTO.Phone)? intentionCustomerDTO.Tel: intentionCustomerDTO.Phone, "您好,客户. 详情见:"+data.DuanxinNeirong);
                        string sss = SMSHelper.PushWToUserMES(string.IsNullOrEmpty(intentionCustomerDTO.Phone)? intentionCustomerDTO.Tel: intentionCustomerDTO.Phone, "您好," + data.DuanxinNeirong + " 详情见:http://51zhengcai.com/" );
                        if (int.Parse(sss) <= 0)
                        {
                            resultEntity.Result = false;
@@ -342,7 +342,7 @@
                resultEntity.Message = "无联系人";
            }
            string sss = SMSHelper.PushWToUserMES(number.ToString(), "您好,客户. 详情见:" + neirong );
            string sss = SMSHelper.PushWToUserMES(number.ToString(), "您好," + neirong + " 详情见:http://51zhengcai.com/");
            if (int.Parse(sss) <= 0)
            {
                resultEntity.Result = false;
zhengcaioa/zhengcaioa/Controllers/Expert/ExpertController.cs
@@ -653,7 +653,7 @@
                resultEntity.Message = "无联系电话";
            }
            string sss = SMSHelper.PushWToUserMES(number.ToString(), "您好,专家. 详情见:" + neirong);
            string sss = SMSHelper.PushWToUserMES(number.ToString(), "您好,"+neirong+" 详情见:http://51zhengcai.com/"   );
            if (int.Parse(sss) <= 0)
            {
                resultEntity.Result = false;
zhengcaioa/zhengcaioa/Views/CooperOrder/Edit.cshtml
@@ -14,6 +14,22 @@
    //List<SysCodeDtl> YouHuiList = ViewData["YouHuiList"] as List<SysCodeDtl>; //优惠列表
    TChallengeletterDTO challengeletterDTO = ViewData["challengeletterDTO"] as TChallengeletterDTO; //质疑函
    List<TChallengeItemDTO> challengeItemDTOs = challengeletterDTO.challengeItemDTOs;
    TComplaintletterDTO complaintletterDTO = ViewData["complaintletterDTO"] as TComplaintletterDTO; //投诉书
    List<TComplaintItemDTO> complaintItemDTOs = complaintletterDTO.complaintItemDTOs;
    List<TComplaintRespondentDTO> complaintRespondentDTOs = complaintletterDTO.complaintRespondentDTOs;
    List<SysCodeDtl> request_info = ViewData["request_info"] as List<SysCodeDtl>; //质疑请求
    List<SysCodeDtl> question = ViewData["question"] as List<SysCodeDtl>; //质疑事项
    List<SysCodeDtl> law = ViewData["law"] as List<SysCodeDtl>; //法律依据
}
@{
    Layout = null;
zhengcaioa/zhengcaioa/Views/Shared/_Layout_Search.cshtml
@@ -57,7 +57,7 @@
    <script src="~/js/plugins/search/searchtoolbar.js?v=20"></script>
    <script src="~/js/plugins/chosen/chosen.jquery.js"></script>
    <script src="~/js/plugins/iCheck/icheck.min.js"></script>
    <script src="~/js/plugins/search/search.js?v=1111111111"></script>
    <script src="~/js/plugins/search/search.js?v=11111111111"></script>
    <script src="~/js/plugins/datapicker/bootstrap-datepicker.js"></script>
    <script type="text/javascript" src="~/js/plugins/treeview/bootstrap-treeview.js"></script>
    <script src="~/js/TUJS.js"></script>
zhengcaioa/zhengcaioa/wwwroot/js/plugins/search/search.js
@@ -191,7 +191,7 @@
        footerrow: footerrow,
        rownumbers: true,
        rowNum: 30,
        rowList: [30, 50, 100,200],
        rowList: [30, 50, 100,500],
        cmTemplate: { sortable: false },
        jsonReader: {
            root: "DataList", page: "CurrPage", total: "PageTotal",          //   很重要 定义了 后台分页参数的名字。