津补贴++

app/admin/controller/TalentAllowance.php

@@ -3,6 +3,12 @@
 namespace app\admin\controller;
 
 use app\admin\common\AdminController;
+use app\common\model\TalentAllowance as TaModel;
+use think\facade\Db;
+use app\common\api\DictApi;
+use app\common\state\AllowanceStateEnum;
+use app\common\state\AllowanceProjectEnum;
+use app\common\api\TalentAllowanceApi;
 
 /**
  * Description of TalentAllowance
@@ -10,5 +16,434 @@ use app\admin\common\AdminController;
  * @author sgq
  */
 class TalentAllowance extends AdminController {
-    //put your code here
+
+    public function index() {
+        $process = $this->request["process"];
+        $type = $this->user["type"];
+        $assigns = ["process" => $process, "type" => $type];
+        if ($process == 4) {
+            if ($type == 1) {
+                $msgBody["typeName"] = "晋江市优秀人才津补贴申报";
+                $msgBody["address"] = "聚才网/人才晋江微信公众号";
+                $msgBody["dep"] = "中共晋江市委人才办、晋江市纪委监委驻市人力资源和社会保障局纪检监察组或晋江市公共就业和人才服务中心";
+                $msgBody["phone"] = "0595-85633128";
+                $msgBody["email"] = "jjrc85661234@163.com";
+            }
+            if ($type == 2) {
+                $msgBody["typeName"] = "晋江市集成电路产业优秀人才津补贴申报";
+                $msgBody["address"] = "福建（晋江）集成电路产业园官方网站及微信公众号";
+                $msgBody["dep"] = "集成电路产业园区";
+                $msgBody["phone"] = "0595-82250007、0595-82250001";
+                $msgBody["email"] = "jjjcdr@163.com";
+            }
+            $assigns["message"] = $msgBody;
+        }
+
+        return view("", $assigns);
+    }
+
+    /**
+     * 获取优秀人才津补贴列表
+     */
+    public function list() {
+        $param = $this->request->param();
+        $offset = $param["offset"] ?: 0;
+        $limit = $param["limit"] ?: 10;
+        $process = $param["process"];
+        $where = [];
+        $where[] = ["type", "=", $this->user["type"]];
+        $order = "newSubmitTime desc";
+        $where = $this->setTalentAllowanceInfo($where, $param, $process);
+        switch ($process) {
+            case 1:
+                $where[] = ["checkState", "in", [1, 5, 10, 13, 15, 20, 25, 30]];
+                break;
+            case 2:
+                $where[] = ["firstPassTime", "EXP", Db::raw("is not null")];
+                break;
+            case 3:
+                $where[] = ["visitPassTime", "EXP", Db::raw("is not null")];
+                break;
+            case 4:
+                if ($param["publicState"]) {
+                    $where[] = ["publicState", "=", $param["publicState"]];
+                }
+                $where[] = ["checkState", "in", [-1, 30]];
+                break;
+        }
+        $count = TaModel::where($where)->count();
+        $list = TaModel::where($where)->limit($offset, $limit)->order($order)->select()->toArray();
+        $list = $this->translateChinese($list);
+        return json(["rows" => $list, "total" => $count]);
+    }
+
+    public function toCheckPage() {
+        $id = $this->request["id"];
+        $process = $this->request["process"];
+        $obj = TalentAllowanceApi::getInfoById($id);
+        $this->translateToChinese($obj);
+        return view("info", ["row" => $obj, "process" => $process]);
+    }
+    
+    /**
+     * 校验是否在审核范围内
+     */
+    public function validateIsCheck() {
+        $id = $this->request["id"];
+        $type = $this->request["type"];
+        $process = $this->request["process"];
+        
+        $response = new \stdClass();
+        $response->code = 500;
+        
+        $info = null;
+        switch ($type) {
+            case 1:                 //编辑合同
+                $detail = \app\common\model\TalentAllowancecontractDetail::find($id);
+                $info = TalentAllowanceApi::getInfoById($detail["mainId"]);
+                break;
+            case 2:                 //编辑项目
+                $project = \app\common\model\TalentAllowanceProject::find($id);
+                $info = TalentAllowanceApi::getInfoById($project["mainId"]);
+                break;
+            case 3:
+                $info = TalentAllowanceApi::getInfoById($id);
+                break;
+        }
+        if (!$info) {
+            $response->msg = "校验不通过，无法操作";
+            return $response;
+        }
+        $where = [];
+        $where[] = ["mainId","=",$info["id"]];
+        $where[] = ["step","=",$process];
+        $where[] = ["active","=",2];
+        \app\common\model\TalentChecklog::where($where)->order("createTime desc")->find();
+        $log = null;
+        switch ($process) {
+            case 1:
+                if (info.getCheckState() != AllowanceStateEnum.NEED_CHECK.getCode() && info.getCheckState() != AllowanceStateEnum.REJECT_TO_FIRST.getCode()) {
+                    return new ResponseObj(ResponseObj.FAILD, "不在审核范围内");
+                } else {
+                    TalentDepcheckstate depcheckstate = this.talentDepcheckstateService.selectOne(new EntityWrapper<TalentDepcheckstate>().eq("mainId", info.getId()).eq("companyId", companyId).last("limit 1"));
+                    if (depcheckstate.getState() != BasicStateEnum.RCRD_BASIC_NEED.getCode() && depcheckstate.getState() != BasicStateEnum.RCRD_BASEIC_RESUBMIT.getCode()
+                            && depcheckstate.getState() != BasicStateEnum.RCRD_BASIC_UPREJECT.getCode()) {
+                        return new ResponseObj(ResponseObj.FAILD, "不在审核范围内");
+                    }
+                }
+                logWrapper.eq("companyId", companyId);
+                log = this.talentChecklogService.selectOne(logWrapper);
+                break;
+            case 2:
+                if (info.getCheckState() != AllowanceStateEnum.NEED_VISIT_CHECK.getCode() && info.getCheckState() != AllowanceStateEnum.REVIEW_REJECT.getCode()) {
+                    return new ResponseObj(ResponseObj.FAILD, "不在审核范围内");
+                }
+                break;
+            case 3:
+                if (info.getCheckState() != AllowanceStateEnum.NEED_REVIEW.getCode() && info.getCheckState() != AllowanceStateEnum.PUBLIC_REJECT.getCode()) {
+                    return new ResponseObj(ResponseObj.FAILD, "不在审核范围内");
+                }
+                log = this.talentChecklogService.selectOne(logWrapper);
+                break;
+        }
+        if (log != null) {
+            info.setCheckState(log.getState());
+            info.setCheckMsg(log.getDescription());
+        } else {
+            info.setCheckState(null);
+            info.setCheckMsg("");
+        }
+        Map<String, Object> res = new HashMap<>();
+        res.put("info", info);
+        if (type == 3) {
+            Map<String, String> enterpriseMap = this.enterpriseService.selectListForMap(new EntityWrapper<Enterprise>());
+            EntityWrapper<TalentAllowanceProject> projectEntityWrapper = new EntityWrapper<>();
+            projectEntityWrapper.eq("mainId", id).eq("isLock", 1);
+            if (ShiroKit.getUser().getType() == 1) {
+                projectEntityWrapper.eq("project", AllowanceProjectEnum.PROJECT_TAX.getCode());
+            }
+            List<TalentAllowanceProject> projectList = this.talentAllowanceProjectService.selectList(projectEntityWrapper);
+            List<TalentAllowancecontractDetail> detailList = this.talentAllowancecontractDetailService.selectList(new EntityWrapper<TalentAllowancecontractDetail>().eq("mainId", id));
+            Map<String, TalentAllowancecontractDetail> detailMap = detailList.stream().collect(Collectors.toMap(TalentAllowancecontractDetail::getId, Function.identity()));
+            for (TalentAllowancecontractDetail detail : detailList) {
+                detail.setEnterpriseName(enterpriseMap.get(detail.getEnterpriseId()) + "(" + detail.getStartTime() + "至" + detail.getEndTime() + ")");
+            }
+            for (TalentAllowanceProject project : projectList) {
+                Enterprise enterprise = this.enterpriseService.selectById(project.getEnterpriseId());
+                TalentAllowancecontractDetail detail = detailMap.get(project.getBaseId());
+                project.setProjectName(AllowanceProjectEnum.valueOf(project.getProject()) + "(" + enterprise.getName() + "(" + detail.getStartTime() + "至" + detail.getEndTime() + "))");
+            }
+            EntityWrapper<UnCommonFiletype> filetypeEntityWrapper = new EntityWrapper<>();
+            filetypeEntityWrapper.eq("project", ProjectEnum.JBT.getCode()).eq("active", 1).eq("type", info.getType());
+            List<UnCommonFiletype> filetypeList = this.unCommonFiletypeService.selectList(filetypeEntityWrapper);
+            res.put("files", filetypeList);
+            res.put("projects", projectList);
+            res.put("concats", detailList);
+        }
+        return new ResponseObj(ResponseObj.SUCCESS, "", res);
+    }
+    
+    /**
+     * 查询工作单位
+     */
+    public function findAllowanceContractDetail() {
+        $mainId = $this->request["mainId"];
+        $offset = $this->request["offset"] ?: 0;
+        $limit = $this->request["limit"] ?: 1000;
+        $count = \app\common\model\TalentAllowancecontractDetail::where("mainId", $mainId)->count();
+        $list = \app\common\model\TalentAllowancecontractDetail::where("mainId", $mainId)->limit($offset, $limit)->select()->toArray();
+        $enterpriseMap = \app\common\model\Enterprise::column("name", "id");
+        foreach ($list as &$row) {
+            $row["enterpriseName"] = $enterpriseMap[$row["enterpriseId"]];
+        }unset($row);
+        return json(["rows" => $list, "total" => $count]);
+    }
+
+    /**
+     * 查询核查项目情况
+     */
+    public function findAllowanceProject() {
+        $mainId = $this->request["mainId"];
+        $baseId = $this->request["baseId"];
+        $offset = $this->request["offset"] ?: 0;
+        $limit = $this->request["limit"] ?: 1000;
+        $where = [];
+        $where[] = ["mainId", "=", $mainId];
+        $where[] = ["baseId", "=", $baseId];
+        $count = \app\common\model\TalentAllowanceProject::where($where)->count();
+        $list = \app\common\model\TalentAllowanceProject::where($where)->limit($offset, $limit)->select()->toArray();
+        $info = TalentAllowanceApi::getInfoById($mainId);
+        foreach ($list as &$project) {
+            $project["projectName"] = AllowanceProjectEnum::getProjectName($project["project"]);
+            if ($info["checkState"] == 1) {
+                $project["isEdit"] = in_array($project["project"], [
+                            AllowanceProjectEnum::PROJECT_CONTRACT,
+                            AllowanceProjectEnum::PROJECT_TAX,
+                            AllowanceProjectEnum::PROJECT_WAGES,
+                            AllowanceProjectEnum::PROJECT_ATTENDANCE,
+                            AllowanceProjectEnum::PROJECT_SB_PENSION,
+                            AllowanceProjectEnum::PROJECT_SB_UNEMPLOYMENT,
+                            AllowanceProjectEnum::PROJECT_SB_MEDICA,
+                            AllowanceProjectEnum::PROJECT_WORKDAY
+                        ]) ? 1 : 2;
+            } else if ($info["checkState"] == 10) {
+                $projects = explode(",", $info["projects"]);
+                if (in_array($project["id"], $projects)) {
+                    $project["isEdit"] = 1;
+                } else {
+                    $project["isEdit"] = 2;
+                }
+            } else {
+                $project["isEdit"] = 2;
+            }
+        }unset($project);
+        return json(["rows" => $list, "total" => $count]);
+    }
+
+    /**
+     * 查询人才层次变更记录
+     */
+    public function findAllowanceArrange() {
+        $mainId = $this->request["mainId"];
+        $offset = $this->request["offset"] ?: 0;
+        $limit = $this->request["limit"] ?: 1000;
+        $where = [];
+        $where[] = ["mainId", "=", $mainId];
+        $count = \app\common\model\TalentAllowanceArrange::where($where)->count();
+        $list = \app\common\model\TalentAllowanceArrange::where($where)->limit($offset, $limit)->select()->toArray();
+        foreach ($list as &$arrange) {
+            $condition = \app\common\api\TalentConditionApi::getOne($arrange["identifyCondition"]);
+            $arrange["identifyConditionText"] = $condition["name"];
+            $arrange["talentArrangeName"] = \app\common\state\CommonConst::getLayerNameByLayer($arrange["talentArrange"]);
+        }unset($arrange);
+        return json(["rows" => $list, "total" => $count]);
+    }
+
+    private function setTalentAllowanceInfo($where, $query, $process) {
+        if (\StrUtil::isNotEmpAndNull($query["year"])) {
+            $where[] = ["year", "=", $query["year"]];
+        }
+        if (\StrUtil::isNotEmpAndNull($query["enterpriseName"])) {
+            $where[] = ["enterpriseName", "like", "%" . $query["enterpriseName"] . "%"];
+        }
+        if (\StrUtil::isNotEmpAndNull($query["name"])) {
+            $where[] = ["name", "like", "%" . $query["name"] . "%"];
+        }
+        if (\StrUtil::isNotEmpAndNull($query["talentType"])) {
+            $where[] = ["talentType", "=", $query["talentType"]];
+        }
+        if (\StrUtil::isNotEmpAndNull($query["talentArrange"])) {
+            $where[] = ["talentArrange", "=", $query["talentArrange"]];
+        }
+        if (\StrUtil::isNotEmpAndNull($query["identifyCondition"])) {
+            $where[] = ["identifyCondition", "=", $query["identifyCondition"]];
+        }
+        if (\StrUtil::isNotEmpAndNull($query["address"])) {
+            $where[] = ["address", "=", $query["address"]];
+        }
+        if ($query["recommendAllowanceType"]) {
+            $where[] = ["recommendAllowanceType", "=", $query["recommendAllowanceType"]];
+        }
+        if ($query["publicState"]) {
+            $where[] = ["publicState", "=", $query["publicState"]];
+        }
+        if (\StrUtil::isNotEmpAndNull($query["introductionMode"])) {
+            $where[] = ["introductionMode", "=", $query["introductionMode"]];
+        }
+        if (\StrUtil::isNotEmpAndNull($query["firstJJStartTime"])) {
+            $where[] = ["firstInJJTime", ">=", $query["firstJJStartTime"]];
+        }
+        if (\StrUtil::isNotEmpAndNull($query["firstJJEndTime"])) {
+            $where[] = ["firstInJJTime", "<=", $query["firstJJEndTime"]];
+        }
+        if ($process == 4) {
+            if ($query["isSupple"]) {
+                $where[] = ["isSupple", "=", $query["isSupple"]];
+            }
+            if ($query["isPublicCheck"]) {
+                $where[] = ["isPublicCheck", "=", $query["isPublicCheck"]];
+            }
+        }
+        if ($query["checkState"]) {
+            if ($query["checkState"] == -1) {
+                $where[] = ["checkState", "=", $query["checkState"]];
+            } else {
+                if ($process == 1) {
+                    switch ($query["checkState"]) {
+                        case 0:     //保存未提交
+                            $where[] = ["checkState", "=", 1];
+                            break;
+                        case 1:
+                            $where[] = ["checkState", "=", 5];
+                            break;
+                        case 2:     //驳回
+                            $where[] = ["checkState", "=", 10];
+                            break;
+                        case 3:     //通过
+                            $where[] = ["checkState", "in", [15, 20, 30, 25]];
+                            break;
+                        case 4:     //重新提交
+                            $where[] = ["checkState", "=", 5];
+                            $where[] = ["highProcess", ">=", $process];
+                            break;
+                        case 5:     //上级驳回
+                            $where[] = ["checkState", "=", 13];
+                            break;
+                    }
+                }
+                if ($process == 2) {
+                    switch ($query["checkState"]) {
+                        case 1:
+                            $where[] = ["checkState", "=", 15];
+                            break;
+                        case 2:     //驳回
+                            $where[] = ["checkState", "in", [1, 5, 10]];
+                            $where[] = ["highProcess", ">=", $process];
+                            break;
+                        case 3:     //通过                            
+                            $where[] = ["checkState", "in", [20, 30]];
+                            break;
+                        case 9:   //重新提交                            
+                            $where[] = ["checkState", "=", 15];
+                            $where[] = ["highProcess", ">=", $process];
+                            break;
+                        case 4:     //上级驳回                            
+                            $where[] = ["checkState", "=", 25];
+                            break;
+                        case -1:
+                            $where[] = ["checkState", "=", -1];
+                            break;
+                    }
+                }
+                if ($process == 3) {
+                    switch ($query["checkState"]) {
+                        case -1:
+                            $where[] = ["checkState", "=", -1];
+                            break;
+                        case 1:
+                            $where[] = ["checkState", "=", 20];
+                            break;
+                        case 2:     //驳回 
+                            $where[] = ["checkState", "in", [1, 5, 10, 15, 25]];
+                            $where[] = ["highProcess", ">=", $process];
+                            break;
+                        case 3:     //通过 
+                            $where[] = ["checkState", "=", 30];
+                            break;
+                        case 9:     //重新提交 
+                            $where[] = ["checkState", "=", 20];
+                            $where[] = ["highProcess", ">=", $process];
+                            break;
+                        case 4:     //上级驳回 
+                            $where[] = ["checkState", "=", 35];
+                            break;
+                    }
+                }
+                if ($process == 4) {
+                    switch ($query["checkState"]) {
+                        case -1:
+                            $where[] = ["checkState", "=", -1];
+                            break;
+                        case 3:     //通过 
+                            $where[] = ["checkState", "=", 30];
+                            break;
+                    }
+                }
+            }
+        }
+        return $where;
+    }
+
+    private function translateToChinese(&$obj) {
+        if (\StrUtil::isNotEmpAndNull($obj["address"])) {
+            $obj["addressName"] = DictApi::findByParentCodeAndCode("street", $obj["address"])["name"];
+        }
+        if (\StrUtil::isNotEmpAndNull($obj["talentType"])) {
+            $obj["talentTypeName"] = DictApi::findByParentCodeAndCode("enterprise_tag", $obj["talentType"])["name"];
+        }
+        if (\StrUtil::isNotEmpAndNull($obj["talentArrange"])) {
+            $obj["talentArrangeName"] = DictApi::findByParentCodeAndCode("talent_arrange", $obj["talentArrange"])["name"];
+        }
+        if (\StrUtil::isNotEmpAndNull($obj["identifyCondition"])) {
+            $obj["identifyConditionText"] = \app\common\api\TalentConditionApi::getOne($obj["identifyCondition"])["name"];
+        }
+        if (\StrUtil::isNotEmpAndNull($obj["introductionMode"])) {
+            $obj["introductionModeName"] = DictApi::findByParentCodeAndCode("import_way", $obj["introductionMode"])["name"];
+        }
+    }
+
+    private function translateChinese($list) {
+        //获取字典表
+        $levelMap = DictApi::selectByParentCode("talent_arrange");
+        $talentTypeMap = DictApi::selectByParentCode("enterprise_tag");
+        $streetMap = DictApi::selectByParentCode("street");
+        $cardTypeMap = DictApi::selectByParentCode("card_type");
+        $modeMap = DictApi::selectByParentCode("import_way");
+        $where = [];
+        $where[] = ["type", "=", $this->user["type"]];
+        $where[] = ["id", "in", array_column($list, "identifyCondition")];
+        $icmap = \app\common\model\TalentCondition::where($where)->column("name", "id");
+        foreach ($list as &$info) {
+            if (\StrUtil::isNotEmpAndNull($info["talentArrange"])) {
+                $info["talentArrangeName"] = $levelMap[$info["talentArrange"]];
+            }
+            $info["talentTypeName"] = $talentTypeMap[$info["talentType"]];
+            if (\StrUtil::isNotEmpAndNull($info["identifyCondition"])) {
+                $info["identifyConditionText"] = $icmap[$info["identifyCondition"]];
+            }
+            $info["addressName"] = $streetMap[$info["address"]];
+            $info["sexName"] = $info["sex"] == 1 ? "男" : "女";
+            $info["checkStateName"] = AllowanceStateEnum::getStateName($info["checkState"]);
+            $info["cardTypeName"] = $cardTypeMap[$info["cardType"]];
+            $info["isSuppleName"] = $info["isSupple"] == 1 ? "是" : "否";
+            $info["isPublicCheckName"] = $info["isPublicCheckName"] == 1 ? "是" : "否";
+            $info["recomendAllowanceTypeName"] = \app\common\state\AllowanceTypeEnum::getTypeName($info["recomendAllowanceType"]);
+            $info["allowanceTypeName"] = \app\common\state\AllowanceTypeEnum::getTypeName($info["allowanceType"]);
+            $info["recommendTalentArrangeName"] = $levelMap[$info["recommendTalentArrange"]];
+            $info["jtTalentArrangeName"] = $levelMap[$info["jtTalentArrange"]];
+            $info["introductionModeName"] = $modeMap[$info["introductionMode"]];
+        }unset($info);
+        return $list;
+    }
+
 }

