Merge branch 'hotfix/market_percentage' of wmtx/platform into release

下游公司字段与上游公司字段一致

Application/Admin/View/CpJuheCompany/detail.html

@@ -111,12 +111,12 @@
                                 <span class="form-required" style="line-height: 30px;"><if condition="$data['is_received'] eq 0">否<else/>是</if></span>
                             </td>
                         </tr>
-                        <tr>
-                            <td class="l">是否为收款方</td>
-                            <td class="r">
-                                <span class="form-required" style="line-height: 30px;"><if condition="$data['is_qualifity'] eq 0">否<else/>是</if></span>
-                            </td>
-                        </tr>
+<!--                        <tr>-->
+<!--                            <td class="l">是否为收款方</td>-->
+<!--                            <td class="r">-->
+<!--                                <span class="form-required" style="line-height: 30px;"><if condition="$data['is_qualifity'] eq 0">否<else/>是</if></span>-->
+<!--                            </td>-->
+<!--                        </tr>-->
                         <tr>
                             <td class="l noticeinfo">联系人</td>
                             <td class="r">

Application/Admin/View/CpJuheCompany/export.html

@@ -112,18 +112,24 @@
           <th >是否有预付款</th>
           <th >预付款金额</th>
           <th >是否签署合同</th>
-
-          <th >是否具有游戏资质</th>
+          <th >合作关系</th>
+<!--          <th >是否具有游戏资质</th>-->
 
           <th >合同期限</th>
           <th >生效时间</th>
           <th >开票税点</th>
           <th >发票类型</th>
+
+          <th >开票内容</th>
+
           <th >税费费率</th>
-          <th >渠道类型</th>
+          <th >渠道费率</th>
           <th >联系人</th>
           <th >联系电话</th>
           <th >联系地址</th>
+          <th >注册电话</th>
+          <th >注册地址</th>
+          <th >公司税号</th>
         </tr>
         </thead>
         <!-- 列表 -->
@@ -160,8 +166,8 @@
               <td rowspan="{$vo.rowspan}">{$vo.is_surplus|default="否"}</td>
               <td rowspan="{$vo.rowspan}">{$vo.before_amount|default="0"}</td>
               <td rowspan="{$vo.rowspan}">{$vo.is_contract|default="------"}</td>
-
-              <td rowspan="{$vo.rowspan}">{$vo.is_qualifity|default="否"}</td>
+              <td rowspan="{$vo.rowspan}">{$vo.is_cooperate|default="------"}</td>
+<!--              <td rowspan="{$vo.rowspan}">{$vo.is_qualifity|default="否"}</td>-->
 
               <td rowspan="{$vo.rowspan}">
                 <span class="form-required" style="line-height: 30px;">{$vo['agreement_time']['start_time']}</span>—
@@ -172,11 +178,16 @@
               </td>
               <td rowspan="{$vo.rowspan}">{$vo['tax_point']}%</td>
               <td rowspan="{$vo.rowspan}">{$vo.invoice_type|default="------"}</td>
+
+              <td rowspan="{$vo.rowspan}">{$vo.invoice_item|default="信息服务费"}</td>
               <td rowspan="{$vo.rowspan}">{$vo.tax_ratio|default="0"}%</td>
               <td rowspan="{$vo.rowspan}">{$vo.channel_radio|default="0"}%</td>
               <td rowspan="{$vo.rowspan}">{$vo.connection_person|default="------"}</td>
               <td rowspan="{$vo.rowspan}">{$vo.phone|default="------"}</td>
               <td rowspan="{$vo.rowspan}">{$vo.connection_address|default="------"}</td>
+              <td rowspan="{$vo.rowspan}">{$vo.register_phone|default="------"}</td>
+              <td rowspan="{$vo.rowspan}">{$vo.register_address|default="------"}</td>
+              <td rowspan="{$vo.rowspan}">{$vo.tax_identification_number|default="------"}</td>
             </tr>
             <volist name="vo.game_name" id="sec" key="index">
               <if condition="$index gt 1">