wupengfei 1 年之前
父节点
当前提交
fce5faf3ab
共有 3 个文件被更改,包括 17 次插入9 次删除
  1. 5 8
      .idea/workspace.xml
  2. 5 0
      application/synth/controller/BillApply.php
  3. 7 1
      application/synth/view/bill_apply/index.html

+ 5 - 8
.idea/workspace.xml

@@ -2,12 +2,9 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="1a36929e-c054-4875-a943-593a74e55fa4" name="Default Changelist" comment="">
-      <change afterPath="$PROJECT_DIR$/application/synth/controller/BillApply.php" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/application/synth/view/bill_apply/form.html" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/application/synth/view/bill_apply/index.html" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/application/synth/view/bill_apply/index_search.html" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/application/synth/controller/BillHeader.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/synth/controller/BillHeader.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/application/synth/controller/BillApply.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/synth/controller/BillApply.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/application/synth/view/bill_apply/index.html" beforeDir="false" afterPath="$PROJECT_DIR$/application/synth/view/bill_apply/index.html" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -331,7 +328,7 @@
       <workItem from="1684543423796" duration="10653000" />
       <workItem from="1684716593546" duration="15730000" />
       <workItem from="1684743465298" duration="6526000" />
-      <workItem from="1684802887863" duration="1788000" />
+      <workItem from="1684802887863" duration="2167000" />
     </task>
     <servers />
   </component>
@@ -461,10 +458,10 @@
       <screen x="0" y="0" width="2560" height="1400" />
     </state>
     <state x="1410" y="539" key="#com.intellij.fileTypes.FileTypeChooser/0.0.2560.1400@0.0.2560.1400" timestamp="1684374232836" />
-    <state x="1106" y="469" key="#com.jetbrains.php.actions.copyPaste.importReferences.PhpImportReferencesDialog" timestamp="1684460479363">
+    <state x="1106" y="469" key="#com.jetbrains.php.actions.copyPaste.importReferences.PhpImportReferencesDialog" timestamp="1684804956286">
       <screen x="0" y="0" width="2560" height="1400" />
     </state>
-    <state x="1106" y="469" key="#com.jetbrains.php.actions.copyPaste.importReferences.PhpImportReferencesDialog/0.0.2560.1400@0.0.2560.1400" timestamp="1684460479363" />
+    <state x="1106" y="469" key="#com.jetbrains.php.actions.copyPaste.importReferences.PhpImportReferencesDialog/0.0.2560.1400@0.0.2560.1400" timestamp="1684804956286" />
     <state x="420" y="147" width="1942" height="1088" key="DiffContextDialog" timestamp="1684740077011">
       <screen x="0" y="0" width="2560" height="1400" />
     </state>

+ 5 - 0
application/synth/controller/BillApply.php

@@ -36,6 +36,11 @@ class BillApply extends Controller
     }
 
 
+    protected function _index_page_filter(array &$data)
+    {
+
+    }
+
     /**
      * 删除
      * @auth true

+ 7 - 1
application/synth/view/bill_apply/index.html

@@ -10,6 +10,7 @@
             <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>
         </tr>
         </thead>
@@ -20,7 +21,7 @@
             <td class='text-left'>
                 <img data-tips-image style="width:50px;height:50px" src="{$vo.headimg|default=''}" class="margin-right-5 text-top">
                 <div class="inline-block">
-                    用户ID:{$vo.user_id|default='--'}<br>
+                    用户ID:{$vo.user_id|default='--'}<br><br>
                     用户昵称:{$vo.user_name|default='--'}
                 </div>
             </td>
@@ -31,6 +32,11 @@
                     邮箱:{$vo.email|default='--'}
                 </div>
             </td>
+            <td class='text-left nowrap'>
+                {eq name='vo.status' value='0'}<span class="layui-badge layui-bg-orange margin-left-5">已开票</span>{/eq}
+                {eq name='vo.status' value='1'}<span class="layui-badge layui-bg-blue margin-left-5">未开票</span>{/eq}
+                {eq name='vo.status' value='2'}<span class="layui-badge layui-bg-blue margin-left-5">已完成</span>{/eq}
+            </td>
             <td class='text-left nowrap'>{$vo.type_name|default='--'}</td>
             <td class='text-left' >
                 <a data-title="查 看" class="layui-btn layui-btn-sm" data-modal='{:url("edit")}?id={$vo.id}'>查 看</a>