修复一些bug

app/admin/controller/Enterprise.php

@@ -131,9 +131,9 @@ class Enterprise extends AdminController {
         if($checkState == null || ($checkState != 2 && $checkState != 3)){
             return json(["msg" => '请选择审核状态!']);
         }
+        $checkMsg = $this->request['checkMsg'];
         if($checkState == 2){
-            $checkMsg = \StrUtil::isEmpOrNull($this->request['checkMsg']);
-            if ($checkMsg) {
+            if (\StrUtil::isEmpOrNull($checkMsg)) {
                 return json(["msg" => '请填写审核意见!']);
             }
 

app/admin/view/enterprise/goto_enterprise_detail_page.html

@@ -26,9 +26,9 @@
         });
         var type = $("#type").val();
         if (type == 1) {
-            $("#enterpriseTag,#industryFieldNewName").parent().parent().attr("style", "display:block");
+            $(".type1").attr("style", "display:block");
         } else {
-            $("#enterpriseTag,#industryFieldNewName").parent().parent().attr("style", "display:none");
+            $(".type1").attr("style", "display:none");
         }
         var photoImg = $("#yyzz").attr("src");
         var oldSn = photoImg.lastIndexOf(".");
@@ -44,7 +44,7 @@
 
 </script>
 <div class="ibox float-e-margins">
-    <div class="ibox-content" style="height: 1000px;">
+    <div class="ibox-content" style="height: 1100px;">
         <input type="text" class="form-control" id="id" name="id" value="{$ep.id}" style="display: none;"/>
         <div class="panel-body">
             <div class="panel panel-default">
@@ -125,7 +125,7 @@
                                 {$ep.bankNetwork}
                             </td>
                             <td>
-                                <img onclick="Feng.showImg(this)" id="bankImg" alt="开启许可证"
+                                <img onclick="Feng.showImg(this)" id="bankImg" alt="开户许可证"
                                      src="{$ep.bankImg|getStoragePath}" style="max-width: 100px;">
                             </td>
                         </tr>
@@ -144,7 +144,7 @@
                                 申报类型：晋江市现代产业体系人才
                             </td>
                         </tr>
-                        <tr>
+                        <tr class="type1">
                             <td>
                                 产业领域
                             </td>
@@ -161,7 +161,7 @@
                                 行业领域佐证材料
                             </td>
                         </tr>
-                        <tr>
+                        <tr class="type1">
                             <td>
                                 单位标签
                             </td>
@@ -175,7 +175,7 @@
                                 {$ep.enterpriseTypeName}
                             </td>
                             <td>
-                                <img onclick="Feng.showImg(this)" id="domainImg" alt="开启许可证"
+                                <img onclick="Feng.showImg(this)" id="domainImg" alt="行业领域佐证材料"
                                      src="{$ep.domainImg|getStoragePath}" style="max-width: 100px;">
                             </td>
                         </tr>

app/common/api/UserApi.php

@@ -19,7 +19,9 @@ const FREEZE_YES = 2;
  */
 class UserApi {
 
-    protected $username, $password, $usertype, $info;
+    protected $username, $password, $usertype;
+
+    public $info;
 
     public function __construct($username, $password, $usertype) {
         $this->username = $username;
@@ -92,6 +94,10 @@ class UserApi {
                     return "账号需要后台管理人员审核通过后才能登陆，请耐心等待!";
                 }
                 if($this->info['checkState'] == 2){
+                    $temp = [];
+                    $temp['uid'] = $this->info['id'];
+                    $temp['msg'] = "账号审核不通过，原因是：{$this->info['checkMsg']}";
+                    session('temp',$temp);
                     return "账号审核不通过，原因是：{$this->info['checkMsg']}";
                 }
                 return false;
@@ -118,6 +124,7 @@ class UserApi {
     }
 
     public function setSession() {
+        session('temp',null);
         $user = $this->getUserInfo();
         switch ($this->usertype) {
             case 1:

app/common/controller/Auth.php

@@ -4,6 +4,7 @@ namespace app\common\controller;
 
 use app\BaseController;
 use app\common\api\ChuanglanSmsApi;
+use app\common\api\EnterpriseApi;
 use app\common\model\MessageRecord;
 use app\common\model\TalentChecklog;
 use think\facade\Cache;
@@ -127,9 +128,18 @@ class Auth extends BaseController
         return view("", ["msg" => $msg]);
     }
 
-    public function enterpriseRegister()
+    public function enterprise_edit()
     {
+        $temp = session('temp');
+        if(empty($temp)){
+            return redirect("/");
+        }
+        if($this->request->isPost()){
 
+        }
+        $ep = EnterpriseApi::getOne(session('temp')['uid']);
+        $msg = session('temp')['msg'];
+        return view("",['msg' => $msg, 'ep' => $ep]);
     }
 
     public function verificationCode()

app/common/view/auth/enterprise_edit.html

@@ -0,0 +1,237 @@
+{extend name="layout/content" /}
+{block name="content"}
+<style type="text/css">
+  .spacing {
+    margin-bottom: 10px;
+    padding-right:4px;
+    padding-left: 4px;
+  }
+</style>
+<div class="ibox float-e-margins">
+  <div class="ibox-content">
+    <h4 style="color: red;text-align: center">{$msg}</h4>
+    <div class="form-horizontal">
+      <div class="row">
+        <div class="col-sm-12">
+          <form id="ep_form" action="/common/auth/enterprise_edit" method="post" class="form-horizontal" enctype="multipart/form-data" target="hiddenIframe">
+            <input type="hidden" id="id" name="id" value="{$ep.id}">
+            <div class="col-sm-12 form-group-sm">
+
+              <div class="panel panel-default">
+                <div class="panel-heading">单位基础信息</div>
+                <div class="panel-body">
+                  <table style="width: 100%;border-collapse: collapse;" class="table table-bordered">
+                    <tr>
+                      <td>
+                        <div class="rowGroup">
+                          <label class="control-label spacing td-label"><span style="color: red">*</span>账号</label>
+                          <input type="text" autocomplete="off" readonly="readonly" class="form-control" id="username" name="username" value="{$ep.username}" />
+                        </div>
+                      </td>
+                      <td>
+                        <div class="rowGroup">
+                          <label class="control-label spacing td-label"><span style="color: red">*</span>密码</label>
+                          <input type="password" autocomplete="off" class="form-control" id="password" name="password" value="**********" readonly disabled placeholder="密码由字母、数字及特殊字符组成且字符个数为8-20"/>
+                        </div>
+                      </td>
+                      <td>
+                        <div class="rowGroup">
+                          <label class="control-label spacing td-label"><span style="color: red">*</span>重复密码</label>
+                          <input autocomplete="off" type="password" class="form-control" id="re_password" name="re_password" value="**********" readonly disabled placeholder="密码由字母、数字及特殊字符组成且字符个数为8-20"/>
+                        </div>
+
+                      </td>
+                      <td rowspan="3" >
+                        <label class="control-label spacing"><span class="text-danger">*</span>营业执照</label>
+                        <img id="photoImg" src="{$ep.imgurl|getStoragePath}" style="height: 60px;" onclick="$('#imgurl').click()" >
+                        <input style="display: none" autocomplete="off" type="file" class="form-control" id="imgurl" name="imgurl" />
+                      </td>
+                    </tr>
+                    <tr>
+                      <td>
+                        <div class="rowGroup">
+                          <label class=" control-label spacing td-label"><span style="color: red">*</span>单位名称</label>
+                          <input autocomplete="off" type="text" class="form-control" id="name" name="name" value="{$ep.name}"/>
+                        </div>
+                      </td>
+                      <td>
+                        <div class="rowGroup">
+                          <label class=" control-label spacing td-label"><span style="color: red">*</span>统一社会信用代码</label>
+                          <input autocomplete="off" type="text" class="form-control" id="idCard" name="idCard" value="{$ep.idCard}"/>
+                        </div>
+                      </td>
+                      <td>
+                        <div class="rowGroup">
+                          <label class=" control-label spacing td-label"><span style="color: red">*</span>法人代表</label>
+                          <input autocomplete="off" type="text" class="form-control" id="legal" name="legal" value="{$ep.legal}"/>
+                        </div>
+                      </td>
+                    </tr>
+                    <tr>
+                      <td>
+                        <div class="rowGroup">
+                          <label class=" control-label spacing td-label"><span style="color: red">*</span>所属街道</label>
+                          <select class="form-control" id="street" name="street" value="{$ep.street}"></select>
+                        </div>
+                      </td>
+                      <td>
+                        <div class="rowGroup">
+                          <label class=" control-label spacing td-label"><span style="color: red">*</span>单位地址</label>
+                          <input autocomplete="off" type="text" class="form-control" id="address" name="address" value="{$ep.address}"/>
+                        </div>
+                      </td>
+                      <td>
+                        <div class="rowGroup">
+                          <label class=" control-label spacing td-label"><span style="color: red">*</span>单位电话</label>
+                          <input autocomplete="off" type="text" class="form-control" id="ephone" name="ephone" value="{$ep.ephone}"/>
+                        </div>
+                      </td>
+                    </tr>
+                    <tr>
+                      <td>
+                        <div class="rowGroup">
+                          <label class=" control-label spacing td-label"><span style="color: red">*</span>企业银行账号</label>
+                          <input autocomplete="off" type="text" class="form-control" id="bankCard" name="bankCard" value="{$ep.bankCard}" />
+                        </div>
+                      </td>
+                      <td>
+                        <div class="rowGroup">
+                          <label class=" control-label spacing td-label"><span style="color: red">*</span>企业开户银行</label>
+                          <input autocomplete="off" type="text" class="form-control" id="bank" name="bank" value="{$ep.bank}" />
+                        </div>
+                      </td>
+                      <td>
+                        <div class="rowGroup">
+                          <label class=" control-label spacing td-label"><span style="color: red">*</span>企业开户银行网点</label>
+                          <input autocomplete="off" type="text" class="form-control" id="bankNetwork" name="bankNetwork" value="{$ep.bankNetwork}" />
+                        </div>
+                      </td>
+                      <td>
+                        <label class="control-label spacing"><span class="text-danger">*</span>开户许可证</label>
+                        <img id="photoImg1" src="{$ep.bankImg|getStoragePath}" style="height: 60px;" onclick="$('#bankImg').click()" >
+                        <input style="display: none" autocomplete="off" type="file" class="form-control" id="bankImg" name="bankImg" />
+                      </td>
+                    </tr>
+
+                  </table>
+                </div>
+                <div class="panel-heading">申报基础信息</div>
+                <div class="panel-body">
+                  <div class="row">
+                    <div class="rowGroup" >
+                      <label class="col-sm-2 control-label spacing"><span class="text-danger">*</span>申报类型</label>
+                      <div class="col-sm-4 spacing">
+                        <select class="form-control" id="type" name="type" onchange="Register.typeChange()" value="{$ep.type}">
+                          <option value="">请选择</option>
+                          <option value="1">晋江市现代产业体系人才</option>
+                          <option value="2">集成电路优秀人才</option>
+<!--                          <option value="3">海峡计划团队</option>-->
+                        </select>
+                      </div>
+                    </div>
+                  </div>
+                  <div class="row" id="typeGroup" style="display: none">
+                    <table style="width: 100%;border-collapse: collapse;" class="table table-bordered">
+                      <tr>
+                        <td>
+                          <div class="rowGroup">
+                            <label class="control-label spacing td-label"><span style="color: red">*</span>产业领域</label>
+                            <select autocomplete="off" type="text" class="form-control" id="industryFieldNew" name="industryFieldNew" onchange="Register.industryChange()" value="{$ep.industryFieldNew}"></select>
+                          </div>
+                        </td>
+                        <td>
+                          <div class="rowGroup">
+                            <label class="control-label spacing td-label"><span style="color: red">*</span>行业领域</label>
+                            <select class="form-control" id="industryFieldOld" name="industryFieldOld" value="{$ep.industryFieldOld}">
+                            </select>
+                          </div>
+                        </td>
+                        <td rowspan="2">
+                          <label class="control-label spacing">行业领域上传材料 </label>
+                          <img id="photoImg2" src="{$ep.domainImg|getStoragePath}" style="height: 60px;" onclick="$('#domainImg').click()" >
+                          <input style="display: none" autocomplete="off" type="file" class="form-control" id="domainImg" name="domainImg" />
+                        </td>
+                      </tr>
+                      <tr>
+                        <td>
+                          <div class="rowGroup">
+                            <label class="control-label spacing td-label"><span style="color: red">*</span>单位标签</label>
+                            <select class="form-control" id="enterpriseTag" name="enterpriseTag" value="{$ep.enterpriseTag}">
+                            </select>
+                          </div>
+                        </td>
+                        <td>
+                          <div class="rowGroup">
+                            <label class="control-label spacing td-label"><span style="color: red">*</span>单位类型</label>
+                            <select class="form-control" id="enterpriseType" name="enterpriseType" value="{$ep.enterpriseType}">
+                            </select>
+                          </div>
+                        </td>
+                      </tr>
+                    </table>
+                  </div>
+
+                </div>
+                <div class="panel-heading">人才联络员信息</div>
+                <div class="panel-body">
+                  <table style="width: 100%;border-collapse: collapse;" class="table table-bordered">
+                    <tr>
+                      <td>
+                        <div class="rowGroup">
+                          <label class="control-label spacing td-label"><span style="color: red">*</span>人才联络员</label>
+                          <input autocomplete="off" type="text" class="form-control" id="agentName" name="agentName" value="{$ep.agentName}"/>
+                        </div>
+                      </td>
+                      <td>
+                        <div class="rowGroup">
+                          <label class="control-label spacing td-label"><span style="color: red">*</span>电子邮箱</label>
+                          <input autocomplete="off" type="text" class="form-control" id="agentEmail" name="agentEmail" value="{$ep.agentEmail}"/>
+                        </div>
+                      </td>
+                      <td rowspan="2">
+                        <label class="control-label spacing" style="text-align: center">人才联络员备案表<br /><a href="/beianbiao.doc" style="color: red">模板下载</a>  </label>
+                        <img id="photoImg3" src="{$ep.beian|getStoragePath}" style="height: 60px;" onclick="$('#beian').click()" >
+                        <input style="display: none" autocomplete="off" type="file" class="form-control" id="beian" name="beian" />
+                      </td>
+                    </tr>
+                    <tr>
+                      <td>
+                        <div class="rowGroup">
+                          <label class="control-label spacing td-label"><span style="color: red">*</span>人才联络员手机号</label>
+                          <input autocomplete="off" type="text" class="form-control" id="agentPhone" name="agentPhone" value="{$ep.agentPhone}" readonly disabled  placeholder="用于找回密码" />
+                        </div>
+                      </td>
+                      <td>
+                        <div class="rowGroup">
+                          <label class="control-label spacing td-label"><span style="color: red">*</span>审核状态</label>
+                          <input autocomplete="off" type="text" class="form-control" id="checkState" name="checkState" value="审核驳回" readonly disabled  />
+                        </div>
+                      </td>
+                    </tr>
+                  </table>
+                </div>
+              </div>
+
+
+
+              <div class="row">
+
+                <div class="col-sm-12" style="text-align: center;margin-top: 10px;">
+                  <button type="button" class="btn btn-sm btn-primary " onclick="Register.enterpriseUserRegister()" id="ensure">
+                    <i class="fa fa-check"></i>&nbsp;提交
+                  </button>
+                </div>
+              </div>
+            </div>
+          </form>
+        </div>
+      </div>
+    </div>
+  </div>
+</div>
+<iframe id="hiddenIframe" name="hiddenIframe" style="display: none;"></iframe>
+<!--<script src="${ctxPath}/static/modular/gate/enterprise/enterprise_edit.js"></script>-->
+<script type="text/javascript">
+  document.write('<script src="/static/modular/gate/enterprise/enterprise_edit.js?v='+(new Date()).getTime()+'"><\/script>');
+</script>
+{/block}

app/index/controller/Auth.php

@@ -45,6 +45,9 @@ class Auth extends BaseController {
                 session('login_fail',$login_fail);
                 $msg = "用户名或者密码错误";
             } else if($res_msg = $user->checkState()){
+                if($user->info['checkState'] == 2){
+                    return redirect("/common/auth/enterprise_edit");
+                }
                 $msg = $res_msg;
             }
             $url = "/admin";

public/static/js/register.js

@@ -425,7 +425,7 @@ Register.typeChange = function(){
     if(type==1){
         $("#typeGroup").attr("style","display:block");
     }else{
-        $("typeGroup").attr("style","display:none");
+        $("#typeGroup").attr("style","display:none");
         $("#enterpriseTag,#industryFieldNew,#industryFieldOld").val("");
 
     }

public/static/modular/gate/enterprise/enterprise_edit.js

@@ -17,9 +17,10 @@ Register.enterpriseUserRegister = function() {
     var address = $("#address").val();
     var type = $("#type").val();
     var agentEmail = $("#agentEmail").val();
-    var talentType = $("#talentType").val();
     var ephone = $("#ephone").val();
-    var industryField = $("#industryField").val();
+    var bankCard = $("#bankCard").val();
+    var bank = $("#bank").val();
+    var bankNetwork = $("#bankNetwork").val();
     if (username==null || username=='') {
         Feng.info("请填写账号!");
         return;
@@ -76,6 +77,19 @@ Register.enterpriseUserRegister = function() {
         Feng.info("请填写单位地址!");
         return;
     }
+    if (bankCard==null || bankCard=='') {
+        Feng.info("请填写企业银行账号!");
+        return;
+    }
+    if (bank==null || bank=='') {
+        Feng.info("请填写企业开户银行!");
+        return;
+    }
+    if (bankNetwork==null || bankNetwork=='') {
+        Feng.info("请填写企业开户银行网点!");
+        return;
+    }
+
     if(type==null || type==''){
         Feng.info("请选择企业类别");
         return ;
@@ -85,14 +99,33 @@ Register.enterpriseUserRegister = function() {
         return;
     }
     if(type==1 ){
-        if(talentType==null||talentType==''){
+        var industryFieldNew = $("#industryFieldNew").val();
+        var industryFieldOld = $("#industryFieldOld").val();
+        var domainImg = $("#domainImg").val();
+        var enterpriseTag = $("#enterpriseTag").val();
+        var enterpriseType = $("#enterpriseType").val();
+
+        if(enterpriseTag==null||enterpriseTag==''){
             Feng.info("请选择企业标签!");
             return;
         }
-        if(industryField == null || industryField ==''){
+        if(industryFieldNew == null || industryFieldNew ==''){
+            Feng.info("请选择产业领域");
+            return ;
+        }
+        if(industryFieldOld == null || industryFieldOld ==''){
             Feng.info("请选择行业领域");
             return ;
         }
+        if(domainImg==null||domainImg==''){
+            Feng.info("请上传行业领域佐证材料!");
+            return;
+        }
+        if(enterpriseType==null||enterpriseType==''){
+            Feng.info("请选择企业类型!");
+            return;
+        }
+
     }
     if(!/((\d{11})|^((\d{7,8})|(\d{4}|\d{3})-(\d{7,8})|(\d{4}|\d{3})-(\d{7,8})-(\d{4}|\d{3}|\d{2}|\d{1})|(\d{7,8})-(\d{4}|\d{3}|\d{2}|\d{1}))$)/.test(ephone)){
         Feng.info("单位电话格式不合法!");
@@ -125,19 +158,26 @@ Register.epCallBack = function(data) {
 Register.typeChange = function(){
     var type = $("#type").val();
     if(type==1){
-        $("#talentType,#industryField").parent().parent().attr("style","display:block");
+        $("#typeGroup").attr("style","display:block");
     }else{
-        $("#talentType,#industryField").val("");
-        $("#talentType,#industryField").parent().parent().attr("style","display:none");
+        $("#typeGroup").attr("style","display:none");
     }
 }
+Register.industryChange = function(){
+    var industryNew = $("#industryFieldNew").val();
+    var arr = [{"name":"industryFieldOld","code":industryNew+"_field"}];
+    Feng.findChildDictBatch(JSON.stringify(arr));
+}
 
 
 $(function(){
+    var industryNew = $("#industryFieldNew").attr("value");
     var arr = [
-        {"name":"street","code":"un_street"},
-        {"name":"talentType","code":"un_enterprise_talentType"},
-        {"name":"industryField","code":"un_industryField"}];
+        {"name":"street","code":"street"},
+        {"name":"enterpriseTag","code":"enterprise_tag"},
+        {"name":"enterpriseType","code":"enterprise_type"},
+        {"name":"industryFieldNew","code":"industry_field"},
+        {"name":"industryFieldOld","code":industryNew+"_field"}];
     Feng.findChildDictBatch(JSON.stringify(arr));
     $("select").each(function () {
         $(this).val($(this).attr("value"));