فهرست منبع

变更层次++

sugangqiang 1 سال پیش
والد
کامیت
80a7db11ad

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

@@ -99,6 +99,7 @@ class Api extends BaseController {
             case 4:
             case 6:
             case 7:
+            case 8:
             case 9:
             case 19:
             case 20:
@@ -129,6 +130,7 @@ class Api extends BaseController {
                 case 4:
                 case 6:
                 case 7:
+                case 8:
                 case 9:
                 case 19:
                     $new_item["stateName"] = \app\common\state\LivingAllowanceState::getStateName($item["state"]);

+ 15 - 0
app/enterprise/api/TalentApi.php

@@ -8,6 +8,7 @@ use app\common\api\TalentConditionApi;
 use app\common\api\TalentLogApi;
 use app\common\api\TalentState;
 use app\enterprise\model\TalentTypeChange;
+use think\facade\Db;
 
 /**
  * Description of TalentApi
@@ -180,6 +181,20 @@ class TalentApi {
         $talentArangeList = DictApi::selectByParentCode("talent_arrange"); //人才层次
 
         foreach ($list as $k => $v) {
+            if (strlen($v["oldIdentifyCondition"]) == 19) {
+                $condition = Db::table("un_identify_condition")->find($v["oldIdentifyCondition"]);
+                $list[$k]["oldIdentifyCondition"] = $condition["name"];
+            } else if ($v["oldIdentifyCondition"]) {
+                $condition = TalentConditionApi::getOne($v["oldIdentifyCondition"]);
+                $list[$k]["oldIdentifyCondition"] = $condition["name"];
+            }
+            if (strlen($v["newIdentifyCondition"]) == 19) {
+                $condition = Db::table("un_identify_condition")->find($v["newIdentifyCondition"]);
+                $list[$k]["newIdentifyCondition"] = $condition["name"];
+            } else if ($v["newIdentifyCondition"]) {
+                $condition = TalentConditionApi::getOne($v["newIdentifyCondition"]);
+                $list[$k]["newIdentifyCondition"] = $condition["name"];
+            }
             $list[$k]["oldTalentArrangeName"] = array_key_exists($v["oldTalentArrange"], $talentArangeList) ? $talentArangeList[$v["oldTalentArrange"]] : "";
             $list[$k]["newTalentArrangeName"] = array_key_exists($v["newTalentArrange"], $talentArangeList) ? $talentArangeList[$v["newTalentArrange"]] : "";
         }

+ 16 - 3
app/enterprise/controller/TalentTypeChange.php

@@ -38,12 +38,18 @@ class TalentTypeChange extends EnterpriseController {
         if ($params["id"]) {
             $info = TalentTypeChangeModel::find($params["id"]);
         }
-        $year = $info["year"] ?: $params["year"];
+        $year = $info["newYear"] ?: $params["year"];
         return view("apply", ['enterprise' => $enterprise, "info" => $info, 'year' => $year]);
     }
 
     public function view() {
-        return view();
+        $params = $this->request->param();
+        if ($params["id"]) {
+            $info = TalentTypeChangeModel::find($params["id"]);
+        }
+        if ($info["enterpriseId"] != $this->user["uid"])
+            $info = null;
+        return view("", ["info" => $info]);
     }
 
     public function add() {
@@ -122,6 +128,13 @@ class TalentTypeChange extends EnterpriseController {
             $response->msg = implode("<br>", $sb);
             return $response;
         }
+        if (!$info["firstSubmitTime"]) {
+            $data["firstSubmitTime"] = date("Y-m-d H:i:s");
+        }
+        $data["newSubmitTime"] = date("Y-m-d H:i:s");
+        $data["checkMsg"] = "";
+        $data["files"] = "";
+        $data["fields"] = "";
         $data["id"] = $id;
         $data["checkState"] = MainState::NEED_FIRST_CHECK;
         TalentTypeChangeModel::update($data);
@@ -136,7 +149,7 @@ class TalentTypeChange extends EnterpriseController {
         $log["description"] = "确认提交审核";
         $log["createUser"] = $user ? sprintf("%s(%s)", $user["account"], $user["companyName"] ?: $user["rolename"]) : "系统";
         $log["createTime"] = date("Y-m-d H:i:s");
-        TalentLog::create($log);
+        TalentChecklog::create($log);
         $response->code = 200;
         $response->msg = "提交审核成功";
         $response->obj = 3;

+ 33 - 36
app/enterprise/view/talent_type_change/apply.html

@@ -40,10 +40,11 @@
                                         <input type="hidden" id="oldFromCityName" name="newFromCityName" value="{$info.newFromCityName}"/>
                                         <input type="hidden" id="oldFromCityName" name="oldFromCountyName" value="{$info.oldFromCountyName}"/>
                                         <input type="hidden" id="oldFromCityName" name="newFromCountyName" value="{$info.newFromCountyName}"/>
+                                        <input type="hidden" id="fields" name="fields" value="{$info.fields}"/>
+                                        <input type="hidden" id="files" name="files" value="{$info.files}"/>
                                         <input type="hidden" id="source" name="source"/>
-                                        <input type="hidden" name="year" id="year" value="{$year}"/>
-                                        <input type="hidden" id="oldYear" name="oldYear"/>
-                                        <input type="hidden" id="newYear" name="newYear" value=""/>
+                                        <input type="hidden" id="oldYear" name="oldYear" value="{$info.oldYear}"/>
+                                        <input type="hidden" id="newYear" name="newYear" value="{$year}"/>
                                         <div class="rowGroup">
                                             <label class="col-sm-2 control-label spacing">变更对象</label>
                                             <div class="col-sm-4 spacing">
@@ -59,7 +60,7 @@
                                         <div class="rowGroup">
                                             <label class="col-sm-2 control-label spacing">单位名称</label>
                                             <div class="col-sm-4 spacing">
-                                                <input class="form-control" id="enterpriseName" readonly="readonly" name="enterpriseName" />
+                                                <input class="form-control" id="enterpriseName" readonly="readonly" name="enterpriseName" value="{$info.enterpriseName}"/>
                                             </div>
                                         </div>
 
@@ -67,164 +68,160 @@
                                         <div class="rowGroup">
                                             <label class="col-sm-2 control-label spacing">原申报来源</label>
                                             <div class="col-sm-4 spacing">
-                                                <select class="form-control" disabled="disabled" id="oldSource" name="oldSource" >
-                                                    <option value="">请选择</option>
-                                                    <option value="1">经我市申报并已经成功入选的泉州高层次人才</option>
-                                                    <option value="2">从我市以外的其他县(市、区)变动到我市工作的泉州市高层次人才</option>
-                                                    <option value="3">依据《晋江市优秀人才补充认定标准》申报认定</option>
+                                                <select class="form-control" disabled="disabled" id="oldSource" name="oldSource" onchange="TalentTypeChangeInfoDlg.sourceChange(false)" value="{$info.oldSource}">
                                                 </select>
                                             </div>
                                         </div>
                                         <div class="rowGroup" style="display: none">
                                             <label class="col-sm-2 control-label spacing">原入选来源地级市</label>
                                             <div class="col-sm-4 spacing">
-                                                <select class="form-control" disabled="disabled" id="oldFromCity" name="oldFromCity"></select>
+                                                <select class="form-control" disabled="disabled" id="oldFromCity" name="oldFromCity" value="{$info.oldFromCity}"></select>
                                             </div>
                                         </div>
                                         <div class="rowGroup" style="display: none">
                                             <label class="col-sm-2 control-label spacing">原入选来源县市区</label>
                                             <div class="col-sm-4 spacing">
-                                                <select class="form-control" disabled="disabled" id="oldFromCounty" name="oldFromCounty"></select>
+                                                <select class="form-control" disabled="disabled" id="oldFromCounty" name="oldFromCounty" value="{$info.oldFromCounty}"></select>
                                             </div>
                                         </div>
                                         {/if}
                                         <div class="rowGroup">
                                             <label class="col-sm-2 control-label spacing">原人才层次</label>
                                             <div class="col-sm-4 spacing">
-                                                <select class="form-control" disabled="disabled" id="oldTalentArrange" name="oldTalentArrange"></select>
+                                                <select class="form-control" disabled="disabled" id="oldTalentArrange" name="oldTalentArrange" value="{$info.oldTalentArrange}" onchange="TalentTypeChangeInfoDlg.getLayerCatdByLayer(false);"></select>
                                             </div>
                                         </div>
                                         {neq name="enterprise.type" value="2"}
                                         <div class="rowGroup">
                                             <label class="col-sm-2 control-label spacing">原人才条款</label>
-                                            <div class="col-sm-4 spacing">                                                
-                                                <input class="form-control" id="oldTalentArrangeCategory" readonly="readonly" name="oldTalentArrangeCategory" />
+                                            <div class="col-sm-4 spacing">      
+                                                <select class="form-control" id="oldIdentifyConditionCategory" disabled="disabled" name="oldIdentifyConditionCategory" onchange="TalentTypeChangeInfoDlg.getIdentifyCondition(false)" value="{$info.oldIdentifyConditionCategory}"></select>
                                             </div>
                                         </div>
                                         {/neq}
                                         <div class="rowGroup">
                                             <label class="col-sm-2 control-label spacing">原认定条件</label>
                                             <div class="col-sm-4 spacing">
-                                                <input class="form-control" id="oldIdentifyCondition" readonly="readonly" name="oldIdentifyCondition" />
+                                                <select class="form-control" id="oldIdentifyCondition" disabled="disabled" name="oldIdentifyCondition" value="{$info.oldIdentifyCondition}" onchange="TalentTypeChangeInfoDlg.getIdentifyNeedsFileTypes(false)"></select>
                                             </div>
                                         </div>
                                         {if condition="$enterprise['type'] eq 2"}
                                         <div class="rowGroup">
                                             <label class="col-sm-2 control-label spacing">原认定条件名称</label>
                                             <div class="col-sm-4 spacing">
-                                                <input class="form-control" id="oldIdentifyConditionName" readonly="readonly" name="oldIdentifyConditionName" />
+                                                <input class="form-control" id="oldIdentifyConditionName" readonly="readonly" name="oldIdentifyConditionName" value="{$info.oldIdentifyConditionName}"/>
                                             </div>
                                         </div>
                                         {/if}
                                         <div class="rowGroup" style="display: none">
                                             <label class="col-sm-2 control-label spacing">新年薪</label>
                                             <div class="col-sm-4 spacing">
-                                                <input class="form-control" id="oldAnnualSalary" name="oldAnnualSalary"/>
+                                                <input class="form-control" id="oldAnnualSalary" name="oldAnnualSalary" value="{$info.oldAnnualSalary}"/>
                                             </div>
                                         </div>
                                         <div class="rowGroup">
                                             <label class="col-sm-2 control-label spacing">原认定条件证书取得时间</label>
                                             <div class="col-sm-4 spacing">
-                                                <input class="form-control" id="oldIdentifyGetTime" readonly="readonly" name="oldIdentifyGetTime" />
+                                                <input class="form-control" id="oldIdentifyGetTime" readonly="readonly" name="oldIdentifyGetTime" value="{$info.oldIdentifyGetTime}"/>
                                             </div>
                                         </div>
                                         <div class="rowGroup">
                                             <label class="col-sm-2 control-label spacing">原公布入选月份</label>
                                             <div class="col-sm-4 spacing">
-                                                <input class="form-control" id="oldIdentifyMonth" readonly="readonly" name="oldIdentifyMonth" />
+                                                <input class="form-control" id="oldIdentifyMonth" readonly="readonly" name="oldIdentifyMonth" value="{$info.oldIdentifyGetTime}"/>
                                             </div>
                                         </div>
                                         <div class="rowGroup">
                                             <label class="col-sm-2 control-label spacing">原人才编号</label>
                                             <div class="col-sm-4 spacing">
-                                                <input class="form-control" id="oldCertificateNO" readonly="readonly" name="oldCertificateNO" />
+                                                <input class="form-control" id="oldCertificateNO" readonly="readonly" name="oldCertificateNO" value="{$info.oldCertificateNO}"/>
                                             </div>
                                         </div>
                                         {if condition="$enterprise['type'] == 1"}
                                         <div class="rowGroup" style="display: none">
                                             <label class="col-sm-2 control-label spacing">原泉州高层次人才证书发证日期</label>
                                             <div class="col-sm-4 spacing">
-                                                <input class="form-control" id="oldCertificateStartTime" readonly="readonly" name="oldCertificateStartTime" />
+                                                <input class="form-control" id="oldCertificateStartTime" readonly="readonly" name="oldCertificateStartTime" value="{$info.oldCertificateStartTime}"/>
                                             </div>
                                         </div>
                                         <div class="rowGroup" style="display: none">
                                             <label class="col-sm-2 control-label spacing">原泉州高层次人才证书的有效期</label>
                                             <div class="col-sm-4 spacing">
-                                                <input class="form-control" id="oldCertificateOutTime" readonly="readonly" name="oldCertificateOutTime" />
+                                                <input class="form-control" id="oldCertificateOutTime" readonly="readonly" name="oldCertificateOutTime" value="{$info.oldCertificateOutTime}"/>
                                             </div>
                                         </div>
                                         <div class="rowGroup">
                                             <label class="col-sm-2 control-label spacing">原引进方式</label>
                                             <div class="col-sm-4 spacing">
-                                                <select class="form-control" id="oldIntroductionMode" disabled="disabled" name="oldIntroductionMode" >
+                                                <select class="form-control" id="oldIntroductionMode" disabled="disabled" name="oldIntroductionMode" value="{$info.oldIntroductionMode}">
                                                 </select>
                                             </div>
                                         </div>
                                         <div class="rowGroup">
                                             <label class="col-sm-2 control-label spacing">新申报来源</label>
                                             <div class="col-sm-4 spacing">
-                                                <select class="form-control" id="newSource" name="newSource" onchange="TalentTypeChangeInfoDlg.sourceChange()">
+                                                <select class="form-control" id="newSource" name="newSource" onchange="TalentTypeChangeInfoDlg.sourceChange(true)" value="{$info.newSource}">
                                                 </select>
                                             </div>
                                         </div>
                                         <div class="rowGroup" style="display: none">
                                             <label class="col-sm-2 control-label spacing">新入选来源地级市</label>
                                             <div class="col-sm-4 spacing">
-                                                <select class="form-control" id="newFromCity" name="newFromCity"></select>
+                                                <select class="form-control" id="newFromCity" name="newFromCity" value="{$info.newFromCity}"></select>
                                             </div>
                                         </div>
                                         <div class="rowGroup" style="display: none">
                                             <label class="col-sm-2 control-label spacing">新入选来源县市区</label>
                                             <div class="col-sm-4 spacing">
-                                                <select class="form-control" id="newFromCounty" name="newFromCounty"></select>
+                                                <select class="form-control" id="newFromCounty" name="newFromCounty" value="{$info.newFromCounty}"></select>
                                             </div>
                                         </div>
                                         {/if}
                                         <div class="rowGroup">
                                             <label class="col-sm-2 control-label spacing">新人才层次</label>
                                             <div class="col-sm-4 spacing">
-                                                <select class="form-control" id="newTalentArrange" name="newTalentArrange" onchange="TalentTypeChangeInfoDlg.getLayerCatdByLayer();"></select>
+                                                <select class="form-control" id="newTalentArrange" name="newTalentArrange" onchange="TalentTypeChangeInfoDlg.getLayerCatdByLayer(true);" value="{$info.newTalentArrange}"></select>
                                             </div>
                                         </div>
                                         {neq name="enterprise.type" value="2"}
                                         <div class="rowGroup">
                                             <label class="col-sm-2 control-label spacing">新人才条款</label>
                                             <div class="col-sm-4 spacing">
-                                                <select class="form-control" id="newTalentArrangeCategory" name="newTalentArrangeCategory" onchange="TalentTypeChangeInfoDlg.getIdentifyCondition()" value=""></select>
+                                                <select class="form-control" id="newIdentifyConditionCategory" name="newIdentifyConditionCategory" onchange="TalentTypeChangeInfoDlg.getIdentifyCondition(true)" value="{$info.newIdentifyConditionCategory}"></select>
                                             </div>
                                         </div>
                                         {/neq}
                                         <div class="rowGroup">
                                             <label class="col-sm-2 control-label spacing">新认定条件</label>
                                             <div class="col-sm-4 spacing">
-                                                <select class="form-control" id="newIdentifyCondition" name="newIdentifyCondition" onchange="TalentTypeChangeInfoDlg.getIdentifyNeedsFileTypes()"></select>
+                                                <select class="form-control" id="newIdentifyCondition" name="newIdentifyCondition" onchange="TalentTypeChangeInfoDlg.getIdentifyNeedsFileTypes(true)" value="{$info.newIdentifyCondition}"></select>
                                             </div>
                                         </div>
                                         {if condition="$enterprise['type'] eq 2"}
                                         <div class="rowGroup">
                                             <label class="col-sm-2 control-label spacing">新认定条件名称</label>
                                             <div class="col-sm-4 spacing">
-                                                <input class="form-control" id="newIdentifyConditionName" name="newIdentifyConditionName" placeholder="例:获得国家一级职业资格(汽车维修工)"/>
+                                                <input class="form-control" id="newIdentifyConditionName" name="newIdentifyConditionName" value="{$info.newIdentifyConditionName}" placeholder="例:获得国家一级职业资格(汽车维修工)"/>
                                             </div>
                                         </div>
                                         {/if}
                                         <div class="rowGroup" style="display: none">
                                             <label class="col-sm-2 control-label spacing">新年薪</label>
                                             <div class="col-sm-4 spacing">
-                                                <input class="form-control" id="newAnnualSalary" name="newAnnualSalary"/>
+                                                <input class="form-control" id="newAnnualSalary" name="newAnnualSalary" value="{$info.newAnnualSalary}"/>
                                             </div>
                                         </div>
                                         <div class="rowGroup">
                                             <label class="col-sm-2 control-label spacing">新认定条件证书取得时间</label>
                                             <div class="col-sm-4 spacing">
-                                                <input class="form-control date" id="newIdentifyGetTime" name="newIdentifyGetTime" />
+                                                <input class="form-control date" id="newIdentifyGetTime" name="newIdentifyGetTime" value="{$info.newIdentifyGetTime}"/>
                                             </div>
                                         </div>
                                         {if condition="$enterprise['type'] == 1"}
                                         <div class="rowGroup">
                                             <label class="col-sm-2 control-label spacing">新引进方式</label>
                                             <div class="col-sm-4 spacing">
-                                                <select class="form-control" id="newIntroductionMode" name="newIntroductionMode" >
+                                                <select class="form-control" id="newIntroductionMode" name="newIntroductionMode" value="{$info.newIntroductionMode}">
                                                 </select>
                                             </div>
                                         </div>
@@ -246,13 +243,13 @@
                                 </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">
+                            <form id="uploadForm" action="/common/api/addTalentCommonFile" method="post" class="form-horizontal" enctype="multipart/form-data" target="hiddenIframe" style="display: none">                          
+                                <input type="hidden" name="backName" value="TalentTypeChangeInfoDlg.callBack">
                                 <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="typeId" name="typeId" >
                                 <input type='hidden' id="index" name="index" >
-                                <input type="hidden" name="backName" value="TalentTypeChangeInfoDlg.callBack">
                                 <input type="type" name="type" value="8">
                             </form>
                         </div>

+ 76 - 83
app/enterprise/view/talent_type_change/view.html

@@ -30,202 +30,195 @@
                             <div class="panel-body" >
                                 <form id="talentTypeForm">
                                     <div class="col-sm-12 form-group-sm">
-                                        <input type="hidden" id="id" name="id" value="${item.id}">
-                                        <input type="hidden" id="type" name="type" value="${item.type}">
-                                        <input type="hidden" id="talentType" name="talentType" value="">
-                                        <input type="hidden" id="checkState" name="checkState" value="${item.checkState}"/>
-                                        <input type="hidden" id="talentName" name="talentName" value="${item.checkState}"/>
-                                        <input type="hidden" id="enterpriseId" name="enterpriseId" value="${item.enterpriseId}"/>
-                                        <input type="hidden" name="fields" id="fields" value="${item.fields}">
-                                        <input type="hidden" name="files" id="files" value="${item.files}">
+                                        <input type="hidden" id="id" name="id" value="{$info.id}"/>
+                                        <input type="hidden" id="type" name="type" value="{$info.type}"/>
+                                        <input type="hidden" id="talentType" name="talentType" value="{$info.talentType}"/>
+                                        <input type="hidden" id="checkState" name="checkState" value="{$info.checkState}"/>
+                                        <input type="hidden" id="talentName" name="talentName" value="{$info.talentName}"/>
+                                        <input type="hidden" id="enterpriseId" name="enterpriseId" value="{$info.enterpriseId}"/>
+                                        <input type="hidden" id="fields" name="fields" value="{$info.fields}"/>
+                                        <input type="hidden" id="files" name="files" value="{$info.files}"/>
                                         <div class="rowGroup">
                                             <label class="col-sm-2 control-label spacing">变更对象</label>
                                             <div class="col-sm-4 spacing">
-                                                <select class="form-control" id="talentId" name="talentId" value="${item.talentId}" onchange="TalentTypeChangeInfoDlg.talentInfoDetail()"></select>
+                                                <select class="form-control" disabled id="talentId" name="talentId" onchange="TalentTypeChangeInfoDlg.talentInfoDetail()" value="{$info.talentId}"></select>
                                             </div>
                                         </div>
                                         <div class="rowGroup">
                                             <label class="col-sm-2 control-label spacing">证件号码</label>
                                             <div class="col-sm-4 spacing">
-                                                <input class="form-control" id="idCard" readonly="readonly" name="idCard" value="${item.idCard}"/>
+                                                <input class="form-control" id="idCard" readonly="readonly" name="idCard" value="{$info.idCard}"/>
                                             </div>
                                         </div>
                                         <div class="rowGroup">
                                             <label class="col-sm-2 control-label spacing">单位名称</label>
                                             <div class="col-sm-4 spacing">
-                                                <input class="form-control" id="enterpriseName" readonly="readonly" name="enterpriseName" value="${item.enterpriseName}"/>
+                                                <input class="form-control" id="enterpriseName" readonly="readonly" name="enterpriseName" value="{$info.enterpriseName}"/>
                                             </div>
                                         </div>
-                                        @if(item.type==1){
+
+                                        {if condition="$info['type'] == 1"}
                                         <div class="rowGroup">
                                             <label class="col-sm-2 control-label spacing">原申报来源</label>
                                             <div class="col-sm-4 spacing">
-                                                <select class="form-control" disabled="disabled" id="oldSource" name="oldSource" value="${item.oldSource}">
-                                                    <option value="">请选择</option>
-                                                    <option value="1">经我市申报并已经成功入选的泉州高层次人才</option>
-                                                    <option value="2">从我市以外的其他县(市、区)变动到我市工作的泉州市高层次人才</option>
-                                                    <option value="3">依据《晋江市优秀人才补充认定标准》申报认定</option>
+                                                <select class="form-control" disabled="disabled" id="oldSource" name="oldSource" onchange="TalentTypeChangeInfoDlg.sourceChange(false)" value="{$info.oldSource}">
                                                 </select>
                                             </div>
                                         </div>
-                                        <div class="rowGroup">
-                                            <label class="col-sm-2 control-label spacing">公布入选来源</label>
+                                        <div class="rowGroup" style="display: none">
+                                            <label class="col-sm-2 control-label spacing">原入选来源地级市</label>
                                             <div class="col-sm-4 spacing">
-                                                <select class="form-control" disabled="disabled" id="oldOurCitySource" name="oldOurCitySource" value="${item.oldOurCitySource}">
-                                                    <option value="">请选择</option>
-                                                    <option value="1">泉州市公布入选的泉州市第一至第五层次人才</option>
-                                                    <option value="2">晋江市公布入选的泉州市高层次第六七层次人才</option>
-                                                </select>
+                                                <select class="form-control" disabled="disabled" id="oldFromCity" name="oldFromCity" value="{$info.oldFromCity}"></select>
                                             </div>
                                         </div>
-                                        <div class="rowGroup">
-                                            <label class="col-sm-2 control-label spacing">原入选来源县市</label>
+                                        <div class="rowGroup" style="display: none">
+                                            <label class="col-sm-2 control-label spacing">原入选来源县市区</label>
                                             <div class="col-sm-4 spacing">
-                                                <select class="form-control" disabled="disabled" id="oldFromCity" name="oldFromCity" value="${item.oldFromCity}"></select>
+                                                <select class="form-control" disabled="disabled" id="oldFromCounty" name="oldFromCounty" value="{$info.oldFromCounty}"></select>
                                             </div>
                                         </div>
+                                        {/if}
                                         <div class="rowGroup">
-                                            <label class="col-sm-2 control-label spacing">原入选名单批次</label>
+                                            <label class="col-sm-2 control-label spacing">原人才层次</label>
                                             <div class="col-sm-4 spacing">
-                                                <select class="form-control" disabled="disabled" id="oldQzBath" name="oldQzBath" value="${item.oldQzBath}"></select>
+                                                <select class="form-control" disabled="disabled" id="oldTalentArrange" name="oldTalentArrange" value="{$info.oldTalentArrange}" onchange="TalentTypeChangeInfoDlg.getLayerCatdByLayer(false);"></select>
                                             </div>
                                         </div>
-                                        @}
+                                        {neq name="info.type" value="2"}
                                         <div class="rowGroup">
-                                            <label class="col-sm-2 control-label spacing">原人才层次</label>
-                                            <div class="col-sm-4 spacing">
-                                                <select class="form-control" disabled="disabled" id="oldTalentArrange" name="oldTalentArrange" value="${item.oldTalentArrange}" onchange="TalentTypeChangeInfoDlg.talentArrangeChange('oldTalentArrange', 'oldIdentifyCondition')"></select>
+                                            <label class="col-sm-2 control-label spacing">原人才条款</label>
+                                            <div class="col-sm-4 spacing">      
+                                                <select class="form-control" id="oldIdentifyConditionCategory" disabled="disabled" name="oldIdentifyConditionCategory" onchange="TalentTypeChangeInfoDlg.getIdentifyCondition(false)" value="{$info.oldIdentifyConditionCategory}"></select>
                                             </div>
                                         </div>
+                                        {/neq}
                                         <div class="rowGroup">
                                             <label class="col-sm-2 control-label spacing">原认定条件</label>
                                             <div class="col-sm-4 spacing">
-                                                <select class="form-control" disabled="disabled" id="oldIdentifyCondition" name="oldIdentifyCondition" value="${item.oldIdentifyCondition}"></select>
+                                                <select class="form-control" id="oldIdentifyCondition" disabled="disabled" name="oldIdentifyCondition" value="{$info.oldIdentifyCondition}" onchange="TalentTypeChangeInfoDlg.getIdentifyNeedsFileTypes(false)"></select>
                                             </div>
                                         </div>
+                                        {if condition="$info['type'] eq 2"}
                                         <div class="rowGroup">
-                                            <label class="col-sm-2 control-label spacing">原认定条件证书取得时间</label>
+                                            <label class="col-sm-2 control-label spacing">原认定条件名称</label>
+                                            <div class="col-sm-4 spacing">
+                                                <input class="form-control" id="oldIdentifyConditionName" readonly="readonly" name="oldIdentifyConditionName" value="{$info.oldIdentifyConditionName}"/>
+                                            </div>
+                                        </div>
+                                        {/if}
+                                        <div class="rowGroup" style="display: none">
+                                            <label class="col-sm-2 control-label spacing">新年薪</label>
                                             <div class="col-sm-4 spacing">
-                                                <input class="form-control" id="oldIdentifyGetTime" readonly="readonly" name="oldIdentifyGetTime" value="${item.oldIdentifyGetTime}"/>
+                                                <input class="form-control" id="oldAnnualSalary" name="oldAnnualSalary" value="{$info.oldAnnualSalary}"/>
                                             </div>
                                         </div>
                                         <div class="rowGroup">
-                                            <label class="col-sm-2 control-label spacing">原认定条件名称</label>
+                                            <label class="col-sm-2 control-label spacing">原认定条件证书取得时间</label>
                                             <div class="col-sm-4 spacing">
-                                                <input class="form-control " id="oldIdentifyConditionName" readonly="readonly" name="oldIdentifyConditionName" value="${item.oldIdentifyConditionName}"/>
+                                                <input class="form-control" id="oldIdentifyGetTime" readonly="readonly" name="oldIdentifyGetTime" value="{$info.oldIdentifyGetTime}"/>
                                             </div>
                                         </div>
                                         <div class="rowGroup">
                                             <label class="col-sm-2 control-label spacing">原公布入选月份</label>
                                             <div class="col-sm-4 spacing">
-                                                <input class="form-control " id="oldIdentifyMonth" readonly="readonly" name="oldIdentifyMonth" value="${item.oldIdentifyMonth}"/>
+                                                <input class="form-control" id="oldIdentifyMonth" readonly="readonly" name="oldIdentifyMonth" value="{$info.oldIdentifyGetTime}"/>
                                             </div>
                                         </div>
                                         <div class="rowGroup">
                                             <label class="col-sm-2 control-label spacing">原人才编号</label>
                                             <div class="col-sm-4 spacing">
-                                                <input class="form-control " id="oldCertificateNO" readonly="readonly" name="oldCertificateNO" value="${item.oldCertificateNO}"/>
+                                                <input class="form-control" id="oldCertificateNO" readonly="readonly" name="oldCertificateNO" value="{$info.oldCertificateNO}"/>
                                             </div>
                                         </div>
-                                        @if(item.type==1){
-                                        <div class="rowGroup">
+                                        {if condition="$info['type'] == 1"}
+                                        <div class="rowGroup" style="display: none">
                                             <label class="col-sm-2 control-label spacing">原泉州高层次人才证书发证日期</label>
                                             <div class="col-sm-4 spacing">
-                                                <input class="form-control" id="oldCertificateStartTime" readonly="readonly" name="oldCertificateStartTime" value="${item.oldCertificateStartTime}"/>
+                                                <input class="form-control" id="oldCertificateStartTime" readonly="readonly" name="oldCertificateStartTime" value="{$info.oldCertificateStartTime}"/>
                                             </div>
                                         </div>
-                                        <div class="rowGroup">
+                                        <div class="rowGroup" style="display: none">
                                             <label class="col-sm-2 control-label spacing">原泉州高层次人才证书的有效期</label>
                                             <div class="col-sm-4 spacing">
-                                                <input class="form-control " id="oldCertificateOutTime" readonly="readonly" name="oldCertificateOutTime" value="${item.oldCertificateOutTime}"/>
+                                                <input class="form-control" id="oldCertificateOutTime" readonly="readonly" name="oldCertificateOutTime" value="{$info.oldCertificateOutTime}"/>
                                             </div>
                                         </div>
                                         <div class="rowGroup">
                                             <label class="col-sm-2 control-label spacing">原引进方式</label>
                                             <div class="col-sm-4 spacing">
-                                                <select class="form-control" id="oldIntroductionMode" disabled="disabled" name="oldIntroductionMode" value="${item.oldIntroductionMode}">
+                                                <select class="form-control" id="oldIntroductionMode" disabled="disabled" name="oldIntroductionMode" value="{$info.oldIntroductionMode}">
                                                 </select>
                                             </div>
                                         </div>
                                         <div class="rowGroup">
                                             <label class="col-sm-2 control-label spacing">新申报来源</label>
                                             <div class="col-sm-4 spacing">
-                                                <select class="form-control" id="newSource" name="newSource" value="${item.newSource}" onchange="TalentTypeChangeInfoDlg.sourceChange()">
-                                                    <option value="">请选择</option>
-                                                    <option value="1">经我市申报并已经成功入选的泉州高层次人才</option>
-                                                    <option value="2">从我市以外的其他县(市、区)变动到我市工作的泉州市高层次人才</option>
-                                                    <option value="3">依据《晋江市优秀人才补充认定标准》申报认定</option>
+                                                <select class="form-control" disabled id="newSource" name="newSource" onchange="TalentTypeChangeInfoDlg.sourceChange(true)" value="{$info.newSource}">
                                                 </select>
                                             </div>
                                         </div>
-                                        <div class="rowGroup">
-                                            <label class="col-sm-2 control-label spacing">新公布入选来源</label>
+                                        <div class="rowGroup" style="display: none">
+                                            <label class="col-sm-2 control-label spacing">新入选来源地级市</label>
                                             <div class="col-sm-4 spacing">
-                                                <select class="form-control" id="newOurCitySource" name="newOurCitySource" value="${item.newOurCitySource}">
-                                                    <option value="">请选择</option>
-                                                    <option value="1">泉州市公布入选的泉州市第一至第五层次人才</option>
-                                                    <option value="2">晋江市公布入选的泉州市高层次第六七层次人才</option>
-                                                </select>
+                                                <select class="form-control" disabled id="newFromCity" name="newFromCity" value="{$info.newFromCity}"></select>
                                             </div>
                                         </div>
-                                        <div class="rowGroup">
-                                            <label class="col-sm-2 control-label spacing">新入选来源县市</label>
+                                        <div class="rowGroup" style="display: none">
+                                            <label class="col-sm-2 control-label spacing">新入选来源县市区</label>
                                             <div class="col-sm-4 spacing">
-                                                <select class="form-control" id="newFromCity" name="newFromCity" value="${item.newFromCity}"></select>
+                                                <select class="form-control" disabled id="newFromCounty" name="newFromCounty" value="{$info.newFromCounty}"></select>
                                             </div>
                                         </div>
-                                        <div class="rowGroup">
-                                            <label class="col-sm-2 control-label spacing">新入选名单批次</label>
-                                            <div class="col-sm-4 spacing">
-                                                <select class="form-control" id="newQzBath" name="newQzBath" value="${item.newQzBath}"></select>
-                                            </div>
-                                        </div>
-                                        @}
+                                        {/if}
                                         <div class="rowGroup">
                                             <label class="col-sm-2 control-label spacing">新人才层次</label>
                                             <div class="col-sm-4 spacing">
-                                                <select class="form-control" id="newTalentArrange" name="newTalentArrange" value="${item.newTalentArrange}" onchange="TalentTypeChangeInfoDlg.talentArrangeChange('newTalentArrange', 'newIdentifyCondition')"></select>
+                                                <select class="form-control" disabled="disabled" id="newTalentArrange" name="newTalentArrange" onchange="TalentTypeChangeInfoDlg.getLayerCatdByLayer(true);" value="{$info.newTalentArrange}"></select>
                                             </div>
                                         </div>
+                                        {neq name="info.type" value="2"}
                                         <div class="rowGroup">
-                                            <label class="col-sm-2 control-label spacing">新认定条件</label>
+                                            <label class="col-sm-2 control-label spacing">新人才条款</label>
                                             <div class="col-sm-4 spacing">
-                                                <select class="form-control" id="newIdentifyCondition" name="newIdentifyCondition" value="${item.newIdentifyCondition}"></select>
+                                                <select class="form-control" disabled="disabled" id="newIdentifyConditionCategory" name="newIdentifyConditionCategory" onchange="TalentTypeChangeInfoDlg.getIdentifyCondition(true)" value="{$info.newIdentifyConditionCategory}"></select>
                                             </div>
                                         </div>
+                                        {/neq}
                                         <div class="rowGroup">
-                                            <label class="col-sm-2 control-label spacing">新认定条件证书取得时间</label>
+                                            <label class="col-sm-2 control-label spacing">新认定条件</label>
                                             <div class="col-sm-4 spacing">
-                                                <input class="form-control date" id="newIdentifyGetTime" name="newIdentifyGetTime" value="${item.newIdentifyGetTime}"/>
+                                                <select class="form-control" disabled="disabled" id="newIdentifyCondition" name="newIdentifyCondition" onchange="TalentTypeChangeInfoDlg.getIdentifyNeedsFileTypes(true)" value="{$info.newIdentifyCondition}"></select>
                                             </div>
                                         </div>
+                                        {if condition="$info['type'] eq 2"}
                                         <div class="rowGroup">
                                             <label class="col-sm-2 control-label spacing">新认定条件名称</label>
                                             <div class="col-sm-4 spacing">
-                                                <input class="form-control" id="newIdentifyConditionName" name="newIdentifyConditionName" value="${item.newIdentifyConditionName}"/>
+                                                <input class="form-control" readonly="readonly" id="newIdentifyConditionName" name="newIdentifyConditionName" value="{$info.newIdentifyConditionName}" placeholder="例:获得国家一级职业资格(汽车维修工)"/>
                                             </div>
                                         </div>
-                                        @if(item.type==1){
-                                        <div class="rowGroup" >
-                                            <label class="col-sm-2 control-label spacing">新泉州高层次人才证书发证日期</label>
+                                        {/if}
+                                        <div class="rowGroup" style="display: none">
+                                            <label class="col-sm-2 control-label spacing">新年薪</label>
                                             <div class="col-sm-4 spacing">
-                                                <input class="form-control date" id="newCertificateStartTime" name="newCertificateStartTime" value="${item.newCertificateStartTime}"/>
+                                                <input class="form-control" readonly="readonly" id="newAnnualSalary" name="newAnnualSalary" value="{$info.newAnnualSalary}"/>
                                             </div>
                                         </div>
-                                        <div class="rowGroup" >
-                                            <label class="col-sm-2 control-label spacing">新泉州高层次人才证书的有效期</label>
+                                        <div class="rowGroup">
+                                            <label class="col-sm-2 control-label spacing">新认定条件证书取得时间</label>
                                             <div class="col-sm-4 spacing">
-                                                <input class="form-control date" id="newCertificateOutTime" name="newCertificateOutTime" value="${item.newCertificateOutTime}"/>
+                                                <input class="form-control date" readonly="readonly" id="newIdentifyGetTime" name="newIdentifyGetTime" value="{$info.newIdentifyGetTime}"/>
                                             </div>
                                         </div>
+                                        {if condition="$info['type'] == 1"}
                                         <div class="rowGroup">
                                             <label class="col-sm-2 control-label spacing">新引进方式</label>
                                             <div class="col-sm-4 spacing">
-                                                <select class="form-control" id="newIntroductionMode" name="newIntroductionMode" value="${item.newIntroductionMode}">
+                                                <select class="form-control" disabled="disabled" id="newIntroductionMode" name="newIntroductionMode" value="{$info.newIntroductionMode}">
                                                 </select>
                                             </div>
                                         </div>
-                                        @}
+                                        {/if}
                                     </div>
                                     <div class="row">
                                         <label class="col-sm-2 control-label spacing" style="text-align: left"></label>

+ 2 - 2
public/static/modular/gate/talentLibrary/talentTypeChange/talentTypeChange.js

@@ -17,11 +17,11 @@ TalentTypeChange.initColumn = function () {
         {title: '姓名', field: 'talentName', visible: true, align: 'center', valign: 'middle', width: "80px", 'class': 'uitd_showTip'},
         {title: '原公布入选月份', field: 'oldIdentifyMonth', visible: true, align: 'center', valign: 'middle', width: "90px", },
         {title: '原人才层次', field: 'oldTalentArrangeName', visible: true, align: 'center', valign: 'middle', width: "90px", 'class': 'uitd_showTip'},
-        {title: '原认定条件', field: 'oldIdentifyConditionName', visible: true, align: 'center', valign: 'middle', width: "120px", 'class': 'uitd_showTip'},
+        {title: '原认定条件', field: 'oldIdentifyCondition', visible: true, align: 'center', valign: 'middle', width: "120px", 'class': 'uitd_showTip'},
         {title: '原认定条件证书取得时间', field: 'oldIdentifyGetTime', visible: true, align: 'center', valign: 'middle', width: "130px", 'class': 'uitd_showTip'},
         {title: '新公布入选月份', field: 'newIdentifyMonth', visible: true, align: 'center', valign: 'middle', width: "80px"},
         {title: '新人才层次', field: 'newTalentArrangeName', visible: true, align: 'center', valign: 'middle', width: "80px"},
-        {title: '新认定条件', field: 'newIdentifyConditionName', visible: true, align: 'center', valign: 'middle', width: "120px", 'class': 'uitd_showTip'},
+        {title: '新认定条件', field: 'newIdentifyCondition', visible: true, align: 'center', valign: 'middle', width: "120px", 'class': 'uitd_showTip'},
         {title: '新认定条件证书取得时间', field: 'newIdentifyGetTime', visible: true, align: 'center', valign: 'middle', width: "130px"},
         {title: '审核状态', field: 'checkState', visible: true, align: 'center', valign: 'middle', width: "80px",
             formatter: function (value, row, index) {

+ 166 - 79
public/static/modular/gate/talentLibrary/talentTypeChange/talentTypeChange_info.js

@@ -70,10 +70,14 @@ TalentTypeChangeInfoDlg.collectData = function () {
             .set('oldSource')
             .set('oldFromCity')
             .set('oldFromCityName')
+            .set('oldFromCounty')
+            .set('oldFromCountyName')
             .set('oldQzBath')
             .set('oldOurCitySource')
             .set('oldTalentArrange')
+            .set('oldIdentifyConditionCategory')
             .set('oldIdentifyCondition')
+            .set('oldAnnualSalary')
             .set('oldIdentifyGetTime')
             // .set('oldIdentifyOutTime')
             .set('oldIdentifyConditionName')
@@ -84,10 +88,15 @@ TalentTypeChangeInfoDlg.collectData = function () {
             .set('oldIntroductionMode')
             .set('newSource')
             .set('newFromCity')
+            .set('newFromCityName')
+            .set('newFromCounty')
+            .set('newFomrCountyName')
             .set('newQzBath')
             .set('newOurCitySource')
             .set('newTalentArrange')
+            .set('newIdentifyConditionCategory')
             .set('newIdentifyCondition')
+            .set('newAnnualSalary')
             .set('newIdentifyGetTime')
             .set('newIdentifyConditionName')
             .set('newIdentifyMonth')
@@ -159,7 +168,7 @@ TalentTypeChangeInfoDlg.editSubmit = function (type) {
     if (!this.validate()) {
         return;
     }
-    var ajax = new $ax("/api/talentTypeChange/update", function (data) {
+    var ajax = new $ax("/enterprise/talentTypeChange/add", function (data) {
         if (data.code == "200") {
             if (type == 1) {
                 Feng.success(data.msg);
@@ -181,12 +190,12 @@ TalentTypeChangeInfoDlg.editSubmit = function (type) {
 
 //点击按钮初始化
 TalentTypeChangeInfoDlg.talentInfoDetail = function () {
+    var type = $("#type").val();
     var talentId = $("#talentId").val();
     if (Feng.isEmptyStr(talentId)) {
         talentId = $("#talentId").attr("value");
     }
     var ajax = new $ax("/enterprise/talent/detail/id/" + talentId, function (data) {
-        console.log(data)
         //$("#type").val(data.type);
         $("#enterpriseId").val(data.enterpriseId);
         $("#talentName").val(data.name);
@@ -194,6 +203,9 @@ TalentTypeChangeInfoDlg.talentInfoDetail = function () {
         $("#idCard").val(data.card_number);
         $("#enterpriseName").val(data.enterpriseName);
         $("#oldSource").val(data.source);
+        if (type == 1) {
+            $("#oldSource").change();
+        }
         //$("#oldOurCitySource").val(data.ourCitySource);
         $("#oldFromCity").val(data.sourceCityName);
         $("#oldFromCounty").val(data.sourceCountyName);
@@ -202,8 +214,13 @@ TalentTypeChangeInfoDlg.talentInfoDetail = function () {
         //$("#oldQzBath").val(data.qzBatch);
         $("#oldTalentType").val(data.talent_type);
         $("#oldTalentArrange").val(data.talent_arrange);
-        $("#oldTalentArrangeCategory").val(data.talentArrangeCatName);
-        $("#oldIdentifyCondition").val(data.talentConditionName);
+        $("#oldTalentArrange").change();
+        $("#oldIdentifyConditionCategory").val(data.talent_arrange_category);
+        if (type != 2) {
+            $("#oldIdentifyConditionCategory").change();
+        }
+        $("#oldIdentifyCondition").val(data.talent_condition);
+        $("#oldIdentifyCondition").change();
         $("#oldIdentifyConditionName").val(data.identifyConditionName);
         $("#oldAnnualSalary").val(data.annual_salary);
         $("#oldIdentifyGetTime").val(data.identifyGetTime);
@@ -266,44 +283,74 @@ TalentTypeChangeInfoDlg.talentArrangeChange = function (now, next, source) {
     $("#" + next).trigger('chosen:updated');
 }
 
-TalentTypeChangeInfoDlg.sourceChange = function () {
-    var source = $("#newSource").val();
-    $("#newFromCity").parent().parent().attr("style", "display:none");
-    $("#newFromCounty").parent().parent().attr("style", "display:none");
-    if (source == 3) {
-        $("#newFromCity").parent().parent().attr("style", "display:block");
-        $("#newFromCounty").val("");
-    }
-    if (source == 4) {
-        $("#newFromCounty").parent().parent().attr("style", "display:block");
-        $("#newFromCity").val("");
-    }
-    if (source == 5) {
-        $("#newFromCity").val("");
-        $("#newFromCounty").val("");
+TalentTypeChangeInfoDlg.sourceChange = function (isNew) {
+    if (isNew) {
+        var source = $("#newSource").val();
+        $("#newFromCity").parent().parent().attr("style", "display:none");
+        $("#newFromCounty").parent().parent().attr("style", "display:none");
+        if (source == 3) {
+            $("#newFromCity").parent().parent().attr("style", "display:block");
+            $("#newFromCounty").val("");
+        }
+        if (source == 4) {
+            $("#newFromCounty").parent().parent().attr("style", "display:block");
+            $("#newFromCity").val("");
+        }
+        if (source == 5) {
+            $("#newFromCity").val("");
+            $("#newFromCounty").val("");
+        }
+        $("#newTalentArrange").val("");
+        $("#newTalentArrangeCategory").html("<option value=''>---请选择---</option>");
+        $("#newIdentifyCondition").html("<option value=''>---请选择---</option>");
+        $("#newIdentifyCondition").trigger('chosen:updated');
+        TalentTypeChangeInfoDlg.isNewSalary = false;
+        $("#newAnnualSalary").parent().parent().css("display", "none");
+        //$("#newTalentArrange").val("").trigger("change");
+    } else {
+        var source = $("#oldSource").val();
+        $("#oldFromCity").parent().parent().attr("style", "display:none");
+        $("#oldFromCounty").parent().parent().attr("style", "display:none");
+        if (source == 3) {
+            $("#oldFromCity").parent().parent().attr("style", "display:block");
+            $("#oldFromCounty").val("");
+        }
+        if (source == 4) {
+            $("#oldFromCounty").parent().parent().attr("style", "display:block");
+            $("#oldFromCity").val("");
+        }
+        if (source == 5) {
+            $("#oldFromCity").val("");
+            $("#oldFromCounty").val("");
+        }
+        $("#oldTalentArrange").val("");
+        $("#oldIdentifyConditionCategory").html("<option value=''>---请选择---</option>");
+        $("#oldIdentifyCondition").html("<option value=''>---请选择---</option>");
+        $("#oldIdentifyCondition").trigger('chosen:updated');
+        TalentTypeChangeInfoDlg.isOldSalary = false;
+        $("#oldAnnualSalary").parent().parent().css("display", "none");
+        //$("#oldTalentArrange").val("").trigger("change");
     }
-    $("#newTalentArrange").val("");
-    $("#newTalentArrangeCategory").html("<option value=''>---请选择---</option>");
-    $("#newIdentifyCondition").html("<option value=''>---请选择---</option>");
-    $("#newIdentifyCondition").trigger('chosen:updated');
-    TalentTypeChangeInfoDlg.isSalary = false;
-    $("#newAnnualSalary").parent().parent().css("display", "none");
-    //$("#newTalentArrange").val("").trigger("change");
 }
 
-TalentTypeChangeInfoDlg.isSalary = false;
-TalentTypeChangeInfoDlg.getLayerCatdByLayer = function () {
+TalentTypeChangeInfoDlg.isNewSalary = false;
+TalentTypeChangeInfoDlg.isOldSalary = false;
+TalentTypeChangeInfoDlg.getLayerCatdByLayer = function (isNew) {
     var type = $("#type").val();
-    var source = $("#newSource").val();
+    var sourceElem = isNew ? "newSource" : "oldSource";
+    var arrangeElem = isNew ? "newTalentArrange" : "oldTalentArrange";
+    var conditionElem = isNew ? "newIdentifyCondition" : "oldIdentifyCondition";
+    var catElem = isNew ? "newIdentifyConditionCategory" : "oldIdentifyConditionCategory";
+    var source = $("#" + sourceElem).val();
     if (type == 1) {
         if (source == "" || typeof source == "undefined") {
-            $("#newTalentArrange").val("");
+            $("#" + arrangeElem).val("");
             return;
         }
-        $("#newIdentifyCondition").html("<option value=''>---请选择---</option>");
-        var level = $("#newTalentArrange").val();
+        $("#" + conditionElem).html("<option value=''>---请选择---</option>");
+        var level = $("#" + arrangeElem).val();
         Feng.addAjaxSelect({
-            "id": "newTalentArrangeCategory",
+            "id": catElem,
             "displayCode": "code",
             "displayName": "name",
             "type": "GET",
@@ -324,86 +371,126 @@ TalentTypeChangeInfoDlg.getLayerCatdByLayer = function () {
                     allowedCats = ["A+", "A1", "A2", "B", "B1", "B2", "C", "C1", "C2", "D", "D1", "D2", "E", "E1", "E2", "F", "G"];
                     break;
             }
-            for (var i = 0; i < $("#newTalentArrangeCategory option").length; i++) {
-                if (allowedCats.indexOf($("#newTalentArrangeCategory option").eq(i).val()) == -1) {
-                    $("#newTalentArrangeCategory option").eq(i).css("display", "none");
+            for (var i = 0; i < $("#" + catElem + " option").length; i++) {
+                if (allowedCats.indexOf($("#" + catElem + " option").eq(i).val()) == -1) {
+                    $("#" + catElem + " option").eq(i).css("display", "none");
                 }
             }
         }();
     } else if (type == 5 || type == 6) {
-        $("#newIdentifyCondition").html("<option value=''>---请选择---</option>");
-        var level = $("#newTalentArrange").val();
+        $("#" + conditionElem).html("<option value=''>---请选择---</option>");
+        var level = $("#" + arrangeElem).val();
         Feng.addAjaxSelect({
-            "id": "newTalentArrangeCategory",
+            "id": catElem,
             "displayCode": "code",
             "displayName": "name",
             "type": "GET",
             "url": Feng.ctxPath + "/common/api/getLayerCatsByLayer/level/" + level
         });
     } else {
-        var level = $("#newTalentArrange").val();
+        var level = $("#" + arrangeElem).val();
         Feng.addAjaxSelect({
-            "id": "newIdentifyCondition",
+            "id": conditionElem,
             "displayCode": "id",
             "displayName": "name",
             "type": "GET",
             "url": Feng.ctxPath + "/common/api/findIdentifyConditionByLevel/level/" + level
         });
     }
-    $("#newIdentifyCondition").trigger("chosen:updated");
+    $("#" + conditionElem).trigger("chosen:updated");
 
-    TalentTypeChangeInfoDlg.displaySalary();
+    TalentTypeChangeInfoDlg.displaySalary(isNew);
 }
-TalentTypeChangeInfoDlg.displaySalary = function () {
-    if (!TalentTypeChangeInfoDlg.isSalary || $("#newIdentifyCondition").val() == "" || $("#newIdentifyCondition").val() == "---请选择---") {
-        $("#newAnnualSalary").parent().parent().css("display", "none");
+TalentTypeChangeInfoDlg.displaySalary = function (isNew) {
+    if (isNew) {
+        if (!TalentTypeChangeInfoDlg.isNewSalary || $("#newIdentifyCondition").val() == "" || $("#newIdentifyCondition").val() == "---请选择---") {
+            $("#newAnnualSalary").parent().parent().css("display", "none");
+        } else {
+            $("#newAnnualSalary").parent().parent().css("display", "block");
+        }
     } else {
-        $("#newAnnualSalary").parent().parent().css("display", "block");
+        if (!TalentTypeChangeInfoDlg.isOldSalary || $("#oldIdentifyCondition").val() == "" || $("#oldIdentifyCondition").val() == "---请选择---") {
+            $("#oldAnnualSalary").parent().parent().css("display", "none");
+        } else {
+            $("#oldAnnualSalary").parent().parent().css("display", "block");
+        }
     }
 }
 /**
  * 获取人才认定
  */
-TalentTypeChangeInfoDlg.getIdentifyCondition = function () {
-    var level = $("#newTalentArrange").val();
-    var cat = $("#newTalentArrangeCategory").val();
-    Feng.addAjaxSelect({
-        "id": "newIdentifyCondition",
-        "displayCode": "id",
-        "displayName": "name",
-        "type": "GET",
-        "url": Feng.ctxPath + "/common/api/findIdentifyConditionByLevel/level/" + level + "/cat/" + cat
-    });
-    $("#newIdentifyCondition").trigger('chosen:updated');
-
-    TalentTypeChangeInfoDlg.displaySalary();
+TalentTypeChangeInfoDlg.getIdentifyCondition = function (isNew) {
+    if (isNew) {
+        var level = $("#newTalentArrange").val();
+        var cat = $("#newIdentifyConditionCategory").val();
+        Feng.addAjaxSelect({
+            "id": "newIdentifyCondition",
+            "displayCode": "id",
+            "displayName": "name",
+            "type": "GET",
+            "url": Feng.ctxPath + "/common/api/findIdentifyConditionByLevel/level/" + level + "/cat/" + cat
+        });
+        $("#newIdentifyCondition").trigger('chosen:updated');
+    } else {
+        var level = $("#oldTalentArrange").val();
+        var cat = $("#oldIdentifyConditionCategory").val();
+        Feng.addAjaxSelect({
+            "id": "oldIdentifyCondition",
+            "displayCode": "id",
+            "displayName": "name",
+            "type": "GET",
+            "url": Feng.ctxPath + "/common/api/findIdentifyConditionByLevel/level/" + level + "/cat/" + cat
+        });
+        $("#oldIdentifyCondition").trigger('chosen:updated');
+    }
+    TalentTypeChangeInfoDlg.displaySalary(isNew);
 }
 
-TalentTypeChangeInfoDlg.getIdentifyNeedsFileTypes = function () {
+TalentTypeChangeInfoDlg.getIdentifyNeedsFileTypes = function (isNew) {
     var type = $("#type").val();
-    var source = $("#newSource").val();
-    if (type == 1 && (source == "" || typeof source == "undefined")) {
-        //layer.alert("请先选择申报来源");
-        $("#newIdentifyCondition").val("");
-        $("#newIdentifyCondition").trigger('chosen:updated');
-        return;
+    if (isNew) {
+        var source = $("#newSource").val();
+        if (type == 1 && (source == "" || typeof source == "undefined")) {
+            //layer.alert("请先选择申报来源");
+            $("#newIdentifyCondition").val("");
+            $("#newIdentifyCondition").trigger('chosen:updated');
+            return;
+        }
+    } else {
+        var source = $("#oldSource").val();
+        if (type == 1 && (source == "" || typeof source == "undefined")) {
+            //layer.alert("请先选择申报来源");
+            $("#oldIdentifyCondition").val("");
+            $("#oldIdentifyCondition").trigger('chosen:updated');
+            return;
+        }
     }
-    TalentTypeChangeInfoDlg.ajaxGetConditionFile(source);
+    TalentTypeChangeInfoDlg.ajaxGetConditionFile(source, isNew);
 
-    TalentTypeChangeInfoDlg.displaySalary();
+    TalentTypeChangeInfoDlg.displaySalary(isNew);
 }
-TalentTypeChangeInfoDlg.ajaxGetConditionFile = function (source) {
-    var condition = $("#newIdentifyCondition option:selected").val();
+
+TalentTypeChangeInfoDlg.ajaxGetConditionFile = function (source, isNew) {
+    var condition = isNew ? $("#newIdentifyCondition option:selected").val() : $("#oldIdentifyCondition option:selected").val();
     if (condition != "") {
         var ajax = new $ax("/common/api/getTalentCondtionUploadFile", function (data) {
             if (data == null || data.length == 0) {
                 return;
             }
             if (typeof data.info != "undefined" && data.info.isSalary == 1) {
-                TalentTypeChangeInfoDlg.isSalary = true;
-                $("#newAnnualSalary").parent().parent().css("display", "block");
+                if (isNew) {
+                    TalentTypeChangeInfoDlg.isNewSalary = true;
+                    $("#newAnnualSalary").parent().parent().css("display", "block");
+                } else {
+                    TalentTypeChangeInfoDlg.isOldSalary = true;
+                    $("#oldAnnualSalary").parent().parent().css("display", "block");
+                }
             } else {
-                TalentTypeChangeInfoDlg.isSalary = false;
+                if (isNew) {
+                    TalentTypeChangeInfoDlg.isNewSalary = false;
+                } else {
+                    TalentTypeChangeInfoDlg.isOldSalary = false;
+                }
             }
         }, function (data) {
             Feng.error("查询失败!" + data.responseJSON.message + "!");
@@ -423,7 +510,7 @@ TalentTypeChangeInfoDlg.initFileTable = function () {
     queryData['type'] = $("#type").val();
     queryData['project'] = CONFIG.project_levelchange;
     $("#fileTable").bootstrapTable({
-        url: "/api/talentInfo/findUnCommonFileType",
+        url: "/common/api/findCommonFileType",
         method: 'POST',
         contentType: "application/x-www-form-urlencoded; charset=UTF-8",
         search: false, // 是否显示表格搜索,此搜索是客户端搜索,不会进服务端
@@ -456,7 +543,7 @@ TalentTypeChangeInfoDlg.initFileTable = function () {
             $("#fileTable").bootstrapTable('expandAllRows');
         },
         onExpandRow: function (index, row, $detail) {
-            var ajax = new $ax("/api/talentInfo/listTalentFile", function (data) {
+            var ajax = new $ax("/common/api/listTalentCommonFile", function (data) {
                 if (data == null || data.length == 0) {
                     return;
                 }
@@ -500,7 +587,7 @@ TalentTypeChangeInfoDlg.initFileTable = function () {
             });
             var queryData = {};
             queryData["mainId"] = $("#id").val();
-            queryData["fileTypeId"] = row.id;
+            queryData["typeId"] = row.id;
             ajax.set(queryData);
             ajax.start();
         }
@@ -543,7 +630,7 @@ TalentTypeChangeInfoDlg.upload = function (fileTypeId, fileId) {
         $("#fileId").val("");
     }
     $("#mainId").val(id);
-    $("#fileTypeId").val(fileTypeId);
+    $("#typeId").val(fileTypeId);
     var index = layer.load(0, {shade: false, time: 0});
     $("#index").val(index);
     $("#uploadForm").submit();
@@ -557,7 +644,7 @@ TalentTypeChangeInfoDlg.deleteFile = function (id, state) {
         return;
     }
     var operation = function () {
-        var ajax = new $ax("/common/api/deleteFile", function (data) {
+        var ajax = new $ax("/common/api/deleteTalentCommonFile", function (data) {
             if (data.code = 200) {
                 Feng.success(data.msg);
                 $("#fileTable").bootstrapTable("refresh", {});

+ 351 - 176
public/static/modular/gate/talentLibrary/talentTypeChange/talentTypeChange_select.js

@@ -2,10 +2,10 @@
  * 初始化人才类别变更详情对话框
  */
 var TalentTypeChangeInfoDlg = {
-    talentTypeChangeInfoData : {},
+    talentTypeChangeInfoData: {},
     validateFields: {
-        talentId: {validators: {notEmpty: {message: '申报对象不能为空' }}},
-        newTalentArrange : {validators: {notEmpty: {message: '新人才层次不能为空' }}},
+        talentId: {validators: {notEmpty: {message: '申报对象不能为空'}}},
+        newTalentArrange: {validators: {notEmpty: {message: '新人才层次不能为空'}}},
         newIdentifyCondition: {validators: {notEmpty: {message: '新人才认定条件不能为空'}}},
         newIdentifyConditionName: {
             validators: {
@@ -20,7 +20,7 @@ var TalentTypeChangeInfoDlg = {
 /**
  * 清除数据
  */
-TalentTypeChangeInfoDlg.clearData = function() {
+TalentTypeChangeInfoDlg.clearData = function () {
     this.talentTypeChangeInfoData = {};
 }
 
@@ -30,7 +30,7 @@ TalentTypeChangeInfoDlg.clearData = function() {
  * @param key 数据的名称
  * @param val 数据的具体值
  */
-TalentTypeChangeInfoDlg.set = function(key, val) {
+TalentTypeChangeInfoDlg.set = function (key, val) {
     this.talentTypeChangeInfoData[key] = (typeof val == "undefined") ? $("#" + key).val() : val;
     return this;
 }
@@ -41,179 +41,341 @@ TalentTypeChangeInfoDlg.set = function(key, val) {
  * @param key 数据的名称
  * @param val 数据的具体值
  */
-TalentTypeChangeInfoDlg.get = function(key) {
+TalentTypeChangeInfoDlg.get = function (key) {
     return $("#" + key).val();
 }
 
 /**
  * 关闭此对话框
  */
-TalentTypeChangeInfoDlg.close = function() {
+TalentTypeChangeInfoDlg.close = function () {
     parent.layer.close(window.parent.TalentTypeChange.layerIndex);
 }
 
 /**
  * 收集数据
  */
-TalentTypeChangeInfoDlg.collectData = function() {
+TalentTypeChangeInfoDlg.collectData = function () {
     this
-        .set('id')
-        .set('type')
-        .set('talentId')
-        .set('talentName')
-        .set('idCard')
-        .set('enterpriseId')
-        .set('enterpriseName')
-        .set('oldTalentArrange')
-        .set('oldIdentifyCondition')
-        .set('oldIdentifyGetTime')
-        .set('oldIdentifyOutTime')
-        .set('oldIdentifyConditionName')
-        .set('oldIdentifyMonth')
-        .set('oldCertificateNO')
-        .set('oldCertificateOutTime')
-        .set('oldIntroductionMode')
-        .set('newTalentArrange')
-        .set('newIdentifyCondition')
-        .set('newIdentifyGetTime')
-        .set('newIdentifyConditionName')
-        .set('newIdentifyMonth')
-        .set('newCertificateNO')
-        .set('newCertificateOutTime')
-        .set('newIntroductionMode')
-        .set('source');
+            .set('id')
+            .set('type')
+            .set('talentId')
+            .set('talentName')
+            .set('idCard')
+            .set('enterpriseId')
+            .set('enterpriseName')
+            .set('oldTalentArrange')
+            .set('oldIdentifyCondition')
+            .set('oldIdentifyGetTime')
+            .set('oldIdentifyOutTime')
+            .set('oldIdentifyConditionName')
+            .set('oldIdentifyMonth')
+            .set('oldCertificateNO')
+            .set('oldCertificateOutTime')
+            .set('oldIntroductionMode')
+            .set('newTalentArrange')
+            .set('newIdentifyCondition')
+            .set('newIdentifyGetTime')
+            .set('newIdentifyConditionName')
+            .set('newIdentifyMonth')
+            .set('newCertificateNO')
+            .set('newCertificateOutTime')
+            .set('newIntroductionMode')
+            .set('source');
 
 }
 
 
 
 //点击按钮初始化
-TalentTypeChangeInfoDlg.talentInfoDetail = function (){
+TalentTypeChangeInfoDlg.talentInfoDetail = function () {
+    var type = $("#type").val();
     var talentId = $("#talentId").val();
-    if(Feng.isEmptyStr(talentId)){
+    if (Feng.isEmptyStr(talentId)) {
         talentId = $("#talentId").attr("value");
     }
-    var ajax = new $ax(Feng.ctxPath + "/api/talentInfo/detail/"+talentId, function(data){
-        $("#source").val(data.source);
-        $("#type").val(data.type);
+    var ajax = new $ax(Feng.ctxPath + "/enterprise/talent/detail/id/" + talentId, function (data) {
         $("#enterpriseId").val(data.enterpriseId);
         $("#talentName").val(data.name);
-        $("#idCard").val(data.idCard);
+        $("#idCard").val(data.card_number);
         $("#enterpriseName").val(data.enterpriseName);
-        $("#oldTalentArrange").val(data.talentArrange).trigger("change");
-        $("#oldTalentType").val(data.talentType);
-        $("#oldIdentifyGetTime").val(data.identifyGetTime);
+        $("#oldSource").val(data.source);
+        $("#oldTalentType").val(data.talent_type);
+        $("#oldTalentArrange").val(data.talent_arrange);
+        $("#oldIdentifyConditionCategory").val(data.talent_arrange_category);
+        $("#oldIdentifyCondition").val(data.talent_condition);
         $("#oldIdentifyConditionName").val(data.identifyConditionName);
-        $("#oldCertificateNO").val(data.certificateNO);
-        $("#oldIdentifyCondition").val(data.identifyCondition);
-        $("#oldIdentifyOutTime").val(data.identifyOutTime);
+        $("#oldAnnualSalary").val(data.annual_salary);
+        $("#oldIdentifyGetTime").val(data.identifyGetTime);
+        $("#oldIdentifyOutTime").val(data.identifyExpireTime);
+        $("#oldCertificateNO").val(data.certificateNo);
+        $("#oldCertificateStartTime").val(data.certificateGetTime);
+        $("#oldCertificateOutTime").val(data.certificateExpireTime);
         $("#oldIdentifyMonth").val(data.identifyMonth);
-        $("#oldCertificateOutTime").val(data.qzgccrcActiveTime);
-        $("#oldIntroductionMode").val(data.introductionMode);
-        // $("#oldGygb").val(data.oldGygb);
-        // $("#oldLetterTime").val(data.oldLetterTime);
-        if(data.source==1){
-            $("#oldCertificateStartTime").parent().parent().attr("style","display:block");
-            $("#oldCertificateOutTime").parent().parent().attr("style","display:block");
-            $("#oldFromCity").parent().parent().attr("style","display:none");
-            $("#oldQzBath").parent().parent().attr("style","display:block");
-            $("#oldOurCitySource").parent().parent().attr("style","display:block");
-        }else if(data.source == 2){
-            $("#oldCertificateStartTime").parent().parent().attr("style","display:block");
-            $("#oldCertificateOutTime").parent().parent().attr("style","display:block");
-            $("#oldFromCity").parent().parent().attr("style","display:block");
-            $("#oldQzBath").parent().parent().attr("style","display:block");
-            $("#oldOurCitySource").parent().parent().attr("style","display:none");
-        }else if(data.source == 3){
-            $("#oldCertificateStartTime").parent().parent().attr("style","display:none");
-            $("#oldCertificateOutTime").parent().parent().attr("style","display:none");
-            $("#oldFromCity").parent().parent().attr("style","display:none");
-            $("#oldQzBath").parent().parent().attr("style","display:none");
-            $("#oldOurCitySource").parent().parent().attr("style","display:none");
+        $("#oldIntroductionMode").val(data.import_way);
+        if (data.enterpriseType == 1) {
+            var hide = [1, 2];
+            if (data.isMatchZhiren == 1) {
+                hide = [3, 4, 5];
+            }
+            for (var i in hide) {
+                $("#newSource option[value=" + hide[i] + "]").css("display", "none");
+            }
+            //toastr.success("符合晋江市现代产业体系人才补充认定标准的无需填写‘新泉州高层次人才证书发证日期’及‘新泉州高层次人才证书的有效期’。");
         }
-    },function(data){
+    }, function (data) {
         Feng.error("查询失败!" + data.responseJSON.message + "!");
     });
     ajax.set();
     ajax.start();
 }
-
-TalentTypeChangeInfoDlg.talentArrangeChange = function(now,next){
-    var level = $('#'+now).val();
-    var type = $("#type").val();
-    if(level==null||level==''){
-        $("#"+next).empty();
-        return;
+TalentTypeChangeInfoDlg.sourceChange = function (isNew) {
+    if (isNew) {
+        var source = $("#newSource").val();
+        $("#newFromCity").parent().parent().attr("style", "display:none");
+        $("#newFromCounty").parent().parent().attr("style", "display:none");
+        if (source == 3) {
+            $("#newFromCity").parent().parent().attr("style", "display:block");
+            $("#newFromCounty").val("");
+        }
+        if (source == 4) {
+            $("#newFromCounty").parent().parent().attr("style", "display:block");
+            $("#newFromCity").val("");
+        }
+        if (source == 5) {
+            $("#newFromCity").val("");
+            $("#newFromCounty").val("");
+        }
+        $("#newTalentArrange").val("");
+        $("#newTalentArrangeCategory").html("<option value=''>---请选择---</option>");
+        $("#newIdentifyCondition").html("<option value=''>---请选择---</option>");
+        $("#newIdentifyCondition").trigger('chosen:updated');
+        TalentTypeChangeInfoDlg.isNewSalary = false;
+        $("#newAnnualSalary").parent().parent().css("display", "none");
+        //$("#newTalentArrange").val("").trigger("change");
+    } else {
+        var source = $("#oldSource").val();
+        $("#oldFromCity").parent().parent().attr("style", "display:none");
+        $("#oldFromCounty").parent().parent().attr("style", "display:none");
+        if (source == 3) {
+            $("#oldFromCity").parent().parent().attr("style", "display:block");
+            $("#oldFromCounty").val("");
+        }
+        if (source == 4) {
+            $("#oldFromCounty").parent().parent().attr("style", "display:block");
+            $("#oldFromCity").val("");
+        }
+        if (source == 5) {
+            $("#oldFromCity").val("");
+            $("#oldFromCounty").val("");
+        }
+        $("#oldTalentArrange").val("");
+        $("#oldIdentifyConditionCategory").html("<option value=''>---请选择---</option>");
+        $("#oldIdentifyCondition").html("<option value=''>---请选择---</option>");
+        $("#oldIdentifyCondition").trigger('chosen:updated');
+        TalentTypeChangeInfoDlg.isOldSalary = false;
+        $("#oldAnnualSalary").parent().parent().css("display", "none");
+        //$("#oldTalentArrange").val("").trigger("change");
     }
-    Feng.addAjaxSelect({
-        "id": next,
-        "displayCode": "id",
-        "displayName": "name",
-        "type": "GET",
-        "url": Feng.ctxPath + "/api/common/findIdentifyConditionByLevel?talentLevel="+level+"&type="+type
-    });
 }
 
+TalentTypeChangeInfoDlg.isNewSalary = false;
+TalentTypeChangeInfoDlg.isOldSalary = false;
+TalentTypeChangeInfoDlg.getLayerCatdByLayer = function (isNew) {
+    var type = $("#type").val();
+    var sourceElem = isNew ? "newSource" : "oldSource";
+    var arrangeElem = isNew ? "newTalentArrange" : "oldTalentArrange";
+    var conditionElem = isNew ? "newIdentifyCondition" : "oldIdentifyCondition";
+    var catElem = isNew ? "newIdentifyConditionCategory" : "oldIdentifyConditionCategory";
+    var source = $("#" + sourceElem).val();
+    if (type == 1) {
+        if (source == "" || typeof source == "undefined") {
+            $("#" + arrangeElem).val("");
+            return;
+        }
+        $("#" + conditionElem).html("<option value=''>---请选择---</option>");
+        var level = $("#" + arrangeElem).val();
+        Feng.addAjaxSelect({
+            "id": catElem,
+            "displayCode": "code",
+            "displayName": "name",
+            "type": "GET",
+            "url": Feng.ctxPath + "/common/api/getLayerCatsByLayer/level/" + level
+        });
+        var layerFilter = function () {
+            let allowedCats = [];
+            switch (source) {
+                case "1":
+                case "3":
+                    allowedCats = ["A+", "A", "B", "C"];
+                    break;
+                case "2":
+                case "4":
+                    allowedCats = ["A1", "B1", "C1", "D1", "E1"];
+                    break;
+                case "5":
+                    allowedCats = ["A+", "A1", "A2", "B", "B1", "B2", "C", "C1", "C2", "D", "D1", "D2", "E", "E1", "E2", "F", "G"];
+                    break;
+            }
+            for (var i = 0; i < $("#" + catElem + " option").length; i++) {
+                if (allowedCats.indexOf($("#" + catElem + " option").eq(i).val()) == -1) {
+                    $("#" + catElem + " option").eq(i).css("display", "none");
+                }
+            }
+        }();
+    } else if (type == 5 || type == 6) {
+        $("#" + conditionElem).html("<option value=''>---请选择---</option>");
+        var level = $("#" + arrangeElem).val();
+        Feng.addAjaxSelect({
+            "id": catElem,
+            "displayCode": "code",
+            "displayName": "name",
+            "type": "GET",
+            "url": Feng.ctxPath + "/common/api/getLayerCatsByLayer/level/" + level
+        });
+    } else {
+        var level = $("#" + arrangeElem).val();
+        Feng.addAjaxSelect({
+            "id": conditionElem,
+            "displayCode": "id",
+            "displayName": "name",
+            "type": "GET",
+            "url": Feng.ctxPath + "/common/api/findIdentifyConditionByLevel/level/" + level
+        });
+    }
+    $("#" + conditionElem).trigger("chosen:updated");
 
-TalentTypeChangeInfoDlg.sourceChange = function(){
-    var source = $("#newSource").val();
-    if(source==1){
-        $("#newFromCity").parent().parent().attr("style","display:none");
-        $("#newQzBath").parent().parent().attr("style","display:block");
-        $("#newCertificateStartTime").parent().parent().attr("style","display:block");
-        $("#newCertificateOutTime").parent().parent().attr("style","display:block");
-        $("#newOurCitySource").parent().parent().attr("style","display:block");
-        $("#newFromCity").val("");
+    TalentTypeChangeInfoDlg.displaySalary(isNew);
+}
+TalentTypeChangeInfoDlg.displaySalary = function (isNew) {
+    if (isNew) {
+        if (!TalentTypeChangeInfoDlg.isNewSalary || $("#newIdentifyCondition").val() == "" || $("#newIdentifyCondition").val() == "---请选择---") {
+            $("#newAnnualSalary").parent().parent().css("display", "none");
+        } else {
+            $("#newAnnualSalary").parent().parent().css("display", "block");
+        }
+    } else {
+        if (!TalentTypeChangeInfoDlg.isOldSalary || $("#oldIdentifyCondition").val() == "" || $("#oldIdentifyCondition").val() == "---请选择---") {
+            $("#oldAnnualSalary").parent().parent().css("display", "none");
+        } else {
+            $("#oldAnnualSalary").parent().parent().css("display", "block");
+        }
+    }
+}
+/**
+ * 获取人才认定
+ */
+TalentTypeChangeInfoDlg.getIdentifyCondition = function (isNew) {
+    if (isNew) {
+        var level = $("#newTalentArrange").val();
+        var cat = $("#newIdentifyConditionCategory").val();
+        Feng.addAjaxSelect({
+            "id": "newIdentifyCondition",
+            "displayCode": "id",
+            "displayName": "name",
+            "type": "GET",
+            "url": Feng.ctxPath + "/common/api/findIdentifyConditionByLevel/level/" + level + "/cat/" + cat
+        });
+        $("#newIdentifyCondition").trigger('chosen:updated');
+    } else {
+        var level = $("#oldTalentArrange").val();
+        var cat = $("#oldIdentifyConditionCategory").val();
+        Feng.addAjaxSelect({
+            "id": "oldIdentifyCondition",
+            "displayCode": "id",
+            "displayName": "name",
+            "type": "GET",
+            "url": Feng.ctxPath + "/common/api/findIdentifyConditionByLevel/level/" + level + "/cat/" + cat
+        });
+        $("#oldIdentifyCondition").trigger('chosen:updated');
     }
-    if(source==2){
-        $("#newCertificateStartTime").parent().parent().attr("style","display:block");
-        $("#newCertificateOutTime").parent().parent().attr("style","display:block");
-        $("#newFromCity").parent().parent().attr("style","display:block");
-        $("#newQzBath").parent().parent().attr("style","display:block");
-        $("#newOurCitySource").parent().parent().attr("style","display:none");
-        $("#newOurCitySource").val("");
+    TalentTypeChangeInfoDlg.displaySalary(isNew);
+}
+
+TalentTypeChangeInfoDlg.getIdentifyNeedsFileTypes = function (isNew) {
+    var type = $("#type").val();
+    if (isNew) {
+        var source = $("#newSource").val();
+        if (type == 1 && (source == "" || typeof source == "undefined")) {
+            //layer.alert("请先选择申报来源");
+            $("#newIdentifyCondition").val("");
+            $("#newIdentifyCondition").trigger('chosen:updated');
+            return;
+        }
+    } else {
+        var source = $("#oldSource").val();
+        if (type == 1 && (source == "" || typeof source == "undefined")) {
+            //layer.alert("请先选择申报来源");
+            $("#oldIdentifyCondition").val("");
+            $("#oldIdentifyCondition").trigger('chosen:updated');
+            return;
+        }
     }
-    if(source==3||source==null||source==''){
-        $("#newCertificateStartTime").parent().parent().attr("style","display:none");
-        $("#newCertificateOutTime").parent().parent().attr("style","display:none");
-        $("#newFromCity").parent().parent().attr("style","display:none");
-        $("#newQzBath").parent().parent().attr("style","display:none");
-        $("#newOurCitySource").parent().parent().attr("style","display:none");
-        $("#newOurCitySource").val("");
-        $("#newCertificateStartTime").val('');
-        $("#newCertificateOutTime").val('');
-        $("#newFromCity").val("");
-        $("#newQzBath").val("");
+    TalentTypeChangeInfoDlg.ajaxGetConditionFile(source, isNew);
+
+    TalentTypeChangeInfoDlg.displaySalary(isNew);
+}
+
+TalentTypeChangeInfoDlg.ajaxGetConditionFile = function (source, isNew) {
+    var condition = isNew ? $("#newIdentifyCondition option:selected").val() : $("#oldIdentifyCondition option:selected").val();
+    if (condition != "") {
+        var ajax = new $ax("/common/api/getTalentCondtionUploadFile", function (data) {
+            if (data == null || data.length == 0) {
+                return;
+            }
+            if (typeof data.info != "undefined" && data.info.isSalary == 1) {
+                if (isNew) {
+                    TalentTypeChangeInfoDlg.isNewSalary = true;
+                    $("#newAnnualSalary").parent().parent().css("display", "block");
+                } else {
+                    TalentTypeChangeInfoDlg.isOldSalary = true;
+                    $("#oldAnnualSalary").parent().parent().css("display", "block");
+                }
+            } else {
+                if (isNew) {
+                    TalentTypeChangeInfoDlg.isNewSalary = false;
+                } else {
+                    TalentTypeChangeInfoDlg.isOldSalary = false;
+                }
+            }
+        }, function (data) {
+            Feng.error("查询失败!" + data.responseJSON.message + "!");
+        });
+        var queryData = {};
+        queryData["talent_condition"] = condition;
+        ajax.set(queryData);
+        ajax.start();
     }
 }
 
+
 //初始化附件类别表单
-TalentTypeChangeInfoDlg.initFileTable = function (){
+TalentTypeChangeInfoDlg.initFileTable = function () {
     var queryData = {};
     queryData['type'] = $("#type").val();
     queryData['project'] = CONFIG.project_levelchange;
     $("#fileTable").bootstrapTable({
-        url: Feng.ctxPath + "/api/talentInfo/findUnCommonFileType",
+        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,  				// 是否显示行间隔色
+        search: false, // 是否显示表格搜索,此搜索是客户端搜索,不会进服务端
+        showRefresh: false, // 是否显示刷新按钮
+        clickToSelect: true, // 是否启用点击选中行
+        singleSelect: true, // 设置True 将禁止多选
+        striped: true, // 是否显示行间隔色
         escape: true,
-        pagination: false,   			// 设置为 true 会在表格底部显示分页条
+        pagination: false, // 设置为 true 会在表格底部显示分页条
         paginationHAlign: "left",
         paginationDetailHAlign: "right",
-        sidePagination: "server",   	// 设置在哪里进行分页,可选值为 'client' 或者 'server'
+        sidePagination: "server", // 设置在哪里进行分页,可选值为 'client' 或者 'server'
         showColumns: false,
-        detailView: true,               //是否显示父子表
+        detailView: true, //是否显示父子表
         pageList: [10, 30, 50],
         queryParams: function (params) {
-            return $.extend(queryData,params)
+            return $.extend(queryData, params)
         },
         rowStyle: function (row, index) {
-            return {classes:"info"};
+            return {classes: "info"};
         },
         columns: TalentTypeChangeInfoDlg.initFileTypeColumn(),
         onPostBody: function () {
@@ -226,31 +388,31 @@ TalentTypeChangeInfoDlg.initFileTable = function (){
             $("#fileTable").bootstrapTable('expandAllRows');
         },
         onExpandRow: function (index, row, $detail) {
-            var ajax = new $ax(Feng.ctxPath + "/api/talentInfo/listTalentFile", function (data) {
-                if(data==null||data.length==0){
+            var ajax = new $ax(Feng.ctxPath + "/common/api/listTalentCommonFile", 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: 20%;font-weight: bold;padding-top: 5px;">预览</li>';
-                for(var key in data){
+                for (var key in data) {
                     var sn = data[key].url.lastIndexOf(".");
-                    var suffix = data[key].url.substring(sn+1,data[key].url.length);
+                    var suffix = data[key].url.substring(sn + 1, data[key].url.length);
                     var imgStr = "";
-                    if(suffix=="pdf"||suffix=="PDF"){
-                        imgStr = "<button type='button'  onclick=\"Feng.showPdf('"+data[key].url+"','"+data[key].id+"','"+data[key].orignName+"')\" class=\"btn btn-xs btn-danger\"><i class=\"fa fa-file-pdf-o\" aria-hidden=\"true\"></i></button>";
-                    }else if(suffix == "xlsx" || suffix=="XLSX" || suffix == 'xls' || suffix == 'XLS'){
-                        imgStr = "<button type='button'  onclick=\"Feng.showExcel('"+data[key].url+"','"+data[key].id+"','"+data[key].orignName+"')\" class=\"btn btn-xs btn-danger\"><i class=\"fa fa-file-excel-o\" aria-hidden=\"true\"></i></button>";
-                    }else{
-                        imgStr = '<img class=\"imgUrl\"  src=\"'+data[key].url+'\" style=\"width:25px;height:25px;\">';
+                    if (suffix == "pdf" || suffix == "PDF") {
+                        imgStr = "<button type='button'  onclick=\"Feng.showPdf('" + data[key].url + "','" + data[key].id + "','" + data[key].orignName + "')\" class=\"btn btn-xs btn-danger\"><i class=\"fa fa-file-pdf-o\" aria-hidden=\"true\"></i></button>";
+                    } else if (suffix == "xlsx" || suffix == "XLSX" || suffix == 'xls' || suffix == 'XLS') {
+                        imgStr = "<button type='button'  onclick=\"Feng.showExcel('" + data[key].url + "','" + data[key].id + "','" + data[key].orignName + "')\" class=\"btn btn-xs btn-danger\"><i class=\"fa fa-file-excel-o\" aria-hidden=\"true\"></i></button>";
+                    } else {
+                        imgStr = '<img class=\"imgUrl\"  src=\"' + data[key].url + '\" style=\"width:25px;height:25px;\">';
                     }
-                    html = html + '<li style="display: none">'+data[key].id+'</li>\n'+
-                        '<li style="width: 80%;padding-top: 5px;">'+data[key].orignName+'</li>\n'+
-                        '<li style="width: 20%;">'+imgStr+'</li>\n';
+                    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: 20%;">' + imgStr + '</li>\n';
                 }
                 html = html + '</ul>';
                 $detail.html(html);
                 $(".imgs").viewer({
                     // toolbar:false,
-                    fullscreen:false
+                    fullscreen: false
                 });
             }, function (data) {
                 Feng.error("查询失败!" + data.responseJSON.message + "!");
@@ -266,12 +428,12 @@ TalentTypeChangeInfoDlg.initFileTable = function (){
 }
 
 //校验是否保存基础信息
-TalentTypeChangeInfoDlg.validId = function (){
+TalentTypeChangeInfoDlg.validId = function () {
     var id = $("#id").val();
-    if(id!=null && id!=''){
+    if (id != null && id != '') {
         $("#fileLi").removeAttr("style");
-    }else{
-        $("#fileLi").attr("style","pointer-events: none");
+    } else {
+        $("#fileLi").attr("style", "pointer-events: none");
     }
 }
 
@@ -281,53 +443,64 @@ TalentTypeChangeInfoDlg.validId = function (){
  */
 TalentTypeChangeInfoDlg.initFileTypeColumn = function () {
     return [
-        {field: 'selectItem', checkbox:false,visible:false},
-        {title: '名称', field: 'name', visible: true, align: 'center', valign: 'middle',width:"30%",'class': 'uitd_showTip',
-            formatter : function(value,row,index){
-                if(row.must==1){
-                    return '<i class="fa fa-paste"></i><span style="font-weight:bold;color:red;font-size:14px;font-family:宋体"> * </span> '+ value;
-                }if(row.must==2){
-                    return '<i class="fa fa-paste"></i>'+value;
+        {field: 'selectItem', checkbox: false, visible: false},
+        {title: '名称', field: 'name', visible: true, align: 'center', valign: 'middle', width: "30%", 'class': 'uitd_showTip',
+            formatter: function (value, row, index) {
+                if (row.must == 1) {
+                    return '<i class="fa fa-paste"></i><span style="font-weight:bold;color:red;font-size:14px;font-family:宋体"> * </span> ' + value;
+                }
+                if (row.must == 2) {
+                    return '<i class="fa fa-paste"></i>' + value;
                 }
             }
         },
-        {title: '模板', field: 'templateUrl', visible: true, align: 'center', valign: 'middle',width:"8%",
-            formatter : function(value,row,index){
-                if(value==null||value==''||value=='null'){
+        {title: '模板', field: 'templateUrl', visible: true, align: 'center', valign: 'middle', width: "8%",
+            formatter: function (value, row, index) {
+                if (value == null || value == '' || value == 'null') {
                     return '无';
                 }
-                return "<button type='button' onclick=\"TalentTypeChangeInfoDlg.downloadFile('"+row.id+"',3)\" style='margin-right: 10px' class=\"btn btn-xs btn-primary\">" +
-                    "<i class=\"fa fa-download\"></i>下载" +
-                    "</button>";
+                return "<button type='button' onclick=\"TalentTypeChangeInfoDlg.downloadFile('" + row.id + "',3)\" style='margin-right: 10px' class=\"btn btn-xs btn-primary\">" +
+                        "<i class=\"fa fa-download\"></i>下载" +
+                        "</button>";
             }
         },
-        {title: '备注', field: 'description', visible: true, align: 'center', valign: 'middle',width:"52%",'class': 'uitd_showTip'},
+        {title: '备注', field: 'description', visible: true, align: 'center', valign: 'middle', width: "52%", 'class': 'uitd_showTip'},
     ]
 };
 
 
-TalentTypeChangeInfoDlg.downloadFile = function (id,type){
-    window.location.href = Feng.ctxPath + "/api/common/downloadFile?id=" + id + "&type="+type;
+TalentTypeChangeInfoDlg.downloadFile = function (id, type) {
+    window.location.href = Feng.ctxPath + "/api/common/downloadFile?id=" + id + "&type=" + type;
 }
 
 
 
-$(function() {
+$(function () {
     Feng.initValidator("talentTypeForm", TalentTypeChangeInfoDlg.validateFields);
     var arr = [
-        {"name":"oldTalentArrange","code":"un_talentLevel"},
-        {"name":"newTalentArrange","code":"un_talentLevel"},
-        {"name":"oldIntroductionMode","code":"un_introduction_mode"},
-        {"name":"newIntroductionMode","code":"un_introduction_mode"}];
+        {"name": "oldTalentArrange", "code": "talent_arrange"},
+        {"name": "newTalentArrange", "code": "talent_arrange"},
+        {"name": "oldIntroductionMode", "code": "import_way"},
+        {"name": "newIntroductionMode", "code": "import_way"},
+        {"name": "oldSource", "code": "source"},
+        {"name": "newSource", "code": "source"}];
     Feng.findChildDictBatch(JSON.stringify(arr));
     var id = $("#id").val();
-    //加载福建省泉州的
+    //加载福建省泉州的地级市
     Feng.addAjaxSelect({
         "id": "oldFromCity",
         "displayCode": "code",
         "displayName": "name",
         "type": "GET",
-        "url": Feng.ctxPath + "/api/commonLocation/findCountyByCitySelect/350500"
+        "url": "/common/tool/findChildAreaByCode/code/35/no/350500"
+    });
+    //加载福建省泉州的县市区
+    Feng.addAjaxSelect({
+        "id": "oldFromCounty",
+        "displayCode": "code",
+        "displayName": "name",
+        "type": "GET",
+        "url": "/common/tool/findChildAreaByCode/code/3505/no/350582"
     });
     //加载福建省泉州的县
     Feng.addAjaxSelect({
@@ -335,14 +508,17 @@ $(function() {
         "displayCode": "code",
         "displayName": "name",
         "type": "GET",
-        "url": Feng.ctxPath + "/api/commonLocation/findCountyByCitySelect/350500"
+        "url": "/common/tool/findChildAreaByCode/code/35/no/350500"
     });
-    var batchHtml = "<option value=''>请选择</option>";
-    for(var i=1;i<101;i++){
-        batchHtml = batchHtml + "<option value='"+i+"'>"+i+"</option>";
-    }
-    $("#oldQzBath,#newQzBath").append(batchHtml);
-    var url = (id==null||id=='')?"/api/talentInfo/findTalentInfoInLibrary/"+CONFIG.project_levelchange:"/api/talentInfo/findTalentInfoByChangeId/"+CONFIG.project_levelchange+"/"+id;
+    //加载福建省泉州的县
+    Feng.addAjaxSelect({
+        "id": "newFromCounty",
+        "displayCode": "code",
+        "displayName": "name",
+        "type": "GET",
+        "url": "/common/tool/findChildAreaByCode/code/3505/no/350582"
+    });
+    var url = (id == null || id == '') ? "/enterprise/talent/findTalentInfoInLibrary/type/" + CONFIG.project_levelchange : "/enterprise/talent/findTalentInfoByChangeId/type/" + CONFIG.project_levelchange + "/id/" + id;
     Feng.addAjaxSelect({
         "id": 'talentId',
         "displayCode": "id",
@@ -350,21 +526,20 @@ $(function() {
         "type": "GET",
         "url": Feng.ctxPath + url
     });
-    if(id!=null && id!=''){
+    if (id != null && id != '') {
         $("select").each(function () {
             $(this).val($(this).attr("value")).trigger("change");
         });
     }
-    $("#newIdentifyCondition").on('chosen:ready', function(e, params) {
-        $(".chosen-container-single .chosen-single").css("padding","4px 0px 0px 4px");
+    $("#newIdentifyCondition").on('chosen:ready', function (e, params) {
+        $(".chosen-container-single .chosen-single").css("padding", "4px 0px 0px 4px");
     });
     $("#newIdentifyCondition").chosen({
-        search_contains:true,       //关键字模糊搜索。设置为true,只要选项包含搜索词就会显示;设置为false,则要求从选项开头开始匹配
+        search_contains: true,       //关键字模糊搜索。设置为true,只要选项包含搜索词就会显示;设置为false,则要求从选项开头开始匹配
         disable_search: false,
-        width:"100%",
+        width: "100%",
         enable_split_word_search: true,
-        rtl:true
+        rtl: true
     });
     TalentTypeChangeInfoDlg.validId();
-    TalentTypeChangeInfoDlg.sourceChange();
 });