补充信息

src/api/program/ProgramProjectListInfoService.js

@@ -22,6 +22,15 @@ export default class ProgramProjectListInfoService {
       params: params
     })
   }
+
+	allList (params) {
+		return request({
+			url: prefix + '/program/projectList/allList',
+			method: 'get',
+			params: params
+		})
+	}
+
   list2022 (params) {
     return request({
       url: prefix + '/program/projectList/list2022',

src/views/program/registered/ProjectForm.vue

@@ -141,6 +141,7 @@
                   <el-col :span="12">
                     <el-form-item label="评估目的" prop="assessmentObjective"
                                   :rules="[
+                                  {required: true, message:'评估目的不能为空', trigger:'change'}
                  ]">
                       <el-input v-model="inputForm.assessmentObjective" placeholder="请输入评估目的" clearable></el-input>
                     </el-form-item>

src/views/program/registered/ProjectList.vue

@@ -8,6 +8,9 @@
       <el-form-item label="项目编号" prop="no">
         <el-input v-model="searchForm.no" placeholder="请输入项目编号" clearable></el-input>
       </el-form-item>
+		<el-form-item v-if="showHideItem" label="报告号" prop="reportNo">
+			<el-input v-model="searchForm.reportNo" placeholder="请输入报告号" clearable></el-input>
+		</el-form-item>
       <el-form-item v-if="showHideItem" label="登记人" prop="createById">
         <UserSelect :limit='1' :readonly="true" :modelValue="searchForm.createById" @update:modelValue='(value) => {searchForm.createById = value}'></UserSelect>
       </el-form-item>
@@ -104,7 +107,7 @@
       <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" 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> <a style="color:red;" v-show="!isOver">已登记项目存在信息未填写完成情况，请补充完整</a>
         </template>
       </vxe-toolbar>
       <div class="jp-table-body">
@@ -188,7 +191,10 @@
           </vxe-column>
           <vxe-column title="操作" min-width="200px" fixed="right" align="center">
             <template  #default="scope">
-              <el-button v-if="hasPermission('program:registered:edit')&&(scope.row.status === '1' || scope.row.status === '3')&&(scope.row.createBy === $store.state.user.id||haveProjectIds.includes(scope.row.id))" text type="primary"  @click="registeredPush(scope.row)">修改</el-button>
+<!--				补充信息-->
+				<el-button v-if="scope.row.isOver === false && scope.row.createBy === $store.state.user.id" text type="primary"  @click="editInfo(scope.row)">补充信息</el-button>
+
+				<el-button v-if="hasPermission('program:registered:edit')&&(scope.row.status === '1' || scope.row.status === '3')&&(scope.row.createBy === $store.state.user.id||haveProjectIds.includes(scope.row.id))" text type="primary"  @click="registeredPush(scope.row)">修改</el-button>
               <!--管理员角色登记完成后可修改-->
               <el-button v-if="hasPermission('program:registered:edit')&&scope.row.status === '5' && isAdmin" text type="primary"  @click="edit(scope.row.id)">修改</el-button>
               <!--项目负责人修改-->
@@ -307,6 +313,7 @@
   export default {
     data () {
       return {
+      	isOver : true,
 		  overArchiveFlag: '',
         applyUserName: '',
         showHideItem: false,
@@ -326,6 +333,7 @@
           status3: '',	// 三级校审状态
 		  issuedStatus: '',	// 签发单状态
 		  archiveStatus: '',	// 归档状态
+			reportNo:'', // 报告号
         },
         dataList: [],
         tablePage: {
@@ -421,6 +429,9 @@
       view (row) {
         this.$refs.projectForm.init('view', row.id, row.auditId1, row.auditId2, row.auditId3, row.archiveId)
       },
+		editInfo(row){
+			this.$refs.projectForm.init('edit', row.id, row.auditId1, row.auditId2, row.auditId3, row.archiveId)
+		},
       // 获取数据列表
       refreshList () {
         this.loading = true
@@ -442,6 +453,16 @@
 				  console.log('this.overArchiveFlag', this.overArchiveFlag)
 			  }
 		  })
+		  //获取当前登陆人所有的项目
+		  this.programProjectListInfoService.allList().then((data)=>{
+			  data.forEach((data)=>{
+				  if (this.commonJS.isNotEmpty(data.isOver)){
+					  console.log('data.isOver',data.isOver)
+					  this.isOver =data.isOver
+				  }
+			  })
+		  })
+
         // 获取当前登录人的所属项目id集合
         this.programProjectListInfoService.getHaveProjectIds().then((data) => {
           if (this.commonJS.isNotEmpty(data)) {

src/views/program/registered/RegisItemForm.vue

@@ -129,6 +129,7 @@
           <el-col :span="12">
             <el-form-item label="评估目的" prop="assessmentObjective"
                           :rules="[
+                          {required: true, message:'评估目的不能为空', trigger:'change'}
                  ]">
               <el-input v-model="inputForm.assessmentObjective" placeholder="请输入评估目的" clearable></el-input>
             </el-form-item>