更新高教复审判定

app/admin/controller/TalentAllowance.php

@@ -776,13 +776,13 @@ class TalentAllowance extends AdminController {
                         $where[] = ["id", "in", $detailIds];
                         $detailList = \app\common\model\TalentAllowancecontractDetail::where($where)->select()->toArray();
                         $set = [];
-                        if ($params["resAllowanceType"] == 1) {
+                        if ($param["resAllowanceType"] == 1) {
                             $monthsMap = [];
                             for ($i = 0; $i < count($param["details"]); $i++) {
                                 $monthsMap[$param["details"][$i]["id"]] = $param["details"][$i]["months"];
                             }
                             foreach ($detailList as &$detail) {
-                                $months = $monthdsMap[$detail["id"]];
+                                $months = $monthsMap[$detail["id"]];
                                 if (\StrUtil::isNotEmpAndNull($months)) {
                                     $detail["months"] = $months;
                                     $set = array_merge($set, explode(",", $months));
@@ -796,7 +796,7 @@ class TalentAllowance extends AdminController {
                         $old["recommendAllowanceType"] = $param["resAllowanceType"];
                         $old["recommendMonths"] = implode(",", $set);
                         $typeName = "人工判定:津补贴类型(" . (\app\common\state\AllowanceTypeEnum::getTypeName($old["recommendAllowanceType"])) . ");享受月份:" . $old["recommendMonths"] . ";\n";
-                        $old["recommendAllowanceMsg"] = $typeName . "判定说明：\n" . $obj["resAllowanceMsg"] . ";";
+                        $old["recommendAllowanceMsg"] = $typeName . "判定说明：\n" . $old["resAllowanceMsg"] . ";";
                         $arrangeList = $this->calculateAllowance($old, $set, $detailList);
                     }
                     $desc .= "判定结果：" . $typeName;
@@ -1687,7 +1687,23 @@ class TalentAllowance extends AdminController {
             $res["projects"] = $projectList;
             $res["concats"] = $detailList;
             $res["calResult"] = TalentAllowanceApi::validateAllowanceType($id);
+
         }
+
+
+        $detailList = \app\common\model\TalentAllowancecontractDetail::where("mainId", $id)->select()->toArray();
+        $talentTypeMap = DictApi::selectByParentCode("enterprise_tag");
+        $enterpriseMap = \app\common\model\Enterprise::where("type", $this->user["type"])->column("name", "id");
+        foreach ($detailList as &$detail) {
+            $detail["enterpriseName"] = $enterpriseMap[$detail["enterpriseId"]];
+            if (\StrUtil::isNotEmpAndNull($detail["talentType"])) {
+                $detail["talentTypeName"] = $talentTypeMap[$detail["talentType"]];
+            }
+        }
+        $res["detailList"] = $detailList;
+
+
+
         return new Response(Response::SUCCESS, "不在审核范围内", $res);
     }
 

public/static/modular/talentAllowance/talentAllowanceInfo_info_supple.js

@@ -515,6 +515,7 @@ TalentAllowanceInfoDlg.initCommonFileTable = function () {
  * 
  */
 TalentAllowanceInfoDlg.createCheckHtml = function () {
+
     var type = $("#type").val();
     var process = $("#process").val();
     var companyCode = $("#companyCode").val();
@@ -635,6 +636,9 @@ TalentAllowanceInfoDlg.createCheckHtml = function () {
                         '<option value="2">一次性交通补贴</option>\n' +
                         '</select>\n' +
                         '</div>\n' +
+                        '<div class="form-group notPassDiv personDiv" id="setMonths" style="display: none;margin: 10px;">\n' +
+                        '<label for="checkState" class="control-label">享受月份(仅工作津贴填写)</label>\n' +
+                        '</div>\n' +
                         '<div class="form-group notPassDiv personDiv" style="display: none;margin: 10px;">\n' +
                         '<label for="checkState" class="control-label">判定说明</label>\n' +
                         '<textarea type="text" class="form-control" id="resAllowanceMsg" name="resAllowanceMsg"></textarea>\n' +

public/static/modular/talentAllowance/talentAllowanceInfo_public_check.js

@@ -563,7 +563,7 @@ TalentAllowanceInfoDlg.showCheckModal = function () {
                     for (var key in list) {
                         var title = info.type == 1 ? list[key].enterpriseName + "(" + list[key].entryTime + "至" + list[key].quitTime + ")-" + list[key].talentTypeName : list[key].enterpriseName + "(" + list[key].entryTime + "至" + list[key].quitTime + ")";
                         html = html +
-                                '<div class="input-group detailMonths">\n' +
+                                '<div class="input-group   detailMonths">\n' +
                                 '<input type="hidden" class="detailId" value="' + list[key].id + '">' +
                                 '<span class="input-group-addon" title="' + title + '">' + title + '</span>' +
                                 '<input type="text" class="form-control months" >\n' +