Przeglądaj źródła

基础信息修改增加劳动合同的修改,并去掉津补贴申报中修改合同时间的功能

sugangqiang 1 rok temu
rodzic
commit
2af3a1a0fe

+ 5 - 4
app/admin/controller/TalentBasicChange.php

@@ -131,6 +131,7 @@ class TalentBasicChange extends AdminController {
                 $upd["card_type"] = $info["newCardType"];
                 $upd["card_number"] = $info["newIdCard"];
                 $upd["email"] = $info["newEmail"];
+                $upd["labor_contract_rangetime"] = $info["newContractTime"];
                 Db::table("new_talent_info")->save($upd);
 
                 $talentLog["id"] = getStringId();
@@ -178,10 +179,10 @@ class TalentBasicChange extends AdminController {
         $cardTypeMap = DictApi::selectByParentCode("card_type");
         $epMaps = \app\common\model\Enterprise::column("name", "id");
 
-        $title = ["申报单位", "原姓名", "原出生日期", "原国家/地区", "原民族", "原政治面貌", "原证件类型", "原证件号码", "原电子邮箱",
-            "现姓名", "现出生日期", "现国家/地区", "现民族", "现政治面貌", "现证件类型", "现证件号码", "现电子邮箱", "首次提交时间", "最新提交时间", "审核状态"];
-        $keys = ["enterpriseName", "oldName", "oldBirthday", "oldNationalityName", "oldNationName", "oldPoliticsName", "oldCardTypeName", "oldIdCard", "oldEmail",
-            "newName", "newBirthday", "newNationalityName", "newNationName", "newPoliticsName", "newCardTypeName", "newIdCard", "newEmail", "firstSubmitTime", "newSubmitTime", "checkStateName"];
+        $title = ["申报单位", "原姓名", "原出生日期", "原国家/地区", "原民族", "原政治面貌", "原证件类型", "原证件号码", "原电子邮箱", "原劳动合同起止时间",
+            "现姓名", "现出生日期", "现国家/地区", "现民族", "现政治面貌", "现证件类型", "现证件号码", "现电子邮箱", "现劳动合同起止时间", "首次提交时间", "最新提交时间", "审核状态"];
+        $keys = ["enterpriseName", "oldName", "oldBirthday", "oldNationalityName", "oldNationName", "oldPoliticsName", "oldCardTypeName", "oldIdCard", "oldEmail", "oldContractTime",
+            "newName", "newBirthday", "newNationalityName", "newNationName", "newPoliticsName", "newCardTypeName", "newIdCard", "newEmail", "newContractTime", "firstSubmitTime", "newSubmitTime", "checkStateName"];
         $rows = [];
         foreach ($list as &$item) {
             $item["oldNationalityName"] = $nationalityMap[$item["oldNationality"]];

+ 10 - 3
app/admin/view/talent_basic_change/check.html

@@ -34,7 +34,7 @@
                     <div class="tabs-container" >
                         <ul class="nav nav-tabs">
                             <li class="active"><a data-toggle="tab" href="#tab-1" aria-expanded="true">1.基础信息</a></li>
-                            <li id="fileLi" class=""><a data-toggle="tab" href="#tab-2" onclick="initNoBtnFileTable(CONFIG.project_basicchange,'fileTable',)"  aria-expanded="false">2.附件上传</a></li>
+                            <li id="fileLi" class=""><a data-toggle="tab" href="#tab-2" onclick="initNoBtnFileTable(CONFIG.project_basicchange, 'fileTable', )"  aria-expanded="false">2.附件上传</a></li>
                         </ul>
                     </div>
                     <div class="tab-content">
@@ -88,6 +88,10 @@
                                                             <label class="control-label spacing"><span style="color: red">*</span>原电子邮箱</label>
                                                             <input type="text" class="form-control" id="oldEmail" name="oldEmail" value="{$row.oldEmail}" style="pointer-events: none;background-color: #eee;"/>
                                                         </div>
+                                                        <div class="rowGroup col-sm-3">
+                                                            <label class="control-label spacing"><span style="color: red">*</span>原劳动合同起止时间</label>
+                                                            <input type="text" class="form-control" id="oldContractTime" name="oldContractTime" value="{$row.oldContractTime}" style="pointer-events: none;background-color: #eee;"/>
+                                                        </div>
 
                                                         <div class="rowGroup col-sm-3">
                                                             <label class=" control-label spacing"><span style="color: red">*</span>现姓名</label>
@@ -124,6 +128,9 @@
                                                         <div class="rowGroup col-sm-3">
                                                             <label class="control-label spacing"><span style="color: red">*</span>现电子邮箱</label>
                                                             <input type="text" class="form-control" id="newEmail" name="newEmail" value="{$row.newEmail}"/>
+                                                        </div><div class="rowGroup col-sm-3">
+                                                            <label class="control-label spacing"><span style="color: red">*</span>现劳动合同起止时间</label>
+                                                            <input type="text" class="form-control" id="newContractTime" name="newContractTime" value="{$row.newContractTime}" style="pointer-events: none;background-color: #eee;"/>
                                                         </div>
                                                     </div>
                                                 </div>
@@ -156,7 +163,7 @@
 </div>
 <iframe id="hiddenIframe" name="hiddenIframe" style="display: none;"></iframe>
 <script type="text/javascript">
-    document.write('<script src="/static/modular/talentLibrary/talentBasicChange/talentBasicChange_info.js?v='+(new Date()).getTime()+'"><\/script>');
-    document.write('<script src="/static/modular/common/upload.js?v='+(new Date()).getTime()+'"><\/script>');
+    document.write('<script src="/static/modular/talentLibrary/talentBasicChange/talentBasicChange_info.js?v=' + (new Date()).getTime() + '"><\/script>');
+    document.write('<script src="/static/modular/common/upload.js?v=' + (new Date()).getTime() + '"><\/script>');
 </script>
 {/block}

+ 10 - 0
app/enterprise/controller/TalentBasicChange.php

@@ -102,6 +102,7 @@ class TalentBasicChange extends EnterpriseController {
                 $data["oldIdCard"] = $talentInfo["card_number"];
                 $data["oldBirthday"] = $talentInfo["birthday"];
                 $data["oldEmail"] = $talentInfo["email"];
+                $data["oldContractTime"] = $talentInfo["labor_contract_rangetime"];
                 $data["checkState"] = -1;
                 $data["createUser"] = $this->user["uid"];
                 $data["createTime"] = date("Y-m-d H:i:s");
@@ -281,6 +282,10 @@ class TalentBasicChange extends EnterpriseController {
             $response->msg = "现电子邮箱不能为空";
             return $response;
         }
+        if (\StrUtil::isEmpOrNull($data["newContractTime"])) {
+            $response->msg = "现劳动合同起止时间不能为空";
+            return $response;
+        }
         if (!preg_match("/[\\w!#$%&'*+\/=?^_`{|}~-]+(?:\\.[\\w!#$%&'*+\/=?^_`{|}~-]+)*@(?:[\\w](?:[\\w-]*[\\w])?\\.)+[\\w](?:[\\w-]*[\\w])?/", $data["newEmail"])) {
             $response->msg = "电子邮箱格式不正确";
             return $response;
@@ -297,6 +302,11 @@ class TalentBasicChange extends EnterpriseController {
             $response->msg = "护照格式不合法";
             return $response;
         }
+        list($startTime, $endTime) = explode(" - ", $data["newContractTime"]);
+        if (!strtotime($startTime) || !strtotime($endTime) || strtotime($startTime) > strtotime($endTime)) {
+            $response->msg = "劳动合同起止时间不合法";
+            return $response;
+        }
         $response->code = 200;
         return $response;
     }

+ 8 - 0
app/enterprise/view/talent_basic_change/apply.html

@@ -98,6 +98,10 @@
                                                             <label class="control-label spacing"><span style="color: red">*</span>原电子邮箱</label>
                                                             <input type="text" class="form-control" id="oldEmail" name="oldEmail" value="{$row.oldEmail}" style="pointer-events: none;background-color: #eee;"/>
                                                         </div>
+                                                        <div class="rowGroup col-sm-3">
+                                                            <label class=" control-label spacing"><span style="color: red">*</span>原劳动合同起止时间</label>
+                                                            <input class="form-control" id="oldContractTime" name="oldContractTime" value="{$row.oldContractTime}" style="pointer-events: none;background-color: #eee;">
+                                                        </div>
 
                                                         <div class="rowGroup col-sm-3">
                                                             <label class=" control-label spacing"><span style="color: red">*</span>现姓名</label>
@@ -135,6 +139,10 @@
                                                             <label class="control-label spacing"><span style="color: red">*</span>现电子邮箱</label>
                                                             <input type="text" class="form-control" id="newEmail" name="newEmail" value="{$row.newEmail}"/>
                                                         </div>
+                                                        <div class="rowGroup col-sm-3">
+                                                            <label class=" control-label spacing"><span style="color: red">*</span>现劳动合同起止时间</label>
+                                                            <input class="form-control date" id="newContractTime" name="newContractTime" value="{$row.newContractTime}" style="pointer-events: none;background-color: #eee;">
+                                                        </div>
                                                     </div>
                                                 </div>
                                                 <div class="row">

+ 14 - 14
public/static/modular/gate/talentAllowance/common/talentAllowanceInfo_select.js

@@ -226,13 +226,13 @@ TalentAllowanceInfoDlg.initContractColumns = function () {
             {title: '本年度工作截止时间', field: 'quitTime', visible: true, align: 'center', valign: 'middle', width: "100px"},
             {title: '人才标签', field: 'talentTypeName', visible: true, align: 'center', valign: 'middle', width: "100px", 'class': 'uitd_showTip'},
             {title: '首次来晋行政介绍信时间', field: 'letterTime', visible: true, align: 'center', valign: 'middle', width: "120px"},
-            {title: '操作', field: 'id', visible: true, align: 'center', valign: 'middle', width: "120px",
-                formatter: function (value, row, index) {
-                    return "<button type='button' onclick='TalentAllowanceInfoDlg.showLog(\"" + row.id + "\")' style='margin-right: 10px' class='btn btn-xs btn-success'>" +
-                            "<i class=\"fa fa-book\"></i>日志" +
-                            "</button>";
-                }
-            }
+                    /*{title: '操作', field: 'id', visible: true, align: 'center', valign: 'middle', width: "120px",
+                     formatter: function (value, row, index) {
+                     return "<button type='button' onclick='TalentAllowanceInfoDlg.showLog(\"" + row.id + "\")' style='margin-right: 10px' class='btn btn-xs btn-success'>" +
+                     "<i class=\"fa fa-book\"></i>日志" +
+                     "</button>";
+                     }
+                     }*/
         ];
     } else {
         return [
@@ -242,13 +242,13 @@ TalentAllowanceInfoDlg.initContractColumns = function () {
             {title: '合同截止时间', field: 'endTime', visible: true, align: 'center', valign: 'middle', width: "120px", 'class': 'uitd_showTip'},
             {title: '入职时间', field: 'entryTime', visible: true, align: 'center', valign: 'middle', width: "100px"},
             {title: '本年度工作截止时间', field: 'quitTime', visible: true, align: 'center', valign: 'middle', width: "100px"},
-            {title: '操作', field: 'id', visible: true, align: 'center', valign: 'middle', width: "120px",
-                formatter: function (value, row, index) {
-                    return "<button type='button' onclick='TalentAllowanceInfoDlg.showLog(\"" + row.id + "\")' style='margin-right: 10px' class='btn btn-xs btn-success'>" +
-                            "<i class=\"fa fa-book\"></i>日志" +
-                            "</button>"
-                }
-            }
+                    /*{title: '操作', field: 'id', visible: true, align: 'center', valign: 'middle', width: "120px",
+                     formatter: function (value, row, index) {
+                     return "<button type='button' onclick='TalentAllowanceInfoDlg.showLog(\"" + row.id + "\")' style='margin-right: 10px' class='btn btn-xs btn-success'>" +
+                     "<i class=\"fa fa-book\"></i>日志" +
+                     "</button>"
+                     }
+                     }*/
         ];
     }
 }

+ 28 - 28
public/static/modular/gate/talentAllowance/common/talentAllowance_info_supple.js

@@ -51,20 +51,20 @@ TalentAllowanceInfoDlg.initContractColumns = function () {
             {title: '本年度工作截止时间', field: 'quitTime', visible: true, align: 'center', valign: 'middle', width: "100px", 'class': 'uitd_showTip'},
             {title: '人才标签', field: 'talentTypeName', visible: true, align: 'center', valign: 'middle', width: "100px", 'class': 'uitd_showTip'},
             {title: '首次来晋行政介绍信时间', field: 'letterTime', visible: true, align: 'center', valign: 'middle', width: "120px"},
-            {title: '操作', field: 'id', visible: true, align: 'left', valign: 'middle', width: "120px",
-                formatter: function (value, row, index) {
-                    var html = "";
-                    if (checkState == 1 || (checkState == 10 && concats.indexOf(value) != -1)) {
-                        html = html + "<button type='button' onclick='TalentAllowanceInfoDlg.showEditContractModel(\"" + value + "\")' style='margin-left: 5px' class='btn btn-xs btn-danger'>" +
-                                "<i class=\"fa fa-edit\"></i>修改" +
-                                "</button>";
-                    }
-                    html = html + "<button type='button' onclick='TalentAllowanceInfoDlg.showLog(\"" + row.id + "\")' style='margin-left: 5px' class='btn btn-xs btn-success'>" +
-                            "<i class=\"fa fa-book\"></i>日志" +
-                            "</button>";
-                    return  html;
-                }
-            }
+                    /*{title: '操作', field: 'id', visible: true, align: 'left', valign: 'middle', width: "120px",
+                     formatter: function (value, row, index) {
+                     var html = "";
+                     if (checkState == 1 || (checkState == 10 && concats.indexOf(value) != -1)) {
+                     html = html + "<button type='button' onclick='TalentAllowanceInfoDlg.showEditContractModel(\"" + value + "\")' style='margin-left: 5px' class='btn btn-xs btn-danger'>" +
+                     "<i class=\"fa fa-edit\"></i>修改" +
+                     "</button>";
+                     }
+                     html = html + "<button type='button' onclick='TalentAllowanceInfoDlg.showLog(\"" + row.id + "\")' style='margin-left: 5px' class='btn btn-xs btn-success'>" +
+                     "<i class=\"fa fa-book\"></i>日志" +
+                     "</button>";
+                     return  html;
+                     }
+                     }*/
         ];
     } else {
         return [
@@ -74,20 +74,20 @@ TalentAllowanceInfoDlg.initContractColumns = function () {
             {title: '合同截止时间', field: 'endTime', visible: true, align: 'center', valign: 'middle', width: "120px", 'class': 'uitd_showTip'},
             {title: '入职时间', field: 'entryTime', visible: true, align: 'center', valign: 'middle', width: "100px"},
             {title: '本年度工作截止时间', field: 'quitTime', visible: true, align: 'center', valign: 'middle', width: "100px"},
-            {title: '操作', field: 'id', visible: true, align: 'left', valign: 'middle', width: "120px",
-                formatter: function (value, row, index) {
-                    var html = "";
-                    if (checkState == 1 || (checkState == 10 && concats.indexOf(value) != -1)) {
-                        html = html + "<button type='button' onclick='TalentAllowanceInfoDlg.showEditContractModel(\"" + value + "\")' style='margin-left: 5px' class='btn btn-xs btn-danger'>" +
-                                "<i class=\"fa fa-edit\"></i>修改" +
-                                "</button>";
-                    }
-                    html = html + "<button type='button' onclick='TalentAllowanceInfoDlg.showLog(\"" + row.id + "\")' style='margin-left: 5px' class='btn btn-xs btn-success'>" +
-                            "<i class=\"fa fa-book\"></i>日志" +
-                            "</button>";
-                    return  html;
-                }
-            }
+                    /*{title: '操作', field: 'id', visible: true, align: 'left', valign: 'middle', width: "120px",
+                     formatter: function (value, row, index) {
+                     var html = "";
+                     if (checkState == 1 || (checkState == 10 && concats.indexOf(value) != -1)) {
+                     html = html + "<button type='button' onclick='TalentAllowanceInfoDlg.showEditContractModel(\"" + value + "\")' style='margin-left: 5px' class='btn btn-xs btn-danger'>" +
+                     "<i class=\"fa fa-edit\"></i>修改" +
+                     "</button>";
+                     }
+                     html = html + "<button type='button' onclick='TalentAllowanceInfoDlg.showLog(\"" + row.id + "\")' style='margin-left: 5px' class='btn btn-xs btn-success'>" +
+                     "<i class=\"fa fa-book\"></i>日志" +
+                     "</button>";
+                     return  html;
+                     }
+                     }*/
         ];
     }
 }

+ 188 - 187
public/static/modular/gate/talentAllowance/common/talentAllowance_patch.js

@@ -2,16 +2,16 @@
  * 初始化人才认定申报详情对话框
  */
 var TalentAllowanceInfoDlg = {
-    talentAllowanceData : {},
+    talentAllowanceData: {},
     validateFields: {
-        talentId: {validators: {notEmpty: {message: '申报对象不能为空' }}}
+        talentId: {validators: {notEmpty: {message: '申报对象不能为空'}}}
     }
 };
 
 /**
  * 清除数据
  */
-TalentAllowanceInfoDlg.clearData = function() {
+TalentAllowanceInfoDlg.clearData = function () {
     this.talentAllowanceData = {};
 }
 
@@ -21,7 +21,7 @@ TalentAllowanceInfoDlg.clearData = function() {
  * @param key 数据的名称
  * @param val 数据的具体值
  */
-TalentAllowanceInfoDlg.set = function(key, val) {
+TalentAllowanceInfoDlg.set = function (key, val) {
     this.talentAllowanceData[key] = (typeof val == "undefined") ? $("#" + key).val() : val;
     return this;
 }
@@ -32,24 +32,24 @@ TalentAllowanceInfoDlg.set = function(key, val) {
  * @param key 数据的名称
  * @param val 数据的具体值
  */
-TalentAllowanceInfoDlg.get = function(key) {
+TalentAllowanceInfoDlg.get = function (key) {
     return $("#" + key).val();
 }
 
 /**
  * 关闭此对话框
  */
-TalentAllowanceInfoDlg.close = function() {
+TalentAllowanceInfoDlg.close = function () {
     parent.layer.close(window.parent.TalentAllowanceInfo.layerIndex);
 }
 
 /**
  * 收集数据
  */
-TalentAllowanceInfoDlg.collectData = function() {
+TalentAllowanceInfoDlg.collectData = function () {
     this.set('id')
-        .set('talentId')
-        .set('year');
+            .set('talentId')
+            .set('year');
 }
 /**
  * 验证数据
@@ -63,9 +63,9 @@ TalentAllowanceInfoDlg.validate = function () {
 /**
  * 选择申报对象初始化
  */
-TalentAllowanceInfoDlg.init = function(){
+TalentAllowanceInfoDlg.init = function () {
     var talentId = $("#name").val();
-    var ajax = new $ax(Feng.ctxPath + "/enterprise/talent/getInfoById/id/"+talentId, function(data){
+    var ajax = new $ax(Feng.ctxPath + "/enterprise/talent/getInfoById/id/" + talentId, function (data) {
         $("#talentId").val(talentId);
         $("#talentTypeName").val(data.talentTypeName);
         $("#enterpriseName").val(data.enterpriseName);
@@ -78,14 +78,14 @@ TalentAllowanceInfoDlg.init = function(){
         $("#phone").val(data.phone);
         $("#bank").val(data.bank);
         $("#bankNumber").val(data.bankNumber);
-        $("#bankNetwork").val(data.bankNetwork).attr("title",data.bankNetwork);
+        $("#bankNetwork").val(data.bankNetwork).attr("title", data.bankNetwork);
         $("#bankAccount").val(data.bankAccount);
         $("#talentArrangeName").val(data.talentArrangeName);
-        $("#identifyConditionText").val(data.identifyConditionText).attr("title",data.identifyConditionText);
-        $("#identifyConditionName").val(data.identifyConditionName).attr("title",data.identifyConditionName);
+        $("#identifyConditionText").val(data.identifyConditionText).attr("title", data.identifyConditionText);
+        $("#identifyConditionName").val(data.identifyConditionName).attr("title", data.identifyConditionName);
         $("#identifyGetTime").val(data.identifyGetTime);
-        $("#provinceCode").val(data.provinceName+data.cityName+data.countyName);
-    },function(data){
+        $("#provinceCode").val(data.provinceName + data.cityName + data.countyName);
+    }, function (data) {
         Feng.error("查询失败!" + data.responseJSON.message + "!");
     });
     ajax.set();
@@ -96,26 +96,26 @@ TalentAllowanceInfoDlg.init = function(){
 /**
  * 初始化工作单位及核查项目情况表
  */
-TalentAllowanceInfoDlg.initContract = function(){
-    $("#projectTable").bootstrapTable("destroy",{});
+TalentAllowanceInfoDlg.initContract = function () {
+    $("#projectTable").bootstrapTable("destroy", {});
     $("#projectTable").bootstrapTable({
         url: Feng.ctxPath + "/enterprise/talentAllowance/findAllowanceContractDetail",
         method: 'POST',
         contentType: "application/x-www-form-urlencoded; charset=UTF-8",
-        search: false,					// 是否显示表格搜索,此搜索是客户端搜索,不会进服务端
-        showRefresh: false,				// 是否显示刷新按钮
-        clickToSelect: true,			// 是否启用点击选中行
-        singleSelect: true,				// 设置True 将禁止多选
-        striped: true,  				// 是否显示行间隔色
+        search: false, // 是否显示表格搜索,此搜索是客户端搜索,不会进服务端
+        showRefresh: false, // 是否显示刷新按钮
+        clickToSelect: true, // 是否启用点击选中行
+        singleSelect: true, // 设置True 将禁止多选
+        striped: true, // 是否显示行间隔色
         escape: true,
-        pagination: false,   			// 设置为 true 会在表格底部显示分页条
+        pagination: false, // 设置为 true 会在表格底部显示分页条
         paginationHAlign: "left",
         paginationDetailHAlign: "right",
-        sidePagination: "server",   	// 设置在哪里进行分页,可选值为 'client' 或者 'server'
+        sidePagination: "server", // 设置在哪里进行分页,可选值为 'client' 或者 'server'
         showColumns: false,
-        detailView: true,//父子表
+        detailView: true, //父子表
         queryParams: function (params) {
-            return $.extend({"mainId":$("#id").val()},params)
+            return $.extend({"mainId": $("#id").val()}, params)
         },
         columns: TalentAllowanceInfoDlg.initContractColumns(),
         onPostBody: function () {
@@ -129,24 +129,24 @@ TalentAllowanceInfoDlg.initContract = function(){
         },
         onExpandRow: function (index, row, $detail) {
             var enterpriseId = row.enterpriseId;
-            var cur_table = $detail.html('<table id="'+enterpriseId+'" class="mytable-hover"></table>').find('table');
-            $(cur_table).bootstrapTable("destroy",{});
+            var cur_table = $detail.html('<table id="' + enterpriseId + '" class="mytable-hover"></table>').find('table');
+            $(cur_table).bootstrapTable("destroy", {});
             $(cur_table).bootstrapTable({
                 url: Feng.ctxPath + "/api/talentAllowance/findAllowanceProject",
                 method: 'POST',
                 contentType: "application/x-www-form-urlencoded; charset=UTF-8",
-                search: false,					// 是否显示表格搜索,此搜索是客户端搜索,不会进服务端
-                showRefresh: false,				// 是否显示刷新按钮
-                clickToSelect: true,			// 是否启用点击选中行
-                singleSelect: true,				// 设置True 将禁止多选
+                search: false, // 是否显示表格搜索,此搜索是客户端搜索,不会进服务端
+                showRefresh: false, // 是否显示刷新按钮
+                clickToSelect: true, // 是否启用点击选中行
+                singleSelect: true, // 设置True 将禁止多选
                 escape: true,
-                pagination: false,   			// 设置为 true 会在表格底部显示分页条
+                pagination: false, // 设置为 true 会在表格底部显示分页条
                 paginationHAlign: "left",
                 paginationDetailHAlign: "right",
-                sidePagination: "server",   	// 设置在哪里进行分页,可选值为 'client' 或者 'server'
+                sidePagination: "server", // 设置在哪里进行分页,可选值为 'client' 或者 'server'
                 showColumns: false,
                 queryParams: function (params) {
-                    return $.extend({"mainId":$("#id").val(),"baseId":row.id},params)
+                    return $.extend({"mainId": $("#id").val(), "baseId": row.id}, params)
                 },
                 columns: TalentAllowanceInfoDlg.initProjectColumns(),
             });
@@ -157,7 +157,7 @@ TalentAllowanceInfoDlg.initContract = function(){
 
 
 //初始化附件类别表单
-TalentAllowanceInfoDlg.initFileTable = function (){
+TalentAllowanceInfoDlg.initFileTable = function () {
     TalentAllowanceInfoDlg.initContract();
     var queryData = {};
     queryData['project'] = CONFIG.project_jbt;
@@ -166,24 +166,24 @@ TalentAllowanceInfoDlg.initFileTable = function (){
         url: Feng.ctxPath + "/common/api/findUnCommonFileType",
         method: 'POST',
         contentType: "application/x-www-form-urlencoded; charset=UTF-8",
-        search: false,					// 是否显示表格搜索,此搜索是客户端搜索,不会进服务端
-        showRefresh: false,				// 是否显示刷新按钮
-        clickToSelect: true,			// 是否启用点击选中行
-        singleSelect: true,				// 设置True 将禁止多选
-        striped: true,  				// 是否显示行间隔色
+        search: false, // 是否显示表格搜索,此搜索是客户端搜索,不会进服务端
+        showRefresh: false, // 是否显示刷新按钮
+        clickToSelect: true, // 是否启用点击选中行
+        singleSelect: true, // 设置True 将禁止多选
+        striped: true, // 是否显示行间隔色
         escape: true,
-        pagination: false,   			// 设置为 true 会在表格底部显示分页条
+        pagination: false, // 设置为 true 会在表格底部显示分页条
         paginationHAlign: "left",
         paginationDetailHAlign: "right",
-        sidePagination: "server",   	// 设置在哪里进行分页,可选值为 'client' 或者 'server'
+        sidePagination: "server", // 设置在哪里进行分页,可选值为 'client' 或者 'server'
         showColumns: false,
-        detailView: true,               //是否显示父子表
+        detailView: true, //是否显示父子表
         pageList: [10, 30, 50],
         queryParams: function (params) {
-            return $.extend(queryData,params)
+            return $.extend(queryData, params)
         },
         rowStyle: function (row, index) {
-            return {classes:"info"};
+            return {classes: "info"};
         },
         columns: TalentAllowanceInfoDlg.initFileTypeColumn(),
         onPostBody: function () {
@@ -197,45 +197,45 @@ TalentAllowanceInfoDlg.initFileTable = function (){
         },
         onExpandRow: function (index, row, $detail) {
             var ajax = new $ax(Feng.ctxPath + "/common/api/listTalentFile", function (data) {
-                if(data==null||data.length==0){
+                if (data == null || data.length == 0) {
                     return;
                 }
                 var html = '<ul class="imgs"><li style="width: 80%;font-weight: bold;padding-top: 5px;">附件原名</li><li style="width: 10%;font-weight: bold;padding-top: 5px;">预览</li><li style="width: 10%;font-weight: bold;padding-top: 5px;">操作</li>';
                 var publicStartTime = new Date($("#publicStartTime").val());
                 var publicEndTime = new Date($("#publicEndTime").val());
-                for(var key in data){
+                for (var key in data) {
                     var createTime = new Date(data[key].createTime);
                     var btn = "";
-                    if(createTime>=publicStartTime && createTime<=publicEndTime){
-                        btn = "<button type=\'button\' onclick=\"TalentAllowanceInfoDlg.checkFile(this,'"+row.id+"','"+data[key].id+"')\" style=\'margin-right: 10px\' class=\"btn btn-xs btn-info\">" +
-                            "<i class=\"fa fa-paste\"></i>修改" +
-                            "</button>" +
-                            "<button type='button' onclick=\"TalentAllowanceInfoDlg.deleteFile('"+data[key].id+"','"+row.fState+"')\" class=\"btn btn-xs btn-danger\">" +
-                            "<i class=\"fa fa-times\"></i>删除" +
-                            "</button>";
-                    }else{
+                    if (createTime >= publicStartTime && createTime <= publicEndTime) {
+                        btn = "<button type=\'button\' onclick=\"TalentAllowanceInfoDlg.checkFile(this,'" + row.id + "','" + data[key].id + "')\" style=\'margin-right: 10px\' class=\"btn btn-xs btn-info\">" +
+                                "<i class=\"fa fa-paste\"></i>修改" +
+                                "</button>" +
+                                "<button type='button' onclick=\"TalentAllowanceInfoDlg.deleteFile('" + data[key].id + "','" + row.fState + "')\" class=\"btn btn-xs btn-danger\">" +
+                                "<i class=\"fa fa-times\"></i>删除" +
+                                "</button>";
+                    } else {
                         btn = "";
                     }
                     var sn = data[key].url.lastIndexOf(".");
-                    var suffix = data[key].url.substring(sn+1,data[key].url.length);
+                    var suffix = data[key].url.substring(sn + 1, data[key].url.length);
                     var imgStr = "";
-                    if(suffix=="pdf"||suffix=="PDF"){
-                        imgStr = "<button type='button'  onclick=\"Feng.showPdf('"+data[key].url+"','"+data[key].id+"','"+data[key].orignName+"')\" class=\"btn btn-xs btn-danger\"><i class=\"fa fa-file-pdf-o\" aria-hidden=\"true\"></i></button>";
-                    }else if(suffix == "xlsx" || suffix=="XLSX" || suffix == 'xls' || suffix == 'XLS'){
-                        imgStr = "<button type='button'  onclick=\"Feng.showExcel('"+data[key].url+"','"+data[key].id+"','"+data[key].orignName+"')\" class=\"btn btn-xs btn-danger\"><i class=\"fa fa-file-excel-o\" aria-hidden=\"true\"></i></button>";
-                    }else{
-                        imgStr = '<img class=\"imgUrl\"  src=\"'+data[key].url+'\" style=\"width:25px;height:25px;\">';
+                    if (suffix == "pdf" || suffix == "PDF") {
+                        imgStr = "<button type='button'  onclick=\"Feng.showPdf('" + data[key].url + "','" + data[key].id + "','" + data[key].orignName + "')\" class=\"btn btn-xs btn-danger\"><i class=\"fa fa-file-pdf-o\" aria-hidden=\"true\"></i></button>";
+                    } else if (suffix == "xlsx" || suffix == "XLSX" || suffix == 'xls' || suffix == 'XLS') {
+                        imgStr = "<button type='button'  onclick=\"Feng.showExcel('" + data[key].url + "','" + data[key].id + "','" + data[key].orignName + "')\" class=\"btn btn-xs btn-danger\"><i class=\"fa fa-file-excel-o\" aria-hidden=\"true\"></i></button>";
+                    } else {
+                        imgStr = '<img class=\"imgUrl\"  src=\"' + data[key].url + '\" style=\"width:25px;height:25px;\">';
                     }
-                    html = html + '<li style="display: none">'+data[key].id+'</li>\n'+
-                        '<li style="width: 80%;padding-top: 5px;">'+data[key].orignName+'</li>\n'+
-                        '<li style="width: 10%;">'+imgStr+'</li>\n'+
-                        '<li style="width: 10%;padding-top: 2px;">'+btn+'</li>';
+                    html = html + '<li style="display: none">' + data[key].id + '</li>\n' +
+                            '<li style="width: 80%;padding-top: 5px;">' + data[key].orignName + '</li>\n' +
+                            '<li style="width: 10%;">' + imgStr + '</li>\n' +
+                            '<li style="width: 10%;padding-top: 2px;">' + btn + '</li>';
                 }
                 html = html + '</ul>';
                 $detail.html(html);
                 $(".imgs").viewer({
                     // toolbar:false,
-                    fullscreen:false
+                    fullscreen: false
                 });
             }, function (data) {
                 Feng.error("查询失败!" + data.responseJSON.message + "!");
@@ -251,41 +251,41 @@ TalentAllowanceInfoDlg.initFileTable = function (){
 }
 
 //初始化工作单位表的列
-TalentAllowanceInfoDlg.initContractColumns = function(){
+TalentAllowanceInfoDlg.initContractColumns = function () {
     var type = $("#type").val();
-    if(type==1){
+    if (type == 1) {
         return [
-            {field: 'selectItem', checkbox:false,visible:false},
-            {title: '企业名称', field: 'enterpriseName', visible: true, align: 'center', valign: 'middle',width:"120px",'class': 'uitd_showTip'},
-            {title: '合同起始时间', field: 'startTime', visible: true, align: 'center', valign: 'middle',width:"120px",'class': 'uitd_showTip'},
-            {title: '合同截止时间', field: 'endTime', visible: true, align: 'center', valign: 'middle',width:"120px",'class': 'uitd_showTip'},
-            {title: '入职时间', field: 'entryTime', visible: true, align: 'center', valign: 'middle',width:"100px"},
-            {title: '本年度工作截止时间', field: 'quitTime', visible: true, align: 'center', valign: 'middle',width:"100px"},
-            {title: '人才标签', field: 'talentTypeName', visible: true, align: 'center', valign: 'middle',width:"100px",'class': 'uitd_showTip'},
-            {title: '首次来晋行政介绍信时间', field: 'letterTime', visible: true, align: 'center', valign: 'middle',width:"120px"},
-            {title: '操作', field: 'id', visible: true, align: 'center', valign: 'middle',width:"120px",
-                formatter : function(value,row,index){
-                    return "<button type='button' onclick='TalentAllowanceInfoDlg.showLog(\""+row.id+"\")' style='margin-right: 10px' class='btn btn-xs btn-success'>" +
-                        "<i class=\"fa fa-book\"></i>日志" +
-                        "</button>";
-                }
-            }
+            {field: 'selectItem', checkbox: false, visible: false},
+            {title: '企业名称', field: 'enterpriseName', visible: true, align: 'center', valign: 'middle', width: "120px", 'class': 'uitd_showTip'},
+            {title: '合同起始时间', field: 'startTime', visible: true, align: 'center', valign: 'middle', width: "120px", 'class': 'uitd_showTip'},
+            {title: '合同截止时间', field: 'endTime', visible: true, align: 'center', valign: 'middle', width: "120px", 'class': 'uitd_showTip'},
+            {title: '入职时间', field: 'entryTime', visible: true, align: 'center', valign: 'middle', width: "100px"},
+            {title: '本年度工作截止时间', field: 'quitTime', visible: true, align: 'center', valign: 'middle', width: "100px"},
+            {title: '人才标签', field: 'talentTypeName', visible: true, align: 'center', valign: 'middle', width: "100px", 'class': 'uitd_showTip'},
+            {title: '首次来晋行政介绍信时间', field: 'letterTime', visible: true, align: 'center', valign: 'middle', width: "120px"},
+                    /*{title: '操作', field: 'id', visible: true, align: 'center', valign: 'middle',width:"120px",
+                     formatter : function(value,row,index){
+                     return "<button type='button' onclick='TalentAllowanceInfoDlg.showLog(\""+row.id+"\")' style='margin-right: 10px' class='btn btn-xs btn-success'>" +
+                     "<i class=\"fa fa-book\"></i>日志" +
+                     "</button>";
+                     }
+                     }*/
         ];
-    }else{
+    } else {
         return [
-            {field: 'selectItem', checkbox:false,visible:false},
-            {title: '企业名称', field: 'enterpriseName', visible: true, align: 'center', valign: 'middle',width:"120px",'class': 'uitd_showTip'},
-            {title: '合同起始时间', field: 'startTime', visible: true, align: 'center', valign: 'middle',width:"120px"},
-            {title: '合同截止时间', field: 'endTime', visible: true, align: 'center', valign: 'middle',width:"120px",'class': 'uitd_showTip'},
-            {title: '入职时间', field: 'entryTime', visible: true, align: 'center', valign: 'middle',width:"100px"},
-            {title: '本年度工作截止时间', field: 'quitTime', visible: true, align: 'center', valign: 'middle',width:"100px"},
-            {title: '操作', field: 'id', visible: true, align: 'center', valign: 'middle',width:"120px",
-                formatter : function(value,row,index){
-                    return "<button type='button' onclick='TalentAllowanceInfoDlg.showLog(\""+row.id+"\")' style='margin-right: 10px' class='btn btn-xs btn-success'>" +
-                        "<i class=\"fa fa-book\"></i>日志" +
-                        "</button>"
-                }
-            }
+            {field: 'selectItem', checkbox: false, visible: false},
+            {title: '企业名称', field: 'enterpriseName', visible: true, align: 'center', valign: 'middle', width: "120px", 'class': 'uitd_showTip'},
+            {title: '合同起始时间', field: 'startTime', visible: true, align: 'center', valign: 'middle', width: "120px"},
+            {title: '合同截止时间', field: 'endTime', visible: true, align: 'center', valign: 'middle', width: "120px", 'class': 'uitd_showTip'},
+            {title: '入职时间', field: 'entryTime', visible: true, align: 'center', valign: 'middle', width: "100px"},
+            {title: '本年度工作截止时间', field: 'quitTime', visible: true, align: 'center', valign: 'middle', width: "100px"},
+                    /*{title: '操作', field: 'id', visible: true, align: 'center', valign: 'middle',width:"120px",
+                     formatter : function(value,row,index){
+                     return "<button type='button' onclick='TalentAllowanceInfoDlg.showLog(\""+row.id+"\")' style='margin-right: 10px' class='btn btn-xs btn-success'>" +
+                     "<i class=\"fa fa-book\"></i>日志" +
+                     "</button>"
+                     }
+                     }*/
         ];
     }
 }
@@ -293,23 +293,23 @@ TalentAllowanceInfoDlg.initContractColumns = function(){
 //初始化项目表的列
 TalentAllowanceInfoDlg.initProjectColumns = function () {
     return [
-        {field: 'selectItem', checkbox:false,visible:false},
-        {title: '核查项目名称', field: 'projectName', visible: true, align: 'center', valign: 'middle',width:"15%",'class': 'uitd_showTip'},
-        {title: '详情', field: 'months', visible: true, align: 'center', valign: 'middle',width:"35%",
-            formatter : function(value,row,index){
-                if(value!=null && value!=''){
+        {field: 'selectItem', checkbox: false, visible: false},
+        {title: '核查项目名称', field: 'projectName', visible: true, align: 'center', valign: 'middle', width: "15%", 'class': 'uitd_showTip'},
+        {title: '详情', field: 'months', visible: true, align: 'center', valign: 'middle', width: "35%",
+            formatter: function (value, row, index) {
+                if (value != null && value != '') {
                     return value;
-                }else if(row.days!=null && row.days!=''){
+                } else if (row.days != null && row.days != '') {
                     return row.days + "天";
-                }else{
+                } else {
                     return "";
                 }
             }
         },
-        {title: '备注', field: 'description', visible: true, align: 'center', valign: 'middle',width:"35%",'class': 'uitd_showTip'},
-        {title: '操作', field: 'project', visible: true, align: 'center', valign: 'middle',width:"15%",
-            formatter : function(value,row,index){
-                return "<button type='button' onclick='TalentAllowanceInfoDlg.showLog(\""+row.id+"\")' style='margin-right: 10px' class='btn btn-xs btn-success'><i class=\"fa fa-book\"></i>日志</button>";
+        {title: '备注', field: 'description', visible: true, align: 'center', valign: 'middle', width: "35%", 'class': 'uitd_showTip'},
+        {title: '操作', field: 'project', visible: true, align: 'center', valign: 'middle', width: "15%",
+            formatter: function (value, row, index) {
+                return "<button type='button' onclick='TalentAllowanceInfoDlg.showLog(\"" + row.id + "\")' style='margin-right: 10px' class='btn btn-xs btn-success'><i class=\"fa fa-book\"></i>日志</button>";
             }
         }
     ];
@@ -320,32 +320,33 @@ TalentAllowanceInfoDlg.initProjectColumns = function () {
  */
 TalentAllowanceInfoDlg.initFileTypeColumn = function () {
     return [
-        {field: 'selectItem', checkbox:false,visible:false},
-        {title: '名称', field: 'name', visible: true, align: 'center', valign: 'middle',width:"30%",'class': 'uitd_showTip',
-            formatter : function(value,row,index){
-                if(row.must==1){
-                    return '<i class="fa fa-paste"></i><span style="font-weight:bold;color:red;font-size:14px;font-family:宋体"> * </span> '+ value;
-                }if(row.must==2){
-                    return '<i class="fa fa-paste"></i>'+value;
+        {field: 'selectItem', checkbox: false, visible: false},
+        {title: '名称', field: 'name', visible: true, align: 'center', valign: 'middle', width: "30%", 'class': 'uitd_showTip',
+            formatter: function (value, row, index) {
+                if (row.must == 1) {
+                    return '<i class="fa fa-paste"></i><span style="font-weight:bold;color:red;font-size:14px;font-family:宋体"> * </span> ' + value;
+                }
+                if (row.must == 2) {
+                    return '<i class="fa fa-paste"></i>' + value;
                 }
             }
         },
-        {title: '模板', field: 'templateUrl', visible: true, align: 'center', valign: 'middle',width:"8%",
-            formatter : function(value,row,index){
-                if(value==null||value==''||value=='null'){
+        {title: '模板', field: 'templateUrl', visible: true, align: 'center', valign: 'middle', width: "8%",
+            formatter: function (value, row, index) {
+                if (value == null || value == '' || value == 'null') {
                     return '';
                 }
-                return "<button type='button' onclick=\"Feng.downloadFile('"+row.id+"',3)\" style='margin-right: 10px' class=\"btn btn-xs btn-primary\">" +
-                    "<i class=\"fa fa-download\"></i>下载" +
-                    "</button>";
+                return "<button type='button' onclick=\"Feng.downloadFile('" + row.id + "',3)\" style='margin-right: 10px' class=\"btn btn-xs btn-primary\">" +
+                        "<i class=\"fa fa-download\"></i>下载" +
+                        "</button>";
             }
         },
-        {title: '备注', field: 'description', visible: true, align: 'center', valign: 'middle',width:"52%",'class': 'uitd_showTip'},
-        {title: '操作', field: 'id', visible: true, align: 'center', valign: 'middle',width:"10%",
-            formatter : function(value,row,index){
-                return "<button type='button' onclick=\"TalentAllowanceInfoDlg.checkFile(this,'"+value+"','"+null+"')\" style='margin-right: 10px' class=\"btn btn-xs btn-info\">" +
-                    "<i class=\"fa fa-upload\"></i>添加" +
-                    "</button>" ;
+        {title: '备注', field: 'description', visible: true, align: 'center', valign: 'middle', width: "52%", 'class': 'uitd_showTip'},
+        {title: '操作', field: 'id', visible: true, align: 'center', valign: 'middle', width: "10%",
+            formatter: function (value, row, index) {
+                return "<button type='button' onclick=\"TalentAllowanceInfoDlg.checkFile(this,'" + value + "','" + null + "')\" style='margin-right: 10px' class=\"btn btn-xs btn-info\">" +
+                        "<i class=\"fa fa-upload\"></i>添加" +
+                        "</button>";
             }
         }
     ]
@@ -353,47 +354,47 @@ TalentAllowanceInfoDlg.initFileTypeColumn = function () {
 
 
 //选择附件并显示附件名
-TalentAllowanceInfoDlg.checkFile = function (content,fileTypeId,fileId){
+TalentAllowanceInfoDlg.checkFile = function (content, fileTypeId, fileId) {
     $("#upload_file ").unbind("change");
     $("#upload_file ").change(function () {
-        TalentAllowanceInfoDlg.upload(fileTypeId,fileId);
+        TalentAllowanceInfoDlg.upload(fileTypeId, fileId);
     });
     $('#upload_file').val("");
     $('#upload_file').click()
 }
 //上传附件
-TalentAllowanceInfoDlg.upload = function (fileTypeId,fileId){
+TalentAllowanceInfoDlg.upload = function (fileTypeId, fileId) {
     var id = $("#id").val();
-    if(id==null || id==''){
+    if (id == null || id == '') {
         Feng.info("请先添加基本信息并保存后再试");
-        return ;
+        return;
     }
-    if(fileId!=null&&fileId!='null'){
+    if (fileId != null && fileId != 'null') {
         $("#fileId").val(fileId)
-    }else{
+    } else {
         $("#fileId").val("");
     }
     $("#mainId").val(id);
     $("#fileTypeId").val(fileTypeId);
-    var index = layer.load(0, {shade: false,time:0});
+    var index = layer.load(0, {shade: false, time: 0});
     $("#index").val(index);
     $("#uploadForm").submit();
 }
 //删除附件
-TalentAllowanceInfoDlg.deleteFile = function (id){
-    var operation = function() {
+TalentAllowanceInfoDlg.deleteFile = function (id) {
+    var operation = function () {
         var ajax = new $ax(Feng.ctxPath + "/common/api/deleteFile", function (data) {
-            if(data.code=200){
+            if (data.code = 200) {
                 Feng.success(data.msg);
                 $("#fileTable").bootstrapTable("refresh", {});
-            }else{
+            } else {
                 Feng.error(data.msg);
             }
         }, function (data) {
             Feng.error("删除失败!" + data.responseJSON.message + "!");
         });
         ajax.set("id", id);
-        ajax.set("type",CONFIG.project_jbt);
+        ajax.set("type", CONFIG.project_jbt);
         ajax.start();
     }
     Feng.confirm("删除后无法恢复,确认删除吗?", operation);
@@ -403,47 +404,47 @@ TalentAllowanceInfoDlg.deleteFile = function (id){
 TalentAllowanceInfoDlg.showLog = function (id) {
     layer.open({
         type: 1,
-        title:"日志",
-        fixed:false,
-        content: '<table id="'+id+'"></table>',
+        title: "日志",
+        fixed: false,
+        content: '<table id="' + id + '"></table>',
         area: ['80%', '80%'],
         maxmin: true,
-        success :function (layero, index) {
-            $('#'+id).bootstrapTable({
+        success: function (layero, index) {
+            $('#' + id).bootstrapTable({
                 url: Feng.ctxPath + "/common/api/getJbtCheckLog",
                 method: 'POST',
                 contentType: "application/x-www-form-urlencoded; charset=UTF-8",
-                search: false,					// 是否显示表格搜索,此搜索是客户端搜索,不会进服务端
-                showRefresh: false,				// 是否显示刷新按钮
-                clickToSelect: true,			// 是否启用点击选中行
-                singleSelect: true,				// 设置True 将禁止多选
-                striped: true,  				// 是否显示行间隔色
-                pagination: false,   			// 设置为 true 会在表格底部显示分页条
+                search: false, // 是否显示表格搜索,此搜索是客户端搜索,不会进服务端
+                showRefresh: false, // 是否显示刷新按钮
+                clickToSelect: true, // 是否启用点击选中行
+                singleSelect: true, // 设置True 将禁止多选
+                striped: true, // 是否显示行间隔色
+                pagination: false, // 设置为 true 会在表格底部显示分页条
                 paginationHAlign: "left",
                 paginationDetailHAlign: "right",
-                sidePagination: "server",   	// 设置在哪里进行分页,可选值为 'client' 或者 'server'
+                sidePagination: "server", // 设置在哪里进行分页,可选值为 'client' 或者 'server'
                 showColumns: false,
                 queryParams: function (params) {
-                    return {"type":CONFIG.project_jbt,"mainId":$("#id").val(),"typeFileId":id,"active":1}
+                    return {"type": CONFIG.project_jbt, "mainId": $("#id").val(), "typeFileId": id, "active": 1}
                 },
                 columns:
-                    [
-                        {title: '步骤', field: 'stepName', visible: true, align: 'center', valign: 'middle',width:"10%",
-                            formatter : function (value,row,index) {
-                                return ""+value;
+                        [
+                            {title: '步骤', field: 'stepName', visible: true, align: 'center', valign: 'middle', width: "10%",
+                                formatter: function (value, row, index) {
+                                    return "" + value;
+                                }
+                            },
+                            {title: '操作人', field: 'createUser', visible: true, align: 'center', valign: 'middle', width: "15%"},
+                            {title: '操作时间', field: 'createTime', visible: true, align: 'center', valign: 'middle', width: "20%"},
+                            {title: '描述', field: 'description', visible: true, align: 'center', valign: 'middle', width: "45%",
+                                formatter: function (value, row, index) {
+                                    return '<span data-toggle="tooltip" title="' + value + '">"' + value + '"</span>';
+                                }
                             }
-                        },
-                        {title: '操作人', field: 'createUser', visible: true, align: 'center', valign: 'middle',width:"15%"},
-                        {title: '操作时间', field: 'createTime', visible: true, align: 'center', valign: 'middle',width:"20%"},
-                        {title: '描述', field: 'description', visible: true, align: 'center', valign: 'middle',width:"45%",
-                            formatter : function (value,row,index) {
-                                return '<span data-toggle="tooltip" title="'+ value +'">"'+value+'"</span>';
-                            }
-                        }
-                    ]
+                        ]
                 ,
                 onPostBody: function () {
-                    $('#'+id+"td.uitd_showTip").bind("mouseover", function () {
+                    $('#' + id + "td.uitd_showTip").bind("mouseover", function () {
                         var htm = $(this).html();
                         $(this).webuiPopover({title: '详情', content: htm, trigger: 'hover'}).webuiPopover('show');
                     });
@@ -454,50 +455,50 @@ TalentAllowanceInfoDlg.showLog = function (id) {
 }
 
 //回调
-TalentAllowanceInfoDlg.callBack = function (data){
+TalentAllowanceInfoDlg.callBack = function (data) {
     layer.close(data.obj);
     Feng.info(data.msg);
     if (data.code == 200) {
-        var ajax = new $ax(Feng.ctxPath + "/enterprise/talentAllowance/updateSuppleState", function(data){
-            if(data.code == 200){
+        var ajax = new $ax(Feng.ctxPath + "/enterprise/talentAllowance/updateSuppleState", function (data) {
+            if (data.code == 200) {
 
-            }else{
+            } else {
 
             }
-        },function(data){
+        }, function (data) {
             Feng.error("修改失败!" + data.responseJSON.message + "!");
         });
-        ajax.set("id",$("#id").val());
+        ajax.set("id", $("#id").val());
         ajax.start();
         $("#fileTable").bootstrapTable("refresh", {});
     }
 }
 
-TalentAllowanceInfoDlg.showAllLog = function(){
+TalentAllowanceInfoDlg.showAllLog = function () {
     var id = $("#id").val();
-    if(Feng.isNotEmptyStr(id)){
-        Feng.getCheckLog("logTable",{"type":CONFIG.project_jbt,"mainId":$("#id").val(),"typeFileId":"","active":1})
+    if (Feng.isNotEmptyStr(id)) {
+        Feng.getCheckLog("logTable", {"type": CONFIG.project_jbt, "mainId": $("#id").val(), "typeFileId": "", "active": 1})
     }
 }
 
-$(function() {
-    Feng.initValidatorTip("talentAllowanceForm",TalentAllowanceInfoDlg.validateFields);
+$(function () {
+    Feng.initValidatorTip("talentAllowanceForm", TalentAllowanceInfoDlg.validateFields);
     Feng.addAjaxSelect({
         "id": 'name',
         "displayCode": "id",
         "displayName": "name",
         "type": "GET",
-        "url": Feng.ctxPath + "/enterprise/talent/findTalentByEnterpriseInLibrary?type=1&year="+$("#year").val()
+        "url": Feng.ctxPath + "/enterprise/talent/findTalentByEnterpriseInLibrary?type=1&year=" + $("#year").val()
     });
     TalentAllowanceInfoDlg.validId();
-    if($("#type").val()==2){
-        $("#bankNumberSpan,#talentTypeSpan,#introductionModeSpan,#firstInJJTimeSpan").attr("style","display:none");
+    if ($("#type").val() == 2) {
+        $("#bankNumberSpan,#talentTypeSpan,#introductionModeSpan,#firstInJJTimeSpan").attr("style", "display:none");
     }
     //批量加载时间控件
-    $(".date").each(function(){
-        laydate.render({elem: "#"+$(this).attr("id"),type: 'date',trigger: 'click'});
+    $(".date").each(function () {
+        laydate.render({elem: "#" + $(this).attr("id"), type: 'date', trigger: 'click'});
     });
-    $("select").each(function (){
+    $("select").each(function () {
         $(this).val($(this).attr("value"));
     });
     TalentAllowanceInfoDlg.showAllLog();

+ 4 - 4
public/static/modular/gate/talentLibrary/talentBasicChange/talentBasicChange.js

@@ -19,17 +19,17 @@ TalentBasicChange.initColumn = function () {
         {title: '原国籍', field: 'oldNationalityName', visible: true, align: 'center', valign: 'middle', width: "120px", 'class': 'uitd_showTip'},
         {title: '原民族', field: 'oldNationName', visible: true, align: 'center', valign: 'middle', width: "120px", 'class': 'uitd_showTip'},
         {title: '原政治面貌', field: 'oldPoliticsName', visible: true, align: 'center', valign: 'middle', width: "120px", 'class': 'uitd_showTip'},
-        {title: '原证件类型', field: 'oldCardTypName', visible: true, align: 'center', valign: 'middle', width: "80px", 'class': 'uitd_showTip'},
+        //{title: '原证件类型', field: 'oldCardTypName', visible: true, align: 'center', valign: 'middle', width: "80px", 'class': 'uitd_showTip'},
         {title: '原证件号码', field: 'oldIdCard', visible: true, align: 'center', valign: 'middle', width: "150px", 'class': 'uitd_showTip'},
-        // {title: '原电子邮箱', field: 'oldEmail', visible: true, align: 'center', valign: 'middle',width:"100px",'class': 'uitd_showTip'},
+        {title: '原劳动合同时间', field: 'oldContractTime', visible: true, align: 'center', valign: 'middle', width: "100px", 'class': 'uitd_showTip'},
         {title: '现姓名', field: 'newName', visible: true, align: 'center', valign: 'middle', width: "100px", 'class': 'uitd_showTip'},
         // {title: '现出生日期', field: 'newBirthday', visible: true, align: 'center', valign: 'middle',width:"120px",'class': 'uitd_showTip'},
         {title: '现国籍', field: 'newNationalityName', visible: true, align: 'center', valign: 'middle', width: "120px", 'class': 'uitd_showTip'},
         {title: '现民族', field: 'newNationName', visible: true, align: 'center', valign: 'middle', width: "120px", 'class': 'uitd_showTip'},
         {title: '现政治面貌', field: 'newPoliticsName', visible: true, align: 'center', valign: 'middle', width: "120px", 'class': 'uitd_showTip'},
-        {title: '现证件类型', field: 'newCardTypName', visible: true, align: 'center', valign: 'middle', width: "80px", 'class': 'uitd_showTip'},
+        //{title: '现证件类型', field: 'newCardTypName', visible: true, align: 'center', valign: 'middle', width: "80px", 'class': 'uitd_showTip'},
         {title: '现证件号码', field: 'newIdCard', visible: true, align: 'center', valign: 'middle', width: "150px", 'class': 'uitd_showTip'},
-        // {title: '现邮箱', field: 'newEmail', visible: true, align: 'center', valign: 'middle',width:"100px",'class': 'uitd_showTip'},
+        {title: '现劳动合同时间', field: 'newContractTime', visible: true, align: 'center', valign: 'middle', width: "100px", 'class': 'uitd_showTip'},
         {title: '首次提交时间', field: 'firstSubmitTime', visible: true, align: 'center', valign: 'middle', width: "120px", 'class': 'uitd_showTip'},
         {title: '最新提交时间', field: 'newSubmitTime', visible: true, align: 'center', valign: 'middle', width: "120px", 'class': 'uitd_showTip'},
         {title: '审核状态', field: 'checkState', visible: true, align: 'center', valign: 'middle', width: "80px",

+ 4 - 1
public/static/modular/gate/talentLibrary/talentBasicChange/talentBasicChange_info.js

@@ -13,6 +13,7 @@ var TalentBasicChangeInfoDlg = {
         newCardType: {validators: {notEmpty: {message: '现证件类型不能为空'}}},
         newIdCard: {validators: {notEmpty: {message: '现证件号码不能为空'}}},
         newEmail: {validators: {notEmpty: {message: '现电子邮箱不能为空'}}},
+        newContractTime: {validators: {notEmpty: {message: '现劳动合同起止时间不能为空'}}},
     }
 };
 
@@ -77,7 +78,8 @@ TalentBasicChangeInfoDlg.collectData = function () {
             .set('newPolitics')
             .set('newCardType')
             .set('newIdCard')
-            .set('newEmail');
+            .set('newEmail')
+            .set('newContractTime');
 }
 
 
@@ -101,6 +103,7 @@ TalentBasicChangeInfoDlg.nameChange = function () {
             $("#newCardType").val(talentInfo.card_type);
             $("#newIdCard").val(talentInfo.card_number);
             $("#newEmail").val(talentInfo.email);
+            $("#newContractTime").val(talentInfo.labor_contract_rangetime);
         }, function (data) {
             Feng.error("查询失败!" + data.responseJSON.message + "!");
         });

+ 4 - 4
public/static/modular/talentLibrary/talentBasicChange/talentBasicChange.js

@@ -20,17 +20,17 @@ TalentBasicChange.initColumn = function () {
         {title: '原国籍', field: 'oldNationalityName', visible: true, align: 'center', valign: 'middle', width: "120px", 'class': 'uitd_showTip'},
         {title: '原民族', field: 'oldNationName', visible: true, align: 'center', valign: 'middle', width: "120px", 'class': 'uitd_showTip'},
         {title: '原政治面貌', field: 'oldPoliticsName', visible: true, align: 'center', valign: 'middle', width: "120px", 'class': 'uitd_showTip'},
-        {title: '原证件类型', field: 'oldCardTypName', visible: true, align: 'center', valign: 'middle', width: "80px", 'class': 'uitd_showTip'},
+        //{title: '原证件类型', field: 'oldCardTypName', visible: true, align: 'center', valign: 'middle', width: "80px", 'class': 'uitd_showTip'},
         {title: '原证件号码', field: 'oldIdCard', visible: true, align: 'center', valign: 'middle', width: "150px", 'class': 'uitd_showTip'},
-        // {title: '原电子邮箱', field: 'oldEmail', visible: true, align: 'center', valign: 'middle',width:"100px",'class': 'uitd_showTip'},
+        {title: '原劳动合同时间', field: 'oldContractTime', visible: true, align: 'center', valign: 'middle',width:"100px",'class': 'uitd_showTip'},
         {title: '现姓名', field: 'newName', visible: true, align: 'center', valign: 'middle', width: "100px", 'class': 'uitd_showTip'},
         // {title: '现出生日期', field: 'newBirthday', visible: true, align: 'center', valign: 'middle',width:"120px",'class': 'uitd_showTip'},
         {title: '现国籍', field: 'newNationalityName', visible: true, align: 'center', valign: 'middle', width: "120px", 'class': 'uitd_showTip'},
         {title: '现民族', field: 'newNationName', visible: true, align: 'center', valign: 'middle', width: "120px", 'class': 'uitd_showTip'},
         {title: '现政治面貌', field: 'newPoliticsName', visible: true, align: 'center', valign: 'middle', width: "120px", 'class': 'uitd_showTip'},
-        {title: '现证件类型', field: 'newCardTypName', visible: true, align: 'center', valign: 'middle', width: "80px", 'class': 'uitd_showTip'},
+        //{title: '现证件类型', field: 'newCardTypName', visible: true, align: 'center', valign: 'middle', width: "80px", 'class': 'uitd_showTip'},
         {title: '现证件号码', field: 'newIdCard', visible: true, align: 'center', valign: 'middle', width: "150px", 'class': 'uitd_showTip'},
-        // {title: '现邮箱', field: 'newEmail', visible: true, align: 'center', valign: 'middle',width:"100px",'class': 'uitd_showTip'},
+        {title: '现劳动合同时间', field: 'newContractTime', visible: true, align: 'center', valign: 'middle',width:"100px",'class': 'uitd_showTip'},
         {title: '首次提交时间', field: 'firstSubmitTime', visible: true, align: 'center', valign: 'middle', width: "120px", 'class': 'uitd_showTip'},
         {title: '最新提交时间', field: 'newSubmitTime', visible: true, align: 'center', valign: 'middle', width: "120px", 'class': 'uitd_showTip'},
         {title: '审核状态', field: 'checkState', visible: true, align: 'center', valign: 'middle', width: "80px",

+ 8 - 0
public/static/modular/talentLibrary/talentBasicChange/talentBasicChange_info.js

@@ -93,6 +93,14 @@ TalentBasicChangeInfoDlg.toggleField = function () {
 
 $(function () {
     var id = $("#id").val();
+    $(".date").each(function () {
+        laydate.render({
+            elem: this,
+            type: "date",
+            range: true,
+            trigger: "click"
+        })
+    })
     //批量加载字典表数据
     var arr = [
         {"name": "oldNationality", "code": "nationality"},