From 4ba6db00e8bee7dd95a6ebd4dc95c62c1162027e Mon Sep 17 00:00:00 2001 From: gongdi <410827992@qq.com> Date: Fri, 18 Feb 2022 08:01:30 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B4=8B=E6=B5=A6=E5=AD=A6=E6=A0=A1=20?= =?UTF-8?q?=E5=BE=85=E5=8A=9E=E5=B7=A5=E4=BD=9C=E9=98=B6=E6=AE=B5=E4=BB=A3?= =?UTF-8?q?=E7=A0=81=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/adminCenter/AccessSubsystem.vue | 4 +- .../todoHandle/business/BusinessItem.vue | 58 +++++++++++--- .../todoHandle/modulComponent/handleDom.vue | 75 +++++++++++++++++++ .../todoHandle/modulComponent/interConfig.js | 23 ++++-- 4 files changed, 138 insertions(+), 22 deletions(-) create mode 100644 src/views/screenAdaptation/pages/adminCenter/messageProcessing/todoHandle/modulComponent/handleDom.vue diff --git a/src/views/screenAdaptation/pages/adminCenter/AccessSubsystem.vue b/src/views/screenAdaptation/pages/adminCenter/AccessSubsystem.vue index 48fab43..759c6e1 100644 --- a/src/views/screenAdaptation/pages/adminCenter/AccessSubsystem.vue +++ b/src/views/screenAdaptation/pages/adminCenter/AccessSubsystem.vue @@ -68,10 +68,10 @@ this.twoLevelMenu = twoLevel; } } else { - if (oneLevel && Object.keys(oneLevel).length === 0) { + if (!oneLevel || Object.keys(oneLevel).length === 0) { this.oneLevelMenu = ''; } - if (twoLevel && Object.keys(twoLevel).length === 0) { + if (!twoLevel || Object.keys(twoLevel).length === 0) { this.twoLevelMenu = ''; } } diff --git a/src/views/screenAdaptation/pages/adminCenter/messageProcessing/todoHandle/business/BusinessItem.vue b/src/views/screenAdaptation/pages/adminCenter/messageProcessing/todoHandle/business/BusinessItem.vue index a34b208..51f7382 100644 --- a/src/views/screenAdaptation/pages/adminCenter/messageProcessing/todoHandle/business/BusinessItem.vue +++ b/src/views/screenAdaptation/pages/adminCenter/messageProcessing/todoHandle/business/BusinessItem.vue @@ -101,8 +101,10 @@ updateTs: "",//教师信息审批使用 bizCode: "",// useType: 0, - leaveDateTime:"",//出车时间 - leaveMileage:0,//出车时记录的里程数 + leaveDateTime: "",//出车时间 + leaveMileage: 0,//出车时记录的里程数 + //节点信息 公文 事务审批 + nodeName:"", } }, methods: { @@ -173,6 +175,11 @@ case "101001"://通知签阅 this.modalOk(); break; + case "103001"://办理公文 + case "104001"://待办事务 + console.log("办理公文") + this.$emit("clickContent", this.businessData) + break; case "106001001"://物品领用申请审批 case "107001001"://公车审批 case "108001001"://会议室审批 @@ -236,8 +243,8 @@ //待还车 this.useType = 2; this.modalTitle = "还车处理"; - let callBack = this.getCarApplyInfo(infoBox); - callBack.then((res)=>{ + var callBack = this.getCarApplyInfo(infoBox); + callBack.then((res) => { let applyInfo = res.apply_info; console.log(applyInfo) this.leaveMileage = applyInfo.leave_mileage; @@ -710,7 +717,7 @@ }) return } - if(new Date(leaveTime).getTime() < new Date(this.leaveDateTime)){ + if (new Date(leaveTime).getTime() < new Date(this.leaveDateTime)) { Modal.warning({ title: "还车时间不可小于出车时间", content: "", @@ -718,7 +725,7 @@ }) return } - if(givebackMileage < this.leaveMileage){ + if (givebackMileage < this.leaveMileage) { Modal.warning({ title: "还车表盘里程不能小于用车时记录的表盘里程", content: "", @@ -728,10 +735,10 @@ } let param = { apply_id: infoBox.apply_id, - giveback_datetime:leaveTime, - giveback_mileage:givebackMileage, - current_mileage:currentMileage, - car_info:carInfo, + giveback_datetime: leaveTime, + giveback_mileage: givebackMileage, + current_mileage: currentMileage, + car_info: carInfo, } if (fileList && fileList.length > 0) { param.giveback_pic = JSON.stringify(fileList) @@ -1111,6 +1118,34 @@ } }) }, + //公文办理相关 + calcCommitNext: function (infoBox) { + console.log("infoBox:",infoBox) + let _this = this; + let p = new Promise(function (resolve) { + let param = { + person_id:_this.BaseConfig.userInfo.person_id_cookie, + flow_id:infoBox.flow_id, + node_id:infoBox.node_id, + run_id:infoBox.run_id, + run_node_id:infoBox.run_node_id, + step_id:infoBox.step_id + } + _this.InterfaceConfig.callInterface([{ + url: interConfig.calcCommitNext.url, + params: param, + method: interConfig.calcCommitNext.method, + isTestLogin: interConfig.calcCommitNext.isTestLogin + }], (result) => { + console.log("result:",result) + let res = result[0].data; + if (res.code === 2000) { + resolve(res.data) + } + }) + }) + return p; + }, //获取系统时间 getNowTime: function () { let _this = this; @@ -1140,11 +1175,10 @@ components: { AModal: Modal, ApproveCom, - CarUseReturnDom + CarUseReturnDom, } } - \ No newline at end of file diff --git a/src/views/screenAdaptation/pages/adminCenter/messageProcessing/todoHandle/modulComponent/interConfig.js b/src/views/screenAdaptation/pages/adminCenter/messageProcessing/todoHandle/modulComponent/interConfig.js index 3d46edd..b056c57 100644 --- a/src/views/screenAdaptation/pages/adminCenter/messageProcessing/todoHandle/modulComponent/interConfig.js +++ b/src/views/screenAdaptation/pages/adminCenter/messageProcessing/todoHandle/modulComponent/interConfig.js @@ -166,11 +166,11 @@ const interConfig = { //------------公车领用保存----------------------- /* - * apply_id - * leave_datetime: 2021-04-19 03:20 - * leave_mileage: 20 - * leave_pic - * */ + * apply_id + * leave_datetime: 2021-04-19 03:20 + * leave_mileage: 20 + * leave_pic + * */ 'saveReceiveCar': { url: '/intellioa/carManage/carApply/saveReceiveCar', method: 'post', @@ -192,14 +192,21 @@ const interConfig = { }, //------------我的会议已知晓----------------------- /* - * data_id 必填 number data_id - * person_id 必填 number 人员ID - * */ + * data_id 必填 number data_id + * person_id 必填 number 人员ID + * */ 'saveMyMeetingKnown': { url: '/intellioa/meetingRoom/myMeeting/saveMyMeetingKnown', method: 'post', isTestLogin: true, }, + //-------------公文办理-------------------------- + 'calcCommitNext': { + url: '/intellioa/flow/run/calc_commit_next', + method: 'get', + isTestLogin: true, + } + } export default interConfig