username@email.com
2021-12-07 56ac25efe5d470e08df3827de011c24d02817249
提交
6个文件已修改
1个文件已添加
433 ■■■■■ 已修改文件
zhengcaioa/DTO/TChallengeItemDTO.cs 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
zhengcaioa/DTO/TChallengeletterDTO.cs 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
zhengcaioa/Services/CooperOrderService.cs 106 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
zhengcaioa/zhengcaioa/Controllers/BusinessOrder/CooperOrderController.cs 61 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
zhengcaioa/zhengcaioa/Views/CooperOrder/EditZhiyihan.cshtml 20 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
zhengcaioa/zhengcaioa/Views/CooperOrder/PrintZhiyihan.cshtml 239 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
zhengcaioa/zhengcaioa/Views/CooperOrder/selectWenshu.cshtml 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
zhengcaioa/DTO/TChallengeItemDTO.cs
@@ -9,8 +9,10 @@
        public int Id { get; set; }
        public string ChallengeId { get; set; }
        public string Question { get; set; }
        public string QuestionName { get; set; }
        public string Evidential { get; set; }
        public string Law { get; set; }
        public string LawName { get; set; }
        public int? Sort { get; set; }
        public string Lawcoment { get; set; }
    }
zhengcaioa/DTO/TChallengeletterDTO.cs
@@ -28,6 +28,7 @@
        public DateTime? DocumentsDate { get; set; }
        public string DocumentsDateName { get; set; }
        public string RequestInfo { get; set; }
        public string RequestInfoName { get; set; }
        public bool? IsReply { get; set; }
        public string Respondent { get; set; }
        public DateTime? RespondDate { get; set; }
zhengcaioa/Services/CooperOrderService.cs
@@ -930,6 +930,34 @@
            var result = _mapper.Map<List<TChallengeletterDTO>>(entity);
            var listCode = (from a in _context.SysCodeDtls
                            join b in _context.SysCodes
                            on a.CodeId equals b.Id
                            where a.RecStatus == "A"
                                          && b.RecStatus == "A"
                            select new CodeDataEntity()
                            {
                                CodeId = b.Id,
                                CodeTable = b.CodeTable,
                                CodeField = b.CodeField,
                                CodeSn = a.CodeSn,
                                Comments = a.Comments,
                                Contents = a.Contents,
                                RecStatus = a.RecStatus,
                                Sort = a.Sort
                            }
                   ).Where(x => x.CodeTable == "t_challengeletter" && x.CodeField == "request_info").ToList();
            foreach(var challengeletterDTO in result)
            {
              var codeDataEntity  = listCode.Where(x => x.CodeSn == challengeletterDTO.RequestInfo).FirstOrDefault();
                if (codeDataEntity != null)
                {
                    challengeletterDTO.RequestInfoName = codeDataEntity.Comments;
                }
            }
            return result;
        }
@@ -1014,6 +1042,84 @@
            var result = _mapper.Map<List<TChallengeItemDTO>>(entity);
            var question = (from a in _context.SysCodeDtls
                            join b in _context.SysCodes
                            on a.CodeId equals b.Id
                            where a.RecStatus == "A"
                                          && b.RecStatus == "A"
                            select new CodeDataEntity()
                            {
                                CodeId = b.Id,
                                CodeTable = b.CodeTable,
                                CodeField = b.CodeField,
                                CodeSn = a.CodeSn,
                                Comments = a.Comments,
                                Contents = a.Contents,
                                RecStatus = a.RecStatus,
                                Sort = a.Sort
                            }
                   ).Where(x => x.CodeTable == "t_challenge_items" && x.CodeField == "question").ToList();
            var law = (from a in _context.SysCodeDtls
                            join b in _context.SysCodes
                            on a.CodeId equals b.Id
                            where a.RecStatus == "A"
                                          && b.RecStatus == "A"
                            select new CodeDataEntity()
                            {
                                CodeId = b.Id,
                                CodeTable = b.CodeTable,
                                CodeField = b.CodeField,
                                CodeSn = a.CodeSn,
                                Comments = a.Comments,
                                Contents = a.Contents,
                                RecStatus = a.RecStatus,
                                Sort = a.Sort
                            }
                 ).Where(x => x.CodeTable == "t_complaint_items" && x.CodeField == "law").ToList();
            var falv = (from a in _context.SysCodeDtls
                       join b in _context.SysCodes
                       on a.CodeId equals b.Id
                       where a.RecStatus == "A"
                                     && b.RecStatus == "A"
                       select new CodeDataEntity()
                       {
                           CodeId = b.Id,
                           CodeTable = b.CodeTable,
                           CodeField = b.CodeField,
                           CodeSn = a.CodeSn,
                           Comments = a.Comments,
                           Contents = a.Contents,
                           RecStatus = a.RecStatus,
                           Sort = a.Sort
                       }
               ).Where(x => x.CodeTable == "expert_test_topicjiexi" && x.CodeField == "falv").ToList();
            foreach (var challengeItemDTO in result)
            {
                var codeDataEntity = question.Where(x => x.CodeSn == challengeItemDTO.Question).FirstOrDefault();
                if (codeDataEntity != null)
                {
                    challengeItemDTO.QuestionName = codeDataEntity.Comments;
                }
                codeDataEntity = law.Where(x => x.CodeSn == challengeItemDTO.Law).FirstOrDefault();
                if (codeDataEntity != null)
                {
                    challengeItemDTO.LawName = codeDataEntity.Comments;
                    challengeItemDTO.Lawcoment = codeDataEntity.Contents;
                    codeDataEntity = falv.Where(x => x.CodeSn == challengeItemDTO.LawName).FirstOrDefault();
                    if (codeDataEntity != null)
                    {
                        challengeItemDTO.LawName = codeDataEntity.Comments;
                    }
                }
            }
            return result;
        }
