优化修复

src/views/marketing_center/distribution_page/components/distribution_details.vue

@@ -59,14 +59,6 @@
     <div class="row">
       <el-table :data="tableData.list" stripe border v-loading="tableData.loading">
         <el-table-column label="分销员" prop="sourceNickName" width="200">
-          <template #default="scope">
-            <div class="column">
-              <div>{{ scope.row.sourceNickName }}</div>
-              <div>{{ scope.row.sourcePhone }}</div>
-            </div>
-          </template>
-        </el-table-column>
-        <el-table-column label="用户" prop="nickName" width="200">
           <template #default="scope">
             <div class="column">
               <div>{{ scope.row.nickName }}</div>
@@ -74,9 +66,18 @@
             </div>
           </template>
         </el-table-column>
-        <el-table-column label="等级" prop="level" min-width="80">
+        <el-table-column label="下级用户" prop="nickName" width="200">
           <template #default="scope">
-            {{ scope.row.level }}级
+            <div class="column">
+              <div>{{ scope.row.sourceNickName }}</div>
+              <div>{{ scope.row.sourcePhone }}</div>
+            </div>
+          </template>
+        </el-table-column>
+        <el-table-column label="分成来源" prop="level" min-width="80">
+          <template #default="scope">
+            <span v-if="scope.row.level == 1">直接分成</span>
+            <span v-if="scope.row.level == 2">间接分成</span>
           </template>
         </el-table-column>
         <el-table-column label="状态" prop="status" min-width="100">

src/views/marketing_center/distribution_page/components/distributor.vue

@@ -53,7 +53,10 @@
             <el-button link type="primary" @click="editorUserDialogRef.show(3, scope.row)" v-else>
               重置分销组
             </el-button>
-            <el-button link type="primary" @click="editorUserDialogRef.show(2, scope.row)">取消分销员</el-button>
+            <el-button link type="primary" @click="editorUserDialogRef.show(2, scope.row)"
+              v-if="scope.row.status == 1">取消分销员</el-button>
+            <el-button link type="primary" @click="editorUserDialogRef.show(9, scope.row)"
+              v-if="scope.row.status == 9">恢复分销员</el-button>
             <el-button link type="primary" @click="distributionUserDetailRef.show(scope.row)">分销详情</el-button>
           </template>
         </el-table-column>

src/views/marketing_center/distribution_page/components/editorUserDialog.vue

@@ -25,6 +25,14 @@
         <span>是否确认重置分销组<br />重置后将会按照用户的实际数据匹配分销组</span>
       </div>
     </div>
+    <div v-else-if="type == 9">
+      <div class="center">
+        <el-icon color="red" size="24">
+          <Warning />
+        </el-icon>
+        <span>是否确认恢复分销员</span>
+      </div>
+    </div>
     <template #footer>
       <div class="dialog-footer">
         <el-button @click="visible = false">取 消</el-button>
@@ -44,7 +52,8 @@ const type = ref(1)
 const titleOptions = ref({
   1: '更改分销组',
   2: '取消分销员',
-  3: '重置分销组'
+  3: '重置分销组',
+  9: '恢复分销员'
 })
 
 const confirmLoading = ref(false)
@@ -64,16 +73,16 @@ async function submitHandle() {
       data.isAssignLevel = 1
       data.distributionLevelId = form.value.distributionLevelId
       data.distributionLevelName = levelConfigList.value.find(item => item.id == form.value.distributionLevelId).name
-
       await distributionUser(data, 'put')
     } else if (type.value == 2) {
       data.status = 9
-
       await distributionUser(data, 'put')
     } else if (type.value == 3) {
       data.shopId = rowInfo.value.shopId
-
       await distributionUserResetLevel(data)
+    } else if (type.value == 9) {
+      data.status = 1
+      await distributionUser(data, 'put')
     }
     ElNotification({
       title: '注意',

src/views/marketing_center/distribution_page/components/recharge_record_dialog.vue

@@ -45,10 +45,10 @@
             {{statusList.find(item => item.value == scope.row.type).label}}
           </template>
         </el-table-column>
-        <el-table-column label="变动金额（元）" prop="amount"></el-table-column>
+        <el-table-column label="变动金额（元）" prop="changeAmount"></el-table-column>
-        <el-table-column label="变动后金额（元）" prop="changeAmount"></el-table-column>
+        <el-table-column label="变动后金额（元）" prop="amount"></el-table-column>
         <el-table-column label="变动原因" prop="remark"></el-table-column>
-        <el-table-column label="关联订单" prop="19107220837"></el-table-column>
+        <el-table-column label="关联订单" prop="orderNo"></el-table-column>
         <el-table-column label="创建时间" prop="createTime"></el-table-column>
       </el-table>
     </div>
@@ -91,7 +91,7 @@ const statusList = ref([
   },
   {
     value: 'sub',
-    label: '统扣减'
+    label: '系统扣减'
   },
 ])