sugangqiang пре 2 година
родитељ
комит
4ed070fd5e

+ 23 - 10
app/common/controller/Api.php

@@ -216,20 +216,33 @@ class Api extends BaseController {
         $checkState = $param["checkState"];
         $isMix = $param["isMix"] ?: 0;
         $talent_condition = $param["talent_condition"];
-        if (in_array($checkState, [TalentState::BASE_VERIFY_FAIL, 0, TalentState::FST_SAVE, TalentState::FST_SUBMIT, TalentState::BASE_VERIFY_PASS]) && $isMix != 1) {
-            $where[] = ["step", "=", 1]; //只查找人才第一步所需文件
-        } else {
-            $where[] = ["isConditionFile", "<>", 1]; //排除人才条件上传文件
-        }
         $where[] = ["project", "=", $project];
         $where[] = ["active", "=", 1];
         $where[] = ["delete", "=", 0];
         $where[] = ["type", "=", $type];
-        if ($talent_condition && $source == 5) {
-            $condition_info = Db::table("new_talent_condition")->findOrEmpty($talent_condition);
-            if ($condition_info["bindFileTypes"]) {
-                $whr[] = ["id", "in", $condition_info["bindFileTypes"]];
-            }
+        switch ($project) {
+            case 1:
+                if (in_array($checkState, [TalentState::BASE_VERIFY_FAIL, 0, TalentState::FST_SAVE, TalentState::FST_SUBMIT, TalentState::BASE_VERIFY_PASS]) && $isMix != 1) {
+                    $where[] = ["step", "=", 1]; //只查找人才第一步所需文件
+                } else {
+                    $where[] = ["isConditionFile", "<>", 1]; //排除人才条件上传文件
+                }
+                if ($talent_condition && $source == 5) {
+                    $condition_info = Db::table("new_talent_condition")->findOrEmpty($talent_condition);
+                    if ($condition_info["bindFileTypes"]) {
+                        $whr[] = ["id", "in", $condition_info["bindFileTypes"]];
+                    }
+                }
+                break;
+            case 20:
+                $itemId = $param["itemId"];
+                $integral_item = \app\common\api\IntegralItemApi::getOne($itemId);
+                if ($integral_item && $integral_item["fileTypeId"]) {
+                    $where[] = ["id", "in", explode(',', $integral_item["fileTypeId"])];
+                } else {
+                    return json([]);
+                }
+                break;
         }
         if ($whr) {
             $rows = Db::table("new_common_filetype")->whereOr([$where, $whr])->order("must asc")->order("sn " . $order)->select()->toArray();

+ 2 - 2
app/enterprise/view/integral/apply.html

@@ -62,7 +62,6 @@
         text-align:center;
         border-left:1px solid #ddd;
     }
-    #annual_salary{padding-right:32px;}
 </style>
 <div class="ibox float-e-margins">
     <div class="ibox-content">
@@ -75,6 +74,7 @@
                                 <input type="hidden" name="id" id="id" value="{$row.id}"/>
                                 <input type="hidden" name="year" id="year" value="{$year}"/>
                                 <input type="hidden" name="enterprise_id" id="enterpriseId" value="{$row.enterprise.id}"/>
+                                <input type="hidden" name="enterprise_type" id="type" value="{$row.enterprise.type}"/>
                                 <input type="hidden" name="checkState" id="checkState" value="{$row.checkState}"/>
                                 <input type="hidden" name="realState" id="realState" value="{$row.real_state}"/>
                                 <input type="hidden" name="files" id="files" value="{$row.modify_files}"/>
@@ -214,7 +214,7 @@
                                 <input type='hidden' id="tableIndex" name="tableIndex" />
                                 <input type='hidden' id="trIndex" name="trIndex" />
                                 <input type="hidden" name="backName" value="IntegralInfoDlg.callBack"/>
-                                <input type="type" name="type" value="1"/>
+                                <input type="type" name="type" value="20"/>
                             </form>
                             <div class="panel-heading" onclick="$(this).next().toggle()">日志</div>
                             <table id="logTable">

+ 2 - 2
public/static/modular/gate/integral/integral.js

@@ -201,7 +201,7 @@ Integral.showLog = function (id) {
         area: ['80%', '80%'],
         maxmin: true,
         success: function (layero, index) {
-            Feng.getCheckLog(id, {"type": CONFIG.project_rcrd, "mainId": id, "typeFileId": "", "active": 1})
+            Feng.getCheckLog(id, {"type": CONFIG.project_integral_apply, "mainId": id, "typeFileId": "", "active": 1})
         }
     });
 
@@ -288,7 +288,7 @@ Integral.editInfo = function () {
         }, function (data) {
             Feng.error("校验失败!" + data.responseJSON.message + "!");
         });
-        ajax.set("type", CONFIG.project_rcrd);
+        ajax.set("type", CONFIG.project_integral_apply);
         ajax.set("year", Integral.seItem.year);
         ajax.start();
     }

+ 79 - 580
public/static/modular/gate/integral/integralInfo.js

