From f7841c1dc1cd7f0a80d0cc77cc54481d0a8bb707 Mon Sep 17 00:00:00 2001
From: LR-20210131IOQH\Administrator <jackcold@163.com>
Date: 星期二, 08 六月 2021 15:02:41 +0800
Subject: [PATCH] 更新用户管理，增加工号，是否项目录入，问答录入，预发工资，保底年薪，工龄工资，是否交通补贴，界面调整。
---
zhengcaioa/Model/PltUser.cs | 10
用户表更新.sql | 13 +
.gitignore | 1
zhengcaioa/zhengcaioa/Views/User/Edit.cshtml | 472 +++++++++++++++++++++++---------------
zhengcaioa/zhengcaioa/Controllers/UserController.cs | 134 +++++-----
zhengcaioa/zhengcaioa/zhengcaioa.csproj.user | 1
zhengcaioa/Services/UserService.cs | 19 +
zhengcaioa/DTO/PltUserDTO.cs | 42 +++
zhengcaioa/Model/zhengcaioaContext.cs | 18 +
9 files changed, 450 insertions(+), 260 deletions(-)
diff --git a/.gitignore b/.gitignore
index 0d817a6..300c696 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,3 +12,4 @@
zhengcaioa/Services/obj/
zhengcaioa/zhengcaioa/wwwroot/UploadingFiles/
zhengcaioa/zhengcaioa/wwwroot/UploadFile/
+/zhengcaioa/.vs
diff --git a/zhengcaioa/DTO/PltUserDTO.cs b/zhengcaioa/DTO/PltUserDTO.cs
index 946ae13..c4593d0 100644
--- a/zhengcaioa/DTO/PltUserDTO.cs
+++ b/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; }
diff --git a/zhengcaioa/Model/PltUser.cs b/zhengcaioa/Model/PltUser.cs
index 1731018..bcf0962 100644
--- a/zhengcaioa/Model/PltUser.cs
+++ b/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; }
+
}
}
diff --git a/zhengcaioa/Model/zhengcaioaContext.cs b/zhengcaioa/Model/zhengcaioaContext.cs
index 31ba8bd..c65c3f7 100644
--- a/zhengcaioa/Model/zhengcaioaContext.cs
+++ b/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")
diff --git a/zhengcaioa/Services/UserService.cs b/zhengcaioa/Services/UserService.cs
index 37529bc..9364f63 100644
--- a/zhengcaioa/Services/UserService.cs
+++ b/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();
diff --git a/zhengcaioa/zhengcaioa/Controllers/UserController.cs b/zhengcaioa/zhengcaioa/Controllers/UserController.cs
index 754ffbb..867184c 100644
--- a/zhengcaioa/zhengcaioa/Controllers/UserController.cs
+++ b/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
diff --git a/zhengcaioa/zhengcaioa/Views/User/Edit.cshtml b/zhengcaioa/zhengcaioa/Views/User/Edit.cshtml
index 3d6fd2c..f59e8d5 100644
--- a/zhengcaioa/zhengcaioa/Views/User/Edit.cshtml
+++ b/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> 椤圭洰褰曞叆</h5>
+ <h5><i class="fa fa-list"></i> 椤圭洰褰曞叆</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> <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;"> <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;"> <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;"> <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;"> <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;"> <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;"> <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;"> <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;"> <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;"> <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;"> <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 });
}
},
diff --git a/zhengcaioa/zhengcaioa/zhengcaioa.csproj.user b/zhengcaioa/zhengcaioa/zhengcaioa.csproj.user
index 4e73f98..67fd912 100644
--- a/zhengcaioa/zhengcaioa/zhengcaioa.csproj.user
+++ b/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>
\ No newline at end of file
diff --git "a/\347\224\250\346\210\267\350\241\250\346\233\264\346\226\260.sql" "b/\347\224\250\346\210\267\350\241\250\346\233\264\346\226\260.sql"
new file mode 100644
index 0000000..956ba54
--- /dev/null
+++ "b/\347\224\250\346\210\267\350\241\250\346\233\264\346\226\260.sql"
@@ -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
\ No newline at end of file
--
Gitblit v1.9.1