fdfd

application/admin/controller/ZcbdPosition.php

@@ -125,6 +125,7 @@ class ZcbdPosition extends Base
                 ->find();
 
             $v['type_name'] = $one['name'];
+            $v['extend'] = json_decode($v['extend'], true);
 
             $list[$k] = $v;
         }
@@ -1248,4 +1249,10 @@ class ZcbdPosition extends Base
             }
         }
     }
+
+    public function show()
+    {
+        $this->assign(【】);
+        return $this->fetch();
+    }
 }

application/admin/template/zcbd_position/index.htm

@@ -52,7 +52,7 @@
                     <thead>
                         <tr>
                             {if condition="$main_lang == $admin_lang || !empty($global['language_split'])"}
-                                <th class="sign w40" axis="col0">
+                                <th class="sign w40" axis="col0" style="width:20px;">
                                     <div class="tc"><input type="checkbox" class="checkAll"></div>
                                 </th>
                             {/if}
@@ -61,11 +61,11 @@
                                 <div class="tc">ID</div>
                             </th>
 
-                            <th abbr="article_title" axis="col3"  class="w200">
+                            <th abbr="article_title" axis="col3"  class="w150">
                                 <div class="tl text-l10" style="width: 100%">个人信息</div>
                             </th>
 
-                            <th abbr="article_title" axis="col3"  class="w100">
+                            <th abbr="article_title" axis="col3"  class="w150">
                                 <div class="tl text-l10" style="width: 100%">申报信息</div>
                             </th>
 
@@ -75,15 +75,11 @@
 
 
                             <th abbr="article_title" axis="col3" class="w100">
-                                <div class="tc">是否需要前置证书</div>
+                                <div class="tc">拥有证书</div>
                             </th>
 
                             <th abbr="article_title" axis="col3" class="w120">
-                                <div class="tc">主题图片</div>
-                            </th>
-
-                            <th abbr="article_time" axis="col6" class="w60">
-                                <div class="tc">启用</div>
+                                <div class="tc">毕业专业</div>
                             </th>
 
                             <th axis="col1" class="w180">
@@ -127,17 +123,18 @@
 
                                 <td align="left">
 
-                                    <div class="tc w200">
+                                    <div class="tc w150">
                                         称呼: {$vo.ch} <br/>
                                         手机号码: {$vo.sjhm} <br/>
+                                        所在地区: {$vo.extend.szsf}/{$vo.extend.szsc}<br/>
                                     </div>
                                 </td>
 
                                 <td>
-                                    <div class="tc w100">
-                                        预选地区: {$vo.yxdq}<br/>
-                                        申报专业: {$vo.sbzy}<br/>
-                                        申报等级: {$vo.sbdj}<br/>
+                                    <div class="tc w150">
+
+                                        申报专业: {$vo.extend.sbzy}<br/>
+                                        申报等级: {$vo.extend.sbdj}<br/>
                                     </div>
 
                                 </td>
@@ -148,8 +145,8 @@
                                         年龄: {$vo.nl}岁<br/>
                                         毕业时间: {$vo.bysj}<br/>
 
-                                        学历: {$vo.xl}<br/>
-                                        学校类型: {$vo.xxlx}<br/>
+                                        学历: {$vo.extend.xl}<br/>
+                                        学校类型: {$vo.extend.xxlx}<br/>
 
 
                                     </div>
@@ -158,44 +155,22 @@
 
                                 <td>
                                     <div class="tc w100">
-
-                                        {eyou:if condition='($vo.is_zs > 0)'}
-                                        需要 <?php echo count(json_decode($vo['zhengshu'])); ?>个
-                                        {eyou:else /}
-                                        不需要
-                                        {/eyou:if}
-
+                                        {$vo.extend.zs?$vo.extend.zs:'无'}
                                     </div>
                                 </td>
                                 <td>
                                     <div class="tc w120">
-                                        <ul class="adpic">
-                                            {volist name="$vo.ad" id="vs" length="1" }
-                                                <li>
-                                                    <img src="{$vs.litpic}"> {eq name="$vo.type" value="1"}<span>{$vo.ad_count}</span>{/eq}
-                                                </li>
-                                            {/volist}
-                                        </ul>
-                                    </div>
-                                </td>
-                                <td>
-                                    <div class="tc w60">
-                                        {if condition="$vo['status'] eq 1"}
-                                            <span class="yes" {eq name="$Think.const.CONTROLLER_NAME.'@edit'|is_check_access" value="1"}onClick="changeTableVal('zcwd_position','id','{$vo.id}','status',this);"{/eq} ><i class="fa fa-check-circle"></i>是</span>
-                                        {else /}
-                                            <span class="no" {eq name="$Think.const.CONTROLLER_NAME.'@edit'|is_check_access" value="1"}onClick="changeTableVal('zcwd_position','id','{$vo.id}','status',this);"{/eq} ><i class="fa fa-ban"></i>否</span>
-                                        {/if}
+                                        {$vo.extend.zy?$vo.extend.zy:"无"}
                                     </div>
                                 </td>
                                 <td class="operation">
                                     <div class="w180 tc">
-                                        {eq name="$Think.const.CONTROLLER_NAME.'@edit'|is_check_access" value="1"}
-                                            <a href="javascript:void(0);" data-href="{:url('ZcwfPosition/edit',array('id'=>$vo['id']))}" data-closereload="1" class="btn blue" onclick="openFullframe(this, '编辑前置条件规则', '80%', '70%');">编辑</a> <i></i>
-                                        {/eq}
+
+                                        <a href="javascript:void(0);" data-href="{:url('ZcbdPosition/show',array('h'=>$vo['code']))}" data-closereload="1" class="btn blue" onclick="openFullframe(this, '查看匹配详情', '80%', '100%');">查看</a> <i></i>
 
                                         {if condition="$main_lang == $admin_lang || !empty($global['language_split'])"}
                                             {eq name="$Think.const.CONTROLLER_NAME.'@del'|is_check_access" value="1"}
-                                                <a class="btn red"  href="javascript:void(0);" data-url="{:url('ZcwfPosition/del')}" data-id="{$vo.id}" onClick="delfun(this);">删除</a>
+                                                <a class="btn red"  href="javascript:void(0);" data-url="{:url('ZcbdPosition/del')}" data-id="{$vo.id}" onClick="delfun(this);">删除</a>
                                             {/eq} <!--<i></i>-->
                                         {/if}
     									

application/admin/template/zcbd_position/show.htm

