津补贴++

app/admin/controller/AmountStandard.php

@@ -12,6 +12,7 @@ use app\admin\common\AdminController;
 use think\facade\Db;
 use app\common\api\Response;
 use app\common\api\DictApi;
+use app\common\model\AmountStandard as AsModel;
 
 /**
  * Description of AmountStandard
@@ -33,8 +34,8 @@ class AmountStandard extends AdminController {
         if ($params["allowanceType"]) {
             $where[] = ["allowanceType", "=", $params["allowanceType"]];
         }
-        $count = Db::table("sys_amount_standard")->where($where)->count();
-        $list = Db::table("sys_amount_standard")->where($where)->limit($offset, $limit)->order("createTime " . $order)->select()->toArray();
+        $count = AsModel::where($where)->count();
+        $list = AsModel::where($where)->limit($offset, $limit)->order("createTime " . $order)->select()->toArray();
         $levelMap = DictApi::selectByParentCode("talent_arrange");
         foreach ($list as &$item) {
             $item["talentArrangeName"] = $levelMap[$item["talentArrange"]];
@@ -50,7 +51,7 @@ class AmountStandard extends AdminController {
     }
 
     public function edit() {
-        $info = Db::table("sys_amount_standard")->where("id", $this->request["id"])->find();
+        $info = AsModel::where("id", $this->request["id"])->find();
         if ($this->request->isPost()) {
             return $this->save();
         }
@@ -58,14 +59,14 @@ class AmountStandard extends AdminController {
     }
 
     public function detail() {
-        $info = Db::table("sys_amount_standard")->where("id", $this->request["id"])->find();
+        $info = AsModel::where("id", $this->request["id"])->find();
         return view("", ["info" => $info, "type" => $this->user["type"]]);
     }
 
     public function delete() {
         if (!$this->request["id"])
             return new Response(Response::ERROR, "删除失败");
-        Db::table("sys_amount_standard")->where("id", $this->request["id"])->delete();
+        AsModel::where("id", $this->request["id"])->delete();
         return new Response(Response::SUCCESS, "删除成功");
     }
 
@@ -87,13 +88,13 @@ class AmountStandard extends AdminController {
                 $data["id"] = $param["id"];
                 $data["updateTime"] = date("Y-m-d H:i:s");
                 $data["updateUser"] = $this->user["uid"];
-                Db::table("sys_amount_standard")->save($data);
+                AsModel::update($data);
                 $msg = "修改成功";
             } else {
                 $data["id"] = getStringId();
                 $data["createTime"] = date("Y-m-d H:i:s");
                 $data["createUser"] = $this->user["uid"];
-                Db::table("sys_amount_standard")->insert($data);
+                AsModel::insert($data);
                 $msg = "添加成功";
             }
             return new Response(Response::SUCCESS, $msg);

app/admin/controller/TalentAllowance.php

@@ -14,6 +14,7 @@ use app\common\model\TalentAllowanceArrange;
 use app\common\state\ProjectState;
 use app\common\state\AllowanceStateEnum;
 use app\common\state\AllowanceProjectEnum;
+use app\common\model\AmountStandard as AsModel;
 
 /**
  * Description of TalentAllowance
@@ -82,6 +83,10 @@ class TalentAllowance extends AdminController {
         return json(["rows" => $list, "total" => $count]);
     }
 
+    /**
+     * 审核页面
+     * @return type
+     */
     public function toCheckPage() {
         $id = $this->request["id"];
         $process = $this->request["process"];
@@ -91,7 +96,19 @@ class TalentAllowance extends AdminController {
     }
 
     /**
-     * 审核
+     * 查看详情
+     * @return type
+     */
+    public function toSelectPage() {
+        $id = $this->request["id"];
+        $process = $this->request["process"];
+        $obj = TalentAllowanceApi::getInfoById($id);
+        $this->translateToChinese($obj);
+        return view("select", ["row" => $obj, "process" => $process]);
+    }
+
+    /**
+     * 审核保存
      */
     public function check() {
         $obj = $this->request->param();
@@ -145,6 +162,10 @@ class TalentAllowance extends AdminController {
         return new Response(Response::SUCCESS, "审核成功");
     }
 
+    /**
+     * 提交审核
+     * @return Response
+     */
     public function submitCheck() {
         $id = $this->request["id"];
         $process = $this->request["process"];
@@ -170,6 +191,9 @@ class TalentAllowance extends AdminController {
                         if (!$old["firstPassTime"]) {
                             $updCheck["firstPassTime"] = date("Y-m-d H:i:s");
                         }
+                        if (!$old["visitPassTime"]) {
+                            $updCheck["visitPassTime"] = date("Y-m-d H:i:s");
+                        }
                         $updCheck["submitTime"] = date("Y-m-d H:i:s");
                         $updCheck["checkState"] = AllowanceStateEnum::NEED_REVIEW;
                         break;
@@ -195,7 +219,7 @@ class TalentAllowance extends AdminController {
                     'state' => $log["state"],
                     'step' => $process,
                     'stateChange' => AllowanceStateEnum::getStateName($old["checkState"]) . "->" . AllowanceStateEnum::getStateName($updCheck["checkState"]),
-                    'description' => $log["checkMsg"],
+                    'description' => $log["description"],
                     'createTime' => date("Y-m-d H:i:s", time()),
                     'createUser' => sprintf("%s(%s)", $this->user["account"], $this->user["companyName"])
                 ]);
@@ -228,14 +252,11 @@ class TalentAllowance extends AdminController {
                         $updCheck["reviewPassTime"] = date("Y-m-d H:i:s");
                         /*                         * * 在此处需要判断津补贴类型 */
                         $arrangeList = $this->validateAllowanceType($updCheck);
-                        TalentAllowanceArrange::update($arrangeList);
+                        $taaModel = new TalentAllowanceArrange();
+                        $taaModel->saveAll($arrangeList);
                         break;
                     case 2:
-                        if ($old["toProcess"] == 1) {
-                            $updCheck["checkState"] = AllowanceStateEnum::REJECT_TO_FIRST;
-                        } else if ($old["toProcess"] == 2) {
-                            $updCheck["checkState"] = AllowanceStateEnum::REVIEW_REJECT;
-                        }
+                        $updCheck["checkState"] = AllowanceStateEnum::REJECT_TO_FIRST;
                         $updCheck["toProcess"] = null;
                         $updCheck["toDep"] = "";
                         break;
@@ -258,17 +279,300 @@ class TalentAllowance extends AdminController {
                     'state' => $log["state"],
                     'step' => $process,
                     'stateChange' => AllowanceStateEnum::getStateName($old["checkState"]) . "->" . AllowanceStateEnum::getStateName($updCheck["checkState"]),
-                    'description' => $log["checkMsg"],
+                    'description' => $log["description"],
                     'createTime' => date("Y-m-d H:i:s", time()),
                     'createUser' => sprintf("%s(%s)", $this->user["account"], $this->user["companyName"])
                 ]);
                 break;
         }
-        TalentChecklog::delete($log["id"]);
+        TalentChecklog::where("id", $log["id"])->delete();
         TaModel::update($updCheck);
         return new Response(Response::SUCCESS, "提交审核成功");
     }
 
+    /**
+     * 初审撤销
+     * @return Response
+     */
+    public function cancleFirstCheck() {
+        $obj = $this->request->param();
+        $id = $obj["id"];
+        $checkMsg = $obj["checkMsg"];
+        if (!$id) {
+            return new Response(Response::ERROR, "请选择需要撤销的对象");
+        }
+        $old = TalentAllowanceApi::getInfoById($id);
+        if ($old["checkState"] != AllowanceStateEnum::NEED_REVIEW && $old["checkState"] != AllowanceStateEnum::NOTPASS) {
+            return new Response(Response::ERROR, "当前对象的审核无法撤销");
+        }
+        $data["id"] = $id;
+        $data["checkMsg"] = $checkMsg;
+        $data["checkState"] = AllowanceStateEnum::NEED_CHECK;
+        //添加日志
+        TalentChecklog::create([
+            'id' => getStringId(),
+            'mainId' => $id,
+            'type' => intval(ProjectState::JBT),
+            'typeFileId' => null,
+            'active' => 1,
+            'state' => 11, //撤销审核
+            'step' => 1,
+            'stateChange' => AllowanceStateEnum::getStateName($old["checkState"]) . "->" . AllowanceStateEnum::getStateName($data["checkState"]),
+            'description' => "撤销原因：" . $checkMsg,
+            'createTime' => date("Y-m-d H:i:s", time()),
+            'createUser' => sprintf("%s(%s)", $this->user["account"], $this->user["companyName"])
+        ]);
+        TaModel::update($data);
+        return new Response(Response::SUCCESS, "撤销成功");
+    }
+
+    /**
+     * 复核撤销
+     * @return Response|\app\admin\controller\ResponseObj
+     */
+    public function reviewCancleCheck() {
+        $obj = $this->request->param();
+        $id = $obj["id"];
+        $checkMsg = $obj["checkMsg"];
+        if (!$id) {
+            return new Response(Response::ERROR, "请选择需要撤销的对象");
+        }
+        $old = TalentAllowanceApi::getInfoById($id);
+        if ($old["checkState"] != AllowanceStateEnum::REVIEW_PASS || $old["publicState"] != 1) {
+            return new Response(Response::ERROR, "当前对象的审核无法撤销");
+        }
+        $data["id"] = $id;
+        $data["checkMsg"] = $checkMsg;
+        $data["checkState"] = AllowanceStateEnum::NEED_REVIEW;
+        //添加日志
+        TalentChecklog::create([
+            'id' => getStringId(),
+            'mainId' => $id,
+            'type' => intval(ProjectState::JBT),
+            'typeFileId' => null,
+            'active' => 1,
+            'state' => 11, //撤销审核
+            'step' => 3,
+            'stateChange' => AllowanceStateEnum::getStateName($old["checkState"]) . "->" . AllowanceStateEnum::getStateName($data["checkState"]),
+            'description' => "撤销原因：" . $checkMsg,
+            'createTime' => date("Y-m-d H:i:s", time()),
+            'createUser' => sprintf("%s(%s)", $this->user["account"], $this->user["companyName"])
+        ]);
+        TaModel::update($data);
+        return new Response(Response::SUCCESS, "撤销成功");
+    }
+
+    /**
+     * 查询需要导出的数据
+     *
+     */
+    public function findTalentAllowanceByPage() {
+        $param = $this->request->param();
+        $where = [];
+        $where[] = ["type", "=", $this->user["type"]];
+        if ($param != null) {
+            if (\StrUtil::isNotEmpAndNull($param["name"])) {
+                $where[] = ["name", "like", "%" . $param["name"] . "%"];
+            }
+            if (\StrUtil::isNotEmpAndNull($param["idCard"])) {
+                $where[] = ["idCard", "like", "%" . $param["idCard"] . "%"];
+            }
+        }
+        $error = null;
+        switch ($param["type"]) {
+            case 1:
+            case 2:
+                $where[] = ["publicState", "=", 1];
+                $where[] = ["checkState", "in", [-1, 30]];
+                $error = "暂无可核查征信的数据";
+                break;
+            case 3:
+            case 7:
+                $where[] = ["publicState", "=", 2];
+                $where[] = ["checkState", "in", [-1, 30]];
+                $where[] = ["recommendAllowanceType", "=", 3];
+                $error = "暂无可公示（不予兑现）的数据";
+                break;
+            case 4:             //需要兑现
+            case 8:
+                $where[] = ["publicState", "=", 2];
+                $where[] = ["checkState", "in", [30]];
+                $where[] = ["recommendAllowanceType", "in", [1, 2]];
+                $error = "暂无需要公示（兑现）的数据";
+                break;
+            case 5:
+                $where[] = ["publicState", "=", 3];
+                $where[] = ["checkState", "in", [-1, 30]];
+                $error = "暂无可公示通过的数据";
+                break;
+            case 6:
+                $where[] = ["publicState", "=", 4];
+                $where[] = ["checkState", "in", [30]];
+                $where[] = ["allowanceType", "in", [1, 2]];
+                $error = "暂无可兑现的数据";
+                break;
+        }
+        $list = TaModel::where($where)->select()->toArray();
+        //查询企业信息
+        $enterpriseMap = \app\common\model\Enterprise::where("type", $this->user["type"])->column("name", "id");
+        foreach ($list as $key => $item) {
+            $list[$key]["enterpriseName"] = $enterpriseMap[$item["enterpriseId"]];
+        }
+        $res = [
+            "rows" => $list,
+            "total" => count($list)
+        ];
+        return new Response(Response::SUCCESS, "", $res);
+    }
+
+    public function exportHczx() {
+        $response = new \stdClass();
+        $response->code = 500;
+        $ids = $this->request->param("ids");
+        $ids_arr = array_filter(explode(",", $ids));
+        if (!$ids_arr) {
+            $response->msg = "没有选择导出的名单";
+            return \StrUtil::back($response, "TalentAllowanceInfo.hczxCallBack");
+        }
+        $where = [];
+        $where[] = ["id", "in", $ids_arr];
+        $list = TaModel::field("id,cardType,idCard,name,enterpriseId,year")->where($where)->select()->toArray();
+        if (!$list) {
+            $response->msg = "暂无可核查征信的数据";
+            return \StrUtil::back($response, "TalentAllowanceInfo.hczxCallBack");
+        }
+        $columns = ["序号", "姓名", "证件类型", "证件号码", "工作单位", "备注"];
+
+        $enterpriseMap = \app\common\model\Enterprise::where("type", $this->user["type"])->column("name", "id");
+        $cardTypeName = DictApi::selectByParentCode("card_type");
+        $rows = [];
+        for ($i = 0; $i < count($list); $i++) {
+            $item = $list[$i];
+            $row = [
+                $i + 1, $item["name"], $cardTypeName[$item["cardType"]], $item["idCard"], $enterpriseMap[$item["enterpriseId"]], $item["description"]
+            ];
+            $rows[] = $row;
+        }
+        $filename = "津补贴待核查征信名单导出";
+        if ($rows) {
+            export($columns, $rows, $filename);
+            exit();
+        } else {
+            $response->msg = "没有选择导出的名单";
+            return \StrUtil::back($response, "TalentTypeChange.callBack");
+        }
+    }
+
+    /**
+     * 核查征信驳回
+     */
+    public function hczxReject() {
+        $param = $this->request->param();
+        if (!$param) {
+            return new Response(Response::ERROR, "系统错误，请联系管理员");
+        }
+        $old = TalentAllowanceApi::getInfoById($param["id"]);
+        if ($old["publicState"] != 1) {
+            return new Response(Response::ERROR, "当前记录不是待核查征信状态，无法核查");
+        }
+        $data["id"] = $param["id"];
+        $data["publicState"] = 2;
+        $data["checkState"] = AllowanceStateEnum::NOTPASS;
+        $data["recommendAllowanceType"] = 3;
+        $data["recommendAllowanceMsg"] = "征信失信,不予兑现，失信原因：" . $param["outMsg"];
+        $data["recommendMonths"] = "";
+        $data["recommendMoney"] = 0.00;
+        $data["workAllowanceMoney"] = null;
+        $data["developAllowanceMoney"] = null;
+
+        //添加日志
+        TalentChecklog::create([
+            'id' => getStringId(),
+            'mainId' => $param["id"],
+            'type' => intval(ProjectState::JBT),
+            'typeFileId' => null,
+            'active' => 1,
+            'state' => 2,
+            'step' => 4,
+            'stateChange' => AllowanceStateEnum::getStateName($old["checkState"]) . "-><span class='label label-primary'>审核不通过</span>" . "公示状态：<span class='label label-success'>待核查</span>-><span class='label label-primary'>待公示</span>",
+            'description' => $param["outMsg"],
+            'createTime' => date("Y-m-d H:i:s", time()),
+            'createUser' => sprintf("%s(%s)", $this->user["account"], $this->user["companyName"])
+        ]);
+        TaModel::update($data);
+        return new Response(Response::SUCCESS, "核查征信成功");
+    }
+
+    /**
+     * 核查征信批量通过
+     */
+    public function hczxPass() {
+        $ids = $this->request["ids"];
+        if (\StrUtil::isEmpOrNull($ids)) {
+            return new Response(Response::ERROR, "请选择核查征信通过的数据");
+        }
+        $where = [];
+        $where[] = ["id", "in", $ids];
+        $list = TaModel::where($where)->select()->toArray();
+        $logList = [];
+        $upds = [];
+        foreach ($list as $obj) {
+            $upds[] = [
+                "id" => $obj["id"],
+                "publicState" => 2,
+            ];
+            $logList[] = [
+                "id" => getStringId(),
+                "type" => ProjectState::JBT,
+                "mainId" => $obj["id"],
+                "active" => 1,
+                "state" => 3,
+                "step" => 4,
+                "stateChange" => "<span class='label label-success'>待核查</span>-><span class='label label-primary'>待公示</span>",
+                "description" => "核查征信通过",
+                "createTime" => date("Y-m-d H:i:s"),
+                'createUser' => sprintf("%s(%s)", $this->user["account"], $this->user["companyName"])
+            ];
+        }
+        $taModel = new TaModel();
+        $taModel->saveAll($upds);
+        Db::table("new_talent_checklog")->insertAll($logList);
+        return new Response(Response::SUCCESS, "核查征信通过成功");
+    }
+
+    /**
+     * 公示预览(不予兑现)
+     */
+    public function exportPublicNotCash() {
+        $response = new \stdClass();
+        $response->code = 500;
+        //获取字典表人才层次+
+        $levelMap = DictApi::selectByParentCode("talent_arrange");
+        $streetMap = DictApi::selectByParentCode("street");
+        //查询企业信息
+        $enterpriseMap = \app\common\model\Enterprise::where("type", $this->user["type"])->column("name", "id");
+        //查询所有
+        $where = [];
+        $where[] = ["id", "in", explode(",", $this->request["ids"])];
+        $list = TaModel::where($where)->select()->toArray();
+        $rows = [];
+        for ($i = 0; $i < count($list); $i++) {
+            $item = $list[$i];
+            $rows[] = [
+                $i + 1, $item["name"], $enterpriseMap[$item["enterpriseId"]], $streetMap[$item["address"]], $levelMap[$item["talentArrange"]], $item["description"]
+            ];
+        }
+        $filename = ($this->user["type"] == 1 ? "晋江市优秀人才" : "晋江市集成电路人才") . $allList[0]["year"] . "年度津补贴不予兑现对象名单";
+        $columns = ["序号", "姓名", "工作单位", "镇(街道)", "人才层次", "备注"];
+        if ($rows) {
+            export($columns, $rows, $filename);
+            exit();
+        } else {
+            $response->msg = "没有选择导出的名单";
+            return \StrUtil::back($response, "TalentTypeChange.callBack");
+        }
+    }
+
     private function validateAllowanceType(&$info) {
         $old = TalentAllowanceApi::getInfoById($info["id"]);
         $talentTypeMap = DictApi::selectByParentCode("enterprise_tag");
@@ -327,19 +631,43 @@ class TalentAllowance extends AdminController {
         /*         * 2.判定工作月份、五险和个税是否满足重叠6个月要求* */
         $workdaySet = $this->chkMonths($monthMap[AllowanceProjectEnum::PROJECT_WORKDAY], $info, "上年度工作月份", "①");
         $pensionSet = $this->chkMonths($monthMap[AllowanceProjectEnum::PROJECT_SB_PENSION], $info, "养老保险", "②");
-        $injurySet = $this->chkMonths($monthMap[AllowanceProjectEnum::PROJECT_SB_INJURY], $info, "工伤保险", "③");
-        $unemploymentSet = $this->chkMonths($monthMap[AllowanceProjectEnum::PROJECT_SB_UNEMPLOYMENT], $info, "失业保险", "④");
-        $medicaSet = $this->chkMonths($monthMap[AllowanceProjectEnum::PROJECT_SB_MEDICA], $info, "医疗保险", "⑤");
-        $taxSet = $this->chkMonths($monthMap[AllowanceProjectEnum::PROJECT_TAX], $info, "个税", "⑥");
+        $unemploymentSet = $this->chkMonths($monthMap[AllowanceProjectEnum::PROJECT_SB_UNEMPLOYMENT], $info, "失业保险", "③");
+        $medicaSet = $this->chkMonths($monthMap[AllowanceProjectEnum::PROJECT_SB_MEDICA], $info, "医疗保险", "④");
+        $taxSet = $this->chkMonths($monthMap[AllowanceProjectEnum::PROJECT_TAX], $info, "个税", "⑤");
         $set = array_intersect($set, $workdaySet);
         $set = array_intersect($set, $pensionSet);
-        $set = array_intersect($set, $injurySet);
         $set = array_intersect($set, $unemploymentSet);
         $set = array_intersect($set, $medicaSet);
         $set = array_intersect($set, $taxSet);
-        if ($info["recommendAllowanceType"] == 1 && count($set) < 6) {
-            //如果全部满足6个月，但是重叠时间不满足6个月，开始检测是否符合交通补贴要求
-            $info["recommendAllowanceType"] == 2;
+        usort($set, function($a, $b) {
+            return (int) $a - (int) $b;
+        });
+        if ($info["recommendAllowanceType"] == 1) {
+            if (count($set) < 6) {
+                //如果全部满足6个月，但是重叠时间不满足6个月，开始检测是否符合交通补贴要求
+                $info["recommendAllowanceType"] == 2;
+                $info["recommendAllowanceMsg"] = $info["recommendAllowanceMsg"] . "\n社会保险、个税、上年度工作月份交集月份不满足6个月（" . implode(",", $set) . "），无法享受工作津贴（×）";
+            } else {
+                //检查连续缴纳月份是否满足6个月
+                $count = 1;
+                foreach ($set as $s) {
+                    $currentVal = intval($s);
+                    $nextVal = $currentVal + 1;
+                    $nextKey = str_pad($nextVal, 2, "0", STR_PAD_LEFT);
+                    if (in_array($nextKey, $set)) {
+                        $count++;
+                        if ($count >= 6) {
+                            break;
+                        }
+                    } else {
+                        $count = 1;
+                    }
+                }
+                if ($count < 6) {
+                    $info["recommendAllowanceType"] == 2;
+                    $info["recommendAllowanceMsg"] = $info["recommendAllowanceMsg"] . "\n社会保险、个税、上年度工作月份交集月份不满足连续缴纳6个月（" . implode(",", $set) . "），无法享受工作津贴（×）";
+                }
+            }
         }
         if ($info["recommendAllowanceType"] == 2) {
             //判断境内工作时间是否大于30天
@@ -355,151 +683,85 @@ class TalentAllowance extends AdminController {
         }
         return $set;
     }
-    
+
     /**
      * 计算津补贴
      */
     private function calculateAllowance(&$info, $retainMonths, $detailMonthList) {
-        /**查询人才层次变更记录*/
-        List<TalentAllowanceArrange> arrangeList = this.talentAllowanceArrangeService.selectListAndAmount(new EntityWrapper<TalentAllowanceArrange>().eq("mainId", info.getId()).orderBy("talentArrange"));
-        AmountStandard amountStandard = this.amountStandardService.selectOne(new EntityWrapper<AmountStandard>().eq("type", 1).eq("allowanceType", 1).eq("talentArrange", "4"));
-        /*** 容器*/
-        BigDecimal jobMoney = BigDecimal.ZERO;               //计算所得工作津贴
-        BigDecimal jtMoney = BigDecimal.ZERO;               //计算所得一次性交通补贴
-        Set<String> recommendMonths = new TreeSet<>(new Comparator<String>() {
-            @Override
-            public int compare(String o1, String o2) {
-                int o1Int = Integer.parseInt(o1);
-                int o2Int = Integer.parseInt(o2);
-                return o1Int - o2Int;
+        /*         * 查询人才层次变更记录 */
+        $arrangeList = TalentAllowanceArrange::where("mainId", $info["id"])->order("talentArrange")->select()->toArray();
+        foreach ($arrangeList as &$arrange) {
+            $where = [];
+            $where[] = ["type", "=", $this->user["type"]];
+            $where[] = ["allowanceType", "in", [1, 2]];
+            $where[] = ["talentArrange", "=", $arrange["talentArrange"]];
+            $list = AsModel::where($where)->field("money,allowanceType")->select()->toArray();
+            foreach ($list as $amount) {
+                if ($amount["allowanceType"] == 1) {
+                    $arrange["jobMoney"] = $amount["money"];
+                }
+                if ($amount["allowanceType"] == 2) {
+                    $arrange["jtMoney"] = $amount["money"];
+                }
             }
-        });               //推荐月份
-        String talentArrange = null;
-        /***********计算**************/
-        StringBuilder msgBulider = new StringBuilder();
-        switch (info.getRecommendAllowanceType()) {
+        }unset($arrange);
+
+        /*         * * 容器 */
+        $jobMoney = 0.00;               //计算所得工作津贴
+        $jtMoney = 0.00;               //计算所得一次性交通补贴
+        $recommendMonths = []; //推荐月份
+        $talentArrange = null;
+        /*         * *********计算************* */
+        $msgBulider = [];
+        switch ($info["recommendAllowanceType"]) {
             case 1:
-                if (info.getType() == 1) {                //晋江市优秀人才
-                    /**判断判定最终月份和人才层次有效月份是否存在共同月份，不存在则为一次性交通补贴*/
-                    Set<String> totalArrangeMonth = new HashSet<>();
-                    for (TalentAllowanceArrange arrange : arrangeList) {
-                        List<String> levelList = new ArrayList<>(Arrays.asList(arrange.getPrepareMonths().split(",")));
-                        //对于2019年度的津补贴申报人才层次可享受月份均在07-12月
-                        if ("2019".equals(info.getYear())) {
-                            levelList.retainAll(new ArrayList<>(Arrays.asList("07", "08", "09", "10", "11", "12")));
-                        }
-                        totalArrangeMonth.addAll(levelList);
-                    }
-                    totalArrangeMonth.retainAll(retainMonths);
-                    /**对于人才标签中存在在站博士后的需要去除在站博士后计算，在站博士后不考虑人才层次（不予人才层次取交集），默认第四层次*/
-                    for (TalentAllowancecontractDetail detail : detailMonthList) {
-                        if (DictValueConst.TALENTTYPE_ZZBSH.equals(detail.getTalentType())) {
-                            String months = detail.getMonths();
-                            if (FengStringUtil.isNotEmpAndNull(months)) {
-                                List<String> monthsList = new ArrayList<>(Arrays.asList(months.split(",")));
-                                BigDecimal total = amountStandard.getMoney().multiply(new BigDecimal(monthsList.size())).setScale(2, BigDecimal.ROUND_HALF_UP);
-                                jobMoney = jobMoney.add(total);
-                                msgBulider.append(monthsList.size() + "(" + StringUtils.join(monthsList.toArray(), ",") + ")x" + amountStandard.getMoney() + "(第" + amountStandard.getTalentArrange() + "层次)+");
-                                recommendMonths.addAll(monthsList);
-                                retainMonths.removeAll(monthsList);             //去除在站博士后已计算月份
-                                /**当存在在站博士后时无需计算月份和人才层次的交集，此处在交集内加入月份 数据，防止下面if判断导致津贴类型变更*/
-                                totalArrangeMonth.addAll(monthsList);
-                            }
-                        }
-                    }
-                    if (totalArrangeMonth.size() == 0) {
-                        int tempArrange = Integer.parseInt(arrangeList.get(0).getTalentArrange());
-                        if (tempArrange < 6) {
-                            info.setRecommendAllowanceType(2);
-                            info.setRecommendAllowanceMsg(info.getRecommendAllowanceMsg() + "\n由于判定结果月份与人才层次有效月份无交集，因此津贴类型为：一次性交通补贴");
-                        } else {
-                            info.setRecommendAllowanceType(3);
-                            info.setRecommendAllowanceMsg(info.getRecommendAllowanceMsg() + "\n由于判定结果月份与人才层次有效月份无交集且为第" + tempArrange + "层次，因此津贴类型为：不予兑现");
-                        }
-                        return calculateAllowance(info, retainMonths, detailMonthList);
-                    }
-                    if (retainMonths.size() > 0) {
-                        for (TalentAllowanceArrange arrange : arrangeList) {
-                            if (FengStringUtil.isNotEmpAndNull(arrange.getPrepareMonths())) {
-                                List<String> levelList = new ArrayList<>(Arrays.asList(arrange.getPrepareMonths().split(",")));
-                                //对于2019年度的津补贴申报人才层次可享受月份均在07-12月
-                                if ("2019".equals(info.getYear())) {
-                                    levelList.retainAll(new ArrayList<>(Arrays.asList("07", "08", "09", "10", "11", "12")));
-                                }
-                                levelList.retainAll(retainMonths);
-                                BigDecimal total = arrange.getJobMoney().multiply(new BigDecimal(levelList.size())).setScale(2, BigDecimal.ROUND_HALF_UP);
-                                jobMoney = jobMoney.add(total);
-                                msgBulider.append(levelList.size() + "(" + StringUtils.join(levelList.toArray(), ",") + ")x" + arrange.getJobMoney() + "(第" + arrange.getTalentArrange() + "层次)+");
-                                recommendMonths.addAll(levelList);
-                                arrange.setMonths(StringUtils.join(levelList.toArray(), ","));
-                                arrange.setCount(levelList.size());
-                                arrange.setTotal(total);
-                            } else {
-                                msgBulider.append("0()x" + arrange.getJobMoney() + "(第" + arrange.getTalentArrange() + "层次)+");
-                                arrange.setCount(0);
-                                arrange.setTotal(new BigDecimal(0.00));
-                            }
-                        }
-                    }
-                    info.setRecommendMonths(StringUtils.join(recommendMonths.toArray(), ","));
-                    info.setRecommendAllowanceMsg(info.getRecommendAllowanceMsg() + "通过与人才证书有效期取交集得到最终可享受月份:" + StringUtils.join(recommendMonths.toArray(), ",") + "\n经过计算：人才津贴为" + jobMoney + ";");
-                    info.setRecommendMoney(jobMoney);
-                    info.setRecommendMoneyDesc(msgBulider.substring(0, msgBulider.length() - 1));
-                    info.setWorkAllowanceMoney(jobMoney.multiply(new BigDecimal(0.8)).setScale(2, BigDecimal.ROUND_HALF_UP));
-                    info.setDevelopAllowanceMoney(jobMoney.multiply(new BigDecimal(0.2)).setScale(2, BigDecimal.ROUND_HALF_UP));
-                    info.setRecommendAllowanceMsg(info.getRecommendAllowanceMsg() + "工作津贴为" + info.getWorkAllowanceMoney() + ";发展津贴为：" + info.getDevelopAllowanceMoney());
-                    this.talentAllowancecontractDetailService.updateBatchById(detailMonthList);
-                } else if (info.getType() == 2) {          //集成电路优秀人才
-                    for (TalentAllowanceArrange arrange : arrangeList) {
-                        if (FengStringUtil.isNotEmpAndNull(arrange.getPrepareMonths())) {
-                            List<String> levelList = new ArrayList<>(Arrays.asList(arrange.getPrepareMonths().split(",")));
-                            levelList.retainAll(retainMonths);
-                            BigDecimal total = arrange.getJobMoney().multiply(new BigDecimal(levelList.size())).setScale(2, BigDecimal.ROUND_HALF_UP);
-                            jobMoney = jobMoney.add(total);
-                            msgBulider.append(levelList.size() + "(" + StringUtils.join(levelList.toArray(), ",") + ")x" + arrange.getJobMoney() + "(第" + arrange.getTalentArrange() + "层次)+");
-                            recommendMonths.addAll(levelList);
-                            arrange.setMonths(StringUtils.join(levelList.toArray(), ","));
-                            arrange.setCount(levelList.size());
-                            arrange.setTotal(total);
-                        } else {
-                            msgBulider.append("0()x" + arrange.getJobMoney() + "(第" + arrange.getTalentArrange() + "层次)+");
-                            arrange.setCount(0);
-                            arrange.setTotal(new BigDecimal(0.00));
-                        }
+                foreach ($arrangeList as &$arrange) {
+                    if (\StrUtil::isNotEmpAndNull($arrange["prepareMonths"])) {
+                        $levelList = array_filter(explode(",", $arrange["prepareMonths"]));
+                        $levelList = array_intersect($levelList, $retainMonths);
+                        $total = round($arrange["jobMoney"] * count($levelList), 2);
+                        $jobMoney += $total;
+                        $msgBulider[] = sprintf("%d(%s)x%s(第%d层次)", count($levelList), $levelList ? implode(",", $levelList) : "", $arrange["jobMoney"], $arrange["talentArrange"]);
+                        $recommendMonths = array_merge($recommendMonths, $levelList);
+                        usort($recommendMonths, function($a, $b) {
+                            return (int) $a - (int) $b;
+                        });
+                        $arrange["months"] = implode(",", $levelList);
+                        $arrange["count"] = count($levelList);
+                        $arrange["total"] = $total;
+                    } else {
+                        $msgBulider[] = sprintf("0()x%s(第%d层次)", $arrange["jobMoney"], $arrange["talentArrange"]);
+                        $arrange["count"] = 0;
+                        $arrange["total"] = 0.00;
                     }
-                    info.setRecommendMonths(StringUtils.join(recommendMonths.toArray(), ","));
-                    info.setRecommendAllowanceMsg(info.getRecommendAllowanceMsg() + "通过与人才证书有效期取交集得到最终可享受月份:" + StringUtils.join(recommendMonths.toArray(), ",") + "\n经过计算：人才津贴为" + jobMoney + ";");
-                    info.setRecommendMoney(jobMoney);
-                    info.setRecommendMoneyDesc(msgBulider.substring(0, msgBulider.length() - 1));
-                }
+                }unset($arrange);
+                $info["recommendMonths"] = implode(",", $recommendMonths);
+                $info["recommendAllowanceMsg"] = $info["recommendAllowanceMsg"] . "通过与人才证书有效期取交集得到最终可享受月份:" . implode(",", $recommendMonths) . "\n经过计算：人才津贴为" . $jobMoney . ";";
+                $info["recommendMoney"] = $jobMoney;
+                $info["recommendMoneyDesc"] = implode("+", $msgBulider);
+
                 break;
             case 2:
-                for (TalentAllowanceArrange arrange : arrangeList) {
-                    Integer intArragnge = Integer.parseInt(arrange.getTalentArrange());
-                    if (FengStringUtil.isNotEmpAndNull(arrange.getPrepareMonths()) && intArragnge <=5) {
-                        if (jtMoney.compareTo(BigDecimal.ZERO) == 0 || arrange.getJtMoney().compareTo(jtMoney) == 1) {
-                            jtMoney = arrange.getJtMoney();
-                            talentArrange = arrange.getTalentArrange();
-                        }
-                    }
+                foreach ($arrangeList as $arrange) {
+                    $jtMoney = $arrange["jtMoney"];
+                    $talentArrange = $arrange["talentArrange"];
                 }
-                info.setRecommendMoney(jtMoney);
-                info.setRecommendMonths("");
-                info.setRecommendMoneyDesc("一次性交通补贴");
-                info.setWorkAllowanceMoney(new BigDecimal(0.00));
-                info.setDevelopAllowanceMoney(new BigDecimal(0.00));
-                info.setRecommendTalentArrange(talentArrange);
+                $info["recommendMoney"] = $jtMoney;
+                $info["recommendMonths"] = "";
+                $info["recommendMoneyDesc"] = "一次性交通补贴";
+                $info["workAllowanceMoney"] = 0.00;
+                $info["developAllowanceMoney"] = 0.00;
+                $info["recommendTalentArrange"] = $talentArrange;
                 break;
             case 3:
-                info.setRecommendMoney(new BigDecimal(0.00));
-                info.setRecommendMoneyDesc("不予兑现");
-                info.setRecommendMonths("");
-                info.setWorkAllowanceMoney(new BigDecimal(0.00));
-                info.setDevelopAllowanceMoney(new BigDecimal(0.00));
+                $info["recommendMoney"] = 0.00;
+                $info["recommendMonths"] = "";
+                $info["recommendMoneyDesc"] = "不予兑现";
+                $info["workAllowanceMoney"] = 0.00;
+                $info["developAllowanceMoney"] = 0.00;
                 break;
         }
-//        this.talentAllowanceArrangeService.updateBatchById(arrangeList);
-        return arrangeList;
+        return $arrangeList;
     }
 
     /**
@@ -509,11 +771,23 @@ class TalentAllowance extends AdminController {
      * @param name
      */
     private function chkMonths($set, &$info, $name, $sort) {
+        if ($name == "上年度工作月份") {
+            $tmp = [];
+            foreach ($set as $s) {
+                $_s = explode("=", $s);
+                $month = $_s[0];
+                $days = $_s[1];
+                if ($days > 0) {
+                    $tmp[] = $month;
+                }
+            }
+            $set = $tmp;
+        }
         if ($info["recommendAllowanceType"] == 1 && (!$set || count($set) < 6)) {
             $info["recommendAllowanceType"] = 2;
             $info["recommendAllowanceMsg"] = $info["recommendAllowanceMsg"] . $sort . $name . "不足6个月，无法享受工作津贴（×）";
         }
-        return set;
+        return $set;
     }
 
     //合并所有项目的月份

app/admin/view/talent_allowance/info.html

@@ -90,12 +90,6 @@
                                                         </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="{$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">

app/admin/view/talent_allowance/select.html

@@ -44,7 +44,7 @@
                     <div class="tabs-container" >
                         <ul class="nav nav-tabs">
                             <li class="active"><a data-toggle="tab" href="#tab-1" aria-expanded="true">1.基本信息</a></li>
-<!--                            <li id="condition" class=""><a data-toggle="tab" href="#tab-2" aria-expanded="false" onclick="TalentAllowanceInfoDlg.initContract()">2.核查条件录入</a></li>-->
+                            <!--                            <li id="condition" class=""><a data-toggle="tab" href="#tab-2" aria-expanded="false" onclick="TalentAllowanceInfoDlg.initContract()">2.核查条件录入</a></li>-->
                             <li id="fileLi" class=""><a data-toggle="tab" href="#tab-2"  aria-expanded="false" onclick="TalentAllowanceInfoDlg.initFileTable()">2.附件上传</a></li>
                         </ul>
                     </div>
@@ -59,47 +59,51 @@
                                 <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="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="${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="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}">
+                                            {eq name="process" value="1"}
+                                            <input type="hidden" name="companyCode" id="companyCode" value="{$row.companyCode}">
+                                            {/eq}
                                             <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>
+                                                    <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}" >
+                                                        <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" 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>
@@ -109,101 +113,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" readonly="readonly" id="wage" placeholder="正常工资薪金、一次性奖金收入" name="wage" value="${item.wage}"/>
+                                                        <input type="text" class="form-control" readonly="readonly" id="wage" placeholder="正常工资薪金、一次性奖金收入" name="wage" value="{$row.wage}"/>
                                                     </div>
                                                 </div>
                                             </div>
@@ -230,22 +230,34 @@
                                     </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">
-                                            人才层次记录
-                                        </h3>
-                                    </div>
+                            <div class="panel panel-default">
+                                <div class="panel-heading" onclick="$(this).next().toggle()">
+                                    <h3 class="panel-title">
+                                        人才层次记录
+                                    </h3>
+                                </div>
+                                <div class="panel-body">
                                     <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){
+                            </div>
+                            {eq name="process" value="4"}
                             <div id="recommendDiv" class="panel panel-default">
                                 <div class="panel-heading" onclick="$(this).next().toggle()">
                                     <h3 class="panel-title">
@@ -258,35 +270,30 @@
                                             <label class="col-sm-1 control-label spacing">津补贴类型</label>
                                             <div class="col-sm-5 spacing">
                                                 <input type="text" class="form-control" readonly="readonly" id="recommendAllowanceTypeName"
-                                                       @if(item.recommendAllowanceType == 1){
-                                                       value="人才津贴"
-                                                       @}
-                                                       @if(item.recommendAllowanceType == 2){
-                                                       value="一次性交通补贴"
-                                                       @}
-                                                       @if(item.recommendAllowanceType == 3){
-                                                       value="不予兑现"
-                                                       @}
-                                                />
+                                                       value='{switch name="row.recommendAllowanceType"}
+                                                       {case value="1"}工作津贴{/case}
+                                                       {case value="2"}一次性交通补贴{/case}
+                                                       {case value="3"}不予兑现{/case}
+                                                       {/switch}'/>
                                             </div>
                                             <label class="col-sm-1 control-label spacing">兑现月份</label>
                                             <div class="col-sm-5 spacing">
-                                                <input type="text" class="form-control" readonly="readonly" id="recommendMonths" value="${item.recommendMonths}"/>
+                                                <input type="text" class="form-control" readonly="readonly" id="recommendMonths" value="{$row.recommendMonths}"/>
                                             </div>
                                             <label class="col-sm-1 control-label spacing">津补贴判定详情</label>
                                             <div class="col-sm-5 spacing">
-                                                <textarea class="form-control" readonly="readonly" id="recommendAllowanceMsg" name="allowanceMsg" rows="4" >${item.recommendAllowanceMsg}</textarea>
+                                                <textarea class="form-control" readonly="readonly" id="recommendAllowanceMsg" name="allowanceMsg" rows="4" >{$row.recommendAllowanceMsg}</textarea>
                                             </div>
                                             <label class="col-sm-1 control-label spacing">津补贴计算详情</label>
                                             <div class="col-sm-5 spacing">
-                                                <input type="text" class="form-control" readonly="readonly" id="recommendMoneyDesc" name="moneyDesc" value="${item.recommendMoneyDesc}"/>
+                                                <input type="text" class="form-control" readonly="readonly" id="recommendMoneyDesc" name="moneyDesc" value="{$row.recommendMoneyDesc}"/>
                                             </div>
                                         </div>
                                     </div>
                                 </div>
                             </div>
-                            @}
-                            @if(item.publicState >= 4 ){
+                            {/eq}
+                            {if condition="$row['publicState'] >= 4"}
                             <div id="resDiv" class="panel panel-default">
                                 <div class="panel-heading" onclick="$(this).next().toggle()">
                                     <h3 class="panel-title">
@@ -299,34 +306,29 @@
                                             <label class="col-sm-1 control-label spacing">津补贴类型</label>
                                             <div class="col-sm-5 spacing">
                                                 <input type="text" class="form-control" readonly="readonly" id="oldAllowanceType"
-                                                       @if(item.allowanceType == 1){
-                                                       value="人才津贴"
-                                                       @}
-                                                       @if(item.allowanceType == 2){
-                                                       value="一次性交通补贴"
-                                                       @}
-                                                       @if(item.allowanceType == 3){
-                                                       value="不予兑现"
-                                                       @}
-                                                />
+                                                       {switch name="row.recommendAllowanceType"}
+                                                       {case value="1"}工作津贴{/case}
+                                                       {case value="2"}一次性交通补贴{/case}
+                                                       {case value="3"}不予兑现{/case}
+                                                       {/switch}/> />
                                             </div>
                                             <label class="col-sm-1 control-label spacing">兑现月份</label>
                                             <div class="col-sm-5 spacing">
-                                                <input type="text" class="form-control" readonly="readonly" id="dxMonths" value="${item.months}"/>
+                                                <input type="text" class="form-control" readonly="readonly" id="dxMonths" value="{$row.months}"/>
                                             </div>
                                             <label class="col-sm-1 control-label spacing">津补贴判定详情</label>
                                             <div class="col-sm-5 spacing">
-                                                <textarea class="form-control" readonly="readonly" id="allowanceMsg" name="allowanceMsg" rows="4" >${item.allowanceMsg}</textarea>
+                                                <textarea class="form-control" readonly="readonly" id="allowanceMsg" name="allowanceMsg" rows="4" >{$row.allowanceMsg}</textarea>
                                             </div>
                                             <label class="col-sm-1 control-label spacing">津补贴计算详情</label>
                                             <div class="col-sm-5 spacing">
-                                                <input type="text" class="form-control" readonly="readonly" id="moneyDesc" name="moneyDesc" value="${item.moneyDesc}"/>
+                                                <input type="text" class="form-control" readonly="readonly" id="moneyDesc" name="moneyDesc" value="{$row.moneyDesc}"/>
                                             </div>
                                         </div>
                                     </div>
                                 </div>
                             </div>
-                            @}
+                            {/if}
                             <div class="panel panel-default">
                                 <div class="panel-heading" onclick="$(this).next().toggle()">
                                     <h3 class="panel-title">
@@ -334,10 +336,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" >
@@ -357,7 +365,7 @@
 </div>
 <iframe id="hiddenIframe" name="hiddenIframe" style="display: none;"></iframe>
 <script type="text/javascript">
-    document.write('<script src="/static/modular/talentAllowance/talentAllowanceInfo_select.js?v='+(new Date()).getTime()+'"><\/script>');
-    document.write('<script src="/static/modular/common/upload.js?v='+(new Date()).getTime()+'"><\/script>');
+    document.write('<script src="/static/modular/talentAllowance/talentAllowanceInfo_select.js?v=' + (new Date()).getTime() + '"><\/script>');
+    document.write('<script src="/static/modular/common/upload.js?v=' + (new Date()).getTime() + '"><\/script>');
 </script>
 {/block}

app/common/controller/Api.php

@@ -796,6 +796,14 @@ class Api extends BaseController {
                         return true;
                 }
                 break;
+            case ProjectState::JBT:
+                if ($this->user["usertype"] == 2) {
+                    $user_id = $this->user["uid"];
+                    $talent_info = \app\common\model\TalentAllowance::findOrEmpty($mainId);
+                    if ($user_id == $talent_info["enterpriseId"])
+                        return true;
+                }
+                break;
             case ProjectState::EDUCATION:
                 if ($this->user["usertype"] == 3) {
                     $user_id = $this->user["uid"];

app/common/model/AmountStandard.php

@@ -0,0 +1,16 @@
+<?php
+
+namespace app\common\model;
+
+use think\Model;
+
+/**
+ * Description of AmountStandard
+ *
+ * @author sgq
+ */
+class AmountStandard extends Model {
+
+    protected $table = "sys_amount_standard";
+
+}

app/enterprise/controller/TalentAllowance.php

@@ -603,7 +603,7 @@ class TalentAllowance extends EnterpriseController {
         foreach ($filetypes as $filetype) {
             if ($filetype["must"] == 1) {
                 $where = [];
-                $where[] = ["mainId", "=", $id];
+                $where[] = ["mainId", "=", $data["id"]];
                 $where[] = ["typeId", "=", $filetype["id"]];
                 $count = Db::table("new_talent_file")->where($where)->count();
                 if ($count == 0) {

app/enterprise/view/talent_allowance/apply.html

@@ -203,7 +203,7 @@
                                                      <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="{$row.active}">
-                                                        <input type="text" class="form-control" id="wage" placeholder="正常工资薪金、一次性奖金收入(无需填写单位)" name="wage" value="{$row.wage}" {if condition="!$row['fields'] && $row['checkState']!=1 && $row['id']"}readonly="readonly"{/if}/>
+                                                        <input type="text" class="form-control" id="wage" placeholder="正常工资薪金、一次性奖金收入(无需填写单位)" name="wage" value="{$row.wage}" />
                                                     </div>
                                                 </div>
 

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

@@ -15,7 +15,7 @@ TalentAllowanceInfoDlg.initFileTable = function (){
     queryData['project'] = CONFIG.project_jbt;
     queryData['type'] = $("#type").val();
     $("#fileTable").bootstrapTable({
-        url: Feng.ctxPath + "/common/api/findUnCommonFileType",
+        url: Feng.ctxPath + "/common/api/findCommonFileType",
         method: 'POST',
         contentType: "application/x-www-form-urlencoded; charset=UTF-8",
         search: false,					// 是否显示表格搜索，此搜索是客户端搜索，不会进服务端

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

@@ -507,7 +507,7 @@ TalentAllowanceInfoDlg.initFileTable = function () {
     queryData['project'] = CONFIG.project_jbt;
     queryData['type'] = $("#type").val();
     $("#fileTable").bootstrapTable({
-        url: Feng.ctxPath + "/common/api/findUnCommonFileType",
+        url: Feng.ctxPath + "/common/api/findCommonFileType",
         method: 'POST',
         contentType: "application/x-www-form-urlencoded; charset=UTF-8",
         search: false, // 是否显示表格搜索，此搜索是客户端搜索，不会进服务端
@@ -770,6 +770,23 @@ $(function () {
     if ($("#allowanceType").val() == 1) {
         $("#wageDiv").css("display", "block");
     }
+    //设置禁止字段
+    var checkState = $("#checkState").val();
+    if ($("#id").val() != "" && checkState != 1) {
+        $("#allowanceType").attr("style", "pointer-events: none;background-color: #eee;");
+        $("#wage").prop("readonly", true);
+    }
+    if (checkState == 10) {
+        var fields = $("#fields").val().split(",");
+        if (fields.indexOf("wage") > -1) {
+            $("#wage").removeAttr("readonly");
+        }
+        if (fields.indexOf("allowanceType") > -1) {
+            $("#allowanceType").removeAttr("style");
+        }
+    }
+
+
     TalentAllowanceInfoDlg.showAllLog();
     toastr.options = {
         "closeButton": true,

public/static/modular/talentAllowance/talentAllowanceInfo.js

@@ -829,7 +829,7 @@ TalentAllowanceInfo.getIdentifyCondition = function () {
 $(function () {
     var process = $("#process").val();
     var defaultColunms = TalentAllowanceInfoSupple.initColumn(process);
-    var table = new BSTable(TalentAllowanceInfo.id, "/admin/talentAllowance/list/" + process, defaultColunms);
+    var table = new BSTable(TalentAllowanceInfo.id, "/admin/talentAllowance/list/process/" + process, defaultColunms);
     table.setPaginationType("server");
     table.setOnDblClickRow(function () {
         TalentAllowanceInfo.openCheckTalentAllowanceInfo();
@@ -846,16 +846,16 @@ $(function () {
     //批量加载字典表数据
     var arr = [{
             "name": "address",
-            "code": "un_street"
+            "code": "street"
         }, {
             "name": "talentArrange",
-            "code": "un_talentLevel"
+            "code": "talent_arrange"
         }, {
             "name": "nationality",
-            "code": "un_nationality"
+            "code": "nationality"
         }, {
             "name": "talentType",
-            "code": "un_jbt_talentType"
+            "code": "talent_type"
         }, {"name": "introductionMode", "code": "un_introduction_mode"}];
     Feng.findChildDictBatch(JSON.stringify(arr));
     $("#identifyCondition").on('chosen:ready', function (e, params) {

public/static/modular/talentAllowance/talentAllowanceInfo_info.js

@@ -711,7 +711,7 @@ TalentAllowanceInfoDlg.checkSubmit = function (index) {
         Feng.info("请填写审核意见");
         return;
     }
-    if (process == 3 && checkState == 2) {
+    /*if (process == 3 && checkState == 2) {
         var toProcess = $("#toProcess").val();
         if (Feng.isEmptyStr(toProcess)) {
             Feng.info("请选择驳回至流程");
@@ -727,7 +727,7 @@ TalentAllowanceInfoDlg.checkSubmit = function (index) {
                 return;
             }
         }
-    }
+    }*/
     var projects = '', files = '', concats = '', fields = "";
     if (process == 1) {
         $("#field_project li input").each(function (index) {

public/static/modular/talentAllowance/talentAllowanceInfo_info_supple.js

@@ -1,6 +1,6 @@
 
 //回调
-TalentAllowanceInfoDlg.callBack = function (data){
+TalentAllowanceInfoDlg.callBack = function (data) {
     layer.close(data.obj);
     Feng.info(data.msg);
     if (data.code == 200) {
@@ -10,71 +10,71 @@ TalentAllowanceInfoDlg.callBack = function (data){
 
 //全选
 TalentAllowanceInfoDlg.checkAll = function (id) {
-    $("#"+id+" input").each(function () {
+    $("#" + id + " input").each(function () {
         $(this).iCheck("check");
     })
 }
 //反选
 TalentAllowanceInfoDlg.unCheckAll = function (id) {
-    $("#"+id+" input").each(function () {
-        if(this.checked){
+    $("#" + id + " input").each(function () {
+        if (this.checked) {
             $(this).iCheck("uncheck");
-        }else{
+        } else {
             $(this).iCheck("check");
         }
     })
 }
 //初始化工作单位表的列
-TalentAllowanceInfoDlg.initContractColumns = function(){
+TalentAllowanceInfoDlg.initContractColumns = function () {
     var type = $("#type").val();
     var process = $("#process").val();
     var companyCode = $("#companyCode").val();
-    if(type==1){
+    if (type == 1) {
         return [
-            {field: 'selectItem', checkbox:false,visible:false},
-            {title: '企业名称', field: 'enterpriseName', visible: true, align: 'center', valign: 'middle',width:"100px",'class': 'uitd_showTip'},
-            {title: '合同起始时间', field: 'startTime', visible: true, align: 'center', valign: 'middle',width:"90px",'class': 'uitd_showTip'},
-            {title: '合同截止时间', field: 'endTime', visible: true, align: 'center', valign: 'middle',width:"90px",'class': 'uitd_showTip'},
-            {title: '入职时间', field: 'entryTime', visible: true, align: 'center', valign: 'middle',width:"100px",'class': 'uitd_showTip'},
-            {title: '离职时间', field: 'quitTime', visible: true, align: 'center', valign: 'middle',width:"100px",'class': 'uitd_showTip'},
-            {title: '人才标签', field: 'talentTypeName', visible: true, align: 'center', valign: 'middle',width:"100px",'class': 'uitd_showTip'},
-            {title: '首次来晋行政介绍信时间', field: 'letterTime', visible: true, align: 'center', valign: 'middle',width:"120px",'class': 'uitd_showTip'},
-            {title:'认定条件证书取得时间',field:'identifyGetTime', visible: true, align: 'center', valign: 'middle',width:"120px",'class': 'uitd_showTip'},
-            {title: '操作', field: 'id', visible: true, align: 'center', valign: 'middle',width:"150px",
-                formatter : function(value,row,index){
+            {field: 'selectItem', checkbox: false, visible: false},
+            {title: '企业名称', field: 'enterpriseName', visible: true, align: 'center', valign: 'middle', width: "100px", 'class': 'uitd_showTip'},
+            {title: '合同起始时间', field: 'startTime', visible: true, align: 'center', valign: 'middle', width: "90px", 'class': 'uitd_showTip'},
+            {title: '合同截止时间', field: 'endTime', visible: true, align: 'center', valign: 'middle', width: "90px", 'class': 'uitd_showTip'},
+            {title: '入职时间', field: 'entryTime', visible: true, align: 'center', valign: 'middle', width: "100px", 'class': 'uitd_showTip'},
+            {title: '离职时间', field: 'quitTime', visible: true, align: 'center', valign: 'middle', width: "100px", 'class': 'uitd_showTip'},
+            {title: '人才标签', field: 'talentTypeName', visible: true, align: 'center', valign: 'middle', width: "100px", 'class': 'uitd_showTip'},
+            {title: '首次来晋行政介绍信时间', field: 'letterTime', visible: true, align: 'center', valign: 'middle', width: "120px", 'class': 'uitd_showTip'},
+            {title: '认定条件证书取得时间', field: 'identifyGetTime', visible: true, align: 'center', valign: 'middle', width: "120px", 'class': 'uitd_showTip'},
+            {title: '操作', field: 'id', visible: true, align: 'center', valign: 'middle', width: "150px",
+                formatter: function (value, row, index) {
                     var html = "";
-                    if(process==1 && companyCode==CONFIG.COM_RSJ){
-                        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>" ;
+                    if (process == 1 && companyCode == CONFIG.COM_RSJ) {
+                        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>";
                     }
-                    html  = html + "<button type='button' onclick='TalentAllowanceInfoDlg.showLog(\""+value+"\")' style='margin-right: 10px' class='btn btn-xs btn-success'>" +
-                        "<i class=\"fa fa-book\"></i>日志" +
-                        "</button>";
+                    html = html + "<button type='button' onclick='TalentAllowanceInfoDlg.showLog(\"" + value + "\")' style='margin-right: 10px' class='btn btn-xs btn-success'>" +
+                            "<i class=\"fa fa-book\"></i>日志" +
+                            "</button>";
                     return html;
                 }
             }
         ];
     }
-    if(type==2){
+    if (type == 2) {
         return [
-            {field: 'selectItem', checkbox:false,visible:false},
-            {title: '企业名称', field: 'enterpriseName', visible: true, align: 'center', valign: 'middle',width:"120px",'class': 'uitd_showTip'},
-            {title: '合同起始时间', field: 'startTime', visible: true, align: 'center', valign: 'middle',width:"120px",'class': 'uitd_showTip'},
-            {title: '合同截止时间', field: 'endTime', visible: true, align: 'center', valign: 'middle',width:"120px",'class': 'uitd_showTip'},
-            {title: '入职时间', field: 'entryTime', visible: true, align: 'center', valign: 'middle',width:"80px"},
-            {title: '离职时间', field: 'quitTime', visible: true, align: 'center', valign: 'middle',width:"80px"},
-            {title: '操作', field: 'id', visible: true, align: 'center', valign: 'middle',width:"150px",
-                formatter : function(value,row,index){
+            {field: 'selectItem', checkbox: false, visible: false},
+            {title: '企业名称', field: 'enterpriseName', visible: true, align: 'center', valign: 'middle', width: "120px", 'class': 'uitd_showTip'},
+            {title: '合同起始时间', field: 'startTime', visible: true, align: 'center', valign: 'middle', width: "120px", 'class': 'uitd_showTip'},
+            {title: '合同截止时间', field: 'endTime', visible: true, align: 'center', valign: 'middle', width: "120px", 'class': 'uitd_showTip'},
+            {title: '入职时间', field: 'entryTime', visible: true, align: 'center', valign: 'middle', width: "80px"},
+            {title: '离职时间', field: 'quitTime', visible: true, align: 'center', valign: 'middle', width: "80px"},
+            {title: '操作', field: 'id', visible: true, align: 'center', valign: 'middle', width: "150px",
+                formatter: function (value, row, index) {
                     var html = "";
-                    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>" ;
+                    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>";
                     }
-                    html  = html + "<button type='button' onclick='TalentAllowanceInfoDlg.showLog(\""+value+"\")' style='margin-right: 10px' class='btn btn-xs btn-success'>" +
-                        "<i class=\"fa fa-book\"></i>日志" +
-                        "</button>";
+                    html = html + "<button type='button' onclick='TalentAllowanceInfoDlg.showLog(\"" + value + "\")' style='margin-right: 10px' class='btn btn-xs btn-success'>" +
+                            "<i class=\"fa fa-book\"></i>日志" +
+                            "</button>";
                     return html;
                 }
             }
@@ -86,115 +86,115 @@ TalentAllowanceInfoDlg.initContractColumns = function(){
 TalentAllowanceInfoDlg.initProjectColumns = function (enterpriseId) {
     var process = $("#process").val();
     return [
-        {field: 'selectItem', checkbox:false,visible:false},
-        {title: '核查项目名称', field: 'projectName', visible: true, align: 'center', valign: 'middle',width:"15%",'class': 'uitd_showTip'},
-        {title: '详情', field: 'months', visible: true, align: 'center', valign: 'middle',width:"35%",
-            formatter : function(value,row,index){
-                if(value!=null && value!=''){
+        {field: 'selectItem', checkbox: false, visible: false},
+        {title: '核查项目名称', field: 'projectName', visible: true, align: 'center', valign: 'middle', width: "15%", 'class': 'uitd_showTip'},
+        {title: '详情', field: 'months', visible: true, align: 'center', valign: 'middle', width: "35%",
+            formatter: function (value, row, index) {
+                if (value != null && value != '') {
                     return value;
-                }else if(row.days!=null && row.days!=''){
+                } else if (row.days != null && row.days != '') {
                     return row.days + "天";
-                }else{
+                } else {
                     return "";
                 }
             }
         },
-        {title: '附件材料', field: 'fileUrl', visible: true, align: 'center', valign: 'middle',width:"35%",
-            formatter : function(value,row,index){
-                if(Feng.isNotEmptyStr(value)){
+        {title: '附件材料', field: 'fileUrl', visible: true, align: 'center', valign: 'middle', width: "35%",
+            formatter: function (value, row, index) {
+                if (Feng.isNotEmptyStr(value)) {
                     var sn = value.lastIndexOf(".");
-                    var suffix = value.substring(sn+1,value.length);
+                    var suffix = value.substring(sn + 1, value.length);
                     var imgStr = "";
-                    if(suffix=="pdf"||suffix=="PDF"){
-                        return  "<button type='button'  onclick=\"Feng.showPdf('"+value+"','"+row.id+"','"+row.projectName+"')\" class=\"btn btn-xs btn-danger\"><i class=\"fa fa-file-pdf-o\" aria-hidden=\"true\"></i></button>";
-                    }else if(suffix == "xlsx" || suffix=="XLSX" || suffix == 'xls' || suffix == 'XLS'){
-                        return "<button type='button'  onclick=\"Feng.showExcel('"+value+"','"+row.id+"','"+row.projectName+"')\" class=\"btn btn-xs btn-danger\"><i class=\"fa fa-file-excel-o\" aria-hidden=\"true\"></i></button>";
-                    }else{
-                        return '<img class=\"imgs\"  src=\"'+value+'\" style=\"width:25px;height:25px;\">';
+                    if (suffix == "pdf" || suffix == "PDF") {
+                        return  "<button type='button'  onclick=\"Feng.showPdf('" + value + "','" + row.id + "','" + row.projectName + "')\" class=\"btn btn-xs btn-danger\"><i class=\"fa fa-file-pdf-o\" aria-hidden=\"true\"></i></button>";
+                    } else if (suffix == "xlsx" || suffix == "XLSX" || suffix == 'xls' || suffix == 'XLS') {
+                        return "<button type='button'  onclick=\"Feng.showExcel('" + value + "','" + row.id + "','" + row.projectName + "')\" class=\"btn btn-xs btn-danger\"><i class=\"fa fa-file-excel-o\" aria-hidden=\"true\"></i></button>";
+                    } else {
+                        return '<img class=\"imgs\"  src=\"' + value + '\" style=\"width:25px;height:25px;\">';
                     }
-                }else{
+                } else {
                     return "忽略";
                 }
             }
         },
-        {title: '备注', field: 'description', visible: true, align: 'center', valign: 'middle',width:"25%",'class': 'uitd_showTip'},
-        {title: '操作', field: 'project', visible: true, align: 'left', valign: 'middle',width:"20%",
-            formatter : function(value,row,index){
+        {title: '备注', field: 'description', visible: true, align: 'center', valign: 'middle', width: "25%", 'class': 'uitd_showTip'},
+        {title: '操作', field: 'project', visible: true, align: 'left', valign: 'middle', width: "20%",
+            formatter: function (value, row, index) {
                 var html = "";
-                if (process == 1){
+                if (process == 1) {
                     var companyCode = $("#companyCode").val();
-                    if(companyCode == CONFIG.COM_RSJ || companyCode == CONFIG.COM_IC){
-                        if(value == 1){
-                            html = html + "<button type='button' data-value='"+row.description+"' onclick=\"TalentAllowanceInfoDlg.showEditProjectModal('"+row.project+"','"+row.id+"','"+enterpriseId+"','"+row.months+"','"+row.days+"',this)\" style='margin-left: 5px;'  class=\"btn btn-xs btn-danger\">" +
-                                "<i class=\"fa fa-edit\"></i>修改" +
-                                "</button>" ;
+                    if (companyCode == CONFIG.COM_RSJ || companyCode == CONFIG.COM_IC) {
+                        if (value == 1) {
+                            html = html + "<button type='button' data-value='" + row.description + "' onclick=\"TalentAllowanceInfoDlg.showEditProjectModal('" + row.project + "','" + row.id + "','" + enterpriseId + "','" + row.months + "','" + row.days + "',this)\" style='margin-left: 5px;'  class=\"btn btn-xs btn-danger\">" +
+                                    "<i class=\"fa fa-edit\"></i>修改" +
+                                    "</button>";
                         }
                     }
-                    if((companyCode == CONFIG.COM_SWJ || companyCode == CONFIG.COM_RSJ )&& value==2){
-                        html = html + "<button type='button' data-value='"+row.description+"' onclick=\"TalentAllowanceInfoDlg.showEditProjectModal('"+row.project+"','"+row.id+"','"+enterpriseId+"','"+row.months+"','"+row.days+"',this)\" style='margin-left: 5px;'  class=\"btn btn-xs btn-danger\">" +
-                            "<i class=\"fa fa-edit\"></i>修改" +
-                            "</button>" ;
+                    if ((companyCode == CONFIG.COM_SWJ || companyCode == CONFIG.COM_RSJ) && value == 2) {
+                        html = html + "<button type='button' data-value='" + row.description + "' onclick=\"TalentAllowanceInfoDlg.showEditProjectModal('" + row.project + "','" + row.id + "','" + enterpriseId + "','" + row.months + "','" + row.days + "',this)\" style='margin-left: 5px;'  class=\"btn btn-xs btn-danger\">" +
+                                "<i class=\"fa fa-edit\"></i>修改" +
+                                "</button>";
                     }
                 }
-                if(process==2 && (value==3 || value==4 || value==5 || value==6 || value==7)){
-                    html = html + "<button type='button' data-value='"+row.description+"' onclick=\"TalentAllowanceInfoDlg.showEditProjectModal('"+row.project+"','"+row.id+"','"+enterpriseId+"','"+row.months+"','"+row.days+"',this)\" style='margin-left: 5px;' class=\"btn btn-xs btn-danger\">" +
-                        "<i class=\"fa fa-edit\"></i>修改" +
-                        "</button>" ;
+                if (process == 2 && (value == 3 || value == 4 || value == 5 || value == 6 || value == 7)) {
+                    html = html + "<button type='button' data-value='" + row.description + "' onclick=\"TalentAllowanceInfoDlg.showEditProjectModal('" + row.project + "','" + row.id + "','" + enterpriseId + "','" + row.months + "','" + row.days + "',this)\" style='margin-left: 5px;' class=\"btn btn-xs btn-danger\">" +
+                            "<i class=\"fa fa-edit\"></i>修改" +
+                            "</button>";
                 }
-                if (value == 1 || value ==2){
-                    html = html + "<button type='button' onclick=\"TalentAllowanceInfoDlg.showFileTable('"+row.project+"')\"  style='margin-left: 5px;' class=\"btn btn-xs btn-default\"><i class=\"fa fa-book\"></i>查看附件</button>" ;
+                if (value == 1 || value == 2) {
+                    html = html + "<button type='button' onclick=\"TalentAllowanceInfoDlg.showFileTable('" + row.project + "')\"  style='margin-left: 5px;' class=\"btn btn-xs btn-default\"><i class=\"fa fa-book\"></i>查看附件</button>";
                 }
-                if(Feng.isNotEmptyStr(row.fileUrl)){
-                    html = html + "<button type='button' onclick=\"TalentAllowanceInfoDlg.downloadFileByUrl('"+row.fileUrl+"')\" style='margin-left: 5px;' class=\"btn btn-xs btn-success\"><i class=\"fa fa-download\"></i>下载</button>" ;
+                if (Feng.isNotEmptyStr(row.fileUrl)) {
+                    html = html + "<button type='button' onclick=\"TalentAllowanceInfoDlg.downloadFileByUrl('" + row.fileUrl + "')\" style='margin-left: 5px;' class=\"btn btn-xs btn-success\"><i class=\"fa fa-download\"></i>下载</button>";
                 }
                 html = html +
-                    "<button type='button' onclick='TalentAllowanceInfoDlg.showLog(\""+row.id+"\")'  class='btn btn-xs btn-success' style='margin-left: 5px;'>" +
-                    "<i class=\"fa fa-book\"></i>日志" +
-                    "</button>";
+                        "<button type='button' onclick='TalentAllowanceInfoDlg.showLog(\"" + row.id + "\")'  class='btn btn-xs btn-success' style='margin-left: 5px;'>" +
+                        "<i class=\"fa fa-book\"></i>日志" +
+                        "</button>";
                 return html;
             }
         }
     ];
 }
 
-TalentAllowanceInfoDlg.showFileTable = function(project){
-    var api = (project == 1)?CONFIG.jbt_concat:CONFIG.jbt_tax;
+TalentAllowanceInfoDlg.showFileTable = function (project) {
+    var api = (project == 1) ? CONFIG.jbt_concat : CONFIG.jbt_tax;
     var index = layer.open({
         type: 1,
-        title:"附件材料",
+        title: "附件材料",
         shade: 0,
-        fixed:false,
+        fixed: false,
         content: '<ul class="showImgs" style="padding: 0px 5px 0px 5px;"><li style="width: 80%;font-weight: bold;padding-top: 5px;">附件原名</li><li style="width: 10%;font-weight: bold;padding-top: 5px;">预览</li><li style="width: 10%;font-weight: bold;padding-top: 5px;">操作</li></ul>',
         area: ['50%', '50%'],
         maxmin: true,
         btn: ['<i class="fa fa-eraser"></i>&nbsp;&nbsp;关闭'],
-        success :function (layero, index) {
-            var ajax = new $ax(Feng.ctxPath + "/commmon/api/getTalentFileByApi?api="+api+"&mainId="+$("#id").val(), function (data) {
-                if(data.code==500){
+        success: function (layero, index) {
+            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;
                 }
                 var html = "";
                 var files = data.obj;
-                for(var key in files){
+                for (var key in files) {
                     var sn = files[key].url.lastIndexOf(".");
-                    var suffix = files[key].url.substring(sn+1,files[key].url.length);
+                    var suffix = files[key].url.substring(sn + 1, files[key].url.length);
                     var imgStr = "";
-                    if(suffix=="pdf"||suffix=="PDF"){
-                        imgStr = "<button type='button'  onclick=\"Feng.showPdf('"+files[key].url+"','"+files[key].id+"','"+files[key].orignName+"')\" class=\"btn btn-xs btn-danger\"><i class=\"fa fa-file-pdf-o\" aria-hidden=\"true\"></i></button>";
-                    }else if(suffix == "xlsx" || suffix=="XLSX" || suffix == 'xls' || suffix == 'XLS'){
-                        imgStr = "<button type='button'  onclick=\"Feng.showExcel('"+files[key].url+"','"+files[key].id+"','"+files[key].orignName+"')\" class=\"btn btn-xs btn-danger\"><i class=\"fa fa-file-excel-o\" aria-hidden=\"true\"></i></button>";
-                    }else{
-                        imgStr = '<img class=\"imgUrl\"  src=\"'+files[key].url+'\" style=\"width:25px;height:25px;\">';
+                    if (suffix == "pdf" || suffix == "PDF") {
+                        imgStr = "<button type='button'  onclick=\"Feng.showPdf('" + files[key].url + "','" + files[key].id + "','" + files[key].orignName + "')\" class=\"btn btn-xs btn-danger\"><i class=\"fa fa-file-pdf-o\" aria-hidden=\"true\"></i></button>";
+                    } else if (suffix == "xlsx" || suffix == "XLSX" || suffix == 'xls' || suffix == 'XLS') {
+                        imgStr = "<button type='button'  onclick=\"Feng.showExcel('" + files[key].url + "','" + files[key].id + "','" + files[key].orignName + "')\" class=\"btn btn-xs btn-danger\"><i class=\"fa fa-file-excel-o\" aria-hidden=\"true\"></i></button>";
+                    } else {
+                        imgStr = '<img class=\"imgUrl\"  src=\"' + files[key].url + '\" style=\"width:25px;height:25px;\">';
                     }
-                    html = html + '<li style="display: none">'+files[key].id+'</li>\n'+
-                        '<li style="width: 80%;padding-top: 5px;">'+files[key].orignName+'</li>\n'+
-                        '<li style="width: 10%;">'+imgStr+'</li>\n'+
-                        "<li style='width: 10%;padding-top: 2px;'><button type='button' onclick=\"Feng.downloadFile('"+files[key].id+"',1)\" class=\"btn btn-xs btn-success\"><i class=\"fa fa-download\" aria-hidden=\"true\"></i>下载</button></li>";
+                    html = html + '<li style="display: none">' + files[key].id + '</li>\n' +
+                            '<li style="width: 80%;padding-top: 5px;">' + files[key].orignName + '</li>\n' +
+                            '<li style="width: 10%;">' + imgStr + '</li>\n' +
+                            "<li style='width: 10%;padding-top: 2px;'><button type='button' onclick=\"Feng.downloadFile('" + files[key].id + "',1)\" class=\"btn btn-xs btn-success\"><i class=\"fa fa-download\" aria-hidden=\"true\"></i>下载</button></li>";
                 }
                 $(".showImgs").append(html);
                 $(".showImgs").viewer({
-                    fullscreen:false
+                    fullscreen: false
                 });
             });
             ajax.start();
@@ -208,93 +208,93 @@ TalentAllowanceInfoDlg.showFileTable = function(project){
  */
 TalentAllowanceInfoDlg.initFileTypeColumn = function () {
     return [
-        {field: 'selectItem', checkbox:false,visible:false},
-        {title: '名称', field: 'name', visible: true, align: 'center', valign: 'middle',width:"52%",'class': 'uitd_showTip',
-            formatter : function(value,row,index){
-                if(row.must==1){
-                    return '<i class="fa fa-paste"></i><span style="font-weight:bold;color:red;font-size:14px;font-family:宋体"> * </span> '+ value;
-                }if(row.must==2){
-                    return '<i class="fa fa-paste"></i>'+value;
+        {field: 'selectItem', checkbox: false, visible: false},
+        {title: '名称', field: 'name', visible: true, align: 'center', valign: 'middle', width: "52%", 'class': 'uitd_showTip',
+            formatter: function (value, row, index) {
+                if (row.must == 1) {
+                    return '<i class="fa fa-paste"></i><span style="font-weight:bold;color:red;font-size:14px;font-family:宋体"> * </span> ' + value;
+                }
+                if (row.must == 2) {
+                    return '<i class="fa fa-paste"></i>' + value;
                 }
             }
         },
-        {title: '模板', field: 'templateUrl', visible: true, align: 'center', valign: 'middle',width:"8%",
-            formatter : function(value,row,index){
-                if(value==null||value==''||value=='null'){
+        {title: '模板', field: 'templateUrl', visible: true, align: 'center', valign: 'middle', width: "8%",
+            formatter: function (value, row, index) {
+                if (value == null || value == '' || value == 'null') {
                     return '无';
                 }
-                return "<button type='button' onclick=\"Feng.downloadFile('"+value+"',3)\" style='margin-right: 10px' class=\"btn btn-xs btn-primary\">" +
-                    "<i class=\"fa fa-download\"></i>下载" +
-                    "</button>";
+                return "<button type='button' onclick=\"Feng.downloadFile('" + value + "',3)\" style='margin-right: 10px' class=\"btn btn-xs btn-primary\">" +
+                        "<i class=\"fa fa-download\"></i>下载" +
+                        "</button>";
             }
         },
-        {title: '备注', field: 'description', visible: true, align: 'center', valign: 'middle',width:"40%",'class': 'uitd_showTip'},
+        {title: '备注', field: 'description', visible: true, align: 'center', valign: 'middle', width: "40%", 'class': 'uitd_showTip'},
     ]
 };
 
-TalentAllowanceInfoDlg.initArrangeColumn = function(){
+TalentAllowanceInfoDlg.initArrangeColumn = function () {
     return [
-        {field: 'selectItem', checkbox:false,visible:false},
-        {title: '人才层次', field: 'talentArrangeName', visible: true, align: 'center', valign: 'middle',width:"100px"},
-        {title: '认定条件', field: 'identifyConditionText', visible: true, align: 'center', valign: 'middle',width:"120px",'class': 'uitd_showTip'},
-        {title: '人才证书发证日期', field: 'startTime', visible: true, align: 'center', valign: 'middle',width:"100px"},
-        {title: '人才证书有效期', field: 'endTime', visible: true, align: 'center', valign: 'middle',width:"100px"},
-        {title: '忽略其他条件可享受月份', field: 'prepareMonths', visible: true, align: 'center', valign: 'middle',width:"150px",'class': 'uitd_showTip'},
-        {title: '综合可享受月份', field: 'months', visible: true, align: 'center', valign: 'middle',width:"150px",'class': 'uitd_showTip'},
-        {title: '备注', field: 'description', visible: true, align: 'center', valign: 'middle',width:"150px",'class': 'uitd_showTip'},
-
+        {field: 'selectItem', checkbox: false, visible: false},
+        {title: '人才层次', field: 'talentArrangeName', visible: true, align: 'center', valign: 'middle', width: "100px"},
+        {title: '认定条件', field: 'identifyConditionText', visible: true, align: 'center', valign: 'middle', width: "120px", 'class': 'uitd_showTip'},
+        {title: '人才证书发证日期', field: 'startTime', visible: true, align: 'center', valign: 'middle', width: "100px"},
+        {title: '人才证书有效期', field: 'endTime', visible: true, align: 'center', valign: 'middle', width: "100px"},
+        {title: '忽略其他条件可享受月份', field: 'prepareMonths', visible: true, align: 'center', valign: 'middle', width: "150px", 'class': 'uitd_showTip'},
+        {title: '综合可享受月份', field: 'months', visible: true, align: 'center', valign: 'middle', width: "150px", 'class': 'uitd_showTip'},
+        {title: '备注', field: 'description', visible: true, align: 'center', valign: 'middle', width: "150px", 'class': 'uitd_showTip'},
     ]
 }
 
 
-TalentAllowanceInfoDlg.downloadFileByUrl = function(url){
+TalentAllowanceInfoDlg.downloadFileByUrl = function (url) {
     window.location.href = Feng.ctxPath + "/common/api/downloadByUrl?url=" + url;
 }
 
 TalentAllowanceInfoDlg.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({
+        success: function (layero, index) {
+            $('#' + id).bootstrapTable({
                 url: Feng.ctxPath + "/common/api/getJbtCheckLog",
                 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").val(),"typeFileId":id,"active":1}
+                    return {"type": CONFIG.project_jbt, "mainId": $("#id").val(), "typeFileId": id, "active": 1}
                 },
                 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: true, 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: "45%",
+                                formatter: function (value, row, index) {
+                                    return '<span data-toggle="tooltip" title="' + value + '">"' + value + '"</span>';
+                                }
                             }
-                        },
-                        {title: '操作人', field: 'createUser', visible: true, 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:"45%",
-                            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');
                     });
@@ -305,34 +305,34 @@ TalentAllowanceInfoDlg.showLog = function (id) {
 }
 
 //初始化附件类别表单
-TalentAllowanceInfoDlg.initFileTable = function (){
+TalentAllowanceInfoDlg.initFileTable = function () {
     TalentAllowanceInfoDlg.initContract();
     // Feng.showMiniFileModal(CONFIG.project_jbt,$("#type").val(),$("#id").val());
     var queryData = {};
     queryData['project'] = CONFIG.project_jbt;
     queryData['type'] = $("#type").val();
     $("#fileTable").bootstrapTable({
-        url: Feng.ctxPath + "/common/api/findUnCommonFileType",
+        url: Feng.ctxPath + "/common/api/findCommonFileType",
         method: 'POST',
         contentType: "application/x-www-form-urlencoded; charset=UTF-8",
-        search: false,					// 是否显示表格搜索，此搜索是客户端搜索，不会进服务端
-        showRefresh: false,				// 是否显示刷新按钮
-        clickToSelect: true,			// 是否启用点击选中行
-        singleSelect: true,				// 设置True 将禁止多选
-        striped: true,  				// 是否显示行间隔色
+        search: false, // 是否显示表格搜索，此搜索是客户端搜索，不会进服务端
+        showRefresh: false, // 是否显示刷新按钮
+        clickToSelect: true, // 是否启用点击选中行
+        singleSelect: true, // 设置True 将禁止多选
+        striped: true, // 是否显示行间隔色
         escape: true,
-        pagination: false,   			// 设置为 true 会在表格底部显示分页条
+        pagination: false, // 设置为 true 会在表格底部显示分页条
         paginationHAlign: "left",
         paginationDetailHAlign: "right",
-        sidePagination: "server",   	// 设置在哪里进行分页，可选值为 'client' 或者 'server'
+        sidePagination: "server", // 设置在哪里进行分页，可选值为 'client' 或者 'server'
         showColumns: false,
-        detailView: true,               //是否显示父子表
+        detailView: true, //是否显示父子表
         pageList: [10, 30, 50],
         queryParams: function (params) {
-            return $.extend(queryData,params)
+            return $.extend(queryData, params)
         },
         rowStyle: function (row, index) {
-            return {classes:"info"};
+            return {classes: "info"};
         },
         columns: TalentAllowanceInfoDlg.initFileTypeColumn(),
         onPostBody: function () {
@@ -346,31 +346,31 @@ TalentAllowanceInfoDlg.initFileTable = function (){
         },
         onExpandRow: function (index, row, $detail) {
             var ajax = new $ax(Feng.ctxPath + "/common/api/listTalentFile", function (data) {
-                if(data==null||data.length==0){
+                if (data == null || data.length == 0) {
                     return;
                 }
                 var html = '<ul class="imgs"><li style="width: 80%;font-weight: bold;padding-top: 5px;">附件原名</li><li style="width: 10%;font-weight: bold;padding-top: 5px;">预览</li><li style="width: 10%;font-weight: bold;padding-top: 5px;">操作</li>';
-                for(var key in data){
+                for (var key in data) {
                     var sn = data[key].url.lastIndexOf(".");
-                    var suffix = data[key].url.substring(sn+1,data[key].url.length);
+                    var suffix = data[key].url.substring(sn + 1, data[key].url.length);
                     var imgStr = "";
-                    if(suffix=="pdf"||suffix=="PDF"){
-                        imgStr = "<button type='button'  onclick=\"Feng.showPdf('"+data[key].url+"','"+data[key].id+"','"+data[key].orignName+"')\" class=\"btn btn-xs btn-danger\"><i class=\"fa fa-file-pdf-o\" aria-hidden=\"true\"></i></button>";
-                    }else if(suffix == "xlsx" || suffix=="XLSX" || suffix == 'xls' || suffix == 'XLS'){
-                        imgStr = "<button type='button'  onclick=\"Feng.showExcel('"+data[key].url+"','"+data[key].id+"','"+data[key].orignName+"')\" class=\"btn btn-xs btn-danger\"><i class=\"fa fa-file-excel-o\" aria-hidden=\"true\"></i></button>";
-                    }else{
-                        imgStr = '<img class=\"imgUrl\"  src=\"'+data[key].url+'\" style=\"width:25px;height:25px;\">';
+                    if (suffix == "pdf" || suffix == "PDF") {
+                        imgStr = "<button type='button'  onclick=\"Feng.showPdf('" + data[key].url + "','" + data[key].id + "','" + data[key].orignName + "')\" class=\"btn btn-xs btn-danger\"><i class=\"fa fa-file-pdf-o\" aria-hidden=\"true\"></i></button>";
+                    } else if (suffix == "xlsx" || suffix == "XLSX" || suffix == 'xls' || suffix == 'XLS') {
+                        imgStr = "<button type='button'  onclick=\"Feng.showExcel('" + data[key].url + "','" + data[key].id + "','" + data[key].orignName + "')\" class=\"btn btn-xs btn-danger\"><i class=\"fa fa-file-excel-o\" aria-hidden=\"true\"></i></button>";
+                    } else {
+                        imgStr = '<img class=\"imgUrl\"  src=\"' + data[key].url + '\" style=\"width:25px;height:25px;\">';
                     }
-                    html = html + '<li style="display: none">'+data[key].id+'</li>\n'+
-                        '<li style="width: 80%;padding-top: 5px;">'+data[key].orignName+'</li>\n'+
-                        '<li style="width: 10%;">'+imgStr+'</li>\n'+
-                        "<li style='width: 10%;padding-top: 2px;'><button type='button' onclick=\"Feng.downloadFile('"+data[key].id+"',1)\" class=\"btn btn-xs btn-success\"><i class=\"fa fa-download\" aria-hidden=\"true\"></i>下载</button></li>";
+                    html = html + '<li style="display: none">' + data[key].id + '</li>\n' +
+                            '<li style="width: 80%;padding-top: 5px;">' + data[key].orignName + '</li>\n' +
+                            '<li style="width: 10%;">' + imgStr + '</li>\n' +
+                            "<li style='width: 10%;padding-top: 2px;'><button type='button' onclick=\"Feng.downloadFile('" + data[key].id + "',1)\" class=\"btn btn-xs btn-success\"><i class=\"fa fa-download\" aria-hidden=\"true\"></i>下载</button></li>";
                 }
                 html = html + '</ul>';
                 $detail.html(html);
                 $(".imgs").viewer({
                     // toolbar:false,
-                    fullscreen:false
+                    fullscreen: false
                 });
             }, function (data) {
                 Feng.error("查询失败!" + data.responseJSON.message + "!");
@@ -394,78 +394,63 @@ TalentAllowanceInfoDlg.createCheckHtml = function () {
     switch (process) {
         case '1':
             html =
-                '<form id="checkForm">\n' +
+                    '<form id="checkForm">\n' +
                     '<div class="form-group" style="margin: 10px;">\n' +
-                        '<label for="checkState" class="control-label">审核状态</label>\n' +
-                        '<select class="form-control" id="checkStateModal" onchange="TalentAllowanceInfoDlg.toggleField()">\n' +
-                            '<option value=""></option>\n' +
-                            '<option value="3">审核通过</option>\n' +
-                            '<option value="2">审核驳回</option>\n' +
-                            '<option value="-1">审核不通过</option>\n' +
-                        '</select>\n' +
+                    '<label for="checkState" class="control-label">审核状态</label>\n' +
+                    '<select class="form-control" id="checkStateModal" onchange="TalentAllowanceInfoDlg.toggleField()">\n' +
+                    '<option value=""></option>\n' +
+                    '<option value="3">审核通过</option>\n' +
+                    '<option value="2">审核驳回</option>\n' +
+                    '<option value="-1">审核不通过</option>\n' +
+                    '</select>\n' +
                     '</div>\n' +
                     '<div class="form-group" style="margin: 10px;">\n' +
-                        '<label for="checkMsg" class="control-label">审核意见</label>\n' +
-                        '<textarea class="form-control" id="checkMsg" rows="5"></textarea>\n' +
+                    '<label for="checkMsg" class="control-label">审核意见</label>\n' +
+                    '<textarea class="form-control" id="checkMsg" rows="5"></textarea>\n' +
                     '</div>\n' +
-                    '<div class="form-group" id="field" style="display: none;margin: 10px">\n' ;
+                    '<div class="form-group" id="field" style="display: none;margin: 10px">\n';
             //if(companyCode == CONFIG.COM_RSJ || companyCode == CONFIG.COM_IC){
-                html = html +
-                        '<label for="field_concat" class="control-label">可修改合同时间</label>\n' +
-                        '<div id="field_concat">\n' +
-                        '</div>\n'+
+            html = html +
+                    '<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>'+
+                    '<ul><li style="width: 100%"><input type="checkbox" value="allowanceType"><span>津补贴类型</span></li>\n' +
+                    '<li style="width: 100%"><input type="checkbox" value="wage"><span>上一年度年薪(元)</span></li></ul>\n' +
                     '</div>\n';
             //}
             html = html +
-                        '<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="TalentAllowanceInfoDlg.checkAll(\'field\')">全选</button>\n' +
-                            '<button type="button" class="btn btn-success" onclick="TalentAllowanceInfoDlg.unCheckAll(\'field\')">反选</button>\n' +
-                        '</div>\n' +
-                    '</div>\n'+
-                '</form>';
+                    '<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="TalentAllowanceInfoDlg.checkAll(\'field\')">全选</button>\n' +
+                    '<button type="button" class="btn btn-success" onclick="TalentAllowanceInfoDlg.unCheckAll(\'field\')">反选</button>\n' +
+                    '</div>\n' +
+                    '</div>\n' +
+                    '</form>';
             break;
         case '3':
-            html=
-            '<form id="checkForm">\n' +
-                '<div class="form-group" style="margin: 10px;">\n' +
+            html =
+                    '<form id="checkForm">\n' +
+                    '<div class="form-group" style="margin: 10px;">\n' +
                     '<label for="checkState" class="control-label">审核状态</label>\n' +
                     '<select class="form-control" id="checkStateModal" onchange="TalentAllowanceInfoDlg.toggleField()">\n' +
-                        '<option value=""></option>\n' +
-                        '<option value="3">审核通过</option>\n' +
-                        '<option value="2">审核驳回</option>\n' +
-                        '<option value="-1">审核不通过</option>\n' +
-                    '</select>\n' +
-                '</div>\n' +
-                '<div class="form-group" style="display: none;margin: 10px;" id="toProcessDiv" >\n' +
-                    '<label for="processLable" class=" control-label">驳回至</label>\n' +
-                    '<select class="form-control" id="toProcess" onchange="TalentAllowanceInfoDlg.processChange(this)">\n' +
-                        '<option value="">请选择</option>\n' +
-                        '<option value="1">初级审核</option>\n' +
-                        '<option value="2">走访核查</option>\n' +
+                    '<option value=""></option>\n' +
+                    '<option value="3">审核通过</option>\n' +
+                    '<option value="2">审核驳回</option>\n' +
+                    '<option value="-1">审核不通过</option>\n' +
                     '</select>\n' +
-                '</div>\n' +
-                '<div class="form-group" style="display: none;margin: 10px;" id="toDepDiv" >\n' +
-                    '<label for="processLable" class=" control-label">驳回单位</label>\n' +
-                    '<select class="form-control" id="toDep" multiple>\n' +
-                        '<option value="rsj">人社局</option>\n' +
-                        // '<option value="swj">税务局</option>\n' +
-                        // '<option value="sbj">社保局</option>\n' +
-                    '</select>\n' +
-                '</div>\n'+
-                '<div class="form-group" style="margin: 10px;">\n' +
+                    '</div>\n' +
+                    '<div class="form-group" style="margin: 10px;">\n' +
                     '<label for="checkMsg" class="control-label">审核意见</label>\n' +
                     '<textarea class="form-control" id="checkMsg" rows="5"></textarea>\n' +
-                '</div>\n' +
-            '</form>';
+                    '</div>\n' +
+                    '</form>';
             break;
     }
     return html;
@@ -474,11 +459,11 @@ TalentAllowanceInfoDlg.createCheckHtml = function () {
 
 TalentAllowanceInfoDlg.processChange = function (content) {
     var process = $(content).val();
-    var  checkStateModal = $("#checkStateModal").val();
-    if(process == 1  && checkStateModal == 2){
-        $("#toDepDiv").css("display","block");
-        $('#toDep').chosen({width: '100%',placeholder_text_multiple: '请选择驳回单位'});
-    }else{
-        $("#toDepDiv").css("display","none");
+    var checkStateModal = $("#checkStateModal").val();
+    if (process == 1 && checkStateModal == 2) {
+        $("#toDepDiv").css("display", "block");
+        $('#toDep').chosen({width: '100%', placeholder_text_multiple: '请选择驳回单位'});
+    } else {
+        $("#toDepDiv").css("display", "none");
     }
 }

public/static/modular/talentAllowance/talentAllowanceInfo_select.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;
             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,					// 是否显示表格搜索，此搜索是客户端搜索，不会进服务端
@@ -79,7 +79,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,					// 是否显示表格搜索，此搜索是客户端搜索，不会进服务端
@@ -214,7 +214,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,					// 是否显示表格搜索，此搜索是客户端搜索，不会进服务端
@@ -265,7 +265,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/findCommonFileType",
         method: 'POST',
         contentType: "application/x-www-form-urlencoded; charset=UTF-8",
         search: false,					// 是否显示表格搜索，此搜索是客户端搜索，不会进服务端
@@ -319,7 +319,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

@@ -253,6 +253,8 @@ TalentAllowanceInfoSupple.createColOneAndTwoIC = function(process){
                         return "<span class='label label-success'>上级驳回</span>";
                     }if(value==10){
                         return "<span class='label label-danger'>已驳回</span>";
+                    }if(value==13){
+                        return "<span class='label label-danger'>上级驳回</span>";
                     }if(value == 15 ||value==20 || value==30){
                         return "<span class='label label-primary'>已通过</span>";
                     }

public/static/modular/talentAllowance/talentAllowancePrepare.js

@@ -89,7 +89,7 @@ TalentAllowanceInfo.showPrepareDataModal = function(type){
     }
     $('#prepareTable').bootstrapTable('destroy');
     $('#prepareTable').bootstrapTable({
-        url: Feng.ctxPath + "/talentAllowanceInfo/findTalentAllowanceByPage?type="+type,
+        url: Feng.ctxPath + "/admin/talentAllowance/findTalentAllowanceByPage?type="+type,
         method: 'POST',
         contentType: "application/x-www-form-urlencoded; charset=UTF-8",
         search: false,					// 是否显示表格搜索，此搜索是客户端搜索，不会进服务端
@@ -133,7 +133,7 @@ TalentAllowanceInfo.exportHczx = function(){
     }
     ids = ids.substring(0,ids.length-1);
     var operation = function(){
-        window.location.href = Feng.ctxPath + "/talentAllowanceExportPrepare/exportHczx?ids="+ids;
+        window.location.href = Feng.ctxPath + "/admin/talentAllowance/exportHczx?ids="+ids;
     }
     Feng.confirm("确定导出吗?", operation);
 }
@@ -153,7 +153,7 @@ TalentAllowanceInfo.hczxPass = function(){
     }
     ids = ids.substring(0,ids.length-1);
     var operation = function(){
-        var ajax = new $ax(Feng.ctxPath + "/talentAllowanceInfo/hczxPass", function (data) {
+        var ajax = new $ax(Feng.ctxPath + "/admin/talentAllowance/hczxPass", function (data) {
             if(data.code==200){
                 Feng.success(data.msg);
                 TalentAllowanceInfo.table.refresh();
@@ -186,7 +186,7 @@ TalentAllowanceInfo.publishExportBefore = function(type){
     }
     var operation = function(){
         $("#exportPrepareModal").modal("hide");
-        var url = (type==1)?"/talentAllowanceExportPrepare/exportPublicNotCash?ids="+ids:"/talentAllowanceExportPrepare/exportPublicNeedCash?ids="+ids;
+        var url = (type==1)?"/admin/talentAllowance/exportPublicNotCash?ids="+ids:"/admin/talentAllowance/exportPublicNeedCash?ids="+ids;
         window.location.href = encodeURI(encodeURI(Feng.ctxPath + url));
     }
     Feng.confirm("确定要公示预览吗?", operation);
@@ -375,7 +375,7 @@ TalentAllowanceInfo.showHczxRejectModal = function(){
                     return;
                 }
                 var operation = function(){
-                    var ajax = new $ax(Feng.ctxPath + "/talentAllowanceInfo/hczxReject", function (data) {
+                    var ajax = new $ax(Feng.ctxPath + "/admin/talentAllowance/hczxReject", function (data) {
                         if(data.code==200){
                             Feng.success(data.msg);
                             TalentAllowanceInfo.table.refresh();