From 2d2a6b9d20ae8c5d9fcbedac48b4428f696fa127 Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期四, 16 五月 2024 14:46:35 +0800
Subject: [PATCH] 招聘简历打印

---
 CoreCms.Net.Web.Admin/Controllers/baifenbingfa/Job_ApplicantProfileController.cs   |  115 ++++
 CoreCms.Net.Web.Admin/wwwroot/views/baifenbingfa/job_applicantprofile/index.html   |  248 ++-------
 CoreCms.Net.Model/Entities/baifenbingfa/job/ApplicantProfile.cs                    |   43 +
 CoreCms.Net.Services/baifenbingfa/Job_ApplicantProfileServices.cs                  |   26 +
 CoreCms.Net.Web.Admin/wwwroot/views/baifenbingfa/job_applicantprofile/edit.html    |  493 +++++++++++-------
 CoreCms.Net.IServices/baifenbingfa/IJob_ApplicantProfileServices.cs                |   18 
 CoreCms.Net.Web.Admin/wwwroot/views/baifenbingfa/job_applicantprofile/details.html |  581 ++++++++++++---------
 7 files changed, 888 insertions(+), 636 deletions(-)

diff --git a/CoreCms.Net.IServices/baifenbingfa/IJob_ApplicantProfileServices.cs b/CoreCms.Net.IServices/baifenbingfa/IJob_ApplicantProfileServices.cs
index 7f059b4..a8fec6a 100644
--- a/CoreCms.Net.IServices/baifenbingfa/IJob_ApplicantProfileServices.cs
+++ b/CoreCms.Net.IServices/baifenbingfa/IJob_ApplicantProfileServices.cs
@@ -91,5 +91,23 @@
             Expression<Func<Job_ApplicantProfile, object>> orderByExpression, OrderByType orderByType, int pageIndex = 1,
             int pageSize = 20, bool blUseNoLock = false);
         #endregion
+
+
+
+        #region 鏌ヨ瀛愯〃==========================================================
+
+        /// <summary>
+        /// 鑾峰彇瀹跺涵鎴愬憳
+        /// </summary>
+        /// <returns></returns>
+        List<Job_FamilyMember> getJobFamilyMember(int ApplicantProfileId);
+
+        /// <summary>
+        /// 鑾峰彇宸ヤ綔缁忓巻
+        /// </summary>
+        /// <returns></returns>
+        List<Job_EmploymentRecord> getJobEmploymentRecord(int ApplicantProfileId);
+
+        #endregion
     }
 }
diff --git a/CoreCms.Net.Model/Entities/baifenbingfa/job/ApplicantProfile.cs b/CoreCms.Net.Model/Entities/baifenbingfa/job/ApplicantProfile.cs
index 5312962..e170608 100644
--- a/CoreCms.Net.Model/Entities/baifenbingfa/job/ApplicantProfile.cs
+++ b/CoreCms.Net.Model/Entities/baifenbingfa/job/ApplicantProfile.cs
@@ -3,7 +3,9 @@
 using SqlSugar;
 using System;
 using System.Collections.Generic;
+using System.ComponentModel;
 using System.Linq;
+using System.Runtime.Serialization;
 using System.Text;
 using System.Threading.Tasks;
 
@@ -25,6 +27,12 @@
         /// 搴旇仒鐨勫矖浣嶃��
         /// </summary>
         public int  jobId { get; set; }
+
+        /// <summary>
+        /// 搴旇仒鐨勫矖浣嶅悕绉般��
+        /// </summary>
+        [SugarColumn(IsIgnore = true)]
+        public string jobName { get; set; }
 
         /// <summary>
         /// 搴旇仒鑰呮湡鏈涚殑鏈�浣庤柂璧勮姹傘��
@@ -55,6 +63,18 @@
         /// 搴旇仒鑰呯殑鍑虹敓鏃ユ湡銆�
         /// </summary>
         public DateTime dateOfBirth { get; set; }
+
+        /// <summary>
+        /// 搴旇仒鑰呯殑鍑虹敓鏃ユ湡銆�
+        /// </summary>
+        [SugarColumn(IsIgnore = true)]
+        public string dateOfBirthName { get; set; }
+
+        /// <summary>
+        /// 搴旇仒鑰呯殑鍑虹敓鏃ユ湡銆�
+        /// </summary>
+        [SugarColumn(IsIgnore = true)]
+        public string dateOfBirthNameCeshi { get; set; }
 
         /// <summary>
         /// 搴旇仒鑰呯殑姣曚笟瀛︽牎鍚嶇О銆�
@@ -129,6 +149,14 @@
         /// 瀹℃牳鐘舵�併��
         /// </summary>
         public AuditStatus? AuditStatu { get; set; } = AuditStatus.Submitted;
+ 
+
+
+        /// <summary>
+        /// 鐢熻偛鎯呭喌锛堜緥濡傦紝鏃犲瓙濂炽�佹湁瀛愬コ绛夛級銆�
+        /// </summary>   
+        [SugarColumn(IsIgnore = true)] 
+        public string createTimetxt { get; set; }
 
     }
     /// <summary>
@@ -139,37 +167,43 @@
         /// <summary>
         /// 鐢宠宸叉彁浜わ紝绛夊緟瀹℃牳銆�
         /// </summary>
-       
+        [Description("宸叉彁浜�")]
         Submitted,
 
         /// <summary>
         /// 鐢宠姝e湪瀹℃牳涓��
         /// </summary>
+        [Description("瀹℃牳涓�")]
         UnderReview,
 
         /// <summary>
         /// 鐢宠宸茶鎵瑰噯銆�
         /// </summary>
+        [Description("宸插鏍�")]
         Approved,
 
         /// <summary>
         /// 鐢宠宸茶鎷掔粷銆�
         /// </summary>
+        [Description("宸叉嫆缁�")] 
         Rejected,
 
         /// <summary>
         /// 鐢宠闇�瑕佹洿澶氳祫鏂欐垨淇℃伅銆�
         /// </summary>
+        [Description("鏇村璧勬枡")] 
         Incomplete,
 
         /// <summary>
         /// 鐢宠宸叉挙鍥炴垨鍙栨秷銆�
         /// </summary>
+        [Description("宸叉挙鍥�")] 
         Withdrawn,
 
         /// <summary>
         /// 鐢宠澶勪簬鍏朵粬鏈畾涔夌殑鐘舵�併��
         /// </summary>
+        [Description("鍏朵粬")] 
         Other
     }
     /// <summary>
@@ -194,6 +228,13 @@
         public DateTime? endDate { get; set; }
 
         /// <summary>
+        /// 宸ヤ綔缁撴潫鏃ユ湡锛屽鏋滄槸褰撳墠宸ヤ綔锛屽垯涓虹┖鎴栬〃绀鸿嚦浠婄殑鏃ユ湡銆�
+        /// </summary>
+
+        [SugarColumn(IsIgnore = true)]
+        public string startDatetxt { get; set; }
+
+        /// <summary>
         /// 宸ヤ綔鍗曚綅鐨勫悕绉般��
         /// </summary>
         public string workplace { get; set; }
diff --git a/CoreCms.Net.Services/baifenbingfa/Job_ApplicantProfileServices.cs b/CoreCms.Net.Services/baifenbingfa/Job_ApplicantProfileServices.cs
index 6928aff..286b82b 100644
--- a/CoreCms.Net.Services/baifenbingfa/Job_ApplicantProfileServices.cs
+++ b/CoreCms.Net.Services/baifenbingfa/Job_ApplicantProfileServices.cs
@@ -126,5 +126,31 @@
         }
         #endregion
 
+
+
+
+        #region 鑾峰彇缂撳瓨鐨勬墍鏈夋暟鎹�==========================================================
+
+        /// <summary>
+        /// 鑾峰彇瀹跺涵鎴愬憳
+        /// </summary>
+        /// <returns></returns>
+        public List<Job_FamilyMember> getJobFamilyMember(int ApplicantProfileId)
+        {
+            var Job_FamilyMembers = _unitOfWork.GetDbClient().Queryable<Job_FamilyMember>().Where(p => p.ApplicantProfileId == ApplicantProfileId).ToList();
+            return Job_FamilyMembers;
+        }
+
+        /// <summary>
+        /// 鑾峰彇宸ヤ綔缁忓巻
+        /// </summary>
+        /// <returns></returns>
+        public List<Job_EmploymentRecord> getJobEmploymentRecord(int ApplicantProfileId)
+        {
+            var job_EmploymentRecords = _unitOfWork.GetDbClient().Queryable<Job_EmploymentRecord>().Where(p => p.ApplicantProfileId == ApplicantProfileId).ToList();
+            return job_EmploymentRecords;
+        }
+
+        #endregion
     }
 }
diff --git a/CoreCms.Net.Web.Admin/Controllers/baifenbingfa/Job_ApplicantProfileController.cs b/CoreCms.Net.Web.Admin/Controllers/baifenbingfa/Job_ApplicantProfileController.cs
index 7fc4194..d01ba84 100644
--- a/CoreCms.Net.Web.Admin/Controllers/baifenbingfa/Job_ApplicantProfileController.cs
+++ b/CoreCms.Net.Web.Admin/Controllers/baifenbingfa/Job_ApplicantProfileController.cs
@@ -32,6 +32,10 @@
 using SqlSugar;
 using CoreCms.Net.Model.Entities.baifenbingfa.jon;
 using CoreCms.Net.Web.Admin.Infrastructure;
