到账开票相关bug修改

This commit is contained in:
zhaoxiao
2021-12-23 10:53:22 +08:00
parent b9ebbd2c78
commit 88a41cd4e8
6 changed files with 19 additions and 8 deletions
@@ -120,7 +120,7 @@
<a @click="handleDelete(record.id)" <a @click="handleDelete(record.id)"
v-has="'expenditureContract:delete'" v-has="'expenditureContract:delete'"
v-if="record.status === 6">删除</a> 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)" <a v-if="record.status === 3 || record.status === 5" @click="handleCancellation(record)"
v-has="'expenditureContract:cancellation'">作废</a> v-has="'expenditureContract:cancellation'">作废</a>
@@ -137,7 +137,7 @@
<a @click="handleDelete(record.id)" <a @click="handleDelete(record.id)"
v-if="record.status === 1 || record.status === 6" v-if="record.status === 1 || record.status === 6"
v-has="'revenueContract:delete'">删除</a> 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> <a v-if="record.status === 3 || record.status === 5" @click="handleCancellation(record)" v-has="'revenueContract:cancellation'">作废</a>
</span> </span>
@@ -115,6 +115,7 @@
<span slot="action" class="action-span-cell" slot-scope="text, record"> <span slot="action" class="action-span-cell" slot-scope="text, record">
<!-- 待审核状态显示审核按钮--> <!-- 待审核状态显示审核按钮-->
<a @click="auditProof(record)" <a @click="auditProof(record)"
class="audit-btn"
v-if="record.paymentStatus === 'toBeReviewed'" v-if="record.paymentStatus === 'toBeReviewed'"
v-has="'incomePaymentAndInvoiving:audit'">审核</a> v-has="'incomePaymentAndInvoiving:audit'">审核</a>
<!-- 未审核通过的会议项目不允许在这里来款--> <!-- 未审核通过的会议项目不允许在这里来款-->
@@ -451,4 +452,8 @@ export default {
<style scoped lang="less"> <style scoped lang="less">
@import '~@assets/less/common.less'; @import '~@assets/less/common.less';
.audit-btn {
color: red;
}
</style> </style>
@@ -211,6 +211,10 @@ export default {
if (!err) { if (!err) {
values.projectId = this.model.id values.projectId = this.model.id
values.projectType = this.model.projectType values.projectType = this.model.projectType
// 当选了同意则把说明清空,防止出现错误信息
if (values.paymentStatus === 'completed') {
values.reviewInstructions = null
}
const formData = Object.assign(this.proofInfo, values) const formData = Object.assign(this.proofInfo, values)
postAction(this.auditUrl, formData).then(res => { postAction(this.auditUrl, formData).then(res => {
if (res.success) { if (res.success) {
@@ -347,16 +347,16 @@ export default {
}, },
created() { created() {
// 初始化工作组信息 // 初始化工作组信息
this.initWorkGruopData() this.initWorkGroupData()
}, },
methods: { methods: {
/** /**
* 初始化工作组信息 * 初始化工作组信息
*/ */
initWorkGruopData() { initWorkGroupData() {
this.spinning = true this.spinning = true
this.workingGroupProject = this.$route.query.workingGroupProject this.workingGroupProject = this.$route.query.workingGroupProject || ''
this.workingGroupProjectId = this.$route.query.workingGroupProjectId this.workingGroupProjectId = this.$route.query.workingGroupProjectId || ''
this.canOperate = this.$route.query.canOperate === 'true' ? true : false this.canOperate = this.$route.query.canOperate === 'true' ? true : false
this.filters.workingGroupId = this.workingGroupProjectId this.filters.workingGroupId = this.workingGroupProjectId
this.importParam.workGroupId = this.workingGroupProjectId this.importParam.workGroupId = this.workingGroupProjectId
@@ -365,7 +365,9 @@ export default {
id: this.workingGroupProjectId id: this.workingGroupProjectId
} }
getWorkingGroupById(param).then(res => { getWorkingGroupById(param).then(res => {
this.workingGroupDetail = res.result if(res.success) {
this.workingGroupDetail = res.result || {}
}
}).finally(() => { }).finally(() => {
this.spinning = false this.spinning = false
}) })
@@ -98,7 +98,7 @@ export default {
*/ */
handlePreview(record) { handlePreview(record) {
if (record && record.FILE_ID) { 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) }`
// let url = `${window._CONFIG['onlinePreviewDomainURL']}?url=${encodeURIComponent(fileFullUrl)}` // let url = `${window._CONFIG['onlinePreviewDomainURL']}?url=${encodeURIComponent(fileFullUrl)}`
window.open(url) window.open(url)