提交

application/api/view/common/index_1.html

@@ -1,40 +1,95 @@
-{include file='approve_info/index_search_1'}
-<table class="layui-table margin-top-10" lay-skin="line">
-    {notempty name='list'}
-    <thead>
-    <tr>
-        <th class='text-left nowrap'>申请ID</th>
-        <th class='text-left nowrap'>提交人</th>
-        <th class='text-left nowrap'>审批状态</th>
-        <th class='text-left nowrap'>创建时间</th>
-        <th class='text-left nowrap'>审批编号</th>
-        <th class='text-left nowrap'>申请日期</th>
-        <th class='text-left nowrap'>申请事由</th>
-        <th class='text-left nowrap'>申购类型</th>
-        <th class="text-center nowrap">操作</th>
-    </tr>
-    </thead>
+<style>
+    table {
+        /*letter-spacing: 1px;*/
+        width: 100%;
+        border-collapse: collapse;
+        table-layout: fixed;
+    }
+    td {
+        text-align: left;
+    }
+    .content {
+        border: 1px solid black;
+    }
+    .with-30{
+        width:30%;
+    }
+    .with-70{
+        width:60%;
+    }
+    .align-center {
+        text-align: center;
+    }
+    .font-size-14{
+        font-size: 14pt;
+    }
+</style>
+<div class="align-center font-size-14">{$get_module_list[$vo.module]|default='--'}审批单</div>
+<table cellpadding="6">
+    <tr>
+        <td class="with-30">{$vo.subject|default='--'}</td>
+        <td class="with-70">&nbsp;&nbsp;创建时间：{$vo.apply_date|default='--'}</td>
+        <td></td>
+    </tr>
+</table>
+<table cellpadding="8">
+    <tr>
+        <td class="content with-30">审批编号</td>
+        <td class="content with-70">{$vo.order_no|default='--'}</td>
+    </tr>
+    <tr>
+        <td class="content">审批状态</td>
+        <td class="content">{$get_approve_status_list[$vo.status]|default='--'}</td>
+    </tr>
+    <tr>
+        <td class="content">创建人</td>
+        <td class="content">{$vo.create_user.name|default='--'}</td>
+    </tr>
+    <tr>
+        <td class="content">创建人部门</td>
+        <td class="content">{foreach $vo.department_data as $k=>$v} {$v.name}&nbsp;{/foreach}</td>
+    </tr>
+    <tr>
+        <td class="content">申请人</td>
+        <td class="content">{$vo.apply_user.name|default='--'}</td>
+    </tr>
+    {notempty name='vo.contract'}
+    <tr>
+        <td class="content">合同编号</td>
+        <td class="content">{foreach $vo.contract as $k=>$v}{$v.reason}<br/>{/foreach}</td>
+    </tr>
+    {/notempty}
+    <tr>
+        <td class="content">申购事由</td>
+        <td class="content">{$vo.reason|default='--'}</td>
+    </tr>
+    <tr>
+        <td class="content">申购类型</td>
+        <td class="content">{$get_type_list[$vo.type]|default='--'}</td>
+    </tr>
+    {notempty name='vo.data'}
+    <tr>
+        <td class="content">总金额</td>
+        <td class="content">{$vo.module_info.total_amount|default='--'}</td>
+    </tr>
+    {/notempty}
+    <tr>
+        <td class="content">预计申购完成日期</td>
+        <td class="content">{$vo.module_info.start_time|default='--'}</td>
+    </tr>
+    <tr>
+        <td class="content">附件</td>
+        <td class="content"></td>
+    </tr>
+    <tr>
+        <td class="content">支付方式</td>
+        <td class="content">{$get_pay_type_list[$vo.module_info.pay_type]|default='--'}</td>
+    </tr>
+    {notempty name='vo.data'}
+    <tr>
+        <td class="content">申购明细</td>
+        <td class="content"></td>
+    </tr>
     {/notempty}
-    <tbody>
-    {foreach $list as $key=>$vo}
-    <tr>
-        <td class='text-left nowrap'>{$vo.id}</td>
-        <td class='text-left nowrap'>
-            <p>用户姓名：{$vo.create_user.name|default='--'}</p>
-            <p class="color-desc">手机号码：{$vo.create_user.mobile|default="--"}</p>
-        </td>
-        <td class='text-left nowrap'><strong>{$get_approve_status_list[$vo.status]}</strong></td>
-        <td class='text-left nowrap'>{$vo.create_at}</td>
-        <td class='text-left nowrap'>{$vo.order_no}</td>
-        <td class='text-left nowrap'>{$vo.apply_date}</td>
-        <td class='text-left nowrap'>{$vo.reason}</td>
-        <td class='text-left nowrap'>{$get_type_list[$vo.type]}</td>
-        <td class='text-center nowrap'>
-            <a class="layui-btn layui-btn-xs layui-bg-blue" data-open="{:url('approve_info_log/index')}?info_id={$vo.id}">审批人修改记录</a>
-            <a class="layui-btn layui-btn-xs" data-open="{:url('edit')}?id={$vo.id}">详 情</a>
-        </td>
-    </tr>
-    {/foreach}
-    </tbody>
 </table>
-{empty name='list'}<span class="notdata">没 有 记 录 哦！</span>{else}{$pagehtml|raw|default=''}{/empty}
+{include file='common/index_approve'}

application/api/view/common/index_10.html

@@ -47,8 +47,7 @@
     </tr>
     <tr>
         <td class="content">创建人部门</td>
-        <td class="content">{foreach $vo.department_data as $k=>$v} {$v.name}&nbsp;{/foreach}
-        </td>
+        <td class="content">{foreach $vo.department_data as $k=>$v} {$v.name}&nbsp;{/foreach}</td>
     </tr>
     <tr>
         <td class="content">创建人</td>

application/api/view/common/index_11.html

@@ -47,8 +47,7 @@
     </tr>
     <tr>
         <td class="content">创建人部门</td>
-        <td class="content">{foreach $vo.department_data as $k=>$v} {$v.name}&nbsp;{/foreach}
-        </td>
+        <td class="content">{foreach $vo.department_data as $k=>$v} {$v.name}&nbsp;{/foreach}</td>
     </tr>
     <tr>
         <td class="content">拟稿部门</td>

application/api/view/common/index_2.html

