电路初审阶段完成

app/admin/controller/Talent.php

@@ -33,7 +33,12 @@ class Talent extends AdminController {
         if (in_array($info["checkState"], [TalentState::BASE_VERIFY_FAIL, TalentState::FST_SUBMIT, TalentState::BASE_VERIFY_PASS, TalentState::BASE_REVERIFY_REJECT, TalentState::BASE_REVERIFY_FAIL])) {
             return view("talentInfo_base_check", ["info" => $info]);
         } else {
-            return view("talentInfo_common_check", ["info" => $info]);
+            switch ($info["enterpriseType"]) {
+                case 1:
+                    return view("talentInfo_common_check", ["info" => $info]);
+                case 2:
+                    return view("talentInfo_common_checkIC", ["info" => $info]);
+            }
         }
     }
 
@@ -1227,6 +1232,13 @@ class Talent extends AdminController {
         $params = $this->request->param();
         $id = $params["id"];
         $talent_info = VerifyApi::getOne($id);
+        $fstLog = TalentLogApi::getFstLog($id, 1);
+        $isMix = false;
+        if ($fstLog["state"] == TalentState::SCND_SAVE) {
+            //初次提交是待初审状态，则为新的混合基础信息和人才认证信息的申报
+            $isMix = true;
+        }
+        $enterprise = \app\common\model\Enterprise::findOrEmpty($talent_info["enterprise_id"]);
         if ($talent_info) {
             $checkState = $talent_info["checkState"];
 // 0正在填写 1保存未提交 2已提交未审核 3已审核 4驳回 5基审复核通过 6基审复核驳回 7基审复核失败 8保存补充材料未提交 9提交补充材料进入初审 10初审通过 11初审驳回 12部门审核通过 13部门审核驳回 14复核通过 15复核驳回 16复核失败
@@ -1234,7 +1246,6 @@ class Talent extends AdminController {
             if (in_array($checkState, [TalentState::FST_SUBMIT, TalentState::BASE_VERIFY_PASS, TalentState::SCND_SUBMIT, TalentState::FST_VERIFY_PASS, TalentState::DEPT_VERIFY_PASS])) {
                 switch ($checkState) {
                     case TalentState::FST_SUBMIT:
-                        $enterprise = \app\common\model\Enterprise::findOrEmpty($talent_info["enterprise_id"]);
                         $fields = DictApi::getTalentFields(1);
                         $field_tmp = [];
                         foreach ($fields as $key => $field) {
@@ -1276,7 +1287,6 @@ class Talent extends AdminController {
                         $process = 1;
                         break;
                     case TalentState::BASE_VERIFY_PASS:
-                        $enterprise = \app\common\model\Enterprise::findOrEmpty($talent_info["enterprise_id"]);
                         $fields = DictApi::getTalentFields(1);
                         $field_tmp = [];
                         foreach ($fields as $key => $field) {
@@ -1309,8 +1319,14 @@ class Talent extends AdminController {
                         $fields = DictApi::getTalentFields(2);
                         break;
                 }
+                if ($isMix) {
+                    if ($enterprise["type"] == 2) {
+                        $fields = DictApi::getTalentFields_IC();
+                    } else {
+                        $fields = DictApi::getTalentFields(4);
+                    }
+                }
                 if ($checkState != TalentState::FST_SUBMIT) {
-                    $enterprise = \app\common\model\Enterprise::findOrEmpty($talent_info["enterprise_id"]);
                     //$fields = DictApi::getTalentFields(2);
                     $field_tmp = [];
                     if ($fields) {
@@ -1318,16 +1334,10 @@ class Talent extends AdminController {
                             $field_tmp[] = ["key" => $key, "value" => $field];
                         }
                     }
-                    $where = [];
-                    $whr = [];
                     $condition = TalentConditionApi::getOne($talent_info["talent_condition"]);
-                    $where[] = ["project", "=", 1];
-                    $where[] = ["step", "=", 2];
-                    $where[] = ["active", "=", 1];
-                    $where[] = ["type", "=", $enterprise["type"]];
-                    $where[] = ["isConditionFile", "<>", 1];
-                    if ($process == 4) {
+                    if ($process == 4 && $enterprise["type"] == 1) {
                         $where = [];
+                        $where[] = ["delete", "=", 0];
                         $cwfts = explode(";", $condition["companyWithFileType"]);
                         foreach ($cwfts as $cwft) {
                             $_company_setting = explode(":", $cwft);
@@ -1342,6 +1352,16 @@ class Talent extends AdminController {
                             $files = [];
                         }
                     } else {
+                        $where = [];
+                        $whr = [];
+                        if (!$isMix) {
+                            $where[] = ["step", "=", 2];
+                        }
+                        $where[] = ["project", "=", 1];
+                        $where[] = ["active", "=", 1];
+                        $where[] = ["type", "=", $enterprise["type"]];
+                        $where[] = ["isConditionFile", "<>", 1];
+                        $where[] = ["delete", "=", 0];
                         if ($condition && $condition["bindFileTypes"]) {
                             $whr[] = ["id", "in", explode(",", $condition["bindFileTypes"])];
                             $files = \think\facade\Db::table("new_common_filetype")->whereOr([$where, $whr])->select();

app/admin/view/talent/talentInfo_common_checkIC.html

@@ -1,4 +1,5 @@
-@layout("/common/_container.html"){
+{extend name="layout/content"}
+{block name="content"}
 <style type="text/css">
     .spacing {
         margin-bottom: 10px;
@@ -43,185 +44,177 @@
                     <div class="tabs-container" >
                         <ul class="nav nav-tabs">
                             <li class="active"><a data-toggle="tab" href="#tab-1" aria-expanded="true">基本信息</a></li>
-                            <li id="fileLi" class=""><a data-toggle="tab" href="#tab-2" onclick="TalentInfoInfoDlg.initFileTable()"  aria-expanded="false">申报附件</a></li>
-                            <li  class="" style="float: right;"><#button name="打包下载" icon="fa-download" clickFun="TalentInfoInfoDlg.download()"/></li>
+                            <li id="fileLi" class=""><a data-toggle="tab" href="#tab-2" onclick="TalentInfoInfoDlg.initICFileTable()"  aria-expanded="false">申报附件</a></li>
+                            <li  class="" style="float: right;">                                
+                                <button type="button" class="btn btn-sm btn-primary " onclick="TalentInfoInfoDlg.download()" >
+                                    <i class="fa fa-download"></i>&nbsp;打包下载
+                                </button>
+                            </li>
                         </ul>
                     </div>
                     <div class="tab-content">
                         <div id="tab-1" class="tab-pane active">
                             <div class="panel-body" >
                                 <div class="panel panel-default">
-                                    <div class="panel-heading" onclick="$(this).next().toggle()">申报信息<span style="color: red;">(${item.year}年度)</span></div>
+                                    <div class="panel-heading" onclick="$(this).next().toggle()">申报信息<span style="color: red;">({$info.apply_year}年度)</span></div>
                                     <div class="panel-body">
-                                        <form id="talentInfoForm" class="form-horizontal" action="${ctxPath}/api/talentInfo/upsert" method="post" enctype="multipart/form-data" target="hiddenIframe">
+                                        <form id="talentInfoForm" class="form-horizontal" action="/api/talentInfo/upsert" method="post" enctype="multipart/form-data" target="hiddenIframe">
                                             <div class="col-sm-12 form-group-sm">
-                                                <input type="hidden" name="id" id="id" value="${item.id}">
-                                                <input type="hidden" name="source" id="source" value="${item.source}">
-                                                <input type="hidden" name="enterpriseId" id="enterpriseId" value="${item.enterpriseId}">
-                                                <input type="hidden" name="type" id="type" value="${item.type}">
-                                                <input type="hidden" name="checkState" id="checkState" value="${item.checkState}">
-                                                <input type="hidden" id="process" value="${item.process}">
-                                                <input type="hidden" id="companyId" value="${companyId}">
+                                                <input type="hidden" name="id" id="id" value="{$info.id}">
+                                                <input type="hidden" name="type" id="type" value="{$info.enterpriseType}">
+                                                <input type="hidden" name="checkState" id="checkState" value="{$info.checkState}">
+                                                <input type="hidden" name="enterprise_tag" id="enterprise_tag" value="{$info.enterpriseTag}">
                                                 <div class="row">
                                                     <div class="col-sm-11">
                                                         <div class="rowGroup col-sm-4">
                                                             <label class=" control-label spacing"><span style="color: red">*</span>姓名</label>
-                                                            <input type="text" class="form-control" id="name" name="name" value="${item.name}"/>
+                                                            <input type="text" class="form-control" id="name" name="name" value="{$info.name}"/>
                                                         </div>
                                                         <div class="rowGroup col-sm-4">
-                                                            <label class=" control-label spacing"><span style="color: red">*</span>性别</label>
-                                                            <select class="form-control" id="sex" name="sex" value="${item.sex}">
-                                                                <option value="">请选择</option>
-                                                                <option value="1">男</option>
-                                                                <option value="2">女</option>
+                                                            <label class=" control-label spacing"><span style="color: red">*</span>证件类别</label>
+                                                            <select class="form-control" id="card_type" name="card_type" value="{$info.card_type}">
+                                                                {eq name="info.card_type" value="1"}<option value="1">身份证</option>{/eq}
+                                                                {eq name="info.card_type" value="2"}<option value="2">通行证</option>{/eq}
+                                                                {eq name="info.card_type" value="3"}<option value="3">护照</option>{/eq}
                                                             </select>
                                                         </div>
                                                         <div class="rowGroup col-sm-4">
-                                                            <label class=" control-label spacing"><span style="color: red">*</span>国籍/地区</label>
-                                                            <input class="form-control" id="nationality" name="nationality" value="${item.nationalityName}">
+                                                            <label class=" control-label spacing"><span style="color: red">*</span>证件号码</span></label>
+                                                            <input type="text" class="form-control" id="card_number" name="card_number" value="{$info.card_number}"/>
                                                         </div>
                                                         <div class="rowGroup col-sm-4">
-                                                            <label class=" control-label spacing"><span style="color: red">*</span>籍贯</label>
-                                                            <input class="form-control" id="provinceCode" name="provinceCode" value="${item.provinceName}${item.cityName}${item.countyName}"/>
+                                                            <label class=" control-label spacing"><span style="color: red">*</span>性别</label>
+                                                            <input type="text" class="form-control" value="{eq name='info.sex' value='1'}男{else/}女{/eq}" id="sex"/>
                                                         </div>
                                                         <div class="rowGroup col-sm-4">
-                                                            <label class=" control-label spacing"><span style="color: red">*</span>民族</label>
-                                                            <input class="form-control" id="nation" name="nation" value="${item.nationName}"/>
+                                                            <label class=" control-label spacing"><span style="color: red">*</span>出生日期</label>
+                                                            <input type="text" class="form-control date" id="birthday" name="birthday" value="{$info.birthday}"/>
                                                         </div>
                                                         <div class="rowGroup col-sm-4">
-                                                            <label class=" control-label spacing"><span style="color: red">*</span>政治面貌</label>
-                                                            <input class="form-control" id="politics" name="politics" value="${item.politicsName}"/>
+                                                            <label class=" control-label spacing"><span style="color: red">*</span>国籍/地区</label>
+                                                            <input class="form-control" id="nationality" name="nationality" value="{$info.nationalityName}">
                                                         </div>
                                                         <div class="rowGroup col-sm-4">
-                                                            <label class=" control-label spacing"><span style="color: red">*</span>出生日期</label>
-                                                            <input type="text" class="form-control date" id="birthday" name="birthday" value="${item.birthday}"/>
+                                                            <label class=" control-label spacing"><span style="color: red">*</span>籍贯</label>
+                                                            <input class="form-control" id="provinceCode" name="province" value="{$info.provinceName}{$info.cityName}{$info.countyName}"/>
                                                         </div>
                                                         <div class="rowGroup col-sm-4">
-                                                            <label class=" control-label spacing"><span style="color: red">*</span>证件类别</label>
-                                                            <select type="text" class="form-control" id="cardType" name="cardType" value="${item.cardType}">
-                                                                <option value="">请选择</option>
-                                                                <option value="1">身份证</option>
-                                                                <option value="2">通行证</option>
-                                                                <option value="3">护照</option>
-                                                            </select>
+                                                            <label class=" control-label spacing"><span style="color: red">*</span>民族</label>
+                                                            <input class="form-control" id="nation" name="nation" value="{$info.nationName}"/>
                                                         </div>
                                                         <div class="rowGroup col-sm-4">
-                                                            <label class=" control-label spacing"><span style="color: red">*</span>证件号码</span></label>
-                                                            <input type="text" class="form-control" id="idCard" name="idCard" value="${item.idCard}"/>
+                                                            <label class=" control-label spacing"><span style="color: red">*</span>政治面貌</label>
+                                                            <input class="form-control" id="politics" name="politics" value="{$info.politicsName}"/>
                                                         </div>
                                                         <div class="rowGroup col-sm-4">
                                                             <label class=" control-label spacing"><span style="color: red">*</span>是否曾被相关主管部门列为失信个人</label>
-                                                            <select class="form-control" id="breakFaith" name="breakFaith" value="${item.breakFaith}">
-                                                                <option value="2">否</option>
-                                                                <option value="1">是</option>
-                                                            </select>
+                                                            <input type="text" class="form-control" id="break_faith" name="break_faith" value="{eq name='info.break_faith' value='2'}否{else/}是{/eq}"/>
                                                         </div>
                                                         <div class="rowGroup col-sm-4">
                                                             <label class=" control-label spacing"><span style="color: red">*</span>手机号码</label>
-                                                            <input type="text" class="form-control" id="phone" name="phone" value="${item.phone}"/>
+                                                            <input type="text" class="form-control" id="phone" name="phone" value="{$info.phone}"/>
                                                         </div>
                                                         <div class="rowGroup col-sm-4">
                                                             <label class=" control-label spacing"><span style="color: red">*</span>电子邮箱</label>
-                                                            <input type="text" class="form-control" id="email" name="email" value="${item.email}"/>
+                                                            <input type="text" class="form-control" id="email" name="email" value="{$info.email}"/>
                                                         </div>
                                                         <div class="rowGroup col-sm-4">
                                                             <label class=" control-label spacing"><span style="color: red">*</span>最高学历</label>
-                                                            <input class="form-control" id="highEducation" name="highEducation" value="${item.educationName}">
+                                                            <select class="form-control" id="highest_degree" name="highest_degree" value="{$info.highest_degree}">
+                                                                <option value="" selected="true">{$info.highestDegreeName}</option>
+                                                            </select>
                                                         </div>
                                                         <div class="rowGroup col-sm-4">
                                                             <label class=" control-label spacing"><span style="color: red">*</span>毕业学校</label>
-                                                            <input type="text" class="form-control" id="graduateSchool" name="graduateSchool" value="${item.graduateSchool}"/>
+                                                            <input type="text" class="form-control" id="graduate_school" name="graduate_school" value="{$info.graduate_school}"/>
                                                         </div>
                                                         <div class="rowGroup col-sm-4">
                                                             <label class=" control-label spacing"><span style="color: red">*</span>专业</label>
-                                                            <input type="text" class="form-control" id="major" name="major" value="${item.major}"/>
+                                                            <input type="text" class="form-control" id="major" name="major" value="{$info.major}"/>
                                                         </div>
                                                         <div class="rowGroup col-sm-4">
                                                             <label class=" control-label spacing">是否有留学经历</label>
-                                                            <select class="form-control" id="studyAbroad" name="studyAbroad" value="${item.studyAbroad}">
-                                                                <option value="2">否</option>
-                                                                <option value="1">是</option>
-                                                            </select>
+                                                            <input type="text" class="form-control" id="study_abroad" name="study_abroad" value="{eq name='info.study_abroad' value='2'}否{else/}是{/eq}"/>
                                                         </div>
                                                         <div class="rowGroup col-sm-4">
                                                             <label class=" control-label spacing"><span style="color: red">*</span>单位名称</label>
-                                                            <input type="text" class="form-control" id="companyName"  name="companyName" readonly="readonly" value="${item.enterpriseName}" />
+                                                            <input type="text" class="form-control" id="companyName"  name="companyName" readonly="readonly" value="{$info.enterpriseName}" />
                                                         </div>
                                                         <div class="rowGroup col-sm-4">
                                                             <label class=" control-label spacing"><span style="color: red">*</span>所属镇街</label>
-                                                            <input class="form-control" id="address" name="address" value="${item.streetName}"/>
+                                                            <input class="form-control" id="address" name="address" value="{$info.streetName}"/>
                                                         </div>
                                                         <div class="rowGroup col-sm-4">
                                                             <label class=" control-label spacing"><span style="color: red">*</span>职务</label>
-                                                            <input type="text" class="form-control" id="post" name="post" value="${item.post}"/>
+                                                            <input type="text" class="form-control" id="position" name="position" value="{$info.position}"/>
                                                         </div>
                                                         <div class="rowGroup col-sm-4">
                                                             <label class=" control-label spacing"><span style="color: red">*</span>入职时间</label>
-                                                            <input type="text" class="form-control date" id="entryTime" name="entryTime" value="${item.entryTime}"/>
-                                                        </div>
-                                                        <div class="rowGroup col-sm-4">
-                                                            <label class=" control-label spacing"><span style="color: red">*</span>工作合同开始时间</label>
-                                                            <input type="text" class="form-control date" id="startTime" name="startTime" value="${item.startTime}"/>
+                                                            <input type="text" class="form-control date" id="cur_entry_time" name="cur_entry_time" value="{$info.cur_entry_time}"/>
                                                         </div>
                                                         <div class="rowGroup col-sm-4">
-                                                            <label class=" control-label spacing"><span style="color: red">*</span>工作合同结束时间</label>
-                                                            <input type="text" class="form-control date" id="endTime" name="endTime" value="${item.endTime}"/>
+                                                            <label class=" control-label spacing"><span style="color: red">*</span>工作合同起止时间</label>
+                                                            <input type="text" class="form-control date" id="labor_contract_rangetime" name="labor_contract_rangetime" value="{$info.labor_contract_rangetime}"/>
                                                         </div>
                                                         <div class="rowGroup col-sm-4">
                                                             <label class=" control-label spacing"><span style="color: red">*</span>人才层次</label>
-                                                            <input class="form-control" id="talentArrange" name="talentArrange" value="${item.talentArrangeName}" />
+                                                            <select class="form-control" id="talent_arrange" name="talent_arrange">
+                                                                <option value="">{$info.talentArrangeName}</option>
+                                                            </select>
                                                         </div>
                                                         <div class="rowGroup col-sm-4">
                                                             <label class=" control-label spacing"><span style="color: red">*</span>认定条件</label>
-                                                            <input class="form-control" id="identifyCondition" name="identifyCondition"  value="${item.identifyConditionText}" title="${item.identifyConditionText}">
+                                                            <select class="form-control" id="talent_condition">
+                                                                <option value="{$info.talent_condition}">{$info.talentConditionName}</option>
+                                                            </select>
                                                         </div>
                                                         <div class="rowGroup col-sm-4">
                                                             <label class=" control-label spacing"><span style="color: red">*</span>认定条件名称</label>
-                                                            <input type="text" class="form-control" id="identifyConditionName" name="identifyConditionName" value="${item.identifyConditionName}" title="${item.identifyConditionName}"/>
+                                                            <input type="text" class="form-control" id="identifyConditionName" name="identifyConditionName" value="{$info.identifyConditionName}" title="{$info.identifyConditionName}"/>
                                                         </div>
                                                         <div class="rowGroup col-sm-4">
                                                             <label class=" control-label spacing"><span style="color: red">*</span>认定条件证书取得时间</label>
-                                                            <input type="text" class="form-control date" id="identifyGetTime" name="identifyGetTime" value="${item.identifyGetTime}"/>
+                                                            <input type="text" class="form-control date" id="identifyGetTime" name="identifyGetTime" value="{$info.identifyGetTime}"/>
                                                         </div>
                                                         <div class="rowGroup col-sm-4">
                                                             <label class=" control-label spacing">职称</label>
-                                                            <input type="text" class="form-control" id="title" name="title" value="${item.title}"/>
+                                                            <input type="text" class="form-control" id="title" name="title" value="{$info.title}"/>
                                                         </div>
                                                         <div class="rowGroup col-sm-4">
                                                             <label class=" control-label spacing">国家职业资格</label>
-                                                            <input type="text" class="form-control" id="professionalQualifications" name="professionalQualifications" value="${item.professionalQualifications}"/>
+                                                            <input type="text" class="form-control" id="pro_qua" name="pro_qua" value="{$info.pro_qua}"/>
                                                         </div>
                                                         <div class="rowGroup col-sm-4">
                                                             <label class=" control-label spacing"><span style="color: red">*</span>开户银行</label>
-                                                            <input type="text" class="form-control" onchange="TalentInfoInfoDlg.bankChange()" id="bank" name="bank" value="${item.bank}" placeholder="XX银行"/>
+                                                            <input type="text" class="form-control" id="bank" name="bank" value="{$info.bank}" placeholder="XX银行"/>
                                                         </div>
                                                         <div class="rowGroup col-sm-4">
                                                             <label class=" control-label spacing"><span style="color: red">*</span>开户银行网点</label>
-                                                            <input type="text" class="form-control" id="bankNetwork" name="bankNetwork" value="${item.bankNetwork}" PLACEHOLDER="XX银行XX省XX市XX支行/分行/分理处"/>
+                                                            <input type="text" class="form-control" id="bankNetwork" name="bank_branch_name" value="{$info.bank_branch_name}" PLACEHOLDER="XX银行XX省XX市XX支行/分行/分理处"/>
                                                         </div>
                                                         <div class="rowGroup col-sm-4">
                                                             <label class=" control-label spacing"><span style="color: red">*</span>银行账号</label>
-                                                            <input type="text" class="form-control" id="bankAccount" name="bankAccount" value="${item.bankAccount}"/>
+                                                            <input type="text" class="form-control" id="bank_account" name="bank_account" value="{$info.bank_account}"/>
                                                         </div>
                                                         <div class="rowGroup col-sm-8">
                                                             <label class=" control-label spacing">备注</label>
-                                                            <input type="text" class="form-control" id="description" name="description" value="${item.description}"/>
+                                                            <input type="text" class="form-control" id="description" name="description" value="{$info.description}"/>
                                                         </div>
                                                     </div>
                                                     <div class="col-sm-1">
-                                                        <img id="photoImg" src="${item.photo}"  style="height: 110px;width: 76px;">
+                                                        <img id="photoImg" src="{$info.headimgurl|getStoragePath}"  style="height:147px;width:105px;">
                                                     </div>
                                                 </div>
                                                 <div class="row">
                                                     <div class="rowGroup col-sm-12">
                                                         <label class=" control-label spacing"><span style="color: red">*</span>教育背景及工作简历</label>
-                                                        <textarea style="overflow: auto;word-break: break-all; " class="form-control" id="educationAndResume" name="educationAndResume" rows="2">${item.educationAndResume}</textarea>
+                                                        <textarea style="overflow: auto;word-break: break-all; " class="form-control" id="education" name="education" rows="2">{$info.education}</textarea>
                                                     </div>
                                                 </div>
                                                 <div class="row">
                                                     <div class="rowGroup col-sm-12">
                                                         <label class=" control-label spacing"><span style="color: red">*</span>主要业绩及取得的荣誉</label>
-                                                        <textarea style="overflow: auto;word-break: break-all; " class="form-control" id="mainHonours" name="mainHonours" rows="2">${item.mainHonours}</textarea>
+                                                        <textarea style="overflow: auto;word-break: break-all; " class="form-control" id="experience" name="experience" rows="2">{$info.experience}</textarea>
                                                     </div>
                                                 </div>
                                             </div>
@@ -233,8 +226,14 @@
                                 </div>
                             </div>
                         </div>
-                        <div id="tab-2" class="tab-pane ">
-                            <#table id="fileTable"/>
+                        <div id="tab-2" class="tab-pane ">                            
+                            <table id="fileTable" class="table-condensed" style="font-size: 10px;table-layout: fixed!important;" data-mobile-responsive="true" data-click-to-select="true">
+                                <thead>
+                                    <tr>
+                                        <th data-field="selectItem" data-checkbox="true"></th>
+                                    </tr>
+                                </thead>
+                            </table>
                         </div>
                     </div>
                 </div>
@@ -242,121 +241,7 @@
         </div>
     </div>
 </div>
-<!--审核模态框-->
-<!--<div class="modal fade " id="commonModal" tabindex="-1" role="dialog" aria-labelledby="exampleModalLabel">-->
-<!--    <div class="modal-dialog" role="document">-->
-<!--        <div class="modal-content animated flipInY">-->
-<!--            <div class="modal-header">-->
-<!--                <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>-->
-<!--                <h4 class="modal-title" id="basicModalLabel">审核</h4>-->
-<!--            </div>-->
-<!--            <div class="modal-body">-->
-<!--                <form id="commonCheckForm">-->
-<!--                    <div class="form-group">-->
-<!--                        <label for="checkState" class="control-label">审核状态</label>-->
-<!--                        <select class="form-control" id="checkStateModal" onchange="TalentInfoInfoDlg.toggledepField()">-->
-<!--                            <option value=""></option>-->
-<!--                            <option value="3">审核通过</option>-->
-<!--                            <option value="2">审核驳回</option>-->
-<!--                        </select>-->
-<!--                    </div>-->
-<!--                    <div class="form-group">-->
-<!--                        <label for="checkMsg" class="control-label">审核意见</label>-->
-<!--                        <textarea class="form-control" id="checkMsg"></textarea>-->
-<!--                    </div>-->
-<!--                </form>-->
-<!--            </div>-->
-<!--            <div class="modal-footer">-->
-<!--                <button type="button" class="btn btn-primary" onclick="TalentInfoInfoDlg.commonCheck()">提交</button>-->
-<!--                <button type="button" class="btn btn-default" data-dismiss="modal">关闭</button>-->
-<!--            </div>-->
-<!--        </div>-->
-<!--    </div>-->
-<!--</div>-->
-
-<!--&lt;!&ndash;审核模态框&ndash;&gt;-->
-<!--<div class="modal fade " id="firstModal" tabindex="-1" role="dialog" aria-labelledby="exampleModalLabel">-->
-<!--    <div class="modal-dialog modal-lg" role="document">-->
-<!--        <div class="modal-content animated flipInY">-->
-<!--            <div class="modal-header">-->
-<!--                <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>-->
-<!--                <h4 class="modal-title" id="firstModalLabel">初级审核</h4>-->
-<!--            </div>-->
-<!--            <div class="modal-body">-->
-<!--                <form id="firstCheckForm">-->
-<!--                    <div class="form-group">-->
-<!--                        <label for="checkState" class="control-label">审核状态</label>-->
-<!--                        <select class="form-control" id="checkStateFirstModal" onchange="TalentInfoInfoDlg.toggleField()">-->
-<!--                            <option value=""></option>-->
-<!--                            <option value="3">审核通过</option>-->
-<!--                            <option value="2">审核驳回</option>-->
-<!--                            <option value="-1">审核不通过</option>-->
-<!--                        </select>-->
-<!--                    </div>-->
-<!--                    <div class="form-group">-->
-<!--                        <label for="checkMsg" class="control-label">审核意见</label>-->
-<!--                        <textarea class="form-control" id="checkMsgFirst"></textarea>-->
-<!--                    </div>-->
-<!--                    <div class="form-group" id="field" style="display: none">-->
-<!--                        <label for="checkMsg" class="control-label">可修改字段</label>-->
-<!--                        <div id="field_info">-->
-<!--                            <ul>-->
-<!--                                <li style="width:10%"><input type="checkbox" value="name"><span>姓名</span></li>-->
-<!--                                <li style="width:10%"><input type="checkbox" value="sex"><span>性别</span></li>-->
-<!--                                <li style="width:10%"><input type="checkbox" value="birthday"><span>出生日期</span></li>-->
-<!--                                <li style="width:10%"><input type="checkbox" value="industryField"><span>行业领域</span></li>-->
-<!--                                <li style="width:10%"><input type="checkbox" value="address"><span>所属镇街</span></li>-->
-<!--                                <li style="width:10%"><input type="checkbox" value="nationality"><span>国籍/地区</span></li>-->
-<!--                                <li style="width:10%"><input type="checkbox" value="provinceCode"><span>籍贯省</span></li>-->
-<!--                                <li style="width:10%"><input type="checkbox" value="cityCode"><span>籍贯市</span></li>-->
-<!--                                <li style="width:10%"><input type="checkbox" value="countyCode"><span>籍贯县</span></li>-->
-<!--                                <li style="width:10%"><input type="checkbox" value="cardType"><span>证件类型</span></li>-->
-<!--                                <li style="width:10%"><input type="checkbox" value="idCard"><span>证件号码</span></li>-->
-<!--                                <li style="width:10%"><input type="checkbox" value="nation"><span>民族</span></li>-->
-<!--                                <li style="width:10%"><input type="checkbox" value="politics"><span>政治面貌</span></li>-->
-<!--                                <li style="width:20.5%"><input type="checkbox" value="entryTime"><span>本单位入职时间</span></li>-->
-<!--                                <li style="width:10%"><input type="checkbox" value="post"><span>职务</span></li>-->
-<!--                                <li style="width:20.5%"><input type="checkbox" value="startTime"><span>工作合同开始时间</span></li>-->
-<!--                                <li style="width:20.5%"><input type="checkbox" value="endTime"><span>工作合同结束时间</span></li>-->
-<!--                                <li style="width:10%"><input type="checkbox" value="highEducation"><span>最高学历</span></li>-->
-<!--                                <li style="width:10%"><input type="checkbox" value="major"><span>专业</span></li>-->
-<!--                                <li style="width:10%"><input type="checkbox" value="title"><span>职称</span></li>-->
-<!--                                <li style="width:20.5%"><input type="checkbox" value="professionalQualifications"><span>国家职业资格</span></li>-->
-<!--                                <li style="width:20.5%"><input type="checkbox" value="studyAbroad"><span>是否有留学经历</span></li>-->
-<!--                                <li style="width:10%"><input type="checkbox" value="phone"><span>手机号码</span></li>-->
-<!--                                <li style="width:10%"><input type="checkbox" value="email"><span>电子邮箱</span></li>-->
-<!--                                <li style="width:10%"><input type="checkbox" value="bank"><span>开户银行</span></li>-->
-<!--                                <li style="width:20.5%"><input type="checkbox" value="bankNetwork"><span>开户银行网点</span></li>-->
-<!--                                <li style="width:10%"><input type="checkbox" value="bankNumber"><span>银行行号</span></li>-->
-<!--                                <li style="width:10%"><input type="checkbox" value="bankAccount"><span>银行账号</span></li>-->
-<!--                                <li style="width:31%"><input type="checkbox" value="breakFaith"><span>曾被相关主管部门列为失信个人</span></li>-->
-<!--                                <li style="width:10%"><input type="checkbox" value="talentArrange"><span>人才层次</span></li>-->
-<!--                                <li style="width:10%"><input type="checkbox" value="identifyCondition"><span>认定条件</span></li>-->
-<!--                                <li style="width:20.5%"><input type="checkbox" value="identifyConditionName"><span>认定条件名称</span></li>-->
-<!--                                <li style="width:20.5%"><input type="checkbox" value="identifyGetTime"><span>认定条件证书取得时间</span></li>-->
-<!--                                <li style="width:20.5%"><input type="checkbox" value="educationAndResume"><span>教育背景及工作简历</span></li>-->
-<!--                                <li style="width:20.5%"><input type="checkbox" value="mainHonours"><span>主要业绩及取得的荣誉</span></li>-->
-<!--                            </ul>-->
-<!--                        </div>-->
-<!--                        <label for="checkMsg" class="control-label">可修改附件</label>-->
-<!--                        <div id="field_file">-->
-<!--                        </div>-->
-<!--                        <div class="form-group" style="text-align: center">-->
-<!--                            <button type="button" class="btn btn-primary" onclick="TalentInfoInfoDlg.checkAll()">全选</button>-->
-<!--                            <button type="button" class="btn btn-success" onclick="TalentInfoInfoDlg.unCheckAll()">反选</button>-->
-<!--                        </div>-->
-<!--                    </div>-->
-<!--                </form>-->
-<!--            </div>-->
-<!--            <div class="modal-footer">-->
-<!--                <button type="button" class="btn btn-primary" onclick="TalentInfoInfoDlg.firstCheck()">提交</button>-->
-<!--                <button type="button" class="btn btn-default" data-dismiss="modal">关闭</button>-->
-<!--            </div>-->
-<!--        </div>-->
-<!--    </div>-->
-<!--</div>-->
-<!--<script src="${ctxPath}/static/modular/talentIdentify/talentInfo/talentInfo_common_check.js"></script>-->
 <script type="text/javascript">
-    document.write('<script src="${ctxPath}/static/modular/talentIdentify/talentInfo/talentInfo_common_check.js?v='+(new Date()).getTime()+'"><\/script>');
+    document.write('<script src="/static/modular/talentIdentify/talentInfo/talentInfo_common_check.js?v=' + (new Date()).getTime() + '"><\/script>');
 </script>
-@}
+{/block}

app/common/api/TalentLogApi.php

@@ -30,6 +30,16 @@ class TalentLogApi {
         return TalentLog::where($where)->column("companyId");
     }
 
+    public static function getFstLog($mainId, $type) {
+        $where = [];
+        $where[] = ["mainId", "=", $mainId];
+        $where[] = ["type", "=", $type];
+        $where[] = ["active", "=", 1];
+        $where[] = ["typeFileId", "null"];
+        $log = TalentLog::where($where)->order("createTime asc")->findOrEmpty()->toArray();
+        return $log;
+    }
+
     public static function getLastLog($mainId, $type, $companyId = 0, $extra_where = []) {
         $where = [];
         $where[] = ["mainId", "=", $mainId];

app/enterprise/controller/Talent.php

@@ -105,7 +105,7 @@ class Talent extends EnterpriseController {
      * @return type
      */
     public function second(\think\Request $request) {
-        if($this->user["type"] != 1)
+        if ($this->user["type"] != 1)
             return "此入口仅供晋江市人才申报，晋江集成电路人才请使用新统一申报入口";
         $params = $request->param();
         $id = $params["id"];
@@ -389,7 +389,7 @@ class Talent extends EnterpriseController {
                 exit;
             }
 
-            $this->save($info, $this->request, TalentState::SCND_SUBMIT);
+            return $this->save($info, $this->request, TalentState::SCND_SUBMIT);
         } else if (in_array($checkState, [TalentState::BASE_VERIFY_FAIL, TalentState::BASE_REVERIFY_FAIL, TalentState::FST_VERIFY_FAIL, TalentState::REVERIFY_FAIL, TalentState::ZX_FAIL, TalentState::ANNOUNCED_REVERIFY_FAIL, TalentState::PUBLISH_FAIL])) {
             $res = ["msg" => "审核失败，不能再提交审核"];
             echo sprintf("<script>parent.TalentInfoInfoDlg.submitCallback(%s);</script>", json_encode($res));
@@ -446,7 +446,7 @@ class Talent extends EnterpriseController {
                 return json(["msg" => "请留意附件上传栏中带*号的内容均为必传项，请上传完整再提交审核"]);
             }
 
-            $this->icSave($info, $this->request, TalentState::SCND_SUBMIT);
+            return $this->icSave($info, $this->request, TalentState::SCND_SUBMIT);
         } else if (in_array($checkState, [TalentState::BASE_VERIFY_FAIL, TalentState::BASE_REVERIFY_FAIL, TalentState::FST_VERIFY_FAIL, TalentState::REVERIFY_FAIL, TalentState::ZX_FAIL, TalentState::ANNOUNCED_REVERIFY_FAIL, TalentState::PUBLISH_FAIL])) {
             return json(["msg" => "审核失败，不能再提交审核", "code" => 500]);
         }
@@ -874,30 +874,25 @@ class Talent extends EnterpriseController {
                     $upd_checklog["mainId"] = $id;
                     Db::table("new_talent_checklog")->where($whr)->save($upd_checklog);
                 }
+                $res = ["code" => 200, "msg" => $success_msg, "obj" => ["id" => $data["id"], "checkState" => $checkState]];
+                echo sprintf("<script>parent.TalentInfoInfoDlg.infoCallback(%s);</script>", json_encode($res));
+                exit();
             } else if ($checkState == TalentState::SCND_SUBMIT) {
                 $data["new_submit_time"] = date("Y-m-d H:i:s");
                 TalentModel::update($data);
                 TalentLogApi::write(1, $data["id"], $checkState, "确认提交审核", 1);
+                return json(["msg" => $success_msg, "code" => 200]);
             } else {
                 throw new ValidateException($error_msg);
             }
-
-            if ($id) {
-                $whr = [];
-                $whr[] = ["id", "in", $files];
-                Db::table("new_talent_file")->where($whr)->save(["mainId" => $id]);
-                $res = ["code" => 200, "msg" => $success_msg, "obj" => ["id" => $id, "checkState" => $checkState]];
-                $callback = $checkState == TalentState::SCND_SAVE ? "infoCallback" : "submitCallback";
-                echo sprintf("<script>parent.TalentInfoInfoDlg.{$callback}(%s);</script>", json_encode($res));
+        } catch (ValidateException $e) {
+            if ($checkState == TalentState::SCND_SAVE) {
+                $res = ["msg" => $e->getMessage()];
+                echo sprintf("<script>parent.TalentInfoInfoDlg.infoCallback(%s);</script>", json_encode($res));
                 exit();
             } else {
-                throw new ValidateException($error_msg);
+                return json(["msg" => $e->getMessage()], 500);
             }
-        } catch (ValidateException $e) {
-            $res = ["msg" => $e->getMessage()];
-            $callback = $checkState == TalentState::SCND_SAVE ? "infoCallback" : "submitCallback";
-            echo sprintf("<script>parent.TalentInfoInfoDlg.{$callback}(%s);</script>", json_encode($res));
-            exit();
         }
     }
 

app/enterprise/view/talent/ic_view.html

@@ -0,0 +1,271 @@
+{extend name="layout/content"}
+{block name="content"}
+<style type="text/css">
+    .spacing {
+        margin-bottom: 10px;
+    }
+    #talentInfoForm label {
+        font-size: 10px;
+    }
+    .has-feedback .form-control {
+        padding-right: 5px;
+    }
+    .control-label{
+        color: #337ab7;
+    }
+    .rowGroup{
+        padding-bottom: 5px;
+    }
+    .imgs li{
+        list-style: none;
+        float: left;
+        border: 1px solid #d8d1d1;
+        text-align: center;
+        height: 30px;
+    }
+</style>
+<div class="ibox float-e-margins">
+    <div class="ibox-content">
+        <div class="form-horizontal">
+            <div class="row">
+                <div class="col-sm-12" >
+                    <div class="tabs-container" >
+                        <ul class="nav nav-tabs">
+                            <li class="active"><a data-toggle="tab" href="#tab-1" aria-expanded="true">基本信息</a></li>
+                            <li id="fileLi" class=""><a data-toggle="tab" href="#tab-2" onclick="TalentInfoInfoDlg.initFileTable()"  aria-expanded="false">申报附件</a></li>
+                        </ul>
+                    </div>
+                    <div class="tab-content">
+                        <div id="tab-1" class="tab-pane active">
+                            <div class="panel-body" >
+                                <div class="panel panel-default">
+                                    <div class="panel-heading" onclick="$(this).next().toggle()">基础信息</div>
+                                    <div class="panel-body">
+                                        <form id="talentInfoForm" class="form-horizontal" action="/enterprise/talent/apply" method="post" enctype="multipart/form-data" target="hiddenIframe">
+                                            <div class="col-sm-12 form-group-sm">                                                
+                                                <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.enterpriseId}">
+                                                <input type="hidden" name="enterprise_type" id="type" value="{$row.enterpriseType}">
+                                                <input type="hidden" name="enterprise_tag" id="enterprise_tag" value="{$row.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}">
+                                                <div class="row">
+                                                    <div class="col-sm-11">
+                                                        <div class="rowGroup col-sm-4">
+                                                            <label class=" control-label spacing"><span style="color: red">*</span>姓名</label>
+                                                            <input type="text" class="form-control" id="name" name="name" value="{$row.name}"/>
+                                                        </div>
+                                                        <div class="rowGroup col-sm-4">
+                                                            <label class=" control-label spacing"><span style="color: red">*</span>证件类型</label>
+                                                            <select class="form-control" id="card_type" name="card_type" value="{$row.card_type}">
+                                                                <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"><span style="color: red">*</span>证件号码</label>
+                                                            <input class="form-control" id="card_number" name="card_number" value="{$row.card_number}">
+                                                        </div>
+                                                        <div class="rowGroup col-sm-4">
+                                                            <label class=" control-label spacing"><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>
+                                                        </div>
+                                                        <div class="rowGroup col-sm-4">
+                                                            <label class=" control-label spacing"><span style="color: red">*</span>出生日期</label>
+                                                            <input type="text" class="form-control date" id="birthday" name="birthday" value="{$row.birthday}"/>
+                                                        </div>
+                                                        <div class="rowGroup col-sm-4">
+                                                            <label class=" control-label spacing"><span style="color: red">*</span>国籍/地区</label>
+                                                            <select class="form-control" id="nationality" name="nationality" value="{$row.nationality}">
+                                                            </select>
+                                                        </div>
+                                                        <div class="rowGroup col-sm-4">
+                                                            <label class="control-label spacing"><span style="color: red">*</span>籍贯省</label>
+                                                            <select class="form-control " onchange="TalentInfoInfoDlg.afterSelectProvince()" id="province" name="province" value="{$row.province}">
+                                                            </select>
+                                                        </div>
+                                                        <div class="rowGroup col-sm-4">
+                                                            <label class="control-label spacing"><span style="color: red">*</span>籍贯市</label>
+                                                            <select class="form-control" onchange="TalentInfoInfoDlg.afterSelectCity()" id="city" name="city" value="{$row.city}"></select>
+                                                        </div>
+                                                        <div class="rowGroup col-sm-4">
+                                                            <label class="control-label spacing"><span style="color: red">*</span>籍贯县</label>
+                                                            <select class="form-control" id="county" name="county" value="{$row.county}"></select>
+                                                        </div>
+                                                        <div class="rowGroup col-sm-4">
+                                                            <label class="control-label spacing"><span style="color: red">*</span>民族</label>
+                                                            <select class="form-control" id="nation" name="nation" value="{$row.nation}">
+                                                            </select>
+                                                        </div>
+                                                        <div class="rowGroup col-sm-4">
+                                                            <label class=" control-label spacing"><span style="color: red">*</span>政治面貌</label>
+                                                            <select class="form-control" id="politics" name="politics" value="{$row.politics}">
+                                                            </select>
+                                                        </div>
+                                                        <div class="rowGroup col-sm-4">
+                                                            <label class=" control-label spacing"><span style="color: red">*</span>是否曾被相关主管部门列为失信个人</label>
+                                                            <select class="form-control" id="break_faith" name="break_faith" value="{$row.break_faith}">
+                                                                <option value="2">否</option>
+                                                                <option value="1">是</option>
+                                                            </select>
+                                                        </div>
+                                                        <div class="rowGroup col-sm-4">
+                                                            <label class=" control-label spacing"><span style="color: red">*</span>手机号码</label>
+                                                            <input type="text" class="form-control" id="phone" name="phone" maxlength="11" value="{$row.phone}"/>
+                                                        </div>
+                                                        <div class="rowGroup col-sm-4">
+                                                            <label class=" control-label spacing"><span style="color: red">*</span>电子邮箱</label>
+                                                            <input type="text" class="form-control" id="email" name="email" value="{$row.email}"/>
+                                                        </div>
+                                                        <div class="rowGroup col-sm-4">
+                                                            <label class=" control-label spacing"><span style="color: red">*</span>最高学历</label>
+                                                            <select class="form-control" id="highest_degree" name="highest_degree" value="{$row.highest_degree}"></select>
+                                                        </div>
+                                                        <div class="rowGroup col-sm-4">
+                                                            <label class=" control-label spacing"><span style="color: red">*</span>毕业学校</label>
+                                                            <input type="text" class="form-control" id="graduate_school" name="graduate_school" value="{$row.graduate_school}"/>
+                                                        </div>
+                                                        <div class="rowGroup col-sm-4">
+                                                            <label class=" control-label spacing"><span style="color: red">*</span>专业</label>
+                                                            <input type="text" class="form-control" id="major" name="major" value="{$row.major}"/>
+                                                        </div>
+                                                        <div class="rowGroup col-sm-4">
+                                                            <label class="control-label spacing">是否有留学经历</label>
+                                                            <select class="form-control" id="study_abroad" name="study_abroad" value="{$row.study_abroad}">
+                                                                <option value="2">否</option>
+                                                                <option value="1">是</option>
+                                                            </select>
+                                                        </div>
+                                                        <div class="rowGroup col-sm-4">
+                                                            <label class=" control-label spacing"><span style="color: red">*</span>单位名称</label>
+                                                            <input type="text" class="form-control" readonly="readonly" value="{$row.enterpriseName}"/>
+                                                        </div>
+                                                        <div class="rowGroup col-sm-4">
+                                                            <label class=" control-label spacing"><span style="color: red">*</span>所属镇街</label>
+                                                            <input type="text" class="form-control" readonly="readonly" value="{$row.streetName}"/>
+                                                        </div>
+                                                        <div class="rowGroup col-sm-4">
+                                                            <label class=" control-label spacing"><span style="color: red">*</span>职务</label>
+                                                            <input type="text" class="form-control" id="position" name="position" value="{$row.position}"/>
+                                                        </div>
+                                                        <div class="rowGroup col-sm-4">
+                                                            <label class=" control-label spacing"><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>
+                                                        <div class="rowGroup col-sm-4">
+                                                            <label class=" control-label spacing"><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>
+                                                        <div class="rowGroup col-sm-4">
+                                                            <label class=" control-label spacing"><span style="color: red">*</span>人才层次</label>
+                                                            <select class="form-control" id="talent_arrange" name="talent_arrange" onchange="TalentInfoInfoDlg.getIdentifyCondition()" value="{$row.talent_arrange}"></select>
+                                                        </div>
+                                                        <div class="rowGroup col-sm-4">
+                                                            <label class=" control-label spacing"><span style="color: red">*</span>认定条件</label>
+                                                            <select class="form-control" id="talent_condition" name="talent_condition" value="{$row.talent_condition}"></select>
+                                                        </div>
+                                                        <div class="rowGroup col-sm-4">
+                                                            <label class=" control-label spacing"><span style="color: red">*</span>认定条件名称</label>
+                                                            <input type="text" class="form-control" id="identifyConditionName" name="identifyConditionName" value="{$row.identifyConditionName}"/>
+                                                        </div>
+                                                        <div class="rowGroup col-sm-4">
+                                                            <label class=" control-label spacing"><span style="color: red">*</span>认定条件证书取得时间</label>
+                                                            <input type="text" class="form-control date" id="identifyGetTime" name="identifyGetTime" value="{$row.identifyGetTime}"/>
+                                                        </div>
+                                                        <div class="rowGroup col-sm-4">
+                                                            <label class=" control-label spacing">职称</label>
+                                                            <input type="text" class="form-control" id="title" name="title" value="{$row.title}"/>
+                                                        </div>
+                                                        <div class="rowGroup col-sm-4">
+                                                            <label class=" control-label spacing">国家职业资格</label>
+                                                            <input type="text" class="form-control" id="pro_qua" name="pro_qua" value="{$row.pro_qua}"/>
+                                                        </div>
+                                                        <div class="rowGroup col-sm-4">
+                                                            <label class=" control-label spacing"><span style="color: red">*</span>开户银行</label>
+                                                            <input type="text" class="form-control" onchange="TalentInfoInfoDlg.bankChange()" id="bank" name="bank" value="{$row.bank}" placeholder="XX银行"/>
+                                                        </div>
+                                                        <div class="rowGroup col-sm-4">
+                                                            <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" value="{$row.bank_branch_name}" PLACEHOLDER="XX银行XX省XX市XX支行/分行/分理处"/>
+                                                        </div>
+                                                        <div class="rowGroup col-sm-4">
+                                                            <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>
+                                                        <div class="rowGroup col-sm-12">
+                                                            <label class=" control-label spacing">备注</label>
+                                                            <input type="text" class="form-control" id="description" name="description" value="{$row.description}"/>
+                                                        </div>
+                                                    </div>
+                                                    <div class="col-sm-1">
+                                                        <img id="photoImg" {if condition="$row['headimgurl']"} src="{$row.headimgurl|getStoragePath}" {else/} src="/static/img/photo.png" {/if} style="height:147px;width:105px;">                                                        
+                                                    </div>
+                                                </div>
+                                                <div class="row">
+                                                    <div class="rowGroup col-sm-12">
+                                                        <label class=" control-label spacing"><span style="color: red">*</span>教育背景及工作简历</label>
+                                                        <textarea style="overflow: auto;word-break: break-all; " class="form-control" id="education" name="education" rows="4">{$row.education}</textarea>
+                                                    </div>
+                                                </div>
+                                                <div class="row">
+                                                    <div class="rowGroup col-sm-12">
+                                                        <label class=" control-label spacing"><span style="color: red">*</span>主要业绩及取得的荣誉</label>
+                                                        <textarea style="overflow: auto;word-break: break-all; " class="form-control" id="experience" name="experience" rows="4">{$row.experience}</textarea>
+                                                    </div>
+                                                </div>
+                                                <div class="row">
+                                                    <label class="col-sm-12 control-label spacing" style="text-align: left"><span style="color: red">声明：本人对输入材料的真实性负全部责任</span></label>
+                                                </div>
+                                            </div>
+                                        </form>
+                                    </div>
+                                    <div class="panel-heading" onclick="$(this).next().toggle()">日志</div>
+                                    <table id="logTable">
+                                    </table>
+                                </div>
+                            </div>
+                        </div>
+                        <div id="tab-2" class="tab-pane ">
+                            <table id="fileTable" class="table-condensed"
+                                   style="font-size: 10px;table-layout: fixed!important;" data-mobile-responsive="true"
+                                   data-click-to-select="true">
+                                <thead>
+                                <tr>
+                                    <th data-field="selectItem" data-checkbox="true"></th>
+                                </tr>
+                                </thead>
+                            </table>
+                            <label style="padding-top: 15px;color: red">*请根据上传的附件材料，编辑好相应的文件夹名称</label>
+                            <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" name="backName" value="TalentInfoInfoDlg.callBack">
+                                <input type="type" name="type" value="1">
+                            </form>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
+<iframe id="hiddenIframe" name="hiddenIframe" style="display: none;"></iframe>
+<!--<script src="${ctxPath}/static/modular/gate/talentInfo/talentInfo_ic_info.js"></script>-->
+<script type="text/javascript">
+    document.write('<script src="/static/modular/gate/talentInfo/talentInfo_ic_select.js?v=' + (new Date()).getTime() + '"><\/script>');
+    document.write('<script src="/static/modular/common/config.js?v=' + (new Date()).getTime() + '"><\/script>');
+</script>
+{/block}

public/static/modular/gate/talentInfo/talentInfo_ic_info.js

@@ -340,9 +340,10 @@ TalentInfoInfoDlg.initFileTable = function () {
                 var html = '<ul class="imgs"><li style="width: 80%;font-weight: bold;padding-top: 5px;">附件原名</li><li style="width: 10%;font-weight: bold;padding-top: 5px;">预览</li><li style="width: 10%;font-weight: bold;padding-top: 5px;">操作</li>';
                 var files = $("#files").val();
                 var checkState = $("#checkState").val();
+                var realState = $("#realState").val();
                 for (var key in data) {
-                    var btn = "";
-                    if (checkState != 10 || (checkState == 10 && files.indexOf(row.id) != -1)) {
+                    var btn = "";                    
+                    if (Feng.isEmptyStr(checkState) || (checkState == 8 && realState == 8) || (checkState == 11 && realState != 14) || (realState == 11 && files.indexOf(row.id) != -1)) {
                         btn = "<button type=\'button\' onclick=\"TalentInfoInfoDlg.checkFile(this,'" + row.fState + "','" + row.id + "','" + data[key].id + "')\" style=\'margin-right: 10px\' class=\"btn btn-xs btn-info\">" +
                                 "<i class=\"fa fa-paste\"></i>修改" +
                                 "</button>" +
@@ -396,12 +397,14 @@ TalentInfoInfoDlg.validId = function () {
 TalentInfoInfoDlg.checkFile = function (content, state, fileTypeId, fileId) {
     if (!TalentInfoInfoDlg.validateIsEdit())
         return;
-    $("#upload_file ").unbind("change");
-    $("#upload_file ").change(function () {
+    $("#upload_file").unbind("change");
+    $("#upload_file").change(function () {
+        if (!Feng.chkFileInvalid(this.files[0], 5, 10))
+            return;
         TalentInfoInfoDlg.upload(fileTypeId, fileId);
     });
     $('#upload_file').val("");
-    $('#upload_file').click()
+    $('#upload_file').click();
 }
 //上传附件
 TalentInfoInfoDlg.upload = function (fileTypeId, fileId) {
@@ -533,7 +536,7 @@ TalentInfoInfoDlg.initFileTypeColumn = function () {
                 var files = $("#files").val();
                 var checkState = $("#checkState").val();
                 var realState = $("#realState").val();
-                if (checkState == 8 || (checkState == 11 && realState != 14) || (realState == 11 && files.indexOf(value) != -1)) {
+                if (Feng.isEmptyStr(checkState) || (checkState == 8 && realState == 8) || (checkState == 11 && realState != 14) || (realState == 11 && files.indexOf(value) != -1)) {
                     return "<button type='button' onclick=\"TalentInfoInfoDlg.checkFile(this,'" + row.fState + "','" + value + "','" + null + "')\" style='margin-right: 10px' class=\"btn btn-xs btn-info\">" +
                             "<i class=\"fa fa-upload\"></i>上传" +
                             "</button>";
@@ -561,7 +564,8 @@ TalentInfoInfoDlg.downloadFile = function (id, type) {
 TalentInfoInfoDlg.setNoChangeField = function () {
     var checkState = $("#checkState").val();
     var fields = $("#fields").val();
-    if (checkState == 10) {
+    var realState = $("#realState").val();
+    if (realState == 11) {
         $("input,textarea").each(function () {
             $(this).attr("readonly", "readonly");
         });
@@ -574,9 +578,12 @@ TalentInfoInfoDlg.setNoChangeField = function () {
                 var name = $("#" + arr[key]).prop("tagName");
                 if (name == 'select' || name == 'SELECT') {
                     $("#" + arr[key]).removeAttr("disabled");
-                }
-                if (name == "input" || name == 'textarea' || name == "INPUT" || name == 'TEXTAREA') {
+                } else if (name == "input" || name == 'textarea' || name == "INPUT" || name == 'TEXTAREA') {
                     $("#" + arr[key]).removeAttr("readonly");
+                } else {
+                    if (name == "undefined") {
+                        $("input[name=" + arr[key] + "]").removeAttr("disabled");
+                    }
                 }
             }
         }

public/static/modular/talentIdentify/talentInfo/talentInfo_common_check.js

@@ -165,6 +165,84 @@ TalentInfoInfoDlg.initFileTable = function () {
     ajax.start();
 }
 
+TalentInfoInfoDlg.initICFileTable = function () {
+    var queryData = {};
+    queryData['project'] = CONFIG.project_rcrd;
+    queryData['type'] = $("#type").val();
+    queryData['checkState'] = $("#checkState").val();
+    queryData['isMix'] = 1;
+    $("#fileTable").bootstrapTable({
+        url: Feng.ctxPath + "/common/api/findCommonFileType",
+        method: 'POST',
+        contentType: "application/x-www-form-urlencoded; charset=UTF-8",
+        search: false, // 是否显示表格搜索，此搜索是客户端搜索，不会进服务端
+        showRefresh: false, // 是否显示刷新按钮
+        clickToSelect: true, // 是否启用点击选中行
+        singleSelect: true, // 设置True 将禁止多选
+        striped: true, // 是否显示行间隔色
+        escape: true,
+        pagination: false, // 设置为 true 会在表格底部显示分页条
+        paginationHAlign: "left",
+        paginationDetailHAlign: "right",
+        sidePagination: "server", // 设置在哪里进行分页，可选值为 'client' 或者 'server'
+        showColumns: false,
+        detailView: true, //是否显示父子表
+        pageList: [10, 30, 50],
+        queryParams: function (params) {
+            return $.extend(queryData, params)
+        },
+        rowStyle: function (row, index) {
+            return {classes: "info"};
+        },
+        columns: TalentInfoInfoDlg.initFileTypeColumn(),
+        onPostBody: function () {
+            $("td.uitd_showTip").bind("mouseover", function () {
+                var htm = $(this).html();
+                $(this).webuiPopover({title: '详情', content: htm, trigger: 'hover'}).webuiPopover('show');
+            });
+        },
+        onLoadSuccess: function (data) {
+            $("#fileTable").bootstrapTable('expandAllRows');
+        },
+        onExpandRow: function (index, row, $detail) {
+            var ajax = new $ax(Feng.ctxPath + "/common/api/listTalentFile", function (data) {
+                if (data == null || data.length == 0) {
+                    return;
+                }
+                var html = '<ul class="imgs"><li style="width: 80%;font-weight: bold;padding-top: 5px;">附件原名</li><li style="width: 10%;font-weight: bold;padding-top: 5px;">预览</li>';
+                var files = $("#files").val();
+                var checkState = $("#checkState").val();
+                for (var key in data) {
+                    var sn = data[key].url.lastIndexOf(".");
+                    var suffix = data[key].url.substring(sn + 1, data[key].url.length);
+                    var imgStr = "";
+                    if (suffix == "pdf" || suffix == "PDF") {
+                        imgStr = "<button type='button'  onclick=\"Feng.showPdf('" + data[key].url + "','" + data[key].id + "','" + data[key].orignName + "')\" class=\"btn btn-xs btn-danger\"><i class=\"fa fa-file-pdf-o\" aria-hidden=\"true\"></i></button>";
+                    } else if (suffix == "xlsx" || suffix == "XLSX" || suffix == 'xls' || suffix == 'XLS') {
+                        imgStr = "<button type='button'  onclick=\"Feng.showExcel('" + data[key].url + "','" + data[key].id + "','" + data[key].orignName + "')\" class=\"btn btn-xs btn-danger\"><i class=\"fa fa-file-excel-o\" aria-hidden=\"true\"></i></button>";
+                    } else {
+                        imgStr = '<img class=\"imgUrl\"  src=\"' + data[key].url + '\" style=\"width:25px;height:25px;\">';
+                    }
+                    html = html + '<li style="display: none">' + data[key].id + '</li>\n' +
+                            '<li style="width: 80%;padding-top: 5px;">' + data[key].orignName + '</li>\n' +
+                            '<li style="width: 10%;">' + imgStr + '</li>\n';
+                }
+                html = html + '</ul>';
+                $detail.html(html);
+                $(".imgs").viewer({fullscreen: false});
+            }, function (data) {
+                Feng.error("查询失败!" + data.responseJSON.message + "!");
+            });
+            var queryData = {};
+            queryData["mainId"] = $("#id").val();
+            queryData["fileTypeId"] = row.id;
+            ajax.set(queryData);
+            ajax.start();
+        }
+    });
+
+}
+
 
 /**
  * 关闭此对话框
@@ -305,8 +383,8 @@ TalentInfoInfoDlg.showFirstCheckModal = function () {
                     for (var key in fileList) {
                         html2 = html2 + '<ul><li style="width: 100%"><input type="checkbox" value="' + fileList[key].id + '"><span>' + fileList[key].name + '</span></li></ul>';
                     }
-                    $("#field_info ul").empty().append(html1);
-                    $("#field_file").empty().append(html2);
+                    $("#field_info ul").css("overflow","hidden").empty().append(html1);
+                    $("#field_file").css("overflow","hidden").empty().append(html2);
                     var optionHtml = "";
                     if (process <= 4 && process != 2) {
                         optionHtml = '<option value="">请选择</option>\n' +
@@ -709,7 +787,10 @@ $(function () {
     TalentInfoInfoDlg.typeChange();
     TalentInfoInfoDlg.sourceChange();
     $('[data-toggle="tooltip"]').tooltip();
-    TalentInfoInfoDlg.initFileTable();
+    var type = $("#type").val();
+    if (type == 1) {
+        TalentInfoInfoDlg.initFileTable();
+    }
     //$(".ibox-content").viewer({fullscreen: false});
     Feng.getCheckLog("logTable", {"type": CONFIG.project_rcrd, "mainId": $("#id").val(), "typeFileId": "", "active": 1})
 });