Commit 7a76265a authored by youjie's avatar youjie

1 流程端口增加

parent 3c80be86
...@@ -109,6 +109,7 @@ ...@@ -109,6 +109,7 @@
crmOrderObj: null, crmOrderObj: null,
commissionObj: null, commissionObj: null,
tradeObj: null, tradeObj: null,
portTypeId: null,
} }
}, },
computed: { computed: {
...@@ -243,6 +244,7 @@ ...@@ -243,6 +244,7 @@
"Type":Type, "Type":Type,
"tradeObj":JSON.stringify(this.tradeObj), "tradeObj":JSON.stringify(this.tradeObj),
'path':this.$route.query.path, 'path':this.$route.query.path,
'companyID':this.$route.query.companyID,
blank:'y', blank:'y',
tab:'新增付款单' tab:'新增付款单'
} }
...@@ -318,8 +320,8 @@ ...@@ -318,8 +320,8 @@
}else{ }else{
this.noData = false; this.noData = false;
} }
let newList = [];
if (this.templateID) { if (this.templateID) {
let newList = [];
this.templateID.forEach(x=>{ this.templateID.forEach(x=>{
this.GetList.forEach(y=>{ this.GetList.forEach(y=>{
if(x == y.Id) { if(x == y.Id) {
...@@ -334,54 +336,17 @@ ...@@ -334,54 +336,17 @@
}else{ }else{
this.GetList.forEach(y=>{ this.GetList.forEach(y=>{
y.showYes = false y.showYes = false
newList.push(JSON.parse(JSON.stringify(y))) //newList.push(JSON.parse(JSON.stringify(y)))
}) })
} }
}, },
Financial_post_GetList(){ //获取 Financial_post_GetList(){ //获取
this.apipost('Financial_post_GetList',{},res=>{ this.apipost('Financial_post_GetList',{PortType:this.portTypeId},res=>{
if(res.data.resultCode==1){ if(res.data.resultCode==1){
let data = res.data.data; let data = res.data.data;
let list = [94,95,96,97,51,52,54,55,49,50,57,58,88,89] let list = [94,95,96,97,51,52,54,55,49,50,57,58,88,89]
if(data){ if(data){
data.forEach(x => { data.forEach(x => {
// 5-8 OrderSource 为5 并且当前登录人为吴珊,只显示49和50
// 如果不是吴珊,只显示49
// 如果没有 OrderSource 则49和50都不显示
// if (this.OrderSource === '5' && this.showTab === '2' && (x.Id === 49 || x.Id === 50)) {
// if (x.Id === 49 || x.Id === 50){
// x.bigShow = false
// if (x.Id === 49){
// x.bigShow = true
// } else if (x.Id === 50 && this.EmployeeId === 639){
// x.bigShow = true
// }
// } else {
// x.bigShow = false
// }
// } else if (x.Id === 49 || x.Id === 50){
// x.bigShow = false
// } else {
// 5-5 仅茈、而巳。 14:32:06
// 部门id = 242 或者 240 就展示出 templeteId=33 的流程, 流程名字叫做 公司佣金收款
// if (x.Id === 33 || x.Id === 48) {
// if (x.Id === 33) {
// if (this.DepartID === 242 || this.DepartID === 240) {
// x.bigShow = true
// } else {
// x.bigShow = false
// }
// } else if (x.Id === 48 ) { //76 77 稽核单据|| x.Id === 76 || x.Id === 77
// if (this.EmployeeId === 1725) {
// x.bigShow = true
// } else {
// x.bigShow = false
// }
// }
// } else {
// x.bigShow = true
// }
// }
x.bigShow = true x.bigShow = true
if(x.Type==1){ if(x.Type==1){
this.collectList.push(x); this.collectList.push(x);
...@@ -446,6 +411,7 @@ ...@@ -446,6 +411,7 @@
this.EmployeeId = userInfo.EmployeeId; this.EmployeeId = userInfo.EmployeeId;
} }
this.templateID = this.$route.query.templateID ? JSON.parse(this.$route.query.templateID) : null this.templateID = this.$route.query.templateID ? JSON.parse(this.$route.query.templateID) : null
this.portTypeId = this.$route.query.portTypeId ? this.$route.query.portTypeId : null
this.OrderSource = this.$route.query.OrderSource ? this.$route.query.OrderSource : null this.OrderSource = this.$route.query.OrderSource ? this.$route.query.OrderSource : null
// this.showTab = this.$route.query.Type?this.$route.query.Type:0; // this.showTab = this.$route.query.Type?this.$route.query.Type:0;
this.tradeWay = this.$route.query.tradeWay?this.$route.query.tradeWay:0; this.tradeWay = this.$route.query.tradeWay?this.$route.query.tradeWay:0;
......
...@@ -1150,7 +1150,13 @@ export default { ...@@ -1150,7 +1150,13 @@ export default {
tab: `新增${text}单据`, tab: `新增${text}单据`,
Type: type, Type: type,
tradeObj: JSON.stringify(this.BillMakingMsg), tradeObj: JSON.stringify(this.BillMakingMsg),
companyID: row.OutBranchId
}; };
if(num==2){
query.searchTitle='溢收团费退款';
}else if(num ==3 && this.cdState == false){
query.portTypeId= 4;
}
this.queryObj = query this.queryObj = query
if(!Offset){ if(!Offset){
this.$store.commit("ChoiceAddFinancialDocuments"); this.$store.commit("ChoiceAddFinancialDocuments");
......
...@@ -1390,6 +1390,12 @@ ...@@ -1390,6 +1390,12 @@
orderObj: JSON.stringify(orderObj), orderObj: JSON.stringify(orderObj),
Type: type, Type: type,
} }
if(num==2){
query.searchTitle='签证退款'
}
else if(num ==3 && this.cdState == false){
query.portTypeId= 2;
}
this.queryObj = query this.queryObj = query
if(!Offset){ if(!Offset){
this.$router.push({ this.$router.push({
......
...@@ -1508,6 +1508,12 @@ export default { ...@@ -1508,6 +1508,12 @@ export default {
orderObj: JSON.stringify(orderObj), orderObj: JSON.stringify(orderObj),
Type: type, Type: type,
} }
if(num==2){
query.searchTitle='签证退款'
}
else if(num ==3 && this.cdState == false){
query.portTypeId= 2;//签证成本
}
this.queryObj = query this.queryObj = query
if(!Offset){ if(!Offset){
this.$router.push({ this.$router.push({
......
...@@ -1504,7 +1504,7 @@ ...@@ -1504,7 +1504,7 @@
<p class="_num3">{{item.TicketNum==null?'0':item.TicketNum}}</p> <p class="_num3">{{item.TicketNum==null?'0':item.TicketNum}}</p>
<p class="_wz">{{$t('Airticket.Air_reservation')}}</p> <p class="_wz">{{$t('Airticket.Air_reservation')}}</p>
</li> </li>
<li> <li>
<p <p
:class="{'_num3':item.ConfigUnionCount!=item.UnionCount,'_num2':item.ConfigUnionCount==item.UnionCount}"> :class="{'_num3':item.ConfigUnionCount!=item.UnionCount,'_num2':item.ConfigUnionCount==item.UnionCount}">
...@@ -3528,9 +3528,10 @@ ...@@ -3528,9 +3528,10 @@
name: "ChoiceAddFinancialDocuments", name: "ChoiceAddFinancialDocuments",
query: { query: {
Type: nFeeType, Type: nFeeType,
portTypeId:1,
path: "TicketFinace", path: "TicketFinace",
blank: "y", blank: "y",
orderObj: JSON.stringify(orderObj) orderObj: JSON.stringify(orderObj),
} }
}); });
}, },
...@@ -3558,6 +3559,7 @@ ...@@ -3558,6 +3559,7 @@
name: "ChoiceAddFinancialDocuments", name: "ChoiceAddFinancialDocuments",
query: { query: {
Type: nFeeType, Type: nFeeType,
portTypeId:1,
path: "TicketFinace", path: "TicketFinace",
blank: "y", blank: "y",
orderObj: JSON.stringify(orderObj) orderObj: JSON.stringify(orderObj)
......
...@@ -1360,7 +1360,13 @@ export default { ...@@ -1360,7 +1360,13 @@ export default {
tab: `新增${text}单据`, tab: `新增${text}单据`,
Type: type, Type: type,
tradeObj: JSON.stringify(this.BillMakingMsg), tradeObj: JSON.stringify(this.BillMakingMsg),
companyID:row.OutBranchId
}; };
if(num==2){
query.searchTitle='溢收团费退款';
}else if(num ==3 && this.cdState == false){
query.portTypeId= 3;
}
this.queryObj = query; this.queryObj = query;
if (!Offset) { if (!Offset) {
this.$store.commit("ChoiceAddFinancialDocuments"); this.$store.commit("ChoiceAddFinancialDocuments");
......
...@@ -31,7 +31,7 @@ ...@@ -31,7 +31,7 @@
</div> </div>
</div> </div>
<el-select slot="reference" v-model="value" class='w80' placeholder="收款方式" @change='chanceType(item)'> <el-select slot="reference" v-model="value" class='w80' placeholder="收款方式" @change='chanceType(item)'>
<el-option label="二维码" value="1"></el-option> <!-- <el-option label="二维码" value="1"></el-option> -->
<el-option label="团队收款" value="2"></el-option> <el-option label="团队收款" value="2"></el-option>
<el-option v-if='item.orderState===1' label="团队退款" value="3"></el-option> <el-option v-if='item.orderState===1' label="团队退款" value="3"></el-option>
<el-option label="团队小费" value="4"></el-option> <el-option label="团队小费" value="4"></el-option>
......
...@@ -1362,8 +1362,14 @@ ...@@ -1362,8 +1362,14 @@
blank: "y", blank: "y",
tab: `新增${text}单据`, tab: `新增${text}单据`,
Type: type, Type: type,
tradeObj: JSON.stringify(this.BillMakingMsg) tradeObj: JSON.stringify(this.BillMakingMsg),
companyID:row.OutBranchId
}; };
if(num==2){
query.searchTitle='溢收团费退款';
}else if(num ==3 && this.cdState == false){
query.portTypeId= 6;
}
this.queryObj = query this.queryObj = query
if(!Offset){ if(!Offset){
this.$store.commit("ChoiceAddFinancialDocuments"); this.$store.commit("ChoiceAddFinancialDocuments");
......
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