@@ -1,42 +1,81 @@
-{include file='approve_info/index_search_2'}
-<table class="layui-table margin-top-10" lay-skin="line">
-    {notempty name='list'}
-    <thead>
-    <tr>
-        <th class='text-left nowrap'>申请ID</th>
-        <th class='text-left nowrap'>提交人</th>
-        <th class='text-left nowrap'>审批状态</th>
-        <th class='text-left nowrap'>创建时间</th>
-        <th class='text-left nowrap'>审批编号</th>
-        <th class='text-left nowrap'>申请日期</th>
-        <th class='text-left nowrap'>申请标题</th>
-        <th class='text-left nowrap'>呈批类型</th>
-        <th class='text-left nowrap'>缓急程度</th>
-        <th class="text-center nowrap">操作</th>
-    </tr>
-    </thead>
-    {/notempty}
-    <tbody>
-    {foreach $list as $key=>$vo}
-    <tr>
-        <td class='text-left nowrap'>{$vo.id}</td>
-        <td class='text-left nowrap'>
-            <p>用户姓名：{$vo.create_user.name|default='--'}</p>
-            <p class="color-desc">手机号码：{$vo.create_user.mobile|default="--"}</p>
-        </td>
-        <td class='text-left nowrap'><strong>{$get_approve_status_list[$vo.status]}</strong></td>
-        <td class='text-left nowrap'>{$vo.create_at}</td>
-        <td class='text-left nowrap'>{$vo.order_no}</td>
-        <td class='text-left nowrap'>{$vo.apply_date}</td>
-        <td class='text-left nowrap'>{$vo.reason}</td>
-        <td class='text-left nowrap'>{$get_type_list[$vo.type]}</td>
-        <td class='text-left nowrap'>{$get_degree_list[$vo.desc]}</td>
-        <td class='text-center nowrap'>
-            <a class="layui-btn layui-btn-xs layui-bg-blue" data-open="{:url('approve_info_log/index')}?info_id={$vo.id}">审批人修改记录</a>
-            <a class="layui-btn layui-btn-xs" data-open="{:url('edit')}?id={$vo.id}">详 情</a>
-        </td>
-    </tr>
-    {/foreach}
-    </tbody>
+<style>
+    table {
+        /*letter-spacing: 1px;*/
+        width: 100%;
+        border-collapse: collapse;
+        table-layout: fixed;
+    }
+    td {
+        text-align: left;
+    }
+    .content {
+        border: 1px solid black;
+    }
+    .with-30{
+        width:30%;
+    }
+    .with-70{
+        width:60%;
+    }
+    .align-center {
+        text-align: center;
+    }
+    .font-size-14{
+        font-size: 14pt;
+    }
+</style>
+<div class="align-center font-size-14">{$get_module_list[$vo.module]|default='--'}审批单</div>
+<table cellpadding="6">
+    <tr>
+        <td class="with-30">{$vo.subject|default='--'}</td>
+        <td class="with-70">&nbsp;&nbsp;创建时间：{$vo.apply_date|default='--'}</td>
+        <td></td>
+    </tr>
+</table>
+<table cellpadding="8">
+    <tr>
+        <td class="content with-30">审批编号</td>
+        <td class="content with-70">{$vo.order_no|default='--'}</td>
+    </tr>
+    <tr>
+        <td class="content">审批状态</td>
+        <td class="content">{$get_approve_status_list[$vo.status]|default='--'}</td>
+    </tr>
+    <tr>
+        <td class="content">创建人</td>
+        <td class="content">{$vo.create_user.name|default='--'}</td>
+    </tr>
+    <tr>
+        <td class="content">创建人部门</td>
+        <td class="content">{foreach $vo.department_data as $k=>$v} {$v.name}&nbsp;{/foreach}</td>
+    </tr>
+    <tr>
+        <td class="content">呈批类型</td>
+        <td class="content">{$get_type_list[$vo.type]|default='--'}</td>
+    </tr>
+    <tr>
+        <td class="content">发文字号</td>
+        <td class="content">{$vo.module_info.word_size|default='--'}</td>
+    </tr>
+    <tr>
+        <td class="content">缓急程度</td>
+        <td class="content">{$get_degree_list[$vo.module_info.desc]|default='--'}</td>
+    </tr>
+    <tr>
+        <td class="content">申请标题</td>
+        <td class="content">{$vo.reason|default='--'}</td>
+    </tr>
+    <tr>
+        <td class="content">请假时长</td>
+        <td class="content">{$vo.module_info.time|default='--'}</td>
+    </tr>
+    <tr>
+        <td class="content">申请内容</td>
+        <td class="content">{$vo.module_info.remark|default='--'}</td>
+    </tr>
+    <tr>
+        <td class="content">附件</td>
+        <td class="content"></td>
+    </tr>
 </table>
-{empty name='list'}<span class="notdata">没 有 记 录 哦！</span>{else}{$pagehtml|raw|default=''}{/empty}
+{include file='common/index_approve'}

application/api/view/common/index_3.html

@@ -1,36 +1,78 @@
-{include file='approve_info/index_search_3'}
-<table class="layui-table margin-top-10" lay-skin="line">
-    {notempty name='list'}
-    <thead>
-    <tr>
-        <th class='text-left nowrap'>申请ID</th>
-        <th class='text-left nowrap'>提交人</th>
-        <th class='text-left nowrap'>审批状态</th>
-        <th class='text-left nowrap'>创建时间</th>
-        <th class='text-left nowrap'>审批编号</th>
-        <th class='text-left nowrap'>申请日期</th>
-        <th class="text-center nowrap">操作</th>
-    </tr>
-    </thead>
+<style>
+    table {
+        /*letter-spacing: 1px;*/
+        width: 100%;
+        border-collapse: collapse;
+        table-layout: fixed;
+    }
+    td {
+        text-align: left;
+    }
+    .content {
+        border: 1px solid black;
+    }
+    .with-30{
+        width:30%;
+    }
+    .with-70{
+        width:60%;
+    }
+    .align-center {
+        text-align: center;
+    }
+    .font-size-14{
+        font-size: 14pt;
+    }
+</style>
+<div class="align-center font-size-14">{$get_module_list[$vo.module]|default='--'}审批单</div>
+<table cellpadding="6">
+    <tr>
+        <td class="with-30">{$vo.subject|default='--'}</td>
+        <td class="with-70">&nbsp;&nbsp;创建时间：{$vo.apply_date|default='--'}</td>
+        <td></td>
+    </tr>
+</table>
+<table cellpadding="8">
+    <tr>
+        <td class="content with-30">审批编号</td>
+        <td class="content with-70">{$vo.order_no|default='--'}</td>
+    </tr>
+    <tr>
+        <td class="content">审批状态</td>
+        <td class="content">{$get_approve_status_list[$vo.status]|default='--'}</td>
+    </tr>
+    <tr>
+        <td class="content">创建人</td>
+        <td class="content">{$vo.create_user.name|default='--'}</td>
+    </tr>
+    <tr>
+        <td class="content">创建人部门</td>
+        <td class="content">{foreach $vo.department_data as $k=>$v} {$v.name}&nbsp;{/foreach}</td>
+    </tr>
+    {notempty name='vo.apply'}
+    <tr>
+        <td class="content">采购审批单</td>
+        <td class="content">{$vo.apply.order_no|default='--'}</td>
+    </tr>
+    {else/}
+    <tr>
+        <td class="content">采购审批单</td>
+        <td class="content"></td>
+    </tr>
+    {/notempty}
+    <tr>
+        <td class="content">附件</td>
+        <td class="content"></td>
+    </tr>
+    <tr>
+        <td class="content">其它补充说明</td>
+        <td class="content">{$vo.module_info.remark|default='--'}</td>
+    </tr>
+    {notempty name='vo.data'}
+    <tr>
+        <td class="content">入库明细</td>
+        <td class="content"></td>
+    </tr>
     {/notempty}
