From c086415233cf8edd2090fbcd4ceefca055f61f02 Mon Sep 17 00:00:00 2001
From: lzhizhao <790086754@qq.com>
Date: Tue, 15 Jul 2025 00:22:47 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E5=93=81=E7=89=8C=E6=96=B0=E5=A2=9E?=
 =?UTF-8?q?=E5=88=86=E9=94=80=E5=AE=A1=E6=A0=B8=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/modules/mer_admin.js                  |  36 ++
 src/utils/index.js                            |   1 +
 .../distributor/index.vue                     | 415 +++++++++++++++++-
 3 files changed, 446 insertions(+), 6 deletions(-)

diff --git a/src/api/modules/mer_admin.js b/src/api/modules/mer_admin.js
index c7fb203..019e790 100644
--- a/src/api/modules/mer_admin.js
+++ b/src/api/modules/mer_admin.js
@@ -293,4 +293,40 @@ export const mer_admin = {
       params: data,
     });
   },
+  /**
+   * 获取申请记录
+   * @param {object} data 查询参数
+   * @returns {Promise}
+   */
+  getApplyRecord: (data) => {
+    return $http.request({
+      method: "get",
+      url: "/merchant-api/distribution/apply_record",
+      params: data,
+    });
+  },
+  /**
+   * 审核申请记录
+   * @param {object} data 审核参数
+   * @returns {Promise}
+   */
+  auditApplyRecord: (data) => {
+    return $http.request({
+      method: "put",
+      url: "/merchant-api/distribution/audit",
+      params: data,
+    });
+  },
+  /**
+   * 审核一键通过
+   * @param {object} data 审核参数
+   * @returns {Promise}
+   */
+  passAllApplyRecord: (data) => {
+    return $http.request({
+      method: "put",
+      url: "/merchant-api/distribution/pass_all",
+      params: data,
+    });
+  },
 };
diff --git a/src/utils/index.js b/src/utils/index.js
index fb7a92c..c394af2 100644
--- a/src/utils/index.js
+++ b/src/utils/index.js
@@ -241,6 +241,7 @@ export function getMenu(role, manageMode) {
       // "operation-management/shop-list/index",
       'operation-management/brand-market/index',
       'operation-management/brand-store/index',
+      'operation-management/distributor/index',
       // "operation-management/order/index",
       'operation-management/brand-order/index',
       // "operation-management/role/index",
diff --git a/src/views/modules/operation-management/distributor/index.vue b/src/views/modules/operation-management/distributor/index.vue
index 1937f7c..f71a981 100644
--- a/src/views/modules/operation-management/distributor/index.vue
+++ b/src/views/modules/operation-management/distributor/index.vue
@@ -1,15 +1,418 @@
 <template>
-<div>
-    分销商
-</div>
+    <div class="app-container">
+        <!-- 搜索区域 -->
+        <el-card class="filter-container" shadow="never">
+            <div class="filter-item">
+                <el-form :inline="true" :model="listQuery" size="small">
+                    <el-form-item label="审核状态">
+                        <el-select v-model="listQuery.status" placeholder="请选择审核状态" clearable>
+                            <el-option v-for="item in statusOptions" :key="item.value" :label="item.label"
+                                :value="item.value"></el-option>
+                        </el-select>
+                    </el-form-item>
+                    <el-form-item>
+                        <el-button type="primary" @click="handleFilter">查询</el-button>
+                        <el-button @click="resetQuery">重置</el-button>
+                    </el-form-item>
+                </el-form>
+            </div>
+        </el-card>
+
+        <!-- 表格区域 -->
+        <el-card class="table-container" shadow="never">
+            <div class="table-header">
+                <span class="table-title">分销商申请列表</span>
+                <div class="table-operations">
+                    <el-button v-if="hasWaitingApproval" type="primary" size="mini" @click="handlePassAll">
+                        一键通过
+                    </el-button>
+                </div>
+            </div>
+
+            <el-table v-loading="listLoading" :data="list" border style="width: 100%"
+                :header-cell-style="{ background: '#F5F7FA', color: '#606266' }">
+                <el-table-column prop="userName" label="申请人" align="center"></el-table-column>
+                <el-table-column prop="createTime" label="申请时间" align="center">
+                    <template slot-scope="scope">
+                        <span>{{ scope.row.createTime | formatDate }}</span>
+                    </template>
+                </el-table-column>
+                <el-table-column prop="auditTime" label="审核时间" align="center">
+                    <template slot-scope="scope">
+                        <span>{{ scope.row.auditTime | formatDate }}</span>
+                    </template>
+                </el-table-column>
+                <el-table-column prop="status" label="审核状态" align="center">
+                    <template slot-scope="scope">
+                        <el-tag :type="getStatusType(scope.row.status)">
+                            {{ getStatusText(scope.row.status) }}
+                        </el-tag>
+                    </template>
+                </el-table-column>
+                <el-table-column prop="refuseReason" label="拒绝理由" align="center" width="200">
+                    <template slot-scope="scope">
+                        <span v-if="scope.row.status === 2">{{ scope.row.refuseReason }}</span>
+                        <span v-else>-</span>
+                    </template>
+                </el-table-column>
+                <el-table-column label="操作" align="center" width="180">
+                    <template slot-scope="scope">
+                        <el-button v-if="scope.row.status === 0" size="mini" type="success"
+                            @click="handleApprove(scope.row)">通过</el-button>
+                        <el-button v-if="scope.row.status === 0" size="mini" type="danger"
+                            @click="handleReject(scope.row)">拒绝</el-button>
+                        <el-button v-else size="mini" type="primary" @click="handleDetail(scope.row)">详情</el-button>
+                    </template>
+                </el-table-column>
+            </el-table>
+
+            <!-- 分页 -->
+            <div class="pagination-container">
+                <el-pagination background @size-change="handleSizeChange" @current-change="handleCurrentChange"
+                    :current-page.sync="listQuery.pageNumber" :page-sizes="[10, 20, 30, 50]"
+                    :page-size="listQuery.pageSize" layout="total, sizes, prev, pager, next, jumper" :total="total">
+                </el-pagination>
+            </div>
+        </el-card>
+
+        <!-- 拒绝原因对话框 -->
+        <el-dialog title="拒绝申请" :visible.sync="rejectDialogVisible" width="30%">
+            <el-form :model="rejectForm" :rules="rejectRules" ref="rejectForm" label-width="100px">
+                <el-form-item label="拒绝理由" prop="reason">
+                    <el-input type="textarea" :rows="4" placeholder="请输入拒绝理由" v-model="rejectForm.reason">
+                    </el-input>
+                </el-form-item>
+            </el-form>
+            <span slot="footer" class="dialog-footer">
+                <el-button @click="rejectDialogVisible = false">取 消</el-button>
+                <el-button type="primary" @click="confirmReject">确 定</el-button>
+            </span>
+        </el-dialog>
+
+        <!-- 详情对话框 -->
+        <el-dialog title="申请详情" :visible.sync="detailDialogVisible" width="50%">
+            <el-descriptions :column="2" border>
+                <el-descriptions-item label="申请人">{{ detailData.userName }}</el-descriptions-item>
+                <el-descriptions-item label="申请时间">{{ detailData.createTime | formatDate }}</el-descriptions-item>
+                <el-descriptions-item label="审核时间">{{ detailData.auditTime | formatDate }}</el-descriptions-item>
+                <el-descriptions-item label="审核状态">
+                    <el-tag :type="getStatusType(detailData.status)">
+                        {{ getStatusText(detailData.status) }}
+                    </el-tag>
+                </el-descriptions-item>
+                <el-descriptions-item label="拒绝理由" v-if="detailData.status === 2" :span="2">
+                    {{ detailData.refuseReason }}
+                </el-descriptions-item>
+            </el-descriptions>
+            <span slot="footer" class="dialog-footer">
+                <el-button @click="detailDialogVisible = false">关 闭</el-button>
+            </span>
+        </el-dialog>
+    </div>
 </template>
 
 <script>
-export default {
+import { mer_admin } from '@/api/modules/mer_admin';
+import { mapState } from 'vuex';
 
-}
+export default {
+  name: 'DistributorApplyList',
+  data() {
+    return {
+      brandId: '',
+      isBrand: false,
+      listLoading: false,
+      list: [],
+      total: 0,
+      listQuery: {
+        pageNumber: 1,
+        pageSize: 10,
+        status: null
+      },
+      statusOptions: [
+        { label: '待审核', value: 0 },
+        { label: '已通过', value: 1 },
+        { label: '已拒绝', value: 2 }
+      ],
+      rejectDialogVisible: false,
+      detailDialogVisible: false,
+      currentRow: null,
+      rejectForm: {
+        id: null,
+        reason: ''
+      },
+      rejectRules: {
+        reason: [
+          { required: true, message: '请输入拒绝理由', trigger: 'blur' },
+          { min: 5, max: 200, message: '长度在 5 到 200 个字符', trigger: 'blur' }
+        ]
+      },
+      detailData: {}
+    };
+  },
+  computed: {
+    ...mapState("userData", [
+      "isMerchant",
+      "marketList",
+      "storeList",
+      "marketId",
+      "shopId",
+    ]),
+    // 判断是否有待审核的申请
+    hasWaitingApproval() {
+      return this.list.some(item => item.status === 0);
+    }
+  },
+  created() {
+    if (
+      JSON.parse(sessionStorage.getItem("userInfo")).role ===
+      "ROLE_BRAND_MANAGER"
+    ) {
+      this.brandId = JSON.parse(
+        sessionStorage.getItem("userInfo")
+      ).brandId;
+      this.isBrand = true;
+    } else {
+      this.brandId = JSON.parse(
+        sessionStorage.getItem("userInfo")
+      ).agentId;
+      this.isBrand = false;
+    }
+    this.getList();
+  },
+  methods: {
+    getList() {
+      this.listLoading = true;
+      const params = {
+        pageNumber: this.listQuery.pageNumber,
+        pageSize: this.listQuery.pageSize
+      };
+      
+      if (this.listQuery.status !== null && this.listQuery.status !== '') {
+        params.status = this.listQuery.status;
+      }
+      
+      // 判断当前是品牌、市场还是店铺，添加相应参数
+      if (this.isBrand) {
+        // 如果是品牌管理员
+        params.brandId = this.brandId;
+      } else if (this.isMerchant) {
+        // 如果是商户
+        if (this.shopId) {
+          // 如果是店铺
+          params.marketId = this.marketId;
+          params.shopId = this.shopId;
+        } else if (this.marketId) {
+          // 如果是市场
+          params.marketId = this.marketId;
+        }
+      }
+      
+      mer_admin.getApplyRecord(params)
+        .then(response => {
+          this.list = response.data.list || [];
+          this.total = response.data.total || 0;
+          this.listLoading = false;
+        })
+        .catch(() => {
+          this.listLoading = false;
+        });
+    },
+    handleFilter() {
+      this.listQuery.pageNumber = 1;
+      this.getList();
+    },
+    resetQuery() {
+      this.listQuery = {
+        pageNumber: 1,
+        pageSize: 10,
+        status: null
+      };
+      this.getList();
+    },
+    handleSizeChange(val) {
+      this.listQuery.pageSize = val;
+      this.getList();
+    },
+    handleCurrentChange(val) {
+      this.listQuery.pageNumber = val;
+      this.getList();
+    },
+    getStatusType(status) {
+      switch (parseInt(status)) {
+        case 0:
+          return 'warning';
+        case 1:
+          return 'success';
+        case 2:
+          return 'danger';
+        default:
+          return 'info';
+      }
+    },
+    getStatusText(status) {
+      switch (parseInt(status)) {
+        case 0:
+          return '待审核';
+        case 1:
+          return '已通过';
+        case 2:
+          return '已拒绝';
+        default:
+          return '未知状态';
+      }
+    },
+    handleApprove(row) {
+      this.$confirm('确定通过该分销商申请?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        this.listLoading = true;
+        const params = {
+          id: row.id,
+          status: 1 // 通过
+        };
+        
+        // 调用审核接口
+        mer_admin.auditApplyRecord(params)
+          .then(() => {
+            this.$message({
+              type: 'success',
+              message: '审核通过成功!'
+            });
+            this.getList();
+          })
+          .catch(() => {
+            this.listLoading = false;
+          });
+      }).catch(() => {
+        this.$message({
+          type: 'info',
+          message: '已取消操作'
+        });          
+      });
+    },
+    handleReject(row) {
+      this.currentRow = row;
+      this.rejectForm.id = row.id;
+      this.rejectForm.reason = '';
+      this.rejectDialogVisible = true;
+    },
+    confirmReject() {
+      this.$refs.rejectForm.validate((valid) => {
+        if (valid) {
+          this.listLoading = true;
+          const params = {
+            id: this.rejectForm.id,
+            status: 2, // 拒绝
+            refuseReason: this.rejectForm.reason
+          };
+          
+          // 调用审核接口
+          mer_admin.auditApplyRecord(params)
+            .then(() => {
+              this.$message({
+                type: 'success',
+                message: '已拒绝该申请'
+              });
+              this.rejectDialogVisible = false;
+              this.getList();
+            })
+            .catch(() => {
+              this.listLoading = false;
+            });
+        }
+      });
+    },
+    // 添加一键通过功能
+    handlePassAll() {
+      this.$confirm('确定要一键通过所有待审核的分销商申请?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        this.listLoading = true;
+        const params = {};
+        
+        // 添加品牌或市场店铺参数
+        if (this.isBrand) {
+          params.brandId = this.brandId;
+        } else if (this.isMerchant) {
+          if (this.shopId) {
+            params.marketId = this.marketId;
+            params.shopId = this.shopId;
+          } else if (this.marketId) {
+            params.marketId = this.marketId;
+          }
+        }
+        
+        // 调用一键通过接口
+        mer_admin.passAllApplyRecord(params)
+          .then(response => {
+            this.$message({
+              type: 'success',
+              message: `成功通过 ${response.data || 0} 条申请记录!`
+            });
+            this.getList();
+          })
+          .catch(() => {
+            this.listLoading = false;
+          });
+      }).catch(() => {
+        this.$message({
+          type: 'info',
+          message: '已取消操作'
+        });
+      });
+    },
+    handleDetail(row) {
+      this.detailData = {...row};
+      this.detailDialogVisible = true;
+    }
+  },
+  filters: {
+    formatDate(time) {
+      if (!time) return '';
+      return new Date(time).toLocaleString();
+    }
+  }
+};
 </script>
 
-<style>
+<style scoped>
+.app-container {
+    padding: 20px;
+}
 
+.filter-container {
+    margin-bottom: 20px;
+}
+
+.table-container {
+    margin-bottom: 20px;
+}
+
+.table-header {
+    padding: 0 0 15px;
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+}
+
+.table-title {
+    font-size: 16px;
+    font-weight: bold;
+}
+
+.table-operations {
+    display: flex;
+    gap: 10px;
+}
+
+.pagination-container {
+    padding: 15px 0;
+    display: flex;
+    justify-content: flex-end;
+}
 </style>
\ No newline at end of file