@@ -5,8 +5,6 @@ var locked = false;
 var IntegralInfoDlg = {
     talentInfoInfoData: {},
     validateFields: {
-        source_county: {validators: {notEmpty: {message: '入选来源县市区不能为空'}}},
-        talent_type: {validators: {notEmpty: {message: '人才类型不能为空'}}},
         name: {validators: {notEmpty: {message: '姓名不能为空'}}},
         card_type: {validators: {notEmpty: {message: '证件类型不能为空'}}},
         card_number: {
@@ -18,69 +16,6 @@ var IntegralInfoDlg = {
                 }
             }
         },
-        sex: {validators: {notEmpty: {message: '性别不能为空'}}},
-        birthday: {validators: {notEmpty: {message: '出生日期不能为空'}}},
-        nationality: {validators: {notEmpty: {message: '国籍/地区不能为空'}}},
-        province: {validators: {notEmpty: {message: '户籍省份不能为空'}}},
-        city: {validators: {notEmpty: {message: '户籍市不能为空'}}},
-        nation: {validators: {notEmpty: {message: '民族不能为空'}}},
-        politics: {validators: {notEmpty: {message: '政治面貌不能为空'}}},
-        experience: {validators: {notEmpty: {message: '工作简历不能为空'}}},
-        education: {validators: {notEmpty: {message: '教育背景不能为空'}}},
-        apply_year: {validators: {notEmpty: {message: '申报年度不能为空'}}},
-        import_way: {validators: {notEmpty: {message: '引进方式不能为空'}}},
-        cur_entry_time: {validators: {notEmpty: {message: '本单位入职时间不能为空'}}},
-        position: {validators: {notEmpty: {message: '本单位现任职务不能为空'}}},
-        source: {validators: {notEmpty: {message: '申报来源不能为空'}}},
-        talent_arrange: {validators: {notEmpty: {message: '人才层次不能为空'}}},
-        talent_condition: {validators: {notEmpty: {message: '认定条件不能为空'}}},
-        highest_degree: {validators: {notEmpty: {message: '最高学历不能为空'}}},
-        graduate_school: {validators: {notEmpty: {message: '毕业院校不能为空'}}},
-        major: {validators: {notEmpty: {message: '专业不能为空'}}},
-        bank: {
-            validators: {
-                notEmpty: {
-                    message: '开户银行不能为空'
-                },
-                regexp: {
-                    regexp: /^[\u4e00-\u9fa5]*银行$/,
-                    message: "开户银行格式不正确"
-                }
-            }
-        },
-        bank_number: {
-            validators: {
-                notEmpty: {
-                    message: '银行行号不能为空'
-                },
-                regexp: {
-                    regexp: /^\d+$/,
-                    message: "银行行号格式不正确"
-                }
-            }
-        },
-        bank_branch_name: {
-            validators: {
-                notEmpty: {
-                    message: '开户银行网点不能为空'
-                },
-                regexp: {
-                    regexp: /^[\u4e00-\u9fa5]*银行[\u4e00-\u9fa5]*省?[\u4e00-\u9fa5]+市[\u4e00-\u9fa5]*$/,
-                    message: "开户银行格式不正确"
-                }
-            }
-        },
-        bank_account: {
-            validators: {
-                notEmpty: {
-                    message: '银行账号不能为空'
-                },
-                regexp: {
-                    regexp: /^\d+$/,
-                    message: "银行账号格式不正确"
-                }
-            }
-        },
         phone: {
             validators: {
                 notEmpty: {
@@ -153,65 +88,11 @@ IntegralInfoDlg.collectData = function () {
     this
             .set('id')
             .set('type')
-            .set('talent_type')
-            .set('tax_insurance_month')
-            .set('labor_contract_rangetime')
-            .set('pre_import_type')
-            .set('salary_pay_way')
-            .set('salary_pay_month')
-            .set('enterprise_id')
             .set('name')
-            .set('photo')
             .set('card_type')
             .set('card_number')
-            .set('sex')
-            .set('birthday')
-            .set('nationality')
-            .set('province')
-            .set('city')
-            .set('county')
-            .set('nation')
-            .set('politics')
-            .set('talent_arrange')
-            .set('talent_condition')
-            .set('highest_degree')
-            .set('graduate_school')
-            .set('major')
-            .set('professional')
-            .set('bank')
-            .set('bank_number')
-            .set('bank_branch_name')
-            .set('bank_account')
-            .set('study_abroad')
-            .set('abroad_school')
-            .set('abroad_major')
             .set('phone')
-            .set('email')
-            .set('apply_year')
-            .set('import_way')
-            .set('fst_work_time')
-            .set('cur_entry_time')
-            .set('position')
-            .set('source')
-            .set('fujian_highcert_pubtime')
-            .set('fujian_highcert_exptime')
-            .set('quanzhou_highcert_pubtime')
-            .set('quanzhou_highcert_exptime');
-    if ($("#province").val() != null && $("#province").val() != '') {
-        this.talentInfoInfoData["province_name"] = $("#province").find("option:selected").text();
-    }
-    if ($("#city").val() != null && $("#city").val() != '') {
-        this.talentInfoInfoData["city_name"] = $("#city").find("option:selected").text();
-    }
-    if ($("#county").val() != null && $("#county").val() != '') {
-        this.talentInfoInfoData["county_name"] = $("#county").find("option:selected").text();
-    }
-    if ($("#source_city").val() != null && $("#source_city").val() != '') {
-        this.talentInfoInfoData["source_city_name"] = $("#source_city").find("option:selected").text();
-    }
-    if ($("#source_county").val() != null && $("#source_county").val() != '') {
-        this.talentInfoInfoData["source_county_name"] = $("#source_county").find("option:selected").text();
-    }
+            .set('email');
 }
 
 /**
@@ -253,135 +134,11 @@ IntegralInfoDlg.initFileTypeColumn = function () {
         },
         {title: '操作', field: 'id', visible: true, align: 'center', valign: 'middle', width: "10%",
             formatter: function (value, row, index) {
-                return IntegralInfoDlg.validUploadButton(1, value, '', row.tableIndex, row.trIndex);
+                return IntegralInfoDlg.validUploadButton(1, value, '');
             }
         }
     ]
 };
-IntegralInfoDlg.initFileTable = function () {
-    var ajax = new $ax("/common/api/findCommonFileType", function (data) {
-        if (data == null || data.length == 0) {
-            return;
-        }
-        var datas = new Array();
-        for (var i = 0; i < $(".fileTable").length; i++) {
-            datas.push([]); //创建空的多维数组,等下用来存每个附件表的各自的列
-        }
-        var enterpriseTag = $("#enterprise_tag").val();
-        for (var k in data["rows"]) {
-            if (data["rows"][k].enterprise_tag != "" && data["rows"][k].enterprise_tag != null && data["rows"][k].enterprise_tag.indexOf(enterpriseTag) == -1) {
-                continue;
-            }
-            var rel = data["rows"][k].rel;
-            if ($("#" + rel).length > 0) {
-                var tableIndex = 0;
-                if ($("#" + rel).parents(".table").length > 0) {
-                    tableIndex = $("#" + rel).parents(".table").find("table.fileTable").index(".fileTable");
-                } else {
-                    tableIndex = $("#" + rel).parents(".row").next(".row").find("table.fileTable").index(".fileTable");
-                }
-                data["rows"][k].tableIndex = tableIndex;
-                data["rows"][k].trIndex = datas[tableIndex].length;
-                datas[tableIndex].push(data["rows"][k]);
-                if (data["rows"][k].option) {
-                    //指定了选项
-                    if (rel == "birthday") {
-                        let birthday = parseInt($("#" + rel).val().substring(0, 4));
-                        let currentYear = parseInt(new Date().getFullYear());
-                        let age = currentYear - (isNaN(birthday) ? 0 : birthday);
-                        if (isNaN(birthday) || (!isNaN(birthday) && age < data["rows"][k].option))
-                            data["rows"][k].hidden = true;
-                    } else {
-                        let selectVal = $("#" + rel).data("value").toString();
-                        let options = data["rows"][k].option.split(",");
-                        if (options.indexOf(selectVal) == -1) {
-                            data["rows"][k].hidden = true;
-                        }
-                    }
-                }
-            } else {
-                if (data["rows"][k].isConditionFile) {
-                    var tableIndex = 0;
-                    if ($("#talent_condition").parents(".table").length > 0) {
-                        tableIndex = $("#talent_condition").parents(".table").find("table.fileTable").index(".fileTable");
-                    } else {
-                        tableIndex = $("#talent_condition").parents(".row").next(".row").find("table.fileTable").index(".fileTable");
-                    }
-                    data["rows"][k].tableIndex = tableIndex;
-                    data["rows"][k].trIndex = datas[tableIndex].length;
-                    datas[tableIndex].push(data["rows"][k]); //放入人才条件后面的附件表
-                } else {
-                    var tableIndex = $(".fileTable").length - 1;
-                    data["rows"][k].tableIndex = tableIndex;
-                    data["rows"][k].trIndex = datas[tableIndex].length;
-                    datas[$(".fileTable").length - 1].push(data["rows"][k]); //没有归属,放入最后一个附件表
-                }
-            }
-        }
-        for (var i = 0; i < $(".fileTable").length; i++) {
-            var that = $(".fileTable").eq(i);
-            that.bootstrapTable({
-                columns: IntegralInfoDlg.initFileTypeColumn(),
-                data: datas[i],
-                showHeader: false,
-                rowStyle: function (row, index) {
-                    return {classes: ""};
-                },
-                onPostBody: function (data) {
-                    for (var k in data) {
-                        var files = data[k].files;
-                        var html = '<ul class="imgs"><li style="width: 70%;font-weight: bold;padding-top: 5px;">附件原名</li><li style="width: 10%;font-weight: bold;padding-top: 5px;">预览</li><li style="width: 20%;font-weight: bold;padding-top: 5px;">操作</li>';
-                        for (var key in files) {
-                            var btn = "";
-                            btn = IntegralInfoDlg.validUploadButton(2, data[k].id, files[key].id, i, k);
-                            var sn = files[key].url.lastIndexOf(".");
-                            var suffix = files[key].ext; //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' || suffix == 'docx' || suffix == 'doc' || suffix == 'DOCX' || suffix == 'DOC') {
-                                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\" onclick=\"Feng.showImg(this)\" src=\"' + files[key].url + '\" style=\"width:25px;height:25px;\">';
-                            }
-
-                            html += '<li data-id="' + files[key].id + '">\n\
-                                    <div>' + (data[k].step != 1 ? '<input type="hidden" name="uploadFiles[]" value="' + files[key].id + '">' : "") + '</div>\n' +
-                                    '<div style="width: 70%;">' + files[key].orignName + '</div>\n' +
-                                    '<div style="width: 10%;">' + imgStr + '</div>\n' +
-                                    '<div style="width: 20%;">' + btn + '</div>\n\
-                                    </li>';
-                        }
-                        html = html + '</ul>';
-                        that.find("tr[data-index='" + k + "']").attr("data-rel", data[k]["rel"]);
-                        that.find("tr[data-index='" + k + "']").attr("data-option", data[k]["option"]);
-                        that.find("tr[data-index='" + k + "']").after('<tr class="detail-view"><td colspan="5">' + html + '</td></tr>');
-                        if (typeof data[k].hidden != "undefined") {
-                            that.find("tr[data-index='" + k + "']").css("display", "none");
-                            that.find("tr[data-index='" + k + "']").next("tr.detail-view").css("display", "none");
-                        }
-                    }
-                    $("td.uitd_showTip").bind("mouseover", function () {
-                        var htm = $(this).html();
-                        $(this).webuiPopover({title: '详情', content: htm, trigger: 'hover'}).webuiPopover('show');
-                    });
-                },
-            });
-        }
-    }, function (data) {
-        Feng.error("查询失败!" + data.responseJSON.message + "!");
-    });
-    var queryData = {};
-    queryData["mainId"] = $("#id").val();
-    queryData['project'] = CONFIG.project_rcrd;
-    queryData["source"] = $("#source").val();
-    queryData['type'] = $("#type").val();
-    queryData["talent_condition"] = $("#talent_condition option:selected").val();
-    queryData['checkState'] = $("#checkState").val();
-    queryData['isMix'] = 1;
-    ajax.set(queryData);
-    ajax.start();
-}
 IntegralInfoDlg.addItem = function () {
     var html = '<table style="width:100%;border-collapse: collapse;" class="table table-bordered">' +
             '                             <tr>' +
@@ -432,6 +189,64 @@ IntegralInfoDlg.addItem = function () {
             '                         </table>';
     $("#toolbar").before(html);
 }
+IntegralInfoDlg.changeAndLoadFile = function (table, itemId) {
+    var ajax = new $ax("/common/api/findCommonFileType", function (data) {
+        if (data == null || data.length == 0) {
+            return;
+        }
+        table.bootstrapTable({
+            columns: IntegralInfoDlg.initFileTypeColumn(),
+            data: data.rows,
+            showHeader: false,
+            rowStyle: function (row, index) {
+                return {classes: ""};
+            },
+            onPostBody: function (data) {
+                for (var k in data) {
+                    var files = data[k].files;
+                    var html = '<ul class="imgs"><li style="width: 70%;font-weight: bold;padding-top: 5px;">附件原名</li><li style="width: 10%;font-weight: bold;padding-top: 5px;">预览</li><li style="width: 20%;font-weight: bold;padding-top: 5px;">操作</li>';
+                    for (var key in files) {
+                        var btn = "";
+                        btn = IntegralInfoDlg.validUploadButton(2, data[k].id, files[key].id);
+                        var sn = files[key].url.lastIndexOf(".");
+                        var suffix = files[key].ext; //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' || suffix == 'docx' || suffix == 'doc' || suffix == 'DOCX' || suffix == 'DOC') {
+                            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\" onclick=\"Feng.showImg(this)\" src=\"' + files[key].url + '\" style=\"width:25px;height:25px;\">';
+                        }
+
+                        html += '<li data-id="' + files[key].id + '">\n\
+                                    <div>' + (data[k].step != 1 ? '<input type="hidden" name="uploadFiles[]" value="' + files[key].id + '">' : "") + '</div>\n' +
+                                '<div style="width: 70%;">' + files[key].orignName + '</div>\n' +
+                                '<div style="width: 10%;">' + imgStr + '</div>\n' +
+                                '<div style="width: 20%;">' + btn + '</div>\n\
+                                    </li>';
+                    }
+                    html = html + '</ul>';
+                    table.find("tr[data-index='" + k + "']").after('<tr class="detail-view"><td colspan="5">' + html + '</td></tr>');
+                }
+                $("td.uitd_showTip").bind("mouseover", function () {
+                    var htm = $(this).html();
+                    $(this).webuiPopover({title: '详情', content: htm, trigger: 'hover'}).webuiPopover('show');
+                });
+            },
+        });
+    }, function (data) {
+        Feng.error("查询失败!" + data.responseJSON.message + "!");
+    });
+    var queryData = {};
+    queryData["mainId"] = $("#id").val();
+    queryData['project'] = CONFIG.project_integral_apply;
+    queryData['type'] = $("#type").val();
+    queryData["itemId"] = itemId;
+    queryData['checkState'] = $("#checkState").val();
+    ajax.set(queryData);
+    ajax.start();
+}
 IntegralInfoDlg.deleteItem = function () {
     var len = $("input[name='chk[]']:checked").length;
     if (len == 0) {
@@ -466,11 +281,13 @@ IntegralInfoDlg.onProjectChange = function (obj) {
 }
 IntegralInfoDlg.onItemChange = function (obj) {
     var unit = $(obj).find("option:selected").data("unit");
+    var parent = $(obj).parents("table");
     if (typeof unit != "undefined" && unit) {
-        $(obj).parents("table").find(".unit").html("(" + unit + ")");
+        parent.find(".unit").html("(" + unit + ")");
     } else {
-        $(obj).parents("table").find(".unit").html("");
+        parent.find(".unit").html("");
     }
+    IntegralInfoDlg.changeAndLoadFile(parent.find(".fileTable"), $(obj).val());
 }
 
 /**
@@ -512,202 +329,6 @@ IntegralInfoDlg.infoCallback = function (data) {
     return;
 }
 
-IntegralInfoDlg.getLayerCatdByLayer = function () {
-    $("#talent_condition").parents(".table").find(".fileTable").find("tbody").html("");
-    $("#talent_condition").html("<option>---请选择---</option>");
-    $("#annual_salary").parents("td").css("display", "none");
-    $('#integralInfoForm').bootstrapValidator('removeField', "annual_salary");
-    var level = $("#talent_arrange").val();
-    Feng.addAjaxSelect({
-        "id": "talent_arrange_category",
-        "displayCode": "code",
-        "displayName": "name",
-        "type": "GET",
-        "url": Feng.ctxPath + "/common/api/getLayerCatsByLayer/level/" + level
-    });
-    $("#talent_condition").trigger("chosen:updated");
-}
-
-/**
- * 获取人才认定
- */
-IntegralInfoDlg.getIdentifyCondition = function () {
-    $("#talent_condition").parents(".table").find(".fileTable").find("tbody").html("");
-    $("#annual_salary").parents("td").css("display", "none");
-    $('#integralInfoForm').bootstrapValidator('removeField', "annual_salary");
-    var level = $("#talent_arrange").val();
-    var cat = $("#talent_arrange_category").val();
-    var id = $('#id').val();
-    Feng.addAjaxSelect({
-        "id": "talent_condition",
-        "displayCode": "id",
-        "displayName": "name",
-        "type": "GET",
-        "url": Feng.ctxPath + "/common/api/findIdentifyConditionByLevel/level/" + level + "/cat/" + cat + "/id/" + id
-    });
-    $("#talent_condition").trigger('chosen:updated');
-}
-
-IntegralInfoDlg.getIdentifyNeedsFileTypes = function () {
-    $("#talent_condition").parents(".table").find(".fileTable").find("tbody").html("");
-    $("#annual_salary").parents("td").css("display", "none");
-    $('#integralInfoForm').bootstrapValidator('removeField', "annual_salary");
-    var source = $("#source").val();
-    if (source == "" || typeof source == "undefined") {
-        layer.alert("请先选择申报来源");
-        $("#talent_condition").val("");
-        $("#talent_condition").trigger('chosen:updated');
-        return;
-    }
-    IntegralInfoDlg.ajaxGetConditionFile(source);
-}
-IntegralInfoDlg.ajaxGetConditionFile = function (source) {
-    var condition = $("#talent_condition option:selected").val();
-    if (condition != "") {
-        var ajax = new $ax("/common/api/getTalentCondtionUploadFile", function (data) {
-            if (data == null || data.length == 0) {
-                return;
-            }
-            if (typeof data.info != "undefined" && data.info.isSalary == 1) {
-                $("#annual_salary").parents("td").css("display", "table-cell");
-                $('#integralInfoForm').bootstrapValidator('addField', "annual_salary", {validators: {
-                        notEmpty: {message: '年薪不能放空'},
-                        callback: {
-                            message: "年薪只能填写数字",
-                            callback: function (value, validator) {
-                                if (!isNaN(value) && isFinite(value)) {
-                                    return true;
-                                }
-                                return false;
-                            }
-                        }
-                    }
-                });
-            }
-            if (source != "5") {
-                return;
-            }
-            var conditionFileTable = $("#talent_condition").parents(".table").find(".fileTable");
-            var tableIndex = conditionFileTable.index(".fileTable");
-            var tbody = conditionFileTable.find("tbody");
-            var html = "";
-            for (var key in data.rows) {
-                var filetype = data.rows[key];
-                var name = "";
-                if (filetype.must == 1) {
-                    name = '<i class="fa fa-paste"></i><span style="font-weight:bold;color:red;font-size:14px;font-family:宋体"> * </span> ' + filetype.name;
-                }
-                if (filetype.must == 2) {
-                    name = '<i class="fa fa-paste"></i>' + filetype.name;
-                }
-                var uploadbtn = IntegralInfoDlg.validUploadButton(1, filetype.id, '', tableIndex, key);
-                var templateUrl = '<button type="button" onclick="IntegralInfoDlg.downloadFile("' + filetype.id + '",3)" style="margin-right: 10px" class="btn btn-xs btn-primary">\n\
-<i class=\"fa fa-download\"></i>下载""</button>"';
-                html += '<tr data-index="' + key + '">\n\
-                                <td class="uitd_showTip" style="text-align: center; vertical-align: middle; width: 30%; ">' + name + '</td> \n\
-                                <td style="text-align: center; vertical-align: middle; width: 8%; ">' + (filetype.templateUrl ? templateUrl : "无") + '</td> \n\
-                                <td class="uitd_showTip" style="text-align: center; vertical-align: middle; width: 52%; ">' + filetype.description + '</td> \n\
-                                <td style="text-align: center; vertical-align: middle; width: 10%; ">' + uploadbtn + '</td> </tr></tr>';
-                html += '<tr class="detail-view"><td colspan="5"><ul class="imgs"><li style="width: 70%;font-weight: bold;padding-top: 5px;">附件原名</li><li style="width: 10%;font-weight: bold;padding-top: 5px;">预览</li><li style="width: 20%;font-weight: bold;padding-top: 5px;">操作</li>';
-                for (var k in filetype.files) {
-                    var file = filetype.files[k];
-                    var btn = IntegralInfoDlg.validUploadButton(2, filetype.id, file.id, tableIndex, key);
-                    var sn = file.url.lastIndexOf(".");
-                    var suffix = file.ext; //file.url.substring(sn + 1, file.url.length);
-                    var imgStr = "";
-                    if (suffix == "pdf" || suffix == "PDF") {
-                        imgStr = "<button type='button'  onclick=\"Feng.showPdf('" + file.url + "','" + file.id + "','" + file.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' || suffix == 'docx' || suffix == 'doc' || suffix == 'DOCX' || suffix == 'DOC') {
-                        imgStr = "<button type='button'  onclick=\"Feng.showExcel('" + file.url + "','" + file.id + "','" + file.orignName + "')\" class=\"btn btn-xs btn-danger\"><i class=\"fa fa-file-excel-o\" aria-hidden=\"true\"></i></button>";
-                    } else {
-                        imgStr = '<img class=\"imgUrl\"  onclick=\"Feng.showImg(this)\" src=\"' + file.url + '\" style=\"width:25px;height:25px;\">';
-                    }
-
-                    html += '<li data-id="' + file.id + '">\n\
-                                    <div>' + (filetype.step != 1 ? '<input type="hidden" name="uploadFiles[]" value="' + file.id + '">' : "") + '</div>\n' +
-                            '<div style="width: 80%;">' + file.orignName + '</div>\n' +
-                            '<div style="width: 10%;">' + imgStr + '</div>\n' +
-                            '<div style="width: 10%;">' + btn + '</div>\n\
-                                    </li>';
-                }
-                html += '</ul></td></tr>';
-            }
-            tbody.html(html);
-        }, function (data) {
-            Feng.error("查询失败!" + data.responseJSON.message + "!");
-        });
-        var queryData = {};
-        queryData["mainId"] = $("#id").val();
-        queryData['project'] = CONFIG.project_rcrd;
-        queryData["source"] = source;
-        queryData['type'] = $("#type").val();
-        queryData["talent_condition"] = condition;
-        ajax.set(queryData);
-        ajax.start();
-    }
-}
-
-IntegralInfoDlg.bankChange = function () {
-    var bank = $("#bank").val();
-    if ($.trim(bank) == '中国工商银行') {
-        $("#bank_number").val('102391050013');
-    } else {
-        $("#bank_number").val('');
-    }
-}
-
-IntegralInfoDlg.changeStudyAbroad = function () {
-    var is_abroad = $("#study_abroad").val();
-    if (is_abroad == 1) {
-        $("#abroad_school").parent().css("display", "block");
-        $("#abroad_major").parent().css("display", "block");
-        $('#integralInfoForm').bootstrapValidator('addField', "abroad_school", {validators: {notEmpty: {message: '留学毕业院校不能为空'}}});
-        $('#integralInfoForm').bootstrapValidator('addField', "abroad_major", {validators: {notEmpty: {message: '留学专业不能为空'}}});
-        $("[data-rel='study_abroad']").find("i.fa-paste").after('<span style="font-weight:bold;color:red;font-size:14px;font-family:宋体"> * </span>');
-    } else {
-        $("#abroad_school").val("").parent().css("display", "none");
-        $("#abroad_major").val("").parent().css("display", "none");
-        $('#integralInfoForm').bootstrapValidator('removeField', "abroad_school");
-        $('#integralInfoForm').bootstrapValidator('removeField', "abroad_major");
-        $("[data-rel='study_abroad']").find("i.fa-paste").next("span").remove();
-    }
-}
-/**
- * 加载市
- */
-IntegralInfoDlg.afterSelectProvince = function () {
-    var province = $("#province").val();
-    $("#city").empty();
-    $("#county").empty();
-    if (province == null || province == '') {
-        return;
-    }
-    Feng.addAjaxSelect({
-        "id": "city",
-        "displayCode": "code",
-        "displayName": "name",
-        "type": "GET",
-        "url": Feng.ctxPath + "/common/tool/findCityByProvinceSelect/code/" + province
-    });
-}
-/**
- * 加载县
- */
-IntegralInfoDlg.afterSelectCity = function () {
-    var city = $("#city").val();
-    $("#county").empty();
-    if (city == null || city == '') {
-        return;
-    }
-    Feng.addAjaxSelect({
-        "id": "county",
-        "displayCode": "code",
-        "displayName": "name",
-        "type": "GET",
-        "url": Feng.ctxPath + "/common/tool/findCountyByCitySelect/code/" + city
-    });
-}
-
 //校验是否保存基础信息
 IntegralInfoDlg.validId = function () {
     var id = $("#id").val();
@@ -717,21 +338,25 @@ IntegralInfoDlg.validId = function () {
         $("#fileLi").attr("style", "pointer-events: none");
     }
 }
+var currentTable = null;
+var currentTr = null;
 //选择附件并显示附件名
-IntegralInfoDlg.checkFile = function (content, fileTypeId, fileId, tableIndex, trIndex) {
+IntegralInfoDlg.checkFile = function (content, fileTypeId, fileId) {
+    currentTable = $(content).parents(".fileTable");
+    currentTr = $(content).parents("tr").data("index");
     if (!IntegralInfoDlg.validateIsEdit())
         return;
     $("#upload_file").unbind("change");
     $("#upload_file").change(function () {
         if (!Feng.chkFileInvalid(this.files[0], 5, 10))
             return;
-        IntegralInfoDlg.upload(fileTypeId, fileId, tableIndex, trIndex);
+        IntegralInfoDlg.upload(fileTypeId, fileId);
     });
     $('#upload_file').val("");
     $('#upload_file').click();
 }
 //上传附件
-IntegralInfoDlg.upload = function (fileTypeId, fileId, tableIndex, trIndex) {
+IntegralInfoDlg.upload = function (fileTypeId, fileId) {
     var id = $("#id").val();
     if (!IntegralInfoDlg.validateIsEdit())
         return;
@@ -742,8 +367,6 @@ IntegralInfoDlg.upload = function (fileTypeId, fileId, tableIndex, trIndex) {
     }
     $("#mainId").val(id);
     $("#fileTypeId").val(fileTypeId);
-    $("#tableIndex").val(tableIndex);
-    $("#trIndex").val(trIndex);
     var index = layer.load(0, {shade: false, time: 0});
     $("#index").val(index);
     $("#uploadForm").submit();
@@ -803,25 +426,10 @@ IntegralInfoDlg.submitToCheck = function () {
             return;
         }
         locked = true;
-        $("#integralInfoForm").attr("action", "/enterprise/talent/submitToCheck");
+        $("#integralInfoForm").attr("action", "/enterprise/integral/submitToCheck");
         $("#integralInfoForm")[0].submit();
-        return;
-        var ajax = new $ax(Feng.ctxPath + "/enterprise/talent/submit", function (data) {
-            if (data.code == 200) {
-                Feng.success(data.msg);
-                // $("#checkState").val(data.obj);
-                window.parent.TalentInfo.table.refresh();
-                IntegralInfoDlg.close();
-            } else {
-                Feng.error(data.msg);
-            }
-        }, function (data) {
-            Feng.error("提交审核失败!" + data.responseJSON.message + "!");
-        });
-        ajax.set("id", id);
-        ajax.start();
     }
-    Feng.confirm("请确认基础信息已核对无误,相应附件已上传,一旦提交,无法修改", operation);
+    Feng.confirm("请确认积分申报内容已核对无误,相应附件已上传,一旦提交,无法修改", operation);
 }
 //回调
 IntegralInfoDlg.submitCallback = function (data) {
@@ -869,7 +477,7 @@ IntegralInfoDlg.validateIsEdit = function () {
  * @param row
  * @returns {string}
  */
-IntegralInfoDlg.validUploadButton = function (type, fileTypeId, fileId, tableIndex, trIndex) {
+IntegralInfoDlg.validUploadButton = function (type, fileTypeId, fileId) {
     var files = $("#files").val();
     files = files.split(",");
     var checkState = $("#checkState").val();
@@ -877,11 +485,11 @@ IntegralInfoDlg.validUploadButton = function (type, fileTypeId, fileId, tableInd
     //console.log(checkState, realState);
     if (Feng.isEmptyStr(checkState) || checkState == 0 || (checkState == 8 && realState == 8) || (checkState == 11 && realState != 14) || (realState == 11 && files.indexOf(fileTypeId.toString()) != -1)) {
         if (type == 1) {          //上传
-            return "<button type='button' onclick=\"IntegralInfoDlg.checkFile(this," + fileTypeId + "," + null + "," + tableIndex + "," + trIndex + ")\" style='margin-right: 10px' class=\"btn btn-xs btn-info\">" +
+            return "<button type='button' onclick=\"IntegralInfoDlg.checkFile(this," + fileTypeId + "," + null + ")\" style='margin-right: 10px' class=\"btn btn-xs btn-info\">" +
                     "<i class=\"fa fa-upload\"></i>上传" +
                     "</button>";
         } else {
-            return "<button type=\'button\' onclick=\"IntegralInfoDlg.checkFile(this," + fileTypeId + "," + fileId + "," + tableIndex + "," + trIndex + ")\" style=\'margin-right: 10px\' class=\"btn btn-xs btn-info\">" +
+            return "<button type=\'button\' onclick=\"IntegralInfoDlg.checkFile(this," + fileTypeId + "," + fileId + ")\" style=\'margin-right: 10px\' class=\"btn btn-xs btn-info\">" +
                     "<i class=\"fa fa-paste\"></i>修改" +
                     "</button>" +
                     "<button type='button' onclick=\"IntegralInfoDlg.deleteFile(" + fileId + ")\" class=\"btn btn-xs btn-danger\">" +
@@ -899,8 +507,6 @@ IntegralInfoDlg.callBack = function (data) {
     layer.close(data.obj);
     Feng.info(data.msg);
     if (data.code == 200) {
-        var tableIndex = $("#tableIndex").val();
-        var trIndex = $("#trIndex").val();
         var sn = data.info.lastIndexOf(".");
         var suffix = data.ext; //data.info.substring(sn + 1, data.info.length);
         var imgStr = "";
@@ -921,10 +527,10 @@ IntegralInfoDlg.callBack = function (data) {
 <div style="width: 70%;">' + data.orignName + '</div>\n\
 <div style="width: 10%;">' + imgStr + '</div>\n\
 <div style="width: 20%;">\n\
-<button type="button" onclick="IntegralInfoDlg.checkFile(this,' + data.typeId + ',' + data.id + ',' + tableIndex + ',' + trIndex + ')" style="margin-right: 10px" class="btn btn-xs btn-info"><i class="fa fa-paste"></i>修改</button>\n\
+<button type="button" onclick="IntegralInfoDlg.checkFile(this,' + data.typeId + ',' + data.id + ')" style="margin-right: 10px" class="btn btn-xs btn-info"><i class="fa fa-paste"></i>修改</button>\n\
 <button type="button" onclick="IntegralInfoDlg.deleteFile(' + data.id + ')" class="btn btn-xs btn-danger"><i class="fa fa-times"></i>删除</button>\n\
 </div></li></ul>';
-            $(".fileTable").eq(tableIndex).find("tr[data-index='" + trIndex + "']").next("tr.detail-view").find(".imgs").append(html);
+            $(currentTable).find("tr[data-index='" + currentTr + "']").next("tr.detail-view").find(".imgs").append(html);
         }
     }
 }
@@ -961,51 +567,10 @@ IntegralInfoDlg.setNoChangeField = function () {
         }
     }
 }
-$("#card_type").change(function () {
-    async_padding($("#card_number").val().trim(), $(this).val());
-})
-$("#card_number").blur(function () {
-    async_padding($(this).val().trim(), $("#card_type").val());
-})
-function async_padding(card_number, card_type) {
-    if (card_number != "" && card_number.length == 18 && card_type == "1") {
-        var year = card_number.substring(6, 10);
-        var month = card_number.substring(10, 12);
-        var day = card_number.substring(12, 14);
-        var birthday = year + "-" + month + "-" + day;
-        var rule = /\d{4}-\d{2}-\d{2}/;
-        if (rule.test(birthday))
-            $("#birthday").val(birthday);
-        var num = card_number.substring(17, 1);
-        if (num % 2 == 0) {
-            $("#sex").val(2);
-        } else {
-            $("#sex").val(1);
-        }
-    }
-}
 $(function () {
 //Feng.initValidatorTip("integralInfoForm", IntegralInfoDlg.validateFields);
     var id = $("#id").val();
     var checkState = $("#checkState").val();
-    //批量加载字典表数据
-    var arr = [
-        {"name": "nation", "code": "nation"},
-        {"name": "talent_arrange", "code": "talent_arrange"},
-        {"name": "nationality", "code": "nationality"},
-        {"name": "politics", "code": "politics"},
-        {"name": "highest_degree", "code": "highest_degree"},
-        {"name": "source", "code": "source"},
-        {"name": "import_way", "code": "import_way"}];
-    Feng.findChildDictBatch(JSON.stringify(arr))
-    //加载省份
-    Feng.addAjaxSelect({
-        "id": "province",
-        "displayCode": "code",
-        "displayName": "name",
-        "type": "GET",
-        "url": "/common/tool/getProvinceSelect"
-    });
     //批量加载时间控件
     $(".date").each(function () {
         laydate.render({
@@ -1035,77 +600,11 @@ $(function () {
         $("select").each(function () {
             $(this).val($(this).attr("value")).trigger("change");
         });
-        Feng.getCheckLog("logTable", {"type": CONFIG.project_rcrd, "mainId": id, "typeFileId": "", "active": 1})
+        Feng.getCheckLog("logTable", {"type": CONFIG.project_integral_apply, "mainId": id, "typeFileId": "", "active": 1})
     }
-    $("#talent_type").val($("#talent_type").attr("value"));
     $("#card_type").val($("#card_type").attr("value"));
-    $("#sex").val($("#sex").attr("value"));
-    $("#enterprise_tag").val($("#enterprise_tag").attr("value"));
-    $("#address").val($("#address").attr("value"));
-    $("#nation").val($("#nation").attr("value"));
-    $("#nationality").val($("#nationality").attr("value"));
-    $("#industry_field").val($("#industry_field").attr("value"));
-    $("#province").val($("#province").attr("value"));
-    IntegralInfoDlg.afterSelectProvince();
-    $("#city").val($("#city").attr("value"));
-    IntegralInfoDlg.afterSelectCity();
-    $("#county").val($("#county").attr("value"));
-    IntegralInfoDlg.getIdentifyCondition();
-    $("#politics").val($("#politics").attr("value"));
-    $("#tax_insurance_month").val($("#tax_insurance_month").attr("value"));
-    $("#labor_contract_rangetime").val($("#labor_contract_rangetime").attr("value"));
-    $("#source_batch").val($("#source_batch").attr("value"));
-    $("#source_city").val($("#source_city").attr("value"));
-    $("#source_county").val($("#source_county").attr("value"));
-    $("#quanzhou_highcert_pubtime").val($("#quanzhou_highcert_pubtime").attr("value"));
-    $("#quanzhou_highcert_exptime").val($("#quanzhou_highcert_exptime").attr("value"));
-    $("#fujian_highcert_pubtime").val($("#fujian_highcert_pubtime").attr("value"));
-    $("#fujian_highcert_exptime").val($("#fujian_highcert_exptime").attr("value"));
-    $("#talent_arrange").val($("#talent_arrange").attr("value"));
-    IntegralInfoDlg.getLayerCatdByLayer();
-    $("#talent_arrange_category").val($("#talent_arrange_category").attr("value"));
-    IntegralInfoDlg.getIdentifyCondition();
     IntegralInfoDlg.validId();
-    $("#photo").change(function (e) {
-        var tag = e.target;
-        var file = tag.files[0];
-        var imgSrc;
-        var reader = new FileReader();
-        reader.readAsDataURL(file);
-        reader.onload = function () {
-            imgSrc = this.result;
-            $("#photoImg").attr("src", imgSrc);
-        };
-    });
     IntegralInfoDlg.setNoChangeField();
-    $("#talent_condition").on('chosen:ready', function (e, params) {
-        $(".chosen-container-single .chosen-single").css("padding", "4px 0px 0px 4px");
-    });
-    $("#talent_condition").val($("#talent_condition").attr("value"));
-    $("#talent_condition").chosen({
-        search_contains: true,       //关键字模糊搜索。设置为true,只要选项包含搜索词就会显示;设置为false,则要求从选项开头开始匹配
-        disable_search: false,
-        width: "100%",
-        enable_split_word_search: true,
-        rtl: true
-    });
-    if ($("#annual_salary").val() != "") {
-        $("#annual_salary").parents("td").css("display", "table-cell");
-        $('#integralInfoForm').bootstrapValidator('addField', "annual_salary", {validators: {
-                notEmpty: {message: '年薪不能放空'},
-                callback: {
-                    message: "年薪只能填写数字",
-                    callback: function (value, validator) {
-                        if (!isNaN(value) && isFinite(value)) {
-                            return true;
-                        }
-                        return false;
-                    }
-                }
-            }
-        });
-    }
-    IntegralInfoDlg.initFileTable();
 });