Răsfoiți Sursa

修改一些界面

sandm 2 ani în urmă
părinte
comite
34d7dc43c0

+ 27 - 9
app/admin/view/talent/talentInfo_base_check.html

@@ -106,7 +106,7 @@
                                                 </td>
                                                 <td>
                                                     <div class="rowGroup">
-                                                        <label class=" control-label spacing td-label"><span style="color: red">*证件号码</span></label>
+                                                        <label class=" control-label spacing td-label"><span style="color: red">*</span>证件号码</label>
                                                         <input class="form-control" id="card_number" name="card_number" value="{$info.card_number}">
                                                     </div>
                                                 </td>
@@ -167,7 +167,7 @@
                                                         <input type="text" class="form-control" id="enterprise_name" name="enterprise_name" value="{$info.enterpriseName}" />
                                                     </div>
                                                 </td>
-                                                <td rowspan="4" style="width: 200%">
+                                                <td rowspan="5" style="width: 200%">
                                                     <table class="fileTable"></table>
                                                 </td>
                                             </tr>
@@ -193,20 +193,38 @@
                                                     </div>
                                                 </td>
                                                 <td>
-                                                    {if condition="in_array($info['talent_type'],[1,2])"}
-                                                    <div class="rowGroup">
+
+                                                </td>
+                                            </tr>
+                                            {if condition="in_array($info['talent_type'],[1,2])"}
+                                            <tr>
+                                                <td>
+                                                    <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="{$info.tax_insurance_month}"/>
+                                                        <input type="text" class="form-control" id="tax_insurance_month" name="tax_insurance_month" value="{$info.tax_insurance_month}" />
                                                     </div>
-                                                    {else/}
+                                                </td>
+                                                <td>
                                                     <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="{$info.labor_contract_rangetime}" />
+                                                        <input type="text" class="form-control" id="labor_contract_rangetime" name="labor_contract_rangetime" value="{$info.labor_contract_rangetime}" />
+                                                    </div>
+                                                </td>
+                                            </tr>
+                                            {else/}
+                                            <tr>
+                                                <td >
+                                                    <div class="rowGroup">
+                                                        预引进类型
+                                                    </div>
+                                                </td>
+                                                <td >
+                                                    <div class="rowGroup">
+                                                        {if condition="$info['pre_import_type']==1"}意向合同{else/}创业企业名称预核准{/if}
                                                     </div>
-                                                    {/if}
-
                                                 </td>
                                             </tr>
+                                            {/if}
                                             <tr>
                                                 <td colspan="2">
                                                     <label class=" control-label spacing td-label">说明</label>

+ 24 - 5
app/admin/view/talent/talentInfo_common_check.html

@@ -102,7 +102,7 @@
                                                     </select>
                                                 </td>
                                                 <td>
-                                                    <label class=" control-label spacing td-label"><span style="color: red">*证件号码</span></label>
+                                                    <label class=" control-label spacing td-label"><span style="color: red">*</span>证件号码</label>
                                                     <input class="form-control" id="card_number" name="card_number" value="{$info.card_number}">
                                                 </td>
                                             </tr>
@@ -150,7 +150,7 @@
                                                     <label class=" control-label spacing td-label"><span style="color: red">*</span>单位名称</label>
                                                     <input type="text" class="form-control" id="enterprise_name" name="enterprise_name" value="{$info.enterpriseName}" />
                                                 </td>
-                                                <td rowspan="4" style="width: 200%">
+                                                <td rowspan="5" style="width: 200%">
                                                     <table class="fileTable"></table>
                                                 </td>
                                             </tr>
@@ -172,19 +172,38 @@
                                                     </select>
                                                 </td>
                                                 <td>
-                                                    {if condition="in_array($info['talent_type'],[1,2])"}
+
+                                                </td>
+                                            </tr>
+                                            {if condition="in_array($info['talent_type'],[1,2])"}
+                                            <tr>
+                                                <td>
                                                     <div class="rowGroup ">
                                                         <label class=" control-label spacing td-label"><span style="color: red">*</span>在我市缴交社会保险或个人所得税月份</label>
                                                         <input type="text" class="form-control" id="tax_insurance_month" name="tax_insurance_month" value="{$info.tax_insurance_month}" />
                                                     </div>
-                                                    {else/}
+                                                </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="labor_contract_rangetime" name="labor_contract_rangetime" value="{$info.labor_contract_rangetime}" />
                                                     </div>
-                                                    {/if}
                                                 </td>
                                             </tr>
