Merge branch 'master' of http://59.57.98.130:3000/jjhc/report

app/admin/controller/Enterprise.php

@@ -375,130 +375,101 @@ class Enterprise extends AdminController {
     }
 
     public function export() {
-        $res = EnterpriseApi::getList($this->request);
+        $res = EnterpriseApi::getList($this->request, true);
+        $rows = $res["rows"];
+        $columns = ["单位名称", " 统一社会信用代码", "产业领域", "单位标签", " 所属街道", "单位地址", " 法人代表", " 单位电话", "人才联络员", "人才联络员电话", "人才联络员邮箱", "审核状态", "账号状态", "注册时间", "备注"];
+
+        $exportDatas = [];
+        if ($res["rows"]) {
+            $stateMaps = [1 => "未审核", 2 => "审核驳回", 3 => "审核通过", 4 => "重新提交"];
+            $activeMaps = [1 => "账号有效", 2 => "拉黑/冻结"];
+            foreach ($rows as $row) {
+                $exportDatas[] = [
+                    $row['name'],
+                    $row['idCard'],
+                    $row['industryFieldNewName'],
+                    $row['enterpriseTagName'],
+                    $row['streetName'],
+                    $row['address'],
+                    $row['legal'],
+                    $row['ephone'],
+                    $row['agentName'],
+                    $row['agentPhone'],
+                    $row['agentEmail'],
+                    $stateMaps[$row["checkState"]],
+                    $activeMaps[$row["active"]],
+                    $row['createTime'],
+                    $row['description']
+                ];
+            }
+            export($columns, $exportDatas, "企业用户信息");
+            exit();
+        }
+        return json(["msg" => "没有可以导出的内容"]);
+    }
+
+    public function findFieldsAndFiles() {
+        $id = $this->request->param("id");
+        $ep = EnterpriseApi::getOne($id);
 
-        $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(\PhpOffice\PhpSpreadsheet\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++;
+        if ($ep->special == 0) {
+            $fields = ["name" => "企业名称", "idCard" => "统一社会信用代码", "legal" => "法人代表", "address" => "企业地址", "street" => "所属街道", "ephone" => "企业电话", "bankCard" => "企业银行账号", "bank" => "企业开户银行", "bankNetwork" => "企业开户银行网点",
+                "agencyType" => "机构类型", "industryFieldNew" => "产业领域", "industryFieldOld" => "行业领域", "enterpriseTag" => "企业标签", "enterpriseType" => "企业类型",
+                "agentName" => "人才联络员姓名", "agentPhone" => "人才联络员电话", "agentEmail" => "人才联络员邮箱"];
+            $files = ["imgurl" => "企业营业执照", "bankImg" => "开户许可证/基本存款账户信息", "domainImg" => "行业领域佐证材料", "beian" => "人才联络员信息备案表", "typeImg" => "规上、高新技术、专精特新企业上传材料"];
+        } else {
+            $fields = ["name" => "单位名称", "idCard" => "统一社会信用代码", "legal" => "法人代表", "address" => "单位地址", "street" => "所属街道", "ephone" => "单位电话", "bankCard" => "单位银行账号", "bank" => "单位开户银行", "bankNetwork" => "单位开户银行网点",
+                "agentName" => "人才联络员姓名", "agentPhone" => "人才联络员电话", "agentEmail" => "人才联络员邮箱"];
+            if ($ep->special == 1) {
+                $fields["institutionTag"] = "单位标签";
             }
+            if ($ep->special == 3) {
+                $fields["organizationTag"] = "机构标签";
+            }
+            $files = ["imgurl" => "法人证或批文", "bankImg" => "开户许可证/基本存款账户信息", "beian" => "人才联络员备案表"];
         }
 
+        $modify_fields = [];
+        $modify_files = [];
+        $_modify_fields = explode(",", $ep["modify_fields"]);
+        foreach ($fields as $key => $value) {
+            $checked = in_array($key, $_modify_fields);
+            $modify_fields[$key] = ["field" => $key, "name" => $value, "checked" => $checked];
+        }
+        $_modify_files = explode(",", $ep["modify_files"]);
+        foreach ($files as $key => $value) {
+            $checked = in_array($key, $_modify_files);
+            $modify_files[$key] = ["field" => $key, "name" => $value, "checked" => $checked];
+        }
+        return json(["code" => 200, "files" => $modify_files, "fields" => $modify_fields]);
+    }
 
-        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');
+    public function updateFieldsAndFiles() {
+        try {
+            $params = $this->request->param();
+            $id = $params["id"];
+            $ep = EnterpriseApi::getOne($id);
+            if (!$ep) {
+                throw new \think\Exception("没有对应的企业信息");
+            }
+            if ($ep["checkState"] != 2) {
+                throw new \think\Exception("不是驳回状态，不能修改驳回字段！");
+            }
+            $fields = array_filter(explode(",", $params["fields"]));
+            $files = array_filter(explode(",", $params["files"]));
+            if (!$fields || !$files)
+                throw new \think\Exception("请选择要驳回的字段或附件！");
+            $data["id"] = $id;
+            $data["modify_fields"] = $fields ? implode(",", $fields) : null;
+            $data["modify_files"] = $files ? implode(",", $files) : null;
+            $data["updateTime"] = date("Y-m-d H:i:s");
+            $data["updateUser"] = session("user")["uid"];
+            if (EnterpriseApi::updateById($data)) {
+                return json(["code" => 200, "msg" => "修改成功！"]);
+            }
+        } catch (\think\Exception $e) {
+            return json(["msg" => $e->getMessage()]);
+        }
     }
 
 }

app/admin/controller/EnterpriseChangeRecord.php

@@ -587,4 +587,103 @@ class EnterpriseChangeRecord extends AdminController {
         return json(["msg" => "没有可以导出的内容"]);
     }
 
