提交

username@email.com

2021-10-21 c571ee7de9595e2616e0e5f85734dbaa42ed6098

提交

 zhengcaioa/IServices/ICooperOrderService.cs

@@ -12,6 +12,8 @@

        CooperOrderDTO Get(string id);

        string GetOrderNo();

        ResultDataEntity<CooperOrderDTO> SearchByPaging(CooperOrderDTOSearch searchEntity);

        ResultEntity ModifyStatus(string id, string userid);

 zhengcaioa/Services/CooperOrderService.cs

@@ -103,6 +103,24 @@
            return resultEntity;
        }

        public string GetOrderNo()
        {
            string OrderNoback = "";
            var datestreing = DateTime.Now.ToString("yyyyMMdd");
            var OrderNo = _context.CooperOrders.Where(x => x.OrderNo.Contains(datestreing)).Max(x => x.OrderNo);
            if (string.IsNullOrEmpty(OrderNo))
            {
                OrderNoback = datestreing + 1.ToString().PadLeft(3, '0');
            }
            else
            {
                OrderNoback = datestreing + (int.Parse(OrderNo.Substring(OrderNo.Length - 3)) + 1).ToString().PadLeft(3, '0');
            }


            return OrderNoback;
        }

        public CooperOrderDTO Get(string id)
        {


 zhengcaioa/zhengcaioa/Controllers/BusinessOrder/CooperOrderController.cs

@@ -423,6 +423,7 @@
                dto.XdTime = DateTime.Now;
                dto.OrderNum = 1;
                ViewBag.ShouliStatus = "1";
                dto.OrderNo = _cooperOrderService.GetOrderNo();
                //ViewBag.YouHuiList = new List<AdmAskYouHuiDTO>();
            }


 zhengcaioa/zhengcaioa/Views/CooperOrder/Edit.cshtml

@@ -181,8 +181,8 @@

                                    </div>

                                    <label class="text-right col-sm-1 col-md-1 control-label">订单类型2</label>
                                    <div class="col-sm-2 col-md-2">
                                    <label class="text-right col-sm-1 col-md-1 control-label" id="dingdanleixing2">订单类型2</label>
                                    <div class="col-sm-2 col-md-2" id="dingdanleixing3">
                                        <select id="OrderType2" class="form-control" name="OrderType2" data-placeholder="选择 序列 ...">
                                            <option value="" hassubinfo="true">请选择</option>
                                        </select>
@@ -632,6 +632,10 @@

                        $("#Price").trigger("change");


                        $("#dingdanleixing2").hide();
                        $("#dingdanleixing3").hide();

                    } else {
                        var aaa = '<option value="" hassubinfo="true">请选择</option>';
                        city.append(aaa);
@@ -648,7 +652,8 @@

                            }
                        }

                        $("#dingdanleixing2").show();
                        $("#dingdanleixing3").show();
                    }


@@ -750,7 +755,8 @@
                success: function (data) {
                    var city = $("#OrderType2");
                    if (order_type != "02" || order_type1 == "电话咨询" || order_type1 == "当面咨询" || order_type1 == "代拟质疑答复" || order_type1 == "代拟投诉处理决定" || order_type1 == "竞争对手和评审专家参加政府采购数据信息查询" || order_type1 == "政采贷") {

                        $("#dingdanleixing2").hide();
                        $("#dingdanleixing3").hide();

                    } else {
                        var aaa = '';
@@ -768,6 +774,8 @@

                            }
                        }
                        $("#dingdanleixing2").show();
                        $("#dingdanleixing3").show();

                    }


 zhengcaioa/zhengcaioa/Views/ExpertTestTopic/Edit.cshtml

@@ -251,13 +251,13 @@
                                    {
                                    <div class="clearfix layer-area" style="padding-bottom:15px;">
                                        <label class="text-right col-sm-1 col-md-1 control-label"></label>
                                        <div class="col-sm-2 col-md-2" style="width:4%;">
                                        @*<div class="col-sm-2 col-md-2" style="width:4%;">
                                            <input class="form-control" style="text-align:left;border:none;" label="答案编号" name="anwserno" labtype="txt" addvisible="true" editvisible="true" reg="" maxlength="50" ismust="true" type="text" value="@expertTestTopicanwserDTOs[i].Anwserno" readonly="readonly">
                                        </div>
                                        <label class="text-right col-sm-1 col-md-1 control-label" style="width:10px;" name="Anwser1">、</label>
                                        </div>*@
                                        <label class="text-right col-sm-1 col-md-1 control-label" style="width:15px;margin-left:15px;" name="Anwser1">@expertTestTopicanwserDTOs[i].Anwserno、</label>
                                        <div class="col-sm-6 col-md-6" name="Anwser2">
                                            <input class="form-control" label="答案" name="Anwser" labtype="txt" addvisible="true" editvisible="true" maxlength="500" reg="" ismust="flase" type="text" value="@expertTestTopicanwserDTOs[i].Anwser">

                                            <input type="hidden" name="anwserno" value="@expertTestTopicanwserDTOs[i].Anwserno" />
                                        </div>

                                        <label grouptype="Vdata" class="text-right col-sm-1 col-md-1 control-label">
@@ -704,8 +704,8 @@
                    }
                }

                if (booll < 1) {
                    toastr.warning("多单选至少有一个正确答案");
                if (booll <= 1) {
                    toastr.warning("多单选至少有两个正确答案");
                    return;
                }
            }
