From 8f9732b6be3cf6984757305e87fb1919f939933e Mon Sep 17 00:00:00 2001
From: cabbage <281119120@qq.com>
Date: Thu, 19 Jun 2025 16:06:45 +0800
Subject: [PATCH 1/4] =?UTF-8?q?##=20=E4=BC=9A=E5=91=98=E4=BF=A1=E6=81=AF?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=88=86=E7=BA=A2=E5=A5=96=E8=A1=94=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/information/member/index.vue | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/views/information/member/index.vue b/src/views/information/member/index.vue
index be59a4d..955f4c3 100644
--- a/src/views/information/member/index.vue
+++ b/src/views/information/member/index.vue
@@ -443,13 +443,19 @@
             align="center"
             prop="pkAwardsVal"
             :label="$t('当月奖衔')"
-            width="180"
+            width="160"
+          />
+          <el-table-column
+            align="center"
+            prop="pkRangeAwardsVal"
+            :label="$t('分红奖衔')"
+            width="160"
           />
           <el-table-column
             align="center"
             prop="pkMaxAwardsVal"
             :label="$t('荣誉奖衔')"
-            width="180"
+            width="160"
           />
           <el-table-column
             v-if="allTxt.orderSourceVal"

From 759e4b9dd814b523c4855dd9100fd7be3845b5d4 Mon Sep 17 00:00:00 2001
From: woody <woody@163>
Date: Sat, 21 Jun 2025 09:43:00 +0800
Subject: [PATCH 2/4] =?UTF-8?q?fix(member):=20=E7=BB=93=E7=AE=97=E7=AD=89?=
 =?UTF-8?q?=E7=BA=A7=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/information/member/index.vue | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/views/information/member/index.vue b/src/views/information/member/index.vue
index 955f4c3..190618b 100644
--- a/src/views/information/member/index.vue
+++ b/src/views/information/member/index.vue
@@ -64,7 +64,7 @@
           <el-col :span="4">
             <el-form-item :label="'结算等级'" prop="pkMaxAwards">
               <el-select
-                v-model="queryParams.pkgettleGrade"
+                v-model="queryParams.pkSettleGrade"
                 clearable
                 :placeholder="'请选择'"
               >
@@ -472,9 +472,9 @@
             width="180"
           />
           <el-table-column
-            v-if="menuList[4].checked == true && allTxt.pkgettleGradeval"
+            v-if="menuList[4].checked == true && allTxt.pkSettleGradeVal"
             align="center"
-            prop="pkgettleGradeval"
+            prop="pkSettleGradeVal"
             :label="'结算等级'"
             width="180"
           />
