From 4b6abbe15d852233407b4c330429d142ace41da6 Mon Sep 17 00:00:00 2001
From: hr121 <568127468@qq.com>
Date: Sat, 16 Aug 2025 21:26:25 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=9D=83=E9=99=90=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=EF=BC=8C=E6=B5=8B=E8=AF=95=E9=A3=9E=E8=A1=8C=E5=99=A8?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86=E5=92=8C=E8=BD=BD=E7=89=A9=E9=87=91=E9=A2=9D?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/InsuranceRecord.vue            | 21 +++++++++++++++++--
 .../settlementOrder/generateOrder/index.vue   | 10 ++++++++-
 .../settlementOrder/orderDetail/index.vue     |  1 -
 src/views/system/pilot/index.vue              | 11 +++++-----
 src/views/transport-fee/index.vue             | 20 ++++++++++++------
 5 files changed, 47 insertions(+), 16 deletions(-)

diff --git a/src/views/aircraft/aircraftDetail/components/InsuranceRecord.vue b/src/views/aircraft/aircraftDetail/components/InsuranceRecord.vue
index 1c1e1ca..8c9dedc 100644
--- a/src/views/aircraft/aircraftDetail/components/InsuranceRecord.vue
+++ b/src/views/aircraft/aircraftDetail/components/InsuranceRecord.vue
@@ -12,6 +12,8 @@
         type="text"
         icon="el-icon-plus"
         @click="handleAdd"
+        v-permission="permission.add"
+        v-if="checkPer(permission.add)"
         >新增保险
       </el-button>
     </div>
@@ -32,10 +34,20 @@
           <el-button type="text" size="small" @click="handleView(scope.row)"
             >查看详情</el-button
           >
-          <el-button type="text" size="small" @click="handleEdit(scope.row)"
+          <el-button
+            type="text"
+            size="small"
+            @click="handleEdit(scope.row)"
+            v-if="checkPer(permission.edit)"
+            v-permission="permission.edit"
             >编辑</el-button
           >
-          <el-button type="text" size="small" @click="handleDelete(scope.row)"
+          <el-button
+            type="text"
+            size="small"
+            @click="handleDelete(scope.row)"
+            v-if="checkPer(permission.delete)"
+            v-permission="permission.delete"
             >删除</el-button
           >
         </template>
@@ -165,6 +177,11 @@ export default {
         attachments: [],
         aircraftId: null
       },
+      permission: {
+        add: ['admin', 'aircraftDetail:add'],
+        edit: ['admin', 'aircraftDetail:edit'],
+        delete: ['admin', 'aircraftDetail:delete']
+      },
       insuranceTypes: [
         { value: 0, label: "三方险" },
         { value: 1, label: "设备险" },
diff --git a/src/views/order/settlementOrder/generateOrder/index.vue b/src/views/order/settlementOrder/generateOrder/index.vue
index f658624..2bd1f57 100644
--- a/src/views/order/settlementOrder/generateOrder/index.vue
+++ b/src/views/order/settlementOrder/generateOrder/index.vue
@@ -100,7 +100,12 @@
 
     <!-- 生成结算单按钮 -->
     <div class="generate-btn-container">
-      <el-button type="primary" @click="handleGenerate">生成结算单</el-button>
+      <el-button
+        type="primary"
+        @click="handleGenerate"
+        v-permission="permission.add"
+        v-if="checkPer(permission.add)"
+      >生成结算单</el-button>
     </div>
     <!-- 结算列表弹窗 -->
     <el-dialog
@@ -160,6 +165,9 @@ export default {
         customerId: undefined,
         dateRange: [defaultStartDate, defaultEndDate]
       },
+      permission: {
+        add: ['admin', 'settlementOrder:add'],
+      },
       defaultDateRange: [defaultStartDate, defaultEndDate],
       page: {
         current: 1,
diff --git a/src/views/order/settlementOrder/orderDetail/index.vue b/src/views/order/settlementOrder/orderDetail/index.vue
index 21da6eb..bad8cb2 100644
--- a/src/views/order/settlementOrder/orderDetail/index.vue
+++ b/src/views/order/settlementOrder/orderDetail/index.vue
@@ -234,7 +234,6 @@ export default {
           item.createBy = pilotResponse.name
 
           // 获取景区名称
-          console.log(this.scenicAreaOptions)
           const scenic = this.scenicAreaOptions.find(s => s.value === item.attractionId)
           item.scenicName = scenic ? scenic.label : ''
         }))
