From 071941ef8a229dea94f82bda7b512fe70a037118 Mon Sep 17 00:00:00 2001
From: lzhizhao <790086754@qq.com>
Date: Tue, 15 Jul 2025 17:02:51 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E5=88=86=E9=94=80=E5=95=86=E5=AE=A1?=
 =?UTF-8?q?=E6=A0=B8=E6=A8=A1=E5=9D=97=E5=88=97=E8=A1=A8=E6=8E=A5=E5=8F=A3?=
 =?UTF-8?q?=E5=AF=B9=E6=8E=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../distributor/index.vue                     | 259 +++++++++---------
 1 file changed, 132 insertions(+), 127 deletions(-)

diff --git a/src/views/modules/operation-management/distributor/index.vue b/src/views/modules/operation-management/distributor/index.vue
index f71a981..93350e2 100644
--- a/src/views/modules/operation-management/distributor/index.vue
+++ b/src/views/modules/operation-management/distributor/index.vue
@@ -1,114 +1,114 @@
 <template>
-    <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>
+  <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-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>
+      <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 === -1">{{ 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>
+      <!-- 分页 -->
+      <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="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>
+    <!-- 详情对话框 -->
+    <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 === -1" :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>
@@ -132,7 +132,7 @@ export default {
       statusOptions: [
         { label: '待审核', value: 0 },
         { label: '已通过', value: 1 },
-        { label: '已拒绝', value: 2 }
+        { label: '已拒绝', value: -1 }
       ],
       rejectDialogVisible: false,
       detailDialogVisible: false,
@@ -144,7 +144,7 @@ export default {
       rejectRules: {
         reason: [
           { required: true, message: '请输入拒绝理由', trigger: 'blur' },
-          { min: 5, max: 200, message: '长度在 5 到 200 个字符', trigger: 'blur' }
+          { min: 2, max: 200, message: '长度在 2 到 200 个字符', trigger: 'blur' }
         ]
       },
       detailData: {}
@@ -210,8 +210,9 @@ export default {
       
       mer_admin.getApplyRecord(params)
         .then(response => {
-          this.list = response.data.list || [];
-          this.total = response.data.total || 0;
+          console.log(response);
+          this.list = response.data.data.data || [];
+          this.total = response.data.data.total || 0;
           this.listLoading = false;
         })
         .catch(() => {
@@ -244,7 +245,7 @@ export default {
           return 'warning';
         case 1:
           return 'success';
-        case 2:
+        case -1:
           return 'danger';
         default:
           return 'info';
@@ -256,7 +257,7 @@ export default {
           return '待审核';
         case 1:
           return '已通过';
-        case 2:
+        case -1:
           return '已拒绝';
         default:
           return '未知状态';
@@ -271,6 +272,7 @@ export default {
         this.listLoading = true;
         const params = {
           id: row.id,
+          distributorId: row.distributorId,
           status: 1 // 通过
         };
         
@@ -305,7 +307,8 @@ export default {
           this.listLoading = true;
           const params = {
             id: this.rejectForm.id,
-            status: 2, // 拒绝
+            distributorId: this.currentRow.distributorId,
+            status: -1, // 拒绝
             refuseReason: this.rejectForm.reason
           };
           
@@ -330,7 +333,9 @@ export default {
       this.$confirm('确定要一键通过所有待审核的分销商申请?', '提示', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
-        type: 'warning'
+        type: 'warning',
+        dangerouslyUseHTMLString: true,
+        message: '<strong>一键通过操作将批量审核所有待审核申请，此操作不可撤销，请谨慎操作！</strong>'
       }).then(() => {
         this.listLoading = true;
         const params = {};
@@ -382,37 +387,37 @@ export default {
 
 <style scoped>
 .app-container {
-    padding: 20px;
+  padding: 20px;
 }
 
 .filter-container {
-    margin-bottom: 20px;
+  margin-bottom: 20px;
 }
 
 .table-container {
-    margin-bottom: 20px;
+  margin-bottom: 20px;
 }
 
 .table-header {
-    padding: 0 0 15px;
-    display: flex;
-    justify-content: space-between;
-    align-items: center;
+  padding: 0 0 15px;
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
 }
 
 .table-title {
-    font-size: 16px;
-    font-weight: bold;
+  font-size: 16px;
+  font-weight: bold;
 }
 
 .table-operations {
-    display: flex;
-    gap: 10px;
+  display: flex;
+  gap: 10px;
 }
 
 .pagination-container {
-    padding: 15px 0;
-    display: flex;
-    justify-content: flex-end;
+  padding: 15px 0;
+  display: flex;
+  justify-content: flex-end;
 }
 </style>
\ No newline at end of file