From 24c7242181f02ff6bb5e98ebd42c734aea120c13 Mon Sep 17 00:00:00 2001
From: 移动系统liao <liaoxujun@qq.com>
Date: 星期一, 20 五月 2024 15:37:03 +0800
Subject: [PATCH] Merge branch 'master' of http://47.108.235.38:8080/r/baifenbaishop
---
CoreCms.Net.Web.Admin/Controllers/baifenbingfa/Job_ApplicantProfileController.cs | 22 ++++++-
CoreCms.Net.Web.Admin/wwwroot/views/baifenbingfa/job_applicantprofile/edit.html | 63 +++++++++++++++++++++
CoreCms.Net.Web.Admin/wwwroot/views/baifenbingfa/job_applicantprofile/details.html | 67 ++++++++++++++++++++++
3 files changed, 148 insertions(+), 4 deletions(-)
diff --git a/CoreCms.Net.Web.Admin/Controllers/baifenbingfa/Job_ApplicantProfileController.cs b/CoreCms.Net.Web.Admin/Controllers/baifenbingfa/Job_ApplicantProfileController.cs
index fa6d63b..feccc95 100644
--- a/CoreCms.Net.Web.Admin/Controllers/baifenbingfa/Job_ApplicantProfileController.cs
+++ b/CoreCms.Net.Web.Admin/Controllers/baifenbingfa/Job_ApplicantProfileController.cs
@@ -36,6 +36,7 @@
using SqlSugar.Extensions;
using NPOI.OpenXmlFormats.Spreadsheet;
using CoreCms.Net.Auth.HttpContextUser;
+using System.Collections.Generic;
namespace CoreCms.Net.Web.Admin.Controllers
{
@@ -421,12 +422,21 @@
(job_EmploymentRecord.endDate.HasValue ? "-" + job_EmploymentRecord.endDate.Value.ToString("yyyy/MM") : "");
}
+ var tupian = new List<string>();
+ if (!string.IsNullOrEmpty(model.iDPicture))
+ {
+ tupian = model.iDPicture.Split(',').ToList();
+ }
+
+
+
jm.code = 0;
jm.data = new
{
model,
job_FamilyMembers,
- job_EmploymentRecords
+ job_EmploymentRecords,
+ tupian
};
return jm;
@@ -544,13 +554,19 @@
job_EmploymentRecord.startDatetxt = (job_EmploymentRecord.startDate.HasValue? job_EmploymentRecord.startDate.Value.ToString("yyyy/MM"):"") +
(job_EmploymentRecord.endDate.HasValue ? "-"+ job_EmploymentRecord.endDate.Value.ToString("yyyy/MM") : "");
}
-
+ var tupian = new List<string>();
+ if (!string.IsNullOrEmpty(model.iDPicture))
+ {
+ tupian = model.iDPicture.Split(',').ToList();
+ }
+
jm.code = 0;
jm.data = new
{
model,
job_FamilyMembers,
- job_EmploymentRecords
+ job_EmploymentRecords,
+ tupian
};
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 30bbde7..a115391 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
@@ -303,7 +303,72 @@
}
</style>
</div>
-
+
+
+ <table border="0" align="center" cellpadding="3" cellspacing="0">
+ <tr>
+
+ <td style="text-align: left; " colspan="8">
+
+
+ </td>
+
+
+
+ </tr>
+ <tr>
+
+ <td style="text-align: left; " colspan="8">
+
+
+ </td>
+
+
+
+ </tr>
+ <tr>
+
+ <td style="text-align: left; " colspan="8">
+
+
+ </td>
+
+
+
+ </tr>
+ <tr>
+ <td style="text-align: left; " colspan="8">
+
+ 褰㈣薄鍥剧墖: <a href="javascript:void(0);" onclick="layui.coreHelper.viewImage('{{ d.params.data.model.avatar }}')"><image style="max-width: 30px; max-height: 30px;" src="{{d.params.data.model.avatar}}" /></a>
+ </td>
+
+ </tr>
+
+ <tr>
+ <td style="text-align: left; " colspan="8">
+
+ 璇佷欢鐓�: {{# layui.each(d.params.data.tupian, function(index, item){ }}
+ <a href="javascript:void(0);" onclick="layui.coreHelper.viewImage('{{ item }}')"><image style="max-width: 30px; max-height: 30px;" src="{{ item }}" /></a>
+ {{# }); }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ </td>
+
+ </tr>
+
+ </table>
</div>
<div class="layui-form-item text-right core-hidden">
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 cd686ee..9714cdb 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
@@ -304,7 +304,70 @@
border-bottom: 1px dashed #111;
}
</style>
+ <table border="0" align="center" cellpadding="3" cellspacing="0">
+ <tr>
+ <td style="text-align: left; " colspan="8">
+
+
+ </td>
+
+
+
+ </tr>
+ <tr>
+
+ <td style="text-align: left; " colspan="8">
+
+
+ </td>
+
+
+
+ </tr>
+ <tr>
+
+ <td style="text-align: left; " colspan="8">
+
+
+ </td>
+
+
+
+ </tr>
+ <tr>
+ <td style="text-align: left; " colspan="8">
+
+ 褰㈣薄鍥剧墖: <a href="javascript:void(0);" onclick="layui.coreHelper.viewImage('{{ d.params.data.model.avatar }}')"><image style="max-width: 30px; max-height: 30px;" src="{{d.params.data.model.avatar}}" /></a>
+ </td>
+
+ </tr>
+
+ <tr>
+ <td style="text-align: left; " colspan="8">
+
+ 璇佷欢鐓�: {{# layui.each(d.params.data.tupian, function(index, item){ }}
+ <a href="javascript:void(0);" onclick="layui.coreHelper.viewImage('{{ item }}')"><image style="max-width: 30px; max-height: 30px;" src="{{ item }}" /></a>
+ {{# }); }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ </td>
+
+ </tr>
+
+ </table>
<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>
--
Gitblit v1.9.1