app/admin/view/talent_allowance/index.html

@@ -276,7 +276,7 @@
                                 <i class="fa fa-cancle"></i>&nbsp;撤销审核
                             </button>
                             {/if}
-                            {if condition="chkCommission('/admin/talentAllowance/firstSbSubmit','/talentAllowance/firstSbSubmit')"}
+                            <!--{if condition="chkCommission('/admin/talentAllowance/firstSbSubmit','/talentAllowance/firstSbSubmit')"}
                             <button type="button" class="btn btn-sm btn-primary " onclick="TalentAllowanceInfo.showDataModal(1)" id="">
                                 <i class="fa fa-angle-double-up"></i>&nbsp;批量提交审核(社保局)
                             </button>
@@ -295,13 +295,13 @@
                             <button type="button" class="btn btn-sm btn-primary " onclick="TalentAllowanceInfo.showDataModal(3)" id="">
                                 <i class="fa fa-file-excel-o"></i>&nbsp;导出社保核查结果
                             </button>
-                            {/if}
+                            {/if}-->
                             {if condition="chkCommission('/admin/talentAllowance/updateFieldsAndFiles','/talentAllowance/updateFieldsAndFiles')"}
                             <button type="button" class="btn btn-sm btn-primary " onclick="TalentAllowanceInfo.updateFieldsAndFiles()" id="">
                                 <i class="fa fa-edit"></i>&nbsp;修改驳回字段
                             </button>
                             {/if}
-                            {if condition="chkCommission('/admin/talentAllowance/firstExport','/talentAllowance/firstExport')"}
+                            <!--{if condition="chkCommission('/admin/talentAllowance/firstExport','/talentAllowance/firstExport')"}
                             <button type="button" class="btn btn-sm btn-primary " onclick="TalentAllowanceInfo.exportBasicInfo()" id="">
                                 <i class="fa fa-file-excel-o"></i>&nbsp;导出基础信息
                             </button>
@@ -310,7 +310,7 @@
                             <button type="button" class="btn btn-sm btn-primary " onclick="TalentAllowanceInfo.showDataModal(4)" id="">
                                 <i class="fa fa-file-excel-o"></i>&nbsp;导出项目核查结果
                             </button>
-                            {/if}
+                            {/if}-->
                             {if condition="chkCommission('/admin/talentAllowance/firstSelect','/talentAllowance/firstSelect')"}
                             <button type="button" class="btn btn-sm btn-primary " onclick="TalentAllowanceInfo.select()" id="">
                                 <i class="fa fa-eye"></i>&nbsp;查看
@@ -365,7 +365,7 @@
                                 <i class="fa fa-reply"></i>&nbsp;撤销审核
                             </button>
                             {/if}
-                            {if condition="chkCommission('/admin/talentAllowance/reviewExport','/talentAllowance/reviewExport')"}
+                            <!--{if condition="chkCommission('/admin/talentAllowance/reviewExport','/talentAllowance/reviewExport')"}
                             <button type="button" class="btn btn-sm btn-primary " onclick="TalentAllowanceInfo.exportBasicInfo()" id="">
                                 <i class="fa fa-file-excel-o"></i>&nbsp;导出基础信息
                             </button>
@@ -374,17 +374,17 @@
                             <button type="button" class="btn btn-sm btn-primary " onclick="TalentAllowanceInfo.showDataModal(8)" id="">
                                 <i class="fa fa-file-excel-o"></i>&nbsp;导出项目核查结果
                             </button>
-                            {/if}
+                            {/if}-->
                             {if condition="chkCommission('/admin/talentAllowance/reviewSelect','/talentAllowance/reviewSelect')"}
                             <button type="button" class="btn btn-sm btn-primary " onclick="TalentAllowanceInfo.select()" id="">
                                 <i class="fa fa-eye"></i>&nbsp;查看
                             </button>
                             {/if}
-                            {if condition="chkCommission('/admin/talentAllowance/repair','/talentAllowance/repair')"}
+                            <!--{if condition="chkCommission('/admin/talentAllowance/repair','/talentAllowance/repair')"}
                             <button type="button" class="btn btn-sm btn-primary " onclick="TalentAllowanceInfo.repair()" id="">
                                 <i class="fa fa-eye"></i>&nbsp;修复
                             </button>
