From 88a41cd4e81e2c1d432a52c0b96ea81adae47101 Mon Sep 17 00:00:00 2001
From: zhaoxiao <zhaoxiao@syxysoft.com>
Date: Thu, 23 Dec 2021 10:53:22 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=B0=E8=B4=A6=E5=BC=80=E7=A5=A8=E7=9B=B8?=
 =?UTF-8?q?=E5=85=B3bug=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../expenditureContract/ExpenditureContractList.vue  |  2 +-
 .../revenueContract/RevenueContractList.vue          |  2 +-
 .../arriveAndInvoicing/ArriveAndInvoivingList.vue    |  5 +++++
 .../arriveAndInvoicing/modules/AuditProofModule.vue  |  4 ++++
 .../WorkingGroupMemberUnitMaintenance.vue            | 12 +++++++-----
 .../modules/CommitteeUnderStudyFilesModal.vue        |  2 +-
 6 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/src/views/contractManagement/expenditureContract/ExpenditureContractList.vue b/src/views/contractManagement/expenditureContract/ExpenditureContractList.vue
index f57a8a9..5fe893a 100644
--- a/src/views/contractManagement/expenditureContract/ExpenditureContractList.vue
+++ b/src/views/contractManagement/expenditureContract/ExpenditureContractList.vue
@@ -120,7 +120,7 @@
             <a @click="handleDelete(record.id)"
                v-has="'expenditureContract:delete'"
                v-if="record.status === 6">删除</a>
-            <a :disabled="true" v-if="record.status === 5">已存档</a>
+            <!-- <a :disabled="true" v-if="record.status === 5">已存档</a> -->
             <!--            待存档、已存档-->
             <a v-if="record.status === 3 || record.status === 5" @click="handleCancellation(record)"
                v-has="'expenditureContract:cancellation'">作废</a>
diff --git a/src/views/contractManagement/revenueContract/RevenueContractList.vue b/src/views/contractManagement/revenueContract/RevenueContractList.vue
index ddb2cc0..534dcba 100644
--- a/src/views/contractManagement/revenueContract/RevenueContractList.vue
+++ b/src/views/contractManagement/revenueContract/RevenueContractList.vue
@@ -137,7 +137,7 @@
             <a @click="handleDelete(record.id)"
                v-if="record.status === 1 || record.status === 6"
                v-has="'revenueContract:delete'">删除</a>
-            <a :disabled="true" v-if="record.status === 5">已存档</a>
+            <!-- <a :disabled="true" v-if="record.status === 5">已存档</a> -->
             <!--            待存档、已存档-->
             <a v-if="record.status === 3 || record.status === 5" @click="handleCancellation(record)" v-has="'revenueContract:cancellation'">作废</a>
           </span>
diff --git a/src/views/financialManagement/arriveAndInvoicing/ArriveAndInvoivingList.vue b/src/views/financialManagement/arriveAndInvoicing/ArriveAndInvoivingList.vue
index e93979a..5a7aa82 100644
--- a/src/views/financialManagement/arriveAndInvoicing/ArriveAndInvoivingList.vue
+++ b/src/views/financialManagement/arriveAndInvoicing/ArriveAndInvoivingList.vue
@@ -115,6 +115,7 @@
           <span slot="action" class="action-span-cell" slot-scope="text, record">
             <!--            待审核状态显示审核按钮-->
             <a @click="auditProof(record)"
+               class="audit-btn"
                v-if="record.paymentStatus === 'toBeReviewed'"
                v-has="'incomePaymentAndInvoiving:audit'">审核</a>
             <!--            未审核通过的会议项目不允许在这里来款-->
@@ -451,4 +452,8 @@ export default {
 
 <style scoped lang="less">
 @import '~@assets/less/common.less';
+
+.audit-btn {
+  color: red;
+}
 </style>
\ No newline at end of file
diff --git a/src/views/financialManagement/arriveAndInvoicing/modules/AuditProofModule.vue b/src/views/financialManagement/arriveAndInvoicing/modules/AuditProofModule.vue
index 162184c..63f1a77 100644
--- a/src/views/financialManagement/arriveAndInvoicing/modules/AuditProofModule.vue
+++ b/src/views/financialManagement/arriveAndInvoicing/modules/AuditProofModule.vue
@@ -211,6 +211,10 @@ export default {
         if (!err) {
           values.projectId = this.model.id
           values.projectType = this.model.projectType
+          // 当选了同意则把说明清空，防止出现错误信息
+          if (values.paymentStatus === 'completed') {
+            values.reviewInstructions = null
+          }
           const formData = Object.assign(this.proofInfo, values)
           postAction(this.auditUrl, formData).then(res => {
             if (res.success) {
diff --git a/src/views/projectManagement/WorkingGroupMemberUnitMaintenance.vue b/src/views/projectManagement/WorkingGroupMemberUnitMaintenance.vue
index 999b388..433abf4 100644
--- a/src/views/projectManagement/WorkingGroupMemberUnitMaintenance.vue
+++ b/src/views/projectManagement/WorkingGroupMemberUnitMaintenance.vue
@@ -347,16 +347,16 @@ export default {
   },
   created() {
     // 初始化工作组信息
-    this.initWorkGruopData()
+    this.initWorkGroupData()
   },
   methods: {
     /**
      * 初始化工作组信息
      */
-    initWorkGruopData() {
+    initWorkGroupData() {
       this.spinning = true
-      this.workingGroupProject = this.$route.query.workingGroupProject
-      this.workingGroupProjectId = this.$route.query.workingGroupProjectId
+      this.workingGroupProject = this.$route.query.workingGroupProject || ''
+      this.workingGroupProjectId = this.$route.query.workingGroupProjectId || ''
       this.canOperate = this.$route.query.canOperate === 'true' ? true : false
       this.filters.workingGroupId = this.workingGroupProjectId
       this.importParam.workGroupId = this.workingGroupProjectId
@@ -365,7 +365,9 @@ export default {
         id: this.workingGroupProjectId
       }
       getWorkingGroupById(param).then(res => {
-        this.workingGroupDetail = res.result
+        if(res.success) {
+          this.workingGroupDetail = res.result || {}
+        }
       }).finally(() => {
         this.spinning = false
       })
diff --git a/src/views/projectManagement/modules/CommitteeUnderStudyFilesModal.vue b/src/views/projectManagement/modules/CommitteeUnderStudyFilesModal.vue
index 8c5ec08..5203c82 100644
--- a/src/views/projectManagement/modules/CommitteeUnderStudyFilesModal.vue
+++ b/src/views/projectManagement/modules/CommitteeUnderStudyFilesModal.vue
@@ -98,7 +98,7 @@ export default {
      */
     handlePreview(record) {
       if (record && record.FILE_ID) {
-        const fileFullUrl = `${ window._CONFIG['domianWebSocketURL'] }/sys/common/download/${ record.FILE_ID }?token=${ Vue.ls.get(ACCESS_TOKEN) }&fullfilename=${ record.FILE_NAME }`
+        const fileFullUrl = `${ window._CONFIG['domianWebSocketURL'] }/payResearchProject/payResearchProject/downLoad/?fileId=${ record.FILE_ID }&fileName=${ record.FILE_NAME }`
         let url = `${ window._CONFIG['onlinePreviewDomainURL'] }?url=${ encodeURIComponent(fileFullUrl) }`
         // let url = `${window._CONFIG['onlinePreviewDomainURL']}?url=${encodeURIComponent(fileFullUrl)}`
         window.open(url)