@@ -0,0 +1,666 @@
+
+<?php
+
+function hide_phone_number_regex($phone_number) {
+    return preg_replace('/(\d{3})\d{4}(\d{4})/', '$1****$2', $phone_number);
+}
+
+$param = request()->param();
+function isValidChineseMobileNumber($number) {
+    return preg_match('/^1\d{10}$/', $number) ? true : false;
+}
+if(!empty($param['p'])){
+    //验证手机号码
+    if(isValidChineseMobileNumber($param['p'])) {
+        $is_cha = 1;
+    }else{
+        $is_cha = 0;
+    }
+}else{
+    $is_cha = 0;
+}
+
+$is_detail = 0;
+if(!empty($param['h'])){
+    $is_cha = 1;
+    $is_detail = 1;
+
+    $sql = "select * from ey_zc_form where code='".$param['h']."' and status=1 and is_del=0 limit 1";
+
+}
+
+//缓存问题 增加时间参数即可
+
+?>
+
+{eyou:if condition='($is_detail === 1)'}
+{eyou:sql sql='$sql' cachetime='3600' empty=''}
+{eyou:php}
+$detail = $field;
+$extend_info = json_decode($field['extend'],true);
+{/eyou:php}
+{/eyou:sql}
+
+
+<?php
+
+//区域
+if((int)$detail['yxdq'] === 10001){
+    $area_name = '不限制';
+}else if((int)$detail['yxdq'] === 20000){
+    $area_name = '全国';
+}else if((int)$detail['yxdq'] === 0){
+    $area_name = '未选';
+}else{
+    $area_name = '';
+    $sql2 = "select id,name from ey_citysite where id=".$detail['yxdq'];
+}
+
+//职称
+$zc_name = '';
+$sql3 = "select id,title from ey_zc_position where id=".$detail['sbzy'];
+
+//职称等级
+$zc_dj = '';
+$sql4 = "select id,title from ey_zcdj_position where id=".$detail['sbdj'];
+?>
+
+{eyou:if condition='($area_name == "")'}
+{eyou:sql sql='$sql2' cachetime='3600' empty=''}
+{eyou:php}
+$area_name = $field['name'];
+{/eyou:php}
+{/eyou:sql}
+{/eyou:if}
+
+<?php
+/*
+ *
+ * 减少sql调用
+ *
+ * {eyou:sql sql='$sql3' cachetime='3600' empty=''}
+    {eyou:php}
+        $zc_name = $field['title'];
+    {/eyou:php}
+{/eyou:sql}
+
+{eyou:sql sql='$sql4' cachetime='3600' empty=''}
+    {eyou:php}
+        $zc_dj = $field['title'];
+    {/eyou:php}
+{/eyou:sql}
+ *
+ *
+ */
+
+?>
+
+{/eyou:if}
+
+
+
+
+<!DOCTYPE html>
+<html lang="zh-CN">
+<head>
+
+    <title>职称评审一键匹配系统</title>
+    <meta name="keywords" content="职称评审系统">
+    <meta name="description" content="职称评审系统,输入学历、区域、专业名称等,即可为您一建匹配符合相应的区域，并提供详细的申报流程指引及各地规则参考。">
+
+    <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=no">
+    <meta name="renderer" content="webkit">
+    <meta name="force-rendering" content="webkit">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge,Chrome=1">
+    <meta name="applicable-device" content="pc,mobile">
+    <meta name="author" content="order by ">
+
+
+<!-- 最新版本的 Bootstrap 核心 CSS 文件 -->
+<link rel="stylesheet" href="https://cdn.bootcdn.net/ajax/libs/twitter-bootstrap/3.4.1/css/bootstrap.min.css" integrity="sha384-HSMxcRTRxnN+Bdg0JdbxYKrThecOKuH5zCYotlSAcp1+c8xmyTe9GYg1l9a69psu" crossorigin="anonymous">
+
+<!-- 可选的 Bootstrap 主题文件（一般不用引入） -->
+<link rel="stylesheet" href="https://cdn.bootcdn.net/ajax/libs/twitter-bootstrap/3.4.1/css/bootstrap-theme.min.css" integrity="sha384-6pzBo3FDv/PJ8r2KRkGHifhEocL+1X2rVCTTkUfGk7/0pbek5mMa1upzvWbrUbOZ" crossorigin="anonymous">
+
+<!-- 最新的 Bootstrap 核心 JavaScript 文件 -->
+<script src="https://cdn.bootcdn.net/ajax/libs/twitter-bootstrap/3.4.1/js/bootstrap.min.js" integrity="sha384-aJ21OjlMXNL5UyIl/XNwTMqvzeRMZH2w8c5cRVpzpU8Y5bApTppSuUkhZXN0VxHd" crossorigin="anonymous"></script>
+
+<body>
+
+<div style="width:600px;margin: 0 auto;">
+<div class="well" style="margin-top:20px;">
+<p>匹配结果展示:<br/><br/>
+    <!--编号: 202410247774<br/>-->
+    姓名: {$detail.ch}<br/>
+    手机: <?php echo $detail['sjhm']; ?><br/>
+    地区: {$extend_info.szsf}/{$extend_info.szcs}
+</p>
+</div>
+
+<div class="well" style="margin-top:20px;">
+
+    <?php
+    /*
+     *
+     *  预选地区: {$area_name}<br/>
+     */
+    ?>
+    申报专业: {$extend_info.sbzy}<br/>
+    申报等级: {$extend_info.sbdj}<br/>
+
+</div>
+<?php
+//现在没有所谓预选和其他推荐的区分
+$sql_end = '';
+$t = '';
+$scen = '抱歉!暂时未找到相关匹配结果信息!';
+?>
+
+<?php
+$result_map = "";
+$xl = ['不限制','中专','高技','大专','本科','硕士','博士'];
+//先列出全国 再其他省 再到市
+$sql = 'select * from ey_zcwd_position where type='.$detail['sbzy'].' and sbdj='.$detail['sbdj'].' and is_del=0 and status=1'.$sql_end.' order by sf asc';
+$is_list_empty = '';
+?>
+{eyou:sql sql="$sql" cachetime='3600' empty='' id="field"}
+<?php
+$is_list_empty = $field['id'];
+?>
+<div class="panel panel-primary">
+    <div class="panel-body">
+
+        {eyou:if condition='((int)$field.sf === 0)'}
+        （{$t}匹配结果）全国通用申报要求对比结果如下：
+        {eyou:else /}
+        <?php
+        if((int)$field['sf'] > 0){
+            $sql22 = "select id,name from ey_citysite where id=".$field['sf'];
+            $sql222 = '';
+            if((int)$field['cs'] > 0){
+                $sql222 = "select id,name from ey_citysite where id=".$field['cs'];
+            }
+        }
+        ?>
+
+        {eyou:sql sql='$sql22' cachetime='3600' empty='' id="kop"}
+        <?php
+        $aname = $kop['name'];
+        ?>
+        {/eyou:sql}
+        {eyou:if condition='((int)$field.cs > 0)'}
+        {eyou:sql sql='$sql222' cachetime='3600' empty='' id="kop"}
+        <?php
+        $bname = $kop['name'];
+        ?>
+        {/eyou:sql}
+        {/eyou:if}
+
+        （{$t}匹配结果）{$aname}{$bname}地区申报要求对比结果如下：
+        {/eyou:if}
+
+
+    </div>
+    <div class="panel-footer" style="padding:3px 5px;">
+
+        <!--查询专业-->
+        <?php
+        $num = 0;
+        $sql2 = "select * from ey_zcwe_position where type=".$field['id']." and is_del=0 and status=1";
+        ?>
+        {eyou:sql sql="$sql2" cachetime='3600' empty='暂无相关数据' id="field2"}
+        <table class="table table-bordered" style="margin-bottom:0px;margin-top:5px;">
+            <thead>
+            <tr>
+                <th scope="col" style="text-align: center;">情况<br/>{$i}</th>
+                <th scope="col">字段<br/>信息</th>
+                <th scope="col">实际<br/>要求</th>
+                <th scope="col">填写<br/>资料</th>
+                <th scope="col">匹配<br/>结果</th>
+            </tr>
+            </thead>
+            <tbody>
+            <?php
+            //先判断学历是否符合
+            ?>
+            <tr>
+                <th scope="row">1</th>
+                <td>学历</td>
+                <td><?php echo $xl[$field2['xlyq']];?></td>
+                <td><?php echo $xl[$detail['xl']];?></td>
+                <td>
+                    <?php
+                    if($field2['xlyq'] == $detail['xl']){
+                        echo "<font style='color: blue;'>符合</font>";
+                        $num++;
+                    }else{
+                        echo "<font style='color: red;'>不符合</font>";
+                    }
+                    ?>
+                </td>
+            </tr>
+            <tr>
+                <th scope="row">2</th>
+                <td>年龄</td>
+                <td>
+                    <?php
+                    if((int)$field2['is_ega'] === 0){
+                        echo "不限制";
+                    }else{
+                        echo $field2['ega_0'].'-'.$field2['ega_1'].'岁';
+                    }
+                    ?>
+                </td>
+                <td>
+                    {$detail.nl}岁
+                </td>
+                <td>
+                    <?php
+                    if((int)$detail['nl'] <= (int)$field2['ega_1'] && (int)$detail['nl'] >= (int)$field2['ega_0']){
+                        echo "<font style='color: blue;'>符合</font>";
+                        $num++;
+                    }else{
+                        echo "<font style='color: red;'>不符合</font>";
+                    }
+                    ?>
+                </td>
+
+            </tr>
+            <tr>
+                <th scope="row">3</th>
+                <td>毕业<br/>专业</td>
+                <td>
+
+                    {eyou:if condition='((int)$field2.byzy === 0)'}
+                    不限制
+                    {eyou:else /}
+
+                    <?php
+                    //查询出毕业专业 $deta
+                    $zhengshu2 = json_decode($field2['zhengshu2'],true);
+                    $zhengshu2_str = '0';
+                    foreach ($zhengshu2 as $k => $v){
+                        $zhengshu2_str .= ','.$v;
+                    }
+                    $sql3 = "select id,title from ey_zczy_position where id IN(".$zhengshu2_str.") and is_del=0 and status=1";
+                    ?>
+
+
+                    {eyou:notempty name='$zhengshu2' /}
+                    {eyou:sql sql="$sql3" cachetime='3600' empty='' id="field3"}
+                    <?php /***/ ?>{$field3.title}<br/>
+                    {/eyou:sql}
+                    {eyou:else /}
+                    不限制
+                    {/eyou:notempty}
+
+
+
+                    {/eyou:if}
+
+
+
+                </td>
+                <td>
+                    <?php
+                    //查询出毕业专业 $deta
+                    $zhengshu = json_decode($detail['zy'],true);
+                    $zhengshu_str = '0';
+                    foreach ($zhengshu as $k => $v){
+                        $zhengshu_str .= ','.$v;
+                    }
+                    $sql3 = "select id,title from ey_zczy_position where id IN(".$zhengshu_str.") and is_del=0 and status=1";
+                    ?>
+
+                    {eyou:notempty name='$zhengshu' /}
+                    {eyou:sql sql="$sql3" cachetime='3600' empty='' id="field3"}
+                    {$field3.title}<br/>
+                    {/eyou:sql}
+                    {eyou:else /}
+                    无
+                    {/eyou:notempty}
+                </td>
+
+                <td>
+                    <?php
+                    if((int)$field2.byzy === 0 || empty($zhengshu2)){
+                        echo "<font style='color: blue;'>符合</font>";
+                        $num++;
+                    }else{
+                        if(empty($zhengshu)){
+                            echo "<font style='color: red;'>不符合</font>";
+                        }else{
+                            $run = "<font style='color: red;'>不符合</font>";
+                            $ik = 1;
+                            foreach ($zhengshu as $k => $v){
+                                if(in_array($v,$zhengshu2)){
+                                    //$run = '<font style="color: blue;">符合</font><br/>'.$ik.'项';
+                                    $run = '<font style="color: blue;">符合</font><br/>';
+                                    $ik++;
+                                }
+                            }
+                            echo $run;
+                            if($ik>1){
+                                $num++; //符合+1
+                            }
+                        }
+                    }
+                    ?>
+                </td>
+
+
+            </tr>
+            <tr>
+                <th scope="row">4</th>
+                <td>学校<br/>类型</td>
+                <td>
+                    {eyou:if condition='((int)$field2.xxlx === 0)'}
+                    不限制
+                    {eyou:else /}
+                    <?php
+                    if((int)$field2['xxlx'] === 1) echo "全日制";
+                    if((int)$field2['xxlx'] === 2) echo "非全日制";
+                    ?>
+                    {/eyou:if}
+                </td>
+                <td>
+                    {eyou:if condition='((int)$detail.xxlx === 1)'}
+                    全日制
+                    {eyou:else /}
+                    非全日制
+                    {/eyou:if}
+                </td>
+                <td>
+                    {eyou:if condition='((int)$field2.xxlx === 0)'}
+                    符合
+                    {eyou:else /}
+                    <?php
+                    if((int)$field2['xxlx'] === (int)$detail['xxlx']){
+                        echo "<font style='color: blue;'>符合</font>";
+                        $num++;
+                    }else{
+                        echo "<font style='color: red;'>不符合</font>";
+                    }
+                    ?>
+                    {/eyou:if}
+                </td>
+            </tr>
+            <tr>
+                <th scope="row">5</th>
+                <td>毕业<br/>时间</td>
+                <td>
+                    {eyou:if condition='((int)$field2.bysj === 0)'}
+                    <?php /*不要求**/  ?>不要求
+                    {eyou:else /}
+                    <?php /*要求>={$field2.bysj_time}年**/  ?>要求>={$field2.bysj_time}年
+                    {/eyou:if}
+                </td>
+                <td>
+
+                    <?php
+
+                    //$detail['bysj']
+                    //假设我们要计算的时间是2000年1月1日
+                    $startDate = new DateTime($detail['bysj']);
+                    // 获取现在的日期
+                    $now = new DateTime('now');
+                    // 计算差值
+                    $interval = date_diff($startDate, $now);
+                    // 输出年份
+                    //echo $interval->y . ' years';
+                    if($interval->y > 0){
+                        echo '已毕业'.$interval->y . '年';
+                    }else{
+                        echo '刚毕业不足1年';
+                    }
+
+
+                    ?>
+
+
+                </td>
+                <td>
+                    <?php
+                    if((int)$field2['bysj'] === 0){
+                        echo "<font style='color: blue;'>符合</font>";
+                        $num++;
+                    }else{
+                        if((int)$field2['bysj_time'] <= $interval->y){
+                            echo "<font style='color: blue;'>符合</font>";
+                            $num++;
+                        }else{
+                            echo "<font style='color: red;'>不符合</font>";
+                        }
+                    }
+                    ?>
+                </td>
+            </tr>
+            <tr>
+                <th scope="row">6</th>
+                <td>前置<br/>证书</td>
+                <td>
+                    <?php
+                    $zs_all = [];
+                    //(且或) 列出证书要求
+                    //调用需要的记录 is_zs
+                    $sql5 = "select * from ey_zcwf_position where type_son=".$field2['id']." and is_del=0 and status=1 and is_zs=1";
+                    ?>
+                    {eyou:sql sql="$sql5" cachetime='3600' empty='不限制' id="field3"}
+
+                    <?php
+                    if($i > 1){
+                        echo "或<br/>";
+                    }
+                    ?>
+
+                    <?php
+                    //查询出证书 $deta
+                    $zhengshu3 = json_decode($field3['zhengshu'],true);
+                    $sjnx = json_decode($field3['sjnx'],true);
+                    //var_dump($field3);
+                    //var_dump($field3['zhengshu']);
+                    //var_dump($field3['sjnx']);
+                    $zs_all[] = [
+                        'a' => $zhengshu3,
+                        'b' => $sjnx
+                    ];
+                    //var_dump($sjnx);
+                    $zhengshu3_str = '0';
+                    foreach ($zhengshu3 as $k => $v){
+                        $zhengshu3_str .= ','.$v;
+                    }
+                    $sql3 = "select id,title from ey_zczs_position where id IN(".$zhengshu3_str.") and is_del=0 and status=1";
+                    ?>
+                    {eyou:notempty name='$zhengshu3' /}
+                    {eyou:sql sql="$sql3" cachetime='3600' empty='' id="field4"}
+                    <?php
+                    $key_s = array_search($field4['id'], $zhengshu3);
+                    $year_s = $sjnx[$key_s];
+                    ?>
+                    <?php  /**{$field4.title}(需要{$year_s}年)**/?>{$field4.title}(需要{$year_s}年)<br/>
+                    {/eyou:sql}
+                    {eyou:else /}
+                    <!--忽略-->
+                    {/eyou:notempty}
+
+
+                    {/eyou:sql}
+                </td>
+                <td>
+
+
+                    <?php
+                    //查询出拥有的证书 $deta
+                    $zhengshu = json_decode($detail['zs'],true);
+                    $zsnx = json_decode($detail['zsnx'],true);
+                    $zhengshu_str = '0';
+                    foreach ($zhengshu as $k => $v){
+                        $zhengshu_str .= ','.$v;
+                    }
+                    $sql3 = "select id,title from ey_zczs_position where id IN(".$zhengshu_str.") and is_del=0 and status=1";
+                    ?>
+
+                    {eyou:notempty name='$zhengshu' /}
+                    {eyou:sql sql="$sql3" cachetime='3600' empty='' id="field3"}
+                    <?php
+                    $key_s = array_search($field3['id'], $zhengshu);
+                    $year_s = $zsnx[$key_s];
+                    ?>
+                    <?php /**{$field3.title}(拥有{$year_s}年)**/ ?>{$field3.title}(拥有{$year_s}年)<br/>
+                    {/eyou:sql}
+                    {eyou:else /}
+                    无
+                    {/eyou:notempty}
+
+                </td>
+
+                <td>
+                    <?php
+                    //var_dump($field['id']);
+                    //var_dump($zs_all);
+                    //表示没查出限制要求
+                    if(empty($zhengshu3)){
+                        echo "<font style='color: blue;'>符合</font>";
+                        $num++;
+                    }else{
+                        if(empty($zhengshu)){
+                            //用户没有证书
+                            echo "<font style='color: red;'>不符合</font>";
+                        }else{
+                            //判断是否包含
+                            //第一轮 循环 或
+                            foreach ($zs_all as $k => $v){
+                                if($k > 0){
+                                    //echo "或<br/>";
+                                }
+                                $ik = 1;
+                                $ik2 = 1;
+                                $ik3 = 1;
+                                //第二轮 循环 且
+                                //var_dump($v['a']);
+                                $ik4 = 0; //真实有效数量
+                                foreach ($v['a'] as $k2 => $v2){
+                                    //var_dump($v2);
+                                    //var_dump($zhengshu);
+                                    //第三轮 循环 每一项要求是否在 用户拥有的证书 里面
+                                    //必须完全满足
+                                    if((int)$v2 > 0) {
+                                        if (in_array($v2, $zhengshu)) {
+                                            //判断年限是否符合要求
+                                            $key_i = array_search($v2, $zhengshu);
+                                            //var_dump($zsnx[$key_i]);
+                                            if ((int)$zsnx[$key_i] >= (int)$v['b'][$k2]) {
+                                                $run_1 = '<font style="color: blue;">符合</font><br/>' . $ik . '项';
+                                                $ik++;
+                                            } else {
+                                                $run_2 = '<font style="color: blue;">年限不符合</font><br/>' . $ik2 . '项';
+                                                $ik2++;
+                                            }
+                                        } else {
+                                            $run_3 = '<font style="color: blue;">未拥有</font><br/>' . $ik3 . '项';
+                                            $ik3++;
+                                        }
+                                        $ik4++;
+                                    }
+                                }
+                                //具体情况 循环且
+                                //echo $run_1;
+                                //echo $run_2;
+                                //echo $run_3;
+                                //echo count($v['a']);
+                                //var_dump($ik);
+                                //var_dump(count($v['a']));
+                                if(($ik-1) === $ik4){
+                                    //echo "<font style='color: blue;'>符合1</font>";
+                                    $res = "<font style='color: blue;'>符合</font>";
+                                    $num++;
+                                    //跳出循环 已经符合其中 一个 且了
+                                    break;
+                                }else{
+                                    //echo "<font style='color: red;'>不符合2</font>";
+                                    $res = "<font style='color: red;'>不符合</font>";
+                                }
+                            }
+                            echo $res;
+                        }
+                    }
+                    ?>
+
+
+                </td>
+
+
+            </tr>
+            <tr>
+                <th scope="row">7</th>
+                <td>综合<br/>评估</td>
+                <td colspan="3" style="vertical-align:middle;">
+
+
+                    <?php
+                    //echo $num;
+                    if($num >= 6){
+                        //多次循环可能大于6
+                        echo "<font style='color: blue;'>完全符合要求!</font>";
+
+                        if(!empty($bname)){
+                            $bname_str = '/'.$bname;
+                        }
+
+                        $result_map .= $aname.$bname_str.'地区<br/>';
+
+
+                    }else if($num === 0){
+                        echo "<font style='color: red;'>完全不符合要求!</font>";
+                    }else{
+                        echo "<font style='color: #ff4c08;'>未完全符合要求!</font>";
+                    }
+                    $num = 0;
+                    ?>
+
+                </td>
+            </tr>
+            </tbody>
+        </table>
+        {/eyou:sql}
+    </div>
+</div>
+{/eyou:sql}
+
+<?php
+//var_dump($is_list_empty);
+?>
+{eyou:if condition='(empty($is_list_empty))'}
+<div class="alert alert-danger" role="alert" style="">
+    <!--<span class="glyphicon glyphicon-exclamation-sign" aria-hidden="true"></span>
+    <span class="sr-only">Error:</span>-->
+    {$scen}
+</div>
+{eyou:else /}
+
+<?php
+if(empty($result_map)){
+    $info = '';
+    $result_map = "抱歉!未找到符合地区!";
+    $class = 'alert-danger';
+}else{
+    //$result_map;
+    $info = "找到以下符合申请的地区:<br/><br/>";
+    $class = 'alert-success';
+}
+?>
+
+
+<div class="alert {$class}" role="alert" style="">
+    <?php
+    echo $info;
+    echo $result_map;
+    ?>
+</div>
+
+{/eyou:if}
+</div>
+</body>
+
+</html>

