Skip to content

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

no message

parent 212ee17b
Hide whitespace changes
Inline Side-by-side
Showing with 166 additions and 15 deletions
src/components/FinancialModule/ChoiceAddFinancialDocuments2.vue
View file @ c6147bb9
......@@ -105,6 +105,7 @@
czmsg:{},
crmOrderObj: null,
commissionObj: null,
tradeObj: null,
}
},
computed: {
......@@ -211,6 +212,19 @@
tab:'新增付款单'
}
})
}else if(this.tradeObj){//同业制单
this.$router.push({
name: path,
query:{
"id":id,
"Name":Name,
"Type":Type,
"tradeObj":JSON.stringify(this.tradeObj),
'path':this.$route.query.path,
blank:'y',
tab:'新增付款单'
}
})
} else{
this.$router.push({
name: path,
......@@ -357,6 +371,10 @@
this.commissionObj = JSON.parse(this.$route.query.commissionObj)
this.active = this.$route.query.Type
this.showTab = this.$route.query.Type
}else if(this.$route.query.tradeObj){
this.tradeObj = JSON.parse(this.$route.query.tradeObj)
this.active = this.$route.query.Type
this.showTab = this.$route.query.Type
} else{
this.showTab = this.$route.query.Type?this.$route.query.Type:0;
this.active = parseInt(this.$route.query.Type)?parseInt(this.$route.query.Type):1;
......
src/components/FinancialModule/addFinancialDocuments.vue
View file @ c6147bb9
......@@ -698,7 +698,8 @@ export default {
czmsgState:false,
maxmoneyTips:false,
crmOrderObj:null,
commissionObj:null
commissionObj:null,
tradeObj:null,
}
},
methods:{
......@@ -936,6 +937,12 @@ export default {
}
}
// 同业制单
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;
}
// crm自动登陆传过来的参数
if(this.crmOrderObj){
this.msg.OtherType = this.crmOrderObj.OtherType
......@@ -1650,6 +1657,8 @@ export default {
this.crmOrderObj = JSON.parse(this.$route.query.crmOrderObj);
}else if(this.$route.query.commissionObj){//印象提成参数
this.commissionObj = JSON.parse(this.$route.query.commissionObj);
}else 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;
}
......
src/components/Hotel/reservation/OrderList.vue
View file @ c6147bb9
......@@ -175,7 +175,7 @@
</el-table>
</div>
<div class="row justify-sb mt mb20">
<div class="row pt20">
<!-- <div class="row pt20">
<i class="el-icon-warning cF57A98 fz15 mr"></i>
<div class="column w220">
<div class="wrap fz12 c9e">
......@@ -199,32 +199,47 @@
</div>
</template>
</div>
</div>
<div class="column px15 bgf5 radius5 ml flex-g pa relative">
</div> -->
<div class="column px15 bgf5 radius5 flex-g pa relative">
<div class="fz12">收款单据</div>
<div class="row wrap orderNo fz12 py c3FC4FF">
<span class="cursor-pointer radius5 bgD9F3FF mr px5">45454</span>
<span class="cursor-pointer radius5 bgD9F3FF mr px5">45454</span>
<span class="cursor-pointer radius5 bgD9F3FF mr px5" v-for="(x,i) in item.IncomeList">{{x}}</span>
<span v-if="item.IncomeList.length==0" class="c9e fz12">
暂无收款单据,快去右下角新增吧!
</span>
</div>
<i class="absolute right20 bottom20 el-icon-edit cursor-pointer c059FF6"></i>
<el-tooltip class="item" effect="dark" content="制单" placement="top">
<i class="absolute right20 bottom20 el-icon-edit cursor-pointer c059FF6"
@click="makeAdocument(item,index,1)"></i>
</el-tooltip>
</div>
<div class="column px15 bgf5 radius5 ml flex-g pa relative">
<div class="fz12">退款单据</div>
<div class="row wrap orderNo fz12 py c3FC4FF">
<span class="cursor-pointer radius5 bgD9F3FF mr px5">45454</span>
<span class="cursor-pointer radius5 bgD9F3FF mr px5">45454</span>
<span class="cursor-pointer radius5 bgD9F3FF mr px5" v-for="(x,i) in item.RefundList">{{x}}</span>
<span v-if="item.RefundList.length==0" class="c9e fz12">
暂无退款单据,快去右下角新增吧!
</span>
</div>
<i class="absolute right20 bottom20 el-icon-edit cursor-pointer c059FF6"></i>
<el-tooltip class="item" effect="dark" content="制单" placement="top">
<i class="absolute right20 bottom20 el-icon-edit cursor-pointer c059FF6"
@click="makeAdocument(item,index,2)"></i>
</el-tooltip>
</div>
<div class="column px15 bgf5 radius5 ml flex-g pa relative">
<div class="fz12">成本单据</div>
<div class="row wrap orderNo fz12 py c3FC4FF">
<span class="cursor-pointer radius5 bgD9F3FF mr px5">45454</span>
<span class="cursor-pointer radius5 bgD9F3FF mr px5">45454</span>
<span class="cursor-pointer radius5 bgD9F3FF mr px5" v-for="(x,i) in item.CostList">{{x}}</span>
<span v-if="item.CostList.length==0" class="c9e fz12">
暂无成本单据,快去右下角新增吧!
</span>
</div>
<i class="absolute right20 bottom20 el-icon-edit cursor-pointer c059FF6"></i>
<el-tooltip class="item" effect="dark" content="制单" placement="top">
<i class="absolute right20 bottom20 el-icon-edit cursor-pointer c059FF6"
@click="makeAdocument(item,index,3)"></i>
</el-tooltip>
</div>
<div class="column px15 bgf5 radius5 ml pa20">
<div class="column px15 bgf5 radius5 ml flex-g pa20">
<div class="row-c justify-sb borderD pb5">
<span class="fz12 c9e">订单总金额</span>
<div class="ml">
......@@ -295,11 +310,120 @@
loading0:false,
loading1:false,
loading2:false,
userInfo:{}
BillMakingMsg:{
// PeroidsId: null,
// Type: null,
// EmpIds:'',
OtherType: 61,
ReFinanceId: '',
ReFinanceId2: ''
},
userInfo:{},
};
},
methods: {
// 制作单据
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.ReFinanceId2 = num
let query = {
blank: "",
tab: "",
Type: "",
tradeObj: ""
}
if(num==1){
query = {
blank: "y",
tab: "新增收款款单据",
Type: num,
tradeObj: JSON.stringify(this.BillMakingMsg)
}
}else if(num==2){
query = {
blank: "y",
tab: "新增退款单据",
Type: num,
tradeObj: JSON.stringify(this.BillMakingMsg)
}
}else{
query = {
blank: "y",
tab: "新增成本单据",
Type: num,
tradeObj: JSON.stringify(this.BillMakingMsg)
}
}
this.$router.push({
path: "/ChoiceAddFinancialDocuments",
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) {
var path = "roomReservationsDetails";
if (this.userInfo.RB_Group_id == 91) {
......
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