From f47fb2d019001333c27dfcdc0261fb9e561207bd Mon Sep 17 00:00:00 2001
From: woody <woody@163>
Date: Tue, 20 May 2025 13:23:09 +0800
Subject: [PATCH] =?UTF-8?q?feat(top-member-select):=20=E9=A1=B6=E7=82=B9?=
 =?UTF-8?q?=E4=BC=9A=E5=91=98=E9=80=89=E6=8B=A9=E7=BB=84=E4=BB=B6=E7=9B=AE?=
 =?UTF-8?q?=E5=BD=95=E8=BF=81=E7=A7=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../top-member-select/index.vue}              |   3 -
 src/views/framework/architecture/azjg2.vue    |   2 +-
 src/views/framework/architecture/azjg3.vue    |   2 +-
 src/views/framework/architecture/azjg4.vue    |   2 +-
 src/views/framework/architecture/azjg5.vue    |   2 +-
 src/views/framework/architecture/index.vue    |   2 +-
 src/views/statistics/underPlacementPerNew.vue | 221 ++++++++----------
 7 files changed, 107 insertions(+), 127 deletions(-)
 rename src/{views/framework/architecture/components/top-member-select.vue => components/top-member-select/index.vue} (98%)

diff --git a/src/views/framework/architecture/components/top-member-select.vue b/src/components/top-member-select/index.vue
similarity index 98%
rename from src/views/framework/architecture/components/top-member-select.vue
rename to src/components/top-member-select/index.vue
index 73a1f75..4d3877f 100644
--- a/src/views/framework/architecture/components/top-member-select.vue
+++ b/src/components/top-member-select/index.vue
@@ -52,6 +52,3 @@ export default {
 }
 </script>
 
-<style>
-
-</style>
diff --git a/src/views/framework/architecture/azjg2.vue b/src/views/framework/architecture/azjg2.vue
index 359b871..4dab8c4 100644
--- a/src/views/framework/architecture/azjg2.vue
+++ b/src/views/framework/architecture/azjg2.vue
@@ -250,7 +250,7 @@ import {
   getMemberSettlePeriod,
   getUrlBase
 } from '@/api/archityecture'
