diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/Payslip/Payslip/list.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/Payslip/Payslip/list.vue index 396d1ef44..94e38c436 100644 --- a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/Payslip/Payslip/list.vue +++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/Payslip/Payslip/list.vue @@ -590,9 +590,19 @@ // 点击跳转到详情页 GoTosingle(type){ let _this = this - uni.navigateTo({ - url: './single?type='+type+'&item='+encodeURIComponent(JSON.stringify(_this.list)) - }); + if(_this.list.length>0){ + uni.navigateTo({ + url: './single?type='+type+'&item='+encodeURIComponent(JSON.stringify(_this.list)) + }); + }else{ + uni.showToast({ + title: '当月无工资', + icon: 'none', + duration: 2000 + }) + } + + } } } diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/nworkflow/myflow/sign.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/nworkflow/myflow/sign.vue index e35a4a15d..b4add5cb9 100644 --- a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/nworkflow/myflow/sign.vue +++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/nworkflow/myflow/sign.vue @@ -415,18 +415,26 @@ export default { } + uni.showLoading({ + title: '提交中...' + }); + + + const success = await this.HTTP_POST( this.type === 'sign' ? 'learun/adms/newwf/sign' : 'learun/adms/newwf/audit', postData, `提交[${this.typeText}]时发生错误` ) - + if (!success) { + uni.hideLoading(); return } this.EMIT('task-list-change') this.NAV_BACK(2) + uni.hideLoading(); this.TOAST(`已成功提交${this.typeText}`, 'success') },