-    <tbody>
-    {foreach $list as $key=>$vo}
-    <tr>
-        <td class='text-left nowrap'>{$vo.id}</td>
-        <td class='text-left nowrap'>
-            <p>用户姓名：{$vo.create_user.name|default='--'}</p>
-            <p class="color-desc">手机号码：{$vo.create_user.mobile|default="--"}</p>
-        </td>
-        <td class='text-left nowrap'><strong>{$get_approve_status_list[$vo.status]}</strong></td>
-        <td class='text-left nowrap'>{$vo.create_at}</td>
-        <td class='text-left nowrap'>{$vo.order_no}</td>
-        <td class='text-left nowrap'>{$vo.apply_date}</td>
-        <td class='text-center nowrap'>
-            <a class="layui-btn layui-btn-xs layui-bg-blue" data-open="{:url('approve_info_log/index')}?info_id={$vo.id}">审批人修改记录</a>
-            <a class="layui-btn layui-btn-xs" data-open="{:url('edit')}?id={$vo.id}">详 情</a>
-        </td>
-    </tr>
-    {/foreach}
-    </tbody>
 </table>
-{empty name='list'}<span class="notdata">没 有 记 录 哦！</span>{else}{$pagehtml|raw|default=''}{/empty}
+{include file='common/index_approve'}

application/api/view/common/index_4.html

@@ -1,38 +1,71 @@
-{include file='approve_info/index_search_4'}
-<table class="layui-table margin-top-10" lay-skin="line">
-    {notempty name='list'}
-    <thead>
-    <tr>
-        <th class='text-left nowrap'>申请ID</th>
-        <th class='text-left nowrap'>提交人</th>
-        <th class='text-left nowrap'>审批状态</th>
-        <th class='text-left nowrap'>创建时间</th>
-        <th class='text-left nowrap'>审批编号</th>
-        <th class='text-left nowrap'>申请日期</th>
-        <th class='text-left nowrap'>物品用途</th>
-        <th class="text-center nowrap">操作</th>
-    </tr>
-    </thead>
+<style>
+    table {
+        /*letter-spacing: 1px;*/
+        width: 100%;
+        border-collapse: collapse;
+        table-layout: fixed;
+    }
+    td {
+        text-align: left;
+    }
+    .content {
+        border: 1px solid black;
+    }
+    .with-30{
+        width:30%;
+    }
+    .with-70{
+        width:60%;
+    }
+    .align-center {
+        text-align: center;
+    }
+    .font-size-14{
+        font-size: 14pt;
+    }
+</style>
+<div class="align-center font-size-14">{$get_module_list[$vo.module]|default='--'}审批单</div>
+<table cellpadding="6">
+    <tr>
+        <td class="with-30">{$vo.subject|default='--'}</td>
+        <td class="with-70">&nbsp;&nbsp;创建时间：{$vo.apply_date|default='--'}</td>
+        <td></td>
+    </tr>
+</table>
+<table cellpadding="8">
+    <tr>
+        <td class="content with-30">审批编号</td>
+        <td class="content with-70">{$vo.order_no|default='--'}</td>
+    </tr>
+    <tr>
+        <td class="content">审批状态</td>
+        <td class="content">{$get_approve_status_list[$vo.status]|default='--'}</td>
+    </tr>
+    <tr>
+        <td class="content">创建人</td>
+        <td class="content">{$vo.create_user.name|default='--'}</td>
+    </tr>
+    <tr>
+        <td class="content">创建人部门</td>
+        <td class="content">{foreach $vo.department_data as $k=>$v} {$v.name}&nbsp;{/foreach}</td>
+    </tr>
+    <tr>
+        <td class="content">物品用途</td>
+        <td class="content">{$vo.reason|default='--'}</td>
+    </tr>
+    <tr>
+        <td class="content">附件</td>
+        <td class="content"></td>
+    </tr>
+    <tr>
+        <td class="content">其它补充说明</td>
+        <td class="content">{$vo.module_info.remark|default='--'}</td>
+    </tr>
+    {notempty name='vo.data'}
+    <tr>
+        <td class="content">领用明细</td>
+        <td class="content"></td>
+    </tr>
     {/notempty}
-    <tbody>
-    {foreach $list as $key=>$vo}
-    <tr>
-        <td class='text-left nowrap'>{$vo.id}</td>
-        <td class='text-left nowrap'>
-            <p>用户姓名：{$vo.create_user.name|default='--'}</p>
-            <p class="color-desc">手机号码：{$vo.create_user.mobile|default="--"}</p>
-        </td>
-        <td class='text-left nowrap'><strong>{$get_approve_status_list[$vo.status]}</strong></td>
-        <td class='text-left nowrap'>{$vo.create_at}</td>
-        <td class='text-left nowrap'>{$vo.order_no}</td>
-        <td class='text-left nowrap'>{$vo.apply_date}</td>
-        <td class='text-left nowrap'>{$vo.reason}</td>
-        <td class='text-center nowrap'>
-            <a class="layui-btn layui-btn-xs layui-bg-blue" data-open="{:url('approve_info_log/index')}?info_id={$vo.id}">审批人修改记录</a>
-            <a class="layui-btn layui-btn-xs" data-open="{:url('edit')}?id={$vo.id}">详 情</a>
-        </td>
-    </tr>
-    {/foreach}
-    </tbody>
 </table>