@@ -838,8 +838,8 @@
                    }
                }

                if (booll < 1) {
                    toastr.warning("多单选至少有一个正确答案");
                if (booll <= 1) {
                    toastr.warning("多单选至少有两个正确答案");
                    return;
                }
            }
@@ -957,7 +957,7 @@
                                                        </div>`);
              } else  if (num == 2) {
                $('#addlist_2').append(oTr);
                  $(oTr).html(` <div class="fatiaomeirong" > 
                  $(oTr).html(` <div class="fatiaomeirong" >
<div class="clearfix layer-area" style="padding-bottom:15px;">

 <label grouptype="Vdata" class="text-right col-sm-1 col-md-1 control-label">
@@ -1111,13 +1111,11 @@
                $('#addlist_3').html(`
<div class="clearfix layer-area" style="padding-bottom:15px;">
                                        <label class="text-right col-sm-1 col-md-1 control-label"></label>
                                        <div class="col-sm-2 col-md-2" style="width:4%;">
                                            <input class="form-control" style="text-align:left;border:none;"  label="答案编号" name="anwserno" labtype="txt" addvisible="true" editvisible="true" reg="" maxlength="50" ismust="true" type="text" value="A" readonly="readonly">
                                        </div>
                                        <label class="text-right col-sm-1 col-md-1 control-label" style="width:10px;" name="Anwser1">、</label>

                                        <label class="text-right col-sm-1 col-md-1 control-label" style="width:15px;margin-left:15px;" name="Anwser1">A、</label>
                                        <div class="col-sm-6 col-md-6" name="Anwser2">
                                            <input class="form-control" label="答案" name="Anwser" labtype="txt" addvisible="true" editvisible="true" maxlength="500" reg="" ismust="flase" type="text" value="">

                                             <input type="hidden" name="anwserno" value="A" />
                                        </div>

                                        <label grouptype="Vdata" class="text-right col-sm-1 col-md-1 control-label">
@@ -1135,13 +1133,11 @@

<div class="clearfix layer-area" style="padding-bottom:15px;">
                                        <label class="text-right col-sm-1 col-md-1 control-label"></label>
                                        <div class="col-sm-2 col-md-2" style="width:4%;">
                                            <input class="form-control" style="text-align:left;border:none;"  label="答案编号" name="anwserno" labtype="txt" addvisible="true" editvisible="true" reg="" maxlength="50" ismust="true" type="text" value="B" readonly="readonly">
                                        </div>
                                        <label class="text-right col-sm-1 col-md-1 control-label" style="width:10px;" name="Anwser1">、</label>

                                        <label class="text-right col-sm-1 col-md-1 control-label" style="width:15px;margin-left:15px;" name="Anwser1">B、</label>
                                        <div class="col-sm-6 col-md-6" name="Anwser2">
                                            <input class="form-control" label="答案" name="Anwser" labtype="txt" addvisible="true" editvisible="true" maxlength="500" reg="" ismust="flase" type="text" value="">

                                            <input type="hidden" name="anwserno" value="B" />
                                        </div>

                                        <label grouptype="Vdata" class="text-right col-sm-1 col-md-1 control-label">
@@ -1159,13 +1155,11 @@

<div class="clearfix layer-area" style="padding-bottom:15px;">
                                        <label class="text-right col-sm-1 col-md-1 control-label"></label>
                                         <div class="col-sm-2 col-md-2" style="width:4%;">
                                            <input class="form-control" style="text-align:left;border:none;"  label="答案编号" name="anwserno" labtype="txt" addvisible="true" editvisible="true" reg="" maxlength="50" ismust="true" type="text" value="C" readonly="readonly">
                                        </div>
                                        <label class="text-right col-sm-1 col-md-1 control-label" style="width:10px;" name="Anwser1">、</label>

                                        <label class="text-right col-sm-1 col-md-1 control-label" style="width:15px;margin-left:15px;" name="Anwser1">C、</label>
                                        <div class="col-sm-6 col-md-6" name="Anwser2">
                                            <input class="form-control" label="答案" name="Anwser" labtype="txt" addvisible="true" editvisible="true" maxlength="500" reg="" ismust="flase" type="text" value="">

                                            <input type="hidden" name="anwserno" value="C" />
                                        </div>

                                        <label grouptype="Vdata" class="text-right col-sm-1 col-md-1 control-label">
@@ -1183,13 +1177,11 @@

<div class="clearfix layer-area" style="padding-bottom:15px;">
                                        <label class="text-right col-sm-1 col-md-1 control-label"></label>
                                         <div class="col-sm-2 col-md-2" style="width:4%;">
                                            <input class="form-control" style="text-align:left;border:none;"  label="答案编号" name="anwserno" labtype="txt" addvisible="true" editvisible="true" reg="" maxlength="50" ismust="true" type="text" value="D" readonly="readonly">
                                        </div>
                                        <label class="text-right col-sm-1 col-md-1 control-label" style="width:10px;" name="Anwser1">、</label>

                                        <label class="text-right col-sm-1 col-md-1 control-label" style="width:15px;margin-left:15px;" name="Anwser1">D、</label>
                                        <div class="col-sm-6 col-md-6" name="Anwser2">
                                            <input class="form-control" label="答案" name="Anwser" labtype="txt" addvisible="true" editvisible="true" maxlength="500" reg="" ismust="flase" type="text" value="">

                                            <input type="hidden" name="anwserno" value="D" />
                                        </div>

                                        <label grouptype="Vdata" class="text-right col-sm-1 col-md-1 control-label">
@@ -1223,7 +1215,7 @@
            }
        }
        function checkFlag(vi) {
            if ($("#Topictype").val() == "01" || $("#Topictype").val() == "03") {
            //if ($("#Topictype").val() == "01" || $("#Topictype").val() == "03") {
                if (vi.checked) {
                    var ssssss = document.getElementsByName("FlagName");
                    for (var i = 0; i < ssssss.length; i++) {
@@ -1231,7 +1223,7 @@
                    }
                    vi.checked = true;
                }
            }
            //}
        }

    </script>

 zhengcaioa/zhengcaioa/Views/ExpertTestTopic/EditPeizhi.cshtml