+    public function findFieldsAndFiles() {
+        $id = trim($this->request['id']);
+        $ecr = EnterpriseApi::getOneRecord($id);
+        $ep = EnterpriseApi::getOne($ecr['mainId']);
+        if (!$ecr || !$ep || !$id) {
+            return json(["msg" => '没有对应的企业变更信息!']);
+        }
+
+        if ($ep->special == 0) {
+            if ($ep->type == 1) {
+                $fields = ["Name" => "企业名称", "IdCard" => "统一社会信用代码", "Legal" => "法人代表", "Address" => "企业地址", "Street" => "所属街道", "Ephone" => "企业电话", "BankCard" => "企业银行账号", "Bank" => "企业开户银行", "BankNetwork" => "企业开户银行网点",
+                    "AgencyType" => "机构类型", "IndustryFieldNew" => "产业领域", "IndustryFieldOld" => "行业领域", "EnterpriseTag" => "企业标签", "EnterpriseType" => "企业类型",
+                    "AgentName" => "人才联络员姓名", "AgentPhone" => "人才联络员电话", "AgentEmail" => "人才联络员邮箱"];
+                $files = ["newImgurl" => "企业营业执照", "newBankImg" => "开户许可证/基本存款账户信息", "newDomainImg" => "行业领域佐证材料", "newBeian" => "人才联络员信息备案表", "newTypeImg" => "规上、高新技术、专精特新企业上传材料"];
+            } else {
+                $fields = ["Name" => "企业名称", "IdCard" => "统一社会信用代码", "Legal" => "法人代表", "Address" => "企业地址", "Street" => "所属街道", "Ephone" => "企业电话", "BankCard" => "企业银行账号", "Bank" => "企业开户银行", "BankNetwork" => "企业开户银行网点",
+                    "AgentName" => "人才联络员姓名", "AgentPhone" => "人才联络员电话", "AgentEmail" => "人才联络员邮箱"];
+                $files = ["newImgurl" => "企业营业执照", "newBankImg" => "开户许可证/基本存款账户信息", "newBeian" => "人才联络员备案表"];
+            }
+        } else {
+            $fields = ["Name" => "单位名称", "IdCard" => "统一社会信用代码", "Legal" => "法人代表", "Address" => "单位地址", "Street" => "所属街道", "Ephone" => "单位电话", "BankCard" => "单位银行账号", "Bank" => "单位开户银行", "BankNetwork" => "单位开户银行网点",
+                "AgentName" => "人才联络员姓名", "AgentPhone" => "人才联络员电话", "AgentEmail" => "人才联络员邮箱"];
+            if ($ep->special == 1) {
+                $fields["InstitutionTag"] = "单位标签";
+            }
+            if ($ep->special == 3) {
+                $fields["OrganizationTag"] = "机构标签";
+            }
+            $files = ["newImgurl" => "法人证或批文", "newBankImg" => "开户许可证/基本存款账户信息", "newBeian" => "人才联络员备案表"];
+        }
+        $modify_fields = [];
+        foreach ($fields as $key => $value) {
+            $oldFieldName = "old" . $key;
+            $newFieldName = "new" . $key;
+            //if ($ecr[$oldFieldName] != $ecr[$newFieldName]) {
+            $modify_fields[$newFieldName] = ["field" => $newFieldName, "name" => $value, "checked" => false];
+            //}
+        }
+        if ($ecr["modify_fields"]) {
+            $_modify_fields = explode(",", $ecr["modify_fields"]);
+            foreach ($_modify_fields as $_field) {
+                if ($modify_fields[$_field]) {
+                    $modify_fields[$_field]["checked"] = true;
+                } else {
+                    $modify_fields[$_field] = ["field" => $_field, "name" => $fields[substr($_field, 3)], "checked" => true];
+                }
+            }
+        }
+        $oldtypes = ["1161965644164075522" => "newImgurl", "1518753449987148467" => "newImgurl", "1518328155588131269" => "newBankImg", "1518926324960220206" => "newBankImg",
+            "1518941016720463523" => "newDomainImg", "1519109971871948101" => "newBeian", "1519185486755815382" => "newBeian"];
+        $modify_files = [];
+        foreach ($files as $key => $value) {
+            $modify_files[$key] = ["field" => $key, "name" => $value, "checked" => false];
+        }
+        if ($ecr["modify_files"]) {
+            $_modify_files = explode(",", $ecr["modify_files"]);
+            foreach ($_modify_files as $_file) {
+                if ($modify_files[$_file]) {
+                    $modify_files[$_file]["checked"] = true;
+                } else {
+                    if (strtotime($ecr["createTime"]) < strtotime($this->compatible_time)) {
+                        //兼容旧的typeid
+                        $_file = $oldtypes[$_file];
+                    }
+                    $modify_files[$_file] = ["field" => $_file, "name" => $files[$_file], "checked" => true];
+                }
+            }
+        }
+        return json(["code" => 200, "files" => $modify_files, "fields" => $modify_fields]);
+    }
+
+    public function updateFieldsAndFiles() {
+        try {
+            $params = $this->request->param();
+            $id = $params["id"];
+            $ecr = EnterpriseApi::getOneRecord($id);
+            if (!$ecr) {
+                throw new \think\Exception("没有对应的企业变更信息");
+            }
+            if ($ecr["checkState"] != 3) {
+                throw new \think\Exception("不是驳回状态，不能修改驳回字段！");
+            }
+            $fields = array_filter(explode(",", $params["fields"]));
+            $files = array_filter(explode(",", $params["files"]));
+            if (!$fields || !$files)
+                throw new \think\Exception("请选择要驳回的字段或附件！");
+            $data["id"] = $id;
+            $data["modify_fields"] = $fields ? implode(",", $fields) : null;
+            $data["modify_files"] = $files ? implode(",", $files) : null;
+            $data["updateTime"] = date("Y-m-d H:i:s");
+            $data["updateUser"] = session("user")["uid"];
+            if (EnterpriseApi::updateById($data)) {
+                return json(["code" => 200, "msg" => "修改成功！"]);
+            }
+        } catch (\think\Exception $e) {
+            return json(["msg" => $e->getMessage()]);
+        }
+    }
+
 }

app/admin/view/enterprise/goto_enterprise_page.html

@@ -1,5 +1,9 @@
 {extend name="layout/content"}
 {block name="content"}
+<style>
+    #field_info{overflow:hidden;}
+    #field_info li{list-style:none;float:left;margin:2px 5px;}
+</style>
 <div class="row">
     <div class="col-sm-12">
         <div class="ibox float-e-margins">
@@ -81,17 +85,54 @@
                         </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="special" onchange="Enterprise.onSpecialChange()">
+                                <option value=""></option>
+                                <option value="0">企业用户</option>
+                                <option value="3">民办非企业</option>
+                                <option value="1">事业单位</option>
+                            </select>
+                        </div>
+                    </div>
+                    <div class="col-sm-4 hiddenElement" style="display:none;">
+                        <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="agencyType" onchange="Enterprise.onAgencyTypeChange();">
+                            </select>
+                        </div>
+                    </div>
+                    <div class="col-sm-4 hiddenElement" style="display:none;">
                         <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="industryFieldNew">
+                            <select class="form-control" id="industryFieldNew" onchange="Enterprise.onIndustryFieldNewChange();">
                             </select>
                         </div>
                     </div>
-                    <div class="col-sm-4">
+                    <div class="col-sm-4 hiddenElement" style="display:none;">
+                        <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="industryFieldOld">
+                            </select>
+                        </div>
+                    </div>
+                    <div class="col-sm-4 hiddenElement">
                         <div class="input-group input-group-sm">
                             <div class="input-group-btn">
                                 <button data-toggle="dropdown" class="btn btn-white dropdown-toggle" type="button">
@@ -103,6 +144,18 @@
                             </select>
                         </div>
                     </div>