-{empty name='list'}<span class="notdata">没 有 记 录 哦！</span>{else}{$pagehtml|raw|default=''}{/empty}
+{include file='common/index_approve'}

application/api/view/common/index_5.html

@@ -1,42 +1,94 @@
-{include file='approve_info/index_search_5'}
-<table class="layui-table margin-top-10" lay-skin="line">
-    {notempty name='list'}
-    <thead>
-    <tr>
-        <th class='text-left nowrap'>申请ID</th>
-        <th class='text-left nowrap'>提交人</th>
-        <th class='text-left nowrap'>审批状态</th>
-        <th class='text-left nowrap'>创建时间</th>
-        <th class='text-left nowrap'>审批编号</th>
-        <th class='text-left nowrap'>申请日期</th>
-        <th class='text-left nowrap'>出差事由</th>
-        <th class='text-left nowrap'>出差类型</th>
-        <th class='text-left nowrap'>出差时间</th>
-        <th class="text-center nowrap">操作</th>
-    </tr>
-    </thead>
+<style>
+    table {
+        /*letter-spacing: 1px;*/
+        width: 100%;
+        border-collapse: collapse;
+        table-layout: fixed;
+    }
+    td {
+        text-align: left;
+    }
+    .content {
+        border: 1px solid black;
+    }
+    .with-30{
+        width:30%;
+    }
+    .with-70{
+        width:60%;
+    }
+    .align-center {
+        text-align: center;
+    }
+    .font-size-14{
+        font-size: 14pt;
+    }
+</style>
+<div class="align-center font-size-14">{$get_module_list[$vo.module]|default='--'}审批单</div>
+<table cellpadding="6">
+    <tr>
+        <td class="with-30">{$vo.subject|default='--'}</td>
+        <td class="with-70">&nbsp;&nbsp;创建时间：{$vo.apply_date|default='--'}</td>
+        <td></td>
+    </tr>
+</table>
+<table cellpadding="8">
+    <tr>
+        <td class="content with-30">审批编号</td>
+        <td class="content with-70">{$vo.order_no|default='--'}</td>
+    </tr>
+    <tr>
+        <td class="content">审批状态</td>
+        <td class="content">{$get_approve_status_list[$vo.status]|default='--'}</td>
+    </tr>
+    <tr>
+        <td class="content">创建人</td>
+        <td class="content">{$vo.create_user.name|default='--'}</td>
+    </tr>
+    <tr>
+        <td class="content">创建人部门</td>
+        <td class="content">{foreach $vo.department_data as $k=>$v} {$v.name}&nbsp;{/foreach}</td>
+    </tr>
+    <tr>
+        <td class="content">申请人</td>
+        <td class="content">{$vo.apply_user.name|default='--'}</td>
+    </tr>
+
+    <tr>
+        <td class="content">出差事由</td>
+        <td class="content">{$vo.reason|default='--'}</td>
+    </tr>
+    <tr>
+        <td class="content">出差开始时间</td>
+        <td class="content">{$vo.module_info.start_time|default='--'}</td>
+    </tr>
+    <tr>
+        <td class="content">出差结束时间</td>
+        <td class="content">{$vo.module_info.end_time|default='--'}</td>
+    </tr>
+    <tr>
+        <td class="content">附件</td>
+        <td class="content"></td>
+    </tr>
+    <tr>
+        <td class="content">出差类型</td>
+        <td class="content">{$get_type_list[$vo.type]|default='--'}</td>
+    </tr>
+    {if ($vo.type == 1)}
+    <tr>
+        <td class="content">是否跨关内关外</td>
+        <td class="content">{$get_is_who_list[$vo.module_info.is_who]|default='--'}</td>
+    </tr>
+    {/if}
+    <tr>
+        <td class="content">备注</td>
+        <td class="content">{$vo.module_info.remark|default='--'}</td>
+    </tr>
+    {notempty name='vo.data'}
+    <tr>
+        <td class="content">同行人员</td>
+        <td class="content">{foreach $vo.data as $k=>$v}{$v.name|default='--'}&nbsp;{/foreach}</td>
+    </tr>
     {/notempty}
-    <tbody>
-    {foreach $list as $key=>$vo}
-    <tr>
-        <td class='text-left nowrap'>{$vo.id}</td>
-        <td class='text-left nowrap'>
-            <p>用户姓名：{$vo.create_user.name|default='--'}</p>
-            <p class="color-desc">手机号码：{$vo.create_user.mobile|default="--"}</p>
-        </td>
-        <td class='text-left nowrap'><strong>{$get_approve_status_list[$vo.status]}</strong></td>
-        <td class='text-left nowrap'>{$vo.create_at}</td>
-        <td class='text-left nowrap'>{$vo.order_no}</td>
-        <td class='text-left nowrap'>{$vo.apply_date}</td>
-        <td class='text-left nowrap'>{$vo.reason}</td>
-        <td class='text-left nowrap'>{$get_type_list[$vo.type]}</td>
-        <td class='text-left nowrap'>{$vo.start_time} - {$vo.end_time}</td>
-        <td class='text-center nowrap'>
-            <a class="layui-btn layui-btn-xs layui-bg-blue" data-open="{:url('approve_info_log/index')}?info_id={$vo.id}">审批人修改记录</a>
-            <a class="layui-btn layui-btn-xs" data-open="{:url('edit')}?id={$vo.id}">详 情</a>
-        </td>
-    </tr>
-    {/foreach}
-    </tbody>
 </table>
-{empty name='list'}<span class="notdata">没 有 记 录 哦！</span>{else}{$pagehtml|raw|default=''}{/empty}
+{include file='common/index_approve'}

application/api/view/common/index_6.html