application/api/controller/Diyajax.php

@@ -353,12 +353,48 @@ class Diyajax extends Base
         $param['zhengshu_val'] = substr($param['zhengshu_val'], 0, -1);
         $param['zhengshu'] = explode(',',$param['zhengshu_val']);
 
+
+        //翻译冗余字段
+        $xl_arr = ['','中专','高技','大专','本科','硕士','博士'];
+        $xxlx_arr = ['','全日制','非全日制'];
+        $sbzy_val = Db::name('zc_position')->where('id',$param['sbzy'])->value('title');
+        $sbdj_val = Db::name('zcdj_position')->where('id',$param['sbdj'])->value('title');
+        $zs_list = Db::name('zczs_position')->field('id,title')->where('id','in',$param['zhengshu'])->select();
+        $zs_str = '';
+        foreach ($zs_list as $k => $v){
+            $key = array_search($v['id'],$param['zhengshu']);
+            $zs_str .= $v['title'].'('.$param['zsnx'][$key].'年),';
+        }
+        $zy_list = Db::name('zczy_position')->field('id,title')->where('id','in',$param['zy'])->select();
+        $zy_str = '';
+        foreach ($zy_list as $k => $v){
+            $zy_str .= $v['title'].',';
+        }
+        $szcs_str = Db::name('citysite')
+            ->where('id', $param['szcs'])
+            ->value('name');
+        $szsf_str = Db::name('citysite')
+            ->where('id', $param['szsf'])
+            ->value('name');
+        $json = [
+            'xl' => $xl_arr[$param['xl']], //学历
+            'sbzy' => $sbzy_val, //申报专业
+            'sbdj' => $sbdj_val, //申报等级
+            'xxlx' => $xxlx_arr[$param['xxlx']], //学校类型
+            'zs' => $zs_str, //证书
+            'zy' => $zy_str, //专业
+            'szsf' => $szsf_str, //省份
+            'szcs' => $szcs_str, //城市
+        ];
+        $json_str = json_encode($json,JSON_UNESCAPED_UNICODE);
+        //{"xl":"中专","sbzy":"建筑职称","sbdj":"初级","xxlx":"全日制","zs":"建筑一级证书(1年),","zy":"计算机网络技术,","szsf":"广东","szcs":"广州"}
+
         //插入数据
         $insertData = [
             'yxdq' => $param['yxdq'], //预选地区
             'sbzy' => $param['sbzy'], //申报专业
             'sbdj' => $param['sbdj'], //申报等级
-            'bysj' => $param['bysj'], //毕业时间
+            'bysj' => $param['bysj2'], //毕业时间
             'nl' => $param['nl'], //年龄
             'xl' => $param['xl'], //学历
             'xxlx' => $param['xxlx'], //学校类型
@@ -371,6 +407,9 @@ class Diyajax extends Base
             'updatetime' => getTime(),
             'is_del' => 0,
             'status' => 1,
+            'szcs' => $param['szcs'], //城市
+            'szsf' => $param['szsf'], //省份
+            'extend' => $json_str
         ];
         $res_id = Db::name('zc_form')->insertGetId($insertData);
         if($res_id > 0){
@@ -382,4 +421,22 @@ class Diyajax extends Base
         }
         respose(['code'=>0, 'msg'=>'提交失败', 'data'=>[]]);
     }
