更新用户管理，增加工号，是否项目录入，问答录入，预发工资，保底年薪，工龄工资，是否交通补贴，界面调整。

LR-20210131IOQH\Administrator

2021-06-08 f7841c1dc1cd7f0a80d0cc77cc54481d0a8bb707

更新用户管理，增加工号，是否项目录入，问答录入，预发工资，保底年薪，工龄工资，是否交通补贴，界面调整。

 .gitignore

@@ -12,3 +12,4 @@
zhengcaioa/Services/obj/
zhengcaioa/zhengcaioa/wwwroot/UploadingFiles/
zhengcaioa/zhengcaioa/wwwroot/UploadFile/
/zhengcaioa/.vs

 zhengcaioa/DTO/PltUserDTO.cs

@@ -6,6 +6,13 @@
{
  public  class PltUserDTO
    {
        public PltUserDTO()
        {
            advancewages = 0;
            miniyearsalary = 0;
            senioritywages = 0;
        }

        public string Id { get; set; }
        public string UserSn { get; set; }
        public string UserAlias { get; set; }
@@ -72,6 +79,41 @@
        public string JzYoubian { get; set; }
        public string HjYoubian { get; set; }

        /// <summary>
        /// mac地址
        /// </summary>
        public string IpMac { get; set; }
        /// <summary>
        /// å·¥å·
        /// </summary>
        public string Usernumber { get; set; }
        /// <summary>
        /// æ˜¯å¦é¡¹ç›®å½•å…¥
        /// </summary>
        public string Isxmenter { get; set; }
        /// <summary>
        /// æ˜¯å¦é—®ç­”录入
        /// </summary>
        public string Iswdenter { get; set; }
        /// <summary>
        /// é¢„发工资
        /// </summary>
        public decimal? advancewages { get; set; }
        /// <summary>
        /// ä¿åº•å¹´è–ª
        /// </summary>
        public decimal? miniyearsalary { get; set; }
        /// <summary>
        /// å·¥é¾„工资
        /// </summary>
        public decimal? senioritywages { get; set; }
        /// <summary>
        /// æ˜¯å¦äº¤é€šè¡¥è´´
        /// </summary>
        public string Istravelsubsidy { get; set; }



        public string[] JiatingchengyuanId { get; set; }
        public string[] Name { get; set; }
        public string[] Guanxi { get; set; }

 zhengcaioa/Model/PltUser.cs

@@ -59,5 +59,15 @@
        public string JinjiPhone { get; set; }
        public string JzYoubian { get; set; }
        public string HjYoubian { get; set; }

        public string IpMac { get; set; }
        public string Usernumber { get; set; }
        public string Isxmenter { get; set; }
        public string Iswdenter { get; set; }
        public decimal? advancewages { get; set; }
        public decimal? miniyearsalary { get; set; }
        public decimal? senioritywages { get; set; }
        public string Istravelsubsidy { get; set; }

    }
}

 zhengcaioa/Model/zhengcaioaContext.cs

@@ -3132,6 +3132,24 @@
                    .HasDefaultValueSql("('')")
                    .HasComment("是业务经理");

                entity.Property(e => e.Isxmenter)
                   .HasMaxLength(1)
                   .HasColumnName("is_xmenter")
                   .HasDefaultValueSql("('')")
                   .HasComment("是项目录入");

                entity.Property(e => e.Iswdenter)
                   .HasMaxLength(1)
                   .HasColumnName("is_wdenter")
                   .HasDefaultValueSql("('')")
                   .HasComment("是问答录入");

                entity.Property(e => e.Istravelsubsidy)
                   .HasMaxLength(1)
                   .HasColumnName("is_travelsubsidy")
                   .HasDefaultValueSql("('')")
                   .HasComment("有交通补贴");

                entity.Property(e => e.Jg)
                    .HasMaxLength(500)
                    .HasColumnName("jg")

 zhengcaioa/Services/UserService.cs

