小改

app/admin/view/talent/talentInfo_base_check.html

@@ -59,11 +59,6 @@
                                     <i class="fa fa-download"></i>&nbsp;打包下载
                                 </button>
                             </li>
-                            <li  class="" style="float: right;">
-                                <button type="button" class="btn btn-sm btn-info " onclick="$('.fileTable').bootstrapTable('expandAllRows');" >
-                                    <i class="fa fa-caret-square-o-down"></i>&nbsp;显示附件
-                                </button>
-                            </li>
                         </ul>
                     </div>
                     <div class="tab-content">
@@ -75,6 +70,7 @@
                                         <input type="hidden" name="id" id="id" value="{$info.id}">
                                         <input type="hidden" name="type" id="type" value="1">
                                         <input type="hidden" name="checkState" id="checkState" value="{$info.checkState}">
+                                        <input type="hidden" name="enterprise_tag" id="enterprise_tag" value="{$info.enterpriseTag}">
                                         <table style="width: 100%;border-collapse: collapse;" class="table table-bordered">
                                             <tr>
                                                 <td>

app/admin/view/talent/talentInfo_common_check.html

@@ -59,11 +59,6 @@
                                     <i class="fa fa-download"></i>&nbsp;打包下载
                                 </button>
                             </li>
-                            <li  class="" style="float: right;">
-                                <button type="button" class="btn btn-sm btn-info " onclick="$('#fileTable').bootstrapTable('expandAllRows');" >
-                                    <i class="fa fa-caret-square-o-down"></i>&nbsp;显示附件
-                                </button>
-                            </li>
                         </ul>
                     </div>
                     <div class="tab-content">
@@ -75,6 +70,7 @@
                                         <input type="hidden" name="id" id="id" value="{$info.id}">
                                         <input type="hidden" name="type" id="type" value="1">
                                         <input type="hidden" name="checkState" id="checkState" value="{$info.checkState}">
+                                        <input type="hidden" name="enterprise_tag" id="enterprise_tag" value="{$info.enterpriseTag}">
                                         <table style="width: 100%;border-collapse: collapse;" class="table table-bordered">
                                             <tr>
                                                 <td>

app/enterprise/view/base/first.html

@@ -65,6 +65,7 @@
                                 <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="enterprise_tag" id="enterprise_tag" value="{$row.enterprise.enterpriseTag}">
                                 <input type="file" name="photo" id="photo" style="display: none">
                                 <input type="hidden" name="province_name" id="province_name" value="">
                                 <input type="hidden" name="city_name" id="city_name" value="">

app/enterprise/view/talent/second.html

@@ -62,6 +62,7 @@
                                 <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="enterprise_tag" id="enterprise_tag" value="{$row.enterprise.enterpriseTag}">
                                 <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}">

app/enterprise/view/talent/view.html

@@ -52,7 +52,7 @@
                                                 <input type="hidden" name="id" id="id" value="{$row.id}">
                                                 <input type="hidden" name="type" id="type" value="1">
                                                 <input type="hidden" name="checkState" id="checkState" value="{$row.checkState}">
-                                                <input type="hidden" name="talent_condition" id="talent_condition" value="{$row.talent_condition}">
+                                                <input type="hidden" name="enterprise_tag" id="enterprise_tag" value="{$row.enterpriseTag}">
                                                 <div class="row">
                                                     <div class="col-sm-10">
                                                         <div class="rowGroup col-sm-3">
@@ -336,7 +336,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="talent_condition" value="{$row.talent_condition}">
                                                             <option value="">{$row.talentConditionName}</option>
                                                         </select>
                                                     </div>

public/static/modular/gate/talentBase/talentBase.js

@@ -346,8 +346,8 @@ $(function () {
     //批量加载字典表数据
     var arr = [
         {"name": "nation", "code": "nation"},
-        {"name": "nationality", "code": "nationality"},
-        {"name": "enterprise_tag", "code": "enterprise_tag"}];
+        {"name": "nationality", "code": "nationality"}
+    ];
     Feng.findChildDictBatch(JSON.stringify(arr));
 });
 

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

