Bladeren bron

Merge branch 'master' of http://1.71.9.215:3000/feiyi/cbjsxt-front-master

15110620229@163.com 2 weken geleden
bovenliggende
commit
ecb05bc477

+ 1 - 1
src/api/audit/archive.js

@@ -30,7 +30,7 @@ export function generateArchive(taskId) {
 }
 
 // 确定归档
-export function confirmArchive(taskId) {
+export function queConfirmArchive(taskId) {
   return request({
     url: url + '/api/materialSummary/v1/confirmArchive',
     method: 'post',

+ 2 - 1
src/views/EntDeclaration/auditTaskManagement/taskFillIn.vue

@@ -778,7 +778,8 @@
     computed: {
       // 是否为材料处理初审阶段
       isClcs() {
-        return this.currentNode === 'clcs'
+        // return this.currentNode === 'clcs'
+        return this.taskInfo.status !== '600'
       },
       // 补充材料校验规则:clcs 阶段严格,其它阶段仅名称必填
       materialRulesComputed() {

+ 2 - 2
src/views/costAudit/auditInfo/archivesManage/ArchivePreview.vue

@@ -114,7 +114,7 @@
   import {
     getArchiveStatus,
     generateArchive,
-    confirmArchive,
+    queConfirmArchive,
   } from '@/api/audit/archive'
 
   export default {
@@ -325,7 +325,7 @@
         })
           .then(async () => {
             try {
-              const response = await confirmArchive(this.taskId)
+              const response = await queConfirmArchive(this.taskId)
               if (response && response.success !== false) {
                 this.$message.success(response.message || '归档成功')
                 // 关闭弹窗并刷新主页面列表