From fd125f4f973eda2cf37974977842a0c5ba00a69c Mon Sep 17 00:00:00 2001
From: aaron <>
Date: Tue, 4 Mar 2025 23:34:38 +0800
Subject: [PATCH] =?UTF-8?q?=E6=94=AF=E6=8C=81=E5=9B=BA=E5=AE=9A=E5=88=86?=
 =?UTF-8?q?=E4=BD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/deliveryman/List.vue | 222 ++++++++++++++++++++++++---------
 1 file changed, 161 insertions(+), 61 deletions(-)

diff --git a/src/views/deliveryman/List.vue b/src/views/deliveryman/List.vue
index 763af26..7610b78 100644
--- a/src/views/deliveryman/List.vue
+++ b/src/views/deliveryman/List.vue
@@ -72,13 +72,23 @@
               </template>
             </a-space>
           </template>
+          <template v-if="column.key === 'commission'">
+            <template v-if="record.delivery_commission_fixed > 0">
+              <a-tag color="blue">固定金额</a-tag>
+              <span>¥{{ record.delivery_commission_fixed }}</span>
+            </template>
+            <template v-else>
+              <a-tag color="orange">按比例</a-tag>
+              <span>{{ record.delivery_commission_rate || 0 }}%</span>
+            </template>
+          </template>
           <template v-if="column.key === 'action'">
             <a-space>
               <a-button type="link" @click="handleEditCommunity(record)">
                 {{ record.community_name ? '修改小区' : '设置小区' }}
               </a-button>
-              <a-button type="link" @click="handleEditCommission(record)">
-                设置分佣比例
+              <a-button type="link" @click="showCommissionModal(record)">
+                设置分佣
               </a-button>
             </a-space>
           </template>
@@ -114,32 +124,68 @@
         </a-form>
       </a-modal>
 
-      <!-- 分佣比例设置模态框 -->
+      <!-- 设置分佣比例模态框 -->
       <a-modal
         v-model:visible="commissionModalVisible"
-        title="设置分佣比例"
-        :confirm-loading="commissionSaving"
-        @ok="handleCommissionSave"
+        title="设置分佣"
+        :confirm-loading="commissionSubmitting"
+        @ok="handleCommissionSubmit"
         @cancel="handleCommissionCancel"
       >
-        <a-form layout="vertical">
+        <a-form
+          ref="commissionFormRef"
+          :model="commissionForm"
+          :rules="commissionRules"
+          layout="vertical"
+        >
           <a-form-item
-            label="分佣比例（%）"
-            required
-            :rules="[
-              { required: true, message: '请输入分佣比例' },
-              { type: 'number', min: 0, max: 100, message: '分佣比例必须在0-100之间' }
-            ]"
+            label="分佣类型"
+            name="commission_type"
+            :rules="[{ required: true, message: '请选择分佣类型' }]"
+          >
+            <a-radio-group v-model:value="commissionForm.commission_type" @change="handleCommissionTypeChange">
+              <a-radio value="rate">按比例分佣</a-radio>
+              <a-radio value="fixed">固定金额分佣</a-radio>
+            </a-radio-group>
+          </a-form-item>
+          
+          <a-form-item
+            v-if="commissionForm.commission_type === 'rate'"
+            label="分佣比例"
+            name="delivery_commission_rate"
+            :rules="[{ required: commissionForm.commission_type === 'rate', message: '请输入分佣比例' }]"
           >
             <a-input-number
-              v-model:value="commissionRate"
+              v-model:value="commissionForm.delivery_commission_rate"
               :min="0"
               :max="100"
-              style="width: 200px"
-              placeholder="请输入分佣比例"
+              :precision="2"
+              :step="1"
+              style="width: 100%"
               addon-after="%"
             />
-            <div class="commission-tip">请输入0-100之间的整数</div>
+            <div class="form-help-text">
+              配送员可获得订单金额的百分比作为佣金
+            </div>
+          </a-form-item>
+          
+          <a-form-item
+            v-if="commissionForm.commission_type === 'fixed'"
+            label="固定金额"
+            name="delivery_commission_fixed"
+            :rules="[{ required: commissionForm.commission_type === 'fixed', message: '请输入固定金额' }]"
+          >
+            <a-input-number
+              v-model:value="commissionForm.delivery_commission_fixed"
+              :min="0"
+              :precision="2"
+              :step="1"
+              style="width: 100%"
+              addon-before="¥"
+            />
+            <div class="form-help-text">
+              配送员每单可获得的固定金额佣金
+            </div>
           </a-form-item>
         </a-form>
       </a-modal>
@@ -148,15 +194,17 @@
 </template>
 
 <script>
