wupengfei 1 年之前
父節點
當前提交
160686fbe7
共有 3 個文件被更改,包括 4 次插入2 次删除
  1. 2 1
      .idea/workspace.xml
  2. 1 0
      application/synth/controller/BillApply.php
  3. 1 1
      application/synth/view/bill_apply/form.html

+ 2 - 1
.idea/workspace.xml

@@ -3,6 +3,7 @@
   <component name="ChangeListManager">
     <list default="true" id="1a36929e-c054-4875-a943-593a74e55fa4" name="Default Changelist" comment="">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" 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/form.html" beforeDir="false" afterPath="$PROJECT_DIR$/application/synth/view/bill_apply/form.html" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
@@ -443,7 +444,7 @@
       <workItem from="1694739473903" duration="20371000" />
       <workItem from="1694997975324" duration="5574000" />
       <workItem from="1695085328694" duration="21844000" />
-      <workItem from="1695603648860" duration="14609000" />
+      <workItem from="1695603648860" duration="14825000" />
     </task>
     <servers />
   </component>

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

@@ -92,6 +92,7 @@ class BillApply extends Controller
             if($data['order_type'] == 2) $order_info = GoodsOrder::where('id',$data['order_id'])->find()->toArray();
             if($data['order_type'] == 3) $order_info = ActivityApply::where('id',$data['order_id'])->find()->toArray();
             $data['order_info'] = $order_info;
+            $data['type_name'] = \app\common\model\BillType::where('id',$data['type'])->value('title');
             if($data['address_info']) $data['address_info'] = json_decode($data['address_info'],true);
             $this->data = $data;
         }

+ 1 - 1
application/synth/view/bill_apply/form.html

@@ -7,7 +7,7 @@
                     <div class="layui-col-md6">抬头:{$data.header}</div>
                     <div class="layui-col-md6">纳税人识别号:{$data.identify_number}</div><hr />
                     <div class="layui-col-md6">EMAIL:{$data.email}</div>
-                    <div class="layui-col-md6">发票类型:{$data.send_type == 1 ? '电子发票':'纸质发票'}</div><hr />
+                    <div class="layui-col-md6">发票类型:{$data.type_name}</div><hr />
 
                     <div class="layui-col-md6">领取方式:
                        {eq name='data.send_type' value ='1'}