From 4681cc5a92184981325b32b9286694c62a362bca Mon Sep 17 00:00:00 2001
From: woody <woody@gmail.com>
Date: Thu, 15 May 2025 09:55:55 +0800
Subject: [PATCH 01/22] =?UTF-8?q?feat(yihandeled):=20=E6=89=93=E5=8D=B0?=
 =?UTF-8?q?=E5=BC=B9=E7=AA=97=E8=B0=83=E8=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Delivery/yihandeled.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/Delivery/yihandeled.vue b/src/components/Delivery/yihandeled.vue
index f655bdb..7a86a2e 100644
--- a/src/components/Delivery/yihandeled.vue
+++ b/src/components/Delivery/yihandeled.vue
@@ -1261,7 +1261,7 @@ export default {
             printWindow.document.close()
             printWindow.focus()
             printWindow.print()
-            printWindow.close()
+            // printWindow.close()
           } else {
             const printContent = document.getElementById('print-content2')
             const printWindow = window.open('', '_blank') // 这句解决edge浏览器打不开的问题
@@ -1269,7 +1269,7 @@ export default {
             printWindow.document.close()
             printWindow.focus()
             printWindow.print()
-            printWindow.close()
+            // printWindow.close()
           }
         })
     },

From a1d44e9b3d544987c83325114bd8a714e66c7196 Mon Sep 17 00:00:00 2001
From: woody <woody@gmail.com>
Date: Thu, 15 May 2025 11:03:00 +0800
Subject: [PATCH 02/22] =?UTF-8?q?fix(sourceBonus):=20=E5=A5=96=E9=87=91?=
 =?UTF-8?q?=E6=9D=A5=E6=BA=90=E5=88=97=E8=A1=A8=E5=A5=96=E8=A1=94=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5=E6=94=B9=E5=90=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/settlementCenter/sourceBonus/index.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/settlementCenter/sourceBonus/index.vue b/src/views/settlementCenter/sourceBonus/index.vue
index 6bd86a5..1222d9b 100644
--- a/src/views/settlementCenter/sourceBonus/index.vue
+++ b/src/views/settlementCenter/sourceBonus/index.vue
@@ -347,7 +347,7 @@
               align="center"
               prop="pkAwardsVal"
               width="130"
-              :label="'真实奖衔'"
+              :label="'荣誉奖衔'"
             />
             <!--            <el-table-column-->
             <!--              v-for="item in menuList"-->

From e05f8c81fb0c32eda318995ba5707f5361acfbbe Mon Sep 17 00:00:00 2001
From: woody <woody@gmail.com>
Date: Thu, 15 May 2025 11:25:40 +0800
Subject: [PATCH 03/22] =?UTF-8?q?feat(totalBonus):=20=E5=A5=96=E9=87=91?=
 =?UTF-8?q?=E6=B1=87=E6=80=BB=E7=A7=BB=E9=99=A4=E4=BA=91=E4=BB=A3=E7=9B=B8?=
 =?UTF-8?q?=E5=85=B3=E5=88=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../settlementCenter/totalBonus/index.vue     | 20 +------------------
 1 file changed, 1 insertion(+), 19 deletions(-)

diff --git a/src/views/settlementCenter/totalBonus/index.vue b/src/views/settlementCenter/totalBonus/index.vue
index 38e0999..4818c2f 100644
--- a/src/views/settlementCenter/totalBonus/index.vue
+++ b/src/views/settlementCenter/totalBonus/index.vue
@@ -426,14 +426,7 @@
               :label="'首购实发小计' + '($)'"
               :formatter="stateFormat"
             /> -->
-            <el-table-column
-              v-if="allTxt.cloudRealSubtotalOri"
-              align="center"
-              prop="cloudRealSubtotalOri"
-              width="130"
-              :label="'云代实发小计' + `(${isLocalSymbol()})`"
-              :formatter="stateFormat"
-            />
+
             <!-- <el-table-column
               v-if="allTxt.cloudRealSubtotal"
               align="center"
@@ -1079,17 +1072,6 @@ export default {
 
       this.getDataList()
     },
-    getMenu(e, id) {
-      if (e && id == 0) {
-        this.menuList.forEach((item) => {
-          this.$set(item, 'checked', true)
-        })
-      } else if (!e && id == 0) {
-        this.menuList.forEach((item) => {
-          this.$set(item, 'checked', false)
-        })
-      }
-    },
     getData() {
       api.accountList().then((res) => {
         this.acList = res.data

From 243ea8640d9948f2f0ca44ed9472245b46f3a7cd Mon Sep 17 00:00:00 2001
From: woody <woody@gmail.com>
Date: Thu, 15 May 2025 11:49:32 +0800
Subject: [PATCH 04/22] =?UTF-8?q?feat(bonusDetail):=20=E5=A5=96=E9=87=91?=
 =?UTF-8?q?=E6=98=8E=E7=BB=86=E7=A7=BB=E9=99=A4=E9=94=99=E8=AF=AF=E7=9A=84?=
 =?UTF-8?q?=E6=9E=81=E5=B7=AE=E6=94=B6=E7=9B=8A=E5=88=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/settlementCenter/bonusDetail/index.vue | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/src/views/settlementCenter/bonusDetail/index.vue b/src/views/settlementCenter/bonusDetail/index.vue
index dc66943..81929f2 100644
--- a/src/views/settlementCenter/bonusDetail/index.vue
+++ b/src/views/settlementCenter/bonusDetail/index.vue
@@ -224,15 +224,6 @@
               :label="'服务收益' + '($)'"
               :formatter="stateFormat"
             /> -->
-
-            <el-table-column
-              v-if="allTxt.cloudPurIncomeOri"
-              align="center"
-              prop="cloudPurIncomeOri"
-              width="130"
-              :label="$t('极差收益') + `(${isLocalSymbol()})`"
-              :formatter="stateFormat"
-            />
             <!-- <el-table-column
               v-if="allTxt.cloudPurIncome"
               align="center"

From 3d90d348c8a46f0e358a4f2a4ed253f34db7c23f Mon Sep 17 00:00:00 2001
From: woody <woody@gmail.com>
Date: Thu, 15 May 2025 14:15:29 +0800
Subject: [PATCH 05/22] =?UTF-8?q?fix(rigiestList):=20=E7=A9=BA=E5=8D=95?=
 =?UTF-8?q?=E6=B3=A8=E5=86=8C-=E6=B3=A8=E5=86=8C=E5=88=97=E8=A1=A8=20?=
 =?UTF-8?q?=E8=A1=A8=E5=8D=95=E6=90=9C=E7=B4=A2=E9=83=A8=E5=88=86=E8=BE=93?=
 =?UTF-8?q?=E5=85=A5=E6=A1=86=E6=94=B9=E4=B8=BA=E9=80=89=E6=8B=A9=E5=99=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../emptyOrder/rigiestList.vue                | 80 +++++++++----------
 1 file changed, 40 insertions(+), 40 deletions(-)

diff --git a/src/views/information/specialBusiness/emptyOrder/rigiestList.vue b/src/views/information/specialBusiness/emptyOrder/rigiestList.vue
index 4e06585..6fc443d 100644
--- a/src/views/information/specialBusiness/emptyOrder/rigiestList.vue
+++ b/src/views/information/specialBusiness/emptyOrder/rigiestList.vue
@@ -1,9 +1,3 @@
-<!--
- * @Descripttion:
- * @version:
- * @Author: kBank
- * @Date: 2022-10-24 15:45:01
--->
 <template>
   <div class="page">
     <topBar
@@ -52,35 +46,37 @@
               </el-form-item>
             </el-col>
             <el-col :span="4">
-              <el-form-item label="真实奖衔">
-                <el-input
+              <el-form-item label="荣誉奖衔">
+                <el-select
                   v-model="select.pkAwards"
                   clearable
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="4">
-              <el-form-item label="结算国家">
-                <el-input
-                  v-model="select.pkSettleCountry"
-                  clearable
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="4">
-              <el-form-item label="自然国家">
-                <el-input
-                  v-model="select.pkCountry"
-                  clearable
-                />
+                  :placeholder="'请选择'"
+                >
+                  <el-option
+                    v-for="item in awardsList"
+                    :key="item.pkId"
+                    :label="item.awardsName"
+                    :value="item.pkId"
+                  />
+                </el-select>
               </el-form-item>
             </el-col>
             <el-col :span="4">
               <el-form-item label="是否结算">
-                <el-input
+                <el-select
                   v-model="select.settlementFlag"
                   clearable
-                />
+                  placeholder="请选择"
+                >
+                  <el-option
+                    label="是"
+                    :value="0"
+                  />
+                  <el-option
+                    label="否"
+                    :value="1"
+                  />
+                </el-select>
               </el-form-item>
             </el-col>
             <!-- <el-col :span="4">
@@ -146,6 +142,7 @@
             align="center"
             prop="memberCode"
             label="会员编号"
+            min-width="110"
           />
           <el-table-column
             align="center"
@@ -156,16 +153,19 @@
             align="center"
             prop="phone"
             label="联系方式"
+            min-width="130"
           />
           <el-table-column
             align="center"
             prop="parentCode"
             label="推荐编号"
+            min-width="110"
           />
           <el-table-column
             align="center"
             prop="placeParentCode"
             label="安置编号"
+            min-width="110"
           />
           <el-table-column
             align="center"
@@ -188,20 +188,11 @@
             prop="orderSourceVal"
             label="注册类型"
           />
-          <el-table-column
-            align="center"
-            prop="settleCountryName"
-            label="结算国家"
-          />
-          <el-table-column
-            align="center"
-            prop="countryName"
-            label="自然国家"
-          />
+
           <el-table-column
             align="center"
             prop="pkAwardKeyVal"
-            label="真实奖衔"
+            label="荣誉奖衔"
           />
           <el-table-column
             align="center"
@@ -306,6 +297,9 @@
 <script>
 import topBar from '@/components/topBar'
 import * as api from '@/api/specialBusiness.js'
+import {
+  getAwardsListChiose
+} from '@/api/level'
 export default {
   name: 'Bzpz',
   components: {
@@ -339,14 +333,20 @@ export default {
           name: '注册列表',
           path: 'rigiestList'
         }
-      ]
+      ],
+      awardsList: []
     }
   },
   mounted() {
-    // 获取列表
     this.getDataList()
+    this.getAwardsListOpts()
   },
   methods: {
+    getAwardsListOpts() {
+      getAwardsListChiose().then((res) => {
+        this.awardsList = res.rows
+      })
+    },
     handleChange1() {},
     reset() {
       this.select = {}

From 0b870c8489caa720754121c0de56432a86335f52 Mon Sep 17 00:00:00 2001
From: woody <woody@gmail.com>
Date: Thu, 15 May 2025 16:56:08 +0800
Subject: [PATCH 06/22] =?UTF-8?q?feat(waterPv):=20=E6=B3=A8=E6=B0=B4?=
 =?UTF-8?q?=E4=B8=9A=E7=BB=A9=E9=BB=98=E8=AE=A4=E8=B5=B0=E5=85=A8=E5=85=8D?=
 =?UTF-8?q?=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../information/specialBusiness/waterPv.vue   | 584 ++++++++----------
 1 file changed, 273 insertions(+), 311 deletions(-)

diff --git a/src/views/information/specialBusiness/waterPv.vue b/src/views/information/specialBusiness/waterPv.vue
index 4d17836..1bf6c07 100644
--- a/src/views/information/specialBusiness/waterPv.vue
+++ b/src/views/information/specialBusiness/waterPv.vue
@@ -2,21 +2,21 @@
   <div class="page">
     <topBar
       v-if="topList.length > 0"
-      :topList="topList"
+      :top-list="topList"
       :moren="moren"
-    ></topBar>
+    />
     <div v-if="topList[3].changed == true">
       <div class="thetopbox">
         <el-form ref="queryParams" :model="queryParams" 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">
@@ -109,8 +109,7 @@
                   :start-placeholder="'开始日期'"
                   :end-placeholder="'结束日期'"
                   @change="changeZsDate"
-                >
-                </el-date-picker>
+                />
               </el-form-item>
             </el-col>
             <el-col :span="8">
@@ -123,16 +122,14 @@
                   :start-placeholder="'开始日期'"
                   :end-placeholder="'结束日期'"
                   @change="changeJsDate"
-                >
-                </el-date-picker>
+                />
               </el-form-item>
             </el-col>
 
             <el-col :span="4">
               <div class="searchbox" style="margin-left: 30px">
                 <el-button class="searchbtn" @click="getSearch()">
-                  {{ '搜索' }}</el-button
-                >
+                  {{ '搜索' }}</el-button>
                 <el-button @click="reChongzhi"> {{ '重置' }}</el-button>
               </div>
             </el-col>
@@ -144,26 +141,24 @@
         <div class="maintop">
           <div class="mainbtn">
             <el-button
+              v-hasButtons="['WaterPvUpdate']"
               size="small"
               class="thebtn1"
               @click="updateCode()"
-              v-hasButtons="['WaterPvUpdate']"
-              >{{ '注水业绩' }}</el-button
-            >
+            >{{ '注水业绩' }}</el-button>
             <el-button
               v-hasButtons="['WaterPvExport']"
               size="small"
               class="thebtn2"
               @click="handleExport"
             >
-              {{ '导出' }}</el-button
-            >
+              {{ '导出' }}</el-button>
           </div>
           <div>
             <el-dropdown :hide-on-click="false">
               <span class="el-dropdown-link kuang" style="margin-right: 10px">
                 {{ '筛选字段'
-                }}<i class="el-icon-arrow-down el-icon--right"></i>
+                }}<i class="el-icon-arrow-down el-icon--right" />
               </span>
               <el-dropdown-menu
                 slot="dropdown"
@@ -173,17 +168,15 @@
                   <el-checkbox
                     v-model="item.checked"
                     @change="getMenu($event, item.id)"
-                    >{{ item.text }}</el-checkbox
-                  ></el-dropdown-item
-                >
+                  >{{ item.text }}</el-checkbox></el-dropdown-item>
               </el-dropdown-menu>
             </el-dropdown>
           </div>
         </div>
         <div class="maintable">
           <el-table
-            :data="tableData"
             v-loading="loading"
+            :data="tableData"
             style="width: 100%"
             :header-cell-style="{ background: '#EEEEEE' }"
             height="620px"
@@ -193,33 +186,28 @@
               prop="memberCode"
               min-width="120px"
               :label="'会员编号'"
-            >
-            </el-table-column>
+            />
 
             <el-table-column
               align="center"
               prop="memberName"
               :label="'会员姓名'"
-            >
-            </el-table-column>
+            />
             <el-table-column
               align="center"
               prop="awardsVal"
               :label="'真实奖衔'"
-            >
-            </el-table-column>
+            />
             <el-table-column
               align="center"
               prop="vertexName"
               :label="'隶属体系'"
-            >
-            </el-table-column>
+            />
             <el-table-column
               align="center"
               prop="teamName"
               :label="'隶属团队'"
-            >
-            </el-table-column>
+            />
             <el-table-column
               v-for="(item, index) in headerList"
               :key="index"
@@ -227,34 +215,29 @@
               :prop="item.prop"
               :label="item.text"
               min-width="180px"
-            >
-            </el-table-column>
+            />
             <el-table-column
               align="center"
               prop="infusingWaterTypeVal"
               :label="'注水方式'"
-            >
-            </el-table-column>
+            />
             <el-table-column
               align="center"
               prop="settleDate"
               :label="'注水日期'"
               min-width="150px"
-            >
-            </el-table-column>
+            />
             <el-table-column
               align="center"
               prop="dueDate"
               min-width="150px"
               :label="'结束日期'"
-            >
-            </el-table-column>
+            />
             <el-table-column
               align="center"
               prop="waterStatusVal"
               :label="'注水状态'"
-            >
-            </el-table-column>
+            />
           </el-table>
         </div>
       </div>
@@ -266,7 +249,7 @@
         @pagination="getSearch"
       />
       <el-dialog
-        :title="'安置架构'"
+        title="注水业绩"
         :visible.sync="updateShow"
         width="80%"
         :close-on-click-modal="false"
@@ -276,46 +259,45 @@
         <el-form ref="form" :model="form" label-width="80px">
           <el-form-item :label="'操作类型'">
             <el-select
+              v-model="form.czlx"
               clearable
               :placeholder="'请选择'"
-              v-model="form.czlx"
             >
               <el-option
                 v-for="item in cztypeList"
                 :key="item.value"
                 :label="item.label"
                 :value="item.value"
-              ></el-option>
+              />
             </el-select>
           </el-form-item>
           <el-row style="margin-top: 10px">
             <el-col :span="6">
               <el-form-item :label="'会员编号'">
                 <el-input
+                  v-model="form.memberCode"
                   clearable
                   style="width: 200px"
-                  v-model="form.memberCode"
                   @blur="checkName"
-                ></el-input>
+                />
               </el-form-item>
             </el-col>
             <el-col :span="6">
               <el-form-item :label="'会员姓名'">
                 <el-input
+                  v-model="form.memberName"
                   clearable
                   style="width: 200px"
-                  v-model="form.memberName"
                   disabled
-                ></el-input>
+                />
               </el-form-item>
             </el-col>
             <el-col :span="6">
               <el-button
-                @click="getDataList"
                 style="background-color: #c8161d; color: #fff"
+                @click="getDataList"
               >
-                {{ '搜索' }}</el-button
-              >
+                {{ '搜索' }}</el-button>
               <el-button @click="reset"> {{ '重置' }}</el-button>
             </el-col>
           </el-row>
@@ -325,19 +307,17 @@
               <el-button
                 size="small"
                 class="thebtn1"
-                @click="handleImport"
                 style="background: #ff6723"
+                @click="handleImport"
               >
-                {{ '导入' }}</el-button
-              >
+                {{ '导入' }}</el-button>
               <el-button
                 size="small"
                 class="thebtn2"
-                @click="importTemplate"
                 style="background: #009b58"
+                @click="importTemplate"
               >
-                {{ '下载模板' }}</el-button
-              >
+                {{ '下载模板' }}</el-button>
             </div>
           </template>
 
@@ -345,22 +325,20 @@
             <el-form-item :label="'业务类型'">
               <el-checkbox-group v-model="form.waterTypeList">
                 <el-checkbox
-                  @change="changeAccountType"
                   v-for="item in waterTypeList"
                   :key="item.value"
                   :label="item.value"
-                  >{{ item.label }}</el-checkbox
-                >
+                  @change="changeAccountType"
+                >{{ item.label }}</el-checkbox>
               </el-checkbox-group>
             </el-form-item>
             <el-form-item :label="'注水方式'">
               <el-radio-group v-model="form.infusingWaterType">
                 <el-radio
-                  :label="item.value"
                   v-for="(item, index) in waterWayList"
                   :key="index"
-                  >{{ item.label }}</el-radio
-                >
+                  :label="item.value"
+                >{{ item.label }}</el-radio>
               </el-radio-group>
             </el-form-item>
             <el-table
@@ -373,16 +351,14 @@
                 align="center"
                 prop="memberCode"
                 :label="'会员编号'"
-              >
-              </el-table-column>
+              />
               <!-- CN30720201 -->
               <el-table-column
                 min-width="100px"
                 align="center"
                 prop="memberName"
                 :label="'会员姓名'"
-              >
-              </el-table-column>
+              />
               <el-table-column
                 min-width="180px"
                 align="center"
@@ -397,8 +373,7 @@
                     value-format="yyyy-MM-dd"
                     style="width: 160px"
                     @change="changeSettleData(scope.row)"
-                  >
-                  </el-date-picker>
+                  />
                 </template>
               </el-table-column>
               <el-table-column
@@ -414,22 +389,20 @@
                     :placeholder="'请选择'"
                     value-format="yyyy-MM-dd"
                     style="width: 160px"
-                  >
-                  </el-date-picker>
+                  />
                 </template>
               </el-table-column>
 
               <el-table-column
                 v-for="item in tableTitleList"
-                :label="item.label"
                 :key="item.value"
+                :label="item.label"
                 align="center"
                 :prop="item.field"
                 min-width="180px"
               >
                 <template slot-scope="scope">
-                  <el-input clearable v-model="scope.row[`${item.field}`]">
-                  </el-input>
+                  <el-input v-model="scope.row[`${item.field}`]" clearable />
                 </template>
               </el-table-column>
 
@@ -437,23 +410,20 @@
                 align="center"
                 prop="pkAccountKeyVal"
                 :label="'扣款币种'"
-              >
-              </el-table-column>
+              />
               <el-table-column
                 min-width="160px"
                 align="center"
                 prop="cost"
                 :label="'单笔扣款金额' + `(${isOther()})`"
-              >
-              </el-table-column>
+              />
 
               <el-table-column
                 align="center"
                 prop="remarks"
                 :label="'合计扣款金额' + `(${isOther()})`"
                 min-width="160px"
-              >
-              </el-table-column>
+              />
             </el-table>
           </div>
         </el-form>
@@ -467,33 +437,29 @@
               >{{ item.label }}</el-button
             > -->
             <el-button class="thebtn0" @click="saveDate(0)">
-              {{ '取消' }}</el-button
-            >
-            <el-button
+              {{ '取消' }}</el-button>
+            <!-- <el-button
               v-hasButtons="['WaterPvExemptSign']"
               class="thebtn1"
               @click="saveDate(1)"
-              >{{ '免签' }}</el-button
-            >
+            >{{ '免签' }}</el-button>
             <el-button
               v-hasButtons="['WaterPvExemptPay']"
               class="thebtn2"
               @click="saveDate(2)"
-              >{{ '免付' }}</el-button
-            >
+            >{{ '免付' }}</el-button> -->
+            <!-- 走免的权限 -->
             <el-button
               v-hasButtons="['WaterPvExemptAll']"
               class="thebtn3"
               @click="saveDate(3)"
-              >{{ '全免' }}</el-button
-            >
-            <el-button
+            >确认</el-button>
+            <!-- <el-button
               v-hasButtons="['WaterPvConfirm']"
               class="thebtn4"
               @click="saveDate(4)"
             >
-              {{ '确认' }}</el-button
-            >
+              {{ '确认' }}</el-button> -->
           </div>
         </div>
       </el-dialog>
@@ -517,12 +483,12 @@
           :auto-upload="false"
           drag
         >
-          <i class="el-icon-upload"></i>
+          <i class="el-icon-upload" />
           <div class="el-upload__text">
             {{ '将文件拖到此处，或' }}
             <em>{{ '点击上传' }}</em>
           </div>
-          <div class="el-upload__tip" style="color: red" slot="tip">
+          <div slot="tip" class="el-upload__tip" style="color: red">
             {{ '提示：仅允许导入“xls”或“xlsx”格式文件！' }}
           </div>
         </el-upload>
@@ -553,24 +519,20 @@
               align="center"
               prop="memberCode"
               :label="'会员编号'"
-            >
-            </el-table-column>
+            />
             <el-table-column
               align="center"
               prop="errorMsg"
               :label="'报错信息'"
-            >
-            </el-table-column>
+            />
           </el-table>
         </div>
         <div class="footer" style="text-align: center">
           <div style="margin: 0 auto">
             <el-button class="thebtn" @click="errorShow = false">
-              {{ '取消' }}</el-button
-            >
+              {{ '取消' }}</el-button>
             <el-button type="primary" class="thebtn" @click="errorShow = false">
-              {{ '确认' }}</el-button
-            >
+              {{ '确认' }}</el-button>
           </div>
         </div>
       </el-dialog>
@@ -578,116 +540,116 @@
   </div>
 </template>
 
-  <script>
-import topBar from "@/components/topBar";
-import * as spe from "@/api/specialBusiness";
-import { getPubEnumsProcessTyepe, getHistoryAchieve } from "@/api/business.js";
-import { getToken } from "@/utils/auth";
-import { getMemberName } from "@/api/financial";
-import { getAwardsListChiose } from "@/api/level";
-import * as api from "@/api/settle.js";
-import { getRouters } from "@/api/settle.js";
-import { isOther } from "@/utils/numberToCurrency";
+<script>
+import topBar from '@/components/topBar'
+import * as spe from '@/api/specialBusiness'
+import { getPubEnumsProcessTyepe, getHistoryAchieve } from '@/api/business.js'
+import { getToken } from '@/utils/auth'
+import { getMemberName } from '@/api/financial'
+import { getAwardsListChiose } from '@/api/level'
+import * as api from '@/api/settle.js'
+import { getRouters } from '@/api/settle.js'
+import { isOther } from '@/utils/numberToCurrency'
 export default {
-  name: "waterPv",
+  name: 'WaterPv',
   components: { topBar },
   data() {
     return {
-      moren: "waterPv",
+      moren: 'waterPv',
       topList: [
         {
           name: '空单注册',
-          path: "emptyOrder",
-          changed: false,
+          path: 'emptyOrder',
+          changed: false
         },
         {
           name: '修改直推',
-          path: "modifyDirectpush",
-          changed: false,
+          path: 'modifyDirectpush',
+          changed: false
         },
         {
           name: '修改安置',
-          path: "modifyPlacement",
-          changed: false,
+          path: 'modifyPlacement',
+          changed: false
         },
         {
           name: '注水业绩',
-          path: "waterPv",
-          changed: false,
+          path: 'waterPv',
+          changed: false
         },
         {
           name: '修改编号',
-          path: "modifyCode",
-          changed: false,
+          path: 'modifyCode',
+          changed: false
         },
         {
           name: '真实奖衔控制',
-          path: "awardControl",
-          changed: false,
+          path: 'awardControl',
+          changed: false
         },
         {
           name: '修改结算国家',
-          path: "modifySettleCountry",
-          changed: false,
+          path: 'modifySettleCountry',
+          changed: false
         },
         {
           name: '政策币业务',
-          path: "policyMoney",
-          changed: false,
+          path: 'policyMoney',
+          changed: false
         },
         {
           name: '分红配置',
-          path: "bonusConfig",
-          changed: false,
-        },
+          path: 'bonusConfig',
+          changed: false
+        }
       ],
       queryParams: {
         pageNum: 1,
         pageSize: 50,
-        memberCode: "",
-        memberName: "",
-        startDate: "",
-        endtDate: "",
-        pkAwards: "",
-        pkTeamCode: "",
-        pkVertex: "",
+        memberCode: '',
+        memberName: '',
+        startDate: '',
+        endtDate: '',
+        pkAwards: '',
+        pkTeamCode: '',
+        pkVertex: ''
       },
       tableTitleList: [],
       tableData: [],
-      loading:false,
+      loading: false,
       total: 0,
       updateShow: false,
       upload: {
         // 是否显示弹出层（物流导入）
         open: false,
         // 弹出层标题（物流导入）
-        title: "",
+        title: '',
         // 是否禁用上传
         isUploading: false,
         // 是否更新已经存在的物流数据
         updateSupport: 0,
         // 设置上传的请求头部
-        headers: { Authorization: "Bearer " + getToken() },
+        headers: { Authorization: 'Bearer ' + getToken() },
         // 上传的地址
         url:
           process.env.VUE_APP_BASE_API +
-          "/member/manager/member-achieve-log/importData",
+          '/member/manager/member-achieve-log/importData'
       },
       processTypeList: [],
-      zsDate: "",
-      jsDate: "",
+      zsDate: '',
+      jsDate: '',
       form: {
         czlx: 2,
-        waterTypeList: [], //选中注水类型
-        memberCode: "",
-        memberName: "",
-        infusingWaterType: "", //注水方式
+        waterTypeList: [], // 选中注水类型
+        memberCode: '',
+        memberName: '',
+        infusingWaterType: '' // 注水方式
       },
 
       cztypeList: [],
-      waterTypeList: [], //注水类型
-      waterWayList: [], //注水方式
-      waterStatusList: [], //注水状态
+      waterTypeList: [], // 注水类型
+      waterWayList: [], // 注水方式
+      waterStatusList: [], // 注水状态
       waterPvList: [],
       awardsList: [],
       verList: [],
@@ -696,140 +658,140 @@ export default {
         {
           id: 0,
           text: '全选',
-          checked: true,
+          checked: true
         },
         {
           id: 21,
           text: `${'变更后左区真实业绩'}(${isOther()})`,
           checked: true,
-          prop: "asumRealModifyPv",
+          prop: 'asumRealModifyPv'
         },
         {
           id: 22,
           text: `${'变更后右区真实业绩'}(${isOther()})`,
           checked: true,
-          prop: "bsumRealModifyPv",
+          prop: 'bsumRealModifyPv'
         },
         {
           id: 23,
           text: `${'变更后左区首购业绩'}(${isOther()})`,
           checked: true,
-          prop: "afirstModifyPv",
+          prop: 'afirstModifyPv'
         },
         {
           id: 24,
           text: `${'变更后右区首购业绩'}(${isOther()})`,
           checked: true,
-          prop: "bfirstModifyPv",
+          prop: 'bfirstModifyPv'
         },
         {
           id: 25,
           text: `${'变更后左区首购结余'}`,
           checked: true,
-          prop: "repAFirstModifyBalance",
+          prop: 'repAFirstModifyBalance'
         },
         {
           id: 26,
           text: `${'变更后右区首购结余'}`,
           checked: true,
-          prop: "repBFirstModifyBalance",
+          prop: 'repBFirstModifyBalance'
         },
         {
           id: 27,
           text: `${'变更后左区复购业绩'}(${isOther()})`,
           checked: true,
-          prop: "repAModifySumPv",
+          prop: 'repAModifySumPv'
         },
         {
           id: 28,
           text: `${'变更后右区复购业绩'}(${isOther()})`,
           checked: true,
-          prop: "repBModifySumPv",
+          prop: 'repBModifySumPv'
         },
         {
           id: 29,
           text: `${'变更后左区复购结余'}`,
           checked: false,
-          prop: "repAModifyBalance",
+          prop: 'repAModifyBalance'
         },
         {
           id: 30,
           text: `${'变更后右区复购结余'}`,
           checked: false,
-          prop: "repBModifyBalance",
+          prop: 'repBModifyBalance'
         },
         {
           id: 31,
           text: `${'变更前左区真实业绩'}(${isOther()})`,
           checked: false,
-          prop: "asumRealPv",
+          prop: 'asumRealPv'
         },
         {
           id: 32,
           text: `${'变更前右区真实业绩'}(${isOther()})`,
           checked: false,
-          prop: "bsumRealPv",
+          prop: 'bsumRealPv'
         },
         {
           id: 33,
           text: `${'变更前左区首购业绩'}(${isOther()})`,
           checked: false,
-          prop: "asumPv",
+          prop: 'asumPv'
         },
         {
           id: 34,
           text: `${'变更前右区首购业绩'}(${isOther()})`,
           checked: false,
-          prop: "bsumPv",
+          prop: 'bsumPv'
         },
         {
           id: 35,
           text: `${'变更前左区首购结余'}`,
           checked: false,
-          prop: "abalance",
+          prop: 'abalance'
         },
         {
           id: 36,
           text: `${'变更前右区首购结余'}`,
           checked: false,
-          prop: "bbalance",
+          prop: 'bbalance'
         },
         {
           id: 37,
           text: `${'变更前左区复购业绩'}(${isOther()})`,
           checked: false,
-          prop: "repASumPv",
+          prop: 'repASumPv'
         },
         {
           id: 38,
           text: `${'变更前右区复购业绩'}(${isOther()})`,
           checked: false,
-          prop: "repBSumPv",
+          prop: 'repBSumPv'
         },
         {
           id: 39,
           text: `${'变更前左区复购结余'}`,
           checked: false,
-          prop: "repABalance",
+          prop: 'repABalance'
         },
         {
           id: 40,
           text: `${'变更前右区复购结余'}`,
           checked: false,
-          prop: "repBBalance",
-        },
-      ], //表头筛选
+          prop: 'repBBalance'
+        }
+      ], // 表头筛选
       headerList: [],
       errorData: [],
-      errorShow: false,
-    };
+      errorShow: false
+    }
   },
   created() {
-    this.getSearch();
-    this.getOther();
-    this.getPubEnumsProcessTyepe();
-    this.getUserRoute();
-    this.getMenu();
+    this.getSearch()
+    this.getOther()
+    this.getPubEnumsProcessTyepe()
+    this.getUserRoute()
+    this.getMenu()
   },
   methods: {
     isOther,
@@ -838,153 +800,153 @@ export default {
         if (this.form.infusingWaterType == 3) {
           getHistoryAchieve({
             pkMember: row.pkMember,
-            settleDate: row.settleDate,
+            settleDate: row.settleDate
           }).then((res) => {
             if (res.data) {
               this.waterPvList.forEach((ele, index) => {
                 if (ele.pkMember == res.data.pkMember) {
-                  const tedata = Object.assign({}, ele, res.data);
-                  this.$set(this.waterPvList, index, tedata);
+                  const tedata = Object.assign({}, ele, res.data)
+                  this.$set(this.waterPvList, index, tedata)
                 }
-              });
+              })
             }
-          });
+          })
         }
       } else {
         this.$message({
-          message: "请先填写注水业绩",
-          type: "warning",
-        });
+          message: '请先填写注水业绩',
+          type: 'warning'
+        })
         this.waterPvList.forEach((ele, index) => {
           if ((row.pkId = ele.pkId)) {
-            this.$set(this.waterPvList[index], "settleDate", "");
+            this.$set(this.waterPvList[index], 'settleDate', '')
           }
-        });
-        return;
+        })
+        return
       }
     },
     handleExport() {
       this.$confirm('是否确认导出所有数据项?', '警告', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
-        type: "warning",
+        type: 'warning'
       }).then((_) => {
         this.download(
-          "/member/manager/member-achieve-log/export",
+          '/member/manager/member-achieve-log/export',
           { ...this.queryParams },
           `${'注水业绩'}${new Date().getTime()}.xlsx`
-        );
-      });
+        )
+      })
     },
     changeJsDate(val) {
-      this.queryParams.staDueDate = val ? val[0] : "";
-      this.queryParams.endDueDate = val ? val[1] : "";
+      this.queryParams.staDueDate = val ? val[0] : ''
+      this.queryParams.endDueDate = val ? val[1] : ''
     },
     changeZsDate(val) {
-      this.queryParams.startDate = val ? val[0] : "";
-      this.queryParams.endtDate = val ? val[1] : "";
+      this.queryParams.startDate = val ? val[0] : ''
+      this.queryParams.endtDate = val ? val[1] : ''
     },
     getUserRoute() {
       getRouters().then((res) => {
         res.data.forEach((item) => {
           this.topList.forEach((items) => {
             if (item.path == items.url) {
-              items.changed = true;
+              items.changed = true
             }
-          });
-        });
-      });
+          })
+        })
+      })
     },
     getMenu(e, id) {
       if (e && id == 0) {
         this.menuList.forEach((item) => {
-          this.$set(item, "checked", true);
-        });
-        const theList1 = [];
+          this.$set(item, 'checked', true)
+        })
+        const theList1 = []
         this.menuList.forEach((ele) => {
           if (ele.checked && ele.prop) {
-            theList1.push(ele);
+            theList1.push(ele)
           }
-        });
-        this.headerList = theList1;
+        })
+        this.headerList = theList1
       } else if (!e && id == 0) {
         this.menuList.forEach((item) => {
-          this.$set(item, "checked", false);
-        });
-        const theList2 = [];
+          this.$set(item, 'checked', false)
+        })
+        const theList2 = []
         this.menuList.forEach((ele) => {
           if (ele.checked) {
-            theList2.push(ele);
+            theList2.push(ele)
           }
-        });
-        this.headerList = theList2;
+        })
+        this.headerList = theList2
       } else {
-        const theList = [];
+        const theList = []
         this.menuList.forEach((ele) => {
           if (ele.id != 0 && ele.checked) {
-            theList.push(ele);
+            theList.push(ele)
           }
-        });
-        this.headerList = theList;
+        })
+        this.headerList = theList
       }
     },
