Skip to content

S
SuperMan
Commit 29c16c80 authored by youjie's avatar youjie
Browse files
Options

no message

parent e3c1044d
Hide whitespace changes
Inline Side-by-side
Showing with 99 additions and 100 deletions
src/components/FinancialModule/ChoiceAddFinancialDocuments2.vue
View file @ 29c16c80
...@@ -132,8 +132,7 @@ ...@@ -132,8 +132,7 @@
let Handmsg=this.$route.query.czmsg; let Handmsg=this.$route.query.czmsg;
this.$router.push({ name: "addReceivablesDocuments",query:{"Handmsg":Handmsg,"tradeWay":this.tradeWay,"platformAccount":this.platformAccount,"id":id,"Name":Name,"Type":Type,"orderObj":this.orderObj,'path':this.$route.query.path,'IsUploadPic':IsUploadPic,'Cmd':this.$route.query.Cmd,'companyID':this.$route.query.companyID,blank:'y',tab:'新增收款单'}}) this.$router.push({ name: "addReceivablesDocuments",query:{"Handmsg":Handmsg,"tradeWay":this.tradeWay,"platformAccount":this.platformAccount,"id":id,"Name":Name,"Type":Type,"orderObj":this.orderObj,'path':this.$route.query.path,'IsUploadPic':IsUploadPic,'Cmd':this.$route.query.Cmd,'companyID':this.$route.query.companyID,blank:'y',tab:'新增收款单'}})
} }else{
else{
// crm自动登陆传过来的参数 // crm自动登陆传过来的参数
if(this.crmOrderObj){ if(this.crmOrderObj){
this.$router.push({ this.$router.push({
...@@ -154,6 +153,26 @@ ...@@ -154,6 +153,26 @@
tab:'新增收款单' tab:'新增收款单'
} }
}) })
}// 同业制单
else if(this.$route.query.tradeObj){
this.$router.push({
name: "addReceivablesDocuments",
query:{
"tradeWay":this.tradeWay,
"platformAccount":this.platformAccount,
"id":id,
"Name":Name,
"Type":this.tradeObj.ReFinanceId2,
"tradeObj":JSON.stringify(this.tradeObj),
"orderObj":this.orderObj,
'path':this.$route.query.path,
'IsUploadPic':IsUploadPic,
'Cmd':this.$route.query.Cmd,
'companyID':this.$route.query.companyID,
blank:'y',
tab:'新增收款单'
}
})
}else{ }else{
this.$router.push({ this.$router.push({
name: "addReceivablesDocuments", name: "addReceivablesDocuments",
...@@ -247,7 +266,25 @@ ...@@ -247,7 +266,25 @@
}else if(this.active==4){ }else if(this.active==4){
this.$router.push({ name: path,query:{"id":id,"Name":Name,"Type":2,"orderObj":this.orderObj,'path':this.$route.query.path,'IsUploadPic':IsUploadPic,'Cmd':this.$route.query.Cmd,'companyID':this.$route.query.companyID,blank:'y',tab:'新增付款单'}}) this.$router.push({ name: path,query:{"id":id,"Name":Name,"Type":2,"orderObj":this.orderObj,'path':this.$route.query.path,'IsUploadPic':IsUploadPic,'Cmd':this.$route.query.Cmd,'companyID':this.$route.query.companyID,blank:'y',tab:'新增付款单'}})
}else { }else {
this.$router.push({ name: "addFinancialGZDocuments",query:{"id":id,"Name":Name,"Type":Type,"orderObj":this.orderObj,'path':this.$route.query.path,'IsUploadPic':IsUploadPic,'Cmd':this.$route.query.Cmd,'companyID':this.$route.query.companyID,blank:'y',tab:'新增挂账单'}}) if(this.tradeObj){
this.$router.push({
name: "addFinancialGZDocuments",
query:{
"id":id,
"Name":Name,
"Type":Type,
"tradeObj":JSON.stringify(this.tradeObj),
'path':this.$route.query.path,
'IsUploadPic':IsUploadPic,
'Cmd':this.$route.query.Cmd,
'companyID':this.$route.query.companyID,
blank:'y',tab:'新增挂账单'
}
})
}else {
this.$router.push({ name: "addFinancialGZDocuments",query:{"id":id,"Name":Name,"Type":Type,"orderObj":this.orderObj,'path':this.$route.query.path,'IsUploadPic':IsUploadPic,'Cmd':this.$route.query.Cmd,'companyID':this.$route.query.companyID,blank:'y',tab:'新增挂账单'}})
}
} }
}, },
getFlowChart(id){ //获取流程图 getFlowChart(id){ //获取流程图
...@@ -408,7 +445,9 @@ ...@@ -408,7 +445,9 @@
} }
// this.active = parseInt(this.$route.query.Type)?parseInt(this.$route.query.Type):1; // this.active = parseInt(this.$route.query.Type)?parseInt(this.$route.query.Type):1;
this.orderObj = this.$route.query.orderObj; if(this.$route.query.orderObj){
this.orderObj = this.$route.query.orderObj;
}
this.Handmsg = this.$route.query.Handmsg?this.$route.query.Handmsg:this.Handmsg; this.Handmsg = this.$route.query.Handmsg?this.$route.query.Handmsg:this.Handmsg;
this.czmsg = this.$route.query.czmsg?this.$route.query.czmsg:this.czmsg; this.czmsg = this.$route.query.czmsg?this.$route.query.czmsg:this.czmsg;
......
src/components/FinancialModule/addFinancialGZDocuments.vue
View file @ 29c16c80
...@@ -683,6 +683,7 @@ export default { ...@@ -683,6 +683,7 @@ export default {
loading2: false, loading2: false,
EmployeeId:0, EmployeeId:0,
isFist: true, isFist: true,
tradeObj: {}
} }
},methods:{ },methods:{
changeTCNum(t, i){ changeTCNum(t, i){
...@@ -919,6 +920,14 @@ export default { ...@@ -919,6 +920,14 @@ export default {
// if(this.msg.IsPublic!=2 && this.IsLeader!=0){ // if(this.msg.IsPublic!=2 && this.IsLeader!=0){
// if(this.msg.AccountNumber=='')return this.$message.error('请选择付款账户！'); // if(this.msg.AccountNumber=='')return this.$message.error('请选择付款账户！');
// } // }
// 同业制单
if(this.tradeObj){
this.msg.OtherType = this.tradeObj.OtherType?this.tradeObj.OtherType:0;
this.msg.ReFinanceId = this.tradeObj.ReFinanceId?this.tradeObj.ReFinanceId:0;
this.msg.ReFinanceId2 = this.tradeObj.ReFinanceId2?this.tradeObj.ReFinanceId2:0;
}
if(this.msg.IsHave==0&&this.chosenPeople.length==0)return this.$message.error(this.$t('rule.qxzxybsheren')); if(this.msg.IsHave==0&&this.chosenPeople.length==0)return this.$message.error(this.$t('rule.qxzxybsheren'));
if(!this.msg.RB_Depart_Id)return this.$message.error(this.$t('rule.qxzzdbumen')); if(!this.msg.RB_Depart_Id)return this.$message.error(this.$t('rule.qxzzdbumen'));
delete this.msg.DetailList; delete this.msg.DetailList;
...@@ -1320,7 +1329,11 @@ export default { ...@@ -1320,7 +1329,11 @@ export default {
}, err => {}) }, err => {})
}, },
},created(){ },created(){
this.orderObj = this.$route.query.orderObj?JSON.parse(this.$route.query.orderObj):null; if(this.$route.query.tradeObj){
this.tradeObj = JSON.parse(this.$route.query.tradeObj)
}else {
this.orderObj = this.$route.query.orderObj?JSON.parse(this.$route.query.orderObj):null;
}
},mounted(){ },mounted(){
let userInfo = this.getLocalStorage(); let userInfo = this.getLocalStorage();
this.department = userInfo.DepartName; this.department = userInfo.DepartName;
......
src/components/FinancialModule/addReceivablesDocuments.vue
View file @ 29c16c80
...@@ -804,7 +804,8 @@ ...@@ -804,7 +804,8 @@
tradeWay: '', tradeWay: '',
platformAccount: '', platformAccount: '',
Handmsg: {}, Handmsg: {},
crmOrderObj:{} crmOrderObj:{},
tradeObj:{}
} }
}, },
methods: { methods: {
...@@ -1324,6 +1325,12 @@ ...@@ -1324,6 +1325,12 @@
this.msg.GuestId = this.crmOrderObj.GuestId this.msg.GuestId = this.crmOrderObj.GuestId
this.msg.RelevanceFrId = this.crmOrderObj.RelevanceFrId this.msg.RelevanceFrId = this.crmOrderObj.RelevanceFrId
} }
// 同业的参数
if(this.tradeObj){
this.msg.OtherType = this.tradeObj.OtherType
this.msg.ReFinanceId = this.tradeObj.ReFinanceId
this.msg.ReFinanceId2 = this.tradeObj.ReFinanceId2
}
this.msg.detailList.forEach(x => { this.msg.detailList.forEach(x => {
delete x.rate; delete x.rate;
}); });
...@@ -1826,6 +1833,8 @@ ...@@ -1826,6 +1833,8 @@
// crm自动登陆传过来的参数 // crm自动登陆传过来的参数
if(this.$route.query.crmOrderObj){ if(this.$route.query.crmOrderObj){
this.crmOrderObj = JSON.parse(this.$route.query.crmOrderObj); this.crmOrderObj = JSON.parse(this.$route.query.crmOrderObj);
}else if(this.$route.query.tradeObj){//同业参数
this.tradeObj = JSON.parse(this.$route.query.tradeObj);
}else{ }else{
this.orderObj = this.$route.query.orderObj ? JSON.parse(this.$route.query.orderObj) : null; this.orderObj = this.$route.query.orderObj ? JSON.parse(this.$route.query.orderObj) : null;
} }
......
src/components/Hotel/reservation/OrderList.vue
View file @ 29c16c80
...@@ -203,39 +203,42 @@ ...@@ -203,39 +203,42 @@
<div class="column px15 bgf5 radius5 flex-g pa relative"> <div class="column px15 bgf5 radius5 flex-g pa relative">
<div class="fz12">收款单据</div> <div class="fz12">收款单据</div>
<div class="row wrap orderNo fz12 py c3FC4FF"> <div class="row wrap orderNo fz12 py c3FC4FF">
<span class="cursor-pointer radius5 bgD9F3FF mr px5" v-for="(x,i) in item.IncomeList">{{x}}</span> <span class="cursor-pointer radius5 bgD9F3FF mr px5" v-for="(x,i) in item.IncomeList"
@click="openDetails(x)">{{x.FrID}}</span>
<span v-if="item.IncomeList.length==0" class="c9e fz12"> <span v-if="item.IncomeList.length==0" class="c9e fz12">
暂无收款单据 暂无收款单据
</span> </span>
</div> </div>
<el-tooltip v-if="item.OrderStatus==2" class="item" effect="dark" content="制单" placement="top"> <el-tooltip v-if="item.OrderStatus==2" class="item" effect="dark" content="制单" placement="top">
<i class="absolute right20 bottom20 el-icon-edit cursor-pointer c059FF6" <i class="absolute right20 bottom20 el-icon-circle-plus cursor-pointer c059FF6"
@click="makeAdocument(item,index,1)"></i> @click="makeAdocument(item,index,1)"></i>
</el-tooltip> </el-tooltip>
</div> </div>
<div class="column px15 bgf5 radius5 ml flex-g pa relative"> <div class="column px15 bgf5 radius5 ml flex-g pa relative">
<div class="fz12">退款单据</div> <div class="fz12">退款单据</div>
<div class="row wrap orderNo fz12 py c3FC4FF"> <div class="row wrap orderNo fz12 py c3FC4FF">
<span class="cursor-pointer radius5 bgD9F3FF mr px5" v-for="(x,i) in item.RefundList">{{x}}</span> <span class="cursor-pointer radius5 bgD9F3FF mr px5" v-for="(x,i) in item.RefundList"
@click="openDetails(x)">{{x.FrID}}</span>
<span v-if="item.RefundList.length==0" class="c9e fz12"> <span v-if="item.RefundList.length==0" class="c9e fz12">
暂无退款单据 暂无退款单据
</span> </span>
</div> </div>
<el-tooltip v-if="item.OrderStatus==2" class="item" effect="dark" content="制单" placement="top"> <el-tooltip v-if="item.OrderStatus==2" class="item" effect="dark" content="制单" placement="top">
<i class="absolute right20 bottom20 el-icon-edit cursor-pointer c059FF6" <i class="absolute right20 bottom20 el-icon-circle-plus cursor-pointer c059FF6"
@click="makeAdocument(item,index,2)"></i> @click="makeAdocument(item,index,2)"></i>
</el-tooltip> </el-tooltip>
</div> </div>
<div class="column px15 bgf5 radius5 ml flex-g pa relative"> <div class="column px15 bgf5 radius5 ml flex-g pa relative">
<div class="fz12">成本单据</div> <div class="fz12">成本单据</div>
<div class="row wrap orderNo fz12 py c3FC4FF"> <div class="row wrap orderNo fz12 py c3FC4FF">
<span class="cursor-pointer radius5 bgD9F3FF mr px5" v-for="(x,i) in item.CostList">{{x}}</span> <span class="cursor-pointer radius5 bgD9F3FF mr px5" v-for="(x,i) in item.CostList"
@click="openDetails(x)">{{x.FrID}}</span>
<span v-if="item.CostList.length==0" class="c9e fz12"> <span v-if="item.CostList.length==0" class="c9e fz12">
暂无成本单据 暂无成本单据
</span> </span>
</div> </div>
<el-tooltip v-if="item.OrderStatus==2" class="item" effect="dark" content="制单" placement="top"> <el-tooltip v-if="item.OrderStatus==2" class="item" effect="dark" content="制单" placement="top">
<i class="absolute right20 bottom20 el-icon-edit cursor-pointer c059FF6" <i class="absolute right20 bottom20 el-icon-circle-plus cursor-pointer c059FF6"
@click="makeAdocument(item,index,3)"></i> @click="makeAdocument(item,index,3)"></i>
</el-tooltip> </el-tooltip>
</div> </div>
...@@ -322,107 +325,41 @@ ...@@ -322,107 +325,41 @@
}, },
methods: { methods: {
// 单据详情
openDetails(item) {
let query = {
id: item.FrID,
}
this.$router.push({
path: "/FinancialDocumentsDetail",
query
});
},
// 制作单据 // 制作单据
makeAdocument(row, index, num){ makeAdocument(row, index, num){
// let type;
// type = num == 1 ? 1 : 2; // 1收款 2退款 3成本
// let data;
// data = [
// {
// path: "ChoiceAddFinancialDocuments",
// type: type,
// OtherType: 61,
// ReFinanceId: row.OrderId,
// ReFinanceId2: num,
// GuestId: row.GuestId,
// RelevanceFrId: row.selectedType, // 单据类型
// },
// ];
// this.BillMakingMsg.OtherType = 61
this.BillMakingMsg.ReFinanceId = row.OrderId this.BillMakingMsg.ReFinanceId = row.OrderId
this.BillMakingMsg.ReFinanceId2 = num this.BillMakingMsg.ReFinanceId2 = num
let query = { let text = ''
blank: "", let query = {}
tab: "",
Type: "",
tradeObj: ""
}
if(num==1){ if(num==1){
query = { text = '收款'
blank: "y",
tab: "新增收款款单据",
Type: num,
tradeObj: JSON.stringify(this.BillMakingMsg)
}
}else if(num==2){ }else if(num==2){
query = { text = '退款'
blank: "y",
tab: "新增退款单据",
Type: num,
tradeObj: JSON.stringify(this.BillMakingMsg)
}
}else{ }else{
query = { text = '成本'
blank: "y", }
tab: "新增成本单据", query = {
Type: num, blank: "y",
tradeObj: JSON.stringify(this.BillMakingMsg) tab: `新增${text}单据`,
} Type: num,
tradeObj: JSON.stringify(this.BillMakingMsg)
} }
this.$router.push({ this.$router.push({
path: "/ChoiceAddFinancialDocuments", path: "/ChoiceAddFinancialDocuments",
query query
}); });
return
let list = row.OrderType && row.OrderType.split(",");
if (row.OrderStatus != "2") {
if (list && list.length > 1) {
let typeList = row.selectedType.split(",");
if (num == 1 && typeList.length >= 2) {
let $this = this;
row.ReFinanceId2 = num;
this.MsgBus.$emit("BillMakingOrderBoxOpen", $this.ID, row, true);
}
if ((typeList.length == 1 && num == "1") || num == "3") {
data = [
{
path: "ChoiceAddFinancialDocuments",
type: type,
OtherType: 61,
ReFinanceId: row.OrderId,
ReFinanceId2: num,
GuestId: row.GuestId,
RelevanceFrId: row.selectedType, // 单据类型
},
];
}
if (num == "2") {
data = [
{
path: "ChoiceAddFinancialDocuments",
type: type,
OtherType: 61,
ReFinanceId: row.OrderId,
ReFinanceId2: num,
GuestId: row.GuestId,
},
];
}
} else {
data = [{
path: 'ChoiceAddFinancialDocuments',
type: type,
OtherType: 61,
ReFinanceId: row.OrderId,
ReFinanceId2: num,
GuestId: row.GuestId,
RelevanceFrId: num==2?1:row.OrderType, // 单据类型
}]
}
}
}, },
// 订单明细
goRoomDetails(obj, title) { goRoomDetails(obj, title) {
var path = "roomReservationsDetails"; var path = "roomReservationsDetails";
if (this.userInfo.RB_Group_id == 91) { if (this.userInfo.RB_Group_id == 91) {
...@@ -445,6 +382,7 @@ ...@@ -445,6 +382,7 @@
}) })
}, },
clickRightButtom(item,type){ clickRightButtom(item,type){
// 0取消订单 1确认订单
if(type==0){ if(type==0){
}else if(type==1){ }else if(type==1){
......
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