update 驳回备注验证

src/views/workCenter/enterpriseStandardInspectionPlan/EnterpriseStandardInspectionPlanFlow.vue

@@ -326,6 +326,8 @@ export default {
     },
     // 获取页面参数
     async getPageParams (isValidate = true) {
+      // 去除备注必填
+      this.validatorRules.remarks.rules[0].required = false
       if (this.$refs.inspectionPlanTable.dataSource.length === 0) {
         this.$message.warning(this.$t('addAtLeastOneRowOfData'))
         throw new Error('base')
@@ -517,6 +519,15 @@ export default {
      */
     handleReject () {
       if (this.loading) return
+      // 备注设置必填并校验(校验第一次正常，第二次校验就不提示，force配置项解决问题)
+      this.validatorRules.remarks.rules[0].required = true
+      this.$nextTick(() => {
+        this.approvalInfoForm.validateFields(['commitText'], { force: true }, (err) => {
+          if (err) {
+            this.switchChange('base')
+          }
+        })
+      })
       // 驳回需要填写备注
       if (!this.approvalInfoForm.getFieldValue('commitText')) {
         this.$message.warning(this.$t('pleaseEnterRemarks'))
@@ -576,7 +587,7 @@ export default {
       for (const form of formList) {
         promiseList.push(
           new Promise((resolve, reject) => {
-            form.validateFields((err, val) => {
+            form.validateFields({ force: true }, (err, val) => {
               if (!err) {
                 resolve(val)
               } else {

src/views/workCenter/enterpriseStandardInspectionProcess/EnterpriseStandardInspectionProcess.vue

@@ -279,6 +279,8 @@ export default {
     },
     // 获取页面参数
     async getPageParams (isValidate = true) {
+      // 去除备注必填
+      this.validatorRules.remarks.rules[0].required = false
       if (this.$refs.inspectionProcessTable.dataSource.length === 0) {
         this.$message.warning(this.$t('addAtLeastOneRowOfData'))
         throw new Error('base')
@@ -440,6 +442,15 @@ export default {
      */
     handleReject () {
       if (this.loading) return
+      // 备注设置必填并校验(校验第一次正常，第二次校验就不提示，force配置项解决问题)
+      this.validatorRules.remarks.rules[0].required = true
+      this.$nextTick(() => {
+        this.approvalInfoForm.validateFields(['commitText'], { force: true }, (err) => {
+          if (err) {
+            this.switchChange('base')
+          }
+        })
+      })
       // 驳回需要填写备注
       if (!this.approvalInfoForm.getFieldValue('commitText')) {
         this.$message.warning(this.$t('pleaseEnterRemarks'))
@@ -473,7 +484,7 @@ export default {
       for (const form of formList) {
         promiseList.push(
           new Promise((resolve, reject) => {
-            form.validateFields((err, val) => {
+            form.validateFields({ force: true }, (err, val) => {
               if (!err) {
                 resolve(val)
               } else {

src/views/workCenter/enterpriseStandardInspectionRectification/EnterpriseStandardInspectionRectification.vue

@@ -278,6 +278,8 @@ export default {
     },
     // 获取页面参数
     async getPageParams (isValidate = true) {
+      // 去除备注必填
+      this.validatorRules.remarks.rules[0].required = false
       const params = {}
       // 收集所有表单信息
       let formDataList = []
@@ -437,6 +439,15 @@ export default {
      */
     handleReject () {
       if (this.loading) return
+      // 备注设置必填并校验(校验第一次正常，第二次校验就不提示，force配置项解决问题)
+      this.validatorRules.remarks.rules[0].required = true
+      this.$nextTick(() => {
+        this.approvalInfoForm.validateFields(['commitText'], { force: true }, (err) => {
+          if (err) {
+            this.switchChange('base')
+          }
+        })
+      })
       // 驳回需要填写备注
       if (!this.approvalInfoForm.getFieldValue('commitText')) {
         this.$message.warning(this.$t('pleaseEnterRemarks'))
@@ -470,7 +481,7 @@ export default {
       for (const form of formList) {
         promiseList.push(
           new Promise((resolve, reject) => {
-            form.validateFields((err, val) => {
+            form.validateFields({ force: true }, (err, val) => {
               if (!err) {
                 resolve(val)
               } else {

src/views/workCenter/inspectionExtensionRequestProcess/InspectionExtensionRequestProcess.vue

@@ -284,6 +284,8 @@ export default {
     },
     // 获取页面参数
     async getPageParams (isValidate = true) {
+      // 去除备注必填
+      this.validatorRules.remarks.rules[0].required = false
       // 必须有数据才能提交
       if (this.$refs.extensionRequestTable.dataSource.length === 0) {
         this.$message.warning(this.$t('addAtLeastOneRowOfData'))
@@ -449,6 +451,15 @@ export default {
      */
     handleReject () {
       if (this.loading) return
+      // 备注设置必填并校验(校验第一次正常，第二次校验就不提示，force配置项解决问题)
+      this.validatorRules.remarks.rules[0].required = true
+      this.$nextTick(() => {
+        this.approvalInfoForm.validateFields(['commitText'], { force: true }, (err) => {
+          if (err) {
+            this.switchChange('base')
+          }
+        })
+      })
       // 驳回需要填写备注
       if (!this.approvalInfoForm.getFieldValue('commitText')) {
         this.$message.warning(this.$t('pleaseEnterRemarks'))
@@ -482,7 +493,7 @@ export default {
       for (const form of formList) {
         promiseList.push(
           new Promise((resolve, reject) => {
-            form.validateFields((err, val) => {
+            form.validateFields({ force: true }, (err, val) => {
               if (!err) {
                 resolve(val)
               } else {

src/views/workCenter/permissionApplicationProcess/PermissionApplicationProcess.vue

@@ -359,6 +359,8 @@ export default {
     },
     // 获取页面参数
     async getPageParams (isValidate = true) {
+      // 去除备注必填
+      this.validatorRules.remarks.rules[0].required = false
       // 节点1判断表格是否有数据
       if (this.isInitiate && this.$refs.baseInfoTable.dataSource.length === 0) {
         this.$message.warning(this.$t('addAtLeastOneRowOfData'))
@@ -529,6 +531,15 @@ export default {
      */
     handleReject () {
       if (this.loading) return
+      // 备注设置必填并校验(校验第一次正常，第二次校验就不提示，force配置项解决问题)
+      this.validatorRules.remarks.rules[0].required = true
+      this.$nextTick(() => {
+        this.approvalInfoForm.validateFields(['commitText'], { force: true }, (err) => {
+          if (err) {
+            this.switchChange('base')
+          }
+        })
+      })
       // 驳回需要填写备注
       if (!this.approvalInfoForm.getFieldValue('commitText')) {
         this.$message.warning(this.$t('pleaseEnterRemarks'))
@@ -562,7 +573,7 @@ export default {
       for (const form of formList) {
         promiseList.push(
           new Promise((resolve, reject) => {
-            form.validateFields((err, val) => {
+            form.validateFields({ force: true }, (err, val) => {
               if (!err) {
                 resolve(val)
               } else {

src/views/workCenter/postMeetingManageProcess/PostMeetingManageProcess.vue

@@ -305,6 +305,8 @@ export default {
     },
     // 获取页面参数
     async getPageParams (isValidate = true) {
+      // 去除备注必填
+      this.validatorRules.remarks.rules[0].required = false
       const params = {}
       // 收集所有表单信息
       let formDataList = []
@@ -495,7 +497,7 @@ export default {
       for (const form of formList) {
         promiseList.push(
           new Promise((resolve, reject) => {
-            form.validateFields((err, val) => {
+            form.validateFields({ force: true }, (err, val) => {
               if (!err) {
                 resolve(val)
               } else {

src/views/workCenter/standardPromotionProcess/StandardPromotionProcess.vue

@@ -248,6 +248,8 @@ export default {
     },
     // 获取页面参数
     async getPageParams (isValidate = true) {
+      // 去除备注必填
+      this.validatorRules.remarks.rules[0].required = false
       const params = {}
       // 收集所有表单信息
       let formDataList = []
@@ -341,7 +343,7 @@ export default {
       for (const form of formList) {
         promiseList.push(
           new Promise((resolve, reject) => {
-            form.validateFields((err, val) => {
+            form.validateFields({ force: true }, (err, val) => {
               if (!err) {
                 resolve(val)
               } else {