Merge branch 'master' of http://59.57.98.130:3000/jjhc/report

app/admin/view/talent/talentInfo_common_check.html

@@ -290,7 +290,6 @@
                                                 <td>
                                                     <div class="rowGroup">
                                                         <label class="control-label spacing td-label"><span style="color: red">*</span>最高学历</label>
-                                                        <input type="hidden" id="talent_edu" />
                                                         <input type="text" class="form-control" id="highest_degree" name="highest_degree" value="{$info.highestDegreeName}">
                                                     </div>
                                                 </td>

app/enterprise/view/talent/second.html

@@ -282,7 +282,6 @@
                                         <td>
                                             <div class="rowGroup">
                                                 <label class="control-label spacing td-label"><span style="color: red">*</span>最高学历</label>
-                                                <input type="hidden" id="talent_edu" />
                                                 <select class="form-control" id="highest_degree" name="highest_degree" value="{$row.highest_degree}"></select>
                                             </div>
                                         </td>

app/enterprise/view/talent/view.html

@@ -70,7 +70,7 @@
                                                         </div>
                                                         <div class="rowGroup col-sm-3">
                                                             <label class=" control-label spacing"><span style="color: red">*</span>证件号码</span></label>
-                                                            <input class="form-control" id="card_type" name="card_type" value="{$row.card_number}">
+                                                            <input class="form-control" id="card_number" name="card_type" value="{$row.card_number}">
                                                         </div>
                                                         <div class="rowGroup col-sm-3">
                                                             <label class=" control-label spacing"><span style="color: red">*</span>性别</label>                                                            
@@ -205,7 +205,7 @@
                                                     </div>
                                                     <div class="rowGroup col-sm-3">
                                                         <label class="control-label spacing"><span style="color: red">*</span>最高学历</label>
-                                                        <select class="form-control" >
+                                                        <select class="form-control" id="highest_degree">
                                                             <option value="">{$row.highestDegreeName}</option>
                                                         </select>
                                                     </div>

public/static/modular/gate/talentInfo/talentInfo_info.js

@@ -280,10 +280,11 @@ TalentInfoInfoDlg.initFileTable = function () {
         for (var k in data["rows"]) {
             var rel = data["rows"][k].rel;
             if ($("#" + rel).length > 0) {
+                var tableIndex = 0;
                 if ($("#" + rel).parents(".table").length > 0) {
-                    var tableIndex = $("#" + rel).parents(".table").find("table.fileTable").index(".fileTable");
+                    tableIndex = $("#" + rel).parents(".table").find("table.fileTable").index(".fileTable");
                 } else {
-                    var tableIndex = $("#" + rel).parents(".row").next(".row").find("table.fileTable").index(".fileTable");
+                    tableIndex = $("#" + rel).parents(".row").next(".row").find("table.fileTable").index(".fileTable");
                 }
                 data["rows"][k].tableIndex = tableIndex;
                 data["rows"][k].trIndex = datas[tableIndex].length;
@@ -298,7 +299,12 @@ TalentInfoInfoDlg.initFileTable = function () {
                 }
             } else {
                 if (data["rows"][k].isConditionFile) {
-                    var tableIndex = $("#talent_condition").parents(".row").next(".row").find("table.fileTable").index(".fileTable");
+                    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]);//放入人才条件后面的附件表
@@ -424,7 +430,7 @@ TalentInfoInfoDlg.infoCallback = function (data) {
 }
 
 TalentInfoInfoDlg.getLayerCatdByLayer = function () {
-    $("#talent_condition").parents(".row").next(".row").find(".fileTable").find("tbody").html("");
+    $("#talent_condition").parents(".table").find(".fileTable").find("tbody").html("");
     $("#talent_condition").html("<option>---请选择---</option>");
     $("#annual_salary").parents(".rowGroup").css("display", "none");
     $('#talentInfoForm').bootstrapValidator('removeField', "annual_salary");
@@ -444,7 +450,7 @@ TalentInfoInfoDlg.getLayerCatdByLayer = function () {
  * 获取人才认定
  */
 TalentInfoInfoDlg.getIdentifyCondition = function () {
-    $("#talent_condition").parents(".row").next(".row").find(".fileTable").find("tbody").html("");
+    $("#talent_condition").parents(".table").find(".fileTable").find("tbody").html("");
     $("#annual_salary").parents(".rowGroup").css("display", "none");
     $('#talentInfoForm').bootstrapValidator('removeField', "annual_salary");
     var level = $("#talent_arrange").val();
@@ -462,6 +468,9 @@ TalentInfoInfoDlg.getIdentifyCondition = function () {
 
 
 TalentInfoInfoDlg.getIdentifyNeedsFileTypes = function () {
+    $("#talent_condition").parents(".table").find(".fileTable").find("tbody").html("");
+    $("#annual_salary").parents(".rowGroup").css("display", "none");
+    $('#talentInfoForm').bootstrapValidator('removeField', "annual_salary");
     var condition = $("#talent_condition option:selected").val();
     if (condition != "") {
         var ajax = new $ax("/common/api/getTalentCondtionUploadFile", function (data) {

public/static/modular/gate/talentInfo/talentInfo_select.js

@@ -52,7 +52,12 @@ TalentInfoInfoDlg.initFileTable = function () {
         for (var k in data["rows"]) {
             var rel = data["rows"][k].rel;
             if ($("#" + rel).length > 0) {
-                var tableIndex = $("#" + rel).parents(".row").next(".row").find("table.fileTable").index(".fileTable");
+                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]);
@@ -60,14 +65,18 @@ TalentInfoInfoDlg.initFileTable = function () {
                     //指定了选项
                     let selectVal = $("#" + rel).data("value").toString();
                     let options = data["rows"][k].option.split(",");
-                    console.log(selectVal,options)
                     if (options.indexOf(selectVal) == -1) {
                         data["rows"][k].hidden = true;
                     }
                 }
             } else {
                 if (data["rows"][k].isConditionFile) {
-                    var tableIndex = $("#talent_condition").parents(".row").next(".row").find("table.fileTable").index(".fileTable");
+                    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]);//放入人才条件后面的附件表
@@ -101,7 +110,7 @@ TalentInfoInfoDlg.initFileTable = function () {
                             } else if (suffix == "xlsx" || suffix == "XLSX" || suffix == 'xls' || suffix == 'XLS') {
                                 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\"  src=\"' + files[key].url + '\" style=\"width:25px;height:25px;\">';
+                                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\
@@ -151,7 +160,6 @@ $(function () {
     var id = $("#id").val();
     var checkState = $("#checkState").val();
     TalentInfoInfoDlg.initFileTable();
-    $(".ibox-content").viewer({fullscreen: false});
     if (id != null && id != '') {
         //select初始化
         $("select").each(function () {