-                            {/if}
+                            {/if}-->
                             {/eq}
                             {eq name="process" value="4"}
                             {if condition="chkCommission('/admin/talentAllowance/prepareHczx','/talentAllowance/prepareHczx')"}

app/admin/view/talent_allowance/talentAllowanceInfo_info.html → app/admin/view/talent_allowance/info.html

@@ -64,47 +64,54 @@
                                 <div class="panel-body" >
                                     <form id="talentAllowanceForm" class="form-horizontal">
                                         <div class="col-sm-12 form-group-sm">
-                                            <input type="hidden" name="id" id="id" value="${item.id}">
-                                            <input type="hidden" name="year" id="year" value="${item.year}">
-                                            <input type="hidden" name="type" id="type" value="${item.type}">
-                                            <input type="hidden" name="talentId" id="talentId" value="${item.talentId}">
-                                            <input type="hidden" name="checkState" id="checkState" value="${item.checkState}">
-                                            <input type="hidden" name="process" id="process" value="${process}">
-                                            <input type="hidden" name="companyId" id="companyId" value="${item.companyId}">
-                                            <input type="hidden" name="allowanceType" id="allowanceType" value="${item.allowanceType}">
-                                            <input type="hidden" name="recommendAllowanceType" id="recommendAllowanceType" value="${item.recommendAllowanceType}">
-                                            @if(process == 1){
-                                                <input type="hidden" name="companyCode" id="companyCode" value="${item.companyCode}">
-                                            @}
+                                            <input type="hidden" name="id" id="id" value="{$row.id}">
+                                            <input type="hidden" name="year" id="year" value="{$row.year}">
+                                            <input type="hidden" name="type" id="type" value="{$row.type}">
+                                            <input type="hidden" name="talentId" id="talentId" value="{$row.talentId}">
+                                            <input type="hidden" name="checkState" id="checkState" value="{$row.checkState}">
+                                            <input type="hidden" name="process" id="process" value="{$process}">
+                                            <input type="hidden" name="companyId" id="companyId" value="{$row.companyId}">
+                                            <input type="hidden" name="allowanceType" id="allowanceType" value="{$row.allowanceType}">
+                                            <input type="hidden" name="recommendAllowanceType" id="recommendAllowanceType" value="{$row.recommendAllowanceType}">
                                             <div class="row">
                                                 <div class="rowGroup">
                                                     <label class="col-sm-1 control-label spacing"><span style="color: red">*</span>申报对象</label>
                                                     <div class="col-sm-2 spacing">
-                                                        <input type="text" class="form-control" readonly="readonly" id="name" name="name" value="${item.name}" >
+                                                        <input type="text" class="form-control" readonly="readonly" id="name" name="name" value="{$row.name}" >
+                                                    </div>
+                                                </div>
+                                                <div class="rowGroup">
+                                                    <label class="col-sm-1 control-label spacing"><span style="color: red">*</span>津补贴类型</label>
+                                                    <div class="col-sm-2 spacing">
+                                                        <select type="text" class="form-control" id="allowanceType" name="allowanceType" value="{$row.allowanceType}" disabled="disabled">
+                                                            <option>请选择</option>
+                                                            <option value="1">工作津贴</option>
+                                                            <option value="2">一次性交通补贴</option>
+                                                        </select>
                                                     </div>
                                                 </div>
                                                 <div class="rowGroup">
                                                     <label class="col-sm-1 control-label spacing"><span style="color: red">*</span>申报来源</label>
                                                     <div class="col-sm-2 spacing">
-                                                        <input type="text" class="form-control" readonly="readonly" id="sourceName" name="sourceName" value="${item.sourceName}" >
+                                                        <input type="text" class="form-control" readonly="readonly" id="sourceName" name="sourceName" value="{$row.sourceName}" >
                                                     </div>
                                                 </div>
                                                 <div class="rowGroup" id="talentTypeSpan">
                                                     <label class="col-sm-1 control-label spacing"><span style="color: red">*</span>人才标签</label>
                                                     <div class="col-sm-2 spacing">
-                                                        <input type="text" class="form-control" readonly="readonly" id="talentTypeName" name="talentTypeName" value="${item.talentTypeName}"/>
+                                                        <input type="text" class="form-control" readonly="readonly" id="talentTypeName" name="talentTypeName" value="{$row.talentTypeName}"/>
                                                     </div>
                                                 </div>
                                                 <div class="rowGroup">
                                                     <label class="col-sm-1 control-label spacing"><span style="color: red">*</span>企业名称</label>
                                                     <div class="col-sm-2 spacing">
-                                                        <input type="text" class="form-control" readonly="readonly" id="enterpriseName" name="enterpriseName" value="${item.enterpriseName}"/>
+                                                        <input type="text" class="form-control" readonly="readonly" id="enterpriseName" name="enterpriseName" value="{$row.enterpriseName}"/>
                                                     </div>
                                                 </div>
                                                 <div class="rowGroup">
                                                     <label class="col-sm-1 control-label spacing"><span style="color: red">*</span>性别</label>
                                                     <div class="col-sm-2 spacing">
-                                                        <select class="form-control" disabled="disabled" id="sex" name="sex" value="${item.sex}">
+                                                        <select class="form-control" disabled="disabled" id="sex" name="sex" value="{$row.sex}">
                                                             <option value="">请选择</option>
                                                             <option value="1">男</option>
                                                             <option value="2">女</option>
@@ -114,101 +121,97 @@
                                                 <div class="rowGroup">
                                                     <label class="col-sm-1 control-label spacing"><span style="color: red">*</span>证件号码</label>
                                                     <div class="col-sm-2 spacing">
-                                                        <input class="form-control" readonly="readonly" id="idCard" name="idCard" value="${item.idCard}">
+                                                        <input class="form-control" readonly="readonly" id="idCard" name="idCard" value="{$row.idCard}">
                                                     </div>
                                                 </div>
                                                 <div class="rowGroup">
                                                     <label class="col-sm-1 control-label spacing"><span style="color: red">*</span>籍贯</label>
                                                     <div class="col-sm-2 spacing">
-                                                        <input class="form-control" readonly="readonly" id="provinceCode" name="provinceCode" value="${item.provinceName}${item.cityName}${item.countyName}">
+                                                        <input class="form-control" readonly="readonly" id="provinceCode" name="provinceCode" value="{$row.provinceName}{$row.cityName}{$row.countyName}">
                                                     </div>
                                                 </div>
                                                 <div class="rowGroup" id="introductionModeSpan">
                                                     <label class="col-sm-1 control-label spacing"><span style="color: red">*</span>引进方式</label>
                                                     <div class="col-sm-2 spacing" >
-                                                        <input class="form-control" readonly="readonly" id="introductionModeName" name="introductionModeName" value="${item.introductionModeName}">
+                                                        <input class="form-control" readonly="readonly" id="introductionModeName" name="introductionModeName" value="{$row.introductionModeName}">
                                                     </div>
                                                 </div>
                                                 <div class="rowGroup" id="firstInJJTimeSpan">
                                                     <label class="col-sm-1 control-label spacing"><span style="color: red">*</span>首次来晋工作时间</label>
                                                     <div class="col-sm-2 spacing">
-                                                        <input type="text" class="form-control" readonly="readonly" id="firstInJJTime" name="firstInJJTime" value="${item.firstInJJTime}"/>
+                                                        <input type="text" class="form-control" readonly="readonly" id="firstInJJTime" name="firstInJJTime" value="{$row.firstInJJTime}"/>
                                                     </div>
                                                 </div>
                                                 <div class="rowGroup">
                                                     <label class="col-sm-1 control-label spacing"><span style="color: red">*</span>本单位入职时间</label>
                                                     <div class="col-sm-2 spacing">
-                                                        <input type="text" class="form-control" readonly="readonly" id="entryTime" name="entryTime" value="${item.entryTime}"/>
+                                                        <input type="text" class="form-control" readonly="readonly" id="entryTime" name="entryTime" value="{$row.entryTime}"/>
                                                     </div>
                                                 </div>
                                                 <div class="rowGroup">
                                                     <label class="col-sm-1 control-label spacing"><span style="color: red">*</span>职务</label>
                                                     <div class="col-sm-2 spacing">
-                                                        <input type="text" class="form-control" readonly="readonly" id="post" name="post" value="${item.post}"/>
+                                                        <input type="text" class="form-control" readonly="readonly" id="post" name="post" value="{$row.post}"/>
                                                     </div>
                                                 </div>
                                                 <div class="rowGroup">
                                                     <label class="col-sm-1 control-label spacing"><span style="color: red">*</span>手机号码</label>
                                                     <div class="col-sm-2 spacing">
-                                                        <input type="text" class="form-control" readonly="readonly" id="phone" name="phone" value="${item.phone}"/>
+                                                        <input type="text" class="form-control" readonly="readonly" id="phone" name="phone" value="{$row.phone}"/>
                                                     </div>
                                                 </div>
                                                 <div class="rowGroup">
                                                     <label class="col-sm-1 control-label spacing"><span style="color: red">*</span>开户银行</label>
                                                     <div class="col-sm-2 spacing">
-                                                        <input type="text" class="form-control" readonly="readonly" id="bank" name="bank" value="${item.bank}"/>
+                                                        <input type="text" class="form-control" readonly="readonly" id="bank" name="bank" value="{$row.bank}"/>
                                                     </div>
                                                 </div>
                                                 <div class="rowGroup" id="bankNumberSpan">
                                                     <label class="col-sm-1 control-label spacing"><span style="color: red">*</span>银行行号</label>
                                                     <div class="col-sm-2 spacing">
-                                                        <input type="text" class="form-control" readonly="readonly" id="bankNumber" name="bankNumber" value="${item.bankNumber}"/>
+                                                        <input type="text" class="form-control" readonly="readonly" id="bankNumber" name="bankNumber" value="{$row.bankNumber}"/>
                                                     </div>
                                                 </div>
                                                 <div class="rowGroup">
                                                     <label class="col-sm-1 control-label spacing"><span style="color: red">*</span>开户银行网点</label>
                                                     <div class="col-sm-2 spacing">
-                                                        <input type="text" class="form-control" readonly="readonly" id="bankNetwork" name="bankNetwork" value="${item.bankNetwork}"/>
+                                                        <input type="text" class="form-control" readonly="readonly" id="bankNetwork" name="bankNetwork" value="{$row.bankNetwork}"/>
                                                     </div>
                                                 </div>
                                                 <div class="rowGroup">
                                                     <label class="col-sm-1 control-label spacing"><span style="color: red">*</span>银行账号</label>
                                                     <div class="col-sm-2 spacing">
-                                                        <input type="text" class="form-control" readonly="readonly" id="bankAccount" name="bankAccount" value="${item.bankAccount}"/>
+                                                        <input type="text" class="form-control" readonly="readonly" id="bankAccount" name="bankAccount" value="{$row.bankAccount}"/>
                                                     </div>
                                                 </div>
                                                 <div class="rowGroup">
                                                     <label class="col-sm-1 control-label spacing"><span style="color: red">*</span>人才层次</label>
                                                     <div class="col-sm-2 spacing">
-                                                        <input type="text" class="form-control"  readonly="readonly"id="talentArrangeName" name="talentArrangeName" value="${item.talentArrangeName}">
+                                                        <input type="text" class="form-control"  readonly="readonly"id="talentArrangeName" name="talentArrangeName" value="{$row.talentArrangeName}">
                                                     </div>
                                                 </div>
                                                 <div class="rowGroup">
                                                     <label class="col-sm-1 control-label spacing"><span style="color: red">*</span>认定条件</label>
                                                     <div class="col-sm-2 spacing">
-                                                        <input type="text" class="form-control" readonly="readonly" id="identifyConditionText" name="identifyConditionText" value="${item.identifyConditionText}">
+                                                        <input type="text" class="form-control" readonly="readonly" id="identifyConditionText" name="identifyConditionText" value="{$row.identifyConditionText}">
                                                     </div>
                                                 </div>
                                                 <div class="rowGroup">
                                                     <label class="col-sm-1 control-label spacing"><span style="color: red">*</span>认定条件名称</label>
                                                     <div class="col-sm-2 spacing">
-                                                        <input type="text" class="form-control" readonly="readonly" id="identifyConditionName" name="identifyConditionName" value="${item.identifyConditionName}"/>
+                                                        <input type="text" class="form-control" readonly="readonly" id="identifyConditionName" name="identifyConditionName" value="{$row.identifyConditionName}"/>
                                                     </div>
                                                 </div>
                                                 <div class="rowGroup">
                                                     <label class="col-sm-1 control-label spacing"><span style="color: red">*</span>认定条件取得时间</label>
                                                     <div class="col-sm-2 spacing">
