评估项目作废

src/api/program/ProgramProjectListInfoService.js

@@ -239,5 +239,12 @@ export default class ProgramProjectListInfoService {
 			data: data
 		})
 	}
+	getIsUsed (reportNo) {
+		return request({
+			url: prefix + '/program/projectList/getIsUsed',
+			method: 'get',
+			params: {reportNo:reportNo}
+		})
+	}
 
 }

src/views/program/registered/ProjectList.vue

@@ -113,7 +113,8 @@
       <vxe-toolbar ref="toolbarRef" :refresh="{query: refreshList}" export custom>
         <template #buttons>
 <!--          <el-button v-if="hasPermission('program:registered:add')" type="primary" icon="el-icon-plus" @click="start()">新建</el-button>-->
-          <el-button  v-if="(hasPermission('program:registered:add') && overArchiveFlag === 0)" v-show="isOver" type="primary" icon="el-icon-plus" @click="start()">新建</el-button>
+<!--			v-if="(hasPermission('program:registered:add') && overArchiveFlag === 0)" v-show="isOver"-->
+			<el-button   type="primary" icon="el-icon-plus" @click="start()">新建</el-button>
 			<a style="color:red;" v-show="!isOver">已登记项目存在信息未填写完成情况，请补充完整(可通过筛选项筛选归档状态为：已归档、超期已归档。进行查看)</a>
         </template>
       </vxe-toolbar>
@@ -321,6 +322,21 @@
     <WorkContractForm2 ref="workContractForm2" @refreshDataList="refreshList"></WorkContractForm2>
 	  <ProjectArchiveFormDialog ref="projectArchiveFormDialog" @refreshDataList="refreshList"></ProjectArchiveFormDialog>
 	  <user-select ref="userSelect2" @doSubmit="selectUser"></user-select>
+	  <el-dialog
+		  v-model="dialogVisible"
+		  title="提示"
+		  width="500"
+	  >
+		  <span>报告号-{{usedNo.reportNo}}已经被使用,是否要恢复</span>
+		  <template #footer>
+			  <div class="dialog-footer">
+				  <el-button @click="dialogVisible = false">否</el-button>
+				  <el-button type="primary" @click="reUsedReportNo(usedNo)">
+					  是
+				  </el-button>
+			  </div>
+		  </template>
+	  </el-dialog>
   </div>
 </template>
 
@@ -347,6 +363,7 @@
 		  overArchiveFlag: '',
         applyUserName: '',
         showHideItem: false,
+		  dialogVisible:false,
         showHideIcon: 'el-icon-arrow-down',
         showHideName: '展示',
         searchForm: {
@@ -390,6 +407,7 @@
         haveProjectIds: '',
 		  processDefinitionIdCell: '',
 		  procDefKeyCell: '',
+		  usedNo:{}
       }
     },
     programProjectListInfoService: null,
@@ -1703,18 +1721,46 @@
 		},
 		// 恢复作废的项目
 		rnew (row) {
+      		this.programProjectListInfoService.getIsUsed(row.reportNo).then((data)=>{
+      			console.log('data',data)
+      			if (data === true){
+      				this.usedNo = row
+      				this.dialogVisible = true
+				}else {
+					this.$confirm(`确定要恢复该项目吗?`, '提示', {
+						confirmButtonText: '确定',
+						cancelButtonText: '取消',
+						type: 'warning'
+					}).then(async () => {
+						await this.programProjectListInfoService.queryById(row.cancellId).then((data) => {
+							if (data.cancellationStatus !== '5') { // status的值不等于“审核中”，就弹出提示
+								this.$message.error('数据已发生改变或不存在，请刷新数据')
+								this.refreshList()
+							} else {
+								let form = {cancellationStatus: '0', cancellId: row.cancellId}
+								this.programProjectListInfoService.updateStatusByCancellId(form)
+								this.dialogVisible = false
+								this.refreshList()
+							}
+						})
+					})
+				}
+			})
+		},
+		reUsedReportNo(usedNo){
 			this.$confirm(`确定要恢复该项目吗?`, '提示', {
 				confirmButtonText: '确定',
 				cancelButtonText: '取消',
 				type: 'warning'
 			}).then(async () => {
-				await this.programProjectListInfoService.queryById(row.cancellId).then((data) => {
+				await this.programProjectListInfoService.queryById(usedNo.cancellId).then((data) => {
 					if (data.cancellationStatus !== '5') { // status的值不等于“审核中”，就弹出提示
 						this.$message.error('数据已发生改变或不存在，请刷新数据')
 						this.refreshList()
 					} else {
-						let form = {cancellationStatus: '0', cancellId: row.cancellId}
+						let form = {cancellationStatus: '0', cancellId: usedNo.cancellId}
 						this.programProjectListInfoService.updateStatusByCancellId(form)
+						this.dialogVisible = false
 						this.refreshList()
 					}
 				})

src/views/program/registered/RegisItemForm.vue

@@ -645,7 +645,7 @@
 				>
 					<vxe-table-column field="name" title="姓名" :edit-render="{name: '$input'}" align="center">
 						<template v-slot:edit="scope">
-							<vxe-input @focus="openUserDia2(scope.$rowIndex)" v-model="scope.row.name" :disabled="commonJS.isNotEmpty(scope.row.userId) || status === 'audit' || status === 'taskFormDetail'"  style="width: 100%">
+							<vxe-input v-model="scope.row.name" :disabled="commonJS.isNotEmpty(scope.row.userId) || status === 'audit' || status === 'taskFormDetail'"  style="width: 100%">
 								<template #suffix>
 									<el-button :disabled="status === 'audit' || status === 'taskFormDetail'"  @click="openUserDia2(scope.$rowIndex)" type="text" content="" icon="el-icon-search" ></el-button>
 								</template>