新增充值搜索和修改usd

src/api/relAgency/relAgency.js

@@ -88,9 +88,16 @@ export const agencyWithdrawExamineExport = query => {
     });
 };
 // 官方提现记录 结算
+// export const agencyWithdrawSet = query => {
+//     return request({
+//         url: '/agencyWithdrawExamine/settle',
+//         method: 'post',
+//         params: query
+//     });
+// };
 export const agencyWithdrawSet = query => {
     return request({
-        url: '/agencyWithdrawExamine/settle',
+        url: '/agencyWithdrawExamine/batchSettle',
         method: 'post',
         params: query
     });
@@ -103,6 +110,14 @@ export const agencyWithdrawBatchSet = query => {
         params: query
     });
 };
+// 官方提现记录 批量驳回
+export const batchReject = query => {
+    return request({
+        url: '/agencyWithdrawExamine/batchReject',
+        method: 'post',
+        params: query
+    });
+};
 
 // 公会开业数据统计
 export const agencyOpenList = query => {
@@ -136,3 +151,26 @@ export const excellentAnchorDetail = query => {
         params: query
     });
 };
+// 官方提现-国家
+export const adminCountry = query => {
+    return request({
+        url: '/admin/country/list',
+        method: 'get',
+        params: query
+    });
+};
+
+// =====================================钻石充值流水=======================================
+// 查询
+export const diamondStatistics = query => {
+    return request({
+        url: '/admin/guild/diamondStatistics',
+        method: 'get',
+        params: query
+    });
+};
+//  导出
+export const diamondStatisticsExport = query => {
+    window.location.href = `/admin/guild/diamondStatistics/export?${genQueryParam(query)}`;
+    return;
+};

src/api/relPrivilegeManage/relPrivilegeManage.js

