增加高教复审功能(人工判定兑现类型)

app/admin/controller/TalentAllowance.php

@@ -208,6 +208,18 @@ class TalentAllowance extends AdminController {
             $newObj["toDep"] = $obj["toDep"];
 
             if ($oldObj["type"] == CommonConst::ENTERPRISE_GJ && $obj["checkState"] == 3) {
+                $typeName = "";
+                $old["recommendAllowanceMsg"] = "";
+                if ($obj["source"] == 1) {            //遵循系统结果
+                    $typeName = "系统判定:津补贴类型(" . (\app\common\state\AllowanceTypeEnum::getTypeName($old["allowanceType"])) . ");享受月份:" . $old["recommendMonths"] . ";\n";
+                    $newObj["recommendAllowanceMsg"] = $typeName . "判定说明：\n" . $newObj["recommendAllowanceMsg"] . ";";
+                } else if ($obj["source"] == 2) {
+                    $newObj["recommendAllowanceType"] = $obj["resAllowanceType"];
+                    $typeName = "人工判定:津补贴类型(" . (\app\common\state\AllowanceTypeEnum::getTypeName($old["recommendAllowanceType"])) . ");\n";
+                    $newObj["recommendAllowanceMsg"] = $typeName . "判定说明：\n" . $obj["resAllowanceMsg"] . ";";
+                }
+
+
                 $newObj["otherEnjoyedMoney"] = $obj["otherEnjoyedMoney"];
                 $newObj["otherEnjoyedDescription"] = $obj["otherEnjoyedDescription"];
             } else {

public/static/modular/talentAllowance/talentAllowanceInfo_info.js

@@ -681,7 +681,7 @@ TalentAllowanceInfoDlg.saveReviewCheck = function () {
                 allowanceMsg = $("#newAllowanceMsg").val();
             }
             var param = {"id": id, "checkState": checkState, "checkMsg": checkMsg, "process": $("#process").val(),
-                "toPorcess": toPorcess, "allowanceType": allowanceType, "allowanceMsg": allowanceMsg, "months": months};
+                "toPorcess": toPorcess, "allowanceType": allowanceType, "allowanceMsg": allowanceMsg, "months": months, "source": $("#source").val(), "resAllowanceType": $("#resAllowanceType").val(), resAllowanceMsg: $("#resAllowanceMsg").val()};
             var checkAjax = new $ax(Feng.ctxPath + "/admin/talentAllowance/reviewCheck", function (res) {
                 if (res.code == 200) {
                     Feng.success(res.msg)
@@ -852,7 +852,7 @@ TalentAllowanceInfoDlg.checkSubmit = function (index) {
     }, function (data) {
         Feng.error("提交审核失败!" + data.responseJSON.message + "!");
     });
-    ajax.setData({"id": id, "checkState": checkState, "checkMsg": checkMsg, "process": $("#process").val(), "projects": projects, "files": files, "concats": concats, "fields": fields, "companyId": $("#companyId").val(), "toProcess": $("#toProcess").val(), "toDep": companyCodes, otherEnjoyedMoney: otherEnjoyedMoney, otherEnjoyedDescription: otherEnjoyedDescription});
+    ajax.setData({"id": id, "checkState": checkState, "checkMsg": checkMsg, "process": $("#process").val(), "projects": projects, "files": files, "concats": concats, "fields": fields, "companyId": $("#companyId").val(), "toProcess": $("#toProcess").val(), "toDep": companyCodes, otherEnjoyedMoney: otherEnjoyedMoney, otherEnjoyedDescription: otherEnjoyedDescription, source: $("#source").val(), resAllowanceType: $("#resAllowanceType").val(), resAllowanceMsg: $("#resAllowanceMsg").val()});
     ajax.start();
 }
 

public/static/modular/talentAllowance/talentAllowanceInfo_info_supple.js

@@ -628,28 +628,23 @@ TalentAllowanceInfoDlg.createCheckHtml = function () {
                         '<label for="checkState" class="control-label">判定类型</label>\n' +
                         '<select class="form-control" id="source" onchange="TalentAllowanceInfoDlg.allowanceTypeChange(this)">\n' +
                             '<option value="">请选择</option>\n' +
-                            '<option value="1">与系统判定一致</option>\n' +
+                            '<option value="1" selected>与系统判定一致</option>\n' +
                             '<option value="2">个人判定</option>\n' +
                         '</select>\n' +
-                        '</div>\n'; +
+                        '</div>\n' +
                         '<div class="form-group notPassDiv personDiv">\n' +
                         '<label for="checkState" class="control-label">津补贴类型</label>\n' +
                         '<select type="text" class="form-control" id="resAllowanceType">\n' +
                             '<option value="">请选择</option>\n' +
-                            '<option value="1">工作津贴</option>\n' +
                             '<option value="2">一次性交通补贴</option>\n' +
-                            '<option value="3">不予兑现</option>\n' +
                         '</select>\n' +
                         '</div>\n' +
-                        '<div class="form-group notPassDiv personDiv" id="setMonths">\n' +
-                        '<label for="checkState" class="control-label">享受月份(仅工作津贴填写)</label>\n' +
-                        '</div>\n' +
-                        '<div class="form-group notPassDiv personDiv" style="display: none">\n' +
+                        '<div class="form-group notPassDiv personDiv">\n' +
                         '<label for="checkState" class="control-label">判定说明</label>\n' +
                         '<textarea type="text" class="form-control" id="resAllowanceMsg" name="resAllowanceMsg"></textarea>\n' +
                         '</div>\n' +
                         '</div>';
-                html += '<div id="otherEnjoyed" style="display:none;"><div class="form-group" style="margin: 10px;">\n' +
+                html += '<div id="otherEnjoyed" ><div class="form-group" style="margin: 10px;">\n' +
                         '<label for="checkState" class="control-label">试算结果</label>\n' +
                         '<textarea type="text" class="form-control" id="calResult" rows="2" readonly></textarea>\n' +
                         '</div>\n' +