+using CoreCms.Net.Services;
+using SqlSugar.Extensions;
+using NPOI.OpenXmlFormats.Spreadsheet;
+using CoreCms.Net.Auth.HttpContextUser;
 
 namespace CoreCms.Net.Web.Admin.Controllers
 {
@@ -47,16 +51,22 @@
     {
         private readonly IWebHostEnvironment _webHostEnvironment;
         private readonly IJob_ApplicantProfileServices _Job_ApplicantProfileServices;
+        private readonly IJob_jobSetingServices _Job_jobSetingServices;
+        private readonly IHttpContextUser _user;
 
         /// <summary>
         /// 鏋勯�犲嚱鏁�
         ///</summary>
         public Job_ApplicantProfileController(IWebHostEnvironment webHostEnvironment
             ,IJob_ApplicantProfileServices Job_ApplicantProfileServices
+            , IJob_jobSetingServices Job_jobSetingServices
+            , IHttpContextUser user
             )
         {
             _webHostEnvironment = webHostEnvironment;
             _Job_ApplicantProfileServices = Job_ApplicantProfileServices;
+            _Job_jobSetingServices = Job_jobSetingServices;
+            _user = user;
         }
 
         #region 鑾峰彇鍒楄〃============================================================
@@ -79,7 +89,7 @@
             Expression<Func<Job_ApplicantProfile, object>> orderEx = orderField switch
             {
                 "id" => p => p.id,"jobId" => p => p.jobId,"minSalaryRequirement" => p => p.minSalaryRequirement,"name" => p => p.name,"gender" => p => p.gender,"height" => p => p.height,"weight" => p => p.weight,"dateOfBirth" => p => p.dateOfBirth,"graduatingSchool" => p => p.graduatingSchool,"educationLevel" => p => p.educationLevel,"major" => p => p.major,"smokes" => p => p.smokes,"drivingSkill" => p => p.drivingSkill,"phoneNumber" => p => p.phoneNumber,"whiteWineCapacity" => p => p.whiteWineCapacity,"politicalAffiliation" => p => p.politicalAffiliation,"maritalStatus" => p => p.maritalStatus,"specialAbilities" => p => p.specialAbilities,"email" => p => p.email,"parentalStatus" => p => p.parentalStatus,"residentialAddress" => p => p.residentialAddress,"createTime" => p => p.createTime,"upDataTime" => p => p.upDataTime,"createBy" => p => p.createBy,"upDataBy" => p => p.upDataBy,"isdelete" => p => p.isdelete,"AuditStatu" => p => p.AuditStatu,
-                _ => p => p.id
+                _ => p => p.createTime
             };
 
             //璁剧疆鎺掑簭鏂瑰紡
@@ -120,7 +130,7 @@
 			var gender = Request.Form["gender"].FirstOrDefault();
             if (!string.IsNullOrEmpty(gender))
             {
-                where = where.And(p => p.gender.Contains(gender));
+                where = where.And(p => p.gender == gender);
             }
 			//搴旇仒鑰呯殑韬珮锛堝崟浣嶏細鍘樼背锛夈�� int
 			var height = Request.Form["height"].FirstOrDefault().ObjectToInt(0);
@@ -284,13 +294,28 @@
                 where = where.And(p => p.isdelete == false);
             }
 			//瀹℃牳鐘舵�併�� int
-			var AuditStatu =(AuditStatus) Request.Form["AuditStatu"].FirstOrDefault().ObjectToInt(0);
-            if (AuditStatu > 0)
+			var AuditStatu =(AuditStatus) Request.Form["AuditStatu"].FirstOrDefault().ObjectToInt(-1);
+            if (AuditStatu >= 0)
             {
                 where = where.And(p => p.AuditStatu == AuditStatu);
             }
             //鑾峰彇鏁版嵁
             var list = await _Job_ApplicantProfileServices.QueryPageAsync(where, orderEx, orderBy, pageCurrent, pageSize, true);
+
+            foreach (var job_ApplicantProfile in list)
+            {
+                job_ApplicantProfile.createTimetxt = job_ApplicantProfile.createTime.HasValue? job_ApplicantProfile.createTime.Value.ToString("yyyy-MM-dd"):"";
+                job_ApplicantProfile.dateOfBirthName = job_ApplicantProfile.dateOfBirth.ToString("yyyy-MM-dd");
+                var job_JobSeting = await _Job_jobSetingServices.QueryByIdAsync(job_ApplicantProfile.jobId, false);
+                if (job_JobSeting != null)
+                {
+                    job_ApplicantProfile.jobName = job_JobSeting.position;
+                }
+                var auditStatus = (int)job_ApplicantProfile.AuditStatu;
+
+                job_ApplicantProfile.dateOfBirthNameCeshi = EnumHelper.GetEnumDescriptionByValue<AuditStatus>(auditStatus);
+            }
+
             //杩斿洖鏁版嵁
             jm.data = list;
             jm.code = 0;
@@ -308,10 +333,15 @@
         /// <returns></returns>
         [HttpPost]
         [Description("棣栭〉鏁版嵁")]
-        public AdminUiCallBack GetIndex()
+        public async Task<AdminUiCallBack> GetIndex()
         {
+
             //杩斿洖鏁版嵁
             var jm = new AdminUiCallBack { code = 0 };
+
+            var job_JobSetings  =  await _Job_jobSetingServices.QueryListByClauseAsync(p => p.isdelete == false);
+            jm.data = job_JobSetings;
+
             return jm;
         }
         #endregion
@@ -367,8 +397,37 @@
                 jm.msg = "涓嶅瓨鍦ㄦ淇℃伅";
                 return jm;
             }
+            if (model.AuditStatu != AuditStatus.Submitted)
+            {
+                jm.msg = "淇℃伅宸茬粡瀹℃牳";
+                return jm;
+            }
+            var job_JobSeting = await _Job_jobSetingServices.QueryByIdAsync(model.jobId, false);
+            if (job_JobSeting == null)
+            {
+                jm.msg = "涓嶅瓨鍦ㄦ宸ヤ綔";
+                return jm;
+            }
+            model.jobName = job_JobSeting.position;
+            model.dateOfBirthName = model.dateOfBirth.ToString("yyyy/MM/dd");
+            var job_FamilyMembers = _Job_ApplicantProfileServices.getJobFamilyMember(model.id);
+
+
+
+            var job_EmploymentRecords = _Job_ApplicantProfileServices.getJobEmploymentRecord(model.id);
+            foreach (var job_EmploymentRecord in job_EmploymentRecords)
+            {
+                job_EmploymentRecord.startDatetxt = job_EmploymentRecord.startDate.ToString("yyyy/MM") +
+                    (job_EmploymentRecord.endDate.HasValue ? "-" + job_EmploymentRecord.endDate.Value.ToString("yyyy/MM") : "");
+            }
+
             jm.code = 0;
-            jm.data = model;
+            jm.data = new
+            {
+                model,
+                job_FamilyMembers,
+                job_EmploymentRecords
+            };
 
             return jm;
         }
@@ -385,7 +444,23 @@
         [Description("缂栬緫鎻愪氦")]
         public async Task<AdminUiCallBack> DoEdit([FromBody]Job_ApplicantProfile entity)
         {
-            var jm = await _Job_ApplicantProfileServices.UpdateAsync(entity);
+            var jm = new AdminUiCallBack();
+
+            var model = await _Job_ApplicantProfileServices.QueryByIdAsync(entity.id, false);
+            if (model == null)
+            {
+                jm.msg = "涓嶅瓨鍦ㄦ淇℃伅";
+                return jm;
+            }
+            
+            model.AuditStatu = AuditStatus.Approved;
+            model.upDataBy = _user.Name;
+                model.upDataTime = DateTime.Now;
+            jm = await _Job_ApplicantProfileServices.UpdateAsync(model);
+           if(jm.code == 0)
+            {
+                jm.msg = "瀹℃牳鎴愬姛锛�";
+            }
             return jm;
         }
         #endregion
@@ -451,8 +526,32 @@
                 jm.msg = "涓嶅瓨鍦ㄦ淇℃伅";
                 return jm;
             }
+            var job_JobSeting  = await _Job_jobSetingServices.QueryByIdAsync(model.jobId, false);
+            if (job_JobSeting == null)
+            {
+                jm.msg = "涓嶅瓨鍦ㄦ宸ヤ綔";
+                return jm;
+            }
+            model.jobName = job_JobSeting.position;
+            model.dateOfBirthName = model.dateOfBirth.ToString("yyyy/MM/dd");
+            var job_FamilyMembers =_Job_ApplicantProfileServices.getJobFamilyMember(model.id);
+
+           
+
+            var job_EmploymentRecords = _Job_ApplicantProfileServices.getJobEmploymentRecord(model.id);
+            foreach (var job_EmploymentRecord in job_EmploymentRecords)
+            {
+                job_EmploymentRecord.startDatetxt = job_EmploymentRecord.startDate.ToString("yyyy/MM") + 
+                    (job_EmploymentRecord.endDate.HasValue ? "-"+ job_EmploymentRecord.endDate.Value.ToString("yyyy/MM") : "");
+            }
+
             jm.code = 0;
-            jm.data = model;
+            jm.data = new
+            {
+                model,
+                job_FamilyMembers,
+                job_EmploymentRecords
+            };
 
             return jm;
         }
