Browse Source

评估重新归档问题调整

huangguoce 4 weeks ago
parent
commit
ba3bb97666

+ 1 - 2
src/views/program/registered/ProjectArchiveForm.vue

@@ -750,8 +750,7 @@ export default {
       if (this.commonJS.isNotEmpty(this.inputForm.id)) {
         this.programProjectListInfoService.findByIdArchive(this.inputForm.id).then((data) => {
           if (this.commonJS.isNotEmpty(data.status) && data.status !== '0' && data.status !== '1' && data.status !== '3' && data.status !== '6') { // 审核状态不是“未发起”或“暂存”或“撤回”,就弹出提示
-
-            if ((data.status == "5" || data.status == "7") && !data.invoiceDate && data.projectMould == "2") {
+            if ((data.status == "5" || data.status == "7") && !data.invoiceDate) {
               this.startFormTrue(callback)
             } else {
               this.loading = false

+ 1 - 1
src/views/program/registered/ProjectList.vue

@@ -333,7 +333,7 @@
                 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 !== '5'"
                 text type="primary" @click="archivePush(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 == '7' || scope.row.archiveStatus == '5') && !scope.row.invoiceDate) || scope.row.archiveStatus === '0' || scope.row.archiveStatus === '1' || scope.row.archiveStatus === '3' || scope.row.archiveStatus === '6') && scope.row.cancellationStatus !== '5'"
+                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 == '7' || scope.row.archiveStatus == '5') && !scope.row.invoiceDate) && scope.row.cancellationStatus !== '5'"
                 text type="primary" @click="archivePush(scope.row)">重新归档</el-button>
               <!-- 项目归档撤回-->
               <el-button