+
+    /*
+     * 获取城市1
+     */
+    public function getCsList(){
+        $param = request()->param();
+        $param['id'] = (int)$param['id'];
+        if(!empty($param['id'])){
+            $list = Db::name('citysite')
+                ->field('id,name')
+                ->where('parent_id', $param['id'])
+                ->where('status',1)
+                ->select();
+            respose(['code'=>1, 'msg'=>'请求成功', 'data'=>$list]);
+        }else{
+            respose(['code'=>0, 'msg'=>'请求失败', 'data'=>[]]);
+        }
+    }
 }

template/pc/common/include/step.htm

@@ -23,7 +23,7 @@
 
             $this.daterangepicker({
                 locale : {
-                    "format" : "YYYY-MM-DD",// 显示格式
+                    //"format" : "YYYY-MM",// 显示格式 //YYYY-MM-DD
                     "separator" : " / ",// 两个日期之间的分割线
                     // 中文化
                     "applyLabel" : "确定",
@@ -34,7 +34,12 @@
                     "monthNames" : [ "一月", "二月", "三月", "四月", "五月", "六", "七月", "八月", "九月", "十月", "十一月", "十二月" ],
                     "firstDay" : 1,
                     "defaultDate": new Date(),
+                    "format": 'YYYY', // 设置年份格式
                 },
+                startDate: moment(),
+                endDate: moment(),
+                minView: "years", // 设置最小视图为年份
+                maxView: "years", // 设置最大视图为年份
                 showDropdowns: true,
                 singleDatePicker: true,
                 opens: 'right', //日期选择框的弹出位置
@@ -233,6 +238,51 @@
 
         });
 