-import TopMemberSelect from './components/top-member-select.vue'
+import TopMemberSelect from '@/components/top-member-select/index.vue'
 import { isLocals } from '../../../utils/numberToCurrency'
 export default {
   name: 'Azjg2',
diff --git a/src/views/framework/architecture/azjg3.vue b/src/views/framework/architecture/azjg3.vue
index c0a394c..e8867ff 100644
--- a/src/views/framework/architecture/azjg3.vue
+++ b/src/views/framework/architecture/azjg3.vue
@@ -244,7 +244,7 @@ import {
   getUrlBase
 } from '@/api/archityecture'
 import { isLocals } from '../../../utils/numberToCurrency'
-import TopMemberSelect from './components/top-member-select.vue'
+import TopMemberSelect from '@/components/top-member-select/index.vue'
 export default {
   name: 'Azjg3',
   components: {
diff --git a/src/views/framework/architecture/azjg4.vue b/src/views/framework/architecture/azjg4.vue
index 5ba394b..e16b5ad 100644
--- a/src/views/framework/architecture/azjg4.vue
+++ b/src/views/framework/architecture/azjg4.vue
@@ -232,7 +232,7 @@ import {
   getUrlBase
 } from '@/api/archityecture'
 import { isLocals } from '../../../utils/numberToCurrency'
-import TopMemberSelect from './components/top-member-select.vue'
+import TopMemberSelect from '@/components/top-member-select/index.vue'
 export default {
   name: 'Azjg4',
   components: {
diff --git a/src/views/framework/architecture/azjg5.vue b/src/views/framework/architecture/azjg5.vue
index 422b408..97b6253 100644
--- a/src/views/framework/architecture/azjg5.vue
+++ b/src/views/framework/architecture/azjg5.vue
@@ -87,7 +87,7 @@ import {
   getUrlBase
 } from '@/api/archityecture'
 import { isLocals } from '../../../utils/numberToCurrency'
-import TopMemberSelect from './components/top-member-select.vue'
+import TopMemberSelect from '@/components/top-member-select/index.vue'
 import tabBarMixin from './mixins/tab-bar'
 import { getgradeRanglist } from '@/api/level'
 export default {
diff --git a/src/views/framework/architecture/index.vue b/src/views/framework/architecture/index.vue
index c956dd3..116da7f 100644
--- a/src/views/framework/architecture/index.vue
+++ b/src/views/framework/architecture/index.vue
@@ -255,7 +255,7 @@ import {
   getMemberSettlePeriod,
   getUrlBase
 } from '@/api/archityecture'
-import TopMemberSelect from './components/top-member-select.vue'
+import TopMemberSelect from '@/components/top-member-select/index.vue'
 import { isLocals } from '../../../utils/numberToCurrency'
 import tabBarMixin from './mixins/tab-bar'
 export default {
diff --git a/src/views/statistics/underPlacementPerNew.vue b/src/views/statistics/underPlacementPerNew.vue
index 1a12044..290586f 100644
--- a/src/views/statistics/underPlacementPerNew.vue
+++ b/src/views/statistics/underPlacementPerNew.vue
@@ -2,36 +2,36 @@
   <div class="page">
     <topBar
       v-if="topList.length > 0"
-      :topList="topList"
+      :top-list="topList"
       :moren="moren"
-    ></topBar>
+    />
     <div class="thetopbox">
       <el-form label-width="100px">
         <el-row>
           <el-col :span="4">
             <el-form-item :label="'会员编号'" prop="memberCode">
-              <el-input clearable v-model="queryParams.memberCode"></el-input>
+              <el-input v-model="queryParams.memberCode" clearable />
             </el-form-item>
           </el-col>
           <el-col :span="4">
             <el-form-item :label="'会员姓名'" prop="memberName">
-              <el-input clearable v-model="queryParams.memberName"></el-input>
+              <el-input v-model="queryParams.memberName" clearable />
             </el-form-item>
           </el-col>
 
           <el-col :span="4">
             <el-form-item :label="'订单类型'" prop="orderType">
               <el-select
+                v-model="queryParams.orderType"
                 clearable
                 :placeholder="'请选择'"
-                v-model="queryParams.orderType"
               >
                 <el-option
                   v-for="item in orderTypeList"
                   :key="item.value"
                   :label="item.label"
                   :value="item.value"
-                ></el-option>
+                />
               </el-select>
             </el-form-item>
           </el-col>
@@ -39,48 +39,48 @@
           <el-col :span="4">
             <el-form-item :label="'真实奖衔'" prop="pkAwards">
               <el-select
+                v-model="queryParams.pkAwards"
                 clearable
                 :placeholder="'请选择'"
-                v-model="queryParams.pkAwards"
               >
                 <el-option
                   v-for="item in awardsList"
                   :key="item.pkId"
                   :label="item.awardsName"
                   :value="item.pkId"
-                ></el-option>
+                />
               </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="4">
             <el-form-item :label="'隶属体系'" prop="pkVertex">
               <el-select
+                v-model="queryParams.pkVertex"
                 clearable
                 :placeholder="'请选择'"
-                v-model="queryParams.pkVertex"
               >
                 <el-option
                   v-for="item in vertexList"
                   :key="item.pkId"
                   :label="item.vertexName"
                   :value="item.pkId"
-                ></el-option>
+                />
               </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="4">
             <el-form-item :label="'隶属团队'" prop="pkTeamCode">
               <el-select
+                v-model="queryParams.pkTeamCode"
                 clearable
                 :placeholder="'请选择'"
-                v-model="queryParams.pkTeamCode"
               >
                 <el-option
                   v-for="item in memberTeamList"
                   :key="item.pkId"
                   :label="item.teamName"
                   :value="item.pkId"
-                ></el-option>
+                />
               </el-select>
             </el-form-item>
           </el-col>
@@ -104,15 +104,14 @@
             <el-form-item :label="'订单日期'" prop="thetimes">
               <el-date-picker
                 v-model="queryParams.thetimes"
-                @change="changeTime"
                 value-format="yyyy-MM-dd"
                 type="daterange"
                 :clearable="false"
                 :range-separator="'至'"
                 :start-placeholder="'开始日期'"
                 :end-placeholder="'结束日期'"
-              >
-              </el-date-picker>
+                @change="changeTime"
+              />
             </el-form-item>
           </el-col>
           <el-col :span="4">
@@ -126,11 +125,9 @@
                   }
                 "
               >
-                {{ '搜索' }}</el-button
-              >
+                {{ '搜索' }}</el-button>
               <el-button class="my_reset" @click="reChongzhi">
-                {{ '重置' }}</el-button
-              >
+                {{ '重置' }}</el-button>
             </div>
           </el-col>
         </el-row>
@@ -140,21 +137,19 @@
       <div class="maintop">
         <div class="mainbtn">
           <el-button size="small" class="thebtn1" @click="handleExport">
-            {{ '导出' }}</el-button
-          >
+            {{ '导出' }}</el-button>
         </div>
       </div>
       <div class="maintable">
         <el-table
-          :data="tableData"
           v-loading="loading"
+          :data="tableData"
           height="680px"
           style="width: 100%"
           :header-cell-style="{ background: '#EEEEEE' }"
           @selection-change="handleSelectionChange"
         >
-          <el-table-column prop="colsele" type="selection" width="55">
-          </el-table-column>
+          <el-table-column prop="colsele" type="selection" width="55" />
 
           <el-table-column
             align="center"
@@ -166,7 +161,7 @@
                 style="width: 44px; height: 44px; border-radius: 50%"
                 :src="scope.row.nationalFlag"
                 alt=""
-              />
+              >
             </template>
           </el-table-column>
 
@@ -175,74 +170,63 @@
             prop="shortName"
             :label="'国家'"
             min-width="120px"
-          >
-          </el-table-column>
+          />
           <el-table-column
             align="center"
             prop="memberCode"
             :label="'会员编号'"
             min-width="120px"
-          >
-          </el-table-column>
+          />
           <el-table-column
             align="center"
             prop="memberName"
             :label="'会员姓名'"
             min-width="120px"
-          >
-          </el-table-column>
+          />
 
           <el-table-column
             align="center"
             prop="phone"
             :label="'联系方式'"
             min-width="120px"
-          >
-          </el-table-column>
+          />
           <el-table-column
             align="center"
             prop="awardsName"
             :label="'真实奖衔'"
-          >
-          </el-table-column>
+          />
           <el-table-column
             align="center"
             prop="vertexName"
             :label="'隶属体系'"
-          >
-          </el-table-column>
+          />
           <el-table-column
             align="center"
             prop="teamCodeName"
             :label="'隶属团队'"
-          >
-          </el-table-column>
+          />
           <el-table-column
             align="center"
             prop="leftNewAddAmount"
             :label="'左区新增金额'"
-          >
-          </el-table-column>
+          />
           <el-table-column
             align="center"
             prop="rightNewAddAmount"
             :label="'右区新增金额'"
-          >
-          </el-table-column>
+          />
           <el-table-column
             align="center"
             prop="leftNewAddAchieve"
             min-width="100px"
             :label="'左区新增业绩' + `(PV)`"
-          >
-          </el-table-column>
+          />
           <el-table-column
             align="center"
             prop="rightNewAddAchieve"
             min-width="100px"
             :label="'右区新增业绩' + `(PV)`"
-          >
-          </el-table-column>
+          />
           <!-- <el-table-column
               min-width="120px"
               align="center"
@@ -262,35 +246,36 @@
     />
   </div>
 </template>
-      
-          <script>
-import topBar from "@/components/topBar";
-import * as sta from "@/api/statistics";
-import * as log from "@/api/logistics";
-import { getAwardsListChiose } from "@/api/level";
-import { getcountryAllList } from "@/api/exchangerate";
-import { getvertexValue, getmemberTeamList } from "@/api/financialCase";
-import { isLocals, isLocalSymbol } from "@/utils/numberToCurrency";
+
+<script>
+import topBar from '@/components/topBar'
+import * as sta from '@/api/statistics'
+import * as log from '@/api/logistics'
+import { getAwardsListChiose } from '@/api/level'
+import { getcountryAllList } from '@/api/exchangerate'
+import { getvertexValue, getmemberTeamList } from '@/api/financialCase'
+import { isLocals, isLocalSymbol } from '@/utils/numberToCurrency'
+
 export default {
-  name: "UnderPlacementPerNew",
+  name: 'UnderPlacementPerNew',
   components: {
-    topBar,
+    topBar
   },
   data() {
     return {
-      moren: "underPlacementPerNew",
+      moren: 'underPlacementPerNew',
       topList: [
         {
-          name: "伞下新増安置业绩（新）",
-          path: "underPlacementPerNew",
-        },
+          name: '伞下新増安置业绩（新）',
+          path: 'underPlacementPerNew'
+        }
       ],
       tableData: [],
-      loading:false,
+      loading: false,
       queryParams: {
         pageNum: 1,
         pageSize: 50,
-        thetimes: [],
+        thetimes: []
       },
       total: 0,
       multipleSelection: [],
@@ -298,105 +283,104 @@ export default {
       memberTeamList: [],
       vertexList: [],
       countryList: [],
-      orderTypeList: [],
-    };
+      orderTypeList: []
+    }
   },
   created() {
-    this.getSearch();
-    this.getOthers();
-    var s1 = this.getStartTime();
-    var s2 = this.getEndTime();
-    this.queryParams.startPayTime = s1;
-    this.queryParams.endPayTime = s2;
-    this.queryParams.thetimes = [s1, s2];
+    this.getSearch()
+    this.getOthers()
+    var s1 = this.getStartTime()
+    var s2 = this.getEndTime()
+    this.queryParams.startPayTime = s1
+    this.queryParams.endPayTime = s2
+    this.queryParams.thetimes = [s1, s2]
   },
   methods: {
     isLocalSymbol,
     isLocals,
     getStartTime() {
-      const date = new Date();
-      date.setDate(1); // 将当前时间的日期设置成第一天
-      const year = date.getFullYear(); // 得到当前年份
-      let month = date.getMonth() + 1; // 得到当前月份（0-11月份，+1是当前月份）
-      month = month >= 10 ? month : "0" + month; // 补零
-      let day = date.getDate(); // 得到当前天数，实际是本月第一天，因为前面setDate(1) 设置过了
-      day = day >= 10 ? day : "0" + day; // 补零
-      return year + "-" + month + "-" + day;
+      const date = new Date()
+      date.setDate(1) // 将当前时间的日期设置成第一天
+      const year = date.getFullYear() // 得到当前年份
+      let month = date.getMonth() + 1 // 得到当前月份（0-11月份，+1是当前月份）
+      month = month >= 10 ? month : '0' + month // 补零
+      let day = date.getDate() // 得到当前天数，实际是本月第一天，因为前面setDate(1) 设置过了
+      day = day >= 10 ? day : '0' + day // 补零
+      return year + '-' + month + '-' + day
     },
     getEndTime() {
-      let date = new Date();
-      let year = date.getFullYear(); // 得到当前年份
-      let month = date.getMonth() + 1; // 得到当前月份（0-11月份，+1是当前月份）
-      month = month >= 10 ? month : "0" + month; // 补零
-      let day = date.getDate(); // 得到当前天数，实际是本月第一天，因为前面setDate(1) 设置过了
-      day = day >= 10 ? day : "0" + day; // 补零
-      return year + "-" + month + "-" + day + " ";
+      const date = new Date()
+      const year = date.getFullYear() // 得到当前年份
+      let month = date.getMonth() + 1 // 得到当前月份（0-11月份，+1是当前月份）
+      month = month >= 10 ? month : '0' + month // 补零
+      let day = date.getDate() // 得到当前天数，实际是本月第一天，因为前面setDate(1) 设置过了
+      day = day >= 10 ? day : '0' + day // 补零
+      return year + '-' + month + '-' + day + ' '
     },
     changeTime(val) {
-      this.queryParams.startPayTime = val[0];
-      this.queryParams.endPayTime = val[1];
+      this.queryParams.startPayTime = val[0]
+      this.queryParams.endPayTime = val[1]
     },
     getOthers() {
       getAwardsListChiose().then((res) => {
-        this.awardsList = res.rows;
-      });
+        this.awardsList = res.rows
+      })
       getmemberTeamList().then((res) => {
-        this.memberTeamList = res.rows;
-      });
+        this.memberTeamList = res.rows
+      })
       getvertexValue().then((res) => {
-        this.vertexList = res.data;
-      });
+        this.vertexList = res.data
+      })
       getcountryAllList().then((res) => {
-        this.countryList = res.data;
-      });
+        this.countryList = res.data
+      })
       // 获取订单类型
       log.getUnderAddOrderTypeNew().then((res) => {
-        this.orderTypeList = res.data;
-      });
+        this.orderTypeList = res.data
+      })
     },
