From 8f96aed8fb09220771c5e10c91b71b71fc349897 Mon Sep 17 00:00:00 2001
From: "autumn.g@foxmail.com" <autumn.g@foxmail.com>
Date: Wed, 31 Jan 2024 16:14:28 +0800
Subject: [PATCH] =?UTF-8?q?update=E4=BC=9A=E5=91=98=E8=AE=A1=E8=B4=B9?=
 =?UTF-8?q?=E6=A8=A1=E6=9D=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/pile/PileBillingTemplateMapper.xml | 10 +++++-
 .../views/pile/station/components/billing.vue | 32 +++----------------
 2 files changed, 13 insertions(+), 29 deletions(-)

diff --git a/jsowell-pile/src/main/resources/mapper/pile/PileBillingTemplateMapper.xml b/jsowell-pile/src/main/resources/mapper/pile/PileBillingTemplateMapper.xml
index 837fae4c0..e6c73352f 100644
--- a/jsowell-pile/src/main/resources/mapper/pile/PileBillingTemplateMapper.xml
+++ b/jsowell-pile/src/main/resources/mapper/pile/PileBillingTemplateMapper.xml
@@ -15,6 +15,7 @@
         <result property="occupyFee" column="occupy_fee"/>
         <result property="maxOccupyFee" column="max_occupy_fee"/>
         <result property="publicFlag" column="public_flag"/>
+        <result property="memberFlag" column="memberFlag"/>
         <result property="createBy" column="create_by"/>
         <result property="createTime" column="create_time"/>
         <result property="updateBy" column="update_by"/>
@@ -25,7 +26,7 @@
     <sql id="Base_Column_List">
         <!--@mbg.generated PileBillingTemplate-->
         id, template_code, name, status, remark, type, station_id, free_time, occupy_fee, max_occupy_fee, public_flag,
-        create_time, update_by, update_time, del_flag
+        member_flag, create_time, update_by, update_time, del_flag
     </sql>
 
     <resultMap type="com.jsowell.pile.domain.PileBillingDetail" id="PileBillingDetailResult">
@@ -123,6 +124,9 @@
             <if test="publicFlag != null">
                 public_flag,
             </if>
+            <if test="memberFlag != null">
+                member_flag,
+            </if>
             <if test="name != null">
                 name,
             </if>
@@ -170,6 +174,9 @@
             <if test="publicFlag != null">
                 #{publicFlag},
             </if>
+            <if test="memberFlag != null">
+                #{memberFlag},
+            </if>
             <if test="name != null">
                 #{name},
             </if>
@@ -330,6 +337,7 @@
             t2.free_time as freeTime,
             t2.occupy_fee as occupyFee,
             t2.publish_time as publishTime,
+            t2.member_flag as memberFlag,
             t3.electricity_price AS sharpElectricityPrice,
             t3.service_price AS sharpServicePrice,
             t3.apply_time AS sharpApplyDate,
diff --git a/jsowell-ui/src/views/pile/station/components/billing.vue b/jsowell-ui/src/views/pile/station/components/billing.vue
index 97e2f2589..73728732e 100644
--- a/jsowell-ui/src/views/pile/station/components/billing.vue
+++ b/jsowell-ui/src/views/pile/station/components/billing.vue
@@ -125,35 +125,11 @@
       <el-table-column label="上次发布时间" prop="publishTime" />
       <el-table-column label="操作" align="center" width="250">
         <template slot-scope="scope">
-          <el-button
-            type="text"
-            size="small"
-            @click="issue(scope.row.templateId)"
-          >
-            发布
-          </el-button>
 
-          <el-button type="text" size="small" @click="outerVisible = true"
-            >绑定设备
-          </el-button>
-          <!-- <el-col :span="5">
-              <el-button type="text" size="small" @click="expDialog = true"
-                >费率详情页</el-button
-              >
-            </el-col> -->
-          <el-button
-            type="text"
-            size="small"
-            @click="handleUpdate(scope.row.templateId)"
-            >修改默认费率
-          </el-button>
-
-          <el-button
-            type="text"
-            size="small"
-            @click="delBilling(scope.row.templateId)"
-            >删除</el-button
-          >
+          <el-button v-if="scope.row.memberFlag === '0'" type="text" size="small" @click="issue(scope.row.templateId)">发布</el-button>
+          <el-button v-if="scope.row.memberFlag === '0'" type="text" size="small" @click="outerVisible = true">绑定设备</el-button>
+          <el-button type="text" size="small" @click="handleUpdate(scope.row.templateId)">修改默认费率</el-button>
+          <el-button type="text" size="small" @click="delBilling(scope.row.templateId)">删除</el-button>
         </template>
       </el-table-column>
     </el-table>