-                                                        <input type="text" class="form-control" readonly="readonly" id="identifyGetTime" name="identifyGetTime" value="${item.identifyGetTime}"/>
+                                                        <input type="text" class="form-control" readonly="readonly" id="identifyGetTime" name="identifyGetTime" value="{$row.identifyGetTime}"/>
                                                     </div>
                                                 </div>
-                                                <div class="rowGroup" id="wageDiv"
-                                                     @if(item.active != 2){
-                                                     style="display: none"
-                                                     @}
-                                                >
+                                                <div class="rowGroup" id="wageDiv" {if condition="$row['allowanceType' neq 1]"}style="display:none;"{/if}>
                                                     <label class="col-sm-1 control-label spacing"><span style="color: red">*</span>上一年度年薪(元)</label>
                                                     <div class="col-sm-2 spacing">
-                                                        <input type="text" class="form-control" id="wage" readonly="readonly" placeholder="正常工资薪金、一次性奖金收入" name="wage" value="${item.wage}"/>
+                                                        <input type="text" class="form-control" id="wage" readonly="readonly" placeholder="正常工资薪金、一次性奖金收入" name="wage" value="{$row.wage}"/>
                                                     </div>
                                                 </div>
                                             </div>
@@ -223,10 +226,15 @@
                                     </h3>
                                 </div>
                                 <div class="panel-body">
-                                    <#table id="projectTable"/>
+                                    <table id="projectTable" class="table-condensed" style="font-size: 10px;table-layout: fixed!important;" data-mobile-responsive="true" data-click-to-select="true">
+                                        <thead>
+                                            <tr>
+                                                <th data-field="selectItem" data-checkbox="true"></th>
+                                            </tr>
+                                        </thead>
+                                    </table>
                                 </div>
                             </div>
-                            @if((process == 1 && item.companyCode == 'rsj')||process == 3 || process==4){
                             <div class="panel panel-default" >
                                 <div class="panel-heading" onclick="$(this).next().toggle()">
                                     <h3 class="panel-title">
@@ -234,11 +242,16 @@
                                     </h3>
                                 </div>
                                 <div class="panel-body">
-                                    <#table id="arrangeTable"/>
+                                    <table id="arrangeTable" class="table-condensed" style="font-size: 10px;table-layout: fixed!important;" data-mobile-responsive="true" data-click-to-select="true">
+                                        <thead>
+                                            <tr>
+                                                <th data-field="selectItem" data-checkbox="true"></th>
+                                            </tr>
+                                        </thead>
+                                    </table>
                                 </div>
                             </div>
-                            @}
-                            @if(process == 4){
+                            {eq name="process" value="4"}
                             <div id="recommendDiv" class="panel panel-default">
                                 <div class="panel-heading" onclick="$(this).next().toggle()">推荐津补贴类型</div>
                                 <div class="panel-body">
@@ -247,34 +260,34 @@
                                             <label class="col-sm-2 control-label spacing">津补贴类型</label>
                                             <div class="col-sm-4 spacing">
                                                 <input type="text" class="form-control" readonly="readonly" id="oldAllowanceType"
-                                                       @if(item.recommendAllowanceType == 1){
+                                                       {eq name="row.recommendAllowanceType" value="1"}
                                                        value="人才津贴"
-                                                       @}
-                                                       @if(item.recommendAllowanceType == 2){
+                                                       {/eq}
+                                                       {eq name="row.recommendAllowanceType" value="2"}
                                                        value="一次性交通补贴"
-                                                       @}
-                                                       @if(item.recommendAllowanceType == 3){
+                                                       {/eq}
+                                                       {eq name="row.recommendAllowanceType" value="3"}
                                                        value="不予兑现"
-                                                       @}
+                                                       {/eq}
                                                 />
                                             </div>
                                             <label class="col-sm-2 control-label spacing">兑现月份</label>
                                             <div class="col-sm-4 spacing">
-                                                <input type="text" class="form-control" readonly="readonly" id="dxMonths" value="${item.recommendMonths}"/>
+                                                <input type="text" class="form-control" readonly="readonly" id="dxMonths" value="{$row.recommendMonths}"/>
                                             </div>
                                             <label class="col-sm-2 control-label spacing">津补贴判定详情</label>
                                             <div class="col-sm-4 spacing">
-                                                <textarea class="form-control" readonly="readonly" id="allowanceMsg" name="allowanceMsg" rows="4" >${item.recommendAllowanceMsg}</textarea>
+                                                <textarea class="form-control" readonly="readonly" id="allowanceMsg" name="allowanceMsg" rows="4" >{$row.recommendAllowanceMsg}</textarea>
                                             </div>
                                             <label class="col-sm-2 control-label spacing">津补贴计算详情</label>
                                             <div class="col-sm-4 spacing">
-                                                <input type="text" class="form-control" readonly="readonly" id="moneyDesc" name="moneyDesc" value="${item.recommendMoneyDesc}"/>
+                                                <input type="text" class="form-control" readonly="readonly" id="moneyDesc" name="moneyDesc" value="{$row.recommendMoneyDesc}"/>
                                             </div>
                                         </div>
                                     </div>
                                 </div>
                             </div>
-                            @}
+                            {/eq}
                             <div class="panel panel-default">
                                 <div class="panel-heading" onclick="$(this).next().toggle()">
                                     <h3 class="panel-title">
@@ -282,10 +295,16 @@
                                     </h3>
                                 </div>
                                 <div class="panel-body" >
-                                    <#table id="fileTable"/>
+                                    <table id="fileTable" class="table-condensed" style="font-size: 10px;table-layout: fixed!important;" data-mobile-responsive="true" data-click-to-select="true">
+                                        <thead>
+                                            <tr>
+                                                <th data-field="selectItem" data-checkbox="true"></th>
+                                            </tr>
+                                        </thead>
+                                    </table>
                                     <label style="padding-top: 15px;color: red">*请根据上传的附件材料，编辑好相应的文件夹名称</label><br>
                                     <label style="padding-top: 15px;color: red">声明：本人对输入材料的真实性负全部责任</label>
-                                    <form id="uploadForm" action="${ctxPath}/api/talentInfo/addTalentFile" method="post" class="form-horizontal" enctype="multipart/form-data" target="hiddenIframe" style="display: none">
+                                    <form id="uploadForm" action="/common/api/addTalentFile" method="post" class="form-horizontal" enctype="multipart/form-data" target="hiddenIframe" style="display: none">
                                         <input type='hidden' id="fileId" name="fileId" >
                                         <input type='file' id="upload_file" name="fileUrl" style='display: none'>
                                         <input type='hidden' id="mainId" name="mainId" >
@@ -503,7 +522,7 @@
                 <h4 class="modal-title" id="jjAttendanceModalLabel">编辑</h4>
             </div>
             <div class="modal-body">
-                <form id="jjAttendanceForm" action="${ctxPath}/talentAllowanceInfo/editAttendanceNeedFile" method="post" enctype="multipart/form-data" target="hiddenIframe">
+                <form id="jjAttendanceForm" action="/admin/talentAllowance/editAttendanceNeedFile" method="post" enctype="multipart/form-data" target="hiddenIframe">
                     <input type="hidden" id="jjAttendanceId" name="jjAttendanceId">
                     <input type="hidden" id="jjAttendanceEnterpriseId" name="jjAttendanceEnterpriseId">
                     <input type="hidden" id="attendanceMonths" name="attendanceMonths">

app/common/state/AllowanceStateEnum.php

@@ -0,0 +1,56 @@
+<?php
+
+/*
+ * To change this license header, choose License Headers in Project Properties.
+ * To change this template file, choose Tools | Templates
+ * and open the template in the editor.
+ */
+
+namespace app\common\state;
+
+/**
+ * Description of AllowanceStateEnum
+ *
+ * @author sgq
+ */
+class AllowanceStateEnum {
+
+    const NOTPASS = -1;
+    const SAVE = 1;
+    const NEED_CHECK = 5;
+    const FIRST_REJECT = 10;
+    const REJECT_TO_FIRST = 13;
+    const NEED_VISIT_CHECK = 15;
+    const NEED_REVIEW = 20;
+    const REVIEW_REJECT = 25;
+    const REVIEW_PASS = 30;
+    const PUBLIC_REJECT = 35;
+
+    static function getStateName($code) {
+        switch ($code) {
+            case self::NOTPASS:
+                return "审核不通过";
+            case self::SAVE:
+                return "待提交";
+            case self::NEED_CHECK:
+                return "待审核";
+            case self::FIRST_REJECT:
+                return "初审驳回";
+            case self::REJECT_TO_FIRST:
+                return "驳回(至初审)";
+            case self::NEED_VISIT_CHECK:
+                return "待走访";
+            case self::NEED_REVIEW:
+                return "待复核";
+            case self::REVIEW_REJECT:
+                return "已驳回(至走访核查)";
+            case self::REVIEW_PASS:
+                return "审核通过";
+            case self::PUBLIC_REJECT:
+                return "已驳回(至复核)";
+            default:
+                return "";
+        }
+    }
+
+}

app/common/state/AllowanceTypeEnum.php

@@ -0,0 +1,35 @@
+<?php
+
+/*
+ * To change this license header, choose License Headers in Project Properties.
+ * To change this template file, choose Tools | Templates
+ * and open the template in the editor.
+ */
+
+namespace app\common\state;
+
+/**
+ * Description of AllowanceTypeEnum
+ *
+ * @author sgq
+ */
+class AllowanceTypeEnum {
+
+    const JBT_TALENT = 1;
+    const JBT_JT = 2;
+    const JBT_NOTCASH = 3;
+
+    static function getTypeName($code) {
+        switch ($code) {
+            case self::JBT_TALENT:
+                return "工作津贴";
+            case self::JBT_JT:
+                return "一次性交通补贴";
+            case self::JBT_NOTCASH:
+                return "不予兑现";
+            default:
+                return "未判定";
+        }
+    }
+
+}

public/static/modular/gate/talentAllowance/common/talentAllowance_patch.js

