From f9ac26a5b4bc9067e631878a401a073c0f2a9ba9 Mon Sep 17 00:00:00 2001
From: woody <woody@163>
Date: Mon, 23 Jun 2025 14:53:30 +0800
Subject: [PATCH] =?UTF-8?q?feat(business):=20=E5=8A=9E=E7=90=86=E4=B8=9A?=
 =?UTF-8?q?=E5=8A=A1=E6=B7=BB=E5=8A=A0=E5=88=86=E5=85=AC=E5=8F=B8=E9=80=89?=
 =?UTF-8?q?=E6=8B=A9=E6=89=80=E5=B1=9E=E7=9C=81=E4=BB=BD=E9=80=89=E6=8B=A9?=
 =?UTF-8?q?=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/information/business/index.vue      | 23 +------------------
 src/views/information/member/index.vue        |  7 ++++++
 .../specialBusiness/emptyOrder/dataList.vue   |  5 +++-
 .../specialBusiness/emptyOrder/index.vue      |  9 +++++---
 4 files changed, 18 insertions(+), 26 deletions(-)

diff --git a/src/views/information/business/index.vue b/src/views/information/business/index.vue
index b4cb6e1..f23fd5b 100644
--- a/src/views/information/business/index.vue
+++ b/src/views/information/business/index.vue
@@ -34,23 +34,7 @@
               </el-select>
             </el-form-item>
           </el-col>
-          <el-col :span="4">
-            <el-form-item :label="'真实奖衔'" prop="pkAwards">
-              <el-select
-                v-model="queryParams.pkAwards"
-                clearable
-                :placeholder="'请选择'"
-              >
-                <el-option
-                  v-for="item in awardsList"
-                  :key="item.pkId"
-                  :label="item.awardsName"
-                  :value="item.pkId"
-                />
-              </el-select>
-              <!-- <el-input clearable v-model="queryParams.pkAwards"></el-input> -->
-            </el-form-item>
-          </el-col>
+
           <el-col :span="4">
             <el-form-item :label="'隶属体系'" prop="vertexId">
               <el-select
@@ -245,11 +229,6 @@
             prop="pkRegisterGradeVal"
             :label="'结算等级'"
           />
-          <el-table-column
-            align="center"
-            prop="pkAwardsVal"
-            :label="'真实奖衔'"
-          />
 
           <el-table-column
             align="center"
diff --git a/src/views/information/member/index.vue b/src/views/information/member/index.vue
index 5f5433a..6294d85 100644
--- a/src/views/information/member/index.vue
+++ b/src/views/information/member/index.vue
@@ -497,6 +497,13 @@
             :label="'收益状态'"
             width="180"
           />
+          <el-table-column
+            v-if="allTxt.incomeStatusVal"
+            align="center"
+            prop="areaName"
+            label="分公司所属省份"
+            width="180"
+          />
           <el-table-column
             v-if="allTxt.creationTime"
             align="center"
diff --git a/src/views/information/specialBusiness/emptyOrder/dataList.vue b/src/views/information/specialBusiness/emptyOrder/dataList.vue
index ed9d55c..01323f4 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, index) => {
         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, index, item)
       })
     },
     handleSelectionChange(val) {
diff --git a/src/views/information/specialBusiness/emptyOrder/index.vue b/src/views/information/specialBusiness/emptyOrder/index.vue
index 58d6c34..2b72391 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"
@@ -1702,7 +1702,7 @@ export default {
       }
     },
     changeAllData() {
-      this.tableData.forEach((item) => {
+      this.tableData.forEach((item, index) => {
         item.autoFlag = ''
         item.autoFlagVal = ''
         if (this.changeData.placeDept != '') {
@@ -1782,6 +1782,9 @@ export default {
           item.autoFlagVal = this.changeData.autoFlagVal
           this.$forceUpdate()
         }
+        item.autoFlag = 1
+        item.autoFlagVal = '否'
+        this.$set(this.tableData, index, item)
       })
     },
     handleSelectionChange(val) {