浏览代码

积分申报进度++

sugangqiang 2 年之前
父节点
当前提交
16e03d3a4c

+ 16 - 0
app/common/controller/Api.php

@@ -633,4 +633,20 @@ class Api extends BaseController {
         }
     }
 
+    function getIntegralProjectsByType() {
+        $type = $this->request->param("type") ?: 0;
+        $where[] = ["type", "=", $type];
+        $where[] = ["active", "=", 1];
+        $list = \app\common\api\IntegralProjectApi::getAll($where);
+        return json($list);
+    }
+
+    public function getIntegralItemsByProject() {
+        $projectId = $this->request->param("projectId") ?: 0;
+        $where[] = ["projectId", "=", $projectId];
+        $where[] = ["active", "=", 1];
+        $list = \app\common\api\IntegralItemApi::getAll($where);
+        return json($list);
+    }
+
 }

+ 1 - 17
app/enterprise/controller/Integral.php

@@ -34,12 +34,6 @@ class Integral extends EnterpriseController {
         $ep = EnterpriseApi::getOne($this->user["uid"]);
         if (!chkEnterpriseFull($ep))
             return;
-        $tagList = DictApi::selectByParentCode('enterprise_tag');
-        $streetList = DictApi::selectByParentCode('street');
-        $industryFieldNew = DictApi::selectByParentCode('industry_field');
-        $ep->enterpristTagName = $tagList[$ep->enterpriseTag];
-        $ep->streetName = $streetList[$ep->street];
-        $ep->industryFieldNewName = $industryFieldNew[$ep->industryFieldNew];
         if ($info) {
             $info["real_state"] = TalentLogApi::getLastLog($id, 1)["state"];
         }
@@ -50,16 +44,7 @@ class Integral extends EnterpriseController {
         if ($request->isPost()) {
             $checkState = $info["checkState"] ?: 0;
             if ($checkState == TalentState::SCND_SAVE || $checkState == 0) {
-                switch ($type) {
-                    case 1:
-                        $this->mixSave($info, $request, TalentState::SCND_SAVE);
-                        exit();
-                        break;
-                    case 2:
-                        $this->icSave($info, $request, TalentState::SCND_SAVE);
-                        exit();
-                        break;
-                }
+                $this->save($info, $request, TalentState::SCND_SAVE);
             } else if (in_array($checkState, [TalentState::BASE_VERIFY_FAIL, TalentState::BASE_REVERIFY_FAIL, TalentState::FST_VERIFY_FAIL, TalentState::REVERIFY_FAIL])) {
                 $res = ["msg" => "审核失败,不能再保存"];
                 echo sprintf("<script>parent.TalentInfoInfoDlg.infoCallback(%s);</script>", json_encode($res));
@@ -72,7 +57,6 @@ class Integral extends EnterpriseController {
         $checkState = $info["checkState"] ?: 0;
 
         $info["enterprise"] = $ep;
-        $info["talent_type_list"] = DictApi::findChildDictByCode("talent_type");
         return view("", ["year" => date("Y"), "checkState" => $checkState, "row" => $info]);
     }
 

+ 89 - 469
app/enterprise/view/integral/apply.html

@@ -11,7 +11,7 @@
         padding-right:4px;
         padding-left: 4px;
     }
-    #talentInfoForm label {
+    #integralInfoForm label {
         font-size: xx-small;
     }
     .has-feedback .form-control {
@@ -72,16 +72,13 @@
                     <div class="tab-content">
                         <div id="tab-1" class="tab-pane active">
                             <form id="integralInfoForm" action="/enterprise/integral/apply" method="post" enctype="multipart/form-data" target="hiddenIframe">
-                                <input type="hidden" name="id" id="id" value="{$row.id}">
-                                <input type="hidden" name="year" id="year" value="{$year}">
-                                <input type="hidden" name="enterprise_id" id="enterpriseId" value="{$row.enterprise.id}">
-                                <input type="hidden" name="enterprise_type" id="type" value="{$row.enterprise.type}">
-                                <input type="hidden" name="enterprise_tag" id="enterprise_tag" value="{$row.enterprise.enterpriseTag}">
-                                <input type="file" name="photo" id="photo" style="display: none">
-                                <input type="hidden" name="checkState" id="checkState" value="{$row.checkState}">
-                                <input type="hidden" name="realState" id="realState" value="{$row.real_state}">
-                                <input type="hidden" name="files" id="files" value="{$row.modify_files}">
-                                <input type="hidden" name="fields" id="fields" value="{$row.modify_fields}">
+                                <input type="hidden" name="id" id="id" value="{$row.id}"/>
+                                <input type="hidden" name="year" id="year" value="{$year}"/>
+                                <input type="hidden" name="enterprise_id" id="enterpriseId" value="{$row.enterprise.id}"/>
+                                <input type="hidden" name="checkState" id="checkState" value="{$row.checkState}"/>
+                                <input type="hidden" name="realState" id="realState" value="{$row.real_state}"/>
+                                <input type="hidden" name="files" id="files" value="{$row.modify_files}"/>
+                                <input type="hidden" name="fields" id="fields" value="{$row.modify_fields}"/>
                                 <div class="panel panel-default">
                                     <div class="panel-heading" onclick="$(this).next().toggle()">基础信息</div>
                                     <div class="panel-body">
@@ -93,24 +90,6 @@
                                                         <input type="text" class="form-control" id="name" name="name" value="{$row.name}"/>
                                                     </div>
                                                 </td>
-                                                <td>
-                                                    <div class="rowGroup">
-                                                        <label class="control-label spacing td-label"><span style="color: red">*</span>民族</label>
-                                                        <select class="form-control" id="nation" name="nation" value='{$row.nation}'>
-                                                        </select>
-                                                    </div>
-                                                </td>
-                                                <td rowspan="5" style="width: 200%">
-                                                    <p style="text-align: center;color: red">
-                                                        请上传近期免冠半身彩照(两寸)
-                                                    </p>
-                                                    <img id="photoImg" {if condition="$row['headimgurl']"} src="{$row.headimgurl|getStoragePath}" {else/} src="/static/img/photo.png" {/if} onclick="$('#photo').click();" style="height:147px;width:105px;margin:0 auto;display:block;">
-                                                         <hr />
-                                                    附件:
-                                                    <table class="fileTable"></table>
-                                                </td>
-                                            </tr>
-                                            <tr>
                                                 <td>
                                                     <div class="rowGroup">
                                                         <label class=" control-label spacing td-label"><span style="color: red">*</span>证件类型</label>
@@ -128,484 +107,125 @@
                                                         <input class="form-control" id="card_number" name="card_number" value="{$row.card_number}">
                                                     </div>
                                                 </td>
+                                                <td>
+                                                    <div class="rowGroup">
+                                                        <label class="control-label spacing td-label"><span style="color: red">*</span>手机号码</label>
+                                                        <input type="text" class="form-control" id="phone" name="phone" maxlength="11" value="{$row.phone}"/>
+                                                    </div>
+                                                </td>
                                             </tr>
                                             <tr>
                                                 <td>
                                                     <div class="rowGroup">
-                                                        <label class=" control-label spacing td-label"><span style="color: red">*</span>性别</label>
-                                                        <select class="form-control" id="sex" name="sex" value='{$row.sex}'>
-                                                            <option value="">请选择</option>
-                                                            <option value="1">男</option>
-                                                            <option value="2">女</option>
-                                                        </select>
+                                                        <label class="control-label spacing td-label"><span style="color: red">*</span>电子邮箱</label>
+                                                        <input type="text" class="form-control" id="email" name="email"  value="{$row.email}"/>
                                                     </div>
                                                 </td>
                                                 <td>
                                                     <div class="rowGroup">
-                                                        <label class=" control-label spacing td-label"><span style="color: red">*</span>出生日期</label>
-                                                        <input type="text" class="form-control date" id="birthday" name="birthday" value="{$row.birthday}"/>
+                                                        <label class="control-label spacing td-label"><span style="color: red">*</span>单位标签</label>
+                                                        <div class="form-control" style="border: none">{$row.enterprise.enterpristTagName}</div>
                                                     </div>
                                                 </td>
-                                            </tr>
-                                            <tr>
                                                 <td>
                                                     <div class="rowGroup">
-                                                        <label class=" control-label spacing td-label"><span style="color: red">*</span>政治面貌</label>
-                                                        <select class="form-control" id="politics" name="politics" value='{$row.politics}'>
-                                                        </select>
+                                                        <label class=" control-label spacing td-label"><span style="color: red">*</span>单位名称</label>
+                                                        <div class="form-control" style="border: none">{$row.enterprise.name}</div>
                                                     </div>
                                                 </td>
                                                 <td>
                                                     <div class="rowGroup">
-                                                        <label class=" control-label spacing td-label"><span style="color: red">*</span>国籍/地区</label>
-                                                        <select class="form-control" id="nationality" name="nationality" value="{$row.nationality}">
-                                                        </select>
+                                                        <label class=" control-label spacing td-label"><span style="color: red">*</span>所属街道</label>
+                                                        <div class="form-control" style="border: none">{$row.enterprise.streetName}</div>
                                                     </div>
                                                 </td>
                                             </tr>
+                                        </table>
+                                    </div>
+                                </div>
+                                <div class="panel panel-default">
+                                    <div class="panel-heading" onclick="$(this).next().toggle()">申报项目</div>
+                                    <div class="panel-body" id="itemList">
+                                        <table style="width:100%;border-collapse: collapse;" class="table table-bordered">
                                             <tr>
-                                                <td colspan="2">
-                                                    <div class="rowGroup col-sm-4">
-                                                        <label class="control-label spacing td-label"><span style="color: red">*</span>籍贯省</label>
-                                                        <select class="form-control " onchange="TalentInfoInfoDlg.afterSelectProvince()" id="province" name="province" value='{$row.province}'>
+                                                <td style="width:40px;">
+                                                    <div class="rowGroup">
+                                                        <label class=" control-label spacing td-label">选择</label>
+                                                        <input type="checkbox" name="chk[]" class="form-control"/>
+                                                    </div>
+                                                </td>
+                                                <td>
+                                                    <div class="rowGroup">
+                                                        <label class=" control-label spacing td-label"><span style="color: red">*</span>项目类别</label>
+                                                        <select class="form-control" name="projectType[]" value="{$row.projectType}" onchange="IntegralInfoDlg.onProjectTypeChange(this);">
+                                                            <option value="">请选择</option>
+                                                            <option value="1">基础分</option>
+                                                            <option value="2">贡献分</option>
+                                                            <option value="3">资历分</option>
                                                         </select>
                                                     </div>
-                                                    <div class="rowGroup col-sm-4">
-                                                        <label class="control-label spacing td-label"><span style="color: red">*</span>籍贯市</label>
-                                                        <select class="form-control" onchange="TalentInfoInfoDlg.afterSelectCity()" id="city" name="city" value='{$row.city}'>                                                            
+                                                </td>
+                                                <td>
+                                                    <div class="rowGroup">
+                                                        <label class=" control-label spacing td-label"><span style="color: red">*</span>积分项目</label>
+                                                        <select class="form-control" name="projectId[]" value="{$row.projectId}" onchange="IntegralInfoDlg.onProjectChange(this);">
+                                                            <option value="">请选择</option>
                                                         </select>
                                                     </div>
-                                                    <div class="rowGroup col-sm-4">
-                                                        <label class="control-label spacing td-label"><span style="color: red">*</span>籍贯县(区)</label>
-                                                        <select class="form-control" id="county" name="county" value='{$row.county}'>                                                            
+                                                </td>
+                                                <td>
+                                                    <div class="rowGroup">
+                                                        <label class=" control-label spacing td-label"><span style="color: red">*</span>积分标准</label>
+                                                        <select class="form-control" name="item_id[]" value="{$row.item_id}" onchange="IntegralInfoDlg.onItemChange(this);">
+                                                            <option value="">请选择</option>
                                                         </select>
                                                     </div>
                                                 </td>
+                                                <td>
+                                                    <div class="rowGroup">
+                                                        <label class="control-label spacing td-label"><span style="color: red">*</span>数额<span class="unit"></span></label>
+                                                        <input type="text" class="form-control" name="amount[]" value="{$row.amount}"/>
+                                                    </div>
+                                                </td>
+                                            </tr>
+                                            <tr>
+                                                <td colspan="5">
+                                                    <table class="fileTable"></table>
+                                                </td>
                                             </tr>
                                         </table>
+                                        <div id="toolbar" style="text-align:center;">
+                                            <button type="button" class="btn btn-sm btn-info " onclick="IntegralInfoDlg.addItem()" id="">
+                                                <i class="fa fa-plus"></i>&nbsp;增加项目
+                                            </button>
+                                            <button type="button" class="btn btn-sm btn-warning " onclick="IntegralInfoDlg.deleteItem()" id="">
+                                                <i class="fa fa-remove"></i>&nbsp;移除项目
+                                            </button>
+                                        </div>
                                     </div>
                                 </div>
-                        <div class="panel panel-default">
-                            <div class="panel-heading" onclick="$(this).next().toggle()">人才基础信息</div>
-                            <div class="panel-body">
-                                <table style="width: 100%;border-collapse: collapse;" class="table table-bordered">
-                                    <tr>
-                                        <td>
-                                            <div class="rowGroup">
-                                                <label class="control-label spacing td-label"><span style="color: red">*</span>单位标签</label>
-                                                <div class="form-control" style="border: none">{$row.enterprise.enterpristTagName}</div>
-                                            </div>
-                                        </td>
-                                        <td>
-                                            <div class="rowGroup">
-                                                <label class=" control-label spacing td-label"><span style="color: red">*</span>单位名称</label>
-                                                <div class="form-control" style="border: none">{$row.enterprise.name}</div>
-                                            </div>
-                                        </td>
-                                        <td>
-                                            <div class="rowGroup">
-                                                <label class=" control-label spacing td-label"><span style="color: red">*</span>所属街道</label>
-                                                <div class="form-control" style="border: none">{$row.enterprise.streetName}</div>
-                                            </div>
-                                        </td>
-                                        <td>
-                                            <div class="rowGroup">
-                                                <label class=" control-label spacing td-label"><span style="color: red">*</span>产业领域</label>
-                                                <div class="form-control" style="border: none">{$row.enterprise.industryFieldNewName}</div>
-                                            </div>
-                                        </td>
-                                    </tr>
-                                    <tr>
-                                        <td>
-                                            <div class="rowGroup">
-                                                <label class=" control-label spacing td-label"><span style="color: red">*</span>人才类型</label>
-                                                <select class="form-control" id="talent_type" name="talent_type" value="{$row.talent_type}" onchange="TalentInfoInfoDlg.talentTypeChange()" data-value="{$row.talent_type}">
-                                                    <option value="">请选择</option>
-                                                    {volist name="row.talent_type_list" id="item"}
-                                                    <option value="{$item.code}">{$item.name}</option>
-                                                    {/volist}
-                                                </select>
-                                            </div>
-                                        </td>
-                                        <td>
-                                            <label class=" control-label spacing td-label">人才类型说明</label>
-                                            <div class="word-wrap" id="typeTips">
-
-                                            </div>
-                                        </td>
-                                        <td rowspan="3" colspan='2'>
-                                            <table class="fileTable">
-                                                <tr><td>载入附件</td></tr>
-                                            </table>
-                                        </td>
-                                    </tr>                                    
-                                    <tr class="talentType1-2" style="display: none">
-                                        <td >
-                                            <div class="rowGroup">
-                                                <label class=" control-label spacing td-label"><span style="color: red">*</span><span id="talentType_first" style="display: none">首次</span>在我市缴交社会保险或个人所得税月份</label>
-                                                <input type="text" class="form-control rangemonth" id="tax_insurance_month" name="tax_insurance_month" value="{$row.tax_insurance_month}"/>
-                                            </div>
-                                        </td>
-                                        <td>
-                                            <div class="rowGroup">
-                                                <label class=" control-label spacing td-label"><span style="color: red">*</span>劳动合同起止时间</label>
-                                                <input type="text" class="form-control rangedate" id="labor_contract_rangetime" name="labor_contract_rangetime" value="{$row.labor_contract_rangetime}" />
-                                            </div>
-                                        </td>
-                                    </tr>                                    
-                                    <tr class="talentType1-2" style="display: none">
-                                        <td >
-                                            <div class="rowGroup">
-                                                <label class=" control-label spacing td-label"><span style="color: red">*</span>工资发放渠道</label>
-                                                <input type="radio" name="salary_pay_way" value="1" {eq name="row.salary_pay_way" value="1"}checked{/eq}/>本单位&nbsp;&nbsp;
-                                                <input type="radio" name="salary_pay_way" value="2" {eq name="row.salary_pay_way" value="2"}checked{/eq}/>本单位所属集团公司及权属公司
-                                            </div>
-                                        </td>
-                                        <td>
-                                            <div class="rowGroup">
-                                                <label class=" control-label spacing td-label"><span style="color: red">*</span>工资发放月份</label>
-                                                <input type="text" class="form-control rangemonth" id="labor_contract_rangetime" name="salary_pay_month" value="{$row.salary_pay_month}" />
-                                            </div>
-                                        </td>
-                                    </tr>
-                                    <tr class="talentType3" style="display: none">
-                                        <td >
-                                            <div class="rowGroup">
-                                                预引进类型
-                                            </div>
-                                        </td>
-                                        <td >
-                                            <div class="rowGroup">
-                                                <input type="radio" name="pre_import_type" value="1" {eq name="row.pre_import_type" value="1"}checked{/eq}/><span style="color: red">*</span>意向合同&nbsp;&nbsp;&nbsp;&nbsp;
-                                                <input type="radio" name="pre_import_type" value="2" {eq name="row.pre_import_type" value="2"}checked{/eq}/><span style="color: red">*</span>创业企业名称预核准
-                                            </div>
-                                        </td>
-                                    </tr>
-                                    {if condition="in_array($row['enterprise']['enterpriseTag'],['mtdw','gyqyh','mbfqy','jrjg'])"}
-                                    <tr style="display:none" id="come_in_jin">
-                                        <td>
-                                            <div class="rowGroup">
-                                                <label class="control-label spacing td-label">{if condition="$row['talent_type'] eq 1"}近三年{else/}首次{/if}来晋工作时间</label>
-                                                <input type="text" class="form-control date" id="fst_work_time" name="fst_work_time" value="{$row.fst_work_time}"/>
-                                            </div>
-                                        </td>
-                                        <td id="come_in_jin_str">
-                                            <label class=" control-label spacing td-label">近三年来晋工作时间说明</label>
-                                            <div class="word-wrap">
-                                                如您为近三年来晋工作的人才,须填写近三年来晋日期,同时上传对应佐证材料,如果来晋时间已超过三年,则此项不必填写。
-                                            </div>
-                                        </td>
-                                    </tr>
-                                    {/if}
-                                </table>
-                            </div>                            
-                            <div class="panel-body">
-                                <table style="width: 100%;border-collapse: collapse;" class="table table-bordered">
-                                    <tr>
-                                        <td>
-                                            <div class="rowGroup">
-                                                <label class="control-label spacing td-label"><span style="color: red">*</span>工作简历</label>
-                                                <textarea rows="5" class="form-control" id="experience" name="experience" style="border: none" placeholder="请严格按如下格式填写:
-2000.07-2005.03 xxxx有限公司 (私营企业) 总务科 后勤
-2005.03-2010.09 xx市xx单位 (事业单位) 非编 经办
-2010.09-2013.08 待业
-2013.08-至今 xx省xx单位 (参公事业单位) 在编 科员">{$row.experience}</textarea>
-                                            </div>
-                                        </td>
-                                        <td>
-                                            <div class="rowGroup">
-                                                <label class=" control-label spacing td-label"><span style="color: red">*</span>教育背景</label>
-                                                <textarea rows="5" class="form-control" id="education" name="education" style="border: none" placeholder="请严格按如下格式填写:
-1993.09-1996.07 xx市xx中学 (高中) 学生
-1996.09-2000.07 xxxxx大学 (本科) xxxx专业 学生">{$row.education}</textarea>
-                                            </div>
-                                        </td>
-                                    </tr>
-                                </table>
-                            </div>
+                            </form>
+                            <form id="uploadForm" action="/common/api/addTalentFile" method="post" class="form-horizontal" enctype="multipart/form-data" target="hiddenIframe" style="display: none">
+                                <input type='hidden' id="fileId" name="fileId" />
+                                <input type='file' id="upload_file" name="fileUrl" style='display: none'/>
+                                <input type='hidden' id="mainId" name="mainId" />
+                                <input type='hidden' id="fileTypeId" name="fileTypeId" />
+                                <input type='hidden' id="index" name="index" />
+                                <input type='hidden' id="tableIndex" name="tableIndex" />
+                                <input type='hidden' id="trIndex" name="trIndex" />
+                                <input type="hidden" name="backName" value="IntegralInfoDlg.callBack"/>
+                                <input type="type" name="type" value="1"/>
+                            </form>
+                            <div class="panel-heading" onclick="$(this).next().toggle()">日志</div>
+                            <table id="logTable">
+                            </table>
                         </div>
-                        <div class="panel panel-default">
-                            <div class="panel-heading" onclick="$(this).next().toggle()">人才认定申请</div>
-                            <div class="panel-body">
-                                <table style="width: 100%;border-collapse: collapse;" class="table table-bordered">
-                                    <tr>
-                                        <td>
-                                            <div class="rowGroup">
-                                                <label class=" control-label spacing td-label"><span style="color: red">*</span>申报年度</label>
-                                                <input type="text" class="form-control" name="apply_year" id="apply_year" value="{$year}" readonly disabled>
-                                            </div>
-                                        </td>
-                                        <td>
-                                            <div class="rowGroup">
-                                                <label class="control-label spacing td-label"><span style="color: red">*</span>手机号码</label>
-                                                <input type="text" class="form-control" id="phone" name="phone" maxlength="11" value="{$row.phone}"/>
-                                            </div>
-                                        </td>
-                                        <td>
-                                            <div class="rowGroup">
-                                                <label class="control-label spacing td-label"><span style="color: red">*</span>电子邮箱</label>
-                                                <input type="text" class="form-control" id="email" name="email"  value="{$row.email}"/>
-                                            </div>
-                                        </td>
-                                        <td rowspan="3" style="width: 300%">
-                                            <table class="fileTable"></table>
-                                        </td>
-                                    </tr>
-                                    <tr>
-                                        <td>
-                                            <div class="rowGroup">
-                                                <label class="control-label spacing td-label"><span style="color: red">*</span>最高学历</label>
-                                                <select class="form-control" id="highest_degree" name="highest_degree" value="{$row.highest_degree}"></select>
-                                            </div>
-                                        </td>
-                                        <td>
-                                            <div class="rowGroup">
-                                                <label class="control-label spacing td-label"><span style="color: red">*</span>毕业院校</label>
-                                                <input type="text" class="form-control" id="graduate_school" name="graduate_school" value="{$row.graduate_school}">
-                                            </div>
-                                        </td>
-                                        <td>
-                                            <div class="rowGroup">
-                                                <label class="control-label spacing td-label"><span style="color: red">*</span>专业</label>
-                                                <input type="text" class="form-control" id="major" name="major" value="{$row.major}"/>
-                                            </div>
-                                        </td>
-                                    </tr>
-                                </table>
-                                <table style="width: 100%;border-collapse: collapse;border:1px solid #ddd;border-left:none;border-right:none;" class="table table-bordered">                                    
-                                    <tr>
-                                        <td>
-                                            <div class="rowGroup">
-                                                <label class="control-label spacing td-label">是否有留学经历</label>
-                                                <select class="form-control" id="study_abroad" name="study_abroad" onchange="TalentInfoInfoDlg.changeStudyAbroad()" autocomplete='off' value="{$row.study_abroad}">
-                                                    <option value="2">否</option>
-                                                    <option value="1">是</option>
-                                                </select>
-                                            </div>
-                                        </td>
-                                        <td>
-                                            <div class="rowGroup abroad_need_this" {if condition='!$row["study_abroad"] or $row["study_abroad"] eq 2'}style="display:none;"{/if}>
-                                                <label class="control-label spacing td-label"><span style="color: red">*</span>留学毕业院校</label>
-                                                <input type="text" class="form-control" id="abroad_school" name="abroad_school" value="{$row.abroad_school}"/>
-                                            </div>
-                                        </td>
-                                        <td>
-                                            <div class="rowGroup abroad_need_this" {if condition='!$row["study_abroad"] or $row["study_abroad"] eq 2'}style="display:none;"{/if}>
-                                                <label class="control-label spacing td-label"><span style="color: red">*</span>留学专业</label>
-                                                <input type="text" class="form-control" id="abroad_major" name="abroad_major" value="{$row.abroad_major}"/>
-                                            </div>
-                                        </td>
-                                        <td rowspan="3" style="width: 300%">
-                                            <table class="fileTable"></table>
-                                        </td>
-                                    </tr>
-                                </table>
-                                <table style="width: 100%;border-collapse: collapse;" class="table table-bordered">
-                                    <tr>
-                                        <td>
-                                            <div class="rowGroup">
-                                                <label class=" control-label spacing td-label"><span style="color: red">*</span>引进方式</label>
-                                                <select class="form-control" id="import_way" name="import_way" data-placeholder="引进方式" value="{$row.import_way}">
-                                                </select>
-                                            </div>
-                                        </td>
-                                        <td>
-                                            <div class="rowGroup">
-                                                <label class="control-label spacing td-label"><span style="color: red">*</span>本单位入职时间</label>
-                                                <input type="text" class="form-control date" id="cur_entry_time" name="cur_entry_time" value="{$row.cur_entry_time}"/>
-                                            </div>
-                                        </td>
-                                        <td>
-                                            <div class="rowGroup">
-                                                <label class="control-label spacing td-label"><span style="color: red">*</span>本单位现任职务</label>
-                                                <input type="text" class="form-control" id="position" name="position" value="{$row.position}"/>
-                                            </div>
-                                        </td>
-                                        <td rowspan="3" style="width: 300%">
-                                            <table class="fileTable"></table>
-                                        </td>
-                                    </tr>
-                                </table>
-                                <table style="width: 100%;border-collapse: collapse;" class="table table-bordered">
-                                    <tr>
-                                        <td>
-                                            <div class="rowGroup">
-                                                <label class="control-label spacing">职称技术资格</label>
-                                                <input type="text" class="form-control" id="pro_qua" name="pro_qua" value="{$row.pro_qua}"/>
-                                            </div>
-                                        </td>
-                                        <td rowspan="3" style="width: 100%">
-                                            <table class="fileTable"></table>
-                                        </td>
-                                    </tr>
-                                </table>
-                                <table style="width: 100%;border-collapse: collapse;" class="table table-bordered">
-                                    <tr>
-                                        <td>
-                                            <div class="rowGroup">
-                                                <label class="control-label spacing">专业技术职称</label>
-                                                <input type="text" class="form-control" id="professional" name="professional" value="{$row.professional}"/>
-                                            </div>
-                                        </td>
-                                        <td rowspan="3" style="width: 100%">
-                                            <table class="fileTable"></table>
-                                        </td>
-                                    </tr>
-                                </table>
-
-                                <table style="width: 100%;border-collapse: collapse;" class="table table-bordered">
-                                    <tr>
-                                        <td colspan="3">
-                                            <div class="rowGroup">
-                                                <label class=" control-label spacing td-label"><span style="color: red">*</span>申报来源</label>
-                                                <select class="form-control" id="source" name="source" onchange="TalentInfoInfoDlg.sourceChange()" value="{$row.source}">
-                                                </select>
-                                            </div>
-                                        </td>
-                                        <td rowspan="7" style="width: 100%">
-                                            <table class="fileTable"></table>
-                                        </td>
-                                    </tr>
-                                    <tr>
-                                        <td colspan="3">
-                                            <div class="rowGroup" {if condition="!$row['source_batch']"}style="display:none;"{/if}>
-                                                <label class=" control-label spacing" ><span style="color: red">*</span>入选名单的文件号及批次</label>
-                                                <input type="text" class="form-control" id="source_batch" name="source_batch" value="{$row.source_batch}"/>
-                                            </div>
-                                        </td>
-                                    </tr>
-                                    <tr>
-                                        <td colspan="3">
-                                            <div class="rowGroup col-sm-6" {if condition="!$row['source_city']"}style="display:none;"{/if}>
-                                                <label class="control-label spacing"><span style="color: red">*</span>入选来源地级市</label>
-                                                <select class="form-control" id="source_city" name="source_city" value="{$row['source_city']}">
-                                                    <option value="">{$row.sourceCityName}</option>
-                                                </select>
-                                             </div>
-                                            <div class="rowGroup col-sm-6" {if condition="!$row['source_county']"}style="display:none;"{/if}>
-                                                <label class="control-label spacing"><span style="color: red">*</span>入选来源县市区</label>
-                                                <select class="form-control" id="source_county" name="source_county" value="{$row['source_county']}">
-                                                    <option value="">{$row.sourceCountyName}</option>
-                                                </select>
-                                            </div>
-                                        </td>
-                                    </tr>
-                                    <tr>
-                                        <td colspan="3">
-                                            <div class="rowGroup col-sm-6 fujian_highcert" style="display: none">
-                                                <label class=" control-label spacing" ><span style="color: red">*</span>福建省高层次人才证书发证日期</label>
-                                                <input type="text" class="form-control date" id="fujian_highcert_pubtime" name="fujian_highcert_pubtime" value="{$row.fujian_highcert_pubtime}"/>
-                                            </div>
-                                            <div class="rowGroup col-sm-6 fujian_highcert" style="display: none">
-                                                <label class=" control-label spacing" ><span style="color: red">*</span>福建省高层次人才证书有效期</label>
-                                                <input type="text" class="form-control date" id="fujian_highcert_exptime" name="fujian_highcert_exptime" value="{$row.fujian_highcert_exptime}"/>
-                                            </div>
-                                        </td>
-                                    </tr>
-                                    <tr>
-                                        <td colspan="3">
-                                            <div class="rowGroup col-sm-6 quanzhou_highcert" style="display: none">
-                                                <label class=" control-label spacing" ><span style="color: red">*</span>泉州高层次人才证书发证日期</label>
-                                                <input type="text" class="form-control date" id="quanzhou_highcert_pubtime" name="quanzhou_highcert_pubtime" value="{$row.quanzhou_highcert_pubtime}"/>
-                                            </div>
-                                            <div class="rowGroup col-sm-6 quanzhou_highcert" style="display: none">
-                                                <label class=" control-label spacing" ><span style="color: red">*</span>泉州高层次人才证书有效期</label>
-                                                <input type="text" class="form-control date" id="quanzhou_highcert_exptime" name="quanzhou_highcert_exptime" value="{$row.quanzhou_highcert_exptime}"/>
-                                            </div>
-                                        </td>
-                                    </tr>
-                                    <tr>
-                                        <td colspan="3">
-                                            <div class="rowGroup col-sm-6">
-                                                <label class="control-label spacing"><span style="color: red">*</span>人才层次</label>
-                                                <select class="form-control" id="talent_arrange" name="talent_arrange" onchange="TalentInfoInfoDlg.getLayerCatdByLayer()" value="{$row.talent_arrange}"></select>
-                                            </div>
-                                            <div class="rowGroup col-sm-6">
-                                                <label class="control-label spacing"><span style="color: red">*</span>人才条款</label>
-                                                <select class="form-control" id="talent_arrange_category" name="talent_arrange_category" onchange="TalentInfoInfoDlg.getIdentifyCondition()" value="{$row.talent_arrange_category}"></select>
-                                            </div>
-                                        </td>
-                                    </tr>
-                                    <tr>
-                                        <td colspan="2" style="overflow: inherit">
-                                            <div class="rowGroup col-sm-9">
-                                                <label class="control-label spacing"><span style="color: red">*</span>认定条件</label>
-                                                <select class="chosen" id="talent_condition" name="talent_condition" onchange="TalentInfoInfoDlg.getIdentifyNeedsFileTypes()" value="{$row.talent_condition}" style="width: 80%"></select>
-                                            </div>
-                                        </td>
-                                        <td {if condition='!$row["annual_salary"]'}style="display:none;"{/if}>
-                                            <div class="rowGroup col-sm-12">
-                                                <label class="control-label spacing"><span style="color: red">*</span>上一年度年薪(元)</label>
-                                                <div style="position:relative;">
-                                                    <input type="text" class="form-control" id="annual_salary" name="annual_salary" value="{$row.annual_salary}"/>
-                                                    <i class="control-symbol">元</i>
-                                                </div>
-                                            </div>
-                                        </td>
-                                    </tr>
-                                </table>
-                            </div>
-                        </div>
-                        <div class="panel panel-default">
-                            <div class="panel-heading" onclick="$(this).next().toggle()">个人开户银行信息</div>
-                            <div class="panel-body">
-                                <table style="width: 100%;border-collapse: collapse;" class="table table-bordered">
-                                    <tr>
-                                        <td>
-                                            <div class="rowGroup">
-                                                <label class="control-label spacing"><span style="color: red">*</span>开户银行</label>
-                                                <input type="text" class="form-control" onchange="TalentInfoInfoDlg.bankChange()" id="bank" name="bank" placeholder="XX银行" value="{$row.bank}"/>
-                                            </div>
-                                        </td>
-                                        <td>
-                                            <div class="rowGroup">
-                                                <label class="control-label spacing"><span style="color: red">*</span>银行行号</label>
-                                                <input type="text" class="form-control" id="bank_number" name="bank_number" value="{$row.bank_number}"/>
-                                            </div>
-                                        </td>
-                                        <td rowspan="2" style="width: 200%">
-                                            <table class="fileTable"></table>
-                                        </td>
-                                    </tr>
-                                    <tr>
-                                        <td>
-                                            <div class="rowGroup">
-                                                <label class="control-label spacing"><span style="color: red">*</span>开户银行网点</label>
-                                                <input type="text" class="form-control" id="bank_branch_name" name="bank_branch_name" placeholder="XX银行XX省XX市XX支行/分行/分理处" value="{$row.bank_branch_name}"/>
-                                            </div>
-                                        </td>
-                                        <td>
-                                            <div class="rowGroup">
-                                                <label class="control-label spacing"><span style="color: red">*</span>个人银行账号</label>
-                                                <input type="text" class="form-control" id="bank_account" name="bank_account"  value="{$row.bank_account}"/>
-                                            </div>
-                                        </td>
-                                    </tr>
-                                </table>
-                            </div>
-                        </div>
-                        </form>
-                        <form id="uploadForm" action="/common/api/addTalentFile" method="post" class="form-horizontal" enctype="multipart/form-data" target="hiddenIframe" style="display: none">
-                            <input type='hidden' id="fileId" name="fileId" >
-                            <input type='file' id="upload_file" name="fileUrl" style='display: none'>
-                            <input type='hidden' id="mainId" name="mainId" >
-                            <input type='hidden' id="fileTypeId" name="fileTypeId" >
-                            <input type='hidden' id="index" name="index" >
-                            <input type='hidden' id="tableIndex" name="tableIndex" >
-                            <input type='hidden' id="trIndex" name="trIndex" >
-                            <input type="hidden" name="backName" value="TalentInfoInfoDlg.callBack">
-                            <input type="type" name="type" value="1">
-                        </form>
-                        <div class="panel-heading" onclick="$(this).next().toggle()">日志</div>
-                        <table id="logTable">
-                        </table>
                     </div>
                 </div>
             </div>
         </div>
     </div>
 </div>
-</div>
 <iframe id="hiddenIframe" name="hiddenIframe" style="display: none;"></iframe>
 <!--<script src="${ctxPath}/static/modular/gate/talentInfo/talentInfo_info.js"></script>-->
 <script type="text/javascript">

+ 16 - 2
public/static/js/common/Feng.js

@@ -254,9 +254,11 @@ var Feng = {
     },
     addAjaxSelect: function (val) {
         var id = val.id;                                                            //下拉框对象的id
+        var obj = val.obj;
         var url = val.url;                                                          //请求地址
         var displayCode = val.displayCode;                                          //下拉框实际值名称
         var displayName = val.displayName;                                          //下拉框显示值名称
+        var bindData = val.bindData;
         var type = val.type;                                                        //请求方式 GET 或者 POST, 默认POST
         var async = val.async;                                                      //同步方式 {异步--falae, 同步--true}, 默认为同步
         if (async == null){
@@ -265,20 +267,32 @@ var Feng = {
         if (type==null){
             type == "POST";
         }
-        var select = $("#"+id);
+        var select = typeof id !="undefined"?$("#"+id):$(obj);
         select.empty();
         var ajax = new $ax(url, function(data){
             var length = data.length;
             var html = "<option value=''>---请选择---</option>";
             for(var i=0; i<length; i++){
                 if (length == 1){
-                    html = html+  "<option value=\""+data[i][displayCode]+"\">"+data[i][displayName]+"</option>";
+                    if(typeof bindData !="undefined" && bindData){
+                        html = html+  "<option value=\""+data[i][displayCode]+"\" data-"+bindData+"=\""+data[i][bindData]+"\">"+data[i][displayName]+"</option>";
+                    }else{
+                        html = html+  "<option value=\""+data[i][displayCode]+"\">"+data[i][displayName]+"</option>";
+                    }
                 }else{
+                    if(typeof bindData !="undefined" && bindData){
+                	if(data[i][displayCode]==select.attr("defval")){
+                        html += "<option selected='selected' value=\""+data[i][displayCode]+"\" data-"+bindData+"=\""+data[i][bindData]+"\">"+data[i][displayName]+"</option>";
+                	}else{
+                		html += "<option value=\""+data[i][displayCode]+"\" data-"+bindData+"=\""+data[i][bindData]+"\">"+data[i][displayName]+"</option>";
+                	}
+                    }else{
                 	if(data[i][displayCode]==select.attr("defval")){
                         html += "<option selected='selected' value=\""+data[i][displayCode]+"\">"+data[i][displayName]+"</option>";
                 	}else{
                 		html += "<option value=\""+data[i][displayCode]+"\">"+data[i][displayName]+"</option>";
                 	}
+                    }
                 }
             }
             select.append(html);

+ 165 - 282
public/static/modular/gate/integral/integralInfo.js

@@ -2,7 +2,7 @@
  * 初始化人才认定申报详情对话框
  */
 var locked = false;
-var TalentInfoInfoDlg = {
+var IntegralInfoDlg = {
     talentInfoInfoData: {},
     validateFields: {
         source_county: {validators: {notEmpty: {message: '入选来源县市区不能为空'}}},
@@ -104,11 +104,10 @@ var TalentInfoInfoDlg = {
         }
     }
 };
-
 /**
  * 清除数据
  */
-TalentInfoInfoDlg.clearData = function () {
+IntegralInfoDlg.clearData = function () {
     this.talentInfoInfoData = {};
 }
 
@@ -118,7 +117,7 @@ TalentInfoInfoDlg.clearData = function () {
  * @param key 数据的名称
  * @param val 数据的具体值
  */
-TalentInfoInfoDlg.set = function (key, val) {
+IntegralInfoDlg.set = function (key, val) {
     var dis = $("#" + key).attr("disabled");
     if (dis == "disabled") {
         $("#" + key).removeAttr("disabled");
@@ -136,21 +135,21 @@ TalentInfoInfoDlg.set = function (key, val) {
  * @param key 数据的名称
  * @param val 数据的具体值
  */
-TalentInfoInfoDlg.get = function (key) {
+IntegralInfoDlg.get = function (key) {
     return $("#" + key).val();
 }
 
 /**
  * 关闭此对话框
  */
-TalentInfoInfoDlg.close = function () {
+IntegralInfoDlg.close = function () {
     parent.layer.close(window.parent.TalentInfo.layerIndex);
 }
 
 /**
  * 收集数据
  */
-TalentInfoInfoDlg.collectData = function () {
+IntegralInfoDlg.collectData = function () {
     this
             .set('id')
             .set('type')
@@ -218,7 +217,7 @@ TalentInfoInfoDlg.collectData = function () {
 /**
  * 验证数据
  */
-TalentInfoInfoDlg.validate = function () {
+IntegralInfoDlg.validate = function () {
     $('#integralInfoForm').data("bootstrapValidator").resetForm();
     $('#integralInfoForm').bootstrapValidator('validate');
     return $("#integralInfoForm").data('bootstrapValidator').isValid();
@@ -226,7 +225,7 @@ TalentInfoInfoDlg.validate = function () {
 /**
  * 初始化表格的列
  */
-TalentInfoInfoDlg.initFileTypeColumn = function () {
+IntegralInfoDlg.initFileTypeColumn = function () {
     return [
         {field: 'selectItem', checkbox: false, visible: false},
         {title: '名称', field: 'name', visible: true, align: 'left', valign: 'middle', width: "82%", 'class': 'uitd_showTip',
@@ -247,27 +246,26 @@ TalentInfoInfoDlg.initFileTypeColumn = function () {
                 if (value == null || value == '' || value == 'null') {
                     return '无';
                 }
-                return "<button type='button' onclick=\"TalentInfoInfoDlg.downloadFile('" + row.id + "',3)\" style='margin-right: 10px' class=\"btn btn-xs btn-primary\">" +
+                return "<button type='button' onclick=\"IntegralInfoDlg.downloadFile('" + row.id + "',3)\" style='margin-right: 10px' class=\"btn btn-xs btn-primary\">" +
                         "<i class=\"fa fa-download\"></i>下载" +
                         "</button>";
             }
         },
         {title: '操作', field: 'id', visible: true, align: 'center', valign: 'middle', width: "10%",
             formatter: function (value, row, index) {
-                return TalentInfoInfoDlg.validUploadButton(1, value, '', row.tableIndex, row.trIndex);
+                return IntegralInfoDlg.validUploadButton(1, value, '', row.tableIndex, row.trIndex);
             }
         }
     ]
 };
-
-TalentInfoInfoDlg.initFileTable = function () {
+IntegralInfoDlg.initFileTable = function () {
     var ajax = new $ax("/common/api/findCommonFileType", function (data) {
         if (data == null || data.length == 0) {
             return;
         }
         var datas = new Array();
         for (var i = 0; i < $(".fileTable").length; i++) {
-            datas.push([]);//创建空的多维数组,等下用来存每个附件表的各自的列
+            datas.push([]); //创建空的多维数组,等下用来存每个附件表的各自的列
         }
         var enterpriseTag = $("#enterprise_tag").val();
         for (var k in data["rows"]) {
@@ -311,19 +309,19 @@ TalentInfoInfoDlg.initFileTable = function () {
                     }
                     data["rows"][k].tableIndex = tableIndex;
                     data["rows"][k].trIndex = datas[tableIndex].length;
-                    datas[tableIndex].push(data["rows"][k]);//放入人才条件后面的附件表
+                    datas[tableIndex].push(data["rows"][k]); //放入人才条件后面的附件表
                 } else {
                     var tableIndex = $(".fileTable").length - 1;
                     data["rows"][k].tableIndex = tableIndex;
                     data["rows"][k].trIndex = datas[tableIndex].length;
-                    datas[$(".fileTable").length - 1].push(data["rows"][k]);//没有归属,放入最后一个附件表
+                    datas[$(".fileTable").length - 1].push(data["rows"][k]); //没有归属,放入最后一个附件表
                 }
             }
         }
         for (var i = 0; i < $(".fileTable").length; i++) {
             var that = $(".fileTable").eq(i);
             that.bootstrapTable({
-                columns: TalentInfoInfoDlg.initFileTypeColumn(),
+                columns: IntegralInfoDlg.initFileTypeColumn(),
                 data: datas[i],
                 showHeader: false,
                 rowStyle: function (row, index) {
@@ -335,9 +333,9 @@ TalentInfoInfoDlg.initFileTable = function () {
                         var html = '<ul class="imgs"><li style="width: 70%;font-weight: bold;padding-top: 5px;">附件原名</li><li style="width: 10%;font-weight: bold;padding-top: 5px;">预览</li><li style="width: 20%;font-weight: bold;padding-top: 5px;">操作</li>';
                         for (var key in files) {
                             var btn = "";
-                            btn = TalentInfoInfoDlg.validUploadButton(2, data[k].id, files[key].id, i, k);
+                            btn = IntegralInfoDlg.validUploadButton(2, data[k].id, files[key].id, i, k);
                             var sn = files[key].url.lastIndexOf(".");
-                            var suffix = files[key].ext;//files[key].url.substring(sn + 1, files[key].url.length);
+                            var suffix = files[key].ext; //files[key].url.substring(sn + 1, files[key].url.length);
                             var imgStr = "";
                             if (suffix == "pdf" || suffix == "PDF") {
                                 imgStr = "<button type='button'  onclick=\"Feng.showPdf('" + files[key].url + "','" + files[key].id + "','" + files[key].orignName + "')\" class=\"btn btn-xs btn-danger\"><i class=\"fa fa-file-pdf-o\" aria-hidden=\"true\"></i></button>";
@@ -384,19 +382,109 @@ TalentInfoInfoDlg.initFileTable = function () {
     ajax.set(queryData);
     ajax.start();
 }
+IntegralInfoDlg.addItem = function () {
+    var html = '<table style="width:100%;border-collapse: collapse;" class="table table-bordered">' +
+            '                             <tr>' +
+            '                                 <td style="width:40px;">' +
+            '                                     <div class="rowGroup">' +
+            '                                         <label class="control-label spacing td-label">选择</label>' +
+            '                                         <input type="checkbox" name="chk[]" class="form-control"/>' +
+            '                                 </td>' +
+            '                                 <td>' +
+            '                                     <div class="rowGroup">' +
+            '                                         <label class=" control-label spacing td-label"><span style="color: red">*</span>项目类别</label>' +
+            '                                         <select class="form-control" name="projectType[]" value="" onchange="IntegralInfoDlg.onProjectTypeChange(this);">' +
+            '                                             <option value="">请选择</option>' +
+            '                                             <option value="1">基础分</option>' +
+            '                                             <option value="2">贡献分</option>' +
+            '                                             <option value="3">资历分</option>' +
+            '                                         </select>' +
+            '                                     </div>' +
+            '                                 </td>' +
+            '                                 <td>' +
+            '                                     <div class="rowGroup">' +
+            '                                         <label class=" control-label spacing td-label"><span style="color: red">*</span>积分项目</label>' +
+            '                                         <select class="form-control" name="projectId[]" value="" onchange="IntegralInfoDlg.onProjectChange(this);">' +
+            '                                             <option value="">请选择</option>' +
+            '                                         </select>' +
+            '                                     </div>' +
+            '                                 </td>' +
+            '                                 <td>' +
+            '                                     <div class="rowGroup">' +
+            '                                         <label class=" control-label spacing td-label"><span style="color: red">*</span>积分标准</label>' +
+            '                                         <select class="form-control" name="item_id[]" value="" onchange="IntegralInfoDlg.onItemChange(this);">' +
+            '                                             <option value="">请选择</option>' +
+            '                                         </select>' +
+            '                                     </div>' +
+            '                                 </td>' +
+            '                                 <td>' +
+            '                                     <div class="rowGroup">' +
+            '                                         <label class="control-label spacing td-label"><span style="color: red">*</span>数额<span class="unit"></span></label>' +
+            '                                         <input type="text" class="form-control" name="amount[]" value=""/>' +
+            '                                     </div>' +
+            '                                 </td>' +
+            '                             </tr>' +
+            '                             <tr>' +
+            '                                 <td colspan="5">' +
+            '                                     <table class="fileTable"></table>' +
+            '                                 </td>' +
+            '                             </tr>' +
+            '                         </table>';
+    $("#toolbar").before(html);
+}
+IntegralInfoDlg.deleteItem = function () {
+    var len = $("input[name='chk[]']:checked").length;
+    if (len == 0) {
+        Feng.info("请选择要移除的项目");
+    }
+    for (var i = 0; i < len; i++) {
+        $("input[name='chk[]']:checked").eq(i).parents("table").remove();
+    }
+}
+IntegralInfoDlg.onProjectTypeChange = function (obj) {
+    var type = $(obj).val();
+    var projectObj = $(obj).parents("table").find("select[name='projectId[]']")
+    Feng.addAjaxSelect({
+        "obj": projectObj,
+        "displayCode": "id",
+        "displayName": "name",
+        "type": "GET",
+        "url": "/common/api/getIntegralProjectsByType/type/" + type
+    });
+}
+IntegralInfoDlg.onProjectChange = function (obj) {
+    var projectId = $(obj).val();
+    var itemObj = $(obj).parents("table").find("select[name='item_id[]']")
+    Feng.addAjaxSelect({
+        "obj": itemObj,
+        "displayCode": "id",
+        "displayName": "name",
+        "bindData": "unit",
+        "type": "GET",
+        "url": "/common/api/getIntegralItemsByProject/projectId/" + projectId
+    });
+}
+IntegralInfoDlg.onItemChange = function (obj) {
+    var unit = $(obj).find("option:selected").data("unit");
+    if (typeof unit != "undefined" && unit) {
+        $(obj).parents("table").find(".unit").html("(" + unit + ")");
+    } else {
+        $(obj).parents("table").find(".unit").html("");
+    }
+}
 
 /**
  * 提交添加
  */
-TalentInfoInfoDlg.addSubmit = function () {
+IntegralInfoDlg.addSubmit = function () {
     this.clearData();
     this.collectData();
-    /*if (!TalentInfoInfoDlg.validate()) {
+    /*if (!IntegralInfoDlg.validate()) {
      return;
      }*/
     var id = $('#id').val();
     if (id != null && id != '') {
-        if (!TalentInfoInfoDlg.validateIsEdit())
+        if (!IntegralInfoDlg.validateIsEdit())
             return;
     }
     $("select").each(function () {
@@ -411,9 +499,9 @@ TalentInfoInfoDlg.addSubmit = function () {
 }
 
 //回调
-TalentInfoInfoDlg.infoCallback = function (data) {
+IntegralInfoDlg.infoCallback = function (data) {
     locked = false;
-    TalentInfoInfoDlg.setNoChangeField();
+    IntegralInfoDlg.setNoChangeField();
     Feng.info(data.msg);
     if (data.code == 200) {
         window.parent.TalentInfo.table.refresh();
@@ -424,12 +512,11 @@ TalentInfoInfoDlg.infoCallback = function (data) {
     return;
 }
 
-TalentInfoInfoDlg.getLayerCatdByLayer = function () {
+IntegralInfoDlg.getLayerCatdByLayer = function () {
     $("#talent_condition").parents(".table").find(".fileTable").find("tbody").html("");
     $("#talent_condition").html("<option>---请选择---</option>");
     $("#annual_salary").parents("td").css("display", "none");
     $('#integralInfoForm').bootstrapValidator('removeField', "annual_salary");
-
     var level = $("#talent_arrange").val();
     Feng.addAjaxSelect({
         "id": "talent_arrange_category",
@@ -444,7 +531,7 @@ TalentInfoInfoDlg.getLayerCatdByLayer = function () {
 /**
  * 获取人才认定
  */
-TalentInfoInfoDlg.getIdentifyCondition = function () {
+IntegralInfoDlg.getIdentifyCondition = function () {
     $("#talent_condition").parents(".table").find(".fileTable").find("tbody").html("");
     $("#annual_salary").parents("td").css("display", "none");
     $('#integralInfoForm').bootstrapValidator('removeField', "annual_salary");
@@ -461,11 +548,10 @@ TalentInfoInfoDlg.getIdentifyCondition = function () {
     $("#talent_condition").trigger('chosen:updated');
 }
 
-TalentInfoInfoDlg.getIdentifyNeedsFileTypes = function () {
+IntegralInfoDlg.getIdentifyNeedsFileTypes = function () {
     $("#talent_condition").parents(".table").find(".fileTable").find("tbody").html("");
     $("#annual_salary").parents("td").css("display", "none");
     $('#integralInfoForm').bootstrapValidator('removeField', "annual_salary");
-
     var source = $("#source").val();
     if (source == "" || typeof source == "undefined") {
         layer.alert("请先选择申报来源");
@@ -473,9 +559,9 @@ TalentInfoInfoDlg.getIdentifyNeedsFileTypes = function () {
         $("#talent_condition").trigger('chosen:updated');
         return;
     }
-    TalentInfoInfoDlg.ajaxGetConditionFile(source);
+    IntegralInfoDlg.ajaxGetConditionFile(source);
 }
-TalentInfoInfoDlg.ajaxGetConditionFile = function (source) {
+IntegralInfoDlg.ajaxGetConditionFile = function (source) {
     var condition = $("#talent_condition option:selected").val();
     if (condition != "") {
         var ajax = new $ax("/common/api/getTalentCondtionUploadFile", function (data) {
@@ -514,8 +600,8 @@ TalentInfoInfoDlg.ajaxGetConditionFile = function (source) {
                 if (filetype.must == 2) {
                     name = '<i class="fa fa-paste"></i>' + filetype.name;
                 }
-                var uploadbtn = TalentInfoInfoDlg.validUploadButton(1, filetype.id, '', tableIndex, key);
-                var templateUrl = '<button type="button" onclick="TalentInfoInfoDlg.downloadFile("' + filetype.id + '",3)" style="margin-right: 10px" class="btn btn-xs btn-primary">\n\
+                var uploadbtn = IntegralInfoDlg.validUploadButton(1, filetype.id, '', tableIndex, key);
+                var templateUrl = '<button type="button" onclick="IntegralInfoDlg.downloadFile("' + filetype.id + '",3)" style="margin-right: 10px" class="btn btn-xs btn-primary">\n\
 <i class=\"fa fa-download\"></i>下载""</button>"';
                 html += '<tr data-index="' + key + '">\n\
                                 <td class="uitd_showTip" style="text-align: center; vertical-align: middle; width: 30%; ">' + name + '</td> \n\
@@ -523,12 +609,11 @@ TalentInfoInfoDlg.ajaxGetConditionFile = function (source) {
                                 <td class="uitd_showTip" style="text-align: center; vertical-align: middle; width: 52%; ">' + filetype.description + '</td> \n\
                                 <td style="text-align: center; vertical-align: middle; width: 10%; ">' + uploadbtn + '</td> </tr></tr>';
                 html += '<tr class="detail-view"><td colspan="5"><ul class="imgs"><li style="width: 70%;font-weight: bold;padding-top: 5px;">附件原名</li><li style="width: 10%;font-weight: bold;padding-top: 5px;">预览</li><li style="width: 20%;font-weight: bold;padding-top: 5px;">操作</li>';
-
                 for (var k in filetype.files) {
                     var file = filetype.files[k];
-                    var btn = TalentInfoInfoDlg.validUploadButton(2, filetype.id, file.id, tableIndex, key);
+                    var btn = IntegralInfoDlg.validUploadButton(2, filetype.id, file.id, tableIndex, key);
                     var sn = file.url.lastIndexOf(".");
-                    var suffix = file.ext;//file.url.substring(sn + 1, file.url.length);
+                    var suffix = file.ext; //file.url.substring(sn + 1, file.url.length);
                     var imgStr = "";
                     if (suffix == "pdf" || suffix == "PDF") {
                         imgStr = "<button type='button'  onclick=\"Feng.showPdf('" + file.url + "','" + file.id + "','" + file.orignName + "')\" class=\"btn btn-xs btn-danger\"><i class=\"fa fa-file-pdf-o\" aria-hidden=\"true\"></i></button>";
@@ -562,7 +647,7 @@ TalentInfoInfoDlg.ajaxGetConditionFile = function (source) {
     }
 }
 
-TalentInfoInfoDlg.bankChange = function () {
+IntegralInfoDlg.bankChange = function () {
     var bank = $("#bank").val();
     if ($.trim(bank) == '中国工商银行') {
         $("#bank_number").val('102391050013');
@@ -571,7 +656,7 @@ TalentInfoInfoDlg.bankChange = function () {
     }
 }
 
-TalentInfoInfoDlg.changeStudyAbroad = function () {
+IntegralInfoDlg.changeStudyAbroad = function () {
     var is_abroad = $("#study_abroad").val();
     if (is_abroad == 1) {
         $("#abroad_school").parent().css("display", "block");
@@ -590,7 +675,7 @@ TalentInfoInfoDlg.changeStudyAbroad = function () {
 /**
  * 加载市
  */
-TalentInfoInfoDlg.afterSelectProvince = function () {
+IntegralInfoDlg.afterSelectProvince = function () {
     var province = $("#province").val();
     $("#city").empty();
     $("#county").empty();
@@ -608,7 +693,7 @@ TalentInfoInfoDlg.afterSelectProvince = function () {
 /**
  * 加载县
  */
-TalentInfoInfoDlg.afterSelectCity = function () {
+IntegralInfoDlg.afterSelectCity = function () {
     var city = $("#city").val();
     $("#county").empty();
     if (city == null || city == '') {
@@ -623,203 +708,8 @@ TalentInfoInfoDlg.afterSelectCity = function () {
     });
 }
 
-TalentInfoInfoDlg.isAgeChecked = false;
-TalentInfoInfoDlg.birthdayChange = function () {
-    let birthday = parseInt($("#birthday").val().substring(0, 4));
-    let currentYear = parseInt(new Date().getFullYear());
-    let age = currentYear - (isNaN(birthday) ? 0 : birthday);
-    let option = $("[data-rel=birthday]");
-    let limitAge = option.data("option");
-    if (age >= limitAge) {
-        option.css("display", "table-row");
-        option.next("tr.detail-view").css("display", "table-row");
-        if (!TalentInfoInfoDlg.isAgeChecked) {
-            layer.alert("由于您的年龄大于70岁(含),要求提供人社局的允许申报的批文,请线下前往人社局办理。如已办理,请将该批文作为附件上传至对应附件栏中。");
-            TalentInfoInfoDlg.isAgeChecked = true;
-            return false;
-        }
-    } else {
-        TalentInfoInfoDlg.isAgeChecked = false;
-        option.css("display", "none");
-        option.next("tr.detail-view").css("display", "none");
-    }
-    return true;
-}
-TalentInfoInfoDlg.initBirthday = function () {
-    let birthday = parseInt($("#birthday").val().substring(0, 4));
-    let currentYear = parseInt(new Date().getFullYear());
-    let age = currentYear - (isNaN(birthday) ? 0 : birthday);
-    let option = $("[data-rel=birthday]");
-    let isFileExists = option.next("tr.detail-view").find("ul.imgs").find("li").length > 3 ? true : false;
-    let limitAge = option.data("option");
-    if (!isNaN(birthday)) {
-        if (age >= limitAge && isFileExists) {
-            TalentInfoInfoDlg.isAgeChecked = true;
-        }
-        TalentInfoInfoDlg.birthdayChange();
-    }
-}
-
-
-TalentInfoInfoDlg.talentTypeChange = function () {
-    var talent_type = $("#talent_type").val();
-    //$("#tax_insurance_month").val("").parent().css("display", "none");
-    //$("#labor_contract_rangetime").val("").parent().css("display", "none");
-    $(".talentType1-2").css("display", "none");
-    $(".talentType3").css("display", "none");
-    var text = "";
-    switch (talent_type) {
-        case "1":
-            TalentInfoInfoDlg.talentTypeOneTwo = true;
-            $("#tipsBlock").css('display', 'block');
-            $("#typeTips").html("含经晋江市认定且还在晋江市就业创业的人才,或在晋江市就业创业但未曾申报过晋江市现代产业体系人才的人才。");
-            //$("#desc_talent_type").html("请上传社会保险或个人所得税缴费佐证材料");
-            $(".talentType1-2").css("display", "table-row");
-            $("#talentType_first").css('display', "none");
-            $('#integralInfoForm').bootstrapValidator('addField', "tax_insurance_month", {
-                validators: {
-                    notEmpty: {message: '在我市缴交社会保险或个人所得税月份不能为空'}
-                }
-            });
-            $('#integralInfoForm').bootstrapValidator('addField', "labor_contract_rangetime", {validators: {notEmpty: {message: '劳动合同起止时间'}}});
-            $('#integralInfoForm').bootstrapValidator('addField', "salary_pay_way", {validators: {notEmpty: {message: '请选择工资发放渠道'}}});
-            $('#integralInfoForm').bootstrapValidator('addField', "salary_pay_month", {validators: {notEmpty: {message: '请选择工资发放月份'}}});
-            if (TalentInfoInfoDlg.talentTypeFlag) {
-                TalentInfoInfoDlg.talentTypeFlag = false;
-                $('#integralInfoForm').bootstrapValidator('removeField', "pre_import_type");
-            }
-            text = $("#fst_work_time").length > 0 ? $("#fst_work_time").prev("label").html().replace(/首次/, "近三年") : "";
-            $("#come_in_jin").length > 0 ? $("#come_in_jin").css('display', 'table-row') : "";
-            $("#come_in_jin_str").length > 0 ? $("#come_in_jin_str").css('display', 'table-cell') : "";
-            break;
-        case "2":
-            TalentInfoInfoDlg.talentTypeOneTwo = true;
-            $("#tipsBlock").css('display', 'block');
-            $("#typeTips").html("含本办法出台后首次从晋江市以外引进认定的人才,或者流出晋江市满3年后又返回晋江市就业创业(不含企业集团内部人员调动)的人才。")
-            //$("#desc_talent_type").html("请上传社会保险或个人所得税缴费佐证材料与来我市前工作情况证明,例如原工作单位出具的工作证明、离职证明或原创(领)办企业的营业执照复印件、经市场监管部门备案的公司章程复印件等证明材料");
-            $(".talentType1-2").css("display", "table-row");
-            $("#talentType_first").css('display', "inline");
-            $('#integralInfoForm').bootstrapValidator('addField', "tax_insurance_month", {
-                validators: {
-                    notEmpty: {message: '在我市缴交社会保险或个人所得税月份不能为空'}
-                }
-            });
-            $('#integralInfoForm').bootstrapValidator('addField', "labor_contract_rangetime", {validators: {notEmpty: {message: '劳动合同起止时间'}}});
-            $('#integralInfoForm').bootstrapValidator('addField', "salary_pay_way", {validators: {notEmpty: {message: '请选择工资发放渠道'}}});
-            $('#integralInfoForm').bootstrapValidator('addField', "salary_pay_month", {validators: {notEmpty: {message: '请选择工资发放月份'}}});
-            if (TalentInfoInfoDlg.talentTypeFlag) {
-                TalentInfoInfoDlg.talentTypeFlag = false;
-                $('#integralInfoForm').bootstrapValidator('removeField', "pre_import_type");
-            }
-            text = $("#fst_work_time").length > 0 ? $("#fst_work_time").prev("label").html().replace(/近三年/, "首次") : "";
-            $("#come_in_jin").length > 0 ? $("#come_in_jin").css('display', 'table-row') : "";
-            $("#come_in_jin_str").length > 0 ? $("#come_in_jin_str").css('display', 'none') : "";
-            break;
-        case "3":
-            TalentInfoInfoDlg.talentTypeFlag = true;
-            $("#tipsBlock").css('display', 'block');
-            $("#typeTips").html("含已经与晋江市用人单位达成就业意向且签订预引进意向合作协议(合同)的人才,或拟来我市创业且提交企业名称预先核准的人才。")
-            //$("#desc_talent_type").html("请先提供意向合作协议(合同)或企业名称预先核准材料,落地我市后再补齐上述材料");
-            $(".talentType3").css("display", "table-row");
-            $("#talentType_first").css('display', "none");
-            $('#integralInfoForm').bootstrapValidator('addField', "pre_import_type", {validators: {notEmpty: {message: '请选择预引进类型'}}});
-            if (TalentInfoInfoDlg.talentTypeOneTwo) {
-                TalentInfoInfoDlg.talentTypeOneTwo = false;
-                $('#integralInfoForm').bootstrapValidator('removeField', "labor_contract_rangetime");
-                $('#integralInfoForm').bootstrapValidator('removeField', "tax_insurance_month");
-                $('#integralInfoForm').bootstrapValidator('removeField', "salary_pay_way");
-                $('#integralInfoForm').bootstrapValidator('removeField', "salary_pay_month");
-            }
-            text = $("#fst_work_time").length > 0 ? $("#fst_work_time").prev("label").html().replace(/近三年/, "首次") : "";
-            $("#come_in_jin").length > 0 ? $("#come_in_jin").css('display', 'none') : "";
-            $("#come_in_jin_str").length > 0 ? $("#come_in_jin_str").css('display', 'none') : "";
-            break;
-        default:
-            $("#tipsBlock").css('display', 'none');
-            text = $("#fst_work_time").length > 0 ? $("#fst_work_time").prev("label").html().replace(/近三年/, "首次") : "";
-            break;
-    }
-    $("#fst_work_time").prev("label").html(text);
-    for (var i = 0; i < $("[data-rel=talent_type]").length; i++) {
-        let option = $("[data-rel=talent_type]").eq(i);
-        let options = option.data("option").toString().split(",");
-        if (options.indexOf(talent_type) > -1) {
-            option.css("display", "table-row");
-            option.next("tr.detail-view").css("display", "table-row");
-        } else {
-            option.css("display", "none");
-            option.next("tr.detail-view").css("display", "none");
-        }
-    }
-
-}
-
-
-TalentInfoInfoDlg.sourceChange = function () {
-    var source = $("#source").val();
-    $("#source_batch").val("").parent().css("display", "none");
-    $(".fujian_highcert").css("display", "none");
-    $(".quanzhou_highcert").css("display", "none");
-    $("#source_city").val("").parent().css("display", "none");
-    $("#source_county").val("").parent().css("display", "none");
-    $('#integralInfoForm').bootstrapValidator('removeField', "source_batch");
-    $('#integralInfoForm').bootstrapValidator('removeField', "fujian_highcert_pubtime");
-    $('#integralInfoForm').bootstrapValidator('removeField', "fujian_highcert_exptime");
-    $('#integralInfoForm').bootstrapValidator('removeField', "quanzhou_highcert_pubtime");
-    $('#integralInfoForm').bootstrapValidator('removeField', "quanzhou_highcert_exptime");
-    $('#integralInfoForm').bootstrapValidator('removeField', "source_city");
-    $('#integralInfoForm').bootstrapValidator('removeField', "source_county");
-    switch (source) {
-        case "1":
-        case "3":
-            $("#source_batch").parent().css("display", "block");
-            $(".fujian_highcert").css("display", "block");
-            $('#integralInfoForm').bootstrapValidator('addField', "source_batch", {validators: {notEmpty: {message: '申报来源批次不能为空'}}});
-            $('#integralInfoForm').bootstrapValidator('addField', "fujian_highcert_pubtime", {validators: {notEmpty: {message: '福建省高层次人才证书发证日期不能为空'}}});
-            $('#integralInfoForm').bootstrapValidator('addField', "fujian_highcert_exptime", {validators: {notEmpty: {message: '福建省高层次人才证书有效期不能为空'}}});
-            break;
-        case "2":
-        case "4":
-            $("#source_batch").parent().css("display", "block");
-            $(".quanzhou_highcert").css("display", "block");
-            $('#integralInfoForm').bootstrapValidator('addField', "source_batch", {validators: {notEmpty: {message: '申报来源批次不能为空'}}});
-            $('#integralInfoForm').bootstrapValidator('addField', "quanzhou_highcert_pubtime", {validators: {notEmpty: {message: '泉州高层次人才证书发证日期不能为空'}}});
-            $('#integralInfoForm').bootstrapValidator('addField', "quanzhou_highcert_exptime", {validators: {notEmpty: {message: '泉州高层次人才证书有效期不能为空'}}});
-            break;
-    }
-    if (source == 3) {
-        //显示入选来源地级市除泉
-        $("#source_city").parent().css("display", "block");
-        Feng.addAjaxSelect({
-            "id": "source_city",
-            "displayCode": "code",
-            "displayName": "name",
-            "type": "GET",
-            "url": "/common/tool/findChildAreaByCode/code/35/no/350500"
-        });
-        $('#integralInfoForm').bootstrapValidator('addField', "source_city", {validators: {notEmpty: {message: '入选来源地级市不能为空'}}});
-    }
-    if (source == 4) {
-        //显示入选来源县市区除晋
-        $("#source_county").parent().css("display", "block");
-        Feng.addAjaxSelect({
-            "id": "source_county",
-            "displayCode": "code",
-            "displayName": "name",
-            "type": "GET",
-            "url": "/common/tool/findChildAreaByCode/code/3505/no/350582"
-        });
-        $('#integralInfoForm').bootstrapValidator('addField', "source_county", {validators: {notEmpty: {message: '入选来源县市区不能为空'}}});
-    }
-    if (source != 5) {
-        $("#talent_condition").parents(".table").find(".fileTable").find("tbody").html("");
-    } else {
-        TalentInfoInfoDlg.ajaxGetConditionFile(source);
-    }
-}
-
 //校验是否保存基础信息
-TalentInfoInfoDlg.validId = function () {
+IntegralInfoDlg.validId = function () {
     var id = $("#id").val();
     if (id != null && id != '') {
         $("#fileLi").removeAttr("style");
@@ -828,22 +718,22 @@ TalentInfoInfoDlg.validId = function () {
     }
 }
 //选择附件并显示附件名
-TalentInfoInfoDlg.checkFile = function (content, fileTypeId, fileId, tableIndex, trIndex) {
-    if (!TalentInfoInfoDlg.validateIsEdit())
+IntegralInfoDlg.checkFile = function (content, fileTypeId, fileId, tableIndex, trIndex) {
+    if (!IntegralInfoDlg.validateIsEdit())
         return;
     $("#upload_file").unbind("change");
     $("#upload_file").change(function () {
         if (!Feng.chkFileInvalid(this.files[0], 5, 10))
             return;
-        TalentInfoInfoDlg.upload(fileTypeId, fileId, tableIndex, trIndex);
+        IntegralInfoDlg.upload(fileTypeId, fileId, tableIndex, trIndex);
     });
     $('#upload_file').val("");
     $('#upload_file').click();
 }
 //上传附件
-TalentInfoInfoDlg.upload = function (fileTypeId, fileId, tableIndex, trIndex) {
+IntegralInfoDlg.upload = function (fileTypeId, fileId, tableIndex, trIndex) {
     var id = $("#id").val();
-    if (!TalentInfoInfoDlg.validateIsEdit())
+    if (!IntegralInfoDlg.validateIsEdit())
         return;
     if (fileId != null && fileId != 'null') {
         $("#fileId").val(fileId)
@@ -859,8 +749,8 @@ TalentInfoInfoDlg.upload = function (fileTypeId, fileId, tableIndex, trIndex) {
     $("#uploadForm").submit();
 }
 //删除附件
-TalentInfoInfoDlg.deleteFile = function (id, state) {
-    if (!TalentInfoInfoDlg.validateIsEdit())
+IntegralInfoDlg.deleteFile = function (id, state) {
+    if (!IntegralInfoDlg.validateIsEdit())
         return;
     var operation = function () {
         var ajax = new $ax(Feng.ctxPath + "/common/api/deleteFile", function (data) {
@@ -884,8 +774,8 @@ TalentInfoInfoDlg.deleteFile = function (id, state) {
 /**
  * 提交审核
  */
-TalentInfoInfoDlg.submitToCheck = function () {
-    /*if (!TalentInfoInfoDlg.validate()) {
+IntegralInfoDlg.submitToCheck = function () {
+    /*if (!IntegralInfoDlg.validate()) {
      return;
      }*/
     var id = $("#id").val();
@@ -893,17 +783,17 @@ TalentInfoInfoDlg.submitToCheck = function () {
      Feng.info("请先填写基础信息并上传附件");
      return;
      }*/
-    if (!TalentInfoInfoDlg.validateIsEdit())
+    if (!IntegralInfoDlg.validateIsEdit())
         return;
     var operation = function () {
-        TalentInfoInfoDlg.clearData();
-        TalentInfoInfoDlg.collectData();
-        /*if (!TalentInfoInfoDlg.validate()) {
+        IntegralInfoDlg.clearData();
+        IntegralInfoDlg.collectData();
+        /*if (!IntegralInfoDlg.validate()) {
          return;
          }*/
         var id = $('#id').val();
         if (id != null && id != '') {
-            if (!TalentInfoInfoDlg.validateIsEdit())
+            if (!IntegralInfoDlg.validateIsEdit())
                 return;
         }
         $("select").each(function () {
@@ -915,15 +805,13 @@ TalentInfoInfoDlg.submitToCheck = function () {
         locked = true;
         $("#integralInfoForm").attr("action", "/enterprise/talent/submitToCheck");
         $("#integralInfoForm")[0].submit();
-
-
         return;
         var ajax = new $ax(Feng.ctxPath + "/enterprise/talent/submit", function (data) {
             if (data.code == 200) {
                 Feng.success(data.msg);
                 // $("#checkState").val(data.obj);
                 window.parent.TalentInfo.table.refresh();
-                TalentInfoInfoDlg.close();
+                IntegralInfoDlg.close();
             } else {
                 Feng.error(data.msg);
             }
@@ -936,14 +824,14 @@ TalentInfoInfoDlg.submitToCheck = function () {
     Feng.confirm("请确认基础信息已核对无误,相应附件已上传,一旦提交,无法修改", operation);
 }
 //回调
-TalentInfoInfoDlg.submitCallback = function (data) {
+IntegralInfoDlg.submitCallback = function (data) {
     locked = false;
-    TalentInfoInfoDlg.setNoChangeField();
+    IntegralInfoDlg.setNoChangeField();
     if (data.code == 200) {
         Feng.success(data.msg);
         // $("#checkState").val(data.obj);
         window.parent.TalentInfo.table.refresh();
-        TalentInfoInfoDlg.close();
+        IntegralInfoDlg.close();
     } else {
         Feng.error(data.msg);
     }
@@ -952,7 +840,7 @@ TalentInfoInfoDlg.submitCallback = function (data) {
 /**
  * 校验是否可以修改/提交审核
  */
-TalentInfoInfoDlg.validateIsEdit = function () {
+IntegralInfoDlg.validateIsEdit = function () {
     var checkState = $("#checkState").val();
     if (checkState != 0 && checkState != 8) {
         if (checkState == 16 || checkState == -1 || checkState == -2 || checkState == 7) {
@@ -981,7 +869,7 @@ TalentInfoInfoDlg.validateIsEdit = function () {
  * @param row
  * @returns {string}
  */
-TalentInfoInfoDlg.validUploadButton = function (type, fileTypeId, fileId, tableIndex, trIndex) {
+IntegralInfoDlg.validUploadButton = function (type, fileTypeId, fileId, tableIndex, trIndex) {
     var files = $("#files").val();
     files = files.split(",");
     var checkState = $("#checkState").val();
@@ -989,14 +877,14 @@ TalentInfoInfoDlg.validUploadButton = function (type, fileTypeId, fileId, tableI
     //console.log(checkState, realState);
     if (Feng.isEmptyStr(checkState) || checkState == 0 || (checkState == 8 && realState == 8) || (checkState == 11 && realState != 14) || (realState == 11 && files.indexOf(fileTypeId.toString()) != -1)) {
         if (type == 1) {          //上传
-            return "<button type='button' onclick=\"TalentInfoInfoDlg.checkFile(this," + fileTypeId + "," + null + "," + tableIndex + "," + trIndex + ")\" style='margin-right: 10px' class=\"btn btn-xs btn-info\">" +
+            return "<button type='button' onclick=\"IntegralInfoDlg.checkFile(this," + fileTypeId + "," + null + "," + tableIndex + "," + trIndex + ")\" style='margin-right: 10px' class=\"btn btn-xs btn-info\">" +
                     "<i class=\"fa fa-upload\"></i>上传" +
                     "</button>";
         } else {
-            return "<button type=\'button\' onclick=\"TalentInfoInfoDlg.checkFile(this," + fileTypeId + "," + fileId + "," + tableIndex + "," + trIndex + ")\" style=\'margin-right: 10px\' class=\"btn btn-xs btn-info\">" +
+            return "<button type=\'button\' onclick=\"IntegralInfoDlg.checkFile(this," + fileTypeId + "," + fileId + "," + tableIndex + "," + trIndex + ")\" style=\'margin-right: 10px\' class=\"btn btn-xs btn-info\">" +
                     "<i class=\"fa fa-paste\"></i>修改" +
                     "</button>" +
-                    "<button type='button' onclick=\"TalentInfoInfoDlg.deleteFile(" + fileId + ")\" class=\"btn btn-xs btn-danger\">" +
+                    "<button type='button' onclick=\"IntegralInfoDlg.deleteFile(" + fileId + ")\" class=\"btn btn-xs btn-danger\">" +
                     "<i class=\"fa fa-times\"></i>删除" +
                     "</button>";
         }
@@ -1007,14 +895,14 @@ TalentInfoInfoDlg.validUploadButton = function (type, fileTypeId, fileId, tableI
 
 
 //回调
-TalentInfoInfoDlg.callBack = function (data) {
+IntegralInfoDlg.callBack = function (data) {
     layer.close(data.obj);
     Feng.info(data.msg);
     if (data.code == 200) {
         var tableIndex = $("#tableIndex").val();
         var trIndex = $("#trIndex").val();
         var sn = data.info.lastIndexOf(".");
-        var suffix = data.ext;//data.info.substring(sn + 1, data.info.length);
+        var suffix = data.ext; //data.info.substring(sn + 1, data.info.length);
         var imgStr = "";
         if (suffix == "pdf" || suffix == "PDF") {
             imgStr = "<button type='button'  onclick=\"Feng.showPdf('" + data.info + "','" + data.id + "','" + data.orignName + "')\" class=\"btn btn-xs btn-danger\"><i class=\"fa fa-file-pdf-o\" aria-hidden=\"true\"></i></button>";
@@ -1033,19 +921,19 @@ TalentInfoInfoDlg.callBack = function (data) {
 <div style="width: 70%;">' + data.orignName + '</div>\n\
 <div style="width: 10%;">' + imgStr + '</div>\n\
 <div style="width: 20%;">\n\
-<button type="button" onclick="TalentInfoInfoDlg.checkFile(this,' + data.typeId + ',' + data.id + ',' + tableIndex + ',' + trIndex + ')" style="margin-right: 10px" class="btn btn-xs btn-info"><i class="fa fa-paste"></i>修改</button>\n\
-<button type="button" onclick="TalentInfoInfoDlg.deleteFile(' + data.id + ')" class="btn btn-xs btn-danger"><i class="fa fa-times"></i>删除</button>\n\
+<button type="button" onclick="IntegralInfoDlg.checkFile(this,' + data.typeId + ',' + data.id + ',' + tableIndex + ',' + trIndex + ')" style="margin-right: 10px" class="btn btn-xs btn-info"><i class="fa fa-paste"></i>修改</button>\n\
+<button type="button" onclick="IntegralInfoDlg.deleteFile(' + data.id + ')" class="btn btn-xs btn-danger"><i class="fa fa-times"></i>删除</button>\n\
 </div></li></ul>';
             $(".fileTable").eq(tableIndex).find("tr[data-index='" + trIndex + "']").next("tr.detail-view").find(".imgs").append(html);
         }
     }
 }
-TalentInfoInfoDlg.downloadFile = function (id, type) {
+IntegralInfoDlg.downloadFile = function (id, type) {
     window.location.href = Feng.ctxPath + "/api/common/downloadFile?id=" + id + "&type=" + type;
 }
 
 //设置不可修改的字段
-TalentInfoInfoDlg.setNoChangeField = function () {
+IntegralInfoDlg.setNoChangeField = function () {
     var checkState = $("#checkState").val();
     var fields = $("#fields").val();
     var realState = $("#realState").val();
@@ -1097,7 +985,7 @@ function async_padding(card_number, card_type) {
     }
 }
 $(function () {
-    //Feng.initValidatorTip("integralInfoForm", TalentInfoInfoDlg.validateFields);
+//Feng.initValidatorTip("integralInfoForm", IntegralInfoDlg.validateFields);
     var id = $("#id").val();
     var checkState = $("#checkState").val();
     //批量加载字典表数据
@@ -1143,7 +1031,7 @@ $(function () {
         })
     })
     if (id != null && id != '') {
-        //select初始化
+//select初始化
         $("select").each(function () {
             $(this).val($(this).attr("value")).trigger("change");
         });
@@ -1158,11 +1046,11 @@ $(function () {
     $("#nationality").val($("#nationality").attr("value"));
     $("#industry_field").val($("#industry_field").attr("value"));
     $("#province").val($("#province").attr("value"));
-    TalentInfoInfoDlg.afterSelectProvince();
+    IntegralInfoDlg.afterSelectProvince();
     $("#city").val($("#city").attr("value"));
-    TalentInfoInfoDlg.afterSelectCity();
+    IntegralInfoDlg.afterSelectCity();
     $("#county").val($("#county").attr("value"));
-    TalentInfoInfoDlg.getIdentifyCondition();
+    IntegralInfoDlg.getIdentifyCondition();
     $("#politics").val($("#politics").attr("value"));
     $("#tax_insurance_month").val($("#tax_insurance_month").attr("value"));
     $("#labor_contract_rangetime").val($("#labor_contract_rangetime").attr("value"));
@@ -1174,10 +1062,10 @@ $(function () {
     $("#fujian_highcert_pubtime").val($("#fujian_highcert_pubtime").attr("value"));
     $("#fujian_highcert_exptime").val($("#fujian_highcert_exptime").attr("value"));
     $("#talent_arrange").val($("#talent_arrange").attr("value"));
-    TalentInfoInfoDlg.getLayerCatdByLayer();
+    IntegralInfoDlg.getLayerCatdByLayer();
     $("#talent_arrange_category").val($("#talent_arrange_category").attr("value"));
-    TalentInfoInfoDlg.getIdentifyCondition();
-    TalentInfoInfoDlg.validId();
+    IntegralInfoDlg.getIdentifyCondition();
+    IntegralInfoDlg.validId();
     $("#photo").change(function (e) {
         var tag = e.target;
         var file = tag.files[0];
@@ -1189,7 +1077,7 @@ $(function () {
             $("#photoImg").attr("src", imgSrc);
         };
     });
-    TalentInfoInfoDlg.setNoChangeField();
+    IntegralInfoDlg.setNoChangeField();
     $("#talent_condition").on('chosen:ready', function (e, params) {
         $(".chosen-container-single .chosen-single").css("padding", "4px 0px 0px 4px");
     });
@@ -1217,12 +1105,7 @@ $(function () {
             }
         });
     }
-    TalentInfoInfoDlg.initFileTable();
-    var is_abroad = $("#study_abroad").val();
-    if (is_abroad == "1") {
-        TalentInfoInfoDlg.changeStudyAbroad();
-    }
-    TalentInfoInfoDlg.initBirthday();
+    IntegralInfoDlg.initFileTable();
 });