1.调整

src/views/system/dept/index.vue

@@ -74,9 +74,9 @@
       :default-sort="defaultSort" @sort-change="handleSortChange">
       <el-table-column prop="deptName" label="运营商名称" width="260" sortable="custom" :sort-orders="['descending', 'ascending']"></el-table-column>
       <el-table-column prop="areaName" label="名下运营区" align="center" ></el-table-column>
-      <el-table-column prop="phone" label="电话" align="center" ></el-table-column>
+      <el-table-column prop="phone" label="联系电话" align="center" ></el-table-column>
       <el-table-column prop="appName" label="小程序" align="center" ></el-table-column>
-      <el-table-column prop="userName" label="绑定微信" align="center" ></el-table-column>
+      <el-table-column prop="userName" label="绑定提现账户" align="center" ></el-table-column>
       <el-table-column prop="separateAccount" label="独立支付" align="center" width="100">
         <template slot-scope="scope">
           <dict-tag :options="dict.type.sys_yes_no" :value="scope.row.separateAccount"/>
@@ -87,9 +87,9 @@
           <span>{{ scope.row.platformServiceFee && scope.row.platformServiceFee != '0'?scope.row.platformServiceFee+'%':'' }}</span>
         </template>
       </el-table-column>
-      <el-table-column prop="handlingCharge" label="手续费(‰)" align="center" >
+      <el-table-column prop="handlingCharge" label="手续费" align="center" >
         <template slot-scope="scope">
-          <span>{{ scope.row.handlingCharge && scope.row.handlingCharge != '0'?scope.row.handlingCharge+'‰':'' }}</span>
+          <span>{{ formatHandlingCharge(scope.row.handlingCharge,scope.row.handlingChargeType) }}</span>
         </template>
       </el-table-column>
       <el-table-column prop="status" label="状态" width="100">
@@ -153,7 +153,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="绑定微信" prop="phonenumber">
+            <el-form-item label="绑定提现账户" prop="phonenumber" label-width="120">
               <el-select
                 ref="headerSearchSelect"
                 v-model="form.appUserId"
@@ -175,9 +175,12 @@
           </el-col>
         </el-row>
         <el-row>
-          <el-col :span="12">
+          <el-col :span="12" >
             <el-form-item label="联系电话" prop="phone">
-              <el-input v-model="form.phone" placeholder="请输入联系电话" maxlength="11" />
+              <el-input v-model="form.phone" placeholder="请输入联系电话" maxlength="11" :disabled="form.deptId !== undefined"/>
+              <span class="el-form-item__tip" style="width: 100%;">
+                <div>联系电话用于登录后台管理系统，如需修改请联系管理员</div>
+              </span>
             </el-form-item>
           </el-col>
           <el-col :span="12">
@@ -244,8 +247,14 @@
               </el-form-item>
             </el-col>
             <el-col :span="12">
-              <el-form-item label="手续费(‰)" label-width="120" prop="handlingCharge">
-                <el-input style="width: 65%" v-model="form.handlingCharge" placeholder="请输入手续费" />
+              <el-form-item label="手续费类型" label-width="120" prop="handlingChargeType">
+                <el-radio-group v-model="form.handlingChargeType">
+                  <el-radio
+                    v-for="dict in dict.type.et_handling_charge_type"
+                    :key="dict.value"
+                    :label="dict.value"
+                  >{{dict.label}}</el-radio>
+                </el-radio-group>
               </el-form-item>
             </el-col>
           </el-row>
@@ -255,6 +264,16 @@
                 <el-switch v-model="form.isUsePlatformApp" class="drawer-switch" />
               </el-form-item>
             </el-col>
+            <el-col :span="12" v-if="form.handlingChargeType == '1'">
+              <el-form-item label="比例(‰)" label-width="90" >
+                <el-input style="width: 65%" v-model="form.handlingCharge" placeholder="请输入手续费" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="12" v-else>
+              <el-form-item label="每笔(元)" label-width="90" >
+                <el-input style="width: 65%" v-model="form.handlingCharge" placeholder="请输入手续费" />
+              </el-form-item>
+            </el-col>
           </el-row>
           <el-row>
             <el-col :span="12" v-show="form.isUsePlatformApp != true">