+                    <div class="col-sm-4 hiddenElement" style="display:none;">
+                        <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="enterpriseType">
+
+                            </select>
+                        </div>
+                    </div>
                     <div class="col-sm-4">
                         <div class="input-group input-group-sm">
                             <div class="input-group-btn">
@@ -144,11 +197,15 @@
                 </div>
                 <div class="hidden-xs" id="tableToolbar" role="group">
                     {if condition="chkCommission('/admin/enterprise/doExamine','/enterprise/doExamine')"}
-                    <button type="button" class="btn btn-sm btn-primary "
-                            onclick="Enterprise.gotoEnterpriseDetailPage()">
+                    <button type="button" class="btn btn-sm btn-primary " onclick="Enterprise.gotoEnterpriseDetailPage()">
                         <i class="fa fa-edit"></i>&nbsp;审核
                     </button>
                     {/if}
+                    {if condition="chkCommission('/admin/enterprise/updateFieldsAndFiles','')"}
+                    <button type="button" class="btn btn-sm btn-primary " onclick="Enterprise.updateFieldsAndFiles()" id="">
+                        <i class="fa fa-edit"></i>&nbsp;修改驳回字段
+                    </button>
+                    {/if}
                     {if condition="chkCommission('/admin/enterprise/setActive','/enterprise/setActive')"}
                     <button type="button" class="btn btn-sm btn-primary " onclick="Enterprise.setActive()">
                         <i class="fa fa-edit"></i>&nbsp;设置冻结
@@ -168,9 +225,9 @@
                 <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>
+                        <tr>
+                            <th data-field="selectItem" data-checkbox="true"></th>
+                        </tr>
                     </thead>
                 </table>
             </div>

app/admin/view/enterprise_change_record/goto_enterprise_change_record_page.html

@@ -1,5 +1,9 @@
 {extend name="layout/content"}
 {block name="content"}
+<style>
+    #field_info{overflow:hidden;}
+    #field_info li{list-style:none;float:left;margin:2px 5px;}
+</style>
 <div class="row">
     <div class="col-sm-12">
         <div class="ibox float-e-margins">
@@ -192,6 +196,11 @@
                         <i class="fa fa-edit"></i>&nbsp;审核
                     </button>
                     {/if}
+                    {if condition="chkCommission('/admin/enterpriseChangeRecord/updateFieldsAndFiles','')"}
+                    <button type="button" class="btn btn-sm btn-primary " onclick="EpChange.updateFieldsAndFiles()" id="">
+                        <i class="fa fa-edit"></i>&nbsp;修改驳回字段
+                    </button>
+                    {/if}
                     {if
                     condition="chkCommission('/admin/enterpriseChangeRecord/export','/enterprisechangeRecord/excelExport')"}
                     <button type="button" class="btn btn-sm btn-primary " onclick="EpChange.export()">

app/admin/view/talent/talentInfo_common_check.html

@@ -171,27 +171,27 @@
                                     <table style="width: 100%;border-collapse: collapse;" class="table table-bordered">
                                         <tr>
                                             <td>
-                                                <div class="rowGroup">
+                                                <div class="rowGroup word-wrap">
                                                     <label class="control-label spacing td-label"><span style="color: red">*</span>单位标签</label>
-                                                    <div class="form-control" style="border: none">{$info.enterpriseTagName}</div>
+                                                    <div class="form-control" style="border: none;height:auto;">{$info.enterpriseTagName}</div>
                                                 </div>
                                             </td>
                                             <td>
-                                                <div class="rowGroup">
+                                                <div class="rowGroup word-wrap">
                                                     <label class=" control-label spacing td-label"><span style="color: red">*</span>单位名称</label>
-                                                    <div class="form-control" style="border: none">{$info.enterpriseName}</div>
+                                                    <div class="form-control" style="border: none;height:auto;">{$info.enterpriseName}</div>
                                                 </div>
                                             </td>
                                             <td>
-                                                <div class="rowGroup">
+                                                <div class="rowGroup word-wrap">
                                                     <label class=" control-label spacing td-label"><span style="color: red">*</span>所属街道</label>
-                                                    <div class="form-control" style="border: none">{$info.streetName}</div>
+                                                    <div class="form-control" style="border: none;height:auto;">{$info.streetName}</div>
                                                 </div>
                                             </td>
                                             <td>
-                                                <div class="rowGroup">
+                                                <div class="rowGroup word-wrap">
                                                     <label class=" control-label spacing td-label"><span style="color: red">*</span>产业领域</label>
-                                                    <div class="form-control" style="border: none">{$info.industryFieldName}</div>
+                                                    <div class="form-control" style="border: none;height:auto;">{$info.industryFieldName}</div>
                                                 </div>
                                             </td>
                                         </tr>
@@ -237,7 +237,7 @@
                                         </tr>
                                         <tr>
                                             <td>
-                                                <div class="rowGroup ">
+                                                <div class="rowGroup word-wrap">
                                                     <label class=" control-label spacing td-label"><span style="color: red">*</span>工资发放渠道</label>
                                                     {if condition="$info['salary_pay_way']==1"}本单位{else/}本单位所属集团公司及权属公司{/if}
                                                 </div>
@@ -258,7 +258,7 @@
                                                 </div>
                                             </td>
                                             <td id="come_in_jin_str">
-                                                <label class=" control-label spacing td-label">近三年来晋工作时间说明</label>
+                                                <label class=" control-label spacing td-label">{if condition="$info['talent_type'] eq 1"}近三年{else/}近三年（首次）{/if}来晋工作时间说明</label>
                                                 <div class="word-wrap">
                                                     如您为近三年来晋工作的人才，须填写近三年来晋日期，同时上传对应佐证材料，如果来晋时间已超过三年，则此项不必填写。
                                                 </div>
@@ -274,7 +274,7 @@
                                                 </div>
                                             </td>
                                             <td >
-                                                <div class="rowGroup">
+                                                <div class="rowGroup word-wrap">
                                                     <input type="text" class="form-control" name="pre_import_type" id="pre_import_type" value="{if condition="$info['pre_import_type']==1"}意向合同{else/}创业企业名称预核准{/if}">
                                                 </div>
                                             </td>

app/common/api/EnterpriseApi.php

@@ -19,7 +19,7 @@ class EnterpriseApi {
         return $list = Enterprise::where($where)->order("name", 'asc')->field("name,id")->select()->toArray();
     }
 
