|
@@ -1503,7 +1503,7 @@
|
|
|
<el-button type="primary" :disabled="notChange" @click="saveForm">保 存</el-button>
|
|
|
<el-button v-if="approve === true" @click="goApproval">审批</el-button>
|
|
|
<el-button type="success" @click="backrRconciliation" v-if="form.fBillstatus == '6'">撤销请核</el-button>
|
|
|
- <el-button type="primary" :disabled="notChange" v-if="form.fBillstatus > 3" @click="addOrUpdateHandle()">查看审批流</el-button>
|
|
|
+ <el-button type="primary" :disabled="approvalStatus" v-if="form.fBillstatus > 3" @click="addOrUpdateHandle()">查看审批流</el-button>
|
|
|
<el-button type="primary" :disabled="notChange" @click="submitForm">提交审核</el-button>
|
|
|
<el-button type="danger" :disabled="disappear" v-if="form.fBillstatus == '4' && Operator == Lander" @click="backApproval">撤销审批</el-button>
|
|
|
<el-button v-if="cancelButton === true" @click="cancel">取 消</el-button>
|
|
@@ -1633,6 +1633,7 @@
|
|
|
goodsTransferId:130,
|
|
|
addOrUpdateVisible: false,
|
|
|
addOrUpdateVisib:false,
|
|
|
+ approvalStatus: false,
|
|
|
// 审批状态
|
|
|
approve:false,
|
|
|
notChange:false,
|
|
@@ -1879,6 +1880,7 @@
|
|
|
Jump(){
|
|
|
this.approval = this.$route.query.data
|
|
|
if(this.approval){
|
|
|
+ this.reset()
|
|
|
this.colseButton = false
|
|
|
this.approval = JSON.parse(this.approval)
|
|
|
this.hide = false
|
|
@@ -1888,9 +1890,15 @@
|
|
|
this.approve = true
|
|
|
this.disappear = true
|
|
|
this.cancelButton = false
|
|
|
-
|
|
|
- this.reset()
|
|
|
getGoodsTransfer(this.approval.billId).then((response) => {
|
|
|
+ if (response.data.warehousebills) {
|
|
|
+ this.form = response.data.warehousebills;
|
|
|
+ if (this.form.fBillstatus > 2) {
|
|
|
+ this.approvalStatus = false;
|
|
|
+ } else {
|
|
|
+ this.approvalStatus = true;
|
|
|
+ }
|
|
|
+ }
|
|
|
this.form = response.data.warehousebills
|
|
|
this.$set(this.form, 'fStltypeid', this.form.fStltypeid + '')
|
|
|
this.$set(this.form, 'fFeetunit', Number(this.form.fFeetunit))
|