Skip to content

C
confucius
Commit abd9a177 authored by Mac's avatar Mac
Browse files
Options

修改财务单据的判断

parent d291084e
Hide whitespace changes
Inline Side-by-side
Showing with 24 additions and 20 deletions
src/pages/financial/financalDocument/FinancialDocuments.vue
View file @ abd9a177
...@@ -1046,7 +1046,7 @@ ...@@ -1046,7 +1046,7 @@
</el-tooltip> </el-tooltip>
<el-tooltip class="item" content="复制" placement="top" v-if="item.Type==1 || item.Type==2" > <el-tooltip class="item" content="复制" placement="top" v-if="item.Type==1 || item.Type==2" >
<i class="iconfont icon-fuzhi" v-if="(item.Type==1 || item.Type==2) && msg.Conditon==1" <i class="iconfont icon-fuzhi" v-if="(item.Type==1 || item.Type==2) && msg.Conditon==1"
@click="goEit(item.Type,item.FrID,true,active,msg.pageIndex, item,true)"></i> @click="goEit(item.Type,item.FrID,true,active,msg.pageIndex, item,2)"></i>
</el-tooltip> </el-tooltip>
</td> </td>
</tr> </tr>
...@@ -2456,7 +2456,7 @@ ...@@ -2456,7 +2456,7 @@
path: tempStr path: tempStr
}); });
}, },
goEit(type, id, edit, Conditon, pageIndex, item,iscopy=false) {//iscopy是否复制 现在只做type为1和2 goEit(type, id, edit, Conditon, pageIndex, item,iscopy=1) {//iscopy是否复制 现在只做type为1和2
let path = ''; let path = '';
if (type === 1) { if (type === 1) {
path = 'addReceivablesDocuments' path = 'addReceivablesDocuments'
......
src/pages/financial/financalDocument/addFinancialDocuments.vue
View file @ abd9a177
...@@ -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==false && (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==1 && (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==false" :label="$t('fnc.tijiao')" @click="AddFinancial()" style="marginRight:10px"/> <q-btn color="primary" size="11px" v-if="iscopy==1" :label="$t('fnc.tijiao')" @click="AddFinancial()" style="marginRight:10px"/>
<q-btn color="primary" size="11px" v-if="iscopy==true" label="复制" @click="AddFinancial()" style="marginRight:10px"/> <q-btn color="primary" size="11px" v-if="iscopy==2" 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>
...@@ -1013,7 +1013,7 @@ ...@@ -1013,7 +1013,7 @@
Status: '-1' Status: '-1'
}, },
costmode:true, costmode:true,
iscopy:false,//是否是复制 iscopy:1,//是否是复制 1是修改2为复制
} }
}, },
methods: { methods: {
...@@ -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 == true){//如果是复制赋值为0 if(this.iscopy == 2){//如果是复制赋值为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 == false){ if(!this.$route.query.companyID&&userInfo.Group_Id==100000 && this.iscopy == 1){
this.msg.RB_Branch_Id = 4 this.msg.RB_Branch_Id = 4
} }
if(this.orderObj ){//6.21号新加 校区的id if(this.orderObj ){//6.21号新加 校区的id
...@@ -2100,6 +2100,10 @@ ...@@ -2100,6 +2100,10 @@
.Type == 2)) { .Type == 2)) {
this.MaxMoney(); this.MaxMoney();
} }
if(this.$route.query.iscopy){
this.iscopy = this.$route.query.iscopy//复制的值
console.log(this.iscopy)
}
let userInfo = this.getLocalStorage(); let userInfo = this.getLocalStorage();
this.department = userInfo.DeptName; this.department = userInfo.DeptName;
this.EmployeeId = userInfo.Id; this.EmployeeId = userInfo.Id;
...@@ -2145,9 +2149,7 @@ ...@@ -2145,9 +2149,7 @@
if (this.$route.query.Conditon) { if (this.$route.query.Conditon) {
this.returnCode = this.$route.query.Conditon; this.returnCode = this.$route.query.Conditon;
} }
if(this.$route.query.iscopy){
this.iscopy = this.$route.query.iscopy//复制的值
}
// this.admin_get_DepartmentGetList(); // this.admin_get_DepartmentGetList();
......
src/pages/financial/financalDocument/addReceivablesDocuments.vue
View file @ abd9a177
...@@ -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==false && (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==1 && (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==false" :label="$t('fnc.tijiao')" @click="AddFinancial()" style="marginRight:10px"/> <q-btn color="primary" size="11px" v-if="iscopy==1" :label="$t('fnc.tijiao')" @click="AddFinancial()" style="marginRight:10px"/>
<q-btn color="primary" size="11px" v-if="iscopy==true" label="复制" @click="AddFinancial()" style="marginRight:10px"/> <q-btn color="primary" size="11px" v-if="iscopy==2" 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>
...@@ -857,7 +857,7 @@ ...@@ -857,7 +857,7 @@
Status: '-1' Status: '-1'
}, },
costmode:true, costmode:true,
iscopy:false,//是否是复制 iscopy:1,//是否是复制1是修改 2 为复制
} }
}, },
methods: { methods: {
...@@ -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 == true){//如果是复制赋值为0 if(this.iscopy == 2){//如果是复制赋值为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 == false){ if(!this.$route.query.companyID&&userInfo.Group_Id==100000 && this.iscopy == 1){
this.msg.RB_Branch_Id = 4 this.msg.RB_Branch_Id = 4
} }
...@@ -1868,6 +1868,10 @@ ...@@ -1868,6 +1868,10 @@
} }
}, },
mounted() { mounted() {
if(this.$route.query.iscopy){
this.iscopy = this.$route.query.iscopy//复制的值
console.log(this.iscopy)
}
let userInfo = this.getLocalStorage(); let userInfo = this.getLocalStorage();
this.department = userInfo.DeptName; this.department = userInfo.DeptName;
this.emplyeeName = userInfo.AccountName; this.emplyeeName = userInfo.AccountName;
...@@ -1909,9 +1913,7 @@ ...@@ -1909,9 +1913,7 @@
this.returnCode = this.$route.query.Conditon; this.returnCode = this.$route.query.Conditon;
} }
this.BankAccount_post_GetAccountType(); this.BankAccount_post_GetAccountType();
if(this.$route.query.iscopy){
this.iscopy = this.$route.query.iscopy//复制的值
}
}, },
components: { components: {
......
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