@@ -1,42 +1,85 @@
-{include file='approve_info/index_search_6'}
-<table class="layui-table margin-top-10" lay-skin="line">
-    {notempty name='list'}
-    <thead>
-    <tr>
-        <th class='text-left nowrap'>申请ID</th>
-        <th class='text-left nowrap'>提交人</th>
-        <th class='text-left nowrap'>审批状态</th>
-        <th class='text-left nowrap'>创建时间</th>
-        <th class='text-left nowrap'>审批编号</th>
-        <th class='text-left nowrap'>申请日期</th>
-        <th class='text-left nowrap'>请假原因</th>
-        <th class='text-left nowrap'>请假类型</th>
-        <th class='text-left nowrap'>请假时间</th>
-        <th class="text-center nowrap">操作</th>
-    </tr>
-    </thead>
-    {/notempty}
-    <tbody>
-    {foreach $list as $key=>$vo}
-    <tr>
-        <td class='text-left nowrap'>{$vo.id}</td>
-        <td class='text-left nowrap'>
-            <p>用户姓名：{$vo.create_user.name|default='--'}</p>
-            <p class="color-desc">手机号码：{$vo.create_user.mobile|default="--"}</p>
-        </td>
-        <td class='text-left nowrap'><strong>{$get_approve_status_list[$vo.status]}</strong></td>
-        <td class='text-left nowrap'>{$vo.create_at}</td>
-        <td class='text-left nowrap'>{$vo.order_no}</td>
-        <td class='text-left nowrap'>{$vo.apply_date}</td>
-        <td class='text-left nowrap'>{$vo.reason}</td>
-        <td class='text-left nowrap'>{$get_type_list[$vo.type]}</td>
-        <td class='text-left nowrap'>{$vo.start_time} - {$vo.end_time}</td>
-        <td class='text-center nowrap'>
-            <a class="layui-btn layui-btn-xs layui-bg-blue" data-open="{:url('approve_info_log/index')}?info_id={$vo.id}">审批人修改记录</a>
-            <a class="layui-btn layui-btn-xs" data-open="{:url('edit')}?id={$vo.id}">详 情</a>
-        </td>
-    </tr>
-    {/foreach}
-    </tbody>
+<style>
+    table {
+        /*letter-spacing: 1px;*/
+        width: 100%;
+        border-collapse: collapse;
+        table-layout: fixed;
+    }
+    td {
+        text-align: left;
+    }
+    .content {
+        border: 1px solid black;
+    }
+    .with-30{
+        width:30%;
+    }
+    .with-70{
+        width:60%;
+    }
+    .align-center {
+        text-align: center;
+    }
+    .font-size-14{
+        font-size: 14pt;
+    }
+</style>
+<div class="align-center font-size-14">{$get_module_list[$vo.module]|default='--'}审批单</div>
+<table cellpadding="6">
+    <tr>
+        <td class="with-30">{$vo.subject|default='--'}</td>
+        <td class="with-70">&nbsp;&nbsp;创建时间：{$vo.apply_date|default='--'}</td>
+        <td></td>
+    </tr>
+</table>
+<table cellpadding="8">
+    <tr>
+        <td class="content with-30">审批编号</td>
+        <td class="content with-70">{$vo.order_no|default='--'}</td>
+    </tr>
+    <tr>
+        <td class="content">审批状态</td>
+        <td class="content">{$get_approve_status_list[$vo.status]|default='--'}</td>
+    </tr>
+    <tr>
+        <td class="content">创建人</td>
+        <td class="content">{$vo.create_user.name|default='--'}</td>
+    </tr>
+    <tr>
+        <td class="content">创建人部门</td>
+        <td class="content">{foreach $vo.department_data as $k=>$v} {$v.name}&nbsp;{/foreach}</td>
+    </tr>
+    <tr>
+        <td class="content">申请人</td>
+        <td class="content">{$vo.apply_user.name|default='--'}</td>
+    </tr>
+    <tr>
+        <td class="content">请假类型</td>
+        <td class="content">{$get_type_list[$vo.type]|default='--'}</td>
+    </tr>
+    <tr>
+        <td class="content">请假开始时间</td>
+        <td class="content">{$vo.module_info.start_time|default='--'} {$vo.module_info.start_am|default='--'}</td>
+    </tr>
+    <tr>
+        <td class="content">请假结束时间</td>
+        <td class="content">{$vo.module_info.end_time|default='--'} {$vo.module_info.end_am|default='--'}</td>
+    </tr>
+    <tr>
+        <td class="content">请假时长</td>
+        <td class="content">{$vo.module_info.time|default='--'}</td>
+    </tr>
+    <tr>
+        <td class="content">请假原因</td>
+        <td class="content">{$vo.reason|default='--'}</td>
+    </tr>
+    <tr>
+        <td class="content">附件</td>
+        <td class="content"></td>
+    </tr>
+    <tr>
+        <td class="content">是否离"深"</td>
+        <td class="content">{$vo.module_info.remark|default='--'}</td>
+    </tr>
 </table>
-{empty name='list'}<span class="notdata">没 有 记 录 哦！</span>{else}{$pagehtml|raw|default=''}{/empty}
+{include file='common/index_approve'}

application/api/view/common/index_7.html