diff --git a/src/views/system/pilot/index.vue b/src/views/system/pilot/index.vue
index 946868e..0c9438a 100644
--- a/src/views/system/pilot/index.vue
+++ b/src/views/system/pilot/index.vue
@@ -59,7 +59,7 @@
                 <el-col :xs="24" :sm="24" :md="12" :lg="8" :xl="6" class="mb20">
                   <el-form-item label="景区" prop="scenicId">
                     <el-select v-model="form.scenicId" placeholder="请选择景区">
-                      <el-option v-for="item in scenics" :key="item.name" 
+                      <el-option v-for="item in scenics" :key="item.name"
                       :label="item.name" :value="Number(item.id)"/>
                     </el-select>
                   </el-form-item>
@@ -151,7 +151,7 @@
       </el-row>
     </div>
   </template>
-  
+
   <script>
   import crudPilot from '@/api/system/pilot'
   import { isvalidPhone } from '@/utils/validate'
@@ -164,8 +164,8 @@
   import pagination from '@crud/Pagination'
   import { mapGetters } from 'vuex'
   import { upload } from '@/utils/upload'
-  const defaultForm = { id: null, username: null, name: null, 
-    phone: null, areaId: null, scenicId: null, roles: null, qualification: null, 
+  const defaultForm = { id: null, username: null, name: null,
+    phone: null, areaId: null, scenicId: null, roles: null, qualification: null,
     qualificationAttachment: null, files: [], userType: null, enabled: 1 }
   export default {
     name: 'Pilot',
@@ -350,7 +350,7 @@
     }
   }
   </script>
-  
+
   <style rel="stylesheet/scss" lang="scss" scoped>
     ::v-deep .el-upload--picture-card,::v-deep .el-upload-list__item{
       width: 110px !important;
@@ -365,4 +365,3 @@
       }
     }
   </style>
-  
\ No newline at end of file
diff --git a/src/views/transport-fee/index.vue b/src/views/transport-fee/index.vue
index 3fa175d..6327529 100644
--- a/src/views/transport-fee/index.vue
+++ b/src/views/transport-fee/index.vue
@@ -4,7 +4,7 @@
     <div class="filter-container">
       <el-input
         v-model="query.scenicName"
-        placeholder="请输入景区名称或区域名称"
+        placeholder="请输入景区名称"
         style="width: 200px"
         clearable
       />
@@ -16,12 +16,16 @@
     <el-table :data="tableData" stripe style="width: 100%">
       <el-table-column prop="areaName" label="区域名称" align="left" />
       <el-table-column prop="scenicName" label="景区名称" align="left" />
-      <el-table-column prop="feePerKg" label="金额 / KG" align="center" />
+      <el-table-column prop="feePerKg" label="金额 / KG" align="center">
+        <template slot-scope="scope">
+          <span>{{ scope.row.feePerKg ? scope.row.feePerKg + '元' : "无" }}</span>
+        </template>
+      </el-table-column>
       <el-table-column label="操作" width="120" align="center" fixed="right">
         <template slot-scope="scope">
-          <el-button type="primary" size="mini" @click="handleSetFee(scope.row)"
-            >设置金额</el-button
-          >
+          <el-button type="primary" v-if="checkPer(permission.edit)" v-permission="permission.edit" size="mini" @click="handleSetFee(scope.row)">
+            设置金额
+          </el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -62,6 +66,9 @@ export default {
       query: {
         scenicName: "",
       },
+      permission: {
+        edit: ["admin", "transport-fee:edit"]
+      },
       // 表格数据
       tableData: [],
       // 分页信息
@@ -91,7 +98,7 @@ export default {
           id: item.id,
           areaName: item.areaName,
           scenicName: item.name,
-          feePerKg: item.price ? item.price + '元' : "无",
+          feePerKg: item.price,
         }));
         this.page.total = parseInt(totalElements);
       } catch (error) {
@@ -99,6 +106,7 @@ export default {
         this.$message.error("获取景区数据失败");
       }
     },
+
     // 搜索
     handleSearch() {
       this.page.current = 1;