sugangqiang 2 лет назад
Родитель
Сommit
b0b57caeca

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

@@ -114,6 +114,13 @@ class Enterprise extends AdminController {
             $ep['domainImg_is_img'] = 0;
         }
 
+        $typeImg_info = pathinfo($ep['typeImg']);
+        if(in_array($typeImg_info['extension'],["jpeg","jpg","png","gif"])){
+            $ep['typeImg_is_img'] = 1;
+        }else{
+            $ep['typeImg_is_img'] = 0;
+        }
+
         $beian_info = pathinfo($ep['beian']);
         if(in_array($beian_info['extension'],["jpeg","jpg","png","gif"])){
             $ep['beian_is_img'] = 1;

+ 15 - 1
app/admin/controller/EnterpriseChangeRecord.php

@@ -177,6 +177,19 @@ class EnterpriseChangeRecord extends AdminController {
                 $ecr["newDomainImg_is_img"] = 1;
             }
         }
+        //个别企业类型需要上传附件
+        if ($ecr["oldTypeImg"]) {
+            $pathinfo = pathinfo($ecr["oldTypeImg"]);
+            if (in_array($pathinfo["extension"], ["jpeg", "jpg", "png", "gif"])) {
+                $ecr["oldTypeImg_is_img"] = 1;
+            }
+        }
+        if ($ecr["newTypeImg"]) {
+            $pathinfo = pathinfo($ecr["newTypeImg"]);
+            if (in_array($pathinfo["extension"], ["jpeg", "jpg", "png", "gif"])) {
+                $ecr["newTypeImg_is_img"] = 1;
+            }
+        }
         //开户许可证
         if (!$ecr["oldBankImg"]) {
             $ecr["oldBankImg"] = $ep["bankImg"];
@@ -268,7 +281,7 @@ class EnterpriseChangeRecord extends AdminController {
                 $fields = ["Name" => "企业名称", "IdCard" => "统一社会信用代码", "Legal" => "法人代表", "Address" => "企业地址", "Street" => "所属街道", "Ephone" => "企业电话", "BankCard" => "企业银行账号", "Bank" => "企业开户银行", "BankNetwork" => "企业开户银行网点",
                     "IndustryFieldNew" => "产业领域", "IndustryFieldOld" => "行业领域", "EnterpriseTag" => "企业标签", "EnterpriseType" => "企业类型",
                     "AgentName" => "人才联络员姓名", "AgentPhone" => "人才联络员电话", "AgentEmail" => "人才联络员邮箱"];
-                $files = ["newImgurl" => "企业营业执照", "newBankImg" => "开户许可证", "newDomainImg" => "行业领域佐证材料", "newBeian" => "人才联络员信息备案表"];
+                $files = ["newImgurl" => "企业营业执照", "newBankImg" => "开户许可证", "newDomainImg" => "行业领域佐证材料", "newBeian" => "人才联络员信息备案表", "newTypeImg" => "规上、高新技术、专精特新企业上传材料"];
             } else {
                 $fields = ["Name" => "企业名称", "IdCard" => "统一社会信用代码", "Legal" => "法人代表", "Address" => "企业地址", "Street" => "所属街道", "Ephone" => "企业电话", "BankCard" => "企业银行账号", "Bank" => "企业开户银行", "BankNetwork" => "企业开户银行网点",
                     "AgentName" => "人才联络员姓名", "AgentPhone" => "人才联络员电话", "AgentEmail" => "人才联络员邮箱"];
@@ -439,6 +452,7 @@ class EnterpriseChangeRecord extends AdminController {
             $ep->imgurl = $ecr['newImgurl'] ?: $ep->imgurl;
             $ep->bankImg = $ecr['newBankImg'] ?: $ep->bankImg;
             $ep->domainImg = $ecr['newDomainImg'] ?: $ep->domainImg;
+            $ep->typeImg = $ecr['newTypeImg'];
             $ep->beian = $ecr['newBeian'] ?: $ep->beian;
             //查询此次上传的文件
             /* $list = TalentCommonFile::where('mainId', $ecr['id'])->select()->toArray();

+ 43 - 23
app/admin/view/enterprise/goto_enterprise_detail_page.html

@@ -81,17 +81,18 @@
                             </td>
                             <td rowspan="3" style="border: 1px solid #c0a16b;width: 300px">
                                 <label>
-                                    营业执照<br />
-                                    (事业单位法人证或批文)
+                                    营业执照(事业单位法人证或批文)
                                 </label>
-                                {if condition="$ep['imgurl']"}
+                                <div>
+                                    {if condition="$ep['imgurl']"}
                                     {if condition="$ep['imgurl_is_img']"}
                                     <img onclick="Feng.showImg(this)" id="yyzz" alt="营业执照"
-                                         src="{$ep.imgurl|getStoragePath}" style="max-width: 100px;">
+                                         src="{$ep.imgurl|getStoragePath}" style="max-width:60px;">
                                     {else}
-                                    <button type="button" onclick="Feng.showPdf('{$ep.imgurl|getStoragePath}','beian')" class="btn btn-xs btn-danger"><i class="fa fa-file-pdf-o" aria-hidden="true"></i></button>
+                                    <button type="button" onclick="Feng.showPdf('{$ep.imgurl|getStoragePath}', 'beian')" class="btn btn-xs btn-danger"><i class="fa fa-file-pdf-o" aria-hidden="true"></i></button>
                                     {/if}
-                                {/if}
+                                    {/if}
+                                </div>
                             </td>
                         </tr>
                         <tr>
@@ -139,14 +140,16 @@
                                 <label>
                                     开户许可证
                                 </label>
-                                {if condition="$ep['bankImg']"}
+                                <div>
+                                    {if condition="$ep['bankImg']"}
                                     {if condition="$ep['bankImg_is_img']"}
                                     <img onclick="Feng.showImg(this)" id="bankImg" alt="开户许可证"
-                                         src="{$ep.bankImg|getStoragePath}" style="max-width: 100px;">
+                                         src="{$ep.bankImg|getStoragePath}" style="max-width:60px;">
                                     {else}
-                                    <button type="button" onclick="Feng.showPdf('{$ep.bankImg|getStoragePath}','bankImg')" class="btn btn-xs btn-danger"><i class="fa fa-file-pdf-o" aria-hidden="true"></i></button>
+                                    <button type="button" onclick="Feng.showPdf('{$ep.bankImg|getStoragePath}', 'bankImg')" class="btn btn-xs btn-danger"><i class="fa fa-file-pdf-o" aria-hidden="true"></i></button>
                                     {/if}
-                                {/if}
+                                    {/if}
+                                </div>
                             </td>
                         </tr>
                         <tr>
@@ -192,7 +195,19 @@
                                 {$ep.industryFieldOldName}
                             </td>
                             <td>
-                                行业领域佐证材料
+                                <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>
                         <tr class="type1">
@@ -209,14 +224,19 @@
                                 {$ep.enterpriseTypeName}
                             </td>
                             <td>
-                                {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: 100px;">
+                                <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.domainImg|getStoragePath}','domainImg')" class="btn btn-xs btn-danger"><i class="fa fa-file-pdf-o" aria-hidden="true"></i></button>
+                                    <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}
+                                    {/if}
+                                </div>
                             </td>
                         </tr>
                     </table>
@@ -255,12 +275,12 @@
                             </td>
                             <td style="text-align: left">
                                 {if condition="$ep['beian']"}
-                                    {if condition="$ep['beian_is_img']"}
-                                    <img onclick="Feng.showImg(this)" id="beian" alt="人才联络员信息备案表"
-                                         src="{$ep.beian|getStoragePath}" style="max-width: 100px;">
-                                    {else}
-                                    <button type="button" onclick="Feng.showPdf('{$ep.beian|getStoragePath}','beian')" class="btn btn-xs btn-danger">点击查看</button>
-                                    {/if}
+                                {if condition="$ep['beian_is_img']"}
+                                <img onclick="Feng.showImg(this)" id="beian" alt="人才联络员信息备案表"
+                                     src="{$ep.beian|getStoragePath}" style="max-width:60px;">
+                                {else}
+                                <button type="button" onclick="Feng.showPdf('{$ep.beian|getStoragePath}', 'beian')" class="btn btn-xs btn-danger">点击查看</button>
+                                {/if}
                                 {/if}
                             </td>
                         </tr>

+ 70 - 37
app/admin/view/enterprise_change_record/goto_enterprise_change_detail_page.html

@@ -53,10 +53,6 @@
     span.old{text-decoration:line-through;}
     ul.files{list-style:none;display:flex;justify-content:center;padding:0;align-items:flex-start;}
     ul.files li{overflow:hidden;position:relative;margin-right:10px;float:left;}
-    ul.yyzz li{width:100px;}
-    ul.khxkz li{width:100px;}
-    ul.hyly li{width:100px;}
-    ul.beian li{width:100px;}
     ul.files i.old{text-align:center;height:0;width:0;line-height:15px;color:#fff;position:absolute;right:0;bottom:0;border-top:15px solid transparent;border-right:15px solid #000;border-bottom:15px solid #000;border-left:15px solid transparent;display:block;}
     ul.files i.new{text-align:center;height:0;width:0;line-height:15px;color:#000;position:absolute;right:0;bottom:0;border-top:15px solid transparent;border-right:15px solid #0bfd1a;border-bottom:15px solid #0bfd1a;border-left:15px solid transparent;display:block;}
 </style>
@@ -88,9 +84,9 @@
                                     {if condition="$ecr['oldImgurl']"}
                                     <li>
                                         {if condition="$ecr['oldImgurl_is_img'] eq 1"}
-                                        <img onclick="Feng.showImg(this)" src="{$ecr.oldImgurl|getStoragePath}" style="max-width:100px;">
+                                        <img onclick="Feng.showImg(this)" src="{$ecr.oldImgurl|getStoragePath}" style="max-height:60px">
                                         {else/}
-                                        <img src="/static/img/Pdf.png" onclick="Feng.showPdf('{$ecr.oldImgurl|getStoragePath}', 'imgurl')" style="max-width:100px;">
+                                        <img src="/static/img/Pdf.png" onclick="Feng.showPdf('{$ecr.oldImgurl|getStoragePath}', 'imgurl')" style="max-height:60px">
                                         {/if}
                                     </li>
                                     {/if}
@@ -98,18 +94,18 @@
                                     {if condition="$ecr['oldImgurl']"}
                                     <li>
                                         {if condition="$ecr['oldImgurl_is_img'] eq 1"}
-                                        <img onclick="Feng.showImg(this)" src="{$ecr.oldImgurl|getStoragePath}" style="max-width:100px;"><i class="old">旧</i>
+                                        <img onclick="Feng.showImg(this)" src="{$ecr.oldImgurl|getStoragePath}" style="max-height:60px"><i class="old">旧</i>
                                         {else/}
-                                        <img src="/static/img/Pdf.png" onclick="Feng.showPdf('{$ecr.oldImgurl|getStoragePath}', 'imgurl')" style="max-width:100px;"><i class="old">旧</i>
+                                        <img src="/static/img/Pdf.png" onclick="Feng.showPdf('{$ecr.oldImgurl|getStoragePath}', 'imgurl')" style="max-height:60px"><i class="old">旧</i>
                                         {/if}
                                     </li>
                                     {/if}
                                     {if condition="$ecr['newImgurl']"}
                                     <li>
                                         {if condition="$ecr['newImgurl_is_img'] eq 1"}
-                                        <img src="{$ecr.newImgurl|getStoragePath}" onclick="Feng.showImg(this)" style="max-width:100px;"/><i class="new">新</i>
+                                        <img src="{$ecr.newImgurl|getStoragePath}" onclick="Feng.showImg(this)" style="max-height:60px"/><i class="new">新</i>
                                         {else/}
-                                        <img src="/static/img/Pdf.png" onclick="Feng.showPdf('{$ecr.newImgurl|getStoragePath}', 'imgurl')" style="max-width:100px;"><i class="new">新</i>
+                                        <img src="/static/img/Pdf.png" onclick="Feng.showPdf('{$ecr.newImgurl|getStoragePath}', 'imgurl')" style="max-height:60px"><i class="new">新</i>
                                         {/if}
                                     </li>
                                     {/if}
@@ -157,9 +153,9 @@
                                     {if condition="$ecr['oldBankImg']"}
                                     <li>
                                         {if condition="$ecr['oldBankImg_is_img'] eq 1"}
-                                        <img onclick="Feng.showImg(this)" src="{$ecr.oldBankImg|getStoragePath}" style="max-width:100px;">
+                                        <img onclick="Feng.showImg(this)" src="{$ecr.oldBankImg|getStoragePath}" style="max-height:60px">
                                         {else/}
-                                        <img src="/static/img/Pdf.png" onclick="Feng.showPdf('{$ecr.oldBankImg|getStoragePath}', 'bankImg')" style="max-width:100px;">
+                                        <img src="/static/img/Pdf.png" onclick="Feng.showPdf('{$ecr.oldBankImg|getStoragePath}', 'bankImg')" style="max-height:60px">
                                         {/if}
                                     </li>
                                     {/if}
@@ -167,18 +163,18 @@
                                     {if condition="$ecr['oldBankImg']"}
                                     <li>
                                         {if condition="$ecr['oldBankImg_is_img'] eq 1"}
-                                        <img onclick="Feng.showImg(this)" src="{$ecr.oldBankImg|getStoragePath}" style="max-width:100px;"><i class="old">旧</i>
+                                        <img onclick="Feng.showImg(this)" src="{$ecr.oldBankImg|getStoragePath}" style="max-height:60px"><i class="old">旧</i>
                                         {else/}
-                                        <img src="/static/img/Pdf.png" onclick="Feng.showPdf('{$ecr.oldBankImg|getStoragePath}', 'bankImg')" style="max-width:100px;"><i class="old">旧</i>
+                                        <img src="/static/img/Pdf.png" onclick="Feng.showPdf('{$ecr.oldBankImg|getStoragePath}', 'bankImg')" style="max-height:60px"><i class="old">旧</i>
                                         {/if}
                                     </li>
                                     {/if}
                                     {if condition="$ecr['newBankImg']"}
                                     <li>
                                         {if condition="$ecr['newBankImg_is_img'] eq 1"}
-                                        <img src="{$ecr.newBankImg|getStoragePath}" onclick="Feng.showImg(this)" style="max-width:100px;"/><i class="new">新</i>
+                                        <img src="{$ecr.newBankImg|getStoragePath}" onclick="Feng.showImg(this)" style="max-height:60px"/><i class="new">新</i>
                                         {else/}
-                                        <img src="/static/img/Pdf.png" onclick="Feng.showPdf('{$ecr.newBankImg|getStoragePath}', 'bankImg')" style="max-width:100px;"><i class="new">新</i>
+                                        <img src="/static/img/Pdf.png" onclick="Feng.showPdf('{$ecr.newBankImg|getStoragePath}', 'bankImg')" style="max-height:60px"><i class="new">新</i>
                                         {/if}
                                     </li>
                                     {/if}
@@ -221,8 +217,42 @@
                                 行业领域
                             </td>
                             <td class="value1" data-old="{$ecr.oldIndustryFieldOldName}" data-new="{$ecr.newIndustryFieldOldName}"></td>
-                            <td class="key" style="text-align:center;">
-                                行业领域佐证材料
+                            <td style="border:1px solid #c0a16b">
+                                <label>
+                                    行业领域佐证材料
+                                </label>
+                                <ul class="files hyly">
+                                    {if condition="$ecr['oldDomainImg'] eq $ecr['newDomainImg']"}
+                                    {if condition="$ecr['oldDomainImg']"}
+                                    <li>
+                                        {if condition="$ecr['oldDomainImg_is_img'] eq 1"}
+                                        <img onclick="Feng.showImg(this)" src="{$ecr.oldDomainImg|getStoragePath}" style="max-height:60px">
+                                        {else/}
+                                        <img src="/static/img/Pdf.png" onclick="Feng.showPdf('{$ecr.oldDomainImg|getStoragePath}', 'domainImg')" style="max-height:60px">
+                                        {/if}
+                                    </li>
+                                    {/if}
+                                    {else/}
+                                    {if condition="$ecr['oldDomainImg']"}
+                                    <li>
+                                        {if condition="$ecr['oldDomainImg_is_img'] eq 1"}
+                                        <img onclick="Feng.showImg(this)" src="{$ecr.oldDomainImg|getStoragePath}" style="max-height:60px"><i class="old">旧</i>
+                                        {else/}
+                                        <img src="/static/img/Pdf.png" onclick="Feng.showPdf('{$ecr.oldDomainImg|getStoragePath}', 'domainImg')" style="max-height:60px"><i class="old">旧</i>
+                                        {/if}
+                                    </li>
+                                    {/if}
+                                    {if condition="$ecr['newDomainImg']"}
+                                    <li>
+                                        {if condition="$ecr['newDomainImg_is_img'] eq 1"}
+                                        <img src="{$ecr.newDomainImg|getStoragePath}" onclick="Feng.showImg(this)" style="max-height:60px"/><i class="new">新</i>
+                                        {else/}
+                                        <img src="/static/img/Pdf.png" onclick="Feng.showPdf('{$ecr.newDomainImg|getStoragePath}', 'domainImg')" style="max-height:60px"><i class="new">新</i>
+                                        {/if}
+                                    </li>
+                                    {/if}
+                                    {/if}
+                                </ul>
                             </td>
                         </tr>
                         <tr class="type1">
@@ -235,33 +265,36 @@
                             </td>
                             <td class="value1" data-old="{$ecr.oldEnterpriseTypeName}" data-new="{$ecr.newEnterpriseTypeName}"></td>
                             <td>
+                                <label>
+                                    规上、高新技术、专精特新企业上传材料
+                                </label>
                                 <ul class="files hyly">
-                                    {if condition="$ecr['oldDomainImg'] eq $ecr['newDomainImg']"}
-                                    {if condition="$ecr['oldDomainImg']"}
+                                    {if condition="$ecr['oldTypeImg'] eq $ecr['newTypeImg']"}
+                                    {if condition="$ecr['oldTypeImg']"}
                                     <li>
-                                        {if condition="$ecr['oldDomainImg_is_img'] eq 1"}
-                                        <img onclick="Feng.showImg(this)" src="{$ecr.oldDomainImg|getStoragePath}" style="max-width:100px;">
+                                        {if condition="$ecr['oldTypeImg_is_img'] eq 1"}
+                                        <img onclick="Feng.showImg(this)" src="{$ecr.oldTypeImg|getStoragePath}" style="max-height:60px">
                                         {else/}
-                                        <img src="/static/img/Pdf.png" onclick="Feng.showPdf('{$ecr.oldDomainImg|getStoragePath}', 'domainImg')" style="max-width:100px;">
+                                        <img src="/static/img/Pdf.png" onclick="Feng.showPdf('{$ecr.oldTypeImg|getStoragePath}', 'typeImg')" style="max-height:60px">
                                         {/if}
                                     </li>
                                     {/if}
                                     {else/}
-                                    {if condition="$ecr['oldDomainImg']"}
+                                    {if condition="$ecr['oldTypeImg']"}
                                     <li>
-                                        {if condition="$ecr['oldDomainImg_is_img'] eq 1"}
-                                        <img onclick="Feng.showImg(this)" src="{$ecr.oldDomainImg|getStoragePath}" style="max-width:100px;"><i class="old">旧</i>
+                                        {if condition="$ecr['oldTypeImg_is_img'] eq 1"}
+                                        <img onclick="Feng.showImg(this)" src="{$ecr.oldTypeImg|getStoragePath}" style="max-height:60px"><i class="old">旧</i>
                                         {else/}
-                                        <img src="/static/img/Pdf.png" onclick="Feng.showPdf('{$ecr.oldDomainImg|getStoragePath}', 'domainImg')" style="max-width:100px;"><i class="old">旧</i>
+                                        <img src="/static/img/Pdf.png" onclick="Feng.showPdf('{$ecr.oldTypeImg|getStoragePath}', 'typeImg')" style="max-height:60px"><i class="old">旧</i>
                                         {/if}
                                     </li>
                                     {/if}
-                                    {if condition="$ecr['newDomainImg']"}
+                                    {if condition="$ecr['newTypeImg']"}
                                     <li>
-                                        {if condition="$ecr['newDomainImg_is_img'] eq 1"}
-                                        <img src="{$ecr.newDomainImg|getStoragePath}" onclick="Feng.showImg(this)" style="max-width:100px;"/><i class="new">新</i>
+                                        {if condition="$ecr['newTypeImg_is_img'] eq 1"}
+                                        <img src="{$ecr.newTypeImg|getStoragePath}" onclick="Feng.showImg(this)" style="max-height:60px"/><i class="new">新</i>
                                         {else/}
-                                        <img src="/static/img/Pdf.png" onclick="Feng.showPdf('{$ecr.newDomainImg|getStoragePath}', 'domainImg')" style="max-width:100px;"><i class="new">新</i>
+                                        <img src="/static/img/Pdf.png" onclick="Feng.showPdf('{$ecr.newTypeImg|getStoragePath}', 'typeImg')" style="max-height:60px"><i class="new">新</i>
                                         {/if}
                                     </li>
                                     {/if}
@@ -304,9 +337,9 @@
                                     {if condition="$ecr['oldBeian']"}
                                     <li>
                                         {if condition="$ecr['oldBeian_is_img'] eq 1"}
-                                        <img onclick="Feng.showImg(this)" src="{$ecr.oldBeian|getStoragePath}" style="max-width:100px;">
+                                        <img onclick="Feng.showImg(this)" src="{$ecr.oldBeian|getStoragePath}" style="max-height:60px">
                                         {else/}
-                                        <img src="/static/img/Pdf.png" onclick="Feng.showPdf('{$ecr.oldBeian|getStoragePath}', 'beian')" style="max-width:100px;">
+                                        <img src="/static/img/Pdf.png" onclick="Feng.showPdf('{$ecr.oldBeian|getStoragePath}', 'beian')" style="max-height:60px">
                                         {/if}
                                     </li>
                                     {/if}
@@ -314,18 +347,18 @@
                                     {if condition="$ecr['oldBeian']"}
                                     <li>
                                         {if condition="$ecr['oldBeian_is_img'] eq 1"}
-                                        <img onclick="Feng.showImg(this)" src="{$ecr.oldBeian|getStoragePath}" style="max-width:100px;"><i class="old">旧</i>
+                                        <img onclick="Feng.showImg(this)" src="{$ecr.oldBeian|getStoragePath}" style="max-height:60px"><i class="old">旧</i>
                                         {else/}
-                                        <img src="/static/img/Pdf.png" onclick="Feng.showPdf('{$ecr.oldBeian|getStoragePath}', 'beian')" style="max-width:100px;"><i class="old">旧</i>
+                                        <img src="/static/img/Pdf.png" onclick="Feng.showPdf('{$ecr.oldBeian|getStoragePath}', 'beian')" style="max-height:60px"><i class="old">旧</i>
                                         {/if}
                                     </li>
                                     {/if}
                                     {if condition="$ecr['newBeian']"}
                                     <li>
                                         {if condition="$ecr['newBeian_is_img'] eq 1"}
-                                        <img src="{$ecr.newBeian|getStoragePath}" onclick="Feng.showImg(this)" style="max-width:100px;"/><i class="new">新</i>
+                                        <img src="{$ecr.newBeian|getStoragePath}" onclick="Feng.showImg(this)" style="max-height:60px"/><i class="new">新</i>
                                         {else/}
-                                        <img src="/static/img/Pdf.png" onclick="Feng.showPdf('{$ecr.newBeian|getStoragePath}', 'beian')" style="max-width:100px;"><i class="new">新</i>
+                                        <img src="/static/img/Pdf.png" onclick="Feng.showPdf('{$ecr.newBeian|getStoragePath}', 'beian')" style="max-height:60px"><i class="new">新</i>
                                         {/if}
                                     </li>
                                     {/if}

+ 3 - 0
app/common.php

@@ -317,6 +317,9 @@ function isImage($filename) {
 function chkEnterpriseFull($ep) {
     if ($ep["type"] == 1) {
         $checkEnterpriseFullFields = ["industryFieldNew", "enterpriseType", "bankCard", "bankNetwork", "bank", "imgurl", "bankImg", "domainImg", "beian"];
+        if (in_array($ep["enterpriseType"], ['guishang', 'gaoxinjishu', 'zhuanjingtexin'])) {
+            $checkEnterpriseFullFields[] = "typeImg";
+        }
     } else {
         $checkEnterpriseFullFields = ["bankCard", "bankNetwork", "bank", "imgurl", "bankImg", "beian"];
     }

+ 1 - 1
app/common/view/auth/enterprise_edit.html

@@ -195,7 +195,7 @@
                                                         </select>
                                                     </div>
                                                 </td>
-                                                <td {if condition="!in_array($ep['enterpriseType'],['guishang','gaoxinjishu','zhuanjingtexin'])"}style="display:none;"{/if}>
+                                                <td class="typeUploader" {if condition="!in_array($ep['enterpriseType'],['guishang','gaoxinjishu','zhuanjingtexin'])"}style="display:none;"{/if}>
                                                     <label class="control-label spacing">规上、高新技术、专精特新企业上传材料 </label>
                                                     {if condition="$ep['typeImg']"}
                                                     {if condition="$ep['typeImg_is_img'] eq 1"}

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

@@ -87,6 +87,13 @@ class Api extends EnterpriseController {
                 $ecr["domainImg_is_img"] = 1;
             }
         }
+        if ($ep["typeImg"]) {
+            $ecr["typeImg"] = $ep["typeImg"];
+            $extension = pathinfo($ep["typeImg"])["extension"];
+            if (in_array($extension, ["jpeg", "jpg", "png", "gif"])) {
+                $ecr["typeImg_is_img"] = 1;
+            }
+        }
         if ($ep["beian"]) {
             $ecr["beian"] = $ep["beian"];
             $extension = pathinfo($ep["beian"])["extension"];
@@ -201,6 +208,7 @@ class Api extends EnterpriseController {
                     "oldImgurl" => $ep["imgurl"],
                     "oldBankImg" => $ep["bankImg"],
                     "oldDomainImg" => $ep["domainImg"],
+                    "oldTypeImg" => $ep["typeImg"],
                     "oldBeian" => $ep["beian"],
                     'newName' => htmlspecialchars($data['name']),
                     'newIdCard' => htmlspecialchars($data['idCard']),
@@ -225,6 +233,7 @@ class Api extends EnterpriseController {
                 $record_data["newImgurl"] = $ep["imgurl"];
                 $record_data["newBankImg"] = $ep["bankImg"];
                 $record_data["newDomainImg"] = $ep["domainImg"];
+                $record_data["newTypeImg"] = $ep["typeImg"];
                 $record_data["newBeian"] = $ep["beian"];
                 $files = $this->request->file();
                 if ($files) {
@@ -255,6 +264,15 @@ class Api extends EnterpriseController {
                         $record_data["newDomainImg"] = $upload_result2->filepath;
                     }
 
+                    //检验附件 三种类型企业上传材料
+                    if (array_key_exists('typeImg', $files)) {
+                        $upload_result4 = $uploadapi->uploadOne($this->request->file('typeImg'), 'system');
+                        if ($upload_result4->code == 500) {
+                            return \StrUtil::back($upload_result4, "EpChangeEdit.callBack");
+                        }
+                        $record_data["newTypeImg"] = $upload_result4->filepath;
+                    }
+
                     //检验附件 人才联络员备案表
                     if (array_key_exists('beian', $files)) {
                         $upload_result3 = $uploadapi->uploadOne($this->request->file('beian'), 'system');
@@ -274,6 +292,12 @@ class Api extends EnterpriseController {
                     if ($ep->type == 1 && !$record_data["newDomainImg"]) {
                         throw new ValidateException("请上传行业领域佐证材料");
                     }
+                    if (in_array($record_data["newEnterpriseType"], ["guishang", "gaoxinjishu", "zhuanjingtexin"]) && !$record_data["newTypeImg"]) {
+                        throw new ValidateException("规上、高新技术、专精特新企业需要上传佐证材料");
+                    }
+                    if (!in_array($record_data["newEnterpriseType"], ["guishang", "gaoxinjishu", "zhuanjingtexin"])) {
+                        $record_data["newTypeImg"] = null;
+                    }
                 }
                 if (!$record_data["newBeian"]) {
                     throw new ValidateException("请上传人才联络员信息备案表");
@@ -437,6 +461,16 @@ class Api extends EnterpriseController {
                         $record["newDomainImg"] = $upload_result2->filepath;
                     }
 
+                    //检验附件 规上、高新技术、专精特新企业需要上传佐证材料
+                    $uploadAllowed = $record->checkState == 1 || ($record->checkState != 1 && in_array("newTypeImg", $modify_files)) ? true : false;
+                    if (array_key_exists('typeImg', $files) && $uploadAllowed) {
+                        $upload_result4 = $uploadapi->uploadOne($this->request->file('typeImg'), 'system');
+                        if ($upload_result4->code == 500) {
+                            return \StrUtil::back($upload_result4, "EpChangeEdit.callBack");
+                        }
+                        $record["newTypeImg"] = $upload_result4->filepath;
+                    }
+
                     //检验附件 人才联络员备案表
                     $uploadAllowed = $record->checkState == 1 || ($record->checkState != 1 && in_array("newBeian", $modify_files)) ? true : false;
                     if (array_key_exists('beian', $files) && $uploadAllowed) {
@@ -457,6 +491,12 @@ class Api extends EnterpriseController {
                     if ($ep->type == 1 && !$record["newDomainImg"]) {
                         throw new ValidateException("请上传行业领域佐证材料");
                     }
+                    if (in_array($record->newEnterpriseType, ["guishang", "gaoxinjishu", "zhuanjingtexin"]) && !$record["newTypeImg"]) {
+                        throw new ValidateException("规上、高新技术、专精特新企业需要上传佐证材料");
+                    }
+                    if (!in_array($record->newEnterpriseType, ["guishang", "gaoxinjishu", "zhuanjingtexin"])) {
+                        $record["newTypeImg"] = null;
+                    }
                 }
                 if (!$record["newBeian"]) {
                     throw new ValidateException("请上传人才联络员信息备案表");
@@ -597,6 +637,13 @@ class Api extends EnterpriseController {
                 $ecr["domainImg_is_img"] = 1;
             }
         }
+        //规上、高新技术、专精特新企业需要上传佐证材料        
+        if ($ecr["newTypeImg"]) {
+            $pathinfo = pathinfo($ecr["newTypeImg"]);
+            if (in_array($pathinfo["extension"], ["jpeg", "jpg", "png", "gif"])) {
+                $ecr["typeImg_is_img"] = 1;
+            }
+        }
         //开户许可证
         if (!$ecr["newBankImg"]) {
             //兼容旧filetype
@@ -813,6 +860,19 @@ class Api extends EnterpriseController {
                 $ecr["newDomainImg_is_img"] = 1;
             }
         }
+        //规上、高新技术、专精特新企业需要上传佐证材料
+        if ($ecr["oldTypeImg"]) {
+            $pathinfo = pathinfo($ecr["oldTypeImg"]);
+            if (in_array($pathinfo["extension"], ["jpeg", "jpg", "png", "gif"])) {
+                $ecr["oldTypeImg_is_img"] = 1;
+            }
+        }
+        if ($ecr["newTypeImg"]) {
+            $pathinfo = pathinfo($ecr["newTypeImg"]);
+            if (in_array($pathinfo["extension"], ["jpeg", "jpg", "png", "gif"])) {
+                $ecr["newTypeImg_is_img"] = 1;
+            }
+        }
         //开户许可证
         if (!$ecr["oldBankImg"]) {
             $ecr["oldBankImg"] = $ep["bankImg"];

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

@@ -22,6 +22,9 @@ class Index extends EnterpriseController {
         $ep = \app\common\api\EnterpriseApi::getOne($this->user["uid"]);
         if ($ep["type"] == 1) {
             $checkEnterpriseFullFields = ["industryFieldNew", "enterpriseType", "bankCard", "bankNetwork", "bank", "imgurl", "bankImg", "domainImg", "beian"];
+            if (in_array($ep["enterpriseType"], ['guishang', 'gaoxinjishu', 'zhuanjingtexin'])) {
+                $checkEnterpriseFullFields[] = "typeImg";
+            }
         } else {
             $checkEnterpriseFullFields = ["bankCard", "bankNetwork", "bank", "imgurl", "bankImg", "beian"];
         }
@@ -61,6 +64,12 @@ class Index extends EnterpriseController {
                 $ep["domainImg_is_img"] = 1;
             }
         }
+        if ($ep["typeImg"]) {
+            $pathinfo = pathinfo($ep["typeImg"]);
+            if (in_array($pathinfo["extension"], ["jpg", "jpeg", "png", "gif"])) {
+                $ep["typeImg_is_img"] = 1;
+            }
+        }
         if ($ep["beian"]) {
             $pathinfo = pathinfo($ep["beian"]);
             if (in_array($pathinfo["extension"], ["jpg", "jpeg", "png", "gif"])) {

+ 28 - 14
app/enterprise/view/api/to_add.html

@@ -63,12 +63,12 @@
                                     <label class="control-label spacing"><span class="text-danger">*</span>{eq name="ecr.special" value="0"}营业执照{else/}事业单位法人证或批文{/eq}</label>
                                     {if condition="$ecr['imgurl']"}
                                     {eq name="ecr.imgurl_is_img" value="1"}
-                                    <img src="{$ecr.imgurl|getStoragePath}" style="height: 60px;" onclick="Feng.showImg(this)">
+                                    <img src="{$ecr.imgurl|getStoragePath}" style="height:60px;" onclick="Feng.showImg(this)">
                                     {else/}
-                                    <img src="/static/img/Pdf.png" style="height: 60px;" onclick="Feng.showPdf('{$ecr.imgurl|getStoragePath}', 'imgurl')">
+                                    <img src="/static/img/Pdf.png" style="height:60px;" onclick="Feng.showPdf('{$ecr.imgurl|getStoragePath}', 'imgurl')">
                                     {/eq}
                                     {else/}
-                                    <img src="/static/img/yyzz.png" style="height: 60px;">
+                                    <img src="/static/img/yyzz.png" style="height:60px;">
                                     {/if}                                
                                     <input style="display: none" autocomplete="off" type="file" class="form-control" id="imgurl" name="imgurl" />
                                 </td>
@@ -117,12 +117,12 @@
                                     <label class="control-label spacing"><span class="text-danger">*</span>开户许可证</label>
                                     {if condition="$ecr['bankImg']"}
                                     {eq name="ecr.bankImg_is_img" value="1"}
-                                    <img src="{$ecr.bankImg|getStoragePath}" style="height: 60px;" onclick="Feng.showImg(this)" >
+                                    <img src="{$ecr.bankImg|getStoragePath}" style="height:60px;" onclick="Feng.showImg(this)" >
                                     {else/}
-                                    <img src="/static/img/Pdf.png" style="height: 60px;" onclick="Feng.showPdf('{$ecr.bankImg|getStoragePath}', 'bankImg')">
+                                    <img src="/static/img/Pdf.png" style="height:60px;" onclick="Feng.showPdf('{$ecr.bankImg|getStoragePath}', 'bankImg')">
                                     {/eq}
                                     {else/}
-                                    <img src="/static/img/yyzz.png" style="height: 60px;">
+                                    <img src="/static/img/yyzz.png" style="height:60px;">
                                     {/if}
                                     <input style="display: none" autocomplete="off" type="file" class="form-control" id="bankImg" name="bankImg" />
                                 </td>
@@ -165,17 +165,17 @@
                                             </select>
                                         </div>
                                     </td>
-                                    <td rowspan="2" style="position:relative;">
+                                    <td style="position:relative;">
                                         <button type="button" class="btn btn-info btn-sm" style="position:absolute;right:5px;top:5px;" onclick="$('#domainImg').click()"><i class="fa fa-upload" aria-hidden="true"></i>上传文件</button>
                                         <label class="control-label spacing"><span style="color: red">*</span>行业领域上传材料</label>
                                         {if condition="$ecr['domainImg']"}
                                         {eq name="ecr.domainImg_is_img" value="1"}
-                                        <img src="{$ecr.domainImg|getStoragePath}" style="height: 60px;" onclick="Feng.showImg(this)" >
+                                        <img src="{$ecr.domainImg|getStoragePath}" style="height:60px;" onclick="Feng.showImg(this)" >
                                         {else/}
-                                        <img src="/static/img/Pdf.png" style="height: 60px;" onclick="Feng.showPdf('{$ecr.domainImg|getStoragePath}', 'domainImg')">
+                                        <img src="/static/img/Pdf.png" style="height:60px;" onclick="Feng.showPdf('{$ecr.domainImg|getStoragePath}', 'domainImg')">
                                         {/eq}
                                         {else/}
-                                        <img src="/static/img/yyzz.png" style="height: 60px;">
+                                        <img src="/static/img/yyzz.png" style="height:60px;">
                                         {/if}
                                         <input style="display: none" autocomplete="off" type="file" class="form-control" id="domainImg" name="domainImg" />
                                     </td>
@@ -191,10 +191,24 @@
                                     <td>
                                         <div class="rowGroup">
                                             <label class="control-label spacing td-label"><span style="color: red">*</span>企业类型</label>
-                                            <select class="form-control" id="newEnterpriseType" name="newEnterpriseType" value="{$ecr.newEnterpriseType}">
+                                            <select class="form-control" id="newEnterpriseType" name="newEnterpriseType" value="{$ecr.newEnterpriseType}" onchange="EpChangeEdit.changeEnterpriseType()">
                                             </select>
                                         </div>
                                     </td>
+                                    <td class="typeUploader" {if condition="in_array($ecr.newEnterpriseType,['guishang','gaoxinjishu','zhuanjingtexin'])"}style="position:relative;"{else/}style="position:relative;display:none;"{/if}>
+                                        <button type="button" class="btn btn-info btn-sm" style="position:absolute;right:5px;top:5px;" onclick="$('#typeImg').click()"><i class="fa fa-upload" aria-hidden="true"></i>上传文件</button>
+                                        <label class="control-label spacing"><span style="color: red">*</span>规上、高新技术、专精特新企业上传材料</label>
+                                        {if condition="$ecr['typeImg']"}
+                                        {eq name="ecr.typeImg_is_img" value="1"}
+                                        <img src="{$ecr.typeImg|getStoragePath}" style="height:60px;" onclick="Feng.showImg(this)" >
+                                        {else/}
+                                        <img src="/static/img/Pdf.png" style="height:60px;" onclick="Feng.showPdf('{$ecr.typeImg|getStoragePath}', 'typeImg')">
+                                        {/eq}
+                                        {else/}
+                                        <img src="/static/img/yyzz.png" style="height:60px;">
+                                        {/if}
+                                        <input style="display: none" autocomplete="off" type="file" class="form-control" id="typeImg" name="typeImg" />
+                                    </td>
                                 </tr>
                             </table>
                         </div>
@@ -230,12 +244,12 @@
                                     <label class="control-label spacing" style="text-align: center"><span style="color: red">*</span>人才联络员备案表<br /><a href="/beianbiao.doc" style="color: red">(点击此处下载模板)</a>  </label>
                                     {if condition="$ecr['beian']"}
                                     {eq name="ecr.beian_is_img" value="1"}
-                                    <img src="{$ecr.beian|getStoragePath}" style="height: 60px;" onclick="Feng.showImg(this)" >
+                                    <img src="{$ecr.beian|getStoragePath}" style="height:60px;" onclick="Feng.showImg(this)" >
                                     {else/}
-                                    <img src="/static/img/Pdf.png" style="height: 60px;" onclick="Feng.showPdf('{$ecr.beian|getStoragePath}', 'beian')">
+                                    <img src="/static/img/Pdf.png" style="height:60px;" onclick="Feng.showPdf('{$ecr.beian|getStoragePath}', 'beian')">
                                     {/eq}
                                     {else/}
-                                    <img src="/static/img/yyzz.png" style="height: 60px;">
+                                    <img src="/static/img/yyzz.png" style="height:60px;">
                                     {/if}
                                     <input style="display: none" autocomplete="off" type="file" class="form-control" id="beian" name="beian" />
                                 </td>

+ 68 - 37
app/enterprise/view/api/to_detail.html

@@ -53,10 +53,6 @@
     span.old{text-decoration:line-through;}
     ul.files{list-style:none;display:flex;justify-content:center;padding:0;align-items:flex-start;}
     ul.files li{overflow:hidden;position:relative;margin-right:10px;float:left;}
-    ul.yyzz li{width:100px;}
-    ul.khxkz li{width:100px;}
-    ul.hyly li{width:100px;}
-    ul.beian li{width:100px;}
     ul.files i.old{text-align:center;height:0;width:0;line-height:15px;color:#fff;position:absolute;right:0;bottom:0;border-top:15px solid transparent;border-right:15px solid #000;border-bottom:15px solid #000;border-left:15px solid transparent;display:block;}
     ul.files i.new{text-align:center;height:0;width:0;line-height:15px;color:#000;position:absolute;right:0;bottom:0;border-top:15px solid transparent;border-right:15px solid #0bfd1a;border-bottom:15px solid #0bfd1a;border-left:15px solid transparent;display:block;}
 </style>
@@ -87,27 +83,27 @@
                                     {if condition="$ecr['oldImgurl'] eq $ecr['newImgurl']"}
                                     <li>
                                         {if condition="$ecr['oldImgurl_is_img'] eq 1"}
-                                        <img onclick="Feng.showImg(this)" src="{$ecr.oldImgurl|getStoragePath}" style="max-width:100px;">
+                                        <img onclick="Feng.showImg(this)" src="{$ecr.oldImgurl|getStoragePath}" style="max-height:60px;">
                                         {else/}
-                                        <img src="/static/img/Pdf.png" onclick="Feng.showPdf('{$ecr.oldImgurl|getStoragePath}', 'imgurl')" style="max-width:100px;">
+                                        <img src="/static/img/Pdf.png" onclick="Feng.showPdf('{$ecr.oldImgurl|getStoragePath}', 'imgurl')" style="max-height:60px;">
                                         {/if}
                                     </li>
                                     {else/}
                                     {if condition="$ecr['oldImgurl']"}
                                     <li>
                                         {if condition="$ecr['oldImgurl_is_img'] eq 1"}
-                                        <img onclick="Feng.showImg(this)" src="{$ecr.oldImgurl|getStoragePath}" style="max-width:100px;"><i class="old">旧</i>
+                                        <img onclick="Feng.showImg(this)" src="{$ecr.oldImgurl|getStoragePath}" style="max-height:60px;"><i class="old">旧</i>
                                         {else/}
-                                        <img src="/static/img/Pdf.png" onclick="Feng.showPdf('{$ecr.oldImgurl|getStoragePath}', 'imgurl')" style="max-width:100px;"><i class="old">旧</i>
+                                        <img src="/static/img/Pdf.png" onclick="Feng.showPdf('{$ecr.oldImgurl|getStoragePath}', 'imgurl')" style="max-height:60px;"><i class="old">旧</i>
                                         {/if}
                                     </li>
                                     {/if}
                                     {if condition="$ecr['newImgurl']"}
                                     <li>
                                         {if condition="$ecr['newImgurl_is_img'] eq 1"}
-                                        <img src="{$ecr.newImgurl|getStoragePath}" onclick="Feng.showImg(this)" style="max-width:100px;"/><i class="new">新</i>
+                                        <img src="{$ecr.newImgurl|getStoragePath}" onclick="Feng.showImg(this)" style="max-height:60px;"/><i class="new">新</i>
                                         {else/}
-                                        <img src="/static/img/Pdf.png" onclick="Feng.showPdf('{$ecr.newImgurl|getStoragePath}', 'imgurl')" style="max-width:100px;"><i class="new">新</i>
+                                        <img src="/static/img/Pdf.png" onclick="Feng.showPdf('{$ecr.newImgurl|getStoragePath}', 'imgurl')" style="max-height:60px;"><i class="new">新</i>
                                         {/if}
                                     </li>
                                     {/if}
@@ -154,27 +150,27 @@
                                     {if condition="$ecr['oldBankImg'] eq $ecr['newBankImg']"}
                                     <li>
                                         {if condition="$ecr['oldBankImg_is_img'] eq 1"}
-                                        <img onclick="Feng.showImg(this)" src="{$ecr.oldBankImg|getStoragePath}" style="max-width:100px;">
+                                        <img onclick="Feng.showImg(this)" src="{$ecr.oldBankImg|getStoragePath}" style="max-height:60px;">
                                         {else/}
-                                        <img src="/static/img/Pdf.png" onclick="Feng.showPdf('{$ecr.oldBankImg|getStoragePath}', 'bankImg')" style="max-width:100px;">
+                                        <img src="/static/img/Pdf.png" onclick="Feng.showPdf('{$ecr.oldBankImg|getStoragePath}', 'bankImg')" style="max-height:60px;">
                                         {/if}
                                     </li>
                                     {else/}
                                     {if condition="$ecr['oldBankImg']"}
                                     <li>
                                         {if condition="$ecr['oldBankImg_is_img'] eq 1"}
-                                        <img onclick="Feng.showImg(this)" src="{$ecr.oldBankImg|getStoragePath}" style="max-width:100px;"><i class="old">旧</i>
+                                        <img onclick="Feng.showImg(this)" src="{$ecr.oldBankImg|getStoragePath}" style="max-height:60px;"><i class="old">旧</i>
                                         {else/}
-                                        <img src="/static/img/Pdf.png" onclick="Feng.showPdf('{$ecr.oldBankImg|getStoragePath}', 'bankImg')" style="max-width:100px;"><i class="old">旧</i>
+                                        <img src="/static/img/Pdf.png" onclick="Feng.showPdf('{$ecr.oldBankImg|getStoragePath}', 'bankImg')" style="max-height:60px;"><i class="old">旧</i>
                                         {/if}
                                     </li>
                                     {/if}
                                     {if condition="$ecr['newBankImg']"}
                                     <li>
                                         {if condition="$ecr['newBankImg_is_img'] eq 1"}
-                                        <img src="{$ecr.newBankImg|getStoragePath}" onclick="Feng.showImg(this)" style="max-width:100px;"/><i class="new">新</i>
+                                        <img src="{$ecr.newBankImg|getStoragePath}" onclick="Feng.showImg(this)" style="max-height:60px;"/><i class="new">新</i>
                                         {else/}
-                                        <img src="/static/img/Pdf.png" onclick="Feng.showPdf('{$ecr.newBankImg|getStoragePath}', 'bankImg')" style="max-width:100px;"><i class="new">新</i>
+                                        <img src="/static/img/Pdf.png" onclick="Feng.showPdf('{$ecr.newBankImg|getStoragePath}', 'bankImg')" style="max-height:60px;"><i class="new">新</i>
                                         {/if}
                                     </li>
                                     {/if}
@@ -217,8 +213,40 @@
                                 行业领域
                             </td>
                             <td class="value1" data-old="{$ecr.oldIndustryFieldOldName}" data-new="{$ecr.newIndustryFieldOldName}"></td>
-                            <td class="key" style="text-align:center;">
-                                行业领域佐证材料
+                            <td style="border: 1px solid #c0a16b;width: 300px">
+                                <label>
+                                    行业领域佐证材料
+                                </label>
+                                <ul class="files hyly">
+                                    {if condition="$ecr['oldDomainImg'] eq $ecr['newDomainImg']"}
+                                    <li>
+                                        {if condition="$ecr['oldDomainImg_is_img'] eq 1"}
+                                        <img onclick="Feng.showImg(this)" src="{$ecr.oldDomainImg|getStoragePath}" style="max-height:60px;">
+                                        {else/}
+                                        <img src="/static/img/Pdf.png" onclick="Feng.showPdf('{$ecr.oldDomainImg|getStoragePath}', 'domainImg')" style="max-height:60px;">
+                                        {/if}
+                                    </li>
+                                    {else/}
+                                    {if condition="$ecr['oldDomainImg']"}
+                                    <li>
+                                        {if condition="$ecr['oldDomainImg_is_img'] eq 1"}
+                                        <img onclick="Feng.showImg(this)" src="{$ecr.oldDomainImg|getStoragePath}" style="max-height:60px;"><i class="old">旧</i>
+                                        {else/}
+                                        <img src="/static/img/Pdf.png" onclick="Feng.showPdf('{$ecr.oldDomainImg|getStoragePath}', 'domainImg')" style="max-height:60px;"><i class="old">旧</i>
+                                        {/if}
+                                    </li>
+                                    {/if}
+                                    {if condition="$ecr['newDomainImg']"}
+                                    <li>
+                                        {if condition="$ecr['newDomainImg_is_img'] eq 1"}
+                                        <img src="{$ecr.newDomainImg|getStoragePath}" onclick="Feng.showImg(this)" style="max-height:60px;"/><i class="new">新</i>
+                                        {else/}
+                                        <img src="/static/img/Pdf.png" onclick="Feng.showPdf('{$ecr.newDomainImg|getStoragePath}', 'domainImg')" style="max-height:60px;"><i class="new">新</i>
+                                        {/if}
+                                    </li>
+                                    {/if}
+                                    {/if}
+                                </ul>
                             </td>
                         </tr>
                         <tr class="type1">
@@ -230,32 +258,35 @@
                                 企业类型
                             </td>
                             <td class="value1" data-old="{$ecr.oldEnterpriseTypeName}" data-new="{$ecr.newEnterpriseTypeName}"></td>
-                            <td>
+                            <td style="border:1px solid #c0a16b;width: 300px">
+                                <label>
+                                    规上、高新技术、专精特新企业上传材料
+                                </label>
                                 <ul class="files hyly">
-                                    {if condition="$ecr['oldDomainImg'] eq $ecr['newDomainImg']"}
+                                    {if condition="$ecr['oldTypeImg'] eq $ecr['newTypeImg']"}
                                     <li>
-                                        {if condition="$ecr['oldDomainImg_is_img'] eq 1"}
-                                        <img onclick="Feng.showImg(this)" src="{$ecr.oldDomainImg|getStoragePath}" style="max-width:100px;">
+                                        {if condition="$ecr['oldTypeImg_is_img'] eq 1"}
+                                        <img onclick="Feng.showImg(this)" src="{$ecr.oldTypeImg|getStoragePath}" style="max-height:60px;">
                                         {else/}
-                                        <img src="/static/img/Pdf.png" onclick="Feng.showPdf('{$ecr.oldDomainImg|getStoragePath}', 'domainImg')" style="max-width:100px;">
+                                        <img src="/static/img/Pdf.png" onclick="Feng.showPdf('{$ecr.oldTypeImg|getStoragePath}', 'typeImg')" style="max-height:60px;">
                                         {/if}
                                     </li>
                                     {else/}
-                                    {if condition="$ecr['oldDomainImg']"}
+                                    {if condition="$ecr['oldTypeImg']"}
                                     <li>
-                                        {if condition="$ecr['oldDomainImg_is_img'] eq 1"}
-                                        <img onclick="Feng.showImg(this)" src="{$ecr.oldDomainImg|getStoragePath}" style="max-width:100px;"><i class="old">旧</i>
+                                        {if condition="$ecr['oldTypeImg_is_img'] eq 1"}
+                                        <img onclick="Feng.showImg(this)" src="{$ecr.oldTypeImg|getStoragePath}" style="max-height:60px;"><i class="old">旧</i>
                                         {else/}
-                                        <img src="/static/img/Pdf.png" onclick="Feng.showPdf('{$ecr.oldDomainImg|getStoragePath}', 'domainImg')" style="max-width:100px;"><i class="old">旧</i>
+                                        <img src="/static/img/Pdf.png" onclick="Feng.showPdf('{$ecr.oldTypeImg|getStoragePath}', 'typeImg')" style="max-height:60px;"><i class="old">旧</i>
                                         {/if}
                                     </li>
                                     {/if}
-                                    {if condition="$ecr['newDomainImg']"}
+                                    {if condition="$ecr['newTypeImg']"}
                                     <li>
-                                        {if condition="$ecr['newDomainImg_is_img'] eq 1"}
-                                        <img src="{$ecr.newDomainImg|getStoragePath}" onclick="Feng.showImg(this)" style="max-width:100px;"/><i class="new">新</i>
+                                        {if condition="$ecr['newTypeImg_is_img'] eq 1"}
+                                        <img src="{$ecr.newTypeImg|getStoragePath}" onclick="Feng.showImg(this)" style="max-height:60px;"/><i class="new">新</i>
                                         {else/}
-                                        <img src="/static/img/Pdf.png" onclick="Feng.showPdf('{$ecr.newDomainImg|getStoragePath}', 'domainImg')" style="max-width:100px;"><i class="new">新</i>
+                                        <img src="/static/img/Pdf.png" onclick="Feng.showPdf('{$ecr.newTypeImg|getStoragePath}', 'typeImg')" style="max-height:60px;"><i class="new">新</i>
                                         {/if}
                                     </li>
                                     {/if}
@@ -297,27 +328,27 @@
                                     {if condition="$ecr['oldBeian'] eq $ecr['newBeian']"}
                                     <li>
                                         {if condition="$ecr['oldBeian_is_img'] eq 1"}
-                                        <img onclick="Feng.showImg(this)" src="{$ecr.oldBeian|getStoragePath}" style="max-width:100px;">
+                                        <img onclick="Feng.showImg(this)" src="{$ecr.oldBeian|getStoragePath}" style="max-height:60px;">
                                         {else/}
-                                        <img src="/static/img/Pdf.png" onclick="Feng.showPdf('{$ecr.oldBeian|getStoragePath}', 'beian')" style="max-width:100px;">
+                                        <img src="/static/img/Pdf.png" onclick="Feng.showPdf('{$ecr.oldBeian|getStoragePath}', 'beian')" style="max-height:60px;">
                                         {/if}
                                     </li>
                                     {else/}
                                     {if condition="$ecr['oldBeian']"}
                                     <li>
                                         {if condition="$ecr['oldBeian_is_img'] eq 1"}
-                                        <img onclick="Feng.showImg(this)" src="{$ecr.oldBeian|getStoragePath}" style="max-width:100px;"><i class="old">旧</i>
+                                        <img onclick="Feng.showImg(this)" src="{$ecr.oldBeian|getStoragePath}" style="max-height:60px;"><i class="old">旧</i>
                                         {else/}
-                                        <img src="/static/img/Pdf.png" onclick="Feng.showPdf('{$ecr.oldBeian|getStoragePath}', 'beian')" style="max-width:100px;"><i class="old">旧</i>
+                                        <img src="/static/img/Pdf.png" onclick="Feng.showPdf('{$ecr.oldBeian|getStoragePath}', 'beian')" style="max-height:60px;"><i class="old">旧</i>
                                         {/if}
                                     </li>
                                     {/if}
                                     {if condition="$ecr['newBeian']"}
                                     <li>
                                         {if condition="$ecr['newBeian_is_img'] eq 1"}
-                                        <img src="{$ecr.newBeian|getStoragePath}" onclick="Feng.showImg(this)" style="max-width:100px;"/><i class="new">新</i>
+                                        <img src="{$ecr.newBeian|getStoragePath}" onclick="Feng.showImg(this)" style="max-height:60px;"/><i class="new">新</i>
                                         {else/}
-                                        <img src="/static/img/Pdf.png" onclick="Feng.showPdf('{$ecr.newBeian|getStoragePath}', 'beian')" style="max-width:100px;"><i class="new">新</i>
+                                        <img src="/static/img/Pdf.png" onclick="Feng.showPdf('{$ecr.newBeian|getStoragePath}', 'beian')" style="max-height:60px;"><i class="new">新</i>
                                         {/if}
                                     </li>
                                     {/if}

+ 16 - 2
app/enterprise/view/api/to_update.html

@@ -168,7 +168,7 @@
                                             </select>
                                         </div>
                                     </td>
-                                    <td rowspan="2" style="position:relative;">
+                                    <td style="position:relative;">
                                         <button type="button" class="btn btn-info btn-sm" style="position:absolute;right:5px;top:5px;" onclick="$('#domainImg').click()"><i class="fa fa-upload" aria-hidden="true"></i>上传文件</button>
                                         <label class="control-label spacing"><span style="color: red">*</span>行业领域上传材料</label>
                                         {if condition="$ecr['newDomainImg']"}
@@ -194,10 +194,24 @@
                                     <td>
                                         <div class="rowGroup">
                                             <label class="control-label spacing td-label"><span style="color: red">*</span>企业类型</label>
-                                            <select class="form-control" id="newEnterpriseType" name="newEnterpriseType" value="{$ecr.newEnterpriseType}">
+                                            <select class="form-control" id="newEnterpriseType" name="newEnterpriseType" value="{$ecr.newEnterpriseType}" onchange="EpChangeEdit.changeEnterpriseType()">
                                             </select>
                                         </div>
                                     </td>
+                                    <td class="typeUploader" {if condition="in_array($ecr.newEnterpriseType,['guishang','gaoxinjishu','zhuanjingtexin'])"}style="position:relative;"{else/}style="position:relative;display:none;"{/if}>
+                                        <button type="button" class="btn btn-info btn-sm" style="position:absolute;right:5px;top:5px;" onclick="$('#typeImg').click()"><i class="fa fa-upload" aria-hidden="true"></i>上传文件</button>
+                                        <label class="control-label spacing"><span style="color: red">*</span>规上、高新技术、专精特新企业上传材料</label>
+                                        {if condition="$ecr['newTypeImg']"}
+                                        {eq name="ecr.typeImg_is_img" value="1"}
+                                        <img src="{$ecr.newTypeImg|getStoragePath}" style="height: 60px;" onclick="Feng.showImg(this)" >
+                                        {else/}
+                                        <img src="/static/img/Pdf.png" style="height: 60px;" onclick="Feng.showPdf('{$ecr.newTypeImg|getStoragePath}', 'typeImg')">
+                                        {/eq}
+                                        {else/}
+                                        <img src="/static/img/yyzz.png" style="height: 60px;">
+                                        {/if}
+                                        <input style="display: none" autocomplete="off" type="file" class="form-control" id="typeImg" name="typeImg" />
+                                    </td>
                                 </tr>
                             </table>
                         </div>

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

@@ -65,9 +65,9 @@
                                                         <label>{eq name="ep.special" value="0"}营业执照{else/}事业单位法人证或批文{/eq}</label>
                                                         {if condition="$ep['imgurl']"}
                                                         {if condition="$ep['imgurl_is_img'] eq 1"}
-                                                        <img onclick="Feng.showImg(this)" id="yyzz" src="{$ep.imgurl|getStoragePath}" style="max-width: 100px;">
+                                                        <img onclick="Feng.showImg(this)" id="yyzz" src="{$ep.imgurl|getStoragePath}" style="max-height:60px">
                                                         {else/}
-                                                        <img onclick="Feng.showPdf('{$ep.imgurl|getStoragePath}', 'imgurl')" src="/static/img/Pdf.png" style="max-width: 100px;">
+                                                        <img onclick="Feng.showPdf('{$ep.imgurl|getStoragePath}', 'imgurl')" src="/static/img/Pdf.png" style="max-height:60px">
                                                         {/if}
                                                         {/if}
                                                     </td>
@@ -126,9 +126,9 @@
                                                         <label>开户许可证</label>
                                                         {if condition="$ep['bankImg']"}
                                                         {if condition="$ep['bankImg_is_img'] eq 1"}
-                                                        <img onclick="Feng.showImg(this)" id="bankImg" src="{$ep.bankImg|getStoragePath}" style="max-width: 100px;">
+                                                        <img onclick="Feng.showImg(this)" id="bankImg" src="{$ep.bankImg|getStoragePath}" style="max-height:60px">
                                                         {else/}
-                                                        <img onclick="Feng.showPdf('{$ep.bankImg|getStoragePath}', 'bankImg')" src="/static/img/Pdf.png" style="max-width: 100px;">
+                                                        <img onclick="Feng.showPdf('{$ep.bankImg|getStoragePath}', 'bankImg')" src="/static/img/Pdf.png" style="max-height:60px">
                                                         {/if}
                                                         {/if}
                                                     </td>
@@ -174,13 +174,13 @@
                                                     <td class="value1" style="border-right: 1px solid #c0a16b">
                                                         {$ep.industryFieldOldName}
                                                     </td>
-                                                    <td rowspan="2" style="border: 1px solid #c0a16b">
+                                                    <td style="border: 1px solid #c0a16b">
                                                         <label>行业领域佐证材料</label>
                                                         {if condition="$ep['domainImg']"}
                                                         {if condition="$ep['domainImg_is_img'] eq 1"}
-                                                        <img onclick="Feng.showImg(this)" id="domainImg" src="{$ep.domainImg|getStoragePath}" style="max-width: 100px;">
+                                                        <img onclick="Feng.showImg(this)" id="domainImg" src="{$ep.domainImg|getStoragePath}" style="max-height:60px">
                                                         {else/}
-                                                        <img onclick="Feng.showPdf('{$ep.domainImg|getStoragePath}', 'domainImg')" src="/static/img/Pdf.png" style="max-width: 100px;">
+                                                        <img onclick="Feng.showPdf('{$ep.domainImg|getStoragePath}', 'domainImg')" src="/static/img/Pdf.png" style="max-height:60px">
                                                         {/if}
                                                         {/if}
                                                     </td>
@@ -198,6 +198,16 @@
                                                     <td>
                                                         {$ep.enterpriseTypeName}
                                                     </td>
+                                                    <td style="border: 1px solid #c0a16b">
+                                                        <label>规上、高新技术、专精特新企业上传材料</label>
+                                                        {if condition="$ep['typeImg']"}
+                                                        {if condition="$ep['typeImg_is_img'] eq 1"}
+                                                        <img onclick="Feng.showImg(this)" id="domainImg" src="{$ep.typeImg|getStoragePath}" style="max-height:60px">
+                                                        {else/}
+                                                        <img onclick="Feng.showPdf('{$ep.typeImg|getStoragePath}', 'typeImg')" src="/static/img/Pdf.png" style="max-height:60px">
+                                                        {/if}
+                                                        {/if}
+                                                    </td>
                                                 </tr>
                                             </table>
                                             {/if}
@@ -227,9 +237,9 @@
                                                         <label>人才联络员信息备案表</label>
                                                         {if condition="$ep['beian']"}
                                                         {if condition="$ep['beian_is_img'] eq 1"}
-                                                        <img onclick="Feng.showImg(this)" id="domainImg" src="{$ep.beian|getStoragePath}" style="max-width: 100px;">
+                                                        <img onclick="Feng.showImg(this)" id="domainImg" src="{$ep.beian|getStoragePath}" style="max-height:60px">
                                                         {else/}
-                                                        <img onclick="Feng.showPdf('{$ep.beian|getStoragePath}', 'beian')" src="/static/img/Pdf.png" style="max-width: 100px;">
+                                                        <img onclick="Feng.showPdf('{$ep.beian|getStoragePath}', 'beian')" src="/static/img/Pdf.png" style="max-height:60px">
                                                         {/if}
                                                         {/if}
                                                     </td>

+ 1 - 1
public/static/js/register.js

@@ -648,7 +648,7 @@ $(function () {
         {"name": "enterpriseType", "code": "enterprise_type"},
         {"name": "sy_street", "code": "street"}];
     Feng.findChildDictBatch(JSON.stringify(arr));
-    $("#imgurl,#sy_imgurl,#bankImg,#sy_bankImg,#beian,#domainImg").change(function (e) {
+    $("#imgurl,#sy_imgurl,#bankImg,#sy_bankImg,#beian,#domainImg,#typeImg").change(function (e) {
         var that = this;
         if (!Feng.chkFileInvalid(that.files[0], 5, 10)) {
             return;

+ 19 - 1
public/static/modular/gate/enterprise/enterprise_change_edit.js

@@ -484,6 +484,10 @@ EpChangeEdit.setFieldDisabled = function () {
                     $("#domainImg").removeAttr("disabled");
                     $("#domainImg").parent().find("button").removeAttr("disabled").css("display", "block");
                     break;
+                case "newTypeImg":
+                    $("#typeImg").removeAttr("disabled");
+                    $("#typeImg").parent().find("button").removeAttr("disabled").css("display", "block");
+                    break;
                 case "newBeian":
                     $("#beian").removeAttr("disabled");
                     $("#beian").parent().find("button").removeAttr("disabled").css("display", "block");
@@ -516,7 +520,21 @@ EpChangeEdit.industryChange = function () {
     Feng.findChildDictBatch(JSON.stringify(arr));
 }
 
-$("#imgurl,#bankImg,#beian,#domainImg").change(function (e) {
+EpChangeEdit.changeEnterpriseType = function () {
+    var enterpriseType = $("#newEnterpriseType").val();
+    switch (enterpriseType) {
+        case "guishang":
+        case "gaoxinjishu":
+        case "zhuanjingtexin":
+            $("td.typeUploader").css("display", "table-cell");
+            break;
+        default:
+            $("td.typeUploader").css("display", "none");
+            break;
+    }
+};
+
+$("#imgurl,#bankImg,#beian,#domainImg,#typeImg").change(function (e) {
     var that = this;
     if (!Feng.chkFileInvalid(that.files[0], 5, 10, ["image/jpeg", "image/gif", "image/png", "image/jpg", "application/pdf"], "只允许上传PDF或图片")) {
         return;