+                                            {else/}
+                                            <tr>
+                                                <td >
+                                                    <div class="rowGroup">
+                                                        预引进类型
+                                                    </div>
+                                                </td>
+                                                <td >
+                                                    <div class="rowGroup">
+                                                        {if condition="$info['pre_import_type']==1"}意向合同{else/}创业企业名称预核准{/if}
+                                                    </div>
+                                                </td>
+                                            </tr>
+                                            {/if}
                                             <tr>
                                                 <td colspan="2">
                                                     <label class=" control-label spacing td-label">说明</label>

+ 1 - 1
app/admin/view/talent/talentInfo_common_checkIC.html

@@ -106,7 +106,7 @@
                                                             </select>
                                                         </div>
                                                         <div class="rowGroup col-sm-4">
-                                                            <label class=" control-label spacing"><span style="color: red">*证件号码</span></label>
+                                                            <label class=" control-label spacing"><span style="color: red">*</span>证件号码</span></label>
                                                             <input type="text" class="form-control" id="idCard" name="idCard" value="${item.idCard}"/>
                                                         </div>
                                                         <div class="rowGroup col-sm-4">

+ 1 - 1
app/admin/view/talent/talentInfo_common_check_new.html

@@ -80,7 +80,7 @@
                                                             </select>
                                                         </div>
                                                         <div class="rowGroup col-sm-3">
-                                                            <label class=" control-label spacing"><span style="color: red">*证件号码</span></label>
+                                                            <label class=" control-label spacing"><span style="color: red">*</span>证件号码</span></label>
                                                             <input class="form-control" id="card_number" name="card_number" value="{$info.card_number}">
                                                         </div>
                                                         <div class="rowGroup col-sm-3">

+ 3 - 3
app/enterprise/view/base/index.html

@@ -115,9 +115,9 @@
                             <button type="button" class="btn btn-sm btn-primary " onclick="TalentInfo.openTalentInfoDetail()" id="">
                                 <i class="fa fa-edit"></i>&nbsp;修改申报
                             </button>
-                            <button type="button" class="btn btn-sm btn-primary " onclick="TalentInfo.openTalentInfoSelect()" id="">
-                                <i class="fa fa-book"></i>&nbsp;查看申报
-                            </button>
+<!--                            <button type="button" class="btn btn-sm btn-primary " onclick="TalentInfo.openTalentInfoSelect()" id="">-->
+<!--                                <i class="fa fa-book"></i>&nbsp;查看申报-->
+<!--                            </button>-->
                             <button type="button" class="btn btn-sm btn-primary " onclick="TalentInfo.delete()" id="">
                                 <i class="fa fa-remove"></i>&nbsp;删除申报
                             </button>

+ 1 - 1
app/enterprise/view/base/second.html

@@ -98,7 +98,7 @@
                                                             </select>
                                                         </div>
                                                         <div class="rowGroup col-sm-3">
-                                                            <label class=" control-label spacing"><span style="color: red">*证件号码</span></label>
+                                                            <label class=" control-label spacing"><span style="color: red">*</span>证件号码</span></label>
                                                             <input class="form-control" value="{$row.card_number}" readonly disabled>
                                                         </div>
                                                         <div class="rowGroup col-sm-3">

+ 1 - 1
app/enterprise/view/base/view.html

@@ -68,7 +68,7 @@
                                                             </select>
                                                         </div>
                                                         <div class="rowGroup col-sm-3">
-                                                            <label class=" control-label spacing"><span style="color: red">*证件号码</span></label>
+                                                            <label class=" control-label spacing"><span style="color: red">*</span>证件号码</span></label>
                                                             <input class="form-control" id="card_number" name="card_number" value="{$row.card_number}">
                                                         </div>
                                                         <div class="rowGroup col-sm-3">

+ 1 - 1
app/enterprise/view/talent/second.html

@@ -104,7 +104,7 @@
                                                 </td>
                                                 <td>
                                                     <div class="rowGroup">
-                                                        <label class=" control-label spacing td-label"><span style="color: red">*证件号码</span></label>
+                                                        <label class=" control-label spacing td-label"><span style="color: red">*</span>证件号码</span></label>
                                                         <input class="form-control" value="{$row.card_number}" readonly disabled  id="card_number">
                                                     </div>
                                                 </td>

+ 1 - 1
app/enterprise/view/talent/view.html

@@ -69,7 +69,7 @@
                                                             </select>
                                                         </div>
                                                         <div class="rowGroup col-sm-3">
-                                                            <label class=" control-label spacing"><span style="color: red">*证件号码</span></label>
+                                                            <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}">
                                                         </div>
                                                         <div class="rowGroup col-sm-3">

+ 20 - 6
public/static/modular/gate/talentBase/talentInfo_info.js