-    //下载模板
+    // 下载模板
     importTemplate() {
       this.download(
-        "/member/manager/member-achieve-log/download",
+        '/member/manager/member-achieve-log/download',
         {},
         `${'模板'}${new Date().getTime()}.xlsx`
-      );
+      )
     },
     getDataList() {
-      //根据选中的会员查询会员业绩
+      // 根据选中的会员查询会员业绩
       spe
         .getAchieveSearchList({
-          memberCode: this.form.memberCode,
+          memberCode: this.form.memberCode
         })
         .then((res) => {
-          this.waterPvList = res.data;
-        });
+          this.waterPvList = res.data
+        })
     },
     getOther() {
       getAwardsListChiose().then((res) => {
-        this.awardsList = res.rows;
-      });
+        this.awardsList = res.rows
+      })
       // 获取隶属体系
       api.vertexList().then((res) => {
-        this.verList = res.data;
-      });
+        this.verList = res.data
+      })
       // 获取隶属团队
       api.memberTeam().then((res) => {
-        this.memberList = res.rows;
-      });
+        this.memberList = res.rows
+      })
       spe.getEmusBatchType().then((res) => {
-        this.cztypeList = res.data;
-      });
+        this.cztypeList = res.data
+      })
       spe.getMemberAchieve().then((res) => {
-        this.waterTypeList = res.data;
+        this.waterTypeList = res.data
         this.waterTypeList.forEach((ele) => {
           {
-            this.form.waterTypeList.push(ele.value);
+            this.form.waterTypeList.push(ele.value)
           }
-        });
-        this.changeAccountType();
-      });
+        })
+        this.changeAccountType()
+      })
       spe.getMemberWaterType().then((res) => {
-        this.waterWayList = res.data;
-      });
+        this.waterWayList = res.data
+      })
       spe.getWaterStatus().then((res) => {
-        this.waterStatusList = res.data;
-      });
+        this.waterStatusList = res.data
+      })
     },
-    //根据会员编号查询会员姓名
+    // 根据会员编号查询会员姓名
     checkName() {
       getMemberName({ memberCode: this.form.memberCode }).then((res) => {
-        this.form.memberName = res.memberName;
-      });
+        this.form.memberName = res.memberName
+      })
     },
     changeAccountType() {
-      var titles = [];
+      var titles = []
       if (this.form.waterTypeList.length > 0) {
         this.form.waterTypeList.forEach((ele) => {
           this.waterTypeList.forEach((item) => {
@@ -992,23 +954,23 @@ export default {
               titles.push({
                 value: item.value,
                 label: item.label,
-                field: item.field,
-              });
-              this.tableTitleList = titles;
+                field: item.field
+              })
+              this.tableTitleList = titles
             }
-          });
-        });
+          })
+        })
       } else {
-        this.tableTitleList = [];
+        this.tableTitleList = []
       }
 
-      this.tableTitleList = titles;
+      this.tableTitleList = titles
 
-      this.$forceUpdate();
+      this.$forceUpdate()
     },
     saveDate(index) {
       if (index == 0) {
-        this.updateShow = false;
+        this.updateShow = false
         // this.$router.go(-1);
       } else if (index == 2 || index == 4) {
         // 免付和确认走签呈
@@ -1016,81 +978,81 @@ export default {
           .saveInfusingWater({
             infusingWaterType: this.form.infusingWaterType,
             cmalvList: this.waterPvList,
-            processType: index,
+            processType: index
           })
           .then((res) => {
             if (res.code == 200) {
               this.$router.push({
-                path: "waterZxqc",
+                path: 'waterZxqc',
                 query: {
                   data: JSON.stringify(res.data),
                   index: index,
-                  businessType: 123,
-                },
-              });
+                  businessType: 123
+                }
+              })
             } else if (res.code == 504 && res.data) {
-              this.errorShow = true;
-              this.errorData = res.data;
+              this.errorShow = true
+              this.errorData = res.data
             }
-          });
+          })
       } else {
         spe
           .saveInfusingWater({
             infusingWaterType: this.form.infusingWaterType,
             cmalvList: this.waterPvList,
-            processType: index,
+            processType: index
           })
           .then((res) => {
             if (res.code == 200) {
               this.$message({
                 message: res.msg,
-                type: "success",
-              });
-              this.updateShow = false;
-              this.getSearch();
+                type: 'success'
+              })
+              this.updateShow = false
+              this.getSearch()
             } else if (res.code == 504 && res.data) {
-              this.errorShow = true;
-              this.errorData = res.data;
+              this.errorShow = true
+              this.errorData = res.data
             }
-          });
+          })
       }
     },
     reset() {
-      this.form.memberCode = "";
-      this.form.memberName = "";
-      this.getDataList();
+      this.form.memberCode = ''
+      this.form.memberName = ''
+      this.getDataList()
     },
     getPubEnumsProcessTyepe() {
       getPubEnumsProcessTyepe().then((res) => {
-        this.processTypeList = res.data;
-      });
+        this.processTypeList = res.data
+      })
     },
 
     handleDelete(row, index, rows) {
       this.$confirm('是否删除').then((_) => {
-        rows.splice(index, 1);
-      });
+        rows.splice(index, 1)
+      })
     },
     getSearch() {
       this.loading = true
-      spe.getMmeberAchieveList(this.queryParams).then((res) => {  
+      spe.getMmeberAchieveList(this.queryParams).then((res) => {
         this.loading = false
-        this.tableData = res.rows;
-        this.total = res.total;
-      });
+        this.tableData = res.rows
+        this.total = res.total
+      })
     },
     reChongzhi() {
       this.queryParams = {
         pageNum: 1,
         pageSize: 50,
-        memberCode: "",
-        memberName: "",
-        startDate: "",
-        endtDate: "",
-      };
-      this.zsDate = "";
-      this.jsDate=""
-      this.getSearch();
+        memberCode: '',
+        memberName: '',
+        startDate: '',
+        endtDate: ''
+      }
+      this.zsDate = ''
+      this.jsDate = ''
+      this.getSearch()
     },
     updateCode() {
       // if (this.idList.length > 0) {
@@ -1098,46 +1060,46 @@ export default {
       //     this.waterPvList = res.data;
       //   });
       // }
-      this.updateShow = true;
+      this.updateShow = true
     },
 
     /** 导入按钮操作 */
     handleImport() {
-      this.upload.title = '安置架构';
-      this.upload.open = true;
+      this.upload.title = '安置架构'
+      this.upload.open = true
     },
     // 文件上传中处理
     handleFileUploadProgress(event, file, fileList) {
-      this.upload.isUploading = true;
+      this.upload.isUploading = true
     },
     // 文件上传成功处理
     handleFileSuccess(response, file, fileList) {
-      var fileName = response.fileName;
-      if (fileName != undefined && fileName != "") {
+      var fileName = response.fileName
+      if (fileName != undefined && fileName != '') {
       }
       if (response.code == 200) {
-        this.waterPvList = response.data;
+        this.waterPvList = response.data
       }
 
-      this.upload.open = false;
-      this.upload.isUploading = false;
-      this.$refs.upload.clearFiles();
+      this.upload.open = false
+      this.upload.isUploading = false
+      this.$refs.upload.clearFiles()
       this.$alert(response.msg, '导入结果', {
-        dangerouslyUseHTMLString: true,
-      });
+        dangerouslyUseHTMLString: true
+      })
       // this.getList();
     },
     // 上传文件数量超出后的动作
     handleExceed() {
-      this.upload.isUploading = false;
-      this.msgInfo('仅可上传一个文件哦');
+      this.upload.isUploading = false
+      this.msgInfo('仅可上传一个文件哦')
     },
     // 提交上传文件
     submitFileForm() {
-      this.$refs.upload.submit();
-    },
-  },
-};
+      this.$refs.upload.submit()
+    }
+  }
+}
 </script>
 
   <style lang="scss" scoped>

From af8ea2b77b897b79ad811ba368c24e153fe9178a Mon Sep 17 00:00:00 2001
From: woody <woody@gmail.com>
Date: Fri, 16 May 2025 09:29:59 +0800
Subject: [PATCH 07/22] =?UTF-8?q?feat(waterPv):=20=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=E6=B3=A8=E6=B0=B4=E4=B8=9A=E7=BB=A9=E5=8A=A8=E6=80=81=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5=E4=B8=8D=E9=80=89=E6=97=B6=E8=AF=B7=E6=B1=82=E4=B9=9F?=
 =?UTF-8?q?=E4=BC=9A=E6=90=BA=E5=B8=A6=E8=AF=A5=E5=AD=97=E6=AE=B5=E7=9A=84?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../information/specialBusiness/waterPv.vue      | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/src/views/information/specialBusiness/waterPv.vue b/src/views/information/specialBusiness/waterPv.vue
