Browse Source

评估 项目归档修改

sangwenwei 1 năm trước cách đây
mục cha
commit
474e2794eb

+ 2 - 2
src/views/program/registered/ProjectArchiveFormDialog.vue

@@ -477,12 +477,12 @@
 
 
       </el-form>
-		<trmplate #footer>
+		<template #footer>
 			<span class="dialog-footer">
 				<el-button @click="close()" icon="el-icon-circle-close">关闭</el-button>
 				<el-button type="primary"  @click="doSubmit('agree')" icon="el-icon-circle-check" v-noMoreClick>确定</el-button>
 			  </span>
-		</trmplate>
+		</template>
 
     </el-dialog>
   </div>

+ 9 - 2
src/views/program/registered/ProjectList.vue

@@ -278,7 +278,7 @@
 <!--				管理员角色可对作废项目进行恢复-->
 				<el-button v-if="hasPermission('program:registered:edit')&&scope.row.cancellationStatus === '7' && isAdmin " text type="primary"  @click="rnew(scope.row)">恢复</el-button>
 <!--				部门主任可以修改归档完成的项目-->
-				<el-button v-if="hasPermission('program:registered:edit')&&(scope.row.createBy === $store.state.user.id||haveProjectIds.includes(scope.row.id))&&scope.row.issuedStatus === '5' &&(scope.row.archiveStatus === '0'||scope.row.archiveStatus === '1'||scope.row.archiveStatus === '3'||scope.row.archiveStatus === '6') && scope.row.cancellationStatus !== '7'" text type="primary" @click="archivePush(scope.row)">项目归档</el-button>
+				<el-button v-if="hasPermission('project:achieve:edit')&&(scope.row.archiveStatus === '5'||scope.row.archiveStatus === '7') && scope.row.cancellationStatus !== '7'" text type="primary" @click="archiveEdit(scope.row)">归档修改</el-button>
 
 				<!--一级校审ftl文件下载-->
 <!--              <el-button v-if="hasPermission('program:registered:edit')" text type="primary"  icon="el-icon-circle-check"  @click="downloadFirstAuditTpl(scope.row)">一级校审下载</el-button>-->
@@ -313,6 +313,7 @@
     <ProofreadForm  ref="proofreadForm" @refreshDataList="refreshList"></ProofreadForm>
     <ProofreadBrowseForm  ref="proofreadBrowseForm" @refreshDataList="refreshList"></ProofreadBrowseForm>
     <WorkContractForm2 ref="workContractForm2" @refreshDataList="refreshList"></WorkContractForm2>
+	  <ProjectArchiveFormDialog ref="projectArchiveFormDialog" @refreshDataList="refreshList"></ProjectArchiveFormDialog>
   </div>
 </template>
 
@@ -330,6 +331,7 @@
   import userService from '@/api/sys/userService'
   import ProofreadIssuedService from '@/api/sys/ProofreadIssuedService'
   import UserSelect from '@/components/userSelect'
+  import ProjectArchiveFormDialog from "./ProjectArchiveFormDialog";
 
   export default {
     data () {
@@ -402,7 +404,8 @@
       ProofreadForm,
       ProofreadBrowseForm,
       ProjectFormUpdate,
-      UserSelect
+      UserSelect,
+		ProjectArchiveFormDialog
     },
 	  mounted() {
 		  this.$nextTick(() => {
@@ -1710,6 +1713,10 @@
 				})
 			})
 		},
+		archiveEdit(row){
+      		console.log('id',row.archiveId)
+      		this.$refs.projectArchiveFormDialog.init('edit',row.archiveId);
+		}
     }
   }
 </script>