@@ -84,6 +84,14 @@
                    return resultEntity;
                }

                var checkNumber = _context.PltUsers.Where(x => x.Usernumber == pltUserDTO.Usernumber && x.RecStatus == "A" && x.Id != pltUserDTO.Id).FirstOrDefault();
                if (checkNumber != null && (string.IsNullOrWhiteSpace(pltUserDTO.Id) || (!string.IsNullOrWhiteSpace(pltUserDTO.Id) && checkNumber.Id != pltUserDTO.Id)))
                {
                    resultEntity.Result = false;
                    resultEntity.Message = "工号重复";
                    return resultEntity;
                }

                var checkPhone = _context.PltUsers.Where(x => x.Phone == pltUserDTO.Phone && x.RecStatus == "A" && x.Id != pltUserDTO.Id).FirstOrDefault();
                if (checkPhone != null && (string.IsNullOrWhiteSpace(pltUserDTO.Id) || (!string.IsNullOrWhiteSpace(pltUserDTO.Id) && checkPhone.Id != pltUserDTO.Id)))
                {
@@ -99,7 +107,6 @@
                    resultEntity.Message = "用户身份证号重复";
                    return resultEntity;
                }


                var pltUser = _mapper.Map<PltUser>(pltUserDTO);
                if (String.IsNullOrEmpty(pltUser.Id))
@@ -169,6 +176,14 @@
                    updatepltUser.JzYoubian = pltUser.JzYoubian;
                    updatepltUser.HjYoubian = pltUser.HjYoubian;

                    updatepltUser.IpMac = pltUser.IpMac;
                    updatepltUser.Iswdenter = pltUser.Iswdenter;
                    updatepltUser.Isxmenter = pltUser.Isxmenter;
                    updatepltUser.Usernumber = pltUser.Usernumber;
                    updatepltUser.advancewages = pltUser.advancewages;
                    updatepltUser.miniyearsalary = pltUser.miniyearsalary;
                    updatepltUser.senioritywages = pltUser.senioritywages;
                    updatepltUser.Istravelsubsidy = pltUser.Istravelsubsidy;
                }

                _context.SaveChanges();

 zhengcaioa/zhengcaioa/Controllers/UserController.cs

@@ -7,6 +7,7 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text.RegularExpressions;
using System.Threading.Tasks;
using System.Transactions;
using zhengcaioa.IService;
@@ -171,7 +172,6 @@
            }
            ViewBag.shenfenzheng = resultshenfenzheng;


            ResultDataEntity<SysAttachmentDTO> resultshenfenzhengbeimian = new ResultDataEntity<SysAttachmentDTO>();
            if (!string.IsNullOrEmpty(id))
            {
@@ -183,8 +183,6 @@
                resultshenfenzhengbeimian = _sysAttachmentService.SearchByPaging(searchEntity);
            }
            ViewBag.shenfenzhengbeimian = resultshenfenzhengbeimian;



            ResultDataEntity<SysAttachmentDTO> resultsxuelizheng = new ResultDataEntity<SysAttachmentDTO>();
            if (!string.IsNullOrEmpty(id))
@@ -226,10 +224,6 @@
        }


       
       


        [CheckLogin]
        public string Get(string id = null)
        {
@@ -258,6 +252,11 @@
            ViewData["curentuser"] = curentuser;
            ResultEntity resultEntity = new ResultEntity();
            resultEntity.Result = false;

            string s = @"^([A-Fa-f0-9]{2}[-,:]){5}[A-Fa-f0-9]{2}$";
            Regex rStr = new Regex(s);
            if (rStr.IsMatch(userdata.IpMac))
            {
            using (TransactionScope scope = new TransactionScope())
            {

@@ -329,14 +328,15 @@
                                return JsonConvert.SerializeObject(resultEntity);
                            }
                        }

                    }


                }
                scope.Complete();
            }

            }
            else
            {
                resultEntity.Message = "MAC地址格式错误";
            }
            return JsonConvert.SerializeObject(resultEntity);
        }
        #endregion

 zhengcaioa/zhengcaioa/Views/User/Edit.cshtml