@@ -1,42 +1,81 @@
-{include file='approve_info/index_search_7'}
-<table class="layui-table margin-top-10" lay-skin="line">
-    {notempty name='list'}
-    <thead>
-    <tr>
-        <th class='text-left nowrap'>申请ID</th>
-        <th class='text-left nowrap'>提交人</th>
-        <th class='text-left nowrap'>审批状态</th>
-        <th class='text-left nowrap'>创建时间</th>
-        <th class='text-left nowrap'>审批编号</th>
-        <th class='text-left nowrap'>申请日期</th>
-        <th class='text-left nowrap'>出发地点</th>
-        <th class='text-left nowrap'>出发时间</th>
-        <th class='text-left nowrap'>返回时间</th>
-        <th class="text-center nowrap">操作</th>
-    </tr>
-    </thead>
-    {/notempty}
-    <tbody>
-    {foreach $list as $key=>$vo}
-    <tr>
-        <td class='text-left nowrap'>{$vo.id}</td>
-        <td class='text-left nowrap'>
-            <p>用户姓名：{$vo.create_user.name|default='--'}</p>
-            <p class="color-desc">手机号码：{$vo.create_user.mobile|default="--"}</p>
-        </td>
-        <td class='text-left nowrap'><strong>{$get_approve_status_list[$vo.status]}</strong></td>
-        <td class='text-left nowrap'>{$vo.create_at}</td>
-        <td class='text-left nowrap'>{$vo.order_no}</td>
-        <td class='text-left nowrap'>{$vo.apply_date}</td>
-        <td class='text-left nowrap'>{$vo.reason}</td>
-        <td class='text-left nowrap'>{$vo.start_time}</td>
-        <td class='text-left nowrap'>{$vo.end_time}</td>
-        <td class='text-center nowrap'>
-            <a class="layui-btn layui-btn-xs layui-bg-blue" data-open="{:url('approve_info_log/index')}?info_id={$vo.id}">审批人修改记录</a>
-            <a class="layui-btn layui-btn-xs" data-open="{:url('edit')}?id={$vo.id}">详 情</a>
-        </td>
-    </tr>
-    {/foreach}
-    </tbody>
+<style>
+    table {
+        /*letter-spacing: 1px;*/
+        width: 100%;
+        border-collapse: collapse;
+        table-layout: fixed;
+    }
+    td {
+        text-align: left;
+    }
+    .content {
+        border: 1px solid black;
+    }
+    .with-30{
+        width:30%;
+    }
+    .with-70{
+        width:60%;
+    }
+    .align-center {
+        text-align: center;
+    }
+    .font-size-14{
+        font-size: 14pt;
+    }
+</style>
+<div class="align-center font-size-14">{$get_module_list[$vo.module]|default='--'}审批单</div>
+<table cellpadding="6">
+    <tr>
+        <td class="with-30">{$vo.subject|default='--'}</td>
+        <td class="with-70">&nbsp;&nbsp;创建时间：{$vo.apply_date|default='--'}</td>
+        <td></td>
+    </tr>
+</table>
+<table cellpadding="8">
+    <tr>
+        <td class="content with-30">审批编号</td>
+        <td class="content with-70">{$vo.order_no|default='--'}</td>
+    </tr>
+    <tr>
+        <td class="content">审批状态</td>
+        <td class="content">{$get_approve_status_list[$vo.status]|default='--'}</td>
+    </tr>
+    <tr>
+        <td class="content">创建人</td>
+        <td class="content">{$vo.create_user.name|default='--'}</td>
+    </tr>
+    <tr>
+        <td class="content">创建人部门</td>
+        <td class="content">{foreach $vo.department_data as $k=>$v} {$v.name}&nbsp;{/foreach}</td>
+    </tr>
+    <tr>
+        <td class="content">申请人</td>
+        <td class="content">{$vo.apply_user.name|default='--'}</td>
+    </tr>
+    <tr>
+        <td class="content">出发地点</td>
+        <td class="content">{$vo.reason|default='--'}</td>
+    </tr>
+    <tr>
+        <td class="content">出发时间</td>
+        <td class="content">{$vo.module_info.start_time|default='--'}</td>
+    </tr>
+    <tr>
+        <td class="content">到达地点</td>
+        <td class="content">{$vo.module_info.reach_address|default='--'}</td>
+    </tr>
+    <tr>
+        <td class="content">返回时间</td>
+        <td class="content">{$vo.module_info.end_time|default='--'}</td>
+    </tr>
+    <tr>
+        <td class="content">返回地点</td>
+        <td class="content">{$vo.module_info.end_address|default='--'}</td>
+    </tr>
+    <tr>
+        <td class="content">附件</td>
+        <td class="content"></td>
+    </tr>
 </table>
-{empty name='list'}<span class="notdata">没 有 记 录 哦！</span>{else}{$pagehtml|raw|default=''}{/empty}
+{include file='common/index_approve'}

application/api/view/common/index_8.html

@@ -1,42 +1,89 @@
-{include file='approve_info/index_search_8'}
-<table class="layui-table margin-top-10" lay-skin="line">
-    {notempty name='list'}
-    <thead>
-    <tr>
-        <th class='text-left nowrap'>申请ID</th>
-        <th class='text-left nowrap'>提交人</th>
-        <th class='text-left nowrap'>审批状态</th>
-        <th class='text-left nowrap'>创建时间</th>
-        <th class='text-left nowrap'>审批编号</th>
-        <th class='text-left nowrap'>申请日期</th>
-        <th class='text-left nowrap'>维修地点</th>
-        <th class='text-left nowrap'>维修类型</th>
-        <th class='text-left nowrap'>具体内容</th>
-        <th class="text-center nowrap">操作</th>
-    </tr>
-    </thead>
-    {/notempty}
-    <tbody>
-    {foreach $list as $key=>$vo}
-    <tr>
-        <td class='text-left nowrap'>{$vo.id}</td>
-        <td class='text-left nowrap'>
-            <p>用户姓名：{$vo.create_user.name|default='--'}</p>
-            <p class="color-desc">手机号码：{$vo.create_user.mobile|default="--"}</p>
-        </td>
-        <td class='text-left nowrap'><strong>{$get_approve_status_list[$vo.status]}</strong></td>
-        <td class='text-left nowrap'>{$vo.create_at}</td>
-        <td class='text-left nowrap'>{$vo.order_no}</td>
-        <td class='text-left nowrap'>{$vo.apply_date}</td>
-        <td class='text-left nowrap'>{$vo.reason}</td>
-        <td class='text-left nowrap'>{$get_type_list[$vo.type]}</td>
-        <td class='text-left nowrap'>{$vo.desc}</td>
-        <td class='text-center nowrap'>
-            <a class="layui-btn layui-btn-xs layui-bg-blue" data-open="{:url('approve_info_log/index')}?info_id={$vo.id}">审批人修改记录</a>
-            <a class="layui-btn layui-btn-xs" data-open="{:url('edit')}?id={$vo.id}">详 情</a>
-        </td>
-    </tr>
-    {/foreach}
-    </tbody>
+<style>
+    table {
+        /*letter-spacing: 1px;*/
+        width: 100%;
+        border-collapse: collapse;
+        table-layout: fixed;
+    }
+    td {
+        text-align: left;
+    }
+    .content {
+        border: 1px solid black;
+    }
+    .with-30{
+        width:30%;
+    }
+    .with-70{
+        width:60%;
+    }
+    .align-center {
+        text-align: center;
+    }
+    .font-size-14{
+        font-size: 14pt;
+    }
+</style>
+<div class="align-center font-size-14">{$get_module_list[$vo.module]|default='--'}审批单</div>
+<table cellpadding="6">
+    <tr>
+        <td class="with-30">{$vo.subject|default='--'}</td>
+        <td class="with-70">&nbsp;&nbsp;创建时间：{$vo.apply_date|default='--'}</td>
+        <td></td>
+    </tr>
+</table>
+<table cellpadding="8">
+    <tr>
+        <td class="content with-30">审批编号</td>
+        <td class="content with-70">{$vo.order_no|default='--'}</td>
+    </tr>
+    <tr>
+        <td class="content">审批状态</td>
+        <td class="content">{$get_approve_status_list[$vo.status]|default='--'}</td>
+    </tr>
+    <tr>
+        <td class="content">创建人</td>
+        <td class="content">{$vo.create_user.name|default='--'}</td>
+    </tr>
+    <tr>
+        <td class="content">创建人部门</td>
+        <td class="content">{foreach $vo.department_data as $k=>$v} {$v.name}&nbsp;{/foreach}</td>
+    </tr>
+    <tr>
+        <td class="content">维修类型</td>
+        <td class="content">{$get_type_list[$vo.type]|default='--'}</td>
+    </tr>
+    <tr>
+        <td class="content">维修地点</td>
+        <td class="content">{$vo.reason|default='--'}</td>
+    </tr>
+    <tr>
+        <td class="content">具体内容</td>
+        <td class="content">{$vo.module_info.desc|default='--'}</td>
+    </tr>
+    {if ($vo.maintain_user_id > 0)}
+    <tr>
+        <td class="content">维修人员</td>
+        <td class="content">{$vo.maintain_user.name|default='--'}</td>
+    </tr>
+    {/if}
+    {if ($vo.module_info.feedback_status == 1)}
+    <tr>
+        <td class="content">维修结果</td>
+        <td class="content">{$vo.module_info.feedback|default='--'}</td>
+    </tr>
+    {else/}
+    {/if}
+    {if ($vo.module_info.comment_status == 1)}
+    <tr>
+        <td class="content">评分</td>
+        <td class="content">{$vo.module_info.comment_score|default='--'}</td>
+    </tr>
+    <tr>
+        <td class="content">评价内容</td>
+        <td class="content">{$vo.module_info.comment|default='--'}</td>
+    </tr>
+    {else/}
+    {/if}
 </table>
