修改禅道已知bug
This commit is contained in:
@@ -261,7 +261,8 @@
|
|||||||
watch: {
|
watch: {
|
||||||
currentPersonRole: {
|
currentPersonRole: {
|
||||||
handler: function() {
|
handler: function() {
|
||||||
this.getTableList();
|
console.log(123)
|
||||||
|
this.getTableList()
|
||||||
},
|
},
|
||||||
immediate: true
|
immediate: true
|
||||||
}
|
}
|
||||||
@@ -413,7 +414,9 @@
|
|||||||
if (res.success) {
|
if (res.success) {
|
||||||
if (res.result && res.result.userType) {
|
if (res.result && res.result.userType) {
|
||||||
this.getTableList(res.result.userType)
|
this.getTableList(res.result.userType)
|
||||||
|
console.log(11)
|
||||||
} else {
|
} else {
|
||||||
|
console.log(222)
|
||||||
this.getTableList(result[0].value)
|
this.getTableList(result[0].value)
|
||||||
}
|
}
|
||||||
this.$emit('LoginUserType', result, this.currentPersonRole, res.result.userType)
|
this.$emit('LoginUserType', result, this.currentPersonRole, res.result.userType)
|
||||||
@@ -532,7 +535,9 @@
|
|||||||
this.dataSource = tt
|
this.dataSource = tt
|
||||||
this.total = res.result.total
|
this.total = res.result.total
|
||||||
this.selectedRowKeys = []
|
this.selectedRowKeys = []
|
||||||
|
setTimeout(() => {
|
||||||
this.loading = false
|
this.loading = false
|
||||||
|
}, 500)
|
||||||
} else {
|
} else {
|
||||||
this.loading = false
|
this.loading = false
|
||||||
}
|
}
|
||||||
@@ -616,7 +621,9 @@
|
|||||||
this.selectedRowrowValue = []
|
this.selectedRowrowValue = []
|
||||||
this.$emit('value', this.selectedRowKeys)
|
this.$emit('value', this.selectedRowKeys)
|
||||||
this.$emit('rowValue', this.selectedRowrowValue)
|
this.$emit('rowValue', this.selectedRowrowValue)
|
||||||
|
setTimeout(() => {
|
||||||
this.loading = false
|
this.loading = false
|
||||||
|
}, 500)
|
||||||
} else {
|
} else {
|
||||||
this.loading = false
|
this.loading = false
|
||||||
}
|
}
|
||||||
@@ -638,7 +645,7 @@
|
|||||||
detailClick(item, index) {
|
detailClick(item, index) {
|
||||||
// this.$emit('detailClick', item)
|
// this.$emit('detailClick', item)
|
||||||
}
|
}
|
||||||
},
|
}
|
||||||
}
|
}
|
||||||
</script>
|
</script>
|
||||||
<style lang='less'>
|
<style lang='less'>
|
||||||
@@ -734,9 +741,11 @@
|
|||||||
transform: none !important;
|
transform: none !important;
|
||||||
bottom: 0;
|
bottom: 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
.rowClassRed {
|
.rowClassRed {
|
||||||
background: #f3d9de;
|
background: #f3d9de;
|
||||||
}
|
}
|
||||||
|
|
||||||
.rowClassRedYellow {
|
.rowClassRedYellow {
|
||||||
background: yellow;
|
background: yellow;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -817,7 +817,7 @@
|
|||||||
LoginUserType(val, currentPersonRole,userType) {
|
LoginUserType(val, currentPersonRole,userType) {
|
||||||
this.RoleType = []
|
this.RoleType = []
|
||||||
if (this.currentPersonRole == '') {
|
if (this.currentPersonRole == '') {
|
||||||
this.currentPersonRole = val.length >= 1 ? val[0].value : ''
|
this.currentPersonRole = currentPersonRole || userType || val[0].value
|
||||||
}
|
}
|
||||||
this.RoleType = val
|
this.RoleType = val
|
||||||
this.formInlineRoleSwitching.roleSwitchingCode = currentPersonRole || userType || val[0].value
|
this.formInlineRoleSwitching.roleSwitchingCode = currentPersonRole || userType || val[0].value
|
||||||
|
|||||||
Reference in New Issue
Block a user