@@ -65,7 +65,7 @@ TalentAllowanceInfoDlg.validate = function () {
  */
 TalentAllowanceInfoDlg.init = function(){
     var talentId = $("#name").val();
-    var ajax = new $ax(Feng.ctxPath + "/api/talentInfo/detail/"+talentId, function(data){
+    var ajax = new $ax(Feng.ctxPath + "/enterprise/talent/getInfoById/id/"+talentId, function(data){
         $("#talentId").val(talentId);
         $("#talentTypeName").val(data.talentTypeName);
         $("#enterpriseName").val(data.enterpriseName);
@@ -99,7 +99,7 @@ TalentAllowanceInfoDlg.init = function(){
 TalentAllowanceInfoDlg.initContract = function(){
     $("#projectTable").bootstrapTable("destroy",{});
     $("#projectTable").bootstrapTable({
-        url: Feng.ctxPath + "/api/talentAllowance/findAllowanceContractDetail",
+        url: Feng.ctxPath + "/enterprise/talentAllowance/findAllowanceContractDetail",
         method: 'POST',
         contentType: "application/x-www-form-urlencoded; charset=UTF-8",
         search: false,					// 是否显示表格搜索，此搜索是客户端搜索，不会进服务端
@@ -163,7 +163,7 @@ TalentAllowanceInfoDlg.initFileTable = function (){
     queryData['project'] = CONFIG.project_jbt;
     queryData['type'] = $("#type").val();
     $("#fileTable").bootstrapTable({
-        url: Feng.ctxPath + "/api/talentInfo/findUnCommonFileType",
+        url: Feng.ctxPath + "/common/api/findUnCommonFileType",
         method: 'POST',
         contentType: "application/x-www-form-urlencoded; charset=UTF-8",
         search: false,					// 是否显示表格搜索，此搜索是客户端搜索，不会进服务端
@@ -196,7 +196,7 @@ TalentAllowanceInfoDlg.initFileTable = function (){
             $("#fileTable").bootstrapTable('expandAllRows');
         },
         onExpandRow: function (index, row, $detail) {
-            var ajax = new $ax(Feng.ctxPath + "/api/talentInfo/listTalentFile", function (data) {
+            var ajax = new $ax(Feng.ctxPath + "/common/api/listTalentFile", function (data) {
                 if(data==null||data.length==0){
                     return;
                 }
@@ -383,7 +383,7 @@ TalentAllowanceInfoDlg.upload = function (fileTypeId,fileId){
 //删除附件
 TalentAllowanceInfoDlg.deleteFile = function (id){
     var operation = function() {
-        var ajax = new $ax(Feng.ctxPath + "/api/talentInfo/deleteFile", function (data) {
+        var ajax = new $ax(Feng.ctxPath + "/common/api/deleteFile", function (data) {
             if(data.code=200){
                 Feng.success(data.msg);
                 $("#fileTable").bootstrapTable("refresh", {});
@@ -411,7 +411,7 @@ TalentAllowanceInfoDlg.showLog = function (id) {
         maxmin: true,
         success :function (layero, index) {
             $('#'+id).bootstrapTable({
-                url: Feng.ctxPath + "/api/talentChecklog/getJbtCheckLog",
+                url: Feng.ctxPath + "/common/api/getJbtCheckLog",
                 method: 'POST',
                 contentType: "application/x-www-form-urlencoded; charset=UTF-8",
                 search: false,					// 是否显示表格搜索，此搜索是客户端搜索，不会进服务端
@@ -459,7 +459,7 @@ TalentAllowanceInfoDlg.callBack = function (data){
     layer.close(data.obj);
     Feng.info(data.msg);
     if (data.code == 200) {
-        var ajax = new $ax(Feng.ctxPath + "/api/talentAllowance/updateSuppleState", function(data){
+        var ajax = new $ax(Feng.ctxPath + "/enterprise/talentAllowance/updateSuppleState", function(data){
             if(data.code == 200){
 
             }else{
@@ -488,7 +488,7 @@ $(function() {
         "displayCode": "id",
         "displayName": "name",
         "type": "GET",
-        "url": Feng.ctxPath + "/api/talentInfo/findTalentByEnterpriseInLibrary?type=1&year="+$("#year").val()
+        "url": Feng.ctxPath + "/enterprise/talent/findTalentByEnterpriseInLibrary?type=1&year="+$("#year").val()
     });
     TalentAllowanceInfoDlg.validId();
     if($("#type").val()==2){

public/static/modular/talentAllowance/talentAllowanceInfo.js

@@ -33,7 +33,7 @@ TalentAllowanceInfo.openCheckTalentAllowanceInfo = function () {
                 title: '津补贴初级审核',
                 fix: false, //不固定
                 maxmin: true,
-                content: Feng.ctxPath + '/talentAllowanceInfo/toCheckPage/' + TalentAllowanceInfo.seItem.id + "/" + $("#process").val() + "/" + TalentAllowanceInfo.seItem.companyId,
+                content: Feng.ctxPath + '/admin/talentAllowance/toCheckPage/id/' + TalentAllowanceInfo.seItem.id + "/process/" + $("#process").val() + "/companyId/" + TalentAllowanceInfo.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) {
@@ -56,7 +56,7 @@ TalentAllowanceInfo.openCheckTalentAllowanceInfo = function () {
                 title: '津补贴走访核查',
                 fix: false, //不固定
                 maxmin: true,
-                content: Feng.ctxPath + '/talentAllowanceInfo/toCheckPage/' + TalentAllowanceInfo.seItem.id + "/" + $("#process").val() + "/null",
+                content: Feng.ctxPath + '/admin/talentAllowance/toCheckPage/id/' + TalentAllowanceInfo.seItem.id + "/process/" + $("#process").val() + "/null",
                 btn: ['<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) {
@@ -76,7 +76,7 @@ TalentAllowanceInfo.openCheckTalentAllowanceInfo = function () {
                 fix: false, //不固定
                 maxmin: true,
                 shadeClose: false,
-                content: Feng.ctxPath + '/talentAllowanceInfo/toCheckPage/' + TalentAllowanceInfo.seItem.id + "/" + $("#process").val() + "/null",
+                content: Feng.ctxPath + '/admin/talentAllowance/toCheckPage/id/' + TalentAllowanceInfo.seItem.id + "/process/" + $("#process").val() + "/null",
                 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) {
@@ -105,9 +105,9 @@ TalentAllowanceInfo.openCheckTalentAllowanceInfo = function () {
 TalentAllowanceInfo.select = function () {
     if (this.check()) {
         var process = $("#process").val();
-        var url = Feng.ctxPath + '/talentAllowanceInfo/toSelectPage/' + TalentAllowanceInfo.seItem.id + "/" + $("#process").val() + "/null";
+        var url = Feng.ctxPath + '/admin/talentAllowance/toSelectPage/id/' + TalentAllowanceInfo.seItem.id + "/process/" + $("#process").val() + "/null";
         if (process == 1) {
-            url = Feng.ctxPath + '/talentAllowanceInfo/toSelectPage/' + TalentAllowanceInfo.seItem.id + "/" + $("#process").val() + "/" + TalentAllowanceInfo.seItem.companyId;
+            url = Feng.ctxPath + '/admin/talentAllowance/toSelectPage/id/' + TalentAllowanceInfo.seItem.id + "/process/" + $("#process").val() + "/companyId/" + TalentAllowanceInfo.seItem.companyId;
         }
         var index = layer.open({
             type: 2,
@@ -165,125 +165,125 @@ TalentAllowanceInfo.showDataModal = function (type) {
     }
     $('#dataTable').bootstrapTable('destroy');
     $('#dataTable').bootstrapTable({
-        url: Feng.ctxPath + "/talentAllowanceInfo/selectNeedData?type=" + type,
+        url: Feng.ctxPath + "/admin/talentAllowance/selectNeedData?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) {
             $("#exportCommonModal").modal("show");
             return res.obj.rows;
         },
         columns:
-            [
-                {field: "selectItem", checkbox: true},
-                {title: '年度', field: 'year', visible: true, align: 'center', valign: 'middle', width: "10%"},
-                {title: '姓名', field: 'name', visible: true, align: 'center', valign: 'middle', width: "10%"},
-                {title: '证件号码', field: 'idCard', visible: true, align: 'center', valign: 'middle', width: "30%"},
-                {
-                    title: '企业名称',
-                    field: 'enterpriseName',
-                    visible: true,
-                    align: 'center',
-                    valign: 'middle',
-                    width: "35%"
-                },
-                {
-                    title: '审核状态',
-                    field: 'checkState',
-                    visible: true,
-                    align: 'center',
-                    valign: 'middle',
-                    'class': 'uitd_showTip',
-                    width: "15%",
-                    formatter(value, row, index) {
-                        switch (type) {
-                            case 1:                             //批量提交审核(社保局)
-                            case 2:                             //导出社保录入模板
-                            case 3:                             //导出社保核查结果
-                                if (value == -2) {
-                                    return "<span class='label'>待提交</span>";
-                                } else if (value == -1) {
-                                    return "<span class='label label-warning-light'>审核不通过</span>";
-                                } else if (value == 1) {
-                                    return "<span class='label label-success'>待审核</span>";
-                                } else if (value == 2) {
-                                    return "<span class='label label-danger'>已驳回</span>";
-                                } else if (value == 3) {
-                                    return "<span class='label label-primary'>已通过</span>"
-                                } else if (value == 4) {
-                                    return "<span class='label label-success'>上级驳回</span>";
-                                } else if (value == 9) {
-                                    return "<span class='label label-success'>重新提交</span>";
-                                }
-                                break;
-                            case 4:                             //导出项目核查结果(初审)
-                                if (value == -1) {
-                                    return "<span class='label label-warning-light'>审核不通过</span>";
-                                } else if (value == 1) {
-                                    return "<span class='label'>待提交</span>"
-                                } else if (value == 5) {
-                                    return (Feng.isNotEmptyStr(row.highProcess) && row.highProcess > 1) ? "<span class='label label-success'>重新提交</span>" : "<span class='label label-success'>待审核</span>";
-                                } else if (value == 13) {
-                                    return "<span class='label label-success'>上级驳回</span>";
-                                } else if (value == 10) {
-                                    return "<span class='label label-danger'>已驳回</span>";
-                                } else if (value == 15 || value == 20 || value == 25 || value == 30) {
-                                    return "<span class='label label-primary'>已通过</span>";
-                                }
-                                break;
-                            case 5:                             //批量提交审核(走访核查)
-                            case 6:                             //导出项目录入模板(走访核查)
-                            case 7:                             //导出项目核查结果(走访核查)
-                                if (value == -1) {
-                                    return "<span class='label label-warning-light'>审核不通过</span>";
-                                } else if (value == 1 || value == 5 || value == 10) {
-                                    return "<span class='label label-danger'>已驳回</span>";
-                                } else if (value == 15) {
-                                    return (Feng.isNotEmptyStr(row.highProcess) && row.highProcess >= 2) ? "<span class='label label-success'>重新提交</span>" : "<span class='label label-success'>待审核</span>";
-                                } else if (value == 20 || value == 30) {
-                                    return "<span class='label label-primary'>已通过</span>"
-                                } else if (value == 25) {
-                                    return "<span class='label label-success'>上级驳回</span>";
-                                }
-                                break;
-                            case 8:                             //导出项目核查结果(复核)
-                                if (value == -1) {
-                                    return "<span class='label label-warning-light'>审核不通过</span>";
-                                } else if (value == 1 || value == 5 || value == 10 || value == 13 || value == 15 || value == 25) {
-                                    return "<span class='label label-danger'>已驳回</span>";
-                                } else if (value == 20) {
-                                    return (Feng.isNotEmptyStr(row.highProcess) && row.highProcess >= 3) ? "<span class='label label-success'>重新提交</span>" : "<span class='label label-success'>待审核</span>";
-                                } else if (value == 30) {
-                                    return "<span class='label label-primary'>已通过</span>"
-                                } else if (value == 35) {
-                                    return "<span class='label label-success'>公示驳回</span>";
-                                }
-                                break;
-                            case 9:                             //导出项目核查结果(预备库)
-                                if (value == -1) {
-                                    return "<span class='label label-warning-light'>审核不通过</span>";
-                                }
-                                if (value == 30) {
-                                    return "<span class='label label-primary'>已通过</span>"
-                                }
-                                break;
+                [
+                    {field: "selectItem", checkbox: true},
+                    {title: '年度', field: 'year', visible: true, align: 'center', valign: 'middle', width: "10%"},
+                    {title: '姓名', field: 'name', visible: true, align: 'center', valign: 'middle', width: "10%"},
+                    {title: '证件号码', field: 'idCard', visible: true, align: 'center', valign: 'middle', width: "30%"},
+                    {
+                        title: '企业名称',
+                        field: 'enterpriseName',
+                        visible: true,
+                        align: 'center',
+                        valign: 'middle',
+                        width: "35%"
+                    },
+                    {
+                        title: '审核状态',
+                        field: 'checkState',
+                        visible: true,
+                        align: 'center',
+                        valign: 'middle',
+                        'class': 'uitd_showTip',
+                        width: "15%",
+                        formatter(value, row, index) {
+                            switch (type) {
+                                case 1:                             //批量提交审核(社保局)
+                                case 2:                             //导出社保录入模板
+                                case 3:                             //导出社保核查结果
+                                    if (value == -2) {
+                                        return "<span class='label'>待提交</span>";
+                                    } else if (value == -1) {
+                                        return "<span class='label label-warning-light'>审核不通过</span>";
+                                    } else if (value == 1) {
+                                        return "<span class='label label-success'>待审核</span>";
+                                    } else if (value == 2) {
+                                        return "<span class='label label-danger'>已驳回</span>";
+                                    } else if (value == 3) {
+                                        return "<span class='label label-primary'>已通过</span>"
+                                    } else if (value == 4) {
+                                        return "<span class='label label-success'>上级驳回</span>";
+                                    } else if (value == 9) {
+                                        return "<span class='label label-success'>重新提交</span>";
+                                    }
+                                    break;
+                                case 4:                             //导出项目核查结果(初审)
+                                    if (value == -1) {
+                                        return "<span class='label label-warning-light'>审核不通过</span>";
+                                    } else if (value == 1) {
+                                        return "<span class='label'>待提交</span>"
+                                    } else if (value == 5) {
+                                        return (Feng.isNotEmptyStr(row.highProcess) && row.highProcess > 1) ? "<span class='label label-success'>重新提交</span>" : "<span class='label label-success'>待审核</span>";
+                                    } else if (value == 13) {
+                                        return "<span class='label label-success'>上级驳回</span>";
+                                    } else if (value == 10) {
+                                        return "<span class='label label-danger'>已驳回</span>";
+                                    } else if (value == 15 || value == 20 || value == 25 || value == 30) {
+                                        return "<span class='label label-primary'>已通过</span>";
+                                    }
+                                    break;
+                                case 5:                             //批量提交审核(走访核查)
+                                case 6:                             //导出项目录入模板(走访核查)
+                                case 7:                             //导出项目核查结果(走访核查)
+                                    if (value == -1) {
+                                        return "<span class='label label-warning-light'>审核不通过</span>";
+                                    } else if (value == 1 || value == 5 || value == 10) {
+                                        return "<span class='label label-danger'>已驳回</span>";
+                                    } else if (value == 15) {
+                                        return (Feng.isNotEmptyStr(row.highProcess) && row.highProcess >= 2) ? "<span class='label label-success'>重新提交</span>" : "<span class='label label-success'>待审核</span>";
+                                    } else if (value == 20 || value == 30) {
+                                        return "<span class='label label-primary'>已通过</span>"
+                                    } else if (value == 25) {
+                                        return "<span class='label label-success'>上级驳回</span>";
+                                    }
+                                    break;
+                                case 8:                             //导出项目核查结果(复核)
+                                    if (value == -1) {
+                                        return "<span class='label label-warning-light'>审核不通过</span>";
+                                    } else if (value == 1 || value == 5 || value == 10 || value == 13 || value == 15 || value == 25) {
+                                        return "<span class='label label-danger'>已驳回</span>";
+                                    } else if (value == 20) {
+                                        return (Feng.isNotEmptyStr(row.highProcess) && row.highProcess >= 3) ? "<span class='label label-success'>重新提交</span>" : "<span class='label label-success'>待审核</span>";
+                                    } else if (value == 30) {
+                                        return "<span class='label label-primary'>已通过</span>"
+                                    } else if (value == 35) {
+                                        return "<span class='label label-success'>公示驳回</span>";
+                                    }
+                                    break;
+                                case 9:                             //导出项目核查结果(预备库)
+                                    if (value == -1) {
+                                        return "<span class='label label-warning-light'>审核不通过</span>";
+                                    }
+                                    if (value == 30) {
+                                        return "<span class='label label-primary'>已通过</span>"
+                                    }
+                                    break;
+                            }
                         }
-                    }
-                },
-            ]
+                    },
+                ]
 
     });
 }
@@ -295,7 +295,7 @@ TalentAllowanceInfo.commonSearch = function () {
     var name = $("#commonName").val();
     var idCard = $("#commonIdCard").val();
     var year = $("#commonYear").val();
-    $('#dataTable').bootstrapTable("refresh", {"query": {"name": name, "idCard": idCard,"year":year}});
+    $('#dataTable').bootstrapTable("refresh", {"query": {"name": name, "idCard": idCard, "year": year}});
 }
 
 /**
@@ -321,7 +321,7 @@ TalentAllowanceInfo.submitBatch = function () {
         ids = ids + selected[i].id + ",";
     }
     var operation = function () {
-        var ajax = new $ax(Feng.ctxPath + "/talentAllowanceInfo/submitCheckBatch", function (data) {
+        var ajax = new $ax(Feng.ctxPath + "/admin/talentAllowance/submitCheckBatch", function (data) {
             if (data.code == 200) {
                 Feng.success(data.msg);
                 TalentAllowanceInfo.table.refresh();
@@ -356,7 +356,7 @@ TalentAllowanceInfo.submitBatchVisit = function () {
             icon: 16
             , shade: 0.3
         });
-        var ajax = new $ax(Feng.ctxPath + "/talentAllowanceInfo/submitBatchVisit", function (data) {
+        var ajax = new $ax(Feng.ctxPath + "/admin/talentAllowance/submitBatchVisit", function (data) {
             layer.close(i);
             if (data.code == 200) {
                 Feng.success(data.msg);
@@ -377,7 +377,7 @@ TalentAllowanceInfo.submitBatchVisit = function () {
 
 TalentAllowanceInfo.updateFieldsAndFiles = function () {
     if (this.check()) {
-        var ajax = new $ax(Feng.ctxPath + "/talentAllowanceInfo/findFieldsAndFiles?id=" + TalentAllowanceInfo.seItem.id, function (data) {
+        var ajax = new $ax(Feng.ctxPath + "/admin/talentAllowance/findFieldsAndFiles?id=" + TalentAllowanceInfo.seItem.id, function (data) {
             var obj = data.obj.obj;
             if (data.code == 200) {
                 layer.open({
@@ -389,26 +389,26 @@ TalentAllowanceInfo.updateFieldsAndFiles = function () {
                     shade: 0,
                     maxmin: true,
                     content: '<form id="checkForm">\n' +
-                        '                    <div class="form-group" id="field" style="margin: 10px">\n' +
-                        '                        <label for="field_concat" class="control-label">可修改合同时间</label>\n' +
-                        '                        <div id="field_concat">\n' +
-                        '                        </div>\n' +
-                        '                        <label for="field_project" class="control-label">可修改字段</label>\n' +
-                        '                        <div id="field_field">\n' +
-                        '                           <ul><li style="width: 100%"><input type="checkbox" value="wage"><span>上一年度年薪(元)</span></li></ul>'+
-                        '                        </div>\n'+
-                        '                        <label for="field_project" class="control-label">可修改项目</label>\n' +
-                        '                        <div id="field_project">\n' +
-                        '                        </div>\n' +
-                        '                        <label for="field_file" 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="TalentAllowanceInfoSupple.checkAll(\'field\')">全选</button>\n' +
-                        '                            <button type="button" class="btn btn-success" onclick="TalentAllowanceInfoSupple.unCheckAll(\'field\')">反选</button>\n' +
-                        '                        </div>\n' +
-                        '                    </div>\n' +
-                        '                </form>',
+                            '                    <div class="form-group" id="field" style="margin: 10px">\n' +
+                            '                        <label for="field_concat" class="control-label">可修改合同时间</label>\n' +
+                            '                        <div id="field_concat">\n' +
+                            '                        </div>\n' +
+                            '                        <label for="field_project" class="control-label">可修改字段</label>\n' +
+                            '                        <div id="field_field">\n' +
+                            '                           <ul><li style="width: 100%"><input type="checkbox" value="wage"><span>上一年度年薪(元)</span></li></ul>' +
+                            '                        </div>\n' +
+                            '                        <label for="field_project" class="control-label">可修改项目</label>\n' +
+                            '                        <div id="field_project">\n' +
+                            '                        </div>\n' +
+                            '                        <label for="field_file" 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="TalentAllowanceInfoSupple.checkAll(\'field\')">全选</button>\n' +
+                            '                            <button type="button" class="btn btn-success" onclick="TalentAllowanceInfoSupple.unCheckAll(\'field\')">反选</button>\n' +
+                            '                        </div>\n' +
+                            '                    </div>\n' +
+                            '                </form>',
                     btn: ['<i class="fa fa-save"></i>&nbsp;&nbsp;提交', '<i class="fa fa-eraser"></i>&nbsp;&nbsp;关闭'],
                     btnAlign: 'c',
                     zIndex: layer.zIndex,
@@ -465,12 +465,12 @@ TalentAllowanceInfo.updateFieldsAndFiles = function () {
                                 }
                             });
                         }
-                        if(Feng.isNotEmptyStr(fields) && fields == "wage"){
+                        if (Feng.isNotEmptyStr(fields) && fields == "wage") {
                             $("#field_field ul input[value='wage']").iCheck("check");
                         }
                     },
                     yes: function (index, layero) {
-                        var projects = '', files = '', concats = '' ,fields = '';
+                        var projects = '', files = '', concats = '', fields = '';
                         $("#field_project li input").each(function (index) {
                             if ($(this).is(":checked")) {
                                 projects = projects + $(this).val() + ",";
@@ -486,17 +486,17 @@ TalentAllowanceInfo.updateFieldsAndFiles = function () {
                                 concats = concats + $(this).val() + ",";
                             }
                         });
-                        $("#field_field li input").each(function(index){
-                            if($(this).is(":checked")){
+                        $("#field_field li input").each(function (index) {
+                            if ($(this).is(":checked")) {
                                 fields = fields + $(this).val() + ",";
                             }
                         });
-                        fields  = fields.substring(0,fields.length-1);
+                        fields = fields.substring(0, fields.length - 1);
                         if (Feng.isEmptyStr(projects) && Feng.isEmptyStr(files) && Feng.isEmptyStr(concats) && Feng.isEmptyStr(fields)) {
                             Feng.info("请选择可修改的字段、附件或合同！");
                             return;
                         }
-                        var ajax = new $ax(Feng.ctxPath + "/talentAllowanceInfo/updateFieldsAndFiles", function (data) {
+                        var ajax = new $ax(Feng.ctxPath + "/admin/talentAllowance/updateFieldsAndFiles", function (data) {
                             if (data.code == 200) {
                                 layer.close(index);
                                 Feng.success(data.msg);
@@ -511,7 +511,7 @@ TalentAllowanceInfo.updateFieldsAndFiles = function () {
                             "projects": projects,
                             "files": files,
                             "concats": concats,
-                            "fields" : fields
+                            "fields": fields
                         })
                         ajax.start();
                     }
@@ -538,11 +538,11 @@ TalentAllowanceInfo.firstCancleCheck = function () {
             fix: false, //不固定
             maxmin: true,
             content: '<form >\n' +
-                '                    <div class="form-group" style="margin: 10px;">\n' +
-                '                        <label for="checkMsg" class="control-label">撤销原因</label>\n' +
-                '                        <textarea class="form-control" id="cancleMsg" rows="6"></textarea>\n' +
-                '                    </div>\n' +
-                '                </form>',
+                    '                    <div class="form-group" style="margin: 10px;">\n' +
+                    '                        <label for="checkMsg" class="control-label">撤销原因</label>\n' +
+                    '                        <textarea class="form-control" id="cancleMsg" rows="6"></textarea>\n' +
+                    '                    </div>\n' +
+                    '                </form>',
             btn: ['<i class="fa fa-save layui-bg-green"></i>&nbsp;&nbsp;提交', '<i class="fa fa-eraser"></i>&nbsp;&nbsp;关闭'],
             yes: function (index, layero) {
                 var cancleMsg = $("#cancleMsg").val();
@@ -551,7 +551,7 @@ TalentAllowanceInfo.firstCancleCheck = function () {
                     return;
                 }
                 var operation = function () {
-                    var ajax = new $ax(Feng.ctxPath + "/talentAllowanceInfo/cancleFirstCheck", function (data) {
+                    var ajax = new $ax(Feng.ctxPath + "/admin/talentAllowance/cancleFirstCheck", function (data) {
                         if (data.code == 200) {
                             Feng.success(data.msg);
                             TalentAllowanceInfo.table.refresh();
@@ -589,11 +589,11 @@ TalentAllowanceInfo.reviewCancleCheck = function () {
             fix: false, //不固定
             maxmin: true,
             content: '<form >\n' +
-                '                    <div class="form-group" style="margin: 10px;">\n' +
-                '                        <label for="checkMsg" class="control-label">撤销原因</label>\n' +
-                '                        <textarea class="form-control" id="cancleMsg" rows="6"></textarea>\n' +
-                '                    </div>\n' +
-                '                </form>',
+                    '                    <div class="form-group" style="margin: 10px;">\n' +
+                    '                        <label for="checkMsg" class="control-label">撤销原因</label>\n' +
+                    '                        <textarea class="form-control" id="cancleMsg" rows="6"></textarea>\n' +
+                    '                    </div>\n' +
+                    '                </form>',
             btn: ['<i class="fa fa-save layui-bg-green"></i>&nbsp;&nbsp;提交', '<i class="fa fa-eraser"></i>&nbsp;&nbsp;关闭'],
             yes: function (index, layero) {
                 var cancleMsg = $("#cancleMsg").val();
@@ -602,7 +602,7 @@ TalentAllowanceInfo.reviewCancleCheck = function () {
                     return;
                 }
                 var operation = function () {
-                    var ajax = new $ax(Feng.ctxPath + "/talentAllowanceInfo/reviewCancleCheck", function (data) {
+                    var ajax = new $ax(Feng.ctxPath + "/admin/talentAllowance/reviewCancleCheck", function (data) {
                         if (data.code == 200) {
                             Feng.success(data.msg);
                             TalentAllowanceInfo.table.refresh();
@@ -624,9 +624,9 @@ TalentAllowanceInfo.reviewCancleCheck = function () {
     }
 }
 
-TalentAllowanceInfo.repair = function (){
+TalentAllowanceInfo.repair = function () {
     var operation = function () {
-        var ajax = new $ax(Feng.ctxPath + "/talentAllowanceInfo/repairTalentType", function (data) {
+        var ajax = new $ax(Feng.ctxPath + "/admin/talentAllowance/repairTalentType", function (data) {
             if (data.code == 200) {
                 Feng.success(data.msg);
                 TalentAllowanceInfo.table.refresh();
@@ -685,31 +685,31 @@ TalentAllowanceInfo.export = function (type) {
     switch (type) {
         case 1:         //导出社保录入模板
             var operation = function () {
-                window.hiddenIframe.location.href = Feng.ctxPath + "/talentAllowanceInfoExportProject/exportProject?type=1&projectType=1&ids=" + ids + "&process=" + $("#process").val();
+                window.hiddenIframe.location.href = Feng.ctxPath + "/admin/talentAllowance/exportProject?type=1&projectType=1&ids=" + ids + "&process=" + $("#process").val();
             }
             Feng.confirm("请确认所选数据为未录入社保的数据，确认导出吗?", operation);
             break;
         case 2:         //导出项目录入模板(走访核查)
             var operation = function () {
-                window.hiddenIframe.location.href = Feng.ctxPath + "/talentAllowanceInfoExportProject/exportProject?type=1&projectType=2&ids=" + ids + "&process=" + $("#process").val();
+                window.hiddenIframe.location.href = Feng.ctxPath + "/admin/talentAllowance/exportProject?type=1&projectType=2&ids=" + ids + "&process=" + $("#process").val();
             }
             Feng.confirm("请确认所选数据为未录入走访核查项目的数据，确认导出吗?", operation);
             break;
         case 3:         //导出社保核查结果
             var operation = function () {
-                window.hiddenIframe.location.href = Feng.ctxPath + "/talentAllowanceInfoExportProject/exportProject?type=2&projectType=1&ids=" + ids + "&process=" + $("#process").val();
+                window.hiddenIframe.location.href = Feng.ctxPath + "/admin/talentAllowance/exportProject?type=2&projectType=1&ids=" + ids + "&process=" + $("#process").val();
             }
             Feng.confirm("确认导出吗?", operation);
             break;
         case 4:         //导出项目核查结果(走访核查)
             var operation = function () {
-                window.hiddenIframe.location.href = Feng.ctxPath + "/talentAllowanceInfoExportProject/exportProject?type=2&projectType=2&ids=" + ids + "&process=" + $("#process").val();
+                window.hiddenIframe.location.href = Feng.ctxPath + "/admin/talentAllowance/exportProject?type=2&projectType=2&ids=" + ids + "&process=" + $("#process").val();
             }
             Feng.confirm("确认导出吗?", operation);
             break;
         case 5:         //导出项目核查结果(所有)
             var operation = function () {
-                window.hiddenIframe.location.href = Feng.ctxPath + "/talentAllowanceInfoExportProject/exportProject?type=2&projectType=3&ids=" + ids + "&process=" + $("#process").val();
+                window.hiddenIframe.location.href = Feng.ctxPath + "/admin/talentAllowance/exportProject?type=2&projectType=3&ids=" + ids + "&process=" + $("#process").val();
             }
             Feng.confirm("确认导出吗?", operation);
             break;
@@ -820,7 +820,7 @@ TalentAllowanceInfo.getIdentifyCondition = function () {
         "displayCode": "id",
         "displayName": "name",
         "type": "GET",
-        "url": Feng.ctxPath + "/api/common/findIdentifyConditionByLevel?talentLevel=" + level + "&type=1"
+        "url": Feng.ctxPath + "/common/api/findIdentifyConditionByLevel?level=" + level
     });
     $("#identifyCondition").trigger('chosen:updated');
 }
@@ -829,7 +829,7 @@ TalentAllowanceInfo.getIdentifyCondition = function () {
 $(function () {
     var process = $("#process").val();
     var defaultColunms = TalentAllowanceInfoSupple.initColumn(process);
-    var table = new BSTable(TalentAllowanceInfo.id, "/talentAllowanceInfo/list/" + process, defaultColunms);
+    var table = new BSTable(TalentAllowanceInfo.id, "/admin/talentAllowance/list/" + process, defaultColunms);
     table.setPaginationType("server");
     table.setOnDblClickRow(function () {
         TalentAllowanceInfo.openCheckTalentAllowanceInfo();
@@ -845,18 +845,18 @@ $(function () {
     TalentAllowanceInfo.table = table.init();
     //批量加载字典表数据
     var arr = [{
-        "name": "address",
-        "code": "un_street"
-    }, {
-        "name": "talentArrange",
-        "code": "un_talentLevel"
-    }, {
-        "name": "nationality",
-        "code": "un_nationality"
-    }, {
-        "name": "talentType",
-        "code": "un_jbt_talentType"
-    }, {"name": "introductionMode", "code": "un_introduction_mode"}];
+            "name": "address",
+            "code": "un_street"
+        }, {
+            "name": "talentArrange",
+            "code": "un_talentLevel"
+        }, {
+            "name": "nationality",
+            "code": "un_nationality"
+        }, {
+            "name": "talentType",
+            "code": "un_jbt_talentType"
+        }, {"name": "introductionMode", "code": "un_introduction_mode"}];
     Feng.findChildDictBatch(JSON.stringify(arr));
     $("#identifyCondition").on('chosen:ready', function (e, params) {
         $(".chosen-container-single .chosen-single").css("padding", "4px 0px 0px 4px");
@@ -880,11 +880,11 @@ $(function () {
     $('#uncheckAllPrepare').click(function () {
         $("#prepareTable").bootstrapTable('togglePagination').bootstrapTable('uncheckAll').bootstrapTable('togglePagination')
     })
-    $(".time").each(function(){
+    $(".time").each(function () {
         laydate.render({
-            elem: "#"+$(this).attr("id")
-            ,type: "date"
-            ,trigger: 'click'
+            elem: "#" + $(this).attr("id")
+            , type: "date"
+            , trigger: 'click'
         });
     });
 });

public/static/modular/talentAllowance/talentAllowanceInfo_info.js

@@ -17,7 +17,7 @@ TalentAllowanceInfoDlg.close = function() {
  */
 TalentAllowanceInfoDlg.initContract = function(){
     $("#projectTable").bootstrapTable({
-        url: Feng.ctxPath + "/talentAllowanceInfo/findAllowanceContractDetail",
+        url: Feng.ctxPath + "/admin/talentAllowance/findAllowanceContractDetail",
         method: 'POST',
         contentType: "application/x-www-form-urlencoded; charset=UTF-8",
         search: false,					// 是否显示表格搜索，此搜索是客户端搜索，不会进服务端
@@ -49,7 +49,7 @@ TalentAllowanceInfoDlg.initContract = function(){
             var enterpriseId = row.enterpriseId+index;
             var cur_table = $detail.html('<table id="'+enterpriseId+'"></table>').find('table');
             $(cur_table).bootstrapTable({
-                url: Feng.ctxPath + "/talentAllowanceInfo/findAllowanceProject",
+                url: Feng.ctxPath + "/admin/talentAllowance/findAllowanceProject",
                 method: 'POST',
                 contentType: "application/x-www-form-urlencoded; charset=UTF-8",
                 search: false,					// 是否显示表格搜索，此搜索是客户端搜索，不会进服务端
@@ -94,7 +94,7 @@ TalentAllowanceInfoDlg.initContract = function(){
  */
 TalentAllowanceInfoDlg.initArrange = function(){
     $("#arrangeTable").bootstrapTable({
-        url: Feng.ctxPath + "/talentAllowanceInfo/findAllowanceArrange",
+        url: Feng.ctxPath + "/admin/talentAllowance/findAllowanceArrange",
         method: 'POST',
         contentType: "application/x-www-form-urlencoded; charset=UTF-8",
         search: false,					// 是否显示表格搜索，此搜索是客户端搜索，不会进服务端
@@ -124,7 +124,7 @@ TalentAllowanceInfoDlg.initArrange = function(){
 
 //显示修改工作单位合同情况模态框
 TalentAllowanceInfoDlg.showEditContractModel = function(id){
-    var ajax = new $ax(Feng.ctxPath + "/talentAllowanceInfo/validateIsCheck", function(data){
+    var ajax = new $ax(Feng.ctxPath + "/admin/talentAllowance/validateIsCheck", function(data){
         if(data.code==200){
             $("#contractForm")[0].reset();
             $("#contractId").val(id);
@@ -158,7 +158,7 @@ TalentAllowanceInfoDlg.editContract = function(){
         Feng.info("请选择合同截止时间");
         return ;
     }
-    var ajax = new $ax(Feng.ctxPath + "/talentAllowanceInfo/editContract", function(data){
+    var ajax = new $ax(Feng.ctxPath + "/admin/talentAllowance/editContract", function(data){
         if(data.code==200){
             Feng.success(data.msg);
             $("#projectTable").bootstrapTable("refresh", {});
@@ -176,7 +176,7 @@ TalentAllowanceInfoDlg.editContract = function(){
 TalentAllowanceInfoDlg.showEditProjectModal = function(project,id,enterpriseId,months,days,content){
     var desc = $(content).attr("data-value");
     var type = $("#type").val();
-    var ajax = new $ax(Feng.ctxPath + "/talentAllowanceInfo/validateIsCheck", function(data){
+    var ajax = new $ax(Feng.ctxPath + "/admin/talentAllowance/validateIsCheck", function(data){
         if(data.code==200){
             $("#description").val(desc);
             TalentAllowanceInfoDlg.initICheck();
@@ -302,7 +302,7 @@ TalentAllowanceInfoDlg.contractCheckSubmit = function(){
     var enterpriseId = $("#contractEnterpriseId").val();
     var description = $("#msg").val();
     var months = $("#state").val();
-    var ajax = new $ax(Feng.ctxPath + "/talentAllowanceInfo/editProject", function(data){
+    var ajax = new $ax(Feng.ctxPath + "/admin/talentAllowance/editProject", function(data){
         if(data.code==200){
             Feng.success(data.msg);
             $("#"+enterpriseId).bootstrapTable("refresh", {});
@@ -328,7 +328,7 @@ TalentAllowanceInfoDlg.editProject = function(){
             months = months + $(this).val() + ",";
         }
     })
-    var ajax = new $ax(Feng.ctxPath + "/talentAllowanceInfo/editProject", function(data){
+    var ajax = new $ax(Feng.ctxPath + "/admin/talentAllowance/editProject", function(data){
         if(data.code==200){
             Feng.success(data.msg);
             $("#"+enterpriseId).bootstrapTable("refresh", {});
@@ -407,7 +407,7 @@ TalentAllowanceInfoDlg.editAttendanceProject = function(){
         Feng.error(error);
         return ;
     }
-    var ajax = new $ax(Feng.ctxPath + "/talentAllowanceInfo/editProject", function(data){
+    var ajax = new $ax(Feng.ctxPath + "/admin/talentAllowance/editProject", function(data){
         if(data.code==200){
             Feng.success(data.msg);
             $("#"+enterpriseId).bootstrapTable("refresh", {});
@@ -428,10 +428,10 @@ TalentAllowanceInfoDlg.editAttendanceProject = function(){
  * @param id
  */
 TalentAllowanceInfoDlg.lockContract = function(id){
-    var ajax = new $ax(Feng.ctxPath + "/talentAllowanceInfo/validateIsCheck", function(data){
+    var ajax = new $ax(Feng.ctxPath + "/admin/talentAllowance/validateIsCheck", function(data){
         if(data.code==200){
             var operation = function(){
-                var ajax = new $ax(Feng.ctxPath + "/talentAllowanceInfo/lockContract", function (data) {
+                var ajax = new $ax(Feng.ctxPath + "/admin/talentAllowance/lockContract", function (data) {
                     if(data.code==200){
                         Feng.success(data.msg);
                         $("#projectTable").bootstrapTable("refresh", {});
@@ -464,10 +464,10 @@ TalentAllowanceInfoDlg.lockContract = function(id){
  * @param id
  */
 TalentAllowanceInfoDlg.lockProject = function(id,enterpriseId){
-    var ajax = new $ax(Feng.ctxPath + "/talentAllowanceInfo/validateIsCheck", function(data){
+    var ajax = new $ax(Feng.ctxPath + "/admin/talentAllowance/validateIsCheck", function(data){
         if(data.code==200){
             var operation = function(){
-                var ajax = new $ax(Feng.ctxPath + "/talentAllowanceInfo/lockProject", function (data) {
+                var ajax = new $ax(Feng.ctxPath + "/admin/talentAllowance/lockProject", function (data) {
                     if(data.code==200){
                         Feng.success(data.msg);
                         $("#"+enterpriseId).bootstrapTable("refresh", {});
@@ -500,7 +500,7 @@ TalentAllowanceInfoDlg.lockProject = function(id,enterpriseId){
  * 显示审核模态框
  */
 TalentAllowanceInfoDlg.showCheckModal = function(){
-    var ajax = new $ax(Feng.ctxPath + "/talentAllowanceInfo/validateIsCheck", function(data){
+    var ajax = new $ax(Feng.ctxPath + "/admin/talentAllowance/validateIsCheck", function(data){
         if(data.code==200){
             layer.open({
                 type: 1,
@@ -618,7 +618,7 @@ TalentAllowanceInfoDlg.toggleSetAllowance = function(){
  */
 TalentAllowanceInfoDlg.saveReviewCheck = function(){
     var id = $("#id").val();
-    var ajax = new $ax(Feng.ctxPath + "/talentAllowanceInfo/validateIsCheck", function(data){
+    var ajax = new $ax(Feng.ctxPath + "/admin/talentAllowance/validateIsCheck", function(data){
         if(data.code==200){
             var checkState = $("#reviewState").val();
             var checkMsg = $("#allowanceCheckMsg").val();
@@ -639,7 +639,7 @@ TalentAllowanceInfoDlg.saveReviewCheck = function(){
             }
             var param = {"id":id,"checkState":checkState,"checkMsg":checkMsg,"process":$("#process").val(),
                     "toPorcess":toPorcess,"allowanceType":allowanceType,"allowanceMsg":allowanceMsg,"months":months};
-            var checkAjax = new $ax(Feng.ctxPath + "/talentAllowanceInfo/reviewCheck", function(res){
+            var checkAjax = new $ax(Feng.ctxPath + "/admin/talentAllowance/reviewCheck", function(res){
                 if(res.code==200){
                     Feng.success(res.msg)
                 }else{
@@ -754,7 +754,7 @@ TalentAllowanceInfoDlg.checkSubmit = function(index){
     if(Feng.isNotEmptyStr(companyCodes)){
         companyCodes = companyCodes.substring(0,companyCodes.length-1);
     }
-    var ajax = new $ax(Feng.ctxPath + "/talentAllowanceInfo/check", function (data) {
+    var ajax = new $ax(Feng.ctxPath + "/admin/talentAllowance/check", function (data) {
         if(data.code==200){
             layer.close(index);
             Feng.success(data.msg);
@@ -774,7 +774,7 @@ TalentAllowanceInfoDlg.checkSubmit = function(index){
  */
 TalentAllowanceInfoDlg.submitCheck = function(){
     var operation = function(){
-        var ajax = new $ax(Feng.ctxPath + "/talentAllowanceInfo/submitCheck", function (data) {
+        var ajax = new $ax(Feng.ctxPath + "/admin/talentAllowance/submitCheck", function (data) {
             if(data.code==200){
                 Feng.success(data.msg);
                 window.parent.TalentAllowanceInfo.table.refresh();

public/static/modular/talentAllowance/talentAllowanceInfo_info_supple.js

@@ -67,7 +67,7 @@ TalentAllowanceInfoDlg.initContractColumns = function(){
             {title: '操作', field: 'id', visible: true, align: 'center', valign: 'middle',width:"150px",
                 formatter : function(value,row,index){
                     var html = "";
-                    if(process==1 && companyCode==CONFIG.COM_IC){
+                    if(process==1){
                         html = html + "<button type='button' onclick='TalentAllowanceInfoDlg.showEditContractModel(\""+value+"\")' style='margin-right: 10px' class='btn btn-xs btn-info'>" +
                             "<i class=\"fa fa-edit\"></i>修改" +
                             "</button>" ;
@@ -169,7 +169,7 @@ TalentAllowanceInfoDlg.showFileTable = function(project){
         maxmin: true,
         btn: ['<i class="fa fa-eraser"></i>&nbsp;&nbsp;关闭'],
         success :function (layero, index) {
-            var ajax = new $ax(Feng.ctxPath + "/api/common/getTalentFileByApi?api="+api+"&mainId="+$("#id").val(), function (data) {
+            var ajax = new $ax(Feng.ctxPath + "/commmon/api/getTalentFileByApi?api="+api+"&mainId="+$("#id").val(), function (data) {
                 if(data.code==500){
                     Feng.error(data.msg);
                     return;
@@ -248,7 +248,7 @@ TalentAllowanceInfoDlg.initArrangeColumn = function(){
 
 
 TalentAllowanceInfoDlg.downloadFileByUrl = function(url){
-    window.location.href = Feng.ctxPath + "/api/commonDownload/downloadByUrl?url=" + url;
+    window.location.href = Feng.ctxPath + "/common/api/downloadByUrl?url=" + url;
 }
 
 TalentAllowanceInfoDlg.showLog = function (id) {
@@ -261,7 +261,7 @@ TalentAllowanceInfoDlg.showLog = function (id) {
         maxmin: true,
         success :function (layero, index) {
             $('#'+id).bootstrapTable({
-                url: Feng.ctxPath + "/api/talentChecklog/getJbtCheckLog",
+                url: Feng.ctxPath + "/common/api/getJbtCheckLog",
                 method: 'POST',
                 contentType: "application/x-www-form-urlencoded; charset=UTF-8",
                 search: false,					// 是否显示表格搜索，此搜索是客户端搜索，不会进服务端
@@ -312,7 +312,7 @@ TalentAllowanceInfoDlg.initFileTable = function (){
     queryData['project'] = CONFIG.project_jbt;
     queryData['type'] = $("#type").val();
     $("#fileTable").bootstrapTable({
-        url: Feng.ctxPath + "/api/talentInfo/findUnCommonFileType",
+        url: Feng.ctxPath + "/common/api/findUnCommonFileType",
         method: 'POST',
         contentType: "application/x-www-form-urlencoded; charset=UTF-8",
         search: false,					// 是否显示表格搜索，此搜索是客户端搜索，不会进服务端
@@ -345,7 +345,7 @@ TalentAllowanceInfoDlg.initFileTable = function (){
             $("#fileTable").bootstrapTable('expandAllRows');
         },
         onExpandRow: function (index, row, $detail) {
-            var ajax = new $ax(Feng.ctxPath + "/api/talentInfo/listTalentFile", function (data) {
+            var ajax = new $ax(Feng.ctxPath + "/common/api/listTalentFile", function (data) {
                 if(data==null||data.length==0){
                     return;
                 }

public/static/modular/talentAllowance/talentAllowanceInfo_supple.js

@@ -190,7 +190,7 @@ TalentAllowanceInfoSupple.createColThree = function(process){
         {title: '推荐津补贴类型', field: 'recommendAllowanceType', visible: true, align: 'center', valign: 'middle','class': 'uitd_showTip',width:"120px",
             formatter(value,row,index){
                 if(value==null || value=="")return "<span style='color: black'>未判定</span>";
-                if(value==1)return "<span style='color: green'>人才津贴</span>";
+                if(value==1)return "<span style='color: green'>工作津贴</span>";
                 if(value==2)return "<span style='color: blue'>一次性交通补贴</span>";
                 if(value==3)return "<span style='color: red'>不予兑现</span>";
             }
@@ -201,7 +201,7 @@ TalentAllowanceInfoSupple.createColThree = function(process){
         {title: '津补贴类型', field: 'allowanceType', visible: true, align: 'center', valign: 'middle','class': 'uitd_showTip',width:"120px",
             formatter(value,row,index){
                 if(value==null || value=="")return "<span style='color: black'>未判定</span>";
-                if(value==1)return "<span style='color: green'>人才津贴</span>";
+                if(value==1)return "<span style='color: green'>工作津贴</span>";
                 if(value==2)return "<span style='color: blue'>一次性交通补贴</span>";
                 if(value==3)return "<span style='color: red'>不予兑现</span>";
             }
@@ -216,7 +216,6 @@ TalentAllowanceInfoSupple.createColOneAndTwoIC = function(process){
     return [
         {field: 'selectItem', radio: true},
         {title: '年度', field: 'year', visible: true, align: 'center', valign: 'middle','class': 'uitd_showTip',width:"60px"},
-        {title: '审核单位', field: 'companyName', visible: (process == 1), align: 'center', valign: 'middle','class': 'uitd_showTip',width:"120px"},
         {title: '企业名称', field: 'enterpriseName', visible: true, align: 'center', valign: 'middle','class': 'uitd_showTip',width:"120px"},
         {title: '所属镇街', field: 'addressName', visible: true, align: 'center', valign: 'middle','class': 'uitd_showTip',width:"80px"},
         {title: '姓名', field: 'name', visible: true, align: 'center', valign: 'middle','class': 'uitd_showTip',width:"100px"},
@@ -236,7 +235,7 @@ TalentAllowanceInfoSupple.createColOneAndTwoIC = function(process){
         {title: '认定条件证书取得时间', field: 'identifyGetTime', visible: true, align: 'center', valign: 'middle',width:"130px"},
         {title: '认定条件名称', field: 'identifyConditionName', visible: true, align: 'center', valign: 'middle','class': 'uitd_showTip',width:"100px"},
         {title: '公布入选月份', field: 'identifyMonth', visible: true, align: 'center', valign: 'middle','class': 'uitd_showTip',width:"100px"},
-        {title: '审核状态', field: 'checkState', visible: (process == 2), align: 'center', valign: 'middle','class': 'uitd_showTip',width:"100px",
+        {title: '审核状态', field: 'checkState', visible: true, align: 'center', valign: 'middle','class': 'uitd_showTip',width:"100px",
             formatter(value,row,index){
                 if(value==-1){
                     return "<span class='label label-warning-light'>审核不通过</span>";
@@ -274,31 +273,6 @@ TalentAllowanceInfoSupple.createColOneAndTwoIC = function(process){
                 }
             }
         },
-        {title: '审核状态', field: 'depState', visible: (process == 1), align: 'center', valign: 'middle','class': 'uitd_showTip',width:"100px",
-            formatter(value,row,index){
-                if(value == -2){
-                    return "<span class='label'>待提交</span>";
-                }
-                if(value == -1){
-                    return "<span class='label label-warning-light'>审核不通过</span>";
-                }
-                if(value == 1){
-                    return "<span class='label label-success'>待审核</span>";
-                }
-                if(value == 2){
-                    return "<span class='label label-danger'>已驳回</span>";
-                }
-                if(value == 3){
-                    return "<span class='label label-primary'>已通过</span>"
-                }
-                if(value == 4){
-                    return "<span class='label label-success'>上级驳回</span>";
-                }
-                if(value == 9){
-                    return "<span class='label label-success'>重新提交</span>";
-                }
-            }
-        },
         {title: '操作', field: 'id', visible: true, align: 'center', valign: 'middle',width:"80px",
             formatter : function (value,row,index){
                 return "<span class='label label-success' onclick=\"TalentAllowanceInfoSupple.showLog('"+value+"')\" >" +
@@ -331,7 +305,7 @@ TalentAllowanceInfoSupple.createColThreeIC = function(process){
         {title: '推荐津补贴类型', field: 'recommendAllowanceType', visible: true, align: 'center', valign: 'middle','class': 'uitd_showTip',width:"120px",
             formatter(value,row,index){
                 if(value==null || value=="")return "<span style='color: black'>未判定</span>";
-                if(value==1)return "<span style='color: green'>人才津贴</span>";
+                if(value==1)return "<span style='color: green'>工作津贴</span>";
                 if(value==2)return "<span style='color: blue'>一次性交通补贴</span>";
                 if(value==3)return "<span style='color: red'>不予兑现</span>";
             }
@@ -342,7 +316,7 @@ TalentAllowanceInfoSupple.createColThreeIC = function(process){
         // {title: '津补贴类型', field: 'allowanceType', visible: true, align: 'center', valign: 'middle','class': 'uitd_showTip',width:"120px",
         //     formatter(value,row,index){
         //         if(value==null || value=="")return "未判定";
-        //         if(value==1)return "人才津贴";
+        //         if(value==1)return "工作津贴";
         //         if(value==2)return "一次性交通补贴";
         //         if(value==3)return "不予兑现";
         //     }
@@ -454,7 +428,7 @@ TalentAllowanceInfoSupple.createFour = function(process){
             {title: '津补贴类型', field: 'recommendAllowanceType', visible: true, align: 'center', valign: 'middle','class': 'uitd_showTip',width:"120px",
                 formatter(value,row,index){
                     if(value==null || value=="")return "<span style='color: black'>未判定</span>";
-                    if(value==1)return "<span style='color: green'>人才津贴</span>";
+                    if(value==1)return "<span style='color: green'>工作津贴</span>";
                     if(value==2)return "<span style='color: blue'>一次性交通补贴</span>";
                     if(value==3)return "<span style='color: red'>不予兑现</span>";
                 }
@@ -465,7 +439,7 @@ TalentAllowanceInfoSupple.createFour = function(process){
             {title: '津补贴类型', field: 'allowanceType', visible: true, align: 'center', valign: 'middle','class': 'uitd_showTip',width:"120px",
                 formatter(value,row,index){
                     if(value==null || value=="")return "<span style='color: black'>未判定</span>";
-                    if(value==1)return "<span style='color: green'>人才津贴</span>";
+                    if(value==1)return "<span style='color: green'>工作津贴</span>";
                     if(value==2)return "<span style='color: blue'>一次性交通补贴</span>";
                     if(value==3)return "<span style='color: red'>不予兑现</span>";
                 }
@@ -499,7 +473,7 @@ TalentAllowanceInfoSupple.createFourIC = function(process){
         {title: '津补贴类型', field: 'allowanceType', visible: true, align: 'center', valign: 'middle','class': 'uitd_showTip',width:"120px",
             formatter(value,row,index){
                 if(Feng.isEmptyStr(value))return "未判定";
-                if(value==1)return "人才津贴";
+                if(value==1)return "工作津贴";
                 if(value==2)return "一次性交通补贴";
                 if(value==3)return "不予兑现";
             }