-{empty name='list'}<span class="notdata">没 有 记 录 哦！</span>{else}{$pagehtml|raw|default=''}{/empty}
+{include file='common/index_approve'}

application/api/view/common/index_9.html

@@ -1,40 +1,96 @@
-{include file='approve_info/index_search_9'}
-<table class="layui-table margin-top-10" lay-skin="line">
-    {notempty name='list'}
-    <thead>
-    <tr>
-        <th class='text-left nowrap'>申请ID</th>
-        <th class='text-left nowrap'>提交人</th>
-        <th class='text-left nowrap'>审批状态</th>
-        <th class='text-left nowrap'>创建时间</th>
-        <th class='text-left nowrap'>审批编号</th>
-        <th class='text-left nowrap'>申请日期</th>
-        <th class='text-left nowrap'>合同编号</th>
-        <th class='text-left nowrap'>缓急程度</th>
-        <th class="text-center nowrap">操作</th>
-    </tr>
-    </thead>
+<style>
+    table {
+        /*letter-spacing: 1px;*/
+        width: 100%;
+        border-collapse: collapse;
+        table-layout: fixed;
+    }
+    td {
+        text-align: left;
+    }
+    .content {
+        border: 1px solid black;
+    }
+    .with-30{
+        width:30%;
+    }
+    .with-70{
+        width:60%;
+    }
+    .align-center {
+        text-align: center;
+    }
+    .font-size-14{
+        font-size: 14pt;
+    }
+</style>
+<div class="align-center font-size-14">{$get_module_list[$vo.module]|default='--'}审批单</div>
+<table cellpadding="6">
+    <tr>
+        <td class="with-30">{$vo.subject|default='--'}</td>
+        <td class="with-70">&nbsp;&nbsp;创建时间：{$vo.apply_date|default='--'}</td>
+        <td></td>
+    </tr>
+</table>
+<table cellpadding="8">
+    <tr>
+        <td class="content with-30">审批编号</td>
+        <td class="content with-70">{$vo.order_no|default='--'}</td>
+    </tr>
+    <tr>
+        <td class="content">审批状态</td>
+        <td class="content">{$get_approve_status_list[$vo.status]|default='--'}</td>
+    </tr>
+    <tr>
+        <td class="content">创建人</td>
+        <td class="content">{$vo.create_user.name|default='--'}</td>
+    </tr>
+    <tr>
+        <td class="content">创建人部门</td>
+        <td class="content">{foreach $vo.department_data as $k=>$v} {$v.name}&nbsp;{/foreach}</td>
+    </tr>
+    {notempty name='vo.apply'}
+    <tr>
+        <td class="content">采购审批单</td>
+        <td class="content">{$vo.apply.order_no|default='--'}</td>
+    </tr>
+    {else/}
+    <tr>
+        <td class="content">采购审批单</td>
+        <td class="content"></td>
+    </tr>
     {/notempty}
-    <tbody>
-    {foreach $list as $key=>$vo}
-    <tr>
-        <td class='text-left nowrap'>{$vo.id}</td>
-        <td class='text-left nowrap'>
-            <p>用户姓名：{$vo.create_user.name|default='--'}</p>
-            <p class="color-desc">手机号码：{$vo.create_user.mobile|default="--"}</p>
-        </td>
-        <td class='text-left nowrap'><strong>{$get_approve_status_list[$vo.status]}</strong></td>
-        <td class='text-left nowrap'>{$vo.create_at}</td>
-        <td class='text-left nowrap'>{$vo.order_no}</td>
-        <td class='text-left nowrap'>{$vo.apply_date}</td>
-        <td class='text-left nowrap'>{$vo.reason}</td>
-        <td class='text-left nowrap'>{$get_degree_list[$vo.desc]}</td>
-        <td class='text-center nowrap'>
-            <a class="layui-btn layui-btn-xs layui-bg-blue" data-open="{:url('approve_info_log/index')}?info_id={$vo.id}">审批人修改记录</a>
-            <a class="layui-btn layui-btn-xs" data-open="{:url('edit')}?id={$vo.id}">详 情</a>
-        </td>
-    </tr>
-    {/foreach}
-    </tbody>
+    <tr>
+        <td class="content">合同类型</td>
+        <td class="content">{$get_type_list[$vo.type]|default='--'}</td>
+    </tr>
+    <tr>
+        <td class="content">合同编号</td>
+        <td class="content">{$vo.reason|default='--'}</td>
+    </tr>
+    <tr>
+        <td class="content">缓急程度</td>
+        <td class="content">{$get_degree_list[$vo.module_info.desc]|default='--'}</td>
+    </tr>
+    <tr>
+        <td class="content">印制份数</td>
+        <td class="content">{$vo.module_info.number|default='--'}</td>
+    </tr>
+    <tr>
+        <td class="content">发放范围</td>
+        <td class="content">{$vo.module_info.scope|default='--'}</td>
+    </tr>
+    <tr>
+        <td class="content">法务意见</td>
+        <td class="content">{$vo.module_info.legal_opinion|default='--'}</td>
+    </tr>
+    <tr>
+        <td class="content">附件</td>
+        <td class="content"></td>
+    </tr>
+    <tr>
+        <td class="content">备注说明</td>
+        <td class="content">{$vo.module_info.remark|default='--'}</td>
+    </tr>
 </table>