@@ -7,12 +7,7 @@ var TalentInfoInfoDlg = step == 1 ? {
     talentInfoInfoData: {},
     validateFields: {
         source_county: {validators: {notEmpty: {message: '入选来源县市区不能为空'}}},
-        enterprise_id: {validators: {notEmpty: {message: '所属企业不能为空'}}},
         talent_type: {validators: {notEmpty: {message: '人才类型不能为空'}}},
-        enterprise_tag: {validators: {notEmpty: {message: '单位标签不能为空'}}},
-        enterprise_name: {validators: {notEmpty: {message: '单位名称不能为空'}}},
-        address: {validators: {notEmpty: {message: '所属街道不能为空'}}},
-        industry_field: {validators: {notEmpty: {message: '产业领域不能为空'}}},
         name: {validators: {notEmpty: {message: '姓名不能为空'}}},
         card_type: {validators: {notEmpty: {message: '证件类型不能为空'}}},
         card_number: {
@@ -38,7 +33,6 @@ var TalentInfoInfoDlg = step == 1 ? {
     talentInfoInfoData: {},
     validateFields: {
         apply_year: {validators: {notEmpty: {message: '申报年度不能为空'}}},
-        fst_work_time: {validators: {notEmpty: {message: '首次来晋工作时间不能为空'}}},
         import_way: {validators: {notEmpty: {message: '引进方式不能为空'}}},
         cur_entry_time: {validators: {notEmpty: {message: '本单位入职时间不能为空'}}},
         position: {validators: {notEmpty: {message: '本单位现任职务不能为空'}}},
@@ -395,8 +389,8 @@ TalentInfoInfoDlg.talentTypeChange = function () {
                 $('#talentInfoForm').bootstrapValidator('removeField', "pre_import_type");
             }
             text = $("#fst_work_time").length > 0 ? $("#fst_work_time").prev("label").html().replace(/首次/, "近三年") : "";
-            $("#come_in_jin").length > 0 ? $("#come_in_jin").css('display','table-row') : "";
-            $("#come_in_jin_str").length > 0 ? $("#come_in_jin_str").css('display','table-cell') : "";
+            $("#come_in_jin").length > 0 ? $("#come_in_jin").css('display', 'table-row') : "";
+            $("#come_in_jin_str").length > 0 ? $("#come_in_jin_str").css('display', 'table-cell') : "";
             break;
         case "2":
             TalentInfoInfoDlg.talentTypeOneTwo = true;
@@ -416,8 +410,8 @@ TalentInfoInfoDlg.talentTypeChange = function () {
                 $('#talentInfoForm').bootstrapValidator('removeField', "pre_import_type");
             }
             text = $("#fst_work_time").length > 0 ? $("#fst_work_time").prev("label").html().replace(/近三年/, "首次") : "";
-            $("#come_in_jin").length > 0 ? $("#come_in_jin").css('display','table-row') : "";
-            $("#come_in_jin_str").length > 0 ? $("#come_in_jin_str").css('display','none') : "";
+            $("#come_in_jin").length > 0 ? $("#come_in_jin").css('display', 'table-row') : "";
+            $("#come_in_jin_str").length > 0 ? $("#come_in_jin_str").css('display', 'none') : "";
             break;
         case "3":
             TalentInfoInfoDlg.talentTypeFlag = true;
@@ -433,8 +427,8 @@ TalentInfoInfoDlg.talentTypeChange = function () {
                 $('#talentInfoForm').bootstrapValidator('removeField', "tax_insurance_month");
             }
             text = $("#fst_work_time").length > 0 ? $("#fst_work_time").prev("label").html().replace(/近三年/, "首次") : "";
-            $("#come_in_jin").length > 0 ? $("#come_in_jin").css('display','none') : "";
-            $("#come_in_jin_str").length > 0 ? $("#come_in_jin_str").css('display','none') : "";
+            $("#come_in_jin").length > 0 ? $("#come_in_jin").css('display', 'none') : "";
+            $("#come_in_jin_str").length > 0 ? $("#come_in_jin_str").css('display', 'none') : "";
             break;
         default:
             $("#tipsBlock").css('display', 'none');
@@ -564,7 +558,11 @@ TalentInfoInfoDlg.initFile = function () {
         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 = $("#" + rel).parents(".table").find("table.fileTable").index(".fileTable");
@@ -872,12 +870,7 @@ TalentInfoInfoDlg.__initValidateCondition = function () {
     var step = $("#step").val();
     if (step == 1) {
         $('#talentInfoForm').bootstrapValidator('addField', "source_county", {validators: {notEmpty: {message: '入选来源县市区不能为空'}}});
-        $('#talentInfoForm').bootstrapValidator('addField', "enterprise_id", {validators: {notEmpty: {message: '所属企业不能为空'}}});
         $('#talentInfoForm').bootstrapValidator('addField', "talent_type", {validators: {notEmpty: {message: '人才类型不能为空'}}});
-        $('#talentInfoForm').bootstrapValidator('addField', "enterprise_tag", {validators: {notEmpty: {message: '单位标签不能为空'}}});
-        $('#talentInfoForm').bootstrapValidator('addField', "enterprise_name", {validators: {notEmpty: {message: '单位名称不能为空'}}});
-        $('#talentInfoForm').bootstrapValidator('addField', "address", {validators: {notEmpty: {message: '所属街道不能为空'}}});
-        $('#talentInfoForm').bootstrapValidator('addField', "industry_field", {validators: {notEmpty: {message: '产业领域不能为空'}}});
         $('#talentInfoForm').bootstrapValidator('addField', "name", {validators: {notEmpty: {message: '姓名不能为空'}}});
         $('#talentInfoForm').bootstrapValidator('addField', "card_type", {validators: {notEmpty: {message: '证件类型不能为空'}}});
         $('#talentInfoForm').bootstrapValidator('addField', "card_number", {validators: {notEmpty: {message: '证件号码不能为空'}}});
@@ -890,7 +883,6 @@ TalentInfoInfoDlg.__initValidateCondition = function () {
         $('#talentInfoForm').bootstrapValidator('addField', "politics", {validators: {notEmpty: {message: '政治面貌不能为空'}}});
     } else {
         $('#talentInfoForm').bootstrapValidator('addField', "apply_year", {validators: {notEmpty: {message: '申报年度不能为空'}}});
-        $('#talentInfoForm').bootstrapValidator('addField', "fst_work_time", {validators: {notEmpty: {message: '首次来晋工作时间不能为空'}}});
         $('#talentInfoForm').bootstrapValidator('addField', "import_way", {validators: {notEmpty: {message: '引进方式不能为空'}}});
         $('#talentInfoForm').bootstrapValidator('addField', "cur_entry_time", {validators: {notEmpty: {message: '本单位入职时间不能为空'}}});
         $('#talentInfoForm').bootstrapValidator('addField', "position", {validators: {notEmpty: {message: '本单位现任职务不能为空'}}});
@@ -1000,16 +992,13 @@ $(function () {
     var checkState = $("#checkState").val();
     //批量加载字典表数据
     var arr = [
-        {"name": "enterprise_tag", "code": "enterprise_tag"},
         {"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": "industry_field", "code": "industry_field"},
         {"name": "source", "code": "source"},
-        {"name": "import_way", "code": "import_way"},
-        {"name": "address", "code": "street"}];
+        {"name": "import_way", "code": "import_way"}];
     Feng.findChildDictBatch(JSON.stringify(arr))
     //加载省份
     Feng.addAjaxSelect({

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

@@ -7,12 +7,7 @@ var TalentInfoInfoDlg = step == 1 ? {
     talentInfoInfoData: {},
     validateFields: {
         source_county: {validators: {notEmpty: {message: '入选来源县市区不能为空'}}},
-        enterprise_id: {validators: {notEmpty: {message: '所属企业不能为空'}}},
         talent_type: {validators: {notEmpty: {message: '人才类型不能为空'}}},
-        enterprise_tag: {validators: {notEmpty: {message: '单位标签不能为空'}}},
-        enterprise_name: {validators: {notEmpty: {message: '单位名称不能为空'}}},
-        address: {validators: {notEmpty: {message: '所属街道不能为空'}}},
-        industry_field: {validators: {notEmpty: {message: '产业领域不能为空'}}},
         name: {validators: {notEmpty: {message: '姓名不能为空'}}},
         card_type: {validators: {notEmpty: {message: '证件类型不能为空'}}},
         card_number: {
@@ -38,7 +33,6 @@ var TalentInfoInfoDlg = step == 1 ? {
     talentInfoInfoData: {},
     validateFields: {
         apply_year: {validators: {notEmpty: {message: '申报年度不能为空'}}},
-        fst_work_time: {validators: {notEmpty: {message: '首次来晋工作时间不能为空'}}},
         import_way: {validators: {notEmpty: {message: '引进方式不能为空'}}},
         cur_entry_time: {validators: {notEmpty: {message: '本单位入职时间不能为空'}}},
         position: {validators: {notEmpty: {message: '本单位现任职务不能为空'}}},
@@ -277,7 +271,11 @@ TalentInfoInfoDlg.initFileTable = function () {
         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;
@@ -847,12 +845,7 @@ TalentInfoInfoDlg.__initValidateCondition = function () {
     var step = $("#step").val();
     if (step == 1) {
         $('#talentInfoForm').bootstrapValidator('addField', "source_county", {validators: {notEmpty: {message: '入选来源县市区不能为空'}}});
-        $('#talentInfoForm').bootstrapValidator('addField', "enterprise_id", {validators: {notEmpty: {message: '所属企业不能为空'}}});
         $('#talentInfoForm').bootstrapValidator('addField', "talent_type", {validators: {notEmpty: {message: '人才类型不能为空'}}});
-        $('#talentInfoForm').bootstrapValidator('addField', "enterprise_tag", {validators: {notEmpty: {message: '单位标签不能为空'}}});
-        $('#talentInfoForm').bootstrapValidator('addField', "enterprise_name", {validators: {notEmpty: {message: '单位名称不能为空'}}});
-        $('#talentInfoForm').bootstrapValidator('addField', "address", {validators: {notEmpty: {message: '所属街道不能为空'}}});
-        $('#talentInfoForm').bootstrapValidator('addField', "industry_field", {validators: {notEmpty: {message: '产业领域不能为空'}}});
         $('#talentInfoForm').bootstrapValidator('addField', "name", {validators: {notEmpty: {message: '姓名不能为空'}}});
         $('#talentInfoForm').bootstrapValidator('addField', "card_type", {validators: {notEmpty: {message: '证件类型不能为空'}}});
         $('#talentInfoForm').bootstrapValidator('addField', "card_number", {validators: {notEmpty: {message: '证件号码不能为空'}}});
@@ -865,7 +858,6 @@ TalentInfoInfoDlg.__initValidateCondition = function () {
         $('#talentInfoForm').bootstrapValidator('addField', "politics", {validators: {notEmpty: {message: '政治面貌不能为空'}}});
     } else {
         $('#talentInfoForm').bootstrapValidator('addField', "apply_year", {validators: {notEmpty: {message: '申报年度不能为空'}}});
-        $('#talentInfoForm').bootstrapValidator('addField', "fst_work_time", {validators: {notEmpty: {message: '首次来晋工作时间不能为空'}}});
         $('#talentInfoForm').bootstrapValidator('addField', "import_way", {validators: {notEmpty: {message: '引进方式不能为空'}}});
         $('#talentInfoForm').bootstrapValidator('addField', "cur_entry_time", {validators: {notEmpty: {message: '本单位入职时间不能为空'}}});
         $('#talentInfoForm').bootstrapValidator('addField', "position", {validators: {notEmpty: {message: '本单位现任职务不能为空'}}});

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

@@ -49,7 +49,11 @@ TalentInfoInfoDlg.initFileTable = function () {
         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;

public/static/modular/talentIdentify/talentInfo/talentInfo_common_check.js

@@ -53,7 +53,11 @@ TalentInfoInfoDlg.initFileTable = function () {
         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) {
                 if($("#" + rel).parents(".table").length > 0){