RangTang
/
ddfwxt
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

mergeDxdbV430

This commit is contained in:
jiangrui 2021-04-30 10:04:35 +08:00
parent 6ff7470715
commit a8e4311e21
1 changed files with 0 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/views/convenience/detail.vue
View File

@ -944,11 +944,7 @@ export default {
this.getStaffList(); this.getStaffList();
this.getCommunicationList(); this.getCommunicationList();
this.getTypeList(); this.getTypeList();
<<<<<<< HEAD
this.getRegions();
=======
this.getRegionList(); this.getRegionList();
>>>>>>> dxdb
}, },
methods: { methods: {
getInfo() { getInfo() {
@ -1439,14 +1435,6 @@ export default {
// this.$refs.eventTypeRef.focusFirstNode(); // this.$refs.eventTypeRef.focusFirstNode();
}, 100); }, 100);
}, },
<<<<<<< HEAD
// -----------------------
getRegions(){
getRegionList('CONVENIENCE').then(res=>{
console.log(res);
})
=======
getRegionList() { getRegionList() {
getRegions().then(res => { getRegions().then(res => {
const tempData = res.d; const tempData = res.d;
@ -1498,7 +1486,6 @@ export default {
handleRegionChange(val) { handleRegionChange(val) {
this.staffQuery.regionIds = val.join(","); this.staffQuery.regionIds = val.join(",");
this.getStaffList(); this.getStaffList();
>>>>>>> dxdb
} }
}, },
beforeRouteLeave(to, from, next) { beforeRouteLeave(to, from, next) {