angelo
/
web-retail-admin
3
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

This commit is contained in:
woody 2025-06-23 13:43:34 +08:00
parent 623d749694 26ed9693e9
commit bb76157638
3 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/views/information/member/index.vue
View File

@ -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"

5
src/views/information/specialBusiness/emptyOrder/dataList.vue
View File

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

7
src/views/information/specialBusiness/emptyOrder/index.vue
View File

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