提交修改

app/admin/controller/CurrencyFiletype.php

@@ -0,0 +1,53 @@
+<?php
+
+namespace app\admin\controller;
+
+use app\admin\common\AdminController;
+use app\common\api\DictApi;
+use think\facade\Db;
+
+class CurrencyFiletype extends AdminController{
+
+    public function index(){
+        return view("");
+    }
+
+    public function list(){
+        $order = trim($this->request->param("order")) ?: "desc";
+        $offset = trim($this->request->param("offset")) ?: 0;
+        $limit = trim($this->request->param("limit")) ?: 10;
+        $type = trim($this->request->param("type"));
+        $name = trim($this->request->param("name"));
+        $must = trim($this->request->param("must"));
+        $active = trim($this->request->param("active"));
+
+        $where = [];
+
+        if ($name) {
+            $where[] = ["name", "like", "%" . $name . "%"];
+        }
+        if ($type) {
+            $where[] = ["type", "=", $type];
+        }
+        if ($must) {
+            $where[] = ["must", "=", $must];
+        }
+        if ($active) {
+            $where[] = ["active", "=", $active];
+        }
+
+
+        $count = \app\admin\model\CurrencyFiletype::where($where)->count();
+        if($count > 0){
+            $rows = \app\admin\model\CurrencyFiletype::where($where)->limit($offset, $limit)->order("createTime " . $order)->select()->toArray();
+            $typeName = DictApi::selectByParentCode("common_declareType");
+            foreach ($rows as $k => &$v){
+                $v['typeName'] = $typeName[$v['type']];
+            }
+        }else{
+            $rows = [];
+        }
+
+        return ["total" => $count, "rows" => $rows];
+    }
+}

app/admin/controller/Enterprise.php

@@ -10,6 +10,7 @@ use app\common\model\MessageRecord;
 use app\common\model\TalentChecklog;
 use app\common\api\TalentState;
 use app\common\api\CompanyApi;
+use think\facade\Db;
 
 class Enterprise extends AdminController {
 
@@ -125,7 +126,7 @@ class Enterprise extends AdminController {
                 'checkMsg' => $checkMsg,
                 'checkUser' => session('user')['name'],
                 'updateUser' => session('user')['uid'],
-                'updateTime' => date("y-m-d H:i:s")
+                'updateTime' => date("Y-m-d H:i:s")
             ];
             $res = EnterpriseApi::updateById($checkData);
 
@@ -245,7 +246,7 @@ class Enterprise extends AdminController {
         }
         $ep->password = hash("md5", 'JJrc@123');//默认密码
         $ep->updateUser = session('user')['uid'] . "";
-        $ep->updateTime = date("y-m-d H:i:s");
+        $ep->updateTime = date("Y-m-d H:i:s");
         $ep->save();
 
         $company = CompanyApi::getOne(session('user')['companyId']);
@@ -263,6 +264,134 @@ class Enterprise extends AdminController {
             'createUser' => session('user')['name']."({$company['name']})"
         ]);
         return json(["msg" => '重置密码成功!',"code" => 200]);
+    }
+
+    public function export(){
+        $res = EnterpriseApi::getList($this->request);
+
+        $objPHPExcel = new \PhpOffice\PhpSpreadsheet\Spreadsheet();
+        //创建人
+        $objPHPExcel->getProperties()->setCreator("System");
+        //最后修改人
+        $objPHPExcel->getProperties()->setLastModifiedBy("System");
+        //标题
+        $objPHPExcel->getProperties()->settitle("企业用户信息".date("ymdHis"));
+
+        $objPHPExcel->getDefaultStyle()->getAlignment()->setHorizontal(\PhpOffice\PhpSpreadsheet\Style\Alignment::HORIZONTAL_CENTER);
+        $objPHPExcel->getDefaultStyle()->getAlignment()->setVertical(\PhpOffice\PhpSpreadsheet\Style\Alignment::HORIZONTAL_CENTER);
+        //设置当前的sheet
+        $sheet = $objPHPExcel->getActiveSheet();
+        //设置sheet的name
+        $sheet->settitle('企业用户信息');
+        // 所有单元格默认高度
+        $sheet->getDefaultRowDimension()->setRowHeight(30);
+        $sheet->getDefaultColumnDimension()->setWidth(30);
+
+
+        $sheet->getstyle('A1:O1')->getFill()->setFillType(\PHPExcel_style_Fill::FILL_SOLID)->getStartColor()->setRGB("87CEEB");
+
+        $header = ["单位名称", " 社会信用代码","产业领域" ,"单位标签"," 所属街道", "单位地址", " 法人代表", " 单位电话", "经办人", "经办人电话", "经办人邮箱", "审核状态", "账号状态", "注册时间","备注"];
+
+        foreach ($header as $key => $value) {
+            $sheet->setCellValueByColumnAndRow($key+1, 1, $value);
+        }
+
+        if($res['total'] > 0){
+            $row = 2;
+            foreach ($res['rows'] as $k => $v){
+                for ($i = 0; $i < count($header);$i++){
+                    switch ($i){
+                        case 0:
+                            $sheet->setCellValueByColumnAndRow($i+1, $row, $v['name']);
+                            break;
+                        case 1:
+                            $sheet->setCellValueByColumnAndRow($i+1, $row, $v['idCard']);
+                            break;
+                        case 2:
+                            $sheet->setCellValueByColumnAndRow($i+1, $row, $v['industryFieldNewName']);
+                            break;
+                        case 3:
+                            $sheet->setCellValueByColumnAndRow($i+1, $row, $v['enterpriseTagName']);
+                            break;
+                        case 4:
+                            $sheet->setCellValueByColumnAndRow($i+1, $row, $v['streetName']);
+                            break;
+                        case 5:
+                            $sheet->setCellValueByColumnAndRow($i+1, $row, $v['address']);
+                            break;
+                        case 6:
+                            $sheet->setCellValueByColumnAndRow($i+1, $row, $v['legal']);
+                            break;
+                        case 7:
+                            $sheet->setCellValueExplicitByColumnAndRow($i+1, $row, $v['ephone'], \PhpOffice\PhpSpreadsheet\Cell\DataType::TYPE_STRING);
+                            break;
+                        case 8:
+                            $sheet->setCellValueByColumnAndRow($i+1, $row, $v['agentName']);
+                            break;
+                        case 9:
+                            $sheet->setCellValueExplicitByColumnAndRow($i+1, $row, $v['agentPhone'], \PhpOffice\PhpSpreadsheet\Cell\DataType::TYPE_STRING);
+                            break;
+                        case 10:
+                            $sheet->setCellValueByColumnAndRow($i+1, $row, $v['agentEmail']);
+                            break;
+                        case 11:
+                            switch ($v['checkState']){
+                                case 1:
+                                    $sheet->setCellValueByColumnAndRow($i+1, $row, "未审核");
+                                    break;
+                                case 2:
+                                    $sheet->setCellValueByColumnAndRow($i+1, $row, "审核驳回");
+                                    break;
+                                case 3:
+                                    $sheet->setCellValueByColumnAndRow($i+1, $row, "审核通过");
+                                    break;
+                                case 4:
+                                    $sheet->setCellValueByColumnAndRow($i+1, $row, "重新提交");
+                                    break;
+                                default:
+                                    $sheet->setCellValueByColumnAndRow($i+1, $row, "");
+                                    break;
+                            }
+                            break;
+                        case 12:
+                            switch ($v['active']){
+                                case 1:
+                                    $sheet->setCellValueByColumnAndRow($i+1, $row, "账号有效");
+                                    break;
+                                case 2:
+                                    $sheet->setCellValueByColumnAndRow($i+1, $row, "拉黑/冻结");
+                                    break;
+                                default:
+                                    $sheet->setCellValueByColumnAndRow($i+1, $row, "");
+                                    break;
+                            }
+                            break;
+                        case 13:
+                            $sheet->setCellValueByColumnAndRow($i+1, $row, $v['createTime']);
+                            break;
+                        case 14:
+                            $sheet->setCellValueByColumnAndRow($i+1, $row, $v['description']);
+                            break;
+                    }
+
+                }
+                $row++;
+            }
+        }
+
+
+        header('Content-Type: application/vnd.openxmlformats-officedocument.spreadsheetml.sheet');
+        header('Content-Disposition: attachment;filename="'."企业用户信息".date("ymdHis").'.xlsx"');
+        header('Cache-Control: max-age=0');
+        // If you're serving to IE 9, then the following may be needed
+        header('Cache-Control: max-age=1');
+        // If you're serving to IE over SSL, then the following may be needed
+        header('Expires: Mon, 26 Jul 1997 05:00:00 GMT'); // Date in the past
+        header('Last-Modified: ' . gmdate('D, d M Y H:i:s') . ' GMT'); // always modified
+        header('Cache-Control: cache, must-revalidate'); // HTTP/1.1
+        header('Pragma: public'); // HTTP/1.0
+        $writer = \PhpOffice\PhpSpreadsheet\IOFactory::createWriter($objPHPExcel, 'Xlsx');
+        $writer->save('php://output');
 
     }
 }

