Kaynağa Gözat

提交一些修改

sandm 2 yıl önce
ebeveyn
işleme
096560d236

+ 10 - 12
app/admin/controller/DirectlyIdentify.php

@@ -26,11 +26,11 @@ class DirectlyIdentify extends AdminController{
 
         $excel = $this->request->file("file");
 
-        if (!isExcelFile($excel->getMime())){
-            $response_obj->code = 500;
-            $response_obj->msg = '不是正确的Excel文件,该文件类型为:'.$excel->getMime();
-            return \StrUtil::back($response_obj, "DirectlyIdentify.callBack");
-        }
+//        if (!isExcelFile($excel->getMime())){
+//            $response_obj->code = 500;
+//            $response_obj->msg = '不是正确的Excel文件,该文件类型为:'.$excel->getMime();
+//            return \StrUtil::back($response_obj, "DirectlyIdentify.callBack");
+//        }
 
         $savename = \think\facade\Filesystem::disk("public")->putFile("uploadexcel", $excel);
 
@@ -63,13 +63,11 @@ class DirectlyIdentify extends AdminController{
 
         $excel = $this->request->file("file");
 
-        $savename = \think\facade\Filesystem::disk("public")->putFile("uploadexcel", $excel);
-
-        if (!isExcelFile($excel->getMime())){
-            $response_obj->code = 500;
-            $response_obj->msg = '不是正确的Excel文件,该文件类型为:'.$excel->getMime();
-            return \StrUtil::back($response_obj, "DirectlyIdentify.callBack");
-        }
+//        if (!isExcelFile($excel->getMime())){
+//            $response_obj->code = 500;
+//            $response_obj->msg = '不是正确的Excel文件,该文件类型为:'.$excel->getMime();
+//            return \StrUtil::back($response_obj, "DirectlyIdentify.callBack");
+//        }
 
         $savename = \think\facade\Filesystem::disk("public")->putFile("uploadexcel", $excel);
 

+ 2 - 2
app/admin/controller/EnterpriseVerifyMgr.php

@@ -34,7 +34,7 @@ class EnterpriseVerifyMgr extends AdminController {
             if (!$params["companyId"]) {
                 return json(["msg" => "请选择审核单位"]);
             }
-            if (!$params["enterpriseTag"] && !$params["uniCode"]) {
+            if (!$params["enterpriseTag"] && !$params["uniCode"] && !$params["organizationTag"] && !$params["institutionTag"]) {
                 return json(["msg" => "请选择单位标签或填写例外企业统一信用代码,可同时设置"]);
             }
             if (EnterpriseVerifyMgrApi::chkExist($params["enterpriseTag"]) && $params["enterpriseTag"])
@@ -60,7 +60,7 @@ class EnterpriseVerifyMgr extends AdminController {
             if (!$params["companyId"]) {
                 return json(["msg" => "请选择审核单位"]);
             }
-            if (!$params["enterpriseTag"] && !$params["uniCode"]) {
+            if (!$params["enterpriseTag"] && !$params["uniCode"] && !$params["organizationTag"] && !$params["institutionTag"]) {
                 return json(["msg" => "请选择单位标签或填写例外企业统一信用代码,可同时设置"]);
             }
             if (EnterpriseVerifyMgrApi::chkExist($params["enterpriseTag"], $params["id"]) && $params["enterpriseTag"])

+ 21 - 2
app/admin/view/enterprise_verify_mgr/add.html

@@ -22,19 +22,38 @@
                     </div>
                     <div class="col-sm-6">
                         <div class="form-group">
-                            <label class="col-sm-3 control-label spacing">单位标签</label>
+                            <label class="col-sm-3 control-label spacing">企业标签</label>
                             <div class="col-sm-9 spacing">
                                 <select class="form-control" id="enterpriseTag" name="enterpriseTag">
                                 </select>
                             </div>
                         </div>
+                        <div class="form-group">
+                            <label class="col-sm-3 control-label spacing">机构标签</label>
+                            <div class="col-sm-9 spacing">
+                                <select class="form-control" id="organizationTag" name="organizationTag">
+                                </select>
+                            </div>
+                        </div>
+                    </div>
+                    <div class="col-sm-6">
+                        <div class="form-group">
+                            <label class="col-sm-3 control-label spacing">单位标签</label>
+                            <div class="col-sm-9 spacing">
+                                <select class="form-control" id="institutionTag" name="institutionTag">
+                                </select>
+                            </div>
+                        </div>
+                    </div>
+                    <div class="col-sm-6">
                         <div class="form-group">
                             <label class="col-sm-3 control-label spacing">备注</label>
                             <div class="col-sm-9 spacing">
-                                <input class="form-control" id="description" name="description">
+                                <input class="form-control" id="description" name="description" >
                             </div>
                         </div>
                     </div>
+
                 </div>
                 <div class="row btn-group-m-t">
                     <div class="col-sm-12" style="text-align: center;">

+ 20 - 2
app/admin/view/enterprise_verify_mgr/edit.html

@@ -23,12 +23,30 @@
                     </div>
                     <div class="col-sm-6">
                         <div class="form-group">
-                            <label class="col-sm-3 control-label spacing">单位标签</label>
+                            <label class="col-sm-3 control-label spacing">企业标签</label>
                             <div class="col-sm-9 spacing">
                                 <select class="form-control" id="enterpriseTag" name="enterpriseTag" selectVal="{$info.enterpriseTag}">
                                 </select>
                             </div>
-                        </div>   
+                        </div>
+                        <div class="form-group">
+                            <label class="col-sm-3 control-label spacing">机构标签</label>
+                            <div class="col-sm-9 spacing">
+                                <select class="form-control" id="organizationTag" name="organizationTag" selectVal="{$info.organizationTag}">
+                                </select>
+                            </div>
+                        </div>
+                    </div>
+                    <div class="col-sm-6">
+                        <div class="form-group">
+                            <label class="col-sm-3 control-label spacing">单位标签</label>
+                            <div class="col-sm-9 spacing">
+                                <select class="form-control" id="institutionTag" name="institutionTag" selectVal="{$info.institutionTag}">
+                                </select>
+                            </div>
+                        </div>
+                    </div>
+                    <div class="col-sm-6">
                         <div class="form-group">
                             <label class="col-sm-3 control-label spacing">备注</label>
                             <div class="col-sm-9 spacing">

+ 38 - 10
app/common/api/EnterpriseApi.php

@@ -31,11 +31,24 @@ class EnterpriseApi {
                 $whr[] = ["delete", "=", 0];
                 $list = \app\common\model\EnterpriseVerifyMgr::where($whr)->select()->toArray();
                 $talentType = []; //查找单位对应标签
+                $org = [];
+                $ins = [];
                 $uniCodes = []; //查找单位对应例外
                 foreach ($list as $k => $v) {
-                    array_push($talentType, $v['enterpriseTag']);
-                    $codes = explode(",", $v["uniCode"]);
-                    $uniCodes = array_merge($uniCodes, (array) $codes);
+                    if(!empty($v['enterpriseTag'])){
+                        array_push($talentType, $v['enterpriseTag']);
+                    }
+                    if(!empty($v['organizationTag'])){
+                        array_push($org, $v['organizationTag']);
+                    }
+                    if(!empty($v['institutionTag'])){
+                        array_push($ins, $v['institutionTag']);
+                    }
+                    if(!empty($v["uniCode"])){
+                        $codes = explode(",", $v["uniCode"]);
+                        $uniCodes = array_merge($uniCodes, (array) $codes);
+                    }
+
                 }
 
                 $_whr[] = ["uniCode", "<>", ""];
@@ -47,20 +60,29 @@ class EnterpriseApi {
                     $codes = explode(",", $_v["uniCode"]);
                     $expUniCodes = array_merge($expUniCodes, (array) $codes);
                 }
-                if ($talentType && $uniCodes) {
+
+                if (($talentType || $org || $ins) && $uniCodes) {
                     if ($expUniCodes) {
-                        $whereRaw = sprintf('(enterpriseTag in ("%s") and idCard not in ("%s")) or idCard in ("%s")', implode('","', $talentType), implode('","', $expUniCodes), implode('","', $uniCodes));
+                        $whereRaw = sprintf('(enterpriseTag in ("%s") and organizationTag in ("%s") and institutionTag in ("%s") and idCard not in ("%s")) or idCard in ("%s")', implode('","', $talentType), implode('","', $org), implode('","', $ins), implode('","', $expUniCodes), implode('","', $uniCodes));
                     } else {
-                        $whereRaw = sprintf('enterpriseTag in ("%s") or idCard in ("%s")', implode('","', $talentType), implode('","', $uniCodes));
+                        $whereRaw = sprintf('enterpriseTag in ("%s") and organizationTag in ("%s") and institutionTag in ("%s") or idCard in ("%s")', implode('","', $talentType), implode('","', $org), implode('","', $ins), implode('","', $uniCodes));
                     }
                 }
-                if ($talentType && !$uniCodes) {
-                    $where[] = ["enterpriseTag", "in", $talentType];
+                if (($talentType || $org || $ins) && !$uniCodes) {
+                    if($talentType){
+                        $where[] = ["enterpriseTag", "in", $talentType];
+                    }
+                    if($org){
+                        $where[] = ["organizationTag", "in", $org];
+                    }
+                    if($ins){
+                        $where[] = ["institutionTag", "in", $ins];
+                    }
                     if ($expUniCodes) {
                         $where[] = ["idCard", "not in", $expUniCodes];
                     }
                 }
-                if (!$talentType && $uniCodes) {
+                if (!$talentType && !$org && !$ins && $uniCodes) {
                     $where[] = ["idCard", "in", $uniCodes];
                 }
             }
@@ -114,13 +136,17 @@ class EnterpriseApi {
         if ($industryFieldNew) {
             $where[] = ["industryFieldNew", "=", "{$industryFieldNew}"];
         }
+
         if ($whereRaw) {
             $count = Enterprise::where($where)->whereRaw($whereRaw)->count();
         } else {
             $count = Enterprise::where($where)->count();
         }
+
         if ($count > 0) {
             $talentTypeList = DictApi::selectByParentCode("enterprise_tag");
+            $orgList = DictApi::selectByParentCode("organization_tag");
+            $insList = DictApi::selectByParentCode("institution_tag");
             $industryFieldNewList = DictApi::selectByParentCode("industry_field");
             $streetList = DictApi::selectByParentCode("street");
             //dd($talentTypeList);
@@ -131,7 +157,9 @@ class EnterpriseApi {
             }
             foreach ($list as $k => &$v) {
                 unset($v['password']);
-                $v['enterpriseTagName'] = $talentTypeList[$v['enterpriseTag']]; //此处旧字段为talentType,新字段为enterpriseTag,为防止数据污染与丢失,因而这样写
+                $v['enterpriseTagName'] = array_key_exists($v['enterpriseTag'],$talentTypeList) ? $talentTypeList[$v['enterpriseTag']] : ''; //此处旧字段为talentType,新字段为enterpriseTag,为防止数据污染与丢失,因而这样写
+                $v['organizationTagName'] = array_key_exists($v['organizationTag'],$orgList) ? $orgList[$v['organizationTag']] : '';
+                $v['institutionTagName'] = array_key_exists($v['institutionTag'],$orgList) ? $orgList[$v['institutionTag']] : '';
                 $v['industryFieldNewName'] = $industryFieldNewList[$v['industryFieldNew']];
                 $v['streetName'] = $streetList[$v['street']];
             }

+ 6 - 0
app/common/api/EnterpriseVerifyMgrApi.php

@@ -18,8 +18,12 @@ class EnterpriseVerifyMgrApi {
         $count = EnterpriseVerifyMgr::alias("m")->leftJoin("sys_company c", "c.id=m.companyId")->where($where)->count();
         $list = EnterpriseVerifyMgr::alias("m")->leftJoin("sys_company c", "c.id=m.companyId")->where($where)->limit($offset, $limit)->order("m.updateTime desc,m.createTime desc")->field("m.*,c.name as companyName")->select()->toArray();
         $enterpriseTags = DictApi::selectByParentCode("enterprise_tag");
+        $organizationTags = DictApi::selectByParentCode("organization_tag");
+        $institutionTags = DictApi::selectByParentCode("institution_tag");
         foreach ($list as $key => $item) {
             $list[$key]["enterpriseTagName"] = $enterpriseTags[$item["enterpriseTag"]];
+            $list[$key]["organizationTagName"] = $organizationTags[$item["organizationTag"]];
+            $list[$key]["institutionTagName"] = $institutionTags[$item["institutionTag"]];
         }
         return ["total" => $count, "rows" => $list];
     }
@@ -32,6 +36,8 @@ class EnterpriseVerifyMgrApi {
 
     public static function edit($params) {
         $data["enterpriseTag"] = $params["enterpriseTag"];
+        $data["organizationTag"] = $params["organizationTag"];
+        $data["institutionTag"] = $params["institutionTag"];
         $data["companyId"] = $params["companyId"];
         $data["description"] = $params["description"];
         $data["uniCode"] = implode(",", array_unique(array_filter(explode(",", $params["uniCode"]))));

+ 62 - 38
app/common/controller/Auth.php

@@ -36,6 +36,8 @@ class Auth extends BaseController {
                 'type' => intval($this->request['type']),
                 'agencyType' => intval($this->request['agencyType']),
                 'enterpriseTag' => \StrUtil::getRequestDecodeParam($this->request, 'enterpriseTag'),
+                'organizationTag' => \StrUtil::getRequestDecodeParam($this->request, 'organizationTag'),
+                'institutionTag' => \StrUtil::getRequestDecodeParam($this->request, 'institutionTag'),
                 'enterpriseType' => \StrUtil::getRequestDecodeParam($this->request, 'enterpriseType'),
                 'agentEmail' => \StrUtil::getRequestDecodeParam($this->request, 'agentEmail'),
                 'ephone' => \StrUtil::getRequestDecodeParam($this->request, 'ephone'),
@@ -54,52 +56,74 @@ class Auth extends BaseController {
                     $data['name'] = str_replace(')', ')', $data['name']);
                 }
                 $files = $this->request->file();
-                if ($special == 'qiye') {
-                    if ($data['type'] == 1) {
-                        if ($data["agencyType"] == 1) {
-                            validate(Enterprise::class)->batch(true)->scene('add')->check($data);
-                            if (!array_key_exists('domainImg', $files) || $files['domainImg'] == '') {
+                switch ($special){
+                    case 'qiye':
+                        if ($data['type'] == 1) {
+                            if ($data["agencyType"] == 1) {
+                                validate(Enterprise::class)->batch(true)->scene('add')->check($data);
+                                if (!array_key_exists('domainImg', $files) || $files['domainImg'] == '') {
+                                    $response_object->code = 500;
+                                    $response_object->msg = '行业领域佐证材料不能为空';
+                                    return \StrUtil::back($response_object, "Register.epCallBack");
+                                }
+                            } else {
+                                validate(Enterprise::class)->batch(true)->scene('add2')->check($data);
+                            }
+                            $checkTypes = ["guishang", "gaoxinjishu", "zhuanjingtexin"];
+                            if (in_array($data["enterpriseType"], $checkTypes) && (!array_key_exists('typeImg', $files) || $files['typeImg'] == '')) {
                                 $response_object->code = 500;
-                                $response_object->msg = '行业领域佐证材料不能为空';
+                                $response_object->msg = '规上、高新技术、专精特新企业需要上传佐证材料';
                                 return \StrUtil::back($response_object, "Register.epCallBack");
                             }
                         } else {
-                            validate(Enterprise::class)->batch(true)->scene('add2')->check($data);
+                            validate(Enterprise::class)->batch(true)->scene('jc_add')->check($data); //集成电路
                         }
-                        $checkTypes = ["guishang", "gaoxinjishu", "zhuanjingtexin"];
-                        if (in_array($data["enterpriseType"], $checkTypes) && (!array_key_exists('typeImg', $files) || $files['typeImg'] == '')) {
+                        if (!array_key_exists('imgurl', $files) || $files['imgurl'] == '') {
                             $response_object->code = 500;
-                            $response_object->msg = '规上、高新技术、专精特新企业需要上传佐证材料';
+                            $response_object->msg = '营业执照不能为空';
                             return \StrUtil::back($response_object, "Register.epCallBack");
                         }
-                    } else {
-                        validate(Enterprise::class)->batch(true)->scene('jc_add')->check($data); //集成电路
-                    }
-                    if (!array_key_exists('imgurl', $files) || $files['imgurl'] == '') {
-                        $response_object->code = 500;
-                        $response_object->msg = '营业执照不能为空';
-                        return \StrUtil::back($response_object, "Register.epCallBack");
-                    }
-                    if (!array_key_exists('bankImg', $files) || $files['bankImg'] == '') {
-                        $response_object->code = 500;
-                        $response_object->msg = '开户许可证不能为空';
-                        return \StrUtil::back($response_object, "Register.epCallBack");
-                    }
-                    if (!array_key_exists('beian', $files) || $files['beian'] == '') {
-                        $response_object->code = 500;
-                        $response_object->msg = '人才联络员备案表不能为空';
-                        return \StrUtil::back($response_object, "Register.epCallBack");
-                    }
-                    $data['special'] = 0;
-                } else {
-                    $data['type'] = 1;
-                    validate(Enterprise::class)->batch(true)->scene('sy_add')->check($data); //事业单位
-                    if (!array_key_exists('imgurl', $files) || $files['imgurl'] == '') {
-                        $response_object->code = 500;
-                        $response_object->msg = '法人代表证或批文不能为空';
-                        return \StrUtil::back($response_object, "Register.epCallBack");
-                    }
-                    $data['special'] = 1;
+                        if (!array_key_exists('bankImg', $files) || $files['bankImg'] == '') {
+                            $response_object->code = 500;
+                            $response_object->msg = '开户许可证不能为空';
+                            return \StrUtil::back($response_object, "Register.epCallBack");
+                        }
+                        if (!array_key_exists('beian', $files) || $files['beian'] == '') {
+                            $response_object->code = 500;
+                            $response_object->msg = '人才联络员备案表不能为空';
+                            return \StrUtil::back($response_object, "Register.epCallBack");
+                        }
+                        $data['special'] = 0;
+                        break;
+                    case 'minfei':
+
+                        if (!array_key_exists('imgurl', $files) || $files['imgurl'] == '') {
+                            $response_object->code = 500;
+                            $response_object->msg = '营业执照不能为空';
+                            return \StrUtil::back($response_object, "Register.epCallBack");
+                        }
+                        if (!array_key_exists('bankImg', $files) || $files['bankImg'] == '') {
+                            $response_object->code = 500;
+                            $response_object->msg = '开户许可证不能为空';
+                            return \StrUtil::back($response_object, "Register.epCallBack");
+                        }
+                        if (!array_key_exists('beian', $files) || $files['beian'] == '') {
+                            $response_object->code = 500;
+                            $response_object->msg = '人才联络员备案表不能为空';
+                            return \StrUtil::back($response_object, "Register.epCallBack");
+                        }
+                        $data['special'] = 3;
+                        break;
+                    case 'shiye':
+                        $data['type'] = 1;
+                        validate(Enterprise::class)->batch(true)->scene('sy_add')->check($data); //事业单位
+                        if (!array_key_exists('imgurl', $files) || $files['imgurl'] == '') {
+                            $response_object->code = 500;
+                            $response_object->msg = '法人代表证或批文不能为空';
+                            return \StrUtil::back($response_object, "Register.epCallBack");
+                        }
+                        $data['special'] = 1;
+                        break;
                 }
 
                 //检验验证码

+ 127 - 6
app/common/view/auth/register.html

@@ -46,7 +46,7 @@
                                         <input type="hidden" id="special" name="special" value="" />
                                         <ul class="nav nav-tabs">
                                             <li class="active" special="qiye" id="qiTab"><a data-toggle="tab" href="#tab-3" aria-expanded="true">企业用户</a></li>
-                                            <li class="" special="qiye" id="mfTab"><a data-toggle="tab" href="#tab-3" aria-expanded="true">民办非企业</a></li>
+                                            <li class="" special="minfei" id="mfTab"><a data-toggle="tab" href="#tab-5" aria-expanded="true">民办非企业</a></li>
                                             <li class="" special="shiye" id="shiyeTab" ><a data-toggle="tab" href="#tab-4"   aria-expanded="false">事业单位</a></li>
                                         </ul>
                                         <div class="tab-content">
@@ -189,11 +189,11 @@
                                                                         </td>
                                                                         <td>
                                                                             <label class="control-label spacing"><span style="color: red">*</span>行业领域佐证材料</label>
-                                                                            <img id="photoImg2" src="/static/img/yyzz.png" style="height: 60px;" onclick="$('#domainImg').click()" >
+                                                                            <img id="photoImg11" src="/static/img/yyzz.png" style="height: 60px;" onclick="$('#domainImg').click()" >
                                                                             <input style="display: none" autocomplete="off" type="file" class="form-control" id="domainImg" name="domainImg" />
                                                                         </td>
                                                                     </tr>
-                                                                    <tr>
+                                                                    <tr class="agencyType1">
                                                                         <td colspan="3">
                                                                             <p style="color: #333;width:100%;white-space:normal;word-wrap:break-word;word-break:break-all;">备注:晋江市现代产业体系“434”产业的行业分类,详见<a href="https://rencai.jucai.gov.cn/RXu0fYBPZwdXrgNzq9vIIRjaHXTu3mv3.docx">《国民经济行业分类(GB/T+4754-2017)》</a>,晋江市现代产业体系“1”产业的行业分类详见<a href="https://rencai.jucai.gov.cn/QKmKXmINDNeU1qKslkfaec47LXp7qCUO.docx" >《数字经济及其核心产业统计分类(2021)》</a></p>
                                                                         </td>
@@ -225,6 +225,119 @@
                                                     </div>
                                                 </div>
                                             </div>
+                                            <div id="tab-5" class="tab-pane active">
+                                                <div class="panel-body" >
+                                                    <div class="panel panel-default">
+                                                        <div class="panel-heading">基础信息</div>
+                                                        <div class="panel-body">
+                                                            <table style="width: 100%;border-collapse: collapse;" class="table table-bordered">
+                                                                <tr>
+                                                                    <td>
+                                                                        <div class="rowGroup">
+                                                                            <label class="control-label spacing td-label"><span style="color: red">*</span>账号</label>
+                                                                            <input type="text" autocomplete="off" class="form-control" id="mf_username" name="username" placeholder="请填写账号,用于登陆" />
+                                                                        </div>
+                                                                    </td>
+                                                                    <td>
+                                                                        <div class="rowGroup">
+                                                                            <label class="control-label spacing td-label"><span style="color: red">*</span>密码</label>
+                                                                            <input type="password" autocomplete="off" class="form-control" id="mf_password" name="password" placeholder="密码由字母、数字及特殊字符组成且字符个数为8-20"/>
+                                                                        </div>
+                                                                    </td>
+                                                                    <td>
+                                                                        <div class="rowGroup">
+                                                                            <label class="control-label spacing td-label"><span style="color: red">*</span>重复密码</label>
+                                                                            <input autocomplete="off" type="password" class="form-control" id="mf_re_password" name="re_password" placeholder="密码由字母、数字及特殊字符组成且字符个数为8-20"/>
+                                                                        </div>
+
+                                                                    </td>
+                                                                    <td rowspan="3" >
+                                                                        <label class="control-label spacing"><span class="text-danger">*</span>营业执照</label>
+                                                                        <img id="mf_photoImg" src="/static/img/yyzz.png" style="height: 60px;" onclick="$('#mf_imgurl').click()" >
+                                                                        <input style="display: none" autocomplete="off" type="file" class="form-control" id="mf_imgurl" name="imgurl" />
+                                                                    </td>
+                                                                </tr>
+                                                                <tr>
+                                                                    <td>
+                                                                        <div class="rowGroup">
+                                                                            <label class=" control-label spacing td-label"><span style="color: red">*</span>企业名称</label>
+                                                                            <input autocomplete="off" type="text" class="form-control" id="mf_name" name="name" />
+                                                                        </div>
+                                                                    </td>
+                                                                    <td>
+                                                                        <div class="rowGroup">
+                                                                            <label class=" control-label spacing td-label"><span style="color: red">*</span>统一社会信用代码</label>
+                                                                            <input autocomplete="off" type="text" class="form-control" id="mf_idCard" name="idCard" />
+                                                                        </div>
+                                                                    </td>
+                                                                    <td>
+                                                                        <div class="rowGroup">
+                                                                            <label class=" control-label spacing td-label"><span style="color: red">*</span>法人代表</label>
+                                                                            <input autocomplete="off" type="text" class="form-control" id="mf_legal" name="legal" />
+                                                                        </div>
+                                                                    </td>
+                                                                </tr>
+                                                                <tr>
+                                                                    <td>
+                                                                        <div class="rowGroup">
+                                                                            <label class=" control-label spacing td-label"><span style="color: red">*</span>所属街道</label>
+                                                                            <select class="form-control" id="mf_street" name="street"></select>
+                                                                        </div>
+                                                                    </td>
+                                                                    <td>
+                                                                        <div class="rowGroup">
+                                                                            <label class=" control-label spacing td-label"><span style="color: red">*</span>企业地址</label>
+                                                                            <input autocomplete="off" type="text" class="form-control" id="mf_address" name="address" />
+                                                                        </div>
+                                                                    </td>
+                                                                    <td>
+                                                                        <div class="rowGroup">
+                                                                            <label class=" control-label spacing td-label"><span style="color: red">*</span>企业电话</label>
+                                                                            <input autocomplete="off" type="text" class="form-control" id="mf_ephone" name="ephone" placeholder="固话格式0595xxxx" />
+                                                                        </div>
+                                                                    </td>
+                                                                </tr>
+                                                                <tr>
+                                                                    <td>
+                                                                        <div class="rowGroup">
+                                                                            <label class=" control-label spacing td-label"><span style="color: red">*</span>企业银行账号</label>
+                                                                            <input autocomplete="off" type="text" class="form-control" id="mf_bankCard" name="bankCard" />
+                                                                        </div>
+                                                                    </td>
+                                                                    <td>
+                                                                        <div class="rowGroup">
+                                                                            <label class=" control-label spacing td-label"><span style="color: red">*</span>企业开户银行</label>
+                                                                            <input autocomplete="off" type="text" class="form-control" id="mf_bank" name="bank" />
+                                                                        </div>
+                                                                    </td>
+                                                                    <td>
+                                                                        <div class="rowGroup">
+                                                                            <label class=" control-label spacing td-label"><span style="color: red">*</span>企业开户银行网点</label>
+                                                                            <input autocomplete="off" type="text" class="form-control" id="mf_bankNetwork" name="bankNetwork" placeholder="XX银行XX支行/分行/分理处" />
+                                                                        </div>
+                                                                    </td>
+                                                                    <td>
+                                                                        <label class="control-label spacing"><span class="text-danger">*</span>开户许可证</label>
+                                                                        <img id="photoImg2" src="/static/img/yyzz.png" style="height: 60px;" onclick="$('#mf_bankImg').click()" >
+                                                                        <input style="display: none" autocomplete="off" type="file" class="form-control" id="mf_bankImg" name="bankImg" />
+                                                                    </td>
+                                                                </tr>
+                                                                <tr>
+                                                                    <td colspan="4">
+                                                                        <div class="rowGroup">
+                                                                            <label class="control-label spacing td-label"><span style="color: red">*</span>机构标签</label>
+                                                                            <select class="form-control" id="organizationTag" name="organizationTag">
+                                                                            </select>
+                                                                        </div>
+                                                                    </td>
+
+                                                                </tr>
+                                                            </table>
+                                                        </div>
+
+                                                    </div>
+                                                </div>
+                                            </div>
                                             <div id="tab-4" class="tab-pane">
                                                 <div class="panel-heading">基础信息</div>
                                                 <div class="panel-body">
@@ -320,11 +433,20 @@
                                                                 <input style="display: none" autocomplete="off" type="file" class="form-control" id="sy_bankImg" name="bankImg" />
                                                             </td>
                                                         </tr>
+                                                        <tr>
+                                                            <td colspan="4">
+                                                                <div class="rowGroup">
+                                                                    <label class="control-label spacing td-label"><span style="color: red">*</span>单位标签</label>
+                                                                    <select class="form-control" id="institutionTag" name="institutionTag">
+                                                                    </select>
+                                                                </div>
+                                                            </td>
 
+                                                        </tr>
                                                     </table>
                                                 </div>
-
                                             </div>
+
                                             <div class="panel-heading">人才联络员信息</div>
                                             <div class="panel-body">
                                                 <table style="width: 100%;border-collapse: collapse;" class="table table-bordered">
@@ -363,8 +485,6 @@
                                                         </td>
                                                     </tr>
                                                 </table>
-
-
                                             </div>
                                         </div>
                                     </form>
@@ -459,6 +579,7 @@
                                 </div>
                             </div>
                         </div>
+
                     </div>
                 </div>
             </div>

+ 233 - 146
public/static/js/register.js

@@ -129,31 +129,53 @@ Register.enterpriseUserRegister = function () {
         live: 'enabled',
         message: '该字段不能为空'
     });
-    if (special == "qiye") {
-        $("#tab-3 .form-control").removeAttr("disabled");
-        $("#tab-4 .form-control").attr("disabled", "disabled");
-        $('#ep_form').bootstrapValidator("addField", "idCard", {validators: {notEmpty: {message: '统一社会信用代码不能为空'}}});
-        $('#ep_form').bootstrapValidator("addField", "legal", {validators: {notEmpty: {message: '法人代表不能为空'}, regexp: {regexp: /^[\u4e00-\u9fa5]{1,50}$/, message: "法人代表只允许中文"}}});
-        $('#ep_form').bootstrapValidator("addField", "bankCard", {validators: {notEmpty: {message: '开户银行账号不能为空'}}});
-        $('#ep_form').bootstrapValidator("addField", "bankNetwork", {validators: {notEmpty: {message: '开户银行网点不能为空'},
-                regexp: {
-                    regexp: /^[\u4e00-\u9fa5]*银行[\u4e00-\u9fa5]*$/,
-                    message: "开户银行网点格式不正确"
-                }}});
-        $('#ep_form').bootstrapValidator("addField", "bank", {validators: {notEmpty: {message: '开户银行不能为空'}, regexp: {
-                    regexp: /^[\u4e00-\u9fa5]*$/,
-                    message: "开户银行必须为中文"
-                }}});
-        var prefix = '企业';
-    } else {
-        $("#tab-4 .form-control").removeAttr("disabled");
-        $("#tab-3 .form-control").attr("disabled", "disabled");
-        $('#ep_form').bootstrapValidator("removeField", "idCard");
-        $('#ep_form').bootstrapValidator("removeField", "legal");
-        $('#ep_form').bootstrapValidator("removeField", "bankCard");
-        $('#ep_form').bootstrapValidator("removeField", "bankNetwork");
-        $('#ep_form').bootstrapValidator("removeField", "bank");
-        var prefix = '单位';
+    switch (special) {
+        case 'qiye':
+            $("#tab-3 .form-control").removeAttr("disabled");
+            $("#tab-4 .form-control").attr("disabled", "disabled");
+            $("#tab-5 .form-control").attr("disabled", "disabled");
+            $('#ep_form').bootstrapValidator("addField", "idCard", {validators: {notEmpty: {message: '统一社会信用代码不能为空'}}});
+            $('#ep_form').bootstrapValidator("addField", "legal", {validators: {notEmpty: {message: '法人代表不能为空'}, regexp: {regexp: /^[\u4e00-\u9fa5]{1,50}$/, message: "法人代表只允许中文"}}});
+            $('#ep_form').bootstrapValidator("addField", "bankCard", {validators: {notEmpty: {message: '开户银行账号不能为空'}}});
+            $('#ep_form').bootstrapValidator("addField", "bankNetwork", {validators: {notEmpty: {message: '开户银行网点不能为空'},
+                    regexp: {
+                        regexp: /^[\u4e00-\u9fa5]*银行[\u4e00-\u9fa5]*$/,
+                        message: "开户银行网点格式不正确"
+                    }}});
+            $('#ep_form').bootstrapValidator("addField", "bank", {validators: {notEmpty: {message: '开户银行不能为空'}, regexp: {
+                        regexp: /^[\u4e00-\u9fa5]*$/,
+                        message: "开户银行必须为中文"
+                    }}});
+            var prefix = '企业';
+            break;
+        case 'minfei':
+            $("#tab-5 .form-control").removeAttr("disabled");
+            $("#tab-4 .form-control").attr("disabled", "disabled");
+            $("#tab-3 .form-control").attr("disabled", "disabled");
+            $('#ep_form').bootstrapValidator("addField", "idCard", {validators: {notEmpty: {message: '统一社会信用代码不能为空'}}});
+            $('#ep_form').bootstrapValidator("addField", "legal", {validators: {notEmpty: {message: '法人代表不能为空'}, regexp: {regexp: /^[\u4e00-\u9fa5]{1,50}$/, message: "法人代表只允许中文"}}});
+            $('#ep_form').bootstrapValidator("addField", "bankCard", {validators: {notEmpty: {message: '开户银行账号不能为空'}}});
+            $('#ep_form').bootstrapValidator("addField", "bankNetwork", {validators: {notEmpty: {message: '开户银行网点不能为空'},
+                    regexp: {
+                        regexp: /^[\u4e00-\u9fa5]*银行[\u4e00-\u9fa5]*$/,
+                        message: "开户银行网点格式不正确"
+                    }}});
+            $('#ep_form').bootstrapValidator("addField", "bank", {validators: {notEmpty: {message: '开户银行不能为空'}, regexp: {
+                        regexp: /^[\u4e00-\u9fa5]*$/,
+                        message: "开户银行必须为中文"
+                    }}});
+            var prefix = '企业';
+            break;
+        case 'shiye':
+            $("#tab-4 .form-control").removeAttr("disabled");
+            $("#tab-3 .form-control").attr("disabled", "disabled");
+            $('#ep_form').bootstrapValidator("removeField", "idCard");
+            $('#ep_form').bootstrapValidator("removeField", "legal");
+            $('#ep_form').bootstrapValidator("removeField", "bankCard");
+            $('#ep_form').bootstrapValidator("removeField", "bankNetwork");
+            $('#ep_form').bootstrapValidator("removeField", "bank");
+            var prefix = '单位';
+            break;
     }
 
 
@@ -165,24 +187,44 @@ Register.enterpriseUserRegister = function () {
 
     isDis = $("#type").prop("disabled");
     var source = $("#source").val();
-    if (special == "qiye") {
-        var username = $("#username").val();
-        var password = $("#password").val();
-        var rePassword = $("#re_password").val();
-        var name = $("#name").val();
-        var idCard = $("#idCard").val();
-        var legal = $("#legal").val();
-        var street = $("#street").val();
-        var address = $("#address").val();
-        var ephone = $("#ephone").val();
-    } else {
-        var username = $("#sy_username").val();
-        var password = $("#sy_password").val();
-        var rePassword = $("#sy_re_password").val();
-        var name = $("#sy_name").val();
-        var street = $("#sy_street").val();
-        var address = $("#sy_address").val();
-        var ephone = $("#sy_ephone").val();
+    switch (special) {
+        case 'qiye':
+            var username = $("#username").val();
+            var password = $("#password").val();
+            var rePassword = $("#re_password").val();
+            var name = $("#name").val();
+            var idCard = $("#idCard").val();
+            var legal = $("#legal").val();
+            var street = $("#street").val();
+            var address = $("#address").val();
+            var ephone = $("#ephone").val();
+            var bankCard = $("#bankCard").val();
+            var bank = $("#bank").val();
+            var bankNetwork = $("#bankNetwork").val();
+            break;
+        case 'minfei':
+            var username = $("#mf_username").val();
+            var password = $("#mf_password").val();
+            var rePassword = $("#mf_re_password").val();
+            var name = $("#mf_name").val();
+            var idCard = $("#mf_idCard").val();
+            var legal = $("#mf_legal").val();
+            var street = $("#mf_street").val();
+            var address = $("#mf_address").val();
+            var ephone = $("#mf_ephone").val();
+            var bankCard = $("#mf_bankCard").val();
+            var bank = $("#mf_bank").val();
+            var bankNetwork = $("#mf_bankNetwork").val();
+            break;
+        case 'shiye':
+            var username = $("#sy_username").val();
+            var password = $("#sy_password").val();
+            var rePassword = $("#sy_re_password").val();
+            var name = $("#sy_name").val();
+            var street = $("#sy_street").val();
+            var address = $("#sy_address").val();
+            var ephone = $("#sy_ephone").val();
+            break;
     }
 
     var agentName = $("#agentName").val();
@@ -199,9 +241,7 @@ Register.enterpriseUserRegister = function () {
     var enterpriseType = $("#enterpriseType").val();
     var industryFieldNew = $("#industryFieldNew").val();
     var industryFieldOld = $("#industryFieldOld").val();
-    var bankCard = $("#bankCard").val();
-    var bank = $("#bank").val();
-    var bankNetwork = $("#bankNetwork").val();
+
     if (username == null || username == '') {
         Feng.info("请填写账号!");
         return;
@@ -255,122 +295,166 @@ Register.enterpriseUserRegister = function () {
         return;
     }
 
-    if (special == "qiye") {
-        if ((idCard == null || idCard == '')) {
-            Feng.info("请填写统一社会信用代码!");
-            return;
-        }
-        if (idCard.length > 40) {
-            Feng.info("统一社会信用代码最多40个字符!");
-            return;
-        }
-
-        if (legal == null || legal == '') {
-            Feng.info("请填写法人代表!");
-            return;
-        }
-
-        if (!/^[\u4e00-\u9fa5]{1,50}$/.test(legal)) {
-            Feng.info("法人代表只能输入中文 !");
-            return;
-        }
-
-        if (bankCard == null || bankCard == '') {
-            Feng.info("请填写企业银行账号!");
-            return;
-        }
-        if (bank == null || bank == '') {
-            Feng.info("请填写企业开户银行!");
-            return;
-        }
-        if (bankNetwork == null || bankNetwork == '') {
-            Feng.info("请填写企业开户银行网点");
-            return;
-        }
-
-        var x = document.getElementById("imgurl").value;
-        if (x == "") {
-            Feng.info("请上传营业执照照片!");
-            return;
-        }
-        if (!Feng.chkFileInvalid(document.getElementById("imgurl").files[0], 5, 10, ["image/jpeg", "image/gif", "image/png", "image/jpg", "application/pdf"], "营业执照只允许上传PDF或图片")) {
-            return;
-        }
-
-        var xx = document.getElementById("bankImg").value;
-        if (xx == "") {
-            Feng.info("请上传开户银行许可证!");
-            return;
-        }
-        if (!Feng.chkFileInvalid(document.getElementById("bankImg").files[0], 5, 10, ["image/jpeg", "image/gif", "image/png", "image/jpg", "application/pdf"], "开户银行许可证只允许上传PDF或图片")) {
-            return;
-        }
-
-        if (type == null || type == '') {
-            Feng.info("请选择申报类型!");
-            return;
-        }
+    switch (special) {
+        case 'qiye':
+            if ((idCard == null || idCard == '')) {
+                Feng.info("请填写统一社会信用代码!");
+                return;
+            }
+            if (idCard.length > 40) {
+                Feng.info("统一社会信用代码最多40个字符!");
+                return;
+            }
+            if (legal == null || legal == '') {
+                Feng.info("请填写法人代表!");
+                return;
+            }
+            if (!/^[\u4e00-\u9fa5]{1,50}$/.test(legal)) {
+                Feng.info("法人代表只能输入中文 !");
+                return;
+            }
+            if (bankCard == null || bankCard == '') {
+                Feng.info("请填写企业银行账号!");
+                return;
+            }
+            if (bank == null || bank == '') {
+                Feng.info("请填写企业开户银行!");
+                return;
+            }
+            if (bankNetwork == null || bankNetwork == '') {
+                Feng.info("请填写企业开户银行网点");
+                return;
+            }
+            var x = document.getElementById("imgurl").value;
+            if (x == "") {
+                Feng.info("请上传营业执照照片!");
+                return;
+            }
+            if (!Feng.chkFileInvalid(document.getElementById("imgurl").files[0], 5, 10, ["image/jpeg", "image/gif", "image/png", "image/jpg", "application/pdf"], "营业执照只允许上传PDF或图片")) {
+                return;
+            }
+            var xx = document.getElementById("bankImg").value;
+            if (xx == "") {
+                Feng.info("请上传开户银行许可证!");
+                return;
+            }
+            if (!Feng.chkFileInvalid(document.getElementById("bankImg").files[0], 5, 10, ["image/jpeg", "image/gif", "image/png", "image/jpg", "application/pdf"], "开户银行许可证只允许上传PDF或图片")) {
+                return;
+            }
 
-        if (type == 1) {
-            if (agencyType == null || agencyType == '') {
-                Feng.info("请选择机构类型");
+            if (type == null || type == '') {
+                Feng.info("请选择申报类型!");
                 return;
             }
-            switch (agencyType) {
-                case "1":
-                    if (industryFieldNew == null || industryFieldNew == '') {
-                        Feng.info("请选择产业领域");
-                        return;
-                    }
-                    if (industryFieldOld == null || industryFieldOld == '') {
-                        Feng.info("请选择行业领域");
-                        return;
-                    }
-                    var xxx = document.getElementById("domainImg").value;
-                    if (xxx == "") {
-                        Feng.info("请上传行业领域佐证材料!");
+            if (type == 1) {
+                if (agencyType == null || agencyType == '') {
+                    Feng.info("请选择机构类型");
+                    return;
+                }
+                switch (agencyType) {
+                    case "1":
+                        if (industryFieldNew == null || industryFieldNew == '') {
+                            Feng.info("请选择产业领域");
+                            return;
+                        }
+                        if (industryFieldOld == null || industryFieldOld == '') {
+                            Feng.info("请选择行业领域");
+                            return;
+                        }
+                        var xxx = document.getElementById("domainImg").value;
+                        if (xxx == "") {
+                            Feng.info("请上传行业领域佐证材料!");
+                            return;
+                        }
+                        if (!Feng.chkFileInvalid(document.getElementById("domainImg").files[0], 5, 10, ["image/jpeg", "image/gif", "image/png", "image/jpg", "application/pdf"], "行业领域佐证材料只允许上传PDF或图片")) {
+                            return;
+                        }
+                        break;
+                    case "2":
+                        break;
+                }
+                if (enterpriseTag == null || enterpriseTag == '') {
+                    Feng.info("请选择企业标签!");
+                    return;
+                }
+                if (enterpriseType == null || enterpriseType == '') {
+                    Feng.info("请选择企业类型!");
+                    return;
+                }
+                var checkType = ["guishang", "gaoxinjishu", "zhuanjingtexin"];
+                if (checkType.indexOf(enterpriseType) > -1) {
+                    var typeImg = document.getElementById("typeImg").value;
+                    if (typeImg == "") {
+                        Feng.info("规上、高新技术、专精特新企业需要上传佐证材料!");
                         return;
                     }
-                    if (!Feng.chkFileInvalid(document.getElementById("domainImg").files[0], 5, 10, ["image/jpeg", "image/gif", "image/png", "image/jpg", "application/pdf"], "行业领域佐证材料只允许上传PDF或图片")) {
+                    if (!Feng.chkFileInvalid(document.getElementById("typeImg").files[0], 5, 10, ["image/jpeg", "image/gif", "image/png", "image/jpg", "application/pdf"], "规上、高新技术、专精特新企业佐证材料只允许上传PDF或图片")) {
                         return;
                     }
-                    break;
-                case "2":
-                    break;
+                }
             }
-            if (enterpriseTag == null || enterpriseTag == '') {
-                Feng.info("请选择企业标签!");
+            break;
+        case 'minfei':
+            if ((idCard == null || idCard == '')) {
+                Feng.info("请填写统一社会信用代码!");
                 return;
             }
-            if (enterpriseType == null || enterpriseType == '') {
-                Feng.info("请选择企业类型!");
+            if (idCard.length > 40) {
+                Feng.info("统一社会信用代码最多40个字符!");
                 return;
             }
-            var checkType = ["guishang", "gaoxinjishu", "zhuanjingtexin"];
-            if (checkType.indexOf(enterpriseType) > -1) {
-                var typeImg = document.getElementById("typeImg").value;
-                if (typeImg == "") {
-                    Feng.info("规上、高新技术、专精特新企业需要上传佐证材料!");
-                    return;
-                }
-                if (!Feng.chkFileInvalid(document.getElementById("typeImg").files[0], 5, 10, ["image/jpeg", "image/gif", "image/png", "image/jpg", "application/pdf"], "规上、高新技术、专精特新企业佐证材料只允许上传PDF或图片")) {
-                    return;
-                }
+            if (legal == null || legal == '') {
+                Feng.info("请填写法人代表!");
+                return;
+            }
+            if (!/^[\u4e00-\u9fa5]{1,50}$/.test(legal)) {
+                Feng.info("法人代表只能输入中文 !");
+                return;
+            }
+            if (bankCard == null || bankCard == '') {
+                Feng.info("请填写机构银行账号!");
+                return;
+            }
+            if (bank == null || bank == '') {
+                Feng.info("请填写机构开户银行!");
+                return;
+            }
+            if (bankNetwork == null || bankNetwork == '') {
+                Feng.info("请填写机构开户银行网点");
+                return;
+            }
+            var x = document.getElementById("mf_imgurl").value;
+            if (x == "") {
+                Feng.info("请上传营业执照照片!");
+                return;
+            }
+            if (!Feng.chkFileInvalid(document.getElementById("mf_imgurl").files[0], 5, 10, ["image/jpeg", "image/gif", "image/png", "image/jpg", "application/pdf"], "营业执照只允许上传PDF或图片")) {
+                return;
+            }
+            var xx = document.getElementById("mf_bankImg").value;
+            if (xx == "") {
+                Feng.info("请上传开户银行许可证!");
+                return;
+            }
+            if (!Feng.chkFileInvalid(document.getElementById("mf_bankImg").files[0], 5, 10, ["image/jpeg", "image/gif", "image/png", "image/jpg", "application/pdf"], "开户银行许可证只允许上传PDF或图片")) {
+                return;
             }
-        }
 
-    } else {
-        var x = document.getElementById("sy_imgurl").value;
-        if (x == "") {
-            Feng.info("请上传法人证或批文!");
-            return;
-        }
-        if (!Feng.chkFileInvalid(document.getElementById("sy_imgurl").files[0], 5, 10, ["image/jpeg", "image/gif", "image/png", "image/jpg", "application/pdf"], "法人证或批文只允许上传PDF或图片")) {
-            return;
-        }
+            break;
+        case 'shiye':
+            var x = document.getElementById("sy_imgurl").value;
+            if (x == "") {
+                Feng.info("请上传法人证或批文!");
+                return;
+            }
+            if (!Feng.chkFileInvalid(document.getElementById("sy_imgurl").files[0], 5, 10, ["image/jpeg", "image/gif", "image/png", "image/jpg", "application/pdf"], "法人证或批文只允许上传PDF或图片")) {
+                return;
+            }
+            break;
     }
 
 
+
     if (agentName == null || agentName == '') {
         Feng.info("请填写人才联络员!");
         return;
@@ -688,12 +772,15 @@ $(function () {
     var arr = [
         {"name": "street", "code": "street"},
         {"name": "enterpriseTag", "code": "enterprise_tag"},
+        {"name": "organizationTag", "code": "organization_tag"},
+        {"name": "institutionTag", "code": "institution_tag"},
         {"name": "industryFieldNew", "code": "industry_field"},
         {"name": "enterpriseType", "code": "enterprise_type"},
         {"name": "sy_street", "code": "street"},
+        {"name": "mf_street", "code": "street"},
         {"name": "agencyType", "code": "agency_type"}];
     Feng.findChildDictBatch(JSON.stringify(arr));
-    $("#imgurl,#sy_imgurl,#bankImg,#sy_bankImg,#beian,#domainImg,#typeImg").change(function (e) {
+    $("#imgurl,#sy_imgurl,#mf_imgurl,#bankImg,#mf_bankImg,#sy_bankImg,#beian,#domainImg,#typeImg").change(function (e) {
         var that = this;
         if (!Feng.chkFileInvalid(that.files[0], 5, 10)) {
             return;

+ 3 - 1
public/static/modular/system/enterprisetypeProperties/enterprisetypeProperties.js

@@ -15,7 +15,9 @@ EnterprisetypeProperties.initColumn = function () {
     return [
         {field: 'selectItem', radio: true},
         {title: '审核单位', field: 'companyName', visible: true, align: 'center', valign: 'middle'},
-        {title: '单位标签', field: 'enterpriseTagName', visible: true, align: 'center', valign: 'middle'},
+        {title: '企业标签', field: 'enterpriseTagName', visible: true, align: 'center', valign: 'middle'},
+        {title: '机构标签', field: 'organizationTagName', visible: true, align: 'center', valign: 'middle'},
+        {title: '单位标签', field: 'institutionTagName', visible: true, align: 'center', valign: 'middle'},
         {title: '例外设置', field: 'uniCode', visible: true, align: 'center', valign: 'middle'},
         {title: '备注', field: 'description', visible: true, align: 'center', valign: 'middle'},
     ];

+ 16 - 0
public/static/modular/system/enterprisetypeProperties/enterprisetypeProperties_info.js

@@ -56,6 +56,8 @@ EnterprisetypePropertiesInfoDlg.collectData = function () {
     this
             .set('id')
             .set('enterpriseTag')
+            .set('organizationTag')
+            .set('institutionTag')
             .set('uniCode')
             .set('description');
     var companys = $("#companyId").val();
@@ -145,6 +147,20 @@ $(function () {
         "type": "GET",
         "url": "/admin/dict/findChildDictByCode?code=enterprise_tag"
     });
+    Feng.addAjaxSelect({
+        "id": "organizationTag",
+        "displayCode": "code",
+        "displayName": "name",
+        "type": "GET",
+        "url": "/admin/dict/findChildDictByCode?code=organization_tag"
+    });
+    Feng.addAjaxSelect({
+        "id": "institutionTag",
+        "displayCode": "code",
+        "displayName": "name",
+        "type": "GET",
+        "url": "/admin/dict/findChildDictByCode?code=institution_tag"
+    });
     Feng.addAjaxSelect({
         "id": "companyId",
         "displayCode": "id",