Commit 92a7df30 authored by 黄奎's avatar 黄奎

Merge branch 'master' of http://gitlab.oytour.com/huaguohao/crm

parents 0cda5ae9 f6192f97
...@@ -118,14 +118,15 @@ ...@@ -118,14 +118,15 @@
label="退款" label="退款"
show-overflow-tooltip> show-overflow-tooltip>
<template slot-scope="scope"> <template slot-scope="scope">
{{scope.row.BackMoney}}<i v-if="scope.row.OrderStatus!=1" @click="makeAdocument(scope.row,2)" class="iconfont iconjia- numIcon"></i> <!-- v-if="scope.row.OrderStatus!=1" -->
{{scope.row.BackMoney}}<i @click="makeAdocument(scope.row,2)" class="iconfont iconjia- numIcon"></i>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
label="成本" label="成本"
show-overflow-tooltip> show-overflow-tooltip>
<template slot-scope="scope"> <template slot-scope="scope">
{{scope.row.PayMoney}}<i v-if="scope.row.OrderStatus!=1" @click="makeAdocument(scope.row,3)" class="iconfont iconjia- numIcon"></i> {{scope.row.PayMoney}}<i @click="makeAdocument(scope.row,3)" class="iconfont iconjia- numIcon"></i>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
...@@ -262,19 +263,17 @@ export default { ...@@ -262,19 +263,17 @@ export default {
}, },
methods: { methods: {
// 制作单据 // 制作单据
makeAdocument(row,type){ makeAdocument(row,num){
if(type!=1){ let type
type = 2 type = num==1? 1:2
}
let href let href
let url let url
if(this.isOnline()){ if(this.isOnline()){
url = 'http://yx.oytour.com/#/' url = 'http://yx.oytour.com/#/'
href = url +'automaticLogin?token=' + this.getLocalStorage().token +'&type=' +type
}else{ }else{
url = 'http://www.test.com:8081/#/' url = 'http://www.test.com:8081/#/'
href = url+'automaticLogin?token=' + this.getLocalStorage().token +'&type=' +type
} }
href = url+'automaticLogin?token='+this.getLocalStorage().token+'&type='+type+'&OtherType=55'+'&ReFinanceId='+row.OrderId+'&ReFinanceId2='+num+'&GuestId=' +row.GuestId
window.open(href); window.open(href);
}, },
// 操作日志 // 操作日志
......
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