sugangqiang 2 년 전
부모
커밋
4174fed569

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

@@ -563,4 +563,14 @@ class EnterpriseChangeRecord extends AdminController {
         }
     }
 
+    public function export() {
+        $columns = [];
+        $rows = [];
+        if ($rows) {
+            export($columns, $rows);
+            exit();
+        }
+        return json(["msg" => "没有可以导出的内容"]);
+    }
+
 }

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

@@ -207,7 +207,7 @@
                             <td colspan="5">
                                 申报类型:
                                 {switch name="ecr.type"}
-                                {case value="1"}晋江市现代产业体系人才{if condition="$ecr['newAgencyType'] neq $ecr['oldAgencyType']"}(<span class='old'>{$ecr.oldAgencyTypeName}</span> -> {$ecr.newAgencyTypeName}){else/}({$ecr.newAgencyTypeName}){/if}{/case}
+                                {case value="1"}晋江市现代产业体系人才{if condition="$ecr['newAgencyType'] neq $ecr['oldAgencyType']"}(<span class='old' {if condition="!$ecr['oldAgencyType']"}style="text-decoration:none;"{/if}>{$ecr.oldAgencyTypeName|default='"未填写"'}</span> -> <span class="new">{$ecr.newAgencyTypeName|default='"已取消"'}</span>){else/}({$ecr.newAgencyTypeName|default='"未选择机构类型"'}){/if}{/case}
                                 {case value="2"}集成电路优秀人才{/case}
                                 {/switch}
                             </td>

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

@@ -203,7 +203,7 @@
                             <td colspan="5">
                                 申报类型:
                                 {switch name="ecr.type"}
-                                {case value="1"}晋江市现代产业体系人才{if condition="$ecr['newAgencyType'] neq $ecr['oldAgencyType']"}(<span class='old'>{$ecr.oldAgencyTypeName}</span> -> {$ecr.newAgencyTypeName}){else/}({$ecr.newAgencyTypeName}){/if}{/case}
+                                {case value="1"}晋江市现代产业体系人才{if condition="$ecr['newAgencyType'] neq $ecr['oldAgencyType']"}(<span class='old' {if condition="!$ecr['oldAgencyType']"}style="text-decoration:none;"{/if}>{$ecr.oldAgencyTypeName|default='"未填写"'}</span> -> <span class="new">{$ecr.newAgencyTypeName|default='"已取消"'}</span>){else/}({$ecr.newAgencyTypeName|default='"未选择机构类型"'}){/if}{/case}
                                 {case value="2"}集成电路优秀人才{/case}
                                 {/switch}
                             </td>