|
@@ -297,7 +297,7 @@
|
|
|
</el-form>
|
|
|
<el-button @click="confirmCharge" v-if="form.fBillstatus < 4" type="primary">请 核</el-button>
|
|
|
<el-button @click="revokeCharge" v-if="form.fBillstatus == 6" type="danger">撤销请核</el-button>
|
|
|
- <el-button @click="revocationApproval" v-if="form.fBillstatus == 4" type="danger">撤销审批</el-button>
|
|
|
+ <el-button @click="revocationApproval" :disabled="tablefilter" v-if="form.fBillstatus == 4" type="danger">撤销审批</el-button>
|
|
|
<div class="dialogTableTitle flex a-center jlr">
|
|
|
<h2>作业费明细</h2>
|
|
|
<el-button @click="getList_s" :disabled="prohibit">新增</el-button>
|
|
@@ -405,7 +405,8 @@
|
|
|
<el-button v-if="approvalProhibit" @click="immediateApproval">审批</el-button>
|
|
|
<el-button v-if="form.fBillstatus > 2" @click="viewAudit">查看审批</el-button>
|
|
|
<el-button type="primary" @click="submitForm" :disabled="determine">确 定</el-button>
|
|
|
- <el-button @click="cancel">取 消</el-button>
|
|
|
+ <el-button v-if="cancelButton === true" @click="cancel">取 消</el-button>
|
|
|
+ <el-button v-if="cancelButton === false" @click="homePage">取 消</el-button>
|
|
|
<add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="getDataList"></add-or-update>
|
|
|
<approval-comments v-if="addOrUpdateVisib" ref="ApprovalComments" @refreshDataList="returnData"></approval-comments>
|
|
|
</div>
|
|
@@ -448,6 +449,7 @@ export default {
|
|
|
// 遮罩层
|
|
|
loading: true,
|
|
|
determine:false,
|
|
|
+ cancelButton:true,
|
|
|
approvalProhibit:false,
|
|
|
loading_s: false,
|
|
|
browseStatus: false,
|
|
@@ -455,6 +457,7 @@ export default {
|
|
|
prohibit:false,
|
|
|
addOrUpdateVisible:false,
|
|
|
addOrUpdateVisib:false,
|
|
|
+ tablefilter:false,
|
|
|
// 计价单位
|
|
|
jFeetunitOptions: [
|
|
|
{ dictLabel: "件数", dictValue: "1" },
|
|
@@ -559,7 +562,9 @@ export default {
|
|
|
})
|
|
|
},
|
|
|
adoPt(){
|
|
|
+ this.tablefilter = true
|
|
|
this.approval = this.$route.query.data
|
|
|
+ this.cancelButton = false
|
|
|
if (this.approval){
|
|
|
this.determine = true
|
|
|
this.prohibit = true
|
|
@@ -577,7 +582,6 @@ export default {
|
|
|
fCorpid: '' //结算单位ID
|
|
|
}
|
|
|
getAgreement(this.approval.billId).then(response => {
|
|
|
-
|
|
|
console.log(this.deptName)
|
|
|
console.log(response)
|
|
|
this.deptName = response.data.dept.deptName
|
|
@@ -589,7 +593,6 @@ export default {
|
|
|
}
|
|
|
this.fWbuOptions = response.data.feesList
|
|
|
console.log(JSON.stringify(this.agreementitemsList))
|
|
|
-
|
|
|
this.open = true
|
|
|
this.title = '修改作业费'
|
|
|
})
|