@@ -368,7 +387,7 @@ import { bandAppUser, getUser } from '@/api/system/user'
 
 export default {
   name: "Dept",
-  dicts: ['sys_normal_disable','sys_yes_no'],
+  dicts: ['sys_normal_disable','sys_yes_no','et_handling_charge_type'],
   components: { Treeselect },
   data() {
     return {
@@ -417,9 +436,15 @@ export default {
         deptName: [
           { required: true, message: "运营商名称不能为空", trigger: "blur" }
         ],
-        orderNum: [
-          { required: true, message: "显示排序不能为空", trigger: "blur" }
+        handlingChargeType: [
+          { required: true, message: "手续费类型不能为空", trigger: "blur" }
         ],
+        handlingCharge: [
+          { required: true, message: "手续费不能为空", trigger: "blur" }
+        ],
+        // orderNum: [
+        //   { required: true, message: "显示排序不能为空", trigger: "blur" }
+        // ],
         email: [
           {
             type: "email",
@@ -453,6 +478,17 @@ export default {
     this.getList();
   },
   methods: {
+    formatHandlingCharge(charge, chargeType) {
+      if (!charge || charge === '0') {
+        return '';
+      }
+      if (chargeType === '1') {
+        return `${charge}‰`;
+      } else if (chargeType === '2') {
+        return `每笔${charge}元`;
+      }
+      return charge;
+    },
     /** 排序触发事件 */
     handleSortChange(column, prop, order) {
       this.queryParams.orderByColumn = column.prop;
@@ -514,6 +550,7 @@ export default {
         separateAccount: 'N',
         platformServiceFee: '4',
         handlingCharge: '5.4',
+        handlingChargeType: '1',
         isUsePlatformApp: true,
         merchantId: null,
         apiV3Key: null,
@@ -617,4 +654,9 @@ export default {
     font-weight: bold;
     color: red;
   }
+  .el-form-item__tip{
+    color: #ff0000;
+    font-size: 12px;
+    line-height: 18px;
+  }
 </style>

src/views/system/device/index.vue

@@ -398,7 +398,7 @@
           </el-form-item>
         </el-col>
         <el-col :span="8">
-          <el-form-item label="硬件版本" prop="deviceName">
+          <el-form-item label="硬件版本" prop="deviceName" v-if="hardwareVersionOptions.length > 0">
             <el-select v-model="form.hardwareVersionId" clearable placeholder="请选择硬件版本">
               <el-option
                 v-for="item in hardwareVersionOptions"
@@ -585,6 +585,7 @@ export default {
       activeIndex: '1',
       // 遮罩层
       loading: true,
+      loading2: true,
       // 选中数组
       ids: [],
       deptOptions: [],
@@ -673,6 +674,10 @@ export default {
     window.removeEventListener('scroll', this.handleScroll, true)
   },
   created() {
+    listHardwareVersion(this.queryParams).then(response => {
+      this.hardwareVersionOptions = response.rows;
+      this.loading2 = false;
+    });
     console.log("当前用户信息：",this.$store.state.user.name)
     const sn = this.$route.params && this.$route.params.sn;
     const vehicleNum = this.$route.params && this.$route.params.vehicleNum;
@@ -698,9 +703,6 @@ export default {
     });
     this.userName = this.$store.state.user.name;
     this.getList();
-    listHardwareVersion(this.queryParams).then(response => {
-      this.hardwareVersionOptions = response.rows;
-    });
     if(this.userName === 'admin'){
       listDept({status: '0' }).then(response => {
         this.deptOptions = response.data;
@@ -758,8 +760,11 @@ export default {
       }
     },
     formatVersion(versionId){
-      if(versionId){
-        return this.hardwareVersionOptions.find(item => item.id === versionId).version;
+      if (versionId && this.hardwareVersionOptions.length > 0) {
+        const versionItem = this.hardwareVersionOptions.find(item => item.id === versionId);
+        if (versionItem) {
+          return versionItem.version;
+        }
       }
       return "";
     },
@@ -1187,7 +1192,7 @@ export default {
   .el-input__inner{
     color: red;
   }
-    
+
 }
 .el-input{
   .el-input__inner{

src/views/system/partner/index.vue

@@ -176,7 +176,7 @@
             <el-form-item v-if="form.userId == undefined" label="手机号码" prop="phonenumber">
               <el-input v-model="form.phonenumber" placeholder="请输入手机号码" maxlength="11" />
               <span class="el-form-item__tip" style="width: 100%;">
-                <div>tips:非常重要！手机号用于分润和登录系统，保存后不可修改</div>
+                <div>手机号用于分润和登录系统，保存后不可修改</div>
               </span>
             </el-form-item>
           </el-col>

src/views/system/withdrawAudit/index.vue

@@ -219,16 +219,16 @@ export default {
   },
   computed: {
     formattedFee() {
-      console.log("handlingCharge===========",this.handlingCharge)
-      // 将handlingCharge转换为浮点类型
-      let handlingCharge = parseFloat(this.handlingCharge)/1000;
-      console.log("handlingCharge1===========", handlingCharge);
-      console.log("this.form.amount===========", this.form.amount);
-      // 计算手续费
-      let fee = this.form.amount * handlingCharge;
-      // 保留两位小数，并确保四舍五入
-      fee = fee.toFixed(2);
-
+      let fee;
+      if(this.handlingChargeType === '1'){
+        let handlingCharge = parseFloat(this.handlingCharge)/1000;
+        // 计算手续费
+        let fee1 = this.form.amount * handlingCharge;
+        // 保留两位小数，并确保四舍五入
+        fee = fee1.toFixed(2);
+      }else{
+        fee = parseFloat(this.handlingCharge);
+      }
       // 判断手续费是否为0
       if (fee === 0) {
         return '0.00 （免手续费）';
@@ -238,11 +238,16 @@ export default {
     },
     actualAmount() {
       let amount = this.form.amount;
-      let handlingCharge = parseFloat(this.handlingCharge)/1000;
-      let fee = this.form.amount * handlingCharge;
-      // 四舍五入到两位小数
-      fee = Math.round(fee * 100) / 100;
-      // 计算实际到账金额并四舍五入到两位小数
+      let fee;
+      if(this.handlingChargeType === '1'){
+        let handlingCharge = parseFloat(this.handlingCharge)/1000;
+        let fee1 = this.form.amount * handlingCharge;
+        // 四舍五入到两位小数
+        fee = Math.round(fee1 * 100) / 100;
+        // 计算实际到账金额并四舍五入到两位小数
+      }else{
+        fee = parseFloat(this.handlingCharge);
+      }
       let actual = amount - fee;
       actual = actual.toFixed(2);
       return `${actual} `;
@@ -318,7 +323,7 @@ export default {
     };
   },
   created() {
-    console.log("当前用户信息：",this.$store.state.user.name)
+    // console.log("当前用户信息：",this.$store.state.user.name)
     this.userName = this.$store.state.user.name;
     this.getList();
     this.getAreaList();
@@ -333,6 +338,10 @@ export default {
       getDeptByToken(deptId).then(response => {
         this.balance = response.data.balance;
         this.handlingCharge = response.data.handlingCharge;
+        this.handlingChargeType = response.data.handlingChargeType;
+        this.form.amount = 0;
+        // console.log("11111handlingCharge===========",this.handlingCharge)
+        // console.log("22222handlingChargeType===========",this.handlingChargeType)
       });
     },
     /** 审核 */
@@ -411,6 +420,7 @@ export default {
         busType: null,
         amount: null,
         handlingCharge: null,
+        handlingChargeType: null,
         operatorDividend: null,
         operatorBalance: null,
         partnerDividend: null,
@@ -443,6 +453,7 @@ export default {
         getDeptByToken().then(response => {
           this.balance = response.data.balance;
           this.handlingCharge = response.data.handlingCharge;
+          this.handlingChargeType = response.data.handlingChargeType;
         });
       }
       this.reset();
@@ -495,7 +506,7 @@ export default {
   .el-input__inner{
     color: red;
   }
-    
+
 }
 .el-input{
   .el-input__inner{