app/admin/controller/EnterpriseChangeRecord.php

@@ -3,12 +3,171 @@
 namespace app\admin\controller;
 
 use app\admin\common\AdminController;
+use app\common\api\ChuanglanSmsApi;
+use app\common\api\CompanyApi;
+use app\common\api\DictApi;
+use app\common\api\EnterpriseApi;
+use app\common\api\TalentState;
+use app\common\model\MessageRecord;
+use app\common\model\TalentChecklog;
 
 class EnterpriseChangeRecord extends AdminController {
 
 
     public function gotoEnterpriseChangeRecordPage(){
+        $talentTypeList = DictApi::findChildDictByCode("enterprise_tag");
+        $industryFieldNewList = DictApi::findChildDictByCode("industry_field");
+        $streetList = DictApi::findChildDictByCode("street");
+
+        return view("",['enterprise_tag' => $talentTypeList,'industryFieldNew' => $industryFieldNewList,'street' => $streetList]);
+    }
+
+    public function findEnterpriseChangeRecordByPage(){
+        $res = EnterpriseApi::getRecordList($this->request);
+
+        return json($res);
+    }
+
+    public function gotoEnterpriseChangeDetailPage(){
+        $id = trim($this->request['id']);
+        if(!$id){
+            return json(["msg" => 'ID不能为空!']);
+        }
+        $ecr = EnterpriseApi::getOneRecord($id);
+        if (\StrUtil::isNotEmpAndNull($ecr['oldStreet']) || \StrUtil::isNotEmpAndNull($ecr['newStreet'])) {
+            $streetList = DictApi::selectByParentCode("street");
+			if (\StrUtil::isNotEmpAndNull($ecr['oldStreet'])) {
+                $ecr['oldStreetName'] = $streetList[$ecr['oldStreet']];
+            }
+			if (\StrUtil::isNotEmpAndNull($ecr['newStreet'])) {
+                $ecr['newStreetName'] = $streetList[$ecr['newStreet']];
+            }
+		}
+        if (\StrUtil::isNotEmpAndNull($ecr['oldEnterpriseTag']) || \StrUtil::isNotEmpAndNull($ecr['newEnterpriseTag'])) {
+            $talentTypeList = DictApi::selectByParentCode("enterprise_tag");
+			if (\StrUtil::isNotEmpAndNull($ecr['oldEnterpriseTag'])) {
+                $ecr['oldEnterpriseTagName'] = $talentTypeList[$ecr['oldEnterpriseTag']];
+            }
+			if (\StrUtil::isNotEmpAndNull($ecr['newEnterpriseTag'])) {
+                $ecr['newEnterpriseTagName'] = $talentTypeList[$ecr['newEnterpriseTag']];
+            }
+		}
+        if (\StrUtil::isNotEmpAndNull($ecr['oldIndustryFieldNew']) || \StrUtil::isNotEmpAndNull($ecr['newIndustryFieldNew'])) {
+            $industryFieldNewList = DictApi::selectByParentCode("industry_field");
+			if (\StrUtil::isNotEmpAndNull($ecr['oldIndustryFieldNew'])) {
+                $ecr['oldIndustryFieldNewName'] = $industryFieldNewList[$ecr['oldIndustryFieldNew']];
+            }
+			if (\StrUtil::isNotEmpAndNull($ecr['newIndustryFieldNew'])) {
+                $ecr['newIndustryFieldNewName'] = $industryFieldNewList[$ecr['newIndustryFieldNew']];
+            }
+		}
+        switch ($ecr['checkState']){
+            case 1:
+                $ecr['checkStateName'] = '保存未提交';
+                break;
+            case 2:
+                $ecr['checkStateName'] = '待审核';
+                break;
+            case 3:
+                $ecr['checkStateName'] = '审核驳回';
+                break;
+            case 4:
+                $ecr['checkStateName'] = '审核通过';
+                break;
+            case 5:
+                $ecr['checkStateName'] = '重新提交';
+                break;
+            default:
+                $ecr['checkStateName'] = '';
+                break;
+        }
+
+
+        return view("",['ecr' => $ecr]);
+    }
+
+    public function gotoEnterpriseChangeExaminePage(){
+        $id = trim($this->request['id']);
+        if(!$id){
+            return json(["msg" => 'ID不能为空!']);
+        }
+        $ecr = EnterpriseApi::getOneRecord($id);
+
+        return view("",['ecr' => $ecr]);
+    }
+
+    public function doExamine(){
+        $id = trim($this->request['id']);
+        if(!$id){
+            return json(["msg" => 'ID不能为空!','code' => 500]);
+        }
+        $ecr = EnterpriseApi::getOneRecord($id);
+        if(!$ecr){
+            return json(["msg" => '原始数据不存在!','code' => 500]);
+        }
+        $checkState = trim($this->request['checkState']);
+        if ($checkState==null || ($checkState!=4 && $checkState!=3)) {
+            return json(["msg" => '请选择审核状态!','code' => 500]);
+        }
+        $checkMsg = trim($this->request['checkMsg']);
+        //如果审核状态为 审核驳回， 需要填写审核意见
+        if ($checkState==3 && \StrUtil::isEmpOrNull($checkMsg)) {
+            return json(["msg" => '审核驳回时，需要填写审核意见!','code' => 500]);
+        }
+        if (\StrUtil::isNotEmpAndNull($checkMsg) && strlen($checkMsg)>200) {
+            return json(["msg" => '审核意见最多200个字符!','code' => 500]);
+        }
+        if ($ecr['checkState']!=2 && $ecr['checkState']!=3 && $ecr['checkState']!=5) {
+            return json(["msg" => '不在审核范围内!','code' => 500]);
+        }
+        //如果为审核驳回，更新表中的审核状态 和 审核意见， 直接返回结果
+        if ($checkState == 3) {
+            $ecr->checkState = 3;
+            $ecr->checkMsg = $checkMsg;
+            $ecr->updateUser = session('user')['uid'];
+            $ecr->updateTime = date("Y-m-d H:i:s");
+            $ecr->save();
+            //发送短信
+            $record_data = [
+                'id' => getStringId(),
+                'bizId' => getStringId(),
+                'userId' => $ecr['mainId'],
+                'type' => 2,
+                'smsType' => 2,
+                'name' => $ecr['newName'],
+                'phone' => $ecr['newAgentPhone'],
+                'templateCode' => "【晋江市人才服务平台】您好！您提交申请的优秀人才{$checkMsg}因信息填写错误或上传不完整已被退回，请及时登录申报系统查看审核意见并重新提交。",
+                'params' => '企业信息变更',
+                'state' => 1,
+                'sendingDate' => date("Y-m-d H:i:s",time()),
+                'createTime' => date("Y-m-d H:i:s",time())
+            ];
+
+            $smsapi = new ChuanglanSmsApi();
+
+            $result = $smsapi->sendSMS($ecr['newAgentPhone'],$record_data['templateCode']);
+
+            MessageRecord::create($record_data);
+
+            $company = CompanyApi::getOne(session('user')['companyId']);
+
+            TalentChecklog::create([
+                'id' => getStringId(),
+                'mainId' => $ecr['id'],
+                'type' => 10,
+                'typeField' => null,
+                'active' => 1,
+                'state' => 2,
+                'step' => 101,
+                'stateChange' => "<span class='label label-info'>审核驳回</span>",
+                'description' => $checkMsg,
+                'createTime' => date("Y-m-d H:i:s",time()),
+                'createUser' => session('user')['name']."({$company['name']})"
+            ]);
+
+            return json(["msg" => '操作成功!',"code" => 200]);
+
+		}
 
-        return view();
     }
 }

