From 98f4bbd8bc0418dc40eeb4a6a83b7d6e9da65dbe Mon Sep 17 00:00:00 2001
From: lccsw <805383944@qq.com>
Date: Fri, 1 Jul 2022 09:07:17 +0800
Subject: [PATCH] edit-plan-biz_settle

---
 admin/controllers/auto/Business.php |  4 ++++
 admin/views/auto/business/get.php   | 11 +++++++++--
 admin/views/biz/store/lists.php     |  8 +++++---
 3 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/admin/controllers/auto/Business.php b/admin/controllers/auto/Business.php
index b2f08bd9..289e71ff 100644
--- a/admin/controllers/auto/Business.php
+++ b/admin/controllers/auto/Business.php
@@ -165,6 +165,7 @@ class Business extends HD_Controller{
                 'price_floor' => $row['price_floor'],
                 'price_color' => $row['price_color'],
                 'price_coplus' => $row['price_coplus'],
+                'proxy_profix_car' => $row['proxy_profix_car'],
                 'profix_car' => $row['profix_car'],
                 'profix_carno' => $row['profix_carno'],
                 'profix_insure' => $row['profix_insure'],
@@ -192,6 +193,7 @@ class Business extends HD_Controller{
                 'price_floor' => 0.00,
                 'price_color' => 0.00,
                 'price_coplus' => 0.00,
+                'proxy_profix_car' => 0.00,
                 'profix_car' => 0.00,
                 'profix_carno' => 0.00,
                 'profix_insure' => 0.00,
@@ -248,6 +250,7 @@ class Business extends HD_Controller{
         $info['price_floor'] && $data['price_floor'] = $info['price_floor'];
         $info['price_coplus'] && $data['price_coplus'] = $info['price_coplus'];
         $info['price_color'] && $data['price_color'] = $info['price_color'];
+        $info['proxy_profix_car'] && $data['proxy_profix_car'] = $info['proxy_profix_car'];
         $info['profix_car'] && $data['profix_car'] = $info['profix_car'];
         $info['profix_carno'] && $data['profix_carno'] = $info['profix_carno'];
         $info['profix_insure'] && $data['profix_insure'] = $info['profix_insure'];
@@ -299,6 +302,7 @@ class Business extends HD_Controller{
         $info['price_floor'] && $data['price_floor'] = $info['price_floor'];
         $info['price_coplus'] && $data['price_coplus'] = $info['price_coplus'];
         $info['price_color'] && $data['price_color'] = $info['price_color'];
+        $info['proxy_profix_car'] && $data['proxy_profix_car'] = $info['proxy_profix_car'];
         $info['profix_car'] && $data['profix_car'] = $info['profix_car'];
         $info['profix_carno'] && $data['profix_carno'] = $info['profix_carno'];
         $info['profix_insure'] && $data['profix_insure'] = $info['profix_insure'];
diff --git a/admin/views/auto/business/get.php b/admin/views/auto/business/get.php
index 1925492d..09aec468 100644
--- a/admin/views/auto/business/get.php
+++ b/admin/views/auto/business/get.php
@@ -103,9 +103,16 @@
     </div>
     <div class="tab-pane fade" id="jszc">
         <div class="am-form-group wp50">
-            <label class="am-para-label">单车毛利：</label>
+            <label class="am-para-label">代理店单车毛利：</label>
             <div class="am-para-input">
-                <input type="text" placeholder="请输入单车毛利" name="profix_car" v-model="info.profix_car" style="display: inline;width: 60%"/>
+                <input type="text" placeholder="请输入代理店单车毛利" name="proxy_profix_car" v-model="info.proxy_profix_car" style="display: inline;width: 60%"/>
+                <span>元</span>
+            </div>
+        </div>
+        <div class="am-form-group wp50">
+            <label class="am-para-label">品牌店单车毛利：</label>
+            <div class="am-para-input">
+                <input type="text" placeholder="请输入品牌店单车毛利" name="profix_car" v-model="info.profix_car" style="display: inline;width: 60%"/>
                 <span>元</span>
             </div>
         </div>
diff --git a/admin/views/biz/store/lists.php b/admin/views/biz/store/lists.php
index 49adf8fa..00409a1c 100755
--- a/admin/views/biz/store/lists.php
+++ b/admin/views/biz/store/lists.php
@@ -153,16 +153,18 @@
                 </tr>
                 <tr>
                     <td colspan="6" class="align-r">
-                        <a data-open="/biz/fine/lists?id=<?= $v['id'] ?>"
-                           class="am-btn am-btn-primary am-btn-xs">精品配置
-                        </a>
                         <?if($v['type']==1){?>
+                            <a data-open="/biz/fine/lists?id=<?= $v['id'] ?>"
+                               class="am-btn am-btn-primary am-btn-xs">精品配置
+                            </a>
                             <a data-open="/biz/srv/lists?id=<?= $v['id'] ?>"
                                class="am-btn am-btn-primary am-btn-xs">水平业务配置</a>
                         <?}?>
                         <?if(in_array($v['type'],[1,2])){?>
                         <a data-open="/biz/store/store/get_info?id=<?= $v['id'] ?>"
                            class="am-btn am-btn-primary am-btn-xs">基本信息</a>
+                        <?}?>
+                        <?if(in_array($v['type'],[1,2,3])){?>
                         <a data-open="/biz/settle/lists_static?id=<?= $v['id'] ?>"
                            class="am-btn am-btn-primary am-btn-xs">结算统计</a>
                         <?}?>