增加硕博初审驳回字段修改

app/admin/controller/LivingAllowance.php

@@ -1291,6 +1291,63 @@ class LivingAllowance extends AdminController {
         }
     }
 
+    public function findFieldsAndFiles() {
+        $id = $this->request["id"];
+        $info = \app\common\api\LivingAllowanceApi::getInfoById($id);
+        $responseObj = new \stdClass();
+        if ($info["checkState"] == LaState::LA_FIRST_REJECT) {
+            $where = [];
+            $where[] = ["project", "=", ProjectState::LIVINGALLOWANCE];
+            $where[] = ["active", "=", 1];
+            $where[] = ["type", "=", $info["type"]];
+            $files = \app\common\model\FileType::where($where)->order("sn")->select()->toArray();
+            $responseObj->code = 200;
+            $responseObj->id = $id;
+            $responseObj->fileList = $files;
+            $responseObj->select = [
+                "files" => array_filter(explode(",", $info["files"])),
+                "fields" => array_filter(explode(",", $info["fields"]))
+            ];
+        } else {
+            $responseObj->msg = "不是初审驳回状态不可以编辑驳回内容";
+        }
+        return json($responseObj);
+    }
+
+    /**
+     * 初审-修改驳回字段
+     */
+    public function updateFieldsAndFiles() {
+        $id = $this->request["id"];
+        $fields = array_filter(explode(",", $this->request["fields"]));
+        $files = array_filter(explode(",", $this->request["files"]));
+
+        $info = \app\common\api\LivingAllowanceApi::getInfoById($id);
+        $responseObj = new \stdClass();
+        if ($info["checkState"] == LaState::LA_FIRST_REJECT) {
+            if (!$fields && !$files) {
+                $responseObj->msg = "请选择可修改的字段或附件！";
+                return json($responseObj);
+            }
+            try {
+                //保存驳回字段
+                $updData["id"] = $id;
+                $updData["fields"] = $fields ? implode(",", $fields) : null;
+                $updData["files"] = $files ? implode(",", $files) : null;
+                Db::table("md_living_allowance_info")->save($updData);
+                $responseObj->code = 200;
+                $responseObj->msg = "驳回字段修改成功";
+                return json($responseObj);
+            } catch (\think\db\exception\DbException $e) {
+                $responseObj->msg = $e->getMessage();
+                return json($responseObj);
+            }
+        } else {
+            $responseObj->msg = "不是初审驳回状态不可以编辑驳回内容";
+            return json($responseObj);
+        }
+    }
+
     /**
      * 计算兑现额度
      * @param type $oldInfo

app/admin/view/living_allowance/detail.html

@@ -541,6 +541,7 @@
                         <li style="width:20.5%"><input type="checkbox" value="firstSocialSecurityTime"><span>首次社保缴纳时间</span></li>
                         <li style="width:10%"><input type="checkbox" value="highEducation"><span>最高学历</span></li>
                         <li style="width:10%"><input type="checkbox" value="graduateSchool"><span>毕业院校</span></li>
+                        <li style="width:20.5%"><input type="checkbox" value="studyAbroadTime"><span>学位证书取得时间</span></li>
                         <li style="width:10%"><input type="checkbox" value="major"><span>专业</span></li>
                         <li style="width:10%"><input type="checkbox" value="title"><span>职称</span></li>
                         <li style="width:20.5%"><input type="checkbox"
@@ -554,7 +555,7 @@
                         <li style="width:10%"><input type="checkbox" value="bankAccount"><span>银行账号</span></li>
                         <!--                        <li style="width:31%"><input type="checkbox" value="breakFaith"><span>曾被相关主管部门列为失信个人</span></li>-->
                         <li style="width:20.5%"><input type="checkbox" value="educationAndResume"><span>教育背景及工作简历</span></li>
-                        <li style="width:20.5%"><input type="checkbox" value="mainHonours"><span>主要业绩及取得的荣誉</span></li>
+                        <li style="width:22%"><input type="checkbox" value="mainHonours"><span>主要业绩及取得的荣誉</span></li>
 
                         <li style="width:20.5%"><input type="checkbox" value="socialSecurity"><span>社保缴纳情况</span></li>
                         <li style="width:20.5%"><input type="checkbox" value="personalTax"><span>个税缴纳情况</span></li>

app/admin/view/living_allowance/index.html

@@ -333,6 +333,11 @@
                                 <i class="fa fa-check"></i>&nbsp;审核
                             </button>
                             {/if}
+                            {if condition="chkCommission('/admin/living_allowance/updateFieldsAndFiles','/livingAllowanceInfo/updateFieldsAndFiles')"}
+                            <button type="button" class="btn btn-sm btn-primary " onclick="LivingAllowanceInfo.updateFieldsAndFiles()">
+                                <i class="fa fa-edit"></i>&nbsp;修改驳回字段
+                            </button>
+                            {/if}
                             <button type="button" class="btn btn-sm btn-primary" onclick="LivingAllowanceInfo.setNotPass()">
                                 <i class="fa fa-exclamation-triangle"></i>&nbsp;审核不通过
                             </button>

public/static/modular/master/livingAllowanceInfo/livingAllowanceInfo.js

@@ -419,6 +419,156 @@ LivingAllowanceInfo.openLivingAllowanceInfoDetail = function () {
     }
 };
 
+/**
+ * 修改驳回的字段及附件
+ */
+LivingAllowanceInfo.updateFieldsAndFiles = function () {
+    if (this.check()) {
+        var ajax = new $ax("/admin/living_allowance/findFieldsAndFiles?id=" + LivingAllowanceInfo.seItem.id, function (data) {
+            if (data.code == 200) {
+                layer.open({
+                    type: 1,
+                    id: "neewFieldFormModel",
+                    title: '修改',
+                    area: ['800px', '450px'], //宽高
+                    fix: false, //不固定
+                    shade: 0,
+                    maxmin: true,
+                    content: LivingAllowanceInfo.creatFieldCheckModal(),
+                    btn: ['<i class="fa fa-save"></i>&nbsp;&nbsp;提交', '<i class="fa fa-eraser"></i>&nbsp;&nbsp;关闭'],
+                    btnAlign: 'c',
+                    zIndex: layer.zIndex,
+                    success: function (layero, index) {
+                        var html2 = '';
+                        for (var key in data.fileList) {
+                            html2 = html2 + '<ul><li style="width: 100%"><input type="checkbox" value="' + data.fileList[key].id + '"><span>' + data.fileList[key].name + '</span></li></ul>';
+                        }
+                        $("#firstCheckForm #field_info ul").css("overflow", "hidden");
+                        $("#field_file").css("overflow", "hidden").empty().append(html2);
+                        //$("#field_file").empty().append(html);
+                        if (data.select.fields != null && data.select.fields != '') {
+                            $("#firstCheckForm #field_info li input").each(function () {
+                                if (data.select.fields.indexOf($(this).val()) != -1) {
+                                    this.checked = true;
+                                }
+                            });
+                        }
+                        if (data.select.files != null && data.select.files != '') {
+                            $("#field_file input").each(function () {
+                                if (data.select.files.indexOf($(this).val()) != -1) {
+                                    this.checked = true;
+                                }
+                            });
+                        }
+                    },
+                    yes: function (index, layero) {
+                        LivingAllowanceInfo.submitFieldsAndFiles(index, data.id);
+                    }
+                });
+            } else {
+                Feng.error(data.msg);
+            }
+        }, function (data) {
+            Feng.error("查询失败!" + data.responseJSON.message + "!");
+        });
+        ajax.start();
+    }
+}
+
+/**
+ * 修改提交
+ * @param index
+ * @param id
+ */
+LivingAllowanceInfo.submitFieldsAndFiles = function (index, id) {
+    var fields = '';
+    var files = '';
+    $("#firstCheckForm #field_info li input").each(function (index) {
+        if ($(this).is(":checked")) {
+            fields = fields + $(this).val() + ",";
+        }
+    });
+    $("#field_file li input").each(function (index) {
+        if ($(this).is(":checked")) {
+            files = files + $(this).val() + ",";
+        }
+    });
+    if (fields == '' && files == '') {
+        Feng.info("请选择可修改的字段或附件！");
+        return;
+    }
+    var ajax = new $ax("/admin/living_allowance/updateFieldsAndFiles", function (data) {
+        if (data.code == 200) {
+            layer.close(index);
+            Feng.success(data.msg);
+        } else {
+            Feng.error(data.msg);
+        }
+    }, function (data) {
+        Feng.error("修改失败!" + data.responseJSON.message + "!");
+    });
+    ajax.setData({"id": id, "fields": fields, "files": files})
+    ajax.start();
+}
+
+LivingAllowanceInfo.creatFieldCheckModal = function () {
+    return '<form id="firstCheckForm">\n' +
+            '                    <div class="form-group" style="margin: 10px;">\n' +
+            '                        <div >\n' +
+            '                            <label for="checkMsg" class="control-label">可修改字段</label>\n' +
+            '                            <div id="field_info">\n' +
+            '                                <ul>\n' +
+            '                                    <li style="width:20.5%"><input type="checkbox" value="declareType"><span>申报对象类型</span></li>\n' +
+            '                                    <li style="width:10%"><input type="checkbox" value="introductionMethod"><span>引进方式</span></li>\n' +
+            '                                    <li style="width:10%"><input type="checkbox" value="name"><span>姓名</span></li>\n' +
+            '                                    <li style="width:10%"><input type="checkbox" value="sex"><span>性别</span></li>\n' +
+            '                                    <li style="width:10%"><input type="checkbox" value="birthday"><span>出生日期</span></li>\n' +
+            '                                    <li style="width:20.5%"><input type="checkbox" value="nationality"><span>国籍/地区</span></li>\n' +
+            '                                    <li style="width:10%"><input type="checkbox" value="provinceCode"onchange="LivingAllowanceInfoInfoDlg.fieldCheckd(this)"><span>籍贯省</span></li>\n' +
+            '                                    <li style="width:10%"><input type="checkbox" value="cityCode" onchange="LivingAllowanceInfoInfoDlg.fieldCheckd(this)"><span>籍贯市</span></li>\n' +
+            '                                    <li style="width:10%"><input type="checkbox" value="countyCode"><span>籍贯县</span></li>\n' +
+            '                                    <li style="width:10%"><input type="checkbox" value="nation"><span>民族</span></li>\n' +
+            '                                    <li style="width:10%"><input type="checkbox" value="politics"><span>政治面貌</span></li>\n' +
+            '                                    <li style="width:10%"><input type="checkbox" value="cardType"><span>证件类型</span></li>\n' +
+            '                                    <li style="width:10%"><input type="checkbox" value="idCard"><span>证件号码</span></li>\n' +
+            '                                    <li style="width:20.5%"><input type="checkbox" value="firstInJJTime"><span>首次来晋工作时间</span></li>\n' +
+            '                                    <li style="width:20.5%"><input type="checkbox" value="backJJBusinessTime"><span>返晋创业时间</span></li>\n' +
+            '                                    <li style="width:20.5%"><input type="checkbox" value="entryTime"><span>本单位入职时间</span></li>\n' +
+            '                                    <li style="width:10%"><input type="checkbox" value="post"><span>职务</span></li>\n' +
+            '                                    <li style="width:20.5%"><input type="checkbox" value="startTime"><span>工作合同开始时间</span></li>\n' +
+            '                                    <li style="width:20.5%"><input type="checkbox" value="endTime"><span>工作合同结束时间</span></li>\n' +
+            '                                    <li style="width:20.5%"><input type="checkbox" value="firstSocialSecurityTime"><span>首次社保缴纳时间</span></li>\n' +
+            '                                    <li style="width:10%"><input type="checkbox" value="highEducation"><span>最高学历</span></li>\n' +
+            '                                    <li style="width:10%"><input type="checkbox" value="graduateSchool"><span>毕业院校</span></li>\n' +
+            '                                    <li style="width:20.5%"><input type="checkbox" value="studyAbroadTime"><span>学位证书取得时间</span></li>\n' +
+            '                                    <li style="width:10%"><input type="checkbox" value="major"><span>专业</span></li>\n' +
+            '                                    <li style="width:10%"><input type="checkbox" value="title"><span>职称</span></li>\n' +
+            '                                    <li style="width:20.5%"><input type="checkbox" value="professionalQualifications"><span>国家职业资格</span></li>\n' +
+            '                                    <li style="width:20.5%"><input type="checkbox" value="studyAbroad"><span>是否有留学经历</span></li>\n' +
+            '                                    <li style="width:10%"><input type="checkbox" value="phone"><span>手机号码</span></li>\n' +
+            '                                    <li style="width:10%"><input type="checkbox" value="email"><span>电子邮箱</span></li>\n' +
+            '                                    <li style="width:10%"><input type="checkbox" value="bank"><span>开户银行</span></li>\n' +
+            '                                    <li style="width:20.5%"><input type="checkbox" value="bankNetwork"><span>开户银行网点</span></li>\n' +
+            '                                    <li style="width:10%"><input type="checkbox" value="bankNumber"><span>银行行号</span></li>\n' +
+            '                                    <li style="width:10%"><input type="checkbox" value="bankAccount"><span>银行账号</span></li>\n' +
+            '                                    <li style="width:20.5%"><input type="checkbox" value="educationAndResume"><span>教育背景及工作简历</span></li>\n' +
+            '                                    <li style="width:22%"><input type="checkbox" value="mainHonours"><span>主要业绩及取得的荣誉</span></li>\n' +
+            '                                    <li style="width:20.5%"><input type="checkbox" value="socialSecurity"><span>社保缴纳情况</span></li>\n' +
+            '                                    <li style="width:20.5%"><input type="checkbox" value="personalTax"><span>个税缴纳情况</span></li>\n' +
+            '                                </ul>\n' +
+            '                            </div>\n' +
+            '                            <label for="checkMsg" 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="LivingAllowanceInfo.checkAll()">全选</button>\n' +
+            '                                <button type="button" class="btn btn-success" onclick="LivingAllowanceInfo.unCheckAll()">反选</button>\n' +
+            '                            </div>\n' +
+            '                        </div>\n' +
+            '                    </div>\n' +
+            '                </form>';
+}
+
 /**
  * 显示核查征信驳回模态框
  */