修改企业字段

.gitignore

@@ -4,3 +4,4 @@
 .env
 /config/database.php
 /composer.lock
+storage

app/admin/controller/Enterprise.php

@@ -178,6 +178,91 @@ class Enterprise extends AdminController {
         } catch (\Exception $e){
             return json(["msg" => $e->getMessage()]);
         }
+    }
+
+    public function GotoActivePage(){
+        $id = trim($this->request['id']);
+        $ep = EnterpriseApi::getOne($id);
+
+        return view("", ['ep' => $ep]);
+    }
+
+    public function setActive(){
+        if(!$id = trim($this->request['id'])){
+            return json(["msg" => 'ID不能为空!',"code" => 500]);
+        }
+        $ep = EnterpriseApi::getOne($id);
+        $active = $this->request['active'];
+        if($ep['active'] == null || ($ep['active'] != 1 && $ep['active'] != 2)){
+            return json(["msg" => '状态有误!',"code" => 500]);
+        }
+        if($ep['active'] == 2){
+            $msg = trim($this->request['activeMsg']);
+            if(empty($msg)){
+                return json(["msg" => '请填写拉黑/冻结原因!',"code" => 500]);
+            }
+            if(strlen($msg) > 100){
+                return json(["msg" => '拉黑/冻结原因 最多100个字符!',"code" => 500]);
+            }
+        }
+
+        $company = CompanyApi::getOne(session('user')['companyId']);
+        $ep->active = $active;
+        $ep->activeMsg = $msg;
+        $ep->updateUser = session('user')['uid'] . "";
+        $ep->updateTime = date('y-m-d H:i:s');
+
+    	try {
+            $ep->save();
+            //添加日志
+            TalentChecklog::create([
+                'id' => getStringId(),
+                'mainId' => $ep['id'],
+                'type' => 10,
+                'typeField' => null,
+                'active' => 1,
+                'state' => TalentState::RCRD_BASEIC_FROZEN,
+                'step' => 102,
+                'stateChange' => TalentState::stateEnum(10),
+                'description' => $msg,
+                'createTime' => date("Y-m-d H:i:s",time()),
+                'createUser' => session('user')['name']."({$company['name']})"
+            ]);
+
+            return json(["msg" => '操作成功!',"code" => 200]);
+		} catch (\Exception $e) {
+            return json(["msg" => $e->getMessage()]);
+        }
+    }
+
+    public function resetPassword(){
+        if(!$id = trim($this->request['id'])){
+            return json(["msg" => 'ID不能为空!',"code" => 500]);
+        }
+        $ep = EnterpriseApi::getOne($id);
+        if(!$ep){
+            return json(["msg" => '找不到该用户!',"code" => 500]);
+        }
+        $ep->password = hash("md5", 'JJrc@123');//默认密码
+        $ep->updateUser = session('user')['uid'] . "";
+        $ep->updateTime = date("y-m-d H:i:s");
+        $ep->save();
+
+        $company = CompanyApi::getOne(session('user')['companyId']);
+        TalentChecklog::create([
+            'id' => getStringId(),
+            'mainId' => $ep['id'],
+            'type' => 10,
+            'typeField' => null,
+            'active' => 1,
+            'state' => null,
+            'step' => 103,
+            'stateChange' => '重置密码',
+            'description' => '重置密码',
+            'createTime' => date("Y-m-d H:i:s",time()),
+            'createUser' => session('user')['name']."({$company['name']})"
+        ]);
+        return json(["msg" => '重置密码成功!',"code" => 200]);
 
     }
 }

app/admin/controller/EnterpriseChangeRecord.php

@@ -0,0 +1,14 @@
+<?php
+
+namespace app\admin\controller;
+
+use app\admin\common\AdminController;
+
+class EnterpriseChangeRecord extends AdminController {
+
+
+    public function gotoEnterpriseChangeRecordPage(){
+
+        return view();
+    }
+}

app/admin/view/enterprise/goto_active_page.html

@@ -0,0 +1,62 @@
+{extend name="layout/content"}
+{block name="content"}
+<div class="ibox float-e-margins">
+  <div class="ibox-content">
+    <form id="ep_active" class="form-horizontal">
+      <input type="text" id="id" value="{$ep.id}" style="display: none;" />
+      <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" readonly="readonly" id="name" name="name" value="{$ep.name}"  />
+            </div>
+          </div>
+        </div>
+      </div>
+      <div class="hr-line-dashed"></div>
+      <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" readonly="readonly" id="idCard" name="idCard" value="{$ep.idCard}"  />
+            </div>
+          </div>
+        </div>
+      </div>
+      <div class="hr-line-dashed"></div>
+      <div class="row">
+        <div class="col-sm-12">
+          <div class="rowGroup"  style="margin-bottom: 0px;">
+            <label class="col-sm-2 control-label"><span class="text-danger">*</span>账号状态</label>
+            <div class="col-sm-10">
+              <select class="form-control" id="active" name="active" >
+                <option value="">--- 请选择 ---</option>
+                <option value="1">账号有效</option>
+                <option value="2">拉黑/冻结</option>
+              </select>
+            </div>
+          </div>
+        </div>
+      </div>
+      <div class="hr-line-dashed"></div>
+      <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">
+              <textarea class="form-control" rows="3" id="activeMsg" name="activeMsg">{$ep.activeMsg}</textarea>
+            </div>
+          </div>
+        </div>
+      </div>
+    </form>
+  </div>
+</div>
+<input type="text" id="activeTemp" value="{$ep.active}" style="display: none;" />
+<!--<script src="${ctxPath}/static/modular/enterprise/enterprise_active.js"></script>-->
+<script type="text/javascript">
+  document.write('<script src="/static/modular/enterprise/enterprise_active.js?v='+(new Date()).getTime()+'"><\/script>');
+</script>
+{/block}

app/admin/view/enterprise/goto_enterprise_page.html

@@ -154,11 +154,6 @@
                         <i class="fa fa-edit"></i>&nbsp;设置冻结
                     </button>
                     {/if}
-                    {if condition="chkCommission('/admin/enterprise/delEnterprise','/enterprise/delEnterprise')"}
-                    <button type="button" class="btn btn-sm btn-primary " onclick="Enterprise.delEnterprise()">
-                        <i class="fa fa-remove"></i>&nbsp;删除
-                    </button>
-                    {/if}
                     {if condition="chkCommission('/admin/enterprise/resetPassword','/enterprise/resetPassword')"}
                     <button type="button" class="btn btn-sm btn-primary " onclick="Enterprise.resetPassword()">
                         <i class="fa fa-edit"></i>&nbsp;重置密码

app/admin/view/enterprise_change_record/goto_enterprise_change_record_page.html

@@ -0,0 +1,198 @@
+{extend name="layout/content"}
+{block name="content"}
+<div class="row">
+    <div class="col-sm-12">
+        <div class="ibox float-e-margins">
+            <div class="ibox-title">
+                <h5>企业信息变更</h5>
+            </div>
+            <div class="ibox-content">
+                <div class="row">
+                    <input type="hidden" id="type" value="${type}">
+                    <div class="col-sm-4">
+                        <div class="input-group input-group-sm">
+                            <div class="input-group-btn">
+                                <button data-toggle="dropdown" class="btn btn-white dropdown-toggle"
+                                        type="button">原单位名称
+                                </button>
+                            </div>
+                            <input type="text" class="form-control" id="oldName" placeholder=""/>
+                        </div>
+                    </div>
+                    <div class="col-sm-4">
+                        <div class="input-group input-group-sm">
+                            <div class="input-group-btn">
+                                <button data-toggle="dropdown" class="btn btn-white dropdown-toggle"
+                                        type="button">原社会信用代码
+                                </button>
+                            </div>
+                            <input type="text" class="form-control" id="oldIdCard" placeholder=""/>
+                        </div>
+                    </div>
+                    <div class="col-sm-4">
+                        <div class="input-group input-group-sm">
+                            <div class="input-group-btn">
+                                <button data-toggle="dropdown" class="btn btn-white dropdown-toggle"
+                                        type="button">原法人代表
+                                </button>
+                            </div>
+                            <input type="text" class="form-control" id="oldLegal" placeholder=""/>
+                        </div>
+                    </div>
+                    <div class="col-sm-4">
+                        <div class="input-group input-group-sm">
+                            <div class="input-group-btn">
+                                <button data-toggle="dropdown" class="btn btn-white dropdown-toggle" type="button">
+                                    原所属镇街
+                                </button>
+                            </div>
+                            <select class="form-control" id="oldStreet">
+                                <option value="">请选择</option>
+                            </select>
+                        </div>
+                    </div>
+                    <div class="col-sm-4">
+                        <div class="input-group input-group-sm">
+                            <div class="input-group-btn">
+                                <button data-toggle="dropdown" class="btn btn-white dropdown-toggle" type="button">
+                                    原企业标签
+                                </button>
+                            </div>
+                            <select class="form-control" id="oldTalentType">
+                                <option value="">请选择</option>
+                            </select>
+                        </div>
+                    </div>
+                    <div class="col-sm-4">
+                        <div class="input-group input-group-sm">
+                            <div class="input-group-btn">
+                                <button data-toggle="dropdown" class="btn btn-white dropdown-toggle" type="button">
+                                    原行业领域
+                                </button>
+                            </div>
+                            <select class="form-control" id="oldIndustryField">
+                                <option value="">请选择</option>
+                            </select>
+                        </div>
+                    </div>
+                    <div class="col-sm-4">
+                        <div class="input-group input-group-sm">
+                            <div class="input-group-btn">
+                                <button data-toggle="dropdown" class="btn btn-white dropdown-toggle"
+                                        type="button">新单位名称
+                                </button>
+                            </div>
+                            <input type="text" class="form-control" id="newName" placeholder=""/>
+                        </div>
+                    </div>
+                    <div class="col-sm-4">
+                        <div class="input-group input-group-sm">
+                            <div class="input-group-btn">
+                                <button data-toggle="dropdown" class="btn btn-white dropdown-toggle"
+                                        type="button">新社会信用代码
+                                </button>
+                            </div>
+                            <input type="text" class="form-control" id="newIdCard" placeholder=""/>
+                        </div>
+                    </div>
+                    <div class="col-sm-4">
+                        <div class="input-group input-group-sm">
+                            <div class="input-group-btn">
+                                <button data-toggle="dropdown" class="btn btn-white dropdown-toggle"
+                                        type="button">新法人代表
+                                </button>
+                            </div>
+                            <input type="text" class="form-control" id="newAgentName" placeholder=""/>
+                        </div>
+                    </div>
+                    <div class="col-sm-4">
+                        <div class="input-group input-group-sm">
+                            <div class="input-group-btn">
+                                <button data-toggle="dropdown" class="btn btn-white dropdown-toggle" type="button">
+                                    新所属镇街
+                                </button>
+                            </div>
+                            <select class="form-control" id="newStreet">
+                                <option value="">请选择</option>
+                            </select>
+                        </div>
+                    </div>
+                    <div class="col-sm-4">
+                        <div class="input-group input-group-sm">
+                            <div class="input-group-btn">
+                                <button data-toggle="dropdown" class="btn btn-white dropdown-toggle" type="button">
+                                    新企业标签
+                                </button>
+                            </div>
+                            <select class="form-control" id="newTalentType">
+                                <option value="">请选择</option>
+                            </select>
+                        </div>
+                    </div>
+                    <div class="col-sm-4">
+                        <div class="input-group input-group-sm">
+                            <div class="input-group-btn">
+                                <button data-toggle="dropdown" class="btn btn-white dropdown-toggle" type="button">
+                                    新行业领域
+                                </button>
+                            </div>
+                            <select class="form-control" id="newIndustryField">
+                                <option value="">请选择</option>
+                            </select>
+                        </div>
+                    </div>
+                    <div class="col-sm-4">
+                        <div class="input-group input-group-sm">
+                            <div class="input-group-btn">
+                                <button data-toggle="dropdown" class="btn btn-white dropdown-toggle" type="button">
+                                    审核状态
+                                </button>
+                            </div>
+                            <select class="form-control" id="checkState">
+                                <option value=""></option>
+                                <option value="1">保存未提交</option>
+                                <option value="2">待审核</option>
+                                <option value="3">审核驳回</option>
+                                <option value="4">审核通过</option>
+                                <option value="5">重新提交</option>
+                            </select>
+                        </div>
+                    </div>
+                    <div class="col-sm-4">
+                        <button type="button" class="btn btn-sm btn-primary " onclick="EpChange.search()">
+                            <i class="fa fa-search"></i>&nbsp;搜索
+                        </button>
+                        <button type="button" class="btn btn-sm btn-primary " onclick="EpChange.reset()">
+                            <i class="fa fa-trash"></i>&nbsp;重置
+                        </button>
+                    </div>
+                </div>
+                <div class="hidden-xs" id="tableToolbar" role="group">
+                    {if
+                    condition="chkCommission('/admin/enterpriseChangeRecord/doExamine','/enterprisechangeRecord/doExamine')"}
+                    <button type="button" class="btn btn-sm btn-primary "
+                            onclick="EpChange.gotoEnterpriseChangeDetailPage()">
+                        <i class="fa fa-edit"></i>&nbsp;审核
+                    </button>
+                    {/if}
+                    {if
+                    condition="chkCommission('/admin/enterpriseChangeRecord/excelExport','/enterprisechangeRecord/excelExport')"}
+                    <button type="button" class="btn btn-sm btn-primary " onclick="EpChange.export()">
+                        <i class="fa fa-download"></i>&nbsp;导出
+                    </button>
+                    {/if}
+                </div>
+                <table id="table" 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>
+            </div>
+        </div>
+    </div>
+</div>
+<script src="/static/modular/enterprise/enterprisechangeRecord/ep_change_record_list.js"></script>
+{/block}

