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

app/enterprise/view/talent_allowance/apply.html

@@ -38,7 +38,7 @@
                     <div class="tabs-container" >
                         <ul class="nav nav-tabs">
                             <li class="active"><a data-toggle="tab" href="#tab-1" aria-expanded="true">1.基本信息</a></li>
-<!--                            <li id="condition" class=""><a data-toggle="tab" href="#tab-2" aria-expanded="false" onclick="TalentAllowanceInfoDlg.initContract()">2.核查条件录入</a></li>-->
+                            <!--                            <li id="condition" class=""><a data-toggle="tab" href="#tab-2" aria-expanded="false" onclick="TalentAllowanceInfoDlg.initContract()">2.核查条件录入</a></li>-->
                             <li id="fileLi" class=""><a data-toggle="tab" href="#tab-2"  aria-expanded="false" onclick="TalentAllowanceInfoDlg.initFileTable()">2.附件上传</a></li>
                         </ul>
                     </div>
@@ -66,7 +66,11 @@
                                                 <div class="rowGroup">
                                                     <label class="col-sm-1 control-label spacing"><span style="color: red">*</span>申报对象</label>
                                                     <div class="col-sm-2 spacing">
+                                                        {if condition="$row['id']"}
                                                         <input type="text" class="form-control" readonly="readonly" id="name" name="name" value="{$row.name}" >
+                                                        {else/}
+                                                        <select type="text" class="form-control" id="name" name="name" onchange="TalentAllowanceInfoDlg.init()"></select>
+                                                        {/if}
                                                     </div>
                                                 </div>
                                                 <div class="rowGroup" id="talentTypeSpan">
@@ -84,11 +88,15 @@
                                                 <div class="rowGroup">
                                                     <label class="col-sm-1 control-label spacing"><span style="color: red">*</span>性别</label>
                                                     <div class="col-sm-2 spacing">
+                                                        {if condition="$row['sex']"}
                                                         <select class="form-control" style="pointer-events: none;background-color: #eee;" id="sex" name="sex" value="{$row.sex}">
                                                             <option value="">请选择</option>
                                                             <option value="1">男</option>
                                                             <option value="2">女</option>
                                                         </select>
+                                                        {else/}
+                                                        <input type="text" class="form-control" readonly="readonly" id="sex" name="sex"/>
+                                                        {/if}
                                                     </div>
                                                 </div>
                                                 <div class="rowGroup">
@@ -182,7 +190,7 @@
                                                     </div>
                                                 </div>
                                                 <div class="rowGroup" id="wageDiv" {neq name="row.active" value="2"}style="display: none"{/neq}>
-                                                    <label class="col-sm-1 control-label spacing"><span style="color: red">*</span>上一年度年薪(元)</label>
+                                                     <label class="col-sm-1 control-label spacing"><span style="color: red">*</span>上一年度年薪(元)</label>
                                                     <div class="col-sm-2 spacing">
                                                         <input type="hidden" id="active" value="{$row.active}">
                                                         <input type="text" class="form-control" id="wage" placeholder="正常工资薪金、一次性奖金收入(无需填写单位)" name="wage" value="{$row.wage}" {if condition="!$info['fields'] && $info['checkState']!=1"}readonly="readonly"{/if}/>
@@ -491,7 +499,7 @@
 <!--<script src="${ctxPath}/static/modular/gate/talentAllowance/common/talentAllowance_info.js"></script>-->
 <!--<script src="${ctxPath}/static/modular/gate/talentAllowance/common/talentAllowance_info_supple.js"></script>-->
 <script type="text/javascript">
-    document.write('<script src="/static/modular/gate/talentAllowance/common/talentAllowance_info.js?v='+(new Date()).getTime()+'"><\/script>');
-    document.write('<script src="/static/modular/gate/talentAllowance/common/talentAllowance_info_supple.js?v='+(new Date()).getTime()+'"><\/script>');
+    document.write('<script src="/static/modular/gate/talentAllowance/common/talentAllowance_info.js?v=' + (new Date()).getTime() + '"><\/script>');
+    document.write('<script src="/static/modular/gate/talentAllowance/common/talentAllowance_info_supple.js?v=' + (new Date()).getTime() + '"><\/script>');
 </script>
 {/block}

public/static/modular/gate/talentAllowance/common/talentAllowance_info.js

@@ -67,7 +67,7 @@ TalentAllowanceInfoDlg.validate = function () {
 TalentAllowanceInfoDlg.init = function () {
     var talentId = $("#name").val();
     if (Feng.isNotEmptyStr(talentId)) {
-        var ajax = new $ax(Feng.ctxPath + "/api/talentInfo/detail/" + talentId, function (data) {
+        var ajax = new $ax(Feng.ctxPath + "/enterprise/talent/getInfoById/id/" + talentId, function (data) {
             if (data.active == 1) {
                 $("#wageDiv").css("display", "none");
             } else if (data.active == 2) {
@@ -80,18 +80,18 @@ TalentAllowanceInfoDlg.init = function () {
             $("#talentTypeName").val(data.talentTypeName);
             $("#enterpriseName").val(data.enterpriseName);
             $("#sex").val(data.sex == 1 ? "男" : "女");
-            $("#idCard").val(data.idCard);
-            $("#introductionModeName").val(data.introductionModeName);
-            $("#firstInJJTime").val(data.firstInJJTime);
-            $("#entryTime").val(data.entryTime);
-            $("#post").val(data.post);
+            $("#idCard").val(data.card_number);
+            //$("#introductionModeName").val(data.introductionModeName);
+            $("#firstInJJTime").val(data.fst_work_time);
+            $("#entryTime").val(data.cur_entry_time);
+            $("#post").val(data.position);
             $("#phone").val(data.phone);
             $("#bank").val(data.bank);
-            $("#bankNumber").val(data.bankNumber);
-            $("#bankNetwork").val(data.bankNetwork).attr("title", data.bankNetwork);
-            $("#bankAccount").val(data.bankAccount);
+            $("#bankNumber").val(data.bank_number);
+            $("#bankNetwork").val(data.bank_branch_name).attr("title", data.bank_branch_name);
+            $("#bankAccount").val(data.bank_account);
             $("#talentArrangeName").val(data.talentArrangeName);
-            $("#identifyConditionText").val(data.identifyConditionText).attr("title", data.identifyConditionText);
+            $("#identifyConditionText").val(data.talentConditionName).attr("title", data.talentConditionName);
             $("#identifyConditionName").val(data.identifyConditionName).attr("title", data.identifyConditionName);
             $("#identifyGetTime").val(data.identifyGetTime);
             $("#provinceCode").val(data.provinceName + data.cityName + data.countyName);