+
+        /*
+        * 选择省份 触发城市
+        *
+        * */
+        $("#choose11").change(function (){
+
+            var id = $(this).val();
+            if(id > 0) {
+                //发送请求
+                $('#loadingModal').modal('show');
+                $.ajax({
+                    url: '/api/Diyajax/getCsList',
+                    method: 'POST',
+                    dataType: 'json', // 指定响应数据为JSON
+                    data: {
+                        id : id
+                    },
+                    success: function(data) {
+                        // 请求成功后隐藏加载状态
+                        $('#loadingModal').modal('hide');
+                        // 处理返回的数据
+                        console.log('Ajax response:', data);
+                        console.log(data.data);
+                        var html = '<option value="0">选择您所在城市</option>';
+                        $.each(data.data,function (i,e){
+                            console.log(e);
+                            html += '<option value="'+e.id+'">'+e.name+'</option>';
+                        });
+                        $('#choose12').empty();
+                        $('#choose12').append(html);
+                    },
+                    error: function(xhr, status, error) {
+                        // 请求失败后隐藏加载状态
+                        $('#loadingModal').modal('hide');
+                        // 处理错误
+                        console.error('Ajax error:', status, error);
+                    }
+                });
+            }
+
+        });
+
+
+
         //选择学历 触发专业判断  无法进行判断
         /*
         $("#choose5").change(function (){

template/pc/components/index/kop.htm

@@ -1,4 +1,5 @@
 <?php
+$result_map = "";
 $xl = ['不限制','中专','高技','大专','本科','硕士','博士'];
 //先列出全国 再其他省 再到市
 $sql = 'select * from ey_zcwd_position where type='.$detail['sbzy'].' and sbdj='.$detail['sbdj'].' and is_del=0 and status=1'.$sql_end.' order by sf asc';
@@ -8,7 +9,7 @@ $is_list_empty = '';
 <?php
 $is_list_empty = $field['id'];
 ?>
-<div class="panel panel-primary">
+<div class="panel panel-primary" style="display:none;">
     <div class="panel-body">
 
         {eyou:if condition='((int)$field.sf === 0)'}
@@ -67,15 +68,15 @@ $is_list_empty = $field['id'];
             <tr>
                 <th scope="row">1</th>
                 <td>学历</td>
-                <td><?php echo $xl[$field2['xlyq']];?></td>
-                <td><?php echo $xl[$detail['xl']];?></td>
+                <td><?php //echo $xl[$field2['xlyq']];?></td>
+                <td><?php //echo $xl[$detail['xl']];?></td>
                 <td>
                     <?php
                     if($field2['xlyq'] == $detail['xl']){
-                        echo "<font style='color: blue;'>符合</font>";
+                        //echo "<font style='color: blue;'>符合</font>";
                         $num++;
                     }else{
-                        echo "<font style='color: red;'>不符合</font>";
+                        //echo "<font style='color: red;'>不符合</font>";
                     }
                     ?>
                 </td>
@@ -86,9 +87,9 @@ $is_list_empty = $field['id'];
                 <td>
                     <?php
                     if((int)$field2['is_ega'] === 0){
-                        echo "不限制";
+                        //echo "不限制";
                     }else{
-                        echo $field2['ega_0'].'-'.$field2['ega_1'].'岁';
+                        //echo $field2['ega_0'].'-'.$field2['ega_1'].'岁';
                     }
                     ?>
                 </td>
@@ -98,10 +99,10 @@ $is_list_empty = $field['id'];
                 <td>
                     <?php
                     if((int)$detail['nl'] <= (int)$field2['ega_1'] && (int)$detail['nl'] >= (int)$field2['ega_0']){
-                        echo "<font style='color: blue;'>符合</font>";
+                        //echo "<font style='color: blue;'>符合</font>";
                         $num++;
                     }else{
-                        echo "<font style='color: red;'>不符合</font>";
+                        //echo "<font style='color: red;'>不符合</font>";
                     }
                     ?>
                 </td>
@@ -129,7 +130,7 @@ $is_list_empty = $field['id'];
 
                     {eyou:notempty name='$zhengshu2' /}
                     {eyou:sql sql="$sql3" cachetime='3600' empty='' id="field3"}
-                    {$field3.title}<br/>
+                    <?php /**{$field3.title}*/ ?><br/>
                     {/eyou:sql}
                     {eyou:else /}
                     不限制
