Commit fb3f4fe2 by 陈羽

Merge branch 'feature/销售线索4' into dev

# Conflicts:
#	src/views/apps/customerApp/memberTagSet.vue
parents bc974baa 86ec9534
......@@ -214,7 +214,6 @@ export default {
syncStatus: this.syncStatus,
search: this.search
};
tagList(params)
.then(res => {
this.total = res.data.result.totalCount;
......@@ -307,7 +306,7 @@ export default {
setTimeout(() => (this.isShake = false), 300);
},
rowCheckChange(row, column, event) {
if (this.canSync && row.syncFlag === 0 && row.tagItems.length) {
if (this.canSync && row.syncFlag === 0 && row.tagItems.length && this.canUseCount) {
this.$refs.table.toggleRowSelection(row);
row.check = !row.check;
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment