代码提交

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

@@ -656,6 +656,11 @@
 				name: this.$store.state.user.name
 			},
         },
+		  projectData: {
+		  	id:'',
+			status:'',
+		  	projectLevel:''
+		  },
         keyWatch: '',
       }
     },
@@ -758,6 +763,12 @@
           this.loading = true
           projectReportService.queryByIdNew(this.inputForm.id).then((data) => {
           	console.log(data)
+			  if(data.status){
+			  	this.projectData.status = data.status
+			  }
+			  if(data.projectLevel){
+			  	this.projectData.projectLevel = data.projectLevel
+			  }
             this.inputForm = this.recover(this.inputForm, data)
 
 			  if (this.commonJS.isEmpty(this.inputForm.contractCategory)) {
@@ -858,10 +869,15 @@
         this.loading = true
         if (this.commonJS.isNotEmpty(this.inputForm.id)) {
 			this.reportReviewService.queryByReportIdNew(this.inputForm.id).then((data) => {
+				console.log('data',data)
             if (this.commonJS.isNotEmpty(data.reviewStatus) && data.reviewStatus !== '0' && data.reviewStatus !== '1' && data.reviewStatus !== '3') { // 审核状态不是“未发起”或“暂存”或“撤回”，就弹出提示
-              this.loading = false
-              this.$message.error('任务数据已发生改变或不存在，请在待办任务中确认此任务是否存在')
-              throw new Error('任务数据已发生改变或不存在，请在待办任务中确认此任务是否存在')
+            	if(this.projectData.projectLevel === '2' && data.reviewStatus === '5'){
+					this.doSubmit('start', callback)
+				}else{
+					this.loading = false
+					this.$message.error('任务数据已发生改变或不存在，请在待办任务中确认此任务是否存在')
+					throw new Error('任务数据已发生改变或不存在，请在待办任务中确认此任务是否存在')
+				}
             } else {
               this.doSubmit('start', callback)
             }

src/views/cw/workContract/ContractRegistration.vue

@@ -224,7 +224,7 @@
               <!--纸质归档撤回驳回修改-->
               <el-button v-if="hasPermission('cw:workContract:filed') && scope.row.status === '5'  && scope.row.createId === $store.state.user.id && (scope.row.filedPaperType === '3')" text type="primary" size="small" @click="paperFiledAndClose(scope.row.id)">纸质归档</el-button>
               <!--纸质归档撤回-->
-              <el-button v-if="hasPermission('cw:workContract:back') && scope.row.status === '5'  && scope.row.filedPaperType === '2'" text type="primary"  size="small" @click="rebackPaperFiled(scope.row)">撤回纸质归档</el-button>
+              <el-button v-if="hasPermission('cw:workContract:back') && scope.row.status === '5' && scope.row.createId === $store.state.user.id && scope.row.filedPaperType === '2'" text type="primary"  size="small" @click="rebackPaperFiled(scope.row)">撤回纸质归档</el-button>
               <!--              审核-->
               <el-button v-if="scope.row.filedPaperType === '2' && checkIsAuditFiledPaper(scope.row)" text type="primary"  size="small" @click="examineFiledPaper(scope.row)">审核</el-button>
               <!--              被驳回后当前申请人重新调整-->