@@ -165,13 +166,13 @@ $is_list_empty = $field['id'];
                 <td>
                     <?php
                     if((int)$field2.byzy === 0 || empty($zhengshu2)){
-                        echo "<font style='color: blue;'>符合</font>";
+                        //echo "<font style='color: blue;'>符合</font>";
                         $num++;
                     }else{
                         if(empty($zhengshu)){
-                            echo "<font style='color: red;'>不符合</font>";
+                            //echo "<font style='color: red;'>不符合</font>";
                         }else{
-                            $run = '不符合';
+                            $run = "<font style='color: red;'>不符合</font>";
                             $ik = 1;
                             foreach ($zhengshu as $k => $v){
                                 if(in_array($v,$zhengshu2)){
@@ -180,7 +181,7 @@ $is_list_empty = $field['id'];
                                     $ik++;
                                 }
                             }
-                            echo $run;
+                            //echo $run;
                             if($ik>1){
                                 $num++; //符合+1
                             }
@@ -199,8 +200,8 @@ $is_list_empty = $field['id'];
                     不限制
                     {eyou:else /}
                     <?php
-                    if((int)$field2['xxlx'] === 1) echo "全日制";
-                    if((int)$field2['xxlx'] === 2) echo "非全日制";
+                    //if((int)$field2['xxlx'] === 1) //echo "全日制";
+                    //if((int)$field2['xxlx'] === 2) //echo "非全日制";
                     ?>
                     {/eyou:if}
                 </td>
@@ -217,10 +218,10 @@ $is_list_empty = $field['id'];
                     {eyou:else /}
                     <?php
                     if((int)$field2['xxlx'] === (int)$detail['xxlx']){
-                        echo "<font style='color: blue;'>符合</font>";
+                        //echo "<font style='color: blue;'>符合</font>";
                         $num++;
                     }else{
-                        echo "<font style='color: red;'>不符合</font>";
+                        //echo "<font style='color: red;'>不符合</font>";
                     }
                     ?>
                     {/eyou:if}
@@ -231,9 +232,9 @@ $is_list_empty = $field['id'];
                 <td>毕业<br/>时间</td>
                 <td>
                     {eyou:if condition='((int)$field2.bysj === 0)'}
-                    不要求
+                    <?php /*不要求**/  ?>
                     {eyou:else /}
-                    要求>={$field2.bysj_time}年
+                    <?php /*要求>={$field2.bysj_time}年**/  ?>
                     {/eyou:if}
                 </td>
                 <td>
@@ -248,11 +249,11 @@ $is_list_empty = $field['id'];
                     // 计算差值
                     $interval = date_diff($startDate, $now);
                     // 输出年份
-                    //echo $interval->y . ' years';
+                    ////echo $interval->y . ' years';
                     if($interval->y > 0){
-                        echo '已毕业'.$interval->y . '年';
+                        //echo '已毕业'.$interval->y . '年';
                     }else{
-                        echo '刚毕业不足1年';
+                        //echo '刚毕业不足1年';
                     }
 
 
@@ -263,14 +264,14 @@ $is_list_empty = $field['id'];
                 <td>
                     <?php
                     if((int)$field2['bysj'] === 0){
-                        echo "<font style='color: blue;'>符合</font>";
+                        //echo "<font style='color: blue;'>符合</font>";
                         $num++;
                     }else{
                         if((int)$field2['bysj_time'] <= $interval->y){
-                            echo "<font style='color: blue;'>符合</font>";
+                            //echo "<font style='color: blue;'>符合</font>";
                             $num++;
                         }else{
-                            echo "<font style='color: red;'>不符合</font>";
+                            //echo "<font style='color: red;'>不符合</font>";
                         }
                     }
                     ?>
@@ -290,7 +291,7 @@ $is_list_empty = $field['id'];
 
                     <?php
                     if($i > 1){
-                        echo "或<br/>";
+                        //echo "或<br/>";
                     }
                     ?>
 
@@ -318,7 +319,7 @@ $is_list_empty = $field['id'];
                         $key_s = array_search($field4['id'], $zhengshu3);
                         $year_s = $sjnx[$key_s];
                     ?>
-                    {$field4.title}(需要{$year_s}年)<br/>
+                    <?php  /**{$field4.title}(需要{$year_s}年)**/?><br/>
                     {/eyou:sql}
                     {eyou:else /}
                     <!--忽略-->
@@ -347,7 +348,7 @@ $is_list_empty = $field['id'];
                     $key_s = array_search($field3['id'], $zhengshu);
                     $year_s = $zsnx[$key_s];
                     ?>
-                    {$field3.title}(拥有{$year_s}年)<br/>
+                    <?php /**{$field3.title}(拥有{$year_s}年)**/ ?><br/>
                     {/eyou:sql}
                     {eyou:else /}
                     无
@@ -361,18 +362,18 @@ $is_list_empty = $field['id'];
                     //var_dump($zs_all);
                     //表示没查出限制要求
                     if(empty($zhengshu3)){
-                        echo "<font style='color: blue;'>符合</font>";
+                        //echo "<font style='color: blue;'>符合</font>";
                         $num++;
                     }else{
                         if(empty($zhengshu)){
                             //用户没有证书
-                            echo "<font style='color: red;'>不符合</font>";
+                            //echo "<font style='color: red;'>不符合</font>";
                         }else{
                             //判断是否包含
                             //第一轮 循环 或
                             foreach ($zs_all as $k => $v){
                                 if($k > 0){
-                                    //echo "或<br/>";
+                                    ////echo "或<br/>";
                                 }
                                 $ik = 1;
                                 $ik2 = 1;
@@ -405,24 +406,24 @@ $is_list_empty = $field['id'];
                                     }
                                 }
                                 //具体情况 循环且
-                                //echo $run_1;
-                                //echo $run_2;
-                                //echo $run_3;
-                                //echo count($v['a']);
+                                ////echo $run_1;
+                                ////echo $run_2;
+                                ////echo $run_3;
+                                ////echo count($v['a']);
                                 //var_dump($ik);
                                 //var_dump(count($v['a']));
                                 if(($ik-1) === $ik4){
-                                    //echo "<font style='color: blue;'>符合1</font>";
+                                    ////echo "<font style='color: blue;'>符合1</font>";
                                     $res = "<font style='color: blue;'>符合</font>";
                                     $num++;
                                     //跳出循环 已经符合其中 一个 且了
                                     break;
                                 }else{
-                                    //echo "<font style='color: red;'>不符合2</font>";
+                                    ////echo "<font style='color: red;'>不符合2</font>";
                                     $res = "<font style='color: red;'>不符合</font>";
                                 }
                             }
-                            echo $res;
+                            //echo $res;
                         }
                     }
                     ?>