zhengcaioa/zhengcaioa/Controllers/BusinessOrder/CooperOrderController.cs
@@ -1748,5 +1748,66 @@
            return new JsonResult(resultEntity);
        }
        public IActionResult PrintZhiyihan(string id = null)
        {
            var curentuser = JsonConvert.DeserializeObject<PltUser>(HttpContext.Session.GetString("User"));
            ViewData["curentuser"] = curentuser;
            //质疑函
            List<TChallengeletterDTO> challengeletterDTOs = _cooperOrderService.GetListChallengeletter(id);
            TChallengeletterDTO challengeletterDTO = new TChallengeletterDTO();
            if (challengeletterDTOs != null && challengeletterDTOs.Count > 0)
            {
                challengeletterDTO = challengeletterDTOs[0];
                if (challengeletterDTO.DocumentsDate.HasValue)
                {
                    challengeletterDTO.DocumentsDateName = challengeletterDTO.DocumentsDate.Value.ToString("yyyy-MM-dd");
                }
                List<TChallengeItemDTO> challengeItemDTOs = _cooperOrderService.GetListChallengeItem(challengeletterDTO.Id);
                if (challengeItemDTOs.Count > 0)
                    challengeletterDTO.challengeItemDTOs = challengeItemDTOs;
                else
                    challengeletterDTO.challengeItemDTOs = new List<TChallengeItemDTO>() { new TChallengeItemDTO() };
                List<TComplaintShouquandaibiaoDTO> complaintShouquandaibiaoDTOs = _cooperOrderService.GetListComplaintShouquandaibiao(challengeletterDTO.Id);
                if (complaintShouquandaibiaoDTOs.Count > 0)
                    challengeletterDTO.complaintShouquandaibiaoDTOs = complaintShouquandaibiaoDTOs;
                else
                    challengeletterDTO.complaintShouquandaibiaoDTOs = new List<TComplaintShouquandaibiaoDTO>() { new TComplaintShouquandaibiaoDTO() };
            }
            else
            {
                challengeletterDTO.challengeItemDTOs = new List<TChallengeItemDTO>() { new TChallengeItemDTO() };
                challengeletterDTO.complaintShouquandaibiaoDTOs = new List<TComplaintShouquandaibiaoDTO>() { new TComplaintShouquandaibiaoDTO() };
            }
            //ViewBag.challengeletterDTO = challengeletterDTO;
            //ViewBag.request_info = _liaotianService.GetSYScode("t_challengeletter", "request_info");//质疑请求
            //ViewBag.question = _liaotianService.GetSYScode("t_challenge_items", "question"); //    质疑事项
            //var sysCodeDtls = _liaotianService.GetSYScode("expert_test_topicjiexi", "falv");//法律
            //var sysCodeDtls1 = _liaotianService.GetSYScode("t_complaint_items", "law");//法律依据
            //foreach (var sysCodeDtl in sysCodeDtls1)
            //{
            //    var sysCodeDtl1 = sysCodeDtls.Where(x => x.CodeSn == sysCodeDtl.Comments).FirstOrDefault();
            //    if (sysCodeDtl1 != null)
            //        sysCodeDtl.Comments = sysCodeDtl1.Comments;
            //}
            //ViewBag.law = sysCodeDtls1;//法律依据
            ViewData.Model = challengeletterDTO;
            return View();
        }
    }
}
zhengcaioa/zhengcaioa/Views/CooperOrder/EditZhiyihan.cshtml
@@ -409,9 +409,11 @@
        <div class="ibox-content" id="top" style="z-index:100; position:fixed; height:50px; width:100%;bottom:0; text-align: right; padding-top:8px ">
            <div class="" style="float:right;" data-bootstro-width="500px" data-bootstro-content="功能按钮:“保存”,“删除”">
                @*<a class="btn btn-success" href="javascript:void(0)" onclick="delPosition();" style="margin-left:4px; border-radius:4px;">
                    <i class="glyphicon glyphicon-remove"></i>&nbsp;&nbsp;<span class="bold">删除</span>
                </a>*@
            <i class="glyphicon glyphicon-remove"></i>&nbsp;&nbsp;<span class="bold">删除</span>
        </a>*@
                <a class="btn btn-success" href="javascript:void(0)" onclick="printPosition();" style="margin-left:4px; border-radius:4px;">
                    <i class="glyphicon glyphicon-ok"></i>&nbsp;&nbsp;<span class="bold">打印</span>
                </a>
                <a class="btn btn-success" href="javascript:void(0)" onclick="savePosition();" style="margin-left:4px; border-radius:4px;">
                    <i class="glyphicon glyphicon-ok"></i>&nbsp;&nbsp;<span class="bold">提交</span>
                </a>
