Merge branch 'test' of 47.94.45.65:angelo/web-retail-admin into base-online

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"

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) {

src/views/information/specialBusiness/emptyOrder/index.vue

@@ -1702,9 +1702,7 @@ export default {
       }
     },
     changeAllData() {
-      this.tableData.forEach((item) => {
+      this.tableData.forEach((item, idx) => {
-        item.autoFlag = ''
-        item.autoFlagVal = ''
         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) {