username@email.com
2021-06-15 884e6a825427ef6511e7b7396635fe39c53f4fb4
Merge branch 'master' of http://47.108.235.38:8080/r/zhengcaioa

# Conflicts:
# zhengcaioa/.vs/zhengcaioa/DesignTimeBuild/.dtbcache.v2
# zhengcaioa/.vs/zhengcaioa/config/applicationhost.config
# zhengcaioa/.vs/zhengcaioa/v16/.suo
15个文件已修改
1个文件已添加
841 ■■■■■ 已修改文件
.gitignore 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
zhengcaioa/.vs/zhengcaioa/v16/.suo 补丁 | 查看 | 原始文档 | blame | 历史
zhengcaioa/DTO/PltUserDTO.cs 42 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
zhengcaioa/Model/PltUser.cs 10 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
zhengcaioa/Model/zhengcaioaContext.cs 18 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
zhengcaioa/Services/AdmSigninService.cs 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
zhengcaioa/Services/UserService.cs 19 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
zhengcaioa/zhengcaioa/Controllers/AdmManagement/SigninController.cs 84 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
zhengcaioa/zhengcaioa/Controllers/UserController.cs 134 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
zhengcaioa/zhengcaioa/Startup.cs 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
zhengcaioa/zhengcaioa/Views/Shared/_Layout_Header.cshtml 7 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
zhengcaioa/zhengcaioa/Views/Signin/Index.cshtml 27 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
zhengcaioa/zhengcaioa/Views/Signin/Signin.cshtml 11 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
zhengcaioa/zhengcaioa/Views/User/Edit.cshtml 472 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
zhengcaioa/zhengcaioa/zhengcaioa.csproj.user 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
用户表更新.sql 13 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
.gitignore
@@ -12,3 +12,4 @@
zhengcaioa/Services/obj/
zhengcaioa/zhengcaioa/wwwroot/UploadingFiles/
zhengcaioa/zhengcaioa/wwwroot/UploadFile/
/zhengcaioa/.vs
zhengcaioa/.vs/zhengcaioa/v16/.suo
Binary files differ
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
@@ -3294,6 +3294,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/AdmSigninService.cs
@@ -20,6 +20,7 @@
        }
        #region è€ƒå‹¤æ‰“卡
        public ResultEntity save(string id, int signinType)
        {
            ResultEntity resultEntity = new ResultEntity();
zhengcaioa/Services/UserService.cs
@@ -84,13 +84,21 @@
                    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)))
                {
                    resultEntity.Result = false;
                    resultEntity.Message = "用户手机号重复";
                    return resultEntity;
                }
                }
                var checkIdcard = _context.PltUsers.Where(x => x.Idcard == pltUserDTO.Idcard && x.RecStatus == "A" && x.Id != pltUserDTO.Id).FirstOrDefault();
                if (checkIdcard != null && (string.IsNullOrWhiteSpace(pltUserDTO.Id) || (!string.IsNullOrWhiteSpace(pltUserDTO.Id) && checkIdcard.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/AdmManagement/SigninController.cs
@@ -11,6 +11,7 @@
using Microsoft.AspNetCore.Http;
using Newtonsoft.Json.Linq;
using System.Transactions;
using System.Runtime.InteropServices;
namespace zhengcaioa.Controllers.AdmManagement
{
@@ -85,13 +86,90 @@
        /// <param name="signinType">10早上上班  11早上下班  20下午上班   21下午下班   30加班上班  31加班下班</param>
        /// <returns></returns>
        [CheckLogin]
        public string Save(string id,int signinType)
        {
            ResultEntity resultEntity = _signinService.save(id, signinType);
        public string Save(string id,int signinType,string mac)
        {
            ResultEntity resultEntity = new ResultEntity();
            resultEntity.Result = false;
            try
            {
                if (string.IsNullOrEmpty(mac))
                {
                    resultEntity = _signinService.save(id, signinType);
                }
                else
                {
                    var curentuser = JsonConvert.DeserializeObject<PltUser>(HttpContext.Session.GetString("User"));
                    if(curentuser.IpMac == mac)
                    {
                        //var mac = GetClientMAC(GetClientIP());
                    }
                    else
                    {
                        resultEntity.Message = "打卡电脑检查不匹配。";
                    }
                }
            }
            catch(Exception er)
            { }
            return JsonConvert.SerializeObject(resultEntity);
        }
        [DllImport("Iphlpapi.dll")]
        private static extern int SendARP(Int32 dest, Int32 host, ref Int64 mac, ref Int32 length);
        [DllImport("Ws2_32.dll")]
        private static extern Int32 inet_addr(string ip);
        private string GetClientIP()
        {
            HttpContextAccessor context = new HttpContextAccessor();
            var ip = context.HttpContext?.Connection.RemoteIpAddress.ToString();
            var mac = GetClientMAC(ip);
            var str = "IP:" + ip + "   ï¼ŒMAC:" + mac;
            return str;
        }
        private string GetClientMAC(string ip)
        {
            string mac_dest = string.Empty;
            try
            {
                Int32 ldest = inet_addr(ip); //目的地的ip
                Int32 lhost = inet_addr(""); //服务器的ip
                Int64 macinfo = new Int64();
                Int32 len = 6;
                int res = SendARP(ldest, 0, ref macinfo, ref len);
                string mac_src = macinfo.ToString("X");
                while (mac_src.Length < 12)
                {
                    mac_src = mac_src.Insert(0, "0");
                }
                for (int i = 0; i < 11; i++)
                {
                    if (0 == (i % 2))
                    {
                        if (i == 10)
                        {
                            mac_dest = mac_dest.Insert(0, mac_src.Substring(i, 2));
                        }
                        else
                        {
                            mac_dest = "-" + mac_dest.Insert(0, mac_src.Substring(i, 2));
                        }
                    }
                }
            }
            catch (Exception ex)
            {
                throw ex;
            }
            return mac_dest;
        }
        /// <summary>
        /// å–得今天签到信息
        /// </summary>
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,85 +252,91 @@
            ViewData["curentuser"] = curentuser;
            ResultEntity resultEntity = new ResultEntity();
            resultEntity.Result = false;
            using (TransactionScope scope = new TransactionScope())
            string s = @"^([A-Fa-f0-9]{2}[-,:]){5}[A-Fa-f0-9]{2}$";
            Regex rStr = new Regex(s);
            if (rStr.IsMatch(userdata.IpMac))
            {
                userdata.RecStatus = "A";
                if (String.IsNullOrEmpty(userdata.Id))
                using (TransactionScope scope = new TransactionScope())
                {
                    userdata.Creater = curentuser.Id;
                    userdata.Createtime = DateTime.Now;
                }
                userdata.Modifier = curentuser.Id;
                userdata.Modifytime = DateTime.Now;
                resultEntity = _userService.savePltUser(userdata);
                if (resultEntity.Result == false)
                {
                    return JsonConvert.SerializeObject(resultEntity);
                }
                string[] JiatingchengyuanId = userdata.JiatingchengyuanId;
                string[] Name = userdata.Name;
                string[] Guanxi = userdata.Guanxi;
                string[] Gongzuodanwei = userdata.Gongzuodanwei;
                for (int i = 0; i < JiatingchengyuanId.Length; i++)
                {
                    PltJiatingchengyuanDTO pltJiatingchengyuanDTO = new PltJiatingchengyuanDTO();
                    pltJiatingchengyuanDTO.Id = JiatingchengyuanId[i] == null ? "" : JiatingchengyuanId[i].Trim();
                    pltJiatingchengyuanDTO.UserId = userdata.Id;
                    pltJiatingchengyuanDTO.Name = Name[i] == null ? "" : Name[i].Trim();
                    pltJiatingchengyuanDTO.Guanxi = Guanxi[i] == null ? "" : Guanxi[i].Trim();
                    pltJiatingchengyuanDTO.Gongzuodanwei = Gongzuodanwei[i] == null ? "" : Gongzuodanwei[i].Trim();
                    pltJiatingchengyuanDTO.RecStatus = "A";
                    if (String.IsNullOrEmpty(JiatingchengyuanId[i]))
                    userdata.RecStatus = "A";
                    if (String.IsNullOrEmpty(userdata.Id))
                    {
                        pltJiatingchengyuanDTO.Creater = curentuser.Id;
                        pltJiatingchengyuanDTO.Createtime = DateTime.Now;
                        userdata.Creater = curentuser.Id;
                        userdata.Createtime = DateTime.Now;
                    }
                    pltJiatingchengyuanDTO.Modifier = curentuser.Id;
                    pltJiatingchengyuanDTO.Modifytime = DateTime.Now;
                    resultEntity = _pltJiatingchengyuanService.save(pltJiatingchengyuanDTO);
                    userdata.Modifier = curentuser.Id;
                    userdata.Modifytime = DateTime.Now;
                    resultEntity = _userService.savePltUser(userdata);
                    if (resultEntity.Result == false)
                    {
                        return JsonConvert.SerializeObject(resultEntity);
                    }
                }
                    string[] JiatingchengyuanId = userdata.JiatingchengyuanId;
                    string[] Name = userdata.Name;
                    string[] Guanxi = userdata.Guanxi;
                    string[] Gongzuodanwei = userdata.Gongzuodanwei;
                string[] Filepaths = userdata.Filepath;
                if (Filepaths != null && Filepaths.Length > 0)
                {
                    for (int i = 0; i < Filepaths.Length; i++)
                    for (int i = 0; i < JiatingchengyuanId.Length; i++)
                    {
                        if (string.IsNullOrEmpty(userdata.attachmentid[i]))
                        PltJiatingchengyuanDTO pltJiatingchengyuanDTO = new PltJiatingchengyuanDTO();
                        pltJiatingchengyuanDTO.Id = JiatingchengyuanId[i] == null ? "" : JiatingchengyuanId[i].Trim();
                        pltJiatingchengyuanDTO.UserId = userdata.Id;
                        pltJiatingchengyuanDTO.Name = Name[i] == null ? "" : Name[i].Trim();
                        pltJiatingchengyuanDTO.Guanxi = Guanxi[i] == null ? "" : Guanxi[i].Trim();
                        pltJiatingchengyuanDTO.Gongzuodanwei = Gongzuodanwei[i] == null ? "" : Gongzuodanwei[i].Trim();
                        pltJiatingchengyuanDTO.RecStatus = "A";
                        if (String.IsNullOrEmpty(JiatingchengyuanId[i]))
                        {
                            SysAttachmentDTO sysAttachmentDTO = new SysAttachmentDTO();
                            //sysAttachmentDTO.Id =
                            sysAttachmentDTO.AttObj = userdata.AttObj[i];
                            sysAttachmentDTO.AttObjid = userdata.Id;
                            sysAttachmentDTO.Filefullname = userdata.Filefullname[i];
                            sysAttachmentDTO.Filepath = userdata.Filepath[i];
                            sysAttachmentDTO.Creater = curentuser.Id;
                            sysAttachmentDTO.Modifier = curentuser.Id;
                            sysAttachmentDTO.Createtime = DateTime.Now;
                            sysAttachmentDTO.Modifytime = sysAttachmentDTO.Createtime;
                            resultEntity = _sysAttachmentService.save(sysAttachmentDTO);
                            if (resultEntity.Result == false)
                            {
                                return JsonConvert.SerializeObject(resultEntity);
                            }
                            pltJiatingchengyuanDTO.Creater = curentuser.Id;
                            pltJiatingchengyuanDTO.Createtime = DateTime.Now;
                        }
                        pltJiatingchengyuanDTO.Modifier = curentuser.Id;
                        pltJiatingchengyuanDTO.Modifytime = DateTime.Now;
                        resultEntity = _pltJiatingchengyuanService.save(pltJiatingchengyuanDTO);
                        if (resultEntity.Result == false)
                        {
                            return JsonConvert.SerializeObject(resultEntity);
                        }
                    }
                    string[] Filepaths = userdata.Filepath;
                    if (Filepaths != null && Filepaths.Length > 0)
                    {
                        for (int i = 0; i < Filepaths.Length; i++)
                        {
                            if (string.IsNullOrEmpty(userdata.attachmentid[i]))
                            {
                                SysAttachmentDTO sysAttachmentDTO = new SysAttachmentDTO();
                                //sysAttachmentDTO.Id =
                                sysAttachmentDTO.AttObj = userdata.AttObj[i];
                                sysAttachmentDTO.AttObjid = userdata.Id;
                                sysAttachmentDTO.Filefullname = userdata.Filefullname[i];
                                sysAttachmentDTO.Filepath = userdata.Filepath[i];
                                sysAttachmentDTO.Creater = curentuser.Id;
                                sysAttachmentDTO.Modifier = curentuser.Id;
                                sysAttachmentDTO.Createtime = DateTime.Now;
                                sysAttachmentDTO.Modifytime = sysAttachmentDTO.Createtime;
                                resultEntity = _sysAttachmentService.save(sysAttachmentDTO);
                                if (resultEntity.Result == false)
                                {
                                    return JsonConvert.SerializeObject(resultEntity);
                                }
                            }
                        }
                    }
                    scope.Complete();
                }
                scope.Complete();
            }
            else
            {
                resultEntity.Message = "MAC地址格式错误";
            }
            return JsonConvert.SerializeObject(resultEntity);
        }
        #endregion
zhengcaioa/zhengcaioa/Startup.cs
@@ -62,6 +62,7 @@
                options.CheckConsentNeeded = context => true;
                options.MinimumSameSitePolicy = SameSiteMode.None;
            });
            services.AddSingleton<IHttpContextAccessor, HttpContextAccessor>();
            var connectionString = Configuration.GetConnectionString("DefaultConnection");
            services.AddDbContext<zhengcaioaContext>(options =>
zhengcaioa/zhengcaioa/Views/Shared/_Layout_Header.cshtml
@@ -61,7 +61,7 @@
            <ul class="nav navbar-top-links navbar-right">
                <li class="hidden-xs">
                    <a class="J_menuItem count-info" href="/DailyManagement/ShowRemind/" title="代办工作" data-index="0">
                        <i id="imgRemindCount" class="fa fa-info-circle animated"  style="font-size:larger;"></i>
                        <i id="imgRemindCount" class="fa fa-info-circle animated" style="font-size:larger;"></i>
                        <span class="label label-danger" id="RemindCount">0</span>
                    </a>
                </li>
@@ -72,6 +72,11 @@
                    </a>
                </li>
                <li class="hidden-xs">
                    <a href="http://47.108.235.38:8082/admin/login.aspx?user=test&pwd=123456" target="_blank" class="J_menuItem" title="商城后台跳转" data-index="0">
                        <i class="fa fa-lock"></i>商城后台跳转
                    </a>
                </li>
                <li class="hidden-xs">
                    <a href="javascript:void(0)" class="J_tabExit" title="用户" data-index="0">@actionlist.UserName</a>
                </li>
                <li class="hidden-xs">
zhengcaioa/zhengcaioa/Views/Signin/Index.cshtml
@@ -125,10 +125,10 @@
                            <div class="clearfix layer-area" style="padding-bottom:15px;">
                                <label class="text-right col-sm-1 col-md-1 control-label">上午</label>
                                <a class="btn btn-success" href="javascript:void(0)" onclick="saveSignin(10);" style="margin-left:4px; border-radius:4px;">
                                <a class="btn btn-success" href="javascript:void(0)" onclick="networkInfo()" style="margin-left:4px; border-radius:4px;">
                                    <span class="bold">上班打卡</span>
                                </a>
                                @*saveSignin(10);*@
                                &nbsp;&nbsp;
                                <a class="btn btn-success" href="javascript:void(0)" onclick="saveSignin(11);" style="margin-left:4px; border-radius:4px;">
@@ -192,6 +192,7 @@
        var record;
        var mac;
        $(function () {
            $.ajax({
                type: "GET",
@@ -208,7 +209,7 @@
                }
            })
            mac = networkInfo();
        });
        var _SigninList = function () {
@@ -217,7 +218,6 @@
        // ä¿å­˜æ‰“卡信息
        function saveSignin(signinType ) {
         
            $.ajax({
                type: "POST",
                url: "/Signin/Save",
@@ -225,7 +225,12 @@
                global: false,
                data: {id: record.Id  ,signinType: signinType},// $('form').serializeArray(),
                success: function (data) {
                    toastr.success("打卡成功");
                    if (data.Result) {
                        toastr.success("打卡成功");
                    }
                    else {
                        toastr.success("打卡失败");
                    }
                },
                error: function () {
                    toastr.error("打卡失败");
@@ -242,6 +247,18 @@
            return false;
        }
        function networkInfo() {
            var wmi = new ActiveXObject("WbemScripting.SWbemLocator");
            var service = wmi.ConnectServer(".");
            e = new Enumerator(service.ExecQuery("SELECT * FROM Win32_NetworkAdapterConfiguration WHERE IPEnabled = True"));
            for (; !e.atEnd(); e.moveNext()) {
                var s = e.item();
                var macAddress = unescape(s.MACAddress);
            }
            return macAddress;
        }
    </script>
</body>
</html>
zhengcaioa/zhengcaioa/Views/Signin/Signin.cshtml
@@ -10,6 +10,13 @@
    <script type="text/javascript">
        var year = '@Html.Raw(Newtonsoft.Json.JsonConvert.SerializeObject(ViewBag.year))';
        var month = '@Html.Raw(Newtonsoft.Json.JsonConvert.SerializeObject(ViewBag.month))';        
        var myDate = new Date();
        //获取当前年
        var searchyear = myDate.getFullYear();
        //获取当前月
        var searchmonth = myDate.getMonth() + 1;
        dataCol = [
            { label: 'id', name: 'Id', labtype: 'txt', hidden: true },
            {
@@ -42,8 +49,8 @@
        //?userId=" + "@ViewBag.userId";
        searchCol = [
            { label: '查询时间:å¹´', name: 'Year', labtype: 'combox', hidden: false, defultvalue: JSON.parse(year)[1].code , data: JSON.parse(year), cwidth: '5%', cccwidth: '9%' },
            { label: '月', name: 'Month', labtype: 'combox', hidden: false, data: JSON.parse(month), cwidth: '1%', cccwidth: '7%' }
            { label: '查询时间:年', name: 'Year', labtype: 'combox', hidden: false, defultvalue: searchyear , data: JSON.parse(year), cwidth: '5%', cccwidth: '9%' },
            { label: '月', name: 'Month', labtype: 'combox', hidden: false, defultvalue: searchmonth ,data: JSON.parse(month), cwidth: '1%', cccwidth: '7%' }
        ];
zhengcaioa/zhengcaioa/Views/User/Edit.cshtml
@@ -140,7 +140,7 @@
                <div class="col-sm-12">
                    <div class="ibox float-e-margins">
                        <div class="ibox-title">
                            <h5>                            <i class="fa fa-list"></i>&nbsp;项目录入</h5>
                            <h5><i class="fa fa-list"></i>&nbsp;项目录入</h5>
                        </div>
                        <div id="div_content" class="ibox-content" style="background-color:white;">
                            <div class="row">
@@ -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">
                                    <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>
@@ -204,17 +320,17 @@
                                            <option value="" hassubinfo="true">请选择</option>
                                            @foreach (var item in dept)
                                            {
                                            @if (!item.Id.Equals(Model.DeptId))
                                                @if (!item.Id.Equals(Model.DeptId))
                                                {
                                            <option value="@item.Id" hassubinfo="true">
                                                @item.DeptName
                                            </option>
                                                    <option value="@item.Id" hassubinfo="true">
                                                        @item.DeptName
                                                    </option>
                                                }
                                                else
                                                {
                                            <option value="@item.Id" hassubinfo="true" selected="selected">
                                                @item.DeptName
                                            </option>
                                                    <option value="@item.Id" hassubinfo="true" selected="selected">
                                                        @item.DeptName
                                                    </option>
                                                }
                                            }
@@ -229,17 +345,17 @@
                                            <option value="" hassubinfo="true">请选择</option>
                                            @foreach (var item in post)
                                            {
                                            @if (!item.Id.Equals(Model.HrPosition))
                                                @if (!item.Id.Equals(Model.HrPosition))
                                                {
                                            <option value="@item.Id" hassubinfo="true">
                                                @item.PostName
                                            </option>
                                                    <option value="@item.Id" hassubinfo="true">
                                                        @item.PostName
                                                    </option>
                                                }
                                                else
                                                {
                                            <option value="@item.Id" hassubinfo="true" selected="selected">
                                                @item.PostName
                                            </option>
                                                    <option value="@item.Id" hassubinfo="true" selected="selected">
                                                        @item.PostName
                                                    </option>
                                                }
                                            }
@@ -260,28 +376,24 @@
                                            <option value="" hassubinfo="true">请选择</option>
                                            @foreach (var item in shifou)
                                            {
                                            @if (!item.CodeSn.Equals(Model.IsGmsb))
                                                @if (!item.CodeSn.Equals(Model.IsGmsb))
                                                {
                                            <option value="@item.CodeSn" hassubinfo="true">
                                                @item.Comments
                                            </option>
                                                    <option value="@item.CodeSn" hassubinfo="true">
                                                        @item.Comments
                                                    </option>
                                                }
                                                else
                                                {
                                            <option value="@item.CodeSn" hassubinfo="true" selected="selected">
                                                @item.Comments
                                            </option>
                                                    <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">试用期限 </label>
                                    <div class="col-sm-2 col-md-2">
@@ -330,121 +442,92 @@
                                    <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="选择 åºåˆ— ...">
                                            <option value="" hassubinfo="true">请选择</option>
                                            @foreach (var item in zhiwustatus)
                                            {
                                            @if (!item.CodeSn.Equals(Model.Zhiwustatus))
                                                @if (!item.CodeSn.Equals(Model.Zhiwustatus))
                                                {
                                            <option value="@item.CodeSn" hassubinfo="true">
                                                @item.Comments
                                            </option>
                                                    <option value="@item.CodeSn" hassubinfo="true">
                                                        @item.Comments
                                                    </option>
                                                }
                                                else
                                                {
                                            <option value="@item.CodeSn" hassubinfo="true" selected="selected">
                                                @item.Comments
                                            </option>
                                                    <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">工作电脑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 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 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" 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
                                            </option>
                                                    <option value="@item.CodeSn" hassubinfo="true">
                                                        @item.Comments
                                                    </option>
                                                }
                                                else
                                                {
                                            <option value="@item.CodeSn" hassubinfo="true" selected="selected">
                                                @item.Comments
                                            </option>
                                                    <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;">
@@ -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>
@@ -513,37 +596,37 @@
                                @{
                                    for (int i = 0; i < pltJiatingchengyuanDTOs.Count; i++)
                                    {
                                    <div class="setSelect col-sm-12 col-md-12">
                                        <div class="clearfix layer-area" style="padding-bottom:15px;">
                                            <label grouptype="Vdata" class="text-right col-sm-1 col-md-1 control-label">姓名</label>
                                            <div class="col-sm-2 col-md-2">
                                                <input class="form-control" label="姓名" name="Name" labtype="txt" addvisible="true" maxlength="50" editvisible="true" reg="" ismust="true" type="text" value="@pltJiatingchengyuanDTOs[i].Name">
                                                <input type="hidden" name="JiatingchengyuanId" value="@pltJiatingchengyuanDTOs[i].Id" />
                                            </div>
                                            <label grouptype="Vdata" class="text-right col-sm-1 col-md-1 control-label">关系</label>
                                            <div class="col-sm-2 col-md-2">
                                                <input class="form-control" label="关系" name="Guanxi" labtype="txt" addvisible="true" maxlength="50" editvisible="true" reg="" ismust="true" type="text" value="@pltJiatingchengyuanDTOs[i].Guanxi">
                                        <div class="setSelect col-sm-12 col-md-12">
                                            <div class="clearfix layer-area" style="padding-bottom:15px;">
                                                <label grouptype="Vdata" class="text-right col-sm-1 col-md-1 control-label">姓名</label>
                                                <div class="col-sm-2 col-md-2">
                                                    <input class="form-control" label="姓名" name="Name" labtype="txt" addvisible="true" maxlength="50" editvisible="true" reg="" ismust="true" type="text" value="@pltJiatingchengyuanDTOs[i].Name">
                                                    <input type="hidden" name="JiatingchengyuanId" value="@pltJiatingchengyuanDTOs[i].Id" />
                                                </div>
                                                <label grouptype="Vdata" class="text-right col-sm-1 col-md-1 control-label">关系</label>
                                                <div class="col-sm-2 col-md-2">
                                                    <input class="form-control" label="关系" name="Guanxi" labtype="txt" addvisible="true" maxlength="50" editvisible="true" reg="" ismust="true" type="text" value="@pltJiatingchengyuanDTOs[i].Guanxi">
                                            </div>
                                            <label grouptype="Vdata" class="text-right col-sm-1 col-md-1 control-label">工作单位</label>
                                            <div class="col-sm-2 col-md-2">
                                                <input class="form-control" label="工作单位" name="Gongzuodanwei" labtype="txt" addvisible="true" maxlength="100" editvisible="true" reg="" ismust="true" type="text" value="@pltJiatingchengyuanDTOs[i].Gongzuodanwei">
                                                </div>
                                                <label grouptype="Vdata" class="text-right col-sm-1 col-md-1 control-label">工作单位</label>
                                                <div class="col-sm-2 col-md-2">
                                                    <input class="form-control" label="工作单位" name="Gongzuodanwei" labtype="txt" addvisible="true" maxlength="100" editvisible="true" reg="" ismust="true" type="text" value="@pltJiatingchengyuanDTOs[i].Gongzuodanwei">
                                            </div>
                                            <div class="col-sm-1 col-md-1">
                                                @{
                                                </div>
                                                <div class="col-sm-1 col-md-1">
                                                    @{
                                                        if (i == 0)
                                                        {
                                                    <button type="button" class="addBtn" style="padding-bottom:10px;" onclick="addBtn(this)" data-type="1">+</button>
                                                            <button type="button" class="addBtn" style="padding-bottom:10px;" onclick="addBtn(this)" data-type="1">+</button>
                                                        }
                                                        else
                                                        {
                                                    <button type="button" class="addBtn" style="padding-bottom:10px;" onclick="delBtn(this,'@pltJiatingchengyuanDTOs[i].Id')" data-type="1">-</button>
                                                            <button type="button" class="addBtn" style="padding-bottom:10px;" onclick="delBtn(this,'@pltJiatingchengyuanDTOs[i].Id')" data-type="1">-</button>
                                                        }
                                                }
                                                    }
                                                </div>
                                            </div>
                                        </div>
                                    </div>
                                    }
                                }
@@ -557,20 +640,16 @@
                                <div id='file-list-display-shenfenzhengsssss' style="width: 100%;text-align: left; background-color:white">
                                    @{ for (int i = 0; i < shenfenzhengsssss.Count; i++)
                                        {
                                        <div>
                                            <img src="@shenfenzhengsssss[i].Filepath" alt="" style="width:200px;">     &nbsp;  <a href='javascript: void (0);' onclick='js_method(this,"@shenfenzhengsssss[i].Id")'><i class='glyphicon glyphicon-remove'></i> </a>
                                            <input type="hidden" name="attachmentid" value="@shenfenzhengsssss[i].Id" />
                                            <input type="hidden" name="Filepath" value="@shenfenzhengsssss[i].Filepath" />
                                            <input type="hidden" name="Filefullname" value="@shenfenzhengsssss[i].Filefullname" />
                                            <input type="hidden" name="AttObj" value="@shenfenzhengsssss[i].AttObj" />
                                            <div>
                                                <img src="@shenfenzhengsssss[i].Filepath" alt="" style="width:200px;">     &nbsp;  <a href='javascript: void (0);' onclick='js_method(this,"@shenfenzhengsssss[i].Id")'><i class='glyphicon glyphicon-remove'></i> </a>
                                                <input type="hidden" name="attachmentid" value="@shenfenzhengsssss[i].Id" />
                                                <input type="hidden" name="Filepath" value="@shenfenzhengsssss[i].Filepath" />
                                                <input type="hidden" name="Filefullname" value="@shenfenzhengsssss[i].Filefullname" />
                                                <input type="hidden" name="AttObj" value="@shenfenzhengsssss[i].AttObj" />
                                        </div>
                                            </div>
                                        }
                                    }
                                </div>
@@ -581,20 +660,18 @@
                                    </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>
                                            <input type="hidden" name="attachmentid" value="@shenfenzhengbeimiansssss[i].Id" />
                                            <input type="hidden" name="Filepath" value="@shenfenzhengbeimiansssss[i].Filepath" />
                                            <input type="hidden" name="Filefullname" value="@shenfenzhengbeimiansssss[i].Filefullname" />
                                            <input type="hidden" name="AttObj" value="@shenfenzhengbeimiansssss[i].AttObj" />
                                            <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>
                                                <input type="hidden" name="attachmentid" value="@shenfenzhengbeimiansssss[i].Id" />
                                                <input type="hidden" name="Filepath" value="@shenfenzhengbeimiansssss[i].Filepath" />
                                                <input type="hidden" name="Filefullname" value="@shenfenzhengbeimiansssss[i].Filefullname" />
                                                <input type="hidden" name="AttObj" value="@shenfenzhengbeimiansssss[i].AttObj" />
                                        </div>
                                            </div>
                                        }
                                    }
                                </div>
@@ -609,18 +686,15 @@
                                <div id='file-list-display-xuelizhengsssss' style="width: 100%;text-align: left; background-color:white">
                                    @{ for (int i = 0; i < xuelizhengsssss.Count; i++)
                                        {
                                        <div>
                                            <img src="@xuelizhengsssss[i].Filepath" alt="" style="width:200px;">   &nbsp;  <a href='javascript: void (0);' onclick='js_method(this,"@xuelizhengsssss[i].Id")'><i class='glyphicon glyphicon-remove'></i> </a>
                                            <input type="hidden" name="attachmentid" value="@xuelizhengsssss[i].Id" />
                                            <input type="hidden" name="Filepath" value="@xuelizhengsssss[i].Filepath" />
                                            <input type="hidden" name="Filefullname" value="@xuelizhengsssss[i].Filefullname" />
                                            <input type="hidden" name="AttObj" value="@xuelizhengsssss[i].AttObj" />
                                            <div>
                                                <img src="@xuelizhengsssss[i].Filepath" alt="" style="width:200px;">   &nbsp;  <a href='javascript: void (0);' onclick='js_method(this,"@xuelizhengsssss[i].Id")'><i class='glyphicon glyphicon-remove'></i> </a>
                                                <input type="hidden" name="attachmentid" value="@xuelizhengsssss[i].Id" />
                                                <input type="hidden" name="Filepath" value="@xuelizhengsssss[i].Filepath" />
                                                <input type="hidden" name="Filefullname" value="@xuelizhengsssss[i].Filefullname" />
                                                <input type="hidden" name="AttObj" value="@xuelizhengsssss[i].AttObj" />
                                        </div>
                                            </div>
                                        }
                                    }
                                </div>
@@ -632,20 +706,18 @@
                                    </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>
                                            <input type="hidden" name="attachmentid" value="@zhiyezigezhengsssss[i].Id" />
                                            <input type="hidden" name="Filepath" value="@zhiyezigezhengsssss[i].Filepath" />
                                            <input type="hidden" name="Filefullname" value="@zhiyezigezhengsssss[i].Filefullname" />
                                            <input type="hidden" name="AttObj" value="@zhiyezigezhengsssss[i].AttObj" />
                                            <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>
                                                <input type="hidden" name="attachmentid" value="@zhiyezigezhengsssss[i].Id" />
                                                <input type="hidden" name="Filepath" value="@zhiyezigezhengsssss[i].Filepath" />
                                                <input type="hidden" name="Filefullname" value="@zhiyezigezhengsssss[i].Filefullname" />
                                                <input type="hidden" name="AttObj" value="@zhiyezigezhengsssss[i].AttObj" />
                                        </div>
                                            </div>
                                        }
                                    }
                                </div>
@@ -657,22 +729,20 @@
                                    </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>
                                            <div>
                                            <img src="@qitazhengshusssss[i].Filepath" alt="" style="width:200px;">    &nbsp;  <a href='javascript: void (0);' onclick='js_method(this,"@qitazhengshusssss[i].Id")'><i class='glyphicon glyphicon-remove'></i> </a>
                                            <input type="hidden" name="attachmentid" value="@qitazhengshusssss[i].Id" />
                                            <input type="hidden" name="Filepath" value="@qitazhengshusssss[i].Filepath" />
                                            <input type="hidden" name="Filefullname" value="@qitazhengshusssss[i].Filefullname" />
                                            <input type="hidden" name="AttObj" value="@qitazhengshusssss[i].AttObj" />
                                                <img src="@qitazhengshusssss[i].Filepath" alt="" style="width:200px;">    &nbsp;  <a href='javascript: void (0);' onclick='js_method(this,"@qitazhengshusssss[i].Id")'><i class='glyphicon glyphicon-remove'></i> </a>
                                                <input type="hidden" name="attachmentid" value="@qitazhengshusssss[i].Id" />
                                                <input type="hidden" name="Filepath" value="@qitazhengshusssss[i].Filepath" />
                                                <input type="hidden" name="Filefullname" value="@qitazhengshusssss[i].Filefullname" />
                                                <input type="hidden" name="AttObj" value="@qitazhengshusssss[i].AttObj" />
                                        </div>
                                            </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>false</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