app/admin/view/talent/dept_verify.html

@@ -1,288 +0,0 @@
-{extend name="layout/content"}
-{block name="content"}
-<style type="text/css">
-    .layui-layer-btn .layui-layer-btn1 {
-        border-color: #009688;
-        background-color: #009688;
-        color: #fff;
-    }
-    ul li{
-        list-style: none;
-        display:inline-block;
-        margin-bottom: 5px;
-    }
-    #field ul li input{
-        vertical-align:middle;
-        margin-top:1px;
-    }
-</style>
-<div class="row">
-    <div class="col-sm-12">
-        <div class="ibox float-e-margins">
-            <div class="ibox-title">
-                <h5>人才认定申报 - 部门审核</h5>
-            </div>
-            <div class="ibox-content">
-                <div class="row row-lg">
-                    <div class="col-sm-12">
-                        <div class="row">
-                            <input type="hidden" id="type" value="${user.type}">
-                            <input type="hidden" id="process" value="3">
-                            <input type="hidden" id="title" value="部门审核">
-                            <div class="col-sm-3">
-                                <div class="input-group input-group-sm">
-                                    <div class="input-group-btn">
-                                        <button data-toggle="dropdown" class="btn btn-white dropdown-toggle"
-                                                type="button">姓名
-                                        </button>
-                                    </div>
-                                    <input type="text" class="form-control" id="name" placeholder="" />
-                                </div>
-                            </div>
-                            <div class="col-sm-3">
-                                <div class="input-group input-group-sm">
-                                    <div class="input-group-btn">
-                                        <button data-toggle="dropdown" class="btn btn-white dropdown-toggle"
-                                                type="button">证件号码
-                                        </button>
-                                    </div>
-                                    <input type="text" class="form-control" id="idCard" placeholder="" />
-                                </div>
-                            </div>
-                            <div class="col-sm-3">
-                                <div class="input-group input-group-sm">
-                                    <div class="input-group-btn">
-                                        <button data-toggle="dropdown" class="btn btn-white dropdown-toggle" type="button">
-                                            性别
-                                        </button>
-                                    </div>
-                                    <select class="form-control" id="sex">
-                                        <option value=""></option>
-                                        <option value="1">男</option>
-                                        <option value="2">女</option>
-                                    </select>
-                                </div>
-                            </div>
-                            <div class="col-sm-3">
-                                <div class="input-group input-group-sm">
-                                    <div class="input-group-btn">
-                                        <button data-toggle="dropdown" class="btn btn-white dropdown-toggle" type="button">
-                                            民族
-                                        </button>
-                                    </div>
-                                    <select class="form-control" id="nation">
-                                    </select>
-                                </div>
-                            </div>
-                        </div>
-                        <div class="row highSearch" style="display: none">
-                            <div class="col-sm-3">
-                                <div class="input-group input-group-sm">
-                                    <div class="input-group-btn">
-                                        <button data-toggle="dropdown" class="btn btn-white dropdown-toggle" type="button">
-                                            国籍/地区
-                                        </button>
-                                    </div>
-                                    <select class="form-control" id="nationality">
-                                    </select>
-                                </div>
-                            </div>
-                            <div class="col-sm-3">
-                                <div class="input-group input-group-sm">
-                                    <div class="input-group-btn">
-                                        <button data-toggle="dropdown" class="btn btn-white dropdown-toggle" type="button">
-                                            籍贯省
-                                        </button>
-                                    </div>
-                                    <select class="form-control" id="provinceCode">
-                                    </select>
-                                </div>
-                            </div>
-                            <div class="col-sm-3">
-                                <div class="input-group input-group-sm">
-                                    <div class="input-group-btn">
-                                        <button data-toggle="dropdown" class="btn btn-white dropdown-toggle" type="button">
-                                            政治面貌
-                                        </button>
-                                    </div>
-                                    <select class="form-control" id="politics">
-                                    </select>
-                                </div>
-                            </div>
-                            <div class="col-sm-3">
-                                <div class="input-group input-group-sm">
-                                    <div class="input-group-btn">
-                                        <button data-toggle="dropdown" class="btn btn-white dropdown-toggle" type="button">
-                                            单位名称
-                                        </button>
-                                    </div>
-                                    <select class="form-control" id="enterpriseId">
-                                    </select>
-                                </div>
-                            </div>
-                            <div class="col-sm-3">
-                                <div class="input-group input-group-sm">
-                                    <div class="input-group-btn">
-                                        <button data-toggle="dropdown" class="btn btn-white dropdown-toggle" type="button">
-                                            产业领域
-                                        </button>
-                                    </div>
-                                    <select class="form-control" id="industryField">
-                                    </select>
-                                </div>
-                            </div>
-                            <div class="col-sm-3">
-                                <div class="input-group input-group-sm">
-                                    <div class="input-group-btn">
-                                        <button data-toggle="dropdown" class="btn btn-white dropdown-toggle" type="button">
-                                            申报来源
-                                        </button>
-                                    </div>
-                                    <select class="form-control" id="source">
-                                    </select>
-                                </div>
-                            </div>
-                            <div class="col-sm-3">
-                                <div class="input-group input-group-sm">
-                                    <div class="input-group-btn">
-                                        <button data-toggle="dropdown" class="btn btn-white dropdown-toggle" type="button">申报年度
-                                        </button>
-                                    </div>
-                                    <input type="text" class="form-control" id="year" placeholder="">
-                                </div>                            </div>
-                            <div class="col-sm-3" style="display: none">
-                                <div class="input-group ">
-                                    <div class="input-group-btn">
-                                        <button data-toggle="dropdown" class="btn btn-white dropdown-toggle" type="button">公布入选月份
-                                        </button>
-                                    </div>
-                                    <input type="text"  class="form-control time" id="identifyMonth" name="identifyMonth"/>
-                                </div>
-                            </div>
-                        </div>
-                        <div class="row">
-                            <div class="col-sm-12" style="text-align: center">
-                                <button type="button" style="cursor:pointer;" id="openSearch" onclick="$('.highSearch,#closeSearch').show();
-                                        $(this).hide();" class="btn btn-sm btn-primary glyphicon glyphicon-eye-open" id="open-but">打开高级搜索</button>
-                                <button type="button" style="cursor:pointer;display: none;" id="closeSearch" onclick="$('#openSearch').show();
-                                        $('.highSearch').hide();
-                                        $(this).hide();"  class="btn btn-sm btn-danger glyphicon glyphicon-eye-close" id="close-but">关闭高级搜索</button>
-                                <button type="button" style="cursor:pointer;"  class="btn btn-sm btn-info  glyphicon glyphicon-search" onclick="TalentInfo.search()">搜索</button>
-                                <button type="button" style="cursor:pointer;"  class="btn btn-sm btn-warning glyphicon glyphicon-repeat" onclick="TalentInfo.reset()">重置</button>
-                            </div>
-                        </div>
-                        <div class="hidden-xs" id="TalentInfoTableToolbar" role="group">
-                            <if condition="chkCommission('/admin/talent/deptCheck','/talentInfo/depCheck')">
-                                <button type="button" class="btn btn-sm btn-primary " onclick="TalentInfo.openCheckTalentInfo()" id="">
-                                    <i class="fa fa-check"></i>&nbsp;审核
-                                </button>
-                            </if>
-                            <if condition="chkCommission('/admin/talent/depExport','/talentInfo/depExport')">
-                                <button type="button" class="btn btn-sm btn-primary " onclick="TalentInfo.showExportModal(1)" id="">
-                                    <i class="fa fa-file-excel-o"></i>&nbsp;导出
-                                </button>
-                            </if>
-                            <if condition="chkCommission('/admin/talent/depDownloadZip','/talentInfo/depDownload')">
-                                <button type="button" class="btn btn-sm btn-primary " onclick="TalentInfo.download()" id="">
-                                    <i class="fa fa-download"></i>&nbsp;下载
-                                </button>
-                            </if>
-                        </div>
-                        <table id="TalentInfoTable" 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>
-                    </div>
-                </div>
-            </div>
-        </div>
-    </div>
-</div>
-<!--导出模态框-->
-<div class="modal fade " id="commonExportModal" tabindex="-1" role="dialog" aria-labelledby="exampleModalLabel">
-    <div class="modal-dialog modal-lg" role="document" style="min-width: 1000px">
-        <div class="modal-content animated flipInY">
-            <div class="modal-header">
-                <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
-                <h4 class="modal-title" id="firstModalLabel">导出</h4>
-            </div>
-            <div class="modal-body">
-                <form id="exportForm" action="/talentInfoExport/publicExport" target="hiddenIframe" class="form-horizontal">
-                    <div class="form-group" id="field">
-                        <div id="field_info">
-                            <ul>
-                                <li style="width:24%"><input type="checkbox" value="year"><span>申报年度</span></li>
-                                <li style="width:24%"><input type="checkbox" value="name"><span>姓名</span></li>
-                                <li style="width:24%"><input type="checkbox" value="sexName"><span>性别</span></li>
-                                <li style="width:24%"><input type="checkbox" value="birthday"><span>出生日期</span></li>
-                                <li style="width:24%"><input type="checkbox" value="nationalityName"><span>国籍/地区</span></li>
-                                <li style="width:24%"><input type="checkbox" value="provinceName"><span>籍贯省</span></li>
-                                <li style="width:24%"><input type="checkbox" value="cityName"><span>籍贯市</span></li>
-                                <li style="width:24%"><input type="checkbox" value="countyName"><span>籍贯县</span></li>
-                                <li style="width:24%"><input type="checkbox" value="nationName"><span>民族</span></li>
-                                <li style="width:24%"><input type="checkbox" value="politicsName"><span>政治面貌</span></li>
-                                <li style="width:24%"><input type="checkbox" value="cardTypeName"><span>证件类型</span></li>
-                                <li style="width:24%"><input type="checkbox" value="idCard"><span>证件号码</span></li>
-                                <li style="width:24%"><input type="checkbox" value="firstInJJTime"><span>首次来晋工作时间</span></li>
-                                <li style="width:24%"><input type="checkbox" value="enterpriseName"><span>企业名称</span></li>
-                                <li style="width:24%"><input type="checkbox" value="industryFieldName"><span>产业领域</span></li>
-                                <li style="width:24%"><input type="checkbox" value="streetName"><span>所属镇街</span></li>
-                                <li style="width:24%"><input type="checkbox" value="sourceName"><span>申报来源</span></li>
-                                <li style="width:24%"><input type="checkbox" value="qzBatch"><span>入选名单批次</span></li>
-                                <li style="width:24%"><input type="checkbox" value="certificateStartTime"><span>泉州高层次人才证书发证日期</span></li>
-                                <li style="width:24%"><input type="checkbox" value="qzgccrcActiveTime"><span>泉州高层次人才证书的有效期</span></li>
-                                <li style="width:24%"><input type="checkbox" value="talentArrangeName"><span>人才层次</span></li>
-                                <li style="width:24%"><input type="checkbox" value="identifyConditionText"><span>认定条件</span></li>
-                                <li style="width:24%"><input type="checkbox" value="identifyConditionName"><span>认定条件名称</span></li>
-                                <li style="width:24%"><input type="checkbox" value="enterpriseTalentTypeName"><span>企业标签</span></li>
-                                <li style="width:24%"><input type="checkbox" value="letterTime"><span>首次来晋行政介绍信时间</span></li>
-                                <li style="width:24%"><input type="checkbox" value="introductionModeName"><span>引进方式</span></li>
-                                <li style="width:24%"><input type="checkbox" value="entryTime"><span>本单位入职时间</span></li>
-                                <li style="width:24%"><input type="checkbox" value="post"><span>职务</span></li>
-                                <li style="width:24%"><input type="checkbox" value="startTime"><span>工作合同开始时间</span></li>
-                                <li style="width:24%"><input type="checkbox" value="endTime"><span>工作合同结束时间</span></li>
-                                <li style="width:12%"><input type="checkbox" value="educationName"><span>最高学历</span></li>
-                                <li style="width:24%"><input type="checkbox" value="graduateSchool"><span>毕业院校)</span></li>
-                                <li style="width:24%"><input type="checkbox" value="major"><span>专业</span></li>
-                                <li style="width:24%"><input type="checkbox" value="title"><span>职称</span></li>
-                                <li style="width:24%"><input type="checkbox" value="studyAbroadName"><span>是否有留学经历</span></li>
-                                <li style="width:24%"><input type="checkbox" value="studyAbroadName"><span>留学毕业院校</span></li>
-                                <li style="width:24%"><input type="checkbox" value="studyAbroadName"><span>留学专业</span></li>
-                                <li style="width:24%"><input type="checkbox" value="phone"><span>手机号码</span></li>
-                                <li style="width:24%"><input type="checkbox" value="email"><span>电子邮箱</span></li>
-                                <li style="width:24%"><input type="checkbox" value="bank"><span>开户银行</span></li>
-                                <li style="width:24%"><input type="checkbox" value="bankNetwork"><span>开户银行网点</span></li>
-                                <li style="width:24%"><input type="checkbox" value="bankNumber"><span>银行行号</span></li>
-                                <li style="width:24%"><input type="checkbox" value="bankAccount"><span>银行账号</span></li>
-                                <li style="width:24%"><input type="checkbox" value="certificateNO"><span>人才编号</span></li>
-                                <li style="width:24%"><input type="checkbox" value="firstSubmitTime"><span>首次确认提交时间</span></li>
-                                <li style="width:24%"><input type="checkbox" value="newSubmitTime"><span>最新确认提交时间</span></li>
-                                <li style="width:24%"><input type="checkbox" value="checkStateName"><span>审核状态</span></li>
-                                <li style="width:24%"><input type="checkbox" value="checkMsg"><span>审核意见</span></li>
-                            </ul>
-                        </div>
-                        <div class="form-group" style="text-align: center">
-                            <button type="button" class="btn btn-primary" onclick="TalentInfo.checkAll()">全选</button>
-                            <button type="button" class="btn btn-success" onclick="TalentInfo.unCheckAll()">反选</button>
-                        </div>
-                    </div>
-                </form>
-            </div>
-            <div class="modal-footer">
-                <button type="button" class="btn btn-primary" onclick="TalentInfo.export(1)">导出</button>
-                <button type="button" class="btn btn-default" data-dismiss="modal">关闭</button>
-            </div>
-        </div>
-    </div>
-</div>
-<iframe id="hiddenIframe" name="hiddenIframe" style="display: none;"></iframe>
-<!--<script src="${ctxPath}/static/modular/talentIdentify/talentInfo/talentInfo_first.js"></script>-->
-<!--<script src="${ctxPath}/static/modular/talentIdentify/talentInfo/talentInfo_common.js"></script>-->
-<script type="text/javascript">
-    document.write('<script src="/static/modular/talentIdentify/talentInfo/talentInfo_base.js?v=' + (new Date()).getTime() + '"><\/script>');
-    document.write('<script src="/static/modular/talentIdentify/talentInfo/talentInfo_common.js?v=' + (new Date()).getTime() + '"><\/script>');
-</script>
-{/block}