app/admin/model/CurrencyFiletype.php

@@ -0,0 +1,16 @@
+<?php
+
+namespace app\admin\model;
+
+use think\Model;
+
+/**
+ * Description of Depart
+ *
+ * @author sgq
+ */
+class CurrencyFiletype extends Model {
+
+    protected $table = "new_currency_filetype";
+
+}

app/admin/view/currency_filetype/index.html

@@ -0,0 +1,104 @@
+{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 row-lg">
+                    <div class="col-sm-12">
+                        <div class="row">
+                            <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="type">
+
+                                    </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="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>
+                                <select class="form-control" id="must">
+                                    <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="active">
+                                <option value=""></option>
+                                <option value="1">是</option>
+                                <option value="2">否</option>
+                            </select>
+                        </div>
+                </div>
+                <div class="col-sm-3">
+                    <button type="button" class="btn btn-sm btn-primary " onclick="CurrencyFiletype.search()">
+                        <i class="fa fa-search"></i>&nbsp;搜索
+                    </button>
+                    <button type="button" class="btn btn-sm btn-primary " onclick="CurrencyFiletype.reset()">
+                        <i class="fa fa-trash"></i>&nbsp;重置
+                    </button>
+                </div>
+            </div>
+            <div class="hidden-xs" id="CurrencyFiletypeTableToolbar" role="group">
+                {if condition="chkCommission('/admin/currencyFiletype/add','/currencyFiletype/add')"}
+                <button type="button" class="btn btn-sm btn-primary " onclick="CurrencyFiletype.openAddCurrencyFiletype()">
+                    <i class="fa fa-plus"></i>&nbsp;添加
+                </button>
+                {/if}
+                {if condition="chkCommission('/admin/currencyFiletype/update','/currencyFiletype/update')"}
+                <button type="button" class="btn btn-sm btn-primary " onclick="CurrencyFiletype.openCurrencyFiletypeDetail()">
+                    <i class="fa fa-edit"></i>&nbsp;修改
+                </button>
+                {/if}
+                {if condition="chkCommission('/admin/currencyFiletype/delete','/currencyFiletype/delete')"}
+                <button type="button" class="btn btn-sm btn-primary " onclick="CurrencyFiletype.delete()">
+                    <i class="fa fa-remove"></i>&nbsp;删除
+                </button>
+                {/if}
+
+            </div>
+            <table id="CurrencyFiletypeTable" 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>
+<script src="/static/modular/filetype/currencyFiletype/currencyFiletype.js?v=3"></script>
+{/block}

app/admin/view/enterprise_change_record/goto_enterprise_change_detail_page.html

@@ -0,0 +1,227 @@
+{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}"/>
+                            </div>
+                          </div>
+                          <div class="rowGroup"  style="margin-bottom: 0px;">
+                            <label class="col-sm-2 control-label spacing"><span class="text-danger">*</span>社会信用代码</label>
+                            <div class="col-sm-4 spacing">
+                              <input type="text" class="form-control" id="oldIdCard" name="oldIdCard" value="{$ecr.oldIdCard}"/>
+                            </div>
+                          </div>
+                          <div class="rowGroup" style="display: none">
+                            <label class="col-sm-2 control-label spacing"><span class="text-danger">*</span>产业领域</label>
+                            <div class="col-sm-4 spacing">
+                              <input type="text" class="form-control" id="oldIndustryFieldNew" name="oldIndustryFieldNew" value="{$ecr.oldIndustryFieldNewName}" />
+                            </div>
+                          </div>
+                          <div class="rowGroup" style="display: none">
+                            <label class="col-sm-2 control-label spacing"><span class="text-danger">*</span>行业领域</label>
+                            <div class="col-sm-4 spacing">
+                              <input type="text" class="form-control" id="oldIndustryFieldOld" name="oldIndustryFieldOld" value="{$ecr.oldIndustryFieldOldName}">
+                            </div>
+                          </div>
+                          <div class="rowGroup"  style="display: none">
+                            <label class="col-sm-2 control-label spacing"><span class="text-danger">*</span>单位标签</label>
+                            <div class="col-sm-4 spacing">
+                              <select type="text" class="form-control" id="oldEnterpriseTag" name="oldEnterpriseTag" value="{$ecr.oldEnterpriseTagName}"></select>
+                            </div>
+                          </div>
+                          <div class="rowGroup"  style="margin-bottom: 0px;">
+                            <label class="col-sm-2 control-label spacing"><span class="text-danger">*</span>法人代表</label>
+                            <div class="col-sm-4 spacing">
+                              <input type="text" class="form-control" id="oldLegal" name="oldLegal" value="{$ecr.oldLegal}"/>
+                            </div>
+                          </div>
+                          <div class="rowGroup"  style="margin-bottom: 0px;">
+                            <label class="col-sm-2 control-label spacing"><span class="text-danger">*</span>所属街道</label>
+                            <div class="col-sm-4 spacing">
+                              <select class="form-control" id="oldStreet" name="oldStreet" value="{$ecr.oldStreet}"></select>
+                            </div>
+                          </div>
+                          <div class="rowGroup"  style="margin-bottom: 0px;">
+                            <label class="col-sm-2 control-label spacing"><span class="text-danger">*</span>单位地址</label>
+                            <div class="col-sm-4 spacing">
+                              <input type="text" class="form-control" id="oldAddress" name="oldAddress" value="{$ecr.oldAddress}"/>
+                            </div>
+                          </div>
+                          <div class="rowGroup"  style="margin-bottom: 0px;">
+                            <label class="col-sm-2 control-label spacing"><span class="text-danger">*</span>单位电话</label>
+                            <div class="col-sm-4 spacing">
+                              <input type="text" class="form-control" id="oldEphone" name="oldEphone" value="{$ecr.oldEphone}"/>
+                            </div>
+                          </div>
+                          <div class="rowGroup"  style="margin-bottom: 0px;">
+                            <label class="col-sm-2 control-label spacing"><span class="text-danger">*</span>经办人</label>
+                            <div class="col-sm-4 spacing">
+                              <input type="text" class="form-control" id="oldAgentName" name="oldAgentName" value="{$ecr.oldAgentName}"/>
+                            </div>
+                          </div>
+                          <div class="rowGroup"  style="margin-bottom: 0px;">
+                            <label class="col-sm-2 control-label spacing"><span class="text-danger">*</span>经办人电话</label>
+                            <div class="col-sm-4 spacing">
+                              <input type="text" class="form-control" id="oldAgentPhone" name="oldAgentPhone" value="{$ecr.oldAgentPhone}"/>
+                            </div>
+                          </div>
+                          <div class="rowGroup"  style="margin-bottom: 0px;">
+                            <label class="col-sm-2 control-label spacing"><span class="text-danger">*</span>电子邮箱</label>
+                            <div class="col-sm-4 spacing">
+                              <input type="text" class="form-control" id="oldAgentEmail" name="oldAgentEmail" value="{$ecr.oldAgentEmail}"/>
+                            </div>
+                          </div>
+                        </div>
+                      </div>
+                    </form>
+                  </div>
+                </div>
+                <div class="panel panel-default">
+                  <div class="panel-heading" onclick="$(this).next().toggle()">变更后企业信息</div>
+                  <div class="panel-body">
+                    <form id="ecr_form2" class="form-horizontal" target="hiddenIframe" action="" method="post" enctype="multipart/form-data">
+                      <div class="col-sm-12 ">
+                        <div class="row">
+                          <div class="rowGroup"  style="margin-bottom: 0px;">
+                            <label class="col-sm-2 control-label spacing"><span class="text-danger">*</span>单位名称</label>
+                            <div class="col-sm-4 spacing">
+                              <input type="text" class="form-control" id="newName" name="newName" value="{$ecr.newName}"/>
+                            </div>
+                          </div>
+                          <div class="rowGroup"  style="margin-bottom: 0px;">
+                            <label class="col-sm-2 control-label spacing"><span class="text-danger">*</span>社会信用代码</label>
+                            <div class="col-sm-4 spacing">
+                              <input type="text" class="form-control" id="newIdCard" name="newIdCard" value="{$ecr.newIdCard}"/>
+                            </div>
+                          </div>
+                          <div class="rowGroup" >
+                            <label class="col-sm-2 control-label spacing"><span class="text-danger">*</span>行业领域</label>
+                            <div class="col-sm-4 spacing">
+                              <input type="text" class="form-control" id="newIndustryField" name="newIndustryField" value="{$ecr.newIndustryFieldName}">
+                            </div>
+                          </div>
+                          <div class="rowGroup"  style="display: none">
+                            <label class="col-sm-2 control-label spacing"><span class="text-danger">*</span>企业标签</label>
+                            <div class="col-sm-4 spacing">
+                              <select type="text" class="form-control" id="newTalentType" name="newTalentType" value="{$ecr.newTalentType}"></select>
+                            </div>
+                          </div>
+                          <div class="rowGroup"  style="margin-bottom: 0px;">
+                            <label class="col-sm-2 control-label spacing"><span class="text-danger">*</span>法人代表</label>
+                            <div class="col-sm-4 spacing">
+                              <input type="text" class="form-control" id="newLegal" name="newLegal" value="{$ecr.newLegal}"/>
+                            </div>
+                          </div>
+                          <div class="rowGroup"  style="margin-bottom: 0px;">
+                            <label class="col-sm-2 control-label spacing"><span class="text-danger">*</span>所属街道</label>
+                            <div class="col-sm-4 spacing">
+                              <select class="form-control" id="newStreet" name="newStreet" value="{$ecr.newStreet}"></select>
+                            </div>
+                          </div>
+                          <div class="rowGroup"  style="margin-bottom: 0px;">
+                            <label class="col-sm-2 control-label spacing"><span class="text-danger">*</span>单位地址</label>
+                            <div class="col-sm-4 spacing">
+                              <input type="text" class="form-control" id="newAddress" name="newAddress" value="{$ecr.newAddress}"/>
+                            </div>
+                          </div>
+                          <div class="rowGroup"  style="margin-bottom: 0px;">
+                            <label class="col-sm-2 control-label spacing"><span class="text-danger">*</span>单位电话</label>
+                            <div class="col-sm-4 spacing">
+                              <input type="text" class="form-control" id="newEphone" name="newEphone" value="{$ecr.newEphone}"/>
+                            </div>
+                          </div>
+                          <div class="rowGroup"  style="margin-bottom: 0px;">
+                            <label class="col-sm-2 control-label spacing"><span class="text-danger">*</span>经办人</label>
+                            <div class="col-sm-4 spacing">
+                              <input type="text" class="form-control" id="newAgentName" name="newAgentName" value="{$ecr.newAgentName}"/>
+                            </div>
+                          </div>
+                          <div class="rowGroup"  style="margin-bottom: 0px;">
+                            <label class="col-sm-2 control-label spacing"><span class="text-danger">*</span>经办人电话</label>
+                            <div class="col-sm-4 spacing">
+                              <input type="text" class="form-control" id="newAgentPhone" name="newAgentPhone" value="{$ecr.newAgentPhone}"/>
+                            </div>
+                          </div>
+                          <div class="rowGroup"  style="margin-bottom: 0px;">
+                            <label class="col-sm-2 control-label spacing"><span class="text-danger">*</span>电子邮箱</label>
+                            <div class="col-sm-4 spacing">
+                              <input type="text" class="form-control" id="newAgentEmail" name="newAgentEmail" value="{$ecr.newAgentEmail}"/>
+                            </div>
+                          </div>
+                        </div>
+                      </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=1"></script>
+{/block}

app/admin/view/enterprise_change_record/goto_enterprise_change_examine_page.html

@@ -0,0 +1,39 @@
+{extend name="layout/content"}
+{block name="content"}
+<div class="ibox float-e-margins">
+  <div class="ibox-content">
+    <form id="erc_examine" class="form-horizontal">
+      <input type="text" id="id" value="{$ecr.id}" style="display: none;" />
+      <div class="row">
+        <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="checkState" name="checkState" onchange="examine.toggleField()" >
+                  <option value="">--- 请选择 ---</option>
+                  <option value="3">审核驳回</option>
+                  <option value="4">审核通过</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="6" id="checkMsg" name="checkMsg">{$ecr.checkMsg}</textarea>
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+    </form>
+  </div>
+</div>
+<input type="text" id="checkStateTemp" value="{$ecr.checkState}" style="display: none;" />
+<script src="/static/modular/enterprise/enterprisechangeRecord/ep_change_record_examine.js?v=1"></script>
+{/block}

app/admin/view/enterprise_change_record/goto_enterprise_change_record_page.html

@@ -48,6 +48,9 @@
                             </div>
                             <select class="form-control" id="oldStreet">
                                 <option value="">请选择</option>
+                                {volist name="street" id="item"}
+                                <option value="{$item.code}">{$item.name}</option>
+                                {/volist}
                             </select>
                         </div>
                     </div>
@@ -55,11 +58,14 @@
                         <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">
+                            <select class="form-control" id="oldEnterpriseTag">
                                 <option value="">请选择</option>
+                                {volist name="enterprise_tag" id="item"}
+                                <option value="{$item.code}">{$item.name}</option>
+                                {/volist}
                             </select>
                         </div>
                     </div>
@@ -67,11 +73,14 @@
                         <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">
+                            <select class="form-control" id="oldIndustryFieldNew">
                                 <option value="">请选择</option>
+                                {volist name="industryFieldNew" id="item"}
+                                <option value="{$item.code}">{$item.name}</option>
+                                {/volist}
                             </select>
                         </div>
                     </div>
@@ -114,6 +123,9 @@
                             </div>
                             <select class="form-control" id="newStreet">
                                 <option value="">请选择</option>
+                                {volist name="street" id="item"}
+                                <option value="{$item.code}">{$item.name}</option>
+                                {/volist}
                             </select>
                         </div>
                     </div>
@@ -121,11 +133,14 @@
                         <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">
+                            <select class="form-control" id="newEnterpriseTag">
                                 <option value="">请选择</option>
+                                {volist name="enterprise_tag" id="item"}
+                                <option value="{$item.code}">{$item.name}</option>
+                                {/volist}
                             </select>
                         </div>
                     </div>
@@ -133,11 +148,14 @@
                         <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">
+                            <select class="form-control" id="newIndustryFieldNew">
                                 <option value="">请选择</option>
+                                {volist name="industryFieldNew" id="item"}
+                                <option value="{$item.code}">{$item.name}</option>
+                                {/volist}
                             </select>
                         </div>
                     </div>
@@ -194,5 +212,5 @@
         </div>
     </div>
 </div>
-<script src="/static/modular/enterprise/enterprisechangeRecord/ep_change_record_list.js"></script>
+<script src="/static/modular/enterprise/enterprisechangeRecord/ep_change_record_list.js?v=5"></script>
 {/block}

app/common/api/EnterpriseApi.php

@@ -2,7 +2,9 @@
 
 namespace app\common\api;
 
+use app\admin\controller\EnterpriseChangeRecord;
 use app\common\api\CompanyApi;
+use app\enterprise\model\EnterpriseRecord;
 use think\facade\Db;
 use app\admin\model\Enterprise;
 
@@ -81,14 +83,107 @@ class EnterpriseApi {
         if($count > 0){
             $talentTypeList = DictApi::selectByParentCode("enterprise_tag");
             $industryFieldNewList = DictApi::selectByParentCode("industry_field");
-            $industryFieldOldList = DictApi::selectByParentCode("industry_field");
+            $streetList = DictApi::selectByParentCode("street");
             //dd($talentTypeList);
             $list = Enterprise::where($where)->limit($offset, $limit)->order("createTime", 'desc')->select()->toArray();
             foreach ($list as $k => &$v){
                 unset($v['password']);
                 $v['enterpriseTagName'] = $talentTypeList[$v['enterpriseTag']];//此处旧字段为talentType,新字段为enterpriseTag，为防止数据污染与丢失，因而这样写
                 $v['industryFieldNewName'] = $industryFieldNewList[$v['industryFieldNew']];
-                $v['industryFieldNewName'] = $industryFieldNewList[$v['industryFieldNew']];
+                $v['streetName'] = $streetList[$v['street']];
+            }
+        }else{
+            $list = [];
+        }
+        return ["total" => $count, "rows" => $list];
+    }
+
+    public static function getRecordList($request) {
+        $companyId = session('user')['companyId'];
+        $company_info = CompanyApi::getOne($companyId);
+        $where = [];
+        if($company_info['code'] != 'super'){
+            $where[] = ['type','=',session('user')['type']];
+            if(session('user')['type'] == 1){
+                $list = Db::table('sys_enterprisetype_properties')->where('companyIds','like',$companyId)->select()->toArray();
+                $talentType = [];
+                foreach ($list as $k => $v){
+                    array_push($talentType,$v['talentType']);
+                }
+                $where[] = ['newEnterpriseTag','in',$talentType];
+            }
+        }
+
+        $offset = trim($request->param("offset")) ?: 0;
+        $limit = trim($request->param("limit")) ?: 10;
+
+        $oldName = trim($request->param("oldName"));
+        $oldIdCard = trim($request->param("oldIdCard"));
+        $oldLegal = trim($request->param("oldLegal"));
+        $oldStreet = trim($request->param("oldStreet"));
+        $oldEnterpriseTag = trim($request->param("oldEnterpriseTag"));
+        $oldIndustryFieldNew = trim($request->param("oldIndustryFieldNew"));
+        $newName = trim($request->param("newName"));
+        $newIdCard = trim($request->param("newIdCard"));
+        $newAgentName = trim($request->param("newAgentName"));
+        $newStreet = trim($request->param("newStreet"));
+        $newEnterpriseTag = trim($request->param("newEnterpriseTag"));
+        $newIndustryFieldNew = trim($request->param("newIndustryFieldNew"));
+        $checkState = trim($request->param("checkState"));
+
+        if ($oldName) {
+            $where[] = ["oldName", "like", "%{$oldName}%"];
+        }
+        if ($oldIdCard) {
+            $where[] = ["oldIdCard", "like", "%{$oldIdCard}%"];
+        }
+        if ($oldLegal) {
+            $where[] = ["oldLegal", "like", "%{$oldLegal}%"];
+        }
+        if ($oldStreet) {
+            $where[] = ["oldStreet", "=", "{$oldStreet}"];
+        }
+        if ($oldEnterpriseTag) {
+            $where[] = ["oldEnterpriseTag", "=", "{$oldEnterpriseTag}"];
+        }
+        if ($oldIndustryFieldNew) {
+            $where[] = ["oldIndustryFieldNew", "=", "{$oldIndustryFieldNew}"];
+        }
+        if ($newName) {
+            $where[] = ["newName", "like", "%{$newName}%"];
+        }
+        if ($newIdCard) {
+            $where[] = ["newIdCard", "like", "%{$newIdCard}%"];
+        }
+        if ($newAgentName) {
+            $where[] = ["newAgentName", "like", "%{$newAgentName}%"];
+        }
+        if ($checkState) {
+            $where[] = ["checkState", "=", "{$checkState}"];
+        }
+        if ($newStreet) {
+            $where[] = ["newStreet", "=", "{$newStreet}"];
+        }
+        if ($newEnterpriseTag) {
+            $where[] = ["newEnterpriseTag", "=", "{$newEnterpriseTag}"];
+        }
+        if ($newIndustryFieldNew) {
+            $where[] = ["newIndustryFieldNew", "=", "{$newIndustryFieldNew}"];
+        }
+
+        $count = EnterpriseRecord::where($where)->count();
+        if($count > 0){
+            $talentTypeList = DictApi::selectByParentCode("enterprise_tag");
+            $industryFieldNewList = DictApi::selectByParentCode("industry_field");
+            $streetList = DictApi::selectByParentCode("street");
+            $list = EnterpriseRecord::where($where)->limit($offset, $limit)->order("createTime", 'desc')->select()->toArray();
+            foreach ($list as $k => &$v){
+                $v['oldStreetName'] = $streetList[$v['oldStreet']];
+                $v['newStreetName'] = $streetList[$v['newStreet']];
+                $v['oldEnterpriseTagName'] = $talentTypeList[$v['oldEnterpriseTag']];
+                $v['newEnterpriseTagName'] = $talentTypeList[$v['newEnterpriseTag']];//此处旧字段为talentType,新字段为enterpriseTag，为防止数据污染与丢失，因而这样写
+                $v['oldIndustryFieldNewName'] = $industryFieldNewList[$v['oldIndustryFieldNew']];
+                $v['newIndustryFieldNewName'] = $industryFieldNewList[$v['newIndustryFieldNew']];
             }
         }else{
             $list = [];
@@ -99,4 +194,10 @@ class EnterpriseApi {
     public static function updateById($data){
         return Enterprise::update($data);
     }
+
+    public static function getOneRecord($id){
+        return EnterpriseRecord::findOrEmpty($id);
+    }
+
+
 }

app/common/controller/Api.php

@@ -344,7 +344,7 @@ class Api extends BaseController {
             }else{
                 $file_data['sn'] = 1;
             }
-            $file_data['createTime'] = date("y-m-d H:i:s");
+            $file_data['createTime'] = date("Y-m-d H:i:s");
             TalentCommonFile::create($file_data);
             $response_object = new \StdClass();
             $response_object->code = 200;
@@ -354,7 +354,7 @@ class Api extends BaseController {
         } else {
             $tf = TalentCommonFile::findOrEmpty($id);
             $tf->originalName = $file_data['orignName'];
-            $tf->updateTime = date("y-m-d H:i:s");
+            $tf->updateTime = date("Y-m-d H:i:s");
             $tf->url = $file_check_res->filepath;
             $tf->save();
             $response_object = new \StdClass();

app/common/view/auth/register.html

@@ -318,6 +318,6 @@
 </div>
 <iframe id="hiddenIframe" name="hiddenIframe" style="display: none;"></iframe>
 
-<script src="/static/js/register.js?v=9"></script>
+<script src="/static/js/register.js?v=11"></script>
 
 {/block}

app/enterprise/controller/Api.php

@@ -149,7 +149,7 @@ class Api extends EnterpriseController {
                     'newBank' => $data['bank'],
                     'newBankNetwork' => $data['bankNetwork'],
                     'checkState' => 1,
-                    'createTime' => date("y-m-d H:i:s",time()),
+                    'createTime' => date("Y-m-d H:i:s",time()),
                     'createUser' => session("user")["uid"]
                 ];
                 EnterpriseRecord::create($record_data);
@@ -163,14 +163,14 @@ class Api extends EnterpriseController {
                     'step' => 100,
                     'stateChange' => '保存未提交',
                     'description' => '企业信息变更记录添加成功',
-                    'createTime' => date("y-m-d H:i:s",time()),
+                    '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->updateTime = date("Y-m-d H:i:s");
                 $record->updateUser = session("user")["uid"];
                 $record->save();
 
@@ -183,7 +183,7 @@ class Api extends EnterpriseController {
                     'step' => 100,
                     'stateChange' => '保存未提交',
                     'description' => '企业信息变更记录修改成功',
-                    'createTime' => date("y-m-d H:i:s",time()),
+                    'createTime' => date("Y-m-d H:i:s",time()),
                     'createUser' => '用户'
                 ];
 
@@ -258,7 +258,7 @@ class Api extends EnterpriseController {
             'step' => 100,
             'stateChange' => "<span class='label'>待提交</span>-><span class='label label-success'>待审核</span>" ,
             'description' => '提交审核',
-            'createTime' => date("y-m-d H:i:s",time()),
+            'createTime' => date("Y-m-d H:i:s",time()),
             'createUser' => '用户'
         ];
         TalentChecklog::create($log);

composer.json

@@ -26,7 +26,8 @@
         "topthink/think-view": "^1.0",
         "topthink/think-multi-app": "^1.0",
         "phpoffice/phpexcel": "^1.8",
-        "topthink/think-captcha": "^3.0"
+        "topthink/think-captcha": "^3.0",
+        "phpoffice/phpspreadsheet": "^1.24"
     },
     "require-dev": {
         "symfony/var-dumper": "^4.2",

public/.htaccess

@@ -1,8 +1 @@
-<IfModule mod_rewrite.c>
-  Options +FollowSymlinks -Multiviews
-  RewriteEngine On
-
-  RewriteCond %{REQUEST_FILENAME} !-d
-  RewriteCond %{REQUEST_FILENAME} !-f
-  RewriteRule ^(.*)$ index.php/$1 [QSA,PT,L]
-</IfModule>
+ 

public/static/js/register.js

@@ -406,7 +406,7 @@ Register.typeChange = function(){
 }
 Register.industryChange = function(){
     var industryNew = $("#industryFieldNew").val();
-    var arr = [{"name":"industryFieldOld","code":industryNew}];
+    var arr = [{"name":"industryFieldOld","code":industryNew+"_field"}];
     Feng.findChildDictBatch(JSON.stringify(arr));
 }
 

public/static/modular/enterprise/enterprise_list.js

@@ -253,7 +253,7 @@ Enterprise.doExport = function() {
 	var industryField = $("#industryField").val();
 	var arr = {"name":name, "idCard":idCard, "legal":legal, "ephone":ephone, "agentName":agentName,
 			"agentPhone":agentPhone, "checkState":checkState, "active":active,"street":street,"talentType":talentType,"industryField":industryField};
-	window.location.href = Feng.setUrlParam(Feng.ctxPath + "/enterprise/export", arr);
+	window.location.href = Feng.setUrlParam(Feng.ctxPath + "/admin/enterprise/export", arr);
 }
 
 /**

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

@@ -12,7 +12,7 @@ ecre.doExamine = function() {
 		area: ['830px', '450px'], //宽高
 		fix: false, //不固定
 		maxmin: true,
-		content: Feng.ctxPath + '/enterprisechangeRecord/gotoEnterpriseChangeExaminePage?id='+$("#id").val(),
+		content: Feng.ctxPath + '/admin/enterpriseChangeRecord/gotoEnterpriseChangeExaminePage?id='+$("#id").val(),
 		btn: ['<i class="fa fa-check"></i>&nbsp;&nbsp;确定', '<i class="fa fa-eraser"></i>&nbsp;&nbsp;取消'],
 		yes: function (index, layero) {
 			//按钮【按钮一】的回调

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

@@ -16,7 +16,7 @@ examine.addSubmit = function() {
     var da = {"id":id, "checkState":checkState, "checkMsg":checkMsg};
     if(locked)return;
     locked = true;
-    var ajax = new $ax(Feng.ctxPath + "/enterprisechangeRecord/doExamine", function(data){
+    var ajax = new $ax(Feng.ctxPath + "/admin/enterpriseChangeRecord/doExamine", function(data){
         if (data.code == 200) {
             window.parent.parent.EpChange.table.refresh();
             parent.layer.closeAll();

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

@@ -20,15 +20,15 @@ EpChange.initColumn = function(){
         // {title: '原社会信用代码', field: 'oldIdCard', align: 'center', width:160, valign: 'middle', 'class': 'uitd_showTip'},
         // {title: '原法人代表', field: 'oldLegal', align: 'center', width:120, valign: 'middle', 'class': 'uitd_showTip'},
         {title: '原所属街道', field: 'oldStreetName', align: 'center', width:120, valign: 'middle', 'class': 'uitd_showTip'},
-        {title: '原企业标签', field: 'oldTalentTypeName',visible: isShow, align: 'center', width:170, valign: 'middle', 'class': 'uitd_showTip'},
-        {title: '原行业领域', field: 'oldIndustryFieldName',visible: isShow, align: 'center', width:170, valign: 'middle', 'class': 'uitd_showTip'},
+        {title: '原单位标签', field: 'oldEnterpriseTagName',visible: isShow, align: 'center', width:170, valign: 'middle', 'class': 'uitd_showTip'},
+        {title: '原产业领域', field: 'oldIndustryFieldNewName',visible: isShow, align: 'center', width:170, valign: 'middle', 'class': 'uitd_showTip'},
         // {title: '原单位地址', field: 'oldAddress', align: 'center', width:200, valign: 'middle', 'class': 'uitd_showTip'},
         {title: '<span style="color: red">新单位名称</span>', field: 'newName', align: 'center', width:200, valign: 'middle', 'class': 'uitd_showTip'},
         // {title: '新社会信用代码', field: 'newIdCard', align: 'center', width:160, valign: 'middle', 'class': 'uitd_showTip'},
         // {title: '新法人代表', field: 'newLegal', align: 'center', width:120, valign: 'middle', 'class': 'uitd_showTip'},
         {title: '新所属街道', field: 'newStreetName', align: 'center', width:120, valign: 'middle', 'class': 'uitd_showTip'},
-        {title: '新企业标签', field: 'newTalentTypeName',visible: isShow, align: 'center', width:170, valign: 'middle', 'class': 'uitd_showTip'},
-        {title: '新行业领域', field: 'newIndustryFieldName',visible: isShow, align: 'center', width:170, valign: 'middle', 'class': 'uitd_showTip'},
+        {title: '新单位标签', field: 'newEnterpriseTagName',visible: isShow, align: 'center', width:170, valign: 'middle', 'class': 'uitd_showTip'},
+        {title: '新产业领域', field: 'newIndustryFieldNewName',visible: isShow, align: 'center', width:170, valign: 'middle', 'class': 'uitd_showTip'},
         // {title: '新单位地址', field: 'newAddress', align: 'center', width:200, valign: 'middle', 'class': 'uitd_showTip'},
         {title: '申请时间', field: 'createTime', align: 'center', width:150, valign: 'middle', 'class': 'uitd_showTip'},
         {title: '操作', field: 'id', visible: true, align: 'center', valign: 'middle',width:100,
@@ -83,14 +83,14 @@ EpChange.search = function() {
 	queryData['oldIdCard'] = $("#oldIdCard").val();
 	queryData['oldLegal'] = $("#oldLegal").val();
     queryData['oldStreet'] = $("#oldStreet").val();
-    queryData['oldTalentType'] = $("#oldTalentType").val();
-    queryData['oldIndustryField'] = $("#oldIndustryField").val();
+    queryData['oldEnterpriseTag'] = $("#oldEnterpriseTag").val();
+    queryData['oldIndustryFieldNew'] = $("#oldIndustryFieldNew").val();
 	queryData['newName'] = $("#newName").val();
 	queryData['newIdCard'] = $("#newIdCard").val();
     queryData['newAgentName'] = $("#newAgentName").val();
     queryData['newStreet'] = $("#newStreet").val();
-    queryData['newTalentType'] = $("#newTalentType").val();
-    queryData['newIndustryField'] = $("#newIndustryField").val();
+    queryData['newEnterpriseTag'] = $("#newEnterpriseTag").val();
+    queryData['newIndustryFieldNew'] = $("#newIndustryFieldNew").val();
     queryData['checkState'] = $("#checkState").val();
 
 	EpChange.table.refresh({"query": queryData});	
@@ -101,14 +101,14 @@ EpChange.reset = function() {
     $("#oldIdCard").val("");
     $("#oldLegal").val("");
     $("#oldStreet").val("");
-    $("#oldTalentType").val("");
-    $("#oldIndustryField").val("");
+    $("#oldEnterpriseTag").val("");
+    $("#oldIndustryFieldNew").val("");
     $("#newName").val("");
     $("#newIdCard").val("");
     $("#newAgentName").val("");
     $("#newStreet").val("");
-    $("#newTalentType").val("");
-    $("#newIndustryField").val("");
+    $("#newEnterpriseTag").val("");
+    $("#newIndustryFieldNew").val("");
     $("#checkState").val("");
 };
 
@@ -133,7 +133,7 @@ EpChange.gotoEnterpriseChangeDetailPage = function() {
         area: ['830px', '450px'], //宽高
         fix: false, //不固定
         maxmin: true,
-        content: Feng.ctxPath + '/enterprisechangeRecord/gotoEnterpriseChangeDetailPage?id='+EpChange.seItem.id,
+        content: Feng.ctxPath + '/admin/enterpriseChangeRecord/gotoEnterpriseChangeDetailPage?id='+EpChange.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) {
@@ -162,7 +162,7 @@ EpChange.export = function(){
     queryData['newTalentType'] = $("#newTalentType").val();
     queryData['newIndustryField'] = $("#newIndustryField").val();
     queryData['checkState'] = $("#checkState").val();
-    window.location.href = Feng.setUrlParam(Feng.ctxPath + "/enterpriseChangeRecordExport/export", queryData);
+    window.location.href = Feng.setUrlParam(Feng.ctxPath + "/admin/enterpriseChangeRecordExport/export", queryData);
 }
 
 EpChange.showLog = function(id){
@@ -183,7 +183,7 @@ EpChange.showLog = function(id){
 
 $(function () {	
     var defaultColunms = EpChange.initColumn();
-    var table = new BSTable(EpChange.id, "/enterprisechangeRecord/findEnterpriseChangeRecordByPage", defaultColunms);
+    var table = new BSTable(EpChange.id, "/admin/enterpriseChangeRecord/findEnterpriseChangeRecordByPage", defaultColunms);
     table.setPaginationType("server");
     EpChange.table = table.init();
 });

public/static/modular/filetype/currencyFiletype/currencyFiletype.js

@@ -153,7 +153,7 @@ CurrencyFiletype.reset = function (){
 
 $(function () {
     var defaultColunms = CurrencyFiletype.initColumn();
-    var table = new BSTable(CurrencyFiletype.id, "/currencyFiletype/list", defaultColunms);
+    var table = new BSTable(CurrencyFiletype.id, "/admin/currencyFiletype/list", defaultColunms);
     table.setPaginationType("server");
     table.setOnLoadSuccess(function(){
         $(".imgUrl").viewer({
@@ -168,7 +168,7 @@ $(function () {
         "displayCode": "code",
         "displayName": "name",
         "type": "GET",
-        "url": Feng.ctxPath + "/dict/findChildDictByCode?code=un_common_declareType"
+        "url": Feng.ctxPath + "/admin/dict/findChildDictByCode?code=common_declareType"
     });
 
 });

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

@@ -165,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>";