@@ -152,22 +152,27 @@
                                        <input type="hidden" id="Id" name="Id" value="@Model.Id" />
                                    </div>

                                    <label class="text-right col-sm-1 col-md-1 control-label">工号<i class="red">*</i></label>
                                    <div class="col-sm-2 col-md-2">
                                        <input id="Usernumber" class="form-control" label="工号" name="Usernumber" labtype="txt" addvisible="true" maxlength="20" editvisible="true" reg="" ismust="true" type="text" value="@Model.Usernumber">
                                    </div>

                                    <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 id="Passwordchushi" class="form-control" label="初始密码" name="Passwordchushi" labtype="txt" addvisible="true" maxlength="500" editvisible="true" reg="" ismust="true" type="text" value="@Model.Passwordchushi">

                                       
                                    </div>

                                    <div class="col-sm-2 col-md-2" grouptype="Vdata">
                                        

                                        <a class="btn btn-success" href="javascript:void(0)" onclick="savechushi();" style="margin-left:4px; border-radius:4px;">
                                            <i class="glyphicon glyphicon-ok"></i>&nbsp;&nbsp;<span class="bold">设置初始密码</span>
                                        </a>
                                    </div>

                                </div>

                                <div class="clearfix layer-area" style="padding-bottom:15px;">
                                    <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">
                                        <select id="IsYwjl" class="form-control" name="IsYwjl" data-placeholder="选择 åºåˆ— ...">
@@ -186,16 +191,127 @@
                                                        @item.Comments
                                                    </option>
                                                }
                                            }
                                        </select>
                                    </div>

                                    <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">
                                        <select id="Isxmenter" class="form-control" name="Isxmenter" data-placeholder="选择 åºåˆ— ...">
                                            <option value="" hassubinfo="true">请选择</option>
                                            @foreach (var item in shifou)
                                            {
                                                @if (!item.CodeSn.Equals(Model.Isxmenter))
                                                {
                                                    <option value="@item.CodeSn" hassubinfo="true">
                                                        @item.Comments
                                                    </option>
                                                }
                                                else
                                                {
                                                    <option value="@item.CodeSn" hassubinfo="true" selected="selected">
                                                        @item.Comments
                                                    </option>
                                            }
                                            }
                                        </select>
                                    </div>

                                    <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">
                                        <select id="Iswdenter" class="form-control" name="Iswdenter" data-placeholder="选择 åºåˆ— ...">
                                            <option value="" hassubinfo="true">请选择</option>
                                            @foreach (var item in shifou)
                                            {
                                                @if (!item.CodeSn.Equals(Model.Iswdenter))
                                                {
                                                    <option value="@item.CodeSn" hassubinfo="true">
                                                        @item.Comments
                                                    </option>
                                                }
                                                else
                                                {
                                                    <option value="@item.CodeSn" hassubinfo="true" selected="selected">
                                                        @item.Comments
                                                    </option>
                                                }
                                            }
                                        </select>
                                    </div>
                                </div>

                                <div class="clearfix layer-area" style="padding-bottom:15px;">
                                    <label class="text-right col-sm-1 col-md-1 control-label">姓名<i class="red">*</i></label>
                                    <div class="col-sm-2 col-md-2">
                                        <input id="UserName" class="form-control" label="姓名" name="UserName" labtype="txt" addvisible="true" maxlength="50" editvisible="true" reg="" ismust="true" type="text" value="@Model.UserName">
                                    </div>

                                    <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">
                                        <select id="Sex" class="form-control" name="Sex" data-placeholder="选择 åºåˆ— ...">
                                            <option value="" hassubinfo="true">请选择</option>
                                            @foreach (var item in sex)
                                            {
                                                @if (!item.CodeSn.Equals(Model.Sex))
                                                {
                                                    <option value="@item.CodeSn" hassubinfo="true">
                                                        @item.Comments
                                                    </option>
                                                }
                                                else
                                                {
                                                    <option value="@item.CodeSn" hassubinfo="true" selected="selected">
                                                        @item.Comments
                                                    </option>
                                                }
                                            }
                                        </select>

                                    </div>

                                    <label class="text-right col-sm-1 col-md-1 control-label">学历</label>
                                    <div class="col-sm-2 col-md-2">
                                        <input id="Education" class="form-control" label="学历" name="Education" labtype="txt" addvisible="true" maxlength="50" editvisible="true" reg="" ismust="true" type="text" value="@Model.Education">
                                    </div>
                                    <label class="text-right col-sm-1 col-md-1 control-label">毕业院校</label>
                                    <div class="col-sm-2 col-md-2">
                                        <input id="School" class="form-control" label="毕业院校" name="School" labtype="txt" addvisible="true" maxlength="50" editvisible="true" reg="" ismust="true" type="text" value="@Model.School">
                                    </div>
                                </div>

                                <div class="clearfix layer-area" style="padding-bottom:15px;">
                                    <label class="text-right col-sm-1 col-md-1 control-label">身份证号<i class="red">*</i></label>
                                    <div class="col-sm-2 col-md-2">
                                        <input id="Idcard" class="form-control" label="身份证号" name="Idcard" labtype="txt" addvisible="true" maxlength="50" editvisible="true" reg="" ismust="true" type="text" value="@Model.Idcard">
                                    </div>
                                    <label class="text-right col-sm-1 col-md-1 control-label">政治面貌 </label>
                                    <div class="col-sm-2 col-md-2">
                                        <input id="Zhengzhi" class="form-control" label="政治面貌" name="Zhengzhi" labtype="txt" addvisible="true" maxlength="50" editvisible="true" reg="" ismust="true" type="text" value="@Model.Zhengzhi">
                                    </div>

                                    <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">
                                        <select id="IsMaryed" class="form-control" name="IsMaryed" data-placeholder="选择 åºåˆ— ...">
                                            <option value="" hassubinfo="true">请选择</option>
                                            @foreach (var item in isMaryed)
                                            {
                                                @if (!item.CodeSn.Equals(Model.IsMaryed))
                                                {
                                                    <option value="@item.CodeSn" hassubinfo="true">
                                                        @item.Comments
                                                    </option>
                                                }
                                                else
                                                {
                                                    <option value="@item.CodeSn" hassubinfo="true" selected="selected">
                                                        @item.Comments
                                                    </option>
                                                }

                                            }
                                            }
                                        </select>
                                    </div>
                                </div>

                                <div class="clearfix layer-area" style="padding-bottom:15px;">
                                    <label grouptype="Vdata" class="text-right col-sm-1 col-md-1 control-label">部门<i class="red">*</i></label>
