From 4823497fc64f87cf78a1967641dfffa3326df9cd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=A3=B7=E5=8F=B6?=
 <14103883+leaf-phos@user.noreply.gitee.com>
Date: Sat, 19 Apr 2025 17:50:01 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/bst/device/index.vue                | 31 +++----------------
 .../system/user/components/UserFormDialog.vue | 10 ++++--
 2 files changed, 12 insertions(+), 29 deletions(-)

diff --git a/src/views/bst/device/index.vue b/src/views/bst/device/index.vue
index e9da044..4a4f370 100644
--- a/src/views/bst/device/index.vue
+++ b/src/views/bst/device/index.vue
@@ -280,7 +280,7 @@
           </template>
         </el-table-column>
       </template>
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="300">
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="400">
         <template slot-scope="scope">
           <el-button
             size="mini"
@@ -372,29 +372,6 @@
             @click="handleRefresh(scope.row)"
             v-has-permi="['bst:device:refresh']"
           >刷新</el-button>
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-sort"
-            @click="handleTransfer(scope.row)"
-            v-has-permi="['bst:device:transfer']"
-          >划拨</el-button>
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-connection"
-            @click="handleUnbindMch(scope.row)"
-            v-has-permi="['bst:device:unbindMch']"
-            v-show="scope.row.mchId != null"
-          >解绑商户</el-button>
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-map-location"
-            @click="handleUnbindArea(scope.row)"
-            v-has-permi="['bst:device:unbindArea']"
-            v-show="scope.row.areaId != null"
-          >解绑运营区</el-button>
           <el-button
             size="mini"
             type="text"
@@ -474,10 +451,10 @@ export default {
         {key: 'lockStatus', visible: true, label: '锁状态', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
         {key: 'voltage', visible: true, label: '电压', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
         {key: 'remainingPower', visible: true, label: '续航', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
-        {key: 'music', visible: true, label: '声音', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
+        {key: 'music', visible: false, label: '声音', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
         {key: 'remark', visible: true, label: '备注', minWidth: null, sortable: true, overflow: true, align: 'center', width: null},
-        {key: 'orderNo', visible: true, label: '订单', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
-        {key: 'createTime', visible: true, label: '创建', minWidth: null, sortable: true, overflow: false, align: 'center', width: "90"},
+        {key: 'orderNo', visible: false, label: '订单', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
+        {key: 'createTime', visible: false, label: '创建', minWidth: null, sortable: true, overflow: false, align: 'center', width: "90"},
       ],
       // 排序方式
       orderSorts: ['ascending', 'descending', null],
diff --git a/src/views/system/user/components/UserFormDialog.vue b/src/views/system/user/components/UserFormDialog.vue
index 5095023..01c489f 100644
--- a/src/views/system/user/components/UserFormDialog.vue
+++ b/src/views/system/user/components/UserFormDialog.vue
@@ -48,7 +48,10 @@
                 <el-option v-for="dict in dict.type.withdraw_service_type" :key="dict.value" :label="dict.label" :value="dict.value"/>
               </el-select>
             </template>
-            <template slot="append">元</template>
+            <template slot="append">
+              <template v-if="form.withdrawServiceType == WithdrawServiceType.FIXED">元</template>
+              <template v-else>%</template>
+            </template>
           </el-input>
         </form-col>
         <form-col :span="span" label="延迟到账" prop="bonusDelay">
@@ -68,7 +71,7 @@
 <script>
 import { addUser, getUser, updateUser } from '@/api/system/user'
 import FormCol from '@/components/FormCol/index.vue'
-import { RoleKeys, UserType } from '@/utils/enums'
+import { RoleKeys, UserType, WithdrawServiceType } from '@/utils/enums'
 import UserInput from '@/components/Business/User/UserInput.vue'
 import BooleanTag from '@/components/BooleanTag/index.vue'
 
@@ -94,6 +97,7 @@ export default {
   },
   data() {
     return {
+      WithdrawServiceType,
       span: 24,
       // 部门树选项
       deptOptions: [],
@@ -200,6 +204,8 @@ export default {
         idCardFront: null,
         idCardBack: null,
         resume: null,
+        withdrawServiceType: WithdrawServiceType.FIXED,
+        withdrawServiceValue: 1,
         // vo
         agentName: null,
       };