流程测试，修改BUG

app/admin/controller/Enterprise.php

@@ -72,6 +72,7 @@ class Enterprise extends AdminController {
             }
 		}
 
+
         return view("", ['ep' => $ep]);
     }
 

app/admin/controller/EnterpriseChangeRecord.php

@@ -61,6 +61,15 @@ class EnterpriseChangeRecord extends AdminController {
                 $ecr['newIndustryFieldNewName'] = $industryFieldNewList[$ecr['newIndustryFieldNew']];
             }
 		}
+        if (\StrUtil::isNotEmpAndNull($ecr['oldIndustryFieldOld'])) {
+            $industry = DictApi::findDictByCode($ecr['oldIndustryFieldOld']);
+            $ecr['oldIndustryFieldOldName'] = $industry['name'];
+        }
+        if (\StrUtil::isNotEmpAndNull($ecr['newIndustryFieldOld'])) {
+            $industry = DictApi::findDictByCode($ecr['newIndustryFieldOld']);
+            $ecr['newIndustryFieldOldName'] = $industry['name'];
+        }
+
         switch ($ecr['checkState']){
             case 1:
                 $ecr['checkStateName'] = '保存未提交';

app/admin/view/enterprise/goto_enterprise_detail_page.html

@@ -1,175 +1,236 @@
 {extend name="layout/content"}
 {block name="content"}
 <style type="text/css">
-  .spacing {
-    margin-bottom: 10px;
-    padding-right:4px;
-    padding-left: 4px;
-  }
+    .spacing {
+        margin-bottom: 10px;
+        padding-right: 4px;
+        padding-left: 4px;
+    }
 </style>
 <script type="text/javascript">
-  $(function(){
-    Feng.addAjaxSelect({
-      "id": "enterpriseTag",
-      "displayCode": "code",
-      "displayName": "name",
-      "type": "GET",
-      "url": Feng.ctxPath + "/admin/dict/findChildDictByCode?code=enterprise_tag"
-    });
-    $("select").each(function () {
-      $(this).val($(this).attr("value"));
+    $(function () {
+        Feng.addAjaxSelect({
+            "id": "enterpriseTag",
+            "displayCode": "code",
+            "displayName": "name",
+            "type": "GET",
+            "url": Feng.ctxPath + "/admin/dict/findChildDictByCode?code=enterprise_tag"
+        });
+        $("select").each(function () {
+            $(this).val($(this).attr("value"));
+        });
+        var type = $("#type").val();
+        if (type == 1) {
+            $("#enterpriseTag,#industryFieldNewName").parent().parent().attr("style", "display:block");
+        } else {
+            $("#enterpriseTag,#industryFieldNewName").parent().parent().attr("style", "display:none");
+        }
+        var photoImg = $("#yyzz").attr("src");
+        var oldSn = photoImg.lastIndexOf(".");
+        var oldSuffix = photoImg.substring(oldSn + 1, photoImg.length);
+        if (oldSuffix == 'pdf' || oldSuffix == 'PDF') {
+            $("#yyzz").attr("src", Feng.ctxPath + "/static/img/Pdf.png");
+            // $("#yyzz").attr("onclick", Feng.showPdf(photoImg,"pdf","预览"));
+            $("#yyzz").removeAttr("onclick").unbind("click").click(function () {
+                Feng.showPdf(photoImg, "pdf", "预览")
+            });
+        }
     });
-    var type = $("#type").val();
-    if(type==1){
-      $("#enterpriseTag,#industryFieldNewName").parent().parent().attr("style","display:block");
-    }else{
-      $("#enterpriseTag,#industryFieldNewName").parent().parent().attr("style","display:none");
-    }
-    var photoImg = $("#yyzz").attr("src");
-    var oldSn = photoImg.lastIndexOf(".");
-    var oldSuffix = photoImg.substring(oldSn+1,photoImg.length);
-    if(oldSuffix == 'pdf' || oldSuffix == 'PDF'){
-      $("#yyzz").attr("src", Feng.ctxPath + "/static/img/Pdf.png");
-      // $("#yyzz").attr("onclick", Feng.showPdf(photoImg,"pdf","预览"));
-      $("#yyzz").removeAttr("onclick").unbind("click").click(function () {
-        Feng.showPdf(photoImg,"pdf","预览")
-      });
-    }
-  });
 
 </script>
 <div class="ibox float-e-margins">
-  <div class="ibox-content" style="height: 550px;">
-    <form id="enter_form" class="form-horizontal">
-      <input type="text" class="form-control" id="id" name="id" value="{$ep.id}" style="display: none;" />
-      <div class="col-sm-12 form-group-sm">
-        <div class="row">
-          <div class="rowGroup"  style="margin-bottom: 0px;">
-            <label class="col-sm-2 control-label spacing">单位名称</label>
-            <div class="col-sm-4 spacing">
-              <input type="text" class="form-control" readonly="readonly" id="name" name="name" value="{$ep.name}"  />
-            </div>
-          </div>
-          <div class="rowGroup"  style="margin-bottom: 0px;">
-            <label class="col-sm-2 control-label spacing">社会信用代码</label>
-            <div class="col-sm-4 spacing">
-              <input type="text" class="form-control" readonly="readonly" id="idCard" name="idCard" value="{$ep.idCard}"  />
-            </div>
-          </div>
-          <div class="rowGroup" style="display: none">
-            <label class="col-sm-2 control-label spacing"><span class="text-danger">*</span>产业领域</label>
-            <div class="col-sm-4 spacing">
-              <input type="text" class="form-control" readonly="readonly" id="industryFieldNewName" name="industryFieldNewName" value="{$ep.industryFieldNewName}">
-            </div>
-          </div>
-          <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" disabled="disabled" name="type" value="{$ep.type}">
-                <option value="">请选择</option>
-                <option value="1">晋江市优秀人才</option>
-                <option value="2">集成电路优秀人才</option>
-                <option value="3">海峡计划团队</option>
-              </select>
-            </div>
-          </div>
-          <div class="rowGroup"  style="display: none">
-            <label class="col-sm-2 control-label spacing"><span class="text-danger">*</span>单位标签</label>
-            <div class="col-sm-4 spacing">
-              <select class="form-control" disabled="disabled" id="enterpriseTag" name="enterpriseTag" value="{$ep.enterpriseTag}">
-              </select>
-            </div>
-          </div>
-          <div class="rowGroup"  style="margin-bottom: 0px;">
-            <label class="col-sm-2 control-label spacing">所属街道</label>
-            <div class="col-sm-4 spacing">
-              <input type="text" class="form-control" readonly="readonly" id="street" name="street" value="{$ep.streetName}"  />
-            </div>
-          </div>
-          <div class="rowGroup"  style="margin-bottom: 0px;">
-            <label class="col-sm-2 control-label spacing">单位地址</label>
-            <div class="col-sm-4 spacing">
-              <input type="text" class="form-control" readonly="readonly" id="address" name="address" value="{$ep.address}"  />
-            </div>
-          </div>
-          <div class="rowGroup"  style="margin-bottom: 0px;">
-            <label class="col-sm-2 control-label spacing">法人代表</label>
-            <div class="col-sm-4 spacing">
-              <input type="text" class="form-control" readonly="readonly" id="legal" name="legal" value="{$ep.legal}"  />
-            </div>
-          </div>
-          <div class="rowGroup"  style="margin-bottom: 0px;">
-            <label class="col-sm-2 control-label spacing">单位电话</label>
-            <div class="col-sm-4 spacing">
-              <input type="text" class="form-control" readonly="readonly" id="ephone" name="ephone" value="{$ep.ephone}"  />
-            </div>
-          </div>
-          <div class="rowGroup"  style="margin-bottom: 0px;">
-            <label class="col-sm-2 control-label spacing">人才联络员</label>
-            <div class="col-sm-4 spacing">
-              <input type="text" class="form-control" readonly="readonly" id="agentName" name="agentName" value="{$ep.agentName}"  />
-            </div>
-          </div>
-          <div class="rowGroup"  style="margin-bottom: 0px;">
-            <label class="col-sm-2 control-label spacing">人才联络员电话</label>
-            <div class="col-sm-4 spacing">
-              <input type="text" class="form-control" readonly="readonly" id="agentPhone" name="agentPhone" value="{$ep.agentPhone}"  />
-            </div>
-          </div>
-          <div class="rowGroup"  style="margin-bottom: 0px;">
-            <label class="col-sm-2 control-label spacing">人才联络员邮箱</label>
-            <div class="col-sm-4 spacing">
-              <input type="text" class="form-control" readonly="readonly" id="agentEmail" name="agentEmail" value="{$ep.agentEmail}"  />
-            </div>
-          </div>
-          <div class="rowGroup"  style="margin-bottom: 0px;">
-            <label class="col-sm-2 control-label spacing">审核状态</label>
-            <div class="col-sm-4 spacing">
-              <input type="text" class="form-control" readonly="readonly" id="checkState" name="checkState" value="{$ep.checkStateName}"  />
-            </div>
-          </div>
-          <div class="rowGroup"  style="margin-bottom: 0px;">
-            <label class="col-sm-2 control-label spacing">审核意见</label>
-            <div class="col-sm-4 spacing">
-              <input type="text" class="form-control" readonly="readonly" id="checkMsg" name="checkMsg" value="{$ep.checkMsg}"  />
-            </div>
-          </div>
-          <div class="rowGroup"  style="margin-bottom: 0px;">
-            <label class="col-sm-2 control-label spacing">审核人</label>
-            <div class="col-sm-4 spacing">
-              <input type="text" class="form-control" readonly="readonly" id="checkUser" name="checkUser" value="{$ep.checkUser}"  />
-            </div>
-          </div>
-          <div class="rowGroup"  style="margin-bottom: 0px;">
-            <label class="col-sm-2 control-label spacing">账号状态</label>
-            <div class="col-sm-4 spacing">
-              <input type="text" class="form-control" readonly="readonly" id="active" name="active" value="{$ep.activeName}"  />
-            </div>
-          </div>
-          <div class="rowGroup"  style="margin-bottom: 0px;">
-            <label class="col-sm-2 control-label spacing">拉黑/冻结原因</label>
-            <div class="col-sm-4 spacing">
-              <input type="text" class="form-control" readonly="readonly" id="activeMsg" name="activeMsg" value="{$ep.activeMsg}"  />
-            </div>
-          </div>
-          <div class="rowGroup"  style="margin-bottom: 0px;">
-            <label class="col-sm-2 control-label spacing">备注</label>
-            <div class="col-sm-4 spacing">
-              <input type="text" class="form-control" readonly="readonly" id="description" name="description" value="{$ep.description}"  />
-            </div>
-          </div>
-          <div class="rowGroup"  style="margin-bottom: 0px;">
-            <label class="col-sm-2 control-label spacing">营业执照</label>
-            <div class="col-sm-4 spacing">
-              <img onclick="Feng.showImg(this)" id="yyzz" alt="营业执照" src="{$ep.imgurl}" style="max-width: 100px;">
-            </div>
-          </div>
-        </div>
-      </div>
-    </form>
-  </div>
+    <div class="ibox-content" style="height: 700px;">
+        <form id="enter_form" class="form-horizontal">
+            <input type="text" class="form-control" id="id" name="id" value="{$ep.id}" style="display: none;"/>
+            <div class="col-sm-12 form-group-sm">
+                <div class="row">
+                    <div class="rowGroup" style="margin-bottom: 0px;">
+                        <label class="col-sm-2 control-label spacing">单位名称</label>
+                        <div class="col-sm-4 spacing">
+                            <input type="text" class="form-control" readonly="readonly" id="name" name="name"
+                                   value="{$ep.name}"/>
+                        </div>
+                    </div>
+                    <div class="rowGroup" style="margin-bottom: 0px;">
+                        <label class="col-sm-2 control-label spacing">社会信用代码</label>
+                        <div class="col-sm-4 spacing">
+                            <input type="text" class="form-control" readonly="readonly" id="idCard" name="idCard"
+                                   value="{$ep.idCard}"/>
+                        </div>
+                    </div>
+                    <div class="rowGroup" style="display: none">
+                        <label class="col-sm-2 control-label spacing"><span class="text-danger">*</span>产业领域</label>
+                        <div class="col-sm-4 spacing">
+                            <input type="text" class="form-control" readonly="readonly" id="industryFieldNewName"
+                                   name="industryFieldNewName" value="{$ep.industryFieldNewName}">
+                        </div>
+                    </div>
+                    <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" disabled="disabled" name="type" value="{$ep.type}">
+                                <option value="">请选择</option>
+                                <option value="1">晋江市优秀人才</option>
+                                <option value="2">集成电路优秀人才</option>
+                                <option value="3">海峡计划团队</option>
+                            </select>
+                        </div>
+                    </div>
+                    <div class="rowGroup" style="display: none">
+                        <label class="col-sm-2 control-label spacing"><span class="text-danger">*</span>单位标签</label>
+                        <div class="col-sm-4 spacing">
+                            <select class="form-control" disabled="disabled" id="enterpriseTag" name="enterpriseTag"
+                                    value="{$ep.enterpriseTag}">
+                            </select>
+                        </div>
+                    </div>
+                    <div class="rowGroup" style="margin-bottom: 0px;">
+                        <label class="col-sm-2 control-label spacing">所属街道</label>
+                        <div class="col-sm-4 spacing">
+                            <input type="text" class="form-control" readonly="readonly" id="street" name="street"
+                                   value="{$ep.streetName}"/>
+                        </div>
+                    </div>
+                    <div class="rowGroup" style="margin-bottom: 0px;">
+                        <label class="col-sm-2 control-label spacing">单位地址</label>
+                        <div class="col-sm-4 spacing">
+                            <input type="text" class="form-control" readonly="readonly" id="address" name="address"
+                                   value="{$ep.address}"/>
+                        </div>
+                    </div>
+                    <div class="rowGroup" style="margin-bottom: 0px;">
+                        <label class="col-sm-2 control-label spacing">法人代表</label>
+                        <div class="col-sm-4 spacing">
+                            <input type="text" class="form-control" readonly="readonly" id="legal" name="legal"
+                                   value="{$ep.legal}"/>
+                        </div>
+                    </div>
+                    <div class="rowGroup" style="margin-bottom: 0px;">
+                        <label class="col-sm-2 control-label spacing">单位电话</label>
+                        <div class="col-sm-4 spacing">
+                            <input type="text" class="form-control" readonly="readonly" id="ephone" name="ephone"
+                                   value="{$ep.ephone}"/>
+                        </div>
+                    </div>
+                    <div class="rowGroup" style="margin-bottom: 0px;">
+                        <label class="col-sm-2 control-label spacing">人才联络员</label>
+                        <div class="col-sm-4 spacing">
+                            <input type="text" class="form-control" readonly="readonly" id="agentName" name="agentName"
+                                   value="{$ep.agentName}"/>
+                        </div>
+                    </div>
+                    <div class="rowGroup" style="margin-bottom: 0px;">
+                        <label class="col-sm-2 control-label spacing">人才联络员电话</label>
+                        <div class="col-sm-4 spacing">
+                            <input type="text" class="form-control" readonly="readonly" id="agentPhone"
+                                   name="agentPhone" value="{$ep.agentPhone}"/>
+                        </div>
+                    </div>
+                    <div class="rowGroup" style="margin-bottom: 0px;">
+                        <label class="col-sm-2 control-label spacing">人才联络员邮箱</label>
+                        <div class="col-sm-4 spacing">
+                            <input type="text" class="form-control" readonly="readonly" id="agentEmail"
+                                   name="agentEmail" value="{$ep.agentEmail}"/>
+                        </div>
+                    </div>
+                    <div class="rowGroup" style="margin-bottom: 0px;">
+                        <label class="col-sm-2 control-label spacing">企业银行账号</label>
+                        <div class="col-sm-4 spacing">
+                            <input type="text" class="form-control" readonly="readonly" id="bankCard" name="bankCard"
+                                   value="{$ep.bankCard}"/>
+                        </div>
+                    </div>
+                    <div class="rowGroup" style="margin-bottom: 0px;">
+                        <label class="col-sm-2 control-label spacing">企业开户银行网点</label>
+                        <div class="col-sm-4 spacing">
+                            <input type="text" class="form-control" readonly="readonly" id="bankNetwork"
+                                   name="bankNetwork" value="{$ep.bankNetwork}"/>
+                        </div>
+                    </div>
+                    <div class="rowGroup" style="margin-bottom: 0px;">
+                        <label class="col-sm-2 control-label spacing">企业开户银行</label>
+                        <div class="col-sm-4 spacing">
+                            <input type="text" class="form-control" readonly="readonly" id="bank" name="bank"
+                                   value="{$ep.bank}"/>
+                        </div>
+                    </div>
+                    <div class="rowGroup" style="margin-bottom: 0px;">
+                        <label class="col-sm-2 control-label spacing">审核状态</label>
+                        <div class="col-sm-4 spacing">
+                            <input type="text" class="form-control" readonly="readonly" id="checkState"
+                                   name="checkState" value="{$ep.checkStateName}"/>
+                        </div>
+                    </div>
+                    <div class="rowGroup" style="margin-bottom: 0px;">
+                        <label class="col-sm-2 control-label spacing">审核意见</label>
+                        <div class="col-sm-4 spacing">
+                            <input type="text" class="form-control" readonly="readonly" id="checkMsg" name="checkMsg"
+                                   value="{$ep.checkMsg}"/>
+                        </div>
+                    </div>
+                    <div class="rowGroup" style="margin-bottom: 0px;">
+                        <label class="col-sm-2 control-label spacing">审核人</label>
+                        <div class="col-sm-4 spacing">
+                            <input type="text" class="form-control" readonly="readonly" id="checkUser" name="checkUser"
+                                   value="{$ep.checkUser}"/>
+                        </div>
+                    </div>
+                    <div class="rowGroup" style="margin-bottom: 0px;">
+                        <label class="col-sm-2 control-label spacing">账号状态</label>
+                        <div class="col-sm-4 spacing">
+                            <input type="text" class="form-control" readonly="readonly" id="active" name="active"
+                                   value="{$ep.activeName}"/>
+                        </div>
+                    </div>
+                    <div class="rowGroup" style="margin-bottom: 0px;">
+                        <label class="col-sm-2 control-label spacing">拉黑/冻结原因</label>
+                        <div class="col-sm-4 spacing">
+                            <input type="text" class="form-control" readonly="readonly" id="activeMsg" name="activeMsg"
+                                   value="{$ep.activeMsg}"/>
+                        </div>
+                    </div>
+                    <div class="rowGroup" style="margin-bottom: 0px;">
+                        <label class="col-sm-2 control-label spacing">备注</label>
+                        <div class="col-sm-4 spacing">
+                            <input type="text" class="form-control" readonly="readonly" id="description"
+                                   name="description" value="{$ep.description}"/>
+                        </div>
+                    </div>
+                </div>
+                <div class="row">
+                    {if condition="$ep.imgurl neq ''"}
+                    <div class="rowGroup" style="margin-bottom: 0px;">
+                        <label class="col-sm-1 control-label spacing">营业执照</label>
+                        <div class="col-sm-3 spacing">
+                            <img onclick="Feng.showImg(this)" id="yyzz" alt="营业执照" src="{$ep.imgurl|getStoragePath}"
+                                 style="max-width: 100px;">
+                        </div>
+                    </div>
+                    {/if}
+                    {if condition="$ep.bankImg neq ''"}
+                    <div class="rowGroup" style="margin-bottom: 0px;">
+                        <label class="col-sm-1 control-label spacing">开启许可证</label>
+                        <div class="col-sm-3 spacing">
+                            <img onclick="Feng.showImg(this)" id="bankImg" alt="开启许可证"
+                                 src="{$ep.bankImg|getStoragePath}" style="max-width: 100px;">
+                        </div>
+                    </div>
+                    {/if}
+                    {if condition="$ep.domainImg neq ''"}
+                    <div class="rowGroup" style="margin-bottom: 0px;">
+                      <label class="col-sm-1 control-label spacing">行业领域佐证材料</label>
+                      <div class="col-sm-3 spacing">
+                        <img onclick="Feng.showImg(this)" id="domainImg" alt="开启许可证"
+                             src="{$ep.domainImg|getStoragePath}" style="max-width: 100px;">
+                      </div>
+                    </div>
+                    {/if}
+                </div>
+            </div>
+        </form>
+    </div>
 </div>
 <div style="display: none" id="canvas">
-  <canvas id="the-canvas"></canvas>
+    <canvas id="the-canvas"></canvas>
 </div>
 {/block}

app/admin/view/enterprise_change_record/goto_enterprise_change_detail_page.html

@@ -1,226 +1,362 @@
 {extend name="layout/content"}
 {block name="content"}
 <style>
-  .upload-btn{
-    position: relative;
-    display: inline-block;
-    cursor: pointer;
-    background: #1ab394;
-    padding: 6px 12px;
-    color: #fff;
-    text-align: center;
-    border-radius: 3px;
-    overflow: hidden;
-    font-size: 14px;
-    font-weight: 400;
-  }
-  .spacing {
-    margin-bottom: 10px;
-    padding-right:4px;
-    padding-left: 4px;
-  }
-  .imgs li{
-    list-style: none;
-    float: left;
-    border: 1px solid #d8d1d1;
-    text-align: center;
-    height: 30px;
-  }
+    .upload-btn {
+        position: relative;
+        display: inline-block;
+        cursor: pointer;
+        background: #1ab394;
+        padding: 6px 12px;
+        color: #fff;
+        text-align: center;
+        border-radius: 3px;
+        overflow: hidden;
+        font-size: 14px;
+        font-weight: 400;
+    }
+
+    .spacing {
+        margin-bottom: 10px;
+        padding-right: 4px;
+        padding-left: 4px;
+    }
+
+    .imgs li {
+        list-style: none;
+        float: left;
+        border: 1px solid #d8d1d1;
+        text-align: center;
+        height: 30px;
+    }
 </style>
 <div class="ibox float-e-margins">
-  <div class="ibox-content" >
-    <div class="form-horizontal">
-      <div class="row">
-        <div class="col-sm-12" >
-          <div class="tabs-container" >
-            <ul class="nav nav-tabs">
-              <li class="active"><a data-toggle="tab" href="#tab-1" aria-expanded="true">1.基本信息</a></li>
-              <li id="fileLi" class=""><a data-toggle="tab" href="#tab-2" onclick="ecre.initFileTable()"  aria-expanded="false">2.附件上传</a></li>
-            </ul>
-          </div>
-          <div class="tab-content">
-            <div id="tab-1" class="tab-pane active">
-              <div class="panel-body">
-                <div class="panel panel-default">
-                  <div class="panel-heading" onclick="$(this).next().toggle()">变更前企业信息</div>
-                  <div class="panel-body">
-                    <form id="ecr_form1" class="form-horizontal" target="hiddenIframe" action="" method="post" enctype="multipart/form-data">
-                      <input type="text" class="form-control" id="id" name="id" value="{$ecr.id}" style="display: none;"/>
-                      <input type="text" class="form-control" id="type" name="type" value="{$ecr.type}" style="display: none;"/>
-                      <input style="display: none;" type="text" class="form-control" id="checkState" name="checkState" value="{$ecr.checkState}"/>
-                      <div class="col-sm-12 ">
-                        <div class="row">
-                          <div class="rowGroup"  style="margin-bottom: 0px;">
-                            <label class="col-sm-2 control-label spacing"><span class="text-danger">*</span>单位名称</label>
-                            <div class="col-sm-4 spacing">
-                              <input type="text" class="form-control" id="oldName" name="oldName" value="{$ecr.oldName}"/>
+    <div class="ibox-content">
+        <div class="form-horizontal">
+            <div class="row">
+                <div class="col-sm-12">
+                    <div class="tabs-container">
+                        <ul class="nav nav-tabs">
+                            <li class="active"><a data-toggle="tab" href="#tab-1" aria-expanded="true">1.基本信息</a>
+                            </li>
+                            <li id="fileLi" class=""><a data-toggle="tab" href="#tab-2" onclick="ecre.initFileTable()"
+                                                        aria-expanded="false">2.附件上传</a></li>
+                        </ul>
+                    </div>
+                    <div class="tab-content">
+                        <div id="tab-1" class="tab-pane active">
+                            <input type="text" class="form-control" id="id" name="id" value="{$ecr.id}" style="display: none;"/>
+                            <input type="text" class="form-control" id="type" name="type" value="{$ecr.type}" style="display: none;"/>
+                            <input style="display: none;" type="text" class="form-control" id="checkState" name="checkState" value="{$ecr.checkState}"/>
+                            <div class="panel-body">
+                                <div class="panel panel-default">
+                                    <div class="panel-heading" onclick="$(this).next().toggle()">变更前企业信息</div>
+                                    <div class="panel-body">
+                                        <div class="col-sm-12 ">
+                                            <div class="row">
+                                                <div class="rowGroup" style="margin-bottom: 0px;">
+                                                    <label class="col-sm-2 control-label spacing"><span
+                                                            class="text-danger">*</span>单位名称</label>
+                                                    <div class="col-sm-4 spacing">
+                                                        <input type="text" class="form-control" id="oldName"
+                                                               name="oldName" value="{$ecr.oldName}" readonly disabled/>
+                                                    </div>
+                                                </div>
+                                                <div class="rowGroup" style="margin-bottom: 0px;">
+                                                    <label class="col-sm-2 control-label spacing"><span
+                                                            class="text-danger">*</span>社会信用代码</label>
+                                                    <div class="col-sm-4 spacing">
+                                                        <input type="text" class="form-control" id="oldIdCard"
+                                                               name="oldIdCard" value="{$ecr.oldIdCard}" readonly
+                                                               disabled/>
+                                                    </div>
+                                                </div>
+                                                <div class="rowGroup" style="display: none">
+                                                    <label class="col-sm-2 control-label spacing"><span
+                                                            class="text-danger">*</span>产业领域</label>
+                                                    <div class="col-sm-4 spacing">
+                                                        <input type="text" class="form-control"
+                                                               id="oldIndustryFieldNew" name="oldIndustryFieldNew"
+                                                               value="{$ecr.oldIndustryFieldNewName}" readonly
+                                                               disabled/>
+                                                    </div>
+                                                </div>
+                                                <div class="rowGroup" style="display: none">
+                                                    <label class="col-sm-2 control-label spacing"><span
+                                                            class="text-danger">*</span>行业领域</label>
+                                                    <div class="col-sm-4 spacing">
+                                                        <input type="text" class="form-control"
+                                                               id="oldIndustryFieldOld" name="oldIndustryFieldOld"
+                                                               value="{$ecr.oldIndustryFieldOldName}" readonly
+                                                               disabled/>
+                                                    </div>
+                                                </div>
+                                                <div class="rowGroup" style="display: none">
+                                                    <label class="col-sm-2 control-label spacing"><span
+                                                            class="text-danger">*</span>单位标签</label>
+                                                    <div class="col-sm-4 spacing">
+                                                        <input type="text" class="form-control"
+                                                               id="oldEnterpriseTag" name="oldEnterpriseTag"
+                                                               value="{$ecr.oldEnterpriseTagName}" readonly disabled/>
+                                                    </div>
+                                                </div>
+                                                <div class="rowGroup" style="margin-bottom: 0px;">
+                                                    <label class="col-sm-2 control-label spacing"><span
+                                                            class="text-danger">*</span>法人代表</label>
+                                                    <div class="col-sm-4 spacing">
+                                                        <input type="text" class="form-control" id="oldLegal"
+                                                               name="oldLegal" value="{$ecr.oldLegal}" readonly
+                                                               disabled/>
+                                                    </div>
+                                                </div>
+                                                <div class="rowGroup" style="margin-bottom: 0px;">
+                                                    <label class="col-sm-2 control-label spacing"><span
+                                                            class="text-danger">*</span>所属街道</label>
+                                                    <div class="col-sm-4 spacing">
+                                                        <input type="text" class="form-control" id="oldStreet"
+                                                               name="oldStreet" value="{$ecr.oldStreetName}" readonly
+                                                               disabled/>
+                                                    </div>
+                                                </div>
+                                                <div class="rowGroup" style="margin-bottom: 0px;">
+                                                    <label class="col-sm-2 control-label spacing"><span
+                                                            class="text-danger">*</span>单位地址</label>
+                                                    <div class="col-sm-4 spacing">
+                                                        <input type="text" class="form-control" id="oldAddress"
+                                                               name="oldAddress" value="{$ecr.oldAddress}" readonly
+                                                               disabled/>
+                                                    </div>
+                                                </div>
+                                                <div class="rowGroup" style="margin-bottom: 0px;">
+                                                    <label class="col-sm-2 control-label spacing"><span
+                                                            class="text-danger">*</span>单位电话</label>
+                                                    <div class="col-sm-4 spacing">
+                                                        <input type="text" class="form-control" id="oldEphone"
+                                                               name="oldEphone" value="{$ecr.oldEphone}" readonly
+                                                               disabled/>
+                                                    </div>
+                                                </div>
+                                                <div class="rowGroup" style="margin-bottom: 0px;">
+                                                    <label class="col-sm-2 control-label spacing"><span
+                                                            class="text-danger">*</span>人才联络员</label>
+                                                    <div class="col-sm-4 spacing">
+                                                        <input type="text" class="form-control" id="oldAgentName"
+                                                               name="oldAgentName" value="{$ecr.oldAgentName}" readonly
+                                                               disabled/>
+                                                    </div>
+                                                </div>
+                                                <div class="rowGroup" style="margin-bottom: 0px;">
+                                                    <label class="col-sm-2 control-label spacing"><span
+                                                            class="text-danger">*</span>人才联络员电话</label>
+                                                    <div class="col-sm-4 spacing">
+                                                        <input type="text" class="form-control" id="oldAgentPhone"
+                                                               name="oldAgentPhone" value="{$ecr.oldAgentPhone}"
+                                                               readonly disabled/>
+                                                    </div>
+                                                </div>
+                                                <div class="rowGroup" style="margin-bottom: 0px;">
+                                                    <label class="col-sm-2 control-label spacing"><span
+                                                            class="text-danger">*</span>电子邮箱</label>
+                                                    <div class="col-sm-4 spacing">
+                                                        <input type="text" class="form-control" id="oldAgentEmail"
+                                                               name="oldAgentEmail" value="{$ecr.oldAgentEmail}"
+                                                               readonly disabled/>
+                                                    </div>
+                                                </div>
+                                                <div class="rowGroup" style="margin-bottom: 0px;">
+                                                    <label class="col-sm-2 control-label spacing"><span
+                                                            class="text-danger">*</span>企业银行账号</label>
+                                                    <div class="col-sm-4 spacing">
+                                                        <input type="text" class="form-control" id="oldBankCard"
+                                                               name="oldBankCard" value="{$ecr.oldBankCard}" readonly
+                                                               disabled/>
+                                                    </div>
+                                                </div>
+                                                <div class="rowGroup" style="margin-bottom: 0px;">
+                                                    <label class="col-sm-2 control-label spacing"><span
+                                                            class="text-danger">*</span>企业开户银行网点</label>
+                                                    <div class="col-sm-4 spacing">
+                                                        <input type="text" class="form-control" id="oldBankNetwork"
+                                                               name="oldBankNetwork" value="{$ecr.oldBankNetwork}"
+                                                               readonly disabled/>
+                                                    </div>
+                                                </div>
+                                                <div class="rowGroup" style="margin-bottom: 0px;">
+                                                    <label class="col-sm-2 control-label spacing"><span
+                                                            class="text-danger">*</span>企业开户银行</label>
+                                                    <div class="col-sm-4 spacing">
+                                                        <input type="text" class="form-control" id="oldBank"
+                                                               name="oldBank" value="{$ecr.oldBank}" readonly disabled/>
+                                                    </div>
+                                                </div>
+                                            </div>
+                                        </div>
+                                    </div>
+                                </div>
+                                <div class="panel panel-default">
+                                    <div class="panel-heading" onclick="$(this).next().toggle()">变更后企业信息</div>
+                                    <div class="panel-body">
+
+                                        <div class="col-sm-12 ">
+                                            <div class="row">
+                                                <div class="rowGroup" style="margin-bottom: 0px;">
+                                                    <label class="col-sm-2 control-label spacing"><span
+                                                            class="text-danger">*</span>单位名称</label>
+                                                    <div class="col-sm-4 spacing">
+                                                        <input type="text" class="form-control" id="newName"
+                                                               name="newName" value="{$ecr.newName}" readonly disabled/>
+                                                    </div>
+                                                </div>
+                                                <div class="rowGroup" style="margin-bottom: 0px;">
+                                                    <label class="col-sm-2 control-label spacing"><span
+                                                            class="text-danger">*</span>社会信用代码</label>
+                                                    <div class="col-sm-4 spacing">
+                                                        <input type="text" class="form-control" id="newIdCard"
+                                                               name="newIdCard" value="{$ecr.newIdCard}" readonly
+                                                               disabled/>
+                                                    </div>
+                                                </div>
+                                                <div class="rowGroup">
+                                                    <label class="col-sm-2 control-label spacing"><span
+                                                            class="text-danger">*</span>产业领域</label>
+                                                    <div class="col-sm-4 spacing">
+                                                        <input type="text" class="form-control"
+                                                               id="newIndustryFieldNew" name="newIndustryFieldNew"
+                                                               value="{$ecr.newIndustryFieldNewName}" readonly
+                                                               disabled/>
+                                                    </div>
+                                                </div>
+                                                <div class="rowGroup">
+                                                    <label class="col-sm-2 control-label spacing"><span
+                                                            class="text-danger">*</span>行业领域</label>
+                                                    <div class="col-sm-4 spacing">
+                                                        <input type="text" class="form-control"
+                                                               id="newIndustryFieldOld" name="newIndustryFieldOld"
+                                                               value="{$ecr.newIndustryFieldOldName}" readonly
+                                                               disabled/>
+                                                    </div>
+                                                </div>
+                                                <div class="rowGroup" style="display: none">
+                                                    <label class="col-sm-2 control-label spacing"><span
+                                                            class="text-danger">*</span>单位标签</label>
+                                                    <div class="col-sm-4 spacing">
+                                                        <input type="text" class="form-control"
+                                                               id="newEnterpriseTag" name="newEnterpriseTag"
+                                                               value="{$ecr.newEnterpriseTagName}" readonly disabled/>
+                                                    </div>
+                                                </div>
+                                                <div class="rowGroup" style="margin-bottom: 0px;">
+                                                    <label class="col-sm-2 control-label spacing"><span
+                                                            class="text-danger">*</span>法人代表</label>
+                                                    <div class="col-sm-4 spacing">
+                                                        <input type="text" class="form-control" id="newLegal"
+                                                               name="newLegal" value="{$ecr.newLegal}" readonly
+                                                               disabled/>
+                                                    </div>
+                                                </div>
+                                                <div class="rowGroup" style="margin-bottom: 0px;">
+                                                    <label class="col-sm-2 control-label spacing"><span
+                                                            class="text-danger">*</span>所属街道</label>
+                                                    <div class="col-sm-4 spacing">
+                                                        <input type="text" class="form-control" id="newStreet"
+                                                               name="newStreet" value="{$ecr.newStreetName}" readonly
+                                                               disabled/>
+                                                    </div>
+                                                </div>
+                                                <div class="rowGroup" style="margin-bottom: 0px;">
+                                                    <label class="col-sm-2 control-label spacing"><span
+                                                            class="text-danger">*</span>单位地址</label>
+                                                    <div class="col-sm-4 spacing">
+                                                        <input type="text" class="form-control" id="newAddress"
+                                                               name="newAddress" value="{$ecr.newAddress}" readonly
+                                                               disabled/>
+                                                    </div>
+                                                </div>
+                                                <div class="rowGroup" style="margin-bottom: 0px;">
+                                                    <label class="col-sm-2 control-label spacing"><span
+                                                            class="text-danger">*</span>单位电话</label>
+                                                    <div class="col-sm-4 spacing">
+                                                        <input type="text" class="form-control" id="newEphone"
+                                                               name="newEphone" value="{$ecr.newEphone}" readonly
+                                                               disabled/>
+                                                    </div>
+                                                </div>
+                                                <div class="rowGroup" style="margin-bottom: 0px;">
+                                                    <label class="col-sm-2 control-label spacing"><span
+                                                            class="text-danger">*</span>人才联络员</label>
+                                                    <div class="col-sm-4 spacing">
+                                                        <input type="text" class="form-control" id="newAgentName"
+                                                               name="newAgentName" value="{$ecr.newAgentName}" readonly
+                                                               disabled/>
+                                                    </div>
+                                                </div>
+                                                <div class="rowGroup" style="margin-bottom: 0px;">
+                                                    <label class="col-sm-2 control-label spacing"><span
+                                                            class="text-danger">*</span>人才联络员电话</label>
+                                                    <div class="col-sm-4 spacing">
+                                                        <input type="text" class="form-control" id="newAgentPhone"
+                                                               name="newAgentPhone" value="{$ecr.newAgentPhone}"
+                                                               readonly disabled/>
+                                                    </div>
+                                                </div>
+                                                <div class="rowGroup" style="margin-bottom: 0px;">
+                                                    <label class="col-sm-2 control-label spacing"><span
+                                                            class="text-danger">*</span>电子邮箱</label>
+                                                    <div class="col-sm-4 spacing">
+                                                        <input type="text" class="form-control" id="newAgentEmail"
+                                                               name="newAgentEmail" value="{$ecr.newAgentEmail}"
+                                                               readonly disabled/>
+                                                    </div>
+                                                </div>
+                                                <div class="rowGroup" style="margin-bottom: 0px;">
+                                                    <label class="col-sm-2 control-label spacing"><span
+                                                            class="text-danger">*</span>企业银行账号</label>
+                                                    <div class="col-sm-4 spacing">
+                                                        <input type="text" class="form-control" id="newBankCard"
+                                                               name="newBankCard" value="{$ecr.newBankCard}" readonly
+                                                               disabled/>
+                                                    </div>
+                                                </div>
+                                                <div class="rowGroup" style="margin-bottom: 0px;">
+                                                    <label class="col-sm-2 control-label spacing"><span
+                                                            class="text-danger">*</span>企业开户银行网点</label>
+                                                    <div class="col-sm-4 spacing">
+                                                        <input type="text" class="form-control" id="newBankNetwork"
+                                                               name="newBankNetwork" value="{$ecr.newBankNetwork}"
+                                                               readonly disabled/>
+                                                    </div>
+                                                </div>
+                                                <div class="rowGroup" style="margin-bottom: 0px;">
+                                                    <label class="col-sm-2 control-label spacing"><span
+                                                            class="text-danger">*</span>企业开户银行</label>
+                                                    <div class="col-sm-4 spacing">
+                                                        <input type="text" class="form-control" id="newBank"
+                                                               name="newBank" value="{$ecr.newBank}" readonly disabled/>
+                                                    </div>
+                                                </div>
+                                            </div>
+                                        </div>
+
+                                    </div>
+                                </div>
                             </div>
-                          </div>
-                          <div class="rowGroup"  style="margin-bottom: 0px;">
-                            <label class="col-sm-2 control-label spacing"><span class="text-danger">*</span>社会信用代码</label>
-                            <div class="col-sm-4 spacing">
-                              <input type="text" class="form-control" id="oldIdCard" name="oldIdCard" value="{$ecr.oldIdCard}"/>
-                            </div>
-                          </div>
-                          <div class="rowGroup" style="display: none">
-                            <label class="col-sm-2 control-label spacing"><span class="text-danger">*</span>产业领域</label>
-                            <div class="col-sm-4 spacing">
-                              <input type="text" class="form-control" id="oldIndustryFieldNew" name="oldIndustryFieldNew" value="{$ecr.oldIndustryFieldNewName}" />
-                            </div>
-                          </div>
-                          <div class="rowGroup" style="display: none">
-                            <label class="col-sm-2 control-label spacing"><span class="text-danger">*</span>行业领域</label>
-                            <div class="col-sm-4 spacing">
-                              <input type="text" class="form-control" id="oldIndustryFieldOld" name="oldIndustryFieldOld" value="{$ecr.oldIndustryFieldOldName}">
-                            </div>
-                          </div>
-                          <div class="rowGroup"  style="display: none">
-                            <label class="col-sm-2 control-label spacing"><span class="text-danger">*</span>单位标签</label>
-                            <div class="col-sm-4 spacing">
-                              <select type="text" class="form-control" id="oldEnterpriseTag" name="oldEnterpriseTag" value="{$ecr.oldEnterpriseTagName}"></select>
-                            </div>
-                          </div>
-                          <div class="rowGroup"  style="margin-bottom: 0px;">
-                            <label class="col-sm-2 control-label spacing"><span class="text-danger">*</span>法人代表</label>
-                            <div class="col-sm-4 spacing">
-                              <input type="text" class="form-control" id="oldLegal" name="oldLegal" value="{$ecr.oldLegal}"/>
-                            </div>
-                          </div>
-                          <div class="rowGroup"  style="margin-bottom: 0px;">
-                            <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="oldStreet" name="oldStreet" value="{$ecr.oldStreet}"></select>
-                            </div>
-                          </div>
-                          <div class="rowGroup"  style="margin-bottom: 0px;">
-                            <label class="col-sm-2 control-label spacing"><span class="text-danger">*</span>单位地址</label>
-                            <div class="col-sm-4 spacing">
-                              <input type="text" class="form-control" id="oldAddress" name="oldAddress" value="{$ecr.oldAddress}"/>
-                            </div>
-                          </div>
-                          <div class="rowGroup"  style="margin-bottom: 0px;">
-                            <label class="col-sm-2 control-label spacing"><span class="text-danger">*</span>单位电话</label>
-                            <div class="col-sm-4 spacing">
-                              <input type="text" class="form-control" id="oldEphone" name="oldEphone" value="{$ecr.oldEphone}"/>
-                            </div>
-                          </div>
-                          <div class="rowGroup"  style="margin-bottom: 0px;">
-                            <label class="col-sm-2 control-label spacing"><span class="text-danger">*</span>人才联络员</label>
-                            <div class="col-sm-4 spacing">
-                              <input type="text" class="form-control" id="oldAgentName" name="oldAgentName" value="{$ecr.oldAgentName}"/>
-                            </div>
-                          </div>
-                          <div class="rowGroup"  style="margin-bottom: 0px;">
-                            <label class="col-sm-2 control-label spacing"><span class="text-danger">*</span>人才联络员电话</label>
-                            <div class="col-sm-4 spacing">
-                              <input type="text" class="form-control" id="oldAgentPhone" name="oldAgentPhone" value="{$ecr.oldAgentPhone}"/>
-                            </div>
-                          </div>
-                          <div class="rowGroup"  style="margin-bottom: 0px;">
-                            <label class="col-sm-2 control-label spacing"><span class="text-danger">*</span>电子邮箱</label>
-                            <div class="col-sm-4 spacing">
-                              <input type="text" class="form-control" id="oldAgentEmail" name="oldAgentEmail" value="{$ecr.oldAgentEmail}"/>
-                            </div>
-                          </div>
                         </div>
-                      </div>
-                    </form>
-                  </div>
-                </div>
-                <div class="panel panel-default">
-                  <div class="panel-heading" onclick="$(this).next().toggle()">变更后企业信息</div>
-                  <div class="panel-body">
-                    <form id="ecr_form2" class="form-horizontal" target="hiddenIframe" action="" method="post" enctype="multipart/form-data">
-                      <div class="col-sm-12 ">
-                        <div class="row">
-                          <div class="rowGroup"  style="margin-bottom: 0px;">
-                            <label class="col-sm-2 control-label spacing"><span class="text-danger">*</span>单位名称</label>
-                            <div class="col-sm-4 spacing">
-                              <input type="text" class="form-control" id="newName" name="newName" value="{$ecr.newName}"/>
-                            </div>
-                          </div>
-                          <div class="rowGroup"  style="margin-bottom: 0px;">
-                            <label class="col-sm-2 control-label spacing"><span class="text-danger">*</span>社会信用代码</label>
-                            <div class="col-sm-4 spacing">
-                              <input type="text" class="form-control" id="newIdCard" name="newIdCard" value="{$ecr.newIdCard}"/>
-                            </div>
-                          </div>
-                          <div class="rowGroup" >
-                            <label class="col-sm-2 control-label spacing"><span class="text-danger">*</span>行业领域</label>
-                            <div class="col-sm-4 spacing">
-                              <input type="text" class="form-control" id="newIndustryField" name="newIndustryField" value="{$ecr.newIndustryFieldName}">
-                            </div>
-                          </div>
-                          <div class="rowGroup"  style="display: none">
-                            <label class="col-sm-2 control-label spacing"><span class="text-danger">*</span>企业标签</label>
-                            <div class="col-sm-4 spacing">
-                              <select type="text" class="form-control" id="newTalentType" name="newTalentType" value="{$ecr.newTalentType}"></select>
-                            </div>
-                          </div>
-                          <div class="rowGroup"  style="margin-bottom: 0px;">
-                            <label class="col-sm-2 control-label spacing"><span class="text-danger">*</span>法人代表</label>
-                            <div class="col-sm-4 spacing">
-                              <input type="text" class="form-control" id="newLegal" name="newLegal" value="{$ecr.newLegal}"/>
-                            </div>
-                          </div>
-                          <div class="rowGroup"  style="margin-bottom: 0px;">
-                            <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="newStreet" name="newStreet" value="{$ecr.newStreet}"></select>
-                            </div>
-                          </div>
-                          <div class="rowGroup"  style="margin-bottom: 0px;">
-                            <label class="col-sm-2 control-label spacing"><span class="text-danger">*</span>单位地址</label>
-                            <div class="col-sm-4 spacing">
-                              <input type="text" class="form-control" id="newAddress" name="newAddress" value="{$ecr.newAddress}"/>
-                            </div>
-                          </div>
-                          <div class="rowGroup"  style="margin-bottom: 0px;">
-                            <label class="col-sm-2 control-label spacing"><span class="text-danger">*</span>单位电话</label>
-                            <div class="col-sm-4 spacing">
-                              <input type="text" class="form-control" id="newEphone" name="newEphone" value="{$ecr.newEphone}"/>
-                            </div>
-                          </div>
-                          <div class="rowGroup"  style="margin-bottom: 0px;">
-                            <label class="col-sm-2 control-label spacing"><span class="text-danger">*</span>人才联络员</label>
-                            <div class="col-sm-4 spacing">
-                              <input type="text" class="form-control" id="newAgentName" name="newAgentName" value="{$ecr.newAgentName}"/>
-                            </div>
-                          </div>
-                          <div class="rowGroup"  style="margin-bottom: 0px;">
-                            <label class="col-sm-2 control-label spacing"><span class="text-danger">*</span>人才联络员电话</label>
-                            <div class="col-sm-4 spacing">
-                              <input type="text" class="form-control" id="newAgentPhone" name="newAgentPhone" value="{$ecr.newAgentPhone}"/>
-                            </div>
-                          </div>
-                          <div class="rowGroup"  style="margin-bottom: 0px;">
-                            <label class="col-sm-2 control-label spacing"><span class="text-danger">*</span>电子邮箱</label>
-                            <div class="col-sm-4 spacing">
-                              <input type="text" class="form-control" id="newAgentEmail" name="newAgentEmail" value="{$ecr.newAgentEmail}"/>
-                            </div>
-                          </div>
+                        <div id="tab-2" class="tab-pane ">
+                            <table id="fileTable" class="table-condensed"
+                                   style="font-size: 10px;table-layout: fixed!important;" data-mobile-responsive="true"
+                                   data-click-to-select="true">
+                                <thead>
+                                <tr>
+                                    <th data-field="selectItem" data-checkbox="true"></th>
+                                </tr>
+                                </thead>
+                            </table>
+                            <label style="padding-top: 15px;color: red">*请根据上传的附件材料，编辑好相应的文件夹名称</label>
                         </div>
-                      </div>
-                    </form>
-                  </div>
+                    </div>
                 </div>
-              </div>
-            </div>
-            <div id="tab-2" class="tab-pane ">
-              <table id="fileTable" class="table-condensed" style="font-size: 10px;table-layout: fixed!important;" data-mobile-responsive="true" data-click-to-select="true">
-                <thead>
-                <tr>
-                  <th data-field="selectItem" data-checkbox="true"></th>
-                </tr>
-                </thead>
-              </table>
-              <label style="padding-top: 15px;color: red">*请根据上传的附件材料，编辑好相应的文件夹名称</label>
             </div>
-          </div>
         </div>
-      </div>
     </div>
-  </div>
 </div>
 <iframe style="display: none;" id="hiddenIframe" name="hiddenIframe"></iframe>
 <script src="/static/modular/enterprise/enterprisechangeRecord/ep_change_record_detail.js?v=1"></script>

app/common.php

@@ -99,3 +99,15 @@ function isExcelFile($mime) {
         "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet"
     ]);
 }
+
+/**
+ * 获得上传文件的路径
+ * @param $path
+ * @return string
+ */
+function getStoragePath($path){
+    if($path){
+        return "/storage/{$path}";
+    }
+    return "";
+}

app/common/controller/Api.php

@@ -86,16 +86,53 @@ class Api extends BaseController {
         $list = TalentLogApi::getList($type, $mainId);
         $new_list = [];
         foreach ($list as $item) {
-            $new_item["stepName"] = DictApi::getTalentInfoStepByState($item["new_state"]);
-            if ($item["state"] == 13) {
-                $new_item["stateName"] = '<span class="label label-success">审核不通过</span>';
-            } else if (in_array($item["state"], [3, 7, 9, 11])) {
-                $new_item["stateName"] = '<span class="label label-primary">审核通过</span>';
-            } else if (in_array($item["state"], [4, 8, 10, 12])) {
-                $new_item["stateName"] = '<span class="label label-danger">审核驳回</span>';
-            } else {
-                $new_item["stateName"] = '<span class="label label-success">待审核</span>';
+            if($item['type'] == 10){//姑且按type还区分
+                switch ($item['state']){
+                    case -2:
+                        $new_item["stateName"] = "<span class='label label-success'>待提交</span>";
+                        break;
+                    case -1:
+                        $new_item["stateName"] = "<span class='label label-success'>审核不通过</span>";
+                        break;
+                    case 1:
+                        $new_item["stateName"] = "<span class='label label-success'>待审核</span>";
+                        break;
+                    case 2:
+                        $new_item["stateName"] = "<span class='label label-danger'>审核驳回</span>";
+                        break;
+                    case 3:
+                        $new_item["stateName"] = "<span class='label label-primary'>审核通过</span>";
+                        break;
+                    case 4:
+                        $new_item["stateName"] = "<span class='label label-warm'>上级驳回</span>";
+                        break;
+                    case 8:
+                        $new_item["stateName"] = "<span class='label label-primary'>提交审核</span>";
+                        break;
+                    case 9:
+                        $new_item["stateName"] = "<span class='label label-primary'>重新提交</span>";
+                        break;
+                    case 10:
+                        $new_item["stateName"] = "<span class='label label-default'>冻结</span>";
+                        break;
+                    case 11:
+                        $new_item["stateName"] = "<span class='label label-primary'>撤销审核</span>";
+                        break;
+                }
+            }else{
+                $new_item["stepName"] = DictApi::getTalentInfoStepByState($item["new_state"]);
+                if ($item["state"] == 13) {
+                    $new_item["stateName"] = '<span class="label label-success">审核不通过</span>';
+                } else if (in_array($item["state"], [3, 7, 9, 11])) {
+                    $new_item["stateName"] = '<span class="label label-primary">审核通过</span>';
+                } else if (in_array($item["state"], [4, 8, 10, 12])) {
+                    $new_item["stateName"] = '<span class="label label-danger">审核驳回</span>';
+                } else {
+                    $new_item["stateName"] = '<span class="label label-success">待审核</span>';
+                }
             }
+
+
             if ($item["step"] == 3) {
                 $company = CompanyApi::getOne($item["companyId"]);
                 if ($item["active"] == 0) {
@@ -107,7 +144,7 @@ class Api extends BaseController {
                 if ($item["last_state"] && $item["new_state"]) {
                     $new_item["stateChange"] = sprintf("%s -> %s", DictApi::getTalentInfoStateName($item["last_state"], $item["step"], $needDeptVerify), DictApi::getTalentInfoStateName($item["new_state"], $item["step"], $needDeptVerify));
                 } else {
-                    $new_item["stateChange"] = "";
+                    $new_item["stateChange"] = $item['stateChange'];
                 }
             }
             $new_item["description"] = $item["description"];

app/common/validate/Enterprise.php

@@ -11,7 +11,7 @@ class Enterprise extends Validate{
         'username' => 'require|max:50|unique:new_enterprise',
         'password' => 'require|min:6|regex:/^(?![0-9]+$)(?![a-zA-Z]+$)[0-9A-Za-z]{6,}$/',
         're_password' => 'require|confirm:password',
-        'name' => 'require|max:100|unique:new_enterprise',
+        'name' => 'require|max:100|unique:new_enterprise|regex:/^[\x{4e00}-\x{9fa5}]+$/u',
         'idCard' => ['require','unique:new_enterprise','regex:/^([0-9A-HJ-NPQRTUWXY]{2}\d{6}[0-9A-HJ-NPQRTUWXY]{10}|[1-9]\d{14})$/'],
         'type' => 'require',
         'industryFieldNew' => 'require',
@@ -20,7 +20,7 @@ class Enterprise extends Validate{
         'agentName' => 'require',
         'agentPhone' => 'require|unique:new_enterprise',
         'verificationCode' => 'require',
-        'legal' => 'require',
+        'legal' => 'require|regex:/^[\x{4e00}-\x{9fa5}]+$/u',
         'street' => 'require',
         'address' => 'require',
         'ephone' => 'require',
@@ -42,6 +42,7 @@ class Enterprise extends Validate{
         'name.require' => '请输入单位名称',
         'name.max'     => '单位名称最多100个字符!',
         'name.unique' => '该单位名称已存在',
+        'name.regex' => '单位名称只能是中文',
         'idCard.require'   => '请填写社会信用代码!',
         'idCard.regex'  => '社会信用代码不正确！',
         'idCard.unique' => '该社会信用代码已存在',
@@ -54,6 +55,7 @@ class Enterprise extends Validate{
         'agentPhone.unique' => '该人才联络员手机号已存在',
         'verificationCode.require' => '请输入手机验证码',
         'legal.require' => '请输入单位法人',
+        'legal.regex' => '法人姓名只能是中文',
         'street.require' => '请选择所属镇（街道）',
         'address.require' => '请输入单位地址',
         'ephone.require' => '请输入单位电话',

app/enterprise/view/api/to_add.html

@@ -157,7 +157,7 @@
                 </thead>
               </table>
               <label style="padding-top: 15px;color: red">*请根据上传的附件材料，编辑好相应的文件夹名称</label>
-              <form id="uploadForm" action="/api/talentCommonFile/addTalentCommonFile" method="post" class="form-horizontal" enctype="multipart/form-data" target="hiddenIframe" style="display: none">
+              <form id="uploadForm" action="/common/api/addTalentCommonFile" method="post" class="form-horizontal" enctype="multipart/form-data" target="hiddenIframe" style="display: none">
                 <input type="hidden" name="backName" value="EpChangeEdit.callBack">
                 <input type='hidden' id="fileId" name="fileId" >
                 <input type='file' id="upload_file" name="fileUrl" style='display: none'>

app/enterprise/view/api/to_update.html

@@ -28,7 +28,7 @@
   }
 </style>
 <div class="ibox float-e-margins">
-  <div class="ibox-content" style="height: 450px;">
+  <div class="ibox-content" style="height: 600px;">
     <div class="form-horizontal">
       <div class="row">
         <div class="col-sm-12" >

app/enterprise/view/index/center_page.html

@@ -1,255 +1,345 @@
 {extend name="layout/content"}
 {block name="content"}
 <style type="text/css">
-  .spacing {
-    margin-bottom: 10px;
-    padding-right:4px;
-    padding-left: 4px;
-  }
-  .layui-layer-btn .layui-layer-btn1 {
-    border-color: #009688;
-    background-color: #009688;
-    color: #fff;
-  }
+    .spacing {
+        margin-bottom: 10px;
+        padding-right: 4px;
+        padding-left: 4px;
+    }
+
+    .layui-layer-btn .layui-layer-btn1 {
+        border-color: #009688;
+        background-color: #009688;
+        color: #fff;
+    }
 </style>
 <div class="ibox float-e-margins">
-  <div class="ibox-title">
-    <h5>企业用户中心</h5>
-  </div>
-  <div class="ibox-content">
-    <div class="form-horizontal">
-      <div class="row">
-        <div class="col-sm-12">
-          <div class="tabs-container">
-            <ul class="nav nav-tabs">
-              <li class="active"><a data-toggle="tab" href="#tab-1" aria-expanded="true">基本信息</a></li>
-              <li class=""><a data-toggle="tab" href="#tab-2" aria-expanded="false">企业信息变更</a></li>
-              <li class=""><a data-toggle="tab" href="#tab-3" aria-expanded="false">修改密码</a></li>
-<!--              <li class="" ><a data-toggle="tab" href="#tab-4" aria-expanded="false">绑定聚才网账号</a></li>-->
-            </ul>
-            <div class="tab-content">
-              <div id="tab-1" class="tab-pane active">
-                <div class="panel-body" style="width:900px;">
-                  <br/>
-                  <div class="row">
-                    <div class="col-sm-12 ">
-                      <div class="rowGroup">
-                        <label class="col-sm-2 control-label spacing">账号</label>
-                        <div class="col-sm-4 spacing">
-                          <input type="text" class="form-control" readonly="readonly" name="username" value="{$ep.username}" />
-                        </div>
-                      </div>
-                      <div class="rowGroup">
-                        <label class="col-sm-2 control-label spacing">单位名称</label>
-                        <div class="col-sm-4 spacing">
-                          <input type="text" class="form-control" readonly="readonly" name="name" value="{$ep.name}" />
-                        </div>
-                      </div>
-                      <div class="rowGroup">
-                        <label class="col-sm-2 control-label spacing">社会信用代码</label>
-                        <div class="col-sm-4 spacing">
-                          <input type="text" class="form-control" readonly="readonly" name="idCard" value="{$ep.idCard}" />
-                        </div>
-                      </div>
-                      <div class="rowGroup"  style="display: none">
-                        <label class="col-sm-2 control-label spacing">产业领域</label>
-                        <div class="col-sm-4 spacing">
-                          <input type="text" class="form-control" readonly="readonly" id="industryFieldNewName" name="industryFieldNewName" value="{$ep.industryFieldNewName}">
-                        </div>
-                      </div>
-                      <div class="rowGroup"  style="display: none">
-                        <label class="col-sm-2 control-label spacing">行业领域</label>
-                        <div class="col-sm-4 spacing">
-                          <input type="text" class="form-control" readonly="readonly" id="industryFieldOldName" name="industryFieldOldName" value="{$ep.industryFieldOldName}">
-                        </div>
-                      </div>
-                      <div class="rowGroup" >
-                        <label class="col-sm-2 control-label spacing">申报类型</label>
-                        <div class="col-sm-4 spacing">
-                          <input type="text" class="form-control" readonly="readonly" id="typeName" name="typeName" value="{$ep.typeName}">
-                          <input type="hidden" id="type" name="type" value="{$ep.type}">
-                        </div>
-                      </div>
-                      <div class="rowGroup"  style="display: none">
-                        <label class="col-sm-2 control-label spacing">单位标签</label>
-                        <div class="col-sm-4 spacing">
-                          <input type="text" class="form-control" readonly="readonly" id="talentType" name="talentType" value="{$ep.talentTypeName}">
-                        </div>
-                      </div>
-                      <div class="rowGroup"  >
-                        <label class="col-sm-2 control-label spacing">所属街道</label>
-                        <div class="col-sm-4 spacing">
-                          <input type="text" class="form-control" readonly="readonly" name="streetName" value="{$ep.streetName}" />
-                        </div>
-                      </div>
-                      <div class="rowGroup" >
-                        <label class="col-sm-2 control-label spacing">单位地址</label>
-                        <div class="col-sm-4 spacing">
-                          <input type="text" class="form-control" readonly="readonly" name="address" value="{$ep.address}" />
-                        </div>
-                      </div>
-                      <div class="rowGroup"  >
-                        <label class="col-sm-2 control-label spacing">法人代表</label>
-                        <div class="col-sm-4 spacing">
-                          <input type="text" class="form-control" readonly="readonly" name="legal" value="{$ep.legal}" />
-                        </div>
-                      </div>
-                      <div class="rowGroup"  >
-                        <label class="col-sm-2 control-label spacing">单位电话</label>
-                        <div class="col-sm-4 spacing">
-                          <input type="text" class="form-control" readonly="readonly" name="ephone" value="{$ep.ephone}" />
-                        </div>
-                      </div>
-                      <div class="rowGroup" >
-                        <label class="col-sm-2 control-label spacing">人才联络员</label>
-                        <div class="col-sm-4 spacing">
-                          <input type="text" class="form-control" readonly="readonly" name="agentName" value="{$ep.agentName}" />
-                        </div>
-                      </div>
-                      <div class="rowGroup"  style="margin-bottom: 0px;">
-                        <label class="col-sm-2 control-label spacing">人才联络员电话</label>
-                        <div class="col-sm-4 spacing">
-                          <input type="text" class="form-control" readonly="readonly" name="agentPhone" value="{$ep.agentPhone}" />
-                        </div>
-                      </div>
-                      <div class="rowGroup"  style="margin-bottom: 0px;">
-                        <label class="col-sm-2 control-label spacing">人才联络员邮箱</label>
-                        <div class="col-sm-4 spacing">
-                          <input type="text" class="form-control" readonly="readonly" name="agentEmail" value="{$ep.agentEmail}" />
-                        </div>
-                      </div>
-                      <div class="rowGroup"  style="margin-bottom: 0px;">
-                        <label class="col-sm-2 control-label spacing">审核状态</label>
-                        <div class="col-sm-4 spacing">
-                          <input type="text" class="form-control" readonly="readonly" name="checkState" value="{$ep.checkStateName}" />
-                        </div>
-                      </div>
-                      <div class="rowGroup"  style="margin-bottom: 0px;">
-                        <label class="col-sm-2 control-label spacing">账号状态</label>
-                        <div class="col-sm-4 spacing">
-                          <input type="text" class="form-control" readonly="readonly" name="active" value="{$ep.activeName}" />
-                        </div>
-                      </div>
-                      <div class="rowGroup"  style="margin-bottom: 0px;">
-                        <label class="col-sm-2 control-label spacing">备注</label>
-                        <div class="col-sm-4 spacing">
-                          <input type="text" class="form-control" readonly="readonly" name="description" value="{$ep.description}" />
-                        </div>
-                      </div>
-                      <div class="rowGroup"  style="margin-bottom: 0px;">
-                        <label class="col-sm-2 control-label spacing">营业执照</label>
-                        <div class="col-sm-4 spacing">
-                          <img onclick="Feng.showImg(this)" id="photoImg" alt="营业执照" src="{$ep.imgurl}" style="max-width: 100px;" >
-                        </div>
-                      </div>
-                    </div>
-                  </div>
-                </div>
-              </div>
-              <div id="tab-2" class="tab-pane">
-                <br/>
-                <div class="row">
-                  <div class="hidden-xs" id="tableToolbar" role="group">
-                    <button type="button" class="btn btn-sm btn-primary" onclick="EnterpriseCenter.addEnterprisechangeRecord()"><i class="fa fa-plus"></i>申请变更</button>
-                    <button type="button" class="btn btn-sm btn-primary" onclick="EnterpriseCenter.updateEnterprisechangeRecord()"><i class="fa fa-edit"></i>修改</button>
-                    <button type="button" class="btn btn-sm btn-primary" onclick="EnterpriseCenter.showEnterprisechangeRecordDetail()"><i class="fa fa-info"></i>查看详情</button>
-                  </div>
-                  <table id="table">
-                  </table>
-                </div>
-              </div>
-              <div id="tab-3" class="tab-pane">
-                <div class="panel-body" style="width:900px;">
-                  <br/>
-                  <div class="row">
-                    <div class="col-sm-12 b-r">
-                      <div class="rowGroup"  style="margin-bottom: 0px;">
-                        <label class="col-sm-2 control-label">原密码</label>
-                        <div class="col-sm-10">
-                          <input type="password" class="form-control" autocomplete='new-password' name="password"/>
-                        </div>
-                      </div>
-                    </div>
-                  </div>
-                  <div class="hr-line-dashed"></div>
-                  <div class="row">
-                    <div class="col-sm-12 b-r">
-                      <div class="rowGroup"  style="margin-bottom: 0px;">
-                        <label class="col-sm-2 control-label">新密码</label>
-                        <div class="col-sm-10">
-                          <input type="password" class="form-control" autocomplete='new-password' name="newPassword"/>
-                        </div>
-                      </div>
-                    </div>
-                  </div>
-                  <div class="hr-line-dashed"></div>
-                  <div class="row">
-                    <div class="col-sm-12 b-r">
-                      <div class="rowGroup"  style="margin-bottom: 0px;">
-                        <label class="col-sm-2 control-label">重复新密码</label>
-                        <div class="col-sm-10">
-                          <input type="password" class="form-control" autocomplete='new-password' name="newRePassword"/>
-                        </div>
-                      </div>
-                    </div>
-                  </div>
-                  <br/>
-                  <div style="width:100%; text-align: center;">
-                    <button type="button" class="btn btn-w-m btn-primary" style="width:200px;" onclick="EnterpriseCenter.changePwd()">确认修改</button>
-                  </div>
-                </div>
-              </div>
-              <div id="tab-4" class="tab-pane">
-                <div class="panel-body" style="width:900px;">
-                  <br/>
-                  <div class="row" >
-                    <div class="col-sm-12 ">
-                      <div class="rowGroup"  style="margin-bottom: 0px;">
-                        <label class="col-sm-2 control-label">聚才网账号</label>
-                        <div class="col-sm-10">
-                          <input type="text" class="form-control" id="username" name="username"/>
-                        </div>
-                      </div>
-                    </div>
-                  </div>
-                  <br/>
-                  <div class="row">
-                    <div class="col-sm-12">
-                      <div class="rowGroup"  style="margin-bottom: 0px;">
-                        <label class="col-sm-2 control-label">聚才网账号密码</label>
-                        <div class="col-sm-10">
-                          <input type="password" class="form-control" autocomplete='new-password' id="password" name="password"/>
-                        </div>
-                      </div>
-                    </div>
-                  </div>
-                  <br/>
-                  <div class="row">
-                    <div class="col-sm-12 ">
-                      <div class="rowGroup form-inline"  style="margin-bottom: 0px;">
-                        <label class="col-sm-2 control-label">人才联络员手机验证码</label>
-                        <div class="col-sm-10">
-                          <input autocomplete="off" type="text" style="width: 80%" class="form-control" id="verificationCode" name="verificationCode"  />
-                          <button id="enterprise_sms_btn" style="margin-bottom: 0px;width: 18%" onclick="EnterpriseCenter.getEnterpriseSms()" type="button" class="btn btn-sm btn-info">获取验证码</button>
+    <div class="ibox-title">
+        <h5>企业用户中心</h5>
+    </div>
+    <div class="ibox-content">
+        <div class="form-horizontal">
+            <div class="row">
+                <div class="col-sm-12">
+                    <div class="tabs-container">
+                        <ul class="nav nav-tabs">
+                            <li class="active"><a data-toggle="tab" href="#tab-1" aria-expanded="true">基本信息</a></li>
+                            <li class=""><a data-toggle="tab" href="#tab-2" aria-expanded="false">企业信息变更</a></li>
+                            <li class=""><a data-toggle="tab" href="#tab-3" aria-expanded="false">修改密码</a></li>
+                            <!--              <li class="" ><a data-toggle="tab" href="#tab-4" aria-expanded="false">绑定聚才网账号</a></li>-->
+                        </ul>
+                        <div class="tab-content">
+                            <div id="tab-1" class="tab-pane active">
+                                <div class="panel-body" style="width:900px;">
+                                    <br/>
+                                    <div class="row">
+                                        <div class="col-sm-12 ">
+                                            <div class="rowGroup">
+                                                <label class="col-sm-2 control-label spacing">账号</label>
+                                                <div class="col-sm-4 spacing">
+                                                    <input type="text" class="form-control" readonly="readonly"
+                                                           name="username" value="{$ep.username}"/>
+                                                </div>
+                                            </div>
+                                            <div class="rowGroup">
+                                                <label class="col-sm-2 control-label spacing">单位名称</label>
+                                                <div class="col-sm-4 spacing">
+                                                    <input type="text" class="form-control" readonly="readonly"
+                                                           name="name" value="{$ep.name}"/>
+                                                </div>
+                                            </div>
+                                            <div class="rowGroup">
+                                                <label class="col-sm-2 control-label spacing">社会信用代码</label>
+                                                <div class="col-sm-4 spacing">
+                                                    <input type="text" class="form-control" readonly="readonly"
+                                                           name="idCard" value="{$ep.idCard}"/>
+                                                </div>
+                                            </div>
+                                            <div class="rowGroup" style="display: none">
+                                                <label class="col-sm-2 control-label spacing">产业领域</label>
+                                                <div class="col-sm-4 spacing">
+                                                    <input type="text" class="form-control" readonly="readonly"
+                                                           id="industryFieldNewName" name="industryFieldNewName"
+                                                           value="{$ep.industryFieldNewName}">
+                                                </div>
+                                            </div>
+                                            <div class="rowGroup" style="display: none">
+                                                <label class="col-sm-2 control-label spacing">行业领域</label>
+                                                <div class="col-sm-4 spacing">
+                                                    <input type="text" class="form-control" readonly="readonly"
+                                                           id="industryFieldOldName" name="industryFieldOldName"
+                                                           value="{$ep.industryFieldOldName}">
+                                                </div>
+                                            </div>
+                                            <div class="rowGroup">
+                                                <label class="col-sm-2 control-label spacing">申报类型</label>
+                                                <div class="col-sm-4 spacing">
+                                                    <input type="text" class="form-control" readonly="readonly"
+                                                           id="typeName" name="typeName" value="{$ep.typeName}">
+                                                    <input type="hidden" id="type" name="type" value="{$ep.type}">
+                                                </div>
+                                            </div>
+                                            <div class="rowGroup" style="display: none">
+                                                <label class="col-sm-2 control-label spacing">单位标签</label>
+                                                <div class="col-sm-4 spacing">
+                                                    <input type="text" class="form-control" readonly="readonly"
+                                                           id="talentType" name="talentType"
+                                                           value="{$ep.talentTypeName}">
+                                                </div>
+                                            </div>
+                                            <div class="rowGroup">
+                                                <label class="col-sm-2 control-label spacing">所属街道</label>
+                                                <div class="col-sm-4 spacing">
+                                                    <input type="text" class="form-control" readonly="readonly"
+                                                           name="streetName" value="{$ep.streetName}"/>
+                                                </div>
+                                            </div>
+                                            <div class="rowGroup">
+                                                <label class="col-sm-2 control-label spacing">单位地址</label>
+                                                <div class="col-sm-4 spacing">
+                                                    <input type="text" class="form-control" readonly="readonly"
+                                                           name="address" value="{$ep.address}"/>
+                                                </div>
+                                            </div>
+                                            <div class="rowGroup">
+                                                <label class="col-sm-2 control-label spacing">法人代表</label>
+                                                <div class="col-sm-4 spacing">
+                                                    <input type="text" class="form-control" readonly="readonly"
+                                                           name="legal" value="{$ep.legal}"/>
+                                                </div>
+                                            </div>
+                                            <div class="rowGroup">
+                                                <label class="col-sm-2 control-label spacing">单位电话</label>
+                                                <div class="col-sm-4 spacing">
+                                                    <input type="text" class="form-control" readonly="readonly"
+                                                           name="ephone" value="{$ep.ephone}"/>
+                                                </div>
+                                            </div>
+                                            <div class="rowGroup">
+                                                <label class="col-sm-2 control-label spacing">人才联络员</label>
+                                                <div class="col-sm-4 spacing">
+                                                    <input type="text" class="form-control" readonly="readonly"
+                                                           name="agentName" value="{$ep.agentName}"/>
+                                                </div>
+                                            </div>
+                                            <div class="rowGroup" style="margin-bottom: 0px;">
+                                                <label class="col-sm-2 control-label spacing">人才联络员电话</label>
+                                                <div class="col-sm-4 spacing">
+                                                    <input type="text" class="form-control" readonly="readonly"
+                                                           name="agentPhone" value="{$ep.agentPhone}"/>
+                                                </div>
+                                            </div>
+                                            <div class="rowGroup" style="margin-bottom: 0px;">
+                                                <label class="col-sm-2 control-label spacing">人才联络员邮箱</label>
+                                                <div class="col-sm-4 spacing">
+                                                    <input type="text" class="form-control" readonly="readonly"
+                                                           name="agentEmail" value="{$ep.agentEmail}"/>
+                                                </div>
+                                            </div>
+                                            <div class="rowGroup">
+                                                <label class="col-sm-2 control-label spacing">企业银行账号</label>
+                                                <div class="col-sm-4 spacing">
+                                                    <input type="text" class="form-control" readonly="readonly"
+                                                           name="bankCard" value="{$ep.bankCard}"/>
+                                                </div>
+                                            </div>
+                                            <div class="rowGroup" style="margin-bottom: 0px;">
+                                                <label class="col-sm-2 control-label spacing">企业开户银行网点</label>
+                                                <div class="col-sm-4 spacing">
+                                                    <input type="text" class="form-control" readonly="readonly"
+                                                           name="bankNetwork" value="{$ep.bankNetwork}"/>
+                                                </div>
+                                            </div>
+                                            <div class="rowGroup" style="margin-bottom: 0px;">
+                                                <label class="col-sm-2 control-label spacing">企业开户银行</label>
+                                                <div class="col-sm-4 spacing">
+                                                    <input type="text" class="form-control" readonly="readonly"
+                                                           name="bank" value="{$ep.bank}"/>
+                                                </div>
+                                            </div>
+                                            <div class="rowGroup" style="margin-bottom: 0px;">
+                                                <label class="col-sm-2 control-label spacing">审核状态</label>
+                                                <div class="col-sm-4 spacing">
+                                                    <input type="text" class="form-control" readonly="readonly"
+                                                           name="checkState" value="{$ep.checkStateName}"/>
+                                                </div>
+                                            </div>
+                                            <div class="rowGroup" style="margin-bottom: 0px;">
+                                                <label class="col-sm-2 control-label spacing">账号状态</label>
+                                                <div class="col-sm-4 spacing">
+                                                    <input type="text" class="form-control" readonly="readonly"
+                                                           name="active" value="{$ep.activeName}"/>
+                                                </div>
+                                            </div>
+                                            <div class="rowGroup" style="margin-bottom: 0px;">
+                                                <label class="col-sm-2 control-label spacing">备注</label>
+                                                <div class="col-sm-4 spacing">
+                                                    <input type="text" class="form-control" readonly="readonly"
+                                                           name="description" value="{$ep.description}"/>
+                                                </div>
+                                            </div>
+
+                                        </div>
+                                    </div>
+                                    <div class="row">
+                                      {if condition="$ep.imgurl neq ''"}
+                                      <div class="rowGroup" style="margin-bottom: 0px;">
+                                        <label class="col-sm-1 control-label spacing">营业执照</label>
+                                        <div class="col-sm-2 spacing">
+                                          <img onclick="Feng.showImg(this)" id="photoImg" alt="营业执照"
+                                               src="{$ep.imgurl|getStoragePath}" style="max-width: 100px;">
+                                        </div>
+                                      </div>
+                                      {/if}
+                                      {if condition="$ep.bankImg neq ''"}
+                                      <div class="rowGroup" style="margin-bottom: 0px;">
+                                        <label class="col-sm-1 control-label spacing">开启许可证</label>
+                                        <div class="col-sm-2 spacing">
+                                          <img onclick="Feng.showImg(this)" id="bankImg" alt="开启许可证"
+                                               src="{$ep.bankImg|getStoragePath}" style="max-width: 100px;">
+                                        </div>
+                                      </div>
+                                      {/if}
+                                      {if condition="$ep.domainImg neq ''"}
+                                      <div class="rowGroup" style="margin-bottom: 0px;">
+                                        <label class="col-sm-1 control-label spacing">行业领域佐证材料</label>
+                                        <div class="col-sm-2 spacing">
+                                          <img onclick="Feng.showImg(this)" id="domainImg" alt="开启许可证"
+                                               src="{$ep.domainImg|getStoragePath}" style="max-width: 100px;">
+                                        </div>
+                                      </div>
+                                      {/if}
+                                    </div>
+                                </div>
+                            </div>
+                            <div id="tab-2" class="tab-pane">
+                                <br/>
+                                <div class="row">
+                                    <div class="hidden-xs" id="tableToolbar" role="group">
+                                        <button type="button" class="btn btn-sm btn-primary"
+                                                onclick="EnterpriseCenter.addEnterprisechangeRecord()"><i
+                                                class="fa fa-plus"></i>申请变更
+                                        </button>
+                                        <button type="button" class="btn btn-sm btn-primary"
+                                                onclick="EnterpriseCenter.updateEnterprisechangeRecord()"><i
+                                                class="fa fa-edit"></i>修改
+                                        </button>
+                                        <button type="button" class="btn btn-sm btn-primary"
+                                                onclick="EnterpriseCenter.showEnterprisechangeRecordDetail()"><i
+                                                class="fa fa-info"></i>查看详情
+                                        </button>
+                                    </div>
+                                    <table id="table">
+                                    </table>
+                                </div>
+                            </div>
+                            <div id="tab-3" class="tab-pane">
+                                <div class="panel-body" style="width:900px;">
+                                    <br/>
+                                    <div class="row">
+                                        <div class="col-sm-12 b-r">
+                                            <div class="rowGroup" style="margin-bottom: 0px;">
+                                                <label class="col-sm-2 control-label">原密码</label>
+                                                <div class="col-sm-10">
+                                                    <input type="password" class="form-control"
+                                                           autocomplete='new-password' name="password"/>
+                                                </div>
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <div class="hr-line-dashed"></div>
+                                    <div class="row">
+                                        <div class="col-sm-12 b-r">
+                                            <div class="rowGroup" style="margin-bottom: 0px;">
+                                                <label class="col-sm-2 control-label">新密码</label>
+                                                <div class="col-sm-10">
+                                                    <input type="password" class="form-control"
+                                                           autocomplete='new-password' name="newPassword"/>
+                                                </div>
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <div class="hr-line-dashed"></div>
+                                    <div class="row">
+                                        <div class="col-sm-12 b-r">
+                                            <div class="rowGroup" style="margin-bottom: 0px;">
+                                                <label class="col-sm-2 control-label">重复新密码</label>
+                                                <div class="col-sm-10">
+                                                    <input type="password" class="form-control"
+                                                           autocomplete='new-password' name="newRePassword"/>
+                                                </div>
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <br/>
+                                    <div style="width:100%; text-align: center;">
+                                        <button type="button" class="btn btn-w-m btn-primary" style="width:200px;"
+                                                onclick="EnterpriseCenter.changePwd()">确认修改
+                                        </button>
+                                    </div>
+                                </div>
+                            </div>
+                            <div id="tab-4" class="tab-pane">
+                                <div class="panel-body" style="width:900px;">
+                                    <br/>
+                                    <div class="row">
+                                        <div class="col-sm-12 ">
+                                            <div class="rowGroup" style="margin-bottom: 0px;">
+                                                <label class="col-sm-2 control-label">聚才网账号</label>
+                                                <div class="col-sm-10">
+                                                    <input type="text" class="form-control" id="username"
+                                                           name="username"/>
+                                                </div>
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <br/>
+                                    <div class="row">
+                                        <div class="col-sm-12">
+                                            <div class="rowGroup" style="margin-bottom: 0px;">
+                                                <label class="col-sm-2 control-label">聚才网账号密码</label>
+                                                <div class="col-sm-10">
+                                                    <input type="password" class="form-control"
+                                                           autocomplete='new-password' id="password" name="password"/>
+                                                </div>
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <br/>
+                                    <div class="row">
+                                        <div class="col-sm-12 ">
+                                            <div class="rowGroup form-inline" style="margin-bottom: 0px;">
+                                                <label class="col-sm-2 control-label">人才联络员手机验证码</label>
+                                                <div class="col-sm-10">
+                                                    <input autocomplete="off" type="text" style="width: 80%"
+                                                           class="form-control" id="verificationCode"
+                                                           name="verificationCode"/>
+                                                    <button id="enterprise_sms_btn"
+                                                            style="margin-bottom: 0px;width: 18%"
+                                                            onclick="EnterpriseCenter.getEnterpriseSms()" type="button"
+                                                            class="btn btn-sm btn-info">获取验证码
+                                                    </button>
+                                                </div>
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <br/>
+                                    <div style="width:100%; text-align: center;">
+                                        <button type="button" class="btn btn-w-m btn-primary" style="width:200px;"
+                                                onclick="EnterpriseCenter.bindJcAccount()">确认绑定
+                                        </button>
+                                    </div>
+                                </div>
+                            </div>
                         </div>
-                      </div>
                     </div>
-                  </div>
-                  <br/>
-                  <div style="width:100%; text-align: center;">
-                    <button type="button" class="btn btn-w-m btn-primary" style="width:200px;" onclick="EnterpriseCenter.bindJcAccount()">确认绑定</button>
-                  </div>
                 </div>
-              </div>
             </div>
-          </div>
         </div>
-      </div>
     </div>
-  </div>
 </div>
 <script type="text/javascript">
-  document.write('<script src="/static/modular/gate/enterprise/enterprise_center.js?v='+(new Date()).getTime()+'"><\/script>');
+    document.write('<script src="/static/modular/gate/enterprise/enterprise_center.js?v=' + (new Date()).getTime() + '"><\/script>');
 </script>
 <!--<script src='{$ctxPath}/static/modular/gate/enterprise/enterprise_center.js?v='></script>-->
 {/block}

extend/StrUtil.php

@@ -7,7 +7,7 @@ class StrUtil{
      * @param str
      * @return
      */
-    public static function isEmpOrNull(string $str)
+    public static function isEmpOrNull($str)
     {
         if ($str == null || trim($str) == "") {
             return true;
@@ -16,7 +16,7 @@ class StrUtil{
         }
     }
 
-    public static function isNotEmpAndNull(string $str)
+    public static function isNotEmpAndNull($str)
     {
         if ($str == null || trim($str) == "") {
             return false;

public/static/js/register.js

@@ -234,12 +234,12 @@ Register.enterpriseUserRegister = function() {
         Feng.info("电子邮箱格式不合法!");
         return;
     }
-    // if(!lock){
-    //     lock = true;
-    // }else{
-    //     Feng.info("不能重复点击");
-    //     return;
-    // }
+    if(!lock){
+        lock = true;
+    }else{
+        Feng.info("不能重复点击");
+        return;
+    }
     $("#ep_form")[0].submit();
 };
 

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

@@ -2,11 +2,11 @@ var locked = false;
 var EpChangeEdit = {
 	epChangeEditData : {},
 	validateFields: {
-		newName: {validators: {notEmpty: {message: '单位名称不能为空' }}},
+		newName: {validators: {notEmpty: {message: '单位名称不能为空' },regexp:{regexp:/^[\u4e00-\u9fa5]{1,100}$/,message:"单位名称只允许中文"}}},
 		newIdCard : {validators: {notEmpty: {message: '社会信用代码不能为空' }}},
 		newEnterpriseTag : {validators: {notEmpty: {message: '单位标签不能为空' }}},
 		newEnterpriseType: {validators: {notEmpty: {message: '单位类型不能为空' }}},
-		newLegal: {validators: {notEmpty: {message: '法人代表不能为空'}}},
+		newLegal: {validators: {notEmpty: {message: '法人代表不能为空'},regexp:{regexp:/^[\u4e00-\u9fa5]{1,50}$/,message:"法人代表只允许中文"}}},
 		newAddress: {validators: {notEmpty: {message: '单位地址不能为空'}}},
 		newStreet: {validators: {notEmpty: {message: '所属街道不能为空'}}},
 		newAgentName: {validators: {notEmpty: {message: '人才联络员不能为空'}}},
@@ -375,18 +375,20 @@ EpChangeEdit.downloadFile = function(id) {
 };
 
 EpChangeEdit.industryChange = function(){
-	var industryNew = $("#industryFieldNew").val();
-	var arr = [{"name":"industryFieldOld","code":industryNew}];
+	var industryNew = $("#newIndustryFieldNew").val();
+	var arr = [{"name":"newIndustryFieldOld","code":industryNew+"_field"}];
 	Feng.findChildDictBatch(JSON.stringify(arr));
 }
 
 $(function() {
 	Feng.initValidator("ecr_form", EpChangeEdit.validateFields);
+	var industryNew = $("#newIndustryFieldNew").attr("value");
 	var arr = [
 		{"name":"newStreet","code":"street"},
 		{"name":"newEnterpriseTag","code":"enterprise_tag"},
 		{"name":"newEnterpriseType","code":"enterprise_type"},
-		{"name":"newIndustryFieldNew","code":"industry_field"}];
+		{"name":"newIndustryFieldNew","code":"industry_field"},
+		{"name":"newIndustryFieldOld","code":industryNew+"_field"}];
 	Feng.findChildDictBatch(JSON.stringify(arr));
 	$("select").each(function () {
 		$(this).val($(this).attr("value"));
@@ -394,7 +396,6 @@ $(function() {
 	if($("#type").val()==1){
 		$("#newEnterpriseTag,#newIndustryFieldNew,#newIndustryFieldOld,#newEnterpriseType").parent().parent().attr("style","display:block");
 		$("#newEnterpriseTag").val($("#newEnterpriseTag").attr("value"));
-		console.log($("#newIndustryFieldNew").attr("value"))
 		$("#newIndustryFieldNew").val($("#newIndustryFieldNew").attr("value"));
 		$("#newIndustryFieldOld").val($("#newIndustryFieldOld").attr("value"));
 	}else{