@@ -272,16 +388,12 @@
                                                @item.Comments
                                            </option>
                                                }

                                            }
                                            }

                                        </select>
                                    </div>

                                    </div>


                                </div>
                                <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">
@@ -330,14 +442,11 @@
                                    <label class="text-right col-sm-1 col-md-1 control-label">计薪时间 </label>
                                    <div class="col-sm-2 col-md-2">
                                        <input id="Indate" class="form-control" label="计薪时间" name="Indate" labtype="txt" addvisible="true" editvisible="true" reg="" ismust="true" type="text" value="@Model.IndateName" readonly="readonly">

                                    </div>
                                    <label class="text-right col-sm-1 col-md-1 control-label">社保购买时间 </label>
                                    <div class="col-sm-2 col-md-2">
                                        <input id="Shebaodate" class="form-control" label="计薪时间" name="Shebaodate" labtype="txt" addvisible="true" editvisible="true" reg="" ismust="true" type="text" value="@Model.ShebaodateName" readonly="readonly">

                                    </div>

                                    <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">
                                        <select id="Zhiwustatus" class="form-control" name="Zhiwustatus" data-placeholder="选择 åºåˆ— ...">
@@ -356,29 +465,55 @@
                                                @item.Comments
                                            </option>
                                                }

                                            }
                                            }

                                        </select>

                                    </div>

                                    <label class="text-right col-sm-1 col-md-1 control-label">工作电脑MAC<i class="red">*</i> </label>
                                    <div class="col-sm-2 col-md-2">
                                        <input id="IpMac" class="form-control" label="工作电脑MAC" name="IpMac" labtype="txt" addvisible="true" maxlength="30" editvisible="true" reg="" ismust="true" type="text" value="@Model.IpMac">
                                    </div>
                                </div>

                                <div class="clearfix layer-area" style="padding-bottom:15px;">
                                    <label class="text-right col-sm-1 col-md-1 control-label">姓名<i class="red">*</i></label>
                                    <label class="text-right col-sm-1 col-md-1 control-label">预发工资 </label>
                                    <div class="col-sm-2 col-md-2">
                                        <input id="UserName" class="form-control" label="姓名" name="UserName" labtype="txt" addvisible="true" maxlength="50" editvisible="true" reg="" ismust="true" type="text" value="@Model.UserName">
                                        <div class="col-sm-9 col-md-9" style="padding:0">
                                            <input class="form-control" label="预发工资" name="advancewages" labtype="txt" addvisible="true" maxlength="20" editvisible="true" reg="" ismust="true" type="text" value="@Model.advancewages" oninput="if(value.length>8)value=value.slice(0,10)" onkeyup="value=value.toString().match(/^\d+(?:\.\d{0,2})?/)">
                                        </div>
                                        <div class="col-sm-3 col-md-3" style="padding:0 0 0 10px">
                                            <label class="text-left control-label">元/月</label>
                                        </div>                                        
                                    </div>

                                    <label grouptype="Vdata" class="text-right col-sm-1 col-md-1 control-label">性别 </label>
                                    <label class="text-right col-sm-1 col-md-1 control-label">保底年薪</label>
                                    <div class="col-sm-2 col-md-2">
                                        
                                        <div class="col-sm-9 col-md-9" style="padding:0">                                            
                                            <input class="form-control" label="保底年薪" name="miniyearsalary" labtype="txt" addvisible="true" maxlength="20" editvisible="true" reg="" ismust="true" type="text" value="@Model.miniyearsalary" oninput="if(value.length>8)value=value.slice(0,10)" onkeyup="value=value.toString().match(/^\d+(?:\.\d{0,2})?/)">
                                        </div>
                                        <div class="col-sm-3 col-md-3" style="padding:0 0 0 10px">
                                            <label class="text-left control-label">元/å¹´</label>
                                        </div>
                                    </div>
                                    <label class="text-right col-sm-1 col-md-1 control-label">工龄工资</label>
                                    <div class="col-sm-2 col-md-2">
                                        <div class="col-sm-9 col-md-9" style="padding:0">
                                            <input class="form-control" label="工龄工资" name="senioritywages" labtype="txt" addvisible="true" maxlength="20" editvisible="true" reg="" ismust="true" type="text" value="@Model.senioritywages" oninput="if(value.length>8)value=value.slice(0,10)" onkeyup="value=value.toString().match(/^\d+(?:\.\d{0,2})?/)">
                                        </div>
                                        <div class="col-sm-3 col-md-3" style="padding:0 0 0 10px">
                                            <label class="text-left control-label">元/å¹´</label>
                                        </div>
                                        
                                    </div>

                                    <label class="text-right col-sm-1 col-md-1 control-label">是否交通补贴</label>
                                    <div class="col-sm-2 col-md-2" grouptype="Vdata">
                                        <select id="Sex" class="form-control" name="Sex" data-placeholder="选择 åºåˆ— ...">
                                        <select class="form-control" name="Istravelsubsidy" data-placeholder="选择 åºåˆ— ...">
                                            <option value="" hassubinfo="true">请选择</option>
                                            @foreach (var item in sex)
                                            @foreach (var item in shifou)
                                            {
                                            @if (!item.CodeSn.Equals(Model.Sex))
                                                @if (!item.CodeSn.Equals(Model.Istravelsubsidy))
                                                {
                                            <option value="@item.CodeSn" hassubinfo="true">
                                                @item.Comments
@@ -390,61 +525,9 @@
                                                @item.Comments
                                            </option>
                                                }

                                            }
                                            }

                                        </select>

                                    </div>
                                    <label class="text-right col-sm-1 col-md-1 control-label">学历</label>
                                    <div class="col-sm-2 col-md-2">
                                        <input id="Education" class="form-control" label="学历" name="Education" labtype="txt" addvisible="true" maxlength="50" editvisible="true" reg="" ismust="true" type="text" value="@Model.Education">
                                    </div>
                                    <label class="text-right col-sm-1 col-md-1 control-label">毕业院校</label>
                                    <div class="col-sm-2 col-md-2">
                                        <input id="School" class="form-control" label="毕业院校" name="School" labtype="txt" addvisible="true" maxlength="50" editvisible="true" reg="" ismust="true" type="text" value="@Model.School">
                                    </div>


                                </div>

                                <div class="clearfix layer-area" style="padding-bottom:15px;">
                                    <label class="text-right col-sm-1 col-md-1 control-label">身份证号<i class="red">*</i></label>
                                    <div class="col-sm-2 col-md-2">
                                        <input id="Idcard" class="form-control" label="身份证号" name="Idcard" labtype="txt" addvisible="true" maxlength="50" editvisible="true" reg="" ismust="true" type="text" value="@Model.Idcard">
                                    </div>
                                    <label class="text-right col-sm-1 col-md-1 control-label">政治面貌 </label>
                                    <div class="col-sm-2 col-md-2">
                                        <input id="Zhengzhi" class="form-control" label="政治面貌" name="Zhengzhi" labtype="txt" addvisible="true" maxlength="50" editvisible="true" reg="" ismust="true" type="text" value="@Model.Zhengzhi">
                                    </div>

                                    <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">
                                        <select id="IsMaryed" class="form-control" name="IsMaryed" data-placeholder="选择 åºåˆ— ...">
                                            <option value="" hassubinfo="true">请选择</option>
                                            @foreach (var item in isMaryed)
                                            {
                                            @if (!item.CodeSn.Equals(Model.IsMaryed))
                                                {
                                            <option value="@item.CodeSn" hassubinfo="true">
                                                @item.Comments
                                            </option>
                                                }
                                                else
                                                {
                                            <option value="@item.CodeSn" hassubinfo="true" selected="selected">
                                                @item.Comments
                                            </option>
                                                }

                                            }
                                            }

                                        </select>

                                    </div>

                                </div>

                                <div class="clearfix layer-area" style="padding-bottom:15px;">