@@ -458,6 +460,10 @@
        var bDeleteFile = false; // 删除操作
        var attachment_id = 0; // 附件id
        var imgLoad = new Object();
        var printPosition = function () {
             OpenWindow("打印质疑函", "100%", "100%", "/CooperOrder/PrintZhiyihan?id=@Model.OrderId");
        }
@@ -636,11 +642,11 @@
                                                    <option value="" hassubinfo="true">请选择</option>
                                                    @foreach (var item in question)
                                                    {
                                                            <option value="@item.CodeSn" hassubinfo="true" >
                                                                @item.Comments
                                                            </option>
                                                    }
                                                    }
@@ -664,11 +670,11 @@
                                                    <option value="" hassubinfo="true">请选择</option>
                                                    @foreach (var item in law)
                                                    {
                                                            <option value="@item.CodeSn" hassubinfo="true" >
                                                                @item.Comments
                                                            </option>
                                                    }
                                                    }
zhengcaioa/zhengcaioa/Views/CooperOrder/PrintZhiyihan.cshtml
New file
@@ -0,0 +1,239 @@
@model DTO.TChallengeletterDTO
@using DTO;
@using zhengcaioa.Models;
@{
    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>; //法律依据
    List<TComplaintShouquandaibiaoDTO> challengecomplaintShouquandaibiaoDTOs = Model.complaintShouquandaibiaoDTOs;
    List<TChallengeItemDTO> challengeItemDTOs = Model.challengeItemDTOs;
    int PrintNum = Model.PrintNum.HasValue? Model.PrintNum.Value:0;
}
@{
    Layout = null;
}
<!DOCTYPE html>
<html>
<head>
    <meta charset="utf-8">
    <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0">
    <meta name="description" content="">
    <meta name="author" content="ThemeBucket">
    <title>@(SiteConfig.SiteName)</title>
    <link href="~/css/bootstrap.min.css" rel="stylesheet">
    <link href="~/css/font-awesome.min.css" rel="stylesheet">
    <link href="~/css/animate.min.css" rel="stylesheet">
    @*<link href="~/css/plugins/iCheck/custom.css" rel="stylesheet">*@
    <link href="~/css/style.min.css" rel="stylesheet">
    <link href="~/css/plugins/chosen/chosen.css" rel="stylesheet">
    @*<link href="~/js/plugins/layer/skin/layer.css" rel="stylesheet">*@
    @*<link href="~/css/plugins/datapicker/datepicker3.css" rel="stylesheet">*@
    <link href="~/css/style.min.css" rel="stylesheet">
    <link href="~/css/plugins/toastr/toastr.min.css" rel="stylesheet" />
    <link href="~/css/plugins/webuploader/webuploader.css" rel="stylesheet" />
    <!-- jqgrid-->
    @*<link href="~/css/plugins/jqgrid/ui.jqgrid.css" rel="stylesheet">*@
    <script language="javascript" src="~/js/jquery.min.js" type="text/javascript"></script>
    <script src="~/js/bootstrap.min.js"></script>
    @*<script src="~/js/plugins/bootstro/bootstro.js"></script>*@
    <!--容器-->
    @*<script language="javascript" src="~/js/datehelper.js" type="text/javascript"></script>*@
    @*<script language="javascript" src="~/js/plugins/query/jquery.query-object.js" type="text/javascript"></script>*@
    @*<script language="javascript" src="~/js/plugins/iCheck/icheck.min.js" type="text/javascript"></script>*@
    <script language="javascript" src="~/js/plugins/chosen/chosen.jquery.js" type="text/javascript"></script>
    @*<script language="javascript" src="~/js/plugins/datapicker/bootstrap-datepicker.js" type="text/javascript"></script>*@
    <script language="javascript" src="~/js/plugins/layer/layer.js" type="text/javascript"></script>
    @*<script src="~/js/plugins/jqgrid/jquery.jqGrid.min.js" type="text/javascript"></script>*@
    @*<script src="~/js/plugins/jqgrid/i18n/grid.locale-cn.js" type="text/javascript"></script>*@
    <script src="~/js/plugins/toastr/toastr.min.js" type="text/javascript"></script>
    <script src="~/js/plugins/webuploader/webuploader.min.js"></script>
    <script language="javascript" src="~/js/common-layout.js" type="text/javascript"></script>
    <script src="~/js/plugins/layer/laydate/laydate.js" type="text/javascript"></script>
    @*<script src="~/js/plugins/iTexbox/itextbox.js" type="text/javascript"></script>*@
    @*<script src="~/js/plugins/iuploader/iuploader.js"></script>*@
    <script src="~/js/TUJS.js"></script>
