Эх сурвалжийг харах

去审核端审核页遮罩层、审核页加企业银行相关信息、去除初审搜索中人才层次与人才条件的关联关系

sugangqiang 2 жил өмнө
parent
commit
e31d087123

+ 2 - 1
app/admin/controller/Talent.php

@@ -133,7 +133,8 @@ class Talent extends AdminController {
      */
     public function fst_verify() {
         $enterprises = EnterpriseApi::getSimpleList();
-        return view("", ["enterprises" => $enterprises]);
+        $conditions = TalentConditionApi::getList([1, 2, 3, 4, 5, 6, 7], $this->user["type"]);
+        return view("", ["enterprises" => $enterprises, "talent_conditions" => $conditions]);
     }
 
     /**

+ 5 - 1
app/admin/view/talent/fst_verify.html

@@ -263,7 +263,7 @@
                                             人才层次
                                         </button>
                                     </div>
-                                    <select class="form-control" id="talent_arrange" onchange="TalentInfo.getIdentifyCondition();">
+                                    <select class="form-control" id="talent_arrange">
                                     </select>
                                 </div>
                             </div>
@@ -275,6 +275,10 @@
                                         </button>
                                     </div>
                                     <select class="form-control" id="talent_condition">
+                                        <option value="">--请选择--</option>
+                                        {volist name="talent_conditions" id="condition"}
+                                        <option value="{$condition.id}">{$condition.name}</option>
+                                        {/volist}
                                     </select>
                                 </div>
                             </div>

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

@@ -201,6 +201,30 @@
                                                 </div>
                                             </td>
                                         </tr>
+                                        <tr>
+                                            <td>
+                                                <div class="rowGroup word-wrap">
+                                                    <label class="control-label spacing td-label"><span style="color: red">*</span>单位开户银行</label>
+                                                    <div class="form-control" style="border: none;height:auto;">{$info.enterpriseBank}</div>
+                                                </div>
+                                            </td>
+                                            <td>
+                                                <div class="rowGroup word-wrap">
+                                                    <label class=" control-label spacing td-label"><span style="color: red">*</span>单位开户银行网点</label>
+                                                    <div class="form-control" style="border: none;height:auto;">{$info.enterpriseBankNetwork}</div>
+                                                </div>
+                                            </td>
+                                            <td>
+                                                <div class="rowGroup word-wrap">
+                                                    <label class=" control-label spacing td-label"><span style="color: red">*</span>银行账号</label>
+                                                    <div class="form-control" style="border: none;height:auto;">{$info.enterpriseBankCard}</div>
+                                                </div>
+                                            </td>
+                                            <td>
+                                                <div class="rowGroup word-wrap">
+                                                </div>
+                                            </td>
+                                        </tr>
                                         <tr>
                                             <td>
                                                 <div class="rowGroup">
@@ -413,13 +437,13 @@
                                             </td>
                                             <td>
                                                 <div class="rowGroup abroad_need_this" {if condition='!$info["study_abroad"] or $info["study_abroad"] eq 2'}style="display:none;"{/if}>
-                                                    <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 type="text" class="form-control" id="abroad_school" name="abroad_school" value="{$info.abroad_school}"/>
                                                 </div>
                                             </td>
                                             <td>
                                                 <div class="rowGroup abroad_need_this" {if condition='!$info["study_abroad"] or $info["study_abroad"] eq 2'}style="display:none;"{/if}>
-                                                    <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 type="text" class="form-control" id="abroad_major" name="abroad_major" value="{$info.abroad_major}"/>
                                                 </div>
                                             </td>
@@ -498,7 +522,7 @@
                                                 <div class="rowGroup col-sm-3 zhiren word-wrap-no-width" style="font-weight:bold;">
                                                     <label class="control-label spacing td-label" style="border-bottom:2px solid red;"><span style="color: red">*</span>是否符合<span style="font-size:16px;color:red;">人才直认</span>条件</label>                                                        
                                                     <input type="radio" name="isMatchZhiren" disabled value="1" {eq name="info.isMatchZhiren" value="1"}checked{/eq}/>是&nbsp;&nbsp;
-                                                    <input type="radio" name="isMatchZhiren"  disabled value="0" {if condition="!$info['isMatchZhiren']"}checked{/if}/>否
+                                                           <input type="radio" name="isMatchZhiren"  disabled value="0" {if condition="!$info['isMatchZhiren']"}checked{/if}/>否
                                                 </div>
                                                 <div class="rowGroup col-sm-6">
                                                     <div class="rowGroup">
@@ -514,11 +538,11 @@
                                                 {/if}
                                                 {if condition="$info['source_city'] || $info['source_county']"}
                                                 <div class="rowGroup col-sm-3" {if condition="!$info['source_city']"}style="display:none;"{/if}>
-                                                    <label class="control-label spacing"><span style="color: red">*</span>入选来源地级市</label>
+                                                     <label class="control-label spacing"><span style="color: red">*</span>入选来源地级市</label>
                                                     <input type="text" class="form-control" id="source_city" name="source_city" value="{$info.sourceCityName}"/>
                                                 </div>
                                                 <div class="rowGroup col-sm-3" {if condition="!$info['source_county']"}style="display:none;"{/if}>
-                                                    <label class="control-label spacing"><span style="color: red">*</span>入选来源县市区</label>
+                                                     <label class="control-label spacing"><span style="color: red">*</span>入选来源县市区</label>
                                                     <input type="text" class="form-control" id="source_county" name="source_county" value="{$info.sourceCountyName}"/>
                                                 </div>
                                                 {/if}

+ 5 - 1
app/common/api/TalentConditionApi.php

@@ -12,7 +12,11 @@ use app\common\model\TalentCondition;
 class TalentConditionApi {
 
     public static function getList($lv, $type, $cat = "") {
-        $where[] = ["talentLevel", "=", $lv];
+        if (is_array($lv)) {
+            $where[] = ["talentLevel", "in", $lv];
+        } else {
+            $where[] = ["talentLevel", "=", $lv];
+        }
         $where[] = ["type", "=", $type];
         $where[] = ["delete", "=", 0];
         $where[] = ["active", "=", 1];

+ 4 - 0
app/common/api/VerifyApi.php

@@ -46,7 +46,11 @@ class VerifyApi {
             $info["enterpriseName"] = $enterprise["name"];
             $info["enterpriseId"] = $enterprise["id"];
             $info["enterpriseType"] = $enterprise["type"];
+            $info["enterpriseEphone"] = $enterprise["ephone"];
             $info["enterpriseTag"] = $enterprise["enterpriseTag"];
+            $info["enterpriseBankCard"] = $enterprise["bankCard"];
+            $info["enterpriseBankNetwork"] = $enterprise["bankNetwork"];
+            $info["enterpriseBank"] = $enterprise["bank"];
             if ($enterprise["street"]) {
                 $info["street"] = $enterprise["street"];
                 $info["streetName"] = DictApi::selectByParentCode("street")[$enterprise["street"]];

+ 1 - 0
public/static/modular/talentIdentify/talentInfo/talentInfo_base.js

@@ -159,6 +159,7 @@ TalentInfo.openCheckTalentInfo = function () {
             area: ['800px', '420px'], //宽高
             fix: false, //不固定
             maxmin: true,
+            shade: 0,
             content: '/admin/talent/common_check/id/' + TalentInfo.seItem.id + '/1',
             btn: ['<i class="fa fa-eye"></i>&nbsp;&nbsp;保存未提交', '<i class="fa fa-save"></i>&nbsp;&nbsp;提交审核', '<i class="fa fa-eraser"></i>&nbsp;&nbsp;关闭'],
             btnAlign: 'c',

+ 1 - 1
public/static/modular/talentIdentify/talentInfo/talentInfo_common.js

@@ -202,7 +202,7 @@ TalentInfo.init = function () {
         {"name": "source", "code": "source"},
         {"name": "street", "code": "street"}];
     Feng.findChildDictBatch(JSON.stringify(arr));
-    TalentInfo.getIdentifyCondition();
+    //TalentInfo.getIdentifyCondition();
     TalentInfo.getProvince();
     $("#talent_condition,#enterprise_id").on('chosen:ready', function (e, params) {
         $(".chosen-container-single .chosen-single").css("padding", "4px 0px 0px 4px");