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 1/6] =?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 2/6] =?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 3/6] =?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 4/6] =?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 5/6] =?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 6/6] =?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>