diff --git a/resources/assets/js/App.vue b/resources/assets/js/App.vue index f0a34f7c5..effe749f1 100755 --- a/resources/assets/js/App.vue +++ b/resources/assets/js/App.vue @@ -298,14 +298,14 @@ export default { } } // 会议事件 - window.__onMeetingEvent = ({act,uuid}) => { + window.__onMeetingEvent = ({act, uuid}) => { switch (act) { // 获取用户信息 - case "getInfo": + case "getInfo": this.$store.dispatch("call", { url: 'users/basic', data: { - userid: [ (uuid+"").substring(6) ] + userid: [(uuid + "").substring(6)] } }).then(({data}) => { $A.eeuiAppSendMessage({ @@ -321,22 +321,22 @@ export default { }); break; //加入成功 - case "success": + case "success": // 关闭添加会议窗口 - this.$store.dispatch("closeMeetingWindow","add") + this.$store.dispatch("closeMeetingWindow", "add") break; // 邀请 - case "invent": + case "invent": // 关闭邀请会议窗口 - this.$store.dispatch("closeMeetingWindow","invitation") + this.$store.dispatch("closeMeetingWindow", "invitation") break; //结束会议 - case "endMeeting": - + case "endMeeting": + break; //加入失败 - case "error": - this.$store.dispatch("closeMeetingWindow","error") + case "error": + this.$store.dispatch("closeMeetingWindow", "error") break; default: break; diff --git a/resources/assets/js/pages/manage/approve/index.vue b/resources/assets/js/pages/manage/approve/index.vue index 86801b788..1ae7e30f4 100644 --- a/resources/assets/js/pages/manage/approve/index.vue +++ b/resources/assets/js/pages/manage/approve/index.vue @@ -134,11 +134,11 @@
- @@ -180,7 +180,7 @@
- + @@ -189,7 +189,7 @@ import list from "./list.vue"; import listDetails from "./details.vue"; import DrawerOverlay from "../../../components/DrawerOverlay"; import ImgUpload from "../../../components/ImgUpload"; -import { mapState } from 'vuex' +import {mapState} from 'vuex' export default { components:{list,listDetails,DrawerOverlay,ImgUpload}, @@ -208,7 +208,7 @@ export default { loadIng:false, tabsValue:"", - // + // approvalType:"all", approvalList:[ {value:"all",label:this.$L("全部审批")}, @@ -223,16 +223,16 @@ export default { {value:3,label:this.$L("已拒绝")}, {value:4,label:this.$L("已撤回")} ], - // + // unreadTotal:0, unreadList: [], doneList:[], notifyList:[], initiatedList: [], - // + // details:{}, detailsShow:false, - // + // addTitle:'', addShow:false, startTimeOpen:false, @@ -259,7 +259,7 @@ export default { }, selectTypes:["年假","事假","病假","调休","产假","陪产假","婚假","丧假","哺乳假"], - // + // showDateTime:false } }, @@ -347,7 +347,7 @@ export default { this.notifyList.map(h=>{ h._active = false; }) this.initiatedList.map(h=>{ h._active = false; }) item._active = true; - // + // if( window.innerWidth < 426 ){ this.goForward({name: 'manage-approve-details', query: { id: item.id } }); return; @@ -378,7 +378,7 @@ export default { this.unreadList?.map((res)=>{ if(res._active) activeId = res.id }) } this.unreadList = data.rows.map((h,index)=>{ - h._active = activeId > 0 ? h.id == activeId : index == 0; + h._active = activeId > 0 ? h.id == activeId : index == 0; if(h._active) activeIndex = index return h; }) @@ -414,7 +414,7 @@ export default { this.doneList?.map((res)=>{ if(res._active) activeId = res.id }) } this.doneList = data.rows.map((h,index)=>{ - h._active = activeId > 0 ? h.id == activeId : index == 0; + h._active = activeId > 0 ? h.id == activeId : index == 0; if(h._active) activeIndex = index return h; }) @@ -447,7 +447,7 @@ export default { this.notifyList?.map((res)=>{ if(res._active) activeId = res.id }) } this.notifyList = data.rows.map((h,index)=>{ - h._active = activeId > 0 ? h.id == activeId : index == 0; + h._active = activeId > 0 ? h.id == activeId : index == 0; if(h._active) activeIndex = index return h; }) @@ -481,7 +481,7 @@ export default { this.initiatedList?.map((res)=>{ if(res._active) activeId = res.id }) } this.initiatedList = data.rows.map((h,index)=>{ - h._active = activeId > 0 ? h.id == activeId : index == 0; + h._active = activeId > 0 ? h.id == activeId : index == 0; if(h._active) activeIndex = index return h; }) @@ -536,7 +536,7 @@ export default { if (valid) { this.loadIng = 1; var obj = JSON.parse(JSON.stringify(this.addData)) - + obj.startTime = obj.startTime +" "+ obj.startTimeHour + ":" + obj.startTimeMinute; obj.endTime = obj.endTime +" "+ obj.endTimeHour + ":" + obj.endTimeMinute; @@ -568,7 +568,7 @@ export default { }); } - + }, } diff --git a/resources/assets/js/pages/manage/components/MeetingManager.vue b/resources/assets/js/pages/manage/components/MeetingManager.vue index 5e7eceedf..92ac8e831 100644 --- a/resources/assets/js/pages/manage/components/MeetingManager.vue +++ b/resources/assets/js/pages/manage/components/MeetingManager.vue @@ -117,7 +117,7 @@