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 @@
删除
- 已存档
+
作废
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 @@
删除
- 已存档
+
作废
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 @@
审核
@@ -451,4 +452,8 @@ export default {
\ 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)