Skip to content

S
SuperMan
Commit a8f96287 authored by liudong1993's avatar liudong1993
Browse files
Options

Merge branch 'master' of http://gitlab.oytour.com/luochao/superman

parents c1ef19eb 27970613
Hide whitespace changes
Inline Side-by-side
Showing with 983 additions and 199 deletions
src/components/FinancialModule/FinancialDocuments.vue
View file @ a8f96287
...@@ -865,6 +865,13 @@ ...@@ -865,6 +865,13 @@
<el-input class="w200" v-model="msg.Remark"></el-input> <el-input class="w200" v-model="msg.Remark"></el-input>
</span> </span>
</li> </li>
<li v-if="msg.Conditon==1">
<span>
<em>只看待上传发票的</em>
<el-switch v-model="msg.InvoiceState" active-value="true" inactive-value="false">
</el-switch>
</span>
</li>
</template> </template>
</ul> </ul>
</div> </div>
...@@ -1436,7 +1443,8 @@ ...@@ -1436,7 +1443,8 @@
UpdateBy: "", UpdateBy: "",
Sort: "2", Sort: "2",
IsSpecial: 0, IsSpecial: 0,
Remark: "" Remark: "",
InvoiceState:false,
}, },
getCompanyMsg: { getCompanyMsg: {
// 公司 // 公司
...@@ -2281,6 +2289,7 @@ ...@@ -2281,6 +2289,7 @@
if (!this.msg.Conditon) this.msg.Conditon = 1; if (!this.msg.Conditon) this.msg.Conditon = 1;
if (!this.msg.TradeWay) this.msg.TradeWay = 0; if (!this.msg.TradeWay) this.msg.TradeWay = 0;
if (!this.msg.AccountType) this.msg.AccountType = 0; if (!this.msg.AccountType) this.msg.AccountType = 0;
this.apipost( this.apipost(
"Financial_post_GetPageList", "Financial_post_GetPageList",
this.msg, this.msg,
......
src/components/FinancialModule/FinancialDocumentsDetail.vue
View file @ a8f96287
...@@ -1121,7 +1121,9 @@ ...@@ -1121,7 +1121,9 @@
<div style="border-top: 1px solid #dedede;margin-top: 10px; <div style="border-top: 1px solid #dedede;margin-top: 10px;
padding: 0 0 10px 0;" padding: 0 0 10px 0;"
v-if="GetDetail.KingdeeInvoice&&(GetDetail.KingdeeInvoice==1||GetDetail.KingdeeInvoice==3) v-if="GetDetail.KingdeeInvoice&&(GetDetail.KingdeeInvoice==1||GetDetail.KingdeeInvoice==3)
&&(GetDetail.CreateBy==userInfo.EmployeeId||GetDetail.InvoiceExamineBy==userInfo.EmployeeId)"> &&(GetDetail.CreateBy==userInfo.EmployeeId
||GetDetail.InvoiceExamineBy==userInfo.EmployeeId
||ActionMenuCode.indexOf('F_Query_AllIncomPay')!= -1)">
<p <p
style="margin-top: 10px;"> style="margin-top: 10px;">
<span style="color: red;">发票凭证</span> <span style="color: red;">发票凭证</span>
...@@ -1162,7 +1164,6 @@ ...@@ -1162,7 +1164,6 @@
<!-- <img :src="file.Url?file.Url:file.Content" @click="showImg(file.Url?file.Url:file.Content)"> --> <!-- <img :src="file.Url?file.Url:file.Content" @click="showImg(file.Url?file.Url:file.Content)"> -->
</div> </div>
<span class="iconfont icon-guanbi1" <span class="iconfont icon-guanbi1"
v-if="(GetDetail.CreateBy==userInfo.EmployeeId||GetDetail.InvoiceExamineBy==userInfo.EmployeeId)&&GetDetail.InvoiceState!=2"
@click="deleteUploadFile(fIndex,1)"></span> @click="deleteUploadFile(fIndex,1)"></span>
</div> </div>
<div v-if="file.Type==1"> <div v-if="file.Type==1">
...@@ -1172,13 +1173,14 @@ ...@@ -1172,13 +1173,14 @@
@click="showUpLoadFile(file)"> @click="showUpLoadFile(file)">
</div> </div>
<span class="iconfont icon-guanbi1" <span class="iconfont icon-guanbi1"
v-if="(GetDetail.CreateBy==userInfo.EmployeeId||GetDetail.InvoiceExamineBy==userInfo.EmployeeId)&&GetDetail.InvoiceState!=2"
@click="deleteUploadFile(fIndex,1)"></span> @click="deleteUploadFile(fIndex,1)"></span>
</div> </div>
</template> </template>
</div> </div>
<div style="margin-top: 10px;" <div style="margin-top: 10px;"
v-if="(GetDetail.CreateBy==userInfo.EmployeeId||GetDetail.InvoiceExamineBy==userInfo.EmployeeId)&&GetDetail.InvoiceState!=2"> v-if="(GetDetail.CreateBy==userInfo.EmployeeId
||GetDetail.InvoiceExamineBy==userInfo.EmployeeId
||ActionMenuCode.indexOf('F_Query_AllIncomPay')!= -1)&&GetDetail.InvoiceState!=2">
<div class="_pic_upload"> <div class="_pic_upload">
<!--<div class="_pic_upload" v-if="saveMsg.length!==5 && ((saveMsg.length + GetDetail.VorcherInos.length) < 5)">--> <!--<div class="_pic_upload" v-if="saveMsg.length!==5 && ((saveMsg.length + GetDetail.VorcherInos.length) < 5)">-->
<el-upload drag :http-request="uploadFileBtnFP" :multiple="true" :show-file-list="false" action=""> <el-upload drag :http-request="uploadFileBtnFP" :multiple="true" :show-file-list="false" action="">
...@@ -1666,6 +1668,7 @@ ...@@ -1666,6 +1668,7 @@
huijiShow: false, huijiShow: false,
clientData: {}, clientData: {},
isReceivablesAccount: false, isReceivablesAccount: false,
ActionMenuCode: ''
} }
}, },
components: { components: {
...@@ -1706,7 +1709,7 @@ ...@@ -1706,7 +1709,7 @@
this.pageIndex = this.$route.query.pageIndex; this.pageIndex = this.$route.query.pageIndex;
let userinfo = this.getLocalStorage(); let userinfo = this.getLocalStorage();
this.bossID = userinfo.EmployeeId; this.bossID = userinfo.EmployeeId;
let ActionMenuCode = userinfo.ActionMenuCode; let ActionMenuCode = this.ActionMenuCode = userinfo.ActionMenuCode;
if (ActionMenuCode.indexOf('F_Update_KJCostType') != -1) { if (ActionMenuCode.indexOf('F_Update_KJCostType') != -1) {
this.huijiShow = true; this.huijiShow = true;
} }
......
src/components/SalesModule/MyCustomer.vue
View file @ a8f96287
...@@ -542,7 +542,12 @@ ...@@ -542,7 +542,12 @@
</el-popover> </el-popover>
</td> </td>
<td>{{item.contactNumber}}</td> <td>{{item.contactNumber}}</td>
<td>{{item.customerName}}</td> <td>
{{item.customerName}}
<span v-if="item.departmentManagerStr&&msg.CustomerStatus==1" style="color: red;margin-left: 10px;">
待{{item.departmentManagerStr}}审核
</span>
</td>
<td> <td>
<p v-if="item.customerVisitList.length>0"> <p v-if="item.customerVisitList.length>0">
{{item.customerVisitList[0].visitDateTime}} {{item.customerVisitList[0].visitDateTime}}
......
src/components/Ticketing/TicketManager.vue
View file @ a8f96287
...@@ -1393,6 +1393,16 @@ ...@@ -1393,6 +1393,16 @@
</el-select> </el-select>
</span> </span>
</li> </li>
<li>
<span>
<em>团期状态</em>
<el-select v-model="msg.IsNoTCID" :placeholder="$t('pub.pleaseSel')" class="w120">
<el-option label="不限" :value="0"></el-option>
<el-option label="未绑定团期" :value="1"></el-option>
<el-option label="有机损的取消团期" :value="2"></el-option>
</el-select>
</span>
</li>
<li style="margin-right:50px;"> <li style="margin-right:50px;">
<button class="normalBtn" type="button" @click="resetPageIndex(),getList()">{{$t('pub.searchBtn')}}</button> <button class="normalBtn" type="button" @click="resetPageIndex(),getList()">{{$t('pub.searchBtn')}}</button>
<button class="normalBtn" type="button" @click="addShow=true,command=false,sanmai=false,initAddMsg()"> <button class="normalBtn" type="button" @click="addShow=true,command=false,sanmai=false,initAddMsg()">
...@@ -2785,6 +2795,7 @@ ...@@ -2785,6 +2795,7 @@
Departure_city: 0, //出发地 Departure_city: 0, //出发地
SellType: -1, //售卖机票类型：0-团队机票，1-单卖机票 SellType: -1, //售卖机票类型：0-团队机票，1-单卖机票
IsSelectInvoicing: '0', //是否未维护开票金额1-未维护，2-已维护 IsSelectInvoicing: '0', //是否未维护开票金额1-未维护，2-已维护
IsNoTCID: 0,//1未绑定团期 2有机损的取消团期
}, },
maintenanceList: [{ maintenanceList: [{
Name: '不限', Name: '不限',
......
src/components/TravelManager/TravelList/TravelControlList.vue
View file @ a8f96287
...@@ -669,7 +669,7 @@ ...@@ -669,7 +669,7 @@
</el-popover> </el-popover>
</p> </p>
<p class="travelnowrap" <p class="travelnowrap"
v-if="(item.LineID==14 || item.LineID==90|| item.LineID==168) && item.IsOpenHotel==1"> v-if="(item.LineID==14 || item.LineID==90|| item.LineID==168 ||item.LineID==118) && item.IsOpenHotel==1">
<span style="color:red;font-weight:bold;">※ {{$t('op.DJyiguanbi')}}.</span> <span style="color:red;font-weight:bold;">※ {{$t('op.DJyiguanbi')}}.</span>
</p> </p>
</div> </div>
......
src/components/TravelManager/TravelList/TravelControlListSale.vue
View file @ a8f96287
...@@ -491,7 +491,7 @@ ...@@ -491,7 +491,7 @@
{{item.OutBranchName}} {{item.OutBranchName}}
</p> </p>
<p <p
v-if="(item.LineID==14 || item.LineID==90|| item.LineID==168) && item.HotelOrderListReports && item.HotelOrderListReports.length>0 "> v-if="(item.LineID==14 || item.LineID==90|| item.LineID==168||item.LineID==118) && item.HotelOrderListReports && item.HotelOrderListReports.length>0 ">
<el-popover width="980" trigger="click" popper-class="TC_HotelPop"> <el-popover width="980" trigger="click" popper-class="TC_HotelPop">
<commonHotelInfo :HotelObj="item.HotelOrderListReports" :showHotelObj="showHotelObj" <commonHotelInfo :HotelObj="item.HotelOrderListReports" :showHotelObj="showHotelObj"
:TCID="item.TCID" :DMCNum="item.DMCNum" :TCNUM="item.TCNUM" :TCID="item.TCID" :DMCNum="item.DMCNum" :TCNUM="item.TCNUM"
...@@ -505,7 +505,7 @@ ...@@ -505,7 +505,7 @@
</el-popover> </el-popover>
</p> </p>
<p class="travelnowrap" <p class="travelnowrap"
v-if="(item.LineID==14 || item.LineID==90|| item.LineID==168) && item.IsOpenHotel==1"> v-if="(item.LineID==14 || item.LineID==90|| item.LineID==168||item.LineID==118) && item.IsOpenHotel==1">
<span style="color:red;font-weight:bold;">※ {{$t('op.DJyiguanbi')}}.</span> <span style="color:red;font-weight:bold;">※ {{$t('op.DJyiguanbi')}}.</span>
</p> </p>
</div> </div>
......
src/components/confirmationOrderDownLoadNew.vue
View file @ a8f96287
...@@ -539,8 +539,14 @@ ...@@ -539,8 +539,14 @@
var title = this.orderMsg.startDate + this.orderMsg.lineteamName + this.orderMsg.dayNum + '日游'; var title = this.orderMsg.startDate + this.orderMsg.lineteamName + this.orderMsg.dayNum + '日游';
//欧洲 //欧洲
if (this.dataAll.lineId == 168 || this.dataAll.lineId == 119) { if (this.dataAll.lineId == 168 || this.dataAll.lineId == 119) {
title = this.orderMsg.startDate + this.dataAll.title; title = this.orderMsg.startDate;
if (this.dataAll.title.length > 80) {
title += this.dataAll.title.substring(0, 80);
} else {
title += this.dataAll.title;
}
} }
console.log("title", title);
var fileName = title + ".pdf"; var fileName = title + ".pdf";
if (this.orderId && this.orderId > 0) { if (this.orderId && this.orderId > 0) {
//出团通知书下载 //出团通知书下载
......
src/components/index.vue
View file @ a8f96287
...@@ -173,10 +173,8 @@ ...@@ -173,10 +173,8 @@
@click.native="goUrlT('FinancialDocuments',3,'财务单据')"> @click.native="goUrlT('FinancialDocuments',3,'财务单据')">
<i class="iconfont icon-nav-caiwu" style="color:#8e44ad"></i> <i class="iconfont icon-nav-caiwu" style="color:#8e44ad"></i>
财务单 财务单
<el-badge v-if="NotDealCount8>0" class="mark" :value="NotDealCount8?NotDealCount8:0" <el-badge v-if="NotDealCount8>0" class="mark" :value="NotDealCount8?NotDealCount8:0" type="primary"
type="primary" style="right: 65px;" @click.native.stop="goUrlT('FinancialDocuments',8,'财务单据')" />
style="right: 65px;"
@click.native.stop="goUrlT('FinancialDocuments',8,'财务单据')"/>
<el-badge class="mark" :value="NotDealCount?NotDealCount:'0'" /> <el-badge class="mark" :value="NotDealCount?NotDealCount:'0'" />
<i class="iconfont icon-right1"></i> <i class="iconfont icon-right1"></i>
</el-dropdown-item> </el-dropdown-item>
...@@ -218,8 +216,7 @@ ...@@ -218,8 +216,7 @@
CRM系统 CRM系统
<i class="iconfont icon-right1"></i> <i class="iconfont icon-right1"></i>
</el-dropdown-item> </el-dropdown-item>
<el-dropdown-item class="clearfix _dropdown_other" @click.native="unbundlingVisible=true" <el-dropdown-item class="clearfix _dropdown_other" @click.native="unbundlingVisible=true" v-if="userInfo&&userInfo.DepartName&&(userInfo.DepartName.indexOf('操作部')!=-1 || userInfo.DepartName.indexOf('总部财务部')!=-1) ||(userInfo.RB_Branch_id == 1245
v-if="userInfo&&userInfo.DepartName&&(userInfo.DepartName.indexOf('操作部')!=-1 || userInfo.DepartName.indexOf('总部财务部')!=-1) ||(userInfo.RB_Branch_id == 1245
&& userInfo.DepartName.indexOf('引流')==-1 && userInfo.DepartName.indexOf('引流')==-1
&& userInfo.DepartName.indexOf('市场')==-1)"> && userInfo.DepartName.indexOf('市场')==-1)">
<i class="iconfont icon-Newspaper" style="color:#f39c12"></i> <i class="iconfont icon-Newspaper" style="color:#f39c12"></i>
...@@ -1182,8 +1179,8 @@ ...@@ -1182,8 +1179,8 @@
<div class="tsContent"> <div class="tsContent">
<div style="width:100%;height:372px;position:relative"> <div style="width:100%;height:372px;position:relative">
<p style="text-align:center;font-size:14px;z-index:100;">投诉案例</p> <p style="text-align:center;font-size:14px;z-index:100;">投诉案例</p>
<img @click="CloseTs" class="tsClose" style="width:11px;height:11px;cursor: pointer;" src="../assets/img/tsclose.png" <img @click="CloseTs" class="tsClose" style="width:11px;height:11px;cursor: pointer;"
alt=""> src="../assets/img/tsclose.png" alt="">
<img class="tsbg" style="width:100%;height:100%" src="../assets/img/ts.png" alt=""> <img class="tsbg" style="width:100%;height:100%" src="../assets/img/ts.png" alt="">
</div> </div>
<div style="text-align:center"> <div style="text-align:center">
...@@ -1206,15 +1203,13 @@ ...@@ -1206,15 +1203,13 @@
<!-- 投票 --> <!-- 投票 -->
<Voting v-show="VotingShow" :NowVoteData="NowVoteData" :NowVoteType="NowVoteType"></Voting> <Voting v-show="VotingShow" :NowVoteData="NowVoteData" :NowVoteType="NowVoteType"></Voting>
<!-- 机票未绑团提示 --> <!-- 机票未绑团提示 -->
<unbundlingMessage v-if="unbundlingVisible" <unbundlingMessage v-if="unbundlingVisible" :UnboundDate="UnboundDate" @unbundlingVisible="unbundlingVisible=false">
:UnboundDate="UnboundDate" @unbundlingVisible="unbundlingVisible=false"></unbundlingMessage> </unbundlingMessage>
<!-- 改价提醒/审核改价提醒 --> <!-- 改价提醒/审核改价提醒 -->
<ChangeThePriceMessage v-if="ChangeThePriceVisible||ExamineThePriceVisible" <ChangeThePriceMessage v-if="ChangeThePriceVisible||ExamineThePriceVisible" :type="1" :msg="ExamineThePriceMsg"
:type="1" :ChangeThePriceObj="ChangeThePriceObj"
:msg="ExamineThePriceMsg" @ChangeThePriceVisible="ChangeThePriceVisible=false,ExamineThePriceVisible=false"></ChangeThePriceMessage>
:ChangeThePriceObj="ChangeThePriceObj"
@ChangeThePriceVisible="ChangeThePriceVisible=false,ExamineThePriceVisible=false"></ChangeThePriceMessage>
</div> </div>
</template> </template>
...@@ -1255,29 +1250,29 @@ ...@@ -1255,29 +1250,29 @@
}, },
data() { data() {
return { return {
ExamineThePriceMsg:{ ExamineThePriceMsg: {
Q_IsCollect: '2',//收款状态 Q_IsCollect: '2', //收款状态
DepartSTime: '', //出发时间 DepartSTime: '', //出发时间
DepartETime: '', DepartETime: '',
EnterId: 0,//销售 EnterId: 0, //销售
RB_Branch_Id: '-1',//公司 RB_Branch_Id: '-1', //公司
OrderId:"", OrderId: "",
TicketStatus:"1", TicketStatus: "1",
OrderType:"0", OrderType: "0",
pageIndex:1, pageIndex: 1,
pageSize:5, pageSize: 5,
total: 0, total: 0,
total2: 0, total2: 0,
}, },
ExamineThePriceVisible: false,//审核改价提醒 ExamineThePriceVisible: false, //审核改价提醒
ChangeThePriceList: [], ChangeThePriceList: [],
ChangeThePriceVisible: false,//改价提醒 ChangeThePriceVisible: false, //改价提醒
ChangeThePriceObj:{ ChangeThePriceObj: {
ExamineThePriceData:[], ExamineThePriceData: [],
ChangeThePriceData:[], ChangeThePriceData: [],
}, },
UnboundDate: {}, UnboundDate: {},
unbundlingVisible: false,//未绑团提醒 unbundlingVisible: false, //未绑团提醒
b2bDomain: "", b2bDomain: "",
useRed: false, useRed: false,
//提成账单弹窗 //提成账单弹窗
...@@ -1476,7 +1471,7 @@ ...@@ -1476,7 +1471,7 @@
isFirstLoad: true, isFirstLoad: true,
unReadMsgId: [], unReadMsgId: [],
isFocus: true, isFocus: true,
NotDealCount8:"", NotDealCount8: "",
NotDealCount: "", NotDealCount: "",
MyAuditCount: "", MyAuditCount: "",
sysMsgPageIndex: 1, sysMsgPageIndex: 1,
...@@ -1884,17 +1879,17 @@ ...@@ -1884,17 +1879,17 @@
this.GetSupperOrderEditAuth(); this.GetSupperOrderEditAuth();
// 获取未绑定团的数据 // 获取未绑定团的数据
if(!localStorage.getItem("UnboundDateTime")|| if (!localStorage.getItem("UnboundDateTime") ||
(localStorage.getItem("UnboundDateTime")!=this.getBeforeDate(0, new Date().Format("yyyy-MM-dd")))){ (localStorage.getItem("UnboundDateTime") != this.getBeforeDate(0, new Date().Format("yyyy-MM-dd")))) {
this.GetTravelAirNotBind() this.GetTravelAirNotBind()
}else{ } else {
if(localStorage.getItem("UnboundDate")){ if (localStorage.getItem("UnboundDate")) {
if(this.userInfo.DepartName.indexOf("操作部")!=-1 || this.userInfo.DepartName.indexOf("总部财务部")!=-1 || if (this.userInfo.DepartName.indexOf("操作部") != -1 || this.userInfo.DepartName.indexOf("总部财务部") != -1 ||
(this.userInfo.RB_Branch_id == 1245 (this.userInfo.RB_Branch_id == 1245 &&
&& this.userInfo.DepartName.indexOf("引流")==-1 this.userInfo.DepartName.indexOf("引流") == -1 &&
&& this.userInfo.DepartName.indexOf("市场")==-1)){ this.userInfo.DepartName.indexOf("市场") == -1)) {
this.UnboundDate = JSON.parse(localStorage.getItem("UnboundDate")) this.UnboundDate = JSON.parse(localStorage.getItem("UnboundDate"))
}else{ } else {
localStorage.removeItem("UnboundDate"); localStorage.removeItem("UnboundDate");
localStorage.removeItem("UnboundDateTime"); localStorage.removeItem("UnboundDateTime");
} }
...@@ -1905,43 +1900,45 @@ ...@@ -1905,43 +1900,45 @@
// 获取改价及审核提醒 每月1到10号提示 // 获取改价及审核提醒 每月1到10号提示
let DateTime = new Date(); let DateTime = new Date();
let Year = DateTime.getFullYear() let Year = DateTime.getFullYear()
let Month = DateTime.getMonth()+1 let Month = DateTime.getMonth() + 1
let Months = Month>9?Month:'0'+Month let Months = Month > 9 ? Month : '0' + Month
let StartDate = Year+'-'+Months+'-01' let StartDate = Year + '-' + Months + '-01'
let DateList = [] let DateList = []
for(let i=0;i<10;i++){ for (let i = 0; i < 10; i++) {
DateList.push(this.getBeforeDate(-i, new Date(StartDate).Format("yyyy-MM-dd"))) DateList.push(this.getBeforeDate(-i, new Date(StartDate).Format("yyyy-MM-dd")))
} }
this.ChangeThePriceList = DateList.filter(x=>{ this.ChangeThePriceList = DateList.filter(x => {
return x==this.getBeforeDate(0, new Date().Format("yyyy-MM-dd")) return x == this.getBeforeDate(0, new Date().Format("yyyy-MM-dd"))
}) })
if(this.ChangeThePriceList.length>0){ if (this.ChangeThePriceList.length > 0) {
if((!localStorage.getItem("ChangeThePriceDataTime")|| if ((!localStorage.getItem("ChangeThePriceDataTime") ||
(localStorage.getItem("ChangeThePriceDataTime")!=this.getBeforeDate(0, new Date().Format("yyyy-MM-dd"))))){ (localStorage.getItem("ChangeThePriceDataTime") != this.getBeforeDate(0, new Date().Format("yyyy-MM-dd")))
)) {
this.GetChangeThePrice() this.GetChangeThePrice()
} }
if((!localStorage.getItem("ExamineThePriceDataTime")|| if ((!localStorage.getItem("ExamineThePriceDataTime") ||
(localStorage.getItem("ExamineThePriceDataTime")!=this.getBeforeDate(0, new Date().Format("yyyy-MM-dd"))))){ (localStorage.getItem("ExamineThePriceDataTime") != this.getBeforeDate(0, new Date().Format("yyyy-MM-dd")))
)) {
this.GetExaminePriceOrderPageList() this.GetExaminePriceOrderPageList()
} }
// 两小时请求一次改价、审核改价提醒 // 两小时请求一次改价、审核改价提醒
setInterval(()=>{ setInterval(() => {
if(!this.ChangeThePriceVisible&&!this.ExamineThePriceVisible){ if (!this.ChangeThePriceVisible && !this.ExamineThePriceVisible) {
this.GetChangeThePrice() this.GetChangeThePrice()
this.GetExaminePriceOrderPageList() this.GetExaminePriceOrderPageList()
}else{ } else {
clearInterval() clearInterval()
} }
},7200000) }, 7200000)
} }
}, },
created() { created() {
let DateTime = new Date(); let DateTime = new Date();
let Year = DateTime.getFullYear() let Year = DateTime.getFullYear()
let Month = DateTime.getMonth() let Month = DateTime.getMonth()
let Months = Month>9?Month:'0'+Month let Months = Month > 9 ? Month : '0' + Month
let day = new Date(Year, Month, 0).getDate() let day = new Date(Year, Month, 0).getDate()
let DepartETime = Year+'-'+Months+'-'+day let DepartETime = Year + '-' + Months + '-' + day
this.ExamineThePriceMsg.DepartETime = DepartETime this.ExamineThePriceMsg.DepartETime = DepartETime
if (!localStorage.getItem("tsNumber") || localStorage.getItem("tsNumber") != this.tsNumber) { if (!localStorage.getItem("tsNumber") || localStorage.getItem("tsNumber") != this.tsNumber) {
this.tsState = true; this.tsState = true;
...@@ -1975,92 +1972,94 @@ ...@@ -1975,92 +1972,94 @@
} }
}, },
methods: { methods: {
GetExaminePriceOrderPageList(type){ GetExaminePriceOrderPageList(type) {
this.apipost( this.apipost(
"CarSingle_post_GetExaminePriceOrderPageList",this.ExamineThePriceMsg, "CarSingle_post_GetExaminePriceOrderPageList", this.ExamineThePriceMsg,
res => { res => {
if(res.data.resultCode==1){ if (res.data.resultCode == 1) {
if(res.data.data&&res.data.data.count>0&&res.data.data.pageData.length>0){ if (res.data.data && res.data.data.count > 0 && res.data.data.pageData.length > 0) {
if(!this.ExamineThePriceMsg.total) this.ExamineThePriceMsg.total = res.data.data.count if (!this.ExamineThePriceMsg.total) this.ExamineThePriceMsg.total = res.data.data.count
// localStorage.setItem("ExamineThePriceData", JSON.stringify(res.data.data.pageData)); // localStorage.setItem("ExamineThePriceData", JSON.stringify(res.data.data.pageData));
localStorage.setItem("ExamineThePriceDataTime", this.getBeforeDate(0, new Date().Format("yyyy-MM-dd"))); localStorage.setItem("ExamineThePriceDataTime", this.getBeforeDate(0, new Date().Format(
this.ChangeThePriceObj.ExamineThePriceData = res.data.data.pageData "yyyy-MM-dd")));
this.ExamineThePriceVisible = true this.ChangeThePriceObj.ExamineThePriceData = res.data.data.pageData
}else{ this.ExamineThePriceVisible = true
this.ExamineThePriceVisible = false } else {
if(type==1){ this.ExamineThePriceVisible = false
// this.$message.info('暂无订单审核数据') if (type == 1) {
} // this.$message.info('暂无订单审核数据')
// localStorage.removeItem("ExamineThePriceData");
localStorage.removeItem("ExamineThePriceDataTime");
} }
// localStorage.removeItem("ExamineThePriceData");
localStorage.removeItem("ExamineThePriceDataTime");
} }
} }
); }
);
}, },
// 获取改价提醒的数据 // 获取改价提醒的数据
GetChangeThePrice(type){ GetChangeThePrice(type) {
let msg = { let msg = {
pageIndex:1, pageIndex: 1,
pagesize:5, pagesize: 5,
OrderId:0, OrderId: 0,
GuestId:0, GuestId: 0,
EnterId:0, EnterId: 0,
OrderState:"1", OrderState: "1",
EndTime:"", EndTime: "",
FinishsTime:"", FinishsTime: "",
FinishETime:"", FinishETime: "",
DepartSTime:"", DepartSTime: "",
DepartETime: this.ExamineThePriceMsg.DepartETime, DepartETime: this.ExamineThePriceMsg.DepartETime,
TCNUM:"", TCNUM: "",
ProductName: "", ProductName: "",
CustomerWame:"", CustomerWame: "",
LureEmpId:0, LureEmpId: 0,
LineId:0, LineId: 0,
TravelType:0, TravelType: 0,
OrderType:2, OrderType: 2,
IsSelectCRM:0, IsSelectCRM: 0,
IsMyOrder:"1", IsMyOrder: "1",
OrderType:"0", OrderType: "0",
Q_IsCollect:"2", Q_IsCollect: "2",
TicketStatus:'1', TicketStatus: '1',
} }
this.ChangeThePriceData = [] this.ChangeThePriceData = []
this.apipost( this.apipost(
"CarSingle_post_GetChangePriceOrderPageList", msg, "CarSingle_post_GetChangePriceOrderPageList", msg,
res => { res => {
if(res.data.resultCode==1){ if (res.data.resultCode == 1) {
if(res.data.data&&res.data.data.count>0&&res.data.data.pageData.length>0){ if (res.data.data && res.data.data.count > 0 && res.data.data.pageData.length > 0) {
if(!this.ExamineThePriceMsg.total2) this.ExamineThePriceMsg.total2 = res.data.data.count if (!this.ExamineThePriceMsg.total2) this.ExamineThePriceMsg.total2 = res.data.data.count
// localStorage.setItem("ChangeThePriceData", JSON.stringify(res.data.data.pageData)); // localStorage.setItem("ChangeThePriceData", JSON.stringify(res.data.data.pageData));
localStorage.setItem("ChangeThePriceDataTime", this.getBeforeDate(0, new Date().Format("yyyy-MM-dd"))); localStorage.setItem("ChangeThePriceDataTime", this.getBeforeDate(0, new Date().Format(
this.ChangeThePriceObj.ChangeThePriceData = res.data.data.pageData "yyyy-MM-dd")));
this.ChangeThePriceVisible = true this.ChangeThePriceObj.ChangeThePriceData = res.data.data.pageData
}else{ this.ChangeThePriceVisible = true
this.ChangeThePriceVisible = false } else {
if(type==1){ this.ChangeThePriceVisible = false
// this.$message.info('暂无订单改价数据') if (type == 1) {
} // this.$message.info('暂无订单改价数据')
// localStorage.removeItem("ChangeThePriceData");
localStorage.removeItem("ChangeThePriceDataTime");
} }
// localStorage.removeItem("ChangeThePriceData");
localStorage.removeItem("ChangeThePriceDataTime");
} }
} }
); }
);
}, },
// 获取未绑定团的数据 // 获取未绑定团的数据
GetTravelAirNotBind(){ GetTravelAirNotBind() {
this.UnboundDate = {} this.UnboundDate = {}
if(this.userInfo.DepartName.indexOf("操作部")!=-1 || this.userInfo.DepartName.indexOf("总部财务部")!=-1 || if (this.userInfo.DepartName.indexOf("操作部") != -1 || this.userInfo.DepartName.indexOf("总部财务部") != -1 ||
(this.userInfo.RB_Branch_id == 1245 (this.userInfo.RB_Branch_id == 1245 &&
&& this.userInfo.DepartName.indexOf("引流")==-1 this.userInfo.DepartName.indexOf("引流") == -1 &&
&& this.userInfo.DepartName.indexOf("市场")==-1)){ this.userInfo.DepartName.indexOf("市场") == -1)) {
this.apipost( this.apipost(
"opcommission_GetTravelAirNotBind", {}, "opcommission_GetTravelAirNotBind", {},
res => { res => {
if(res.data.resultCode==1){ if (res.data.resultCode == 1) {
if((res.data.data.TravelList&&res.data.data.TravelList.length>0) if ((res.data.data.TravelList && res.data.data.TravelList.length > 0) ||
||(res.data.data.AirList&&res.data.data.AirList.length>0)){ (res.data.data.AirList && res.data.data.AirList.length > 0)) {
localStorage.setItem("UnboundDate", JSON.stringify(res.data.data)); localStorage.setItem("UnboundDate", JSON.stringify(res.data.data));
localStorage.setItem("UnboundDateTime", this.getBeforeDate(0, new Date().Format("yyyy-MM-dd"))); localStorage.setItem("UnboundDateTime", this.getBeforeDate(0, new Date().Format("yyyy-MM-dd")));
this.UnboundDate = res.data.data this.UnboundDate = res.data.data
...@@ -2072,23 +2071,18 @@ ...@@ -2072,23 +2071,18 @@
} }
}, },
testApi() { testApi() {
var postMsg = {}; // var postMsg = {};
var cmd = ""; // var cmd = "";
cmd = "AirTicket_get_GetTicketProduct"; // cmd = "admin_get_GetErpLoginInfoByUid";
postMsg = { // postMsg = {
StartDate: "2023-09-28", //开始日期 // EmployeeId: 615
EndDate: "2023-12-31", //结束日期 // }
DepartCityId: 343, //出发城市(西安) // this.apipost(
ArriveCityId: 653, //到达城市(东京) // cmd, postMsg,
AirLineID: 0, //航空公司编号 // res => {
TicketType: 0, //类型(1-单程，2-往返) // console.log("testApi", res);
} // }
this.apipost( // );
cmd, postMsg,
res => {
console.log("testApi", res);
}
);
}, },
//测试方法 //测试方法
testEmp() { testEmp() {
...@@ -2428,43 +2422,43 @@ ...@@ -2428,43 +2422,43 @@
// 发票审核提示 // 发票审核提示
GetExamineFinanceInvoiceList() { GetExamineFinanceInvoiceList() {
let msg = { let msg = {
pageIndex:1, pageIndex: 1,
pageSize:5, pageSize: 5,
FrID:"0", FrID: "0",
sDate:"", sDate: "",
eDate:"", eDate: "",
Status:"-1", Status: "-1",
TemplateId:"0", TemplateId: "0",
RB_Branch_Id:-1, RB_Branch_Id: -1,
RB_Depart_Id:0, RB_Depart_Id: 0,
sTradeDate:"", sTradeDate: "",
eTradeDate:"", eTradeDate: "",
ClientType:0, ClientType: 0,
RemitterName:"", RemitterName: "",
ClientID:0, ClientID: 0,
sMoney:"", sMoney: "",
eMoney:"", eMoney: "",
CurrencyId:"0", CurrencyId: "0",
CostTypeID:0, CostTypeID: 0,
Conditon:1, Conditon: 1,
TCNUM:"", TCNUM: "",
TradeWay:0, TradeWay: 0,
Type:"0", Type: "0",
AccountType:0, AccountType: 0,
QEndDate:"", QEndDate: "",
QStartDate:"", QStartDate: "",
UpdateBy:0, UpdateBy: 0,
IsFormRecPayQuery:"1", IsFormRecPayQuery: "1",
KJCostTypeId:0, KJCostTypeId: 0,
IsSelectKJSetCostType:0, IsSelectKJSetCostType: 0,
Remark:"", Remark: "",
Sort:"2", Sort: "2",
KingdeeMark:"0", KingdeeMark: "0",
AuditId:"", AuditId: "",
TCID:0, TCID: 0,
OrderID:0, OrderID: 0,
EmployeeId: this.userInfo.EmployeeId EmployeeId: this.userInfo.EmployeeId
} }
this.apipost( this.apipost(
"Financial_post_GetExamineFinanceInvoiceList", msg, "Financial_post_GetExamineFinanceInvoiceList", msg,
r => { r => {
......
src/components/newTravelmanager/TravelGroupControl/UpgradedVersion/featureHome2.vue 0 → 100644
View file @ a8f96287
<template>
<div class="featureHome-form">
<div class="featureHome-text featureHome2-text z-index1">
<div class="featureHome2-logoBox">
<div class="featureHome2-logoL">
<img v-if="FeatureItem.dataObj.LineShortName=='日本'"
src="https://imgfile.oytour.com/static/featureHome2_0.png"/>
<img v-if="FeatureItem.dataObj.LineShortName=='欧洲'"
src="https://imgfile.oytour.com/static/featureHome2_1.png"/>
<img v-if="FeatureItem.dataObj.LineShortName=='中国'"
src="https://imgfile.oytour.com/static/featureHome2_z.png"/>
<img v-if="FeatureItem.dataObj.LineShortName=='南亚'"
src="https://imgfile.oytour.com/static/featureHome2_n.png"/>
<img v-if="FeatureItem.dataObj.LineShortName=='韩国'"
src="https://imgfile.oytour.com/static/featureHome2_h.png"/>
</div>
<div class="featureHome2-logoBoxR">
<div class="featureHome-text-box featureHome2-text-box">
<div class="featureHome-text-box-sod featureHome2-text-box-sod" :style="{'color':TripColor}">
<vEditDiv :canEdit='canEdit' v-model="FeatureItem.dataObj.LtName"></vEditDiv>
</div>
</div>
<div class="featureHome-text-titleTwo featureHome2-text-titleTwo">
<vEditDiv :canEdit='canEdit' v-model="FeatureItem.dataObj.Title"></vEditDiv>
</div>
</div>
</div>
</div>
<div class="featureHome-left UpgradedVersion-Hover">
<div class="featureHome-vToolBar-one featureHome2-vToolBar-one absolute z-index3">
<FeatureControls :index="index" :FeatureData="FeatureItem" :ControlsType="'row'" :isTemplate="false"
:isUploadImg="true" :isSelectImg="true" :isAddImg="false" :isDeleteImg="false" @toUploadImg="UploadImg"
@toSelectImg="SelectImg" @toAddImg="AddImg" @toDeleteImg="DeleteImg" :x="697" :y="930" :isShowSelect="true"
:DataArray="DataArray"></FeatureControls>
<input type="file" style="display:none" :id="'homefile_'+(FeatureItem * 2 + 1) + '_'+index" @change="uploadpic">
</div>
<div class="featureHome-vToolBar-two absolute z-index3">
<FeatureControls :index="index" :FeatureData="FeatureItem" :ControlsType="'column'"
:isDeletePage="FeatureItem.isDeletePage" :pagesType="1" @toAddPages="toAddPages"
@toDeletePages="toDeletePages" @toMovePages="toMovePages">
</FeatureControls>
</div>
<div class="featureHome-left-one featureHome2-left-one bjF6 absolute z-index2"
:id="'viewSpotBox_' + (FeatureItem * 4 + 1) + '_' +index">
<VueDraggableResizable v-if="FeatureItem.dataObj.ImgList&&FeatureItem.dataObj.ImgList.length>0" :w="1123"
:h="749" :ref="'viewSpotVds_' + (FeatureItem * 4 + 1) + '_'+index" tabindex="0" :resizable="false"
:active="false" :parent="false" axis="y" @activated="onActivated(FeatureItem * 4 + 1, index)"
:x="FeatureItem.dataObj.ImgList[0].x" :y="FeatureItem.dataObj.ImgList[0].y" :z="2" @dragstop="onViewSpotDragstop">
<img :src="FeatureItem.dataObj.ImgList[0].url" :id="'viewSpotImg_' + (FeatureItem * 4 + 1) + '_'+index" />
</VueDraggableResizable>
<!-- 蒙层 -->
<div class="featureHome2-form featureHome2-formHover relative z-index3"
:style="{'background':backgroundColor,'left':FeatureItem.dataObj.maskPosition?'756px':'0px'}">
<el-tooltip class="item" effect="dark" :content="FeatureItem.dataObj.maskPosition?'蒙层靠左':'蒙层靠右'" placement="bottom">
<div class="featureHome2-formMask absolute"
@click="FeatureItem.dataObj.maskPosition=!FeatureItem.dataObj.maskPosition">
<i :class="[FeatureItem.dataObj.maskPosition?'el-icon-arrow-left':'el-icon-arrow-right']"></i>
</div>
</el-tooltip>
<div class="row-aic featureHome2-b15">
<!-- 餐食 -->
<div class="featureHome2-Markers0-img">
<img src="https://imgfile.oytour.com/static/featureHome2_2.png"/>
</div>
<div class="featureHome2-left-twoTitle z-index1">
<vEditDiv :canEdit='canEdit' v-model="FeatureItem.dataObj.Meal"></vEditDiv>
</div>
</div>
<div class="featureHome-left-two featureHome2-left-two z-index1">
<vEditDiv :canEdit='canEdit' v-model="FeatureItem.dataObj.MealName"></vEditDiv>
</div>
<div class="featureHome-left-two featureHome2-left-two z-index1">
<vEditDiv :canEdit='canEdit' v-model="FeatureItem.dataObj.MealName2"></vEditDiv>
</div>
<div class="featureHome2-left-twoT24 featureHome2-bottomBorder1"></div>
<!-- 酒店 -->
<div class="featureHome2-left-twoT24">
<div class="row-aic featureHome2-b15">
<div class="featureHome2-Markers0-img">
<img src="https://imgfile.oytour.com/static/featureHome2_2.png"/>
</div>
<div class="featureHome2-left-twoTitle z-index1">
<vEditDiv :canEdit='canEdit' v-model="FeatureItem.dataObj.Host"></vEditDiv>
</div>
</div>
<div class="featureHome-left-two featureHome2-left-two z-index1">
<vEditDiv :canEdit='canEdit' v-model="FeatureItem.dataObj.HostName"></vEditDiv>
</div>
<div class="featureHome-left-two featureHome2-left-two z-index1">
<vEditDiv :canEdit='canEdit' v-model="FeatureItem.dataObj.HostName2"></vEditDiv>
</div>
</div>
<div class="featureHome2-left-twoT24 featureHome2-bottomBorder1"></div>
<!-- 风景 -->
<div class="featureHome2-left-twoT24">
<div class="row-aic featureHome2-b15">
<div class="featureHome2-Markers0-img">
<img src="https://imgfile.oytour.com/static/featureHome2_2.png"/>
</div>
<div class="featureHome2-left-twoTitle z-index1">
<vEditDiv :canEdit='canEdit' v-model="FeatureItem.dataObj.Scene"></vEditDiv>
</div>
</div>
<div class="featureHome-left-two featureHome2-left-two featureHome2-left-twoTitleClamp7 z-index1">
<vEditDiv :canEdit='canEdit' v-model="FeatureItem.dataObj.SceneDesc"></vEditDiv>
</div>
</div>
</div>
</div>
<div class="featureHome2-bottom-form absolute row">
<div class="featureHome2B-vertical row">
<div class="featureHome2B-verticalL">
<vEditDiv :canEdit='canEdit' v-model="FeatureItem.dataObj.SceneTitle2"></vEditDiv>
</div>
<div class="featureHome2B-verticalR">
<vEditDiv :canEdit='canEdit' v-model="FeatureItem.dataObj.SceneDesc2"></vEditDiv>
</div>
</div>
<div class="featureHome2B-vertical featureHome2B-verticalL62 row">
<div class="featureHome2B-verticalL">
<vEditDiv :canEdit='canEdit' v-model="FeatureItem.dataObj.HostTitle"></vEditDiv>
</div>
<div class="featureHome2B-verticalR">
<vEditDiv :canEdit='canEdit' v-model="FeatureItem.dataObj.HostDesc"></vEditDiv>
</div>
</div>
<div class="featureHome2B-cross column">
<div class="featureHome2B-crossOne">
<div class="featureHome2B-crossTitle">
<vEditDiv :canEdit='canEdit' v-model="FeatureItem.dataObj.SceneTitle3"></vEditDiv></div>
<div class="featureHome-left-three featureHome2-left-three z-index2">
<vEditDiv :canEdit='canEdit' v-model="FeatureItem.dataObj.SceneDesc3"></vEditDiv>
</div>
</div>
<div class="featureHome2B-crossTime">
<div class="featureHome2B-crossTimeBOX">
<div class="featureHome2B-crossTimeB">
<img v-if="FeatureItem.dataObj.LineShortName=='日本'" src="https://imgfile.oytour.com/static/featureHome2_3.png"/>
<img v-else src="https://imgfile.oytour.com/static/featureHome2_4.png"/>
</div>
</div>
</div>
</div>
</div>
</div>
<el-dialog custom-class="resourceImgAdd" :title="$t('sm.chooseImg')" center :visible.sync="isShowScenicImg">
<!--imgType:1-酒店,2-餐厅,3-景点,4-票务,5-车辆,6-领队,7-购物店,isCheckmore:是否多选图片-->
<DMCchooseImg @closeImg="closeDMCchooseImg" ref="DMCchooseImg1" @headCallBack="getDMCimg" v-bind:isCheckmore="1"
v-bind:imgType="choseType" v-bind:queryItem="queryItem" v-bind:IsShowAdd="true" v-bind:IsShowVideo="true">
</DMCchooseImg>
</el-dialog>
</div>
</template>
<script>
import vEditDiv from "../TravelTemp/VEditDiv";
import FeatureControls from "./components/featureControls";
import DMCchooseImg from "../../../commonPage/DMCchooseImg.vue";
import VueDraggableResizable from "vue-draggable-resizable";
export default {
components: {
vEditDiv,
FeatureControls,
DMCchooseImg,
VueDraggableResizable
},
props: [
'TripColor',
'index',
'FeatureItem',
'canEdit',
'DataArray'
],
data() {
return {
//选取弹窗
isShowScenicImg: false,
choseType: 0,
//点击传递对象
queryItem: {
queryName: '',
queryId: 0,
},
borderBox: '',
currentIndex: null,
imgIndex: null,
backgroundColor: null,
};
},
methods: {
onActivated(i, j) {
this.currentIndex = i;
this.imgIndex = j;
},
onViewSpotDragstopY(x, y) {
let imgWidth = document.querySelector(
"#viewSpotImg_" + (this.FeatureItem * 2 + 1) + "_" + this.index
).width;
let boxWidth = document.querySelector(
"#viewSpotBox_" + (this.FeatureItem * 2 + 1) + "_" + this.index
).offsetWidth;
let cha = boxWidth - imgWidth;
if (cha <= 0) {
if (x < 0 && x < cha) {
x = cha;
} else if (x > 0) {
x = 0;
}
} else {
if (x < 0) {
x = 0;
} else if (x > 0 && x > cha) {
x = cha;
}
}
this.FeatureItem.dataObj.ImgList[0].x = x;
this.$refs["viewSpotVds_" + (this.FeatureItem * 2 + 1) + "_" + this.index]._data.left = x;
},
onViewSpotDragstop(x, y) {
let imgHeight = document.querySelector(
"#viewSpotImg_" + (this.FeatureItem * 2 + 1) + "_" + this.index
).height;
let boxHeight = document.querySelector(
"#viewSpotBox_" + (this.FeatureItem * 2 + 1) + "_" + this.index
).offsetHeight;
let cha = boxHeight - imgHeight;
if (cha <= 0) {
if (y < 0 && y < cha) {
y = cha;
} else if (y > 0) {
y = 0;
}
} else {
if (y < 0) {
y = 0;
} else if (y > 0 && y > cha) {
y = cha;
}
}
this.FeatureItem.dataObj.ImgList[0].y = y;
this.$refs["viewSpotVds_" + (this.FeatureItem * 2 + 1) + "_" + this.index]._data.top = y;
},
UploadImg() {
document.querySelector(`#homefile_${(this.FeatureItem * 2 + 1)}_${this.index}`).click();
},
uploadpic(e) {
let that = this;
var postJson = {
// ConfigId: 8757,
// MapLevel: 11,
};
that.$message.info('上传中...')
if (e.target.files.length > 0 && e.target.files[0].size > 0) {
// 压缩图片需要的一些元素和对象
var reader = new FileReader();
reader.onload = function (event) {
let blob = that.base64ToBlob(event.target.result);
let newArr = [];
newArr.push(blob);
var fileName = `${that.uuid(10, 10)}.png`;
var path = `/newFeature`;
that.uploadSelfBlob(path, newArr, postJson, x => {
let allPath = that.domainManager().ViittoFileUrl + x.data.FilePath;
let i = e.target.id.split("_")[2];
that.FeatureItem.dataObj.ImgList[0].url = allPath
that.FeatureItem.dataObj.ImgList[0].x = 0
that.FeatureItem.dataObj.ImgList[0].y = 0
that.$message.success('上传成功');
});
};
reader.readAsDataURL(e.target.files[0]);
}
},
SelectImg() {
this.isShowScenicImg = true
},
AddImg() {
},
DeleteImg() {
},
toAddPages() {
this.$emit('toAddPages', this.index, this.FeatureItem)
},
toDeletePages() {
this.$emit('toDeletePages', this.index)
},
toMovePages(opType) {
this.$emit('toMovePages', opType, this.index);
},
closeDMCchooseImg() {
this.isShowScenicImg = false;
},
getDMCimg(selectImgArr) {
this.FeatureItem.dataObj.ImgList[0].url = selectImgArr[0].Path;
this.FeatureItem.dataObj.ImgList[0].x = 0
this.FeatureItem.dataObj.ImgList[0].y = 0
this.isShowScenicImg = false;
}
},
computed: {},
watch: {
TripColor: {
handler(val, oldVal) {
this.borderBox = '2px solid ' + val
this.backgroundColor = this.hexToRgb(val, 0.7)
},
deep: false,
immediate: true
},
},
mounted() {
}
};
</script>
<style scoped>
@import url("../../../../assets/css/UpgradedVersion.css");
/deep/.featureHome-vToolBar-three .el-input .el-input__inner {
height: 28px;
}
.featureHome-text.featureHome2-text{
padding: 95px 62px 0 62px;
overflow: hidden;
}
.featureHome2-logoBox{
display: flex;
}
.featureHome2-logoL{
width: 153px;
height: 153px;
flex-shrink: 0;
background: #fff;
}
.featureHome2-logoL img{
width: 100%;
height: 100%;
}
.featureHome2-logoBoxR{
flex-grow: 1;
overflow: hidden;
margin-left: 37px;
}
.featureHome-text.featureHome2-text .edit_div{
font-size: 34px;
}
.featureHome-text-box.featureHome2-text-box{
margin: 18px 0px 21px 0px;
text-align: left;
}
.featureHome-text-box.featureHome2-text-box .edit_div{
font-size: 54px;
height: auto;
}
.featureHome-text-box-sod.featureHome2-text-box-sod{
padding: 0;
word-spacing: normal;
text-overflow: ellipsis;
overflow: hidden;
}
.featureHome-text-titleTwo.featureHome2-text-titleTwo{
padding: 0;
height: inherit;
}
.featureHome-text-titleTwo.featureHome2-text-titleTwo .edit_div{
font-family: DengXian;
overflow: hidden;
white-space: nowrap;
text-overflow: ellipsis;
}
.featureHome-left-one.featureHome2-left-one{
width: 100%;
height: 749px;
top: 275px;
bottom: inherit;
}
.featureHome-left-one.featureHome2-left-one img{
width: 100%;
}
.featureHome-vToolBar-one.featureHome2-vToolBar-one{
top: 240px;
}
.featureHome2-form{
padding: 58px 28px 52px 28px;
width: 367px;
height: 100%;
}
.featureHome-left-two.featureHome2-left-two{
width: auto;
padding: 0;
}
.featureHome-left-two.featureHome2-left-two .edit_div{
max-height: inherit;
height: inherit;
font-size: 21px;
line-height: 34px;
font-weight: 500;
font-family: PingFang SC !important;
word-break: break-all;
text-overflow: ellipsis;
display: -webkit-box;
-webkit-box-orient: vertical;
-webkit-line-clamp: 1;
overflow: hidden;
}
.featureHome-right-three.featureHome2-right-three{
z-index: 4;
}
.featureHome2-left-twoTitle{
overflow: hidden;
white-space: nowrap;
text-overflow: ellipsis;
flex-grow: 1;
}
.featureHome2-left-twoTitle .edit_div{
width: 100%;
font-size: 28px;
color: #fff;
font-family: FZCuSong-B09S;
font-weight: 400;
overflow: hidden;
white-space: nowrap;
text-overflow: ellipsis;
}
.featureHome2-left-twoT47{
margin-top: 47px;
}
.featureHome2-left-twoT24{
margin-top: 24px;
}
.featureHome2-left-twoT15{
margin-top: 15px;
}
.featureHome2-bottomBorder1{
width: 100%;
height: 1px;
background: #fff;
opacity: 0.5;
}
.featureHome2-left-two.featureHome2-left-twoTitleClamp2 .edit_div{
word-break: break-all;
text-overflow: ellipsis;
display: -webkit-box;
-webkit-box-orient: vertical;
-webkit-line-clamp: 2;
overflow: hidden;
}
.featureHome2-left-two.featureHome2-left-twoTitleClamp4 .edit_div{
word-break: break-all;
text-overflow: ellipsis;
display: -webkit-box;
-webkit-box-orient: vertical;
-webkit-line-clamp: 4;
overflow: hidden;
}
.featureHome2-left-two.featureHome2-left-twoTitleClamp7 .edit_div{
word-break: break-all;
text-overflow: ellipsis;
display: -webkit-box;
-webkit-box-orient: vertical;
-webkit-line-clamp: 7;
overflow: hidden;
}
.featureHome2-left-two.featureHome2-left-twoTitleClamp8 .edit_div{
word-break: break-all;
text-overflow: ellipsis;
display: -webkit-box;
-webkit-box-orient: vertical;
-webkit-line-clamp: 8;
overflow: hidden;
}
.featureHome2-Markers0-img{
flex-shrink: 0;
margin-right: 10px;
}
.featureHome2-Markers0-img img{
width: 20px;
height: 21px;
display: block;
}
.featureHome2-b15{
margin-bottom: 15px;
}
.featureHome2-bottom-form{
width: 100%;
padding: 0 49px 0 94px;
top: 1060px;
}
.featureHome2B-vertical .edit_div{
writing-mode: vertical-rl;
}
.featureHome2B-verticalL .edit_div{
font-size: 36px;
color: #2A2A2A;
font-family: DengXian !important;
font-weight: bold;
}
.featureHome2B-verticalL{
max-width: 100px;
margin-right: 4px;
height: 445px;
overflow: hidden;
text-overflow: ellipsis;
}
.featureHome2B-verticalR{
max-width: 90px;
height: 445px;
overflow: hidden;
text-overflow: ellipsis;
}
.featureHome2B-verticalR .edit_div{
font-size: 23px;
color: #808080;
}
.featureHome2B-verticalL62{
margin-left: 62px;
}
.featureHome2B-cross{
overflow: hidden;
margin-left: 101px;
flex-grow: 1;
display: flex;
flex-direction: column;
}
.featureHome2B-crossOne{
min-height: 360px;
}
.featureHome2B-crossTitle{
width: 100%;
overflow: hidden;
white-space: nowrap;
text-overflow: ellipsis;
position: relative;
padding-top: 20px;
}
.featureHome2B-crossTitle::after{
display: block;
content: ' ';
position: absolute;
top: 0;
background: #2a2a2a;
width: 38px;
height: 7px;
}
.featureHome2B-crossTitle .edit_div{
width: 100%;
overflow: hidden;
white-space: nowrap;
text-overflow: ellipsis;
font-size: 40px;
font-weight: 400px;
color: #2A2A2A;
font-family: FZCuSong-B09S;
}
.featureHome-left-three.featureHome2-left-three{
max-height: inherit;
height: inherit;
margin-top: 10px;
margin-bottom: 10px;
word-break: break-all;
text-overflow: ellipsis;
display: -webkit-box;
-webkit-box-orient: vertical;
-webkit-line-clamp: 7;
overflow: hidden;
}
.featureHome-left-three.featureHome2-left-three .edit_div{
font-size: 23px;
color: #808080;
/* font-family: PingFang SC; */
line-height: 42px;
font-weight: 500;
}
.featureHome2B-crossTime{
display: flex;
justify-content: end;
}
.featureHome2B-crossTime::after{
}
.featureHome2B-crossTimeBOX{
position: relative;
padding-top: 10px;
}
.featureHome2B-crossTimeBOX::after{
display: block;
content: ' ';
position: absolute;
top: 0;
left: 0;
right: 0;
height: 1px;
background: #2a2a2a;
}
.featureHome2B-crossTimeB{
margin-top: 5px;
}
.featureHome2B-crossTimeB img{
width: 388px;
height: auto;
}
.featureHome2-formMask{
right: 0;
top: 0;
padding: 4px 15px;
background: rgba(0, 0, 0, 0.7);
border-radius: 2px;
color: #fff;
opacity: 0;
transition: opacity 2s ease;
font-size: 18px;
}
.featureHome2-formHover:hover .featureHome2-formMask{
opacity: 1;
}
</style>
src/components/newTravelmanager/TravelGroupControl/UpgradedVersion/index.vue
View file @ a8f96287
...@@ -6,11 +6,14 @@ ...@@ -6,11 +6,14 @@
<!-- logo --> <!-- logo -->
<Header :TripColor="TripColor" :canEdit="canEdit" :FeatureItem="item"></Header> <Header :TripColor="TripColor" :canEdit="canEdit" :FeatureItem="item"></Header>
<!-- 首页 --> <!-- 首页 -->
<featureHome2 v-if="item.pageType==7" :canEdit="canEdit" :index="index" :FeatureItem="item" :TripColor="TripColor"
@UploadImg="UploadImg" @toAddPages="AddPages" @toDeletePages="DeletePages" @toMovePages="MovePages"
:DataArray="DataArray"></featureHome2>
<featureHome v-if="item.pageType==1" :canEdit="canEdit" :index="index" :FeatureItem="item" :TripColor="TripColor" <featureHome v-if="item.pageType==1" :canEdit="canEdit" :index="index" :FeatureItem="item" :TripColor="TripColor"
@UploadImg="UploadImg" @toAddPages="AddPages" @toDeletePages="DeletePages" @toMovePages="MovePages" @UploadImg="UploadImg" @toAddPages="AddPages" @toDeletePages="DeletePages" @toMovePages="MovePages"
:DataArray="DataArray"></featureHome> :DataArray="DataArray"></featureHome>
<!-- 其余页 --> <!-- 其余页 -->
<div v-else> <div v-if="item.pageType!=1&&item.pageType!=7">
<headerTitle :FeatureItem="item" :TripColor="TripColor" :canEdit="canEdit"></headerTitle> <headerTitle :FeatureItem="item" :TripColor="TripColor" :canEdit="canEdit"></headerTitle>
<!-- 介绍、宿食景页 --> <!-- 介绍、宿食景页 -->
<otherJourney :index="index" :FeatureItem="item" :canEdit="canEdit" :TripColor="TripColor" <otherJourney :index="index" :FeatureItem="item" :canEdit="canEdit" :TripColor="TripColor"
...@@ -47,6 +50,7 @@ ...@@ -47,6 +50,7 @@
import Header from "./components/header"; import Header from "./components/header";
import headerTitle from "./components/headerTitle"; import headerTitle from "./components/headerTitle";
import featureHome from "./featureHome"; import featureHome from "./featureHome";
import featureHome2 from "./featureHome2";
import otherJourney from "./otherJourney"; import otherJourney from "./otherJourney";
import UpgradedVersionDetails from "./UpgradedVersionDetails"; import UpgradedVersionDetails from "./UpgradedVersionDetails";
import vEditDiv from "../TravelTemp/VEditDiv"; import vEditDiv from "../TravelTemp/VEditDiv";
...@@ -56,6 +60,7 @@ ...@@ -56,6 +60,7 @@
Header, Header,
headerTitle, headerTitle,
featureHome, featureHome,
featureHome2,
otherJourney, otherJourney,
UpgradedVersionDetails, UpgradedVersionDetails,
vEditDiv, vEditDiv,
...@@ -74,6 +79,13 @@ ...@@ -74,6 +79,13 @@
isDeletePage: true, isDeletePage: true,
dataObj: {}, dataObj: {},
}, },
{
pageTitle: '首页2',
pageType: 7,
pageTemplate: 0,
isDeletePage: true,
dataObj: {},
},
{ {
pageTitle: '首页', pageTitle: '首页',
pageType: 2, pageType: 2,
...@@ -108,7 +120,7 @@ ...@@ -108,7 +120,7 @@
isDeletePage: true, isDeletePage: true,
pageTemplate: 3, pageTemplate: 3,
dataObj: {}, dataObj: {},
} },
], ],
homeBg3: "https://imgfile.oytour.com/Static/NewTripFeature/homeBg3.jpg", homeBg3: "https://imgfile.oytour.com/Static/NewTripFeature/homeBg3.jpg",
homeBg1: "https://imgfile.oytour.com/Static/NewTripFeature/homeBg1.jpg", homeBg1: "https://imgfile.oytour.com/Static/NewTripFeature/homeBg1.jpg",
...@@ -175,11 +187,34 @@ ...@@ -175,11 +187,34 @@
pageData.pageTitle = "食"; pageData.pageTitle = "食";
this.getDinnerData(tripObj, newObj); this.getDinnerData(tripObj, newObj);
} }
//景 //景MainDescTextScene
else if (pageData.pageType == 6) { else if (pageData.pageType == 6) {
pageData.pageTitle = "景"; pageData.pageTitle = "景";
this.getScenicData(tripObj, newObj); this.getScenicData(tripObj, newObj);
} }
//首页2
else if (pageData.pageType == 7) {
pageData.pageTitle = "首页2";
pageData.dataObj.ImgList[0].x = 0
if(!newObj.SceneDesc){
newObj.maskPosition = false
newObj.Meal = '餐食'
newObj.MealName = tripObj.dinnerArray.length>0?tripObj.dinnerArray[0].MainName:'餐食名称'
newObj.MealName2 = tripObj.dinnerArray.length>1?tripObj.dinnerArray[1].MainName:'餐食名称'
newObj.Host = '住宿'
newObj.HostName = tripObj.hotelArray.length>0?tripObj.hotelArray[0].MainName:'酒店名称'
newObj.HostName2 = tripObj.hotelArray.length>1?tripObj.hotelArray[1].MainName:'酒店名称'
newObj.Scene = '风景'
newObj.SceneDesc = tripObj.scenicArray.length>0?tripObj.scenicArray[0].MainName+'：'+tripObj.scenicArray[0].MainDesc:'景点描述信息'
newObj.SceneTitle2 = tripObj.scenicArray.length>1?tripObj.scenicArray[1].MainName:'景点名称'
newObj.SceneDesc2 = tripObj.scenicArray.length>1?tripObj.scenicArray[1].MainDesc:'景点描述信息'
newObj.HostTitle = tripObj.hotelArray.length>1?tripObj.hotelArray[1].MainName:'酒店名称'
newObj.HostDesc = tripObj.hotelArray.length>1?tripObj.hotelArray[1].MainDesc:'酒店描述信息'
newObj.SceneTitle3 = tripObj.scenicArray.length>2?tripObj.scenicArray[2].MainName:'景点名称'
newObj.SceneDesc3 = tripObj.scenicArray.length>2?tripObj.scenicArray[2].MainDesc:'景点描述信息'
}
this.getHomeData(tripObj, newObj);
}
pageData.dataObj = newObj; pageData.dataObj = newObj;
this.pageList.splice(index, 0, pageData); this.pageList.splice(index, 0, pageData);
}, },
...@@ -246,10 +281,75 @@ ...@@ -246,10 +281,75 @@
oldJson.forEach(item => { oldJson.forEach(item => {
item.isDeletePage = true; item.isDeletePage = true;
}); });
let PageType = oldJson.find(x=>{
return x.pageType == 7
})
if(!PageType){
let obj = {
...oldJson[0]
}
obj.pageType = 7
oldJson.unshift(JSON.parse(JSON.stringify(obj)))
}
oldJson.forEach(x=>{
if(x.pageType == 7){
x.dataObj.ImgList[0].x = 0
if(!x.dataObj.SceneDesc) {
x.dataObj.maskPosition= false
x.dataObj.Meal = '餐食'
x.dataObj.MealName = tripObj.dinnerArray.length>0?tripObj.dinnerArray[0].MainName:'餐食名称'
x.dataObj.MealName2 = tripObj.dinnerArray.length>1?tripObj.dinnerArray[1].MainName:'餐食名称'
x.dataObj.Host = '住宿'
x.dataObj.HostName = tripObj.hotelArray.length>0?tripObj.hotelArray[0].MainName:'酒店名称'
x.dataObj.HostName2 = tripObj.hotelArray.length>1?tripObj.hotelArray[1].MainName:'酒店名称'
x.dataObj.Scene = '风景'
x.dataObj.SceneDesc = tripObj.scenicArray.length>0?tripObj.scenicArray[0].MainName+'：'+tripObj.scenicArray[0].MainDesc:'景点描述信息'
x.dataObj.SceneTitle2 = tripObj.scenicArray.length>1?tripObj.scenicArray[1].MainName:'景点名称'
x.dataObj.SceneDesc2 = tripObj.scenicArray.length>1?tripObj.scenicArray[1].MainDesc:'景点描述信息'
x.dataObj.HostTitle = tripObj.hotelArray.length>1?tripObj.hotelArray[1].MainName:'酒店名称'
x.dataObj.HostDesc = tripObj.hotelArray.length>1?tripObj.hotelArray[1].MainDesc:'酒店描述信息'
x.dataObj.SceneTitle3 = tripObj.scenicArray.length>2?tripObj.scenicArray[2].MainName:'景点名称'
x.dataObj.SceneDesc3 = tripObj.scenicArray.length>2?tripObj.scenicArray[2].MainDesc:'景点描述信息'
}
}
})
this.pageList = oldJson; this.pageList = oldJson;
console.log(this.pageList,'====6666')
this.RenderingOk = true; this.RenderingOk = true;
} else { } else {
let PageType = this.pageList.find(x=>{
return x.pageType == 7
})
if(!PageType){
let obj = {
...this.pageList[0]
}
obj.pageType = 7
this.pageList.unshift(JSON.parse(JSON.stringify(obj)))
}
this.pageList.forEach(x=>{
if(x.pageType == 7){
x.dataObj.ImgList[0].x = 0
if(!x.dataObj.SceneDesc) {
x.dataObj.maskPosition= false
x.dataObj.Meal = '餐食'
x.dataObj.MealName = tripObj.dinnerArray.length>0?tripObj.dinnerArray[0].MainName:'餐食名称'
x.dataObj.MealName2 = tripObj.dinnerArray.length>1?tripObj.dinnerArray[1].MainName:'餐食名称'
x.dataObj.Host = '住宿'
x.dataObj.HostName = tripObj.hotelArray.length>0?tripObj.hotelArray[0].MainName:'酒店名称'
x.dataObj.HostName2 = tripObj.hotelArray.length>1?tripObj.hotelArray[1].MainName:'酒店名称'
x.dataObj.Scene = '风景'
x.dataObj.SceneDesc = tripObj.scenicArray.length>0?tripObj.scenicArray[0].MainName+'：'+tripObj.scenicArray[0].MainDesc:'景点描述信息'
x.dataObj.SceneTitle2 = tripObj.scenicArray.length>1?tripObj.scenicArray[1].MainName:'景点名称'
x.dataObj.SceneDesc2 = tripObj.scenicArray.length>1?tripObj.scenicArray[1].MainDesc:'景点描述信息'
x.dataObj.HostTitle = tripObj.hotelArray.length>1?tripObj.hotelArray[1].MainName:'酒店名称'
x.dataObj.HostDesc = tripObj.hotelArray.length>1?tripObj.hotelArray[1].MainDesc:'酒店描述信息'
x.dataObj.SceneTitle3 = tripObj.scenicArray.length>2?tripObj.scenicArray[2].MainName:'景点名称'
x.dataObj.SceneDesc3 = tripObj.scenicArray.length>2?tripObj.scenicArray[2].MainDesc:'景点描述信息'
}
}
})
this.pageList.forEach(pItem => { this.pageList.forEach(pItem => {
var newObj = this.getDetailsObj(); var newObj = this.getDetailsObj();
...@@ -280,6 +380,28 @@ ...@@ -280,6 +380,28 @@
else if (pItem.pageType == 6) { else if (pItem.pageType == 6) {
this.getScenicData(tripObj, newObj); this.getScenicData(tripObj, newObj);
} }
//首页2
else if (pItem.pageType == 7) {
newObj.ImgList[0].x = 0
if(!newObj.SceneDesc){
newObj.maskPosition = false
newObj.Meal = '餐食'
newObj.MealName = tripObj.dinnerArray.length>0?tripObj.dinnerArray[0].MainName:'餐食名称'
newObj.MealName2 = tripObj.dinnerArray.length>1?tripObj.dinnerArray[1].MainName:'餐食名称'
newObj.Host = '住宿'
newObj.HostName = tripObj.hotelArray.length>0?tripObj.hotelArray[0].MainName:'酒店名称'
newObj.HostName2 = tripObj.hotelArray.length>1?tripObj.hotelArray[1].MainName:'酒店名称'
newObj.Scene = '风景'
newObj.SceneDesc = tripObj.scenicArray.length>0?tripObj.scenicArray[0].MainName+'：'+tripObj.scenicArray[0].MainDesc:'景点描述信息'
newObj.SceneTitle2 = tripObj.scenicArray.length>1?tripObj.scenicArray[1].MainName:'景点名称'
newObj.SceneDesc2 = tripObj.scenicArray.length>1?tripObj.scenicArray[1].MainDesc:'景点描述信息'
newObj.HostTitle = tripObj.hotelArray.length>1?tripObj.hotelArray[1].MainName:'酒店名称'
newObj.HostDesc = tripObj.hotelArray.length>1?tripObj.hotelArray[1].MainDesc:'酒店描述信息'
newObj.SceneTitle3 = tripObj.scenicArray.length>2?tripObj.scenicArray[2].MainName:'景点名称'
newObj.SceneDesc3 = tripObj.scenicArray.length>2?tripObj.scenicArray[2].MainDesc:'景点描述信息'
}
this.getHomeData(tripObj, newObj);
}
pItem.dataObj = newObj; pItem.dataObj = newObj;
}); });
this.RenderingOk = true; this.RenderingOk = true;
...@@ -778,7 +900,6 @@ ...@@ -778,7 +900,6 @@
watch: { watch: {
FeatureData: { FeatureData: {
handler(val, oldVal) { handler(val, oldVal) {
}, },
deep: true, deep: true,
immediate: true immediate: true
......
src/plug/index.js
View file @ a8f96287
...@@ -123,7 +123,7 @@ export default { ...@@ -123,7 +123,7 @@ export default {
let ocrUrl = "http://192.168.10.68:8888"; let ocrUrl = "http://192.168.10.68:8888";
// domainUrl = "http://192.168.10.238:8083"; // 刘东电脑 // domainUrl = "http://192.168.10.238:8083"; // 刘东电脑
// domainUrl = "http://192.168.10.226"; //春姐 // domainUrl = "http://192.168.10.226"; //春姐
domainUrl = "http://192.168.10.68"; //奎哥 domainUrl = "http://192.168.10.160"; //奎哥
let crmLocalFileStreamDownLoadUrl = ""; let crmLocalFileStreamDownLoadUrl = "";
crmLocalFileStreamDownLoadUrl = locationName.indexOf('oytour') !== -1 ? "http://crm.oytour.com" : "http://testcrm.oytour.com"; crmLocalFileStreamDownLoadUrl = locationName.indexOf('oytour') !== -1 ? "http://crm.oytour.com" : "http://testcrm.oytour.com";
...@@ -1138,7 +1138,6 @@ export default { ...@@ -1138,7 +1138,6 @@ export default {
}; };
try { try {
let url = oss.signatureUrl(objectKey); let url = oss.signatureUrl(objectKey);
console.log("url", url);
let getBlob = new Promise(resolve => { let getBlob = new Promise(resolve => {
const xhr = new XMLHttpRequest(); const xhr = new XMLHttpRequest();
xhr.open('GET', url, true); xhr.open('GET', url, true);
...@@ -1156,9 +1155,17 @@ export default { ...@@ -1156,9 +1155,17 @@ export default {
xhr.send(); xhr.send();
}); });
getBlob.then(blob => { getBlob.then(blob => {
if (window.navigator.msSaveOrOpenBlob) { if (window.navigator.msSaveOrOpenBlob) {
navigator.msSaveBlob(blob, filename); navigator.msSaveBlob(blob, filename);
} else { resultJson.resultCode = 1;
if (callBack) {
callBack(resultJson)
}
} else {
resultJson.resultCode = 1;
if (callBack) {
callBack(resultJson)
}
const link = document.createElement('a'); const link = document.createElement('a');
const body = document.querySelector('body'); const body = document.querySelector('body');
link.href = window.URL.createObjectURL(blob); link.href = window.URL.createObjectURL(blob);
...@@ -1168,10 +1175,6 @@ export default { ...@@ -1168,10 +1175,6 @@ export default {
link.click(); link.click();
body.removeChild(link); body.removeChild(link);
window.URL.revokeObjectURL(link.href); window.URL.revokeObjectURL(link.href);
resultJson.resultCode = 1;
if (callBack) {
callBack(resultJson)
}
} }
}); });
} catch (err) { } catch (err) {
......
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