-{empty name='list'}<span class="notdata">没 有 记 录 哦！</span>{else}{$pagehtml|raw|default=''}{/empty}
+{include file='common/index_approve'}

application/approve/view/approve_info/form_1.html

@@ -16,7 +16,6 @@
                         </p>
                     </div>
                 </div>
-
                 <div class="layui-form-item">
                     <label class="layui-form-label color-green font-w7">审批编号</label>
                     <div class="layui-input-block">
@@ -25,17 +24,6 @@
                         <p class="help-block"></p>
                     </div>
                 </div>
-                {notempty name='vo.contract'}
-                <div class="layui-form-item">
-                    <label class="layui-form-label color-green font-w7">合同编号</label>
-                    <div class="layui-input-block">
-                        {foreach $vo.contract as $k=>$v}
-                        <p>{$v.reason}</p>
-                        {/foreach}
-                        <p class="help-block"></p>
-                    </div>
-                </div>
-                {/notempty}
                 <div class="layui-form-item">
                     <label class="layui-form-label color-green font-w7">审批状态</label>
                     <div class="layui-input-block">
@@ -53,6 +41,17 @@
                     </div>
                 </div>
 
+                {notempty name='vo.contract'}
+                <div class="layui-form-item">
+                    <label class="layui-form-label color-green font-w7">合同编号</label>
+                    <div class="layui-input-block">
+                        {foreach $vo.contract as $k=>$v}
+                        <p>{$v.reason}</p>
+                        {/foreach}
+                        <p class="help-block"></p>
+                    </div>
+                </div>
+                {/notempty}
                 <div class="layui-form-item">
                     <label class="layui-form-label color-green font-w7">申购事由</label>
                     <div class="layui-input-block">

application/approve/view/approve_info/form_3.html

@@ -41,6 +41,26 @@
                     </div>
                 </div>
 
+                {notempty name='vo.apply'}
+                <div class="layui-form-item">
+                    <label class="layui-form-label color-green font-w7">采购审批单</label>
+                    <div class="layui-input-block">
+                        <input name="" placeholder="" value="{$vo.apply.order_no|default='--'}"
+                               class="layui-input border-0" disabled>
+                        <p class="help-block padding-left-10">
+                            <a href="admin.html#{:url('edit')}?id={$vo.apply.id}" target="_blank">查看</a>
+                        </p>
+                    </div>
+                </div>
+                {else/}
+                <div class="layui-form-item">
+                    <label class="layui-form-label color-green font-w7">采购审批单</label>
+                    <div class="layui-input-block">
+                        <input name="" placeholder="" value="否"
+                               class="layui-input border-0" disabled>
+                    </div>
+                </div>
+                {/notempty}
                 <div class="layui-form-item">
                     <label class="layui-form-label color-green font-w7">附件</label>
                     <div class="layui-input-block">
@@ -71,26 +91,6 @@
                         <p class="help-block"></p>
                     </div>
                 </div>
-                {notempty name='vo.apply'}
-                <div class="layui-form-item">
-                    <label class="layui-form-label color-green font-w7">采购审批单</label>
-                    <div class="layui-input-block">
-                        <input name="" placeholder="" value="{$vo.apply.order_no|default='--'}"
-                               class="layui-input border-0" disabled>
-                        <p class="help-block padding-left-10">
-                            <a href="admin.html#{:url('edit')}?id={$vo.apply.id}" target="_blank">查看</a>
-                        </p>
-                    </div>
-                </div>
-                {else/}
-                <div class="layui-form-item">
-                    <label class="layui-form-label color-green font-w7">采购审批单</label>
-                    <div class="layui-input-block">
-                        <input name="" placeholder="" value="否"
-                               class="layui-input border-0" disabled>
-                    </div>
-                </div>
-                {/notempty}
 
                 {notempty name='vo.data'}
                 <div class="layui-form-item">

application/common/service/ApproveInfoService.php

@@ -9,6 +9,7 @@ use app\common\model\Approve;
 use app\common\model\ApproveCopy;
 use app\common\model\ApproveApplyGoods;
 use app\common\model\ApproveMaintain;
+use app\common\model\ApproveMaintainUser;
 use app\common\model\ApproveMaintainUserLog;
 use app\common\model\ApproveStockGoods;
 use app\common\model\ApproveEvectionPeerUser;
@@ -1468,15 +1469,16 @@ class ApproveInfoService
      **/
     public static function download($id)
     {
-        $data = self::get_detail($id ?: 0, [], CommonConstant::IS_WHO_0, 'detail');
+        $data = self::get_detail($id, [], CommonConstant::IS_WHO_0, 'detail');
         if (!$data) {
             except('申请记录不存在或已删除');
         }
-        $data = $data->toArray();
+        // 维修人员
+        $data['maintain_user'] = $data['module'] == CommonConstant::MODULE_8 && $data['maintain_user_id'] > 0 ? ApproveMaintainUser::field('id,name')->find($data['maintain_user_id']) :null;
         unset($data['approve'][0]);// 去掉审批流程里面的创建人
         $data['approve_count'] = count($data['approve']) + count($data['approve_copy']);
         $data['subject'] = sysconf('subject');
-        $vo = $data;
+        $vo = $data->toArray();
         $template = 'index_' . $data['module'];
         $get_module_list = CommonConstant::get_module_list();
         $get_approve_status_list = CommonConstant::get_approve_status_list();
@@ -1531,7 +1533,7 @@ class ApproveInfoService
             }
         }
         $filename = date('Ymd') . sha1(date('YmdHis', time()) . uniqid());
-        $filename = $name . date('Ymd') . date('YmdHis', time()) . time();
+        $filename = $name . date('Ymd') . time();
         $suffix = '.pdf';
         $realpath = substr($savePath, 1) . '/' . $filename . $suffix;
         return $realpath;