bug修改,到账开票审核按钮判断条件修改

This commit is contained in:
zhaoxiao
2021-12-23 13:50:45 +08:00
parent 5be36d42f7
commit ae40db5ebb
6 changed files with 63 additions and 48 deletions
@@ -246,7 +246,7 @@
</div>
<!-- /分期信息-->
<a-form-item class="table-operator">
<a-button type="primary" @click="save" v-preventclick>保存</a-button>
<a-button type="primary" @click="save" v-preventclick>提交</a-button>
<a-button @click="handleCancle">取消</a-button>
</a-form-item>
</a-form>
@@ -442,39 +442,46 @@ export default {
if (this.confirmLoading) {
return
}
this.confirmLoading = true
this.form.validateFields((err, values) => {
if (!err) {
if (this.installmentList && this.installmentList.length > 0) {
let formData = {}
formData.installment = this.installmentList
formData.contract = Object.assign(this.model, values)
console.log('表单提交数据', formData)
let url = ''
if (!this.model.id) {
url = this.url.add
} else {
url = this.url.edit
}
postAction(url, formData).then(res => {
if (res.success) {
this.contractId = res.result.id
this.$message.success(res.message)
// 跳转至支出合同list页面
this.$router.push({
path: '/contractManagement/ExpenditureContract'
const that = this
this.$confirm({
title: '确认提交?',
content: '提交后将给存档人发送提醒消息',
onOk: function () {
that.confirmLoading = true
if (that.installmentList && that.installmentList.length > 0) {
let formData = {}
formData.installment = that.installmentList
formData.contract = Object.assign(that.model, values)
console.log('表单提交数据', formData)
let url = ''
if (!that.model.id) {
url = that.url.add
} else {
url = that.url.edit
}
postAction(url, formData).then(res => {
if (res.success) {
that.contractId = res.result.id
that.$message.success(res.message)
// 跳转至支出合同list页面
that.$router.push({
path: '/contractManagement/ExpenditureContract'
})
} else {
that.$message.warning(res.message)
}
}).finally(() => {
setTimeout(() => {
that.confirmLoading = false
}, 1000)
})
} else {
this.$message.warning(res.message)
that.confirmLoading = false
}
}).finally(() => {
setTimeout(() => {
this.confirmLoading = false
}, 1000)
})
} else {
this.confirmLoading = false
}
}
})
} else {
this.confirmLoading = false
}
@@ -192,22 +192,29 @@ export default {
this.$message.warn('请至少关联一个项目')
return
}
this.confirmLoading = true
this.associatedProjectLoading = true
const param = {
id: this.contractId,
status: 3
}
submitAudit(param).then(res => {
if (res.success) {
this.$message.success(res.message)
this.$router.go(-1)
} else {
this.$message.warn(res.message)
const that = this
this.$confirm({
title: '确认提交?',
content: '提交后将给存档人发送提醒消息',
onOk: function () {
that.confirmLoading = true
that.associatedProjectLoading = true
const param = {
id: that.contractId,
status: 3
}
submitAudit(param).then(res => {
if (res.success) {
that.$message.success(res.message)
that.$router.go(-1)
} else {
that.$message.warn(res.message)
}
}).finally(() => {
that.confirmLoading = false
that.associatedProjectLoading = false
})
}
}).finally(() => {
this.confirmLoading = false
this.associatedProjectLoading = false
})
}
}
@@ -147,7 +147,7 @@ export default {
title: '操作',
dataIndex: 'operation',
align: 'center',
width: 300,
width: 520,
scopedSlots: { customRender: 'operation' }
}
],
@@ -176,6 +176,7 @@ export default {
title: '职务',
align: 'center',
dataIndex: 'post',
width: 220,
scopedSlots: { customRender: 'textRow' }
}, {
title: '手机号',
@@ -116,7 +116,7 @@
<!-- 待审核状态显示审核按钮-->
<a @click="auditProof(record)"
class="audit-btn"
v-if="record.paymentStatus === 'toBeReviewed'"
v-if="record.checkPaymentStatus === 'toBeReviewed'"
v-has="'incomePaymentAndInvoiving:audit'">审核</a>
<!-- 未审核通过的会议项目不允许在这里来款-->
<a @click="incomePayment(record)"
@@ -171,7 +171,7 @@ export default {
dataIndex: 'action',
align: 'center',
fixed: 'right',
width: 280,
width: 500,
scopedSlots: { customRender: 'action' }
}
],
@@ -8,7 +8,7 @@
<a-row>
<a-col :xl="6" :lg="7" :md="8" :sm="24">
<a-form-item label="项目名称" :labelCol="labelCol" :wrapperCol="wrapperCol">
<a-input placeholder="请输入项目名称" v-model="queryParam.companyName" :maxLength='50'></a-input>
<a-input placeholder="请输入项目名称" v-model="queryParam.projectName" :maxLength='50'></a-input>
</a-form-item>
</a-col>
<a-col :xl="6" :lg="7" :md="8" :sm="24">