Commit eda9db8d authored by Mac's avatar Mac

1

parent b7f347ce
...@@ -813,10 +813,10 @@ ...@@ -813,10 +813,10 @@
</div> </div>
<!-- <button class="normalBtn" v-if="GetDetail.Status==0||GetDetail.Status==3||msg.FrID==0" <!-- <button class="normalBtn" v-if="GetDetail.Status==0||GetDetail.Status==3||msg.FrID==0"
@click="AddFinancial(1)">{{$t('fnc.zancun')}}</button> --> @click="AddFinancial(1)">{{$t('fnc.zancun')}}</button> -->
<q-btn color="primary" size="11px" :label="$t('fnc.zancun')" @click="AddFinancial(1)" style="marginRight:10px" v-if="!iscopy && (GetDetail.Status==0||GetDetail.Status==3||msg.FrID==0)"/> <q-btn color="primary" size="11px" :label="$t('fnc.zancun')" @click="AddFinancial(1)" style="marginRight:10px" v-if="iscopy==false && (GetDetail.Status==0||GetDetail.Status==3||msg.FrID==0)"/>
<!-- <button class="normalBtn" @click="AddFinancial()">{{$t('fnc.tijiao')}}</button> --> <!-- <button class="normalBtn" @click="AddFinancial()">{{$t('fnc.tijiao')}}</button> -->
<q-btn color="primary" size="11px" v-if="!iscopy" :label="$t('fnc.tijiao')" @click="AddFinancial()" style="marginRight:10px"/> <q-btn color="primary" size="11px" v-if="iscopy==false" :label="$t('fnc.tijiao')" @click="AddFinancial()" style="marginRight:10px"/>
<q-btn color="primary" size="11px" v-if="iscopy" label="复制" @click="AddFinancial()" style="marginRight:10px"/> <q-btn color="primary" size="11px" v-if="iscopy==true" label="复制" @click="AddFinancial()" style="marginRight:10px"/>
<!-- <button class="hollowFixedBtn" @click="AuditOrRefund()">{{$t('pub.returnBack')}}</button> --> <!-- <button class="hollowFixedBtn" @click="AuditOrRefund()">{{$t('pub.returnBack')}}</button> -->
<q-btn text-color="primary" size="11px" :label="$t('pub.returnBack')" @click="AuditOrRefund()"/> <q-btn text-color="primary" size="11px" :label="$t('pub.returnBack')" @click="AuditOrRefund()"/>
</div> </div>
...@@ -1323,7 +1323,7 @@ ...@@ -1323,7 +1323,7 @@
this.msg.ReTCID = this.czmsg.ReTCID; this.msg.ReTCID = this.czmsg.ReTCID;
} }
this.msg.GuestId=this.$route.query.GuestId; this.msg.GuestId=this.$route.query.GuestId;
if(this.iscopy){//如果是复制赋值为0 if(this.iscopy == true){//如果是复制赋值为0
this.msg.FrID = 0; this.msg.FrID = 0;
if(this.msg.vorcherInos.length>0){//如果是复制的话 收据ID 为0 if(this.msg.vorcherInos.length>0){//如果是复制的话 收据ID 为0
this.msg.vorcherInos.forEach(x=>{ this.msg.vorcherInos.forEach(x=>{
...@@ -1700,7 +1700,7 @@ ...@@ -1700,7 +1700,7 @@
.RB_Branch_Id; .RB_Branch_Id;
} }
let userInfo = this.getLocalStorage() let userInfo = this.getLocalStorage()
if(!this.$route.query.companyID&&userInfo.Group_Id==100000 && !this.iscopy){ if(!this.$route.query.companyID&&userInfo.Group_Id==100000 && this.iscopy == false){
this.msg.RB_Branch_Id = 4 this.msg.RB_Branch_Id = 4
} }
if(this.orderObj ){//6.21号新加 校区的id if(this.orderObj ){//6.21号新加 校区的id
......
...@@ -650,10 +650,10 @@ ...@@ -650,10 +650,10 @@
<div class="btn-box"> <div class="btn-box">
<!-- <button class="normalBtn" v-if="GetDetail.Status==0||GetDetail.Status==3||msg.FrID==0" <!-- <button class="normalBtn" v-if="GetDetail.Status==0||GetDetail.Status==3||msg.FrID==0"
@click="AddFinancial(1)">{{$t('fnc.zancun')}}</button> --> @click="AddFinancial(1)">{{$t('fnc.zancun')}}</button> -->
<q-btn color="primary" size="11px" :label="$t('fnc.zancun')" @click="AddFinancial(1)" style="marginRight:10px" v-if="!iscopy && (GetDetail.Status==0||GetDetail.Status==3||msg.FrID==0)"/> <q-btn color="primary" size="11px" :label="$t('fnc.zancun')" @click="AddFinancial(1)" style="marginRight:10px" v-if="iscopy==false && (GetDetail.Status==0||GetDetail.Status==3||msg.FrID==0)"/>
<!-- <button class="normalBtn" @click="AddFinancial()">{{$t('fnc.tijiao')}}</button> --> <!-- <button class="normalBtn" @click="AddFinancial()">{{$t('fnc.tijiao')}}</button> -->
<q-btn color="primary" size="11px" v-if="!iscopy" :label="$t('fnc.tijiao')" @click="AddFinancial()" style="marginRight:10px"/> <q-btn color="primary" size="11px" v-if="iscopy==false" :label="$t('fnc.tijiao')" @click="AddFinancial()" style="marginRight:10px"/>
<q-btn color="primary" size="11px" v-if="iscopy" label="复制" @click="AddFinancial()" style="marginRight:10px"/> <q-btn color="primary" size="11px" v-if="iscopy==true" label="复制" @click="AddFinancial()" style="marginRight:10px"/>
<!-- <button class="hollowFixedBtn" @click="AuditOrRefund()">返回</button> --> <!-- <button class="hollowFixedBtn" @click="AuditOrRefund()">返回</button> -->
<q-btn text-color="primary" size="11px" label="返回" @click="AuditOrRefund()"/> <q-btn text-color="primary" size="11px" label="返回" @click="AuditOrRefund()"/>
</div> </div>
...@@ -1350,7 +1350,7 @@ ...@@ -1350,7 +1350,7 @@
this.msg.PlatformAccountId = this.platformAccount; this.msg.PlatformAccountId = this.platformAccount;
this.loading = true; this.loading = true;
this.msg.GuestId=this.$route.query.GuestId this.msg.GuestId=this.$route.query.GuestId
if(this.iscopy){//如果是复制赋值为0 if(this.iscopy == true){//如果是复制赋值为0
this.msg.FrID = 0; this.msg.FrID = 0;
if(this.msg.vorcherInos.length>0){//如果是复制的话 收据ID 为0 if(this.msg.vorcherInos.length>0){//如果是复制的话 收据ID 为0
this.msg.vorcherInos.forEach(x=>{ this.msg.vorcherInos.forEach(x=>{
...@@ -1649,7 +1649,7 @@ ...@@ -1649,7 +1649,7 @@
this.msg.RB_Branch_Id = this.msg.RB_Branch_Id == 0 || this.msg.RB_Branch_Id == ParentCompanyId ? this this.msg.RB_Branch_Id = this.msg.RB_Branch_Id == 0 || this.msg.RB_Branch_Id == ParentCompanyId ? this
.getLocalStorage().School_Id : this.msg.RB_Branch_Id; .getLocalStorage().School_Id : this.msg.RB_Branch_Id;
if(!this.$route.query.companyID&&userInfo.Group_Id==100000 && !this.iscopy){ if(!this.$route.query.companyID&&userInfo.Group_Id==100000 && this.iscopy == false){
this.msg.RB_Branch_Id = 4 this.msg.RB_Branch_Id = 4
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment