提交一些页面修改

app/admin/view/file_type/edit.html

@@ -2,7 +2,7 @@
 {block name="content"}
 <div class="ibox float-e-margins">
     <div class="ibox-content">
-        <form id="unCommonFiletypeForm" action="/admin/filetype/edit" method="post" enctype="multipart/form-data" target="hiddenIframe">
+        <form id="unCommonFiletypeForm" action="/admin/file_type/edit" method="post" enctype="multipart/form-data" target="hiddenIframe">
             <div class="form-horizontal">
                 <div class="row">
                     <input id="id" name="id" type="hidden" value="{$info.id}" underline="false"/>

app/admin/view/talent/talentInfo_base_check.html

@@ -196,12 +196,12 @@
                                                     {if condition="in_array($info['talent_type'],[1,2])"}
                                                     <div class="rowGroup">
                                                         <label class=" control-label spacing td-label"><span style="color: red">*</span>在我市缴交社会保险或个人所得税月份</label>
-                                                        <input type="text" class="form-control rangedate" id="tax_insurance_month" name="tax_insurance_month" value="{$row.tax_insurance_month}"/>
+                                                        <input type="text" class="form-control rangedate" id="tax_insurance_month" name="tax_insurance_month" value="{$info.tax_insurance_month}"/>
                                                     </div>
                                                     {else/}
                                                     <div class="rowGroup">
                                                         <label class=" control-label spacing td-label"><span style="color: red">*</span>劳动合同起止时间</label>
-                                                        <input type="text" class="form-control rangedate" id="labor_contract_rangetime" name="labor_contract_rangetime" value="{$row.labor_contract_rangetime}" />
+                                                        <input type="text" class="form-control rangedate" id="labor_contract_rangetime" name="labor_contract_rangetime" value="{$info.labor_contract_rangetime}" />
                                                     </div>
                                                     {/if}
 

app/admin/view/talent/talentInfo_common_check.html

@@ -205,92 +205,127 @@
                                 <div class="panel panel-default">
                                     <div class="panel-heading" onclick="$(this).next().toggle()">人才认定申请</div>
                                     <div class="panel-body">
-                                        <div class="col-sm-12 form-group-sm">
-                                            <div class="row">
-                                                <div class="col-sm-10">                          
-                                                    <div class="rowGroup col-sm-3">
-                                                        <label class=" control-label spacing"><span style="color: red">*</span>申报年度</label>
+                                        <table style="width: 100%;border-collapse: collapse;" class="table table-bordered">
+                                            <tr>
+                                                <td>
+                                                    <div class="rowGroup">
+                                                        <label class=" control-label spacing td-label"><span style="color: red">*</span>申报年度</label>
                                                         <input type="text" class="form-control" name="apply_year" id="apply_year" value="{$info.apply_year}" readonly disabled>
                                                     </div>
-                                                    <div class="rowGroup col-sm-3">
-                                                        <label class="control-label spacing"><span style="color: red">*</span>首次来晋工作时间</label>
-                                                        <input type="text" class="form-control date" id="fst_work_time" value="{$info.fst_work_time}"/>
-                                                    </div>
-                                                    <div class="rowGroup col-sm-3">
-                                                        <label class="control-label spacing"><span style="color: red">*</span>手机号码</label>
+                                                </td>
+                                                <td>
+                                                    <div class="rowGroup">
+                                                        <label class="control-label spacing td-label"><span style="color: red">*</span>手机号码</label>
                                                         <input type="text" class="form-control" id="phone" value="{$info.phone}" maxlength="11"/>
                                                     </div>
-                                                    <div class="rowGroup col-sm-3">
-                                                        <label class="control-label spacing"><span style="color: red">*</span>电子邮箱</label>
+                                                </td>
+                                                <td>
+                                                    <div class="rowGroup">
+                                                        <label class="control-label spacing td-label"><span style="color: red">*</span>电子邮箱</label>
                                                         <input type="text" class="form-control" id="email" value="{$info.email}"/>
                                                     </div>
-                                                    <div class="rowGroup col-sm-3">
-                                                        <label class="control-label spacing"><span style="color: red">*</span>最高学历</label>
-                                                        <select class="form-control" id="highest_degree">
-                                                            <option value="">{$info.highestDegreeName}</option>
-                                                        </select>
+                                                </td>
+                                                <td rowspan="3" style="width: 300%">
+                                                    <table class="fileTable"></table>
+                                                </td>
+                                            </tr>
+                                            <tr>
+                                                <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>
-                                                    <div class="rowGroup col-sm-3">
-                                                        <label class="control-label spacing"><span style="color: red">*</span>毕业院校</label>
+                                                </td>
+                                                <td>
+                                                    <div class="rowGroup">
+                                                        <label class="control-label spacing td-label"><span style="color: red">*</span>毕业院校</label>
                                                         <input type="text" class="form-control" id="graduate_school" value="{$info.graduate_school}">
                                                     </div>
-                                                    <div class="rowGroup col-sm-3">
-                                                        <label class="control-label spacing"><span style="color: red">*</span>专业</label>
+                                                </td>
+                                                <td>
+                                                    <div class="rowGroup">
+                                                        <label class="control-label spacing td-label"><span style="color: red">*</span>专业</label>
                                                         <input type="text" class="form-control" id="major" value="{$info.major}"/>
                                                     </div>
-                                                    <div class="rowGroup col-sm-3">
-                                                        <label class="control-label spacing">是否有留学经历</label>
-                                                        <select class="form-control" id="study_abroad" >
-                                                            <option value="">{eq name="study_abroad" value="2"}否{else/}是{/eq}</option>
-                                                        </select>
-                                                    </div>                                                
-                                                    {if condition="$info['abroad_school']"}   
-                                                    <div class="rowGroup col-sm-3 abroad_need_this">
-                                                        <label class="control-label spacing"><span style="color: red">*</span>毕业院校</label>
+                                                </td>
+                                            </tr>
+                                            <tr>
+                                                <td>
+                                                    <div class="rowGroup">
+                                                        <label class="control-label spacing td-label">是否有留学经历</label>
+                                                        <input type="text" class="form-control" id="study_abroad" name="study_abroad" value="{eq name='study_abroad' value='2'}否{else/}是{/eq}"/>
+                                                    </div>
+                                                </td>
+                                                <td>
+                                                    {if condition="$info['abroad_school']"}
+                                                    <div class="rowGroup abroad_need_this">
+                                                        <label class="control-label spacing td-label"><span style="color: red">*</span>毕业院校</label>
                                                         <input type="text" class="form-control" id="abroad_school" value="{$info.abroad_school}" maxlength="11"/>
                                                     </div>
-                                                    {/if}                                                
-                                                    {if condition="$info['abroad_major']"}   
-                                                    <div class="rowGroup col-sm-3 abroad_need_this">
-                                                        <label class="control-label spacing"><span style="color: red">*</span>专业</label>
+                                                    {/if}
+                                                </td>
+                                                <td>
+                                                    {if condition="$info['abroad_major']"}
+                                                    <div class="rowGroup abroad_need_this">
+                                                        <label class="control-label spacing td-label"><span style="color: red">*</span>专业</label>
                                                         <input type="text" class="form-control" id="abroad_major" value="{$info.abroad_major}" maxlength="11"/>
                                                     </div>
                                                     {/if}
-                                                </div>
-                                            </div>                     
-                                            <div class="row" style="margin-top:20px;padding:10px 25px;">
-                                                上传附件：                                      
-                                                <table class="fileTable"></table>
-                                            </div>
-                                            <div class="row">
-                                                <div class="col-sm-10">                                                    
-                                                    <div class="rowGroup col-sm-3">
-                                                        <label class="control-label spacing"><span style="color: red">*</span>本单位入职时间</label>
+                                                </td>
+                                             </tr>
+
+
+                                        </table>
+
+                                        <table style="width: 100%;border-collapse: collapse;" class="table table-bordered">
+                                            <tr>
+                                                <td>
+                                                    <div class="rowGroup">
+                                                        <label class=" control-label spacing td-label"><span style="color: red">*</span>引进方式</label>
+                                                        <input type="text" class="form-control date" id="import_way" name="import_way" value="{$info.importWayName}"/>
+                                                    </div>
+                                                </td>
+                                                <td>
+                                                    <div class="rowGroup">
+                                                        <label class="control-label spacing td-label"><span style="color: red">*</span>首次来晋工作时间</label>
+                                                        <input type="text" class="form-control date" id="fst_work_time" name="fst_work_time" value="{$info.fst_work_time}"/>
+                                                    </div>
+                                                </td>
+                                                <td rowspan="3" style="width: 200%">
+                                                    <table class="fileTable"></table>
+                                                </td>
+                                            </tr>
+                                            <tr>
+                                                <td>
+                                                    <div class="rowGroup">
+                                                        <label class="control-label spacing td-label"><span style="color: red">*</span>本单位入职时间</label>
                                                         <input type="text" class="form-control date" id="cur_entry_time" value="{$info.cur_entry_time}"/>
                                                     </div>
-                                                    <div class="rowGroup col-sm-3">
-                                                        <label class="control-label spacing"><span style="color: red">*</span>本单位现任职务</label>
+                                                </td>
+                                                <td>
+                                                    <div class="rowGroup">
+                                                        <label class="control-label spacing td-label"><span style="color: red">*</span>本单位现任职务</label>
                                                         <input type="text" class="form-control" id="position" value="{$info.position}"/>
                                                     </div>
-                                                    {if condition="$info['professional']"}
-                                                    <div class="rowGroup col-sm-3">
-                                                        <label class="control-label spacing">专业技术职称</label>
+                                                </td>
+                                            </tr>
+                                            <tr>
+                                                <td colspan="2">
+                                                    <div class="rowGroup">
+                                                        <label class="control-label spacing td-label">专业技术职称</label>
                                                         <input type="text" class="form-control" id="professional" value="{$info.professional}"/>
-                                                    </div>{/if}
-                                                </div>
-                                            </div>               
-                                            <div class="row" style="margin-top:20px;padding:10px 25px;">
-                                                上传附件：                                      
-                                                <table class="fileTable"></table>
-                                            </div>
+                                                    </div>
+                                                </td>
+                                            </tr>
+
+                                        </table>
+                                        <div class="col-sm-12 form-group-sm">
+
+
                                             <div class="row">
                                                 <div class="col-sm-10">
-                                                    <div class="rowGroup col-sm-3">
-                                                        <label class=" control-label spacing"><span style="color: red">*</span>引进方式</label>
-                                                        <select class="form-control" id="import_way" name="import_way" data-placeholder="引进方式">
-                                                            <option value="">{$info.importWayName}</option>
-                                                        </select>
-                                                    </div>
+
                                                     <div class="rowGroup col-sm-3">
                                                         <label class="control-label spacing"><span style="color: red">*</span>申报来源</label>
                                                         <select class="form-control" id="source" >

app/enterprise/controller/Talent.php

@@ -58,7 +58,7 @@ class Talent extends EnterpriseController {
                 }
             }
 
-            $no_empty = ["talent_arrange", "talent_condition", "highest_degree", "graduate_school", "major", "professional", "bank", "bank_number", "bank_branch_name",
+            $no_empty = ["talent_arrange", "talent_condition", "highest_degree", "graduate_school", "major", "bank", "bank_number", "bank_branch_name",
                 "bank_account", "study_abroad", "phone", "email", "import_way", "fst_work_time", "cur_entry_time", "cur_entry_time", "position", "source"];
 
             if ($data["study_abroad"] == 1) {

app/enterprise/view/base/add.html

@@ -30,6 +30,7 @@
         text-align: center;
         height: 30px;
     }
+
 </style>
 <div class="ibox float-e-margins">
     <div class="ibox-content">

app/enterprise/view/base/first.html

@@ -49,6 +49,9 @@
         word-wrap:break-word;
         word-break:break-all;
     }
+    ul{
+        padding: 0;
+    }
 </style>
 <div class="ibox float-e-margins">
     <div class="ibox-content">

app/enterprise/view/talent/first.html

@@ -30,6 +30,9 @@
         text-align: center;
         height: 30px;
     }
+    ul{
+        margin: 0;
+    }
 </style>
 <div class="ibox float-e-margins">
     <div class="ibox-content">

app/enterprise/view/talent/second.html

@@ -336,7 +336,7 @@
                                     </tr>
                                 </table>
                                 <div class="row">
-                                    <div class="rowGroup col-sm-3">
+                                    <div class="rowGroup col-sm-6">
                                         <label class="control-label spacing"><span style="color: red">*</span>申报来源</label>
                                         <select class="form-control" id="source" name="source" onchange="TalentInfoInfoDlg.sourceChange()" value="{$row.source}">
                                         </select>

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

@@ -476,7 +476,7 @@ TalentInfoInfoDlg.sourceChange = function () {
 TalentInfoInfoDlg._initFileTypeColumn = function () {
     return [
         {field: 'selectItem', checkbox: false, visible: false},
-        {title: '名称', field: 'name', visible: true, align: 'left', valign: 'middle', width: "82%", 'class': 'uitd_showTip',
+        {title: '名称', field: 'name', visible: true, align: 'left', valign: 'middle', width: "75%", 'class': 'uitd_showTip',
             formatter: function (value, row, index) {
                 let str = '<div class="word-wrap">';
                 if (row.must == 1) {
@@ -499,7 +499,7 @@ TalentInfoInfoDlg._initFileTypeColumn = function () {
                         "</button>";
             }
         },
-        {title: '操作', field: 'id', visible: true, align: 'center', valign: 'middle', width: "10%",
+        {title: '操作', field: 'id', visible: true, align: 'center', valign: 'middle', width: "17%",
             formatter: function (value, row, index) {
                 return TalentInfoInfoDlg.validUploadButton(1, value, '', row.tableIndex, row.trIndex);
             }
@@ -550,7 +550,7 @@ TalentInfoInfoDlg.initFile = function () {
                 onPostBody: function (data) {
                     for (var k in data) {
                         var files = data[k].files;
-                        var html = '<ul class="imgs"><li style="width: 80%;font-weight: bold;padding-top: 5px;">附件原名</li><li style="width: 10%;font-weight: bold;padding-top: 5px;">预览</li><li style="width: 10%;font-weight: bold;padding-top: 5px;">操作</li>';
+                        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 = TalentInfoInfoDlg.validUploadButton(2, data[k].id, files[key].id, i, k);
                             var sn = files[key].url.lastIndexOf(".");
@@ -566,9 +566,9 @@ TalentInfoInfoDlg.initFile = function () {
 
                             html += '<li data-id="' + files[key].id + '">\n\
                                     <div><input type="hidden" name="uploadFiles[]" value="' + files[key].id + '"></div>\n' +
-                                    '<div style="width: 80%;">' + files[key].orignName + '</div>\n' +
+                                    '<div style="width: 70%;">' + files[key].orignName + '</div>\n' +
                                     '<div style="width: 10%;">' + imgStr + '</div>\n' +
-                                    '<div style="width: 10%;">' + btn + '</div>\n\
+                                    '<div style="width: 20%;">' + btn + '</div>\n\
                                     </li>';
                         }
                         html = html + '</ul>';

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

@@ -314,7 +314,7 @@ TalentInfoInfoDlg.initFileTable = function () {
                 onPostBody: function (data) {
                     for (var k in data) {
                         var files = data[k].files;
-                        var html = '<ul class="imgs"><li style="width: 80%;font-weight: bold;padding-top: 5px;">附件原名</li><li style="width: 10%;font-weight: bold;padding-top: 5px;">预览</li><li style="width: 10%;font-weight: bold;padding-top: 5px;">操作</li>';
+                        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 = "";
                             if (data[k].step != 1) {
@@ -519,7 +519,7 @@ TalentInfoInfoDlg.changeStudyAbroad = function () {
 
 TalentInfoInfoDlg.sourceChange = function () {
     var source = $("#source").val();
-    $("#source_batch").val("").parent().parent().parent().css("display", "none");
+    $("#source_batch").val("").parent().css("display", "none");
     $(".fujian_highcert").css("display", "none");
     $(".quanzhou_highcert").css("display", "none");
     $("#source_city").val("").parent().css("display", "none");
@@ -534,7 +534,7 @@ TalentInfoInfoDlg.sourceChange = function () {
     switch (source) {
         case "1":
         case "3":
-            $("#source_batch").parent().parent().parent().css("display", "block");
+            $("#source_batch").parent().css("display", "block");
             $(".fujian_highcert").css("display", "block");
             $('#talentInfoForm').bootstrapValidator('addField', "source_batch", {validators: {notEmpty: {message: '申报来源批次不能为空'}}});
             $('#talentInfoForm').bootstrapValidator('addField', "fujian_highcert_pubtime", {validators: {notEmpty: {message: '福建省高层次人才证书发证日期不能为空'}}});
@@ -542,7 +542,7 @@ TalentInfoInfoDlg.sourceChange = function () {
             break;
         case "2":
         case "4":
-            $("#source_batch").parent().parent().parent().css("display", "block");
+            $("#source_batch").parent().css("display", "block");
             $(".quanzhou_highcert").css("display", "block");
             $('#talentInfoForm').bootstrapValidator('addField', "source_batch", {validators: {notEmpty: {message: '申报来源批次不能为空'}}});
             $('#talentInfoForm').bootstrapValidator('addField', "quanzhou_highcert_pubtime", {validators: {notEmpty: {message: '泉州高层次人才证书发证日期不能为空'}}});

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

@@ -57,7 +57,7 @@ TalentInfoInfoDlg.initFileTable = function () {
         for (var k in data["rows"]) {
             var rel = data["rows"][k].rel;
             if ($("#" + rel).length > 0) {
-                if(rel == 'card_number' || rel == 'name' || rel == 'talent_type'){
+                if(rel == 'card_number' || rel == 'name' || rel == 'talent_type' || rel == 'talent_edu' || rel=='fst_work_time'){
                     var tableIndex = $("#" + rel).parents(".table").find("table.fileTable").index(".fileTable");
                 }else{
                     var tableIndex = $("#" + rel).parents(".row").next(".row").find("table.fileTable").index(".fileTable");