</head>
<body class="gray-bg" style="overflow:auto">
    <form id="formtest">
        <div class="wrapper wrapper-content" id="ibox-content" style="padding:15px;">
            <div class="row">
                <div id="content" style="overflow-y:auto;height:100%;">
                    <div id="page1" style="page-break-after:always;">
                        <table border="0" align="center" cellpadding="3" cellspacing="0">
                            <tr>
                                <td colspan="2" style="font-size:29.3px;text-align:center">质疑函(正本)</td>
                            </tr>
                            <tr>
                                <td colspan="2" style="font-family:'SimHei';">一、质疑供应商基本信息</td>
                            </tr>
                            <tr>
                                <td colspan="2" align="left">质疑供应商:<span style="width:460px;">@Model.GysName</span></td>
                            </tr>
                            <tr>
                                <td width="60%" align="left">地址:<span style="width:290px;font-size:13pt;">@Model.GysAddress</span></td>
                                <td width="40%" align="left">邮编:<span style="width:160px;">@Model.GysPostcode</span></td>
                            </tr>
                            <tr>
                                <td align="left">联系人:<span style="width:265px;">@Model.GysContacts </span></td>
                                <td align="left">联系电话:<span style="width:120px;">@Model.GysPhone </span></td>
                            </tr>
                            @for (int i = 0; i < challengecomplaintShouquandaibiaoDTOs.Count; i++)
                            {
                                <tr>
                                    <td colspan="2" align="left">授权代表@(i!=0?(i+""):""):<span style="width:480px;">@challengecomplaintShouquandaibiaoDTOs[i].Shouquandaibiao </span></td>
                                </tr>
                                <tr>
                                    <td colspan="2" align="left">联系电话@(i!=0?(i+""):""):<span style="width:480px;">@challengecomplaintShouquandaibiaoDTOs[i].Lianxidianhua </span></td>
                                </tr>
                                <tr>
                                    <td align="left">地址@(i!=0?(i+""):""):<span style="width:290px;font-size:13pt;">@challengecomplaintShouquandaibiaoDTOs[i].Dizhi </span></td>
                                    <td align="left">邮编@(i!=0?(i+""):""):<span style="width:160px;">@challengecomplaintShouquandaibiaoDTOs[i].Youbian </span></td>
                                </tr>
                            }
                            <tr>
                                <td colspan="2" style="font-family:'SimHei';">二、质疑项目基本情况</td>
                            </tr>
                            <tr>
                                <td colspan="2" align="left">质疑项目的名称:<span style="width:415px;font-size:13pt;">@Model.XmName </span></td>
                            </tr>
                            <tr>
                                <td align="left">质疑项目的编号:<span style="width:180px;">@Model.XmCode </span></td>
                                <td align="left">包号:<span style="width:160px;">@Model.XmPackage </span></td>
                            </tr>
                            <tr>
                                <td colspan="2" align="left">采购人名称:<span style="width:460px;">@Model.PurchaserName </span></td>
                            </tr>
                            <tr>
                                <td colspan="2" align="left">采购文件获取日期:<span style="width:395px;">@Model.DocumentsDateName </span></td>
                            </tr>
                            <tr>
                                <td colspan="2" style="font-family:'SimHei';">三、质疑事项具体内容</td>
                            </tr>
                            @{
                                @for (int i = 0; i < challengeItemDTOs.Count; i++)
                                {
                                    <tr>
                                        <td colspan="2">
                                            质疑事项@(i!=0?(i+""):""):<span style="text-indent:10px">@challengeItemDTOs[i].QuestionName </span>
                                            <br />
                                            事实依据@(i!=0?(i+""):""):<span>@challengeItemDTOs[i].Evidential</span>
                                            <br />
                                            法律依据@(i!=0?(i+""):""):<span>@challengeItemDTOs[i].LawName</span>
                                            <br />
                                            内容@(i!=0?(i+""):""):<span>@challengeItemDTOs[i].Lawcoment</span>
                                            <br />
                                        </td>
                                    </tr>
                                }
                            }
                            <tr>
                                <td colspan="2" style="font-family:'SimHei';">四、与质疑事项相关的质疑请求</td>
                            </tr>
                            <tr>
                                <td colspan="2" align="left">请求:<span>@Model.RequestInfoName</span></td>
                            </tr>
                            <tr>
                                <td colspan="2" style="height:15px"></td>
                            </tr>
                            <tr>
                                <td align="left">签字(签章):</td>
                                <td align="left">公章:</td>
                            </tr>
                            <tr>
                                <td colspan="2" align="left">日期:</td>
                            </tr>
                        </table>
                    </div>
                    <style type="text/css">
                        table {
                            width: 595px;
                            font-size: 16pt;
                            font-family: 'FangSong';
                            background: #fff;
                            line-height: 1.5;
                        }
                        span {
                            font-size: 15pt;
                            display: inline;
                            border-bottom: 1px dashed #111;
                        }
                        s22pan:after {
                            content: '';
                            display: inline;
                            width: 100%;
                            margin-top: -5px;
                            border-bottom: 1px dashed #111;
                        }
                    </style>
                </div>
            </div>
        </div>
        <div class="wrapper wrapper-content" style="margin-top:0px"></div>
        <div class="ibox-content" id="top" style="z-index:100; position:fixed; height:50px; width:100%;bottom:0; text-align: right; padding-top:8px ">
            <div class="" style="float:right;" data-bootstro-width="500px" data-bootstro-content="功能按钮:“保存”,“删除”">
                <a class="btn btn-success" href="javascript:void(0)" onclick="printWin();" style="margin-left:4px; border-radius:4px;">
                    <i class="glyphicon glyphicon-ok"></i>&nbsp;&nbsp;<span class="bold">打印</span>
                </a>
            </div>
        </div>
    </form>
    <script type="text/javascript">
        var pt = document.getElementById("page1").innerHTML;
        pt =  pt.replace("质疑函(正本)","质疑函(副本)");
        var a=  @PrintNum;
        if (a > 0) {
            for (var i = 0; i < a; i++) {
                $('#content').append(' <div style="page-break-after:always;">' + pt +' </div>');
            }
        }
            function printWin() {
                var oWin = window.open("", "_blank");
                var pt = document.getElementById("content").innerHTML;
                oWin.document.write(pt);
                oWin.focus();
                oWin.document.close();
                oWin.print();
                oWin.close();
                return false;
            }
    </script>
</body>
</html>
zhengcaioa/zhengcaioa/Views/CooperOrder/selectWenshu.cshtml
@@ -31,10 +31,10 @@
                formatter: function (cellvalue, options, rowObject) {
                    if (rowObject.OrderType1 == "代拟投诉书") {
                        return "<a onclick=\"OpenWindow('查看投诉书','98%','100%', '/CooperOrder/EditZhiyihan?id=" + rowObject.Id + "')\"  >查看投诉书</a>";
                        return "<a onclick=\"OpenWindow('查看投诉书','98%','100%', '/CooperOrder/PrintZhiyihan?id=" + rowObject.Id + "')\"  >查看投诉书</a>";
                    }
                    else if (rowObject.OrderType1 == "代拟质疑函") {
                        return "<a onclick=\"OpenWindow('查看质疑函','98%','100%', '/CooperOrder/EditZhiyihan?id=" + rowObject.Id + "')\"  >查看质疑函</a>";
                        return "<a onclick=\"OpenWindow('查看质疑函','98%','100%', '/CooperOrder/PrintZhiyihan?id=" + rowObject.Id + "')\"  >查看质疑函</a>";
                    }
                }
            },