@@ -439,15 +440,24 @@ $is_list_empty = $field['id'];
 
 
                     <?php
-                    //echo $num;
-                    if($num === 6){
-                        echo "<font style='color: blue;'>完全符合要求!</font>";
-                    }else if($num === 0){
-                        echo "<font style='color: red;'>完全不符合要求!</font>";
-                    }else{
-                        echo "<font style='color: #ff4c08;'>未完全符合要求!</font>";
-                    }
-                    $num = 0;
+                        ////echo $num;
+                        if($num >= 6){
+                            //多次循环可能大于6
+                            echo "<font style='color: blue;'>完全符合要求!</font>";
+
+                            if(!empty($bname)){
+                                $bname_str = '/'.$bname;
+                            }
+
+                            $result_map .= $aname.$bname_str.'地区<br/>';
+
+
+                        }else if($num === 0){
+                            echo "<font style='color: red;'>完全不符合要求!</font>";
+                        }else{
+                            echo "<font style='color: #ff4c08;'>未完全符合要求!</font>";
+                        }
+                        $num = 0;
                     ?>
 
                 </td>
@@ -468,4 +478,26 @@ $is_list_empty = $field['id'];
     <span class="sr-only">Error:</span>-->
     {$scen}
 </div>
+{eyou:else /}
+
+<?php
+if(empty($result_map)){
+    $info = '';
+    $result_map = "抱歉!未找到符合地区!";
+    $class = 'alert-danger';
+}else{
+    //$result_map;
+    $info = "找到以下符合申请的地区:<br/><br/>";
+    $class = 'alert-success';
+}
+?>
+
+
+<div class="alert {$class}" role="alert" style="">
+    <?php
+        echo $info;
+        echo $result_map;
+    ?>
+</div>
+
 {/eyou:if}

template/pc/components/index/step.htm

@@ -32,6 +32,7 @@
     {eyou:sql sql='$sql' cachetime='3600' empty=''}
         {eyou:php}
             $detail = $field;
+            $extend_info = json_decode($field['extend'],true);
         {/eyou:php}
     {/eyou:sql}
 
@@ -67,7 +68,12 @@
         {/eyou:sql}
     {/eyou:if}
 
-    {eyou:sql sql='$sql3' cachetime='3600' empty=''}
+    <?php
+    /*
+     *
+     * 减少sql调用
+     *
+     * {eyou:sql sql='$sql3' cachetime='3600' empty=''}
         {eyou:php}
             $zc_name = $field['title'];
         {/eyou:php}
@@ -78,6 +84,11 @@
             $zc_dj = $field['title'];
         {/eyou:php}
     {/eyou:sql}
+     *
+     *
+     */
+
+    ?>
 
 {/eyou:if}
 