index 1bf6c07..12ce028 100644
--- a/src/views/information/specialBusiness/waterPv.vue
+++ b/src/views/information/specialBusiness/waterPv.vue
@@ -814,7 +814,7 @@ export default {
         }
       } else {
         this.$message({
-          message: '请先填写注水业绩',
+          message: '请先选择注水方式',
           type: 'warning'
         })
         this.waterPvList.forEach((ele, index) => {
@@ -974,6 +974,7 @@ export default {
         // this.$router.go(-1);
       } else if (index == 2 || index == 4) {
         // 免付和确认走签呈
+
         spe
           .saveInfusingWater({
             infusingWaterType: this.form.infusingWaterType,
@@ -996,10 +997,21 @@ export default {
             }
           })
       } else {
+        const unSelectedField = this.waterTypeList.filter((item) =>
+          !this.form.waterTypeList.includes(item.value)
+        ).map(item => item.field)
+        const waterPvList = this.waterPvList.map(item => {
+          const newItem = { ...item }
+          unSelectedField.forEach(field => {
+            delete newItem[field]
+          })
+          return newItem
+        })
+
         spe
           .saveInfusingWater({
             infusingWaterType: this.form.infusingWaterType,
-            cmalvList: this.waterPvList,
+            cmalvList: waterPvList,
             processType: index
           })
           .then((res) => {

From d6b95e35750391ec3dfb94dd09882bfa6b8ab8a2 Mon Sep 17 00:00:00 2001
From: woody <woody@gmail.com>
Date: Fri, 16 May 2025 09:39:17 +0800
Subject: [PATCH 08/22] =?UTF-8?q?feat(waterPv):=20=E6=B3=A8=E6=B0=B4?=
 =?UTF-8?q?=E4=B8=9A=E7=BB=A9=E8=87=B3=E5=B0=91=E9=80=89=E6=8B=A9=E4=B8=80?=
 =?UTF-8?q?=E4=B8=AA=E6=B3=A8=E6=B0=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/information/specialBusiness/waterPv.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/information/specialBusiness/waterPv.vue b/src/views/information/specialBusiness/waterPv.vue
index 12ce028..98af2f8 100644
--- a/src/views/information/specialBusiness/waterPv.vue
+++ b/src/views/information/specialBusiness/waterPv.vue
@@ -323,7 +323,7 @@
 
           <div class="tableBox" style="padding: 0">
             <el-form-item :label="'业务类型'">
-              <el-checkbox-group v-model="form.waterTypeList">
+              <el-checkbox-group v-model="form.waterTypeList" :min="1">
                 <el-checkbox
                   v-for="item in waterTypeList"
                   :key="item.value"

From 67b71d8418a01abc23e21ea49f550188246ad83d Mon Sep 17 00:00:00 2001
From: woody <woody@gmail.com>
Date: Fri, 16 May 2025 13:36:49 +0800
Subject: [PATCH 09/22] =?UTF-8?q?feat(rigiestList):=20=E7=A9=BA=E5=8D=95?=
 =?UTF-8?q?=E6=B3=A8=E5=86=8C=E6=B3=A8=E5=86=8C=E5=88=97=E8=A1=A8=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E6=B3=A8=E5=86=8C=E6=97=A5=E6=9C=9F=E5=88=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../specialBusiness/emptyOrder/rigiestList.vue       | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/views/information/specialBusiness/emptyOrder/rigiestList.vue b/src/views/information/specialBusiness/emptyOrder/rigiestList.vue
index 6fc443d..f4117da 100644
--- a/src/views/information/specialBusiness/emptyOrder/rigiestList.vue
+++ b/src/views/information/specialBusiness/emptyOrder/rigiestList.vue
@@ -219,18 +219,21 @@
           <el-table-column
             align="center"
             prop="creationTime"
+            label="注册日期"
+            min-width="160"
+          />
+          <el-table-column
+            align="center"
             label="选购产品"
             min-width="200"
             show-overflow-tooltip
           />
           <el-table-column
             align="center"
-            prop="creationTime"
             label="产品规格"
           />
           <el-table-column
             align="center"
-            prop="creationTime"
             label="产品数量"
           />
           <el-table-column
@@ -352,6 +355,11 @@ export default {
       this.select = {}
       this.creationTime = []
       this.creationTime1 = []
+      this.queryParams = {
+        pageNum: 1,
+        pageSize: 50
+      }
+      this.getDataList()
     },
     changeTime(val) {
       this.select.startDate = val ? val[0] : ''

From 4160d08a28616a5586d8ef8a441dfb0d944b08ce Mon Sep 17 00:00:00 2001
From: woody <woody@gmail.com>
Date: Fri, 16 May 2025 15:26:06 +0800
Subject: [PATCH 10/22] =?UTF-8?q?fix(emptyOrder):=20=E7=A9=BA=E5=8D=95?=
 =?UTF-8?q?=E6=B3=A8=E5=86=8C=E9=80=89=E8=B4=AD=E4=BA=A7=E5=93=81=E7=9B=B8?=
 =?UTF-8?q?=E5=85=B3bug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../specialBusiness/emptyOrder/index.vue      |  7 +++
 .../emptyOrder/rigiestList.vue                | 43 ++++++++++++++++---
 2 files changed, 44 insertions(+), 6 deletions(-)

diff --git a/src/views/information/specialBusiness/emptyOrder/index.vue b/src/views/information/specialBusiness/emptyOrder/index.vue
index 7ba0dbb..d523d1b 100644
--- a/src/views/information/specialBusiness/emptyOrder/index.vue
+++ b/src/views/information/specialBusiness/emptyOrder/index.vue
@@ -1451,6 +1451,13 @@ export default {
         })
         return false
       } else {
+        if (!this.selectData.selSkuNameList || !this.selectData.selSkuList) {
+          this.$message({
+            message: '请产品选择规格',
+            type: 'warning'
+          })
+          return false
+        }
         const obj = {
           pkProduct: this.selectData.pkId,
           productCode: this.selectData.productCode,
diff --git a/src/views/information/specialBusiness/emptyOrder/rigiestList.vue b/src/views/information/specialBusiness/emptyOrder/rigiestList.vue
index f4117da..03d255d 100644
--- a/src/views/information/specialBusiness/emptyOrder/rigiestList.vue
+++ b/src/views/information/specialBusiness/emptyOrder/rigiestList.vue
@@ -226,16 +226,47 @@
             align="center"
             label="选购产品"
             min-width="200"
-            show-overflow-tooltip
-          />
+          >
+            <template slot-scope="scope">
+              <div v-for="(item,idx) in scope.row.detailList || []" :key="idx">
+                <el-tooltip :content="item.productName" placement="top" :disabled="!item.productName || item.productName.length < 15">
+                  <div style="overflow: hidden; text-overflow: ellipsis; white-space: nowrap;">
+                    {{ item.productName }}
+                  </div>
+                </el-tooltip>
+              </div>
+            </template>
+          </el-table-column>
           <el-table-column
             align="center"
             label="产品规格"
-          />
+            min-width="180"
+          >
+            <template slot-scope="scope">
+              <div v-for="(item,idx) in scope.row.detailList || []" :key="idx">
+                <el-tooltip :content="item.specsName" placement="top" :disabled="!item.specsName || item.specsName.length < 10">
+                  <div style="overflow: hidden; text-overflow: ellipsis; white-space: nowrap;">
+                    {{ item.specsName }}
+                  </div>
+                </el-tooltip>
+              </div>
+            </template>
+          </el-table-column>
           <el-table-column
             align="center"
             label="产品数量"
-          />
+            min-width="180"
+          >
+            <template slot-scope="scope">
+              <div v-for="(item,idx) in scope.row.detailList || []" :key="idx">
+                <el-tooltip :content="String(item.quantity)" placement="top" :disabled="String(item.quantity).length < 5">
+                  <div style="overflow: hidden; text-overflow: ellipsis; white-space: nowrap;">
+                    {{ item.quantity }}
+                  </div>
+                </el-tooltip>
+              </div>
+            </template>
+          </el-table-column>
           <el-table-column
             align="center"
             prop="recName"
@@ -443,9 +474,9 @@ export default {
       })
     },
     tableRowClassName({ row, rowIndex }) {
-      if (rowIndex % 2 == 1) {
+      if (rowIndex % 2 === 1) {
         return 'warning-row'
-      } else if (rowIndex % 2 == 0) {
+      } else if (rowIndex % 2 === 0) {
         return 'success-row'
       }
       return ''

From cc3ddf7ed5f0d89696b1dfe5f5429a3b02bfd483 Mon Sep 17 00:00:00 2001
From: woody <woody@gmail.com>
Date: Mon, 19 May 2025 09:19:21 +0800
Subject: [PATCH 11/22] =?UTF-8?q?feat(goodsRelease):=20=E5=95=86=E5=93=81?=
 =?UTF-8?q?=E5=8F=91=E5=B8=83=E5=8F=8A=E4=BF=AE=E6=94=B9=E8=A1=A8=E5=8D=95?=
 =?UTF-8?q?=E6=A0=A1=E9=AA=8C=E9=80=BB=E8=BE=91=E8=B0=83=E6=95=B4=EF=BC=8C?=
 =?UTF-8?q?=E5=9B=BE=E7=89=87=E5=8F=8A=E8=A7=86=E9=A2=91=E5=8F=AA=E9=9C=80?=
 =?UTF-8?q?=E9=9D=9E=E5=BF=85=E4=BC=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../goodsManage/goodsList/goodsEdit/jcsz.vue  | 1236 ++++++++++-------
 src/views/goodsManage/goodsList/index.vue     |    3 +-
 src/views/goodsManage/goodsRelease/jcsz.vue   |   38 +-
 3 files changed, 747 insertions(+), 530 deletions(-)

diff --git a/src/views/goodsManage/goodsList/goodsEdit/jcsz.vue b/src/views/goodsManage/goodsList/goodsEdit/jcsz.vue
index 14f6dc9..7e724e4 100644
--- a/src/views/goodsManage/goodsList/goodsEdit/jcsz.vue
+++ b/src/views/goodsManage/goodsList/goodsEdit/jcsz.vue
@@ -7,76 +7,106 @@
 <template>
   <div class="page">
     <div class="topbox">
-      <div class="levelList_i"
-           :class="tabActive == item.id ? 'act' : ''"
-           v-for="(item, index) in topList"
-           :key="index"
-           @click.prevent="handleLink(item.id)">
+      <div
+        v-for="(item, index) in topList"
+        :key="index"
+        class="levelList_i"
+        :class="tabActive == item.id ? 'act' : ''"
+        @click.prevent="handleLink(item.id)"
+      >
         {{ item.name }}
       </div>
     </div>
     <div class="main">
-      <div class="contain"
-           ref="box">
+      <div
+        ref="box"
+        class="contain"
+      >
         <div v-show="tabActive == 0">
-          <el-form ref="form"
-                   :model="form"
-                   :rules="rules"
-                   style="width:1200px"
-                   label-width="100px">
+          <el-form
+            ref="form"
+            :model="form"
+            :rules="rules"
+            style="width:1200px"
+            label-width="100px"
+          >
             <el-row :gutter="40">
               <el-col :span="16">
-                <el-form-item :label="'商品名称'"
-                              prop="waresName">
-                  <el-input clearable
-                            :disabled="methods==0"
-                            maxlength="100"
-                            v-model="form.waresName"
-                            :placeholder="'请输入'"></el-input>
+                <el-form-item
+                  :label="'商品名称'"
+                  prop="waresName"
+                >
+                  <el-input
+                    v-model="form.waresName"
+                    clearable
+                    :disabled="methods==0"
+                    maxlength="100"
+                    :placeholder="'请输入'"
+                  />
                 </el-form-item>
               </el-col>
               <el-col :span="8">
-                <el-form-item :label="'商品编码'"
-                              prop="waresCode">
-                  <el-input v-model="form.waresCode"
-                            :placeholder="'请输入'"></el-input>
+                <el-form-item
+                  :label="'商品编码'"
+                  prop="waresCode"
+                >
+                  <el-input
+                    v-model="form.waresCode"
+                    :placeholder="'请输入'"
+                  />
                 </el-form-item>
               </el-col>
               <el-col :span="16">
-                <el-form-item :label="'商品卖点'"
-                              prop="sellingPoints">
-                  <el-input clearable
-                            :disabled="methods==0"
-                            v-model="form.sellingPoints"
-                            :placeholder="'请输入'"></el-input>
+                <el-form-item
+                  :label="'商品卖点'"
+                  prop="sellingPoints"
+                >
+                  <el-input
+                    v-model="form.sellingPoints"
+                    clearable
+                    :disabled="methods==0"
+                    :placeholder="'请输入'"
+                  />
                 </el-form-item>
               </el-col>
               <el-col :span="8">
-                <el-form-item :label="'虚拟销量'"
-                              prop="sales">
-                  <el-input clearable
-                            :disabled="methods==0"
-                            oninput="value=value.replace(/[^\d]/g,'')"
-                            v-model="form.sales"
-                            :placeholder="'请输入'"></el-input>
+                <el-form-item
+                  :label="'虚拟销量'"
+                  prop="sales"
+                >
+                  <el-input
+                    v-model="form.sales"
+                    clearable
+                    :disabled="methods==0"
+                    oninput="value=value.replace(/[^\d]/g,'')"
+                    :placeholder="'请输入'"
+                  />
                 </el-form-item>
               </el-col>
               <el-col :span="8">
-                <el-form-item :label="'商品价格'"
-                              prop="waresPrice">
-                  <el-input clearable
-                            :disabled="methods==0"
-                            v-model="form.waresPrice"
-                            :placeholder="'请输入'"></el-input>
+                <el-form-item
+                  :label="'商品价格'"
+                  prop="waresPrice"
+                >
+                  <el-input
+                    v-model="form.waresPrice"
+                    clearable
+                    :disabled="methods==0"
+                    :placeholder="'请输入'"
+                  />
                 </el-form-item>
               </el-col>
               <el-col :span="8">
-                <el-form-item :label="'商品业绩'+`(${isLocals()})`"
-                              prop="waresAchieve">
-                  <el-input clearable
-                            :disabled="methods==0"
-                            v-model="form.waresAchieve"
-                            :placeholder="'请输入'"></el-input>
+                <el-form-item
+                  :label="'商品业绩'+`(${isLocals()})`"
+                  prop="waresAchieve"
+                >
+                  <el-input
+                    v-model="form.waresAchieve"
+                    clearable
+                    :disabled="methods==0"
+                    :placeholder="'请输入'"
+                  />
                 </el-form-item>
               </el-col>
               <!-- <el-col :span="8">
@@ -90,279 +120,389 @@
                 </el-form-item>
               </el-col> -->
               <el-col :span="8">
-                <el-form-item :label="'所属专区'"
-                              prop="specialArea">
-                  <el-select clearable
-                             :disabled="methods==0"
-                             @change="selSpecial"
-                             v-model="form.specialArea">
-                    <el-option v-for="item in areaList"
-                               :key="item.value"
-                               :label="item.label"
-                               :value="item.value"></el-option>
+                <el-form-item
+                  :label="'所属专区'"
+                  prop="specialArea"
+                >
+                  <el-select
+                    v-model="form.specialArea"
+                    clearable
+                    :disabled="methods==0"
+                    @change="selSpecial"
+                  >
+                    <el-option
+                      v-for="item in areaList"
+                      :key="item.value"
+                      :label="item.label"
+                      :value="item.value"
+                    />
                   </el-select>
                 </el-form-item>
               </el-col>
               <el-col :span="8">
-                <el-form-item :label="'商品分类'"
-                              prop="pkAreaClassifys">
+                <el-form-item
+                  :label="'商品分类'"
+                  prop="pkAreaClassifys"
+                >
                   <!-- <el-select clearable  v-model="form.pkAreaClassify">
                         <el-option v-for="item in agreeList"
                                    :key="item.val"
                                    :label="item.text"
                                    :value="item.val"></el-option>
                       </el-select> -->
-                  <el-cascader @change="flChange"
-                               :disabled="methods==0"
-                               :show-all-levels="false"
-                               v-model="form.pkAreaClassifys"
-                               :options="hierarchyList"></el-cascader>
+                  <el-cascader
+                    v-model="form.pkAreaClassifys"
+                    :disabled="methods==0"
+                    :show-all-levels="false"
+                    :options="hierarchyList"
+                    @change="flChange"
+                  />
                 </el-form-item>
               </el-col>
 
               <el-col :span="8">
-                <el-form-item :label="'上架状态'"
-                              prop="isPutOn">
-                  <el-select clearable
-                             :disabled="methods==0"
-                             v-model="form.isPutOn">
-                    <el-option v-for="item in agreeList"
-                               :key="item.val"
-                               :label="item.text"
-                               :value="item.val"></el-option>
+                <el-form-item
+                  :label="'上架状态'"
+                  prop="isPutOn"
+                >
+                  <el-select
+                    v-model="form.isPutOn"
+                    clearable
+                    :disabled="methods==0"
+                  >
+                    <el-option
+                      v-for="item in agreeList"
+                      :key="item.val"
+                      :label="item.text"
+                      :value="item.val"
+                    />
                   </el-select>
                 </el-form-item>
               </el-col>
               <el-col :span="8">
-                <el-form-item :label="'预售状态'"
-                              prop="preSaleStatus">
-                  <el-select clearable
-                             :disabled="methods==0"
-                             v-model="form.preSaleStatus">
-                    <el-option v-for="item in presaleList"
-                               :key="item.value"
-                               :label="item.label"
-                               :value="item.value"></el-option>
+                <el-form-item
+                  :label="'预售状态'"
+                  prop="preSaleStatus"
+                >
+                  <el-select
+                    v-model="form.preSaleStatus"
+                    clearable
+                    :disabled="methods==0"
+                  >
+                    <el-option
+                      v-for="item in presaleList"
+                      :key="item.value"
+                      :label="item.label"
+                      :value="item.value"
+                    />
                   </el-select>
                 </el-form-item>
               </el-col>
               <el-col :span="8">
-                <el-form-item :label="'供应方式'"
-                              prop="operateScope">
-                  <el-select clearable
-                             :disabled="methods==0"
-                             v-model="form.operateScope">
-                    <el-option v-for="item in gyList"
-                               :key="item.value"
-                               :label="item.label"
-                               :value="item.value"></el-option>
+                <el-form-item
+                  :label="'供应方式'"
+                  prop="operateScope"
+                >
+                  <el-select
+                    v-model="form.operateScope"
+                    clearable
+                    :disabled="methods==0"
+                  >
+                    <el-option
+                      v-for="item in gyList"
+                      :key="item.value"
+                      :label="item.label"
+                      :value="item.value"
+                    />
                   </el-select>
                 </el-form-item>
               </el-col>
               <el-col :span="8">
-                <el-form-item :label="'销售状态'"
-                              prop="isSale">
-                  <el-select clearable
-                             :disabled="methods==0"
-                             v-model="form.isSale">
-                    <el-option v-for="item in xsList"
-                               :key="item.val"
-                               :label="item.text"
-                               :value="item.val"></el-option>
+                <el-form-item
+                  :label="'销售状态'"
+                  prop="isSale"
+                >
+                  <el-select
+                    v-model="form.isSale"
+                    clearable
+                    :disabled="methods==0"
+                  >
+                    <el-option
+                      v-for="item in xsList"
+                      :key="item.val"
+                      :label="item.text"
+                      :value="item.val"
+                    />
                   </el-select>
                 </el-form-item>
               </el-col>
               <el-col :span="8">
-                <el-form-item :label="'套餐类型'"
-                              prop="isSingle">
-                  <el-select clearable
-                             :disabled="methods==0"
-                             v-model="form.isSingle">
-                    <el-option v-for="item in tcList"
-                               :key="item.val"
-                               :label="item.text"
-                               :value="item.val"></el-option>
+                <el-form-item
+                  :label="'套餐类型'"
+                  prop="isSingle"
+                >
+                  <el-select
+                    v-model="form.isSingle"
+                    clearable
+                    :disabled="methods==0"
+                  >
+                    <el-option
+                      v-for="item in tcList"
+                      :key="item.val"
+                      :label="item.text"
+                      :value="item.val"
+                    />
                   </el-select>
                 </el-form-item>
               </el-col>
               <el-col :span="8">
                 <el-form-item :label="'是否推荐'">
-                  <el-select clearable
-                             :disabled="methods==0"
-                             v-model="form.isRecommend">
-                    <el-option v-for="item in isTj"
-                               :key="item.value"
-                               :label="item.label"
-                               :value="item.value"></el-option>
+                  <el-select
+                    v-model="form.isRecommend"
+                    clearable
+                    :disabled="methods==0"
+                  >
+                    <el-option
+                      v-for="item in isTj"
+                      :key="item.value"
+                      :label="item.label"
+                      :value="item.value"
+                    />
                   </el-select>
                 </el-form-item>
               </el-col>
               <el-col :span="8">
                 <el-form-item :label="'前缀标签'">
-                  <el-select clearable
-                             :disabled="methods==0"
-                             v-model="form.pkPrefixLabel">
-                    <el-option v-for="item in qzList"
-                               :key="item.pkId"
-                               :label="item.label"
-                               :value="item.pkId"></el-option>
+                  <el-select
+                    v-model="form.pkPrefixLabel"
+                    clearable
+                    :disabled="methods==0"
+                  >
+                    <el-option
+                      v-for="item in qzList"
+                      :key="item.pkId"
+                      :label="item.label"
+                      :value="item.pkId"
+                    />
                   </el-select>
                 </el-form-item>
               </el-col>
               <el-col :span="8">
                 <el-form-item :label="'炫酷标签'">
-                  <el-select clearable
-                             :disabled="methods==0"
-                             v-model="form.pkCoolLabel">
-                    <el-option v-for="item in kxList"
-                               :key="item.pkId"
-                               :label="item.label"
-                               :value="item.pkId"></el-option>
+                  <el-select
+                    v-model="form.pkCoolLabel"
+                    clearable
+                    :disabled="methods==0"
+                  >
+                    <el-option
+                      v-for="item in kxList"
+                      :key="item.pkId"
+                      :label="item.label"
+                      :value="item.pkId"
+                    />
                   </el-select>
                 </el-form-item>
               </el-col>
               <el-col :span="8">
-                <el-form-item :label="'商品类型'
-">
-                  <el-select clearable
-                             v-model="form.isMakerGift">
-                    <el-option v-for="item in waresTypeList"
-                               :key="item.value"
-                               :label="item.label"
-                               :value="item.value"></el-option>
+                <el-form-item
+                  :label="'商品类型'
+                  "
+                >
+                  <el-select
+                    v-model="form.isMakerGift"
+                    clearable
+                  >
+                    <el-option
+                      v-for="item in waresTypeList"
+                      :key="item.value"
+                      :label="item.label"
+                      :value="item.value"
+                    />
                   </el-select>
                 </el-form-item>
               </el-col>
               <el-col :span="8">
                 <el-form-item label="支付比例">
-                  <el-select clearable
-                             v-model="form.pkSpecialCurrency">
-                    <el-option v-for="item in specialCurrency"
-                               :key="item.pkId"
-                               :label="item.tempName"
-                               :value="item.pkId"></el-option>
+                  <el-select
+                    v-model="form.pkSpecialCurrency"
+                    clearable
+                  >
+                    <el-option
+                      v-for="item in specialCurrency"
+                      :key="item.pkId"
+                      :label="item.tempName"
+                      :value="item.pkId"
+                    />
                   </el-select>
                 </el-form-item>
               </el-col>
               <el-col :span="8">
                 <el-form-item label="是否预售">
-                  <el-select clearable
-                             v-model="form.isPreSale">
-                    <el-option v-for="item in agreeList"
-                               :key="item.val"
-                               :label="item.text"
-                               :value="item.val"></el-option>
+                  <el-select
+                    v-model="form.isPreSale"
+                    clearable
+                  >
+                    <el-option
+                      v-for="item in agreeList"
+                      :key="item.val"
+                      :label="item.text"
+                      :value="item.val"
+                    />
                   </el-select>
                 </el-form-item>
               </el-col>
               <el-col :span="8">
                 <el-form-item label="预售数量">
-                  <el-input clearable
-                            v-model="form.preSaleQuantity"
-                            :placeholder="'请输入'"></el-input>
+                  <el-input
+                    v-model="form.preSaleQuantity"
+                    clearable
+                    :placeholder="'请输入'"
+                  />
                 </el-form-item>
               </el-col>
               <el-col :span="8">
                 <el-form-item label="商品排序" prop="sortStatus">
-                  <el-select clearable
-                             v-model="form.sortStatus">
-                    <el-option v-for="item in sortList"
-                               :key="item.value"
-                               :label="item.label"
-                               :value="item.value"></el-option>
+                  <el-select
+                    v-model="form.sortStatus"
+                    clearable
+                  >
+                    <el-option
+                      v-for="item in sortList"
+                      :key="item.value"
+                      :label="item.label"
+                      :value="item.value"
+                    />
                   </el-select>
                 </el-form-item>
               </el-col>
-              <el-col :span="8" v-show="form.specialArea == 3">
+              <el-col v-show="form.specialArea == 3" :span="8">
                 <el-form-item label="发起人收益">
-                  <el-input clearable
-                            v-model="form.makerIncome"
-                            :placeholder="'请输入'"></el-input>
+                  <el-input
+                    v-model="form.makerIncome"
+                    clearable
+                    :placeholder="'请输入'"
+                  />
                 </el-form-item>
               </el-col>
               <el-col :span="24">
                 <el-form-item :label="'保证标签'">
-                  <el-checkbox-group v-model="form.pkGuaranteeLabel"
-                                     :disabled="methods==0">
-                    <el-checkbox v-for="item,index in bzList"
-                                 :key="item.pkId"
-                                 :label="item.pkId">{{item.label}}</el-checkbox>
+                  <el-checkbox-group
+                    v-model="form.pkGuaranteeLabel"
+                    :disabled="methods==0"
+                  >
+                    <el-checkbox
+                      v-for="item,index in bzList"
+                      :key="item.pkId"
+                      :label="item.pkId"
+                    >{{ item.label }}</el-checkbox>
                   </el-checkbox-group>
                 </el-form-item>
               </el-col>
               <el-col :span="8">
                 <el-form-item :label="'卖点标签'">
-                  <el-select clearable
-                             :disabled="methods==0"
-                             multiple
-                             v-model="form.pkSellingPoint">
-                    <el-option v-for="item in mdList"
-                               @change="mdChange"
-                               :key="item.pkId"
-                               :label="item.label"
-                               :value="item.pkId"></el-option>
+                  <el-select
+                    v-model="form.pkSellingPoint"
+                    clearable
+                    :disabled="methods==0"
+                    multiple
+                  >
+                    <el-option
+                      v-for="item in mdList"
+                      :key="item.pkId"
+                      :label="item.label"
+                      :value="item.pkId"
+                      @change="mdChange"
+                    />
                   </el-select>
                 </el-form-item>
               </el-col>
               <el-col :span="8">
                 <el-form-item :label="'补充协议'">
-                  <el-select clearable
-                             :disabled="methods==0"
-                             v-model="form.pkAgreement">
-                    <el-option v-for="item in agreementList"
-                               :key="item.pkId"
-                               :label="item.title"
-                               :value="item.pkId"></el-option>
+                  <el-select
+                    v-model="form.pkAgreement"
+                    clearable
+                    :disabled="methods==0"
+                  >
+                    <el-option
+                      v-for="item in agreementList"
+                      :key="item.pkId"
+                      :label="item.title"
+                      :value="item.pkId"
+                    />
                   </el-select>
                 </el-form-item>
               </el-col>
               <el-col :span="8">
-                <el-form-item :label="'包邮类型'"
-                              prop="isFreeMail">
-                  <el-select clearable
-                             :disabled="methods==0"
-                             v-model="form.isFreeMail">
-                    <el-option v-for="item in postList"
-                               :key="item.val"
-                               :label="item.text"
-                               :value="item.val"></el-option>
+                <el-form-item
+                  :label="'包邮类型'"
+                  prop="isFreeMail"
+                >
+                  <el-select
+                    v-model="form.isFreeMail"
+                    clearable
+                    :disabled="methods==0"
+                  >
+                    <el-option
+                      v-for="item in postList"
+                      :key="item.val"
+                      :label="item.text"
+                      :value="item.val"
+                    />
                   </el-select>
                 </el-form-item>
-                <div v-show="form.isFreeMail == 1"
-                     class="baoyou">
-                  <el-checkbox-group v-model="form.checkList"
-                                     @change="getTrans"
-                                     :disabled="methods==0">
-                    <el-checkbox v-for="item,index in transportTypeList"
-                                 :key="item.value"
-                                 :label="item.value">
-                      <div>{{item.label}}</div>
-                      <el-select clearable
-                                 :disabled="methods==0"
-                                 v-show="item.value == 1"
-                                 v-model="form.pkLandPostage">
-                        <el-option v-for="item in postMoneyList1"
-                                   :key="item.pkId"
-                                   :label="item.tempName"
-                                   :value="item.pkId"></el-option>
+                <div
+                  v-show="form.isFreeMail == 1"
+                  class="baoyou"
+                >
+                  <el-checkbox-group
+                    v-model="form.checkList"
+                    :disabled="methods==0"
+                    @change="getTrans"
+                  >
+                    <el-checkbox
+                      v-for="item,index in transportTypeList"
+                      :key="item.value"
+                      :label="item.value"
+                    >
+                      <div>{{ item.label }}</div>
+                      <el-select
+                        v-show="item.value == 1"
+                        v-model="form.pkLandPostage"
+                        clearable
+                        :disabled="methods==0"
+                      >
+                        <el-option
+                          v-for="item in postMoneyList1"
+                          :key="item.pkId"
+                          :label="item.tempName"
+                          :value="item.pkId"
+                        />
                       </el-select>
-                      <el-select clearable
-                                 :disabled="methods==0"
-                                 v-show="item.value == 2"
-                                 v-model="form.pkAirPostage">
-                        <el-option v-for="item in postMoneyList2"
-                                   :key="item.pkId"
-                                   :label="item.tempName"
-                                   :value="item.pkId"></el-option>
+                      <el-select
+                        v-show="item.value == 2"
+                        v-model="form.pkAirPostage"
+                        clearable
+                        :disabled="methods==0"
+                      >
+                        <el-option
+                          v-for="item in postMoneyList2"
+                          :key="item.pkId"
+                          :label="item.tempName"
+                          :value="item.pkId"
+                        />
                       </el-select>
-                      <el-select clearable
-                                 :disabled="methods==0"
-                                 v-show="item.value == 3"
-                                 v-model="form.pkOceanPostage">
-                        <el-option v-for="item in postMoneyList3"
-                                   :key="item.pkId"
-                                   :label="item.tempName"
-                                   :value="item.pkId"></el-option>
+                      <el-select
+                        v-show="item.value == 3"
+                        v-model="form.pkOceanPostage"
+                        clearable
+                        :disabled="methods==0"
+                      >
+                        <el-option
+                          v-for="item in postMoneyList3"
+                          :key="item.pkId"
+                          :label="item.tempName"
+                          :value="item.pkId"
+                        />
                       </el-select>
                     </el-checkbox>
                   </el-checkbox-group>
@@ -372,71 +512,78 @@
             <el-row :gutter="40">
               <el-col :span="8">
                 <el-form-item :label="'上架日期'">
-                  <el-date-picker :disabled="methods==0"
-                                  v-model="form.putOnTime"
-                                  type="datetime"
-                                  :placeholder="'请选择'">
-                  </el-date-picker>
+                  <el-date-picker
+                    v-model="form.putOnTime"
+                    :disabled="methods==0"
+                    type="datetime"
+                    :placeholder="'请选择'"
+                  />
                 </el-form-item>
               </el-col>
               <el-col :span="8">
                 <el-form-item :label="'下架日期'">
-                  <el-date-picker :disabled="methods==0"
-                                  v-model="form.putOffTime"
-                                  type="datetime"
-                                  :placeholder="'请选择'">
-                  </el-date-picker>
+                  <el-date-picker
+                    v-model="form.putOffTime"
+                    :disabled="methods==0"
+                    type="datetime"
+                    :placeholder="'请选择'"
+                  />
                 </el-form-item>
               </el-col>
               <el-col :span="8">
                 <el-form-item :label="'预计发货时间'">
-                  <el-date-picker :disabled="methods==0"
-                                  v-model="form.arrivalTime"
-                                  type="datetime"
-                                  :placeholder="'请选择'">
-                  </el-date-picker>
+                  <el-date-picker
+                    v-model="form.arrivalTime"
+                    :disabled="methods==0"
+                    type="datetime"
+                    :placeholder="'请选择'"
+                  />
                 </el-form-item>
               </el-col>
               <el-col :span="24">
                 <el-form-item :label="'标签提示'">
-                  <el-input clearable
-                            :disabled="methods==0"
-                            v-model="form.warnMessage"
-                            :placeholder="'请输入'"></el-input>
+                  <el-input
+                    v-model="form.warnMessage"
+                    clearable
+                    :disabled="methods==0"
+                    :placeholder="'请输入'"
+                  />
                 </el-form-item>
               </el-col>
             </el-row>
             <el-row>
               <el-col :span="8">
-                <el-form-item label="商品视频"
-                              prop="videoUrl">
+                <el-form-item
+                  label="商品视频"
+                  prop="videoUrl"
+                >
                   <!-- <el-input clearable  v-model="form.name"
                             :placeholder="'请输入'"></el-input> -->
                   <!-- <UpDataImg :maxLength="1"
                                  ref="upImg1"
                                  @getImg="getImg1"
                                  @delImg="delImg1"></UpDataImg> -->
-                  <imageUpload v-model="form.videoUrl"
-                               :isVideo="true" />
+                  <imageUpload
+                    v-model="form.videoUrl"
+                    :is-video="true"
+                  />
                 </el-form-item>
               </el-col>
-              <el-col :span="8">
-                <el-form-item label="视频主图"
-                              prop="cover">
-                  <!-- <el-input clearable  v-model="form.name"
-                            :placeholder="'请输入'"></el-input> -->
-                  <!-- <UpDataImg :maxLength="1"
-                                 ref="upImg2"
-                                 @getImg="getImg2"
-                                 @delImg="delImg2"></UpDataImg> -->
+              <!-- <el-col :span="8">
+                <el-form-item
+                  label="视频封面"
+                  prop="cover"
+                >
                   <imageUpload v-model="form.cover" />
                 </el-form-item>
-              </el-col>
+              </el-col> -->
             </el-row>
             <el-row>
               <el-col :span="8">
-                <el-form-item :label="'图片'"
-                              prop="cover1">
+                <el-form-item
+                  :label="'图片'"
+                  prop="cover1"
+                >
                   <!-- <el-input clearable  v-model="form.name"
                             :placeholder="'请输入'"></el-input> -->
                   <!-- <UpDataImg :maxLength="1"
@@ -447,8 +594,10 @@
                 </el-form-item>
               </el-col>
               <el-col :span="8">
-                <el-form-item :label="'图片'"
-                              prop="cover2">
+                <el-form-item
+                  :label="'图片'"
+                  prop="cover2"
+                >
                   <!-- <el-input clearable  v-model="form.name"
                             :placeholder="'请输入'"></el-input> -->
                   <!-- <UpDataImg :maxLength="1"
@@ -459,8 +608,10 @@
                 </el-form-item>
               </el-col>
               <el-col :span="8">
-                <el-form-item :label="'图片'"
-                              prop="cover3">
+                <el-form-item
+                  :label="'图片'"
+                  prop="cover3"
+                >
                   <!-- <el-input clearable  v-model="form.name"
                             :placeholder="'请输入'"></el-input> -->
                   <!-- <UpDataImg :maxLength="1"
@@ -473,8 +624,10 @@
             </el-row>
             <el-row>
               <el-col :span="8">
-                <el-form-item :label="'图片'"
-                              prop="cover4">
+                <el-form-item
+                  :label="'图片'"
+                  prop="cover4"
+                >
                   <!-- <el-input clearable  v-model="form.name"
                             :placeholder="'请输入'"></el-input> -->
                   <!-- <UpDataImg :maxLength="1"
@@ -509,13 +662,17 @@
             </el-row>
             <el-row>
               <el-col :span="24">
-                <el-form-item :label="'商品详情'"
-                              prop="details">
-                  <editor ref="sptwEditor1"
-                          :readOnly="methods==0"
-                          v-model="form.details"
-                          :min-height="196"
-                          :uploadUrl="uploadImgUrl" />
+                <el-form-item
+                  :label="'商品详情'"
+                  prop="details"
+                >
+                  <editor
+                    ref="sptwEditor1"
+                    v-model="form.details"
+                    :read-only="methods==0"
+                    :min-height="196"
+                    :upload-url="uploadImgUrl"
+                  />
                 </el-form-item>
               </el-col>
               <!-- <el-col :span="24">
@@ -547,13 +704,17 @@
                   </el-col> -->
 
               <el-col :span="24">
-                <el-form-item :label="'售后保障'"
-                              prop="afterGuarantee">
-                  <editor ref="sptwEditor3"
-                          :readOnly="methods==0"
-                          v-model="form.afterGuarantee"
-                          :min-height="196"
-                          :uploadUrl="uploadImgUrl" />
+                <el-form-item
+                  :label="'售后保障'"
+                  prop="afterGuarantee"
+                >
+                  <editor
+                    ref="sptwEditor3"
+                    v-model="form.afterGuarantee"
+                    :read-only="methods==0"
+                    :min-height="196"
+                    :upload-url="uploadImgUrl"
+                  />
                 </el-form-item>
               </el-col>
             </el-row>
@@ -561,66 +722,92 @@
         </div>
         <!-- 产品明细 -->
         <!-- <div v-show="tabActive==1"> -->
-        <Cpmx ref="cpmxed"
-              v-show="tabActive == 1"
-              :methods="methods"
-              :tableDataEd.sync="waresDetailList"
-              @getTableList="getTableList"></Cpmx>
+        <Cpmx
+          v-show="tabActive == 1"
+          ref="cpmxed"
+          :methods="methods"
+          :table-data-ed.sync="waresDetailList"
+          @getTableList="getTableList"
+        />
         <!-- </div> -->
         <!-- 规格明细 -->
         <div v-show="tabActive == 2">
-          <Ggmx ref="ggmxed"
-                :methods="methods"
-                :specialArea="form.specialArea"
-                :waresSpecsSkuList.sync="waresSpecsSkuList"
-                @getGoodList="getGoodList"></Ggmx>
+          <Ggmx
+            ref="ggmxed"
+            :methods="methods"
+            :special-area="form.specialArea"
+            :wares-specs-sku-list.sync="waresSpecsSkuList"
+            @getGoodList="getGoodList"
+          />
         </div>
         <!-- 团队配置 -->
-        <div v-show="tabActive == 3"
-             class="teamPz">
+        <div
+          v-show="tabActive == 3"
+          class="teamPz"
+        >
           <div class="tit">{{ '团队配置' }}</div>
-          <div class="xian"></div>
-          <el-form ref="team"
-                   :model="form"
-                   style="width:1200px;padding: 0 20px;"
-                   label-width="100px">
-            <el-row :gutter="20"
-                    v-for="item,index in form.waresAuthorityList"
-                    :key="index">
+          <div class="xian" />
+          <el-form
+            ref="team"
+            :model="form"
+            style="width:1200px;padding: 0 20px;"
+            label-width="100px"
+          >
+            <el-row
+              v-for="item,index in form.waresAuthorityList"
+              :key="index"
+              :gutter="20"
+            >
               <el-col :span="10">
                 <el-form-item :label="'可见类型'">
-                  <el-select clearable
-                             :disabled="methods==0"
-                             v-model="item.authorityType"
-                             @change="getTeamList(item.authorityType)">
-                    <el-option v-for="cld in xyList"
-                               v-if="!(index>0&&cld.value==5)"
-                               :key="cld.value"
-                               :label="cld.label"
-                               :value="cld.value"></el-option>
+                  <el-select
+                    v-model="item.authorityType"
+                    clearable
+                    :disabled="methods==0"
+                    @change="getTeamList(item.authorityType)"
+                  >
+                    <el-option
+                      v-for="cld in xyList"
+                      v-if="!(index>0&&cld.value==5)"
+                      :key="cld.value"
+                      :label="cld.label"
+                      :value="cld.value"
+                    />
                   </el-select>
                 </el-form-item>
               </el-col>
-              <el-col :span="10"
-                      v-if="form.waresAuthorityList[index].authorityType != 5">
+              <el-col
+                v-if="form.waresAuthorityList[index].authorityType != 5"
+                :span="10"
+              >
                 <el-form-item :label="'团队编号'">
-                  <el-input clearable
-                            :disabled="methods==0"
-                            v-model="item.memberCode"
-                            :placeholder="'请输入'"></el-input>
+                  <el-input
+                    v-model="item.memberCode"
+                    clearable
+                    :disabled="methods==0"
+                    :placeholder="'请输入'"
+                  />
                 </el-form-item>
               </el-col>
-              <el-col v-if="form.waresAuthorityList[index].authorityType != 5&&index !== form.waresAuthorityList.length-1"
-                      :span="4">
-                <i v-show="methods!=0"
-                   class="el-icon-remove-outline addIcon"
-                   @click="removeTeamPz(index)"></i>
+              <el-col
+                v-if="form.waresAuthorityList[index].authorityType != 5&&index !== form.waresAuthorityList.length-1"
+                :span="4"
+              >
+                <i
+                  v-show="methods!=0"
+                  class="el-icon-remove-outline addIcon"
+                  @click="removeTeamPz(index)"
+                />
               </el-col>
-              <el-col v-if="form.waresAuthorityList[index].authorityType != 5&&index == form.waresAuthorityList.length-1"
-                      :span="4">
-                <i v-show="methods!=0"
-                   class="el-icon-circle-plus-outline addIcon"
-                   @click="addTeamPz"></i>
+              <el-col
+                v-if="form.waresAuthorityList[index].authorityType != 5&&index == form.waresAuthorityList.length-1"
+                :span="4"
+              >
+                <i
+                  v-show="methods!=0"
+                  class="el-icon-circle-plus-outline addIcon"
+                  @click="addTeamPz"
+                />
               </el-col>
             </el-row>
           </el-form>
@@ -628,35 +815,47 @@
         </div>
         <!-- 级差配置 -->
         <div v-show="tabActive==4">
-          <Jcpz ref="jcpzed"
-                :methods="methods"
-                :waresRangeList="waresRangeList"
-                @getRangList="getRangList"></Jcpz>
+          <Jcpz
+            ref="jcpzed"
+            :methods="methods"
+            :wares-range-list="waresRangeList"
+            @getRangList="getRangList"
+          />
         </div>
         <!-- 等级配置 -->
-        <div v-show="tabActive==5"
-             class="teamPz">
+        <div
+          v-show="tabActive==5"
+          class="teamPz"
+        >
           <div class="djpz">
             <div class="tit">{{ '等级配置' }}</div>
             <div class="djpz_i">{{ '选择能够购买该商品的会员等级，若不选择则默认全部可购买' }}</div>
           </div>
-          <div class="xian"></div>
-          <el-form ref="team"
-                   :model="form"
-                   style="width:1200px;padding: 0 20px;"
-                   label-width="auto">
+          <div class="xian" />
+          <el-form
+            ref="team"
+            :model="form"
+            style="width:1200px;padding: 0 20px;"
+            label-width="auto"
+          >
             <div class="djpz_a">
 
-              <el-checkbox v-model="levelAll"
-                           :disabled="methods==0"
-                           @change="getLevel">{{'全部'}}</el-checkbox>
+              <el-checkbox
+                v-model="levelAll"
+                :disabled="methods==0"
+                @change="getLevel"
+              >{{ '全部' }}</el-checkbox>
               <div class="djpz_g">
-                <el-checkbox-group v-model="form.waresGradeIds"
-                                   @change="getLevelAll"
-                                   :disabled="methods==0">
-                  <el-checkbox v-for="item in levelList"
-                               :key="item.pkId"
-                               :label="item.pkId">{{ item.gradeName }}</el-checkbox>
+                <el-checkbox-group
+                  v-model="form.waresGradeIds"
+                  :disabled="methods==0"
+                  @change="getLevelAll"
+                >
+                  <el-checkbox
+                    v-for="item in levelList"
+                    :key="item.pkId"
+                    :label="item.pkId"
+                  >{{ item.gradeName }}</el-checkbox>
                 </el-checkbox-group>
               </div>
             </div>
@@ -665,28 +864,38 @@
           <!-- <Ggmx ref="ggmxed"></Ggmx> -->
         </div>
         <!-- 奖衔配置 -->
-        <div v-show="tabActive==6"
-             class="teamPz">
+        <div
+          v-show="tabActive==6"
+          class="teamPz"
+        >
           <div class="djpz">
-            <div class="tit">{{'奖衔配置'}}</div>
+            <div class="tit">{{ '奖衔配置' }}</div>
           </div>
-          <div class="xian"></div>
-          <el-form ref="team"
-                   :model="form"
-                   style="width:1200px;padding: 0 20px;"
-                   label-width="auto">
+          <div class="xian" />
+          <el-form
+            ref="team"
+            :model="form"
+            style="width:1200px;padding: 0 20px;"
+            label-width="auto"
+          >
             <div class="djpz_a">
 
-              <el-checkbox v-model="gradeAll"
-                           :disabled="methods==0"
-                           @change="getGrade">{{'全部'}}</el-checkbox>
+              <el-checkbox
+                v-model="gradeAll"
+                :disabled="methods==0"
+                @change="getGrade"
+              >{{ '全部' }}</el-checkbox>
               <div class="djpz_g">
-                <el-checkbox-group v-model="form.waresAwardsIds"
-                                   @change="getGradeAll"
-                                   :disabled="methods==0">
-                  <el-checkbox v-for="item in awardsList"
-                               :key="item.pkId"
-                               :label="item.pkId">{{ item.awardsName }}</el-checkbox>
+                <el-checkbox-group
+                  v-model="form.waresAwardsIds"
+                  :disabled="methods==0"
+                  @change="getGradeAll"
+                >
+                  <el-checkbox
+                    v-for="item in awardsList"
+                    :key="item.pkId"
+                    :label="item.pkId"
+                  >{{ item.awardsName }}</el-checkbox>
                 </el-checkbox-group>
               </div>
             </div>
@@ -694,23 +903,29 @@
           </el-form>
         </div>
         <!-- 商品权限 -->
-        <div v-show="tabActive==7"
-             class="teamPz">
+        <div
+          v-show="tabActive==7"
+          class="teamPz"
+        >
           <div class="djpz">
             <div class="tit">商品权限</div>
             <!-- <div class="djpz_i">{{'选择能够购买该商品的会员等级，若不选择则默认全部可购买'}}</div> -->
           </div>
-          <div class="xian"></div>
-          <el-form ref="team"
-                   :model="form"
-                   style="width:1200px;padding: 0 20px;"
-                   label-width="auto">
+          <div class="xian" />
+          <el-form
+            ref="team"
+            :model="form"
+            style="width:1200px;padding: 0 20px;"
+            label-width="auto"
+          >
             <div class="djpz_a">
               <div class="djpz_g">
-                <el-checkbox-group v-model="form.waresMemberAuthorizeList"  :disabled="methods==0">
-                  <el-checkbox v-for="item in authorityList"
-                               :key="item.value"
-                               :label="item.value">{{ item.label }}</el-checkbox>
+                <el-checkbox-group v-model="form.waresMemberAuthorizeList" :disabled="methods==0">
+                  <el-checkbox
+                    v-for="item in authorityList"
+                    :key="item.value"
+                    :label="item.value"
+                  >{{ item.label }}</el-checkbox>
                 </el-checkbox-group>
               </div>
             </div>
@@ -718,13 +933,19 @@
           </el-form>
         </div>
       </div>
-      <div class="footer"
-           v-if="methods!=0">
-        <el-button size="small"
-                   class="thebtn2"> {{ '取消' }}</el-button>
-        <el-button size="small"
-                   @click="submit('form')"
-                   class="thebtn1"> {{ '确认' }}</el-button>
+      <div
+        v-if="methods!=0"
+        class="footer"
+      >
+        <el-button
+          size="small"
+          class="thebtn2"
+        > {{ '取消' }}</el-button>
+        <el-button
+          size="small"
+          class="thebtn1"
+          @click="submit('form')"
+        > {{ '确认' }}</el-button>
       </div>
     </div>
   </div>
@@ -750,7 +971,7 @@ export default {
     UpDataImg,
     Jcpz,
     Cpmx,
-    Ggmx,
+    Ggmx
   },
   data() {
     return {
@@ -761,7 +982,7 @@ export default {
       cpList: [],
       uploadImgUrl: process.env.VUE_APP_BASE_API + '/system/upload',
       headers: {
-        Authorization: getToken(),
+        Authorization: getToken()
       },
       dialogImageUrl: '',
       dialogVisible: false,
@@ -769,7 +990,7 @@ export default {
         waresGradeIds: [],
         waresAwardsIds: [],
         sales: '',
-        sortStatus:0,
+        sortStatus: 0,
         sort: '',
         sptw: '',
         ysList: [],
@@ -777,14 +998,14 @@ export default {
         pkGuaranteeLabel: [],
         specialArea: '',
         checkList: [],
-        waresMemberAuthorizeList:[],
+        waresMemberAuthorizeList: [],
         waresAuthorityList: [
           {
             authorityType: 5,
-            memberCode: '',
-          },
+            memberCode: ''
+          }
         ],
-        waresSpecsPackList: [{ key: '', value: '' }],
+        waresSpecsPackList: [{ key: '', value: '' }]
       },
       moren: '/goodsManage/goodsRelease/jcsz',
       tabActive: 0,
@@ -794,84 +1015,84 @@ export default {
       agreeList: [
         {
           text: '允许',
-          val: 0,
+          val: 0
         },
         {
           text: '禁止',
-          val: 1,
-        },
+          val: 1
+        }
       ],
       // 套餐类型
       tcList: [
         {
           text: '套装',
-          val: 0,
+          val: 0
         },
         {
           text: '单品',
-          val: 1,
-        },
+          val: 1
+        }
       ],
       postList: [
         {
           text: '包邮',
-          val: 0,
+          val: 0
         },
         {
           text: '不包邮',
-          val: 1,
-        },
+          val: 1
+        }
       ],
       xsList: [
         {
           text: '允许出售',
-          val: 0,
+          val: 0
         },
         {
           text: '禁止出售',
-          val: 1,
-        },
+          val: 1
+        }
       ],
       isTj: [
         {
           label: '推荐',
-          value: 0,
+          value: 0
         },
         {
           label: '不推荐',
-          value: 1,
-        },
+          value: 1
+        }
       ],
       topList: [
         {
           name: '基础设置',
-          id: 0,
+          id: 0
         },
         {
           name: '产品明细',
-          id: 1,
+          id: 1
         },
         {
           name: '规格明细',
-          id: 2,
+          id: 2
         },
         {
           name: '团队配置',
-          id: 3,
+          id: 3
         },
 
         {
           name: '等级配置',
-          id: 5,
+          id: 5
         },
         {
           name: '奖衔配置',
-          id: 6,
+          id: 6
         },
         {
           name: '商品权限',
-          id: 7,
-        },
+          id: 7
+        }
       ],
       goodList: [],
       copyArr: [],
@@ -879,13 +1100,13 @@ export default {
       xyList: '',
       // 海陆空
       transportTypeList: [],
-      //商品分类
+      // 商品分类
       hierarchyList: [],
       // 所属专区
       areaList: [],
       // 预售状态
       presaleList: [],
-      //供应方式
+      // 供应方式
       gyList: [],
       // 前缀标签
       qzList: [],
@@ -897,88 +1118,88 @@ export default {
       mdList: [],
       // 协议
       agreementList: [],
-      //邮费模板
+      // 邮费模板
       postMoneyList1: [],
       postMoneyList2: [],
       postMoneyList3: [],
       rules: {
         waresName: [
-          { required: true, message: '请输入商品名称', trigger: 'blur' },
+          { required: true, message: '请输入商品名称', trigger: 'blur' }
         ],
         sortStatus: [
-          { required: true, message: '请选择', trigger: 'change' },
+          { required: true, message: '请选择', trigger: 'change' }
         ],
         waresCode: [{ required: true, message: '', trigger: 'blur' }],
         sellingPoints: [
-          { required: true, message: '请输入商品卖点', trigger: 'blur' },
+          { required: true, message: '请输入商品卖点', trigger: 'blur' }
         ],
         sales: [{ required: true, message: '请输入商品销量', trigger: 'blur' }],
         waresPrice: [
-          { required: true, message: '请输入商品价格', trigger: 'blur' },
+          { required: true, message: '请输入商品价格', trigger: 'blur' }
         ],
         waresAchieve: [
-          { required: true, message: '请输入商品业绩', trigger: 'blur' },
+          { required: true, message: '请输入商品业绩', trigger: 'blur' }
         ],
         sort: [
-          { required: true, message: '请输入排列序号', trigger: 'blur' },
+          { required: true, message: '请输入排列序号', trigger: 'blur' }
         ],
         pkAreaClassifys: [
-          { required: true, message: '请选择商品分类', trigger: 'change' },
+          { required: true, message: '请选择商品分类', trigger: 'change' }
         ],
         specialArea: [
-          { required: true, message: '请选择所属专区', trigger: 'change' },
+          { required: true, message: '请选择所属专区', trigger: 'change' }
         ],
         isPutOn: [
-          { required: true, message: '请选择上架状态', trigger: 'change' },
+          { required: true, message: '请选择上架状态', trigger: 'change' }
         ],
         operateScope: [
-          { required: true, message: '请选择供应方式', trigger: 'change' },
+          { required: true, message: '请选择供应方式', trigger: 'change' }
         ],
         preSaleStatus: [
           {
             required: true,
             message: '请选择预售状态',
-            trigger: 'change',
-          },
+            trigger: 'change'
+          }
         ],
         isSale: [
-          { required: true, message: '请选择销售状态', trigger: 'change' },
+          { required: true, message: '请选择销售状态', trigger: 'change' }
         ],
         isSingle: [
           {
             required: true,
             message: '请选择套餐类型',
-            trigger: 'change',
-          },
+            trigger: 'change'
+          }
         ],
         pkAgreement: [
-          { required: true, message: '请选择补充协议', trigger: 'change' },
+          { required: true, message: '请选择补充协议', trigger: 'change' }
         ],
         isFreeMail: [
-          { required: true, message: '请选择包邮类型', trigger: 'change' },
+          { required: true, message: '请选择包邮类型', trigger: 'change' }
         ],
-        videoUrl: [
-          { required: true, message: '请上传商品视频', trigger: 'blur' },
-        ],
-        cover: [{ required: true, message: '请上传视频主图', trigger: 'blur' }],
+        // videoUrl: [
+        //   { required: true, message: '请上传商品视频', trigger: 'blur' }
+        // ],
+        // cover: [{ required: true, message: '请上传视频主图', trigger: 'blur' }],
         cover1: [
-          { required: true, message: '请上传图片', trigger: 'blur' },
-        ],
-        cover2: [
-          { required: true, message: '请上传图片', trigger: 'blur' },
-        ],
-        cover3: [
-          { required: true, message: '请上传图片', trigger: 'blur' },
-        ],
-        cover4: [
-          { required: true, message: '请上传图片', trigger: 'blur' },
+          { required: true, message: '请上传图片', trigger: 'blur' }
         ],
+        // cover2: [
+        //   { required: true, message: '请上传图片', trigger: 'blur' }
+        // ],
+        // cover3: [
+        //   { required: true, message: '请上传图片', trigger: 'blur' }
+        // ],
+        // cover4: [
+        //   { required: true, message: '请上传图片', trigger: 'blur' }
+        // ],
         details: [
-          { required: true, message: '请输入商品详情', trigger: 'blur' },
+          { required: true, message: '请输入商品详情', trigger: 'blur' }
         ],
         afterGuarantee: [
-          { required: true, message: '请输入售后保障', trigger: 'blur' },
-        ],
+          { required: true, message: '请输入售后保障', trigger: 'blur' }
+        ]
       },
       pkId: '',
       methods: 1,
@@ -987,8 +1208,8 @@ export default {
       specialCurrency: [],
       waresTypeList: [],
       awardsList: [],
-      authorityList:[],
-      sortList:[]
+      authorityList: [],
+      sortList: []
     }
   },
   created() {
@@ -1001,7 +1222,7 @@ export default {
     this.getXYList()
     // 运输方式
     this.getTransportType()
-    //查询分类父子级关系
+    // 查询分类父子级关系
     this.get_hierarchy_list()
     // 获取专区
     this.getArea()
@@ -1009,7 +1230,7 @@ export default {
     this.supply_way()
     //  查询预售状态
     this.presale_status()
-    //四个标签
+    // 四个标签
     this.labelAll()
     // 协议接口
     this.getAgreementList()
@@ -1042,8 +1263,8 @@ export default {
         this.awardsList = res.rows
       })
       api.ERegistrationAuthority().then((res) => {
-        this.authorityList = res.data;
-      });
+        this.authorityList = res.data
+      })
     },
     // getWaresSort() {
     //   api.waresSort().then((res) => {
@@ -1052,7 +1273,7 @@ export default {
     // },
     getLevel(e) {
       if (e) {
-        let levelArr = this.levelList.map((item) => {
+        const levelArr = this.levelList.map((item) => {
           return item.pkId
         })
         this.form.waresGradeIds = levelArr
@@ -1069,7 +1290,7 @@ export default {
     },
     getGrade(e) {
       if (e) {
-        let gradeArr = this.awardsList.map((item) => {
+        const gradeArr = this.awardsList.map((item) => {
           return item.pkId
         })
         this.form.waresAwardsIds = gradeArr
@@ -1097,7 +1318,7 @@ export default {
     getEduitdata() {
       api
         .waresDetail({
-          pkId: this.pkId,
+          pkId: this.pkId
         })
         .then((res) => {
           this.form = res.data
@@ -1107,7 +1328,7 @@ export default {
           if (this.form.parentPkAreaClassify) {
             this.form.pkAreaClassifys = [
               this.form.parentPkAreaClassify,
-              this.form.pkAreaClassify,
+              this.form.pkAreaClassify
             ]
           } else {
             this.form.pkAreaClassifys = [this.form.pkAreaClassify]
@@ -1132,7 +1353,7 @@ export default {
             this.levelAll = true
             this.$forceUpdate()
           }
-          let checkList = []
+          const checkList = []
           if (this.form.isOceanTrans == 0) {
             checkList.push(3)
           } else if (this.form.isLandTrans == 0) {
@@ -1141,7 +1362,7 @@ export default {
             checkList.push(2)
           }
           this.$set(this.form, 'checkList', checkList)
-          let that = this
+          const that = this
           if (this.methods == 2) {
             this.getWaresCode()
             // 排序
@@ -1157,36 +1378,36 @@ export default {
             this.topList = [
               {
                 name: '基础设置',
-                id: 0,
+                id: 0
               },
               {
                 name: '产品明细',
-                id: 1,
+                id: 1
               },
               {
                 name: '规格明细',
-                id: 2,
+                id: 2
               },
               {
                 name: '团队配置',
-                id: 3,
+                id: 3
               },
               {
                 name: '级差配置',
-                id: 4,
+                id: 4
               },
               {
                 name: '等级配置',
-                id: 5,
+                id: 5
               },
               {
                 name: '奖衔配置',
-                id: 6,
+                id: 6
               },
               {
-          name: '商品权限',
-          id: 7,
-        },
+                name: '商品权限',
+                id: 7
+              }
             ]
           }
           setTimeout(() => {
@@ -1216,19 +1437,20 @@ export default {
             lock: true,
             text: '努力提交中',
             spinner: 'el-icon-loading',
-            background: 'rgba(0, 0, 0, 0.7)',
+            background: 'rgba(0, 0, 0, 0.7)'
           })
 
           this.$store.commit('settings/GGMX_SETTING', [])
+          this.form.cover = this.form.cover1
           urlRequir(this.form).then((res) => {
             loading.close()
             if (res.code == 200) {
               this.$message({
                 message: mssg,
-                type: 'success',
+                type: 'success'
               })
               this.$router.replace({
-                path: '/goodsManage/goodsList/goodsList',
+                path: '/goodsManage/goodsList/goodsList'
               })
             }
           })
@@ -1256,8 +1478,8 @@ export default {
         this.form.waresAuthorityList = [
           {
             authorityType: 5,
-            memberCode: '',
-          },
+            memberCode: ''
+          }
         ]
       }
     },
@@ -1280,7 +1502,7 @@ export default {
         this.agreementList = res.data
       })
     },
-    //四个标签
+    // 四个标签
     labelAll() {
       // 前缀标签
       api.labelAll({ labelType: 1 }).then((res) => {
@@ -1332,68 +1554,68 @@ export default {
         this.$set(this, 'topList', [
           {
             name: '基础设置',
-            id: 0,
+            id: 0
           },
           {
             name: '产品明细',
-            id: 1,
+            id: 1
           },
           {
             name: '规格明细',
-            id: 2,
+            id: 2
           },
           {
             name: '团队配置',
-            id: 3,
+            id: 3
           },
           {
             name: '级差配置',
-            id: 4,
+            id: 4
           },
           {
             name: '等级配置',
-            id: 5,
+            id: 5
           },
           {
             name: '奖衔配置',
-            id: 6,
+            id: 6
           },
           {
-          name: '商品权限',
-          id: 7,
-        },
+            name: '商品权限',
+            id: 7
+          }
         ])
       } else {
         this.$set(this, 'topList', [
           {
             name: '基础设置',
-            id: 0,
+            id: 0
           },
           {
             name: '产品明细',
-            id: 1,
+            id: 1
           },
           {
             name: '规格明细',
-            id: 2,
+            id: 2
           },
           {
             name: '团队配置',
-            id: 3,
+            id: 3
           },
 
           {
             name: '等级配置',
-            id: 5,
+            id: 5
           },
           {
             name: '奖衔配置',
-            id: 6,
+            id: 6
           },
           {
-          name: '商品权限',
-          id: 7,
-        },
+            name: '商品权限',
+            id: 7
+          }
         ])
       }
     },
@@ -1401,7 +1623,7 @@ export default {
     get_hierarchy_list(val) {
       api
         .get_hierarchy_list({
-          specialArea: val || null,
+          specialArea: val || null
         })
         .then((res) => {
           this.hierarchyList = res.data
@@ -1421,7 +1643,7 @@ export default {
     addTeamPz() {
       this.form.waresAuthorityList.push({
         kjlx: '',
-        teamOrder: '',
+        teamOrder: ''
       })
     },
     removeGg(index) {
@@ -1439,12 +1661,12 @@ export default {
         if (this.cpList.length == 0) {
           this.$message({
             message: '请先添加产品',
-            type: 'warning',
+            type: 'warning'
           })
         } else {
           this.tabActive = id
           this.$refs.box.scrollTop = 0
-          this.$refs.ggmxed.getData(this.cpList,this.form.specialArea)
+          this.$refs.ggmxed.getData(this.cpList, this.form.specialArea)
         }
       } else if (id == 4) {
         this.tabActive = id
@@ -1466,7 +1688,7 @@ export default {
       if (goodList[0].showList) {
         this.goodList = goodList
         this.copyArr = copyArr
-        let waresSpecsSkuList = []
+        const waresSpecsSkuList = []
         this.goodList.forEach((item) => {
           if (item.showList) {
             waresSpecsSkuList.push(...item.showList)
@@ -1490,12 +1712,12 @@ export default {
       this.form.waresDetailList = data
       this.cpList = data.map((item) => {
         return {
-          pkProduct:item.pkProduct,
-          isGift:item.isGift,
-          quantity:item.quantity
+          pkProduct: item.pkProduct,
+          isGift: item.isGift,
+          quantity: item.quantity
         }
       })
-      this.$refs.ggmxed.getData(this.cpList,this.form.specialArea)
+      this.$refs.ggmxed.getData(this.cpList, this.form.specialArea)
     },
     getImg1(data) {
       this.form.videoUrl = data
@@ -1528,8 +1750,8 @@ export default {
     getImg8(data) {
       this.form.cover6 = data
     },
-    delImg8() {},
-  },
+    delImg8() {}
+  }
 }
 </script>
 
diff --git a/src/views/goodsManage/goodsList/index.vue b/src/views/goodsManage/goodsList/index.vue
index 8eb5bf8..e4dbc00 100644
--- a/src/views/goodsManage/goodsList/index.vue
+++ b/src/views/goodsManage/goodsList/index.vue
@@ -289,7 +289,7 @@
           </el-table-column> -->
           <el-table-column align="center" prop="cover" :label="'商品主图'">
             <template slot-scope="scope">
-              <img class="bgImg" :src="scope.row.cover" alt="">
+              <img class="bgImg" :src="scope.row.cover || scope.row.cover1" alt="">
             </template>
           </el-table-column>
           <el-table-column
@@ -316,7 +316,6 @@
           />
           <el-table-column align="center" prop="tempName" label="支付比例" />
 
-          
           <el-table-column
             align="center"
             prop="productName"
diff --git a/src/views/goodsManage/goodsRelease/jcsz.vue b/src/views/goodsManage/goodsRelease/jcsz.vue
index d79f31a..64c1cfb 100644
--- a/src/views/goodsManage/goodsRelease/jcsz.vue
+++ b/src/views/goodsManage/goodsRelease/jcsz.vue
@@ -538,20 +538,15 @@
                   />
                 </el-form-item>
               </el-col>
-              <el-col :span="8">
+              <!-- <el-col :span="8">
                 <el-form-item
                   :label="'视频封面'"
                   prop="cover"
                 >
-                  <!-- <el-input clearable  v-model="form.name"
-                        :placeholder="'请输入'"></el-input> -->
-                  <!-- <UpDataImg :maxLength="1"
-                             ref="upImg"
-                             @getImg="getImg2"
-                             @delImg="delImg2"></UpDataImg> -->
+
                   <imageUpload v-model="form.cover" />
                 </el-form-item>
-              </el-col>
+              </el-col> -->
             </el-row>
             <el-row>
               <el-col :span="8">
@@ -1139,22 +1134,22 @@ export default {
         isFreeMail: [
           { required: true, message: '请选择包邮类型', trigger: 'change' }
         ],
-        videoUrl: [
-          { required: true, message: '请上传商品视频', trigger: 'blur' }
-        ],
-        cover: [{ required: true, message: '请上传视频主图', trigger: 'blur' }],
+        // videoUrl: [
+        //   { required: true, message: '请上传商品视频', trigger: 'blur' }
+        // ],
+        // cover: [{ required: true, message: '请上传视频主图', trigger: 'blur' }],
         cover1: [
           { required: true, message: '请上传图片', trigger: 'blur' }
         ],
-        cover2: [
-          { required: true, message: '请上传图片', trigger: 'blur' }
-        ],
-        cover3: [
-          { required: true, message: '请上传图片', trigger: 'blur' }
-        ],
-        cover4: [
-          { required: true, message: '请上传图片', trigger: 'blur' }
-        ],
+        // cover2: [
+        //   { required: true, message: '请上传图片', trigger: 'blur' }
+        // ],
+        // cover3: [
+        //   { required: true, message: '请上传图片', trigger: 'blur' }
+        // ],
+        // cover4: [
+        //   { required: true, message: '请上传图片', trigger: 'blur' }
+        // ],
         details: [
           { required: true, message: '请输入商品详情', trigger: 'blur' }
         ],
@@ -1295,6 +1290,7 @@ export default {
             background: 'rgba(0, 0, 0, 0.7)'
           })
           this.$store.commit('settings/GGMX_SETTING', [])
+          this.form.cover = this.form.cover1
           api.waresSave(this.form).then((res) => {
             loading.close()
             if (res.code == 200) {

From b9c8241825f631f81a9a757cc8bc4c4e480e5ae3 Mon Sep 17 00:00:00 2001
From: woody <woody@gmail.com>
Date: Mon, 19 May 2025 14:39:03 +0800
Subject: [PATCH 12/22] =?UTF-8?q?feat(azjg5):=20=E5=AE=89=E7=BD=AE?=
 =?UTF-8?q?=E6=9E=B6=E6=9E=84=20=E6=96=B9=E6=A1=88=E4=BA=94=E6=94=B9?=
 =?UTF-8?q?=E9=80=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/framework/architecture/azjg5.vue    | 340 ++++--------------
 src/views/framework/architecture/index.vue    |  24 +-
 .../framework/architecture/mixins/tab-bar.js  |  16 +
 3 files changed, 86 insertions(+), 294 deletions(-)
 create mode 100644 src/views/framework/architecture/mixins/tab-bar.js

diff --git a/src/views/framework/architecture/azjg5.vue b/src/views/framework/architecture/azjg5.vue
index 6404678..422b408 100644
--- a/src/views/framework/architecture/azjg5.vue
+++ b/src/views/framework/architecture/azjg5.vue
@@ -50,12 +50,12 @@
         </el-row></el-form>
     </div>
     <div class="theorgtree">
-      <!-- <div class="lefttop">
-          <div class="single" v-for="(item, index) in avaerInfoList" :key="index">
-            <img :src="item.value" alt="" />
-            <div class="singletitle">{{ item.name }}</div>
-          </div>
-        </div> -->
+      <div class="lefttop">
+        <div v-for="(item, index) in rangeList" :key="index" class="single">
+          <div class="colorbox" :style="{background: item.color}" />
+          <div class="singletitle">{{ item.gradeName }}</div>
+        </div>
+      </div>
       <div class="tree">
         <div class="tree-content" @mousedown.stop="move" @wheel="handleWheel">
           <div :style="{ transform: `scale(${scale})` }">
@@ -74,159 +74,6 @@
         </div>
       </div>
     </div>
-    <el-dialog
-      :visible.sync="ifShow"
-      :close-on-click-modal="false"
-      width="516px"
-    >
-      <div class="rendercontent">
-        <div ref="htmlContent">
-          <div class="toprender">
-            <div class="leftimg">
-              <img
-                class="img1"
-                :src="'data:image/png;base64,' + treeData.avatarUrlBase64"
-              >
-              <img
-                class="img2"
-                :src="'data:image/png;base64,' + treeData.countryUrl2Base64"
-              >
-            </div>
-            <div class="centerbox">
-              <div class="lineboex">
-                <div class="linetitle">{{ '会员编号' }}</div>
-                <div class="linecontent">{{ treeData.memberCode }}</div>
-              </div>
-              <div class="lineboex">
-                <div class="linetitle">{{ '会员姓名' }}</div>
-                <div class="linecontent">{{ treeData.name }}</div>
-              </div>
-              <div class="lineboex">
-                <div class="linetitle">安置部门</div>
-                <div class="linecontent">{{ `第${treeData.placeDept}部门` }}</div>
-              </div>
-              <div class="lineboex">
-                <div class="linetitle">{{ '支付日期' }}</div>
-                <div class="linecontent">{{ treeData.payDate }}</div>
-              </div>
-            </div>
-            <div class="rightimg">
-              <img
-                :src="
-                  'data:image/png;base64,' + treeData.settleCountryUrl2Base64
-                "
-              >
-              <div>{{ '结算国家' }}</div>
-            </div>
-          </div>
-          <div class="bottomrender">
-            <div class="flexbox">
-              <div class="thetitle">{{ '业绩' }}({{ isLocals() }})</div>
-              <div class="linecontent">{{ '真实新增' }}</div>
-              <div class="linecontent">首购新增</div>
-              <div class="linecontent">复购新增</div>
-              <div class="linecontent">真实累计</div>
-              <div class="linecontent">首购累计</div>
-              <div class="linecontent">复购累计</div>
-              <div class="linecontent">首购结余</div>
-              <div class="linecontent">复购结余</div>
-              <!-- <div class="linecontent">新増套数</div>
-              <div class="linecontent">累计套数</div> -->
-            </div>
-            <div class="flexbox">
-              <div class="thetitle">左区</div>
-              <div class="linecontent">{{ treeData.leftRealNewPv }}</div>
-              <div class="linecontent">{{ treeData.leftFirstPurchaseAdd }}</div>
-              <div class="linecontent">
-                {{ treeData.leftRepeatPurchaseAdd }}
-              </div>
-              <div class="linecontent">{{ treeData.leftRealTotal }}</div>
-              <div class="linecontent">{{ treeData.leftFirstTotal }}</div>
-              <div class="linecontent">
-                {{ treeData.leftRepeatPurchaseTotal }}
-              </div>
-              <div class="linecontent">{{ treeData.leftFirstSurplus }}</div>
-              <div class="linecontent">
-                {{ treeData.leftRepeatPurchaseSurplus }}
-              </div>
-              <!-- <div class="linecontent">{{ treeData.aNewBox || 0 }}</div>
-              <div class="linecontent">{{ treeData.aSumBox || 0 }}</div> -->
-            </div>
-            <div class="flexbox">
-              <div class="thetitle">右区</div>
-              <div class="linecontent">{{ treeData.rightRealNewPv }}</div>
-              <div class="linecontent">
-                {{ treeData.rightFirstPurchaseAdd }}
-              </div>
-              <div class="linecontent">
-                {{ treeData.rightRepeatPurchaseAdd }}
-              </div>
-              <div class="linecontent">{{ treeData.rightRealTotal }}</div>
-              <div class="linecontent">{{ treeData.rightFirstTotal }}</div>
-              <div class="linecontent">
-                {{ treeData.rightRepeatPurchaseTotal }}
-              </div>
-              <div class="linecontent">{{ treeData.rightFirstSurplus }}</div>
-              <div class="linecontent">
-                {{ treeData.rightRepeatPurchaseSurplus }}
-              </div>
-              <!-- <div class="linecontent">{{ treeData.bNewBox || 0 }}</div>
-              <div class="linecontent">{{ treeData.bSumBox || 0 }}</div> -->
-            </div>
-          </div>
-        </div>
-        <div class="footerbox">
-          <div class="footerbtn btn1" @click="downloadImage">下载图片</div>
-          <div class="footerbtn btn2" @click="copyText">复制文字</div>
-          <!-- <div class="footerbtn btn3"  @click="goTop(treeData)">置顶</div> -->
-        </div>
-      </div>
-    </el-dialog>
-    <div v-show="false" ref="copyContent" class="copyContent">
-      <div>{{ '会员编号' }}：{{ treeData.memberCode }}</div>
-      <div>{{ '会员姓名' }}：{{ treeData.name }}</div>
-      <div>{{ '支付日期' }}：{{ treeData.payDate }}</div>
-      <div>{{ '业绩' }}({{ isLocals() }})&nbsp;&nbsp;左区&nbsp;&nbsp;右区</div>
-      <div>
-        真实新增&nbsp;&nbsp;{{ treeData.leftRealNewPv }}&nbsp;&nbsp;{{
-          treeData.rightRealNewPv
-        }}
-      </div>
-      <div>
-        首购新增&nbsp;&nbsp;{{ treeData.leftFirstPurchaseAdd }}&nbsp;&nbsp;{{
-          treeData.rightFirstPurchaseAdd
-        }}
-      </div>
-      <div>
-        复购新增{{ treeData.leftRepeatPurchaseAdd }}&nbsp;&nbsp;
-        {{ treeData.rightRepeatPurchaseAdd }}
-      </div>
-      <div>
-        真实累计{{ treeData.leftRealTotal }}&nbsp;&nbsp;{{
-          treeData.rightRealTotal
-        }}
-      </div>
-      <div>
-        首购累计{{ treeData.leftFirstTotal }}&nbsp;&nbsp;{{
-          treeData.rightFirstTotal
-        }}
-      </div>
-      <div>
-        复购累计 {{ treeData.leftRepeatPurchaseTotal }}&nbsp;&nbsp;{{
-          treeData.rightRepeatPurchaseTotal
-        }}
-      </div>
-      <div>
-        首购结余{{ treeData.leftFirstSurplus }}&nbsp;&nbsp;{{
-          treeData.rightFirstSurplus
-        }}
-      </div>
-      <div>
-        复购结余 {{ treeData.leftRepeatPurchaseSurplus }}&nbsp;&nbsp;{{
-          treeData.rightRepeatPurchaseSurplus
-        }}
-      </div>
-    </div>
   </div>
 </template>
 
@@ -241,37 +88,19 @@ import {
 } from '@/api/archityecture'
 import { isLocals } from '../../../utils/numberToCurrency'
 import TopMemberSelect from './components/top-member-select.vue'
+import tabBarMixin from './mixins/tab-bar'
+import { getgradeRanglist } from '@/api/level'
 export default {
   name: 'Azjg5',
   components: {
     topBar,
     TopMemberSelect
   },
+  mixins: [tabBarMixin],
   data() {
     return {
       moren: 'azjg5',
-      topList: [
-        {
-          name: '方案一',
-          path: 'azjg'
-        },
-        {
-          name: '方案二',
-          path: 'azjg2'
-        },
-        {
-          name: '方案三',
-          path: 'azjg3'
-        },
-        {
-          name: '方案四',
-          path: 'azjg4'
-        },
-        {
-          name: '方案五',
-          path: 'azjg5'
-        }
-      ],
+
       queryParams: {
         memberSettlePeriodId: '', // 期数
         memberCode: '', // 会员编号
@@ -283,7 +112,7 @@ export default {
       treeData: {},
       ifShow: false,
       memberSettlePeriodList: [], // 期数
-
+      rangeList: [], // 等级列表
       cantz: 1, // 0不可拖拽,1可拖拽
       scale: 1,
       loading: false
@@ -291,9 +120,19 @@ export default {
   },
   created() {
     // this.getSearch()
+    this.getRangeList()
     this.getAvarerInfo()
   },
   methods: {
+    getBorderColor(grade) {
+      const color = this.rangeList.find((item) => item.gradeName === grade)?.color
+      return color || '#e0e0e0'
+    },
+    getRangeList() {
+      getgradeRanglist().then((res) => {
+        this.rangeList = res.data || []
+      })
+    },
     TopMemberHandleChange(val) {
       if (val) {
         this.queryParams.memberCode = val
@@ -309,31 +148,6 @@ export default {
       }
     },
     isLocals,
-    copyText() {
-      const copyContent = this.$refs.copyContent
-      const textLines = Array.from(copyContent.querySelectorAll('div')).map(
-        (div) => div.textContent.trim()
-      )
-      const text = textLines.join('\n')
-      const tempInput = document.createElement('textarea')
-      tempInput.value = text
-      document.body.appendChild(tempInput)
-      tempInput.select()
-      try {
-        document.execCommand('copy')
-        this.$message({
-          message: '复制成功',
-          type: 'success'
-        })
-      } catch (error) {
-        this.$message({
-          message: '复制失败',
-          type: 'warning'
-        })
-      }
-      tempInput.remove()
-      window.getSelection().removeAllRanges()
-    },
     // 返回
     goback() {
       this.queryParams.memberCode = this.data.parentMemberCode
@@ -417,57 +231,41 @@ export default {
     onMouseout(e, data) {
       this.basicSwitch = false
     },
-    // <div class="xrBox">
-    //     <div class="neibox" on-click={() => this.showPover(data)}>
-    //       <div class="topbox">
-    //         <img src={data.avatarUrl}></img>
-    //       </div>
-    //       <div class="centerbox">
-    //         <div class="cflexbox">
-    //           <img src={data.countryUrl}></img>
-    //           <div class="matitle">{data.memberCode}</div>
-    //         </div>
-    //         <div class="cflexbox">
-    //           <img src={data.settleCountryUrl}></img>
-    //           <div class="matitle">{data.name}</div>
-    //         </div>
-    //       </div>
-    //       <div class="footerbox">
-    //         {/* 阻止冒泡事件 */}
-    //         <div class="ftopbtn" on-click={() => {event.stopPropagation(),this.goTop(data)}}>置顶</div>
-    //       </div>
-    //     </div>
-    //   </div>
+
     // 渲染节点
     renderContent(h, data) {
       if (!data || Object.keys(data).length === 0) {
         return
       }
+      // 获取边框和阴影颜色
+      const borderColor = this.getBorderColor(data.gradeName)
+      // 阴影色转rgba，透明度0.25（直接在boxShadow中拼接，不再声明shadowColor）
       return (
-        <div class='xrBox'>
+        <div
+          class='xrBox'
+          style={{
+            border: `4px solid ${borderColor}`,
+            borderRadius: '12px',
+            boxShadow: `0 4px 18px 0 ${borderColor}40, 0 0 0 4px #fff`, // 增加白色外发光提升对比度
+            padding: '0',
+            background: '#fff',
+            transition: 'box-shadow 0.3s, border-color 0.3s'
+          }}
+        >
           {/* 判断data.codeName是否为空 */}
           <div class='neibox'>
             {data.memberCode ? (
-              <div >
+              <div
+                on-contextmenu={() => this.rightClick(this.$event, data)}
+              >
                 <div class='topbox'>
                   <div>{data.name}</div>
                   <div>{data.memberCode}</div>
+                  <div>{data.awardsName}</div>
                   <div>第{data.placeDept}部门</div>
                   {/* <div>会员姓名：{data.name}</div>
                    <div>会员编号：{data.memberCode}</div> */}
                 </div>
-                <div class='footerbox'>
-                  {/* 阻止冒泡事件 */}
-                  <div
-                    class='ftopbtn'
-                    style={{ backgroundColor: data.color }}
-                    on-click={() => {
-                      event.stopPropagation(), this.goTop(data)
-                    }}
-                  >
-                    {'置顶'}
-                  </div>
-                </div>
               </div>
             ) : null}
           </div>
@@ -479,20 +277,12 @@ export default {
       this.queryParams.memberCode = row.memberCode
       this.getSearch()
     },
-    showPover(row) {
-      getUrlBase({
-        countryUrl2: row.countryUrl2,
-        settleCountryUrl2: row.settleCountryUrl2,
-        avatarUrl: row.avatarUrl
-      }).then((res) => {
-        this.treeData = row
-        this.treeData.countryUrl2Base64 = res.countryUrl2Base64
-        this.treeData.settleCountryUrl2Base64 = res.settleCountryUrl2Base64
-        this.treeData.avatarUrlBase64 = res.avatarUrlBase64
-
-        this.ifShow = true
-      })
+    rightClick(e, data) {
+      event.preventDefault()
+      this.queryParams.memberCode = data.memberCode
+      this.getSearch()
     },
+
     // 点击节点
     NodeClick(e, data) {},
     // 默认展开
@@ -661,24 +451,30 @@ export default {
   }
   .lefttop {
     display: flex;
-    justify-items: center;
     align-items: center;
-    padding-left: 20px;
-    background: #ffffff;
-    .single {
-      margin: 0 5px;
-      img {
-        width: 40px;
-        height: 40px;
-        border-radius: 50%;
-        // box-shadow: 0px 2px 20px 0px rgba(204, 204, 204, 0.5);
-      }
-      .singletitle {
-        text-align: center;
-        font-size: 10px;
-        font-family: PingFang SC-Regular, PingFang SC;
-      }
-    }
+    padding: 10px 0 10px 20px;
+    background: #fff;
+    border-radius: 8px;
+    margin-bottom: 10px;
+  }
+  .single {
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    margin-right: 16px;
+  }
+  .colorbox {
+    width: 24px;
+    height: 24px;
+    border-radius: 6px;
+    border: 1px solid #e0e0e0;
+    box-shadow: 0 2px 6px rgba(0,0,0,0.06);
+    margin-bottom: 4px;
+  }
+  .singletitle {
+    font-size: 12px;
+    color: #333;
+    margin-top: 2px;
   }
   ::v-deep .org-tree-node-label .org-tree-node-label-inner {
     padding: 0;
diff --git a/src/views/framework/architecture/index.vue b/src/views/framework/architecture/index.vue
index 081b064..c956dd3 100644
--- a/src/views/framework/architecture/index.vue
+++ b/src/views/framework/architecture/index.vue
@@ -257,37 +257,17 @@ import {
 } from '@/api/archityecture'
 import TopMemberSelect from './components/top-member-select.vue'
 import { isLocals } from '../../../utils/numberToCurrency'
+import tabBarMixin from './mixins/tab-bar'
 export default {
   name: 'Azjg',
   components: {
     topBar,
     TopMemberSelect
   },
+  mixins: [tabBarMixin],
   data() {
     return {
       moren: 'azjg',
-      topList: [
-        {
-          name: '方案一',
-          path: 'azjg'
-        },
-        {
-          name: '方案二',
-          path: 'azjg2'
-        },
-        {
-          name: '方案三',
-          path: 'azjg3'
-        },
-        {
-          name: '方案四',
-          path: 'azjg4'
-        },
-        {
-          name: '方案五',
-          path: 'azjg5'
-        }
-      ],
       queryParams: {
         memberSettlePeriodId: '', // 期数
         memberCode: '', // 会员编号
diff --git a/src/views/framework/architecture/mixins/tab-bar.js b/src/views/framework/architecture/mixins/tab-bar.js
new file mode 100644
index 0000000..fe8cf14
--- /dev/null
+++ b/src/views/framework/architecture/mixins/tab-bar.js
@@ -0,0 +1,16 @@
+export default {
+  data() {
+    return {
+      topList: [
+        {
+          name: '方案一',
+          path: 'azjg'
+        },
+        {
+          name: '方案五',
+          path: 'azjg5'
+        }
+      ]
+    }
+  }
+}

From 73971cb6b68b5d92bf2225d96dde0c9f1aafb287 Mon Sep 17 00:00:00 2001
From: woody <woody@gmail.com>
Date: Mon, 19 May 2025 14:56:55 +0800
Subject: [PATCH 13/22] =?UTF-8?q?feat(global):=20=E9=A1=B6=E7=82=B9?=
 =?UTF-8?q?=E7=BC=96=E5=8F=B7=E6=94=B9=E4=B8=BA=E7=B3=BB=E7=BB=9F=E7=BC=96?=
 =?UTF-8?q?=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/financial/balanceSummaryTotal/index.vue        | 2 +-
 src/views/settlementCenter/lenTopPerformance/index.vue   | 2 +-
 src/views/settlementCenter/topPerformance/index.vue      | 2 +-
 src/views/settlementCenter/topPerformanceTotal/index.vue | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/views/financial/balanceSummaryTotal/index.vue b/src/views/financial/balanceSummaryTotal/index.vue
index 245b30f..0827369 100644
--- a/src/views/financial/balanceSummaryTotal/index.vue
+++ b/src/views/financial/balanceSummaryTotal/index.vue
@@ -438,7 +438,7 @@ export default {
     getLabel() {
       return function (type) {
         if (type == "1") {
-          return "顶点编号";
+          return "系统编号";
         } else if (type == "2") {
           return "体系编号";
         } else if (type == "3") {
diff --git a/src/views/settlementCenter/lenTopPerformance/index.vue b/src/views/settlementCenter/lenTopPerformance/index.vue
index 6a43370..0e2b4ba 100644
--- a/src/views/settlementCenter/lenTopPerformance/index.vue
+++ b/src/views/settlementCenter/lenTopPerformance/index.vue
@@ -198,7 +198,7 @@ export default {
       ],
       menuList: [
         {
-          text: "顶点编号",
+          text: "系统编号",
           prop: "memberCode",
         },
         {
diff --git a/src/views/settlementCenter/topPerformance/index.vue b/src/views/settlementCenter/topPerformance/index.vue
index f398e7c..0a3d7d4 100644
--- a/src/views/settlementCenter/topPerformance/index.vue
+++ b/src/views/settlementCenter/topPerformance/index.vue
@@ -233,7 +233,7 @@ export default {
         },
         {
           id: 1,
-          text: '顶点编号',
+          text: '系统编号',
           checked: true,
           prop: 'memberCode'
         },
diff --git a/src/views/settlementCenter/topPerformanceTotal/index.vue b/src/views/settlementCenter/topPerformanceTotal/index.vue
index 4da5474..ab49514 100644
--- a/src/views/settlementCenter/topPerformanceTotal/index.vue
+++ b/src/views/settlementCenter/topPerformanceTotal/index.vue
@@ -236,7 +236,7 @@ export default {
       ],
       menuList: [
         {
-          text: "顶点编号",
+          text: "系统编号",
           prop: "memberCode",
         },
         {

From b8f0075c7c52a71fab62e901a887d8d80447e92d Mon Sep 17 00:00:00 2001
From: woody <woody@163>
Date: Tue, 20 May 2025 09:47:22 +0800
Subject: [PATCH 14/22] =?UTF-8?q?feat(removeOrderList):=20=E6=92=A4?=
 =?UTF-8?q?=E5=8D=95=E5=88=97=E8=A1=A8-=E8=AE=A2=E5=8D=95=E7=BC=96?=
 =?UTF-8?q?=E5=8F=B7=E5=AD=97=E6=AE=B5=E5=AE=BD=E5=BA=A6=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/information/removeOrderList/index.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/information/removeOrderList/index.vue b/src/views/information/removeOrderList/index.vue
index a21eccc..0f4bcd6 100644
--- a/src/views/information/removeOrderList/index.vue
+++ b/src/views/information/removeOrderList/index.vue
@@ -301,7 +301,7 @@
             <el-table-column
               align="center"
               prop="orderCode"
-              width="130"
+              min-width="170"
               :label="'订单编号'"
             />
             <el-table-column

From e0e4e273c70c095670babd5f60877e2bd5657314 Mon Sep 17 00:00:00 2001
From: woody <woody@163>
Date: Tue, 20 May 2025 11:05:43 +0800
Subject: [PATCH 15/22] =?UTF-8?q?feat(dashboard):=20=E9=A6=96=E9=A1=B5?=
 =?UTF-8?q?=E6=B1=87=E6=80=BB=E6=95=B0=E6=8D=AE=E5=B1=95=E7=A4=BA=E9=A1=BA?=
 =?UTF-8?q?=E5=BA=8F=E8=B0=83=E6=95=B4-=E4=BB=8A=E6=97=A5-=E6=98=A8?=
 =?UTF-8?q?=E6=97=A5-=E6=9C=AC=E6=9C=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/dashboard/dashboard.vue | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/views/dashboard/dashboard.vue b/src/views/dashboard/dashboard.vue
index 941f7e7..6f79a5e 100644
--- a/src/views/dashboard/dashboard.vue
+++ b/src/views/dashboard/dashboard.vue
@@ -56,7 +56,7 @@
       </div>
       <!-- 业绩数据卡片 (统一结构) -->
       <div class="dashboard-card-group dashboard-card-group--performance-overview">
-        <div class="dashboard-card-title">金额汇总</div>
+        <div class="dashboard-card-title">新增业绩</div>
         <div class="performance-overview-container">
           <!-- 本月业绩 -->
           <div class="performance-section performance-section--month">
@@ -629,7 +629,7 @@ export default {
 /* 当月会员卡片 - 最高优先级 */
 .dashboard-card--month-member {
   background: linear-gradient(135deg, #f6d365 0%, #fda085 100%); /* 恢复原有的橙色渐变，更醒目 */
-  order: 1; /* 通过flex order调整顺序，如果父级是flex */
+  order: 3; /* 通过flex order调整顺序，如果父级是flex */
   /* 或者通过更强的视觉样式，如边框、阴影 */
   box-shadow: 0 6px 15px 0 rgba(253,160,133,0.3);
   transform: scale(1.02); /* 轻微放大 */
@@ -670,7 +670,7 @@ export default {
 /* 今日会员卡片 - 普通优先级 */
 .dashboard-card--today-member {
   background: linear-gradient(135deg, #c3dae6 0%, #a4c1d2 100%); /* 柔和的灰蓝色 */
-  order: 3;
+  order: 1;
   box-shadow: 0 2px 8px 0 rgba(164,193,210,0.2);
 }
 .dashboard-card--today-member .dashboard-card-label {
@@ -780,7 +780,7 @@ export default {
 
 /* 本月业绩区块 - 最高优先级 */
 .performance-section--month {
-  order: 1; /* 在 performance-overview-container 内的顺序 */
+  order: 3; /* 在 performance-overview-container 内的顺序 */
   background: linear-gradient(135deg, #f3f9e6 0%, #e4f5d8 100%); /* 非常淡雅的绿色渐变 */
   border-color: #a3d9a5; /* 边框颜色与渐变协调 */
   box-shadow: 0 6px 15px rgba(163, 217, 165, 0.3);
@@ -844,7 +844,7 @@ export default {
 
 /* 今日业绩区块 - 普通优先级 */
 .performance-section--today {
-  order: 3;
+  order: 1;
   background: linear-gradient(135deg, #e3f2fd 0%, #d0e7fa 100%); /* 非常淡雅的蓝色渐变 */
   border-color: #90caf9; /* 边框颜色 */
   box-shadow: 0 3px 10px rgba(144, 202, 249, 0.2);
@@ -987,7 +987,7 @@ export default {
 
 /* 本月充值区块 - 最高优先级 */
 .recharge-section--month {
-  order: 1; /* 在 recharge-summary-container 内的顺序 */
+  order: 3; /* 在 recharge-summary-container 内的顺序 */
   background: linear-gradient(135deg, #f6eafd 0%, #e9dffc 100%); /* 更淡雅的紫色渐变 */
   border-color: #d1bcf3;
   box-shadow: 0 6px 18px rgba(209, 188, 243, 0.35);
@@ -1037,7 +1037,7 @@ export default {
 
 /* 今日充值区块 - 普通优先级 */
 .recharge-section--today {
-  order: 3;
+  order: 1;
   background: linear-gradient(135deg, #e6f4e7 0%, #d8ebd9 100%); /* 非常淡的灰绿色 */
   border-color: #b2dfdb;
   box-shadow: 0 3px 12px rgba(178, 223, 219, 0.25);

From f47fb2d019001333c27dfcdc0261fb9e561207bd Mon Sep 17 00:00:00 2001
From: woody <woody@163>
Date: Tue, 20 May 2025 13:23:09 +0800
Subject: [PATCH 16/22] =?UTF-8?q?feat(top-member-select):=20=E9=A1=B6?=
 =?UTF-8?q?=E7=82=B9=E4=BC=9A=E5=91=98=E9=80=89=E6=8B=A9=E7=BB=84=E4=BB=B6?=
 =?UTF-8?q?=E7=9B=AE=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

From bc0b62e7f53f97d407063ab5853da8a1101136fb Mon Sep 17 00:00:00 2001
From: woody <woody@163>
Date: Tue, 20 May 2025 14:05:53 +0800
Subject: [PATCH 17/22] =?UTF-8?q?feat(underDirect):=20=E5=AE=89=E7=BD=AE?=
 =?UTF-8?q?=E4=BC=9E=E4=B8=8B=E6=B7=BB=E5=8A=A0=E7=B3=BB=E7=BB=9F=E7=BC=96?=
 =?UTF-8?q?=E5=8F=B7=E5=BF=AB=E9=80=9F=E7=AD=9B=E6=9D=A1=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/top-member-select/index.vue    |   2 +-
 src/views/statistics/underDirectAdd.vue       | 408 ++++++++++--------
 src/views/statistics/underDirectAddNew.vue    | 230 +++++-----
 src/views/statistics/underPlacementPer.vue    | 233 +++++-----
 src/views/statistics/underPlacementPerNew.vue |  15 +-
 5 files changed, 480 insertions(+), 408 deletions(-)

diff --git a/src/components/top-member-select/index.vue b/src/components/top-member-select/index.vue
index 4d3877f..9876d06 100644
--- a/src/components/top-member-select/index.vue
+++ b/src/components/top-member-select/index.vue
@@ -1,5 +1,5 @@
 <template>
-  <el-form-item label="顶点会员">
+  <el-form-item label="系统编号">
     <el-select
       v-model="pkVertex"
       clearable
diff --git a/src/views/statistics/underDirectAdd.vue b/src/views/statistics/underDirectAdd.vue
index b52f83b..382d1ef 100644
--- a/src/views/statistics/underDirectAdd.vue
+++ b/src/views/statistics/underDirectAdd.vue
@@ -6,110 +6,147 @@
 -->
 <template>
   <div class="page">
-    <topBar v-if="topList.length > 0"
-            :topList="topList"
-            :moren="moren"></topBar>
+    <topBar
+      v-if="topList.length > 0"
+      :top-list="topList"
+      :moren="moren"
+    />
     <div class="main">
       <div class="form_all">
-        <el-form ref="select"
-                 :model="select"
-                 label-width="auto">
+        <el-form
+          ref="select"
+          :model="select"
+          label-width="auto"
+        >
           <el-row :gutter="10">
+            <el-col :span="4">
+              <TopMemberSelect ref="topMemberSelect" @change="topMemberHandleChange" />
+            </el-col>
             <el-col :span="4">
               <el-form-item :label="'会员编号'">
-                <el-input clearable
-                          v-model="select.memberCode"></el-input>
+                <el-input
+                  v-model="select.memberCode"
+                  clearable
+                />
               </el-form-item>
             </el-col>
             <el-col :span="4">
               <el-form-item :label="'会员姓名'">
-                <el-input clearable
-                          v-model="select.memberName"></el-input>
+                <el-input
+                  v-model="select.memberName"
+                  clearable
+                />
               </el-form-item>
             </el-col>
             <el-col :span="4">
-          
-                <el-form-item :label="'订单类型'"
-                              prop="orderType">
-                  <el-select clearable
-                             v-model="select.orderType"
-                             :placeholder="'请选择'">
-                    <el-option v-for="(item, index) in orderTypeList"
-                               :key="index"
-                               :label="item.label"
-                               :value="item.value"></el-option>
-                  </el-select>
-                </el-form-item>
-         
+
+              <el-form-item
+                :label="'订单类型'"
+                prop="orderType"
+              >
+                <el-select
+                  v-model="select.orderType"
+                  clearable
+                  :placeholder="'请选择'"
+                >
+                  <el-option
+                    v-for="(item, index) in orderTypeList"
+                    :key="index"
+                    :label="item.label"
+                    :value="item.value"
+                  />
+                </el-select>
+              </el-form-item>
+
             </el-col>
             <el-col :span="4">
               <el-form-item :label="'真实奖衔'">
-                <el-select clearable
-                           :placeholder="'请选择'"
-                           v-model="select.pkAwards">
-                  <el-option v-for="item in awardsList"
-                             :key="item.pkId"
-                             :label="item.awardsName"
-                             :value="item.pkId"></el-option>
+                <el-select
+                  v-model="select.pkAwards"
+                  clearable
+                  :placeholder="'请选择'"
+                >
+                  <el-option
+                    v-for="item in awardsList"
+                    :key="item.pkId"
+                    :label="item.awardsName"
+                    :value="item.pkId"
+                  />
                 </el-select>
               </el-form-item>
             </el-col>
 
             <el-col :span="4">
               <el-form-item :label="'隶属体系'">
-                <el-select clearable
-                           :placeholder="'请选择'"
-                           v-model="select.pkVertex">
-                  <el-option v-for="item in vertexList"
-                             :key="item.pkId"
-                             :label="item.vertexName"
-                             :value="item.pkId"></el-option>
+                <el-select
+                  v-model="select.pkVertex"
+                  clearable
+                  :placeholder="'请选择'"
+                >
+                  <el-option
+                    v-for="item in vertexList"
+                    :key="item.pkId"
+                    :label="item.vertexName"
+                    :value="item.pkId"
+                  />
                 </el-select>
               </el-form-item>
             </el-col>
             <el-col :span="4">
               <el-form-item :label="'隶属团队'">
-                <el-select clearable
-                           :placeholder="'请选择'"
-                           v-model="select.pkTeamCode">
-                  <el-option v-for="item in teamList"
-                             :key="item.pkId"
-                             :label="item.teamName"
-                             :value="item.pkId"></el-option>
+                <el-select
+                  v-model="select.pkTeamCode"
+                  clearable
+                  :placeholder="'请选择'"
+                >
+                  <el-option
+                    v-for="item in teamList"
+                    :key="item.pkId"
+                    :label="item.teamName"
+                    :value="item.pkId"
+                  />
                 </el-select>
               </el-form-item>
             </el-col>
             <el-col :span="4">
               <el-form-item :label="'国家'">
-                <el-select v-model="select.pkCountry"
-                           size="medium"
-                           filterable
-                           :placeholder="'请选择'">
-                  <el-option v-for="item in countryList"
-                             :key="item.pkCountry"
-                             :label="item.name"
-                             :value="item.pkCountry">
-                  </el-option>
+                <el-select
+                  v-model="select.pkCountry"
+                  size="medium"
+                  filterable
+                  :placeholder="'请选择'"
+                >
+                  <el-option
+                    v-for="item in countryList"
+                    :key="item.pkCountry"
+                    :label="item.name"
+                    :value="item.pkCountry"
+                  />
                 </el-select>
               </el-form-item>
             </el-col>
             <el-col :span="8">
               <el-form-item label="订单日期">
-                <el-date-picker v-model="creationTime"
-                                @change="changeTime"
-                                value-format="yyyy-MM-dd"
-                                type="daterange"
-                                :range-separator="'至'"
-                                :start-placeholder="'开始日期'"
-                                :end-placeholder="'结束日期'">
-                </el-date-picker>
+                <el-date-picker
+                  v-model="creationTime"
+                  value-format="yyyy-MM-dd"
+                  type="daterange"
+                  :range-separator="'至'"
+                  :start-placeholder="'开始日期'"
+                  :end-placeholder="'结束日期'"
+                  @change="changeTime"
+                />
               </el-form-item>
             </el-col>
             <el-col :span="4">
-              <el-button type="primary"
-                         @click="getDataList"> {{ '搜索' }}</el-button>
-              <el-button type=""
-                         @click="reset"> {{ '重置' }}</el-button>
+              <el-button
+                type="primary"
+                @click="getDataList"
+              > {{ '搜索' }}</el-button>
+              <el-button
+                type=""
+                @click="reset"
+              > {{ '重置' }}</el-button>
             </el-col>
           </el-row>
         </el-form>
@@ -120,73 +157,93 @@
                      @click="openDig"
                      v-hasButtons="['MissionAdd']"
                      class="addBtn">{{'添加'}}</el-button> -->
-          <el-button size="small"
-                     @click="handleExport"
-                     style="background-color: #ffad41"
-                     class="thebtn1"> {{ '导出' }}</el-button>
+          <el-button
+            size="small"
+            style="background-color: #ffad41"
+            class="thebtn1"
+            @click="handleExport"
+          > {{ '导出' }}</el-button>
         </div>
       </div>
       <div class="maintable">
-        <el-table :data="tableData"
-        v-loading="loading"
-                  style="width: 100%"
-                  height="700px"
-                  :header-cell-style="{ background: '#EEEEEE' }"
-                  :row-class-name="tableRowClassName"
-                  @selection-change="handleSelectionChange">
-          <el-table-column type="selection"
-                           width="55"> </el-table-column>
-          <el-table-column align="center"
-                           prop="picture"
-                           label="国旗">
+        <el-table
+          v-loading="loading"
+          :data="tableData"
+          style="width: 100%"
+          height="700px"
+          :header-cell-style="{ background: '#EEEEEE' }"
+          :row-class-name="tableRowClassName"
+          @selection-change="handleSelectionChange"
+        >
+          <el-table-column
+            type="selection"
+            width="55"
+          />
+          <el-table-column
+            align="center"
+            prop="picture"
+            label="国旗"
+          >
             <template slot-scope="scope">
               <div class="tem">
-                <img :src="scope.row.nationalFlag1"
-                     alt="">
+                <img
+                  :src="scope.row.nationalFlag1"
+                  alt=""
+                >
               </div>
             </template>
           </el-table-column>
-          <el-table-column align="center"
-                           prop="shortName"
-                           :label="'国家'">
-          </el-table-column>
-          <el-table-column align="center"
-                           prop="memberCode"
-                           :label="'会员编号'">
-          </el-table-column>
+          <el-table-column
+            align="center"
+            prop="shortName"
+            :label="'国家'"
+          />
+          <el-table-column
+            align="center"
+            prop="memberCode"
+            :label="'会员编号'"
+          />
 
-          <el-table-column align="center"
-                           prop="memberName"
-                           :label="'会员姓名'">
-          </el-table-column>
-          <el-table-column align="center"
-                           prop="phone"
-                           :label="'联系方式'">
-          </el-table-column>
-          <el-table-column align="center"
-                           prop="orderTypeVal"
-                           :label="'订单类型'">
-          </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="pkTeamCode"
-                           :label="'隶属团队'">
-          </el-table-column>
-          <el-table-column align="center"
-                           prop="orderAmount"
-                           label="新增金额(￥)">
-          </el-table-column>
-          <el-table-column align="center"
-                           prop="orderAchieve"
-                           :label="'新增业绩'+'(PV)'">
-          </el-table-column>
+          <el-table-column
+            align="center"
+            prop="memberName"
+            :label="'会员姓名'"
+          />
+          <el-table-column
+            align="center"
+            prop="phone"
+            :label="'联系方式'"
+          />
+          <el-table-column
+            align="center"
+            prop="orderTypeVal"
+            :label="'订单类型'"
+          />
+          <el-table-column
+            align="center"
+            prop="awardsName"
+            :label="'真实奖衔'"
+          />
+          <el-table-column
+            align="center"
+            prop="vertexName"
+            :label="'隶属体系'"
+          />
+          <el-table-column
+            align="center"
+            prop="pkTeamCode"
+            :label="'隶属团队'"
+          />
+          <el-table-column
+            align="center"
+            prop="orderAmount"
+            label="新增金额(￥)"
+          />
+          <el-table-column
+            align="center"
+            prop="orderAchieve"
+            :label="'新增业绩'+'(PV)'"
+          />
           <!-- <el-table-column align="center"
                            prop="payTime"
                            label="订单日期">
@@ -194,11 +251,13 @@
         </el-table>
       </div>
     </div>
-    <pagination v-show="total>0"
-                :total="total"
-                :page.sync="queryParams.pageNum"
-                :limit.sync="queryParams.pageSize"
-                @pagination="getDataList" />
+    <pagination
+      v-show="total>0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getDataList"
+    />
   </div>
 </template>
 
@@ -210,37 +269,39 @@ import * as log from '@/api/logistics'
 import { getAwardsListChiose } from '@/api/level'
 import { getvertexValue } from '@/api/financialCase'
 import { userCountryList } from '@/api/site.js'
+import TopMemberSelect from '@/components/top-member-select'
 export default {
   name: 'Bzpz',
   components: {
     topBar,
+    TopMemberSelect
   },
   data() {
     return {
       creationTime: [],
       select: {
-        orderType:1
+        orderType: 1
       },
       // 查询参数
       queryParams: {
         pageNum: 1,
-        pageSize: 50,
+        pageSize: 50
       },
       total: 0,
       tableData: [],
-      loading:false,
+      loading: false,
       awardsList: [],
       vertexList: [],
       teamList: [],
       countryList: [],
-      orderTypeList:[],
+      orderTypeList: [],
       moren: 'underDirectAdd',
       topList: [
         {
           name: '伞下直推新增业绩',
-          path: 'underDirectAdd',
-        },
-      ],
+          path: 'underDirectAdd'
+        }
+      ]
     }
   },
   mounted() {
@@ -255,26 +316,32 @@ export default {
     // this.getEYesNoList()
   },
   methods: {
+    topMemberHandleChange(val) {
+      if (val) {
+        this.select.memberCode = val
+        this.getDataList()
+      }
+    },
     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 + ' '
     },
-    //真实奖衔下拉选
+    // 真实奖衔下拉选
     getData() {
       getAwardsListChiose().then((res) => {
         this.awardsList = res.rows
@@ -293,27 +360,28 @@ export default {
       })
     },
     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.getDate() === 1 ? date.getMonth() : 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.getDate() === 1 ? date.getMonth() : 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 + ' '
     },
     reset() {
+      this.$refs.topMemberSelect.reset()
       this.select = {
-        orderType:1
+        orderType: 1
       }
       this.creationTime = []
       this.getDataList()
@@ -338,7 +406,7 @@ export default {
       this.$confirm('是否确认导出所有数据项?', '警告', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
-        type: 'warning',
+        type: 'warning'
       }).then((_) => {
         this.download(
           'report/manager/member-report/export-direct-push-new',
@@ -354,8 +422,8 @@ export default {
         return 'success-row'
       }
       return ''
-    },
-  },
+    }
+  }
 }
 </script>
 <style scoped lang="scss">
diff --git a/src/views/statistics/underDirectAddNew.vue b/src/views/statistics/underDirectAddNew.vue
index 172dcf2..128a321 100644
--- a/src/views/statistics/underDirectAddNew.vue
+++ b/src/views/statistics/underDirectAddNew.vue
@@ -2,28 +2,31 @@
   <div class="page">
     <topBar
       v-if="topList.length > 0"
-      :topList="topList"
+      :top-list="topList"
       :moren="moren"
-    ></topBar>
+    />
     <div class="main">
       <div class="form_all">
         <el-form ref="select" :model="select" label-width="auto">
           <el-row :gutter="10">
+            <el-col :span="4">
+              <TopMemberSelect ref="topMemberSelect" @change="topMemberHandleChange" />
+            </el-col>
             <el-col :span="4">
               <el-form-item :label="'会员编号'">
-                <el-input clearable v-model="select.memberCode"></el-input>
+                <el-input v-model="select.memberCode" clearable />
               </el-form-item>
             </el-col>
             <el-col :span="4">
               <el-form-item :label="'会员姓名'">
-                <el-input clearable v-model="select.memberName"></el-input>
+                <el-input v-model="select.memberName" clearable />
               </el-form-item>
             </el-col>
             <el-col :span="4">
               <el-form-item :label="'订单类型'" prop="orderType">
                 <el-select
-                  clearable
                   v-model="select.orderType"
+                  clearable
                   :placeholder="'请选择'"
                 >
                   <el-option
@@ -31,23 +34,23 @@
                     :key="index"
                     :label="item.label"
                     :value="item.value"
-                  ></el-option>
+                  />
                 </el-select>
               </el-form-item>
             </el-col>
             <el-col :span="4">
               <el-form-item :label="'真实奖衔'">
                 <el-select
+                  v-model="select.pkAwards"
                   clearable
                   :placeholder="'请选择'"
-                  v-model="select.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>
@@ -55,32 +58,32 @@
             <el-col :span="4">
               <el-form-item :label="'隶属体系'">
                 <el-select
+                  v-model="select.pkVertex"
                   clearable
                   :placeholder="'请选择'"
-                  v-model="select.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="'隶属团队'">
                 <el-select
+                  v-model="select.pkTeamCode"
                   clearable
                   :placeholder="'请选择'"
-                  v-model="select.pkTeamCode"
                 >
                   <el-option
                     v-for="item in teamList"
                     :key="item.pkId"
                     :label="item.teamName"
                     :value="item.pkId"
-                  ></el-option>
+                  />
                 </el-select>
               </el-form-item>
             </el-col>
@@ -97,8 +100,7 @@
                     :key="item.pkCountry"
                     :label="item.name"
                     :value="item.pkCountry"
-                  >
-                  </el-option>
+                  />
                 </el-select>
               </el-form-item>
             </el-col>
@@ -106,20 +108,18 @@
               <el-form-item label="订单日期">
                 <el-date-picker
                   v-model="creationTime"
-                  @change="changeTime"
                   value-format="yyyy-MM-dd"
                   type="daterange"
                   :range-separator="'至'"
                   :start-placeholder="'开始日期'"
                   :end-placeholder="'结束日期'"
-                >
-                </el-date-picker>
+                  @change="changeTime"
+                />
               </el-form-item>
             </el-col>
             <el-col :span="4">
               <el-button type="primary" @click="getDataList">
-                {{ '搜索' }}</el-button
-              >
+                {{ '搜索' }}</el-button>
               <el-button type="" @click="reset"> {{ '重置' }}</el-button>
             </el-col>
           </el-row>
@@ -133,29 +133,28 @@
                        class="addBtn">{{'添加'}}</el-button> -->
           <el-button
             size="small"
-            @click="handleExport"
             style="background-color: #ffad41"
             class="thebtn1"
+            @click="handleExport"
           >
-            {{ '导出' }}</el-button
-          >
+            {{ '导出' }}</el-button>
         </div>
       </div>
       <div class="maintable">
         <el-table
-          :data="tableData"
           v-loading="loading"
+          :data="tableData"
           style="width: 100%"
           height="700px"
           :header-cell-style="{ background: '#EEEEEE' }"
           :row-class-name="tableRowClassName"
           @selection-change="handleSelectionChange"
         >
-          <el-table-column type="selection" width="55"> </el-table-column>
+          <el-table-column type="selection" width="55" />
           <el-table-column align="center" prop="picture" label="国旗">
             <template slot-scope="scope">
               <div class="tem">
-                <img :src="scope.row.nationalFlag1" alt="" />
+                <img :src="scope.row.nationalFlag1" alt="">
               </div>
             </template>
           </el-table-column>
@@ -163,59 +162,49 @@
             align="center"
             prop="shortName"
             :label="'国家'"
-          >
-          </el-table-column>
+          />
           <el-table-column
             align="center"
             prop="memberCode"
             :label="'会员编号'"
-          >
-          </el-table-column>
+          />
 
           <el-table-column
             align="center"
             prop="memberName"
             :label="'会员姓名'"
-          >
-          </el-table-column>
-          <el-table-column align="center" prop="phone" :label="'联系方式'">
-          </el-table-column>
+          />
+          <el-table-column align="center" prop="phone" :label="'联系方式'" />
           <el-table-column
             align="center"
             prop="orderTypeVal"
             :label="'订单类型'"
-          >
-          </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="pkTeamCode"
             :label="'隶属团队'"
-          >
-          </el-table-column>
+          />
           <el-table-column
             align="center"
             prop="orderAmount"
             label="新增金额(￥)"
-          >
-          </el-table-column>
+          />
           <el-table-column
             align="center"
             prop="orderAchieve"
             :label="'新增业绩' + '(PV)'"
-          >
-          </el-table-column>
+          />
           <!-- <el-table-column align="center"
                              prop="payTime"
                              label="订单日期">
@@ -232,119 +221,127 @@
     />
   </div>
 </template>
-  
-  <script>
-import topBar from "@/components/topBar";
-import * as api from "@/api/business.js";
-import * as log from "@/api/logistics";
 
-import { getAwardsListChiose } from "@/api/level";
-import { getvertexValue } from "@/api/financialCase";
-import { userCountryList } from "@/api/site.js";
+<script>
+import topBar from '@/components/topBar'
+import * as api from '@/api/business.js'
+import * as log from '@/api/logistics'
+import TopMemberSelect from '@/components/top-member-select'
+import { getAwardsListChiose } from '@/api/level'
+import { getvertexValue } from '@/api/financialCase'
+import { userCountryList } from '@/api/site.js'
 export default {
-  name: "UnderDirectAddNew",
+  name: 'UnderDirectAddNew',
   components: {
     topBar,
+    TopMemberSelect
   },
   data() {
     return {
       creationTime: [],
       select: {
-        orderType: 1,
+        orderType: 1
       },
       // 查询参数
       queryParams: {
         pageNum: 1,
-        pageSize: 50,
+        pageSize: 50
       },
       total: 0,
       tableData: [],
-      loading:false,
+      loading: false,
       awardsList: [],
       vertexList: [],
       teamList: [],
       countryList: [],
       orderTypeList: [],
-      moren: "underDirectAddNew",
+      moren: 'underDirectAddNew',
       topList: [
         {
-          name: "伞下直推新增业绩（新）",
-          path: "underDirectAddNew",
-        },
+          name: '伞下直推新增业绩（新）',
+          path: 'underDirectAddNew'
+        }
       ],
-      monthFirstday: "",
-      monthLastday: "",
-    };
+      monthFirstday: '',
+      monthLastday: ''
+    }
   },
   mounted() {
-    var s1 = this.getStartTime();
-    var s2 = this.getEndTime();
-    this.select.startPayTime = s1;
-    this.select.endPayTime = s2;
-    this.creationTime = [s1, s2];
+    var s1 = this.getStartTime()
+    var s2 = this.getEndTime()
+    this.select.startPayTime = s1
+    this.select.endPayTime = s2
+    this.creationTime = [s1, s2]
     // 获取列表
-    this.getDataList();
-    this.getData();
+    this.getDataList()
+    this.getData()
   },
   methods: {
+    topMemberHandleChange(val) {
+      if (val) {
+        this.select.memberCode = val
+        this.getDataList()
+      }
+    },
     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 + ' '
     },
-    //真实奖衔下拉选
+    // 真实奖衔下拉选
     getData() {
       getAwardsListChiose().then((res) => {
-        this.awardsList = res.rows;
-      });
+        this.awardsList = res.rows
+      })
       getvertexValue().then((res) => {
-        this.vertexList = res.data;
-      });
+        this.vertexList = res.data
+      })
       api.teamList().then((res) => {
-        this.teamList = res.data;
-      });
+        this.teamList = res.data
+      })
       userCountryList().then((res) => {
-        this.countryList = res.data;
-      });
+        this.countryList = res.data
+      })
       log.getUnderAddOrderTypeNew().then((res) => {
-        this.orderTypeList = res.data;
-      });
+        this.orderTypeList = res.data
+      })
     },
 
     reset() {
+      this.$refs.topMemberSelect.reset()
       this.select = {
-        orderType: 1,
-      };
-      this.creationTime = [];
-      this.getDataList();
+        orderType: 1
+      }
+      this.creationTime = []
+      this.getDataList()
     },
     changeTime(val) {
-      this.select.startPayTime = val ? val[0] : "";
-      this.select.endPayTime = val ? val[1] : "";
+      this.select.startPayTime = val ? val[0] : ''
+      this.select.endPayTime = val ? val[1] : ''
     },
     getDataList() {
       this.loading = true
       api
         .directAddNewList(Object.assign({}, this.queryParams, this.select))
         .then((res) => {
-          this.tableData = res.rows;
-          this.total = res.total;
+          this.tableData = res.rows
+          this.total = res.total
           this.loading = false
-        });
+        })
     },
     handleSelectionChange(val) {},
     /** 导出按钮操作 */
@@ -352,25 +349,25 @@ export default {
       this.$confirm('是否确认导出所有数据项?', '警告', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
-        type: "warning",
+        type: 'warning'
       }).then((_) => {
         this.download(
-          "/report/manager/member-report/export-direct-push-new-up",
+          '/report/manager/member-report/export-direct-push-new-up',
           Object.assign({}, this.queryParams, this.select),
           `伞下直推新增业绩（新）${new Date().getTime()}.xlsx`
-        );
-      });
+        )
+      })
     },
     tableRowClassName({ row, rowIndex }) {
       if (rowIndex % 2 == 1) {
-        return "warning-row";
+        return 'warning-row'
       } else if (rowIndex % 2 == 0) {
-        return "success-row";
+        return 'success-row'
       }
-      return "";
-    },
-  },
-};
+      return ''
+    }
+  }
+}
 </script>
   <style scoped lang="scss">
 ::v-deep .el-table .warning-row {
@@ -463,4 +460,3 @@ export default {
   width: 100%;
 }
 </style>
-  
\ No newline at end of file
diff --git a/src/views/statistics/underPlacementPer.vue b/src/views/statistics/underPlacementPer.vue
index 7004964..dbc37b6 100644
--- a/src/views/statistics/underPlacementPer.vue
+++ b/src/views/statistics/underPlacementPer.vue
@@ -2,36 +2,42 @@
   <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">
+            <TopMemberSelect
+              ref="topMemberSelect"
+              @change="topMemberHandleChange"
+            />
+          </el-col>
           <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 +45,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>
@@ -101,18 +107,17 @@
             </el-form-item>
           </el-col> -->
           <el-col :span="8">
-            <el-form-item  :label="'订单日期'" prop="thetimes">
+            <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 +131,9 @@
                   }
                 "
               >
-                {{ '搜索' }}</el-button
-              >
+                {{ '搜索' }}</el-button>
               <el-button class="my_reset" @click="reChongzhi">
-                {{ '重置' }}</el-button
-              >
+                {{ '重置' }}</el-button>
             </div>
           </el-col>
         </el-row>
@@ -140,21 +143,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 +167,7 @@
                 style="width: 44px; height: 44px; border-radius: 50%"
                 :src="scope.row.nationalFlag"
                 alt=""
-              />
+              >
             </template>
           </el-table-column>
 
@@ -175,74 +176,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 +252,37 @@
     />
   </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'
+import TopMemberSelect from '@/components/top-member-select/index.vue'
 export default {
-  name: "UnderPlacementPer",
+  name: 'UnderPlacementPer',
   components: {
     topBar,
+    TopMemberSelect
   },
   data() {
     return {
-      moren: "underPlacementPer",
+      moren: 'underPlacementPer',
       topList: [
         {
           name: '伞下新增安置业绩',
-          path: "underPlacementPer",
-        },
+          path: 'underPlacementPer'
+        }
       ],
       tableData: [],
-      loading:false,
+      loading: false,
       queryParams: {
         pageNum: 1,
         pageSize: 50,
-        thetimes: [],
+        thetimes: []
       },
       total: 0,
       multipleSelection: [],
@@ -298,105 +290,111 @@ 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,
+    topMemberHandleChange(val) {
+      if (val) {
+        this.queryParams.memberCode = val
+        this.getSearch()
+      }
+    },
     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.getUnderAddOrderType().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-export",
+          '/report/manager/member-report/member-resettle-achieve-export',
           { ...this.queryParams },
           `${'伞下新增安置业绩'}${new Date().getTime()}.xlsx`
-        );
-      });
+        )
+      })
     },
     handleSelectionChange(val) {
-      this.multipleSelection = val;
+      this.multipleSelection = val
     },
     reChongzhi() {
+      this.$refs.topMemberSelect.reset()
       this.queryParams = {
         pageNum: 1,
         pageSize: 50,
-        thetimes: [],
-      };
-      this.getSearch();
+        thetimes: []
+      }
+      this.getSearch()
     },
     getSearch() {
       this.loading = true
       sta.getResettleAchieve(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 +467,3 @@ export default {
   }
 }
 </style>
-    
\ No newline at end of file
diff --git a/src/views/statistics/underPlacementPerNew.vue b/src/views/statistics/underPlacementPerNew.vue
index 290586f..6afdbca 100644
--- a/src/views/statistics/underPlacementPerNew.vue
+++ b/src/views/statistics/underPlacementPerNew.vue
@@ -8,6 +8,9 @@
     <div class="thetopbox">
       <el-form label-width="100px">
         <el-row>
+          <el-col :span="4">
+            <TopMemberSelect ref="topMemberSelect" @change="topMemberHandleChange" />
+          </el-col>
           <el-col :span="4">
             <el-form-item :label="'会员编号'" prop="memberCode">
               <el-input v-model="queryParams.memberCode" clearable />
@@ -255,11 +258,12 @@ import { getAwardsListChiose } from '@/api/level'
 import { getcountryAllList } from '@/api/exchangerate'
 import { getvertexValue, getmemberTeamList } from '@/api/financialCase'
 import { isLocals, isLocalSymbol } from '@/utils/numberToCurrency'
-
+import TopMemberSelect from '@/components/top-member-select/index.vue'
 export default {
   name: 'UnderPlacementPerNew',
   components: {
-    topBar
+    topBar,
+    TopMemberSelect
   },
   data() {
     return {
@@ -298,6 +302,12 @@ export default {
   methods: {
     isLocalSymbol,
     isLocals,
+    topMemberHandleChange(val) {
+      if (val) {
+        this.queryParams.memberCode = val
+        this.getSearch()
+      }
+    },
     getStartTime() {
       const date = new Date()
       date.setDate(1) // 将当前时间的日期设置成第一天
@@ -357,6 +367,7 @@ export default {
       this.multipleSelection = val
     },
     reChongzhi() {
+      this.$refs.topMemberSelect.reset()
       this.queryParams = {
         pageNum: 1,
         pageSize: 50,

From 5d6876145f3da79b5a215f04f443d9601730a485 Mon Sep 17 00:00:00 2001
From: woody <woody@163>
Date: Tue, 20 May 2025 14:38:29 +0800
Subject: [PATCH 18/22] =?UTF-8?q?feat(addRechargeCard):=20=E5=85=85?=
 =?UTF-8?q?=E5=80=BC=E6=8F=90=E8=B4=A7=E5=8D=A1=E4=B8=8D=E8=B5=B0=E7=AD=BE?=
 =?UTF-8?q?=E5=91=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../rechargeCard/addRechargeCard.vue          | 45 ++++++++++++++-----
 1 file changed, 34 insertions(+), 11 deletions(-)

diff --git a/src/views/marketing/rechargeCard/addRechargeCard.vue b/src/views/marketing/rechargeCard/addRechargeCard.vue
index 0241c92..e80b5bc 100644
--- a/src/views/marketing/rechargeCard/addRechargeCard.vue
+++ b/src/views/marketing/rechargeCard/addRechargeCard.vue
@@ -411,6 +411,7 @@ import * as apis from '@/api/product.js'
 import * as api_s from '@/api/financial.js'
 import topBar from '@/components/topBar'
 import { pickDetail } from '@/api/manage'
+import * as man from '@/api/manage'
 export default {
   components: {
     topBar
@@ -663,11 +664,21 @@ export default {
           type: 'warning'
         })
       } else {
-        this.$router.push({
-          path: 'rechargeQc',
-          query: {
-            data: JSON.stringify(dataList),
-            approvalBusiness: 700
+        const params = {
+          detailList: dataList,
+          signType: 0, // 普通件，急件，密件
+          remark: '', // 备注
+          fileList: [], // 附件[]
+          userIdList: [], // 审批流程[]
+          sendIdList: [] // 审批流程[]
+        }
+        man.rechargeConfirm(params).then((res) => {
+          if (res.code === 200) {
+            this.$message({
+              message: res.msg,
+              type: 'success'
+            })
+            this.$router.go(-1)
           }
         })
       }
@@ -685,14 +696,26 @@ export default {
           }
         )
       })
-      this.$router.push({
-        path: 'rechargeQc',
-        query: {
-          data: JSON.stringify(dataList),
-          approvalBusiness: 701,
-          type: this.deled
+      const params = {
+        detailList: dataList
+      }
+      man.rechargeDel(params).then((res) => {
+        if (res.code === 200) {
+          this.$message({
+            message: res.msg,
+            type: 'success'
+          })
+          this.$router.go(-1)
         }
       })
+      // this.$router.push({
+      //   path: 'rechargeQc',
+      //   query: {
+      //     data: JSON.stringify(dataList),
+      //     approvalBusiness: 701,
+      //     type: this.deled
+      //   }
+      // })
     },
     getPage(allData) {
       this.allData = allData

From 233cda0d61195cc0b44e5b83adc576a5ffe0424f Mon Sep 17 00:00:00 2001
From: woody <woody@163>
Date: Tue, 20 May 2025 14:49:58 +0800
Subject: [PATCH 19/22] =?UTF-8?q?feat(settlementCenter):=20=E5=A5=96?=
 =?UTF-8?q?=E9=87=91=E6=9D=A5=E6=BA=90=E6=B7=BB=E5=8A=A0=E9=87=8D=E6=B6=88?=
 =?UTF-8?q?=E6=94=B6=E7=9B=8A=E5=92=8C=E5=B9=B3=E5=8F=B0=E6=9C=8D=E5=8A=A1?=
 =?UTF-8?q?=E8=B4=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/settlementCenter/sourceBonus/index.vue | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/src/views/settlementCenter/sourceBonus/index.vue b/src/views/settlementCenter/sourceBonus/index.vue
index 1222d9b..373b57d 100644
--- a/src/views/settlementCenter/sourceBonus/index.vue
+++ b/src/views/settlementCenter/sourceBonus/index.vue
@@ -433,13 +433,27 @@
               :formatter="stateFormat"
             />
             <el-table-column
-              v-if="dataRole.includes('pretaxIncomeOri')"
               align="center"
               prop="pretaxIncomeOri"
               width="130"
               :label="'税前收益' + `(${isLocalSymbol()})`"
               :formatter="stateFormat"
             />
+            <el-table-column
+              v-if="dataRole.includes('pretaxIncomeOri')"
+              align="center"
+              prop="backPoints"
+              width="130"
+              :label="'重消收益 ' + `(${isLocalSymbol()})`"
+              :formatter="stateFormat"
+            />
+            <el-table-column
+              align="center"
+              prop="serviceSpend"
+              width="130"
+              :label="'平台服务费' + `(${isLocalSymbol()})`"
+              :formatter="stateFormat"
+            />
             <el-table-column
               v-if="dataRole.includes('realIncomeOri')"
               align="center"

From ad1b87307410a9b89f5ab3084e8235dbd49a7ade Mon Sep 17 00:00:00 2001
From: woody <woody@163>
Date: Tue, 20 May 2025 14:55:57 +0800
Subject: [PATCH 20/22] =?UTF-8?q?feat(settlementCenter):=20=E7=A7=BB?=
 =?UTF-8?q?=E9=99=A4=E5=9B=BD=E5=AE=B6=E7=9B=B8=E5=85=B3=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../settlementCenter/sourceBonus/index.vue    | 72 +------------------
 1 file changed, 3 insertions(+), 69 deletions(-)

diff --git a/src/views/settlementCenter/sourceBonus/index.vue b/src/views/settlementCenter/sourceBonus/index.vue
index 373b57d..d275255 100644
--- a/src/views/settlementCenter/sourceBonus/index.vue
+++ b/src/views/settlementCenter/sourceBonus/index.vue
@@ -87,38 +87,7 @@
                   </el-select>
                 </el-form-item>
               </el-col>
-              <el-col :span="4">
-                <el-form-item :label="'来源国家'">
-                  <el-select
-                    v-model="select.sourceCountry"
-                    clearable
-                    placeholder=""
-                  >
-                    <el-option
-                      v-for="item in countryList"
-                      :key="item.value"
-                      :label="item.name"
-                      :value="item.pkId"
-                    />
-                  </el-select>
-                </el-form-item>
-              </el-col>
-              <el-col :span="4">
-                <el-form-item :label="'结算国家'">
-                  <el-select
-                    v-model="select.settleCountry"
-                    clearable
-                    placeholder=""
-                  >
-                    <el-option
-                      v-for="item in countryList"
-                      :key="item.value"
-                      :label="item.name"
-                      :value="item.pkId"
-                    />
-                  </el-select>
-                </el-form-item>
-              </el-col>
+
               <el-col :span="4">
                 <el-form-item :label="'隶属体系'">
                   <el-select v-model="select.pkVertex" clearable placeholder="">
@@ -131,23 +100,6 @@
                   </el-select>
                 </el-form-item>
               </el-col>
-              <el-col :span="4">
-                <el-form-item :label="'隶属团队'">
-                  <el-select
-                    v-model="select.pkTeamCode"
-                    clearable
-                    placeholder=""
-                  >
-                    <el-option
-                      v-for="item in memberList"
-                      :key="item.value"
-                      :label="item.teamName"
-                      :value="item.pkId"
-                    />
-                  </el-select>
-                </el-form-item>
-              </el-col>
-
               <el-col :span="4">
                 <el-form-item :label="'结算期数'">
                   <div style="display: flex">
@@ -261,13 +213,7 @@
               width="130"
               :label="'订单类型'"
             />
-            <el-table-column
-              v-if="dataRole.includes('sourceCountryName')"
-              align="center"
-              prop="sourceCountryName"
-              width="130"
-              :label="'来源国家'"
-            />
+
             <el-table-column
               v-if="dataRole.includes('sourceMemberCode')"
               align="center"
@@ -314,13 +260,7 @@
               :label="'来源业绩' + '($)'"
               :formatter="stateFormat"
             /> -->
-            <el-table-column
-              v-if="dataRole.includes('settleCountry')"
-              align="center"
-              prop="settleCountry"
-              width="130"
-              :label="'结算国家'"
-            />
+
             <el-table-column
               v-if="dataRole.includes('memberCode')"
               align="center"
@@ -588,7 +528,6 @@ import topBar from '@/components/topBar'
 import * as api from '@/api/settle.js'
 import { classifyUpdate, classifySave } from '@/api/product'
 import * as log from '@/api/logistics'
-import { getcountryAllList } from '@/api/exchangerate'
 import { bonusSource, exportBonusSouce } from '@/api/bonus'
 import { isLocals, isLocalSymbol, stateFormat } from '@/utils/numberToCurrency'
 import { getRoleMenu } from '@/api/notice'
@@ -755,7 +694,6 @@ export default {
       memberList: [],
       yieldList: [],
       yieldStatus: [],
-      countryList: [],
       orderTypeList: [],
       pkMemberTeam: [],
       pkVertex: [],
@@ -893,10 +831,6 @@ export default {
       log.getOrderType().then((res) => {
         this.orderTypeList = res.data
       })
-      // 获取国家
-      getcountryAllList().then((res) => {
-        this.countryList = res.data
-      })
     },
     changeTime(val) {
       if (val) {

From 11d55cd01bfb65c3e1e848a36f36caee66c08e99 Mon Sep 17 00:00:00 2001
From: woody <woody@163>
Date: Tue, 20 May 2025 15:01:37 +0800
Subject: [PATCH 21/22] =?UTF-8?q?feat(member):=20=E5=90=8E=E5=8F=B0?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86=E7=A7=BB=E9=99=A4=E4=BC=9A=E5=91=98=E6=98=B5?=
 =?UTF-8?q?=E7=A7=B0=E5=88=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../configManage/serviceNumber/index.vue      | 192 +++++++++---------
 src/views/information/member/index.vue        |   6 -
 2 files changed, 93 insertions(+), 105 deletions(-)

diff --git a/src/views/configManage/serviceNumber/index.vue b/src/views/configManage/serviceNumber/index.vue
index edcd03b..8c23567 100644
--- a/src/views/configManage/serviceNumber/index.vue
+++ b/src/views/configManage/serviceNumber/index.vue
@@ -2,43 +2,41 @@
   <div class="page">
     <topBar
       v-if="topList.length > 0"
-      :topList="topList"
+      :top-list="topList"
       :moren="moren"
-    ></topBar>
+    />
     <div class="main">
       <div class="form_all">
         <el-form ref="select" :model="select" label-width="auto">
           <el-row :gutter="10">
             <el-col :span="4">
               <el-form-item label="服务编号">
-                <el-input clearable v-model="select.serviceCode"></el-input>
+                <el-input v-model="select.serviceCode" clearable />
               </el-form-item>
             </el-col>
             <el-col :span="4">
               <el-form-item :label="'会员编号'">
-                <el-input clearable v-model="select.memberCode"></el-input>
+                <el-input v-model="select.memberCode" clearable />
               </el-form-item>
             </el-col>
             <el-col :span="8">
-            <el-form-item label="创建时间">
-              <el-date-picker
-                v-model="creationTime"
-                @change="changeTime"
-                value-format="yyyy-MM-dd"
-                type="daterange"
-                :clearable="false"
-                :range-separator="'至'"
-                :start-placeholder="'开始日期'"
-                :end-placeholder="'结束日期'"
-              >
-              </el-date-picker>
-            </el-form-item>
-          </el-col>
+              <el-form-item label="创建时间">
+                <el-date-picker
+                  v-model="creationTime"
+                  value-format="yyyy-MM-dd"
+                  type="daterange"
+                  :clearable="false"
+                  :range-separator="'至'"
+                  :start-placeholder="'开始日期'"
+                  :end-placeholder="'结束日期'"
+                  @change="changeTime"
+                />
+              </el-form-item>
+            </el-col>
 
             <el-col :span="4">
               <el-button type="primary" @click="getList">
-                {{ '搜索' }}</el-button
-              >
+                {{ '搜索' }}</el-button>
               <el-button type="" @click="reset"> {{ '重置' }}</el-button>
             </el-col>
           </el-row>
@@ -49,30 +47,28 @@
           <el-button
             v-has-buttons="['ServiceNumberAdd']"
             size="small"
-            @click="openDig"
             class="addBtn"
-            >{{ '添加' }}</el-button
-          >
+            @click="openDig"
+          >{{ '添加' }}</el-button>
           <el-button
-            size="small"
-            @click="handleExport"
             v-hasButtons="['ServiceNumberExport']"
+            size="small"
             class="exportBtn"
+            @click="handleExport"
           >
-            {{ '导出' }}</el-button
-          >
+            {{ '导出' }}</el-button>
         </div>
       </div>
       <div class="maintable">
         <el-table
-          :data="tableData"
           v-loading="loading"
+          :data="tableData"
           style="width: 100%"
           :header-cell-style="{ background: '#EEEEEE' }"
           :row-class-name="tableRowClassName"
           @selection-change="handleSelectionChange"
         >
-          <el-table-column type="selection" width="55"> </el-table-column>
+          <el-table-column type="selection" width="55" />
           <el-table-column align="center" prop="serviceCode" label="服务编号" />
           <el-table-column
             align="center"
@@ -85,7 +81,6 @@
             :label="'会员姓名'"
           />
 
-          <el-table-column align="center" prop="nickName" label="会员昵称" />
           <el-table-column
             align="center"
             prop="gradeName"
@@ -109,10 +104,10 @@
           >
             <template slot-scope="scope">
               <el-button
-                @click="handleDelete(scope.row.memberCode)"
-                type="text"
                 v-has-buttons="['ServiceNumberDelete']"
+                type="text"
                 size="small"
+                @click="handleDelete(scope.row.memberCode)"
               >
                 {{ '删除' }}
               </el-button>
@@ -142,23 +137,23 @@
           <el-col :span="12">
             <el-form-item :label="'会员编号'" prop="memberCode">
               <el-input
-                clearable
                 v-model="form.memberCode"
+                clearable
                 :placeholder="'请选择'"
                 @blur="checkName"
-              ></el-input>
+              />
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item :label="'会员姓名'">
               <el-input
-                disabled
                 v-model="form.memberName"
+                disabled
                 :placeholder="'请输入会员姓名'"
-              ></el-input>
+              />
             </el-form-item>
           </el-col>
-          
+
         </el-row>
       </el-form>
       <span slot="footer" class="dialog-footer">
@@ -170,63 +165,63 @@
     </el-dialog>
   </div>
 </template>
-    
+
 <script>
-import topBar from "@/components/topBar";
-import * as api from "@/api/configManage.js";
+import topBar from '@/components/topBar'
+import * as api from '@/api/configManage.js'
 export default {
-  name: "ServiceNumber",
+  name: 'ServiceNumber',
   components: {
-    topBar,
+    topBar
   },
   data() {
     return {
-      moren: "serviceNumber",
+      moren: 'serviceNumber',
       topList: [
         {
-          name: "服务编号配置",
-          path: "serviceNumber",
-        },
+          name: '服务编号配置',
+          path: 'serviceNumber'
+        }
       ],
       select: {},
       // 查询参数
       queryParams: {
         pageNum: 1,
-        pageSize: 50,
+        pageSize: 50
       },
       total: 0,
       dialogVisible: false,
       tableData: [],
       loading: false,
       form: {},
-      dialogTitle: "",
+      dialogTitle: '',
       rules: {
         memberCode: [
-          { required: true, message: '请输入', trigger: "blur" },
-        ],
+          { required: true, message: '请输入', trigger: 'blur' }
+        ]
       },
       multipleSelection: [],
-      creationTime: [],
-    };
+      creationTime: []
+    }
   },
   mounted() {
     // 获取列表
-    this.getList();
+    this.getList()
   },
   methods: {
     changeTime(val) {
-      this.select.startDate = val ? val[0] : "";
-      this.select.endDate = val ? val[1] : "";
+      this.select.startDate = val ? val[0] : ''
+      this.select.endDate = val ? val[1] : ''
     },
     checkName() {
       api
         .checkMemberDetail({ memberCode: this.form.memberCode })
         .then((res) => {
-          this.$set(this.form, "memberName", res.data.memberName);
-        });
+          this.$set(this.form, 'memberName', res.data.memberName)
+        })
     },
     handleSelectionChange(val) {
-      this.multipleSelection = val;
+      this.multipleSelection = val
     },
     onSubmit(formName) {
       this.$refs[formName].validate((valid) => {
@@ -235,93 +230,93 @@ export default {
             if (res.code == 200) {
               this.$message({
                 message: res.msg,
-                type: "success",
-              });
-              this.dialogVisible = false;
+                type: 'success'
+              })
+              this.dialogVisible = false
               // 获取列表
-              this.getList();
-              this.$refs[formName].resetFields();
-              this.$refs[formName].clearValidate();
+              this.getList()
+              this.$refs[formName].resetFields()
+              this.$refs[formName].clearValidate()
             }
-          });
+          })
         } else {
-          return false;
+          return false
         }
-      });
+      })
     },
     reset() {
-      this.select = {};
-      this.creationTime = [];
+      this.select = {}
+      this.creationTime = []
       this.queryParams = {
         pageNum: 1,
-        pageSize: 50,
-      };
-      this.getList();
+        pageSize: 50
+      }
+      this.getList()
     },
     // 删除
     handleDelete(code) {
       this.$confirm('确认删除?', '提示', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
-        type: "warning",
+        type: 'warning'
       }).then(() => {
         api
           .delServiceNumber({
-            memberCode: code,
+            memberCode: code
           })
           .then((res) => {
             this.$message({
               message: res.msg,
-              type: "success",
-            });
-            this.getList();
-          });
-      });
+              type: 'success'
+            })
+            this.getList()
+          })
+      })
     },
     openDig() {
-      this.form = {};
-      this.dialogVisible = true;
-      this.dialogTitle = '添加';
+      this.form = {}
+      this.dialogVisible = true
+      this.dialogTitle = '添加'
     },
 
     getList() {
-      this.loading = true;
+      this.loading = true
       api
         .getServiceNumberList(Object.assign({}, this.queryParams, this.select))
         .then((res) => {
-          this.tableData = res.rows;
-          this.total = res.total;
-          this.loading = false;
-        });
+          this.tableData = res.rows
+          this.total = res.total
+          this.loading = false
+        })
     },
     /** 导出按钮操作 */
     handleExport() {
       this.$confirm('是否确认导出所有数据项?', '警告', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
-        type: "warning",
+        type: 'warning'
       }).then((_) => {
         this.download(
-          "/member/manage/member-service-code/export",
+          '/member/manage/member-service-code/export',
           Object.assign({}, this.queryParams, this.select),
           `服务编号配置-${new Date().getTime()}.xlsx`
-        );
-      });
+        )
+      })
     },
     handleClose() {
-      this.dialogVisible = false;
+      this.dialogVisible = false
     },
 
     tableRowClassName({ row, rowIndex }) {
       if (rowIndex % 2 == 1) {
-        return "warning-row";
+        return 'warning-row'
       } else if (rowIndex % 2 == 0) {
-        return "success-row";
+        return 'success-row'
       }
-      return "";
-    },
-  },
-};
+      return ''
+    }
+  }
+}
 </script>
     <style scoped lang="scss">
 ::v-deep .el-table .warning-row {
@@ -455,4 +450,3 @@ export default {
   margin-top: 0;
 }
 </style>
-    
\ No newline at end of file
diff --git a/src/views/information/member/index.vue b/src/views/information/member/index.vue
index 280c784..37d515b 100644
--- a/src/views/information/member/index.vue
+++ b/src/views/information/member/index.vue
@@ -549,12 +549,6 @@
             :label="'会员姓名'"
             width="180"
           />
-          <el-table-column
-            v-if="allTxt.nickName"
-            align="center"
-            prop="nickName"
-            label="会员昵称"
-          />
           <el-table-column
             v-if="allTxt.phone"
             align="center"

From 7336306eaacab255498af97a72b9ff70699d2a56 Mon Sep 17 00:00:00 2001
From: woody <woody@163>
Date: Tue, 20 May 2025 15:53:57 +0800
Subject: [PATCH 22/22] =?UTF-8?q?feat(goodsManage):=20=E5=95=86=E5=93=81?=
 =?UTF-8?q?=E5=8F=91=E5=B8=83=E5=9F=BA=E7=A1=80=E8=AE=BE=E7=BD=AE=E9=9A=90?=
 =?UTF-8?q?=E8=97=8F=E5=8F=91=E8=B5=B7=E4=BA=BA=E6=94=B6=E7=9B=8A=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/goodsManage/goodsList/goodsEdit/jcsz.vue | 4 ++--
 src/views/goodsManage/goodsRelease/jcsz.vue        | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/views/goodsManage/goodsList/goodsEdit/jcsz.vue b/src/views/goodsManage/goodsList/goodsEdit/jcsz.vue
index 7e724e4..98b50d2 100644
--- a/src/views/goodsManage/goodsList/goodsEdit/jcsz.vue
+++ b/src/views/goodsManage/goodsList/goodsEdit/jcsz.vue
@@ -375,7 +375,7 @@
                   </el-select>
                 </el-form-item>
               </el-col>
-              <el-col v-show="form.specialArea == 3" :span="8">
+              <!-- <el-col v-show="form.specialArea == 3" :span="8">
                 <el-form-item label="发起人收益">
                   <el-input
                     v-model="form.makerIncome"
@@ -383,7 +383,7 @@
                     :placeholder="'请输入'"
                   />
                 </el-form-item>
-              </el-col>
+              </el-col> -->
               <el-col :span="24">
                 <el-form-item :label="'保证标签'">
                   <el-checkbox-group
diff --git a/src/views/goodsManage/goodsRelease/jcsz.vue b/src/views/goodsManage/goodsRelease/jcsz.vue
index 64c1cfb..84902e9 100644
--- a/src/views/goodsManage/goodsRelease/jcsz.vue
+++ b/src/views/goodsManage/goodsRelease/jcsz.vue
@@ -359,7 +359,7 @@
                   </el-select>
                 </el-form-item>
               </el-col>
-              <el-col v-show="form.specialArea == 3" :span="8">
+              <!-- <el-col v-show="form.specialArea == 3" :span="8">
                 <el-form-item label="发起人收益">
                   <el-input
                     v-model="form.makerIncome"
@@ -367,7 +367,7 @@
                     :placeholder="'请输入'"
                   />
                 </el-form-item>
-              </el-col>
+              </el-col> -->
               <el-col :span="24">
                 <el-form-item :label="'保证标签'">
                   <el-checkbox-group v-model="form.pkGuaranteeLabel">