Merge branch 'master' into release

application/em/view/em/update.html

@@ -563,12 +563,10 @@
                 upload = layui.upload;
 
             //渲染date类型字段
-            {if isset($info.edit)}
             laydate.render({
                 elem: '#init_date', // 第一次抄表
                 trigger: 'click'
             });
-            {/if}
             laydate.render({
                 elem: '#contract_confirm_date',//合同确认时间
                 trigger: 'click'

application/em/view/payment/detail.html

@@ -116,7 +116,7 @@
                                         <tbody>
                                         {volist name="invs" id="item"}
                                         <tr>
-                                            <td><a class="layui-link"  title="查看账单" href="{$item.invoice_id}">{$item.invoice_id}</a>
+                                            <td><a class="layui-link"  title="查看账单" href="/invoice/{$item.invoice_id}">{$item.invoice_id}</a>
                                             </td>
                                             <td>{$item.station_name}</td>
                                             <td>{$item.em_numb}</td>