Prechádzať zdrojové kódy

去掉高教在津补贴中不必要的字段

sugangqiang 10 mesiacov pred
rodič
commit
9bb711a625

+ 6 - 2
app/admin/view/talent_allowance/info.html

@@ -130,6 +130,8 @@
                                                         <input class="form-control" readonly="readonly" id="provinceCode" name="provinceCode" value="{$row.provinceName}{$row.cityName}{$row.countyName}">
                                                     </div>
                                                 </div>
+                                                {/if}
+                                                {if condition="!in_array($row['type'],[5,6])"}
                                                 <div class="rowGroup" id="introductionModeSpan">
                                                     <label class="col-sm-1 control-label spacing"><span style="color: red">*</span>引进方式</label>
                                                     <div class="col-sm-2 spacing" >
@@ -197,13 +199,15 @@
                                                         <input type="text" class="form-control" readonly="readonly" id="identifyConditionText" name="identifyConditionText" value="{$row.identifyConditionText}">
                                                     </div>
                                                 </div>
-                                                {if condition="!in_array($row['type'],[5])"}
+                                                {if condition="!in_array($row['type'],[5,6])"}
                                                 <div class="rowGroup">
                                                     <label class="col-sm-1 control-label spacing"><span style="color: red">*</span>认定条件名称</label>
                                                     <div class="col-sm-2 spacing">
                                                         <input type="text" class="form-control" readonly="readonly" id="identifyConditionName" name="identifyConditionName" value="{$row.identifyConditionName}"/>
                                                     </div>
                                                 </div>
+                                                {/if}
+                                                {if condition="!in_array($row['type'],[5])"}
                                                 <div class="rowGroup">
                                                     <label class="col-sm-1 control-label spacing"><span style="color: red">*</span>认定条件取得时间</label>
                                                     <div class="col-sm-2 spacing">
@@ -299,7 +303,7 @@
                                 </div>
                                 <div class="panel-body">
                                     <div id="cal-result">
-                                        
+
                                     </div>
                                 </div>
                             </div>

+ 9 - 5
app/admin/view/talent_allowance/public_check.html

@@ -62,8 +62,8 @@
                     <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="fileLi" class=""><a data-toggle="tab" href="#tab-2"  aria-expanded="false" onclick="TalentAllowanceInfoDlg.initFileTable()">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>
                     <div class="tab-content">
@@ -146,6 +146,8 @@
                                                         <input class="form-control" readonly="readonly" id="provinceCode" name="provinceCode" value="{$row.provinceName}{$row.cityName}{$row.countyName}">
                                                     </div>
                                                 </div>
+                                                {/if}
+                                                {if condition="!in_array($row['type'],[5,6])"}
                                                 <div class="rowGroup" id="introductionModeSpan">
                                                     <label class="col-sm-1 control-label spacing"><span style="color: red">*</span>引进方式</label>
                                                     <div class="col-sm-2 spacing" >
@@ -213,13 +215,15 @@
                                                         <input type="text" class="form-control" readonly="readonly" id="identifyConditionText" name="identifyConditionText" value="{$row.identifyConditionText}">
                                                     </div>
                                                 </div>
-                                                {if condition="!in_array($row['type'],[5])"}
+                                                {if condition="!in_array($row['type'],[5,6])"}
                                                 <div class="rowGroup">
                                                     <label class="col-sm-1 control-label spacing"><span style="color: red">*</span>认定条件名称</label>
                                                     <div class="col-sm-2 spacing">
                                                         <input type="text" class="form-control" readonly="readonly" id="identifyConditionName" name="identifyConditionName" value="{$row.identifyConditionName}"/>
                                                     </div>
                                                 </div>
+                                                {/if}
+                                                {if condition="!in_array($row['type'],[5])"}
                                                 <div class="rowGroup">
                                                     <label class="col-sm-1 control-label spacing"><span style="color: red">*</span>认定条件取得时间</label>
                                                     <div class="col-sm-2 spacing">
@@ -636,8 +640,8 @@
 </div>
 <iframe id="hiddenIframe" name="hiddenIframe" style="display: none;"></iframe>
 <script type="text/javascript">
-    document.write('<script src="/static/modular/talentAllowance/talentAllowanceInfo_public_check.js?v='+(new Date()).getTime()+'"><\/script>');
+    document.write('<script src="/static/modular/talentAllowance/talentAllowanceInfo_public_check.js?v=' + (new Date()).getTime() + '"><\/script>');
     // document.write('<script src="${ctxPath}/static/modular/talentAllowance/talentAllowanceInfo_info_supple.js?v='+(new Date()).getTime()+'"><\/script>');
-    document.write('<script src="/static/modular/common/upload.js?v='+(new Date()).getTime()+'"><\/script>');
+    document.write('<script src="/static/modular/common/upload.js?v=' + (new Date()).getTime() + '"><\/script>');
 </script>
 {/block}

+ 5 - 1
app/admin/view/talent_allowance/select.html

@@ -128,6 +128,8 @@
                                                         <input class="form-control" readonly="readonly" id="provinceCode" name="provinceCode" value="{$row.provinceName}{$row.cityName}{$row.countyName}">
                                                     </div>
                                                 </div>
+                                                {/if}
+                                                {if condition="!in_array($row['type'],[5,6])"}
                                                 <div class="rowGroup" id="introductionModeSpan">
                                                     <label class="col-sm-1 control-label spacing"><span style="color: red">*</span>引进方式</label>
                                                     <div class="col-sm-2 spacing" >
