|
|
@@ -34,7 +34,7 @@
|
|
|
<el-button type="primary" size="mini" style="margin-left: 8px" @click="commonAuditClick()" v-if="auditBtn && AnnualStatus == '5'">审批</el-button><!-- 企业法规处 -->
|
|
|
<el-button type="primary" size="mini" style="margin-left: 8px" @click="confirmStorage()" v-if="auditBtn && AnnualStatus == '7'">入库审批</el-button><!-- 企业法规处 -->
|
|
|
<el-button type="primary" style="margin-left: 8px;" size="mini" @click="secUnitSeparateAuditClick" v-if="auditBtn && AnnualStatus == '10'">提交</el-button>
|
|
|
- <el-button type="primary" size="mini" style="margin-left: 8px" @click="paySureClick()" v-if="auditBtn && parseInt(this.formData.Status) === 6">交费</el-button>
|
|
|
+ <!--<el-button type="primary" size="mini" style="margin-left: 8px" @click="paySureClick()" v-if="auditBtn && parseInt(this.formData.Status) === 6">交费</el-button>-->
|
|
|
<el-button type="primary" size="mini" style="margin-left: 8px;" onclick="window.history.go(-1)">返回</el-button>
|
|
|
</span>
|
|
|
</div>
|
|
|
@@ -1794,8 +1794,9 @@ export default {
|
|
|
if (_this.$refs['WfHistory']) {
|
|
|
_this.$refs['WfHistory'].getHistoryTask()
|
|
|
}
|
|
|
- _this.getstatus(this.annualId)
|
|
|
_this.initDatas()
|
|
|
+ _this.getstatus(this.annualId)
|
|
|
+ _this.isAccess()
|
|
|
} else {
|
|
|
this.$message({
|
|
|
type: 'warning',
|
|
|
@@ -1871,7 +1872,7 @@ export default {
|
|
|
}
|
|
|
_this.getstatus(this.annualId)
|
|
|
_this.initDatas()
|
|
|
- this.isAccess()
|
|
|
+ _this.isAccess()
|
|
|
} else {
|
|
|
this.$message({
|
|
|
type: 'warning',
|
|
|
@@ -1908,6 +1909,7 @@ export default {
|
|
|
this.entrydetail.business = this.formannData.Id
|
|
|
this.entrydetail.instance = this.formannData.WorkflowId
|
|
|
this.entrydetail.Status = this.formannData.Status
|
|
|
+ this.isAccess()
|
|
|
})
|
|
|
.catch(err => {
|
|
|
console.error(err)
|
|
|
@@ -2574,6 +2576,7 @@ export default {
|
|
|
AuditRemark: this.shenheForm.AuditorRemark
|
|
|
}
|
|
|
console.log('审批结果提交参数:', params)
|
|
|
+ let _this = this
|
|
|
annualapi.commonAuditEntity(this.shenheForm.AnnualId, params, this.$axios).then(res => {
|
|
|
if (res.data.code === 0) {
|
|
|
console.log('审批提交,成功返回')
|
|
|
@@ -2584,17 +2587,17 @@ export default {
|
|
|
if (this.$refs['WfHistory']) {
|
|
|
this.$refs['WfHistory'].getHistoryTask()
|
|
|
}
|
|
|
- this.getstatus(this.annualId)
|
|
|
- this.initDatas()
|
|
|
- this.isAccess()
|
|
|
+ _this.initDatas()
|
|
|
+ _this.getstatus(this.annualId)
|
|
|
+ _this.isAccess()
|
|
|
} else {
|
|
|
this.$message({
|
|
|
type: 'warning',
|
|
|
message: res.data.message
|
|
|
})
|
|
|
}
|
|
|
- this.dialogCommonAuditMakeSureVisible = false
|
|
|
- this.loading = false
|
|
|
+ _this.dialogCommonAuditMakeSureVisible = false
|
|
|
+ _this.loading = false
|
|
|
}).catch(err => {
|
|
|
console.error(err)
|
|
|
})
|