Эх сурвалжийг харах

企业标签单位标签,所有流程增加

sugangqiang 2 жил өмнө
parent
commit
82287de15b

+ 14 - 0
app/admin/controller/Enterprise.php

@@ -90,6 +90,20 @@ class Enterprise extends AdminController {
                 $ep['enterpriseTagName'] = $enterpriseTag['name'];
                 $ep['enterpriseTagName'] = $enterpriseTag['name'];
             }
             }
         }
         }
+        //---------设置机构标签 --------------------------------------------------
+        if (\StrUtil::isNotEmpAndNull($ep['organizationTag'])) {
+            $organizationTag = DictApi::findByParentCodeAndCode("organization_tag", $ep['organizationTag']);
+            if ($organizationTag != null) {
+                $ep['organizationTagName'] = $organizationTag['name'];
+            }
+        }
+        //---------设置事业单位标签 --------------------------------------------------
+        if (\StrUtil::isNotEmpAndNull($ep['institutionTag'])) {
+            $institutionTag = DictApi::findByParentCodeAndCode("institution_tag", $ep['institutionTag']);
+            if ($institutionTag != null) {
+                $ep['institutionTagName'] = $institutionTag['name'];
+            }
+        }
         //---------设置单位类型 --------------------------------------------------
         //---------设置单位类型 --------------------------------------------------
         if (\StrUtil::isNotEmpAndNull($ep['enterpriseType'])) {
         if (\StrUtil::isNotEmpAndNull($ep['enterpriseType'])) {
             $enterpriseType = DictApi::findByParentCodeAndCode("enterprise_type", $ep['enterpriseType']);
             $enterpriseType = DictApi::findByParentCodeAndCode("enterprise_type", $ep['enterpriseType']);

+ 27 - 0
app/admin/controller/EnterpriseChangeRecord.php

@@ -270,6 +270,27 @@ class EnterpriseChangeRecord extends AdminController {
                 return view("", ['ecr' => $ecr]);
                 return view("", ['ecr' => $ecr]);
                 break;
                 break;
             case 1:
             case 1:
+                if (\StrUtil::isNotEmpAndNull($ecr['oldInstitutionTag']) || \StrUtil::isNotEmpAndNull($ecr['newInstitutionTag'])) {
+                    $tagList = DictApi::selectByParentCode("institution_tag");
+                    if (\StrUtil::isNotEmpAndNull($ecr['oldInstitutionTag'])) {
+                        $ecr['oldInstitutionTagName'] = $tagList[$ecr['oldInstitutionTag']];
+                    }
+                    if (\StrUtil::isNotEmpAndNull($ecr['newInstitutionTag'])) {
+                        $ecr['newInstitutionTagName'] = $tagList[$ecr['newInstitutionTag']];
+                    }
+                }
+                return view("", ['ecr' => $ecr]);
+                break;
+            case 3:
+                if (\StrUtil::isNotEmpAndNull($ecr['oldOrganizationTag']) || \StrUtil::isNotEmpAndNull($ecr['newOrganizationTag'])) {
+                    $tagList = DictApi::selectByParentCode("organization_tag");
+                    if (\StrUtil::isNotEmpAndNull($ecr['oldOrganizationTag'])) {
+                        $ecr['oldOrganizationTagName'] = $tagList[$ecr['oldOrganizationTag']];
+                    }
+                    if (\StrUtil::isNotEmpAndNull($ecr['newOrganizationTag'])) {
+                        $ecr['newOrganizationTagName'] = $tagList[$ecr['newOrganizationTag']];
+                    }
+                }
                 return view("", ['ecr' => $ecr]);
                 return view("", ['ecr' => $ecr]);
                 break;
                 break;
             default:
             default:
@@ -299,6 +320,12 @@ class EnterpriseChangeRecord extends AdminController {
         } else {
         } else {
             $fields = ["Name" => "单位名称", "IdCard" => "统一社会信用代码", "Legal" => "法人代表", "Address" => "单位地址", "Street" => "所属街道", "Ephone" => "单位电话", "BankCard" => "单位银行账号", "Bank" => "单位开户银行", "BankNetwork" => "单位开户银行网点",
             $fields = ["Name" => "单位名称", "IdCard" => "统一社会信用代码", "Legal" => "法人代表", "Address" => "单位地址", "Street" => "所属街道", "Ephone" => "单位电话", "BankCard" => "单位银行账号", "Bank" => "单位开户银行", "BankNetwork" => "单位开户银行网点",
                 "AgentName" => "人才联络员姓名", "AgentPhone" => "人才联络员电话", "AgentEmail" => "人才联络员邮箱"];
                 "AgentName" => "人才联络员姓名", "AgentPhone" => "人才联络员电话", "AgentEmail" => "人才联络员邮箱"];
+            if ($ep->special == 1) {
+                $fields["InstitutionTag"] = "单位标签";
+            }
+            if ($ep->special == 3) {
+                $fields["OrganizationTag"] = "机构标签";
+            }
             $files = ["newImgurl" => "法人证或批文", "newBankImg" => "开户许可证", "newBeian" => "人才联络员备案表"];
             $files = ["newImgurl" => "法人证或批文", "newBankImg" => "开户许可证", "newBeian" => "人才联络员备案表"];
         }
         }
         $modify_fields = [];
         $modify_fields = [];

+ 89 - 73
app/admin/view/enterprise/goto_enterprise_detail_page.html

@@ -105,7 +105,7 @@
                             <td class="key">
                             <td class="key">
                                 单位地址
                                 单位地址
                             </td>
                             </td>
-                            <td class="value1 word-wrap">
+                            <td class="value1 word-wrap" style="border-right: 1px solid #c0a16b">
                                 {$ep.address}
                                 {$ep.address}
                             </td>
                             </td>
                         </tr>
                         </tr>
@@ -119,7 +119,7 @@
                             <td class="key">
                             <td class="key">
                                 单位电话
                                 单位电话
                             </td>
                             </td>
-                            <td class="value1 word-wrap">
+                            <td class="value1 word-wrap" style="border-right: 1px solid #c0a16b">
                                 {$ep.ephone}
                                 {$ep.ephone}
                             </td>
                             </td>
                         </tr>
                         </tr>
@@ -156,83 +156,99 @@
                             <td class="key">
                             <td class="key">
                                 企业开户银行网点
                                 企业开户银行网点
                             </td>
                             </td>
-                            <td colspan="3">
+                            <td class="value1 word-wrap">
                                 {$ep.bankNetwork}
                                 {$ep.bankNetwork}
                             </td>
                             </td>
+                            {eq name="ep.special" value="3"}
+                            <td class="key">
+                                机构标签
+                            </td>
+                            <td class="value1 word-wrap" style="border-right: 1px solid #c0a16b">
+                                {$ep.organizationTagName}
+                            </td>
+                            {/eq}
+                            {eq name="ep.special" value="1"}
+                            <td class="key">
+                                单位标签
+                            </td>
+                            <td class="value1 word-wrap" style="border-right: 1px solid #c0a16b">
+                                {$ep.institutionTagName}
+                            </td>
+                            {/eq}
                         </tr>
                         </tr>
 
 
                     </table>
                     </table>
                     {if condition="$ep['special'] eq 0"}
                     {if condition="$ep['special'] eq 0"}
-                        <p>
-                            申报类型:
-                            {switch name="ep.type"}
-                            {case value="1"}晋江市现代产业体系人才{if condition="$ep['agencyTypeName']"}({$ep.agencyTypeName}){/if}{/case}
-                            {case value="2"}集成电路优秀人才{/case}
-                            {/switch}
-                            <input type="hidden" id="type" value="{$ep.type}">
-                        </p>
-                        <table style="width:100%;table-layout:fixed;" class="table table-bordered">
-                            {if condition="$ep['agencyType'] eq 1"}
-                            <tr class="type1">
-                                <td class="key">
-                                    产业领域
-                                </td>
-                                <td class="value1 word-wrap">
-                                    {$ep.industryFieldNewName}
-                                </td>
-                                <td class="key">
-                                    行业领域
-                                </td>
-                                <td class="value1 word-wrap" style="border-right: 1px solid #c0a16b">
-                                    {$ep.industryFieldOldName}
-                                </td>
-                                <td style="border: 1px solid #c0a16b;width: 300px">
-                                    <label>
-                                        行业领域佐证材料
-                                    </label>
-                                    <div>
-                                        {if condition="$ep['domainImg']"}
-                                        {if condition="$ep['domainImg_is_img']"}
-                                        <img onclick="Feng.showImg(this)" id="domainImg" alt="行业领域佐证材料"
-                                             src="{$ep.domainImg|getStoragePath}" style="max-width:60px;">
-                                        {else}
-                                        <button type="button" onclick="Feng.showPdf('{$ep.domainImg|getStoragePath}', 'domainImg')" class="btn btn-xs btn-danger"><i class="fa fa-file-pdf-o" aria-hidden="true"></i></button>
-                                        {/if}
-                                        {/if}
-                                    </div>
-                                </td>
-                            </tr>
-                            {/if}
-                            <tr class="type1">
-                                <td class="key">
-                                    企业标签
-                                </td>
-                                <td class="value1 word-wrap">
-                                    {$ep.enterpriseTagName}
-                                </td>
-                                <td class="key">
-                                    单位类型
-                                </td>
-                                <td class="value1 word-wrap" style="border-right:1px solid #c0a16b;">
-                                    {$ep.enterpriseTypeName}
-                                </td>
-                                <td style="border: 1px solid #c0a16b">
-                                    <label>
-                                        规上、高新技术、专精特新企业上传材料
-                                    </label>
-                                    <div>
-                                        {if condition="$ep['typeImg']"}
-                                        {if condition="$ep['typeImg_is_img']"}
-                                        <img onclick="Feng.showImg(this)" id="typeImg" alt="规上、高新技术、专精特新企业上传材料"
-                                             src="{$ep.typeImg|getStoragePath}" style="max-width:60px;">
-                                        {else}
-                                        <button type="button" onclick="Feng.showPdf('{$ep.typeImg|getStoragePath}', 'typeImg')" class="btn btn-xs btn-danger"><i class="fa fa-file-pdf-o" aria-hidden="true"></i></button>
-                                        {/if}
-                                        {/if}
-                                    </div>
-                                </td>
-                            </tr>
-                        </table>
+                    <p>
+                        申报类型:
+                        {switch name="ep.type"}
+                        {case value="1"}晋江市现代产业体系人才{if condition="$ep['agencyTypeName']"}({$ep.agencyTypeName}){/if}{/case}
+                        {case value="2"}集成电路优秀人才{/case}
+                        {/switch}
+                        <input type="hidden" id="type" value="{$ep.type}">
+                    </p>
+                    <table style="width:100%;table-layout:fixed;" class="table table-bordered">
+                        {if condition="$ep['agencyType'] eq 1"}
+                        <tr class="type1">
+                            <td class="key">
+                                产业领域
+                            </td>
+                            <td class="value1 word-wrap">
+                                {$ep.industryFieldNewName}
+                            </td>
+                            <td class="key">
+                                行业领域
+                            </td>
+                            <td class="value1 word-wrap" style="border-right: 1px solid #c0a16b">
+                                {$ep.industryFieldOldName}
+                            </td>
+                            <td style="border: 1px solid #c0a16b;width: 300px">
+                                <label>
+                                    行业领域佐证材料
+                                </label>
+                                <div>
+                                    {if condition="$ep['domainImg']"}
+                                    {if condition="$ep['domainImg_is_img']"}
+                                    <img onclick="Feng.showImg(this)" id="domainImg" alt="行业领域佐证材料"
+                                         src="{$ep.domainImg|getStoragePath}" style="max-width:60px;">
+                                    {else}
+                                    <button type="button" onclick="Feng.showPdf('{$ep.domainImg|getStoragePath}', 'domainImg')" class="btn btn-xs btn-danger"><i class="fa fa-file-pdf-o" aria-hidden="true"></i></button>
+                                    {/if}
+                                    {/if}
+                                </div>
+                            </td>
+                        </tr>
+                        {/if}
+                        <tr class="type1">
+                            <td class="key">
+                                企业标签
+                            </td>
+                            <td class="value1 word-wrap">
+                                {$ep.enterpriseTagName}
+                            </td>
+                            <td class="key">
+                                单位类型
+                            </td>
+                            <td class="value1 word-wrap" style="border-right:1px solid #c0a16b;">
+                                {$ep.enterpriseTypeName}
+                            </td>
+                            <td style="border: 1px solid #c0a16b">
+                                <label>
+                                    规上、高新技术、专精特新企业上传材料
+                                </label>
+                                <div>
+                                    {if condition="$ep['typeImg']"}
+                                    {if condition="$ep['typeImg_is_img']"}
+                                    <img onclick="Feng.showImg(this)" id="typeImg" alt="规上、高新技术、专精特新企业上传材料"
+                                         src="{$ep.typeImg|getStoragePath}" style="max-width:60px;">
+                                    {else}
+                                    <button type="button" onclick="Feng.showPdf('{$ep.typeImg|getStoragePath}', 'typeImg')" class="btn btn-xs btn-danger"><i class="fa fa-file-pdf-o" aria-hidden="true"></i></button>
+                                    {/if}
+                                    {/if}
+                                </div>
+                            </td>
+                        </tr>
+                    </table>
                     {/if}
                     {/if}
                 </div>
                 </div>
             </div>
             </div>

+ 13 - 1
app/admin/view/enterprise_change_record/goto_enterprise_change_detail_page.html

@@ -186,7 +186,19 @@
                             <td class="key">
                             <td class="key">
                                 {eq name="ecr.special" value="0"}企业{else/}单位{/eq}开户银行网点
                                 {eq name="ecr.special" value="0"}企业{else/}单位{/eq}开户银行网点
                             </td>
                             </td>
-                            <td class="value1" colspan="3" data-old='{$ecr.oldBankNetwork}' data-new='{$ecr.newBankNetwork}'></td>
+                            <td class="value1" data-old='{$ecr.oldBankNetwork}' data-new='{$ecr.newBankNetwork}'></td>
+                            {eq name="ecr.special" value="1"}
+                            <td class="key">
+                                单位标签
+                            </td>
+                            <td class="value1" data-old='{$ecr.oldInstitutionTagName}' data-new='{$ecr.newInstitutionTagName}'></td>
+                            {/eq}
+                            {eq name="ecr.special" value="3"}
+                            <td class="key">
+                                机构标签
+                            </td>
+                            <td class="value1" data-old='{$ecr.oldOrganizationTagName}' data-new='{$ecr.newOrganizationTagName}'></td>
+                            {/eq}
                         </tr>
                         </tr>
                     </table>
                     </table>
                     {if condition="$ecr.special == 0"}
                     {if condition="$ecr.special == 0"}

+ 4 - 2
app/common/controller/Auth.php

@@ -56,7 +56,7 @@ class Auth extends BaseController {
                     $data['name'] = str_replace(')', ')', $data['name']);
                     $data['name'] = str_replace(')', ')', $data['name']);
                 }
                 }
                 $files = $this->request->file();
                 $files = $this->request->file();
-                switch ($special){
+                switch ($special) {
                     case 'qiye':
                     case 'qiye':
                         if ($data['type'] == 1) {
                         if ($data['type'] == 1) {
                             if ($data["agencyType"] == 1) {
                             if ($data["agencyType"] == 1) {
@@ -96,7 +96,7 @@ class Auth extends BaseController {
                         $data['special'] = 0;
                         $data['special'] = 0;
                         break;
                         break;
                     case 'minfei':
                     case 'minfei':
-
+                        $data['type'] = 1;
                         if (!array_key_exists('imgurl', $files) || $files['imgurl'] == '') {
                         if (!array_key_exists('imgurl', $files) || $files['imgurl'] == '') {
                             $response_object->code = 500;
                             $response_object->code = 500;
                             $response_object->msg = '营业执照不能为空';
                             $response_object->msg = '营业执照不能为空';
@@ -255,6 +255,8 @@ class Auth extends BaseController {
                 'type' => intval($this->request['type']),
                 'type' => intval($this->request['type']),
                 'agencyType' => intval($this->request['agencyType']),
                 'agencyType' => intval($this->request['agencyType']),
                 'enterpriseTag' => \StrUtil::getRequestDecodeParam($this->request, 'enterpriseTag'), //单位标签
                 'enterpriseTag' => \StrUtil::getRequestDecodeParam($this->request, 'enterpriseTag'), //单位标签
+                'organizationTag' => \StrUtil::getRequestDecodeParam($this->request, 'organizationTag'), //机构标签
+                'institutionTag' => \StrUtil::getRequestDecodeParam($this->request, 'institutionTag'), //事业单位标签
                 'enterpriseType' => \StrUtil::getRequestDecodeParam($this->request, 'enterpriseType'), //单位类型
                 'enterpriseType' => \StrUtil::getRequestDecodeParam($this->request, 'enterpriseType'), //单位类型
                 'agentPhone' => \StrUtil::getRequestDecodeParam($this->request, 'agentPhone'), //手机
                 'agentPhone' => \StrUtil::getRequestDecodeParam($this->request, 'agentPhone'), //手机
                 'agentEmail' => \StrUtil::getRequestDecodeParam($this->request, 'agentEmail'), //邮箱
                 'agentEmail' => \StrUtil::getRequestDecodeParam($this->request, 'agentEmail'), //邮箱

+ 23 - 2
app/common/view/auth/enterprise_edit.html

@@ -130,7 +130,28 @@
                                                 <input style="display: none" autocomplete="off" type="file" class="form-control" id="bankImg" name="bankImg" />
                                                 <input style="display: none" autocomplete="off" type="file" class="form-control" id="bankImg" name="bankImg" />
                                             </td>
                                             </td>
                                         </tr>
                                         </tr>
-
+                                        {eq name="ep.special" value="3"}
+                                        <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" value="{$ep.organizationTag}">
+                                                    </select>
+                                                </div>
+                                            </td>
+                                        </tr>
+                                        {/eq}
+                                        {eq name="ep.special" value="1"}
+                                        <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" value="{$ep.institutionTag}">
+                                                    </select>
+                                                </div>
+                                            </td>
+                                        </tr>
+                                        {/eq}
                                     </table>
                                     </table>
                                 </div>
                                 </div>
                                 {if condition="$ep['special'] eq 0"}
                                 {if condition="$ep['special'] eq 0"}
@@ -148,7 +169,7 @@
                                                 </select>
                                                 </select>
                                             </div>
                                             </div>
                                             <div class="rowGroup agencyType"  {if condition="$ep['type'] neq 1"}style="display: none"{/if}>
                                             <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>
+                                                 <label class="col-sm-1 control-label spacing"><span class="text-danger">*</span>机构类型</label>
                                                 <div class="col-sm-3 spacing">
                                                 <div class="col-sm-3 spacing">
                                                     <select class="form-control" id="agencyType" name="agencyType" value="{$ep.agencyType}" onchange="Register.agencyTypeChange()">
                                                     <select class="form-control" id="agencyType" name="agencyType" value="{$ep.agencyType}" onchange="Register.agencyTypeChange()">
                                                     </select>
                                                     </select>

+ 27 - 0
app/enterprise/controller/Api.php

@@ -60,6 +60,8 @@ class Api extends EnterpriseController {
             'type' => $ep['type'],
             'type' => $ep['type'],
             'newAgencyType' => $ep['agencyType'],
             'newAgencyType' => $ep['agencyType'],
             'newEnterpriseTag' => $ep['enterpriseTag'],
             'newEnterpriseTag' => $ep['enterpriseTag'],
+            'newOrganizationTag' => $ep['organizationTag'],
+            'newInstitutionTag' => $ep['institutionTag'],
             'newEnterpriseType' => $ep['enterpriseType'],
             'newEnterpriseType' => $ep['enterpriseType'],
             'newIndustryFieldNew' => $ep['industryFieldNew'],
             'newIndustryFieldNew' => $ep['industryFieldNew'],
             'newIndustryFieldOld' => $ep['industryFieldOld'],
             'newIndustryFieldOld' => $ep['industryFieldOld'],
@@ -130,6 +132,9 @@ class Api extends EnterpriseController {
             case 1:
             case 1:
                 return view("", ['ecr' => $ecr]);
                 return view("", ['ecr' => $ecr]);
                 break;
                 break;
+            case 3:
+                return view("", ['ecr' => $ecr]);
+                break;
             default:
             default:
 
 
                 break;
                 break;
@@ -149,6 +154,8 @@ class Api extends EnterpriseController {
             'type' => intval($this->request['type']),
             'type' => intval($this->request['type']),
             'agencyType' => intval($this->request['newAgencyType']),
             'agencyType' => intval($this->request['newAgencyType']),
             'enterpriseTag' => \StrUtil::getRequestDecodeParam($this->request, 'newEnterpriseTag'), //单位标签
             'enterpriseTag' => \StrUtil::getRequestDecodeParam($this->request, 'newEnterpriseTag'), //单位标签
+            'organizationTag' => \StrUtil::getRequestDecodeParam($this->request, 'newOrganizationTag'), //机构标签
+            'institutionTag' => \StrUtil::getRequestDecodeParam($this->request, 'newInstitutionTag'), //事业单位标签
             'enterpriseType' => \StrUtil::getRequestDecodeParam($this->request, 'newEnterpriseType'), //单位类型
             'enterpriseType' => \StrUtil::getRequestDecodeParam($this->request, 'newEnterpriseType'), //单位类型
             'agentEmail' => \StrUtil::getRequestDecodeParam($this->request, 'newAgentEmail'), //邮箱
             'agentEmail' => \StrUtil::getRequestDecodeParam($this->request, 'newAgentEmail'), //邮箱
             'ephone' => \StrUtil::getRequestDecodeParam($this->request, 'newEphone'), //单位电话
             'ephone' => \StrUtil::getRequestDecodeParam($this->request, 'newEphone'), //单位电话
@@ -208,6 +215,8 @@ class Api extends EnterpriseController {
                     'oldAgentEmail' => $ep['agentEmail'],
                     'oldAgentEmail' => $ep['agentEmail'],
                     'oldAgentPhone' => $ep['agentPhone'],
                     'oldAgentPhone' => $ep['agentPhone'],
                     'oldEnterpriseTag' => $ep['enterpriseTag'],
                     'oldEnterpriseTag' => $ep['enterpriseTag'],
+                    'oldOrganizationTag' => $ep['organizationTag'],
+                    'oldInstitutionTag' => $ep['institutionTag'],
                     'oldEnterpriseType' => $ep['enterpriseType'],
                     'oldEnterpriseType' => $ep['enterpriseType'],
                     'oldBankCard' => $ep['bankCard'],
                     'oldBankCard' => $ep['bankCard'],
                     'oldBank' => $ep['bank'],
                     'oldBank' => $ep['bank'],
@@ -230,6 +239,8 @@ class Api extends EnterpriseController {
                     'newAgentEmail' => $data['agentEmail'],
                     'newAgentEmail' => $data['agentEmail'],
                     'newAgentPhone' => $data['agentPhone'],
                     'newAgentPhone' => $data['agentPhone'],
                     'newEnterpriseTag' => $data['enterpriseTag'],
                     'newEnterpriseTag' => $data['enterpriseTag'],
+                    'newOrganizationTag' => $data['organizationTag'],
+                    'newInstitutionTag' => $data['institutionTag'],
                     'newEnterpriseType' => $data['enterpriseType'],
                     'newEnterpriseType' => $data['enterpriseType'],
                     'newBankCard' => $data['bankCard'],
                     'newBankCard' => $data['bankCard'],
                     'newBank' => $data['bank'],
                     'newBank' => $data['bank'],
@@ -347,6 +358,8 @@ class Api extends EnterpriseController {
                 $record->oldAgentEmail = $ep['agentEmail'];
                 $record->oldAgentEmail = $ep['agentEmail'];
                 $record->oldAgentPhone = $ep['agentPhone'];
                 $record->oldAgentPhone = $ep['agentPhone'];
                 $record->oldEnterpriseTag = $ep['enterpriseTag'];
                 $record->oldEnterpriseTag = $ep['enterpriseTag'];
+                $record->oldOrganizationTag = $ep['organizationTag'];
+                $record->oldInstitutionTag = $ep['institutionTag'];
                 $record->oldEnterpriseType = $ep['enterpriseType'];
                 $record->oldEnterpriseType = $ep['enterpriseType'];
                 $record->oldBankCard = $ep['bankCard'];
                 $record->oldBankCard = $ep['bankCard'];
                 $record->oldBank = $ep['bank'];
                 $record->oldBank = $ep['bank'];
@@ -371,6 +384,8 @@ class Api extends EnterpriseController {
                     $record->newAgentEmail = $data['agentEmail'];
                     $record->newAgentEmail = $data['agentEmail'];
                     $record->newAgentPhone = $data['agentPhone'];
                     $record->newAgentPhone = $data['agentPhone'];
                     $record->newEnterpriseTag = $data['enterpriseTag'];
                     $record->newEnterpriseTag = $data['enterpriseTag'];
+                    $record->newOrganizationTag = $data['organizationTag'];
+                    $record->newInstitutionTag = $data['institutionTag'];
                     $record->newEnterpriseType = $data['enterpriseType'];
                     $record->newEnterpriseType = $data['enterpriseType'];
                     $record->newBankCard = $data['bankCard'];
                     $record->newBankCard = $data['bankCard'];
                     $record->newBank = $data['bank'];
                     $record->newBank = $data['bank'];
@@ -696,6 +711,9 @@ class Api extends EnterpriseController {
             case 1:
             case 1:
                 return view("", ['ecr' => $ecr]);
                 return view("", ['ecr' => $ecr]);
                 break;
                 break;
+            case 3:
+                return view("", ['ecr' => $ecr]);
+                break;
             default:
             default:
 
 
                 break;
                 break;
@@ -948,6 +966,15 @@ class Api extends EnterpriseController {
                 return view("", ['ecr' => $ecr]);
                 return view("", ['ecr' => $ecr]);
                 break;
                 break;
             case 1:
             case 1:
+                $tagList = DictApi::selectByParentCode('institution_tag');
+                $ecr['oldInstitutionTagName'] = $tagList[$ecr['oldInstitutionTag']];
+                $ecr['newInstitutionTagName'] = $tagList[$ecr['newInstitutionTag']];
+                return view("", ['ecr' => $ecr]);
+                break;
+            case 3:
+                $tagList = DictApi::selectByParentCode('organization_tag');
+                $ecr['oldOrganizationTagName'] = $tagList[$ecr['oldOrganizationTag']];
+                $ecr['newOrganizationTagName'] = $tagList[$ecr['newOrganizationTag']];
                 return view("", ['ecr' => $ecr]);
                 return view("", ['ecr' => $ecr]);
                 break;
                 break;
             default:
             default:

+ 2 - 0
app/enterprise/controller/Index.php

@@ -45,6 +45,8 @@ class Index extends EnterpriseController {
         $ep['industryFieldNewName'] = DictApi::findDictByCode($ep['industryFieldNew'])->name ?? '';
         $ep['industryFieldNewName'] = DictApi::findDictByCode($ep['industryFieldNew'])->name ?? '';
         $ep['industryFieldOldName'] = DictApi::findDictByCode($ep['industryFieldOld'])->name ?? '';
         $ep['industryFieldOldName'] = DictApi::findDictByCode($ep['industryFieldOld'])->name ?? '';
         $ep['enterpriseTagName'] = DictApi::findDictByCode($ep['enterpriseTag'])->name ?? '';
         $ep['enterpriseTagName'] = DictApi::findDictByCode($ep['enterpriseTag'])->name ?? '';
+        $ep['organizationTagName'] = DictApi::findDictByCode($ep['organizationTag'])->name ?? '';
+        $ep['institutionTagName'] = DictApi::findDictByCode($ep['institutionTag'])->name ?? '';
         $ep['streetName'] = DictApi::findDictByCode($ep['street'])->name ?? '';
         $ep['streetName'] = DictApi::findDictByCode($ep['street'])->name ?? '';
         $ep['enterpriseTypeName'] = DictApi::findDictByCode($ep['enterpriseType'])->name ?? '';
         $ep['enterpriseTypeName'] = DictApi::findDictByCode($ep['enterpriseType'])->name ?? '';
         if ($ep["imgurl"]) {
         if ($ep["imgurl"]) {

+ 22 - 0
app/enterprise/view/api/to_add.html

@@ -127,6 +127,28 @@
                                     <input style="display: none" autocomplete="off" type="file" class="form-control" id="bankImg" name="bankImg" />
                                     <input style="display: none" autocomplete="off" type="file" class="form-control" id="bankImg" name="bankImg" />
                                 </td>
                                 </td>
                             </tr>
                             </tr>
+                            {eq name="ecr.special" value="3"}
+                            <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="newOrganizationTag" name="newOrganizationTag" value="{$ecr.newOrganizationTag}">
+                                        </select>
+                                    </div>
+                                </td>
+                            </tr>
+                            {/eq}
+                            {eq name="ecr.special" value="1"}
+                            <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="newInstitutionTag" name="newInstitutionTag" value="{$ecr.newInstitutionTag}">
+                                        </select>
+                                    </div>
+                                </td>
+                            </tr>
+                            {/eq}
                         </table>
                         </table>
                         {if condition="$ecr['special'] eq 0"}
                         {if condition="$ecr['special'] eq 0"}
                         <div class="row">
                         <div class="row">

+ 13 - 1
app/enterprise/view/api/to_detail.html

@@ -182,7 +182,19 @@
                             <td class="key">
                             <td class="key">
                                 {eq name="ecr.special" value="0"}企业{else/}单位{/eq}开户银行网点
                                 {eq name="ecr.special" value="0"}企业{else/}单位{/eq}开户银行网点
                             </td>
                             </td>
-                            <td class="value1 word-wrap" colspan="3" data-old='{$ecr.oldBankNetwork}' data-new='{$ecr.newBankNetwork}'></td>
+                            <td class="value1 word-wrap" data-old='{$ecr.oldBankNetwork}' data-new='{$ecr.newBankNetwork}'></td>
+                            {eq name="ecr.special" value="3"}
+                            <td class="key">
+                                机构标签
+                            </td>
+                            <td class="value1 word-wrap" data-old='{$ecr.oldOrganizationTagName}' data-new='{$ecr.newOrganizationTagName}'></td>
+                            {/eq}
+                            {eq name="ecr.special" value="1"}
+                            <td class="key">
+                                单位标签
+                            </td>
+                            <td class="value1 word-wrap" data-old='{$ecr.oldInstitutionTagName}' data-new='{$ecr.newInstitutionTagName}'></td>
+                            {/eq}
                         </tr>
                         </tr>
                     </table>
                     </table>
                     {if condition="$ecr['special'] == 0"}
                     {if condition="$ecr['special'] == 0"}

+ 22 - 0
app/enterprise/view/api/to_update.html

@@ -130,6 +130,28 @@
                                     <input style="display: none" autocomplete="off" type="file" class="form-control" id="bankImg" name="bankImg" />
                                     <input style="display: none" autocomplete="off" type="file" class="form-control" id="bankImg" name="bankImg" />
                                 </td>
                                 </td>
                             </tr>
                             </tr>
+                            {eq name="ecr.special" value="3"}
+                            <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="newOrganizationTag" name="newOrganizationTag" value="{$ecr.newOrganizationTag}">
+                                        </select>
+                                    </div>
+                                </td>
+                            </tr>
+                            {/eq}
+                            {eq name="ecr.special" value="1"}
+                            <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="newInstitutionTag" name="newInstitutionTag" value="{$ecr.newInstitutionTag}">
+                                        </select>
+                                    </div>
+                                </td>
+                            </tr>
+                            {/eq}
                         </table>
                         </table>
                         {if condition="$ecr['special'] eq 0"}
                         {if condition="$ecr['special'] eq 0"}
                         <div class="row">
                         <div class="row">

+ 9 - 1
app/enterprise/view/index/center_page.html

@@ -137,9 +137,17 @@
                                                     <td class="key">
                                                     <td class="key">
                                                         {eq name="ep.special" value="0"}企业{else/}单位{/eq}开户银行网点
                                                         {eq name="ep.special" value="0"}企业{else/}单位{/eq}开户银行网点
                                                     </td>
                                                     </td>
-                                                    <td colspan="3">
+                                                    <td>
                                                         {$ep.bankNetwork}
                                                         {$ep.bankNetwork}
                                                     </td>
                                                     </td>
+                                                    {eq name="ep.special" value="3"}
+                                                    <td class="key">机构标签</td>                                                            
+                                                    <td>{$ep.organizationTagName}</td>
+                                                    {/eq}
+                                                    {eq name="ep.special" value="1"}
+                                                    <td class="key">单位标签</td>                                                            
+                                                    <td>{$ep.institutionTagName}</td>
+                                                {/eq}
                                                 </tr>
                                                 </tr>
                                             </table>
                                             </table>
                                             {eq name="ep.special" value="0"}
                                             {eq name="ep.special" value="0"}

+ 2 - 0
public/static/modular/gate/enterprise/enterprise_change_edit.js

@@ -593,6 +593,8 @@ $(function () {
     var arr = [
     var arr = [
         {"name": "newStreet", "code": "street"},
         {"name": "newStreet", "code": "street"},
         {"name": "newEnterpriseTag", "code": "enterprise_tag"},
         {"name": "newEnterpriseTag", "code": "enterprise_tag"},
+        {"name": "newOrganizationTag", "code": "organization_tag"},
+        {"name": "newInstitutionTag", "code": "institution_tag"},
         {"name": "newEnterpriseType", "code": "enterprise_type"},
         {"name": "newEnterpriseType", "code": "enterprise_type"},
         {"name": "newIndustryFieldNew", "code": "industry_field"},
         {"name": "newIndustryFieldNew", "code": "industry_field"},
         {"name": "newIndustryFieldOld", "code": industryNew + "_field"},
         {"name": "newIndustryFieldOld", "code": industryNew + "_field"},

+ 2 - 0
public/static/modular/gate/enterprise/enterprise_edit.js

@@ -234,6 +234,8 @@ $(function () {
     var arr = [
     var arr = [
         {"name": "street", "code": "street"},
         {"name": "street", "code": "street"},
         {"name": "enterpriseTag", "code": "enterprise_tag"},
         {"name": "enterpriseTag", "code": "enterprise_tag"},
+        {"name": "organizationTag", "code": "organization_tag"},
+        {"name": "institutionTag", "code": "institution_tag"},
         {"name": "enterpriseType", "code": "enterprise_type"},
         {"name": "enterpriseType", "code": "enterprise_type"},
         {"name": "industryFieldNew", "code": "industry_field"},
         {"name": "industryFieldNew", "code": "industry_field"},
         {"name": "industryFieldOld", "code": industryNew + "_field"},
         {"name": "industryFieldOld", "code": industryNew + "_field"},