@@ -781,7 +781,7 @@ export default {
           id: 4,
           text: '结算等级',
           checked: true,
-          prop: 'pkgettleGradeval'
+          prop: 'pkSettleGradeVal'
         },
         {
           id: 5,
@@ -875,7 +875,7 @@ export default {
         phone: '', // 联系方式
         changeNumber: '', // 变更次数
         pkRegisterGrade: '', // 注册等级
-        pkgettleGrade: '', // 结算等级
+        pkSettleGrade: '', // 结算等级
         pkAwards: '', // 真实奖衔
         vertexId: '', // 隶属体系
         teamId: '', // 隶属团队

From a23a9452137df25d51a773d46a267e19a8dd0d44 Mon Sep 17 00:00:00 2001
From: woody <woody@163>
Date: Mon, 23 Jun 2025 09:26:23 +0800
Subject: [PATCH 3/4] =?UTF-8?q?fix(emptyOrder):=20=E7=A9=BA=E5=8D=95?=
 =?UTF-8?q?=E6=B3=A8=E5=86=8C=E6=98=AF=E5=90=A6=E6=BF=80=E6=B4=BB=E9=BB=98?=
 =?UTF-8?q?=E8=AE=A4=E4=B8=BA=E5=90=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../information/specialBusiness/emptyOrder/dataList.vue     | 6 ++++--
 src/views/information/specialBusiness/emptyOrder/index.vue  | 6 ++++--
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/views/information/specialBusiness/emptyOrder/dataList.vue b/src/views/information/specialBusiness/emptyOrder/dataList.vue
index ed9d55c..2cebe2f 100644
--- a/src/views/information/specialBusiness/emptyOrder/dataList.vue
+++ b/src/views/information/specialBusiness/emptyOrder/dataList.vue
@@ -788,7 +788,7 @@
               <div v-else>{{ scope.row.recAddress }}</div>
             </template>
           </el-table-column>
-          <el-table-column
+          <!-- <el-table-column
             align="center"
             width="150"
             prop="autoFlag"
@@ -825,7 +825,7 @@
               </el-select>
               <div v-else>{{ scope.row.autoFlagVal }}</div>
             </template>
-          </el-table-column>
+          </el-table-column> -->
           <el-table-column
             align="center"
             width="150"
@@ -1975,6 +1975,8 @@ export default {
             parentCode: '',
             placeParentCode: '',
             placeDept: '',
+            autoFlag: 1,
+            autoFlagVal: '否',
             // pkSettleCountry: this.userPkCountry,
             // pkSettleCountryName: this.userPkCountryName,
             pkCountry: this.userPkCountry,
diff --git a/src/views/information/specialBusiness/emptyOrder/index.vue b/src/views/information/specialBusiness/emptyOrder/index.vue
index 58d6c34..b53ad23 100644
--- a/src/views/information/specialBusiness/emptyOrder/index.vue
+++ b/src/views/information/specialBusiness/emptyOrder/index.vue
@@ -894,7 +894,7 @@
               <div v-else>{{ scope.row.recAddress }}</div>
             </template>
           </el-table-column>
-          <el-table-column
+          <!-- <el-table-column
             align="center"
             width="150"
             prop="autoFlag"
@@ -935,7 +935,7 @@
               </el-select>
               <div v-else>{{ scope.row.autoFlagVal }}</div>
             </template>
-          </el-table-column>
+          </el-table-column> -->
           <el-table-column
             align="center"
             width="150"
@@ -2112,6 +2112,8 @@ export default {
             parentCode: '',
             placeParentCode: '',
             placeDept: '',
+            autoFlag: 1,
+            autoFlagVal: '否',
             // pkSettleCountry: this.userPkCountry,
             // pkSettleCountryName: this.userPkCountryName,
             pkCountry: this.userPkCountry,

From 26ed9693e96f85c00faf5d94e25dfda5bd89833e Mon Sep 17 00:00:00 2001
From: woody <woody@163>
Date: Mon, 23 Jun 2025 11:54:03 +0800
Subject: [PATCH 4/4] =?UTF-8?q?fix(emptyOrder):=20=E7=A9=BA=E5=8D=95?=
 =?UTF-8?q?=E6=B3=A8=E5=86=8C=E6=89=B9=E9=87=8F=E6=93=8D=E4=BD=9C=E9=BB=98?=
 =?UTF-8?q?=E8=AE=A4=E5=80=BC=E9=97=AE=E9=A2=98=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../information/specialBusiness/emptyOrder/dataList.vue    | 5 ++++-
 src/views/information/specialBusiness/emptyOrder/index.vue | 7 ++++---
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/views/information/specialBusiness/emptyOrder/dataList.vue b/src/views/information/specialBusiness/emptyOrder/dataList.vue
index 2cebe2f..ace27ab 100644
--- a/src/views/information/specialBusiness/emptyOrder/dataList.vue
+++ b/src/views/information/specialBusiness/emptyOrder/dataList.vue
@@ -1558,7 +1558,7 @@ export default {
       }
     },
     changeAllData() {
-      this.tableData.forEach((item) => {
+      this.tableData.forEach((item, idx) => {
         if (this.changeData.placeDept != '') {
           item.placeDept = this.changeData.placeDept
           item.placeDeptVal = this.changeData.placeDeptVal
@@ -1634,6 +1634,9 @@ export default {
           item.autoFlag = this.changeData.autoFlag
           item.autoFlagVal = this.changeData.autoFlagVal
         }
+        item.autoFlag = 1
+        item.autoFlagVal = '否'
+        this.$set(this.tableData, idx, item)
       })
     },
     handleSelectionChange(val) {
diff --git a/src/views/information/specialBusiness/emptyOrder/index.vue b/src/views/information/specialBusiness/emptyOrder/index.vue
index b53ad23..3c8356f 100644
--- a/src/views/information/specialBusiness/emptyOrder/index.vue
+++ b/src/views/information/specialBusiness/emptyOrder/index.vue
@@ -1702,9 +1702,7 @@ export default {
       }
     },
     changeAllData() {
-      this.tableData.forEach((item) => {
-        item.autoFlag = ''
-        item.autoFlagVal = ''
+      this.tableData.forEach((item, idx) => {
         if (this.changeData.placeDept != '') {
           item.placeDept = this.changeData.placeDept
           item.placeDeptVal = this.changeData.placeDeptVal
@@ -1782,6 +1780,9 @@ export default {
           item.autoFlagVal = this.changeData.autoFlagVal
           this.$forceUpdate()
         }
+        item.autoFlag = 1
+        item.autoFlagVal = '否'
+        this.$set(this.tableData, idx, item)
       })
     },
     handleSelectionChange(val) {