-import { defineComponent, ref, onMounted } from 'vue'
-import { message } from 'ant-design-vue'
+import { defineComponent, ref, onMounted, computed } from 'vue'
+import { message, Radio } from 'ant-design-vue'
 import request from '@/utils/request'
 import PageContainer from '@/components/PageContainer.vue'
 
 export default defineComponent({
   name: 'DeliverymanList',
   components: {
-    PageContainer
+    PageContainer,
+    ARadio: Radio,
+    ARadioGroup: Radio.Group
   },
   setup() {
     const loading = ref(false)
@@ -175,32 +223,29 @@ export default defineComponent({
         dataIndex: 'userid',
         key: 'userid',
         width: 80,
+        align: 'center'
       },
       {
-        title: '昵称',
+        title: '姓名',
         dataIndex: 'nickname',
         key: 'nickname',
-        width: 120,
+        width: 120
       },
       {
         title: '手机号',
         dataIndex: 'phone',
         key: 'phone',
-        width: 120,
+        width: 150
       },
       {
         title: '所属小区',
-        dataIndex: 'community_name',
         key: 'community_name',
-        width: 200,
+        width: 150
       },
       {
-        title: '分佣比例（%）',
-        dataIndex: 'delivery_commission_rate',
+        title: '分佣设置',
         key: 'commission',
-        width: 100,
-        align: 'right',
-        render: (text) => text ? `${text}%` : '-'
+        width: 150
       },
       {
         title: '操作',
@@ -320,42 +365,95 @@ export default defineComponent({
 
     // 分佣相关状态和方法
     const commissionModalVisible = ref(false)
-    const commissionSaving = ref(false)
-    const commissionRate = ref(0)
+    const commissionSubmitting = ref(false)
+    const commissionFormRef = ref(null)
+    const commissionForm = ref({
+      commission_type: 'rate',
+      delivery_commission_rate: 0,
+      delivery_commission_fixed: 0
+    })
+    const commissionRules = {
+      commission_type: [
+        { required: true, message: '请选择分佣类型' }
+      ],
+      delivery_commission_rate: [
+        { required: false, message: '请输入分佣比例' },
+        { type: 'number', min: 0, max: 100, message: '分佣比例必须在0-100之间' }
+      ],
+      delivery_commission_fixed: [
+        { required: false, message: '请输入固定金额' },
+        { type: 'number', min: 0, message: '固定金额必须大于0' }
+      ]
+    }
 
-    // 编辑分佣比例
-    const handleEditCommission = (record) => {
+    // 处理分佣类型变更
+    const handleCommissionTypeChange = (e) => {
+      const type = e.target.value
+      if (type === 'rate') {
+        commissionForm.value.delivery_commission_fixed = 0
+      } else if (type === 'fixed') {
+        commissionForm.value.delivery_commission_rate = 0
+      }
+    }
+
+    // 显示设置分佣模态框
+    const showCommissionModal = (record) => {
       currentUserId.value = record.userid
-      commissionRate.value = record.delivery_commission_rate || 0
+      
+      // 根据已有数据判断分佣类型
+      if (record.delivery_commission_fixed > 0) {
+        commissionForm.value.commission_type = 'fixed'
+        commissionForm.value.delivery_commission_fixed = record.delivery_commission_fixed
+        commissionForm.value.delivery_commission_rate = 0
+      } else {
+        commissionForm.value.commission_type = 'rate'
+        commissionForm.value.delivery_commission_rate = record.delivery_commission_rate || 0
+        commissionForm.value.delivery_commission_fixed = 0
+      }
+      
       commissionModalVisible.value = true
     }
 
-    // 保存分佣比例
-    const handleCommissionSave = async () => {
-    
-      try {
-        commissionSaving.value = true
-        await request.put(`/api/user/delivery-commission-rate`, {
-          user_id : currentUserId.value,
-          delivery_commission_rate: commissionRate.value
-        })
-        
-        message.success('设置成功')
-        commissionModalVisible.value = false
-        fetchData()
-      } catch (error) {
-        console.error('设置分佣比例失败:', error)
-        message.error('设置失败')
-      } finally {
-        commissionSaving.value = false
-      }
+    // 提交分佣设置
+    const handleCommissionSubmit = () => {
+      commissionFormRef.value.validate().then(async () => {
+        try {
+          commissionSubmitting.value = true
+          
+          // 根据分佣类型构建参数
+          const params = {
+            user_id: currentUserId.value,
+            delivery_commission_rate: commissionForm.value.commission_type === 'rate' ? commissionForm.value.delivery_commission_rate : 0,
+            delivery_commission_fixed: commissionForm.value.commission_type === 'fixed' ? commissionForm.value.delivery_commission_fixed : 0
+          }
+          
+          const res = await request.put('/api/user/delivery-commission', params)
+          
+          if (res.code === 200) {
+            message.success('分佣设置成功')
+            commissionModalVisible.value = false
+            fetchData()
+          } else {
+            message.error(res.message || '分佣设置失败')
+          }
+        } catch (error) {
+          console.error('设置分佣失败:', error)
+          message.error('分佣设置失败')
+        } finally {
+          commissionSubmitting.value = false
+        }
+      })
     }
 
     // 取消分佣设置
     const handleCommissionCancel = () => {
       commissionModalVisible.value = false
-      commissionRate.value = 0
       currentUserId.value = null
+      commissionForm.value = {
+        commission_type: 'rate',
+        delivery_commission_rate: 0,
+        delivery_commission_fixed: 0
+      }
     }
 
     // 处理筛选变化
@@ -389,7 +487,6 @@ export default defineComponent({
       columns,
       tableData,
       pagination,
-      handleTableChange,
       formatPhone,
       communityModalVisible,
       communitySaving,
@@ -400,10 +497,13 @@ export default defineComponent({
       handleCommunitySave,
       handleCommunityCancel,
       commissionModalVisible,
-      commissionSaving,
-      commissionRate,
-      handleEditCommission,
-      handleCommissionSave,
+      commissionSubmitting,
+      commissionForm,
+      commissionFormRef,
+      commissionRules,
+      showCommissionModal,
+      handleCommissionSubmit,
+      handleCommissionTypeChange,
       handleCommissionCancel,
       filterForm,
       handleFilterChange,
@@ -464,7 +564,7 @@ export default defineComponent({
   text-align: center;
 }
 
-.commission-tip {
+.form-help-text {
   color: rgba(0, 0, 0, 0.45);
   font-size: 12px;
   margin-top: 4px;