复核模块调整

src/views/cw/reportManagement/ReportManagementFormNew.vue

@@ -9,8 +9,8 @@
       @close="close"
       append-to-body
       v-model="visible">
-      <el-row>
-        <el-row>
+<!--      <el-row>-->
+<!--        <el-row>-->
 			<el-form :model="inputForm" ref="inputForm" v-loading="loading" :class="method==='view'?'readonly':''"  :disabled="method==='view'"
 					 label-width="135px" @submit.native.prevent>
 
@@ -410,8 +410,8 @@
 					</vxe-table>
 				</el-col>
 			</el-row>
-        </el-row>
-      </el-row>
+<!--        </el-row>-->
+<!--      </el-row>-->
 		<template #footer>
 			<span class="dialog-footer">
 			  <el-button @click="close()" icon="el-icon-circle-close">关闭</el-button>

src/views/cw/reportManagement/ReportManagementList.vue

@@ -399,7 +399,7 @@
 			if (this.commonJS.isEmpty(row.newType) || row.newType !== '1'){
 
 				let processTitle = `${this.userName} 在 ${this.moment(new Date()).format('YYYY-MM-DD HH:mm')} 发起了` + title + '[会计-报告复核]'
-				let status = 'startAndClose'
+				let status = 'startAndHold'
 				if (row.reviewStatus === '3') {
 					status = 'startAndClose'
 				} else if (row.reviewStatus === '4') {
@@ -429,7 +429,7 @@
 				})
 			} else if ( row.newType === '1') {
 				let processTitle = `${this.userName} 在 ${this.moment(new Date()).format('YYYY-MM-DD HH:mm')} 发起了` + title + '[会计-复核及签章]'
-				let status = 'startAndClose'
+				let status = 'startAndHold'
 				if (row.reviewStatus === '3') {
 					status = 'startAndClose'
 				} else if (row.reviewStatus === '4') {

src/views/cw/reportManagement/reportReview/ReportReviewForm.vue

@@ -114,7 +114,7 @@
 				  <el-col :span="12">
 					  <el-form-item label="下一节点审核人" prop="reviewBy"
 									:rules="[
-										{required: true, message:'下一节点审核人不能为空', trigger:'blur'}
+										{required: true, message:'下一节点审核人不能为空', trigger:'change'}
                    ]">
 						  <UserSelectSignatory style="width: 100%" ref="userSelect1"
 											   :readonly="true" :limit='1' :modelValue="inputForm.reviewBy"
@@ -740,6 +740,57 @@
 				  })
 
 			  }else{
+				  if (this.commonJS.isEmpty(this.inputForm.reviewBy)){
+					  this.loading = false
+					  this.$message.error('请选择下一节点审核人')
+					  throw new Error()
+				  }
+				  if (this.commonJS.isEmpty(this.inputForm.workStartDate)){
+					  this.loading = false
+					  this.$message.error('请选择工作开始时间')
+					  throw new Error()
+				  }
+				  if (this.commonJS.isEmpty(this.inputForm.workEndDate)){
+					  this.loading = false
+					  this.$message.error('请选择工作结束时间')
+					  throw new Error()
+				  }
+				  if (this.commonJS.isEmpty(this.inputForm.detailInfos)){
+					  this.loading = false
+					  this.$message.error('至少选择一位项目组成员')
+					  throw new Error()
+				  }else {
+					  let i = this.inputForm.detailInfos.length
+					  for (let j = 0; j < i; j++) {
+						  let k = j + 1
+						  if (this.commonJS.isEmpty(this.inputForm.detailInfos[j].memberName)){
+							  this.loading = false
+							  this.$message.error('项目组成员第'+k+'行成员名称为空')
+							  throw new Error('项目组成员第'+k+'行成员名称为空')
+						  }
+						  if (this.commonJS.isEmpty(this.inputForm.detailInfos[j].enrollCertNo)){
+							  this.loading = false
+							  this.$message.error('项目组成员第'+k+'行注册/资格证号为空')
+							  throw new Error('项目组成员第'+k+'行注册/资格证号为空')
+						  }
+						  if (this.commonJS.isEmpty(this.inputForm.detailInfos[j].profession)){
+							  this.loading = false
+							  this.$message.error('项目组成员第'+k+'行专业为空')
+							  throw new Error('项目组成员第'+k+'行专业为空')
+						  }
+						  if (this.commonJS.isEmpty(this.inputForm.detailInfos[j].content)){
+							  this.loading = false
+							  this.$message.error('项目组成员第'+k+'行本人负责内容为空')
+							  throw new Error('项目组成员第'+k+'行本人负责内容为空')
+						  }
+						  if (this.commonJS.isEmpty(this.inputForm.detailInfos[j].opinion)){
+							  this.loading = false
+							  this.$message.error('项目组成员第'+k+'行审核意见为空')
+							  throw new Error('项目组成员第'+k+'行审核意见为空')
+						  }
+
+					  }
+				  }
 				  this.reportReviewService.saveFormReviewNew(this.inputForm).then((data) => {
 					  callback(data.businessTable, data.businessId, this.inputForm)
 					  this.loading = false