1

app/common/api/TalentAllowanceApi.php

@@ -0,0 +1,225 @@
+<?php
+
+namespace app\common\api;
+
+use app\common\model\TalentAllowance as TaModel;
+use app\common\state\MainState;
+use think\facade\Db;
+use app\common\state\CommonConst;
+
+/**
+ * Description of TalentAllowanceApi
+ *
+ * @author sgq
+ */
+class TalentAllowanceApi {
+
+    public static function getList($params) {
+        $order = trim($params["order"]) ?: "desc";
+        $offset = trim($params["offset"]) ?: 0;
+        $limit = trim($params["limit"]) ?: 10;
+        $where = [];
+        if ($_where = self::setLivingAllowanceCheckStateCondition($params)) {
+            $where = array_merge($where, $_where);
+        }
+        if ($_where = self::getWhereByParams($params)) {
+            $where = array_merge($where, $_where);
+        }
+        $type = session("user")["type"];
+        if ($type == CommonConst::ENTERPRISE_NORMAL) {
+            $where[] = ["type", "in", [CommonConst::ENTERPRISE_NORMAL, CommonConst::ENTERPRISE_WJ, CommonConst::ENTERPRISE_GJ]];
+        } else if ($type == CommonConst::ENTERPRISE_JC) {
+            $where[] = ["type", "=", $type];
+        } else {
+            $where[] = ["type", "=", "you have no power"];
+        }
+        $count = TaModel::where($where)->count();
+        $list = TaModel::where($where)->limit($offset, $limit)->order("createTime " . $order)->select()->toArray();
+        $masterTypes = DictApi::selectByParentCode("un_master_education"); //申报对象类型
+        $degrees = DictApi::selectByParentCode("highest_degree"); //最高学历
+        foreach ($list as $key => $item) {
+            $list[$key]["declareTypeName"] = $masterTypes[$item["declareType"]];
+            $list[$key]["highEducation"] = $degrees[$item["highEducation"]];
+        }
+        return ["total" => $count, "rows" => $list];
+    }
+
+    public static function setLivingAllowanceCheckStateCondition($params) {
+        $where = [];
+        $checkState = $params["checkState"];
+        $process = $params["process"];
+        if ($checkState) {
+            switch ($process) {
+                case -1:
+                    if ($checkState == 7) {
+                        $where[] = ["checkState", ">=", $checkState];
+                    } else {
+                        $where[] = ["checkState", "=", $checkState];
+                    }
+                    break;
+                case 1:
+                    if ($checkState == MainState::NEED_DEP_CHECK) {
+                        $where[] = ["checkState", "in", [15, 25, 30, 35]];
+                    } else if ($checkState == 5) {
+                        $where[] = ["checkState", "=", MainState::NEED_FIRST_CHECK];
+                        $where[] = ["highProcess", ">=", 1];
+                    } else if ($checkState == MainState::NEED_FIRST_CHECK) {
+                        $where[] = ["checkState", "=", MainState::NEED_FIRST_CHECK];
+                        $where[] = ["highProcess", "<", 1];
+                    } else {
+                        $where[] = ["checkState", "=", $checkState];
+                    }
+                    break;
+                case 2:
+                    if ($checkState == MainState::BEFORE_REJECT) {
+                        $where[] = ["checkState", "=", 15];
+                        $where[] = ["highProcess", ">=", 2];
+                    } else if ($checkState == MainState::NEED_FIRST_CHECK) {
+                        $where[] = ["checkState", "=", 15];
+                        $where[] = ["highProcess", "<", 2];
+                    } else if ($checkState == MainState::FIRST_REJECT) {               //待复核                        
+                        $where[] = ["checkState", "in", [1, 3, 5, 7, 10, 20]];
+                    } else if ($checkState == MainState::NEED_DEP_CHECK) {
+                        $where[] = ["checkState", ">=", 25];
+                    } else {
+                        $where[] = ["checkState", "=", $checkState];
+                    }
+                    break;
+                case 3:
+                    if ($checkState == MainState::THIRD_REJECT) {
+                        $where [] = ["checkState", "in", [7, 10, 15, 20, 30]];
+                    } else if ($checkState == MainState::BEFORE_REJECT) {            //重新提交
+                        $where[] = ["checkState", "=", MainState::NEED_THIRD];
+                        $where[] = ["highProcess", ">=", 3];
+                    } else if ($checkState == MainState::NEED_THIRD) {               //待复核
+                        $where[] = ["checkState", "=", $checkState];
+                        $where[] = ["highProcess", "<", 3];
+                    } else {
+                        $where[] = ["checkState", "=", $checkState];
+                    }
+                    break;
+                case 4:
+                    $where[] = ["checkState", "=", $checkState];
+                    break;
+                case 5:
+                    break;
+            }
+        }
+        return $where;
+    }
+
+    public static function getWhereByParams($params) {
+        foreach ($params as &$param) {
+            $param = trim($param);
+        }unset($param);
+        $where = [];
+        if ($params["name"]) {
+            $where[] = ["name", "like", "%" . $params["name"] . "%"];
+        }
+        if ($params["idCard"]) {
+            $where[] = ["idCard", "like", "%" . $params["idCard"] . "%"];
+        }
+        if ($params["introductionMethod"]) {
+            $where[] = ["introductionMethod", "=", $params["introductionMethod"]];
+        }
+        if ($params["sex"]) {
+            $where[] = ["sex", "=", $params["sex"]];
+        }
+        if ($params["declareType"]) {
+            $where[] = ["declareType", "=", $params["declareType"]];
+        }
+        if ($params["nation"]) {
+            $where[] = ["nation", "=", $params["nation"]];
+        }
+        if ($params["nationality"]) {
+            $where[] = ["nationality", "=", $params["nationality"]];
+        }
+        if ($params["provinceCode"]) {
+            $where[] = ["provinceCode", "=", $params["provinceCode"]];
+        }
+        if ($params["politics"]) {
+            $where[] = ["politics", "=", $params["politics"]];
+        }
+        if (session("user")["usertype"] == 2) {
+            $where[] = ["enterpriseId", "=", session("user")["uid"]];
+        } else {
+            if ($params["enterpriseId"]) {
+                $where[] = ["enterpriseId", "=", $params["enterpriseId"]];
+            }
+        }
+        if ($params["industryFieldNew"]) {
+            $where[] = ["industryFieldNew", "=", $params["industryFieldNew"]];
+        }
+        if ($params["industryField"]) {
+            $where[] = ["industryField", "=", $params["industryField"]];
+        }
+        if ($params["introductionMode"]) {
+            $where[] = ["introductionMode", "=", $params["introductionMode"]];
+        }
+        if ($params["highEducation"]) {
+            $where[] = ["highEducation", "=", $params["highEducation"]];
+        }
+        if ($params["major"]) {
+            $where[] = ["major", "like", "%" . $params["major"] . "%"];
+        }
+        if ($params["title"]) {
+            $where[] = ["title", "like", "%" . $params["title"] . "%"];
+        }
+        if ($params["studyAbroad"]) {
+            $where[] = ["studyAbroad", "=", $params["studyAbroad"]];
+        }
+        if ($params["phone"]) {
+            $where[] = ["phone", "like", "%" . $params["phone"] . "%"];
+        }
+        if ($params["email"]) {
+            $where[] = ["email", "like", "%" . $params["email"] . "%"];
+        }
+        if ($params["address"]) {
+            $where[] = ["address", "=", $params["address"]];
+        }
+        if ($params["isPublic"]) {
+            $where[] = ["isPublic", "=", $params["isPublic"]];
+        }
+        if ($params["year"]) {
+            $where[] = ["year", "=", $params["year"]];
+        }
+        switch ($params["process"]) {
+            case 1:
+                $where[] = ["checkState", "not in", [3, 5]];
+                break;
+            case 2:
+                $where[] = ["firstPassTime", "EXP", Db::raw("is not null")];
+                break;
+            case 3:
+                $where[] = ["firstDepPassTime", "EXP", Db::raw("is not null")];
+                break;
+            case 4:
+                $where[] = ["checkState", "in", [-1, 35]];
+                break;
+        }
+        return $where;
+    }
+
+    public static function getInfoById($id) {
+        return TaModel::findOrEmpty($id)->toArray();
+    }
+
+    public static function getApplyCountByIdCard($idCard) {
+        $where = [];
+        $where[] = ["idCard", "=", $idCard];
+        $where[] = ["checkState", "<>", MainState::NOTPASS];
+        $list = TaModel::where($where)->distinct(true)->field("substr(year,1,4) as year")->select()->toArray();
+        $years = array_column($list, "year");
+        return $years;
+    }
+
+    public static function getPassYearsByIdCard($idCard) {
+        $where = [];
+        $where[] = ["idCard", "=", $idCard];
+        $where[] = ["checkState", "=", MainState::PASS];
+        $list = TaModel::where($where)->distinct(true)->field("substr(year,1,4) as year")->select()->toArray();
+        $passYears = array_column($list, "year");
+        return $passYears;
+    }
+
+}