@@ -462,6 +545,7 @@
                                    </div>

                                </div>

                                <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">
@@ -471,9 +555,8 @@
                                    <div class="col-sm-2 col-md-2">
                                        <input id="JinjiPhone" class="form-control" label="联系电话" name="JinjiPhone" labtype="txt" addvisible="true" maxlength="50" editvisible="true" reg="" ismust="true" type="text" value="@Model.JinjiPhone">
                                    </div>


                                </div>

                                <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">
@@ -497,7 +580,6 @@
                                        <input id="HjYoubian" class="form-control" label="邮编" name="HjYoubian" labtype="txt" addvisible="true" maxlength="50" editvisible="true" reg="" ismust="true" type="text" value="@Model.HjYoubian">
                                    </div>


                                </div>

                                <div class="clearfix layer-area" style="padding-bottom:15px;">
@@ -506,6 +588,7 @@
                                        <textarea class="form-control bt" id="Reamrk" name="Reamrk" title="个人简历" isempty="" maxlength="4000" length="long" style="resize:none;overflow-y:hidden; min-height:80px;" onpropertychange="this.style.height=this.scrollHeight + 'px'" oninput="this.style.height=this.scrollHeight + 'px'">@Model.Reamrk</textarea>
                                    </div>
                                </div>

                                <div class="clearfix layer-area" style="padding-bottom:15px;">
                                    <label grouptype="Vdata" class="text-right col-sm-1 col-md-1 control-label">家庭成员</label>

