Merge remote-tracking branch 'origin/master'

app/admin/controller/TalentAllowance.php

@@ -182,13 +182,6 @@ class TalentAllowance extends AdminController {
                 $fileList = array_filter(explode(",", $obj["files"]));
                 $newObj["files"] = implode(",", $fileList);
             }
-            if ($obj["process"] == 1 && $oldObj["type"] == CommonConst::ENTERPRISE_GJ && $obj["checkState"] == 3) {
-                $newObj["otherEnjoyedMoney"] = $obj["otherEnjoyedMoney"];
-                $newObj["otherEnjoyedDescription"] = $obj["otherEnjoyedDescription"];
-            } else {
-                $newObj["otherEnjoyedMoney"] = 0.00;
-                $newObj["otherEnjoyedDescription"] = null;
-            }
             //if (Const.RSJ.equals(checkCompany.getCode())) {
             $newObj["concats"] = $obj["concats"];
             $newObj["fields"] = $obj["fields"];
@@ -197,6 +190,14 @@ class TalentAllowance extends AdminController {
         if ($obj["process"] == 3) {
             $newObj["toProcess"] = $obj["toProcess"];
             $newObj["toDep"] = $obj["toDep"];
+
+            if ($oldObj["type"] == CommonConst::ENTERPRISE_GJ && $obj["checkState"] == 3) {
+                $newObj["otherEnjoyedMoney"] = $obj["otherEnjoyedMoney"];
+                $newObj["otherEnjoyedDescription"] = $obj["otherEnjoyedDescription"];
+            } else {
+                //$newObj["otherEnjoyedMoney"] = 0.00;
+                //$newObj["otherEnjoyedDescription"] = null;
+            }
         }
         TaModel::update($newObj);
         //添加日志

public/static/modular/talentAllowance/talentAllowanceInfo_info.js

@@ -757,7 +757,7 @@ TalentAllowanceInfoDlg.checkSubmit = function (index) {
         Feng.info("请填写审核意见");
         return;
     }
-    if (type == 6 && process == 1 && checkState == 3 && otherEnjoyedMoney != 0 && Feng.isEmptyStr(otherEnjoyedDescription)) {
+    if (type == 6 && process == 3 && checkState == 3 && otherEnjoyedMoney != 0 && Feng.isEmptyStr(otherEnjoyedDescription)) {
         Feng.info("其它补贴金额不为0时需要填写其它补贴金额说明");
         return;
     }

public/static/modular/talentAllowance/talentAllowanceInfo_info_supple.js

@@ -542,7 +542,7 @@ TalentAllowanceInfoDlg.createCheckHtml = function () {
                         '</div>\n' +
                         '<div class="form-group" style="margin: 10px;">\n' +
                         '<label for="checkState" class="control-label">扣除其它补贴</label>\n' +
-                        '<input type="text" class="form-control" id="otherEnjoyedMoney" data-money="0" value="0" onclick="$(this).select()" oninput=TalentAllowanceInfoDlg.cal();>\n' +
+                        '<input type="text" class="form-control" id="otherEnjoyedMoney" readonly data-money="0" value="0" onclick="$(this).select()" oninput=TalentAllowanceInfoDlg.cal();>\n' +
                         '</div>\n' +
                         '<div class="form-group" style="margin: 10px;">\n' +
                         '<label for="checkState" class="control-label">最终补贴</label>\n' +
@@ -550,7 +550,7 @@ TalentAllowanceInfoDlg.createCheckHtml = function () {
                         '</div>\n' +
                         '<div class="form-group" style="margin: 10px;">\n' +
                         '<label for="checkMsg" class="control-label">其它补贴说明</label>\n' +
-                        '<textarea class="form-control" id="otherEnjoyedDescription" rows="5"></textarea>\n' +
+                        '<textarea class="form-control" id="otherEnjoyedDescription" readonly rows="5"></textarea>\n' +
                         '</div></div>\n';
             }
             html += '<div class="form-group" id="field" style="display: none;margin: 10px">\n';
@@ -619,7 +619,7 @@ TalentAllowanceInfoDlg.createCheckHtml = function () {
                         '</div>\n' +
                         '<div class="form-group" style="margin: 10px;">\n' +
                         '<label for="checkState" class="control-label">扣除其它补贴</label>\n' +
-                        '<input type="text" class="form-control" id="otherEnjoyedMoney" readonly data-money="0" value="0" onclick="$(this).select()" oninput=TalentAllowanceInfoDlg.cal();>\n' +
+                        '<input type="text" class="form-control" id="otherEnjoyedMoney" data-money="0" value="0" onclick="$(this).select()" oninput=TalentAllowanceInfoDlg.cal();>\n' +
                         '</div>\n' +
                         '<div class="form-group" style="margin: 10px;">\n' +
                         '<label for="checkState" class="control-label">最终补贴</label>\n' +
@@ -627,7 +627,7 @@ TalentAllowanceInfoDlg.createCheckHtml = function () {
                         '</div>\n' +
                         '<div class="form-group" style="margin: 10px;">\n' +
                         '<label for="checkMsg" class="control-label">其它补贴说明</label>\n' +
-                        '<textarea class="form-control" id="otherEnjoyedDescription" rows="5" readonly></textarea>\n' +
+                        '<textarea class="form-control" id="otherEnjoyedDescription" rows="5"></textarea>\n' +
                         '</div></div>\n';
             }
             html += '</form>';