app/enterprise/controller/Talent.php

@@ -1431,7 +1431,7 @@ class Talent extends EnterpriseController {
                 "position", "cur_entry_time", "labor_contract_rangetime",
                 "highest_degree", "graduate_school", "major", "study_abroad", "title", "pro_qua", "phone", "email",
                 "is_fujian_talent", "is_jinjiang_talent", "talent_arrange", "talent_condition", "identifyGetTime",
-                "bank", "bank_account", "bank_number", "bank_branch_name", "experience", "education","parent_talent_level","parent_talent_condition"];
+                "bank", "bank_account", "bank_number", "bank_branch_name", "experience", "education", "parent_talent_level", "parent_talent_condition"];
             foreach ($all_valid_keys as $key) {
                 $value = trim($param[$key]);
                 if ($value) {
@@ -1665,6 +1665,50 @@ class Talent extends EnterpriseController {
         return $responseObj;
     }
 
+    public function findTalentByEnterpriseInLibrary() {
+        $year = $this->request["year"];
+        $type = $this->request["type"];
+        $res = [];
+        $ids = null;
+        //根据申报年度查询当前企业已申报的人才
+        if ($type == 1) {  //津补贴
+            $where = [];
+            $where[] = ["year", "=", $year];
+            $where[] = ["enterpriseId", "=", $this->user["uid"]];
+            $talentAllowances = \app\common\model\TalentAllowance::where($where)->select()->toArray();
+            $ids = array_unique(array_column($talentAllowances, "talentId"));
+        } else if ($type == 2) {    //购房补贴
+            //allowanceWrapper.eq("year",year).eq("enterpriseId",sessionUser.getId()).setSqlSelect("talentId");
+            //List<Housepurchase> allowanceInfoList = this.housepurchaseService.selectList(allowanceWrapper);
+            //ids = allowanceInfoList.stream().map(Housepurchase :: getTalentId).distinct().collect(Collectors.joining(","));
+        }
+        $whr = [];
+        $whr[] = ["ti.checkState", "=", TalentState::CERTIFICATED];
+        $whr[] = ["ti.enterprise_id", "=", $this->user["uid"]];
+        $whr[] = ["e.type", "=", $this->user["type"]];
+        $whr[] = ["ti.id", "not in", $ids];
+        $list = TalentModel::alias("ti")->leftJoin("un_enterprise e", "e.id=ti.enterprise_id")->field("ti.*")->where($whr)->select()->toArray();
+        foreach ($list as $info) {
+            $info["enterpriseName"] = $this->user["name"];
+            if (strtotime($year . "-12-31") >= strtotime($info["identifyMonth"])) {
+                $res[] = $info;
+            } else {
+                $whereTypeChange = [];
+                $whereTypeChange[] = ["talentId", "=", $info["id"]];
+                $whereTypeChange[] = ["checkState", "=", \app\common\state\MainState::PASS];
+                $whereTypeChange[] = ["isPublic", "=", 6];
+                $typeChanges = \app\enterprise\model\TalentTypeChange::where($whereTypeChange)->select()->toArray();
+                foreach ($typeChanges as $typeChange) {
+                    if (strtotime($year . "-12-31") >= strtotime($typeChange["oldIdentifyMonth"])) {
+                        $res[] = $info;
+                        break;
+                    }
+                }
+            }
+        }
+        return $res;
+    }
+
     /**
      * 审核列表页
      */

app/enterprise/controller/TalentAllowance.php

@@ -9,6 +9,11 @@
 namespace app\enterprise\controller;
 
 use app\enterprise\common\EnterpriseController;
+use app\common\state\CommonConst;
+use app\common\api\BatchApi;
+use app\common\api\TalentAllowanceApi;
+use app\common\api\EnterpriseApi;
+use app\common\state\ProjectState;
 
 /**
  * Description of TalentAllowance
@@ -18,7 +23,50 @@ use app\enterprise\common\EnterpriseController;
 class TalentAllowance extends EnterpriseController {
 
     public function index() {
-        return view();
+        $tpl = "";
+        switch ($this->user["type"]) {
+            case CommonConst::ENTERPRISE_JC:
+                $tpl = "indexIC";
+                break;
+        }
+        return view($tpl, ['type' => $this->user["type"]]);
+    }
+
+    public function list() {
+        $res = EnterpriseLaApi::getList($this->request);
+        return json($res);
+    }
+
+    /**
+     * 申请
+     */
+    public function apply(\think\Request $request) {
+        $type = $this->user["type"];
+        $param = $request->param();
+        $id = isset($param["id"]) ? $param["id"] : 0;
+        $info = TalentAllowanceApi::getInfoById($id);
+        $ep = EnterpriseApi::getOne($this->user["uid"]);
+        if (!chkEnterpriseFull($ep))
+            return;
+        /* if ($info && !in_array($info["checkState"], [LaState::LA_SAVE, LaState::LA_FIRST_REJECT])) {
+          return view("", ["row" => $info, "enterprise" => $ep, "hand" => "select"]);
+          } */
+        if ($request->isPost()) {
+            return $this->save($info, $request);
+        }
+        $hand = $info ? "update" : "add";
+        $batch = $info["year"] ?: BatchApi::getValidBatch(ProjectState::LIVINGALLOWANCE, $this->user["type"])["batch"];
+        return view("", ["year" => $batch, "row" => $info, "enterprise" => $ep, "hand" => $hand]);
+    }
+
+    public function detail(\think\Request $request) {
+        $param = $request->param();
+        $id = $param["id"];
+        $info = CommonLaApi::getInfoById($id);
+        $ep = EnterpriseApi::getOne($this->user["uid"]);
+        if (!chkEnterpriseFull($ep))
+            return;
+        return view("apply", ["row" => $info, "enterprise" => $ep, "hand" => "select"]);
     }
 
 }

app/enterprise/view/talent_allowance/edit.html → app/enterprise/view/talent_allowance/apply.html

@@ -53,38 +53,38 @@
                                 <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="projects" id="projects" value="${item.projects}">
-                                            <input type="hidden" name="files" id="files" value="${item.files}">
-                                            <input type="hidden" name="concats" id="concats" value="${item.concats}">
-                                            <input type="hidden" name="fields" id="fields" value="${item.fields}">
+                                            <input type="hidden" name="id" id="id" value="{$info.id}">
+                                            <input type="hidden" name="year" id="year" value="{$year}">
+                                            <input type="hidden" name="type" id="type" value="{$type}">
+                                            <input type="hidden" name="talentId" id="talentId" value="{$info.talentId}">
+                                            <input type="hidden" name="checkState" id="checkState" value="{$info.checkState}">
+                                            <input type="hidden" name="projects" id="projects" value="{$info.projects}">
+                                            <input type="hidden" name="files" id="files" value="{$info.files}">
+                                            <input type="hidden" name="concats" id="concats" value="{$info.concats}">
+                                            <input type="hidden" name="fields" id="fields" value="{$info.fields}">
                                             <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="{$info.name}" >
                                                     </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="{$info.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="{$info.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" style="pointer-events: none;background-color: #eee;" id="sex" name="sex" value="${item.sex}">
+                                                        <select class="form-control" style="pointer-events: none;background-color: #eee;" id="sex" name="sex" value="{$info.sex}">
                                                             <option value="">请选择</option>
                                                             <option value="1">男</option>
                                                             <option value="2">女</option>
@@ -94,106 +94,98 @@
                                                 <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="{$info.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="{$info.provinceName}{$info.cityName}{$info.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="{$info.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="{$info.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="{$info.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="{$info.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="{$info.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="{$info.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="{$info.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="{$info.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}" onkeyup="value = value.replace(/\s+/g, '')"/>
+                                                        <input type="text" class="form-control" readonly="readonly" id="bankAccount" name="bankAccount" value="{$info.bankAccount}" onkeyup="value = value.replace(/\s+/g, '')"/>
                                                     </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="{$info.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="{$info.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="{$info.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="{$info.identifyGetTime}"/>
                                                     </div>
                                                 </div>
-                                                <div class="rowGroup" id="wageDiv"
-                                                     @if(item.active != 2){
-                                                        style="display: none"
-                                                     @}
-                                                >
+                                                <div class="rowGroup" id="wageDiv" {neq name="info.active" value="2"}style="display: none"{/neq}>
                                                     <label class="col-sm-1 control-label spacing"><span style="color: red">*</span>上一年度年薪(元)</label>
                                                     <div class="col-sm-2 spacing">
-                                                        <input type="hidden" id="active" value="${item.active}">
-                                                        <input type="text" class="form-control" id="wage" placeholder="正常工资薪金、一次性奖金收入(无需填写单位)" name="wage" value="${item.wage}"
-                                                         @if(isEmpty(item.fields) && item.checkState != 1){
-                                                               readonly="readonly"
-                                                               @}
-                                                        />
+                                                        <input type="hidden" id="active" value="{$info.active}">
+                                                        <input type="text" class="form-control" id="wage" placeholder="正常工资薪金、一次性奖金收入(无需填写单位)" name="wage" value="{$info.wage}" {if condition="!$info['fields'] && $info['checkState']!=1"}readonly="readonly"{/if}/>
                                                     </div>
                                                 </div>
 
@@ -221,7 +213,13 @@
                                     </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>
                             <div class="panel panel-default">
@@ -231,17 +229,23 @@
                                     </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">
+                                    <label style="padding-top: 15px;color: red">声明：本人对输入材料的真实性负全部责任</label>                                    
+                                    <form id="uploadForm" action="/common/api/addTalentFile" method="post" class="form-horizontal" enctype="multipart/form-data" target="hiddenIframe" style="display: none">
                                         <input type='hidden' id="fileId" name="fileId" >
-                                        <input type='file' id="upload_file" name="fileUrl" style='display: none'>
+                                        <input type='file'  multiple id="upload_file" name="fileUrl" style='display: none'>
                                         <input type='hidden' id="mainId" name="mainId" >
                                         <input type='hidden' id="fileTypeId" name="fileTypeId" >
                                         <input type='hidden' id="index" name="index" >
                                         <input type="hidden" name="backName" value="TalentAllowanceInfoDlg.callBack">
-                                        <input type="type" name="type" value="2">
+                                        <input type="hidden" name="type" value="2">
                                     </form>
                                 </div>
                             </div>

app/enterprise/view/talent_allowance/indexIC.html

@@ -0,0 +1,121 @@
+{extend name="layout/content"}
+{block name="content"}
+<style type="text/css">
+    .layui-layer-btn .layui-layer-btn1 {
+        border-color: #009688;
+        background-color: #009688;
+        color: #fff;
+    }
+</style>
+<div class="row">
+    <div class="col-sm-12">
+        <div class="ibox float-e-margins">
+            <div class="ibox-title">
+                <h5>津补贴管理</h5>
+            </div>
+            <div class="ibox-content">
+                <div class="row row-lg">
+                    <div class="col-sm-12">
+                        <div class="row">
+                            <div class="col-sm-3">
+                                <div class="input-group input-group-sm">
+                                    <div class="input-group-btn">
+                                        <button data-toggle="dropdown" class="btn btn-white dropdown-toggle" type="button">年度
+                                        </button>
+                                    </div>
+                                    <input type="text" class="form-control" id="year" placeholder="">
+                                </div>
+                            </div>
+                            <div class="col-sm-3">
+                                <div class="input-group input-group-sm">
+                                    <div class="input-group-btn">
+                                        <button data-toggle="dropdown" class="btn btn-white dropdown-toggle" type="button">单位名称
+                                        </button>
+                                    </div>
+                                    <input type="text" class="form-control" id="enterpriseName" placeholder="">
+                                </div>
+                            </div>
+                            <div class="col-sm-3">
+                                <div class="input-group input-group-sm">
+                                    <div class="input-group-btn">
+                                        <button data-toggle="dropdown" class="btn btn-white dropdown-toggle" type="button">姓名
+                                        </button>
+                                    </div>
+                                    <input type="text" class="form-control" id="name" placeholder="">
+                                </div>
+                            </div>
+                            <div class="col-sm-3">
+                                <div class="input-group input-group-sm">
+                                    <div class="input-group-btn">
+                                        <button data-toggle="dropdown" class="btn btn-white dropdown-toggle" type="button">
+                                            人才层次
+                                        </button>
+                                    </div>
+                                    <select class="form-control" id="talentArrange" onchange="TalentAllowanceInfo.getIdentifyCondition()">
+                                    </select>
+                                </div>
+                            </div>
+                            <div class="col-sm-3">
+                                <div class="input-group input-group-sm">
+                                    <div class="input-group-btn">
+                                        <button data-toggle="dropdown" class="btn btn-white dropdown-toggle" type="button">
+                                            认定条件
+                                        </button>
+                                    </div>
+                                    <select class="form-control" id="identifyCondition" style='overflow:hidden;'>
+                                    </select>
+                                </div>
+                            </div>
+                            <div class="col-sm-3">           
+                                <div class="input-group input-group-sm">
+                                    <div class="input-group-btn">
+                                        <button data-toggle="dropdown" class="btn btn-white dropdown-toggle" type="button">
+                                            所属镇街
+                                        </button>
+                                    </div>
+                                    <select class="form-control" id="address">
+                                    </select>
+                                </div>
+                            </div>
+                            <div class="col-sm-3">
+                                <button type="button" class="btn btn-sm btn-primary " onclick="TalentAllowanceInfo.search()" id="">
+                                    <i class="fa fa-search"></i>&nbsp;搜索
+                                </button>
+                                <button type="button" class="btn btn-sm btn-primary " onclick="TalentAllowanceInfo.reset()" id="">
+                                    <i class="fa fa-trash"></i>&nbsp;重置
+                                </button>
+                            </div>
+                        </div>
+                        <div class="hidden-xs" id="TalentAllowanceInfoTableToolbar" role="group">
+                            <button type="button" class="btn btn-sm btn-primary " onclick="TalentAllowanceInfo.openAddTalentAllowanceInfo()">
+                                <i class="fa fa-plus"></i>&nbsp;添加
+                            </button>
+                            <button type="button" class="btn btn-sm btn-primary " onclick="TalentAllowanceInfo.openTalentAllowanceInfoDetail()">
+                                <i class="fa fa-edit"></i>&nbsp;修改
+                            </button>
+                            <button type="button" class="btn btn-sm btn-primary " onclick="TalentAllowanceInfo.openTalentAllowanceInfoSelect()">
+                                <i class="fa fa-book"></i>&nbsp;查看
+                            </button>
+                            <!--<button type="button" class="btn btn-sm btn-primary " onclick="TalentAllowanceInfo.openTalentAllowanceInfoSupple()">
+                                <i class="fa fa-upload"></i>&nbsp;补件（公示期）
+                            </button>-->
+                        </div>
+                        <table id="TalentAllowanceInfoTable" class="table-condensed" style="font-size: 10px;table-layout: fixed!important;" data-mobile-responsive="true" data-click-to-select="true">
+                            <thead>
+                                <tr>
+                                    <th data-field="selectItem" data-checkbox="true"></th>
+                                </tr>
+                            </thead>
+                        </table>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
+<!--<script src="${ctxPath}/static/modular/gate/talentAllowance/ic/talentAllowanceInfoIC.js"></script>-->
+<script type="text/javascript">
+    document.write('<script src="/static/modular/gate/talentAllowance/ic/talentAllowanceInfoIC.js?v=' + (new Date()).getTime() + '"><\/script>');
+    document.write('<script src="/static/modular/common/config.js?v=' + (new Date()).getTime() + '"><\/script>');
+</script>
+{/block}

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

@@ -723,7 +723,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/gate/talentAllowance/ic/talentAllowanceInfoIC.js

@@ -2,8 +2,8 @@
  * 优秀人才津补贴管理初始化
  */
 var TalentAllowanceInfo = {
-    id: "TalentAllowanceInfoTable",	//表格id
-    seItem: null,		//选中的条目
+    id: "TalentAllowanceInfoTable", //表格id
+    seItem: null, //选中的条目
     table: null,
     layerIndex: -1
 };
@@ -14,63 +14,67 @@ var TalentAllowanceInfo = {
 TalentAllowanceInfo.initColumn = function () {
     return [
         {field: 'selectItem', radio: true},
-        {title: '年度', field: 'year', visible: true, align: 'center', valign: 'middle','class': 'uitd_showTip',width:"60px"},
-        {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:"100px"},
-        {title: '姓名', field: 'name', visible: true, align: 'center', valign: 'middle','class': 'uitd_showTip',width:"100px"},
-        {title: '性别', field: 'sex', visible: true, align: 'center', valign: 'middle','class': 'uitd_showTip',width:"60px",
-            formatter(value,row,index){
-                if(value==1){
+        {title: '年度', field: 'year', visible: true, align: 'center', valign: 'middle', 'class': 'uitd_showTip', width: "60px"},
+        {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: "100px"},
+        {title: '姓名', field: 'name', visible: true, align: 'center', valign: 'middle', 'class': 'uitd_showTip', width: "100px"},
+        {title: '性别', field: 'sex', visible: true, align: 'center', valign: 'middle', 'class': 'uitd_showTip', width: "60px",
+            formatter(value, row, index) {
+                if (value == 1) {
                     return "男";
                 }
-                if(value==2){
+                if (value == 2) {
                     return "女";
                 }
             }
         },
-        {title: '证件号码', field: 'idCard', visible: true, align: 'center', valign: 'middle','class': 'uitd_showTip',width:"120px"},
-        {title: '人才层次', field: 'talentArrangeName', visible: true, align: 'center', valign: 'middle','class': 'uitd_showTip',width:"100px"},
-        {title: '认定条件', field: 'identifyConditionText', visible: true, align: 'center', valign: 'middle','class': 'uitd_showTip',width:"120px"},
-        {title: '认定条件证书取得时间', field: 'identifyGetTime', visible: true, align: 'center', valign: 'middle',width:"150px"},
-        {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: '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==2)return "一次性交通补贴";
-                if(value==3)return "不予兑现";
+        {title: '证件号码', field: 'idCard', visible: true, align: 'center', valign: 'middle', 'class': 'uitd_showTip', width: "120px"},
+        {title: '人才层次', field: 'talentArrangeName', visible: true, align: 'center', valign: 'middle', 'class': 'uitd_showTip', width: "100px"},
+        {title: '认定条件', field: 'identifyConditionText', visible: true, align: 'center', valign: 'middle', 'class': 'uitd_showTip', width: "120px"},
+        {title: '认定条件证书取得时间', field: 'identifyGetTime', visible: true, align: 'center', valign: 'middle', width: "150px"},
+        {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: '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 == 2)
+                    return "一次性交通补贴";
+                if (value == 3)
+                    return "不予兑现";
             }
         },
-        {title: '兑现月份', field: 'months', visible: true, align: 'center', valign: 'middle','class': 'uitd_showTip',width:"100px"},
-        {title: '兑现金额', field: 'money', visible: true, align: 'center', valign: 'middle','class': 'uitd_showTip',width:"80px"},
-        {title: '金额说明', field: 'moneyDesc', visible: true, align: 'center', valign: 'middle','class': 'uitd_showTip',width:"80px"},
-        {title: '审核状态', field: 'checkState', visible: true, align: 'center', valign: 'middle','class': 'uitd_showTip',width:"100px",
-            formatter(value,row,index){
+        {title: '兑现月份', field: 'months', visible: true, align: 'center', valign: 'middle', 'class': 'uitd_showTip', width: "100px"},
+        {title: '兑现金额', field: 'money', visible: true, align: 'center', valign: 'middle', 'class': 'uitd_showTip', width: "80px"},
+        {title: '金额说明', field: 'moneyDesc', visible: true, align: 'center', valign: 'middle', 'class': 'uitd_showTip', width: "80px"},
+        {title: '审核状态', field: 'checkState', visible: true, align: 'center', valign: 'middle', 'class': 'uitd_showTip', width: "100px",
+            formatter(value, row, index) {
                 var html = "";
                 switch (value) {
                     case 1:
                         html = "<span class='label'>待提交</span>"
                         break;
-                    case 5,13,15,20,25,35:
+                    case 5, 13, 15, 20, 25, 35:
                         html = "<span class='label label-success'>审核中</span>";
                         break;
                     case 10:
                         html = "<span class='label label-danger'>已驳回</span>"
                         break;
-                    case -1:
-                        if(row.publicState >= 3){
+                    case - 1:
+                        if (row.publicState >= 3) {
                             html = "<span class='label label-danger'>审核不通过</span>";
-                        }else{
+                        } else {
                             html = "<span class='label label-success'>审核中</span>";
                         }
                         break;
                     case 30:
-                        if(row.publicState == 3){
+                        if (row.publicState == 3) {
                             html = "<span class='label label-primary'>公示中</span>"
-                        }else if(row.publicState == 4){
-                            html = row.allowanceType != 3? "<span class='label label-success'>待兑现</span>":"<span class='label label-danger'>不予兑现</span>";
-                        }else if(row.publicState == 5){
+                        } else if (row.publicState == 4) {
+                            html = row.allowanceType != 3 ? "<span class='label label-success'>待兑现</span>" : "<span class='label label-danger'>不予兑现</span>";
+                        } else if (row.publicState == 5) {
                             html = "<span class='label label-primary'>已兑现</span>"
                         }
                         break;
@@ -78,11 +82,11 @@ TalentAllowanceInfo.initColumn = function () {
                 return html;
             }
         },
-        {title: '操作', field: 'id', visible: true, align: 'center', valign: 'middle',width:"80px",
-            formatter : function (value,row,index){
-                return "<span class='label label-success' onclick=\"TalentAllowanceInfo.showLog('"+value+"')\" >" +
-                    "<i class=\"fa fa-book\"></i>日志" +
-                    "</span>";
+        {title: '操作', field: 'id', visible: true, align: 'center', valign: 'middle', width: "80px",
+            formatter: function (value, row, index) {
+                return "<span class='label label-success' onclick=\"TalentAllowanceInfo.showLog('" + value + "')\" >" +
+                        "<i class=\"fa fa-book\"></i>日志" +
+                        "</span>";
             }
         }
     ];
@@ -93,10 +97,10 @@ TalentAllowanceInfo.initColumn = function () {
  */
 TalentAllowanceInfo.check = function () {
     var selected = $('#' + this.id).bootstrapTable('getSelections');
-    if(selected.length == 0){
+    if (selected.length == 0) {
         Feng.info("请先选中表格中的某一记录！");
         return false;
-    }else{
+    } else {
         TalentAllowanceInfo.seItem = selected[0];
         return true;
     }
@@ -106,41 +110,41 @@ TalentAllowanceInfo.check = function () {
  * 点击添加优秀人才津补贴
  */
 TalentAllowanceInfo.openAddTalentAllowanceInfo = function () {
-    var ajax = new $ax(Feng.ctxPath + "/api/commonBatch/valiateIsAdd", function (data) {
-        if(data.code==200){
+    var ajax = new $ax("/common/batch/checkBatchValid", function (data) {
+        if (data.code == 200) {
             var index = layer.open({
                 type: 2,
                 title: '津补贴申报',
                 fix: false, //不固定
                 maxmin: true,
-                content: Feng.ctxPath + '/api/talentAllowance/talentAllowanceInfo_add?year='+data.obj,
-                btn: ['<i class="fa fa-eye"></i>&nbsp;&nbsp;保存未提交','<i class="fa fa-check layui-bg-green"></i>&nbsp;&nbsp;提交审核', '<i class="fa fa-eraser"></i>&nbsp;&nbsp;取消'],
+                content: '/enterprise/talentAllowance/apply?year=' + data.batch,
+                btn: ['<i class="fa fa-eye"></i>&nbsp;&nbsp;保存未提交', '<i class="fa fa-check layui-bg-green"></i>&nbsp;&nbsp;提交审核', '<i class="fa fa-eraser"></i>&nbsp;&nbsp;取消'],
                 btnAlign: 'c',
                 btn1: function (index, layero) {
                     var obj = layero.find("iframe")[0].contentWindow;
                     obj.TalentAllowanceInfoDlg.addSubmit();
-                },btn2: function(index, layero){
+                }, btn2: function (index, layero) {
                     var obj = layero.find("iframe")[0].contentWindow;
                     obj.TalentAllowanceInfoDlg.submitToCheck();
                     return false;
                 },
-                success :function (layero, index) {
-                    layer.tips('添加基本信息并上传附件后点击','.layui-layer-btn1',{tips:[1,"#78BA32"],time:0,closeBtn :2});
+                success: function (layero, index) {
+                    layer.tips('添加基本信息并上传附件后点击', '.layui-layer-btn1', {tips: [1, "#78BA32"], time: 0, closeBtn: 2});
                 },
-                end :function () {
+                end: function () {
                     layer.closeAll('tips');
                     TalentAllowanceInfo.table.refresh();
                 }
             });
             layer.full(index);
             TalentAllowanceInfo.layerIndex = index;
-        }else{
+        } else {
             Feng.error(data.msg);
         }
     }, function (data) {
         Feng.error("查询失败!" + data.responseJSON.message + "!");
     });
-    ajax.set("type",CONFIG.project_jbt);
+    ajax.set("type", CONFIG.project_jbt);
     ajax.start();
 };
 
@@ -149,49 +153,50 @@ TalentAllowanceInfo.openAddTalentAllowanceInfo = function () {
  */
 TalentAllowanceInfo.openTalentAllowanceInfoDetail = function () {
     if (this.check()) {
-        var ajax = new $ax(Feng.ctxPath + "/api/commonBatch/valiateIsEditOrSubmit", function (data) {
+        var ajax = new $ax("/common/batch/checkBatchValid", function (data) {
             if (data.code == 200) {
                 var index = layer.open({
                     type: 2,
                     title: '津补贴申报',
                     fix: false, //不固定
                     maxmin: true,
-                    content: Feng.ctxPath + '/api/talentAllowance/talentAllowanceInfo_update/'+TalentAllowanceInfo.seItem.id,
+                    content: Feng.ctxPath + '/api/talentAllowance/apply/id/' + TalentAllowanceInfo.seItem.id,
                     btn: ['<i class="fa fa-check"></i>&nbsp;&nbsp;提交审核', '<i class="fa fa-eraser"></i>&nbsp;&nbsp;取消'],
                     btnAlign: 'c',
                     yes: function (index, layero) {
                         var obj = layero.find("iframe")[0].contentWindow;
                         obj.TalentAllowanceInfoDlg.submitToCheck();
                     },
-                    success :function (layero, index) {
-                        layer.tips('添加基本信息并上传附件后点击','.layui-layer-btn0',{tips:[1,"#78BA32"],time:0,closeBtn :2});
+                    success: function (layero, index) {
+                        layer.tips('添加基本信息并上传附件后点击', '.layui-layer-btn0', {tips: [1, "#78BA32"], time: 0, closeBtn: 2});
                     },
-                    end :function () {
+                    end: function () {
                         layer.closeAll('tips');
                     }
                 });
                 layer.full(index);
                 TalentAllowanceInfo.layerIndex = index;
-            }else{
+            } else {
                 Feng.info(data.msg);
             }
         }, function (data) {
             Feng.error("校验失败!" + data.responseJSON.message + "!");
         });
-        ajax.set("type",CONFIG.project_jbt);
-        ajax.set("year",TalentAllowanceInfo.seItem.year);
+        ajax.set("type", CONFIG.project_jbt);
+        ajax.set("year", TalentAllowanceInfo.seItem.year);
+        ajax.set("first_submit_time", TalentAllowanceInfo.seItem.firstSubmitTime);
         ajax.start();
     }
 };
 
-TalentAllowanceInfo.openTalentAllowanceInfoSelect = function(){
+TalentAllowanceInfo.openTalentAllowanceInfoSelect = function () {
     if (this.check()) {
         var index = layer.open({
             type: 2,
             title: '津补贴查看',
             fix: false, //不固定
             maxmin: true,
-            content: Feng.ctxPath + '/api/talentAllowance/talentAllowanceInfoSelect/'+TalentAllowanceInfo.seItem.id,
+            content: Feng.ctxPath + '/enterprise/talentAllowance/view/id/' + TalentAllowanceInfo.seItem.id,
             btn: ['<i class="fa fa-eraser"></i>&nbsp;&nbsp;取消'],
             btnAlign: 'c',
         });
@@ -206,8 +211,8 @@ TalentAllowanceInfo.openTalentAllowanceInfoSelect = function(){
  */
 TalentAllowanceInfo.delete = function () {
     if (this.check()) {
-        var operation = function() {
-            var ajax = new $ax(Feng.ctxPath + "/api/talentAllowance/delete", function (data) {
+        var operation = function () {
+            var ajax = new $ax(Feng.ctxPath + "/enterpirse/talentAllowance/delete", function (data) {
                 if (data.code == 200) {
                     Feng.success(data.msg);
                     TalentAllowanceInfo.table.refresh();
@@ -217,7 +222,7 @@ TalentAllowanceInfo.delete = function () {
             }, function (data) {
                 Feng.error("删除失败!" + data.responseJSON.message + "!");
             });
-            ajax.set("talentAllowanceInfoId", TalentAllowanceInfo.seItem.id);
+            ajax.set("id", TalentAllowanceInfo.seItem.id);
             ajax.start();
         }
         Feng.confirm("删除后无法恢复，确认删除吗?", operation);
@@ -228,7 +233,7 @@ TalentAllowanceInfo.delete = function () {
  * 查询表单提交参数对象
  * @returns {{}}
  */
-TalentAllowanceInfo.formParams = function() {
+TalentAllowanceInfo.formParams = function () {
     var queryData = {};
     queryData['year'] = $("#year").val();
     queryData['enterpriseName'] = $("#enterpriseName").val();
@@ -251,7 +256,7 @@ TalentAllowanceInfo.search = function () {
 /**
  * 重置
  */
-TalentAllowanceInfo.reset = function (){
+TalentAllowanceInfo.reset = function () {
     $("#year").val("");
     $("#enterpriseName").val("");
     $("#name").val("");
@@ -265,9 +270,9 @@ TalentAllowanceInfo.reset = function (){
 /**
  * 获取人才认定
  */
-TalentAllowanceInfo.getIdentifyCondition = function() {
+TalentAllowanceInfo.getIdentifyCondition = function () {
     var level = $("#talentArrange").val();
-    if(level==null||level==''){
+    if (level == null || level == '') {
         $("#identifyCondition").empty();
         $("#identifyCondition").trigger('chosen:updated');
         return;
@@ -277,7 +282,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');
 }
@@ -285,33 +290,33 @@ TalentAllowanceInfo.getIdentifyCondition = function() {
 /**
  * 显示审核日志
  */
-TalentAllowanceInfo.showLog = function (id){
+TalentAllowanceInfo.showLog = function (id) {
     layer.open({
         type: 1,
-        title:"日志",
-        fixed:false,
-        content: '<table id="'+id+'"></table>',
+        title: "日志",
+        fixed: false,
+        content: '<table id="' + id + '"></table>',
         area: ['80%', '80%'],
         maxmin: true,
-        success :function (layero, index) {
-            $('#'+id).bootstrapTable({
-                url: Feng.ctxPath + "/api/talentInfo/getCheckLog",
+        success: function (layero, index) {
+            $('#' + id).bootstrapTable({
+                url: Feng.ctxPath + "/common/api/getCheckLog",
                 method: 'POST',
                 contentType: "application/x-www-form-urlencoded; charset=UTF-8",
-                search: false,					// 是否显示表格搜索，此搜索是客户端搜索，不会进服务端
-                showRefresh: false,				// 是否显示刷新按钮
-                clickToSelect: true,			// 是否启用点击选中行
-                singleSelect: true,				// 设置True 将禁止多选
-                striped: true,  				// 是否显示行间隔色
-                pagination: false,   			// 设置为 true 会在表格底部显示分页条
+                search: false, // 是否显示表格搜索，此搜索是客户端搜索，不会进服务端
+                showRefresh: false, // 是否显示刷新按钮
+                clickToSelect: true, // 是否启用点击选中行
+                singleSelect: true, // 设置True 将禁止多选
+                striped: true, // 是否显示行间隔色
+                pagination: false, // 设置为 true 会在表格底部显示分页条
                 paginationHAlign: "left",
                 paginationDetailHAlign: "right",
-                sidePagination: "server",   	// 设置在哪里进行分页，可选值为 'client' 或者 'server'
+                sidePagination: "server", // 设置在哪里进行分页，可选值为 'client' 或者 'server'
                 showColumns: false,
                 queryParams: function (params) {
-                    return {"type":CONFIG.project_jbt,"mainId":id,"typeFileId":"","active":1}
+                    return {"type": CONFIG.project_jbt, "mainId": id, "typeFileId": "", "active": 1}
                 },
-                rowStyle : function(row,index){
+                rowStyle: function (row, index) {
                     return {
                         css: {
                             "word-break": "break-word",
@@ -320,23 +325,23 @@ TalentAllowanceInfo.showLog = function (id){
                     }
                 },
                 columns:
-                    [
-                        {title: '步骤', field: 'stepName', visible: true, align: 'center', valign: 'middle',width:"10%",
-                            formatter : function (value,row,index) {
-                                return ""+value;
+                        [
+                            {title: '步骤', field: 'stepName', visible: true, align: 'center', valign: 'middle', width: "10%",
+                                formatter: function (value, row, index) {
+                                    return "" + value;
+                                }
+                            },
+                            {title: '操作人', field: 'createUser', visible: false, align: 'center', valign: 'middle', width: "15%"},
+                            {title: '操作时间', field: 'createTime', visible: true, align: 'center', valign: 'middle', width: "20%"},
+                            {title: '描述', field: 'description', visible: true, align: 'center', valign: 'middle', width: "65%",
+                                formatter: function (value, row, index) {
+                                    return '<span data-toggle="tooltip" title="' + value + '">"' + value + '"</span>';
+                                }
                             }
-                        },
-                        {title: '操作人', field: 'createUser', visible: false, align: 'center', valign: 'middle',width:"15%"},
-                        {title: '操作时间', field: 'createTime', visible: true, align: 'center', valign: 'middle',width:"20%"},
-                        {title: '描述', field: 'description', visible: true, align: 'center', valign: 'middle',width:"65%",
-                            formatter : function (value,row,index) {
-                                return '<span data-toggle="tooltip" title="'+ value +'">"'+value+'"</span>';
-                            }
-                        }
-                    ]
+                        ]
                 ,
                 onPostBody: function () {
-                    $('#'+id+"td.uitd_showTip").bind("mouseover", function () {
+                    $('#' + id + "td.uitd_showTip").bind("mouseover", function () {
                         var htm = $(this).html();
                         $(this).webuiPopover({title: '详情', content: htm, trigger: 'hover'}).webuiPopover('show');
                     });
@@ -348,7 +353,7 @@ TalentAllowanceInfo.showLog = function (id){
 
 $(function () {
     var defaultColunms = TalentAllowanceInfo.initColumn();
-    var table = new BSTable(TalentAllowanceInfo.id, "/api/talentAllowance/list", defaultColunms);
+    var table = new BSTable(TalentAllowanceInfo.id, "/enterprise/talentAllowance/list", defaultColunms);
     table.setPaginationType("server");
     table.setOnDblClickRow(function () {
         TalentAllowanceInfo.openTalentAllowanceInfoDetail();
@@ -356,14 +361,14 @@ $(function () {
     TalentAllowanceInfo.table = table.init();
     //批量加载字典表数据
     var arr = [
-        {"name":"address","code":"un_street"},
-        {"name":"talentArrange","code":"un_talentLevel"},
-        {"name":"nationality","code":"un_nationality"}];
+        {"name": "address", "code": "street"},
+        {"name": "talentArrange", "code": "talent_arrange"},
+        {"name": "nationality", "code": "nationality"}];
     Feng.findChildDictBatch(JSON.stringify(arr));
     $("#identifyCondition").chosen({
-        search_contains:true,       //关键字模糊搜索。设置为true，只要选项包含搜索词就会显示；设置为false，则要求从选项开头开始匹配
+        search_contains: true,       //关键字模糊搜索。设置为true，只要选项包含搜索词就会显示；设置为false，则要求从选项开头开始匹配
         disable_search: false,
-        width:"100%",
+        width: "100%",
         enable_split_word_search: true
     });
 });