机构类型

app/admin/controller/EnterpriseChangeRecord.php

@@ -224,6 +224,15 @@ class EnterpriseChangeRecord extends AdminController {
         $ecr["special"] = $ep->special;
         switch ($ep->special) {
             case 0:
+                if (\StrUtil::isNotEmpAndNull($ecr['oldAgencyType']) || \StrUtil::isNotEmpAndNull($ecr['newAgencyType'])) {
+                    $agencyTypeList = DictApi::selectByParentCode("agency_type");
+                    if (\StrUtil::isNotEmpAndNull($ecr['oldAgencyType'])) {
+                        $ecr['oldAgencyTypeName'] = $agencyTypeList[$ecr['oldAgencyType']];
+                    }
+                    if (\StrUtil::isNotEmpAndNull($ecr['newAgencyType'])) {
+                        $ecr['newAgencyTypeName'] = $agencyTypeList[$ecr['newAgencyType']];
+                    }
+                }
                 if (\StrUtil::isNotEmpAndNull($ecr['oldEnterpriseTag']) || \StrUtil::isNotEmpAndNull($ecr['newEnterpriseTag'])) {
                     $talentTypeList = DictApi::selectByParentCode("enterprise_tag");
                     if (\StrUtil::isNotEmpAndNull($ecr['oldEnterpriseTag'])) {
@@ -279,7 +288,7 @@ class EnterpriseChangeRecord extends AdminController {
         if ($ep->special == 0) {
             if ($ep->type == 1) {
                 $fields = ["Name" => "企业名称", "IdCard" => "统一社会信用代码", "Legal" => "法人代表", "Address" => "企业地址", "Street" => "所属街道", "Ephone" => "企业电话", "BankCard" => "企业银行账号", "Bank" => "企业开户银行", "BankNetwork" => "企业开户银行网点",
-                    "IndustryFieldNew" => "产业领域", "IndustryFieldOld" => "行业领域", "EnterpriseTag" => "企业标签", "EnterpriseType" => "企业类型",
+                    "AgencyType" => "机构类型", "IndustryFieldNew" => "产业领域", "IndustryFieldOld" => "行业领域", "EnterpriseTag" => "企业标签", "EnterpriseType" => "企业类型",
                     "AgentName" => "人才联络员姓名", "AgentPhone" => "人才联络员电话", "AgentEmail" => "人才联络员邮箱"];
                 $files = ["newImgurl" => "企业营业执照", "newBankImg" => "开户许可证", "newDomainImg" => "行业领域佐证材料", "newBeian" => "人才联络员信息备案表", "newTypeImg" => "规上、高新技术、专精特新企业上传材料"];
             } else {

app/admin/view/enterprise_change_record/goto_enterprise_change_detail_page.html

@@ -195,7 +195,7 @@
                             <td colspan="5">
                                 申报类型：
                                 {switch name="ecr.type"}
-                                {case value="1"}晋江市现代产业体系人才{/case}
+                                {case value="1"}晋江市现代产业体系人才{if condition="$ecr['newAgencyType'] neq $ecr['oldAgencyType']"}（<span class='old'>{$ecr.oldAgencyTypeName}</span> -> {$ecr.newAgencyTypeName}）{else/}（{$ecr.newAgencyTypeName}）{/if}{/case}
                                 {case value="2"}集成电路优秀人才{/case}
                                 {/switch}
                             </td>

app/common/controller/Auth.php

@@ -300,14 +300,45 @@ class Auth extends BaseController {
                     if ($ep->type == 1) {
                         if ($ep->agencyType == 1) {
                             validate(\app\common\validate\Enterprise::class)->batch(true)->scene('change')->check($data);
+                            if (!$data["domainImg"] && !$ep->domainImg) {
+                                $response_object->code = 500;
+                                $response_object->msg = "行业领域佐证材料不能为空";
+                                return \StrUtil::back($response_object, "Register.epCallBack");
+                            }
                         } else {
                             validate(\app\common\validate\Enterprise::class)->batch(true)->scene('change2')->check($data);
                         }
+                        $checkTypes = ["guishang", "gaoxinjishu", "zhuanjingtexin"];
+                        if (in_array($data["enterpriseType"], $checkTypes) && (!$data["typeImg"] && !$ep->typeImg)) {
+                            $response_object->code = 500;
+                            $response_object->msg = '规上、高新技术、专精特新企业需要上传佐证材料';
+                            return \StrUtil::back($response_object, "Register.epCallBack");
+                        }
                     } else {
                         validate(\app\common\validate\Enterprise::class)->batch(true)->scene('jc_change')->check($data);
                     }
+                    if (!$data["imgurl"] && !$ep->imgurl) {
+                        $response_object->code = 500;
+                        $response_object->msg = '营业执照不能为空';
+                        return \StrUtil::back($response_object, "Register.epCallBack");
+                    }
+                    if (!$data["bankImg"] && !$ep->bankImg) {
+                        $response_object->code = 500;
+                        $response_object->msg = '开户许可证不能为空';
+                        return \StrUtil::back($response_object, "Register.epCallBack");
+                    }
+                    if (!$data["beian"] && !$ep->beian) {
+                        $response_object->code = 500;
+                        $response_object->msg = '人才联络员备案表不能为空';
+                        return \StrUtil::back($response_object, "Register.epCallBack");
+                    }
                 } else {
                     validate(\app\common\validate\Enterprise::class)->batch(true)->scene('sy_change')->check($data);
+                    if (!$data["imgurl"] && !$ep->imgurl) {
+                        $response_object->code = 500;
+                        $response_object->msg = '法人代表证或批文不能为空';
+                        return \StrUtil::back($response_object, "Register.epCallBack");
+                    }
                 }
                 unset($data["agentPhone"]);
                 $data['checkState'] = 1;

app/common/view/auth/enterprise_edit.html

@@ -139,7 +139,7 @@
                                     <div class="row">
                                         <div class="rowGroup" >
                                             <label class="col-sm-2 control-label spacing"><span class="text-danger">*</span>申报类型</label>
-                                            <div class="col-sm-4 spacing">
+                                            <div class="col-sm-3 spacing">
                                                 <select class="form-control" id="type" name="type" onchange="Register.typeChange()" value="{$ep.type}">
                                                     <option value="">请选择</option>
                                                     <option value="1">晋江市现代产业体系人才</option>
@@ -147,12 +147,19 @@
                                                     <!--                          <option value="3">海峡计划团队</option>-->
                                                 </select>
                                             </div>
+                                            <div class="rowGroup agencyType"  {if condition="$ep['type'] neq 1"}style="display: none"{/if}>
+                                                <label class="col-sm-1 control-label spacing"><span class="text-danger">*</span>机构类型</label>
+                                                <div class="col-sm-3 spacing">
+                                                    <select class="form-control" id="agencyType" name="agencyType" value="{$ep.agencyType}" onchange="Register.agencyTypeChange()">
+                                                    </select>
+                                                </div>
+                                            </div>
                                         </div>
                                     </div>
                                     {if condition="$ep['type'] eq 1"}
                                     <div class="row" id="typeGroup" style="display: none">
                                         <table style="width: 100%;border-collapse: collapse;" class="table table-bordered">
-                                            <tr>
+                                            <tr class='agencyType1'>
                                                 <td>
                                                     <div class="rowGroup">
                                                         <label class="control-label spacing td-label"><span style="color: red">*</span>产业领域</label>
@@ -180,7 +187,7 @@
                                                     <input style="display: none" autocomplete="off" type="file" class="form-control" id="domainImg" name="domainImg" />
                                                 </td>
                                             </tr>
-                                            <tr>
+                                            <tr class='agencyType1 agencyType2'>
                                                 <td>
                                                     <div class="rowGroup">
                                                         <label class="control-label spacing td-label"><span style="color: red">*</span>企业标签</label>

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

@@ -17,6 +17,7 @@ Register.enterpriseUserRegister = function () {
     var street = $("#street").val();
     var address = $("#address").val();
     var type = $("#type").val();
+    var agencyType = $("#agencyType").val();
     var special = $("#special").val();
     var agentEmail = $("#agentEmail").val();
     var ephone = $("#ephone").val();
@@ -101,29 +102,37 @@ Register.enterpriseUserRegister = function () {
         return;
     }
     if (special == 0 && type == 1) {
+        if (agencyType == null || agencyType == '') {
+            Feng.info("请选择机构类型");
+            return;
+        }
         var industryFieldNew = $("#industryFieldNew").val();
         var industryFieldOld = $("#industryFieldOld").val();
-        var domainImg = $("#domainImg").val();
         var enterpriseTag = $("#enterpriseTag").val();
         var enterpriseType = $("#enterpriseType").val();
 
+        switch (agencyType) {
+            case "1":
+                if (industryFieldNew == null || industryFieldNew == '') {
+                    Feng.info("请选择产业领域");
+                    return;
+                }
+                if (industryFieldOld == null || industryFieldOld == '') {
+                    Feng.info("请选择行业领域");
+                    return;
+                }
+                break;
+            case "2":
+                break;
+        }
         if (enterpriseTag == null || enterpriseTag == '') {
             Feng.info("请选择企业标签!");
             return;
         }
-        if (industryFieldNew == null || industryFieldNew == '') {
-            Feng.info("请选择产业领域");
-            return;
-        }
-        if (industryFieldOld == null || industryFieldOld == '') {
-            Feng.info("请选择行业领域");
-            return;
-        }
         if (enterpriseType == null || enterpriseType == '') {
             Feng.info("请选择企业类型!");
             return;
         }
-
     }
     if (!/(^(\d{11})|^((\d{7,8})|(\d{4}|\d{3})-(\d{7,8})|(\d{4}|\d{3})-(\d{7,8})-(\d{4}|\d{3}|\d{2}|\d{1})|(\d{7,8})-(\d{4}|\d{3}|\d{2}|\d{1})))$/.test(ephone)) {
         Feng.info("单位电话格式不合法!");
@@ -169,9 +178,30 @@ Register.epCallBack = function (data) {
 Register.typeChange = function () {
     var type = $("#type").val();
     if (type == 1) {
-        $("#typeGroup").attr("style", "display:block");
+        $(".agencyType").attr("style", "display:block");
     } else {
-        $("#typeGroup").attr("style", "display:none");
+        $(".agencyType").attr("style", "display:none");
+        $("#enterpriseTag,#industryFieldNew,#industryFieldOld,#enterpriseType").val("");
+    }
+}
+Register.agencyTypeChange = function () {
+    var agencyType = $("#agencyType").val();
+    switch (agencyType) {
+        case "1":
+            $("#typeGroup").attr("style", "display:block");
+            $(".agencyType1").attr("style", "");
+            $(".agencyType2").attr("style", "");
+            break;
+        case "2":
+            $("#typeGroup").attr("style", "display:block");
+            $(".agencyType1").attr("style", "display:none");
+            $(".agencyType2").attr("style", "");
+            $("#industryFieldNew").val("");
+            $("#industryFieldOld").val("");
+            break;
+        default:
+            $("#typeGroup").attr("style", "display:none");
+            break;
     }
 }
 Register.industryChange = function () {
@@ -206,7 +236,8 @@ $(function () {
         {"name": "enterpriseTag", "code": "enterprise_tag"},
         {"name": "enterpriseType", "code": "enterprise_type"},
         {"name": "industryFieldNew", "code": "industry_field"},
-        {"name": "industryFieldOld", "code": industryNew + "_field"}];
+        {"name": "industryFieldOld", "code": industryNew + "_field"},
+        {"name": "agencyType", "code": "agency_type"}];
     Feng.findChildDictBatch(JSON.stringify(arr));
     $("select").each(function () {
         $(this).val($(this).attr("value"));