diff --git a/doc/保密业务综合管理系统-操作手册.doc b/doc/保密业务综合管理系统-操作手册.doc index 8e67101..045fa51 100644 Binary files a/doc/保密业务综合管理系统-操作手册.doc and b/doc/保密业务综合管理系统-操作手册.doc differ diff --git a/ruoyi-admin/src/main/resources/templates/system/checkReport/add.html b/ruoyi-admin/src/main/resources/templates/system/checkReport/add.html index 4a67af3..bc8aa6e 100644 --- a/ruoyi-admin/src/main/resources/templates/system/checkReport/add.html +++ b/ruoyi-admin/src/main/resources/templates/system/checkReport/add.html @@ -343,8 +343,10 @@ if (parseFloat(row.realScore) > max) { row.realScore = max; } - this.calculateTotalScore('realScore') - this.postForm.percentageScore = (this.postForm.realScore / this.postForm.totalScore * 100).toFixed(2); + if (row.realScore){ + this.calculateTotalScore('realScore') + this.postForm.percentageScore = (this.postForm.realScore / this.postForm.totalScore * 100).toFixed(2); + } }, handleInput(row, props) { row.realScore = row.realScore.replace(/[^0-9.]/g, ''); @@ -411,6 +413,7 @@ }); if (hasEmptyRealScore){ $.modal.alertWarning("所选自查项内有未评分项,请检查"); + return false } // console.log(hasEmptyRealScore); // console.log(this.cachedData) diff --git a/ruoyi-admin/src/main/resources/templates/system/checkReport/edit.html b/ruoyi-admin/src/main/resources/templates/system/checkReport/edit.html index 2667d7f..94ef72e 100644 --- a/ruoyi-admin/src/main/resources/templates/system/checkReport/edit.html +++ b/ruoyi-admin/src/main/resources/templates/system/checkReport/edit.html @@ -451,6 +451,7 @@ }); if (hasEmptyRealScore){ $.modal.alertWarning("所选自查项内有未评分项,请检查"); + return false } // console.log(hasEmptyRealScore); // console.log(this.cachedData)