app/common/api/TalentState.php

@@ -25,6 +25,17 @@ class TalentState {
     public const BASE_VERIFY_FAIL = -1; //条件验证失败
     public const FST_VERIFY_FAIL = -2; //初审失败
 
+    public const RCRD_BASIC_SAVE = -2;
+    public const RCRD_BASIC_NOTPASS = -1;
+    public const RCRD_BASIC_NEED = 1;
+    public const RCRD_BASIC_REJECT = 2;
+    public const RCRD_BASIC_PASS = 3;
+    public const RCRD_BASIC_UPREJECT = 4;
+    public const RCRD_BASEIC_SUBMIT = 8;
+    public const RCRD_BASEIC_RESUBMIT = 9;
+    public const RCRD_BASEIC_FROZEN = 10;
+    public const RCRD_BASEIC_CANCLE = 11;
+
     public static function stateEnum($code){
         switch ($code){
             case -2:

app/common/api/UploadApi.php

@@ -57,7 +57,10 @@ class UploadApi {
                     $check = ['file' => $file];
                     break;
                 case 'hybrid':
-                    $check = ['file' => $file];
+                    $check = ['hybrid' => $file];
+                    break;
+                case 'system':
+                    $check = ['system' => $file];
                     break;
                 default:
                     $upload_result->code = 500;

app/common/controller/Api.php

@@ -8,6 +8,9 @@ use think\facade\Db;
 use app\enterprise\api\TalentApi;
 use app\common\api\TalentLogApi;
 use app\common\api\DictApi;
+use app\common\model\CurrentcyFileType;
+use app\common\model\TalentCommonFile;
+use app\common\api\UploadApi;
 
 /**
  * 需要权限的公共方法放这
@@ -280,4 +283,87 @@ class Api extends BaseController {
         return json($list);
     }
 
+    public function listCurrencyFileType(){
+        $where = [
+            'type' => $this->request['type'],
+            'active' => 1
+        ];
+        $rows = CurrentcyFileType::where($where)->select();
+        return json(["rows" => $rows, 'total' => count($rows)]);
+    }
+
+    public function listTalentCommonFile(){
+        $where = [];
+        if(\StrUtil::isNotEmpAndNull($this->request['mainId'])){
+            $where[] = ['mainId','=',$this->request['mainId']];
+        }
+        if(\StrUtil::isNotEmpAndNull($this->request['typeId'])){
+            $where[] = ['typeId','=',$this->request['typeId']];
+        }
+        $res = TalentCommonFile::where($where)->order('sn')->select();
+        if($res){
+            foreach ($res as $k => &$v){
+                $v['url'] = "/storage/" . $v['url'];
+            }
+        }
+        return json($res);
+    }
+
+    public function addTalentCommonFile(){
+        $backName = \StrUtil::getRequestDecodeParam($this->request,'backName');
+        $id = \StrUtil::getRequestDecodeParam($this->request, "fileId");
+        $mainId = \StrUtil::getRequestDecodeParam($this->request, "mainId");
+        $typeId = \StrUtil::getRequestDecodeParam($this->request, "typeId");
+        $index = \StrUtil::getRequestDecodeParam($this->request, "index");
+
+        if($backName == "EpChangeEdit.callBack"){
+            $type = 1;
+            $error = "文件格式不正确，只能上传图片";
+        } else {
+            $type = 4;
+            $error = "文件格式不正确，只能上传pdf和图片";
+        }
+        $uploadapi = new UploadApi();
+        $file_check_res = $uploadapi->uploadOne($this->request->file('fileUrl'),'system');
+        if($file_check_res->code == 500){
+            return \StrUtil::back($file_check_res,"Register.epCallBack");
+        }
+
+        $file_data = [
+            'id' => getStringId(),
+            'mainId' => $mainId,
+            'typeId' => $typeId,
+            'orignName' => $this->request->file('fileUrl')->getOriginalName(),
+            'url' => $file_check_res->filepath
+        ];
+
+        if(\StrUtil::isEmpOrNull($id)){
+            $tc = TalentCommonFile::where('mainId',$mainId)->where('typeId',$typeId)->order('sn','desc')->findOrEmpty();
+            if($tc){
+                $file_data['sn'] = $tc['sn'] + 1;
+            }else{
+                $file_data['sn'] = 1;
+            }
+            $file_data['createTime'] = date("y-m-d H:i:s");
+            TalentCommonFile::create($file_data);
+            $response_object = new \StdClass();
+            $response_object->code = 200;
+            $response_object->msg = "附件上传成功!";
+            $response_object->obj = $index;
+            return \StrUtil::back($response_object, $backName);
+        } else {
+            $tf = TalentCommonFile::findOrEmpty($id);
+            $tf->originalName = $file_data['orignName'];
+            $tf->updateTime = date("y-m-d H:i:s");
+            $tf->url = $file_check_res->filepath;
+            $tf->save();
+            $response_object = new \StdClass();
+            $response_object->code = 200;
+            $response_object->msg = "附件修改成功!";
+            $response_object->obj = $index;
+            return \StrUtil::back($response_object, $backName);
+        }
+    }
+
+
 }

app/common/controller/Auth.php

@@ -6,7 +6,7 @@ use app\BaseController;
 use app\common\api\ChuanglanSmsApi;
 use app\common\model\MessageRecord;
 use app\common\model\TalentChecklog;
-use think\Facade\Cache;
+use think\facade\Cache;
 use app\common\validate\Enterprise;
 use think\exception\ValidateException;
 use think\facade\Request;

app/common/model/CurrentcyFileType.php

@@ -0,0 +1,12 @@
+<?php
+
+namespace app\common\model;
+
+use think\Model;
+
+class CurrentcyFileType extends Model{
+
+    protected $table = "new_currency_filetype";
+
+
+}

app/common/model/TalentCommonFile.php

@@ -0,0 +1,12 @@
+<?php
+
+namespace app\common\model;
+
+use think\Model;
+
+class TalentCommonFile extends Model{
+
+    protected $table = "new_talent_common_file";
+
+
+}

app/common/validate/Upload.php

@@ -8,8 +8,8 @@ class Upload extends Validate
     protected $rule = [
         'image' => ['fileExt' => 'jpg,png,gif,jpeg', 'fileSize' => 5 * 1024 * 1024, 'fileMime' => 'image/jpg,image/png,image/gif,image/jpeg'],
         'file' => ['fileExt' => 'pdf,doc,docx,xlsx,xls,csv', 'fileSize' => 10 * 1024 * 1024,'fileMime' => 'application/pdf,application/msword,application/vnd.openxmlformats-officedocument.wordprocessingml.document,application/vnd.ms-excel,application/vnd.openxmlformats-officedocument.spreadsheetml.sheet'],
-        'hybrid' => ['fileExt' => 'zip,rar,7z', 'fileSize' => 50 * 1024 * 1024, 'fileMime' => 'application/zip,application/x-rar-compressed,application/x-7z-compressed']
-
+        'hybrid' => ['fileExt' => 'zip,rar,7z', 'fileSize' => 50 * 1024 * 1024, 'fileMime' => 'application/zip,application/x-rar-compressed,application/x-7z-compressed'],
+        'system' => ['fileExt' => 'jpg,png,gif,jpeg,pdf', 'fileSize' => 10 * 1024 * 1024, 'fileMime' => 'image/jpg,image/png,image/gif,image/jpeg,application/pdf']
     ];
 
     protected $message = [
@@ -21,6 +21,9 @@ class Upload extends Validate
         'file.fileMime' => '文件类型不支持',
         'hybrid.fileExt'=> '文件的格式支持:zip,rar,7z',
         'hybrid.fileSize' => '文件大小不能大于50兆',
-        'hybrid.fileMime' => '文件类型不支持'
+        'hybrid.fileMime' => '文件类型不支持',
+        'system.fileExt' => '文件的格式仅支持:png,jpg,jpeg,gif,pdf',
+        'system.fileSize' => '文件大小不能大于10兆',
+        'system.fileMime' => '文件类型不支持'
     ];
 }

app/common/view/auth/register.html

@@ -1,6 +1,11 @@
 {extend name="layout/content" /}
 {block name="content"}
 <style type="text/css">
+    .panel-heading{
+        color:#333;
+        background-color:#f5f5f5;
+        border-color:#ddd
+    }
     .spacing {
         margin-bottom: 10px;
         padding-right:4px;
@@ -20,155 +25,203 @@
                         <div class="tab-content">
                             <div id="tab-1" class="tab-pane active">
                                 <br/>
-                                <form id="ep_form" action="/common/auth/register" method="post" class="form-horizontal" enctype="multipart/form-data" target="hiddenIframe">
-                                    <div class="col-sm-12 form-group-sm">
-                                        <input type="hidden" id="source" name="source" value="1">
-                                        <div class="row">
-                                            <div class="rowGroup"  >
-                                                <label class="col-sm-2 control-label spacing"><span class="text-danger">*</span>账号</label>
-                                                <div class="col-sm-4 spacing">
-                                                    <input type="text" autocomplete="off" class="form-control" id="username" name="username" placeholder="请填写账号，用于登陆" />
-                                                </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="password" autocomplete="off" class="form-control" id="password" name="password" placeholder="密码由字母、数字及特殊字符组成且字符个数为8-20"/>
-                                                </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 autocomplete="off" type="password" class="form-control" id="re_password" name="re_password" placeholder="密码由字母、数字及特殊字符组成且字符个数为8-20"/>
-                                                </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 autocomplete="off" type="text" class="form-control" id="name" name="name" />
-                                                </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 autocomplete="off" type="text" class="form-control" id="idCard" name="idCard" />
-                                                </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" name="type" onchange="Register.typeChange()">
-                                                        <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 autocomplete="off" type="text" class="form-control" id="industryFieldNew" name="industryFieldNew" onchange="Register.industryChange()"></select>
-                                                </div>
-                                            </div>
-                                            <div class="rowGroup"  style="display: none">
-                                                <label class="col-sm-2 control-label spacing">行业领域</label>
-                                                <div class="col-sm-4 spacing">
-                                                    <select class="form-control" id="industryFieldOld" name="industryFieldOld">
-                                                    </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" id="enterpriseTag" name="enterpriseTag">
-                                                    </select>
-                                                </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="enterpriseType" name="enterpriseType">
-                                                    </select>
-                                                </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 autocomplete="off" type="text" class="form-control" id="agentName" name="agentName" />
-                                                </div>
-                                            </div>
-                                            <div class="rowGroup form-inline" >
-                                                <label class="col-sm-2 control-label spacing"><span class="text-danger">*</span>经办人手机号</label>
-                                                <div class="col-sm-4 spacing">
-                                                    <input autocomplete="off" type="text" class="form-control" id="agentPhone" name="agentPhone"  style="width: 60%" />
-                                                    <button id="enterprise_sms_btn" style="margin-bottom: 0px;" onclick="Register.getEnterpriseSms()" type="button" class="btn btn-xs btn-info" style="width: 38%">获取验证码</button>
-                                                </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 autocomplete="off" type="text" class="form-control" id="verificationCode" name="verificationCode" />
-                                                </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 autocomplete="off" type="text" class="form-control" id="legal" name="legal" />
-                                                </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="street" name="street"></select>
-                                                </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 autocomplete="off" type="text" class="form-control" id="address" name="address" />
-                                                </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 autocomplete="off" type="text" class="form-control" id="ephone" name="ephone" />
+                                <div class="panel-body" >
+                                    <div class="panel panel-default">
+                                        <form id="ep_form1" action="/common/auth/register" method="post" class="form-horizontal" enctype="multipart/form-data" target="hiddenIframe">
+                                            <input type="hidden" id="source" name="source" value="1">
+                                            <div class="panel-heading">单位基础信息</div>
+                                            <div class="panel-body">
+                                                <div class="col-sm-12 form-group-sm">
+                                                    <div class="row">
+                                                        <div class="rowGroup" >
+                                                            <label class="col-sm-1 control-label spacing"><span class="text-danger">*</span>账号</label>
+                                                            <div class="col-sm-3 spacing">
+                                                                <input type="text" autocomplete="off" class="form-control" id="username" name="username" placeholder="请填写账号，用于登陆" />
+                                                            </div>
+                                                        </div>
+                                                        <div class="rowGroup" >
+                                                            <label class="col-sm-1 control-label spacing"><span class="text-danger">*</span>密码</label>
+                                                            <div class="col-sm-3 spacing">
+                                                                <input type="password" autocomplete="off" class="form-control" id="password" name="password" placeholder="密码由字母、数字及特殊字符组成且字符个数为8-20"/>
+                                                            </div>
+                                                        </div>
+                                                        <div class="rowGroup"  >
+                                                            <label class="col-sm-1 control-label spacing"><span class="text-danger">*</span>重复密码</label>
+                                                            <div class="col-sm-3 spacing">
+                                                                <input autocomplete="off" type="password" class="form-control" id="re_password" name="re_password" placeholder="密码由字母、数字及特殊字符组成且字符个数为8-20"/>
+                                                            </div>
+                                                        </div>
+                                                    </div>
+                                                    <div class="row">
+                                                        <div class="rowGroup"  >
+                                                            <label class="col-sm-1 control-label spacing"><span class="text-danger">*</span>单位名称</label>
+                                                            <div class="col-sm-3 spacing">
+                                                                <input autocomplete="off" type="text" class="form-control" id="name" name="name" />
+                                                            </div>
+                                                        </div>
+                                                        <div class="rowGroup"  >
+                                                            <label class="col-sm-1 control-label spacing"><span class="text-danger">*</span>社会信用代码</label>
+                                                            <div class="col-sm-3 spacing">
+                                                                <input autocomplete="off" type="text" class="form-control" id="idCard" name="idCard" />
+                                                            </div>
+                                                        </div>
+                                                        <div class="rowGroup"  >
+                                                            <label class="col-sm-1 control-label spacing"><span class="text-danger">*</span>法人代表</label>
+                                                            <div class="col-sm-3 spacing">
+                                                                <input autocomplete="off" type="text" class="form-control" id="legal" name="legal" />
+                                                            </div>
+                                                        </div>
+                                                    </div>
+                                                    <div class="row">
+                                                        <div class="rowGroup"  >
+                                                            <label class="col-sm-1 control-label spacing"><span class="text-danger">*</span>所属街道</label>
+                                                            <div class="col-sm-3 spacing">
+                                                                <select class="form-control" id="street" name="street"></select>
+                                                            </div>
+                                                        </div>
+                                                        <div class="rowGroup" >
+                                                            <label class="col-sm-1 control-label spacing"><span class="text-danger">*</span>单位地址</label>
+                                                            <div class="col-sm-3 spacing">
+                                                                <input autocomplete="off" type="text" class="form-control" id="address" name="address" />
+                                                            </div>
+                                                        </div>
+                                                        <div class="rowGroup" >
+                                                            <label class="col-sm-1 control-label spacing"><span class="text-danger">*</span>单位电话</label>
+                                                            <div class="col-sm-3 spacing">
+                                                                <input autocomplete="off" type="text" class="form-control" id="ephone" name="ephone" />
+                                                            </div>
+                                                        </div>
+                                                    </div>
+                                                    <div class="row">
+                                                        <div class="rowGroup"  >
+                                                            <label class="col-sm-1 control-label spacing"><span class="text-danger">*</span>企业银行账号</label>
+                                                            <div class="col-sm-3 spacing">
+                                                                <input autocomplete="off" type="text" class="form-control" id="bankCard" name="bankCard" />
+                                                            </div>
+                                                        </div>
+                                                        <div class="rowGroup"  >
+                                                            <label class="col-sm-1 control-label spacing"><span class="text-danger">*</span>企业开户银行</label>
+                                                            <div class="col-sm-3 spacing">
+                                                                <input autocomplete="off" type="text" class="form-control" id="bank" name="bank" />
+                                                            </div>
+                                                        </div>
+                                                        <div class="rowGroup"  >
+                                                            <label class="col-sm-1 control-label spacing"><span class="text-danger">*</span>企业开户银行网点</label>
+                                                            <div class="col-sm-3 spacing">
+                                                                <input autocomplete="off" type="text" class="form-control" id="bankNetwork" name="bankNetwork" />
+                                                            </div>
+                                                        </div>
+                                                    </div>
+                                                    <div class="row">
+                                                        <div class="rowGroup"  >
+                                                            <label class="col-sm-2 control-label spacing"><span class="text-danger">*</span>营业执照</label>
+                                                            <div class="col-sm-4 spacing">
+                                                                <img id="photoImg" src="/static/img/yyzz.png" style="height: 60px;" onclick="$('#imgurl').click()" >
+                                                                <input style="display: none" autocomplete="off" type="file" class="form-control" id="imgurl" name="imgurl" />
+                                                            </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">
+                                                                <img id="photoImg" src="/static/img/yyzz.png" style="height: 60px;" onclick="$('#imgurl').click()" >
+                                                                <input style="display: none" autocomplete="off" type="file" class="form-control" id="imgurl" name="imgurl" />
+                                                            </div>
+                                                        </div>
+                                                    </div>
                                                 </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 autocomplete="off" type="text" class="form-control" id="agentEmail" name="agentEmail" />
+                                            <div class="panel-heading">申报基础信息</div>
+                                            <div class="panel-body">
+                                                <div class="row">
+                                                    <div class="rowGroup" >
+                                                        <label class="col-sm-2 control-label spacing"><span class="text-danger">*</span>申报类型</label>
+                                                        <div class="col-sm-4 spacing">
+                                                            <select class="form-control" id="type" name="type" onchange="Register.typeChange()">
+                                                                <option value="">请选择</option>
+                                                                <option value="1">晋江市现代产业体系人才</option>
+                                                                <option value="2">集成电路优秀人才</option>
+                                                                <!--	<option value="3">海峡计划团队</option>  -->
+                                                            </select>
+                                                        </div>
+                                                    </div>
                                                 </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 autocomplete="off" type="text" class="form-control" id="bankCard" name="bankCard" />
-                                                </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 autocomplete="off" type="text" class="form-control" id="bank" name="bank" />
+                                                <div class="row" id="typeGroup" style="display: none">
+                                                    <div class="rowGroup">
+                                                        <label class="col-sm-1 control-label spacing"><span class="text-danger">*</span>产业领域</label>
+                                                        <div class="col-sm-2 spacing">
+                                                            <select autocomplete="off" type="text" class="form-control" id="industryFieldNew" name="industryFieldNew" onchange="Register.industryChange()"></select>
+                                                        </div>
+                                                    </div>
+                                                    <div class="rowGroup">
+                                                        <label class="col-sm-1 control-label spacing">行业领域</label>
+                                                        <div class="col-sm-2 spacing">
+                                                            <select class="form-control" id="industryFieldOld" name="industryFieldOld">
+                                                            </select>
+                                                        </div>
+                                                    </div>
+                                                    <div class="rowGroup">
+                                                        <label class="col-sm-1 control-label spacing"><span class="text-danger">*</span>单位标签</label>
+                                                        <div class="col-sm-2 spacing">
+                                                            <select class="form-control" id="enterpriseTag" name="enterpriseTag">
+                                                            </select>
+                                                        </div>
+                                                    </div>
+                                                    <div class="rowGroup">
+                                                        <label class="col-sm-1 control-label spacing"><span class="text-danger">*</span>单位类型</label>
+                                                        <div class="col-sm-2 spacing">
+                                                            <select class="form-control" id="enterpriseType" name="enterpriseType">
+                                                            </select>
+                                                        </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">
+                                                            <img id="photoImg" src="/static/img/yyzz.png" style="height: 60px;" onclick="$('#imgurl').click()" >
+                                                            <input style="display: none" autocomplete="off" type="file" class="form-control" id="imgurl" name="imgurl" />
+                                                        </div>
+                                                    </div>
                                                 </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 autocomplete="off" type="text" class="form-control" id="bankNetwork" name="bankNetwork" />
+                                            <div class="panel-heading">联系信息</div>
+                                            <div class="panel-body">
+                                                <div class="row">
+                                                    <div class="rowGroup" >
+                                                        <label class="col-sm-2 control-label spacing"><span class="text-danger">*</span>经办人</label>
+                                                        <div class="col-sm-4 spacing">
+                                                            <input autocomplete="off" type="text" class="form-control" id="agentName" name="agentName" />
+                                                        </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 autocomplete="off" type="text" class="form-control" id="agentEmail" name="agentEmail" />
+                                                        </div>
+                                                    </div>
                                                 </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">
-                                                    <img id="photoImg" src="/static/img/yyzz.png" style="height: 60px;" onclick="$('#imgurl').click()" >
-                                                    <input style="display: none" autocomplete="off" type="file" class="form-control" id="imgurl" name="imgurl" />
+                                                <div class="row">
+                                                    <div class="rowGroup form-inline" >
+                                                        <label class="col-sm-2 control-label spacing"><span class="text-danger">*</span>经办人手机号</label>
+                                                        <div class="col-sm-4 spacing">
+                                                            <input autocomplete="off" type="text" class="form-control" id="agentPhone" name="agentPhone"  style="width: 60%" />
+                                                            <button id="enterprise_sms_btn" style="margin-bottom: 0px;" onclick="Register.getEnterpriseSms()" type="button" class="btn btn-xs btn-info" style="width: 38%">获取验证码</button>
+                                                        </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 autocomplete="off" type="text" class="form-control" id="verificationCode" name="verificationCode" />
+                                                        </div>
+                                                    </div>
                                                 </div>
                                             </div>
-                                        </div>
+
+                                        </form>
+
                                     </div>
-                                </form>
+
+                                </div>
+
                             </div>
                             <div id="tab-2" class="tab-pane">
                                 <input type="hidden" id="ps_source"  value="1">
@@ -265,6 +318,6 @@
 </div>
 <iframe id="hiddenIframe" name="hiddenIframe" style="display: none;"></iframe>
 
-<script src="/static/js/register.js?v=7"></script>
+<script src="/static/js/register.js?v=9"></script>
 
 {/block}

app/enterprise/controller/Api.php

@@ -4,7 +4,9 @@ namespace app\enterprise\controller;
 
 use app\admin\model\Enterprise;
 use app\common\api\DictApi;
+use app\common\model\CurrentcyFileType;
 use app\common\model\TalentChecklog;
+use app\common\model\TalentCommonFile;
 use app\enterprise\model\EnterpriseRecord;
 use app\enterprise\common\EnterpriseController;
 use app\Request;
@@ -20,12 +22,22 @@ class Api extends EnterpriseController {
 
         $list = EnterpriseRecord::where('mainId',session("user")["uid"])->limit($offset, $limit)->order('createTime ' . $order)->select()->toArray();
         $count = count($list);
+        if($count > 0){
+            $streetList = DictApi::selectByParentCode('street');
+            $typeList = DictApi::selectByParentCode('enterprise_type');
+            $industryFieldNew = DictApi::selectByParentCode('industry_field');
+            foreach ($list as $k => &$v){
+                $v['newIndustryFieldNewName'] = $industryFieldNew[$v['newIndustryFieldNew']];
+                $v['newEnterpriseType'] = $typeList[$v['newEnterpriseType']];
+                $v['newStreetName'] = $streetList[$v['newStreet']];
+            }
+        }
 
         return json(["total" => $count, "rows" => $list]);
     }
 
     public function findUnfinishedChangeRecord(){
-        return EnterpriseRecord::where('mainId',session("user")["uid"])->where('checkState',4)->select()->toArray();
+        return EnterpriseRecord::where('mainId',session("user")["uid"])->where('checkState','<>', 4)->select()->toArray();
     }
 
     public function toAdd()
@@ -85,6 +97,7 @@ class Api extends EnterpriseController {
             'address' => \StrUtil::getRequestDecodeParam($this->request,'newAddress'),//地址
             'type' => intval($this->request['type']),
             'enterpriseTag' => \StrUtil::getRequestDecodeParam($this->request,'newEnterpriseTag'),//单位标签
+            'enterpriseType' => \StrUtil::getRequestDecodeParam($this->request,'newEnterpriseType'),//单位类型
             'agentEmail' => \StrUtil::getRequestDecodeParam($this->request,'newAgentEmail'),//邮箱
             'ephone' => \StrUtil::getRequestDecodeParam($this->request,'newEphone'),//单位电话
             'industryFieldNew' => \StrUtil::getRequestDecodeParam($this->request,'newIndustryFieldNew'),//产业领域
@@ -98,8 +111,9 @@ class Api extends EnterpriseController {
             validate(\app\common\validate\Enterprise::class)->batch(true)->scene('change')->check($data);
             $ep = Enterprise::where('id',session("user")["uid"])->find();
             $record_id = \StrUtil::getRequestDecodeParam($this->request,'id');
-            if($record_id){
+            if(!$record_id){
                 $record_data = [
+                    'id' => getStringId(),
                     'mainId' => $data['id'],
                     'type' => $data['type'],
                     'oldName' => $ep['name'],
@@ -114,6 +128,7 @@ class Api extends EnterpriseController {
                     'oldAgentEmail' => $ep['agentEmail'],
                     'oldAgentPhone' => $ep['agentPhone'],
                     'oldEnterpriseTag' => $ep['enterpriseTag'],
+                    'oldEnterpriseType' => $ep['enterpriseType'],
                     'oldBankCard' => $ep['bankCard'],
                     'oldBank' => $ep['bank'],
                     'oldBankNetwork' => $ep['bankNetwork'],
@@ -129,6 +144,7 @@ class Api extends EnterpriseController {
                     'newAgentEmail' => $data['agentEmail'],
                     'newAgentPhone' => $data['agentPhone'],
                     'newEnterpriseTag' => $data['enterpriseTag'],
+                    'newEnterpriseType' => $data['enterpriseType'],
                     'newBankCard' => $data['bankCard'],
                     'newBank' => $data['bank'],
                     'newBankNetwork' => $data['bankNetwork'],
@@ -137,25 +153,138 @@ class Api extends EnterpriseController {
                     'createUser' => session("user")["uid"]
                 ];
                 EnterpriseRecord::create($record_data);
-            }
 
-            $log = [
-                'type' => 10,
-                'active' => 1,
-                'state' => 1,
-                'step' => 100,
-                'stateChange' => '保存未提交',
-                'createTime' => date("y-m-d H:i:s",time()),
-                'createUser' => '用户'
-            ];
+                $log = [
+                    'id' => getStringId(),
+                    'mainId' => $record_data['id'],
+                    'type' => 10,
+                    'active' => 1,
+                    'state' => 1,
+                    'step' => 100,
+                    'stateChange' => '保存未提交',
+                    'description' => '企业信息变更记录添加成功',
+                    'createTime' => date("y-m-d H:i:s",time()),
+                    'createUser' => '用户'
+                ];
+                $res = ['msg' => '添加成功', 'code' => 200, 'obj' => $record_data];
+            } else {
+                $record = EnterpriseRecord::find($record_id);
+                $record->name = htmlspecialchars($data['name']);
+                $record->updateTime = date("y-m-d H:i:s");
+                $record->updateUser = session("user")["uid"];
+                $record->save();
 
+                $log = [
+                    'id' => getStringId(),
+                    'mainId' => '',
+                    'type' => 10,
+                    'active' => 1,
+                    'state' => 1,
+                    'step' => 100,
+                    'stateChange' => '保存未提交',
+                    'description' => '企业信息变更记录修改成功',
+                    'createTime' => date("y-m-d H:i:s",time()),
+                    'createUser' => '用户'
+                ];
+
+                $res = ['msg' => '修改成功', 'code' => 200, 'obj' => $record];
+            }
 
+            TalentChecklog::create($log);
 
+            return json($res);
         } catch (ValidateException $e){
             $error = $e->getError();
             return json(["msg" => array_pop($error)],500);
         }
-        dd($this->request->post());
 
     }
+
+    public function toUpdate(){
+        $id = trim($this->request['id']);
+        $ecr = EnterpriseRecord::findOrEmpty($id);
+
+        return view("", ['ecr' => $ecr]);
+    }
+
+    public function submitToCheck(){
+        $id = trim($this->request->post('id'));
+        if(!$id){
+            return json(['msg' => '记录为空', 'code' => 500]);
+        }
+        $obj = EnterpriseRecord::find($id);
+
+        if(!$obj){
+            return json(['msg' => '提交审核失败，请先填写基础信息', 'code' => 500]);
+        }
+
+        if($obj['checkState'] != 1 && $obj['checkState'] != 3){
+            return json(['msg' => '不能重复提交审核', 'code' => 500]);
+        }
+
+        $list = CurrentcyFileType::where('type','enterpriseChange')->where('active',1)->select();
+        if(!$list || count($list) <= 0){
+            return json(['msg' => '缺少附件', 'code' => 500]);
+        }
+        $error_msg = "";
+        foreach ($list as $k => $v){
+            if($v['must'] == 1){
+                $count = TalentCommonFile::where('mainId',$id)->where('typeId',$v['id'])->count();
+                if($count == 0){
+                    if(strlen($error_msg) == 0){
+                        $error_msg = "以下为必传附件：";
+                    }
+                    $error_msg .= $v['name'] . ";";
+                }
+            }
+        }
+        if(strlen($error_msg) > 0){
+            return json(['msg' => $error_msg, 'code' => 500]);
+        }
+        if($obj['checkState'] == 3){
+            $obj['checkState'] = 5;
+            $state = 9;
+        }else{
+            $obj['checkState'] = 2;
+        }
+        $obj->save();
+
+        $log = [
+            'id' => getStringId(),
+            'mainId' => $id,
+            'type' => 10,
+            'active' => 1,
+            'state' => $state,
+            'step' => 100,
+            'stateChange' => "<span class='label'>待提交</span>-><span class='label label-success'>待审核</span>" ,
+            'description' => '提交审核',
+            'createTime' => date("y-m-d H:i:s",time()),
+            'createUser' => '用户'
+        ];
+        TalentChecklog::create($log);
+        return json(['msg' => '提交审核成功', 'code' => 200, 'obj' => 1]);
+    }
+
+    public function toDetail(){
+        $id = trim($this->request['id']);
+        if(!$id){
+            return json(['msg' => '记录为空', 'code' => 500]);
+        }
+        $ecr = EnterpriseRecord::find($id);
+        $streetList = DictApi::selectByParentCode('street');
+        $tagList = DictApi::selectByParentCode('enterprise_tag');
+        $typeList = DictApi::selectByParentCode('enterprise_type');
+        $industryFieldNew = DictApi::selectByParentCode('industry_field');
+
+        $ecr['oldStreetName'] = $streetList[$ecr['oldStreet']];
+        $ecr['newStreetName'] = $streetList[$ecr['newStreet']];
+        $ecr['oldEnterpriseTagName'] = $tagList[$ecr['oldEnterpriseTag']];
+        $ecr['newEnterpriseTagName'] = $tagList[$ecr['newEnterpriseTag']];
+        $ecr['oldEnterpriseTypeName'] = $typeList[$ecr['oldEnterpriseType']];
+        $ecr['newEnterpriseTypeName'] = $typeList[$ecr['newEnterpriseType']];
+        $ecr['oldIndustryFieldNewName'] = $industryFieldNew[$ecr['oldIndustryFieldNew']];
+        $ecr['newIndustryFieldNewName'] = $industryFieldNew[$ecr['newIndustryFieldNew']];
+
+        return view("",['ecr' => $ecr]);
+    }
 }

app/enterprise/controller/Talent.php

@@ -326,7 +326,7 @@ class Talent extends EnterpriseController {
         return json(["msg" => "删除成功"]);
     }
 
-    static private function chkIsOwner($id, $uid) {
+    static public function chkIsOwner($id, $uid) {
         $where[] = ["id", "=", $id];
         $where[] = ["enterprise_id", "=", $uid];
         $info = TalentModel::where($where)->findOrEmpty()->toArray();

app/enterprise/view/api/to_add.html

@@ -77,6 +77,12 @@
                           <select type="text" class="form-control" id="newEnterpriseTag" name="newEnterpriseTag" value="{$ecr.newEnterpriseTag}"></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 type="text" class="form-control" id="newEnterpriseType" name="newEnterpriseType" value="{$ecr.newEnterpriseType}"></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">
@@ -143,9 +149,15 @@
               </div>
             </div>
             <div id="tab-2" class="tab-pane ">
-              <#table id="fileTable" />
+              <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>
-              <form id="uploadForm" action="${ctxPath}/api/talentCommonFile/addTalentCommonFile" method="post" class="form-horizontal" enctype="multipart/form-data" target="hiddenIframe" style="display: none">
+              <form id="uploadForm" action="/api/talentCommonFile/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_detail.html

@@ -0,0 +1,245 @@
+{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;
+  }
+</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}" 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.oldIndustryFieldOld}" 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="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="oldEnterpriseType" name="oldEnterpriseType" value="{$ecr.oldEnterpriseTypeName}" 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>
+                      </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}" 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="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="newEnterpriseType" name="newEnterpriseType" value="{$ecr.newEnterpriseTypeName}" 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>
+                      </div>
+                    </form>
+                  </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=4"></script>
+{/block}

app/enterprise/view/api/to_update.html

@@ -0,0 +1,181 @@
+{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;
+  }
+</style>
+<div class="ibox float-e-margins">
+  <div class="ibox-content" style="height: 450px;">
+    <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="EpChangeEdit.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">
+                <form id="ecr_form" class="form-horizontal" target="hiddenIframe" action="" method="post" enctype="multipart/form-data">
+                  <input type="text" class="form-control" id="enterprise_id" name="enterprise_id" value="{$ecr.mainId}" style="display: none;"/>
+                  <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="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" 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="newIndustryFieldNew" name="newIndustryFieldNew" value="{$ecr.newIndustryFieldNew}"></select>
+                        </div>
+                      </div>
+                      <div class="rowGroup" style="display: none">
+                        <label class="col-sm-2 control-label spacing">行业领域</label>
+                        <div class="col-sm-4 spacing">
+                          <select type="text" class="form-control" id="newIndustryFieldOld" name="newIndustryFieldOld" value="{$ecr.newIndustryFieldOld}"></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 type="text" class="form-control" id="newEnterpriseTag" name="newEnterpriseTag" value="{$ecr.newEnterpriseTag}"></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 type="text" class="form-control" id="newEnterpriseType" name="newEnterpriseType" value="{$ecr.newEnterpriseType}"></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 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}"/>
+                        </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}"/>
+                        </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}"/>
+                        </div>
+                      </div>
+                    </div>
+                  </div>
+                </form>
+              </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>
+              <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'>
+                <input type='hidden' id="mainId" name="mainId" >
+                <input type='hidden' id="typeId" name="typeId" >
+                <input type='hidden' id="index" name="index" >
+              </form>
+            </div>
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>
+</div>
+<iframe style="display: none;" id="hiddenIframe" name="hiddenIframe"></iframe>
+<!--<script src="${ctxPath}/static/modular/gate/enterprise/enterprise_change_edit.js"></script>-->
+<script type="text/javascript">
+  document.write('<script src="/static/modular/gate/enterprise/enterprise_change_edit.js?v='+(new Date()).getTime()+'"><\/script>');
+</script>
+{/block}

app/enterprise/view/base/first.html

@@ -40,7 +40,7 @@
                         <div id="tab-1" class="tab-pane active">
                             <form id="talentInfoForm" action="/enterprise/talent/add" method="post" enctype="multipart/form-data" target="hiddenIframe">
                                 <div class="panel panel-default">
-                                    <div class="panel-heading" onclick="$(this).next().toggle()">基础信息</div>
+                                    <div class="panel-heading" onclick="$(this).next().toggle()">个人信息</div>
                                     <div class="panel-body">
                                         <div class="row">
                                             <div class="col-sm-12 form-group-sm">
@@ -135,7 +135,7 @@
                                     </div>
                                 </div>
                                 <div class="panel panel-default">
-                                    <div class="panel-heading" onclick="$(this).next().toggle()">人才基础信息</div>
+                                    <div class="panel-heading" onclick="$(this).next().toggle()">基础信息</div>
                                     <div class="panel-body">
                                         <div class="row">
                                             <div class="col-sm-12 form-group-sm">
@@ -166,6 +166,11 @@
                                                         {/volist}
                                                     </select>
                                                 </div>
+                                                <div class="rowGroup col-sm-9" id="tipsBlock" style="display: none">
+                                                    <label class=" control-label spacing">说明</label>
+                                                    <input type="text" class="form-control" id="typeTips" disabled readonly value=""/>
+
+                                                </div>
                                                 {if condition="in_array($row['talent_type'],[1,2])"}                                                        
                                                 <div class="rowGroup col-sm-3">
                                                     <label class=" control-label spacing"><span style="color: red">*</span>在我市缴交社会保险或个人所得税月份</label>
@@ -193,7 +198,7 @@
                                         <div class="row" style="border-top:1px solid #ddd;margin-top:20px;">
                                             <ul class="list-unstyled">
                                                 <li style="margin:10px 0;overflow:hidden;">
-                                                    <div style="float:left;margin-left:25px;">社保或所得税缴费记录</div>
+                                                    <div style="float:left;margin-left:25px;" id="material_name">社保或所得税缴费记录</div>
                                                     <button type='button' onclick="TalentInfoInfoDlg.checkFile(this)" style='margin-right: 10px;float:right;' class="btn btn-xs btn-info">
                                                         <i class="fa fa-upload"></i>上传
                                                     </button>

public/static/js/register.js

@@ -397,10 +397,11 @@ Register.typeChange = function(){
     $("#type").removeAttr("disabled");
     var type = $("#type").val();
     if(type==1){
-        $("#enterpriseTag,#industryFieldNew,#industryFieldOld").parent().parent().attr("style","display:block");
+        $("#typeGroup").attr("style","display:block");
     }else{
+        $("typeGroup").attr("style","display:none");
         $("#enterpriseTag,#industryFieldNew,#industryFieldOld").val("");
-        $("#enterpriseTag,#industryFieldNew,#industryFieldOld").parent().parent().attr("style","display:none");
+
     }
 }
 Register.industryChange = function(){

public/static/modular/enterprise/enterprise_active.js

@@ -5,7 +5,7 @@ EpActive.addSubmit = function() {
 	var active = $("#active").val();
 	var activeMsg = $("#activeMsg").val();
 	var da = {"id":id, "active":active, "activeMsg":activeMsg};
-    var ajax = new $ax(Feng.ctxPath + "/enterprise/setActive", function(data){
+    var ajax = new $ax(Feng.ctxPath + "/admin/enterprise/setActive", function(data){
         Feng.info(data.msg);
         if (data.code == 200) {
         	window.parent.Enterprise.table.refresh();

public/static/modular/enterprise/enterprise_list.js

@@ -159,7 +159,7 @@ Enterprise.setActive = function() {
         area: ['830px', '500px'], //宽高
         fix: false, //不固定
         maxmin: true,
-        content: Feng.ctxPath + '/enterprise/gotoActivePage?id='+Enterprise.seItem.id,
+        content: Feng.ctxPath + '/admin/enterprise/gotoActivePage?id='+Enterprise.seItem.id,
         btn: ['<i class="fa fa-check"></i>&nbsp;&nbsp;提交','<i class="fa fa-eraser"></i>&nbsp;&nbsp;取消'],
         btnAlign: 'c',
         yes: function (index, layero) {
@@ -225,7 +225,7 @@ Enterprise.resetPassword = function() {
 	Feng.confirm(
         "确定要重置密码吗?",
         function(){
-        	var ajax = new $ax(Feng.ctxPath + "/enterprise/resetPassword?id="+Enterprise.seItem.id, function(data){
+        	var ajax = new $ax(Feng.ctxPath + "/admin/enterprise/resetPassword?id="+Enterprise.seItem.id, function(data){
                 Feng.info(data.msg);
 //                if(data.code == 200){
 //                	Enterprise.table.refresh();

public/static/modular/enterprise/enterprisechangeRecord/ep_change_record_detail.js

@@ -28,7 +28,7 @@ ecre.doExamine = function() {
 
 ecre.initFileTable = function(){
 	$("#fileTable").bootstrapTable({
-		url: Feng.ctxPath + "/api/common/listCurrencyFileType",
+		url: Feng.ctxPath + "/common/api/listCurrencyFileType",
 		method: 'POST',
 		contentType: "application/x-www-form-urlencoded; charset=UTF-8",
 		search: false,					// 是否显示表格搜索，此搜索是客户端搜索，不会进服务端
@@ -61,7 +61,7 @@ ecre.initFileTable = function(){
 			$("#fileTable").bootstrapTable('expandAllRows');
 		},
 		onExpandRow: function (index, row, $detail) {
-			var ajax = new $ax(Feng.ctxPath + "/api/talentCommonFile/listTalentCommonFile", function (data) {
+			var ajax = new $ax(Feng.ctxPath + "/common/api/listTalentCommonFile", function (data) {
 				if(data==null||data.length==0){
 					return;
 				}
@@ -123,19 +123,21 @@ ecre.downloadFile = function(id,type) {
 
 
 $(function () {	
-	var arr = [
-		{"name":"newStreet","code":"un_street"},
-		{"name":"oldStreet","code":"un_street"},
-		{"name":"newTalentType","code":"un_enterprise_talentType"},
-		{"name":"oldTalentType","code":"un_enterprise_talentType"}];
-	Feng.findChildDictBatch(JSON.stringify(arr))
+	// var arr = [
+	// 	{"name":"newStreet","code":"street"},
+	// 	{"name":"oldStreet","code":"street"},
+	// 	{"name":"newTalentType","code":"enterprise_type"},
+	// 	{"name":"oldTalentType","code":"enterprise_type"},
+	// 	{"name":"oldIndustryFieldNew","code":"industry_field"},
+	// 	{"name":"newIndustryFieldNew","code":"industry_field"}];
+	// Feng.findChildDictBatch(JSON.stringify(arr))
 
 	$("select").each(function () {
 		$(this).val($(this).attr("value"));
 	})
 	if($("#type").val()==1){
-		$("#newTalentType,#oldTalentType,#oldIndustryField,#newIndustryField").parent().parent().attr("style","display:block");
+		$("#newEnterpriseType,#oldEnterpriseType,#oldIndustryFieldOld,#oldIndustryFieldNew,#newIndustryFieldNew,#newIndustryFieldOld,#newEnterpriseTag,#oldEnterpriseTag").parent().parent().attr("style","display:block");
 	}else{
-		$("#newTalentType,#oldTalentType,#oldIndustryField,#newIndustryField").parent().parent().attr("style","display:none");
+		$("#newEnterpriseType,#oldEnterpriseType,#oldIndustryFieldOld,#oldIndustryFieldNew,#newIndustryFieldNew,#newIndustryFieldOld,#newEnterpriseTag,#oldEnterpriseTag").parent().parent().attr("style","display:none");
 	}
 });

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

@@ -46,8 +46,8 @@ EnterpriseCenter.initColumn = function(){
         {title: 'id', field: 'id', visible: false, align: 'center', valign: 'middle'},
         {title: '更新单位名称', field: 'newName', align: 'left', width:120, valign: 'middle', 'class': 'uitd_showTip'},
         {title: '更新社会信用代码', field: 'newIdCard', align: 'center', width:160, valign: 'middle', 'class': 'uitd_showTip'},
-		{title: '更新行业领域', field: 'newIndustryFieldName', align: 'center', width:160, valign: 'middle', 'class': 'uitd_showTip'},
-		{title: '更新企业标签', field: 'newTalentTypeName', align: 'left', width:120, valign: 'middle', 'class': 'uitd_showTip'},
+		{title: '更新产业领域', field: 'newIndustryFieldNewName', align: 'center', width:160, valign: 'middle', 'class': 'uitd_showTip'},
+		{title: '更新单位标签', field: 'newEnterpriseType', align: 'left', width:120, valign: 'middle', 'class': 'uitd_showTip'},
         {title: '更新法人代表', field: 'newLegal', align: 'left', width:100, valign: 'middle', 'class': 'uitd_showTip'},
         {title: '更新所属街道', field: 'newStreetName', align: 'left', width:100, valign: 'middle', 'class': 'uitd_showTip'},
         {title: '更新单位地址', field: 'newAddress', align: 'left', width:200, valign: 'middle', 'class': 'uitd_showTip'},
@@ -148,7 +148,7 @@ EnterpriseCenter.updateEnterprisechangeRecord = function() {
         area: ['930px', '600px'], //宽高
         fix: false, //不固定
         maxmin: true,
-        content: Feng.ctxPath + '/api/enterpriseChangeRecord/toUpdate?id='+item.id,
+        content: Feng.ctxPath + '/enterprise/api/toUpdate?id='+item.id,
         btn: ['<i class="fa fa-save"></i>&nbsp;&nbsp;保存未提交', '<i class="fa fa-check"></i>&nbsp;&nbsp;提交审核', '<i class="fa fa-eraser"></i>&nbsp;&nbsp;取消'],
 		btnAlign: 'c',
         btn1: function (index, layero) {
@@ -188,7 +188,7 @@ EnterpriseCenter.showEnterprisechangeRecordDetail = function() {
         area: ['930px', '600px'], //宽高
         fix: false, //不固定
         maxmin: true,
-        content: Feng.ctxPath + '/api/enterpriseChangeRecord/toDetail?id='+EnterpriseCenter.seItem.id,
+        content: Feng.ctxPath + '/enterprise/api/toDetail?id='+EnterpriseCenter.seItem.id,
         btn: ['<i class="fa fa-eraser"></i>&nbsp;&nbsp;关闭'],
         btn1: function (index, layero) {
         	layer.close(index);

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

@@ -4,7 +4,7 @@ var EpChangeEdit = {
 
 EpChangeEdit.initFileTable = function(){
     $("#fileTable").bootstrapTable({
-        url: Feng.ctxPath + "/api/common/listCurrencyFileType",
+        url: Feng.ctxPath + "/common/api/listCurrencyFileType",
         method: 'POST',
         contentType: "application/x-www-form-urlencoded; charset=UTF-8",
         search: false,					// 是否显示表格搜索，此搜索是客户端搜索，不会进服务端
@@ -37,7 +37,7 @@ EpChangeEdit.initFileTable = function(){
             $("#fileTable").bootstrapTable('expandAllRows');
         },
         onExpandRow: function (index, row, $detail) {
-            var ajax = new $ax(Feng.ctxPath + "/api/talentCommonFile/listTalentCommonFile", function (data) {
+            var ajax = new $ax(Feng.ctxPath + "/common/api/listTalentCommonFile", function (data) {
                 if(data==null||data.length==0){
                     return;
                 }

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

@@ -4,7 +4,8 @@ var EpChangeEdit = {
 	validateFields: {
 		newName: {validators: {notEmpty: {message: '单位名称不能为空' }}},
 		newIdCard : {validators: {notEmpty: {message: '社会信用代码不能为空' }}},
-		newEnterpriseTag : {validators: {notEmpty: {message: '企业标签不能为空' }}},
+		newEnterpriseTag : {validators: {notEmpty: {message: '单位标签不能为空' }}},
+		newEnterpriseType: {validators: {notEmpty: {message: '单位类型不能为空' }}},
 		newLegal: {validators: {notEmpty: {message: '法人代表不能为空'}}},
 		newAddress: {validators: {notEmpty: {message: '单位地址不能为空'}}},
 		newStreet: {validators: {notEmpty: {message: '所属街道不能为空'}}},
@@ -89,6 +90,7 @@ EpChangeEdit.collectData = function() {
 		.set('newName')
 		.set('newIdCard')
 		.set('newEnterpriseTag')
+		.set('newEnterpriseType')
 		.set('newLegal')
 		.set('newStreet')
 		.set('newAddress')
@@ -116,7 +118,7 @@ EpChangeEdit.validate = function () {
 
 EpChangeEdit.initFileTable = function(){
 	$("#fileTable").bootstrapTable({
-		url: Feng.ctxPath + "/api/common/listCurrencyFileType",
+		url: Feng.ctxPath + "/common/api/listCurrencyFileType",
 		method: 'POST',
 		contentType: "application/x-www-form-urlencoded; charset=UTF-8",
 		search: false,					// 是否显示表格搜索，此搜索是客户端搜索，不会进服务端
@@ -149,7 +151,7 @@ EpChangeEdit.initFileTable = function(){
 			$("#fileTable").bootstrapTable('expandAllRows');
 		},
 		onExpandRow: function (index, row, $detail) {
-			var ajax = new $ax(Feng.ctxPath + "/api/talentCommonFile/listTalentCommonFile", function (data) {
+			var ajax = new $ax(Feng.ctxPath + "/common/api/listTalentCommonFile", function (data) {
 				if(data==null||data.length==0){
 					return;
 				}
@@ -163,7 +165,7 @@ EpChangeEdit.initFileTable = function(){
 					}else if(suffix == "xlsx" || suffix=="XLSX" || suffix == 'xls' || suffix == 'XLS'){
 						imgStr = "<button type='button'  onclick=\"Feng.showExcel('"+data[key].url+"','"+data[key].id+"','"+data[key].orignName+"')\" class=\"btn btn-xs btn-danger\"><i class=\"fa fa-file-excel-o\" aria-hidden=\"true\"></i></button>";
 					}else{
-						imgStr = '<img class=\"imgUrl\"  src=\"'+data[key].url+'\" style=\"width:25px;height:25px;\">';
+						imgStr = '<img class=\"imgUrl\"  src=\"/'+data[key].url+'\" style=\"width:25px;height:25px;\">';
 					}
 					var btn = "<button type=\'button\' onclick=\"EpChangeEdit.checkFile('"+row.id+"','"+data[key].id+"')\" style=\'margin-right: 10px\' class=\"btn btn-xs btn-info\"><i class=\"fa fa-paste\"></i>修改</button>" +
 						"<button type='button' onclick=\"EpChangeEdit.deleteFile('"+data[key].id+"')\" class=\"btn btn-xs btn-danger\"><i class=\"fa fa-times\"></i>删除</button>";
@@ -339,7 +341,7 @@ EpChangeEdit.submitToCheck = function(){
 	}
 	$(".layui-layer-btn1",parent.document).css("pointer-events","none");
 	var operation = function() {
-		var ajax = new $ax(Feng.ctxPath + "/api/enterpriseChangeRecord/submitToCheck", function (data) {
+		var ajax = new $ax(Feng.ctxPath + "/enterprise/api/submitToCheck", function (data) {
 			if(data.code==200){
 				Feng.success(data.msg);
 				window.parent.EnterpriseCenter.table.refresh();
@@ -383,19 +385,20 @@ $(function() {
 	var arr = [
 		{"name":"newStreet","code":"street"},
 		{"name":"newEnterpriseTag","code":"enterprise_tag"},
+		{"name":"newEnterpriseType","code":"enterprise_type"},
 		{"name":"newIndustryFieldNew","code":"industry_field"}];
 	Feng.findChildDictBatch(JSON.stringify(arr));
 	$("select").each(function () {
 		$(this).val($(this).attr("value"));
 	})
 	if($("#type").val()==1){
-		$("#newEnterpriseTag,#newIndustryFieldNew,#newIndustryFieldOld").parent().parent().attr("style","display:block");
+		$("#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{
-		$("#newEnterpriseTag,#newIndustryFieldNew,#newIndustryFieldOld").parent().parent().attr("style","display:none");
+		$("#newEnterpriseTag,#newIndustryFieldNew,#newIndustryFieldOld,#newEnterpriseType").parent().parent().attr("style","display:none");
 		$("#newEnterpriseTag").val("");
 		$("#newIndustryFieldNew").val("");
 	}

public/static/modular/gate/talentInfo/talentInfo_info.js

@@ -376,6 +376,9 @@ TalentInfoInfoDlg.talentTypeChange = function () {
     switch (talent_type) {
         case "1":
         case "2":
+            $("#tipsBlock").css('display','block');
+            $("#typeTips").val("含经晋江市认定且还在晋江市就业创业的人才，或在晋江市就业创业但未曾申报过晋江市优秀人才的人才。");
+            $("#material_name").html("社保或个税的缴交记录");
             $("#tax_insurance_month").removeAttr("disabled").parent().css("display", "block");
             $('#talentInfoForm').bootstrapValidator('addField', "tax_insurance_month", {
                 validators: {
@@ -388,9 +391,30 @@ TalentInfoInfoDlg.talentTypeChange = function () {
             });
             break;
         case "3":
+            $("#tipsBlock").css('display','block');
+            $("#typeTips").val("含本办法出台后首次从晋江市以外引进认定的人才，或者流出晋江市满3年后又返回晋江市就业创业(不含企业集团内部人员调动)的人才。")
+            $("#material_name").html("社保或个税的缴交记录");
+            $("#tax_insurance_month").removeAttr("disabled").parent().css("display", "block");
+            $('#talentInfoForm').bootstrapValidator('addField', "tax_insurance_month", {
+                validators: {
+                    notEmpty: {message: '在我市缴交社会保险或个人所得税月份不能为空'},
+                    regexp: {
+                        regexp: /^\d+$/,
+                        message: "在我市缴交社会保险或个人所得税月份格式不正确"
+                    }
+                }
+            });
+            break;
+        case "4":
+            $("#tipsBlock").css('display','block');
+            $("#typeTips").val("含已经与晋江市用人单位达成就业意向且签订预引进意向合作协议（合同）的人才，或拟来我市创业且提交企业名称预先核准的人才。")
+            $("#material_name").html("社保或个税的缴交记录");
             $("#labor_contract_rangetime").removeAttr("disabled").parent().css("display", "block");
             $('#talentInfoForm').bootstrapValidator('addField', "labor_contract_rangetime", {validators: {notEmpty: {message: '劳动合同起止时间'}}});
             break;
+        default:
+            $("#tipsBlock").css('display','none');
+            break;
     }
 }
 

public/static/modular/gate/talentLibrary/talentQuit/talentQuit_info.js

@@ -261,7 +261,7 @@ TalentQuitInfoDlg.initFileTable = function(){
             $("#fileTable").bootstrapTable('expandAllRows');
         },
         onExpandRow: function (index, row, $detail) {
-            var ajax = new $ax(Feng.ctxPath + "/api/talentCommonFile/listTalentCommonFile", function (data) {
+            var ajax = new $ax(Feng.ctxPath + "/common/api/listTalentCommonFile", function (data) {
                 if(data==null||data.length==0){
                     return;
                 }