Skip to content

E
ElectricitySheep
Commit 3359691f authored by 黄奎's avatar 黄奎
Browse files
Options

erp跳转调整

parent b2aade11
Hide whitespace changes
Inline Side-by-side
Showing with 71 additions and 60 deletions
src/components/coffeeManage/orderList.vue
View file @ 3359691f
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
<div class="orderList"> <div class="orderList">
<div class="head-title"> <div class="head-title">
订单列表 订单列表
<el-button @click="dialogVisible = true" style="float: right; margin-top: -5px" size="small" type="primary">批量导出 <el-button @click="dialogVisible = true" style="float: right; margin-top: -5px" size="small" type="primary">批量导出
</el-button> </el-button>
<el-button @click="ClearHsz" style="float: right; margin-top: -5px; margin-right: 20px" size="small" <el-button @click="ClearHsz" style="float: right; margin-top: -5px; margin-right: 20px" size="small"
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
<el-date-picker v-model="dateList" @change="(msg.pageIndex = 1), getList()" size="small" type="datetimerange" <el-date-picker v-model="dateList" @change="(msg.pageIndex = 1), getList()" size="small" type="datetimerange"
range-separator="至" value-format="yyyy-MM-dd HH:mm:ss" start-placeholder="开始日期" end-placeholder="结束日期"> range-separator="至" value-format="yyyy-MM-dd HH:mm:ss" start-placeholder="开始日期" end-placeholder="结束日期">
</el-date-picker> </el-date-picker>
<span style="margin-left: 15px;font-size:14px">配送方式：</span> <span style="margin-left: 15px;font-size:14px">配送方式：</span>
<el-select class="w120" @change="(msg.pageIndex = 1), getList()" v-model="msg.DeliveryMethod" size="small" <el-select class="w120" @change="(msg.pageIndex = 1), getList()" v-model="msg.DeliveryMethod" size="small"
placeholder="请选择"> placeholder="请选择">
...@@ -909,7 +909,7 @@ ...@@ -909,7 +909,7 @@
IsSelectPayMoney: 0, IsSelectPayMoney: 0,
IsOffline: -1, IsOffline: -1,
OrderEduType: 0, OrderEduType: 0,
Q_OrderEduType:1 Q_OrderEduType: 1
}, },
IsSelectPayMoney: 0, IsSelectPayMoney: 0,
platList: [], platList: [],
...@@ -1817,9 +1817,9 @@ ...@@ -1817,9 +1817,9 @@
ECOrderDetailId: list.Id ECOrderDetailId: list.Id
}], }],
}; };
// window.open('http://www.test.com:8081/#/ChoiceAddFinancialDocuments?Type=1&companyID='+companyID+'&orderObj='+JSON.stringify(orderObj)) var erpSiteUrl = this.domainManager().ErpWebUrl;
window.open( window.open(
"http://yx.oytour.com/#/ChoiceAddFinancialDocuments?Type=1&companyID=" + erpSiteUrl + "/#/ChoiceAddFinancialDocuments?Type=1&companyID=" +
companyID + companyID +
"&orderObj=" + "&orderObj=" +
JSON.stringify(orderObj) JSON.stringify(orderObj)
...@@ -1840,9 +1840,9 @@ ...@@ -1840,9 +1840,9 @@
ECOrderDetailId: list.Id ECOrderDetailId: list.Id
}], }],
}; };
// window.open('http://www.test.com:8081/#/ChoiceAddFinancialDocuments?Type=2&companyID='+companyID+'&orderObj='+JSON.stringify(orderObj)) var erpSiteUrl = this.domainManager().ErpWebUrl;
window.open( window.open(
"http://yx.oytour.com/#/ChoiceAddFinancialDocuments?Type=2&companyID=" + erpSiteUrl + "/#/ChoiceAddFinancialDocuments?Type=2&companyID=" +
companyID + companyID +
"&orderObj=" + "&orderObj=" +
JSON.stringify(orderObj) JSON.stringify(orderObj)
...@@ -1850,13 +1850,13 @@ ...@@ -1850,13 +1850,13 @@
}, },
goSF(item) { goSF(item) {
//收入详情 //收入详情
// window.open('http://localhost:8181/#/financial/financalDocument/FinancialDocumentsDetail?id='+item.FrID,"_blank") window.open('http://edu.oytour.com/#/financial/financalDocument/FinancialDocumentsDetail?id=' + item.FrID,
window.open('http://edu.oytour.com/#/financial/financalDocument/FinancialDocumentsDetail?id='+item.FrID,"_blank") "_blank")
}, },
goZF(item) { goZF(item) {
//付款详情 //付款详情
// window.open('http://localhost:8181/#/financial/financalDocument/FinancialDocumentsDetail?id='+item.FrID,"_blank") window.open('http://edu.oytour.com/#/financial/financalDocument/FinancialDocumentsDetail?id=' + item.FrID,
window.open('http://edu.oytour.com/#/financial/financalDocument/FinancialDocumentsDetail?id='+item.FrID,"_blank") "_blank")
}, },
// 运费成本制单 // 运费成本制单
yunfeizhidan(id) { yunfeizhidan(id) {
...@@ -1882,7 +1882,7 @@ ...@@ -1882,7 +1882,7 @@
}); });
that.getList() that.getList()
} }
},()=>{ }, () => {
loading.close() loading.close()
}); });
}) })
......
src/components/director/directorOrderList.vue
View file @ 3359691f
...@@ -1580,8 +1580,8 @@ ...@@ -1580,8 +1580,8 @@
ECOrderDetailId: list.Id ECOrderDetailId: list.Id
}] }]
} }
// window.open('http://www.test.com:8081/#/ChoiceAddFinancialDocuments?Type=1&companyID='+companyID+'&orderObj='+JSON.stringify(orderObj)) var erpSiteUrl = this.domainManager().ErpWebUrl;
window.open('http://yx.oytour.com/#/ChoiceAddFinancialDocuments?Type=1&companyID=' + companyID + '&orderObj=' + window.open(erpSiteUrl + '/#/ChoiceAddFinancialDocuments?Type=1&companyID=' + companyID + '&orderObj=' +
JSON.stringify(orderObj)) JSON.stringify(orderObj))
}, },
goPayment(item, list) { //跳到erp付款单 goPayment(item, list) { //跳到erp付款单
...@@ -1597,18 +1597,18 @@ ...@@ -1597,18 +1597,18 @@
ECOrderDetailId: list.Id ECOrderDetailId: list.Id
}] }]
} }
// window.open('http://www.test.com:8081/#/ChoiceAddFinancialDocuments?Type=2&companyID='+companyID+'&orderObj='+JSON.stringify(orderObj)) var erpSiteUrl = this.domainManager().ErpWebUrl;
window.open('http://yx.oytour.com/#/ChoiceAddFinancialDocuments?Type=2&companyID=' + companyID + '&orderObj=' + window.open(erpSiteUrl + '/#/ChoiceAddFinancialDocuments?Type=2&companyID=' + companyID + '&orderObj=' +
JSON.stringify(orderObj)) JSON.stringify(orderObj))
}, },
goSF(item) { //收入详情 goSF(item) { //收入详情
// window.open('http://www.test.com:8081/#/FinancialDocumentsDetail?id='+item.FrID+'&Conditon=1&tab=%E5%8D%95%E6%8D%AE%E8%AF%A6%E6%83%85') var erpSiteUrl = this.domainManager().ErpWebUrl;
window.open('http://yx.oytour.com/#/FinancialDocumentsDetail?id=' + item.FrID + window.open(erpSiteUrl + '/#/FinancialDocumentsDetail?id=' + item.FrID +
'&Conditon=1&tab=%E5%8D%95%E6%8D%AE%E8%AF%A6%E6%83%85') '&Conditon=1&tab=%E5%8D%95%E6%8D%AE%E8%AF%A6%E6%83%85')
}, },
goZF(item) { //付款详情 goZF(item) { //付款详情
// window.open('http://www.test.com:8081/#/FinancialDocumentsDetail?id='+item.FrID+'&Conditon=1&tab=%E5%8D%95%E6%8D%AE%E8%AF%A6%E6%83%85') var erpSiteUrl = this.domainManager().ErpWebUrl;
window.open('http://yx.oytour.com/#/FinancialDocumentsDetail?id=' + item.FrID + window.open(erpSiteUrl + '/#/FinancialDocumentsDetail?id=' + item.FrID +
'&Conditon=1&tab=%E5%8D%95%E6%8D%AE%E8%AF%A6%E6%83%85') '&Conditon=1&tab=%E5%8D%95%E6%8D%AE%E8%AF%A6%E6%83%85')
} }
}, },
......
src/components/education/educationOrder.vue
View file @ 3359691f
...@@ -149,13 +149,15 @@ ...@@ -149,13 +149,15 @@
</div> </div>
<div style="margin-bottom: 5px;"> <div style="margin-bottom: 5px;">
<span style="margin-right: 10px;"> <span style="margin-right: 10px;">
老师：<el-tag size="small" style="margin-right:5px;" v-for="(subItem,index) in list.SpecificationList" :key="index">{{subItem}}</el-tag> 老师：<el-tag size="small" style="margin-right:5px;"
v-for="(subItem,index) in list.SpecificationList" :key="index">{{subItem}}</el-tag>
</span> </span>
</div> </div>
<div style="margin-bottom: 5px;" v-if="list.MemberEducationCouponList.length>0"> <div style="margin-bottom: 5px;" v-if="list.MemberEducationCouponList.length>0">
课程卡信息: <span v-for="(childItem,childIndex) in list.MemberEducationCouponList" :key="childIndex"> 课程卡信息: <span v-for="(childItem,childIndex) in list.MemberEducationCouponList"
{{childItem.Name}} :key="childIndex">
</span> {{childItem.Name}}
</span>
</div> </div>
<div style=" display: flex;flex-direction: row;align-items: center;" <div style=" display: flex;flex-direction: row;align-items: center;"
v-if="list.SmallShopsCostPrice!=null && list.SmallShopsCostPrice!=''&& list.SmallShopsCostPrice>0&& item.SmallShopsId!=0"> v-if="list.SmallShopsCostPrice!=null && list.SmallShopsCostPrice!=''&& list.SmallShopsCostPrice>0&& item.SmallShopsId!=0">
...@@ -271,7 +273,8 @@ ...@@ -271,7 +273,8 @@
{{MItem.Name}}券,{{MItem.CouponType==1?'满'+MItem.MinConsumePrice+'元减'+MItem.DiscountsPrice+'元':'满'+MItem.MinConsumePrice+'元打'+MItem.DiscountsPrice+'折'}} {{MItem.Name}}券,{{MItem.CouponType==1?'满'+MItem.MinConsumePrice+'元减'+MItem.DiscountsPrice+'元':'满'+MItem.MinConsumePrice+'元打'+MItem.DiscountsPrice+'折'}}
</span> </span>
</div> </div>
<div style="font-size: 12px" v-if="item.EducationMoney&& item.EducationMoney!=''&& item.EducationMoney>0"> <div style="font-size: 12px"
v-if="item.EducationMoney&& item.EducationMoney!=''&& item.EducationMoney>0">
<span>课程卡抵扣金额:{{item.EducationMoney}}</span> <span>课程卡抵扣金额:{{item.EducationMoney}}</span>
</div> </div>
</div> </div>
...@@ -527,7 +530,8 @@ ...@@ -527,7 +530,8 @@
<el-input size="small" v-model="priceMsg.Income" @keyup.native="checkPrice(priceMsg,'Income')"></el-input> <el-input size="small" v-model="priceMsg.Income" @keyup.native="checkPrice(priceMsg,'Income')"></el-input>
</el-form-item> </el-form-item>
<el-form-item v-if="priceType==2" label="运费"> <el-form-item v-if="priceType==2" label="运费">
<el-input size="small" v-model="priceMsg.FreightMoney" @keyup.native="checkPrice(priceMsg,'FreightMoney')"></el-input> <el-input size="small" v-model="priceMsg.FreightMoney" @keyup.native="checkPrice(priceMsg,'FreightMoney')">
</el-input>
</el-form-item> </el-form-item>
</el-form> </el-form>
<span slot="footer" class="dialog-footer"> <span slot="footer" class="dialog-footer">
...@@ -1443,14 +1447,14 @@ ...@@ -1443,14 +1447,14 @@
msg = { msg = {
Id: this.costMsg.Id, Id: this.costMsg.Id,
CostMoney: Number(this.costMsg.Money), CostMoney: Number(this.costMsg.Money),
EmpId:this.getLocalStorage().EmpId EmpId: this.getLocalStorage().EmpId
} }
} else if (this.cosType == 2) { } else if (this.cosType == 2) {
cmd = '/api/order/SetOrderFreightCostMoney'; cmd = '/api/order/SetOrderFreightCostMoney';
msg = { msg = {
Id: this.costMsg.Id, Id: this.costMsg.Id,
FreightCostMoney: Number(this.costMsg.Money), FreightCostMoney: Number(this.costMsg.Money),
EmpId:this.getLocalStorage().EmpId EmpId: this.getLocalStorage().EmpId
} }
} }
this.apipost(cmd, msg, this.apipost(cmd, msg,
...@@ -1542,8 +1546,8 @@ ...@@ -1542,8 +1546,8 @@
ECOrderDetailId: list.Id ECOrderDetailId: list.Id
}] }]
} }
// window.open('http://www.test.com:8081/#/ChoiceAddFinancialDocuments?Type=1&companyID='+companyID+'&orderObj='+JSON.stringify(orderObj)) var erpSiteUrl = this.domainManager().ErpWebUrl;
window.open('http://yx.oytour.com/#/ChoiceAddFinancialDocuments?Type=1&companyID=' + companyID + '&orderObj=' + window.open(erpSiteUrl + '/#/ChoiceAddFinancialDocuments?Type=1&companyID=' + companyID + '&orderObj=' +
JSON.stringify(orderObj)) JSON.stringify(orderObj))
}, },
goPayment(item, list) { //跳到erp付款单 goPayment(item, list) { //跳到erp付款单
...@@ -1559,18 +1563,18 @@ ...@@ -1559,18 +1563,18 @@
ECOrderDetailId: list.Id ECOrderDetailId: list.Id
}] }]
} }
// window.open('http://www.test.com:8081/#/ChoiceAddFinancialDocuments?Type=2&companyID='+companyID+'&orderObj='+JSON.stringify(orderObj)) var erpSiteUrl = this.domainManager().ErpWebUrl;
window.open('http://yx.oytour.com/#/ChoiceAddFinancialDocuments?Type=2&companyID=' + companyID + '&orderObj=' + window.open(erpSiteUrl + '/#/ChoiceAddFinancialDocuments?Type=2&companyID=' + companyID + '&orderObj=' +
JSON.stringify(orderObj)) JSON.stringify(orderObj))
}, },
goSF(item) { //收入详情 goSF(item) { //收入详情
// window.open('http://www.test.com:8081/#/FinancialDocumentsDetail?id='+item.FrID+'&Conditon=1&tab=%E5%8D%95%E6%8D%AE%E8%AF%A6%E6%83%85') var erpSiteUrl = this.domainManager().ErpWebUrl;
window.open('http://yx.oytour.com/#/FinancialDocumentsDetail?id=' + item.FrID + window.open(erpSiteUrl + '/#/FinancialDocumentsDetail?id=' + item.FrID +
'&Conditon=1&tab=%E5%8D%95%E6%8D%AE%E8%AF%A6%E6%83%85') '&Conditon=1&tab=%E5%8D%95%E6%8D%AE%E8%AF%A6%E6%83%85')
}, },
goZF(item) { //付款详情 goZF(item) { //付款详情
// window.open('http://www.test.com:8081/#/FinancialDocumentsDetail?id='+item.FrID+'&Conditon=1&tab=%E5%8D%95%E6%8D%AE%E8%AF%A6%E6%83%85') var erpSiteUrl = this.domainManager().ErpWebUrl;
window.open('http://yx.oytour.com/#/FinancialDocumentsDetail?id=' + item.FrID + window.open(erpSiteUrl + '/#/FinancialDocumentsDetail?id=' + item.FrID +
'&Conditon=1&tab=%E5%8D%95%E6%8D%AE%E8%AF%A6%E6%83%85') '&Conditon=1&tab=%E5%8D%95%E6%8D%AE%E8%AF%A6%E6%83%85')
} }
}, },
......
src/components/offlineService/osOrderList.vue
View file @ 3359691f
...@@ -167,7 +167,7 @@ ...@@ -167,7 +167,7 @@
<template v-else> <template v-else>
<el-tag size="mini">到店分配</el-tag> <el-tag size="mini">到店分配</el-tag>
</template> </template>
<el-popover placement="right" popper-class="piliangPop" width="350" trigger="click" > <el-popover placement="right" popper-class="piliangPop" width="350" trigger="click">
<table border="0" cellspacing="0" cellpadding="0"> <table border="0" cellspacing="0" cellpadding="0">
<tr> <tr>
<td>服务人员</td> <td>服务人员</td>
...@@ -1537,14 +1537,14 @@ ...@@ -1537,14 +1537,14 @@
msg = { msg = {
Id: this.costMsg.Id, Id: this.costMsg.Id,
CostMoney: Number(this.costMsg.Money), CostMoney: Number(this.costMsg.Money),
EmpId:this.getLocalStorage().EmpId EmpId: this.getLocalStorage().EmpId
} }
} else if (this.cosType == 2) { } else if (this.cosType == 2) {
cmd = '/api/order/SetOrderFreightCostMoney'; cmd = '/api/order/SetOrderFreightCostMoney';
msg = { msg = {
Id: this.costMsg.Id, Id: this.costMsg.Id,
FreightCostMoney: Number(this.costMsg.Money), FreightCostMoney: Number(this.costMsg.Money),
EmpId:this.getLocalStorage().EmpId EmpId: this.getLocalStorage().EmpId
} }
} }
this.apipost(cmd, msg, this.apipost(cmd, msg,
...@@ -1607,8 +1607,8 @@ ...@@ -1607,8 +1607,8 @@
ECOrderDetailId: list.Id ECOrderDetailId: list.Id
}] }]
} }
// window.open('http://www.test.com:8081/#/ChoiceAddFinancialDocuments?Type=1&companyID='+companyID+'&orderObj='+JSON.stringify(orderObj)) var erpSiteUrl = this.domainManager().ErpWebUrl;
window.open('http://yx.oytour.com/#/ChoiceAddFinancialDocuments?Type=1&companyID=' + companyID + '&orderObj=' + window.open(erpSiteUrl + '/#/ChoiceAddFinancialDocuments?Type=1&companyID=' + companyID + '&orderObj=' +
JSON.stringify(orderObj)) JSON.stringify(orderObj))
}, },
goPayment(item, list) { //跳到erp付款单 goPayment(item, list) { //跳到erp付款单
...@@ -1624,18 +1624,18 @@ ...@@ -1624,18 +1624,18 @@
ECOrderDetailId: list.Id ECOrderDetailId: list.Id
}] }]
} }
// window.open('http://www.test.com:8081/#/ChoiceAddFinancialDocuments?Type=2&companyID='+companyID+'&orderObj='+JSON.stringify(orderObj)) var erpSiteUrl = this.domainManager().ErpWebUrl;
window.open('http://yx.oytour.com/#/ChoiceAddFinancialDocuments?Type=2&companyID=' + companyID + '&orderObj=' + window.open(erpSiteUrl + '/#/ChoiceAddFinancialDocuments?Type=2&companyID=' + companyID + '&orderObj=' +
JSON.stringify(orderObj)) JSON.stringify(orderObj))
}, },
goSF(item) { //收入详情 goSF(item) { //收入详情
// window.open('http://www.test.com:8081/#/FinancialDocumentsDetail?id='+item.FrID+'&Conditon=1&tab=%E5%8D%95%E6%8D%AE%E8%AF%A6%E6%83%85') var erpSiteUrl = this.domainManager().ErpWebUrl;
window.open('http://yx.oytour.com/#/FinancialDocumentsDetail?id=' + item.FrID + window.open(erpSiteUrl + '/#/FinancialDocumentsDetail?id=' + item.FrID +
'&Conditon=1&tab=%E5%8D%95%E6%8D%AE%E8%AF%A6%E6%83%85') '&Conditon=1&tab=%E5%8D%95%E6%8D%AE%E8%AF%A6%E6%83%85')
}, },
goZF(item) { //付款详情 goZF(item) { //付款详情
// window.open('http://www.test.com:8081/#/FinancialDocumentsDetail?id='+item.FrID+'&Conditon=1&tab=%E5%8D%95%E6%8D%AE%E8%AF%A6%E6%83%85') var erpSiteUrl = this.domainManager().ErpWebUrl;
window.open('http://yx.oytour.com/#/FinancialDocumentsDetail?id=' + item.FrID + window.open(erpSiteUrl + '/#/FinancialDocumentsDetail?id=' + item.FrID +
'&Conditon=1&tab=%E5%8D%95%E6%8D%AE%E8%AF%A6%E6%83%85') '&Conditon=1&tab=%E5%8D%95%E6%8D%AE%E8%AF%A6%E6%83%85')
} }
}, },
......
src/components/orderMan/orderList.vue
View file @ 3359691f
...@@ -386,7 +386,7 @@ ...@@ -386,7 +386,7 @@
<img slot="reference" src="../../assets/img/userman/price.png" alt="" /> <img slot="reference" src="../../assets/img/userman/price.png" alt="" />
</el-popover> </el-popover>
</div> </div>
<div class="express-price"> <div class="express-price">
<span> <span>
<span style="color: rgb(144, 147, 153)">(含运费￥{{ item.FreightMoney }}) <span style="color: rgb(144, 147, 153)">(含运费￥{{ item.FreightMoney }})
...@@ -479,11 +479,15 @@ ...@@ -479,11 +479,15 @@
src="../../assets/img/userman/sale.png" alt="" /> src="../../assets/img/userman/sale.png" alt="" />
</el-tooltip> </el-tooltip>
<!--待处理--> <!--待处理-->
<el-tooltip class="item" effect="dark" :content="'同意'+((item.CancelRemark&&item.CancelRemark!='')?('【申请理由:'+item.CancelRemark+'】'):'')" placement="top" v-if="item.OrderStatus == 6"> <el-tooltip class="item" effect="dark"
:content="'同意'+((item.CancelRemark&&item.CancelRemark!='')?('【申请理由:'+item.CancelRemark+'】'):'')"
placement="top" v-if="item.OrderStatus == 6">
<img @click="pending(item, 1)" v-if="item.OrderStatus == 6" class="app-order-icon" <img @click="pending(item, 1)" v-if="item.OrderStatus == 6" class="app-order-icon"
src="../../assets/img/userman/pass.png" alt="" /> src="../../assets/img/userman/pass.png" alt="" />
</el-tooltip> </el-tooltip>
<el-tooltip class="item" effect="dark" :content="'拒绝'+((item.CancelRemark&&item.CancelRemark!='')?('【申请理由:'+item.CancelRemark+'】'):'')" placement="top" v-if="item.OrderStatus == 6"> <el-tooltip class="item" effect="dark"
:content="'拒绝'+((item.CancelRemark&&item.CancelRemark!='')?('【申请理由:'+item.CancelRemark+'】'):'')"
placement="top" v-if="item.OrderStatus == 6">
<img @click="pending(item, 2)" v-if="item.OrderStatus == 6" class="app-order-icon" <img @click="pending(item, 2)" v-if="item.OrderStatus == 6" class="app-order-icon"
src="../../assets/img/userman/nopass.png" alt="" /> src="../../assets/img/userman/nopass.png" alt="" />
</el-tooltip> </el-tooltip>
...@@ -1805,9 +1809,9 @@ ...@@ -1805,9 +1809,9 @@
ECOrderDetailId: list.Id ECOrderDetailId: list.Id
}], }],
}; };
// window.open('http://www.test.com:8081/#/ChoiceAddFinancialDocuments?Type=1&companyID='+companyID+'&orderObj='+JSON.stringify(orderObj)) var erpSiteUrl = this.domainManager().ErpWebUrl;
window.open( window.open(
"http://yx.oytour.com/#/ChoiceAddFinancialDocuments?Type=1&companyID=" + erpSiteUrl + "/#/ChoiceAddFinancialDocuments?Type=1&companyID=" +
companyID + companyID +
"&orderObj=" + "&orderObj=" +
JSON.stringify(orderObj) JSON.stringify(orderObj)
...@@ -1828,9 +1832,9 @@ ...@@ -1828,9 +1832,9 @@
ECOrderDetailId: list.Id ECOrderDetailId: list.Id
}], }],
}; };
// window.open('http://www.test.com:8081/#/ChoiceAddFinancialDocuments?Type=2&companyID='+companyID+'&orderObj='+JSON.stringify(orderObj)) var erpSiteUrl = this.domainManager().ErpWebUrl;
window.open( window.open(
"http://yx.oytour.com/#/ChoiceAddFinancialDocuments?Type=2&companyID=" + erpSiteUrl + "/#/ChoiceAddFinancialDocuments?Type=2&companyID=" +
companyID + companyID +
"&orderObj=" + "&orderObj=" +
JSON.stringify(orderObj) JSON.stringify(orderObj)
...@@ -1838,18 +1842,18 @@ ...@@ -1838,18 +1842,18 @@
}, },
goSF(item) { goSF(item) {
//收入详情 //收入详情
// window.open('http://www.test.com:8081/#/FinancialDocumentsDetail?id='+item.FrID+'&Conditon=1&tab=%E5%8D%95%E6%8D%AE%E8%AF%A6%E6%83%85') var erpSiteUrl = this.domainManager().ErpWebUrl;
window.open( window.open(
"http://yx.oytour.com/#/FinancialDocumentsDetail?id=" + erpSiteUrl + "/#/FinancialDocumentsDetail?id=" +
item.FrID + item.FrID +
"&Conditon=1&tab=%E5%8D%95%E6%8D%AE%E8%AF%A6%E6%83%85" "&Conditon=1&tab=%E5%8D%95%E6%8D%AE%E8%AF%A6%E6%83%85"
); );
}, },
goZF(item) { goZF(item) {
//付款详情 //付款详情
// window.open('http://www.test.com:8081/#/FinancialDocumentsDetail?id='+item.FrID+'&Conditon=1&tab=%E5%8D%95%E6%8D%AE%E8%AF%A6%E6%83%85') var erpSiteUrl = this.domainManager().ErpWebUrl;
window.open( window.open(
"http://yx.oytour.com/#/FinancialDocumentsDetail?id=" + erpSiteUrl + "/#/FinancialDocumentsDetail?id=" +
item.FrID + item.FrID +
"&Conditon=1&tab=%E5%8D%95%E6%8D%AE%E8%AF%A6%E6%83%85" "&Conditon=1&tab=%E5%8D%95%E6%8D%AE%E8%AF%A6%E6%83%85"
); );
......
src/plug/index.js
View file @ 3359691f
...@@ -57,18 +57,20 @@ export default { ...@@ -57,18 +57,20 @@ export default {
let javaUrl = 'http://192.168.5.214:8018'; let javaUrl = 'http://192.168.5.214:8018';
let vtUploadUrl = "http://192.168.5.214:8120"; let vtUploadUrl = "http://192.168.5.214:8120";
let vtViewUrl = "http://192.168.5.214:8130"; let vtViewUrl = "http://192.168.5.214:8130";
let erpWebUrl = "http://localhost:8080";
let locationName = window.location.hostname; let locationName = window.location.hostname;
if (locationName.indexOf('testmall.oytour') !== -1) { if (locationName.indexOf('testmall.oytour') !== -1) {
domainUrl = "https://mallapi.oytour.com"; domainUrl = "https://mallapi.oytour.com";
javaUrl = "http://property.oytour.com"; javaUrl = "http://property.oytour.com";
vtUploadUrl = "http://upload.oytour.com"; vtUploadUrl = "http://upload.oytour.com";
vtViewUrl = "https://imgfile.oytour.com"; vtViewUrl = "https://imgfile.oytour.com";
erpWebUrl = "http://admin.oytour.com";
} else if (locationName.indexOf('oytour') !== -1) { } else if (locationName.indexOf('oytour') !== -1) {
domainUrl = "https://mallapi.oytour.com"; domainUrl = "https://mallapi.oytour.com";
javaUrl = "http://property.oytour.com"; javaUrl = "http://property.oytour.com";
vtUploadUrl = "http://upload.oytour.com"; vtUploadUrl = "http://upload.oytour.com";
vtViewUrl = "https://imgfile.oytour.com"; vtViewUrl = "https://imgfile.oytour.com";
erpWebUrl = "http://admin.oytour.com";
} }
var obj = { var obj = {
//主地址npm //主地址npm
...@@ -83,7 +85,8 @@ export default { ...@@ -83,7 +85,8 @@ export default {
//文件上传自己服务器 //文件上传自己服务器
VTUploadUrl: vtUploadUrl, VTUploadUrl: vtUploadUrl,
//文件预览自己服务器 //文件预览自己服务器
VTViewUrl: vtViewUrl VTViewUrl: vtViewUrl,
ErpWebUrl: erpWebUrl
}; };
return obj; return obj;
}, },
......
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