@@ -117,6 +128,7 @@
     }
     .daterange {
         /*position: relative;*/
+        position: relative;
     }
     .daterangepicker button{
         height: auto !important;
@@ -242,6 +254,7 @@
                                             <!--编号: 202410247774<br/>-->
                                             姓名: {$detail.ch}<br/>
                                             手机: <?php echo hide_phone_number_regex($detail['sjhm']); ?><br/>
+                                            地区: {$extend_info.szsf}/{$extend_info.szcs}
                                         </p>
                                     {/eyou:if}
                                 </div>
@@ -281,9 +294,14 @@
 
                                 <div class="well" style="margin-top:20px;">
 
-                                    预选地区: {$area_name}<br/>
-                                    申报专业: {$zc_name}<br/>
-                                    申报等级: {$zc_dj}<br/>
+                                    <?php
+                                    /*
+                                     *
+                                     *  预选地区: {$area_name}<br/>
+                                     */
+                                    ?>
+                                    申报专业: {$extend_info.sbzy}<br/>
+                                    申报等级: {$extend_info.sbdj}<br/>
 
                                 </div>
 
@@ -306,6 +324,7 @@
 
                                 {eyou:else /}
                                     <?php
+                                        //现在没有所谓预选和其他推荐的区分
                                         $sql_end = '';
                                         $t = '';
                                         $scen = '抱歉!暂时未找到相关匹配结果信息!';
@@ -368,7 +387,7 @@
                                     <!--<label class="sr-only" for="form-first-name">First name</label>
                                     <input type="text" name="form-first-name" placeholder="First name..." class="form-first-name form-control" id="form-first-name">-->
 
-                                    <select class="form-control" id="choose1" name="yxdq">
+                                    <select class="form-control" id="choose1" name="yxdq" style="display:none;">
                                         <option value="0">选择地区(可选)</option>
                                         <option value="10001">不限制</option>
                                         <option value="20000">全国</option>
@@ -377,6 +396,25 @@
                                         {/eyou:sql}
                                     </select>
                                 </div>
+
+
+                                <div class="form-group" style="margin-bottom: 15px;">
+                                    <div class="col-sm-6 col-xs-6" style="padding-left:0px;">
+                                        <select class="form-control" id="choose11" name="szsf">
+                                            <option value="0">选择您所在省份</option>
+                                            {eyou:sql sql="select id,name from ey_citysite where status=1 and level=1" cachetime='3600' empty='' id='field'}
+                                            <option value="{$field.id}">{$field.name}</option>
+                                            {/eyou:sql}
+                                        </select>
+                                    </div>
+                                    <div class="col-sm-6 col-xs-6" style="padding-right:0px;">
+                                        <select class="form-control" id="choose12" name="szcs">
+                                            <option value="0">选择您所在城市</option>
+                                        </select>
+                                    </div>
+                                    <div class="clear"></div>
+                                </div>
+
                                 <div class="form-group">
                                    <!-- <label class="sr-only" for="form-last-name">Last name</label>
                                     <input type="text" name="form-last-name" placeholder="Last name..." class="form-last-name form-control" id="form-last-name">-->
@@ -468,12 +506,13 @@
 
                                 <div class="form-group" style="padding-left: 5px;position: relative;">
                                     <label class="col-sm-12 control-label" style="padding-left: 0;">是否以下相关毕业专业</label>
-                                    <div class="col-sm-12" style="padding-left: 0;margin-bottom: 15px;" id="zys">
+                                    <div class="col-sm-12" style="padding-left: 0;margin-bottom: 0px;" id="zys">
                                         <!--先初始化证书-->
                                         <!--<p class="form-control-static" style="min-height:20px;padding-top:5px;padding-bottom:0px;">
                                             <font>建筑一级证书</font>  <font style="margin-left:15px;">3年</font>
                                         </p>-->
                                     </div>
+                                    <div class="clear"></div>
                                 </div>
 
                                 <!--<label class="sr-only" for="form-google-plus">Google plus</label>
@@ -491,7 +530,7 @@
                                     <label class="sr-only" for="form-password">Password</label>
                                     <input type="password" name="form-password" placeholder="Password..." class="form-password form-control" id="form-password">
                                 </div>-->
-                                <div class="form-group daterange">
+                                <div class="form-group daterange" style="display:none;">
                                     <label style="margin-left: 5px;">选择毕业时间</label>
                                     <!--range_date-->
                                     <div class="">
@@ -500,6 +539,17 @@
                                     </div>
                                 </div>
 
+                                <?php
+                                    $end_year = date('Y', time()) + 1;
+                                    /*{eyou:if condition='($i==$end_year)'}selected{/eyou:if}**/
+                                ?>
+                                <select class="form-control" id="choose33" name="bysj2" style="margin-bottom: 15px;">
+                                    <option value="0">选择毕业时间</option>
+                                    {eyou:for start='1990' end="$end_year"}
+                                    <option value="{$i}-07-01">{$i}年</option>
+                                    {/eyou:for}
+                                </select>
+
                                 <!--<label class="sr-only" for="form-repeat-password">Repeat password</label>
                                     <input type="password" name="form-repeat-password" placeholder="Repeat password..."
                                            class="form-repeat-password form-control" id="form-repeat-password">-->

template/pc/js/botstrap-step/scripts.js

@@ -26,6 +26,14 @@ jQuery(document).ready(function() {
     $('.registration-form .btn-next').on('click', function() {
 
 
+        var a11 = $('#choose11').val();
+        var a12 = $('#choose12').val();
+        if(a11 == 0 || a12 == 0){
+            $('#myModal .modal-body p').html('请选择您所在城市');
+            $('#myModal').modal('show');
+            return false;
+        }
+
         //校验字段
         var a = $('#choose2').val();
         console.log(a);
@@ -44,9 +52,14 @@ jQuery(document).ready(function() {
         }
 
 
+
+
+
+
+
         console.log($(this).index());
         //调用专业
-        if($(this).index() == 3) {
+        if($(this).index() == 4) {
             $('#loadingModal').modal('show');
             $.ajax({
                 url: '/api/Diyajax/getZcZyList',
@@ -84,7 +97,10 @@ jQuery(document).ready(function() {
         }
 
         //填完个人资料 点击下一步
-        if($(this).index() == 6) {
+        if($(this).index() == 7) {
+
+
+
 
             var b = $('#choose6').val();
             console.log(a);
@@ -108,6 +124,13 @@ jQuery(document).ready(function() {
                 return false;
             }
 
+            var b33 = $('#choose33').val();
+            console.log(a);
+            if(b33 == 0){
+                $('#myModal .modal-body p').html('请选择毕业时间');
+                $('#myModal').modal('show');
+                return false;
+            }
 
             //调用证书
             $('#loadingModal').modal('show');