+

app/admin/controller/TalentTypeChange.php

@@ -8,6 +8,9 @@ use think\facade\Db;
 use app\enterprise\model\TalentTypeChange as ttcModel;
 use app\common\api\TalentConditionApi;
 use app\common\api\DictApi;
+use app\common\state\CommonConst;
+use app\common\state\ProjectState;
+use app\common\api\TalentLogApi;
 
 class TalentTypeChange extends AdminController {
 
@@ -48,6 +51,7 @@ class TalentTypeChange extends AdminController {
         $where = [];
         $this->setTalentTypeChange($where, $params);
         $this->setTypeChangeCheckStateCondition($where, $params, $process);
+        $whereRaw = "length(talentId) <> 19";
         if (in_array($this->user["type"], [1, 2, 5, 6])) {
             $where[] = ["type", "=", $this->user["type"]];
         }
@@ -79,8 +83,8 @@ class TalentTypeChange extends AdminController {
         }
 
         $levelMap = DictApi::selectByParentCode("talent_arrange");
-        $count = ttcModel::where($where)->count();
-        $list = ttcModel::where($where)->limit($offset, $limit)->order("createTime {$order}")->select();
+        $count = ttcModel::whereRaw($whereRaw)->where($where)->count();
+        $list = ttcModel::whereRaw($whereRaw)->where($where)->limit($offset, $limit)->order("createTime {$order}")->select();
         foreach ($list as $key => $item) {
             if ($item["beforeCheckCompany"]) {
                 $list[$key]["beforeCheckCompanyName"] = getCacheById("Company", $item["beforeCheckCompany"]);
@@ -111,9 +115,112 @@ class TalentTypeChange extends AdminController {
 
     public function toCommonCheck($id) {
         $info = ttcModel::find($id);
+        $arrangeMap = DictApi::selectByParentCode("talent_arrange");
+        $importMap = DictApi::selectByParentCode("import_way");
+        $info["oldTalentArrangeName"] = $arrangeMap[$info["oldTalentArrange"]];
+        $info["oldIntroductionModeName"] = $importMap[$info["oldIntroductionMode"]];
+        $info["newTalentArrangeName"] = $arrangeMap[$info["newTalentArrange"]];
+        $info["newIntroductionModeName"] = $importMap[$info["newIntroductionMode"]];
+        if ($info["type"] == CommonConst::ENTERPRISE_NORMAL) {
+            $sourceMap = DictApi::selectByParentCode("source");
+            $info["oldSourceName"] = $sourceMap[$info["oldSource"]];
+            $info["newSourceName"] = $sourceMap[$info["newSource"]];
+        }
+        if (in_array($info["type"], [CommonConst::ENTERPRISE_NORMAL, CommonConst::ENTERPRISE_WJ, CommonConst::ENTERPRISE_GJ])) {
+            $talentCatMap = DictApi::selectByParentCode("talent_condition_cats");
+            if (strlen($info["oldIdentifyCondition"]) == 19) {
+                $oldCondition = Db::table("un_identify_condition")->find($info["oldIdentifyCondition"]);
+                $info["oldIdentifyConditionCH"] = $oldCondition["name"];
+            } else {
+                $oldCondition = TalentConditionApi::getOne($info["oldIdentifyCondition"]);
+                $info["oldIdentifyConditionCategoryName"] = $talentCatMap[$oldCondition["talentLevelCat"]];
+                $info["oldIdentifyConditionCH"] = $oldCondition["name"];
+            }
+            if (strlen($info["newIdentifyCondition"]) == 19) {
+                $newCondition = Db::table("un_identify_condition")->find($info["newIdentifyCondition"]);
+                $info["newIdentifyConditionCH"] = $newCondition["name"];
+            } else {
+                $newCondition = TalentConditionApi::getOne($info["newIdentifyCondition"]);
+                $info["newIdentifyConditionCategoryName"] = $talentCatMap[$newCondition["talentLevelCat"]];
+                $info["newIdentifyConditionCH"] = $newCondition["name"];
+            }
+        }
         return view("", ["info" => $info]);
     }
 
+    public function validateIsCheck() {
+        $id = $this->request->param("id");
+        $companyId = $this->request->param("companyId");
+        $process = $this->request->param("process");
+        var_dump($process);exit();
+        $response = new \stdClass();
+        $response->code = 500;
+        $whr = [];
+        $whr[] = ["id", "=", $id];
+        $whr[] = ["type", "=", $this->user["type"]];
+        $whr[] = ["delete", "=", 0];
+        $info = ttcModel::where($whr)->find();
+        if (!$info || strlen($info["talentId"]) == 19) {
+            $response->msg = "没有对应的人才变更记录";
+            return $response;
+        }
+        $where = [];
+        $where[] = ["step", "=", $process];
+        $where[] = ["active", "=", 0];
+        $lastLog = [];
+        switch ($process) {
+            case -1:
+                if ($info["checkState"] != MainState::NEED_CHECK) {
+                    $response->msg = "该申报不在审核范围内，无法审核";
+                } else {
+                    $lastLog = TalentLogApi::getLastLogEx($id, ProjectState::LEVELCHANGE, 0, $where);
+                }
+                break;
+            case 1:
+                if ($info["checkState"] != MainState::NEED_FIRST_CHECK && $info["checkState"] != MainState::DEP_REJECT) {
+                    $response->msg = "该申报不在审核范围内，无法审核";
+                } else {
+                    $lastLog = TalentLogApi::getLastLogEx($id, ProjectState::LEVELCHANGE, 0, $where);
+                }
+                break;
+            case 2:
+                if ($info["checkState"] != MainState::NEED_DEP_CHECK) {
+                    $response->msg = "该申报不在审核范围内，无法审核";
+                } else {
+                    $where[] = ["companyId", "=", $companyId];
+                    $lastLog = TalentLogApi::getLastLogEx($id, ProjectState::LEVELCHANGE, 0, $where);
+                }
+                break;
+            case 3:
+                if ($info["checkState"] != MainState::NEED_THIRD) {
+                    $response->msg = "该申报不在审核范围内，无法审核";
+                } else {
+                    $lastLog = TalentLogApi::getLastLogEx($id, ProjectState::LEVELCHANGE, 0, $where);
+                }
+                break;
+            case 4:
+                break;
+        }
+        if ($response->code == 200) {
+            if ($lastLog) {
+                $info["checkState"] = $lastLog["state"];
+                $info["checkMsg"] = $lastLog["description"];
+            } else {
+                $info["checkState"] = null;
+                $info["checkMsg"] = "";
+            }
+            $response->data = $info;
+            $response->code = 200;
+
+            $whrFile = [];
+            $whrFile = ["type", "=", $info["type"]];
+            $whrFile = ["project", "=", ProjectState::LEVELCHANGE];
+            $whrFile = ["active", "=", 1];
+            $response->fileList = \app\common\model\FileType::where($whrFile)->order("sn asc")->select()->toArray();
+        }
+        return $response;
+    }
+
     private function setTalentTypeChange(&$where, $data) {
         if (\StrUtil::isNotEmpAndNull($data["talentName"])) {
             $where[] = ["talentName", "like", "%{$data["talentName"]}%"];

app/admin/view/talent/filesShow.html

@@ -42,6 +42,12 @@
         var queryData = {};
         queryData['project'] = project;
         queryData['type'] = type;
+        var listUrl = "/common/api/listTalentFile";
+        var field = "fileTypeId";
+        if (project == CONFIG.project_levelchange) {
+            listUrl = "/common/api/listTalentCommonFile";
+            field = "typeId";
+        }
         $("#fileTable2").bootstrapTable({
             url: Feng.ctxPath + "/common/api/findCommonFileType",
             method: 'POST',
@@ -88,7 +94,7 @@
                 $("#fileTable2").bootstrapTable('expandAllRows');
             },
             onExpandRow: function (index, row, $detail) {
-                var ajax = new $ax(Feng.ctxPath + "/common/api/listTalentFile", function (data) {
+                var ajax = new $ax(Feng.ctxPath + listUrl, function (data) {
                     if (data == null || data.length == 0) {
                         return;
                     }
@@ -120,7 +126,7 @@
                 });
                 var queryData = {};
                 queryData["mainId"] = id;
-                queryData["fileTypeId"] = row.id;
+                queryData[field] = row.id;
                 ajax.set(queryData);
                 ajax.start();
             }

public/static/modular/talentLibrary/talentTypeChange/talentTypeChange_before.js

@@ -2,8 +2,8 @@
  * 人才类别变更管理初始化
  */
 var TalentTypeChange = {
-    id: "TalentTypeChangeTable",	//表格id
-    seItem: null,		//选中的条目
+    id: "TalentTypeChangeTable", //表格id
+    seItem: null, //选中的条目
     table: null,
     layerIndex: -1
 };
@@ -14,44 +14,46 @@ var TalentTypeChange = {
 TalentTypeChange.initColumn = function () {
     return [
         {field: 'selectItem', radio: true},
-        {title: '姓名', field: 'talentName', visible: true, align: 'center', valign: 'middle','class': 'uitd_showTip',width:"100px"},
-        {title: '原人才层次', field: 'oldTalentArrangeName', visible: true, align: 'center', valign: 'middle','class': 'uitd_showTip',width:"100px"},
-        {title: '原认定条件', field: 'oldIdentifyConditionCH', visible: true, align: 'center', valign: 'middle','class': 'uitd_showTip',width:"130px"},
-        {title: '原认定条件证书取得时间', field: 'oldIdentifyGetTime', visible: true, align: 'center', valign: 'middle','class': 'uitd_showTip',width:"140px"},
-        {title: '原认定条件名称', field: 'oldIdentifyConditionName', visible: true, align: 'center', valign: 'middle','class': 'uitd_showTip',width:"140px"},
-        {title: '原公布入选月份', field: 'oldIdentifyMonth', visible: true, align: 'center', valign: 'middle','class': 'uitd_showTip',width:"100px"},
-        {title: '新人才层次', field: 'newTalentArrangeName', visible: true, align: 'center', valign: 'middle','class': 'uitd_showTip',width:"100px"},
-        {title: '新认定条件', field: 'newIdentifyConditionCH', visible: true, align: 'center', valign: 'middle','class': 'uitd_showTip',width:"140px"},
-        {title: '新认定条件证书取得时间', field: 'newIdentifyGetTime', visible: true, align: 'center', valign: 'middle','class': 'uitd_showTip',width:"140px"},
-        {title: '新认定条件名称', field: 'newIdentifyConditionName', visible: true, align: 'center', valign: 'middle','class': 'uitd_showTip',width:"130px"},
-        {title: '新公布入选月份', field: 'newIdentifyMonth', visible: true, align: 'center', valign: 'middle','class': 'uitd_showTip',width:"100px"},
-        {title: '审核状态', field: 'checkState', visible: true, align: 'center', valign: 'middle','class': 'uitd_showTip',width:"100px",
-            formatter : function (value,row,index) {
-                if(value==-1){
+        {title: '姓名', field: 'talentName', visible: true, align: 'center', valign: 'middle', 'class': 'uitd_showTip', width: "100px"},
+        {title: '原人才层次', field: 'oldTalentArrangeName', visible: true, align: 'center', valign: 'middle', 'class': 'uitd_showTip', width: "100px"},
+        {title: '原认定条件', field: 'oldIdentifyConditionCH', visible: true, align: 'center', valign: 'middle', 'class': 'uitd_showTip', width: "130px"},
+        {title: '原认定条件证书取得时间', field: 'oldIdentifyGetTime', visible: true, align: 'center', valign: 'middle', 'class': 'uitd_showTip', width: "140px"},
+        {title: '原认定条件名称', field: 'oldIdentifyConditionName', visible: true, align: 'center', valign: 'middle', 'class': 'uitd_showTip', width: "140px"},
+        {title: '原公布入选月份', field: 'oldIdentifyMonth', visible: true, align: 'center', valign: 'middle', 'class': 'uitd_showTip', width: "100px"},
+        {title: '新人才层次', field: 'newTalentArrangeName', visible: true, align: 'center', valign: 'middle', 'class': 'uitd_showTip', width: "100px"},
+        {title: '新认定条件', field: 'newIdentifyConditionCH', visible: true, align: 'center', valign: 'middle', 'class': 'uitd_showTip', width: "140px"},
+        {title: '新认定条件证书取得时间', field: 'newIdentifyGetTime', visible: true, align: 'center', valign: 'middle', 'class': 'uitd_showTip', width: "140px"},
+        {title: '新认定条件名称', field: 'newIdentifyConditionName', visible: true, align: 'center', valign: 'middle', 'class': 'uitd_showTip', width: "130px"},
+        {title: '新公布入选月份', field: 'newIdentifyMonth', visible: true, align: 'center', valign: 'middle', 'class': 'uitd_showTip', width: "100px"},
+        {title: '审核状态', field: 'checkState', visible: true, align: 'center', valign: 'middle', 'class': 'uitd_showTip', width: "100px",
+            formatter: function (value, row, index) {
+                if (value == -1) {
                     return "<span class='label label-warning-light'>审核不通过</span>";
                 }
-                if(row.firstBeforeSubmitTime==null || row.firstBeforeSubmitTime==''){
-                    if(value==1){
+                if (row.firstBeforeSubmitTime == null || row.firstBeforeSubmitTime == '') {
+                    if (value == 1) {
                         return "<span class='label'>待提交</span>"
-                    }if(value==3){
-                        if(row.highProcess!=null && row.highProcess!=''){
+                    }
+                    if (value == 3) {
+                        if (row.highProcess != null && row.highProcess != '') {
                             return "<span class='label label-success'>重新提交</span>"
-                        }else{
+                        } else {
                             return "<span class='label label-success'>待审核</span>"
                         }
-                    }if(value==5){
+                    }
+                    if (value == 5) {
                         return "<span class='label label-danger'>已驳回</span>"
                     }
-                }else{
+                } else {
                     return "<span class='label label-primary'>已通过</span>"
                 }
             }
         },
-        {title: '操作', field: 'id', visible: true, align: 'center', valign: 'middle',width:"80px",
-            formatter: function (value,row,index) {
-                return "<span class='label label-success' onclick=\"TalentTypeChange.showLog('"+value+"')\" >" +
-                    "<i class=\"fa fa-book\"></i>日志" +
-                    "</span>";
+        {title: '操作', field: 'id', visible: true, align: 'center', valign: 'middle', width: "80px",
+            formatter: function (value, row, index) {
+                return "<span class='label label-success' onclick=\"TalentTypeChange.showLog('" + value + "')\" >" +
+                        "<i class=\"fa fa-book\"></i>日志" +
+                        "</span>";
             }
         },
     ];
@@ -62,10 +64,10 @@ TalentTypeChange.initColumn = function () {
  */
 TalentTypeChange.check = function () {
     var selected = $('#' + this.id).bootstrapTable('getSelections');
-    if(selected.length == 0){
+    if (selected.length == 0) {
         Feng.info("请先选中表格中的某一记录！");
         return false;
-    }else{
+    } else {
         TalentTypeChange.seItem = selected[0];
         return true;
     }
@@ -82,13 +84,13 @@ TalentTypeChange.openTalentTypeChangeCheck = function () {
             area: ['800px', '420px'], //宽高
             fix: false, //不固定
             maxmin: true,
-            content: Feng.ctxPath + '/talentTypeChange/toCommonCheck/' + TalentTypeChange.seItem.id + '/-1',
-            btn: ['<i class="fa fa-eye"></i>&nbsp;&nbsp;保存未提交','<i class="fa fa-save layui-bg-green"></i>&nbsp;&nbsp;提交审核' ,'<i class="fa fa-eraser"></i>&nbsp;&nbsp;关闭'],
+            content: Feng.ctxPath + '/admin/talentTypeChange/toCommonCheck/id/' + TalentTypeChange.seItem.id + '/process/-1',
+            btn: ['<i class="fa fa-eye"></i>&nbsp;&nbsp;保存未提交', '<i class="fa fa-save layui-bg-green"></i>&nbsp;&nbsp;提交审核', '<i class="fa fa-eraser"></i>&nbsp;&nbsp;关闭'],
             btnAlign: 'c',
             btn1: function (index, layero) {
                 var obj = layero.find("iframe")[0].contentWindow;
                 obj.TalentTypeChangeInfoDlg.showCommonCheckModal();
-            },btn2: function(index, layero){
+            }, btn2: function (index, layero) {
                 var obj = layero.find("iframe")[0].contentWindow;
                 obj.TalentTypeChangeInfoDlg.submitCheck();
                 return false;
@@ -110,7 +112,7 @@ TalentTypeChange.openTalentTypeChangeDetail = function () {
             area: ['800px', '420px'], //宽高
             fix: false, //不固定
             maxmin: true,
-            content: Feng.ctxPath + '/talentTypeChange/talentTypeChange_detail/' + TalentTypeChange.seItem.id,
+            content: Feng.ctxPath + '/admin/talentTypeChange/detail/id/' + TalentTypeChange.seItem.id,
         });
         this.layerIndex = index;
         layer.full(index);
@@ -121,7 +123,7 @@ TalentTypeChange.openTalentTypeChangeDetail = function () {
 
 $(function () {
     var defaultColunms = TalentTypeChange.initColumn();
-    var table = new BSTable(TalentTypeChange.id, "/talentTypeChange/list/-1", defaultColunms);
+    var table = new BSTable(TalentTypeChange.id, "/admin/talentTypeChange/list/process/-1", defaultColunms);
     table.setPaginationType("server");
     table.setOnDblClickRow(function () {
         TalentTypeChange.openTalentTypeChangeCheck();

public/static/modular/talentLibrary/talentTypeChange/talentTypeChange_common_check.js

@@ -3,20 +3,20 @@
  */
 var locked = false;
 var TalentTypeChangeInfoDlg = {
-    talentTypeChangeInfoData : {},
+    talentTypeChangeInfoData: {},
 };
 
 /**
  * 关闭此对话框
  */
-TalentTypeChangeInfoDlg.close = function() {
+TalentTypeChangeInfoDlg.close = function () {
     parent.layer.close(window.parent.TalentTypeChange.layerIndex);
 }
 
 
 //初始化附件类别表单
-TalentTypeChangeInfoDlg.initFileTable = function (){
-    Feng.showMiniFileModal(CONFIG.project_levelchange,$("#type").val(),$("#id").val());
+TalentTypeChangeInfoDlg.initFileTable = function () {
+    Feng.showMiniFileModal(CONFIG.project_levelchange, $("#type").val(), $("#id").val());
     var queryData = {};
     queryData['type'] = $("#type").val();
     queryData['project'] = CONFIG.project_levelchange;
@@ -24,24 +24,24 @@ TalentTypeChangeInfoDlg.initFileTable = function (){
         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 () {
@@ -55,31 +55,31 @@ TalentTypeChangeInfoDlg.initFileTable = function (){
         },
         onExpandRow: function (index, row, $detail) {
             var ajax = new $ax(Feng.ctxPath + "/common/api/listTalentCommonFile", function (data) {
-                if(data==null||data.length==0){
+                if (data == null || data.length == 0) {
                     return;
                 }
                 var html = '<ul class="imgs"><li style="width: 80%;font-weight: bold;padding-top: 5px;">附件原名</li><li style="width: 10%;font-weight: bold;padding-top: 5px;">预览</li><li style="width: 10%;font-weight: bold;padding-top: 5px;">操作</li>';
-                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: 10%;">'+imgStr+'</li>\n'+
-                        "<li style='width: 10%;padding-top: 2px;'><button type='button' onclick=\"TalentTypeChangeInfoDlg.downloadFile('"+data[key].id+"')\" class=\"btn btn-xs btn-success\"><i class=\"fa fa-download\" aria-hidden=\"true\"></i>下载</button></li>";
+                    html = html + '<li style="display: none">' + data[key].id + '</li>\n' +
+                            '<li style="width: 80%;padding-top: 5px;">' + data[key].orignName + '</li>\n' +
+                            '<li style="width: 10%;">' + imgStr + '</li>\n' +
+                            "<li style='width: 10%;padding-top: 2px;'><button type='button' onclick=\"TalentTypeChangeInfoDlg.downloadFile('" + data[key].id + "')\" class=\"btn btn-xs btn-success\"><i class=\"fa fa-download\" aria-hidden=\"true\"></i>下载</button></li>";
                 }
                 html = html + '</ul>';
                 $detail.html(html);
                 $(".imgs").viewer({
                     // toolbar:false,
-                    fullscreen:false
+                    fullscreen: false
                 });
             }, function (data) {
                 Feng.error("查询失败!" + data.responseJSON.message + "!");
@@ -98,60 +98,61 @@ TalentTypeChangeInfoDlg.initFileTable = function (){
  */
 TalentTypeChangeInfoDlg.initFileTypeColumn = function () {
     return [
-        {field: 'selectItem', checkbox:false,visible:false},
-        {title: '名称', field: 'name', visible: true, align: 'center', valign: 'middle',width:"15%",'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: "15%", '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: 'description', visible: true, align: 'center', valign: 'middle',width:"67%",'class': 'uitd_showTip'},
-        {title: '模板', field: 'templateUrl', visible: true, align: 'center', valign: 'middle',width:"8%",
-            formatter : function(value,row,index){
-                if(value==null||value==''||value=='null'){
+        {title: '备注', field: 'description', visible: true, align: 'center', valign: 'middle', width: "67%", 'class': 'uitd_showTip'},
+        {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('"+value+"')\" style='margin-right: 10px' class=\"btn btn-xs btn-primary\">" +
-                    "<i class=\"fa fa-download\"></i>下载" +
-                    "</button>";
+                return "<button type='button' onclick=\"TalentTypeChangeInfoDlg.downloadFile('" + value + "')\" style='margin-right: 10px' class=\"btn btn-xs btn-primary\">" +
+                        "<i class=\"fa fa-download\"></i>下载" +
+                        "</button>";
             }
         },
     ]
 };
 
-TalentTypeChangeInfoDlg.downloadFile = function (id){
-    window.location.href = Feng.ctxPath + "/api/talentInfo/downloadFile?id=" + id;
+TalentTypeChangeInfoDlg.downloadFile = function (id) {
+    window.location.href = Feng.ctxPath + "/common/api/downloadFile?id=" + id;
 }
 
 /**
  * 显示审核模态框
  */
-TalentTypeChangeInfoDlg.showCommonCheckModal = function (){
-    var ajax = new $ax(Feng.ctxPath + "/talentTypeChange/validateIsCheck", function (data) {
-        if(data.code==200){
+TalentTypeChangeInfoDlg.showCommonCheckModal = function () {
+    var ajax = new $ax(Feng.ctxPath + "/admin/talentTypeChange/validateIsCheck", function (data) {
+        if (data.code == 200) {
             layer.open({
                 type: 1,
-                id:"neewFieldFormModel",
+                id: "neewFieldFormModel",
                 title: '审核',
                 area: ['800px', '350px'], //宽高
                 fix: false, //不固定
-                shade:0,
+                shade: 0,
                 maxmin: true,
                 content: TalentTypeChangeInfoDlg.createNoFieldCheckModal(),
-                btn: ['<i class="fa fa-save"></i>&nbsp;&nbsp;提交' ,'<i class="fa fa-eraser"></i>&nbsp;&nbsp;关闭'],
+                btn: ['<i class="fa fa-save"></i>&nbsp;&nbsp;提交', '<i class="fa fa-eraser"></i>&nbsp;&nbsp;关闭'],
                 btnAlign: 'c',
                 zIndex: layer.zIndex,
-                success:function(layero, index){
+                success: function (layero, index) {
                     layer.setTop(layero);
                     $("#commonCheckForm")[0].reset();
                     var process = $("#process").val();
-                    if(process==2){
+                    if (process == 2) {
                         var html = '<option value=""></option>\n' +
-                            '                            <option value="3">审核通过</option>\n' +
-                            '                            <option value="2">审核驳回</option>';
+                                '                            <option value="3">审核通过</option>\n' +
+                                '                            <option value="2">审核驳回</option>';
                         $("#checkStateModal").empty().append(html);
                     }
                     $("#checkStateModal").val(data.obj.checkState);
@@ -161,74 +162,75 @@ TalentTypeChangeInfoDlg.showCommonCheckModal = function (){
                     TalentTypeChangeInfoDlg.commonCheck(index);
                 }
             });
-        }else{
+        } else {
             Feng.error(data.msg);
         }
     }, function (data) {
         Feng.error("校验失败!" + data.responseJSON.message + "!");
     });
-    ajax.setData({"id":$("#id").val(),"process":$("#process").val(),"companyId":$("#companyId").val()})
+    ajax.setData({"id": $("#id").val(), "process": $("#process").val(), "companyId": $("#companyId").val()})
     ajax.start();
 }
 
 /**
  * 显示初审审核模态框
  */
-TalentTypeChangeInfoDlg.showFirstCheckModal = function (){
+TalentTypeChangeInfoDlg.showFirstCheckModal = function () {
     var process = $("#process").val();
-    var ajax = new $ax(Feng.ctxPath + "/talentTypeChange/validateIsCheck", function (data) {
-        if(data.code==200){
+    var ajax = new $ax(Feng.ctxPath + "/admin/talentTypeChange/validateIsCheck", function (data) {
+        if (data.code == 200) {
             layer.open({
                 type: 1,
-                id:"neewFieldFormModel",
+                id: "neewFieldFormModel",
                 title: '审核',
                 area: ['800px', '450px'], //宽高
                 fix: false, //不固定
-                shade:0,
+                shade: 0,
                 maxmin: true,
-                content:TalentTypeChangeInfoDlg.creatFieldCheckModal(),
-                btn: ['<i class="fa fa-save"></i>&nbsp;&nbsp;提交' ,'<i class="fa fa-eraser"></i>&nbsp;&nbsp;关闭'],
+                content: TalentTypeChangeInfoDlg.creatFieldCheckModal(),
+                btn: ['<i class="fa fa-save"></i>&nbsp;&nbsp;提交', '<i class="fa fa-eraser"></i>&nbsp;&nbsp;关闭'],
                 btnAlign: 'c',
                 zIndex: layer.zIndex,
-                success:function(layero, index){
+                success: function (layero, index) {
                     layer.setTop(layero);
                     var obj = data.obj.talentInfo;
                     var fileList = data.obj.fileList;
                     var html = '';
-                    for(var key in fileList){
-                        html = html + '<ul><li style="width: 100%"><input type="checkbox" value="'+fileList[key].id+'"><span>'+fileList[key].name+'</span></li></ul>';
+                    for (var key in fileList) {
+                        html = html + '<ul><li style="width: 100%"><input type="checkbox" value="' + fileList[key].id + '"><span>' + fileList[key].name + '</span></li></ul>';
                     }
                     $("#field_file").empty().append(html);
                     var optionHtml = "";
-                    if(process == 1){
+                    if (process == 1) {
                         optionHtml = '<option value="">请选择</option>\n' +
-                            '                            <option value="3">审核通过</option>\n' +
-                            '                            <option value="2">审核驳回</option>\n' ;
-                    }if(process == 3){
+                                '                            <option value="3">审核通过</option>\n' +
+                                '                            <option value="2">审核驳回</option>\n';
+                    }
+                    if (process == 3) {
                         optionHtml = '<option value="">请选择</option>\n' +
-                            '                            <option value="3">审核通过</option>\n' +
-                            '                            <option value="2">审核驳回</option>\n' +
-                            '                            <option value="-1">审核不通过</option>';
+                                '                            <option value="3">审核通过</option>\n' +
+                                '                            <option value="2">审核驳回</option>\n' +
+                                '                            <option value="-1">审核不通过</option>';
                     }
                     $("#checkStateFirstModal").empty().append(optionHtml);
                     $("#firstCheckForm")[0].reset();
                     $("#checkStateFirstModal").val(obj.checkState);
                     $("#checkStateFirstModal").trigger("change");
                     $("#checkMsgFirst").val(obj.checkMsg);
-                    if(obj.fields!=null && obj.fields!=''){
+                    if (obj.fields != null && obj.fields != '') {
                         $("#field_info input").each(function () {
                             var arr = obj.fields.split(",");
-                            for(var key in arr){
-                                if($(this).val()==arr[key]){
+                            for (var key in arr) {
+                                if ($(this).val() == arr[key]) {
                                     this.checked = true;
                                 }
                             }
                         });
                     }
-                    if(obj.files!=null && obj.files!=''){
+                    if (obj.files != null && obj.files != '') {
                         $("#field_file input").each(function () {
-                            if(obj.files.indexOf($(this).val())!=-1){
-                                this.checked=true;
+                            if (obj.files.indexOf($(this).val()) != -1) {
+                                this.checked = true;
                             }
                         });
                     }
@@ -237,13 +239,13 @@ TalentTypeChangeInfoDlg.showFirstCheckModal = function (){
                     TalentTypeChangeInfoDlg.firstCheck(index);
                 }
             });
-        }else{
+        } else {
             Feng.error(data.msg);
         }
     }, function (data) {
         Feng.error("校验失败!" + data.responseJSON.message + "!");
     });
-    ajax.setData({"id":$("#id").val(),"process":process,"companyId":$("#companyId").val()})
+    ajax.setData({"id": $("#id").val(), "process": process, "companyId": $("#companyId").val()})
     ajax.start();
 }
 
@@ -251,88 +253,88 @@ TalentTypeChangeInfoDlg.showFirstCheckModal = function (){
 TalentTypeChangeInfoDlg.creatFieldCheckModal = function () {
     var type = $("#type").val();
     var html = "<form id=\"firstCheckForm\" style=\"margin: 10px;\">\n" +
-        "                    <div class=\"form-group\">\n" +
-        "                        <label for=\"checkState\" class=\"control-label\">审核状态</label>\n" +
-        "                        <select class=\"form-control\" id=\"checkStateFirstModal\" onchange=\"TalentTypeChangeInfoDlg.toggleField()\">\n" +
-        "                            <option value=\"\"></option>\n" +
-        "                            <option value=\"3\">审核通过</option>\n" +
-        "                            <option value=\"2\">审核驳回</option>\n" +
-        "                            <option value=\"-1\">审核不通过</option>\n" +
-        "                        </select>\n" +
-        "                    </div>\n" +
-        "                    <div class=\"form-group\">\n" +
-        "                        <label for=\"checkMsg\" class=\"control-label\">审核意见</label>\n" +
-        "                        <textarea class=\"form-control\" id=\"checkMsgFirst\" rows='6' placeholder=\"审核状态属“审核通过”的，仅代表此步骤已操作完成，不代表用户提交的信息符合认定条件。若不符合认定条件的，请写明不符合原因。\"></textarea>\n" +
-        "                    </div>\n" +
-        "                    <div class=\"form-group\" id=\"field\" style=\"display: none\">\n" +
-        "                        <label for=\"checkMsg\" class=\"control-label\">可修改字段</label>\n" +
-        "                        <div id=\"field_info\">\n" +
-        "                            <ul>\n" ;
-    if(type == 1){
+            "                    <div class=\"form-group\">\n" +
+            "                        <label for=\"checkState\" class=\"control-label\">审核状态</label>\n" +
+            "                        <select class=\"form-control\" id=\"checkStateFirstModal\" onchange=\"TalentTypeChangeInfoDlg.toggleField()\">\n" +
+            "                            <option value=\"\"></option>\n" +
+            "                            <option value=\"3\">审核通过</option>\n" +
+            "                            <option value=\"2\">审核驳回</option>\n" +
+            "                            <option value=\"-1\">审核不通过</option>\n" +
+            "                        </select>\n" +
+            "                    </div>\n" +
+            "                    <div class=\"form-group\">\n" +
+            "                        <label for=\"checkMsg\" class=\"control-label\">审核意见</label>\n" +
+            "                        <textarea class=\"form-control\" id=\"checkMsgFirst\" rows='6' placeholder=\"审核状态属“审核通过”的，仅代表此步骤已操作完成，不代表用户提交的信息符合认定条件。若不符合认定条件的，请写明不符合原因。\"></textarea>\n" +
+            "                    </div>\n" +
+            "                    <div class=\"form-group\" id=\"field\" style=\"display: none\">\n" +
+            "                        <label for=\"checkMsg\" class=\"control-label\">可修改字段</label>\n" +
+            "                        <div id=\"field_info\">\n" +
+            "                            <ul>\n";
+    if (type == 1) {
         html = html + "<li style=\"width: 33%\"><input type=\"checkbox\" value=\"newSource\"><span>新申报来源</span></li>\n" +
-            "          <li style=\"width: 33%\"><input type=\"checkbox\" value=\"newOurCitySource\"><span>新公布入选来源</span></li>\n" +
-            "          <li style=\"width: 33%\"><input type=\"checkbox\" value=\"newFromCity\"><span>新入选来源县市</span></li>\n" +
-            "          <li style=\"width: 33%\"><input type=\"checkbox\" value=\"newQzBath\"><span>新入选名单批次</span></li>\n" +
-            "          <li style=\"width: 33%\"><input type=\"checkbox\" value=\"newTalentArrange\"><span>新人才层次</span></li>\n" +
-            "          <li style=\"width: 33%\"><input type=\"checkbox\" value=\"newIdentifyCondition\"><span>新认定条件</span></li>\n" +
-            "          <li style=\"width: 33%\"><input type=\"checkbox\" value=\"newIdentifyGetTime\"><span>新认定条件证书取得时间</span></li>\n" +
-            "          <li style=\"width: 33%\"><input type=\"checkbox\" value=\"newIdentifyConditionName\"><span>新认定条件名称</span></li>\n" +
-            "          <li style=\"width: 33%\"><input type=\"checkbox\" value=\"newCertificateStartTime\"><span>新泉州高层次人才证书发证日期</span></li>\n" +
-            "          <li style=\"width: 33%\"><input type=\"checkbox\" value=\"newCertificateOutTime\"><span>新泉州高层次人才证书的有效期</span></li>\n" +
-            "          <li style=\"width: 33%\"><input type=\"checkbox\" value=\"newIntroductionMode\"><span>新引进方式</span></li>\n" +
-            "          <li style=\"width: 33%\"><input type=\"checkbox\" value=\"newGygb\"><span>新是否为我市本级国有股比超过50</span></li>\n" +
-            "          <li style=\"width: 33%\"><input type=\"checkbox\" value=\"newLetterTime\"><span>新首次来晋行政介绍信时间</span></li>\n" ;
+                "          <li style=\"width: 33%\"><input type=\"checkbox\" value=\"newOurCitySource\"><span>新公布入选来源</span></li>\n" +
+                "          <li style=\"width: 33%\"><input type=\"checkbox\" value=\"newFromCity\"><span>新入选来源县市</span></li>\n" +
+                "          <li style=\"width: 33%\"><input type=\"checkbox\" value=\"newQzBath\"><span>新入选名单批次</span></li>\n" +
+                "          <li style=\"width: 33%\"><input type=\"checkbox\" value=\"newTalentArrange\"><span>新人才层次</span></li>\n" +
+                "          <li style=\"width: 33%\"><input type=\"checkbox\" value=\"newIdentifyCondition\"><span>新认定条件</span></li>\n" +
+                "          <li style=\"width: 33%\"><input type=\"checkbox\" value=\"newIdentifyGetTime\"><span>新认定条件证书取得时间</span></li>\n" +
+                "          <li style=\"width: 33%\"><input type=\"checkbox\" value=\"newIdentifyConditionName\"><span>新认定条件名称</span></li>\n" +
+                "          <li style=\"width: 33%\"><input type=\"checkbox\" value=\"newCertificateStartTime\"><span>新泉州高层次人才证书发证日期</span></li>\n" +
+                "          <li style=\"width: 33%\"><input type=\"checkbox\" value=\"newCertificateOutTime\"><span>新泉州高层次人才证书的有效期</span></li>\n" +
+                "          <li style=\"width: 33%\"><input type=\"checkbox\" value=\"newIntroductionMode\"><span>新引进方式</span></li>\n" +
+                "          <li style=\"width: 33%\"><input type=\"checkbox\" value=\"newGygb\"><span>新是否为我市本级国有股比超过50</span></li>\n" +
+                "          <li style=\"width: 33%\"><input type=\"checkbox\" value=\"newLetterTime\"><span>新首次来晋行政介绍信时间</span></li>\n";
     }
-    if(type == 2){
+    if (type == 2) {
         html = html +
-            "          <li style=\"width: 33%\"><input type=\"checkbox\" value=\"newTalentArrange\"><span>新人才层次</span></li>\n" +
-            "          <li style=\"width: 33%\"><input type=\"checkbox\" value=\"newIdentifyCondition\"><span>新认定条件</span></li>\n" +
-            "          <li style=\"width: 33%\"><input type=\"checkbox\" value=\"newIdentifyGetTime\"><span>新认定条件证书取得时间</span></li>\n" +
-            "          <li style=\"width: 33%\"><input type=\"checkbox\" value=\"newIdentifyConditionName\"><span>新认定条件名称</span></li>\n" ;
+                "          <li style=\"width: 33%\"><input type=\"checkbox\" value=\"newTalentArrange\"><span>新人才层次</span></li>\n" +
+                "          <li style=\"width: 33%\"><input type=\"checkbox\" value=\"newIdentifyCondition\"><span>新认定条件</span></li>\n" +
+                "          <li style=\"width: 33%\"><input type=\"checkbox\" value=\"newIdentifyGetTime\"><span>新认定条件证书取得时间</span></li>\n" +
+                "          <li style=\"width: 33%\"><input type=\"checkbox\" value=\"newIdentifyConditionName\"><span>新认定条件名称</span></li>\n";
     }
     html = html + "                            </ul>\n" +
-        "                        </div>\n" +
-        "                        <label for=\"checkMsg\" class=\"control-label\">可修改附件</label>\n" +
-        "                        <div id=\"field_file\">\n" +
-        "                        </div>\n" +
-        "                        <div class=\"form-group\" style=\"text-align: center\">\n" +
-        "                            <button type=\"button\" class=\"btn btn-primary\" onclick=\"TalentTypeChangeInfoDlg.checkAll()\">全选</button>\n" +
-        "                            <button type=\"button\" class=\"btn btn-success\" onclick=\"TalentTypeChangeInfoDlg.unCheckAll()\">反选</button>\n" +
-        "                        </div>\n" +
-        "                    </div>\n" +
-        "                </form>";
+            "                        </div>\n" +
+            "                        <label for=\"checkMsg\" class=\"control-label\">可修改附件</label>\n" +
+            "                        <div id=\"field_file\">\n" +
+            "                        </div>\n" +
+            "                        <div class=\"form-group\" style=\"text-align: center\">\n" +
+            "                            <button type=\"button\" class=\"btn btn-primary\" onclick=\"TalentTypeChangeInfoDlg.checkAll()\">全选</button>\n" +
+            "                            <button type=\"button\" class=\"btn btn-success\" onclick=\"TalentTypeChangeInfoDlg.unCheckAll()\">反选</button>\n" +
+            "                        </div>\n" +
+            "                    </div>\n" +
+            "                </form>";
     return html;
 }
 
-TalentTypeChangeInfoDlg.createNoFieldCheckModal = function(){
+TalentTypeChangeInfoDlg.createNoFieldCheckModal = function () {
     return '<form id="commonCheckForm" style="margin: 10px;">\n' +
-        '                    <div class="form-group">\n' +
-        '                        <label for="checkState" class="control-label">审核状态</label>\n' +
-        '                        <select class="form-control" id="checkStateModal" >\n' +
-        '                            <option value=""></option>\n' +
-        '                            <option value="3">审核通过</option>\n' +
-        '                            <option value="2">审核驳回</option>\n' +
-        '                        </select>\n' +
-        '                    </div>\n' +
-        '                    <div class="form-group" style="margin: 10px;">\n' +
-        '                        <label for="checkMsg" class="control-label">审核意见</label>\n' +
-        '                        <textarea class="form-control" id="checkMsg" placeholder="审核状态属“审核通过”的，仅代表此步骤已操作完成，不代表用户提交的信息符合认定条件。若不符合认定条件的，请写明不符合原因。" rows="6"></textarea>\n' +
-        '                    </div>\n' +
-        '                </form>';
+            '                    <div class="form-group">\n' +
+            '                        <label for="checkState" class="control-label">审核状态</label>\n' +
+            '                        <select class="form-control" id="checkStateModal" >\n' +
+            '                            <option value=""></option>\n' +
+            '                            <option value="3">审核通过</option>\n' +
+            '                            <option value="2">审核驳回</option>\n' +
+            '                        </select>\n' +
+            '                    </div>\n' +
+            '                    <div class="form-group" style="margin: 10px;">\n' +
+            '                        <label for="checkMsg" class="control-label">审核意见</label>\n' +
+            '                        <textarea class="form-control" id="checkMsg" placeholder="审核状态属“审核通过”的，仅代表此步骤已操作完成，不代表用户提交的信息符合认定条件。若不符合认定条件的，请写明不符合原因。" rows="6"></textarea>\n' +
+            '                    </div>\n' +
+            '                </form>';
 }
 
 
 
 
 
-TalentTypeChangeInfoDlg.toggleDepField = function(){
+TalentTypeChangeInfoDlg.toggleDepField = function () {
     var checkState = $("#checkStateModal").val();
     var checkMsg = $("#checkMsg").val();
-    if(checkState==3){
-        if(checkMsg == null || checkMsg == ''){
+    if (checkState == 3) {
+        if (checkMsg == null || checkMsg == '') {
             $("#checkMsg").val("部门审核通过，待复核");
         }
-    }else{
+    } else {
         $("#checkMsg").val("");
     }
 }
@@ -341,26 +343,26 @@ TalentTypeChangeInfoDlg.toggleDepField = function(){
 /**
  * 显示字段或者隐藏字段选择
  */
-TalentTypeChangeInfoDlg.toggleField = function (){
+TalentTypeChangeInfoDlg.toggleField = function () {
     var checkState = $("#checkStateFirstModal").val();
     var process = $("#process").val();
     var source = $("#source").val();
     var newCertificateOutTime = $("#newCertificateOutTime").val();
     var checkMsgFirst = $("#checkMsgFirst").val();
-    if(checkState==2){
+    if (checkState == 2) {
         $("#checkMsgFirst").val("");
         $("#field").show();
-    }else if(checkState==3){
+    } else if (checkState == 3) {
         $("#field").hide();
         $("#field").find("input[type=checkbox]").removeAttr("checked");
-        if(checkMsgFirst == null || checkMsgFirst == ''){
-            if(newCertificateOutTime != null && newCertificateOutTime != ''){
-                $("#checkMsgFirst").val(process==1?"初审通过，待复核。":"复核通过，待核查征信。");
-            }else{
-                $("#checkMsgFirst").val(process==1?"初审通过，待部门审核。":"复核通过，待核查征信。");
+        if (checkMsgFirst == null || checkMsgFirst == '') {
+            if (newCertificateOutTime != null && newCertificateOutTime != '') {
+                $("#checkMsgFirst").val(process == 1 ? "初审通过，待复核。" : "复核通过，待核查征信。");
+            } else {
+                $("#checkMsgFirst").val(process == 1 ? "初审通过，待部门审核。" : "复核通过，待核查征信。");
             }
         }
-    }else if(checkState == -1){
+    } else if (checkState == -1) {
         $("#field").hide();
         $("#checkMsgFirst").val("复核不通过，待核查征信");
     }
@@ -369,7 +371,7 @@ TalentTypeChangeInfoDlg.toggleField = function (){
 /**
  * 全选
  */
-TalentTypeChangeInfoDlg.checkAll = function(){
+TalentTypeChangeInfoDlg.checkAll = function () {
     $("#field input").each(function () {
         this.checked = true;
     })
@@ -377,11 +379,11 @@ TalentTypeChangeInfoDlg.checkAll = function(){
 /**
  * 反选
  */
-TalentTypeChangeInfoDlg.unCheckAll = function(){
+TalentTypeChangeInfoDlg.unCheckAll = function () {
     $("#field input").each(function () {
-        if(this.checked){
+        if (this.checked) {
             this.checked = false;
-        }else{
+        } else {
             this.checked = true;
         }
     })
@@ -389,24 +391,25 @@ TalentTypeChangeInfoDlg.unCheckAll = function(){
 /**
  * 审核提交
  */
-TalentTypeChangeInfoDlg.commonCheck = function (i){
+TalentTypeChangeInfoDlg.commonCheck = function (i) {
     var checkState = $("#checkStateModal").val();
     var checkMsg = $("#checkMsg").val();
-    if(checkState==null||checkState==''){
+    if (checkState == null || checkState == '') {
         Feng.info("请选择审核状态");
-        return ;
+        return;
     }
-    if(checkMsg == null || checkMsg == ''){
+    if (checkMsg == null || checkMsg == '') {
         Feng.info("请填写审核意见");
-        return ;
+        return;
     }
-    if(locked ) return;
+    if (locked)
+        return;
     locked = true;
     var ajax = new $ax(Feng.ctxPath + "/talentTypeChange/check", function (data) {
-        if(data.code==200){
+        if (data.code == 200) {
             Feng.success(data.msg);
             layer.close(i);
-        }else{
+        } else {
             Feng.error(data.msg);
         }
         locked = false;
@@ -414,43 +417,44 @@ TalentTypeChangeInfoDlg.commonCheck = function (i){
         Feng.error("提交审核失败!" + data.responseJSON.message + "!");
         locked = false;
     });
-    ajax.setData({"id":$("#id").val(),"checkState":checkState,"checkMsg":$("#checkMsg").val(),"process":$("#process").val(),"companyId":$("#companyId").val()})
+    ajax.setData({"id": $("#id").val(), "checkState": checkState, "checkMsg": $("#checkMsg").val(), "process": $("#process").val(), "companyId": $("#companyId").val()})
     ajax.start();
 }
 
 /**
  * 初审提交
  */
-TalentTypeChangeInfoDlg.firstCheck = function(i){
+TalentTypeChangeInfoDlg.firstCheck = function (i) {
     var checkState = $("#checkStateFirstModal").val();
     var checkMsg = $("#checkMsgFirst").val();
-    if(checkState==null||checkState==''){
+    if (checkState == null || checkState == '') {
         Feng.info("请选择审核状态");
-        return ;
+        return;
     }
-    if(checkMsg == null || checkMsg == ''){
+    if (checkMsg == null || checkMsg == '') {
         Feng.info("请填写审核意见");
-        return ;
+        return;
     }
     var fields = '';
     var files = '';
-    $("#field_info li input").each(function(index){
-        if($(this).is(":checked")){
+    $("#field_info li input").each(function (index) {
+        if ($(this).is(":checked")) {
             fields = fields + $(this).val() + ",";
         }
     });
-    $("#field_file li input").each(function(index){
-        if($(this).is(":checked")){
+    $("#field_file li input").each(function (index) {
+        if ($(this).is(":checked")) {
             files = files + $(this).val() + ",";
         }
     });
-    if(locked ) return;
+    if (locked)
+        return;
     locked = true;
     var ajax = new $ax(Feng.ctxPath + "/talentTypeChange/check", function (data) {
-        if(data.code==200){
+        if (data.code == 200) {
             layer.close(i);
             Feng.success(data.msg);
-        }else{
+        } else {
             Feng.error(data.msg);
         }
         locked = false;
@@ -458,25 +462,25 @@ TalentTypeChangeInfoDlg.firstCheck = function(i){
         Feng.error("提交审核失败!" + data.responseJSON.message + "!")
         locked = false;
     });
-    ajax.setData({"id":$("#id").val(),"checkState":checkState,"checkMsg":checkMsg,
-        "process":$("#process").val(),"fields":fields,"files":files})
+    ajax.setData({"id": $("#id").val(), "checkState": checkState, "checkMsg": checkMsg,
+        "process": $("#process").val(), "fields": fields, "files": files})
     ajax.start();
 }
 
-TalentTypeChangeInfoDlg.submitCheck = function(){
-    var operation = function(){
+TalentTypeChangeInfoDlg.submitCheck = function () {
+    var operation = function () {
         var ajax = new $ax(Feng.ctxPath + "/talentTypeChange/submitCheck", function (data) {
-            if(data.code==200){
+            if (data.code == 200) {
                 Feng.success(data.msg);
                 window.parent.TalentTypeChange.table.refresh();
                 TalentTypeChangeInfoDlg.close();
-            }else{
+            } else {
                 Feng.error(data.msg);
             }
         }, function (data) {
             Feng.error("提交审核失败!" + data.responseJSON.message + "!");
         });
-        ajax.setData({"id":$("#id").val(),"process":$("#process").val(),"companyId":$("#companyId").val()});
+        ajax.setData({"id": $("#id").val(), "process": $("#process").val(), "companyId": $("#companyId").val()});
         ajax.start();
     }
     Feng.confirm("一旦提交无法修改，是否审核完毕且无误?", operation);
@@ -484,14 +488,14 @@ TalentTypeChangeInfoDlg.submitCheck = function(){
 
 
 
-TalentTypeChangeInfoDlg.download = function(){
-    window.location.href = encodeURI(encodeURI(Feng.ctxPath + "/api/commonDownload/downloadZip?type=2&id="+$("#id").val()));
+TalentTypeChangeInfoDlg.download = function () {
+    window.location.href = encodeURI(encodeURI(Feng.ctxPath + "/api/commonDownload/downloadZip?type=2&id=" + $("#id").val()));
 }
 
-$(function() {
+$(function () {
     $("select").each(function () {
         $(this).val($(this).attr("value"));
     });
-    Feng.getCheckLog("logTable",{"type":CONFIG.project_levelchange,"mainId":$("#id").val(),"typeFileId":"","active":1})
+    Feng.getCheckLog("logTable", {"type": CONFIG.project_levelchange, "mainId": $("#id").val(), "typeFileId": "", "active": 1})
     TalentTypeChangeInfoDlg.initFileTable();
 });

public/static/modular/talentLibrary/talentTypeChange/talentTypeChange_dep.js

@@ -87,7 +87,7 @@ TalentTypeChange.openTalentTypeChangeCheck = function () {
             area: ['800px', '420px'], //宽高
             fix: false, //不固定
             maxmin: true,
-            content: Feng.ctxPath + '/talentTypeChange/toDepCheck/' + TalentTypeChange.seItem.id + '/' + TalentTypeChange.seItem.companyId,
+            content: Feng.ctxPath + '/admin/talentTypeChange/toDepCheck/id/' + TalentTypeChange.seItem.id + '/companyId/' + TalentTypeChange.seItem.companyId,
             btn: ['<i class="fa fa-eye"></i>&nbsp;&nbsp;保存未提交', '<i class="fa fa-save layui-bg-green"></i>&nbsp;&nbsp;提交审核', '<i class="fa fa-eraser"></i>&nbsp;&nbsp;关闭'],
             btnAlign: 'c',
             btn1: function (index, layero) {
@@ -115,7 +115,7 @@ TalentTypeChange.openTalentTypeChangeDetail = function () {
             area: ['800px', '420px'], //宽高
             fix: false, //不固定
             maxmin: true,
-            content: Feng.ctxPath + '/admin/talentTypeChange/deptDetail/id/' + TalentTypeChange.seItem.id + '/company/' + TalentTypeChange.seItem.companyId,
+            content: Feng.ctxPath + '/admin/talentTypeChange/deptDetail/id/' + TalentTypeChange.seItem.id + '/companyId/' + TalentTypeChange.seItem.companyId,
         });
         TalentTypeChange.layerIndex = index;
         layer.full(index);

public/static/modular/talentLibrary/talentTypeChange/talentTypeChange_first.js

@@ -221,7 +221,7 @@ TalentTypeChange.openTalentTypeChangeCheck = function () {
             area: ['800px', '420px'], //宽高
             fix: false, //不固定
             maxmin: true,
-            content: Feng.ctxPath + '/admin/talentTypeChange/toCommonCheck/id/' + TalentTypeChange.seItem.id + '/1',
+            content: Feng.ctxPath + '/admin/talentTypeChange/toCommonCheck/id/' + TalentTypeChange.seItem.id + '/process/1',
             btn: ['<i class="fa fa-eye"></i>&nbsp;&nbsp;保存未提交', '<i class="fa fa-save layui-bg-green"></i>&nbsp;&nbsp;提交审核', '<i class="fa fa-eraser"></i>&nbsp;&nbsp;关闭'],
             btnAlign: 'c',
             btn1: function (index, layero) {

public/static/modular/talentLibrary/talentTypeChange/talentTypeChange_prepare.js

@@ -2,8 +2,8 @@
  * 人才类别变更管理初始化
  */
 var TalentTypeChange = {
-    id: "TalentTypeChangeTable",	//表格id
-    seItem: null,		//选中的条目
+    id: "TalentTypeChangeTable", //表格id
+    seItem: null, //选中的条目
     table: null,
     layerIndex: -1
 };
@@ -14,66 +14,72 @@ var TalentTypeChange = {
 TalentTypeChange.initColumn = function () {
     return [
         {field: 'selectItem', checkbox: true},
-        {title: '原申报年度', field: 'oldYear', visible: true, align: 'center', valign: 'middle',width:'80px'},
-        {title: '工作单位', field: 'enterpriseName', visible: true, align: 'center', valign: 'middle','class': 'uitd_showTip',width:"100px"},
-        {title: '姓名', field: 'talentName', visible: true, align: 'center', valign: 'middle','class': 'uitd_showTip',width:"100px"},
-        {title: '原人才层次', field: 'oldTalentArrangeName', visible: true, align: 'center', valign: 'middle','class': 'uitd_showTip',width:"100px"},
-        {title: '原认定条件', field: 'oldIdentifyConditionCH', visible: true, align: 'center', valign: 'middle','class': 'uitd_showTip',width:"130px"},
+        {title: '原申报年度', field: 'oldYear', visible: true, align: 'center', valign: 'middle', width: '80px'},
+        {title: '工作单位', field: 'enterpriseName', visible: true, align: 'center', valign: 'middle', 'class': 'uitd_showTip', width: "100px"},
+        {title: '姓名', field: 'talentName', visible: true, align: 'center', valign: 'middle', 'class': 'uitd_showTip', width: "100px"},
+        {title: '原人才层次', field: 'oldTalentArrangeName', visible: true, align: 'center', valign: 'middle', 'class': 'uitd_showTip', width: "100px"},
+        {title: '原认定条件', field: 'oldIdentifyConditionCH', visible: true, align: 'center', valign: 'middle', 'class': 'uitd_showTip', width: "130px"},
         // {title: '原认定条件证书取得时间', field: 'oldIdentifyGetTime', visible: true, align: 'center', valign: 'middle','class': 'uitd_showTip',width:"140px"},
-        {title: '原证书有效期', field: 'oldCertificateStartTime', visible: true, align: 'center', valign: 'middle','class': 'uitd_showTip',width:"140px",
-            formatter : function (value,row,index) {
+        {title: '原证书有效期', field: 'oldCertificateStartTime', visible: true, align: 'center', valign: 'middle', 'class': 'uitd_showTip', width: "140px",
+            formatter: function (value, row, index) {
                 return row.oldCertificateStartTime + "至" + row.oldCertificateOutTime;
             }
         },
-        {title: '原认定条件名称', field: 'oldIdentifyConditionName', visible: true, align: 'center', valign: 'middle','class': 'uitd_showTip',width:"140px"},
-        {title: '原公布入选月份', field: 'oldIdentifyMonth', visible: true, align: 'center', valign: 'middle','class': 'uitd_showTip',width:"130px"},
-        {title: '新申报年度', field: 'newYear', visible: true, align: 'center', valign: 'middle',width:'80px'},
-        {title: '新人才层次', field: 'newTalentArrangeName', visible: true, align: 'center', valign: 'middle','class': 'uitd_showTip',width:"100px"},
-        {title: '新认定条件', field: 'newIdentifyConditionCH', visible: true, align: 'center', valign: 'middle','class': 'uitd_showTip',width:"140px"},
+        {title: '原认定条件名称', field: 'oldIdentifyConditionName', visible: true, align: 'center', valign: 'middle', 'class': 'uitd_showTip', width: "140px"},
+        {title: '原公布入选月份', field: 'oldIdentifyMonth', visible: true, align: 'center', valign: 'middle', 'class': 'uitd_showTip', width: "130px"},
+        {title: '新申报年度', field: 'newYear', visible: true, align: 'center', valign: 'middle', width: '80px'},
+        {title: '新人才层次', field: 'newTalentArrangeName', visible: true, align: 'center', valign: 'middle', 'class': 'uitd_showTip', width: "100px"},
+        {title: '新认定条件', field: 'newIdentifyConditionCH', visible: true, align: 'center', valign: 'middle', 'class': 'uitd_showTip', width: "140px"},
         // {title: '新认定条件证书取得时间', field: 'newIdentifyGetTime', visible: true, align: 'center', valign: 'middle','class': 'uitd_showTip',width:"140px"},
-        {title: '新认定条件名称', field: 'newIdentifyConditionName', visible: true, align: 'center', valign: 'middle','class': 'uitd_showTip',width:"130px"},
-        {title: '新证书有效期', field: 'oldCertificateStartTime', visible: true, align: 'center', valign: 'middle','class': 'uitd_showTip',width:"140px",
-            formatter : function (value,row,index) {
+        {title: '新认定条件名称', field: 'newIdentifyConditionName', visible: true, align: 'center', valign: 'middle', 'class': 'uitd_showTip', width: "130px"},
+        {title: '新证书有效期', field: 'oldCertificateStartTime', visible: true, align: 'center', valign: 'middle', 'class': 'uitd_showTip', width: "140px",
+            formatter: function (value, row, index) {
                 return row.newCertificateStartTime + "至" + row.newCertificateOutTime;
             }
         },
-        {title: '新公布入选月份', field: 'newIdentifyMonth', visible: true, align: 'center', valign: 'middle','class': 'uitd_showTip',width:"130px"},
-        {title: '首次提交时间', field: 'firstSubmitTime', visible: true, align: 'center', valign: 'middle','class': 'uitd_showTip',width:"100px"},
-        {title: '最新提交时间', field: 'newSubmitTime', visible: true, align: 'center', valign: 'middle','class': 'uitd_showTip',width:"100px"},
-        {title: '审核状态', field: 'checkState', visible: true, align: 'center', valign: 'middle',width:"100px",
-            formatter : function (value,row,index) {
-                if(value == -1){
+        {title: '新公布入选月份', field: 'newIdentifyMonth', visible: true, align: 'center', valign: 'middle', 'class': 'uitd_showTip', width: "130px"},
+        {title: '首次提交时间', field: 'firstSubmitTime', visible: true, align: 'center', valign: 'middle', 'class': 'uitd_showTip', width: "100px"},
+        {title: '最新提交时间', field: 'newSubmitTime', visible: true, align: 'center', valign: 'middle', 'class': 'uitd_showTip', width: "100px"},
+        {title: '审核状态', field: 'checkState', visible: true, align: 'center', valign: 'middle', width: "100px",
+            formatter: function (value, row, index) {
+                if (value == -1) {
                     return "<span class='label label-danger'>审核不通过</span>"
-                }if(value == 35){
+                }
+                if (value == 35) {
                     return "<span class='label label-primary'>已通过</span>"
                 }
             }
         },
-        {title: '公示状态', field: 'isPublic', visible: true, align: 'center', valign: 'middle','class': 'uitd_showTip',width:"100px",
-            formatter : function (value,row,index) {
-                if(value == 1){
+        {title: '公示状态', field: 'isPublic', visible: true, align: 'center', valign: 'middle', 'class': 'uitd_showTip', width: "100px",
+            formatter: function (value, row, index) {
+                if (value == 1) {
                     return "<span class='label label-info'>待核查征信</span>"
-                }if(value == 2){
+                }
+                if (value == 2) {
                     return "<span class='label label-success'>待公示</span>"
-                }if(value == 3){
+                }
+                if (value == 3) {
                     return "<span class='label label-danger'>公示中</span>"
-                }if(value == 4){
+                }
+                if (value == 4) {
                     return "<span class='label label-warning'>待公布</span>"
-                }if(value == 5){
-                    if(row.checkState == -1){
+                }
+                if (value == 5) {
+                    if (row.checkState == -1) {
                         return "<span class='label label-danger'>审核不通过</span>"
                     }
                     return "<span class='label label-primary'>待发证</span>"
-                }if(value == 6){
+                }
+                if (value == 6) {
                     return "<span class='label label-danger'>已发证</span>"
                 }
             }
         },
-        {title: '操作', field: 'id', visible: true, align: 'center', valign: 'middle',width:"80px",
-            formatter: function (value,row,index) {
-                return "<span class='label label-success' onclick=\"TalentTypeChange.showLog('"+value+"')\" >" +
-                    "<i class=\"fa fa-book\"></i>日志" +
-                    "</span>";
+        {title: '操作', field: 'id', visible: true, align: 'center', valign: 'middle', width: "80px",
+            formatter: function (value, row, index) {
+                return "<span class='label label-success' onclick=\"TalentTypeChange.showLog('" + value + "')\" >" +
+                        "<i class=\"fa fa-book\"></i>日志" +
+                        "</span>";
             }
         }
     ];
@@ -84,10 +90,10 @@ TalentTypeChange.initColumn = function () {
  */
 TalentTypeChange.check = function () {
     var selected = $('#' + this.id).bootstrapTable('getSelections');
-    if(selected.length == 0){
+    if (selected.length == 0) {
         Feng.info("请先选中表格中的某一记录！");
         return false;
-    }else{
+    } else {
         TalentTypeChange.seItem = selected[0];
         return true;
     }
@@ -104,20 +110,20 @@ TalentTypeChange.openTalentTypeChangeDetail = function () {
             area: ['800px', '420px'], //宽高
             fix: false, //不固定
             maxmin: true,
-            content: Feng.ctxPath + '/talentTypeChange/toCommonCheck/' + TalentTypeChange.seItem.id+"/1",
+            content: Feng.ctxPath + '/talentTypeChange/toCommonCheck/' + TalentTypeChange.seItem.id + "/1",
         });
         this.layerIndex = index;
         layer.full(index);
     }
 };
 
-TalentTypeChange.prepareSearch = function(){
+TalentTypeChange.prepareSearch = function () {
     var checkState = $("#pub_checkState").val();
     var name = $("#pub_name").val();
-    $('#dataTable').bootstrapTable("refresh",{"query":{"checkState":checkState,"talentName":name}});
+    $('#dataTable').bootstrapTable("refresh", {"query": {"checkState": checkState, "talentName": name}});
 }
 
-TalentTypeChange.prepareReset = function(){
+TalentTypeChange.prepareReset = function () {
     $("#pub_checkState").val("");
     $("#pub_name").val("");
 }
@@ -128,89 +134,90 @@ TalentTypeChange.prepareReset = function(){
  * 查询需要处理的数据
  * @param type
  */
-TalentTypeChange.showDataCheckModal = function(type){
-    $("#hczxForm").css("display","none");
+TalentTypeChange.showDataCheckModal = function (type) {
+    $("#hczxForm").css("display", "none");
     switch (type) {
         case 1:                     //待核查征信名单-导出
-            $("#hczxButton").attr("onclick","TalentTypeChange.checkExport()").text("导出");
+            $("#hczxButton").attr("onclick", "TalentTypeChange.checkExport()").text("导出");
             $("#exportCommonModalLabel").text("待核查征信名单");
             break;
         case 2:                     //待核查征信名单-核查征信通过
-            $("#hczxButton").attr("onclick","TalentTypeChange.hczxPass()").text("提交");
+            $("#hczxButton").attr("onclick", "TalentTypeChange.hczxPass()").text("提交");
             $("#exportCommonModalLabel").text("待核查征信名单");
             break;
         case 3:                     //公示（批量）
-            $("#hczxButton").attr("onclick","TalentTypeChange.public()").text("公示");
+            $("#hczxButton").attr("onclick", "TalentTypeChange.public()").text("公示");
             $("#exportCommonModalLabel").text("待公示名单");
-            $("#hczxForm").css("display","block");
-            $(".time").each(function(){
+            $("#hczxForm").css("display", "block");
+            $(".time").each(function () {
                 laydate.render({
-                    elem: "#"+$(this).attr("id")
-                    ,type: 'date'
-                    ,format:'yyyy年MM月dd日'
+                    elem: "#" + $(this).attr("id")
+                    , type: 'date'
+                    , format: 'yyyy年MM月dd日'
                 });
             });
             break;
         case 4:                     //公示通过（批量）
-            $("#hczxButton").attr("onclick","TalentTypeChange.publicPass()").text("提交");
+            $("#hczxButton").attr("onclick", "TalentTypeChange.publicPass()").text("提交");
             $("#exportCommonModalLabel").text("公示通过名单");
             break;
         case 5:                     //待公布名单
-            $("#hczxButton").attr("onclick","TalentTypeChange.publish()").text("公布");
+            $("#hczxButton").attr("onclick", "TalentTypeChange.publish()").text("公布");
             $("#exportCommonModalLabel").text("待公布名单");
             break;
         case 6:                     //待发证名单
-            $("#hczxButton").attr("onclick","TalentTypeChange.sendCard()").text("提交");
+            $("#hczxButton").attr("onclick", "TalentTypeChange.sendCard()").text("提交");
             $("#exportCommonModalLabel").text("待发证名单");
             break;
         case 7:                     //公示名单预览
-            $("#hczxButton").attr("onclick","TalentTypeChange.needPublicExport()").text("导出");
+            $("#hczxButton").attr("onclick", "TalentTypeChange.needPublicExport()").text("导出");
             $("#exportCommonModalLabel").text("待公示名单");
             break;
         case 8:                     //公布预览
-            $("#hczxButton").attr("onclick","TalentTypeChange.publishExportBefore()").text("导出");
+            $("#hczxButton").attr("onclick", "TalentTypeChange.publishExportBefore()").text("导出");
             $("#exportCommonModalLabel").text("待公布名单");
             break;
     }
     $('#dataTable').bootstrapTable('destroy');
     $('#dataTable').bootstrapTable({
-        url: Feng.ctxPath + "/talentTypeChange/selectNeedCheckData?type="+type,
+        url: Feng.ctxPath + "/admin/talentTypeChange/selectNeedCheckData?type=" + type,
         method: 'POST',
         contentType: "application/x-www-form-urlencoded; charset=UTF-8",
-        search: false,					// 是否显示表格搜索，此搜索是客户端搜索，不会进服务端
-        showRefresh: false,				// 是否显示刷新按钮
-        clickToSelect: true,			// 是否启用点击选中行
-        singleSelect: false,				// 设置True 将禁止多选
-        striped: true,  				// 是否显示行间隔色
-        pagination: true,   			// 设置为 true 会在表格底部显示分页条
+        search: false, // 是否显示表格搜索，此搜索是客户端搜索，不会进服务端
+        showRefresh: false, // 是否显示刷新按钮
+        clickToSelect: true, // 是否启用点击选中行
+        singleSelect: false, // 设置True 将禁止多选
+        striped: true, // 是否显示行间隔色
+        pagination: true, // 设置为 true 会在表格底部显示分页条
         paginationHAlign: "left",
         paginationDetailHAlign: "right",
-        sidePagination: "client",   	// 设置在哪里进行分页，可选值为 'client' 或者 'server'
-        pageNumber:1,                       //初始化加载第一页，默认第一页
-        pageSize: 10,                       //每页的记录行数（*）
-        pageList: [10, 25, 50, 100,500,1000,1500],        //可供选择的每页的行数（*）
-        maintainSelected:true,              //全表全选需要开启
+        sidePagination: "client", // 设置在哪里进行分页，可选值为 'client' 或者 'server'
+        pageNumber: 1, //初始化加载第一页，默认第一页
+        pageSize: 10, //每页的记录行数（*）
+        pageList: [10, 25, 50, 100, 500, 1000, 1500], //可供选择的每页的行数（*）
+        maintainSelected: true, //全表全选需要开启
         showColumns: false,
-        responseHandler : function(res){
+        responseHandler: function (res) {
             $("#exportCommonModal").modal("show");
             return res.obj.rows;
         },
         columns:
-            [
-                {field:"selectItem",checkbox:true},
-                {title: '姓名', field: 'talentName', visible: true, align: 'center', valign: 'middle',width:"20%"},
-                {title: '证件号码', field: 'idCard', visible: true, align: 'center', valign: 'middle',width:"30%"},
-                {title: '企业名称', field: 'enterpriseName', visible: true, align: 'center', valign: 'middle',width:"40%"},
-                {title: '审核状态', field: 'checkState', visible: true, align: 'center', valign: 'middle',width:"10%",
-                    formatter:function (value,row,index) {
-                        if(value==-1){
-                            return "<span style='color: #ed5565;'>审核不通过</span>";
-                        }if(value== 35){
-                            return "<span style='color: #1ab394;'>审核通过</span>";
+                [
+                    {field: "selectItem", checkbox: true},
+                    {title: '姓名', field: 'talentName', visible: true, align: 'center', valign: 'middle', width: "20%"},
+                    {title: '证件号码', field: 'idCard', visible: true, align: 'center', valign: 'middle', width: "30%"},
+                    {title: '企业名称', field: 'enterpriseName', visible: true, align: 'center', valign: 'middle', width: "40%"},
+                    {title: '审核状态', field: 'checkState', visible: true, align: 'center', valign: 'middle', width: "10%",
+                        formatter: function (value, row, index) {
+                            if (value == -1) {
+                                return "<span style='color: #ed5565;'>审核不通过</span>";
+                            }
+                            if (value == 35) {
+                                return "<span style='color: #1ab394;'>审核通过</span>";
+                            }
                         }
-                    }
-                },
-            ]
+                    },
+                ]
 
     });
 }
@@ -219,45 +226,45 @@ TalentTypeChange.showDataCheckModal = function(type){
 /**
  * 选择导出提交
  */
-TalentTypeChange.checkExport = function(){
+TalentTypeChange.checkExport = function () {
     var selected = $('#dataTable').bootstrapTable('getSelections');
-    if(!selected || selected.length<1){
+    if (!selected || selected.length < 1) {
         Feng.info("请至少选择一行数据!");
         return;
     }
     var ids = "";
-    for(var i=0; i<selected.length; i++){
+    for (var i = 0; i < selected.length; i++) {
         ids = ids + selected[i].id + ",";
     }
-    window.location.href = Feng.ctxPath + "/talentTypeChange/exportHczx?ids="+ids;
+    window.location.href = Feng.ctxPath + "/talentTypeChange/exportHczx?ids=" + ids;
 }
 
 /**
  * 核查征信批量通过提交
  */
-TalentTypeChange.hczxPass = function(){
+TalentTypeChange.hczxPass = function () {
     var selected = $('#dataTable').bootstrapTable('getSelections');
-    if(!selected || selected.length<1){
+    if (!selected || selected.length < 1) {
         Feng.info("请至少选择一行数据!");
         return;
     }
     var ids = "";
-    for(var i=0; i<selected.length; i++){
+    for (var i = 0; i < selected.length; i++) {
         ids = ids + selected[i].id + ",";
     }
-    var operation = function(){
+    var operation = function () {
         var ajax = new $ax(Feng.ctxPath + "/talentTypeChange/hczxPass", function (data) {
-            if(data.code==200){
+            if (data.code == 200) {
                 Feng.success(data.msg);
                 TalentTypeChange.table.refresh();
                 $("#exportCommonModal").modal("hide");
-            }else{
+            } else {
                 Feng.error(data.msg);
             }
         }, function (data) {
             Feng.error("核查征信失败!" + data.responseJSON.message + "!");
         });
-        ajax.set("ids",ids);
+        ajax.set("ids", ids);
         ajax.start();
     }
     Feng.confirm("一旦提交无法修改，确定提交吗?", operation);
@@ -266,9 +273,9 @@ TalentTypeChange.hczxPass = function(){
 /**
  * 显示核查征信驳回模态框
  */
-TalentTypeChange.showHczxRejectModal = function(){
+TalentTypeChange.showHczxRejectModal = function () {
     if (this.check()) {
-        if(TalentTypeChange.seItem.isPublic!=1){
+        if (TalentTypeChange.seItem.isPublic != 1) {
             Feng.info("当前记录不是待核查征信状态，无法核查");
             return;
         }
@@ -281,26 +288,26 @@ TalentTypeChange.showHczxRejectModal = function(){
 /**
  * 核查征信驳回提交
  */
-TalentTypeChange.hczxReject = function(){
+TalentTypeChange.hczxReject = function () {
     var id = $("#hczxId").val();
     var msg = $("#hczxMsg").val();
-    if(msg==null || msg==''){
+    if (msg == null || msg == '') {
         Feng.info("请填写失信原因");
         return;
     }
-    var operation = function(){
+    var operation = function () {
         var ajax = new $ax(Feng.ctxPath + "/talentTypeChange/hczxReject", function (data) {
-            if(data.code==200){
+            if (data.code == 200) {
                 Feng.success(data.msg);
                 TalentTypeChange.table.refresh();
                 $("#hczxRejectModal").modal("hide");
-            }else{
+            } else {
                 Feng.error(data.msg);
             }
         }, function (data) {
             Feng.error("核查征信失败!" + data.responseJSON.message + "!");
         });
-        ajax.setData({"id":id,"outMsg":msg});
+        ajax.setData({"id": id, "outMsg": msg});
         ajax.start();
     }
     Feng.confirm("一旦提交无法修改，确定提交吗?", operation);
@@ -309,31 +316,31 @@ TalentTypeChange.hczxReject = function(){
 /**
  * 是否发送短信
  */
-TalentTypeChange.toggleMessage = function(){
+TalentTypeChange.toggleMessage = function () {
     var isMessage = $("input[name='isSend']:checked").val();
-    if (isMessage==1) {
-        $("#messageEdit").css("display","block");
-    } else if ( isMessage == 2){
-        $("#messageEdit").css("display","none");
+    if (isMessage == 1) {
+        $("#messageEdit").css("display", "block");
+    } else if (isMessage == 2) {
+        $("#messageEdit").css("display", "none");
     }
 }
 
 /**
  * 公示预览
  */
-TalentTypeChange.needPublicExport = function(){
+TalentTypeChange.needPublicExport = function () {
     var selected = $('#dataTable').bootstrapTable('getSelections');
-    if(!selected || selected.length<1){
+    if (!selected || selected.length < 1) {
         Feng.info("请至少选择一行数据!");
         return;
     }
     var ids = "";
-    for(var i=0; i<selected.length; i++){
+    for (var i = 0; i < selected.length; i++) {
         ids = ids + selected[i].id + ",";
     }
-    var operation = function(){
+    var operation = function () {
         $("#exportCommonModal").modal("hide");
-        window.location.href = encodeURI(encodeURI(Feng.ctxPath + "/talentTypeChange/publicExport?ids="+ids ));
+        window.location.href = encodeURI(encodeURI(Feng.ctxPath + "/admin/talentTypeChange/publicExport?ids=" + ids));
     }
     Feng.confirm("确定要公示预览吗?", operation);
 }
@@ -342,14 +349,14 @@ TalentTypeChange.needPublicExport = function(){
 /**
  * 公示
  */
-TalentTypeChange.public = function(){
+TalentTypeChange.public = function () {
     var selected = $('#dataTable').bootstrapTable('getSelections');
-    if(!selected || selected.length<1){
+    if (!selected || selected.length < 1) {
         Feng.info("请至少选择一行数据!");
         return;
     }
     var ids = "";
-    for(var i=0; i<selected.length; i++){
+    for (var i = 0; i < selected.length; i++) {
         ids = ids + selected[i].id + ",";
     }
     var isMessage = $("input[name='isSend']:checked").val();
@@ -360,7 +367,7 @@ TalentTypeChange.public = function(){
     var dep = $("#dep").val();
     var phone = $("#phone").val();
     var email = $("#email").val();
-    if(isMessage == 1) {
+    if (isMessage == 1) {
         if (typeName == null || typeName == '') {
             Feng.info("请填写公示类型");
             return;
@@ -390,7 +397,7 @@ TalentTypeChange.public = function(){
             return;
         }
     }
-    var operation = function(){
+    var operation = function () {
         var index = layer.open({
             type: 1,
             title: '公示',
@@ -398,38 +405,39 @@ TalentTypeChange.public = function(){
             fix: false, //不固定
             maxmin: true,
             content: "<input class='form-control' id='publicBatchId' style='width:90%;margin: 10px' placeholder='请输入公示批次'>",
-            btn: ['<i class="fa fa-save layui-bg-green"></i>&nbsp;&nbsp;提交' ,'<i class="fa fa-eraser"></i>&nbsp;&nbsp;关闭'],
+            btn: ['<i class="fa fa-save layui-bg-green"></i>&nbsp;&nbsp;提交', '<i class="fa fa-eraser"></i>&nbsp;&nbsp;关闭'],
             btnAlign: 'c',
-            success:function(){
-                laydate.render({elem: "#publicBatchId",type: 'month',trigger: 'click',format :"yyyyMM"});
+            success: function () {
+                laydate.render({elem: "#publicBatchId", type: 'month', trigger: 'click', format: "yyyyMM"});
             },
             yes: function (index, layero) {
                 var month = $("#publicBatchId").val();
-                if(Feng.isEmptyStr(month)){
-                    Feng.info("请填写公示批次");return ;
+                if (Feng.isEmptyStr(month)) {
+                    Feng.info("请填写公示批次");
+                    return;
                 }
                 layer.close(index);
-                var ajax = new $ax(Feng.ctxPath + "/talentTypeChange/publicBatch", function (data) {
-                    if(data.code==200){
+                var ajax = new $ax(Feng.ctxPath + "/admin/talentTypeChange/publicBatch", function (data) {
+                    if (data.code == 200) {
                         Feng.success(data.msg);
                         TalentTypeChange.table.refresh();
                         $("#exportCommonModal").modal("hide");
-                    }else{
+                    } else {
                         Feng.error(data.msg);
                     }
                 }, function (data) {
                     Feng.error("公示失败!" + data.responseJSON.message + "!");
                 });
-                ajax.set("ids",ids);
-                ajax.set("typeName",typeName);
-                ajax.set("address",address);
-                ajax.set("publicStartTime",publicStartTime);
-                ajax.set("publicEndTime",publicEndTime);
-                ajax.set("dep",dep);
-                ajax.set("phone",phone);
-                ajax.set("email",email);
-                ajax.set("isMessage",isMessage);
-                ajax.set("batch",month);
+                ajax.set("ids", ids);
+                ajax.set("typeName", typeName);
+                ajax.set("address", address);
+                ajax.set("publicStartTime", publicStartTime);
+                ajax.set("publicEndTime", publicEndTime);
+                ajax.set("dep", dep);
+                ajax.set("phone", phone);
+                ajax.set("email", email);
+                ajax.set("isMessage", isMessage);
+                ajax.set("batch", month);
                 ajax.start();
             }
         });
@@ -439,60 +447,60 @@ TalentTypeChange.public = function(){
 
 
 //已公示的数据根据公示批次公示导出
-TalentTypeChange.publicExport = function(type){
-    var url = "",dateType='',format='';
-    if( type==1 ) {         //公示导出
-        url = Feng.ctxPath+"/talentTypeChangeExport/publicExport";
-        dateType='month';
-        format="yyyyMM";
-    }else if(type==2) {     //公布导出
-        url = Feng.ctxPath+"/talentTypeChangeExport/publishExport";
-        dateType='date';
-        format="yyyy-MM-dd";
+TalentTypeChange.publicExport = function (type) {
+    var url = "", dateType = '', format = '';
+    if (type == 1) {         //公示导出
+        url = Feng.ctxPath + "/admin/talentTypeChange/publicExport";
+        dateType = 'month';
+        format = "yyyyMM";
+    } else if (type == 2) {     //公布导出
+        url = Feng.ctxPath + "/admin/talentTypeChange/publishExport";
+        dateType = 'date';
+        format = "yyyy-MM-dd";
     }
     layer.open({
         type: 1,
-        title: type==1?'公示导出':"公布导出",
+        title: type == 1 ? '公示导出' : "公布导出",
         area: ['800px', '300px'], //宽高
         fix: false, //不固定
         maxmin: true,
-        content: "<form id=\"publicExportForm\" action=\""+url+"\" target=\"hiddenIframe\" class=\"form-horizontal \" style='padding-top: 10px;'>\n" +
-            "                    <div class=\"form-group col-sm-12\">\n" +
-            "                        <div class=\"row\">\n" +
-            "                            <label class=\"col-sm-2 control-label\">开始时间</label>\n" +
-            "                            <div class=\"col-sm-4\">\n" +
-            "                                <input type=\"text\" id=\"startTime\" name=\"startTime\" time=\"time\" format=\"month\" class=\"form-control\">\n" +
-            "                            </div>\n" +
-            "                            <label class=\"col-sm-2 control-label\">截止时间</label>\n" +
-            "                            <div class=\"col-sm-4\">\n" +
-            "                                <input type=\"text\" id=\"endTime\" name=\"endTime\" time=\"time\" format=\"month\" class=\"form-control\">\n" +
-            "                            </div>\n" +
-            "                        </div>\n" +
-            "                    </div>\n" +
-            "                </form>",
+        content: "<form id=\"publicExportForm\" action=\"" + url + "\" target=\"hiddenIframe\" class=\"form-horizontal \" style='padding-top: 10px;'>\n" +
+                "                    <div class=\"form-group col-sm-12\">\n" +
+                "                        <div class=\"row\">\n" +
+                "                            <label class=\"col-sm-2 control-label\">开始时间</label>\n" +
+                "                            <div class=\"col-sm-4\">\n" +
+                "                                <input type=\"text\" id=\"startTime\" name=\"startTime\" time=\"time\" format=\"month\" class=\"form-control\">\n" +
+                "                            </div>\n" +
+                "                            <label class=\"col-sm-2 control-label\">截止时间</label>\n" +
+                "                            <div class=\"col-sm-4\">\n" +
+                "                                <input type=\"text\" id=\"endTime\" name=\"endTime\" time=\"time\" format=\"month\" class=\"form-control\">\n" +
+                "                            </div>\n" +
+                "                        </div>\n" +
+                "                    </div>\n" +
+                "                </form>",
         btn: ['<i class="fa fa-save layui-bg-green"></i>&nbsp;&nbsp;提交', '<i class="fa fa-eraser"></i>&nbsp;&nbsp;关闭'],
         btnAlign: 'c',
         success: function (index, layero) {
             $("#publicExportForm")[0].reset();
-            $("input[time='time']").each(function(){
+            $("input[time='time']").each(function () {
                 laydate.render({
-                    elem: "#"+$(this).attr("id")
-                    ,type: dateType
-                    ,format:format
-                    ,trigger: 'click'
+                    elem: "#" + $(this).attr("id")
+                    , type: dateType
+                    , format: format
+                    , trigger: 'click'
                 });
             });
         },
-        yes:function (index) {
+        yes: function (index) {
             var startTime = $("#startTime").val();
             var endTime = $("#endTime").val();
-            if(startTime==null || startTime==''){
+            if (startTime == null || startTime == '') {
                 Feng.info("请选择开始时间");
-                return ;
+                return;
             }
-            if(endTime==null || endTime==''){
+            if (endTime == null || endTime == '') {
                 Feng.info("请选择结束时间");
-                return ;
+                return;
             }
             $("#publicExportForm")[0].submit();
             layer.close(index)
@@ -503,24 +511,24 @@ TalentTypeChange.publicExport = function(type){
 /**
  * 公示再审核
  */
-TalentTypeChange.afterCheck= function(){
+TalentTypeChange.afterCheck = function () {
     if (this.check()) {
-        if(TalentTypeChange.seItem.isPublic!=3){
+        if (TalentTypeChange.seItem.isPublic != 3) {
             Feng.info("当前记录不是公示中状态，无法审核");
-            return ;
+            return;
         }
-        if(TalentTypeChange.seItem.outMsg!=null && TalentTypeChange.seItem.outMsg!=''){
+        if (TalentTypeChange.seItem.outMsg != null && TalentTypeChange.seItem.outMsg != '') {
             Feng.info("当前申请人核查征信不通过，请谨慎选择审核状态！");
         }
-        if(TalentTypeChange.seItem.checkState==-1){
+        if (TalentTypeChange.seItem.checkState == -1) {
             var html = '<option value="">请选择</option>\n' +
-                '       <option value="2">驳回/恢复</option>';
+                    '       <option value="2">驳回/恢复</option>';
             $("#checkStateAfter").empty().append(html);
         }
-        if(TalentTypeChange.seItem.checkState==35){
+        if (TalentTypeChange.seItem.checkState == 35) {
             var html = '<option value="">请选择</option>\n' +
-                '       <option value="-1">审核不通过</option>'+
-                '       <option value="2">驳回</option>';
+                    '       <option value="-1">审核不通过</option>' +
+                    '       <option value="2">驳回</option>';
             $("#checkStateAfter").empty().append(html);
         }
         $("#checkForm")[0].reset();
@@ -531,29 +539,29 @@ TalentTypeChange.afterCheck= function(){
 /**
  * 公示后审核提交
  */
-TalentTypeChange.afterCheckSubmit = function(){
+TalentTypeChange.afterCheckSubmit = function () {
     var checkState = $("#checkStateAfter").val();
     var msg = $("#msg").val();
-    if(checkState == null || checkState =='') {
+    if (checkState == null || checkState == '') {
         Feng.info("请选择审核状态");
     }
-    if(msg == null || msg ==''){
+    if (msg == null || msg == '') {
         Feng.info("请填写审核意见");
         return;
     }
-    var operation = function(){
-        var ajax = new $ax(Feng.ctxPath + "/talentTypeChange/afterCheck", function (data) {
-            if(data.code==200){
+    var operation = function () {
+        var ajax = new $ax(Feng.ctxPath + "/admin/talentTypeChange/afterCheck", function (data) {
+            if (data.code == 200) {
                 Feng.success(data.msg);
                 TalentTypeChange.table.refresh();
                 $("#checkModal").modal("hide");
-            }else{
+            } else {
                 Feng.error(data.msg);
             }
         }, function (data) {
             Feng.error("审核失败!" + data.responseJSON.message + "!");
         });
-        ajax.setData({"id":$("#mainId").val(),"checkState":checkState,"checkMsg":msg});
+        ajax.setData({"id": $("#mainId").val(), "checkState": checkState, "checkMsg": msg});
         ajax.start();
     }
     Feng.confirm("一旦提交无法修改，确定提交吗?", operation);
@@ -563,29 +571,29 @@ TalentTypeChange.afterCheckSubmit = function(){
  * 批量公示通过
  * @param type
  */
-TalentTypeChange.publicPass = function(){
+TalentTypeChange.publicPass = function () {
     var selected = $('#dataTable').bootstrapTable('getSelections');
-    if(!selected || selected.length<1){
+    if (!selected || selected.length < 1) {
         Feng.info("请至少选择一行数据!");
         return;
     }
     var ids = "";
-    for(var i=0; i<selected.length; i++){
+    for (var i = 0; i < selected.length; i++) {
         ids = ids + selected[i].id + ",";
     }
-    var operation = function(){
-        var ajax = new $ax(Feng.ctxPath + "/talentTypeChange/publicPass", function (data) {
-            if(data.code==200){
+    var operation = function () {
+        var ajax = new $ax(Feng.ctxPath + "/admin/talentTypeChange/publicPass", function (data) {
+            if (data.code == 200) {
                 Feng.success(data.msg);
                 TalentTypeChange.table.refresh();
                 $("#exportCommonModal").modal("hide");
-            }else{
+            } else {
                 Feng.error(data.msg);
             }
         }, function (data) {
             Feng.error("公示通过失败!" + data.responseJSON.message + "!");
         });
-        ajax.set("ids",ids);
+        ajax.set("ids", ids);
         ajax.start();
     }
     Feng.confirm("一旦提交无法修改，确定公示通过吗?", operation);
@@ -594,19 +602,19 @@ TalentTypeChange.publicPass = function(){
 /**
  * 公布预览
  */
-TalentTypeChange.publishExportBefore = function(){
+TalentTypeChange.publishExportBefore = function () {
     var selected = $('#dataTable').bootstrapTable('getSelections');
-    if(!selected || selected.length<1){
+    if (!selected || selected.length < 1) {
         Feng.info("请至少选择一行数据!");
         return;
     }
     var ids = "";
-    for(var i=0; i<selected.length; i++){
+    for (var i = 0; i < selected.length; i++) {
         ids = ids + selected[i].id + ",";
     }
-    var operation = function(){
+    var operation = function () {
         $("#exportCommonModal").modal("hide");
-        window.location.href = Feng.ctxPath + "/talentTypeChange/publishExportBefore?ids="+ids;
+        window.location.href = Feng.ctxPath + "/admin/talentTypeChange/publishExportBefore?ids=" + ids;
     }
     Feng.confirm("一旦确认无法修改,确定要公布吗?", operation);
 }
@@ -615,17 +623,17 @@ TalentTypeChange.publishExportBefore = function(){
 /**
  * 公布
  */
-TalentTypeChange.publish = function(){
+TalentTypeChange.publish = function () {
     var selected = $('#dataTable').bootstrapTable('getSelections');
-    if(!selected || selected.length<1){
+    if (!selected || selected.length < 1) {
         Feng.info("请至少选择一行数据!");
         return;
     }
     var ids = "";
-    for(var i=0; i<selected.length; i++){
+    for (var i = 0; i < selected.length; i++) {
         ids = ids + selected[i].id + ",";
     }
-    var operation = function(){
+    var operation = function () {
         var index = layer.open({
             type: 1,
             title: '公布',
@@ -633,30 +641,31 @@ TalentTypeChange.publish = function(){
             fix: false, //不固定
             maxmin: true,
             content: "<input class='form-control' id='publicBatchId' style='width:90%;margin: 10px' placeholder='请输入公布日期(公布入选月份)'>",
-            btn: ['<i class="fa fa-save layui-bg-green"></i>&nbsp;&nbsp;提交' ,'<i class="fa fa-eraser"></i>&nbsp;&nbsp;关闭'],
+            btn: ['<i class="fa fa-save layui-bg-green"></i>&nbsp;&nbsp;提交', '<i class="fa fa-eraser"></i>&nbsp;&nbsp;关闭'],
             btnAlign: 'c',
-            success:function(){
-                laydate.render({elem: "#publicBatchId",type: 'date',trigger: 'click',format :"yyyy-MM-dd"});
+            success: function () {
+                laydate.render({elem: "#publicBatchId", type: 'date', trigger: 'click', format: "yyyy-MM-dd"});
             },
             yes: function (index, layero) {
                 var month = $("#publicBatchId").val();
-                if(Feng.isEmptyStr(month)){
-                    Feng.info("请填写公布批次");return ;
+                if (Feng.isEmptyStr(month)) {
+                    Feng.info("请填写公布批次");
+                    return;
                 }
                 layer.close(index);
-                var ajax = new $ax(Feng.ctxPath + "/talentTypeChange/publish", function (data) {
-                    if(data.code==200){
+                var ajax = new $ax(Feng.ctxPath + "/admin/talentTypeChange/publish", function (data) {
+                    if (data.code == 200) {
                         Feng.success(data.msg);
                         TalentTypeChange.table.refresh();
                         $("#exportCommonModal").modal("hide");
-                    }else{
+                    } else {
                         Feng.error(data.msg);
                     }
                 }, function (data) {
                     Feng.error("公布失败!" + data.responseJSON.message + "!");
                 });
-                ajax.set("ids",ids);
-                ajax.set("batch",month);
+                ajax.set("ids", ids);
+                ajax.set("batch", month);
                 ajax.start();
             }
         });
@@ -667,20 +676,20 @@ TalentTypeChange.publish = function(){
 /**
  * 撤销公布
  */
-TalentTypeChange.canclePublish = function(){
+TalentTypeChange.canclePublish = function () {
     if (this.check()) {
-        var operation = function(){
-            var ajax = new $ax(Feng.ctxPath + "/talentTypeChange/canclePublish", function (data) {
-                if(data.code==200){
+        var operation = function () {
+            var ajax = new $ax(Feng.ctxPath + "/admin/talentTypeChange/canclePublish", function (data) {
+                if (data.code == 200) {
                     Feng.success(data.msg);
                     TalentTypeChange.table.refresh();
-                }else{
+                } else {
                     Feng.error(data.msg);
                 }
             }, function (data) {
                 Feng.error("撤销公布失败!" + data.responseJSON.message + "!");
             });
-            ajax.set("id",TalentTypeChange.seItem.id);
+            ajax.set("id", TalentTypeChange.seItem.id);
             ajax.start();
         }
         Feng.confirm("一旦撤销无法修改,确定要撤销公布吗?", operation);
@@ -688,29 +697,29 @@ TalentTypeChange.canclePublish = function(){
 }
 
 //发证
-TalentTypeChange.sendCard = function(){
+TalentTypeChange.sendCard = function () {
     var selected = $('#dataTable').bootstrapTable('getSelections');
-    if(!selected || selected.length<1){
+    if (!selected || selected.length < 1) {
         Feng.info("请至少选择一行数据!");
         return;
     }
     var ids = "";
-    for(var i=0; i<selected.length; i++){
+    for (var i = 0; i < selected.length; i++) {
         ids = ids + selected[i].id + ",";
     }
-    var operation = function(){
-        var ajax = new $ax(Feng.ctxPath + "/talentTypeChange/sendCard", function (data) {
-            if(data.code==200){
+    var operation = function () {
+        var ajax = new $ax(Feng.ctxPath + "/admin/talentTypeChange/sendCard", function (data) {
+            if (data.code == 200) {
                 Feng.success(data.msg);
                 TalentTypeChange.table.refresh();
                 $("#exportCommonModal").modal("hide");
-            }else{
+            } else {
                 Feng.error(data.msg);
             }
         }, function (data) {
             Feng.error("发证失败!" + data.responseJSON.message + "!");
         });
-        ajax.set("ids",ids);
+        ajax.set("ids", ids);
         ajax.start();
     }
     Feng.confirm("一旦发证无法修改,确定要发证吗?", operation);
@@ -718,9 +727,9 @@ TalentTypeChange.sendCard = function(){
 
 
 //回调
-TalentTypeChange.callBack = function (data){
+TalentTypeChange.callBack = function (data) {
     Feng.info(data.msg);
-    if(data.code==200){
+    if (data.code == 200) {
         $("#hczxModal,#exportModal").modal("hide");
         TalentTypeChange.table.refresh();
     }
@@ -729,9 +738,9 @@ TalentTypeChange.callBack = function (data){
 /**
  * 批量下载头像
  */
-TalentTypeChange.downloadPhoto = function(){
+TalentTypeChange.downloadPhoto = function () {
     var selected = $('#' + this.id).bootstrapTable('getSelections');
-    if(selected.length == 0){
+    if (selected.length == 0) {
         Feng.info("请先选中表格中的某一记录！");
         return false;
     }
@@ -739,7 +748,7 @@ TalentTypeChange.downloadPhoto = function(){
     for (let i = 0; i < selected.length; i++) {
         ids = ids + selected[i].id + ",";
     }
-    window.location.href = encodeURI(encodeURI(Feng.ctxPath + "/api/commonDownload/downloadPhotos?type=2&ids="+ids));
+    window.location.href = encodeURI(encodeURI(Feng.ctxPath + "/api/commonDownload/downloadPhotos?type=2&ids=" + ids));
 }
 
 $(function () {

public/static/modular/talentLibrary/talentTypeChange/talentTypeChange_third.js

@@ -2,8 +2,8 @@
  * 人才类别变更管理初始化
  */
 var TalentTypeChange = {
-    id: "TalentTypeChangeTable",	//表格id
-    seItem: null,		//选中的条目
+    id: "TalentTypeChangeTable", //表格id
+    seItem: null, //选中的条目
     table: null,
     layerIndex: -1
 };
@@ -14,49 +14,52 @@ var TalentTypeChange = {
 TalentTypeChange.initColumn = function () {
     return [
         {field: 'selectItem', radio: true},
-        {title: '原申报年度', field: 'oldYear', visible: true, align: 'center', valign: 'middle',width:'80px'},
-        {title: '工作单位', field: 'enterpriseName', visible: true, align: 'center', valign: 'middle','class': 'uitd_showTip',width:"100px"},
-        {title: '姓名', field: 'talentName', visible: true, align: 'center', valign: 'middle','class': 'uitd_showTip',width:"100px"},
-        {title: '原人才层次', field: 'oldTalentArrangeName', visible: true, align: 'center', valign: 'middle','class': 'uitd_showTip',width:"100px"},
-        {title: '原认定条件', field: 'oldIdentifyConditionCH', visible: true, align: 'center', valign: 'middle','class': 'uitd_showTip',width:"130px"},
+        {title: '原申报年度', field: 'oldYear', visible: true, align: 'center', valign: 'middle', width: '80px'},
+        {title: '工作单位', field: 'enterpriseName', visible: true, align: 'center', valign: 'middle', 'class': 'uitd_showTip', width: "100px"},
+        {title: '姓名', field: 'talentName', visible: true, align: 'center', valign: 'middle', 'class': 'uitd_showTip', width: "100px"},
+        {title: '原人才层次', field: 'oldTalentArrangeName', visible: true, align: 'center', valign: 'middle', 'class': 'uitd_showTip', width: "100px"},
+        {title: '原认定条件', field: 'oldIdentifyConditionCH', visible: true, align: 'center', valign: 'middle', 'class': 'uitd_showTip', width: "130px"},
         // {title: '原认定条件证书取得时间', field: 'oldIdentifyGetTime', visible: true, align: 'center', valign: 'middle','class': 'uitd_showTip',width:"140px"},
-        {title: '原认定条件名称', field: 'oldIdentifyConditionName', visible: true, align: 'center', valign: 'middle','class': 'uitd_showTip',width:"140px"},
-        {title: '原证书有效期', field: 'oldCertificateStartTime', visible: true, align: 'center', valign: 'middle','class': 'uitd_showTip',width:"140px",
-            formatter : function (value,row,index) {
+        {title: '原认定条件名称', field: 'oldIdentifyConditionName', visible: true, align: 'center', valign: 'middle', 'class': 'uitd_showTip', width: "140px"},
+        {title: '原证书有效期', field: 'oldCertificateStartTime', visible: true, align: 'center', valign: 'middle', 'class': 'uitd_showTip', width: "140px",
+            formatter: function (value, row, index) {
                 return row.oldCertificateStartTime + "至" + row.oldCertificateOutTime
             }
         },
-        {title: '原公布入选月份', field: 'oldIdentifyMonth', visible: true, align: 'center', valign: 'middle','class': 'uitd_showTip',width:"100px"},
-        {title: '新申报年度', field: 'newYear', visible: true, align: 'center', valign: 'middle',width:'80px'},
-        {title: '新人才层次', field: 'newTalentArrangeName', visible: true, align: 'center', valign: 'middle','class': 'uitd_showTip',width:"100px"},
-        {title: '新认定条件', field: 'newIdentifyConditionCH', visible: true, align: 'center', valign: 'middle','class': 'uitd_showTip',width:"140px"},
+        {title: '原公布入选月份', field: 'oldIdentifyMonth', visible: true, align: 'center', valign: 'middle', 'class': 'uitd_showTip', width: "100px"},
+        {title: '新申报年度', field: 'newYear', visible: true, align: 'center', valign: 'middle', width: '80px'},
+        {title: '新人才层次', field: 'newTalentArrangeName', visible: true, align: 'center', valign: 'middle', 'class': 'uitd_showTip', width: "100px"},
+        {title: '新认定条件', field: 'newIdentifyConditionCH', visible: true, align: 'center', valign: 'middle', 'class': 'uitd_showTip', width: "140px"},
         // {title: '新认定条件证书取得时间', field: 'newIdentifyGetTime', visible: true, align: 'center', valign: 'middle','class': 'uitd_showTip',width:"140px"},
-        {title: '新认定条件名称', field: 'newIdentifyConditionName', visible: true, align: 'center', valign: 'middle','class': 'uitd_showTip',width:"130px"},
+        {title: '新认定条件名称', field: 'newIdentifyConditionName', visible: true, align: 'center', valign: 'middle', 'class': 'uitd_showTip', width: "130px"},
         // {title: '新公布入选月份', field: 'newIdentifyMonth', visible: true, align: 'center', valign: 'middle','class': 'uitd_showTip',width:"100px"},
-        {title: '首次提交时间', field: 'firstSubmitTime', visible: true, align: 'center', valign: 'middle','class': 'uitd_showTip',width:"100px"},
-        {title: '最新提交时间', field: 'newSubmitTime', visible: true, align: 'center', valign: 'middle','class': 'uitd_showTip',width:"100px"},
-        {title: '审核状态', field: 'checkState', visible: true, align: 'center', valign: 'middle','class': 'uitd_showTip',width:"100px",
-            formatter : function (value,row,index) {
-                if(value==-1){
+        {title: '首次提交时间', field: 'firstSubmitTime', visible: true, align: 'center', valign: 'middle', 'class': 'uitd_showTip', width: "100px"},
+        {title: '最新提交时间', field: 'newSubmitTime', visible: true, align: 'center', valign: 'middle', 'class': 'uitd_showTip', width: "100px"},
+        {title: '审核状态', field: 'checkState', visible: true, align: 'center', valign: 'middle', 'class': 'uitd_showTip', width: "100px",
+            formatter: function (value, row, index) {
+                if (value == -1) {
                     return "<span class='label label-danger'>审核不通过</span>"
-                }if(value == 25){
-                    if(row.highProcess!=null && row.highProcess!='' && row.highProcess>=3){
+                }
+                if (value == 25) {
+                    if (row.highProcess != null && row.highProcess != '' && row.highProcess >= 3) {
                         return "<span class='label label-success'>重新提交</span>"
-                    }else{
+                    } else {
                         return "<span class='label label-success'>待审核</span>"
                     }
-                }if(value == 30 || value <= 20){
+                }
+                if (value == 30 || value <= 20) {
                     return "<span class='label label-danger'>已驳回</span>"
-                }if(value >= 35){
+                }
+                if (value >= 35) {
                     return "<span class='label label-primary'>已通过</span>"
                 }
             }
         },
-        {title: '操作', field: 'id', visible: true, align: 'center', valign: 'middle',width:"80px",
-            formatter: function (value,row,index) {
-                return "<span class='label label-success' onclick=\"TalentTypeChange.showLog('"+value+"')\" >" +
-                    "<i class=\"fa fa-book\"></i>日志" +
-                    "</span>";
+        {title: '操作', field: 'id', visible: true, align: 'center', valign: 'middle', width: "80px",
+            formatter: function (value, row, index) {
+                return "<span class='label label-success' onclick=\"TalentTypeChange.showLog('" + value + "')\" >" +
+                        "<i class=\"fa fa-book\"></i>日志" +
+                        "</span>";
             }
         },
     ];
@@ -67,10 +70,10 @@ TalentTypeChange.initColumn = function () {
  */
 TalentTypeChange.check = function () {
     var selected = $('#' + this.id).bootstrapTable('getSelections');
-    if(selected.length == 0){
+    if (selected.length == 0) {
         Feng.info("请先选中表格中的某一记录！");
         return false;
-    }else{
+    } else {
         TalentTypeChange.seItem = selected[0];
         return true;
     }
@@ -87,13 +90,13 @@ TalentTypeChange.openTalentTypeChangeCheck = function () {
             area: ['800px', '420px'], //宽高
             fix: false, //不固定
             maxmin: true,
-            content: Feng.ctxPath + '/talentTypeChange/toCommonCheck/' + TalentTypeChange.seItem.id + '/3',
-            btn: ['<i class="fa fa-eye"></i>&nbsp;&nbsp;保存未提交','<i class="fa fa-save layui-bg-green"></i>&nbsp;&nbsp;提交审核' ,'<i class="fa fa-eraser"></i>&nbsp;&nbsp;关闭'],
+            content: Feng.ctxPath + '/admin/talentTypeChange/toCommonCheck/id/' + TalentTypeChange.seItem.id + '/process/3',
+            btn: ['<i class="fa fa-eye"></i>&nbsp;&nbsp;保存未提交', '<i class="fa fa-save layui-bg-green"></i>&nbsp;&nbsp;提交审核', '<i class="fa fa-eraser"></i>&nbsp;&nbsp;关闭'],
             btnAlign: 'c',
             btn1: function (index, layero) {
                 var obj = layero.find("iframe")[0].contentWindow;
                 obj.TalentTypeChangeInfoDlg.showFirstCheckModal();
-            },btn2: function(index, layero){
+            }, btn2: function (index, layero) {
                 var obj = layero.find("iframe")[0].contentWindow;
                 obj.TalentTypeChangeInfoDlg.submitCheck();
                 return false;
@@ -115,7 +118,7 @@ TalentTypeChange.openTalentTypeChangeDetail = function () {
             area: ['800px', '420px'], //宽高
             fix: false, //不固定
             maxmin: true,
-            content: Feng.ctxPath + '/talentTypeChange/talentTypeChange_detail/' + TalentTypeChange.seItem.id,
+            content: Feng.ctxPath + '/admin/talentTypeChange/detail/id/' + TalentTypeChange.seItem.id,
         });
         this.layerIndex = index;
         layer.full(index);