Skip to content

S
SuperMan
Commit 17e7b147 authored by 罗超's avatar 罗超
Browse files
Options

解决冲突

parents 3a4a806b 1af78c56
Hide whitespace changes
Inline Side-by-side
Showing with 247 additions and 173 deletions
src/assets/css/feture2.css
View file @ 17e7b147
......@@ -69,6 +69,8 @@ div{
font-family: SimSun;
font-size: 60px;
color: #000000;
position: relative;
z-index: 5;
}
.hotel_1_header>.hotel_1_header_title>div:nth-child(2){
margin: auto;
......@@ -92,6 +94,8 @@ div{
text-align: center;
font-family: SimSun;
font-size: 34px;
position: relative;
z-index: 5;
}
.hotel_1_header>.hotel_1_header_title>div:nth-child(2)>img:nth-child(3){
position: absolute;
......@@ -231,6 +235,8 @@ div{
font-size: 30px;
line-height: 30px;
color: #222222;
position: relative;
z-index: 5;
}
.hotel_1_info_1_info>.hotel_1_info_1_info_right>div:nth-child(2){
margin: 12px 0;
......@@ -249,6 +255,8 @@ div{
font-size: 16px;
line-height: 25px;
color: #535353;
position: relative;
z-index: 5;
}
.hotel_1_info_2{
......@@ -375,6 +383,8 @@ div{
font-size: 30px;
line-height: 30px;
color: #222222;
position: relative;
z-index: 5;
}
.hotel_1_info_2_bottom>.hotel_1_info_2_bottom_right>div:nth-child(2){
margin: 12px 0;
......@@ -434,6 +444,8 @@ div{
font-size: 30px;
line-height: 30px;
color: #222222;
position: relative;
z-index: 5;
}
.hotel_2_info_1>.hotel_2_info_1_content>div:nth-child(2){
margin: 12px 0;
......@@ -452,6 +464,8 @@ div{
font-size: 16px;
line-height: 25px;
color: #535353;
position: relative;
z-index: 5;
}
.hotel_2_info_1>.hotel_2_info_1_img{
......@@ -617,6 +631,8 @@ div{
font-size: 30px;
line-height: 30px;
color: #222222;
position: relative;
z-index: 5;
}
.hotel_2_info_2_top>.hotel_2_info_2_top_right>div:nth-child(2){
margin: 12px 0;
......@@ -635,6 +651,8 @@ div{
font-size: 16px;
line-height: 25px;
color: #535353;
position: relative;
z-index: 5;
}
.hotel_2_info_2>.hotel_2_info_2_bottom{
......@@ -721,6 +739,8 @@ div{
font-family: SimSun;
font-size: 52px;
color: #000000;
position: relative;
z-index: 5;
}
.viewSpot_1_header>.viewSpot_1_header_title>div:nth-child(1)>div:nth-child(2){
display: inline-block;
......@@ -733,6 +753,8 @@ div{
font-family: SimSun;
font-size: 70px;
color: #000000;
position: relative;
z-index: 5;
}
.viewSpot_1_header>.viewSpot_1_header_title>div:nth-child(1)>div:nth-child(3){
display: inline-block;
......@@ -741,6 +763,8 @@ div{
font-family: SimSun;
font-size: 52px;
color: #000000;
position: relative;
z-index: 5;
}
.viewSpot_1_header>.viewSpot_1_header_title>div:nth-child(2){
margin: auto;
......@@ -763,6 +787,8 @@ div{
text-align: center;
font-family: SimSun;
font-size: 14px;
position: relative;
z-index: 5;
}
.viewSpot_1_header>.viewSpot_1_header_title>div:nth-child(2)>img:nth-child(3){
position: absolute;
......@@ -855,6 +881,8 @@ div{
font-size: 30px;
line-height: 30px;
color: #222222;
position: relative;
z-index: 5;
}
.viewSpot_1_info_1_info>.viewSpot_1_info_1_info_right>div:nth-child(2){
margin: 10px 0 0 0;
......@@ -1020,6 +1048,8 @@ div{
font-size: 30px;
line-height: 30px;
color: #222222;
position: relative;
z-index: 5;
}
.viewSpot_1_info_2_bottom>.viewSpot_1_info_2_bottom_right>div:nth-child(2){
margin: 12px 0;
......@@ -1038,6 +1068,8 @@ div{
font-size: 16px;
line-height: 25px;
color: #535353;
position: relative;
z-index: 5;
}
/* 景点2 */
......@@ -1101,6 +1133,8 @@ div{
font-size: 30px;
line-height: 30px;
color: #222222;
position: relative;
z-index: 5;
}
.viewSpot_2_info_1_info>.viewSpot_2_info_1_info_right>div:nth-child(2){
width: 100%;
......@@ -1261,6 +1295,8 @@ div{
font-size: 30px;
line-height: 30px;
color: #222222;
position: relative;
z-index: 5;
}
.viewSpot_2_info_2>.viewSpot_2_info_2_info_1>div:nth-child(2){
width: 100%;
......@@ -1298,6 +1334,8 @@ div{
font-size: 30px;
line-height: 30px;
color: #222222;
position: relative;
z-index: 5;
}
.viewSpot_2_info_2>.viewSpot_2_info_2_info_2>div:nth-child(2){
display: inline-block;
......@@ -1338,6 +1376,8 @@ div{
font-size: 30px;
line-height: 30px;
color: #222222;
position: relative;
z-index: 5;
}
.viewSpot_2_info_2>.viewSpot_2_info_2_info_3>div:nth-child(2){
width: 100%;
......@@ -1550,6 +1590,8 @@ div{
font-family: SimSun;
font-size: 52px;
color: #000000;
position: relative;
z-index: 5;
}
.restaurant_1_header>.restaurant_1_header_title>div:nth-child(1)>div:nth-child(2){
display: inline-block;
......@@ -1562,6 +1604,8 @@ div{
font-family: SimSun;
font-size: 70px;
color: #000000;
position: relative;
z-index: 5;
}
.restaurant_1_header>.restaurant_1_header_title>div:nth-child(1)>div:nth-child(3){
display: inline-block;
......@@ -1570,6 +1614,8 @@ div{
font-family: SimSun;
font-size: 52px;
color: #000000;
position: relative;
z-index: 5;
}
.restaurant_1_header>.restaurant_1_header_title>div:nth-child(2){
margin: auto;
......@@ -1592,6 +1638,8 @@ div{
text-align: center;
font-family: SimSun;
font-size: 14px;
position: relative;
z-index: 5;
}
.restaurant_1_header>.restaurant_1_header_title>div:nth-child(2)>img:nth-child(3){
position: absolute;
......@@ -1684,6 +1732,8 @@ div{
font-size: 30px;
line-height: 30px;
color: #222222;
position: relative;
z-index: 5;
}
.restaurant_1_info_1_info>.restaurant_1_info_1_info_right>div:nth-child(2){
margin: 10px 0 0 0;
......@@ -1841,6 +1891,8 @@ div{
font-size: 30px;
line-height: 30px;
color: #222222;
position: relative;
z-index: 5;
}
.restaurant_1_info_2_right_bottom>.restaurant_1_info_2_right_bottom_right>div:nth-child(2){
margin: 12px 0;
......
src/components/FinancialModule/FinancialDocuments.vue
View file @ 17e7b147
......@@ -114,7 +114,7 @@
<li>
<span>
<em>单号</em>
<el-input placeholder="" class="w150" type="number" v-model="msg.FrID"></el-input>
<el-input placeholder="" class="w150" v-model="msg.FrID" @keyup.native="checkInteger(msg,'FrID')"></el-input>
</span>
</li>
<li v-if="msg.Conditon==1">
......@@ -356,6 +356,7 @@
<button class="hollowFixedBtn" @click="resetPageIndex(),getPageList()">{{$t('pub.searchBtn')}}</button>
<button class="normalBtn" @click="goUrlAdd('ChoiceAddFinancialDocuments')">新增</button>
<button class="normalBtn" v-if="checkboxShow" @click="Financial_post_SetBatch">批量提交</button>
<button class="normalBtn" @click="method5()">导出</button>
<button class="hollowFixedBtn" @click="goUrl('WorkEntrustmentMy')">工作委托</button>
</li>
</ul>
......@@ -1002,6 +1003,26 @@ export default {
}
}, err => {})
},
//导出
method5: function() {
if(!this.msg.ClientID)this.msg.ClientID=0;
if(!this.msg.ClientType)this.msg.ClientType=0;
if(!this.msg.CurrencyId)this.msg.CurrencyId=0;
if(!this.msg.CostTypeID)this.msg.CostTypeID=0;
if(!this.msg.TemplateId)this.msg.TemplateId=0;
if(!this.msg.RB_Branch_Id)this.msg.RB_Branch_Id=-1;
if(!this.msg.RB_Depart_Id)this.msg.RB_Depart_Id=0;
if(!this.msg.UpdateBy)this.msg.UpdateBy=0;
if(!this.msg.TCID)this.msg.TCID=0;
if(!this.msg.OrderID)this.msg.OrderID=0;
if(!this.msg.Status)this.msg.Status=0;
if(!this.msg.FrID)this.msg.FrID=0;
if(!this.msg.Conditon)this.msg.Conditon=1;
if(!this.msg.TradeWay)this.msg.TradeWay=0;
if(!this.msg.AccountType)this.msg.AccountType=0;
this.msg.EmployeeId=this.userId;
this.GetLocalFile("Financial_get_OutToFinanceList", this.msg,"财务报表.xls");
} ,
getDepartment(){ //部门
this.apipost('admin_get_DepartmentGetList', this.getDepartmentMsg, res => {
if(res.data.resultCode == 1) {
......
src/components/FinancialModule/RecPayQuery.vue
View file @ 17e7b147
......@@ -101,7 +101,7 @@
<el-row style="padding:15px 20px 0 0;">
<el-col :span="4">
<el-form-item label="单号：">
<el-input placeholder="" class="" v-model="msg.FrID"></el-input>
<el-input placeholder="" class="" v-model="msg.FrID" @keyup.native="checkInteger(msg,'FrID')"></el-input>
</el-form-item>
</el-col>
<el-col :span="4">
......
src/components/FinancialModule/RecPayQueryTeam.vue
View file @ 17e7b147
......@@ -171,8 +171,8 @@
</el-form-item>
</el-col>
<el-col :span="4">
<el-form-item label="单号：">
<el-input placeholder="" class="" v-model="msg.OrderId"></el-input>
<el-form-item label="订单号：">
<el-input placeholder="" class="" v-model="msg.OrderId" @keyup.native="checkInteger(msg,'OrderId')"></el-input>
</el-form-item>
</el-col>
<el-col :span="4">
......
src/components/FinancialModule/addFinancialDocuments.vue
View file @ 17e7b147
......@@ -868,7 +868,7 @@ export default {
this.loading = true;
this.apipost('Financial_post_Set',this.msg,res=>{
if(res.data.resultCode==1){
this.$confirm('是否继续制单?', '提示', {
this.$confirm('操作成功，是否继续制单?', '提示', {
confirmButtonText: '继续制单',
cancelButtonText: '不了，谢谢',
type: 'warning'
......
src/components/FinancialModule/addReceivablesDocuments.vue
View file @ 17e7b147
......@@ -1044,7 +1044,7 @@ export default {
console.log(this.msg);
this.apipost('Financial_post_Set',this.msg,res=>{
if(res.data.resultCode==1){
this.$confirm('是否继续制单?', '提示', {
this.$confirm('操作成功，是否继续制单?', '提示', {
confirmButtonText: '继续制单',
cancelButtonText: '不了，谢谢',
type: 'warning'
......
src/components/SalesModule/enrollTotalTwo.vue
View file @ 17e7b147
......@@ -45,7 +45,7 @@
</li>
<li>
<span><em>订单号</em></span>
<el-input class='w200' v-model='msg.tempOrderId'></el-input>
<el-input class='w200' v-model='msg.tempOrderId' @keyup.native="checkInteger(msg,'tempOrderId')"></el-input>
</li>
<li>
<span><em>订单状态</em></span>
......
src/components/SalesModule/groupTourOrder.vue
View file @ 17e7b147
......@@ -2437,37 +2437,27 @@
}
)
this.Unit_PriceList=[];
this.apipost('sellorder_post_GetLessPrice', {}, res => {
this.apipost('sellorder_post_GetLessPrice',{"TCID":obj.tcid}, res => {
this.LessMoney = res.data.data.lessMoney;
if (parseFloat(this.LessMoney)>0){
for (var i = 0; i <= parseInt(this.LessMoney)/10; i++) {
var obj = {
ID: '',
LessMoney: ''
}
obj.ID = this.addMsg.TC_Price-i*10;
obj.LessMoney = this.addMsg.TC_Price-i*10;
this.Unit_PriceList.push(obj);
var obj = {
ID: '',
LessMoney: ''
}
obj.ID = this.addMsg.TC_Price-i*10;
obj.LessMoney = this.addMsg.TC_Price-i*10;
this.Unit_PriceList.push(obj);
}
// this.Unit_PriceList.forEach(person => {
if(this.Unit_PriceList.findIndex(markers => markers.ID == this.addMsg.Unit_Price)<0) {
var obj = {
ID: '',
LessMoney: ''
}
obj.ID = this.addMsg.Unit_Price;
obj.LessMoney = this.addMsg.Unit_Price;
this.Unit_PriceList.push(obj);
var obj = {
ID: '',
LessMoney: ''
}
obj.ID = this.addMsg.Unit_Price;
obj.LessMoney = this.addMsg.Unit_Price;
this.Unit_PriceList.push(obj);
}
// });
//判断下拉价格里面是否包含了成交单价，未包含就添加进来
// const option = {ID:this.addMsg.TC_Price,LessMoney:this.addMsg.TC_Price}
// // 如果数组里面本身不存在这个对象则把这个加进去
// if(JSON.stringify(this.Unit_PriceList).indexOf(JSON.stringify(option))==-1){
// this.Unit_PriceList.push(option); // 进行动态的操作
// }
}
else{
var obj = {
......@@ -2476,7 +2466,7 @@
}
obj.ID = this.addMsg.Unit_Price;
obj.LessMoney = this.addMsg.Unit_Price;
this.Unit_PriceList.push(obj);
this.Unit_PriceList.push(obj);
}
}, err => {})
......@@ -2585,30 +2575,6 @@
this.addMsg.CustomerId = '0'
this.addMsg.CommissionShareMoney = '0'
}
this.Unit_PriceList=[];
this.apipost('sellorder_post_GetLessPrice', {}, res => {
this.LessMoney = res.data.data.lessMoney;
if (parseFloat(this.LessMoney)>0){
for (var i = 0; i <= parseInt(this.LessMoney)/10; i++) {
var obj = {
ID: '',
LessMoney: ''
}
obj.ID = this.addMsg.TC_Price-i*10;
obj.LessMoney = this.addMsg.TC_Price-i*10;
this.Unit_PriceList.push(obj);
}
}
else{
var obj = {
ID: '',
LessMoney: ''
}
obj.ID = this.addMsg.Unit_Price;
obj.LessMoney = this.addMsg.Unit_Price;
this.Unit_PriceList.push(obj);
}
}, err => {})
},
getTicheng () {
//提成
......
src/components/SalesModule/groupTourOrderByTuan.vue
View file @ 17e7b147
......@@ -1045,23 +1045,31 @@
<span class="colorE95252" v-show='!returnPriceShow'>暂无报价！</span>
</el-form-item>
</el-col>
<el-col :span="4">
<el-form-item label="成交单价" prop="Unit_Price">
<el-col :span="4" v-if="isChecked==true">
<!-- <el-form-item label="成交单价" prop="Unit_Price">
<el-input v-model='addMsg.Unit_Price' @keyup.native="checkPrice(addMsg,'Unit_Price');getTotalPrice()" ></el-input>
</el-form-item>
<!-- <el-form-item label="成交单价" prop="Unit_Price">
</el-form-item> -->
<el-form-item label="成交单价" prop="Unit_Price">
<el-select v-model='addMsg.Unit_Price'
filterable :placeholder="$t('pub.pleaseSel')" @change="getTotalPrice()">
<el-option v-for="item in Unit_PriceList" :label='item.LessMoney' :value='item.ID' :key='item.ID'>
</el-option>
</el-select>
</el-form-item> -->
<el-form-item> <p v-if="LessMoney==0" style="line-height: 18px; color: #E95252;">注：如果超出本团的最低让价，差价将由你来承担</p>
<!-- <p v-if="LessMoney==0" style="line-height: 18px; color: #E95252;">注：如果超出本团的最低让价，差价将由你来承担</p>
<p v-else="LessMoney>0" style="line-height: 18px; color: #E95252;">注：最多少价{{LessMoney}}元，如需少价更多请联系上级主管</p> -->
<!-- <el-input v-model='addMsg.Unit_Price' :disabled="true" @keyup.native="checkPrice(addMsg,'Unit_Price');getTotalPrice()"></el-input> -->
</el-form-item>
<el-form-item>
<p v-if="LessMoney==0" style="line-height: 18px; color: #E95252;">注：如果超出本团的最低让价，差价将由你来承担</p>
<p v-else="LessMoney>0" style="line-height: 18px; color: #E95252;">注：最多少价{{LessMoney}}元，如需少价更多请联系上级主管</p>
</el-form-item>
</el-col>
<el-col :span="4" v-else>
<el-form-item label="成交单价" prop="Unit_Price">
<el-input v-model='addMsg.Unit_Price' @keyup.native="checkPrice(addMsg,'Unit_Price');getTotalPrice()"></el-input>
</el-form-item>
<el-form-item>
<p style="line-height: 18px; color: #E95252;">注：如果超出本团的最低让价，差价将由你来承担</p>
</el-form-item>
</el-col>
</el-row>
<div style="width: 100%; border-top:1px dashed #ccc;margin-bottom:25px;"></div>
<el-row :gutter="20">
......@@ -1616,7 +1624,7 @@
<tr>
<td colspan="4" class="groupTourOrder_remarks" style="height: 40px;">
<div>
<div><span>备注：</span><p><span v-if="item.tsId>0">投诉单号：<a href="javascript:void(0);" @click="goUrlTS('ComplaintsDetail',item.tsId,item.orderId,'投诉详情')">{{item.tsId}}</a> ;</span><span v-if='item.clientSource==1&&item.brandName!=""'>{{item.brandName}}订单 {{item.platformOrder}};</span>{{item.remarks}}</p></div>
<div><span>备注：</span><p><span v-if='item.clientSource==1&&item.brandName!=""'>{{item.brandName}}订单 {{item.platformOrder}};</span>{{item.remarks}}</p></div>
<div>
<!-- <span>{{item.remarksName}}&ensp;{{item.rematksTime}}</span> -->
<el-popover width="600" placement="bottom-end" trigger="click">
......@@ -2305,18 +2313,6 @@ export default {
}
},
methods: {
//跳转
goUrlTS (path, id, orderId, title) {
this.$router.push({
name: path,
query: {
'id': id,
'orderId': orderId,
blank: 'y',
tab: title
}
})
},
maxCommissionMinusRate: function () {
this.TCMsg.CommissionMinusRate = this.TCMsg.CommissionMinusRate.replace(/[^\.\d]/g,'');
this.TCMsg.CommissionMinusRate = this.TCMsg.CommissionMinusRate.replace('.','');
......@@ -2753,7 +2749,7 @@ export default {
}
this.Unit_PriceList=[];
this.apipost('sellorder_post_GetLessPrice', {}, res => {
this.apipost('sellorder_post_GetLessPrice', {"TCID":obj.tcid}, res => {
this.LessMoney = res.data.data.lessMoney;
if (parseFloat(this.LessMoney)>0){
for (var i = 0; i <= parseInt(this.LessMoney)/10; i++) {
......
src/components/SalesModule/productQuery.vue
View file @ 17e7b147
......@@ -1481,7 +1481,7 @@
this.addMsg.CommissionShareMoney = '0'
}
this.Unit_PriceList=[];
this.apipost('sellorder_post_GetLessPrice', {}, res => {
this.apipost('sellorder_post_GetLessPrice', {"TCID":this.addObj.TCID}, res => {
this.LessMoney = res.data.data.lessMoney;
if (parseFloat(this.LessMoney)>0){
for (var i = 0; i <= parseInt(this.LessMoney)/10; i++) {
......
src/components/TravelManager/TravelList/RegistrationList.vue
View file @ 17e7b147
......@@ -1089,19 +1089,27 @@
<span class="colorE95252" v-show='!returnPriceShow'>暂无报价！</span>
</el-form-item>
</el-col>
<el-col :span="5">
<el-col :span="5" v-if="isChecked==true">
<el-form-item label="成交单价" prop="Unit_Price">
<!-- <el-select v-model='addMsg.Unit_Price'
<el-select v-model='addMsg.Unit_Price'
filterable :placeholder="$t('pub.pleaseSel')" @change="getTotalPrice()">
<el-option v-for="item in Unit_PriceList" :label='item.LessMoney' :value='item.ID' :key='item.ID'>
</el-option>
</el-select> -->
<el-input v-model='addMsg.Unit_Price' :disabled="isChecked" @keyup.native="checkPrice(addMsg,'Unit_Price');getTotalPrice()"></el-input>
</el-select>
<!-- <el-input v-model='addMsg.Unit_Price' :disabled="true" @keyup.native="checkPrice(addMsg,'Unit_Price');getTotalPrice()"></el-input> -->
</el-form-item>
<el-form-item>
<p v-if="LessMoney==0" style="line-height: 18px; color: #E95252;">注：如果超出本团的最低让价，差价将由你来承担</p>
<p v-else="LessMoney>0" style="line-height: 18px; color: #E95252;">注：最多少价{{LessMoney}}元，如需少价更多请联系上级主管</p>
</el-form-item>
</el-col>
<el-col :span="5" v-else>
<el-form-item label="成交单价" prop="Unit_Price">
<el-input v-model='addMsg.Unit_Price' class="w210" @keyup.native="checkPrice(addMsg,'Unit_Price');getTotalPrice()"></el-input>
</el-form-item>
<el-form-item>
<p style="line-height: 18px; color: #E95252;">注：如果超出本团的最低让价，差价将由你来承担</p>
<!-- <p v-if="LessMoney==0" style="line-height: 18px; color: #E95252;">注：如果超出本团的最低让价，差价将由你来承担</p>
<p v-else="LessMoney>0" style="line-height: 18px; color: #E95252;">注：最多少价{{LessMoney}}元，如需少价更多请联系上级主管</p> -->
</el-form-item>
</el-col>
</el-row>
......@@ -1707,7 +1715,6 @@
<div class="clearfix RL-MARK">
<span class="RL-remarkTitle">备注:</span>
<span class="RL-redType RL-remarkCon">
<span v-if="childItem.TsId>0">投诉单号：<a href="javascript:void(0);" @click="goUrlTS('ComplaintsDetail',childItem.TsId,childItem.OrderId,'投诉详情')">{{childItem.TsId}}</a> ;</span>
<span v-if='childItem.ClientSource==1&&childItem.BrandName!=""'>{{childItem.BrandName}}订单
{{childItem.PlatformOrder}};</span>
{{childItem.Remarks}}
......@@ -2489,18 +2496,6 @@ import updateSalesMan from "../../commonPage/updateSalesMan.vue";
updateSalesMan:updateSalesMan
},
methods: {
//跳转
goUrlTS (path, id, orderId, title) {
this.$router.push({
name: path,
query: {
'id': id,
'orderId': orderId,
blank: 'y',
tab: title
}
})
},
maxCommissionMinusRate: function () {
this.TCMsg.CommissionMinusRate = this.TCMsg.CommissionMinusRate.replace(/[^\.\d]/g,'');
this.TCMsg.CommissionMinusRate = this.TCMsg.CommissionMinusRate.replace('.','');
......@@ -2849,7 +2844,7 @@ import updateSalesMan from "../../commonPage/updateSalesMan.vue";
}
this.Unit_PriceList=[];
this.apipost('sellorder_post_GetLessPrice', {}, res => {
this.apipost('sellorder_post_GetLessPrice', {"TCID":obj.TCID}, res => {
this.LessMoney = res.data.data.lessMoney;
if (parseFloat(this.LessMoney)>0){
for (var i = 0; i <= parseInt(this.LessMoney)/10; i++) {
......
src/components/confirmationOrderDownLoad.vue
View file @ 17e7b147
......@@ -8,7 +8,8 @@
<div class="travelControlTrip detail-box">
<div class="trip_cover" v-show="pdfLoading" v-loading="pdfLoading"></div>
<input type="button" class="travelControlTripBtn" value="下载PDF" @click="toPDF(orderMsg.startDate + orderMsg.lineteamName+orderMsg.dayNum+'日游')" />
<input type="button" class="travelControlTripBtn" value="下载WORD" @click="gernalFeature()" /><!-- ToWord(orderMsg.startDate + orderMsg.lineteamName+orderMsg.dayNum+'日游') -->
<input type="button" style="width: auto !important;display:none" class="travelControlTripBtn" value="下载手机版WORD" @click="gernalFeature()" />
<!-- ToWord(orderMsg.startDate + orderMsg.lineteamName+orderMsg.dayNum+'日游') -->
<!--&&isopOperation HK 注释 可以让销售修改基本信息-->
<input type="button" v-if="orderId>0" class="travelControlTripBtn" value="修改信息" @click="editMsgShow=true" />
<div id="pdfNode">
......@@ -642,55 +643,83 @@
},
methods: {
gernalFeature(){
this.pdfLoading = true;
let tcid = this.$route.query.tcid;
document.querySelector("#gernalCanvas").querySelectorAll('img').forEach(x => {
if(x.src.indexOf('http')!=-1){
x.setAttribute('crossOrigin','anonymous')
let UploadUrl = this.domainManager().UploadUrl
$.ajax({
url: UploadUrl + '/Upload/RemoveImage?fileType=1&fileLimit=5&&filePath=Feature/' + tcid,
type: "POST",
datatype:"jsonP",
success: function (data) {
// console.log("上传成功",data);
},
error: function () {
// console.log("上传失败");
}
});
let cName=''
if(this.showType==4){
cName='.feature-box'
}else if(this.showType==5){
cName='.travle_page'
}
if(cName!=''){
document.querySelectorAll(cName).forEach(x => {
html2Canvas(x,{
useCORS:true,
scale:0.7,
backgroundColor:'#FFFFFF',
}).then((canvas) => {
if(canvas){
var context = canvas.getContext('2d')
context.mozImageSmoothingEnabled = false
context.webkitImageSmoothingEnabled = false
context.msImageSmoothingEnabled = false
context.imageSmoothingEnabled = false
var image = new Image();
image.src = canvas.toDataURL("image/png");
document.body.appendChild(image)
// $.ajax({
// url: 'http://127.0.0.1:8120/Upload/UploadBase64?fileType=1&fileLimit=5&&filePath=Freature/TCID1' + tcid,
// type: "POST",
// data: {myfile: image.src},
// datatype:"jsonP",
// success: function (data) {
// // console.log("上传成功",data);
// },
// error: function () {
// // console.log("上传失败");
// }
// });
// this.uploadImg(tcid,{'myfile': image.src}, res=>{
// console.log(res)
// }, err=>{
// console.log("GHJK",err);
// })
}
});
if (this.showType===4 || this.showType===5) {
document.querySelector("#gernalCanvas").querySelectorAll('img').forEach(x => {
let src = x.src
src = src.replace('https:','http:')
if(src.indexOf('http')!=-1){
x.setAttribute('crossOrigin','anonymous')
}
x.src = src
});
let cName=''
if(this.showType==4){
cName='.feature-box'
}else if(this.showType==5){
cName='.travle_page'
}
if(cName!=''){
let allNum = 1
document.querySelectorAll(cName).forEach((x, index) => {
html2Canvas(x,{
useCORS:true,
scale:0.7,
backgroundColor:'#FFFFFF',
}).then((canvas) => {
if(canvas){
var context = canvas.getContext('2d')
context.mozImageSmoothingEnabled = false
context.webkitImageSmoothingEnabled = false
context.msImageSmoothingEnabled = false
context.imageSmoothingEnabled = false
var image = new Image();
image.src = canvas.toDataURL("image/png");
// document.body.appendChild(image) upload.oytour.com
$.ajax({
url: UploadUrl + '/Upload/UploadBase64?fileType=1&fileLimit=5&&filePath=Feature/' + tcid,
type: "POST",
data: {
myfile: image.src,
fileIndex: index
},
datatype:"jsonP",
success: function (data) {
// console.log("上传成功",data);
},
error: function () {
// console.log("上传失败");
}
});
// this.uploadImg(tcid,{'myfile': image.src}, res=>{
// console.log(res)
// }, err=>{
// console.log("GHJK",err);
// })
if (allNum!==document.querySelectorAll(cName).length) {
allNum += 1
} else {
this.ToWord(this.orderMsg.startDate + this.orderMsg.lineteamName + this.orderMsg.dayNum + '日游')
}
}
});
});
}
}else {
this.ToWord(this.orderMsg.startDate + this.orderMsg.lineteamName + this.orderMsg.dayNum + '日游')
}
},
//保存基础数据
......@@ -903,7 +932,10 @@
//是否显示团号
isShowTCNUM:this.vshowTCNUM?1:0
};
this.GetLocalFile("DownLoadTripWord", msg,title+ ".doc");
this.GetLocalFile("DownLoadTripWord", msg,title+ ".doc", res=>{
this.pdfLoading = false
});
},
DateDiff(sDate1, sDate2) { //sDate1和sDate2是2002-12-18格式
var aDate, oDate1, oDate2, iDays
......
src/components/systemManagement/CostType.vue
View file @ 17e7b147
......@@ -144,13 +144,14 @@
<ul>
<li>
<button class="hollowFixedBtn" @click="resetPageIndex(),initTableInfo()">{{$t('pub.searchBtn')}}</button>
<button type="button" class="normalBtn" @click="outerVisible=true">导入</button>
<button type="button" class="normalBtn" @click="downMuban()">下载导入模板</button>
<!-- <button type="button" class="normalBtn" @click="outerVisible=true">导入</button>
<button type="button" class="normalBtn" @click="downMuban()">下载导入模板</button> -->
<button class="normalBtn" @click="addShow=true,text='新增',addFun()" >新增</button>
<el-tooltip class="item" effect="dark" content="切换排版" placement="top-end">
<i v-if="transitionShow" class="iconfont icon-biaoge" @click="switchMethod(1)"></i>
<i v-if="transitionShow2" class="iconfont icon-icon-ssan" @click="switchMethod(2)"></i>
</el-tooltip>
<!-- <button type="button" class="normalBtn" @click="method5()">导出</button> -->
</li>
</ul>
</div>
......@@ -168,8 +169,8 @@
<p>摊账：{{item.IsShareAccount===0?'非摊账':'摊账'}}</p>
<p>营收报表：{{item.Is_Report===0?'不进入':'进入'}}</p>
<p class="_b_edit">
<button type="button" class="el-button el-tooltip item el-button--danger is-circle" aria-describedby="el-tooltip-694" tabindex="0" @click="financeinfoRemove(item.ID,item.Name)"><i class="el-icon-delete"></i></button>
<button type="button" class="el-button el-tooltip item el-button--primary is-circle" aria-describedby="el-tooltip-5781" tabindex="0" @click="editCurency(item.ID),text='修改'"><i class="el-icon-edit"></i></button>
<!-- <button type="button" class="el-button el-tooltip item el-button--danger is-circle" aria-describedby="el-tooltip-694" tabindex="0" @click="financeinfoRemove(item.ID,item.Name)"><i class="el-icon-delete"></i></button> -->
<button v-if="msg.EmployeeID==910" type="button" class="el-button el-tooltip item el-button--primary is-circle" aria-describedby="el-tooltip-5781" tabindex="0" @click="editCurency(item.ID),text='修改'"><i class="el-icon-edit"></i></button>
</p>
</div>
</div>
......@@ -192,21 +193,25 @@
<tbody class="po_content_item">
<tr v-for="(item,index) in CostTypeTreeList" :key="index" v-loading="loading">
<td width="200px">
<span class="cursorpointer" @click="editCurency(item.ID),text='修改'">{{item.Name}}</span>
<span class="cursorpointer" v-if="msg.EmployeeID==910" @click="editCurency(item.ID),text='修改'">{{item.Name}}</span>
<span class="cursorpointer" v-else>{{item.Name}}</span>
</td>
<template v-if="item.ChildList.length>0">
<td colspan="8" style="padding:0">
<table class="po_content_item po_content_item_two" style="width: 100%;" cellspacing="0" cellpadding="0">
<tbody>
<tr v-for="(son,sIndex) in item.ChildList">
<td style="" width="150px"><span class="cursorpointer" @click="editCurency(son.ID),text='修改'">{{son.Name}}</span></td>
<td style="" width="150px">
<span class="cursorpointer" v-if='msg.EmployeeID==910' @click="editCurency(son.ID),text='修改'">{{son.Name}}</span>
<span class="cursorpointer" v-else>{{son.Name}}</span></td>
<template v-if="son.ChildList.length>0">
<td colspan="7" style="padding:0">
<table class="po_content_item po_content_item_str" style="width: 100%" cellspacing="0" cellpadding="0">
<tbody>
<tr v-for="(grSon,gsIndex) in son.ChildList">
<td class="cursorpointer_last" width="150px">
<span class="cursorpointer" @click="editCurency(grSon.ID),text='修改'">{{grSon.Name}} <i @click.stop="financeinfoRemove(grSon.ID,grSon.Name)" class="el-icon-delete"></i></span></td>
<span class="cursorpointer" v-if='msg.EmployeeID==910' @click="editCurency(grSon.ID),text='修改'">{{grSon.Name}} <i @click.stop="financeinfoRemove(grSon.ID,grSon.Name)" class="el-icon-delete"></i></span>
<span class="cursorpointer" v-else>{{grSon.Name}}</span></td>
<td width="150px">{{grSon.BName}}</td>
<td width="150px">{{grSon.DeName}}</td>
<td width="150px">{{grSon.PName}}</td>
......@@ -464,6 +469,7 @@
Name:'',
Tier:0,
ParentId:'',
EmployeeID:-1,
},
addMsg:{
ID:0,
......@@ -778,6 +784,10 @@
});
});
},
//导出费用类型明细报表
method5: function() {
this.GetLocalFile("financeinfo_post_OutToCostTypeExcel", this.msg,"费用类型明细报表.xls");
} ,
editCurency(id){ // 修改信息
this.apipost('financeinfo_post_GetCostType',{ID:id}, res => {
if(res.data.resultCode == 1) {
......@@ -995,6 +1005,7 @@
this.initTableInfo();
let userInfo = this.getLocalStorage();
this.departmentMsg.RB_Group_Id = this.companyMsg.RB_Group_Id = userInfo.RB_Group_id; //集团
this.msg.EmployeeID=userInfo.EmployeeId;
this.getDepartment();
this.getCompany();
this.getCostTypeTreeList();
......
src/components/systemManagement/LessPriceManagement.vue
View file @ 17e7b147
......@@ -75,7 +75,7 @@
<table border="0" cellspacing="0" cellpadding="0" class="LP_table" v-loading="this.loading">
<tr>
<th width="200">公司</th>
<th width="400">线路/系列</th>
<th width="350">线路/系列</th>
<th>所有人</th>
<th>部门主管</th>
<th>分公司总经理</th>
......@@ -88,17 +88,16 @@
</td>
<td>
<div v-for="subItem in item.LessPriceList" class="comLessDiv">
<el-select class='w150' v-model="subItem.LineId" filterable :placeholder="$t('pub.pleaseSel')" @change="getLineTeamList(subItem)">
<el-select class='w150' v-model="subItem.LineId" filterable :placeholder="$t('pub.pleaseSel')" @change="getLineTeamList(subItem),resetLineTeamId(subItem)">
<el-option label="不限" :value='commonSelect'></el-option>
<el-option v-for="item in LineList" :label='item.LineName' :value='item.LineID' :key='item.LineID'>
</el-option>
</el-select>
{{subItem.LineTeamList}}
<!-- <el-select class='w150' v-model="subItem.LineTeamId" filterable :placeholder="$t('pub.pleaseSel')">
<el-select class='w150' v-model="subItem.LineTeamId" filterable :placeholder="$t('pub.pleaseSel')">
<el-option label="不限" :value='commonSelect'></el-option>
<el-option v-for="sitem in subItem.LineTeamList" :label='sitem.LtName' :value='sitem.LtID' :key='sitem.LtID'>
</el-option>
</el-select> -->
</el-select>
</div>
</td>
<td>
......@@ -152,12 +151,13 @@
methods: {
//保存少价管理
SaveLessPrice(subItem) {
subItem.LineTeamList=[];
this.apipost(
"lessprice_post_Set", subItem,
res => {
if (res.data.resultCode == 1) {
this.Success(res.data.message);
// this.getList();
this.getList();
}else{
this.Error(res.data.message);
}
......@@ -166,7 +166,7 @@
);
},
//获取列表
GetLessList() {
getList() {
this.loading = true;
var that=this;
that.apipost(
......@@ -181,7 +181,6 @@
})
})
that.dataList=data;
console.log(that.dataList,'resssss');
}else{
that.Error(res.data.message);
}
......@@ -205,7 +204,7 @@
res => {
if (res.data.resultCode == 1) {
that.Success("操作成功!");
// that.getList();
that.getList();
} else {
that.Error(res.data.message);
}
......@@ -231,11 +230,14 @@
isTOOP: 1
}, res => {
if (res.data.resultCode == 1) {
//subItem.LineTeamId = 0;
subItem.LineTeamList = res.data.data;
}
});
},
//系列重置默认不限
resetLineTeamId(subItem){
subItem.LineTeamId = 0;
},
//点击添加
addLessPrice(item){
var obj = {
......@@ -260,7 +262,7 @@
},
mounted() {
this.getLineList();
this.GetLessList();
this.getList();
},
};
......
src/plug/index.js
View file @ 17e7b147
......@@ -115,14 +115,14 @@ export default {
Vue.prototype.domainManager = function () {
let domainUrl = '';
let locationName = window.location.hostname;
//domainUrl = "http://127.0.0.1"; //214主域名
domainUrl = "http://127.0.0.1"; //214主域名
// 127.0.0.12
// domainUrl = "http://192.168.2.88"; //王悦主域名
// domainUrl = "http://127.0.0.1"; //214主域名
// domainUrl = "http://192.168.2.16:8083"; //王悦主域名
// domainUrl = "http://127.0.0.1"; //214主域名
// domainUrl = "http://192.168.2.65:8025"; //吴春主域名
domainUrl = "http://192.168.2.106:8082"; //罗超主域名
// domainUrl = "http://192.168.2.106:8082"; //罗超主域名
if (locationName.indexOf('oytour')!==-1) {
domainUrl = "https://reborn.oytour.com";
}else if (locationName.indexOf('viitto')!==-1) {
......@@ -149,7 +149,7 @@ export default {
GoogleMapUrl: "http://ditu.google.cn/maps/api/js?key=AIzaSyAZ5MIfzicStzKbIkbI3RcBBeZBjQFKsp0&sensor=false&language=zh-CN",
//google地图图片地址
GoogleMapImageUrl: "http://super.oytour.com",
Upload: "http://192.168.2.143:8120"
UploadUrl: "http://upload.oytour.com"
};
return obj;
},
......@@ -219,9 +219,7 @@ export default {
Vue.prototype.uploadImg = function (tcID, msg, successCall, faildCall) {
var apiurl = this.domainManager().Upload + '/Upload/UploadBase64?fileType=1&fileLimit=5&&filePath=Freature/TCID' + tcID;
this.$http.post(apiurl, msg, {
headers: {
}
datatype:"jsonP",
}).then(res => {
successCall(res);
}, faildCall)
......@@ -280,7 +278,7 @@ export default {
},
//下载文件
Vue.prototype.GetLocalFile = function (cmd, msg, fileName) {
Vue.prototype.GetLocalFile = function (cmd, msg, fileName, successCall) {
var apiurl = this.domainManager().LocalFileStreamDownLoadUrl;
var timestamp = (new Date()).valueOf();
if (!localStorage.userInfo && localStorage.userInfo != "" && this.$route.path.toLowerCase() != "/login") {
......@@ -315,6 +313,7 @@ export default {
link.setAttribute("download", fileName);
document.body.appendChild(link);
link.click();
successCall(res);
}).catch(function (res) {});
},
Vue.prototype.getCookieItem = function () {
......
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