diff --git a/src/views/layout/components/Navbar.vue b/src/views/layout/components/Navbar.vue index e1d8623c..03911bfc 100644 --- a/src/views/layout/components/Navbar.vue +++ b/src/views/layout/components/Navbar.vue @@ -9,13 +9,13 @@
@@ -157,7 +157,7 @@ export default { 'myPosts', 'myLocations', 'myShops', - 'workShop' + 'userInfo' ]), 'deptPostsTree':function(){ var deptPostsTree=[] @@ -240,13 +240,13 @@ export default { }, sureMethod(row) { this.selectShopVisible = false; - this.workShop.shopId=row.shopId; - this.workShop.branchId=row.branchId; - this.workShop.branchName=row.sysBranchName; - this.workShop.locationId=row.id; - this.workShop.deptid=row.deptid; - this.workShop.locationName=row.businessName; - this.$store.commit('SET_WORK_SHOP',this.workShop); + this.userInfo.shopId=row.shopId; + this.userInfo.branchId=row.branchId; + this.userInfo.branchName=row.sysBranchName; + this.userInfo.locationId=row.id; + this.userInfo.deptid=row.deptid; + this.userInfo.locationName=row.businessName; + this.$store.commit('SET_WORK_SHOP',this.userInfo); }, jumpToOtherSystem(name) { let href = window.location.protocol + "//" + window.location.host + "/" + name + "/" + process.env.VERSION; diff --git a/src/views/mdp/arc/category/CategoryTree.vue b/src/views/mdp/arc/category/CategoryTree.vue index 21b58f8c..bdb1f5e2 100644 --- a/src/views/mdp/arc/category/CategoryTree.vue +++ b/src/views/mdp/arc/category/CategoryTree.vue @@ -116,7 +116,7 @@ return this.nodeKey?this.nodeKey:'id' }, ...mapGetters([ - 'workShop' + 'userInfo' ]) }, props: ['value','isLeaf','visible','nodeKey','showCount','countTips','showFilter','rootKey','multiple','checkedKeys','refresh','defaultExpandAll','expandOnClickNode','showCheckbox','indent'], @@ -182,7 +182,7 @@ this.addCategory.isShow='1' this.addCategory.branchId=this.currentCategory.branchId if(!this.addCategory.branchId){ - this.addCategory.branchId=this.workShop.branchId + this.addCategory.branchId=this.userInfo.branchId } this.$refs.addCategory.validate((valid) => { if (valid) { @@ -250,7 +250,7 @@ branchId:data.branchId } if(!params.branchId){ - params.branchId=this.workShop.branchId + params.branchId=this.userInfo.branchId } this.$confirm('确认删除吗？', '提示', {}).then(() => { delCategory(params).then(res=>{ @@ -276,7 +276,7 @@ } let params = { id: id, - branchId:this.workShop.branchId, + branchId:this.userInfo.branchId, }; if(refresh){ params.refresh=true; diff --git a/src/views/mdp/arc/tag/TagDialog.vue b/src/views/mdp/arc/tag/TagDialog.vue index bc3a4ed2..42f787c0 100644 --- a/src/views/mdp/arc/tag/TagDialog.vue +++ b/src/views/mdp/arc/tag/TagDialog.vue @@ -16,7 +16,7 @@ name:"tagDialog", computed: { ...mapGetters([ - 'workShop', 'userInfo' + 'userInfo', 'userInfo' ]) }, // diff --git a/src/views/mdp/arc/tag/TagMng.vue b/src/views/mdp/arc/tag/TagMng.vue index 737f293c..ab129ae1 100644 --- a/src/views/mdp/arc/tag/TagMng.vue +++ b/src/views/mdp/arc/tag/TagMng.vue @@ -124,7 +124,7 @@ export default { computed: { ...mapGetters([ - 'workShop', 'userInfo' + 'userInfo', 'userInfo' ]) }, // @@ -265,8 +265,8 @@ //params.xxx=xxxxx } - params.shopId = this.workShop.shopId; - params.branchId = this.workShop.branchId; + params.shopId = this.userInfo.shopId; + params.branchId = this.userInfo.branchId; this.sectionLoading = true; this.convertTags = []; getAllTag(params).then((res) => { @@ -450,8 +450,8 @@ let tagName = this.convertTags[index].showAddButtonInputValue; let categoryId = this.convertTags[index].categoryId; let params = { - "branchId": that.workShop.branchId, - "shopId": that.workShop.shopId, + "branchId": that.userInfo.branchId, + "shopId": that.userInfo.shopId, "categoryId": categoryId, "tagName": tagName, "isPub": this.isPub @@ -554,8 +554,8 @@ return; } let params = { - "branchId": this.workShop.branchId, - "shopId": this.workShop.shopId, + "branchId": this.userInfo.branchId, + "shopId": this.userInfo.shopId, "categoryName": this.needAddTagCategoryNameInputValue, "isPub": this.isPub }; @@ -604,8 +604,8 @@ return; }; let params = { - "shopId": this.workShop.shopId, - "branchId": this.workShop.branchId, + "shopId": this.userInfo.shopId, + "branchId": this.userInfo.branchId, "id": categoryId } if (!this.userInfo.isPlatformAdmin && !this.userInfo.isSuperAdmin) { diff --git a/src/views/mdp/sms/SendSms.vue b/src/views/mdp/sms/SendSms.vue index 9ac5f774..6121c42d 100644 --- a/src/views/mdp/sms/SendSms.vue +++ b/src/views/mdp/sms/SendSms.vue @@ -113,7 +113,7 @@ export default { computed: { ...mapGetters([ - 'workShop' + 'userInfo' ]) }, props: ['visible', 'smsBodyParams','smsUserList','loadPhonenoByUserid'], @@ -177,9 +177,9 @@ this.getSmsTemplates(); }, showSendDialogVisibleMethod() { - this.shopId = this.workShop.shopId; - this.locationId = this.workShop.locationId; - this.branchId = this.workShop.branchId; + this.shopId = this.userInfo.shopId; + this.locationId = this.userInfo.locationId; + this.branchId = this.userInfo.branchId; this.sendSmsVisible = true; //获取短信签名 this.getSmsSigns(); @@ -278,7 +278,7 @@ "smsTemplateId": this.smsTemplatesSelectValue.id, "smsTtemplateText": this.smsTemplatesSelectValue.text, "nationCode": "86", - "userid": this.workShop.userid, + "userid": this.userInfo.userid, "branchId": this.smsTemplatesSelectValue.branchId, "shopId": this.smsTemplatesSelectValue.shopId, "locationId": this.smsTemplatesSelectValue.locationId, @@ -312,9 +312,9 @@ //查询短信模板 getSmsTemplates() { let params = { - "shopId": this.workShop.shopId, - "locationId": this.workShop.locationId, - "branchId": this.workShop.branchId, + "shopId": this.userInfo.shopId, + "locationId": this.userInfo.locationId, + "branchId": this.userInfo.branchId, "status": "0" }; this.finallyShowContent = ''; @@ -338,7 +338,7 @@ getSmsSigns() { let params = { "status": "0", - "shopId": this.workShop.shopId + "shopId": this.userInfo.shopId }; this.smsSignsOptions = []; listSmsSign(params).then((res) => { @@ -382,7 +382,7 @@ this.mobilesStr = ''; if(this.loadPhonenoByUserid==true){ let userids=this.smsUserList.map(user=>user.userid); - listUser({userids:userids,branchId:this.workShop.branchId}).then(res=>{ + listUser({userids:userids,branchId:this.userInfo.branchId}).then(res=>{ if(res.data.tips.isOk){ let users=res.data.data; let phonenoList=users.map(user=>user.phoneno); diff --git a/src/views/xm/core/skill/skillMng.vue b/src/views/xm/core/skill/skillMng.vue index 2eef7d0e..2a1ae77d 100644 --- a/src/views/xm/core/skill/skillMng.vue +++ b/src/views/xm/core/skill/skillMng.vue @@ -116,7 +116,7 @@ import { mapGetters } from "vuex"; import { addHrSkillCategory } from "@/api/xm/core/hrSkillCategory"; export default { computed: { - ...mapGetters(["workShop", "userInfo"]), + ...mapGetters(["userInfo", "userInfo"]), }, props: ["jump", "visible", "skillIds"], @@ -158,7 +158,7 @@ export default { methods: { getAllHrSkill() { let params = {}; - params.branchId = this.workShop.branchId; + params.branchId = this.userInfo.branchId; this.sectionLoading = true; getAllHrSkill(params) .then((res) => { @@ -256,8 +256,8 @@ export default { return; } let params = { - branchId: this.workShop.branchId, - shopId: this.workShop.shopId, + branchId: this.userInfo.branchId, + shopId: this.userInfo.shopId, categoryName: this.needAddTagCategoryNameInputValue, isPub: this.isPub, }; @@ -293,8 +293,8 @@ export default { return; } let params = { - shopId: this.workShop.shopId, - branchId: this.workShop.branchId, + shopId: this.userInfo.shopId, + branchId: this.userInfo.branchId, id: categoryId, }; this.$confirm( @@ -361,8 +361,8 @@ export default { let skillName = this.convertSkills[index].showAddButtonInputValue; let categoryId = this.convertSkills[index].categoryId; let params = { - branchId: that.workShop.branchId, - shopId: that.workShop.shopId, + branchId: that.userInfo.branchId, + shopId: that.userInfo.shopId, categoryId: categoryId, skillName: skillName, isPub: this.isPub, diff --git a/src/views/xm/core/xmGroup/XmGroupDialog.vue b/src/views/xm/core/xmGroup/XmGroupDialog.vue index ccb739f3..dad8b331 100644 --- a/src/views/xm/core/xmGroup/XmGroupDialog.vue +++ b/src/views/xm/core/xmGroup/XmGroupDialog.vue @@ -16,7 +16,7 @@ name:"tagDialog", computed: { ...mapGetters([ - 'workShop', 'userInfo' + 'userInfo', 'userInfo' ]) }, // diff --git a/src/views/xm/core/xmGroup/XmGroupSelect.vue b/src/views/xm/core/xmGroup/XmGroupSelect.vue index 2b99902c..acb7ca30 100644 --- a/src/views/xm/core/xmGroup/XmGroupSelect.vue +++ b/src/views/xm/core/xmGroup/XmGroupSelect.vue @@ -36,7 +36,7 @@ import XmProductSelect from '@/views/xm/core/components/XmProductSelect.vue' export default { computed: { ...mapGetters([ - 'workShop','userInfo','roles' + 'userInfo','userInfo','roles' ]) }, //