@@ -35,7 +35,7 @@ export const prettyNumberExamineReject = query => {
 // 靓号导入
 export const erbanUpload = query => {
     return request({
-        url: '/prettyNumberExamine/erban/upload',
+        url: '/admin/prettyNumber/upload',
         method: 'post',
         headers: { 'Content-Type': 'multipart/form-data' },
         data: query

src/views/accountApplyManage/accountApplyManage.vue

@@ -3,52 +3,55 @@
     <div class="container">
       <div class="region-box">
         <el-radio-group v-model="region">
-          <el-radio
-            v-for="(item, index) in userAreaRegion"
+          <el-radio v-for="(item, index) in userAreaRegion"
                     :key="index"
-            :label="item.value"
-            >{{ item.name }}</el-radio
-          >
+                    :label="item.value">{{ item.name }}</el-radio>
         </el-radio-group>
       </div>
       <div class="handle-box">
-        <el-form
-          ref="searchForm"
+        <el-form ref="searchForm"
                  :model="searchForm"
                  label-width="90px"
-          :disabled="tableLoading"
-        >
+                 :disabled="tableLoading">
           <div class="search-line">
-            <el-form-item label="Shaker ID" prop="erbanNo">
-              <el-input
-                v-model.trim="searchForm.erbanNo"
-                placeholder="Please enter"
-              ></el-input>
+            <el-form-item label="MoliStar ID"
+                          prop="erbanNo">
+              <el-input v-model.trim="searchForm.erbanNo"
+                        placeholder="Please enter"></el-input>
             </el-form-item>
-            <el-form-item label="UID" prop="uid">
-              <el-input
-                v-model.trim="searchForm.uid"
-                placeholder="Please enter"
-              ></el-input>
+            <el-form-item label="UID"
+                          prop="uid">
+              <el-input v-model.trim="searchForm.uid"
+                        placeholder="Please enter"></el-input>
             </el-form-item>
-            <el-form-item label="SID" prop="sid">
-              <el-input
-                v-model.trim="searchForm.sid"
-                placeholder="Please enter"
-              ></el-input>
+            <el-form-item label="SID"
+                          prop="sid">
+              <el-input v-model.trim="searchForm.sid"
+                        placeholder="Please enter"></el-input>
+            </el-form-item>
+            <el-form-item label="Region"
+                          prop="partitionId">
+              <el-select v-model="searchForm.partitionId">
+                <el-option label="全部"
+                           value=""></el-option>
+                <el-option v-for="item in partitionInfoList"
+                           :key="item.id"
+                           :label="item.desc"
+                           :value="item.id"></el-option>
+              </el-select>
             </el-form-item>
             <el-form-item label-width="40px">
-              <el-button type="primary" @click="handSearch">Search</el-button>
-              <el-button plain @click="resetSearchForm">Reset Search</el-button>
-              <el-upload
-                class="file-uploader"
+              <el-button type="primary"
+                         @click="handSearch">Search</el-button>
+              <el-button plain
+                         @click="resetSearchForm">Reset Search</el-button>
+              <el-upload class="file-uploader"
                          action="#"
                          list-type="picture-card"
                          :show-file-list="false"
                          :on-change="handleExcel"
                          accept=".xls, .xlsx"
-                :auto-upload="false"
-              >
+                         :auto-upload="false">
                 <el-button type="primary">Import</el-button>
               </el-upload>
             </el-form-item>
@@ -67,76 +70,93 @@
         </el-upload> -->
       </div>
       <div class="table">
-        <el-table
-          :data="tableData"
+        <el-table :data="tableData"
                   border
                   v-loading="tableLoading"
                   @header-click="headerCopy"
-          style="width: 100%"
-        >
-          <el-table-column align="center" prop="id" label="No.">
+                  style="width: 100%">
+          <el-table-column align="center"
+                           prop="id"
+                           label="No.">
           </el-table-column>
-          <el-table-column align="center" prop="erbanNo" label="Shaker ID">
+          <el-table-column align="center"
+                           prop="erbanNo"
+                           label="MoliStar ID">
           </el-table-column>
-          <el-table-column align="center" prop="uid" label="UID">
+          <el-table-column align="center"
+                           prop="uid"
+                           label="UID">
           </el-table-column>
-          <el-table-column align="center" prop="level" label="SID Level">
+          <el-table-column align="center"
+                           prop="level"
+                           label="SID Level">
           </el-table-column>
-          <el-table-column align="center" prop="nick" label="Nickname">
+          <el-table-column align="center"
+                           prop="nick"
+                           label="Nickname">
           </el-table-column>
-          <el-table-column align="center" prop="createTime" label="Apply time">
+          <el-table-column align="center"
+                           prop="partitionInfo"
+                           label="Region">
+          </el-table-column>
+          <el-table-column align="center"
+                           prop="createTime"
+                           label="Apply time">
             <template v-slot="scope">{{
               convertTimestamp(scope.row.createTime)
             }}</template>
           </el-table-column>
-          <el-table-column align="center" prop="prettyNo" label="SID">
+          <el-table-column align="center"
+                           prop="prettyNo"
+                           label="SID">
           </el-table-column>
-          <el-table-column align="center" prop="status" label="State">
+          <el-table-column align="center"
+                           prop="status"
+                           label="State">
             <template v-slot="scope">
               <el-tag :type="applyStateTag(scope.row.status)">{{
                 applyStateText(scope.row.status)
               }}</el-tag>
             </template>
           </el-table-column>
-          <el-table-column align="center" prop="updateTime" label="Review time">
+          <el-table-column align="center"
+                           prop="updateTime"
+                           label="Review time">
             <template v-slot="scope">{{
               convertTimestamp(scope.row.updateTime)
             }}</template>
           </el-table-column>
-          <el-table-column align="center" label="Operate">
+          <el-table-column align="center"
+                           prop="operater"
+                           label="Operator">
+          </el-table-column>
+          <el-table-column align="center"
+                           label="Operate">
             <template v-slot="scope">
-              <el-button
-                type="text"
+              <el-button type="text"
                          v-if="scope.row.status == 0"
-                @click="handlePass(scope.$index, scope.row)"
-              >
+                         @click="handlePass(scope.$index, scope.row)">
                 Pass
               </el-button>
-              <el-button
-                type="text"
+              <el-button type="text"
                          v-if="scope.row.status == 0"
-                @click="handleReject(scope.$index, scope.row)"
-              >
+                         @click="handleReject(scope.$index, scope.row)">
                 Reject
               </el-button>
-              <el-button
-                type="text"
+              <el-button type="text"
                          v-if="scope.row.status == 1"
                          class="red"
-                @click="handleDelete(scope.$index, scope.row)"
-              >
+                         @click="handleDelete(scope.$index, scope.row)">
                 Delete
               </el-button>
             </template>
           </el-table-column>
         </el-table>
-        <table-pagination
-          :pageParams="pageParams"
+        <table-pagination :pageParams="pageParams"
                           :pageTotal="pageTotal"
                           :ifShowSizes="true"
                           @handleSizeChange="handleSizeChange"
-          @handlePageChange="handlePageChange"
-        ></table-pagination>
+                          @handlePageChange="handlePageChange"></table-pagination>
       </div>
     </div>
   </div>
@@ -150,6 +170,7 @@ import {
   prettyNumberExamineReject,
   erbanUpload,
 } from "@/api/relPrivilegeManage/relPrivilegeManage.js";
+import { getPartitionInfoList } from '@/api/partition/partitionInfo';
 import TablePagination from "@/components/common/TablePagination";
 import { formatDate } from "@/utils/relDate";
 import { ElMessageBox, ElMessage } from "element-plus"; // 正确引入 ElM
@@ -162,14 +183,15 @@ export default {
   components: { TablePagination },
   data () {
     return {
+      partitionInfoList: [],
       tableLoading: false, // 表格是否加载中
       tableData: [], // 接口返回的表格数据
       // 搜索表单相关
       searchForm: {
         erbanNo: null,
         uid: null,
-        level: null,
-        region: null,
+        sid: null,
+        partitionId: null,
       },
       pageTotal: 0, // 接口返回的表格总条数
       pageParams: {
@@ -179,6 +201,7 @@ export default {
     };
   },
   created () {
+    this.initPartition();
     this.getData();
   },
   methods: {
@@ -324,7 +347,6 @@ export default {
       this.pageParams.pageNo = 1;
       this.getData();
     },
-
     // 分页导航
     handleSizeChange (val) {
       this.pageParams.pageNo = val;
@@ -337,6 +359,12 @@ export default {
     headerCopy (column, e) {
       this.$copy(column.label);
     },
+    initPartition () {
+      getPartitionInfoList().then(res => {
+        let data = res.data;
+        this.partitionInfoList = data;
+      });
+    },
   },
   computed: {
     applyStateTag () {

src/views/car/CarGoodsAdminView.vue

@@ -1046,11 +1046,11 @@ export default {
                             $("#tipModal").modal('show');
                             return;
                         }
-                        if (!effect) {
-                            $("#tipMsg").text("请上传动画图片");
-                            $("#tipModal").modal('show');
-                            return;
-                        }
+                        // if (!effect) {
+                        //     $("#tipMsg").text("请上传动画图片");
+                        //     $("#tipModal").modal('show');
+                        //     return;
+                        // } 
                         if (!days || days <= 0) {
                             $("#tipMsg").text("请输入合理的购买天数");
                             $("#tipModal").modal('show');

src/views/guildOperationManagement/diamondFlow.vue

@@ -0,0 +1,236 @@
+<template>
+  <div class="box">
+    <!-- 查询 -->
+    <div class="inquire">
+      <span>公会ID</span>
+      <el-input
+        v-model="inquire.guildId"
+        placeholder=""
+        class="input"
+      ></el-input>
+    </div>
+    <div class="inquire">
+      <span>公会长ID</span>
+      <el-input
+        v-model="inquire.guildBoosId"
+        placeholder=""
+        class="input"
+      ></el-input>
+    </div>
+    <!-- 时间选择器 -->
+    <!-- <div class="inquire">
+      <div class="block">
+        <span class="demonstration">日期</span>
+        <el-date-picker
+          v-model="inquire.time"
+          type="datetimerange"
+          range-separator="至"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+        >
+        </el-date-picker>
+      </div>
+    </div> -->
+    <div class="inquire">
+      <div class="block">
+        <span class="demonstration">开始时间</span>
+        <el-date-picker
+          v-model="inquire.time[0]"
+          type="date"
+          placeholder="开始时间"
+        >
+        </el-date-picker>
+      </div>
+    </div>
+    <div class="inquire">
+      <div class="block">
+        <span class="demonstration">结束时间</span>
+        <el-date-picker
+          v-model="inquire.time[1]"
+          type="date"
+          placeholder="结束时间"
+        >
+        </el-date-picker>
+      </div>
+    </div>
+
+    <!-- 查询按钮 -->
+    <el-button class="primary but" type="primary" @click="getData()"
+      >查询</el-button
+    >
+    <el-button
+      class="primary"
+      type="primary"
+      @click="
+        inquire.guildId = '';
+        inquire.guildBoosId = '';
+        inquire.time = [];
+        getData();
+      "
+      >重置查询</el-button
+    >
+    <el-button
+      class="primary"
+      type="primary"
+      @click="diamondStatisticsExportFun()"
+      >导出</el-button
+    >
+
+    <!-- 表格 -->
+    <el-table
+      v-loading="loading"
+      :data="tableData"
+      border
+      style="width: 100%; margin-top: 25px"
+    >
+      <el-table-column type="index" width="100" align="center" label="序号" />
+      <el-table-column prop="guildId" align="center" label="公会ID" />
+      <el-table-column prop="guildName" align="center" label="公会昵称" />
+      <el-table-column prop="ownerErbanNo" align="center" label="公会长ID" />
+      <el-table-column prop="memberNum" align="center" label="主播人数" />
+      <el-table-column prop="diamondNum" align="center" label="钻石流水" />
+    </el-table>
+    <!-- 分页 -->
+    <el-pagination
+      style="margin-top: 10px"
+      class="paginationClass"
+      v-model:current-page="currentPage"
+      v-model:page-size="pageSize"
+      :page-sizes="[10, 20, 30, 40, 50, 100, 200, 300, 400, 500, 999999999]"
+      layout="sizes, prev, pager, next"
+      :total="total"
+      @size-change="handleSizeChange"
+      @current-change="handleCurrentChange"
+    />
+  </div>
+</template>
+<script>
+import {
+  diamondStatistics,
+  diamondStatisticsExport,
+} from "@/api/relAgency/relAgency";
+// @ts-ignore
+import { dateFormat } from "@/utils/system-helper";
+// @ts-ignore
+import { ElMessage } from "element-plus";
+export default {
+  name: "diamondFlow",
+  data() {
+    return {
+      loading: false,
+      //查询所需条件对象
+      inquire: {
+        guildId: "",
+        guildBoosId: "",
+        time: [],
+      },
+      // 表格
+      tableData: [],
+      //   新增弹窗
+      addDialog: false,
+      // 分页
+      total: 0, //总页数
+      currentPage: 1, //页码
+      pageSize: 5, //条数
+    };
+  },
+  created() {
+    // this.getData();
+  },
+  methods: {
+    // 查询接口
+    getData() {
+      this.loading = true;
+      let time = this.inquire.time;
+      let startTime = null;
+      let endTime = null;
+      console.log(this.inquire.time, 111111);
+      if (time.length > 0) {
+        startTime = this.inquire.time[0]
+          ? dateFormat(this.inquire.time[0], "yyyy-MM-dd")
+          : null;
+        endTime = this.inquire.time[1]
+          ? dateFormat(this.inquire.time[1], "yyyy-MM-dd")
+          : null;
+      }
+      diamondStatistics({
+        guildId: this.inquire.guildId,
+        ownerErbanNo: this.inquire.guildBoosId,
+        startTime: startTime,
+        endTime: endTime,
+        pageNo: this.currentPage,
+        pageSize: this.pageSize,
+      }).then((res) => {
+        if (res.code == 200) {
+          this.total = res.data.total;
+          this.tableData = res.data.records;
+          this.loading = false;
+        } else {
+          ElMessage({
+            showClose: true,
+            message: res.message,
+            type: "error",
+          });
+        }
+      });
+    },
+    // 导出
+    diamondStatisticsExportFun() {
+      let time = this.inquire.time;
+      let startTime = "";
+      let endTime = "";
+      if (time && time.length > 0) {
+        startTime = dateFormat(this.inquire.time[0], "yyyy-MM-dd hh:mm:ss");
+        endTime = dateFormat(this.inquire.time[1], "yyyy-MM-dd hh:mm:ss");
+      }
+      diamondStatisticsExport({
+        guildId: this.inquire.guildId,
+        ownerErbanNo: this.inquire.guildBoosId,
+        startTime: startTime,
+        endTime: endTime,
+      });
+    },
+    // 分页导航
+    handleSizeChange() {
+      this.getData();
+    },
+    handleCurrentChange() {
+      this.getData();
+    },
+  },
+};
+</script>
+<style lang="less" scoped>
+.box {
+  padding-top: 20px;
+  background: #ecf0f5;
+  .inquire {
+    display: inline-block;
+    margin-right: 20px;
+    margin-bottom: 20px;
+    span {
+      margin-right: 10px;
+    }
+    .input {
+      width: 180px;
+      margin-right: 10px;
+    }
+  }
+  .dialogTableVisibleBut {
+    display: block;
+    margin: 30px 0 0 830px;
+  }
+  .paginationClass {
+    margin: 15px 0 5px 0px;
+  }
+}
+.selectBox {
+  display: flex;
+  height: 35px;
+  line-height: 35px;
+  margin-bottom: 20px;
+}
+.selectBoxImg {
+  height: 150px;
+}
+</style>

src/views/guildOperationManagement/officialWithdrawRecord.vue

@@ -20,16 +20,36 @@
           :disabled="tableLoading"
         >
           <div class="search-line">
-            <el-form-item label="公会长ID" prop="agencyOwnerErbanNo">
+            <el-form-item label="MoliStar ID" prop="agencyOwnerErbanNo">
               <el-input
                 v-model.trim="searchForm.agencyOwnerErbanNo"
                 placeholder="请输入"
               ></el-input>
             </el-form-item>
-            <el-form-item label="状态" prop="status">
+            <el-form-item label="提现状态" prop="status">
               <el-select v-model="searchForm.status">
-                <el-option label="已结算" value="1"></el-option>
-                <el-option label="未结算" value="0"></el-option>
+                <el-option label="审核中" value="0"></el-option>
+                <el-option label="审核通过" value="1"></el-option>
+                <el-option label="未通过" value="2"></el-option>
+              </el-select>
+            </el-form-item>
+            <el-form-item label="提现账户" prop="accountType">
+              <el-select v-model="searchForm.accountType">
+                <el-option label="Vodafone" value="VODAFONE"></el-option>
+                <el-option label="Payonner" value="PAYONNER"></el-option>
+                <el-option label="USD" value="USDT"></el-option>
+                <el-option label="Bank" value="BANK"></el-option>
+                <el-option label="Other" value="OTHER"></el-option>
+              </el-select>
+            </el-form-item>
+            <el-form-item label="国家" prop="country">
+              <el-select v-model="searchForm.country">
+                <el-option
+                  v-for="(item, index) in adminCountryArr"
+                  :key="index"
+                  :label="item.label"
+                  :value="item.value"
+                ></el-option>
               </el-select>
             </el-form-item>
             <el-form-item label="时间" class="large">
@@ -52,17 +72,30 @@
 
             <el-form-item label-width="40px">
               <el-button type="primary" @click="handSearch">搜索</el-button>
-              <el-button plain @click="resetSearchForm">重置搜索</el-button>
-            </el-form-item>
-          </div>
-        </el-form>
-        <el-button type="primary" class="exportBtn" @click="confirmExport2Excel"
+              <el-button  type="primary" plain @click="resetSearchForm">重置搜索</el-button>
+              <el-button
+                type="primary"
+                class="exportBtn"
+                @click="confirmExport2Excel"
                 >导出</el-button
               >
               <el-button @click="handleChangeAll()" type="info" plain
-          >批量操作</el-button
+                >批量发放</el-button
               >
+              <el-button
+                @click="
+                  centerDialogVisible = true;
+                  centerDialogVisibleType = 1;
+                "
+                type="info"
+                plain
+                >批量驳回</el-button
+              >
+            </el-form-item>
           </div>
+        </el-form>
+      </div>
+      <!-- 表格 -->
       <div class="table">
         <el-table
           :data="tableData"
@@ -70,74 +103,88 @@
           v-loading="tableLoading"
           @header-click="headerCopy"
           @selection-change="handleSelectionChange"
-          style="width: 100%"
+          style="width: 100%;overflow-x: auto;"
         >
-          <el-table-column type="selection" width="55"> </el-table-column>
-          <!-- <el-table-column align="center" prop="region" label="区服">
-            <template v-slot="scope">
-              {{ regionType(scope.row.region) }}
-            </template>
-          </el-table-column>-->
-          <el-table-column align="center" prop="agencyId" label="公会ID">
-          </el-table-column>
-          <el-table-column align="center" prop="erbanNo" label="公会长ID">
-          </el-table-column>
-          <el-table-column align="center" prop="nick" label="公会长昵称">
-          </el-table-column>
-          <!-- <el-table-column align="center" prop="region" label="区域">
-          </el-table-column>
-          <el-table-column align="center" prop="abbr" label="国家">
-          </el-table-column> -->
-          <el-table-column align="center" prop="guildUsdNum" label="提现薪资">
-            <template v-slot="scope">
-              {{ scope.row.guildUsdNum }}
-            </template>
-          </el-table-column>
+          <el-table-column type="selection"> </el-table-column>
+          <el-table-column align="center" prop="erbanNo" label="MoliStar ID" />
+          <el-table-column align="center" prop="nick" label="昵称" />
+          <el-table-column align="center" prop="accountCountry" label="国家" />
           <el-table-column
             align="center"
-            prop="createTime"
-            label="创建时间"
-            width="160"
+            prop="blocked"
+            label="用户当前账户状态"
           >
             <template v-slot="scope">
-              {{ convertTimestamp(scope.row.createTime) }}
+              {{ scope.row.blocked ? "封禁" : "正常" }}
             </template>
           </el-table-column>
-          <el-table-column align="center" prop="status" label="状态">
+          <el-table-column align="center" prop="status" label="申请状态">
             <template v-slot="scope">
-              {{ scope.row.status == 0 ? "未结算" : "已结算" }}
+              {{
+                scope.row.status == 0
+                  ? "审核中"
+                  : scope.row.status == 1
+                  ? "通过"
+                  : "未通过"
+              }}
             </template>
           </el-table-column>
-          <el-table-column align="center" prop="hallSalary" label="操作">
+          <el-table-column align="center" prop="createTime" label="申请时间" />
+          <el-table-column
+            align="center"
+            prop="accountType"
+            label="提现类型  "
+          />
+          <el-table-column
+            align="center"
+            prop="guildUsdNum"
+            label="提现薪资US"
+          />
+          <el-table-column align="center" prop="currency" label="发放币种" />
+          <el-table-column align="center" prop="currencyNum" label="发放金额" />
+          <el-table-column align="center" prop="withdrawRate" label="手续费" />
+          <el-table-column align="center" prop="withdrawNum" label="核销薪资" />
+          <el-table-column align="center" prop="remark" label="驳回理由">
             <template v-slot="scope">
+              {{ scope.row.remark ? scope.row.remark : "/" }}
+            </template>
+          </el-table-column>
+          <el-table-column align="center" prop="hallSalary" label="操作" width="150">
+            <template v-slot="scope">
+              <div v-if="scope.row.status == 0">
                 <el-button
-                v-if="scope.row.status == 0"
                   @click="handleChange(scope.row)"
                   type="text"
                   size="mini"
                 >
-                结算
+                  发放
                 </el-button>
-            </template>
-          </el-table-column>
-          <el-table-column
-            align="center"
-            prop="updateTime"
-            label="操作时间"
-            width="160"
+                <el-button
+                  @click="
+                    centerDialogVisible = true;
+                    centerDialogVisibleType = 2;
+                    centerDialogVisibleID = scope.row.id;
+                  "
+                  type="text"
+                  size="mini"
                 >
-            <template v-slot="scope">
-              {{
-                scope.row.updateTime
-                  ? convertTimestamp(scope.row.updateTime)
-                  : ""
-              }}
+                  驳回
+                </el-button>
+              </div>
+              <div>
+                <el-button
+                  @click="accountInfosFun(scope.row)"
+                  type="text"
+                  size="mini"
+                >
+                  查看详情
+                </el-button>
+              </div>
             </template>
           </el-table-column>
-          <el-table-column align="center" prop="operator" label="操作人">
-          </el-table-column>
         </el-table>
       </div>
+      <!-- 分页 -->
       <table-pagination
         :pageParams="pageParams"
         :pageTotal="pageTotal"
@@ -145,6 +192,46 @@
         @handleSizeChange="handleSizeChange"
         @handlePageChange="handlePageChange"
       ></table-pagination>
+      <!-- 驳回弹窗 -->
+      <el-dialog v-model="centerDialogVisible" title="提示" width="30%" center>
+        <span> 请选择驳回理由:</span>
+        <div class="boxs">
+          <el-radio class="radios" v-model="radio" label="用户消息提供不足"
+            >用户消息提供不足</el-radio
+          >
+        </div>
+        <template #footer>
+          <span class="dialog-footer">
+            <el-button @click="centerDialogVisible = false">取消</el-button>
+            <el-button type="primary" @click="dialogClick()"> 确认 </el-button>
+          </span>
+        </template>
+      </el-dialog>
+      <!-- 提现详情弹窗 -->
+      <el-dialog v-model="centerDialogVisible2" title="提现详情">
+        <div class="boxs2">
+          <div>申请提现时间：{{ accountDetails.createTime }}</div>
+          <div>申请ID：{{ accountDetails.erbanNo }}</div>
+          <div>country：{{ accountDetails.country }}</div>
+          <div>payeeAccount：{{ accountDetails.bank_account }}</div>
+          <div>Bank Name：{{ accountDetails.bank_name }}</div>
+          <div>SWIFT Code：{{ accountDetails.swift_code }}</div>
+          <div>payeeName:：{{ accountDetails.full_name }}</div>
+          <div>address：{{ accountDetails.address }}</div>
+          <div>提现薪资US：{{ accountDetails.guildUsdNum }}</div>
+          <div>
+            发放金额：{{ accountDetails.currency }}
+            {{ accountDetails.currencyNum }}
+          </div>
+          <div>提现手续费：{{ accountDetails.withdrawRate }}</div>
+          <div>核销薪资：{{ accountDetails.withdrawNum }}</div>
+        </div>
+        <template #footer>
+          <span class="dialog-footer">
+            <el-button @click="centerDialogVisible2 = false">确认</el-button>
+          </span>
+        </template>
+      </el-dialog>
     </div>
   </div>
 </template>
@@ -155,12 +242,14 @@ import {
   agencyWithdrawExamineExport,
   agencyWithdrawSet,
   agencyWithdrawBatchSet,
+  batchReject,
+  adminCountry,
 } from "@/api/relAgency/relAgency.js";
 import TablePagination from "@/components/common/TablePagination";
 import { formatDate, formatDateYMD } from "@/utils/relDate";
 import { dateFormat } from "@/utils/system-helper";
 import { ElMessage } from "element-plus";
-import { ElMessageBox } from 'element-plus'; // 正确引入 ElM
+import { ElMessageBox } from "element-plus"; // 正确引入 ElM
 // 混入
 // import Mixin from '../../mixin/mixRegion.js';
 
@@ -180,13 +269,21 @@ export default {
         pageNo: 1,
         pageSize: 20,
       },
+      centerDialogVisible: false, //驳回弹窗
+      centerDialogVisibleType: null, //驳回弹窗
+      centerDialogVisibleID: null, //驳回弹窗
+      centerDialogVisible2: false, //操作弹窗
+      radio: "用户消息提供不足", //驳回原因
       // 搜索表单相关
       searchForm: {
         agencyOwnerErbanNo: null,
         status: null,
         startTime: null,
         endTime: null,
+        adminCountry: null,
+        country: null,
       },
+      adminCountryArr: [],
       searchRule: {
         startTime: [
           {
@@ -216,18 +313,41 @@ export default {
         ],
       },
       idStr: [], //批量删除ID
+      // 查看薪资弹窗数据存储
+      accountDetails: {
+        createTime: null,
+        erbanNo: null,
+        country: null,
+        bank_account: null,
+        bank_name: null,
+        swift_code: null,
+        full_name: null,
+        address: null,
+        guildUsdNum: null,
+        currency: null,
+        currencyNum: null,
+        withdrawRate: null,
+        withdrawNum: null,
+      },
     };
   },
   created() {
-    // this.getData();
+    adminCountry().then((res) => {
+      this.adminCountryArr = res.data;
+      this.getData();
+    });
   },
   methods: {
     getData() {
       this.tableLoading = true;
 
       let { pageParams, searchForm } = this;
-      searchForm.startTime = dateFormat(searchForm.startTime,'yyyy-MM-dd hh:mm:ss');
-      searchForm.endTime = dateFormat(searchForm.endTime,'yyyy-MM-dd hh:mm:ss');
+      searchForm.startTime = searchForm.startTime
+        ? dateFormat(searchForm.startTime, "yyyy-MM-dd hh:mm:ss")
+        : "";
+      searchForm.endTime = searchForm.endTime
+        ? dateFormat(searchForm.endTime, "yyyy-MM-dd hh:mm:ss")
+        : "";
       searchForm = JSON.parse(JSON.stringify(searchForm));
       pageParams = JSON.parse(JSON.stringify(pageParams));
       Object.keys(searchForm).forEach((item) => {
@@ -239,7 +359,8 @@ export default {
         }
       });
       Object.assign(pageParams, searchForm);
-
+      console.log(pageParams);
+      console.log(searchForm);
       agencyWithdrawList(pageParams).then((res) => {
         this.tableLoading = false;
         if (res.code == 200) {
@@ -284,6 +405,61 @@ export default {
           });
         });
     },
+    // 查看详情处理函数
+    accountInfosFun(res) {
+      var obj = JSON.parse(res.accountInfos);
+      console.log(obj);
+      this.accountDetails.createTime = res.createTime ? res.createTime : "-";
+      this.accountDetails.erbanNo = res.erbanNo ? res.erbanNo : "-";
+      this.accountDetails.country = obj.country ? obj.country : "-";
+      this.accountDetails.bank_account = obj.bank_account
+        ? obj.bank_account
+        : "-";
+      this.accountDetails.bank_name = obj.bank_name ? obj.bank_name : "-";
+      this.accountDetails.swift_code = obj.swift_code ? obj.swift_code : "-";
+      this.accountDetails.full_name = obj.full_name ? obj.full_name : "-";
+      this.accountDetails.address = obj.address ? obj.address : "-";
+      this.accountDetails.guildUsdNum = res.guildUsdNum ? res.guildUsdNum : "-";
+      this.accountDetails.currency = res.currency ? res.currency : "-";
+      this.accountDetails.currencyNum = res.currencyNum ? res.currencyNum : "-";
+      this.accountDetails.withdrawRate = res.withdrawRate
+        ? res.withdrawRate
+        : "-";
+      this.accountDetails.withdrawNum = res.withdrawNum ? res.withdrawNum : "-";
+      this.centerDialogVisible2 = true;
+    },
+    // 批量驳回
+    dialogClick() {
+      batchReject({
+        ids:
+          this.centerDialogVisibleType == 1
+            ? this.idStr
+            : this.centerDialogVisibleID,
+        remark: this.radio,
+      })
+        .then((res) => {
+          if (res.code == 200) {
+            ElMessage({
+              type: "success",
+              message: "操作成功!",
+            });
+            this.getData();
+            this.centerDialogVisible = false;
+            this.idStr = null;
+          } else {
+            ElMessage({
+              type: "error",
+              message: res.message,
+            });
+          }
+        })
+        .catch(() => {
+          ElMessage({
+            type: "warning ",
+            message: "已取消",
+          });
+        });
+    },
     handleChange(row) {
       ElMessageBox.confirm("确定要结算吗", "提示", {
         confirmButtonText: "确定",
@@ -291,7 +467,7 @@ export default {
         type: "warning",
       })
         .then(() => {
-          agencyWithdrawSet({ id: row.id }).then((res) => {
+          agencyWithdrawSet({ ids: row.id }).then((res) => {
             if (res.success === true) {
               ElMessage({
                 type: "success",
@@ -405,13 +581,34 @@ export default {
 
 <style scope>
 .exportBtn {
-  margin-bottom: 20px;
+  margin-bottom: 0;
+}
+.text {
+  margin-left: 20px;
 }
-
 .container {
   width: 100%;
 }
 .search-line {
   width: 38%;
 }
+.boxs {
+  margin-top: 10px;
+  width: 100%;
+  word-wrap: break-word; /* 允许在单词内换行 */
+  overflow-wrap: break-word; /* 同上，现代浏览器推荐使用 */
+  white-space: normal; /* 允许换行 */
+}
+.radios {
+  display: block !important;
+  width: 100% !important;
+  word-wrap: break-word !important; /* 允许在单词内换行 */
+  overflow-wrap: break-word !important; /* 同上，现代浏览器推荐使用 */
+  white-space: normal !important; /* 允许换行 */
+  height: auto !important;
+}
+.boxs2 div {
+  margin-bottom: 10px;
+  font-size: 16px;
+}
 </style>

src/views/luckGift/luckGiftData.vue

@@ -43,6 +43,20 @@
         "
         >重置筛选
       </el-button>
+      <el-button
+        class="primary"
+        type="primary"
+        style="margin-left=20px;"
+        :disabled="butClick"
+        @click="
+          editDialog = true;
+          type = 12;
+          editDialogTitle = '赠送1000倍奖励';
+          value = inquire.x;
+        "
+      >
+        赠送</el-button
+      >
     </div>
 
     <!-- 表格 -->
@@ -58,7 +72,11 @@
       <el-table-column prop="totalInput" align="center" label="进入" />
       <el-table-column prop="totalOutput" align="center" label="退出" />
       <el-table-column prop="production" align="center" label="剩余" />
-      <el-table-column prop="productionRatio" align="center" label="退出/进入" />
+      <el-table-column
+        prop="productionRatio"
+        align="center"
+        label="退出/进入"
+      />
       <el-table-column prop="avgInput" align="center" label="每次进入" />
       <el-table-column prop="num" align="center" label="总次数" />
       <el-table-column prop="winNum" align="center" label="得到次数" />
@@ -77,10 +95,46 @@
       @size-change="handleSizeChange"
       @current-change="handleCurrentChange"
     />
+
+    <!-- 编辑弹窗 -->
+    <el-dialog v-model="editDialog" :title="editDialogTitle" width="36%" center>
+      <div style="margin-bottom: 25px; margin-top: 10px">
+        <span
+          style="display: inline-block; margin-right: 20px"
+          class="col-sm-2 control-label"
+          >{{ editDialogTitle }}</span
+        >
+        <el-input
+          v-model="value"
+          style="width: 75%"
+          class="input"
+          placeholder="请输入用户ID"
+        ></el-input>
+      </div>
+
+      <template #footer>
+        <span class="dialog-footer">
+          <el-button
+            @click="
+              editDialog = false;
+              butClick = false;
+            "
+            >取消</el-button
+          >
+          <el-button
+            type="primary"
+            :disabled="butClick"
+            @click="editDialogClick()"
+          >
+            保存
+          </el-button>
+        </span>
+      </template>
+    </el-dialog>
   </div>
 </template>
 <script>
-import { personal } from "@/api/luckGift/luckGift";
+import { personal, updateUserMulti } from "@/api/luckGift/luckGift";
 // @ts-ignore
 import { dateFormat } from "@/utils/system-helper";
 // @ts-ignore
@@ -117,6 +171,9 @@ export default {
       total: 10, //总页数
       currentPage: 1, //页码
       pageSize: 10, //条数
+      editDialog: false,
+      editDialogTitle: "",
+      value: "",
     };
   },
   created() {
@@ -148,6 +205,31 @@ export default {
         this.loading = false;
       });
     },
+    // 确认保存
+    editDialogClick() {
+      this.butClick = true;
+      updateUserMulti({ erbanNo: this.value }).then((res) => {
+        if (res.code == 200) {
+          ElMessage({
+            showClose: true,
+            message: "赠送成功",
+            type: "success",
+          });
+          setTimeout(() => {
+            this.butClick = false;
+          }, 3000);
+          this.editDialog = false;
+          this.getData();
+        } else {
+          this.butClick = false;
+          ElMessage({
+            showClose: true,
+            message: res.message,
+            type: "error",
+          });
+        }
+      });
+    },
     // 分页导航
     handleSizeChange() {
       this.getData();

src/views/pretty/PrettyNoAdminView.vue

@@ -8,20 +8,32 @@
         <section class="content">
           <div id="table"></div>
           <div id="toolbar">
-                        <label for="prettyNo" class="control-label">靓号:</label>
-                        <input type="text" name="goodNum" id="prettyNo">
-                        <label for="erbanNo" class="control-label">平台号:</label>
-                        <input type="text" name="erbanNo" id="erbanNo">
+            <label for="prettyNo"
+                   class="control-label">靓号:</label>
+            <input type="text"
+                   name="goodNum"
+                   id="prettyNo">
+            <label for="erbanNo"
+                   class="control-label">平台号:</label>
+            <input type="text"
+                   name="erbanNo"
+                   id="erbanNo">
 
-                        <label for="status" class="control-label">状态:</label>
-                        <select name="status" id="status" class="input-m">
+            <label for="status"
+                   class="control-label">状态:</label>
+            <select name="status"
+                    id="status"
+                    class="input-m">
               <option value="">全部</option>
               <option value="0">未使用</option>
               <option value="1">使用中</option>
               <option value="2">已占用</option>
             </select>
-                        <label for="status" class="control-label">来源:</label>
-                        <select name="origin" id="origin" class="input-m">
+            <label for="status"
+                   class="control-label">来源:</label>
+            <select name="origin"
+                    id="origin"
+                    class="input-m">
               <option value="">全部</option>
               <option value="1">活动</option>
               <option value="2">贵族</option>
@@ -29,8 +41,10 @@
               <option value="4">摇一摇抽奖所获</option>
             </select>
 
-                        <button id="btnSearch" class="btn btn-sm btn-primary">查询</button>
-                        <button id="add" class="btn btn-default">
+            <button id="btnSearch"
+                    class="btn btn-sm btn-primary">查询</button>
+            <button id="add"
+                    class="btn btn-default">
               <i class="glyphicon glyphicon-plus"></i>新建靓号
             </button>
           </div>
@@ -40,32 +54,51 @@
   </section>
 
   <!--增加对话框-->
-    <div class="modal fade" id="addPrettyNoModel" tabindex="-1" role="dialog" aria-labelledby="modalLabel2">
-        <div class="modal-dialog" role="document">
+  <div class="modal fade"
+       id="addPrettyNoModel"
+       tabindex="-1"
+       role="dialog"
+       aria-labelledby="modalLabel2">
+    <div class="modal-dialog"
+         role="document">
       <div class="modal-content">
         <div class="modal-header">
-                    <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span
-                            aria-hidden="true">x</span></button>
-                    <h4 class="modal-title" id="addModalLabel">新增靓号</h4>
+          <button type="button"
+                  class="close"
+                  data-dismiss="modal"
+                  aria-label="Close"><span aria-hidden="true">x</span></button>
+          <h4 class="modal-title"
+              id="addModalLabel">新增靓号</h4>
         </div>
         <div class="modal-body">
-                    <form id="addPrettyNoForm" class="form-horizontal">
+          <form id="addPrettyNoForm"
+                class="form-horizontal">
             <div class="form-group">
-                            <label for="addPrettyNo" class="col-sm-3 control-label">请输入靓号：</label>
+              <label for="addPrettyNo"
+                     class="col-sm-3 control-label">请输入靓号：</label>
               <!-- 默认靓号使用状态为0，未使用 -->
-                            <input type="hidden" name="status" value="0">
+              <input type="hidden"
+                     name="status"
+                     value="0">
               <!-- 默认上架 -->
-                            <input type="hidden" name="isValid" value="1">
+              <input type="hidden"
+                     name="isValid"
+                     value="1">
               <div class="col-sm-3">
-                                <input type="text" class="form-control validate[required]" name="prettyNo"
+                <input type="text"
+                       class="form-control validate[required]"
+                       name="prettyNo"
                        id="addPrettyNo" />
               </div>
             </div>
 
             <div class="form-group">
-                            <label for="addSource" class="col-sm-3 control-label">选择使用来源：</label>
+              <label for="addSource"
+                     class="col-sm-3 control-label">选择使用来源：</label>
               <div class="col-sm-8">
-                                <select name="useSource" id="addSource" class="col-sm-3">
+                <select name="useSource"
+                        id="addSource"
+                        class="col-sm-3">
                   <option value="1">活动</option>
                   <option value="2">贵族</option>
                   <option value="3">运营需要赠送</option>
@@ -74,68 +107,102 @@
               </div>
             </div>
             <div class="form-group">
-                            <label for="addRemark" class="col-sm-3 control-label">备注:</label>
+              <label for="addRemark"
+                     class="col-sm-3 control-label">备注:</label>
               <div class="col-sm-8">
-                                <input type="text" class="form-control" name="prettyDesc" id="addRemark">
+                <input type="text"
+                       class="form-control"
+                       name="prettyDesc"
+                       id="addRemark">
               </div>
             </div>
           </form>
         </div>
         <div class="modal-footer">
-                    <button type="button" class="btn btn-default" data-dismiss="modal">取消</button>
-                    <button type="button" class="btn btn-primary" id="addSave">新建</button>
+          <button type="button"
+                  class="btn btn-default"
+                  data-dismiss="modal">取消</button>
+          <button type="button"
+                  class="btn btn-primary"
+                  id="addSave">新建</button>
         </div>
       </div>
     </div>
   </div>
 
   <!--使用对话框-->
-    <div class="modal fade" id="usePrettyNoModel" tabindex="-1" role="dialog" aria-labelledby="modalLabel2">
-        <div class="modal-dialog" role="document">
+  <div class="modal fade"
+       id="usePrettyNoModel"
+       tabindex="-1"
+       role="dialog"
+       aria-labelledby="modalLabel2">
+    <div class="modal-dialog"
+         role="document">
       <div class="modal-content">
         <div class="modal-header">
-                    <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span
-                            aria-hidden="true">x</span></button>
-                    <h4 class="modal-title" id="useModalLabel">使用靓号</h4>
+          <button type="button"
+                  class="close"
+                  data-dismiss="modal"
+                  aria-label="Close"><span aria-hidden="true">x</span></button>
+          <h4 class="modal-title"
+              id="useModalLabel">使用靓号</h4>
         </div>
         <div class="modal-body">
-                    <form id="usePrettyNoForm" class="form-horizontal">
+          <form id="usePrettyNoForm"
+                class="form-horizontal">
             <div class="form-group">
-                            <input type="hidden" name="prettyId" id="prettyId" />
-                            <label for="usePrettyNo" class="col-sm-3 control-label">靓号：</label>
+              <label for="usePrettyNo"
+                     class="col-sm-3 control-label">靓号：</label>
               <div class="col-sm-3">
-                                <input type="text" class="form-control validate[required]" disabled="disabled"
-                                    name="usePrettyNo" id="usePrettyNo">
+                <input type="text"
+                       class="form-control validate[required]"
+                       disabled="disabled"
+                       name="usePrettyNo"
+                       id="usePrettyNo">
               </div>
             </div>
 
             <div class="form-group">
-                            <label for="userMsNo" class="col-sm-3 control-label">使用人平台号:</label>
+              <label for="userMsNo"
+                     class="col-sm-3 control-label">使用人平台号:</label>
               <div class="col-sm-8">
-                                <input type="text" class="form-control validate[required]" name="userMsNo" id="userMsNo" />
+                <input type="text"
+                       class="form-control validate[required]"
+                       name="userMsNo"
+                       id="userMsNo" />
               </div>
             </div>
 
             <div class="form-group">
-                            <label for="startUseDate" class="col-sm-3 control-label">开始日期：</label>
+              <label for="startUseDate"
+                     class="col-sm-3 control-label">开始日期：</label>
               <div class="col-sm-4">
-                                <input id="startUseDate" type="text" name="startUseDate"
+                <input id="startUseDate"
+                       type="text"
+                       name="startUseDate"
                        class="form-control validate[required]" />
               </div>
             </div>
 
             <div class="form-group">
-                            <label for="endUseDate" class="col-sm-3 control-label">结束日期：</label>
+              <label for="endUseDate"
+                     class="col-sm-3 control-label">结束日期：</label>
               <div class="col-sm-4">
-                                <input id="endUseDate" type="text" name="endUseDate"
+                <input id="endUseDate"
+                       type="text"
+                       name="endUseDate"
                        class="form-control validate[required]" />
               </div>
             </div>
 
             <div class="form-group">
-                            <label for="useSource" class="col-sm-3 control-label">靓号使用来源：</label>
+              <label for="useSource"
+                     class="col-sm-3 control-label">靓号使用来源：</label>
               <div class="col-sm-8">
-                                <select name="useSource" id="useSource" class="col-sm-3" disabled>
+                <select name="useSource"
+                        id="useSource"
+                        class="col-sm-3"
+                        disabled>
                   <option value="1">活动</option>
                   <option value="2">贵族</option>
                   <option value="3">运营需要赠送</option>
@@ -144,103 +211,144 @@
               </div>
             </div>
             <div class="form-group">
-                            <label for="remark" class="col-sm-3 control-label">备注:</label>
+              <label for="remark"
+                     class="col-sm-3 control-label">备注:</label>
               <div class="col-sm-8">
-                                <input type="text" class="form-control" name="remark" id="remark">
+                <input type="text"
+                       class="form-control"
+                       name="remark"
+                       id="remark">
               </div>
             </div>
           </form>
         </div>
         <div class="modal-footer">
-                    <button type="button" class="btn btn-default" data-dismiss="modal">取消</button>
-                    <button type="button" class="btn btn-primary" id="useSave">确认使用</button>
+          <button type="button"
+                  class="btn btn-default"
+                  data-dismiss="modal">取消</button>
+          <button type="button"
+                  class="btn btn-primary"
+                  id="useSave">确认使用</button>
         </div>
       </div>
     </div>
   </div>
 
-
   <!--删除-->
-    <div class="modal fade" id="delModel">
+  <div class="modal fade"
+       id="delModel">
     <div class="modal-dialog">
       <div class="modal-content message_align">
         <div class="modal-header">
-                    <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span
-                            aria-hidden="true">×</span></button>
+          <button type="button"
+                  class="close"
+                  data-dismiss="modal"
+                  aria-label="Close"><span aria-hidden="true">×</span></button>
           <h4 class="modal-title">提示信息</h4>
         </div>
         <div class="modal-body">
           <p>您确认要删除吗？</p>
         </div>
         <div class="modal-footer">
-                    <input type="hidden" id="url" />
-                    <button type="button" class="btn btn-default" data-dismiss="modal">取消</button>
-                    <button type="button" class="btn btn-primary" id="doDelete">确认</button>
+          <input type="hidden"
+                 id="url" />
+          <button type="button"
+                  class="btn btn-default"
+                  data-dismiss="modal">取消</button>
+          <button type="button"
+                  class="btn btn-primary"
+                  id="doDelete">确认</button>
         </div>
       </div>
     </div>
   </div>
 
   <!--解绑-->
-    <div class="modal fade" id="unbindModel">
+  <div class="modal fade"
+       id="unbindModel">
     <div class="modal-dialog">
       <div class="modal-content message_align">
         <div class="modal-header">
-                    <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span
-                            aria-hidden="true">×</span></button>
+          <button type="button"
+                  class="close"
+                  data-dismiss="modal"
+                  aria-label="Close"><span aria-hidden="true">×</span></button>
           <h4 class="modal-title">提示信息</h4>
         </div>
         <div class="modal-body">
           <p>确认解绑？
             解绑后，使用人会恢复原ID</p>
-                    <div><label for="del-remark">解绑叙述：</label><input type="text" id="del-remark" placeholder="选填" /></div>
+          <div><label for="del-remark">解绑叙述：</label><input type="text"
+                   id="del-remark"
+                   placeholder="选填" /></div>
         </div>
         <div class="modal-footer">
-                    <button type="button" class="btn btn-default" data-dismiss="modal">取消</button>
-                    <button type="button" class="btn btn-primary" id="del-sure">确认</button>
+          <button type="button"
+                  class="btn btn-default"
+                  data-dismiss="modal">取消</button>
+          <button type="button"
+                  class="btn btn-primary"
+                  id="del-sure">确认</button>
         </div>
       </div>
     </div>
   </div>
 
   <!--解绑-->
-    <div class="modal fade" id="unbindForAllModel">
+  <div class="modal fade"
+       id="unbindForAllModel">
     <div class="modal-dialog">
       <div class="modal-content message_align">
         <div class="modal-header">
-                    <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span
-                            aria-hidden="true">×</span></button>
+          <button type="button"
+                  class="close"
+                  data-dismiss="modal"
+                  aria-label="Close"><span aria-hidden="true">×</span></button>
           <h4 class="modal-title">提示信息</h4>
         </div>
         <div class="modal-body">
           <p>确认全面解绑？
             解绑后，使用人会恢复原ID</p>
-                    <div><label for="del-remark-all">解绑叙述：</label><input type="text" id="del-remark-all" placeholder="选填" />
+          <div><label for="del-remark-all">解绑叙述：</label><input type="text"
+                   id="del-remark-all"
+                   placeholder="选填" />
           </div>
         </div>
         <div class="modal-footer">
-                    <button type="button" class="btn btn-default" data-dismiss="modal">取消</button>
-                    <button type="button" class="btn btn-primary" id="del-sure-all">确认</button>
+          <button type="button"
+                  class="btn btn-default"
+                  data-dismiss="modal">取消</button>
+          <button type="button"
+                  class="btn btn-primary"
+                  id="del-sure-all">确认</button>
         </div>
       </div>
     </div>
   </div>
 
   <!--占用-->
-    <div class="modal fade" id="occupyModel">
+  <div class="modal fade"
+       id="occupyModel">
     <div class="modal-dialog">
       <div class="modal-content message_align">
         <div class="modal-header">
-                    <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span
-                            aria-hidden="true">×</span></button>
+          <button type="button"
+                  class="close"
+                  data-dismiss="modal"
+                  aria-label="Close"><span aria-hidden="true">×</span></button>
           <h4 class="modal-title">提示信息</h4>
         </div>
         <div class="modal-body">
-                    <div><label for="occupy-msNo">平台号：</label><input type="text" id="occupy-msNo" /></div>
+          <div><label for="occupy-msNo">平台号：</label><input type="text"
+                   id="occupy-msNo" /></div>
         </div>
         <div class="modal-footer">
-                    <button type="button" class="btn btn-default" data-dismiss="modal">取消</button>
-                    <button type="button" class="btn btn-primary" id="occupy-sure">确认</button>
+          <button type="button"
+                  class="btn btn-default"
+                  data-dismiss="modal">取消</button>
+          <button type="button"
+                  class="btn btn-primary"
+                  id="occupy-sure">确认</button>
         </div>
       </div>
     </div>
@@ -266,7 +374,6 @@ export default {
         $('#table').bootstrapTable('destroy');
         $('#table').bootstrapTable({
           columns: [
-                        { field: 'id', title: 'ID', align: 'center', valign: 'middle', width: '5%' },
             { field: 'prettyNo', title: '靓号', align: 'center', valign: 'middle', width: '10%' },
             {
               field: 'status',
@@ -367,12 +474,11 @@ export default {
               width: '20%',
               valign: 'middle',
               formatter: function (val, row, index) {
-                                var key = row.id;
+                var key = row.prettyNo;
                 var returnS = "";
                 if (row.isValid) {
                   if (row.status == 1) {
-                                        returnS = "<button class='btn btn-sm btn-danger opt-unbind'  data-id=" + key + " >解绑</button>" +
-                                            "<button class='btn btn-sm btn-danger opt-unbind-all'  data-id=" + key + " >全面解绑</button>";
+                    returnS = "<button class='btn btn-sm btn-danger opt-unbind'  data-id=" + key + " >解绑</button>";
                   } else if (row.status == 2) {
                     returnS = "<button class='btn btn-sm btn-success opt-cancel-occupy'  data-id=" + key + ">解除占用</button>";
                   } else if (row.status == 0) {
@@ -403,9 +509,9 @@ export default {
             };
             return param;
           },
-                    uniqueId: 'id',
+          uniqueId: 'prettyNo',
           toolbar: '#toolbar',
-                    url: '/admin/pretty/list',
+          url: '/admin/prettyNumber/list',
           onLoadSuccess: function () {  //加载成功时执行
             console.log("load success");
           },
@@ -424,7 +530,7 @@ export default {
           if ($('#addPrettyNoForm').validationEngine('validate')) {
             $.ajax({
               type: "post",
-                            url: "/admin/pretty/save",
+              url: "/admin/prettyNumber/save",
               data: $('#addPrettyNoForm').serialize(),
               dataType: 'json',
               success: function (data) {
@@ -453,11 +559,11 @@ export default {
           $('#usePrettyNoForm')[0].reset();
           var key = parseInt($(this).data('id'));
           var data = $('#table').bootstrapTable('getRowByUniqueId', key);
+          console.info(data)
           $('#usePrettyNo').val(data.prettyNo);
           $('#useSource').val(data.useSource);
           $('#remark').val(data.prettyDesc);
           $("#userMsNo").val(data.userErbanNo)
-                    $("#prettyId").val(key);
           console.log(key, typeof key);
           $("#usePrettyNoModel").modal('show');
         })
@@ -468,9 +574,9 @@ export default {
           if ($('#usePrettyNoForm').validationEngine('validate')) {
             $.ajax({
               type: 'post',
-                            url: '/admin/pretty/bind',
+              url: '/admin/prettyNumber/bind',
               data: {
-                                prettyId: $('#prettyId').val(),
+                prettyNo: $('#usePrettyNo').val(),
                 erbanNo: $('#userMsNo').val(),
                 desc: $('#remark').val(),
                 startTime: $('#startUseDate').val() + ' 00:00:00',
@@ -497,9 +603,9 @@ export default {
         $("#del-sure").click(function () {
           $.ajax({
             type: 'post',
-                        url: '/admin/pretty/unBind',
+            url: '/admin/prettyNumber/unBind',
             data: {
-                            prettyId: $(this).data('id'),
+              prettyNo: $(this).data('id'),
               desc: $('#del-remark').val()
             },
             dataType: 'json',
@@ -520,9 +626,9 @@ export default {
         $("#del-sure-all").click(function () {
           $.ajax({
             type: 'post',
-                        url: '/admin/pretty/unBindForAll',
+            url: '/admin/prettyNumber/unBindForAll',
             data: {
-                            prettyId: $(this).data('id'),
+              prettyNo: $(this).data('id'),
               desc: $('#del-remark-all').val()
             },
             dataType: 'json',
@@ -543,9 +649,9 @@ export default {
         $("#occupy-sure").click(function () {
           $.ajax({
             type: 'post',
-                        url: '/admin/pretty/occupy',
+            url: '/admin/prettyNumber/occupy',
             data: {
-                            prettyId: $(this).data('id'),
+              prettyNo: $(this).data('id'),
               erbanNo: $("#occupy-msNo").val()
             },
             dataType: 'json',
@@ -580,9 +686,9 @@ export default {
           var key = parseInt($(this).data('id'));
           $.ajax({
             type: 'post',
-                        url: '/admin/pretty/cancelOccupy',
+            url: '/admin/prettyNumber/cancelOccupy',
             data: {
-                            prettyId: key
+              prettyNo: key
             },
             dataType: 'json',
             success: function (data) {
@@ -673,4 +779,5 @@ select {
 
 .record .title {
   font-size: 16px;
-}</style>
+}
+</style>

src/views/pretty/PrettyNoRecordAdminView.vue

@@ -8,17 +8,26 @@
         <div class="content">
           <div id="table"></div>
           <div id="toolbar">
-                        <label for="prettyNo" class="control-label">目标平台号：</label>
-                        <input type="text" name="goodNum" id="targetPrettyNo">
-                        <label for="prettyNo" class="control-label">原平台号：</label>
-                        <input type="text" id="currentPrettyNo">
-                        <label for="operator" class="control-label">操作类型:</label>
-                        <select name="status" id="operator" class="input-m">
+            <label for="prettyNo"
+                   class="control-label">目标平台号：</label>
+            <input type="text"
+                   name="goodNum"
+                   id="targetPrettyNo">
+            <label for="prettyNo"
+                   class="control-label">原平台号：</label>
+            <input type="text"
+                   id="currentPrettyNo">
+            <label for="operator"
+                   class="control-label">操作类型:</label>
+            <select name="status"
+                    id="operator"
+                    class="input-m">
               <option value="">全部</option>
               <option value="1">绑定</option>
               <option value="2">解绑</option>
             </select>
-                        <button id="btnSearch" class="btn btn-sm btn-primary">查询</button>
+            <button id="btnSearch"
+                    class="btn btn-sm btn-primary">查询</button>
           </div>
         </div>
       </div>
@@ -45,7 +54,6 @@ export default {
         $('#table').bootstrapTable('destroy');
         $('#table').bootstrapTable({
           columns: [
-                        { field: 'id', title: 'ID', align: 'center', valign: 'middle', width: '5%' },
             { field: 'currentErbanNo', title: '原平台号', align: 'center', valign: 'middle', width: '10%' },
             {
               field: 'operator',
@@ -135,7 +143,7 @@ export default {
           },
           uniqueId: 'id',
           toolbar: '#toolbar',
-                    url: '/admin/pretty/record/getList',
+          url: '/admin/prettyNumber/record/getList',
           onLoadSuccess: function () {  //加载成功时执行
             console.log("load success");
           },