@@ -566,11 +649,7 @@

                                        </div>
                                        }



                                    }

                                </div>


@@ -581,7 +660,8 @@
                                    </div>
                                </div>
                                <div id='file-list-display-shenfenzhengbeimiansssss' style="width: 100%;text-align: left; background-color:white">
                                    @{ for (int i = 0; i < shenfenzhengbeimiansssss.Count; i++)
                                    @{
                                        for (int i = 0; i < shenfenzhengbeimiansssss.Count; i++)
                                        {
                                        <div>
                                            <img src="@shenfenzhengbeimiansssss[i].Filepath" alt="" style="width:200px;">     &nbsp;  <a href='javascript: void (0);' onclick='js_method(this,"@shenfenzhengbeimiansssss[i].Id")'><i class='glyphicon glyphicon-remove'></i> </a>
@@ -592,9 +672,6 @@

                                        </div>
                                        }



                                    }

                                </div>
@@ -618,9 +695,6 @@

                                        </div>
                                        }



                                    }

                                </div>
@@ -632,7 +706,8 @@
                                    </div>
                                </div>
                                <div id='file-list-display-zhiyezigezhengsssss' style="width: 100%;text-align: left; background-color:white">
                                    @{ for (int i = 0; i < zhiyezigezhengsssss.Count; i++)
                                    @{
                                        for (int i = 0; i < zhiyezigezhengsssss.Count; i++)
                                        {
                                        <div>
                                            <img src="@zhiyezigezhengsssss[i].Filepath" alt="" style="width:200px;"> &nbsp;  <a href='javascript: void (0);' onclick='js_method(this,"@zhiyezigezhengsssss[i].Id")'><i class='glyphicon glyphicon-remove'></i> </a>
@@ -643,9 +718,6 @@

                                        </div>
                                        }



                                    }

                                </div>
@@ -657,7 +729,8 @@
                                    </div>
                                </div>
                                <div id='file-list-display-qitazhengshusssss' style="width: 100%;text-align: left; background-color:white">
                                    @{ for (int i = 0; i < qitazhengshusssss.Count; i++)
                                    @{
                                        for (int i = 0; i < qitazhengshusssss.Count; i++)
                                        {
                                        <div>

@@ -670,9 +743,6 @@

                                        </div>
                                        }



                                    }

                                </div>
@@ -700,7 +770,7 @@

    </form>
    <script type="text/javascript">
        var hh = document.body.clientHeight - $('.ibox-title').height() - $("#top").height() * 2 - 95;
        var hh = document.body.clientHeight - $('.ibox-title').height() - $("#top").height() * 2 - 45;
        $("#div_content").height(hh);

        $("#ZhuanjiaList").chosen();
@@ -785,9 +855,25 @@
                toastr.warning("用户名不能为空");
                return;
            }
            if ($.trim($("#Usernumber").val()) == '') {
                toastr.warning("工号不能为空");
                return;
            }

            if ($("#IsYwjl").val() == '') {
                toastr.warning("是否业务经理不能为空");
                return;
            }


            if ($("#Isxmenter").val() == '') {
                toastr.warning("是否项目录入不能为空");
                return;
            }


            if ($("#Iswdenter").val() == '') {
                toastr.warning("是否问答录入不能为空");
                return;
            }

@@ -813,6 +899,10 @@
                return;
            }

            if ($.trim($("#IpMac").val()) == '') {
                toastr.warning("工作电脑MAC不能为空");
                return;
            }

            $.ajax({
                type: "POST",
@@ -840,7 +930,7 @@
                        }
                        else {
                            // toastr.error("失败");
                            parent.layer.msg('失败', { icon: 5 });
                            parent.layer.msg('失败' + data.Message, { icon: 5 });
                        }

                },

 zhengcaioa/zhengcaioa/zhengcaioa.csproj.user

@@ -15,5 +15,6 @@
    <WebStackScaffolding_IsPartialViewSelected>False</WebStackScaffolding_IsPartialViewSelected>
    <WebStackScaffolding_IsReferencingScriptLibrariesSelected>False</WebStackScaffolding_IsReferencingScriptLibrariesSelected>
    <WebStackScaffolding_LayoutPageFile />
    <ShowAllFiles>true</ShowAllFiles>
  </PropertyGroup>
</Project>

 Óû§±í¸üÐÂ.sql

New file
@@ -0,0 +1,13 @@
use zhengcaioa
go
alter table plt_user add 

ipmac nvarchar(30) null,
usernumber nvarchar(30) null,
is_xmenter nvarchar(1) null,
is_wdenter nvarchar(1) null,
advancewages decimal(10, 2) null,
miniyearsalary decimal(10,2) null,
senioritywages decimal(10,2) null,
is_travelsubsidy nvarchar(1) null
go