diff --git a/src/views/screenAdaptation/pages/adminCenter/messageProcessing/todoHandle/business/BusinessList.vue b/src/views/screenAdaptation/pages/adminCenter/messageProcessing/todoHandle/business/BusinessList.vue index 3b926d8..79a1388 100644 --- a/src/views/screenAdaptation/pages/adminCenter/messageProcessing/todoHandle/business/BusinessList.vue +++ b/src/views/screenAdaptation/pages/adminCenter/messageProcessing/todoHandle/business/BusinessList.vue @@ -32,11 +32,10 @@ + + \ No newline at end of file diff --git a/src/views/screenAdaptation/pages/adminCenter/messageProcessing/todoHandle/modulComponent/carReturnApprove.vue b/src/views/screenAdaptation/pages/adminCenter/messageProcessing/todoHandle/modulComponent/carReturnApprove.vue new file mode 100644 index 0000000..7a49931 --- /dev/null +++ b/src/views/screenAdaptation/pages/adminCenter/messageProcessing/todoHandle/modulComponent/carReturnApprove.vue @@ -0,0 +1,285 @@ + + + + + 车辆: + {{applyInfo.car_name}} + + + 车牌号: + {{applyInfo.car_no}} + + + 驾车方式: + {{applyInfo.driving_type === 1?'司机驾驶':'自己驾驶'}} + + + 用车人员: + + {{applyInfo.user_person_name}} + + 用车部门: + {{applyInfo.user_dept_name}} + + + + + 同行人员: + {{applyInfo.together_person_names}} + + + 开始时间: + {{applyInfo.begin_datetime}} + + + 结束时间: + {{applyInfo.end_datetime}} + + + 出车地点: + {{applyInfo.departure_place}} + + + 目的地点: + {{applyInfo.destination_place}} + + + 用车事由: + {{applyInfo.use_car_reason}} + + + + 出车时间: + + {{applyInfo.leave_datetime}} + + 表盘里程: + {{applyInfo.leave_mileage + '公里'}} + + + + + 照片: + + 暂无照片 + + + + + + + + 还车时间: + + {{applyInfo.giveback_datetime}} + + 表盘里程: + {{applyInfo.giveback_mileage + '公里'}} + + + + + 照片: + + 暂无照片 + + + + + + + 审批内容 + + + + + + + \ No newline at end of file diff --git a/src/views/screenAdaptation/pages/adminCenter/messageProcessing/todoHandle/modulComponent/goodsReceiveApprove.vue b/src/views/screenAdaptation/pages/adminCenter/messageProcessing/todoHandle/modulComponent/goodsReceiveApprove.vue new file mode 100644 index 0000000..72470b1 --- /dev/null +++ b/src/views/screenAdaptation/pages/adminCenter/messageProcessing/todoHandle/modulComponent/goodsReceiveApprove.vue @@ -0,0 +1,273 @@ + + + + + 申请时间: + {{applyInfo.apply_time}} + + + 申请人员: + {{applyInfo.person_name}} + + + 申请部门: + {{applyInfo.dept_name}} + + + 使用人员: + {{applyInfo.use_person_name}} + + + 使用部门: + {{applyInfo.use_dept_name}} + + + 申请说明: + {{applyInfo.apply_desc}} + + 物品明细 + + 审批内容 + + + + + + + \ 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 c58fd61..2d60183 100644 --- a/src/views/screenAdaptation/pages/adminCenter/messageProcessing/todoHandle/modulComponent/interConfig.js +++ b/src/views/screenAdaptation/pages/adminCenter/messageProcessing/todoHandle/modulComponent/interConfig.js @@ -1,5 +1,6 @@ const interConfig = { + //---------------会议室审批----------------- //获取会议室申请信息 'getMeetingApplyInfo':{ url:'/intellioa/meetingRoom/apply/getApplyInfo', @@ -20,5 +21,38 @@ const interConfig = { method:'post', isTestLogin:true, }, + + //---------------公车审批----------------- + //获取会议室申请信息 + 'getCarApplyInfo':{ + url:'/intellioa/carManage/carApply/getApplyInfo', + method:'post', + isTestLogin:true, + }, + //提交审批信息 + 'submitCarCheck':{ + url:'/intellioa/carManage/carApply/checkApplyCar', + method:'post', + isTestLogin:true, + }, + //提交还车审批信息 + 'checkGiveBackCar':{ + url:'/intellioa/carManage/carApply/checkGiveBackCar', + method:'post', + isTestLogin:true, + }, + + //---------------物品领用审批----------------- + 'getGoodsReceiveApplyInfo':{ + url:'/intellioa/supplies/apply/getApplyInfo', + method:'post', + isTestLogin:true, + }, + 'doCheck':{ + url:'/intellioa/supplies/apply/doCheck', + method:'post', + isTestLogin:true, + }, + } export default interConfig diff --git a/src/views/screenAdaptation/pages/adminCenter/messageProcessing/todoHandle/modulComponent/meetingApprove.vue b/src/views/screenAdaptation/pages/adminCenter/messageProcessing/todoHandle/modulComponent/meetingApprove.vue index cbc91d7..1b7aeb1 100644 --- a/src/views/screenAdaptation/pages/adminCenter/messageProcessing/todoHandle/modulComponent/meetingApprove.vue +++ b/src/views/screenAdaptation/pages/adminCenter/messageProcessing/todoHandle/modulComponent/meetingApprove.vue @@ -207,11 +207,15 @@ submitParam.next_person_id = this.checkPersonId; submitParam.next_person_name = this.checkPersonName; } - if(this.paramCopyList.length > 0){ + if(this.copyPersonType === 1 && this.copyPersonList.length > 0){ + //部门领导 + submitParam.copy_person_list = JSON.stringify(this.copyPersonList); + } + if(this.copyPersonType !== 1 && this.paramCopyList.length > 0){ + //其他方式 submitParam.copy_person_list = JSON.stringify(this.paramCopyList); } this.spinning = true; - console.log(submitParam) this.InterfaceConfig.callInterface([{ url: interConfig.submitCheck.url, params: submitParam, diff --git a/src/views/screenAdaptation/pages/adminCenter/workbench.vue b/src/views/screenAdaptation/pages/adminCenter/workbench.vue index aa406c2..c2e2f74 100644 --- a/src/views/screenAdaptation/pages/adminCenter/workbench.vue +++ b/src/views/screenAdaptation/pages/adminCenter/workbench.vue @@ -187,14 +187,13 @@ GlobalParams.biz_codes_bureau = []; GlobalParams.biz_codes_dept = []; GlobalParams.biz_codes_person = []; - if ( this.jurisdictionIsExist([ "daliyOffice", "newOfficeCar", "carApproval", "returnApproval", - ]) + ],false) ) { GlobalParams.biz_codes_bureau.push("107002001"); } @@ -623,6 +622,7 @@ jurisdictionAry.length > 0 ) { let ary = this.crmData; + console.log(ary) for (let i = 0; i < jurisdictionAry.length; i++) { let menuString = jurisdictionAry[i]; if ( diff --git a/src/views/superFusionPlatform/messageProcessing/todoHandle/business/BusinessList.vue b/src/views/superFusionPlatform/messageProcessing/todoHandle/business/BusinessList.vue index 905cb9e..5b80bb4 100644 --- a/src/views/superFusionPlatform/messageProcessing/todoHandle/business/BusinessList.vue +++ b/src/views/superFusionPlatform/messageProcessing/todoHandle/business/BusinessList.vue @@ -84,7 +84,6 @@ } }, mounted(){ - console.log(this.listType) this.getModuleTodoList(); }, methods: {