-    public static function getList($request) {
+    public static function getList($request, $isExport = false) {
         $companyId = session('user')['companyId'];
         $company_info = CompanyApi::getOne($companyId);
         $where = [];
@@ -85,17 +85,21 @@ class EnterpriseApi {
         $offset = trim($request->param("offset")) ?: 0;
         $limit = trim($request->param("limit")) ?: 10;
 
-        $name = trim($request->param("name"));
-        $idCard = trim($request->param("idCard"));
-        $legal = trim($request->param("legal"));
-        $ephone = trim($request->param("ephone"));
-        $agentName = trim($request->param("agentName"));
-        $agentPhone = trim($request->param("agentPhone"));
-        $checkState = trim($request->param("checkState"));
-        $active = trim($request->param("active"));
-        $street = trim($request->param("street"));
-        $enterpriseTag = trim($request->param("enterpriseTag"));
-        $industryFieldNew = trim($request->param("industryFieldNew"));
+        $name = urldecode(trim($request->param("name")));
+        $idCard = urldecode(trim($request->param("idCard")));
+        $legal = urldecode(trim($request->param("legal")));
+        $ephone = urldecode(trim($request->param("ephone")));
+        $agentName = urldecode(trim($request->param("agentName")));
+        $agentPhone = urldecode(trim($request->param("agentPhone")));
+        $checkState = urldecode(trim($request->param("checkState")));
+        $active = urldecode(trim($request->param("active")));
+        $street = urldecode(trim($request->param("street")));
+        $special = urldecode(trim($request->param("special")));
+        $agencyType = urldecode(trim($request->param("agencyType")));
+        $industryFieldNew = urldecode(trim($request->param("industryFieldNew")));
+        $industryFieldOld = urldecode(trim($request->param("industryFieldOld")));
+        $enterpriseTag = urldecode(trim($request->param("enterpriseTag")));
+        $enterpriseType = urldecode(trim($request->param("enterpriseType")));
 
         if ($name) {
             $where[] = ["name", "like", "%{$name}%"];
@@ -124,12 +128,30 @@ class EnterpriseApi {
         if ($street) {
             $where[] = ["street", "=", "{$street}"];
         }
-        if ($enterpriseTag) {
-            $where[] = ["enterpriseTag", "=", "{$enterpriseTag}"];
+        if ($special !== "") {
+            $where[] = ["special", "=", "{$special}"];
+        }
+        if ($agencyType) {
+            $where[] = ["agencyType", "=", "{$agencyType}"];
         }
         if ($industryFieldNew) {
             $where[] = ["industryFieldNew", "=", "{$industryFieldNew}"];
         }
+        if ($industryFieldOld) {
+            $where[] = ["industryFieldOld", "=", "{$industryFieldOld}"];
+        }
+        if ($enterpriseTag) {
+            if ($special == 1) {
+                $where[] = ["institutionTag", "=", "{$enterpriseTag}"];
+            } else if ($special == 3) {
+                $where[] = ["organizationTag", "=", "{$enterpriseTag}"];
+            } else {
+                $where[] = ["enterpriseTag", "=", "{$enterpriseTag}"];
+            }
+        }
+        if ($enterpriseType) {
+            $where[] = ["enterpriseType", "=", "{$enterpriseType}"];
+        }
 
         if ($whereRaw) {
             $count = Enterprise::where($where)->whereRaw($whereRaw)->count();
@@ -145,9 +167,17 @@ class EnterpriseApi {
             $streetList = DictApi::selectByParentCode("street");
             //dd($talentTypeList);
             if ($whereRaw) {
-                $list = Enterprise::where($where)->whereRaw($whereRaw)->limit($offset, $limit)->order("createTime", 'desc')->select()->toArray();
+                if ($isExport) {
+                    $list = Enterprise::where($where)->whereRaw($whereRaw)->order("createTime", 'desc')->select()->toArray();
+                } else {
+                    $list = Enterprise::where($where)->whereRaw($whereRaw)->limit($offset, $limit)->order("createTime", 'desc')->select()->toArray();
+                }
             } else {
-                $list = Enterprise::where($where)->limit($offset, $limit)->order("createTime", 'desc')->select()->toArray();
+                if ($isExport) {
+                    $list = Enterprise::where($where)->order("createTime", 'desc')->select()->toArray();
+                } else {
+                    $list = Enterprise::where($where)->limit($offset, $limit)->order("createTime", 'desc')->select()->toArray();
+                }
             }
             foreach ($list as $k => &$v) {
                 unset($v['password']);
@@ -370,19 +400,19 @@ class EnterpriseApi {
         $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"));
+        $oldName = urldecode(trim($request->param("oldName")));
+        $oldIdCard = urldecode(trim($request->param("oldIdCard")));
+        $oldLegal = urldecode(trim($request->param("oldLegal")));
+        $oldStreet = urldecode(trim($request->param("oldStreet")));
+        $oldEnterpriseTag = urldecode(trim($request->param("oldEnterpriseTag")));
+        $oldIndustryFieldNew = urldecode(trim($request->param("oldIndustryFieldNew")));
+        $newName = urldecode(trim($request->param("newName")));
+        $newIdCard = urldecode(trim($request->param("newIdCard")));
+        $newAgentName = urldecode(trim($request->param("newAgentName")));
+        $newStreet = urldecode(trim($request->param("newStreet")));
+        $newEnterpriseTag = urldecode(trim($request->param("newEnterpriseTag")));
+        $newIndustryFieldNew = urldecode(trim($request->param("newIndustryFieldNew")));
+        $checkState = urldecode(trim($request->param("checkState")));
 
         if ($oldName) {
             $where[] = ["oldName", "like", "%{$oldName}%"];

app/common/view/auth/register.html

@@ -132,7 +132,7 @@
                                                                     <td>
                                                                         <div class="rowGroup">
                                                                             <label class=" control-label spacing td-label"><span style="color: red">*</span>企业开户银行</label>
-                                                                            <input autocomplete="off" type="text" class="form-control" id="bank" name="bank" />
+                                                                            <input autocomplete="off" type="text" class="form-control" id="bank" name="bank" placeholder="XX银行" />
                                                                         </div>
                                                                     </td>
                                                                     <td>
@@ -315,7 +315,7 @@
                                                                     <td>
                                                                         <div class="rowGroup">
                                                                             <label class=" control-label spacing td-label"><span style="color: red">*</span>企业开户银行</label>
-                                                                            <input autocomplete="off" type="text" class="form-control" id="mf_bank" name="bank" />
+                                                                            <input autocomplete="off" type="text" class="form-control" id="mf_bank" name="bank" placeholder="XX银行"/>
                                                                         </div>
                                                                     </td>
                                                                     <td>
@@ -426,7 +426,7 @@
                                                             <td>
                                                                 <div class="rowGroup">
                                                                     <label class=" control-label spacing td-label">单位开户银行</label>
-                                                                    <input autocomplete="off" type="text" class="form-control" id="sy_bank" name="bank" />
+                                                                    <input autocomplete="off" type="text" class="form-control" id="sy_bank" name="bank"  placeholder="XX银行"/>
                                                                 </div>
                                                             </td>
                                                             <td>

app/enterprise/view/integral/view.html

@@ -165,25 +165,25 @@
                                         <table style="width: 100%;border-collapse: collapse;" class="table table-bordered">
                                             <tr>
                                                 <td>
-                                                    <div class="rowGroup">
+                                                    <div class="rowGroup word-wrap">
                                                         <label class="control-label spacing td-label"><span style="color: red">*</span>单位标签</label>
-                                                        <div class="form-control" style="border: none">{$row.enterpriseTagName}</div>
+                                                        <div class="form-control" style="border: none;height:auto;">{$row.enterpriseTagName}</div>
                                                     </div>
                                                 </td>
                                                 <td>
-                                                    <div class="rowGroup">
+                                                    <div class="rowGroup word-wrap">
                                                         <label class=" control-label spacing td-label"><span style="color: red">*</span>单位名称</label>
                                                         <div class="form-control" style="border: none">{$row.enterpriseName}</div>
                                                     </div>
                                                 </td>
                                                 <td>
-                                                    <div class="rowGroup">
+                                                    <div class="rowGroup word-wrap">
                                                         <label class=" control-label spacing td-label"><span style="color: red">*</span>所属街道</label>
                                                         <div class="form-control" style="border: none">{$row.streetName}</div>
                                                     </div>
                                                 </td>
                                                 <td>
-                                                    <div class="rowGroup">
+                                                    <div class="rowGroup word-wrap">
                                                         <label class=" control-label spacing td-label"><span style="color: red">*</span>产业领域</label>
                                                         <div class="form-control" style="border: none">{$row.industryFieldName}</div>
                                                     </div>
@@ -231,7 +231,7 @@
                                             </tr>
                                             <tr>
                                                 <td>
-                                                    <div class="rowGroup ">
+                                                    <div class="rowGroup word-wrap">
                                                         <label class=" control-label spacing td-label"><span style="color: red">*</span>工资发放渠道</label>
                                                         <input type="radio" name="salary_pay_way" value="1" {eq name="row.salary_pay_way" value="1"}checked{/eq} readonly disabled/>本单位&nbsp;&nbsp;
                                                                <input type="radio" name="salary_pay_way" value="2" {eq name="row.salary_pay_way" value="2"}checked{/eq} readonly disabled/>本单位所属集团公司及权属公司

app/enterprise/view/talent/apply.html

@@ -192,27 +192,27 @@
                                         <table style="width: 100%;border-collapse: collapse;" class="table table-bordered">
                                             <tr>
                                                 <td>
-                                                    <div class="rowGroup">
+                                                    <div class="rowGroup word-wrap">
                                                         <label class="control-label spacing td-label"><span style="color: red">*</span>单位标签</label>
-                                                        <div class="form-control" style="border: none">{$row.enterprise.enterpristTagName}</div>
+                                                        <div class="form-control" style="border: none;height:auto;">{$row.enterprise.enterpristTagName}</div>
                                                     </div>
                                                 </td>
                                                 <td>
-                                                    <div class="rowGroup">
+                                                    <div class="rowGroup word-wrap">
                                                         <label class=" control-label spacing td-label"><span style="color: red">*</span>单位名称</label>
-                                                        <div class="form-control" style="border: none">{$row.enterprise.name}</div>
+                                                        <div class="form-control" style="border: none;height:auto;">{$row.enterprise.name}</div>
                                                     </div>
                                                 </td>
                                                 <td>
-                                                    <div class="rowGroup">
+                                                    <div class="rowGroup word-wrap">
                                                         <label class=" control-label spacing td-label"><span style="color: red">*</span>所属街道</label>
-                                                        <div class="form-control" style="border: none">{$row.enterprise.streetName}</div>
+                                                        <div class="form-control" style="border: none;height:auto;">{$row.enterprise.streetName}</div>
                                                     </div>
                                                 </td>
                                                 <td>
-                                                    <div class="rowGroup">
+                                                    <div class="rowGroup word-wrap">
                                                         <label class=" control-label spacing td-label"><span style="color: red">*</span>产业领域</label>
-                                                        <div class="form-control" style="border: none">{$row.enterprise.industryFieldNewName}</div>
+                                                        <div class="form-control" style="border: none;height:auto;">{$row.enterprise.industryFieldNewName}</div>
                                                     </div>
                                                 </td>
                                             </tr>
@@ -256,7 +256,7 @@
                                             </tr>                                    
                                             <tr class="talentType1-2" style="display: none">
                                                 <td >
-                                                    <div class="rowGroup">
+                                                    <div class="rowGroup word-wrap">
                                                         <label class=" control-label spacing td-label"><span style="color: red">*</span>工资发放渠道</label>
                                                         <input type="radio" name="salary_pay_way" value="1" {eq name="row.salary_pay_way" value="1"}checked{/eq}/>本单位&nbsp;&nbsp;
                                                         <input type="radio" name="salary_pay_way" value="2" {eq name="row.salary_pay_way" value="2"}checked{/eq}/>本单位所属集团公司及权属公司
@@ -276,7 +276,7 @@
                                                     </div>
                                                 </td>
                                                 <td >
-                                                    <div class="rowGroup">
+                                                    <div class="rowGroup word-wrap">
                                                         <input type="radio" name="pre_import_type" value="1" {eq name="row.pre_import_type" value="1"}checked{/eq}/><span style="color: red">*</span>意向合同&nbsp;&nbsp;&nbsp;&nbsp;
                                                         <input type="radio" name="pre_import_type" value="2" {eq name="row.pre_import_type" value="2"}checked{/eq}/><span style="color: red">*</span>创业企业名称预核准
                                                     </div>
@@ -291,7 +291,7 @@
                                                     </div>
                                                 </td>
                                                 <td id="come_in_jin_str">
-                                                    <label class=" control-label spacing td-label">近三年来晋工作时间说明</label>
+                                                    <label class=" control-label spacing td-label">{if condition="$row['talent_type'] eq 1"}近三年{else/}近三年（首次）{/if}来晋工作时间说明</label>
                                                     <div class="word-wrap">
                                                         如您为近三年来晋工作的人才，须填写近三年来晋日期，同时上传对应佐证材料，如果来晋时间已超过三年，则此项不必填写。
                                                     </div>

app/enterprise/view/talent/view.html

@@ -166,27 +166,27 @@
                                         <table style="width: 100%;border-collapse: collapse;" class="table table-bordered">
                                             <tr>
                                                 <td>
-                                                    <div class="rowGroup">
+                                                    <div class="rowGroup word-wrap">
                                                         <label class="control-label spacing td-label"><span style="color: red">*</span>单位标签</label>
-                                                        <div class="form-control" style="border: none">{$row.enterpriseTagName}</div>
+                                                        <div class="form-control" style="border: none;height:auto;">{$row.enterpriseTagName}</div>
                                                     </div>
                                                 </td>
                                                 <td>
-                                                    <div class="rowGroup">
+                                                    <div class="rowGroup word-wrap">
                                                         <label class=" control-label spacing td-label"><span style="color: red">*</span>单位名称</label>
-                                                        <div class="form-control" style="border: none">{$row.enterpriseName}</div>
+                                                        <div class="form-control" style="border: none;height:auto;">{$row.enterpriseName}</div>
                                                     </div>
                                                 </td>
                                                 <td>
-                                                    <div class="rowGroup">
+                                                    <div class="rowGroup word-wrap">
                                                         <label class=" control-label spacing td-label"><span style="color: red">*</span>所属街道</label>
-                                                        <div class="form-control" style="border: none">{$row.streetName}</div>
+                                                        <div class="form-control" style="border: none;height:auto;">{$row.streetName}</div>
                                                     </div>
                                                 </td>
                                                 <td>
-                                                    <div class="rowGroup">
+                                                    <div class="rowGroup word-wrap">
                                                         <label class=" control-label spacing td-label"><span style="color: red">*</span>产业领域</label>
-                                                        <div class="form-control" style="border: none">{$row.industryFieldName}</div>
+                                                        <div class="form-control" style="border: none;height:auto;">{$row.industryFieldName}</div>
                                                     </div>
                                                 </td>
                                             </tr>
@@ -232,7 +232,7 @@
                                             </tr>
                                             <tr>
                                                 <td>
-                                                    <div class="rowGroup ">
+                                                    <div class="rowGroup word-wrap">
                                                         <label class=" control-label spacing td-label"><span style="color: red">*</span>工资发放渠道</label>
                                                         <input type="radio" name="salary_pay_way" value="1" {eq name="row.salary_pay_way" value="1"}checked{/eq} readonly disabled/>本单位&nbsp;&nbsp;
                                                                <input type="radio" name="salary_pay_way" value="2" {eq name="row.salary_pay_way" value="2"}checked{/eq} readonly disabled/>本单位所属集团公司及权属公司
@@ -254,7 +254,7 @@
                                                     </div>
                                                 </td>
                                                 <td id="come_in_jin_str">
-                                                    <label class=" control-label spacing td-label">近三年来晋工作时间说明</label>
+                                                    <label class=" control-label spacing td-label">{if condition="$row['talent_type'] eq 1"}近三年{else/}近三年（首次）{/if}来晋工作时间说明</label>
                                                     <div class="word-wrap">
                                                         如您为近三年来晋工作的人才，须填写近三年来晋日期，同时上传对应佐证材料，如果来晋时间已超过三年，则此项不必填写。
                                                     </div>
@@ -270,7 +270,7 @@
                                                     </div>
                                                 </td>
                                                 <td >
-                                                    <div class="rowGroup">
+                                                    <div class="rowGroup word-wrap">
                                                         <input type="radio" name="pre_import_type" value="1" {eq name="row.pre_import_type" value="1"}checked{/eq} readonly disabled/><span style="color: red">*</span>意向合同&nbsp;&nbsp;&nbsp;&nbsp;
                                                         <input type="radio" name="pre_import_type" value="2" {eq name="row.pre_import_type" value="2"}checked{/eq} readonly disabled/><span style="color: red">*</span>创业企业名称预核准
                                                     </div>

public/static/modular/enterprise/enterprise_list.js

@@ -106,8 +106,12 @@ Enterprise.formParam = function () {
     queryData['checkState'] = $("#checkState").val();
     queryData['active'] = $("#active").val();
     queryData['street'] = $("#street").val();
-    queryData['enterpriseTag'] = $("#enterpriseTag").val();
+    queryData['special'] = $("#special").val();
+    queryData['agencyType'] = $("#agencyType").val();
     queryData['industryFieldNew'] = $("#industryFieldNew").val();
+    queryData['industryFieldOld'] = $("#industryFieldOld").val();
+    queryData['enterpriseTag'] = $("#enterpriseTag").val();
+    queryData['enterpriseType'] = $("#enterpriseType").val();
     return queryData;
 }
 
@@ -125,8 +129,12 @@ Enterprise.reset = function () {
     $("#checkState").val("");
     $("#active").val("");
     $("#street").val("");
-    $("#talentType").val("");
-    $("#industryField").val("");
+    $("#special").val("");
+    $("#agencyType").val("");
+    $("#industryFieldNew").val("");
+    $("#industryFieldOld").val("");
+    $("#enterpriseTag").val("");
+    $("#enterpriseType").val("");
 };
 
 Enterprise.gotoEnterpriseDetailPage = function () {
@@ -183,6 +191,7 @@ Enterprise.doExamine = function () {
         area: ['830px', '500px'], //宽高
         fix: false, //不固定
         maxmin: true,
+        shade: 0,
         content: Feng.ctxPath + '/admin/enterprise/gotoExaminePage?id=' + Enterprise.seItem.id,
         btn: ['<i class="fa fa-check"></i>&nbsp;&nbsp;提交', '<i class="fa fa-eraser"></i>&nbsp;&nbsp;取消'],
         btnAlign: 'c',
@@ -195,6 +204,115 @@ Enterprise.doExamine = function () {
 //    layer.full(index);
 };
 
+
+/**
+ * 修改驳回的字段及附件
+ */
+Enterprise.updateFieldsAndFiles = function () {
+    if (this.check()) {
+        var id = Enterprise.seItem.id;
+        var ajax = new $ax("/admin/enterprise/findFieldsAndFiles?id=" + id, function (data) {
+            if (data.code == 200) {
+                layer.open({
+                    type: 1,
+                    id: "fieldCheckModalForm",
+                    title: '修改',
+                    area: ['800px', '450px'], //宽高
+                    fix: false, //不固定
+                    shade: 0,
+                    maxmin: true,
+                    content: Enterprise.creatFieldCheckModal(),
+                    btn: ['<i class="fa fa-save"></i>&nbsp;&nbsp;提交', '<i class="fa fa-eraser"></i>&nbsp;&nbsp;关闭'],
+                    btnAlign: 'c',
+                    zIndex: layer.zIndex,
+                    success: function (layero, index) {
+                        var fileList = data.files;
+                        var fieldList = data.fields;
+                        var html_field = '';
+                        var html_file = '';
+                        for (var key in fieldList) {
+                            html_field = html_field + '<li><input type="checkbox" ' + (fieldList[key].checked ? "checked" : "") + ' value="' + fieldList[key].field + '"><span>' + fieldList[key].name + '</span></li>';
+                        }
+                        for (var key in fileList) {
+                            html_file = html_file + '<li style="width: 100%"><input type="checkbox" ' + (fileList[key].checked ? "checked" : "") + ' value="' + fileList[key].field + '"><span>' + fileList[key].name + '</span></li>';
+                        }
+                        $("#field_info").empty().append("<ul>" + html_field + "</ul>");
+                        $("#field_file").empty().append("<ul>" + html_file + "</ul>");
+                    },
+                    yes: function (index, layero) {
+                        Enterprise.submitFieldsAndFiles(index, id);
+                    }
+                });
+            } else {
+                Feng.error(data.msg);
+            }
+        }, function (data) {
+            Feng.error("查询失败!" + data.responseJSON.message + "!");
+        });
+        ajax.start();
+    }
+};
+
+/**
+ * 修改提交
+ * @param index
+ * @param id
+ */
+Enterprise.submitFieldsAndFiles = function (index, id) {
+    var fields = '';
+    var files = '';
+    $("#field_info li input").each(function (index) {
+        if ($(this).is(":checked")) {
+            fields = fields + $(this).val() + ",";
+        }
+    });
+    $("#field_file li input").each(function (index) {
+        if ($(this).is(":checked")) {
+            files = files + $(this).val() + ",";
+        }
+    });
+    if (fields == '' && files == '') {
+        Feng.info("请选择可修改的字段或附件！");
+        return;
+    }
+    var ajax = new $ax("/admin/enterprise/updateFieldsAndFiles", function (data) {
+        if (data.code == 200) {
+            layer.close(index);
+            Feng.success(data.msg);
+        } else {
+            Feng.error(data.msg);
+        }
+    }, function (data) {
+        Feng.error("修改失败!" + data.responseJSON.message + "!");
+    });
+    ajax.setData({"id": id, "fields": fields, "files": files})
+    ajax.start();
+};
+Enterprise.creatFieldCheckModal = function () {
+    return '<form id="fieldCheckModalForm">\n' +
+            '                    <div class="form-group" style="margin: 10px;">\n' +
+            '                        <div >\n' +
+            '                            <label for="checkMsg" class="control-label">可修改字段</label>\n' +
+            '                            <div id="field_info">\n' +
+            '                            </div>\n' +
+            '                            <label for="checkMsg" class="control-label">可修改附件</label>\n' +
+            '                            <div id="field_file">\n' +
+            '                            </div>\n' +
+            '                            <div class="form-group" style="text-align: center">\n' +
+            '                                <button type="button" class="btn btn-primary" onclick="Enterprise.checkAll()">全选</button>\n' +
+            '                                <button type="button" class="btn btn-success" onclick="Enterprise.unCheckAll()">反选</button>\n' +
+            '                            </div>\n' +
+            '                        </div>\n' +
+            '                    </div>\n' +
+            '                </form>';
+};
+Enterprise.checkAll = function () {
+    $("#fieldCheckModalForm input[type=checkbox]").prop("checked", true);
+};
+Enterprise.unCheckAll = function () {
+    $("#fieldCheckModalForm input[type=checkbox]").removeAttr("checked");
+};
+
 Enterprise.delEnterprise = function () {
     if (!Enterprise.check()) {
         return;
@@ -250,10 +368,15 @@ Enterprise.doExport = function () {
     var checkState = $("#checkState").val();
     var active = $("#active").val();
     var street = $("#street").val();
-    var talentType = $("#talentType").val();
-    var industryField = $("#industryField").val();
+    var special = $("#special").val();
+    var agencyType = $("#agencyType").val();
+    var industryFieldNew = $("#industryFieldNew").val();
+    var industryFieldOld = $("#industryFieldOld").val();
+    var enterpriseTag = $("#enterpriseTag").val();
+    var enterpriseType = $("#enterpriseType").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};
+        "agentPhone": agentPhone, "checkState": checkState, "active": active, "street": street,
+        "special": special, "agencyType": agencyType, "industryFieldNew": industryFieldNew, "industryFieldOld": industryFieldOld, "enterpriseTag": enterpriseTag, "enterpriseType": enterpriseType};
     window.location.href = Feng.setUrlParam(Feng.ctxPath + "/admin/enterprise/export", arr);
 }
 
@@ -304,6 +427,68 @@ Enterprise.showLog = function (id) {
             Feng.getCheckLog(id, {"type": 10, "enterpriseId": id, "typeFileId": "", "active": 1})
         }
     });
+};
+Enterprise.onSpecialChange = function () {
+    var special = $("#special").val();
+    var arr = [];
+    $("#enterpriseTag").html("");
+    switch (special) {
+        case "0":
+            $("#agencyType").parents(".hiddenElement").css("display", "block");
+            $("#industryFieldNew").parents(".hiddenElement").css("display", "block");
+            $("#industryFieldOld").parents(".hiddenElement").css("display", "block");
+            $("#enterpriseType").parents(".hiddenElement").css("display", "block");
+            var arr = [
+                {"name": "agencyType", "code": "agency_type"},
+                {"name": "industryFieldNew", "code": "industry_field"},
+            ];
+            Feng.findChildDictBatch(JSON.stringify(arr));
+            break;
+        case "1":
+            $("#agencyType").val("").parents(".hiddenElement").css("display", "none");
+            $("#industryFieldNew").val("").parents(".hiddenElement").css("display", "none");
+            $("#industryFieldOld").val("").parents(".hiddenElement").css("display", "none");
+            $("#enterpriseType").val("").parents(".hiddenElement").css("display", "none");
+            var arr = [
+                {"name": "enterpriseTag", "code": "institution_tag"}
+            ];
+            Feng.findChildDictBatch(JSON.stringify(arr));
+            break;
+        case "3":
+            $("#agencyType").val("").parents(".hiddenElement").css("display", "none");
+            $("#industryFieldNew").val("").parents(".hiddenElement").css("display", "none");
+            $("#industryFieldOld").val("").parents(".hiddenElement").css("display", "none");
+            $("#enterpriseType").val("").parents(".hiddenElement").css("display", "none");
+            var arr = [
+                {"name": "enterpriseTag", "code": "organization_tag"}
+            ];
+            Feng.findChildDictBatch(JSON.stringify(arr));
+            break;
+    }
+};
+Enterprise.onAgencyTypeChange = function () {
+    var agencyType = $("#agencyType").val();
+    if (agencyType == 1) {
+        var arr = [
+            {"name": "enterpriseTag", "code": "enterprise_tag"},
+            {"name": "enterpriseType", "code": "enterprise_type"}
+        ];
+        Feng.findChildDictBatch(JSON.stringify(arr));
+    } else {
+        $("#enterpriseTag").val("");
+        $("#enterpriseType").val("");
+        $("#enterpriseTag").html("");
+        $("#enterpriseType").html("");
+
+    }
+}
+
+Enterprise.onIndustryFieldNewChange = function () {
+    var industryNew = $("#industryFieldNew").val();
+    var arr = [
+        {"name": "industryFieldOld", "code": industryNew + "_field"}
+    ];
+    Feng.findChildDictBatch(JSON.stringify(arr));
 }
 
 $(function () {
@@ -312,10 +497,17 @@ $(function () {
     table.setPaginationType("server");
     Enterprise.table = table.init();
     var arr = [
-        {"name": "street", "code": "street"},
-        {"name": "enterpriseTag", "code": "enterprise_tag"},
-        {"name": "industryFieldNew", "code": "industry_field"},
-        {"name": "enterpriseType", "code": "enterprise_type"}];
+        {"name": "street", "code": "street"}
+    ];
+    if ($("#special").val() != "") {
+        Enterprise.onSpecialChange();
+        if ($("#agencyType").val() != "") {
+            Enterprise.onAgencyTypeChange();
+        }
+        if ($("#industryFieldNew").val() != "") {
+            Enterprise.onIndustryFieldNewChange();
+        }
+    }
     Feng.findChildDictBatch(JSON.stringify(arr));
     // Feng.addAjaxSelect({
     //     "id": "street",

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

@@ -12,6 +12,7 @@ ecre.doExamine = function () {
         area: ['830px', '450px'], //宽高
         fix: false, //不固定
         maxmin: true,
+        shade: 0,
         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) {
@@ -24,8 +25,6 @@ ecre.doExamine = function () {
     ecre.layerIndex = index;
 };
 
-
-
 ecre.initFileTable = function () {
     $("#fileTable").bootstrapTable({
         url: Feng.ctxPath + "/common/api/listCurrencyFileType",

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

@@ -146,6 +146,113 @@ EpChange.gotoEnterpriseChangeDetailPage = function() {
 };
 
 
+/**
+ * 修改驳回的字段及附件
+ */
+EpChange.updateFieldsAndFiles = function () {
+    if (this.check()) {
+        var id = EpChange.seItem.id;
+        var ajax = new $ax("/admin/enterpriseChangeRecord/findFieldsAndFiles?id=" + id, function (data) {
+            if (data.code == 200) {
+                layer.open({
+                    type: 1,
+                    id: "fieldCheckModalForm",
+                    title: '修改',
+                    area: ['800px', '450px'], //宽高
+                    fix: false, //不固定
+                    shade: 0,
+                    maxmin: true,
+                    content: EpChange.creatFieldCheckModal(),
+                    btn: ['<i class="fa fa-save"></i>&nbsp;&nbsp;提交', '<i class="fa fa-eraser"></i>&nbsp;&nbsp;关闭'],
+                    btnAlign: 'c',
+                    zIndex: layer.zIndex,
+                    success: function (layero, index) {
+                        var fileList = data.files;
+                        var fieldList = data.fields;
+                        var html_field = '';
+                        var html_file = '';
+                        for (var key in fieldList) {
+                            html_field = html_field + '<li><input type="checkbox" ' + (fieldList[key].checked ? "checked" : "") + ' value="' + fieldList[key].field + '"><span>' + fieldList[key].name + '</span></li>';
+                        }
+                        for (var key in fileList) {
+                            html_file = html_file + '<li style="width: 100%"><input type="checkbox" ' + (fileList[key].checked ? "checked" : "") + ' value="' + fileList[key].field + '"><span>' + fileList[key].name + '</span></li>';
+                        }
+                        $("#field_info").empty().append("<ul>" + html_field + "</ul>");
+                        $("#field_file").empty().append("<ul>" + html_file + "</ul>");
+                    },
+                    yes: function (index, layero) {
+                        EpChange.submitFieldsAndFiles(index, id);
+                    }
+                });
+            } else {
+                Feng.error(data.msg);
+            }
+        }, function (data) {
+            Feng.error("查询失败!" + data.responseJSON.message + "!");
+        });
+        ajax.start();
+    }
+};
+
+/**
+ * 修改提交
+ * @param index
+ * @param id
+ */
+EpChange.submitFieldsAndFiles = function (index, id) {
+    var fields = '';
+    var files = '';
+    $("#field_info li input").each(function (index) {
+        if ($(this).is(":checked")) {
+            fields = fields + $(this).val() + ",";
+        }
+    });
+    $("#field_file li input").each(function (index) {
+        if ($(this).is(":checked")) {
+            files = files + $(this).val() + ",";
+        }
+    });
+    if (fields == '' && files == '') {
+        Feng.info("请选择可修改的字段或附件！");
+        return;
+    }
+    var ajax = new $ax("/admin/enterpriseChangeRecord/updateFieldsAndFiles", function (data) {
+        if (data.code == 200) {
+            layer.close(index);
+            Feng.success(data.msg);
+        } else {
+            Feng.error(data.msg);
+        }
+    }, function (data) {
+        Feng.error("修改失败!" + data.responseJSON.message + "!");
+    });
+    ajax.setData({"id": id, "fields": fields, "files": files})
+    ajax.start();
+};
+EpChange.creatFieldCheckModal = function () {
+    return '<form id="fieldCheckModalForm">\n' +
+            '                    <div class="form-group" style="margin: 10px;">\n' +
+            '                        <div >\n' +
+            '                            <label for="checkMsg" class="control-label">可修改字段</label>\n' +
+            '                            <div id="field_info">\n' +
+            '                            </div>\n' +
+            '                            <label for="checkMsg" class="control-label">可修改附件</label>\n' +
+            '                            <div id="field_file">\n' +
+            '                            </div>\n' +
+            '                            <div class="form-group" style="text-align: center">\n' +
+            '                                <button type="button" class="btn btn-primary" onclick="EpChange.checkAll()">全选</button>\n' +
+            '                                <button type="button" class="btn btn-success" onclick="EpChange.unCheckAll()">反选</button>\n' +
+            '                            </div>\n' +
+            '                        </div>\n' +
+            '                    </div>\n' +
+            '                </form>';
+};
+EpChange.checkAll = function () {
+    $("#fieldCheckModalForm input[type=checkbox]").prop("checked", true);
+};
+EpChange.unCheckAll = function () {
+    $("#fieldCheckModalForm input[type=checkbox]").removeAttr("checked");
+};
 
 EpChange.export = function(){
     var queryData = {};

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

@@ -705,6 +705,7 @@ TalentInfoInfoDlg.talentTypeChange = function () {
             text = "近三年来晋工作时间";//$("#fst_work_time").length > 0 ? $("#fst_work_time").prev("label").html().replace(/近三年（首次）/, "近三年") : "";
             $("#come_in_jin").length > 0 ? $("#come_in_jin").css('display', 'table-row') : "";
             $("#come_in_jin_str").length > 0 ? $("#come_in_jin_str").css('display', 'table-cell') : "";
+            $("#come_in_jin_str").find("label").text("近三年来晋工作时间说明");
             break;
         case "2":
             TalentInfoInfoDlg.talentTypeOneTwo = true;
@@ -728,6 +729,7 @@ TalentInfoInfoDlg.talentTypeChange = function () {
             text = "近三年（首次）来晋工作时间";//$("#fst_work_time").length > 0 ? $("#fst_work_time").prev("label").html().replace(/近三年/, "近三年（首次）") : "";
             $("#come_in_jin").length > 0 ? $("#come_in_jin").css('display', 'table-row') : "";
             $("#come_in_jin_str").length > 0 ? $("#come_in_jin_str").css('display', 'table-cell') : "";
+            $("#come_in_jin_str").find("label").text("近三年（首次）来晋工作时间说明");
             break;
         case "3":
             TalentInfoInfoDlg.talentTypeFlag = true;