@@ -367,7 +367,6 @@ TalentInfoInfoDlg.afterSelectCity = function () {
     });
 }
 
-TalentInfoInfoDlg.talentTypeFlag = false;
 TalentInfoInfoDlg.talentTypeChange = function () {
     var talent_type = $("#talent_type").val();
     //$("#tax_insurance_month").val("").parent().css("display", "none");
@@ -377,6 +376,7 @@ TalentInfoInfoDlg.talentTypeChange = function () {
 
     switch (talent_type) {
         case "1":
+            TalentInfoInfoDlg.talentTypeOneTwo = true;
             $("#tipsBlock").css('display', 'block');
             $("#typeTips").html("含经晋江市认定且还在晋江市就业创业的人才,或在晋江市就业创业但未曾申报过晋江市现代产业体系人才的人才。");
             $("#desc_talent_type").html("请上传社会保险或个人所得税缴费佐证材料");
@@ -387,9 +387,13 @@ TalentInfoInfoDlg.talentTypeChange = function () {
                 }
             });
             $('#talentInfoForm').bootstrapValidator('addField', "labor_contract_rangetime", {validators: {notEmpty: {message: '劳动合同起止时间'}}});
-            $('#talentInfoForm').bootstrapValidator('removeField', "pre_import_type");
+            if(TalentInfoInfoDlg.talentTypeFlag){
+                TalentInfoInfoDlg.talentTypeFlag = false;
+                $('#talentInfoForm').bootstrapValidator('removeField', "pre_import_type");
+            }
             break;
         case "2":
+            TalentInfoInfoDlg.talentTypeOneTwo = true;
             $("#tipsBlock").css('display', 'block');
             $("#typeTips").html("含本办法出台后首次从晋江市以外引进认定的人才,或者流出晋江市满3年后又返回晋江市就业创业(不含企业集团内部人员调动)的人才。")
             $("#desc_talent_type").html("请上传社会保险或个人所得税缴费佐证材料与来我市前工作情况证明,例如原工作单位出具的工作证明、离职证明或原创(领)办企业的营业执照复印件、经市场监管部门备案的公司章程复印件等证明材料");
@@ -400,22 +404,30 @@ TalentInfoInfoDlg.talentTypeChange = function () {
                 }
             });
             $('#talentInfoForm').bootstrapValidator('addField', "labor_contract_rangetime", {validators: {notEmpty: {message: '劳动合同起止时间'}}});
-            $('#talentInfoForm').bootstrapValidator('removeField', "pre_import_type");
+            if(TalentInfoInfoDlg.talentTypeFlag){
+                TalentInfoInfoDlg.talentTypeFlag = false;
+                $('#talentInfoForm').bootstrapValidator('removeField', "pre_import_type");
+            }
             break;
         case "3":
+            TalentInfoInfoDlg.talentTypeFlag = true;
             $("#tipsBlock").css('display', 'block');
             $("#typeTips").html("含已经与晋江市用人单位达成就业意向且签订预引进意向合作协议(合同)的人才,或拟来我市创业且提交企业名称预先核准的人才。")
             $("#desc_talent_type").html("请先提供意向合作协议(合同)或企业名称预先核准材料,落地我市后再补齐上述材料");
             $(".talentType3").css("display", "table-row");
             $('#talentInfoForm').bootstrapValidator('addField', "pre_import_type", {validators: {notEmpty: {message: '请选择预引进类型'}}});
-            $('#talentInfoForm').bootstrapValidator('removeField', "labor_contract_rangetime");
-            $('#talentInfoForm').bootstrapValidator('removeField', "tax_insurance_month");
+            if(TalentInfoInfoDlg.talentTypeOneTwo){
+                TalentInfoInfoDlg.talentTypeOneTwo = false;
+                $('#talentInfoForm').bootstrapValidator('removeField', "labor_contract_rangetime");
+                $('#talentInfoForm').bootstrapValidator('removeField', "tax_insurance_month");
+            }
+
             break;
         default:
             $("#tipsBlock").css('display', 'none');
             break;
     }
-    TalentInfoInfoDlg.talentTypeFlag = true;
+
 }
 
 TalentInfoInfoDlg.sourceChange = function () {
@@ -940,6 +952,8 @@ function async_padding(card_number, card_type) {
     }
 }
 $(function () {
+    TalentInfoInfoDlg.talentTypeFlag = false;
+    TalentInfoInfoDlg.talentTypeOneTwo = true;
     Feng.initValidatorTip("talentInfoForm", TalentInfoInfoDlg.validateFields);
     var id = $("#id").val();
     var checkState = $("#checkState").val();