diff --git a/CoreCms.Net.Web.Admin/wwwroot/views/baifenbingfa/job_applicantprofile/details.html b/CoreCms.Net.Web.Admin/wwwroot/views/baifenbingfa/job_applicantprofile/details.html
index b6ffbf0..30bbde7 100644
--- a/CoreCms.Net.Web.Admin/wwwroot/views/baifenbingfa/job_applicantprofile/details.html
+++ b/CoreCms.Net.Web.Admin/wwwroot/views/baifenbingfa/job_applicantprofile/details.html
@@ -1,256 +1,315 @@
-<script type="text/html" template  lay-done="layui.data.done(d);">
-    <table class="layui-table layui-form" lay-filter="LAY-app-Job_ApplicantProfile-detailsForm" id="LAY-app-Job_ApplicantProfile-detailsForm">
-        <colgroup>
-            <col width="100">
-            <col>
-        </colgroup>
-        <tbody>
-		    
-		    <tr>
-                <td>
-                    <label for="id">涓婚敭ID</label>
-                </td>
-                <td>
-                    {{ d.params.data.id || '' }}
-                </td>
-            </tr>
-		    
-		    <tr>
-                <td>
-                    <label for="jobId">搴旇仒鐨勫矖浣嶃��</label>
-                </td>
-                <td>
-                    {{ d.params.data.jobId || '' }}
-                </td>
-            </tr>
-		    
-		    <tr>
-                <td>
-                    <label for="minSalaryRequirement">搴旇仒鑰呮湡鏈涚殑鏈�浣庤柂璧勮姹傘��</label>
-                </td>
-                <td>
-                    {{ d.params.data.minSalaryRequirement || '' }}
-                </td>
-            </tr>
-		    
-		    <tr>
-                <td>
-                    <label for="name">搴旇仒鑰呯殑鍏ㄥ悕銆�</label>
-                </td>
-                <td>
-                    {{ d.params.data.name || '' }}
-                </td>
-            </tr>
-		    
-		    <tr>
-                <td>
-                    <label for="gender">搴旇仒鑰呯殑鎬у埆銆�</label>
-                </td>
-                <td>
-                    {{ d.params.data.gender || '' }}
-                </td>
-            </tr>
-		    
-		    <tr>
-                <td>
-                    <label for="height">搴旇仒鑰呯殑韬珮锛堝崟浣嶏細鍘樼背锛夈��</label>
-                </td>
-                <td>
-                    {{ d.params.data.height || '' }}
-                </td>
-            </tr>
-		    
-		    <tr>
-                <td>
-                    <label for="weight">搴旇仒鑰呯殑浣撻噸锛堝崟浣嶏細鍗冨厠锛夈��</label>
-                </td>
-                <td>
-                    {{ d.params.data.weight || '' }}
-                </td>
-            </tr>
-		    
-		    <tr>
-                <td>
-                    <label for="dateOfBirth">搴旇仒鑰呯殑鍑虹敓鏃ユ湡銆�</label>
-                </td>
-                <td>
-                    {{ d.params.data.dateOfBirth || '' }}
-                </td>
-            </tr>
-		    
-		    <tr>
-                <td>
-                    <label for="graduatingSchool">搴旇仒鑰呯殑姣曚笟瀛︽牎鍚嶇О銆�</label>
-                </td>
-                <td>
-                    {{ d.params.data.graduatingSchool || '' }}
-                </td>
-            </tr>
-		    
-		    <tr>
-                <td>
-                    <label for="educationLevel">搴旇仒鑰呯殑鏈�楂樺鍘嗐��</label>
-                </td>
-                <td>
-                    {{ d.params.data.educationLevel || '' }}
-                </td>
-            </tr>
-		    
-		    <tr>
-                <td>
-                    <label for="major">搴旇仒鑰呯殑涓撲笟鍚嶇О銆�</label>
-                </td>
-                <td>
-                    {{ d.params.data.major || '' }}
-                </td>
-            </tr>
-		    
-		    <tr>
-                <td>
-                    <label for="smokes">鏄惁鍚哥儫銆�</label>
-                </td>
-                <td>
-                    {{ d.params.data.smokes || '' }}
-                </td>
-            </tr>
-		    
-		    <tr>
-                <td>
-                    <label for="drivingSkill">椹鹃┒鎶�鏈瓑绾э紙濡傛柊鎵嬨�佺啛缁冦�佷笓涓氾級銆�</label>
-                </td>
-                <td>
-                    {{ d.params.data.drivingSkill || '' }}
-                </td>
-            </tr>
-		    
-		    <tr>
-                <td>
-                    <label for="phoneNumber">搴旇仒鑰呯殑鑱旂郴鐢佃瘽銆�</label>
-                </td>
-                <td>
-                    {{ d.params.data.phoneNumber || '' }}
-                </td>
-            </tr>
-		    
-		    <tr>
-                <td>
-                    <label for="whiteWineCapacity">鐧介厭閰掗噺锛堜緥濡傦紝姣崌鎴栨澂鏁帮級銆�</label>
-                </td>
-                <td>
-                    {{ d.params.data.whiteWineCapacity || '' }}
-                </td>
-            </tr>
-		    
-		    <tr>
-                <td>
-                    <label for="politicalAffiliation">搴旇仒鑰呯殑鏀挎不闈㈣矊銆�</label>
-                </td>
-                <td>
-                    {{ d.params.data.politicalAffiliation || '' }}
-                </td>
-            </tr>
-		    
-		    <tr>
-                <td>
-                    <label for="maritalStatus">濠氭亱鐘跺喌锛堜緥濡傦紝鍗曡韩銆佸凡濠氥�佺寮傜瓑锛夈��</label>
-                </td>
-                <td>
-                    {{ d.params.data.maritalStatus || '' }}
-                </td>
-            </tr>
-		    
-		    <tr>
-                <td>
-                    <label for="specialAbilities">涓撻暱鑳藉姏銆�</label>
-                </td>
-                <td>
-                    {{ d.params.data.specialAbilities || '' }}
-                </td>
-            </tr>
-		    
-		    <tr>
-                <td>
-                    <label for="email">搴旇仒鑰呯殑鐢靛瓙閭欢鍦板潃銆�</label>
-                </td>
-                <td>
-                    {{ d.params.data.email || '' }}
-                </td>
-            </tr>
-		    
-		    <tr>
-                <td>
-                    <label for="parentalStatus">鐢熻偛鎯呭喌锛堜緥濡傦紝鏃犲瓙濂炽�佹湁瀛愬コ绛夛級銆�</label>
-                </td>
-                <td>
-                    {{ d.params.data.parentalStatus || '' }}
-                </td>
-            </tr>
-		    
-		    <tr>
-                <td>
-                    <label for="residentialAddress">灞呬綇鍦板潃銆�</label>
-                </td>
-                <td>
-                    {{ d.params.data.residentialAddress || '' }}
-                </td>
-            </tr>
-		    
-		    <tr>
-                <td>
-                    <label for="createTime">寤虹珛鏃堕棿</label>
-                </td>
-                <td>
-                    {{ d.params.data.createTime || '' }}
-                </td>
-            </tr>
-		    
-		    <tr>
-                <td>
-                    <label for="upDataTime">淇敼鏃堕棿</label>
-                </td>
-                <td>
-                    {{ d.params.data.upDataTime || '' }}
-                </td>
-            </tr>
-		    
-		    <tr>
-                <td>
-                    <label for="createBy">鍒涘缓浜�</label>
-                </td>
-                <td>
-                    {{ d.params.data.createBy || '' }}
-                </td>
-            </tr>
-		    
-		    <tr>
-                <td>
-                    <label for="upDataBy">淇敼浜�</label>
-                </td>
-                <td>
-                    {{ d.params.data.upDataBy || '' }}
-                </td>
-            </tr>
-		    
-		    <tr>
-                <td>
-                    <label for="isdelete">鍒犻櫎鏍囧織</label>
-                </td>
-                <td>
-                    <input type="checkbox" disabled name="isdelete" value="{{d.params.data.isdelete}}" lay-skin="switch" lay-text="寮�鍚瘄鍏抽棴" lay-filter="isdelete" {{ d.params.data.isdelete ? 'checked' : '' }}>
-                </td>
-            </tr>
-		    
-		    <tr>
-                <td>
-                    <label for="AuditStatu">瀹℃牳鐘舵�併��</label>
-                </td>
-                <td>
-                    {{ d.params.data.AuditStatu || '' }}
-                </td>
-            </tr>
-		    
-        </tbody>
-    </table>
+<script type="text/html" template lay-done="layui.data.done(d);">
+    <div class="layui-form coreshop-form layui-form-pane" lay-filter="LAY-app-Job_ApplicantProfile-detailsForm" id="LAY-app-Job_ApplicantProfile-detailsForm">
+        <div id="content">
+
+            <table border="0" align="center" cellpadding="3" cellspacing="0">
+                <tr>
+                    <td colspan="8" style="font-family: 'SimHei';font-size: 20.3px; text-align: center">搴旇仒绠�鍘嗚〃</td>
+                </tr>
+                <tr>
+                    <td style="text-align: center;">
+                        <label for="jobName">搴旇仒宀椾綅:</label>
+                    </td>
+                    <td style="text-align: left;" colspan="2">
+                        {{ d.params.data.model.jobName || '' }}
+                    </td>
+
+                    <td style="text-align: center;">
+                    </td>
+                    <td style="text-align: center;">
+                    </td>
+
+                    <td style="text-align: right;" colspan="2">
+                        <label for="minSalaryRequirement">鏈�浣庤柂璧勮姹�:</label>
+                    </td>
+                    <td style="text-align: left;">
+                        {{ d.params.data.model.minSalaryRequirement || '' }}鍏�/鏈�
+                    </td>
+                </tr>
+                <tr>
+                    <td style="text-align: center; border: solid #000000 1px;width:12.5%;">
+                        <label for="name">濮�&nbsp;&nbsp;&nbsp;&nbsp;鍚�</label>
+                    </td>
+                    <td style="text-align: left; border: solid #000000 1px; width: 12.5%;">
+                        {{ d.params.data.model.name || '' }}
+                    </td>
+                    <td style="text-align: center; border: solid #000000 1px; width: 12.5%;">
+                        <label for="gender">鎬�&nbsp;&nbsp;&nbsp;&nbsp;鍒�</label>
+                    </td>
+                    <td style="text-align: left; border: solid #000000 1px; width: 12.5%;">
+                        {{ d.params.data.model.gender || '' }}
+                    </td>
+                    <td style="text-align: center; border: solid #000000 1px; width: 12.5%;">
+                        <label for="height">韬�&nbsp;&nbsp;&nbsp;&nbsp;楂�</label>
+                    </td>
+                    <td style="text-align: left; border: solid #000000 1px; width: 12.5%;">
+                        {{ d.params.data.model.height || '' }}cm
+                    </td>
+                    <td style="text-align: center; border: solid #000000 1px; width: 12.5%;">
+                        <label for="weight">浣�&nbsp;&nbsp;&nbsp;&nbsp;閲�</label>
+                    </td>
+                    <td style="text-align: left; border: solid #000000 1px; width: 12.5%;">
+                        {{ d.params.data.model.weight || '' }}kg
+                    </td>
+                </tr>
+
+                <tr>
+                    <td style="text-align: center; border: solid #000000 1px;">
+                        <label for="dateOfBirthName">鍑虹敓骞存湀</label>
+                    </td>
+                    <td style="text-align: left; border: solid #000000 1px; ">
+                        {{ d.params.data.model.dateOfBirthName || '' }}
+                    </td>
+                    <td style="text-align: center; border: solid #000000 1px; ">
+                        <label for="graduatingSchool">姣曚笟瀛︽牎</label>
+                    </td>
+                    <td style="text-align: left; border: solid #000000 1px; ">
+                        {{ d.params.data.model.graduatingSchool || '' }}
+                    </td>
+                    <td style="text-align: center; border: solid #000000 1px; ">
+                        <label for="educationLevel">瀛�&nbsp;&nbsp;&nbsp;&nbsp;鍘�</label>
+                    </td>
+                    <td style="text-align: left; border: solid #000000 1px; ">
+                        {{ d.params.data.model.educationLevel || '' }}
+                    </td>
+                    <td style="text-align: center; border: solid #000000 1px; ">
+                        <label for="major">涓�&nbsp;&nbsp;&nbsp;&nbsp;涓�</label>
+                    </td>
+                    <td style="text-align: left; border: solid #000000 1px; ">
+                        {{ d.params.data.model.major || '' }}
+                    </td>
+                </tr>
+                <tr>
+                    <td style="text-align: center; border: solid #000000 1px;">
+                        <label for="smokes">鏄惁鍚哥儫</label>
+                    </td>
+                    <td style="text-align: left; border: solid #000000 1px; ">
+                        {{ d.params.data.model.smokes || '' }}
+                    </td>
+                    <td style="text-align: center; border: solid #000000 1px; ">
+                        <label for="whiteWineCapacity">鐧介厭閰掗噺</label>
+                    </td>
+                    <td style="text-align: left; border: solid #000000 1px; ">
+                        {{ d.params.data.model.whiteWineCapacity || '' }}涓�
+                    </td>
+                    <td style="text-align: center; border: solid #000000 1px; ">
+                        <label for="maritalStatus">濠氭亱鐘跺喌</label>
+                    </td>
+                    <td style="text-align: left; border: solid #000000 1px; ">
+                        {{ d.params.data.model.maritalStatus || '' }}
+                    </td>
+                    <td style="text-align: center; border: solid #000000 1px; ">
+                        <label for="parentalStatus">鐢熻偛鎯呭喌</label>
+                    </td>
+                    <td style="text-align: left; border: solid #000000 1px; ">
+                        {{ d.params.data.model.parentalStatus || '' }}
+                    </td>
+                </tr>
+                <tr>
+                    <td style="text-align: center; border: solid #000000 1px;">
+                        <label for="drivingSkill">椹鹃┒鎶�鏈�</label>
+                    </td>
+                    <td style="text-align: left; border: solid #000000 1px; ">
+                        {{ d.params.data.model.drivingSkill || '' }}
+                    </td>
+                    <td style="text-align: center; border: solid #000000 1px; ">
+                        <label for="politicalAffiliation">鏀挎不闈㈣矊</label>
+                    </td>
+                    <td style="text-align: left; border: solid #000000 1px; ">
+                        {{ d.params.data.model.politicalAffiliation || '' }}
+                    </td>
+                    <td style="text-align: center; border: solid #000000 1px; ">
+                        <label for="specialAbilities">涓撻暱鑳藉姏</label>
+                    </td>
+                    <td style="text-align: left; border: solid #000000 1px; " colspan="3">
+                        {{ d.params.data.model.specialAbilities || '' }}
+                    </td>
+
+                </tr>
+                <tr>
+                    <td style="text-align: center; border: solid #000000 1px;">
+                        <label for="phoneNumber">鑱旂郴鐢佃瘽</label>
+                    </td>
+                    <td style="text-align: left; border: solid #000000 1px; " colspan="3">
+                        {{ d.params.data.model.phoneNumber || '' }}
+                    </td>
+
+                    <td style="text-align: center; border: solid #000000 1px; ">
+                        <label for="email">鐢靛瓙閭</label>
+                    </td>
+                    <td style="text-align: left; border: solid #000000 1px; " colspan="3">
+                        {{ d.params.data.model.email || '' }}
+                    </td>
+
+                </tr>
+                <tr>
+                    <td style="text-align: center; border: solid #000000 1px;">
+                        <label for="residentialAddress">灞呬綇鍦板潃</label>
+                    </td>
+                    <td style="text-align: left; border: solid #000000 1px; " colspan="7">
+                        {{ d.params.data.model.residentialAddress || '' }}
+                    </td>
+
+
+
+                </tr>
+                <tr>
+
+                    <td style="text-align: left; " colspan="8">
+
+                        &nbsp;
+                    </td>
+
+
+
+                </tr>
+
+                <tr>
+
+                    <td style="text-align: left; " colspan="8">
+                        鏈�杩�10骞村伐浣滅畝鍘�:
+                    </td>
+
+
+
+                </tr>
+
+                <tr>
+                    <td style="text-align: center; border: solid #000000 1px; " colspan="2">
+                        宸ヤ綔鏃堕棿
+                    </td>
+                    <td style="text-align: center; border: solid #000000 1px; " colspan="2">
+                        宸ヤ綔鍗曚綅
+                    </td>
+                    <td style="text-align: center; border: solid #000000 1px; ">
+                        鑱屽姟
+                    </td>
+                    <td style="text-align: center; border: solid #000000 1px; ">
+                        鏈堣柂
+                    </td>
+                    <td style="text-align: center; border: solid #000000 1px; " colspan="2">
+                        绂昏亴鍘熷洜
+                    </td>
+                </tr>
+
+                {{# layui.each(d.params.data.job_EmploymentRecords, function(index, item){ }}
+                <tr>
+                    <td style="text-align: left; border: solid #000000 1px;" colspan="2">
+                        {{item.startDatetxt}}
+                    </td>
+                    <td style="text-align: left; border: solid #000000 1px; " colspan="2">
+                        {{item.workplace}}
+                    </td>
+                    <td style="text-align: left; border: solid #000000 1px; ">
+                        {{item.position}}
+                    </td>
+                    <td style="text-align: left; border: solid #000000 1px; ">
+                        {{item.monthlySalary}}
+                    </td>
+                    <td style="text-align: left; border: solid #000000 1px; " colspan="2">
+                        {{item.reasonForLeaving}}
+                    </td>
+
+
+
+
+
+                </tr>
+                {{# }); }}
+
+
+                <tr>
+
+                    <td style="text-align: left; " colspan="8">
+
+                        &nbsp;
+                    </td>
+
+
+
+                </tr>
+
+                <tr>
+
+                    <td style="text-align: left; " colspan="8">
+                        瀹跺涵鎴愬憳鎯呭喌:
+                    </td>
+
+
+
+                </tr>
+
+                <tr>
+                    <td style="text-align: center; border: solid #000000 1px; ">
+                        濮�&nbsp;&nbsp;&nbsp;&nbsp;鍚�
+                    </td>
+                    <td style="text-align: center; border: solid #000000 1px; ">
+                        绉�&nbsp;&nbsp;&nbsp;&nbsp;璋�
+                    </td>
+                    <td style="text-align: center; border: solid #000000 1px; ">
+                        骞�&nbsp;&nbsp;&nbsp;&nbsp;榫�
+                    </td>
+                    <td style="text-align: center; border: solid #000000 1px; " colspan="5">
+                        宸ヤ綔鍗曚綅鍙婅亴鍔�
+                    </td>
+
+                </tr>
+
+                {{# layui.each(d.params.data.job_FamilyMembers, function(index, item){ }}
+                <tr>
+                    <td style="text-align: left; border: solid #000000 1px;">
+                        {{item.name}}
+                    </td>
+                    <td style="text-align: left; border: solid #000000 1px; ">
+                        {{item.title}}
+                    </td>
+                    <td style="text-align: left; border: solid #000000 1px; ">
+                        {{item.age}}
+                    </td>
+                    <td style="text-align: left; border: solid #000000 1px; " colspan="5">
+                        {{item.workUnitAndPosition}}
+                    </td>
+
+
+
+
+
+
+                </tr>
+                {{# }); }}
+            </table>
+            <style type="text/css">
+                table {
+                    width: 595px;
+                    font-size: 10pt;
+                    font-family: 'SimHei';
+                    background: #fff;
+                    line-height: 1.8;
+                }
+
+
+                span {
+                    font-size: 10pt;
+                    display: inline;
+                    border-bottom: 1px dashed #111;
+                }
+
+                s22pan:after {
+                    content: '';
+                    display: inline;
+                    width: 100%;
+                    margin-top: -5px;
+                    border-bottom: 1px dashed #111;
+                }
+            </style>
+        </div>
+      
+    </div>
+
+    <div class="layui-form-item text-right core-hidden">
+        <input type="button" class="layui-btn" lay-submit lay-filter="LAY-app-Job_ApplicantProfile-editForm-submit" id="LAY-app-Job_ApplicantProfile-editForm-submit" onclick="printWin();" value="鎵撳嵃">
+    </div>
+
 </script>
 <script>
     var debug= layui.setter.debug;
@@ -267,4 +326,20 @@
             form.render(null, 'LAY-app-Job_ApplicantProfile-detailsForm');
         });
     };
+
+
+    function printWin() {
+        var oWin = window.open("", "_blank");
+        var pt = document.getElementById("content").innerHTML;
+
+        oWin.document.write(pt);
+        oWin.focus();
+        oWin.document.close();
+        oWin.print();
+        oWin.close();
+        return false;
+    }
+
+ 
+
 </script>
\ No newline at end of file
diff --git a/CoreCms.Net.Web.Admin/wwwroot/views/baifenbingfa/job_applicantprofile/edit.html b/CoreCms.Net.Web.Admin/wwwroot/views/baifenbingfa/job_applicantprofile/edit.html
index 0b4ccc2..cd686ee 100644
--- a/CoreCms.Net.Web.Admin/wwwroot/views/baifenbingfa/job_applicantprofile/edit.html
+++ b/CoreCms.Net.Web.Admin/wwwroot/views/baifenbingfa/job_applicantprofile/edit.html
@@ -1,195 +1,310 @@
 <script type="text/html" template lay-done="layui.data.sendParams(d);">
     <div class="layui-form coreshop-form layui-form-pane" lay-filter="LAY-app-Job_ApplicantProfile-editForm" id="LAY-app-Job_ApplicantProfile-editForm">
-	    <input type="hidden" name="id"  value="{{d.params.data.id || '' }}" />
-	    <div class="layui-form-item">
-            <label for="id" class="layui-form-label  layui-form-required">涓婚敭ID</label>
-            <div class="layui-input-block">
-                <input  type="number" min="0" max="999999" name="id"   lay-verType="tips" lay-verify="required|number" class="layui-input" value="{{d.params.data.id || '' }}" placeholder="璇疯緭鍏ヤ富閿甀D" lay-reqText="璇疯緭鍏ヤ富閿甀D骞朵负鏁板瓧"  />
-            </div>
+        <input type="hidden" name="id" value="{{d.params.data.model.id || '' }}" />
+        <div id="content">
+
+            <table border="0" align="center" cellpadding="3" cellspacing="0">
+                <tr>
+                    <td colspan="8" style="font-family: 'SimHei';font-size: 20.3px; text-align: center">搴旇仒绠�鍘嗚〃</td>
+                </tr>
+                <tr>
+                    <td style="text-align: center;">
+                        <label for="jobName">搴旇仒宀椾綅:</label>
+                    </td>
+                    <td style="text-align: left;" colspan="2">
+                        {{ d.params.data.model.jobName || '' }}
+                    </td>
+
+                    <td style="text-align: center;">
+                    </td>
+                    <td style="text-align: center;">
+                    </td>
+
+                    <td style="text-align: right;" colspan="2">
+                        <label for="minSalaryRequirement">鏈�浣庤柂璧勮姹�:</label>
+                    </td>
+                    <td style="text-align: left;">
+                        {{ d.params.data.model.minSalaryRequirement || '' }}鍏�/鏈�
+                    </td>
+                </tr>
+                <tr>
+                    <td style="text-align: center; border: solid #000000 1px;width:12.5%;">
+                        <label for="name">濮�&nbsp;&nbsp;&nbsp;&nbsp;鍚�</label>
+                    </td>
+                    <td style="text-align: left; border: solid #000000 1px; width: 12.5%;">
+                        {{ d.params.data.model.name || '' }}
+                    </td>
+                    <td style="text-align: center; border: solid #000000 1px; width: 12.5%;">
+                        <label for="gender">鎬�&nbsp;&nbsp;&nbsp;&nbsp;鍒�</label>
+                    </td>
+                    <td style="text-align: left; border: solid #000000 1px; width: 12.5%;">
+                        {{ d.params.data.model.gender || '' }}
+                    </td>
+                    <td style="text-align: center; border: solid #000000 1px; width: 12.5%;">
+                        <label for="height">韬�&nbsp;&nbsp;&nbsp;&nbsp;楂�</label>
+                    </td>
+                    <td style="text-align: left; border: solid #000000 1px; width: 12.5%;">
+                        {{ d.params.data.model.height || '' }}cm
+                    </td>
+                    <td style="text-align: center; border: solid #000000 1px; width: 12.5%;">
+                        <label for="weight">浣�&nbsp;&nbsp;&nbsp;&nbsp;閲�</label>
+                    </td>
+                    <td style="text-align: left; border: solid #000000 1px; width: 12.5%;">
+                        {{ d.params.data.model.weight || '' }}kg
+                    </td>
+                </tr>
+
+                <tr>
+                    <td style="text-align: center; border: solid #000000 1px;">
+                        <label for="dateOfBirthName">鍑虹敓骞存湀</label>
+                    </td>
+                    <td style="text-align: left; border: solid #000000 1px; ">
+                        {{ d.params.data.model.dateOfBirthName || '' }}
+                    </td>
+                    <td style="text-align: center; border: solid #000000 1px; ">
+                        <label for="graduatingSchool">姣曚笟瀛︽牎</label>
+                    </td>
+                    <td style="text-align: left; border: solid #000000 1px; ">
+                        {{ d.params.data.model.graduatingSchool || '' }}
+                    </td>
+                    <td style="text-align: center; border: solid #000000 1px; ">
+                        <label for="educationLevel">瀛�&nbsp;&nbsp;&nbsp;&nbsp;鍘�</label>
+                    </td>
+                    <td style="text-align: left; border: solid #000000 1px; ">
+                        {{ d.params.data.model.educationLevel || '' }}
+                    </td>
+                    <td style="text-align: center; border: solid #000000 1px; ">
+                        <label for="major">涓�&nbsp;&nbsp;&nbsp;&nbsp;涓�</label>
+                    </td>
+                    <td style="text-align: left; border: solid #000000 1px; ">
+                        {{ d.params.data.model.major || '' }}
+                    </td>
+                </tr>
+                <tr>
+                    <td style="text-align: center; border: solid #000000 1px;">
+                        <label for="smokes">鏄惁鍚哥儫</label>
+                    </td>
+                    <td style="text-align: left; border: solid #000000 1px; ">
+                        {{ d.params.data.model.smokes || '' }}
+                    </td>
+                    <td style="text-align: center; border: solid #000000 1px; ">
+                        <label for="whiteWineCapacity">鐧介厭閰掗噺</label>
+                    </td>
+                    <td style="text-align: left; border: solid #000000 1px; ">
+                        {{ d.params.data.model.whiteWineCapacity || '' }}涓�
+                    </td>
+                    <td style="text-align: center; border: solid #000000 1px; ">
+                        <label for="maritalStatus">濠氭亱鐘跺喌</label>
+                    </td>
+                    <td style="text-align: left; border: solid #000000 1px; ">
+                        {{ d.params.data.model.maritalStatus || '' }}
+                    </td>
+                    <td style="text-align: center; border: solid #000000 1px; ">
+                        <label for="parentalStatus">鐢熻偛鎯呭喌</label>
+                    </td>
+                    <td style="text-align: left; border: solid #000000 1px; ">
+                        {{ d.params.data.model.parentalStatus || '' }}
+                    </td>
+                </tr>
+                <tr>
+                    <td style="text-align: center; border: solid #000000 1px;">
+                        <label for="drivingSkill">椹鹃┒鎶�鏈�</label>
+                    </td>
+                    <td style="text-align: left; border: solid #000000 1px; ">
+                        {{ d.params.data.model.drivingSkill || '' }}
+                    </td>
+                    <td style="text-align: center; border: solid #000000 1px; ">
+                        <label for="politicalAffiliation">鏀挎不闈㈣矊</label>
+                    </td>
+                    <td style="text-align: left; border: solid #000000 1px; ">
+                        {{ d.params.data.model.politicalAffiliation || '' }}
+                    </td>
+                    <td style="text-align: center; border: solid #000000 1px; ">
+                        <label for="specialAbilities">涓撻暱鑳藉姏</label>
+                    </td>
+                    <td style="text-align: left; border: solid #000000 1px; " colspan="3">
+                        {{ d.params.data.model.specialAbilities || '' }}
+                    </td>
+
+                </tr>
+                <tr>
+                    <td style="text-align: center; border: solid #000000 1px;">
+                        <label for="phoneNumber">鑱旂郴鐢佃瘽</label>
+                    </td>
+                    <td style="text-align: left; border: solid #000000 1px; " colspan="3">
+                        {{ d.params.data.model.phoneNumber || '' }}
+                    </td>
+
+                    <td style="text-align: center; border: solid #000000 1px; ">
+                        <label for="email">鐢靛瓙閭</label>
+                    </td>
+                    <td style="text-align: left; border: solid #000000 1px; " colspan="3">
+                        {{ d.params.data.model.email || '' }}
+                    </td>
+
+                </tr>
+                <tr>
+                    <td style="text-align: center; border: solid #000000 1px;">
+                        <label for="residentialAddress">灞呬綇鍦板潃</label>
+                    </td>
+                    <td style="text-align: left; border: solid #000000 1px; " colspan="7">
+                        {{ d.params.data.model.residentialAddress || '' }}
+                    </td>
+
+
+
+                </tr>
+                <tr>
+
+                    <td style="text-align: left; " colspan="8">
+
+                        &nbsp;
+                    </td>
+
+
+
+                </tr>
+
+                <tr>
+
+                    <td style="text-align: left; " colspan="8">
+                        鏈�杩�10骞村伐浣滅畝鍘�:
+                    </td>
+
+
+
+                </tr>
+
+                <tr>
+                    <td style="text-align: center; border: solid #000000 1px; " colspan="2">
+                        宸ヤ綔鏃堕棿
+                    </td>
+                    <td style="text-align: center; border: solid #000000 1px; " colspan="2">
+                        宸ヤ綔鍗曚綅
+                    </td>
+                    <td style="text-align: center; border: solid #000000 1px; ">
+                        鑱屽姟
+                    </td>
+                    <td style="text-align: center; border: solid #000000 1px; ">
+                        鏈堣柂
+                    </td>
+                    <td style="text-align: center; border: solid #000000 1px; " colspan="2">
+                        绂昏亴鍘熷洜
+                    </td>
+                </tr>
+
+                {{# layui.each(d.params.data.job_EmploymentRecords, function(index, item){ }}
+                <tr>
+                    <td style="text-align: left; border: solid #000000 1px;" colspan="2">
+                        {{item.startDatetxt}}
+                    </td>
+                    <td style="text-align: left; border: solid #000000 1px; " colspan="2">
+                        {{item.workplace}}
+                    </td>
+                    <td style="text-align: left; border: solid #000000 1px; ">
+                        {{item.position}}
+                    </td>
+                    <td style="text-align: left; border: solid #000000 1px; ">
+                        {{item.monthlySalary}}
+                    </td>
+                    <td style="text-align: left; border: solid #000000 1px; " colspan="2">
+                        {{item.reasonForLeaving}}
+                    </td>
+
+
+
+
+
+                </tr>
+                {{# }); }}
+
+
+                <tr>
+
+                    <td style="text-align: left; " colspan="8">
+
+                        &nbsp;
+                    </td>
+
+
+
+                </tr>
+
+                <tr>
+
+                    <td style="text-align: left; " colspan="8">
+                        瀹跺涵鎴愬憳鎯呭喌:
+                    </td>
+
+
+
+                </tr>
+
+                <tr>
+                    <td style="text-align: center; border: solid #000000 1px; ">
+                        濮�&nbsp;&nbsp;&nbsp;&nbsp;鍚�
+                    </td>
+                    <td style="text-align: center; border: solid #000000 1px; ">
+                        绉�&nbsp;&nbsp;&nbsp;&nbsp;璋�
+                    </td>
+                    <td style="text-align: center; border: solid #000000 1px; ">
+                        骞�&nbsp;&nbsp;&nbsp;&nbsp;榫�
+                    </td>
+                    <td style="text-align: center; border: solid #000000 1px; " colspan="5">
+                        宸ヤ綔鍗曚綅鍙婅亴鍔�
+                    </td>
+
+                </tr>
+
+                {{# layui.each(d.params.data.job_FamilyMembers, function(index, item){ }}
+                <tr>
+                    <td style="text-align: left; border: solid #000000 1px;">
+                        {{item.name}}
+                    </td>
+                    <td style="text-align: left; border: solid #000000 1px; ">
+                        {{item.title}}
+                    </td>
+                    <td style="text-align: left; border: solid #000000 1px; ">
+                        {{item.age}}
+                    </td>
+                    <td style="text-align: left; border: solid #000000 1px; " colspan="5">
+                        {{item.workUnitAndPosition}}
+                    </td>
+
+
+
+
+
+
+                </tr>
+                {{# }); }}
+            </table>
         </div>
-	    
-	    <div class="layui-form-item">
-            <label for="jobId" class="layui-form-label  layui-form-required">搴旇仒鐨勫矖浣嶃��</label>
-            <div class="layui-input-block">
-                <input  type="number" min="0" max="999999" name="jobId"   lay-verType="tips" lay-verify="required|number" class="layui-input" value="{{d.params.data.jobId || '' }}" placeholder="璇疯緭鍏ュ簲鑱樼殑宀椾綅銆�" lay-reqText="璇疯緭鍏ュ簲鑱樼殑宀椾綅銆傚苟涓烘暟瀛�"  />
-            </div>
-        </div>
-	    
-	    <div class="layui-form-item">
-            <label for="minSalaryRequirement" class="layui-form-label  layui-form-required">搴旇仒鑰呮湡鏈涚殑鏈�浣庤柂璧勮姹傘��</label>
-            <div class="layui-input-block">
-                <input name="minSalaryRequirement"   lay-verType="tips" lay-verify="required" class="layui-input" placeholder="璇疯緭鍏ュ簲鑱樿�呮湡鏈涚殑鏈�浣庤柂璧勮姹傘��" lay-reqText="璇疯緭鍏ュ簲鑱樿�呮湡鏈涚殑鏈�浣庤柂璧勮姹傘��"  value="{{d.params.data.minSalaryRequirement || '' }}" />
-            </div>
-        </div>
-	    
-	    <div class="layui-form-item">
-            <label for="name" class="layui-form-label  layui-form-required">搴旇仒鑰呯殑鍏ㄥ悕銆�</label>
-            <div class="layui-input-block">
-                <input name="name"   lay-verType="tips" lay-verify="required" class="layui-input" placeholder="璇疯緭鍏ュ簲鑱樿�呯殑鍏ㄥ悕銆�" lay-reqText="璇疯緭鍏ュ簲鑱樿�呯殑鍏ㄥ悕銆�"  value="{{d.params.data.name || '' }}" />
-            </div>
-        </div>
-	    
-	    <div class="layui-form-item">
-            <label for="gender" class="layui-form-label  layui-form-required">搴旇仒鑰呯殑鎬у埆銆�</label>
-            <div class="layui-input-block">
-                <input name="gender"   lay-verType="tips" lay-verify="required" class="layui-input" placeholder="璇疯緭鍏ュ簲鑱樿�呯殑鎬у埆銆�" lay-reqText="璇疯緭鍏ュ簲鑱樿�呯殑鎬у埆銆�"  value="{{d.params.data.gender || '' }}" />
-            </div>
-        </div>
-	    
-	    <div class="layui-form-item">
-            <label for="height" class="layui-form-label  layui-form-required">搴旇仒鑰呯殑韬珮锛堝崟浣嶏細鍘樼背锛夈��</label>
-            <div class="layui-input-block">
-                <input  type="number" min="0" max="999999" name="height"   lay-verType="tips" lay-verify="required|number" class="layui-input" value="{{d.params.data.height || '' }}" placeholder="璇疯緭鍏ュ簲鑱樿�呯殑韬珮锛堝崟浣嶏細鍘樼背锛夈��" lay-reqText="璇疯緭鍏ュ簲鑱樿�呯殑韬珮锛堝崟浣嶏細鍘樼背锛夈�傚苟涓烘暟瀛�"  />
-            </div>
-        </div>
-	    
-	    <div class="layui-form-item">
-            <label for="weight" class="layui-form-label  layui-form-required">搴旇仒鑰呯殑浣撻噸锛堝崟浣嶏細鍗冨厠锛夈��</label>
-            <div class="layui-input-block">
-                <input name="weight"   lay-verType="tips" lay-verify="required" class="layui-input" placeholder="璇疯緭鍏ュ簲鑱樿�呯殑浣撻噸锛堝崟浣嶏細鍗冨厠锛夈��" lay-reqText="璇疯緭鍏ュ簲鑱樿�呯殑浣撻噸锛堝崟浣嶏細鍗冨厠锛夈��"  value="{{d.params.data.weight || '' }}" />
-            </div>
-        </div>
-	    
-	    <div class="layui-form-item">
-            <label for="dateOfBirth" class="layui-form-label  layui-form-required">搴旇仒鑰呯殑鍑虹敓鏃ユ湡銆�</label>
-            <div class="layui-input-block">
-                <input name="dateOfBirth"  id="editTime-Job_ApplicantProfile-dateOfBirth" type="text" lay-verType="tips" lay-verify="required|datetime" class="layui-input" placeholder="璇疯緭鍏ュ簲鑱樿�呯殑鍑虹敓鏃ユ湡銆�" lay-reqText="璇疯緭鍏ュ簲鑱樿�呯殑鍑虹敓鏃ユ湡銆�"   value="{{d.params.data.dateOfBirth || '' }}"/>
-            </div>
-        </div>
-	    
-	    <div class="layui-form-item">
-            <label for="graduatingSchool" class="layui-form-label  layui-form-required">搴旇仒鑰呯殑姣曚笟瀛︽牎鍚嶇О銆�</label>
-            <div class="layui-input-block">
-                <input name="graduatingSchool"   lay-verType="tips" lay-verify="required" class="layui-input" placeholder="璇疯緭鍏ュ簲鑱樿�呯殑姣曚笟瀛︽牎鍚嶇О銆�" lay-reqText="璇疯緭鍏ュ簲鑱樿�呯殑姣曚笟瀛︽牎鍚嶇О銆�"  value="{{d.params.data.graduatingSchool || '' }}" />
-            </div>
-        </div>
-	    
-	    <div class="layui-form-item">
-            <label for="educationLevel" class="layui-form-label  layui-form-required">搴旇仒鑰呯殑鏈�楂樺鍘嗐��</label>
-            <div class="layui-input-block">
-                <input name="educationLevel"   lay-verType="tips" lay-verify="required" class="layui-input" placeholder="璇疯緭鍏ュ簲鑱樿�呯殑鏈�楂樺鍘嗐��" lay-reqText="璇疯緭鍏ュ簲鑱樿�呯殑鏈�楂樺鍘嗐��"  value="{{d.params.data.educationLevel || '' }}" />
-            </div>
-        </div>
-	    
-	    <div class="layui-form-item">
-            <label for="major" class="layui-form-label  layui-form-required">搴旇仒鑰呯殑涓撲笟鍚嶇О銆�</label>
-            <div class="layui-input-block">
-                <input name="major"   lay-verType="tips" lay-verify="required" class="layui-input" placeholder="璇疯緭鍏ュ簲鑱樿�呯殑涓撲笟鍚嶇О銆�" lay-reqText="璇疯緭鍏ュ簲鑱樿�呯殑涓撲笟鍚嶇О銆�"  value="{{d.params.data.major || '' }}" />
-            </div>
-        </div>
-	    
-	    <div class="layui-form-item">
-            <label for="smokes" class="layui-form-label  layui-form-required">鏄惁鍚哥儫銆�</label>
-            <div class="layui-input-block">
-                <input name="smokes"   lay-verType="tips" lay-verify="required" class="layui-input" placeholder="璇疯緭鍏ユ槸鍚﹀惛鐑熴��" lay-reqText="璇疯緭鍏ユ槸鍚﹀惛鐑熴��"  value="{{d.params.data.smokes || '' }}" />
-            </div>
-        </div>
-	    
-	    <div class="layui-form-item">
-            <label for="drivingSkill" class="layui-form-label  layui-form-required">椹鹃┒鎶�鏈瓑绾э紙濡傛柊鎵嬨�佺啛缁冦�佷笓涓氾級銆�</label>
-            <div class="layui-input-block">
-                <input name="drivingSkill"   lay-verType="tips" lay-verify="required" class="layui-input" placeholder="璇疯緭鍏ラ┚椹舵妧鏈瓑绾э紙濡傛柊鎵嬨�佺啛缁冦�佷笓涓氾級銆�" lay-reqText="璇疯緭鍏ラ┚椹舵妧鏈瓑绾э紙濡傛柊鎵嬨�佺啛缁冦�佷笓涓氾級銆�"  value="{{d.params.data.drivingSkill || '' }}" />
-            </div>
-        </div>
-	    
-	    <div class="layui-form-item">
-            <label for="phoneNumber" class="layui-form-label  layui-form-required">搴旇仒鑰呯殑鑱旂郴鐢佃瘽銆�</label>
-            <div class="layui-input-block">
-                <input name="phoneNumber"   lay-verType="tips" lay-verify="required" class="layui-input" placeholder="璇疯緭鍏ュ簲鑱樿�呯殑鑱旂郴鐢佃瘽銆�" lay-reqText="璇疯緭鍏ュ簲鑱樿�呯殑鑱旂郴鐢佃瘽銆�"  value="{{d.params.data.phoneNumber || '' }}" />
-            </div>
-        </div>
-	    
-	    <div class="layui-form-item">
-            <label for="whiteWineCapacity" class="layui-form-label  layui-form-required">鐧介厭閰掗噺锛堜緥濡傦紝姣崌鎴栨澂鏁帮級銆�</label>
-            <div class="layui-input-block">
-                <input name="whiteWineCapacity"   lay-verType="tips" lay-verify="required" class="layui-input" placeholder="璇疯緭鍏ョ櫧閰掗厭閲忥紙渚嬪锛屾鍗囨垨鏉暟锛夈��" lay-reqText="璇疯緭鍏ョ櫧閰掗厭閲忥紙渚嬪锛屾鍗囨垨鏉暟锛夈��"  value="{{d.params.data.whiteWineCapacity || '' }}" />
-            </div>
-        </div>
-	    
-	    <div class="layui-form-item">
-            <label for="politicalAffiliation" class="layui-form-label  layui-form-required">搴旇仒鑰呯殑鏀挎不闈㈣矊銆�</label>
-            <div class="layui-input-block">
-                <input name="politicalAffiliation"   lay-verType="tips" lay-verify="required" class="layui-input" placeholder="璇疯緭鍏ュ簲鑱樿�呯殑鏀挎不闈㈣矊銆�" lay-reqText="璇疯緭鍏ュ簲鑱樿�呯殑鏀挎不闈㈣矊銆�"  value="{{d.params.data.politicalAffiliation || '' }}" />
-            </div>
-        </div>
-	    
-	    <div class="layui-form-item">
-            <label for="maritalStatus" class="layui-form-label  layui-form-required">濠氭亱鐘跺喌锛堜緥濡傦紝鍗曡韩銆佸凡濠氥�佺寮傜瓑锛夈��</label>
-            <div class="layui-input-block">
-                <input name="maritalStatus"   lay-verType="tips" lay-verify="required" class="layui-input" placeholder="璇疯緭鍏ュ鎭嬬姸鍐碉紙渚嬪锛屽崟韬�佸凡濠氥�佺寮傜瓑锛夈��" lay-reqText="璇疯緭鍏ュ鎭嬬姸鍐碉紙渚嬪锛屽崟韬�佸凡濠氥�佺寮傜瓑锛夈��"  value="{{d.params.data.maritalStatus || '' }}" />
-            </div>
-        </div>
-	    
-	    <div class="layui-form-item">
-            <label for="specialAbilities" class="layui-form-label  layui-form-required">涓撻暱鑳藉姏銆�</label>
-            <div class="layui-input-block">
-                <input name="specialAbilities"   lay-verType="tips" lay-verify="required" class="layui-input" placeholder="璇疯緭鍏ヤ笓闀胯兘鍔涖��" lay-reqText="璇疯緭鍏ヤ笓闀胯兘鍔涖��"  value="{{d.params.data.specialAbilities || '' }}" />
-            </div>
-        </div>
-	    
-	    <div class="layui-form-item">
-            <label for="email" class="layui-form-label  layui-form-required">搴旇仒鑰呯殑鐢靛瓙閭欢鍦板潃銆�</label>
-            <div class="layui-input-block">
-                <input name="email"   lay-verType="tips" lay-verify="required" class="layui-input" placeholder="璇疯緭鍏ュ簲鑱樿�呯殑鐢靛瓙閭欢鍦板潃銆�" lay-reqText="璇疯緭鍏ュ簲鑱樿�呯殑鐢靛瓙閭欢鍦板潃銆�"  value="{{d.params.data.email || '' }}" />
-            </div>
-        </div>
-	    
-	    <div class="layui-form-item">
-            <label for="parentalStatus" class="layui-form-label  layui-form-required">鐢熻偛鎯呭喌锛堜緥濡傦紝鏃犲瓙濂炽�佹湁瀛愬コ绛夛級銆�</label>
-            <div class="layui-input-block">
-                <input name="parentalStatus"   lay-verType="tips" lay-verify="required" class="layui-input" placeholder="璇疯緭鍏ョ敓鑲叉儏鍐碉紙渚嬪锛屾棤瀛愬コ銆佹湁瀛愬コ绛夛級銆�" lay-reqText="璇疯緭鍏ョ敓鑲叉儏鍐碉紙渚嬪锛屾棤瀛愬コ銆佹湁瀛愬コ绛夛級銆�"  value="{{d.params.data.parentalStatus || '' }}" />
-            </div>
-        </div>
-	    
-	    <div class="layui-form-item">
-            <label for="residentialAddress" class="layui-form-label  layui-form-required">灞呬綇鍦板潃銆�</label>
-            <div class="layui-input-block">
-                <input name="residentialAddress"   lay-verType="tips" lay-verify="required" class="layui-input" placeholder="璇疯緭鍏ュ眳浣忓湴鍧�銆�" lay-reqText="璇疯緭鍏ュ眳浣忓湴鍧�銆�"  value="{{d.params.data.residentialAddress || '' }}" />
-            </div>
-        </div>
-	    
-	    <div class="layui-form-item">
-            <label for="createTime" class="layui-form-label  layui-form-required">寤虹珛鏃堕棿</label>
-            <div class="layui-input-block">
-                <input name="createTime"  id="editTime-Job_ApplicantProfile-createTime" type="text" lay-verType="tips" lay-verify="required|datetime" class="layui-input" placeholder="璇疯緭鍏ュ缓绔嬫椂闂�" lay-reqText="璇疯緭鍏ュ缓绔嬫椂闂�"   value="{{d.params.data.createTime || '' }}"/>
-            </div>
-        </div>
-	    
-	    <div class="layui-form-item">
-            <label for="upDataTime" class="layui-form-label  layui-form-required">淇敼鏃堕棿</label>
-            <div class="layui-input-block">
-                <input name="upDataTime"  id="editTime-Job_ApplicantProfile-upDataTime" type="text" lay-verType="tips" lay-verify="required|datetime" class="layui-input" placeholder="璇疯緭鍏ヤ慨鏀规椂闂�" lay-reqText="璇疯緭鍏ヤ慨鏀规椂闂�"   value="{{d.params.data.upDataTime || '' }}"/>
-            </div>
-        </div>
-	    
-	    <div class="layui-form-item">
-            <label for="createBy" class="layui-form-label  layui-form-required">鍒涘缓浜�</label>
-            <div class="layui-input-block">
-                <input name="createBy"   lay-verType="tips" lay-verify="required" class="layui-input" placeholder="璇疯緭鍏ュ垱寤轰汉" lay-reqText="璇疯緭鍏ュ垱寤轰汉"  value="{{d.params.data.createBy || '' }}" />
-            </div>
-        </div>
-	    
-	    <div class="layui-form-item">
-            <label for="upDataBy" class="layui-form-label  layui-form-required">淇敼浜�</label>
-            <div class="layui-input-block">
-                <input name="upDataBy"   lay-verType="tips" lay-verify="required" class="layui-input" placeholder="璇疯緭鍏ヤ慨鏀逛汉" lay-reqText="璇疯緭鍏ヤ慨鏀逛汉"  value="{{d.params.data.upDataBy || '' }}" />
-            </div>
-        </div>
-	    
-	    <div class="layui-form-item" pane>
-            <label for="isdelete" class="layui-form-label  layui-form-required">鍒犻櫎鏍囧織</label>
-            <div class="layui-input-block">
-                <input type="checkbox" lay-filter="switch" name="isdelete"   {{ d.params.data.isdelete ? 'checked' : '' }} lay-skin="switch" lay-text="寮�鍚瘄鍏抽棴">
-            </div>
-        </div>
-	    
-	    <div class="layui-form-item">
-            <label for="AuditStatu" class="layui-form-label  layui-form-required">瀹℃牳鐘舵�併��</label>
-            <div class="layui-input-block">
-                <input  type="number" min="0" max="999999" name="AuditStatu"   lay-verType="tips" lay-verify="required|number" class="layui-input" value="{{d.params.data.AuditStatu || '' }}" placeholder="璇疯緭鍏ュ鏍哥姸鎬併��" lay-reqText="璇疯緭鍏ュ鏍哥姸鎬併�傚苟涓烘暟瀛�"  />
-            </div>
-        </div>
-	    
+        <style type="text/css">
+            table {
+                width: 595px;
+                font-size: 10pt;
+                font-family: 'FangSong';
+                background: #fff;
+                line-height: 2.0;
+            }
+
+
+            span {
+                font-size: 10pt;
+                display: inline;
+                border-bottom: 1px dashed #111;
+            }
+
+            s22pan:after {
+                content: '';
+                display: inline;
+                width: 100%;
+                margin-top: -5px;
+                border-bottom: 1px dashed #111;
+            }
+        </style>
+
         <div class="layui-form-item text-right core-hidden">
             <input type="button" class="layui-btn" lay-submit lay-filter="LAY-app-Job_ApplicantProfile-editForm-submit" id="LAY-app-Job_ApplicantProfile-editForm-submit" value="纭缂栬緫">
         </div>
diff --git a/CoreCms.Net.Web.Admin/wwwroot/views/baifenbingfa/job_applicantprofile/index.html b/CoreCms.Net.Web.Admin/wwwroot/views/baifenbingfa/job_applicantprofile/index.html
index 6831a9e..8cfd1b1 100644
--- a/CoreCms.Net.Web.Admin/wwwroot/views/baifenbingfa/job_applicantprofile/index.html
+++ b/CoreCms.Net.Web.Admin/wwwroot/views/baifenbingfa/job_applicantprofile/index.html
@@ -20,173 +20,60 @@
 <script type="text/html" id="LAY-app-Job_ApplicantProfile-toolbar">
     <div class="layui-form coreshop-toolbar-search-form">
         <div class="layui-form-item">
-		    
             <div class="layui-inline">
-                <label class="layui-form-label" for="id">涓婚敭ID</label>
-                <div class="layui-input-inline">
-                    <input type="text" name="id"  placeholder="璇疯緭鍏ヤ富閿甀D" class="layui-input">
-                </div>
-            </div>
-            <div class="layui-inline">
-                <label class="layui-form-label" for="jobId">搴旇仒鐨勫矖浣嶃��</label>
-                <div class="layui-input-inline">
-                    <input type="text" name="jobId"  placeholder="璇疯緭鍏ュ簲鑱樼殑宀椾綅銆�" class="layui-input">
-                </div>
-            </div>
-            <div class="layui-inline">
-                <label class="layui-form-label" for="minSalaryRequirement">搴旇仒鑰呮湡鏈涚殑鏈�浣庤柂璧勮姹傘��</label>
-                <div class="layui-input-inline">
-                    <input type="text" name="minSalaryRequirement"  placeholder="璇疯緭鍏ュ簲鑱樿�呮湡鏈涚殑鏈�浣庤柂璧勮姹傘��" class="layui-input">
-                </div>
-            </div>
-            <div class="layui-inline">
-                <label class="layui-form-label" for="name">搴旇仒鑰呯殑鍏ㄥ悕銆�</label>
-                <div class="layui-input-inline">
-                    <input type="text" name="name"  placeholder="璇疯緭鍏ュ簲鑱樿�呯殑鍏ㄥ悕銆�" class="layui-input">
-                </div>
-            </div>
-            <div class="layui-inline">
-                <label class="layui-form-label" for="gender">搴旇仒鑰呯殑鎬у埆銆�</label>
-                <div class="layui-input-inline">
-                    <input type="text" name="gender"  placeholder="璇疯緭鍏ュ簲鑱樿�呯殑鎬у埆銆�" class="layui-input">
-                </div>
-            </div>
-            <div class="layui-inline">
-                <label class="layui-form-label" for="height">搴旇仒鑰呯殑韬珮锛堝崟浣嶏細鍘樼背锛夈��</label>
-                <div class="layui-input-inline">
-                    <input type="text" name="height"  placeholder="璇疯緭鍏ュ簲鑱樿�呯殑韬珮锛堝崟浣嶏細鍘樼背锛夈��" class="layui-input">
-                </div>
-            </div>
-            <div class="layui-inline">
-                <label class="layui-form-label" for="weight">搴旇仒鑰呯殑浣撻噸锛堝崟浣嶏細鍗冨厠锛夈��</label>
-                <div class="layui-input-inline">
-                    <input type="text" name="weight"  placeholder="璇疯緭鍏ュ簲鑱樿�呯殑浣撻噸锛堝崟浣嶏細鍗冨厠锛夈��" class="layui-input">
-                </div>
-            </div>
-            <div class="layui-inline">
-                <label class="layui-form-label" for="dateOfBirth">搴旇仒鑰呯殑鍑虹敓鏃ユ湡銆�</label>
+                <label class="layui-form-label" for="createTime">搴旇仒鏃堕棿</label>
                 <div class="layui-input-inline" style="width: 260px;">
-                    <input type="text" name="dateOfBirth" id="searchTime-Job_ApplicantProfile-dateOfBirth" placeholder="璇疯緭鍏ュ簲鑱樿�呯殑鍑虹敓鏃ユ湡銆�" class="layui-input">
+                    <input type="text" name="createTime" id="searchTime-Job_ApplicantProfile-createTime" placeholder="璇疯緭鍏ュ簲鑱樻椂闂�" class="layui-input">
                 </div>
             </div>
             <div class="layui-inline">
-                <label class="layui-form-label" for="graduatingSchool">搴旇仒鑰呯殑姣曚笟瀛︽牎鍚嶇О銆�</label>
+                <label class="layui-form-label" for="AuditStatu">鏄惁瀹℃牳</label>
                 <div class="layui-input-inline">
-                    <input type="text" name="graduatingSchool"  placeholder="璇疯緭鍏ュ簲鑱樿�呯殑姣曚笟瀛︽牎鍚嶇О銆�" class="layui-input">
+                    <select name="AuditStatu">
+                        <option value="-1">璇烽�夋嫨</option>
+                        <option value="2">鏄�</option>
+                        <option value="0">鍚�</option>
+                    </select>
                 </div>
             </div>
+
             <div class="layui-inline">
-                <label class="layui-form-label" for="educationLevel">搴旇仒鑰呯殑鏈�楂樺鍘嗐��</label>
+                <label class="layui-form-label" for="name">濮撳悕</label>
                 <div class="layui-input-inline">
-                    <input type="text" name="educationLevel"  placeholder="璇疯緭鍏ュ簲鑱樿�呯殑鏈�楂樺鍘嗐��" class="layui-input">
+                    <input type="text" name="name" placeholder="璇疯緭鍏ュ鍚�" class="layui-input">
                 </div>
             </div>
             <div class="layui-inline">
-                <label class="layui-form-label" for="major">搴旇仒鑰呯殑涓撲笟鍚嶇О銆�</label>
+                <label class="layui-form-label" for="gender">鎬у埆</label>
                 <div class="layui-input-inline">
-                    <input type="text" name="major"  placeholder="璇疯緭鍏ュ簲鑱樿�呯殑涓撲笟鍚嶇О銆�" class="layui-input">
-                </div>
-            </div>
-            <div class="layui-inline">
-                <label class="layui-form-label" for="smokes">鏄惁鍚哥儫銆�</label>
-                <div class="layui-input-inline">
-                    <input type="text" name="smokes"  placeholder="璇疯緭鍏ユ槸鍚﹀惛鐑熴��" class="layui-input">
-                </div>
-            </div>
-            <div class="layui-inline">
-                <label class="layui-form-label" for="drivingSkill">椹鹃┒鎶�鏈瓑绾э紙濡傛柊鎵嬨�佺啛缁冦�佷笓涓氾級銆�</label>
-                <div class="layui-input-inline">
-                    <input type="text" name="drivingSkill"  placeholder="璇疯緭鍏ラ┚椹舵妧鏈瓑绾э紙濡傛柊鎵嬨�佺啛缁冦�佷笓涓氾級銆�" class="layui-input">
-                </div>
-            </div>
-            <div class="layui-inline">
-                <label class="layui-form-label" for="phoneNumber">搴旇仒鑰呯殑鑱旂郴鐢佃瘽銆�</label>
-                <div class="layui-input-inline">
-                    <input type="text" name="phoneNumber"  placeholder="璇疯緭鍏ュ簲鑱樿�呯殑鑱旂郴鐢佃瘽銆�" class="layui-input">
-                </div>
-            </div>
-            <div class="layui-inline">
-                <label class="layui-form-label" for="whiteWineCapacity">鐧介厭閰掗噺锛堜緥濡傦紝姣崌鎴栨澂鏁帮級銆�</label>
-                <div class="layui-input-inline">
-                    <input type="text" name="whiteWineCapacity"  placeholder="璇疯緭鍏ョ櫧閰掗厭閲忥紙渚嬪锛屾鍗囨垨鏉暟锛夈��" class="layui-input">
-                </div>
-            </div>
-            <div class="layui-inline">
-                <label class="layui-form-label" for="politicalAffiliation">搴旇仒鑰呯殑鏀挎不闈㈣矊銆�</label>
-                <div class="layui-input-inline">
-                    <input type="text" name="politicalAffiliation"  placeholder="璇疯緭鍏ュ簲鑱樿�呯殑鏀挎不闈㈣矊銆�" class="layui-input">
-                </div>
-            </div>
-            <div class="layui-inline">
-                <label class="layui-form-label" for="maritalStatus">濠氭亱鐘跺喌锛堜緥濡傦紝鍗曡韩銆佸凡濠氥�佺寮傜瓑锛夈��</label>
-                <div class="layui-input-inline">
-                    <input type="text" name="maritalStatus"  placeholder="璇疯緭鍏ュ鎭嬬姸鍐碉紙渚嬪锛屽崟韬�佸凡濠氥�佺寮傜瓑锛夈��" class="layui-input">
-                </div>
-            </div>
-            <div class="layui-inline">
-                <label class="layui-form-label" for="specialAbilities">涓撻暱鑳藉姏銆�</label>
-                <div class="layui-input-inline">
-                    <input type="text" name="specialAbilities"  placeholder="璇疯緭鍏ヤ笓闀胯兘鍔涖��" class="layui-input">
-                </div>
-            </div>
-            <div class="layui-inline">
-                <label class="layui-form-label" for="email">搴旇仒鑰呯殑鐢靛瓙閭欢鍦板潃銆�</label>
-                <div class="layui-input-inline">
-                    <input type="text" name="email"  placeholder="璇疯緭鍏ュ簲鑱樿�呯殑鐢靛瓙閭欢鍦板潃銆�" class="layui-input">
-                </div>
-            </div>
-            <div class="layui-inline">
-                <label class="layui-form-label" for="parentalStatus">鐢熻偛鎯呭喌锛堜緥濡傦紝鏃犲瓙濂炽�佹湁瀛愬コ绛夛級銆�</label>
-                <div class="layui-input-inline">
-                    <input type="text" name="parentalStatus"  placeholder="璇疯緭鍏ョ敓鑲叉儏鍐碉紙渚嬪锛屾棤瀛愬コ銆佹湁瀛愬コ绛夛級銆�" class="layui-input">
-                </div>
-            </div>
-            <div class="layui-inline">
-                <label class="layui-form-label" for="residentialAddress">灞呬綇鍦板潃銆�</label>
-                <div class="layui-input-inline">
-                    <input type="text" name="residentialAddress"  placeholder="璇疯緭鍏ュ眳浣忓湴鍧�銆�" class="layui-input">
-                </div>
-            </div>
-            <div class="layui-inline">
-                <label class="layui-form-label" for="createTime">寤虹珛鏃堕棿</label>
-                <div class="layui-input-inline" style="width: 260px;">
-                    <input type="text" name="createTime" id="searchTime-Job_ApplicantProfile-createTime" placeholder="璇疯緭鍏ュ缓绔嬫椂闂�" class="layui-input">
-                </div>
-            </div>
-            <div class="layui-inline">
-                <label class="layui-form-label" for="upDataTime">淇敼鏃堕棿</label>
-                <div class="layui-input-inline" style="width: 260px;">
-                    <input type="text" name="upDataTime" id="searchTime-Job_ApplicantProfile-upDataTime" placeholder="璇疯緭鍏ヤ慨鏀规椂闂�" class="layui-input">
-                </div>
-            </div>
-            <div class="layui-inline">
-                <label class="layui-form-label" for="createBy">鍒涘缓浜�</label>
-                <div class="layui-input-inline">
-                    <input type="text" name="createBy"  placeholder="璇疯緭鍏ュ垱寤轰汉" class="layui-input">
-                </div>
-            </div>
-            <div class="layui-inline">
-                <label class="layui-form-label" for="upDataBy">淇敼浜�</label>
-                <div class="layui-input-inline">
-                    <input type="text" name="upDataBy"  placeholder="璇疯緭鍏ヤ慨鏀逛汉" class="layui-input">
-                </div>
-            </div>
-		    <div class="layui-inline">
-			    <label class="layui-form-label" for="isdelete">鍒犻櫎鏍囧織</label>
-                <div class="layui-input-inline">
-                    <select name="isdelete">
+
+                    <select name="gender">
                         <option value="">璇烽�夋嫨</option>
-                        <option value="True">鏄�</option>
-                        <option value="False">鍚�</option>
+                        <option value="鐢�">鐢�</option>
+                        <option value="濂�">濂�</option>
                     </select>
                 </div>
             </div>
             <div class="layui-inline">
-                <label class="layui-form-label" for="AuditStatu">瀹℃牳鐘舵�併��</label>
-                <div class="layui-input-inline">
-                    <input type="text" name="AuditStatu"  placeholder="璇疯緭鍏ュ鏍哥姸鎬併��" class="layui-input">
+                <label class="layui-form-label" for="dateOfBirth">骞撮緞</label>
+                <div class="layui-input-inline" style="width: 260px;">
+                    <input type="text" name="dateOfBirth" id="searchTime-Job_ApplicantProfile-dateOfBirth" placeholder="璇疯緭鍏ュ簲鑱樿�呯殑骞撮緞" class="layui-input">
                 </div>
             </div>
+            
+            <div class="layui-inline">
+                <label class="layui-form-label" for="jobId">搴旇仒宀椾綅</label>
+                <div class="layui-input-inline">
+                   
+                    <select name="jobId">
+                        <option value="">璇烽�夋嫨</option>
+                        {{# layui.each(indexData, function(index, item){ }}
+                    <option value="{{ item.id }}">{{ item.position }}</option>
+                        {{# }); }}
+                    </select>
+                </div>
+            </div>
+           
             <div class="layui-inline">
                 <button class="layui-btn layui-btn-sm" lay-submit lay-filter="LAY-app-Job_ApplicantProfile-search"><i class="layui-icon layui-icon-search"></i>绛涢��</button>
             </div>
@@ -196,17 +83,17 @@
 
 <script type="text/html" id="LAY-app-Job_ApplicantProfile-pagebar">
     <div class="layui-btn-container">
-        <button class="layui-btn layui-btn-sm" lay-event="addData"><i class="layui-icon layui-icon-add-1"></i>娣诲姞鏁版嵁</button>
-        <button class="layui-btn layui-btn-sm" lay-event="batchDelete"><i class="layui-icon layui-icon-delete"></i>鎵归噺鍒犻櫎</button>
+        <!--<button class="layui-btn layui-btn-sm" lay-event="addData"><i class="layui-icon layui-icon-add-1"></i>娣诲姞鏁版嵁</button>
+        <button class="layui-btn layui-btn-sm" lay-event="batchDelete"><i class="layui-icon layui-icon-delete"></i>鎵归噺鍒犻櫎</button>-->
         <button class="layui-btn layui-btn-sm" lay-event="selectExportExcel"><i class="layui-icon layui-icon-add-circle"></i>閫夋嫨瀵煎嚭</button>
         <button class="layui-btn layui-btn-sm" lay-event="queryExportExcel"><i class="layui-icon layui-icon-download-circle"></i>鏌ヨ瀵煎嚭</button>
     </div>
 </script>
 
 <script type="text/html" id="LAY-app-Job_ApplicantProfile-tableBox-bar">
-    <a class="layui-btn layui-btn-primary layui-btn-xs" lay-event="detail">鏌ョ湅</a>
-    <a class="layui-btn layui-btn-xs" lay-event="edit">缂栬緫</a>
-    <a class="layui-btn layui-btn-danger layui-btn-xs" data-dropdown="#Job_ApplicantProfileTbDelDrop{{d.LAY_INDEX}}" no-shade="true">鍒犻櫎</a>
+    <a class="layui-btn layui-btn-primary layui-btn-xs" lay-event="detail">鎵撳嵃</a>
+    <a class="layui-btn layui-btn-xs" lay-event="edit">瀹℃牳</a>
+    <!--<a class="layui-btn layui-btn-danger layui-btn-xs" data-dropdown="#Job_ApplicantProfileTbDelDrop{{d.LAY_INDEX}}" no-shade="true">鍒犻櫎</a>-->
     <div class="dropdown-menu-nav dropdown-popconfirm dropdown-top-right layui-hide" id="Job_ApplicantProfileTbDelDrop{{d.LAY_INDEX}}"
          style="max-width: 200px;white-space: normal;min-width: auto;margin-left: 10px;">
         <div class="dropdown-anchor"></div>
@@ -267,33 +154,20 @@
                     cols: [
                         [
                             { type: "checkbox", fixed: "left" },
-						    { field: 'id', title: '涓婚敭ID', width: 60, sort: false},
-						    { field: 'jobId', title: '搴旇仒鐨勫矖浣嶃��', sort: false,width: 105 },
-						    { field: 'minSalaryRequirement', title: '搴旇仒鑰呮湡鏈涚殑鏈�浣庤柂璧勮姹傘��', sort: false,width: 105 },
-						    { field: 'name', title: '搴旇仒鑰呯殑鍏ㄥ悕銆�', sort: false,width: 105 },
-						    { field: 'gender', title: '搴旇仒鑰呯殑鎬у埆銆�', sort: false,width: 105 },
-						    { field: 'height', title: '搴旇仒鑰呯殑韬珮锛堝崟浣嶏細鍘樼背锛夈��', sort: false,width: 105 },
-						    { field: 'weight', title: '搴旇仒鑰呯殑浣撻噸锛堝崟浣嶏細鍗冨厠锛夈��', sort: false,width: 105 },
-						    { field: 'dateOfBirth', title: '搴旇仒鑰呯殑鍑虹敓鏃ユ湡銆�', width: 130, sort: false},
-						    { field: 'graduatingSchool', title: '搴旇仒鑰呯殑姣曚笟瀛︽牎鍚嶇О銆�', sort: false,width: 105 },
-						    { field: 'educationLevel', title: '搴旇仒鑰呯殑鏈�楂樺鍘嗐��', sort: false,width: 105 },
-						    { field: 'major', title: '搴旇仒鑰呯殑涓撲笟鍚嶇О銆�', sort: false,width: 105 },
-						    { field: 'smokes', title: '鏄惁鍚哥儫銆�', sort: false,width: 105 },
-						    { field: 'drivingSkill', title: '椹鹃┒鎶�鏈瓑绾э紙濡傛柊鎵嬨�佺啛缁冦�佷笓涓氾級銆�', sort: false,width: 105 },
-						    { field: 'phoneNumber', title: '搴旇仒鑰呯殑鑱旂郴鐢佃瘽銆�', sort: false,width: 105 },
-						    { field: 'whiteWineCapacity', title: '鐧介厭閰掗噺锛堜緥濡傦紝姣崌鎴栨澂鏁帮級銆�', sort: false,width: 105 },
-						    { field: 'politicalAffiliation', title: '搴旇仒鑰呯殑鏀挎不闈㈣矊銆�', sort: false,width: 105 },
-						    { field: 'maritalStatus', title: '濠氭亱鐘跺喌锛堜緥濡傦紝鍗曡韩銆佸凡濠氥�佺寮傜瓑锛夈��', sort: false,width: 105 },
-						    { field: 'specialAbilities', title: '涓撻暱鑳藉姏銆�', sort: false,width: 105 },
-						    { field: 'email', title: '搴旇仒鑰呯殑鐢靛瓙閭欢鍦板潃銆�', sort: false,width: 105 },
-						    { field: 'parentalStatus', title: '鐢熻偛鎯呭喌锛堜緥濡傦紝鏃犲瓙濂炽�佹湁瀛愬コ绛夛級銆�', sort: false,width: 105 },
-						    { field: 'residentialAddress', title: '灞呬綇鍦板潃銆�', sort: false,width: 105 },
-						    { field: 'createTime', title: '寤虹珛鏃堕棿', width: 130, sort: false},
-						    { field: 'upDataTime', title: '淇敼鏃堕棿', width: 130, sort: false},
-						    { field: 'createBy', title: '鍒涘缓浜�', sort: false,width: 105 },
-						    { field: 'upDataBy', title: '淇敼浜�', sort: false,width: 105 },
-						    { field: 'isdelete', title: '鍒犻櫎鏍囧織', width: 95, templet: '#switch_isdelete', sort: false , unresize: true},
-						    { field: 'AuditStatu', title: '瀹℃牳鐘舵�併��', sort: false,width: 105 },
+                            { type: 'numbers', title: '搴忓彿', width: 60, sort: false },
+                            { field: 'createTimetxt', title: '搴旇仒鏃堕棿', width: 150, sort: false },
+                            { field: 'jobName', title: '搴旇仒宀椾綅', sort: false, width: 150 },
+                            { field: 'name', title: '濮撳悕', sort: false, width: 150 },
+                            { field: 'gender', title: '鎬у埆', sort: false, width: 150 },
+                            { field: 'dateOfBirthName', title: '鍑虹敓鏃ユ湡', width: 150, sort: false },
+                            { field: 'educationLevel', title: '瀛﹀巻', sort: false, width: 150 },
+                            { field: 'major', title: '涓撲笟', sort: false, width: 150 },
+                            
+                            { field: 'minSalaryRequirement', title: '鏈熸湜鏈堣柂', sort: false, width: 150 },
+                            { field: 'dateOfBirthNameCeshi', title: '瀹℃牳鐘舵��', sort: false, width: 150 },
+                        
+						    
+                            
                             { width: 162, align: 'center', title:'鎿嶄綔', fixed: 'right', toolbar: '#LAY-app-Job_ApplicantProfile-tableBox-bar' }
                         ]
                     ]
@@ -397,7 +271,7 @@
                                 area: ['1200px', '90%'],
                                 id: 'LAY-popup-Job_ApplicantProfile-edit',
                                 success: function (layero, index) {
-                                    view(this.id).render('base/Job_ApplicantProfile/edit', { data: e.data }).done(function () {
+                                    view(this.id).render('baifenbingfa/Job_ApplicantProfile/edit', { data: e.data }).done(function () {
                                         //鐩戝惉鎻愪氦
                                         form.on('submit(LAY-app-Job_ApplicantProfile-editForm-submit)',
                                             function(data) {
@@ -419,10 +293,10 @@
                                                     });
                                             });
                                     })
-                                    // 绂佹寮圭獥鍑虹幇婊氬姩鏉�
-                                    $(layero).children('.layui-layer-content').css('overflow', 'visible');
+                                    //// 绂佹寮圭獥鍑虹幇婊氬姩鏉�
+                                    //$(layero).children('.layui-layer-content').css('overflow', 'visible');
                                 }
-                                 , btn: ['纭畾', '鍙栨秷']
+                                 , btn: ['瀹℃牳', '鍙栨秷']
                                 , yes: function (index, layero) {
                                      layero.contents().find("#LAY-app-Job_ApplicantProfile-editForm-submit").click();
                                 }
@@ -442,11 +316,15 @@
                                 area: ['1200px', '90%'],
                                 id: 'LAY-popup-Job_ApplicantProfile-details',
                                 success: function (layero, index) {
-                                    view(this.id).render('base/Job_ApplicantProfile/details', { data: e.data }).done(function () {
+                                    view(this.id).render('baifenbingfa/Job_ApplicantProfile/details', { data: e.data }).done(function () {
                                         form.render();
                                     });
-                                    // 绂佹寮圭獥鍑虹幇婊氬姩鏉�
-                                    $(layero).children('.layui-layer-content').css('overflow', 'visible');
+                                    //// 绂佹寮圭獥鍑虹幇婊氬姩鏉�
+                                    //$(layero).children('.layui-layer-content').css('overflow', 'visible');
+                                }
+                                , btn: ['鎵撳嵃', '鍙栨秷']
+                                , yes: function (index, layero) {
+                                    layero.contents().find("#LAY-app-Job_ApplicantProfile-editForm-submit").click();
                                 }
                             });
                         } else {

--
Gitblit v1.9.1