-    //导出
+    // 导出
     handleExport() {
       this.$confirm('是否确认导出所有数据项?', '警告', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
-        type: "warning",
+        type: 'warning'
       }).then((_) => {
         this.download(
-          "/report/manager/member-report/member-resettle-achieve_up_export",
+          '/report/manager/member-report/member-resettle-achieve_up_export',
           { ...this.queryParams },
           `伞下新増安置业绩（新）${new Date().getTime()}.xlsx`
-        );
-      });
+        )
+      })
     },
     handleSelectionChange(val) {
-      this.multipleSelection = val;
+      this.multipleSelection = val
     },
     reChongzhi() {
       this.queryParams = {
         pageNum: 1,
         pageSize: 50,
-        thetimes: [],
-      };
-      this.getSearch();
+        thetimes: []
+      }
+      this.getSearch()
     },
     getSearch() {
       this.loading = true
       sta.getResettleAchieveNew(this.queryParams).then((res) => {
         this.loading = false
         if (res.code == 200) {
-          this.tableData = res.rows;
-          this.total = res.total;
-          
+          this.tableData = res.rows
+          this.total = res.total
         }
-      });
+      })
     },
     getCzNum() {
-      this.queryParams.pageNum = 1;
-    },
-  },
-};
+      this.queryParams.pageNum = 1
+    }
+  }
+}
 </script>
-      
+
       <style lang="scss" scoped>
 ::v-deep .el-image-viewer__close {
   right: 500px;
@@ -469,4 +453,3 @@ export default {
   }
 }
 </style>
-      
\ No newline at end of file