@@ -122,15 +122,12 @@
                                    <h5>

                                        <div class="clearfix layer-area" style="padding-top:15px;">
                                            <label class="text-right col-sm-1 col-md-1 control-label" style="font-weight:bold;">@expertTestTopicpeizhiDTOs[i].Topictype @expertTestTopicpeizhiDTOs[i].TopictypeName</label>
                                            <label class="text-right col-sm-1 col-md-1 control-label" style="font-weight:bold;">
                                                （数量：
                                            </label>
                                            <label class="text-right col-sm-1 col-md-1 control-label" style="font-weight:bold;">@expertTestTopicpeizhiDTOs[i].Topictype @expertTestTopicpeizhiDTOs[i].TopictypeName  （数量：</label>
                                            
                                            <div class="col-sm-2 col-md-2" style="width:5%;">
                                                <input class="form-control" style="border:none;" label="数量" name="Fenshuszong" labtype="txt" addvisible="true" editvisible="true" reg="" maxlength="50" ismust="true" type="text" value="@expertTestTopicpeizhiDTOs[i].zongFenshu" readonly="readonly">
                                            </div>
                                            <label class="text-left col-sm-1 col-md-1 control-label" style="font-weight:bold;">题</label>
                                            <label class="text-right col-sm-1 col-md-1 control-label" style="font-weight:bold;">分值：</label>
                                            <label class="text-left col-sm-1 col-md-1 control-label" style="font-weight:bold;width:5%;">题  分值：</label>
                                            <div class="col-sm-2 col-md-2" style="width:5%;">
                                                <input class="form-control" label="结论类型" name="Fenzhizong" labtype="txt" addvisible="true" editvisible="true" reg="" maxlength="50" ismust="true" type="text" value="@expertTestTopicpeizhiDTOs[i].zongFenzhi" onkeyup="this.value=this.value.replace(/[^0-9]/g,'')" onafterpaste="this.value=this.value.replace(/[^0-9]/g,'')">
                                            </div>
@@ -148,7 +145,7 @@


                                        <label class="text-right col-sm-1 col-md-1 control-label">@expertTestTopicpeizhiDTOs[i].ZhishitypeName</label>
                                        <div class="col-sm-2 col-md-2">
                                        <div class="col-sm-2 col-md-2" style="width:5%;">
                                            <input class="form-control" label="@expertTestTopicpeizhiDTOs[i].ZhishitypeName" name="Fenshus" labtype="txt" addvisible="true" editvisible="true" reg="" maxlength="50" ismust="true" type="text" value="@expertTestTopicpeizhiDTOs[i].FenshuName" onkeyup="this.value=this.value.replace(/[^0-9]/g,'')" onafterpaste="this.value=this.value.replace(/[^0-9]/g,'')"  onchange="checknum('@expertTestTopicpeizhiDTOs[i].Topictype');">

                                            <input type="hidden" name="Topictypes" value="@expertTestTopicpeizhiDTOs[i].Topictype" />