@@ -195,13 +197,15 @@
                                                         <input type="text" class="form-control" readonly="readonly" id="identifyConditionText" name="identifyConditionText" value="{$row.identifyConditionText}">
                                                     </div>
                                                 </div>
-                                                {if condition="!in_array($row['type'],[5])"}
+                                                {if condition="!in_array($row['type'],[5,6])"}
                                                 <div class="rowGroup">
                                                     <label class="col-sm-1 control-label spacing"><span style="color: red">*</span>认定条件名称</label>
                                                     <div class="col-sm-2 spacing">
                                                         <input type="text" class="form-control" readonly="readonly" id="identifyConditionName" name="identifyConditionName" value="{$row.identifyConditionName}"/>
                                                     </div>
                                                 </div>
+                                                {/if}
+                                                {if condition="!in_array($row['type'],[5])"}
                                                 <div class="rowGroup">
                                                     <label class="col-sm-1 control-label spacing"><span style="color: red">*</span>认定条件取得时间</label>
                                                     <div class="col-sm-2 spacing">

+ 21 - 1
app/enterprise/view/talent_allowance/apply.html

@@ -96,6 +96,22 @@
                                                         </select>
                                                     </div>
                                                 </div>
+                                                <div class="rowGroup">
+                                                    <label class="col-sm-1 control-label spacing"><span style="color: red">*</span>岗位类型</label>
+                                                    <div class="col-sm-2 spacing">
+                                                        <select type="text" class="form-control" id="allowanceType" name="postType" value="{$row.allowanceType}">
+                                                            <option>请选择</option>
+                                                        </select>
+                                                    </div>
+                                                </div>
+                                                <div class="rowGroup">
+                                                    <label class="col-sm-1 control-label spacing"><span style="color: red">*</span>所属编制</label>
+                                                    <div class="col-sm-2 spacing">
+                                                        <select type="text" class="form-control" id="allowanceType" name="institution" value="{$row.allowanceType}">
+                                                            <option>请选择</option>
+                                                        </select>
+                                                    </div>
+                                                </div>
                                                 {if condition="!in_array($type,[5])"}
                                                 <div class="rowGroup" id="talentTypeSpan">
                                                     <label class="col-sm-1 control-label spacing"><span style="color: red">*</span>人才标签</label>
@@ -137,6 +153,8 @@
                                                         <input class="form-control" readonly="readonly" id="provinceCode" name="provinceCode" value="{$row.provinceName}{$row.cityName}{$row.countyName}">
                                                     </div>
                                                 </div>
+                                                {/if}
+                                                {if condition="!in_array($type,[5,6])"}
                                                 <div class="rowGroup" id="introductionModeSpan">
                                                     <label class="col-sm-1 control-label spacing"><span style="color: red">*</span>引进方式</label>
                                                     <div class="col-sm-2 spacing" >
@@ -204,13 +222,15 @@
                                                         <input type="text" class="form-control" readonly="readonly" id="identifyConditionText" name="identifyConditionText" value="{$row.identifyConditionText}">
                                                     </div>
                                                 </div>
-                                                {if condition="!in_array($type,[5])"}
+                                                {if condition="!in_array($type,[5,6])"}
                                                 <div class="rowGroup">
                                                     <label class="col-sm-1 control-label spacing"><span style="color: red">*</span>认定条件名称</label>
                                                     <div class="col-sm-2 spacing">
                                                         <input type="text" class="form-control" readonly="readonly" id="identifyConditionName" name="identifyConditionName" value="{$row.identifyConditionName}"/>
                                                     </div>
                                                 </div>
+                                                {/if}
+                                                {if condition="!in_array($type,[5])"}
                                                 <div class="rowGroup">
                                                     <label class="col-sm-1 control-label spacing"><span style="color: red">*</span>认定条件取得时间</label>
                                                     <div class="col-sm-2 spacing">

+ 5 - 1
app/enterprise/view/talent_allowance/detail.html

@@ -119,6 +119,8 @@
                                                         <input class="form-control" readonly="readonly" id="provinceCode" name="provinceCode" value="{$row.provinceName}{$row.cityName}{$row.countyName}">
                                                     </div>
                                                 </div>
+                                                {/if}
+                                                {if condition="!in_array($row['type'],[5,6])"}
                                                 <div class="rowGroup" id="introductionModeSpan">
                                                     <label class="col-sm-1 control-label spacing"><span style="color: red">*</span>引进方式</label>
                                                     <div class="col-sm-2 spacing" >
@@ -186,13 +188,15 @@
                                                         <input type="text" class="form-control" readonly="readonly" id="identifyConditionText" name="identifyConditionText" value="{$row.identifyConditionText}">
                                                     </div>
                                                 </div>
-                                                {if condition="!in_array($row['type'],[5])"}
+                                                {if condition="!in_array($row['type'],[5,6])"}
                                                 <div class="rowGroup">
                                                     <label class="col-sm-1 control-label spacing"><span style="color: red">*</span>认定条件名称</label>
                                                     <div class="col-sm-2 spacing">
                                                         <input type="text" class="form-control" readonly="readonly" id="identifyConditionName" name="identifyConditionName" value="{$row.identifyConditionName}"/>
                                                     </div>
                                                 </div>
+                                                {/if}
+                                                {if condition="!in_array($row['type'],[5])"}
                                                 <div class="rowGroup">
                                                     <label class="col-sm-1 control-label spacing"><span style="color: red">*</span>认定条件取得时间</label>
                                                     <div class="col-sm-2 spacing">