Skip to content

S
SuperMan
Commit 864c1c5e authored by 华国豪's avatar 华国豪 🙄
Browse files
Options

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

parents b0f671c8 5caf91e7
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 1582 additions and 185 deletions
src/components/Contract/ElectronicContract.vue
View file @ 864c1c5e
......@@ -1209,11 +1209,13 @@
// 生成二维码
GetQrCode: function () {
let urlObj = this.domainManager();
let msg = {
TCID: this.$route.query.TCID,
orderID: this.$route.query.orderID,
pUrl: "clientConfirm",
};
console.log("urlObj",urlObj)
this.$http({
headers: {
'Content-Type': 'application/json'
......
src/components/SalesModule/CustomerCertification.vue
View file @ 864c1c5e
<template>
<div class="CertificationDetail">
<div>
<viewer :options="imageOptions" @inited="inited" class="viewer" :images="images">
<img v-for="item in images" :src="item"/>
</viewer>
<div>
<div
:class="{salesApprovalLayercontentDiv:showlayer,rightZero:isTransition}"
class="ownScrollbarStyle"
......@@ -12,9 +15,13 @@
<div class="item" v-for="item in answerDetailList" style="margin:0">
<div class="topMsg">
<!-- <img v-if="!item.photo" src="../../assets/img/litheader.png">
<img v-if="item.photo" :onerror="defaultImg" :src="item.photo"> -->
<p>{{item.CustomerName}}
<span v-if="item.ApplyState === 0" class="_status_str _status_str_y">审核中</span>
<img v-if="item.photo" :onerror="defaultImg" :src="item.photo">-->
<p>
{{item.CustomerName}}
<span
v-if="item.ApplyState === 0"
class="_status_str _status_str_y"
>审核中</span>
<span v-if="item.ApplyState === 1" class="_status_str _status_str_g">已通过</span>
<span v-if="item.ApplyState === 2" class="_status_str _status_str_r">已拒绝</span>
</p>
......@@ -27,19 +34,19 @@
>{{item.ContactPhone}}</span>
</p>
<p class="fz12 color999 mt5">{{item.Addres}}</p>
</div>
<p class="fz16 color666">
<i class="iconfont icon-ico-renwuyaoqiu fz14 color999"></i>&nbsp;认证信息
</p>
<div class="salesApprovalLayercontentBtn">
<p class="fz12 color999 mt5">认证方式：{{item.ApplyType==1?"三证合一":"身份证+名片"}}</p>
<p class="fz12 color999 mt5">申请时间：{{item.CreateDateStr}}</p>
<div v-if="item.CertificationPics&&item.CertificationPics.length>0" class="mt10">
<div v-for="picItem in item.CertificationPics" class="img_box">
<img v-if="!picItem" src="../../assets/img/litheader.png">
<img v-if="picItem" :src="picItem"></div>
</div>
<p class="fz12 color999 mt5">认证方式：{{item.ApplyType==1?"三证合一":"身份证+名片"}}</p>
<p class="fz12 color999 mt5">申请时间：{{item.CreateDateStr}}</p>
<div v-if="item.CertificationPics&&item.CertificationPics.length>0" class="mt10">
<div v-for="picItem in item.CertificationPics" class="img_box">
<img v-if="!picItem" src="../../assets/img/litheader.png" />
<img @click="imgPrev(picItem)" v-if="picItem" :src="picItem" />
</div>
</div>
<div>
<span class="fz14 color333">审批意见</span>
</div>
......@@ -47,9 +54,21 @@
<el-input v-if="item.ApplyState === 0" type="textarea" v-model="Reason"></el-input>
<span v-else>Reason</span>
</p>
<input type="button" class="hollowFixedBtn mt20 fr" value="取消" @click="closeLayer">
<input type="button" class="normalBtn mt20 fr" v-if="item.ApplyState === 0" value="通过" @click="saveIdea(item,1)">
<input type="button" class="normalBtn mt20 fr" v-if="item.ApplyState === 0" value="拒绝" @click="saveIdea(item,2)">
<input type="button" class="hollowFixedBtn mt20 fr" value="取消" @click="closeLayer" />
<input
type="button"
class="normalBtn mt20 fr"
v-if="item.ApplyState === 0"
value="通过"
@click="saveIdea(item,1)"
/>
<input
type="button"
class="normalBtn mt20 fr"
v-if="item.ApplyState === 0"
value="拒绝"
@click="saveIdea(item,2)"
/>
</div>
</div>
</div>
......@@ -83,17 +102,18 @@
</li>
<li>
<span>
<em>{{$t('system.query_company')}}</em>
<el-select filterable v-model='msg.RB_Branch_Id' >
<el-option :value="-2" :label="$t('pub.unlimitedSel')"></el-option>
<el-option v-for='item in CompanyList'
:label='item.BName'
:value='item.Id'
:key='item.Id'>
</el-option>
</el-select>
<em>{{$t('system.query_company')}}</em>
<el-select filterable v-model="msg.RB_Branch_Id">
<el-option :value="-2" :label="$t('pub.unlimitedSel')"></el-option>
<el-option
v-for="item in CompanyList"
:label="item.BName"
:value="item.Id"
:key="item.Id"
></el-option>
</el-select>
</span>
</li>
</li>
<li>
<span>
<em>状态</em>
......@@ -111,7 +131,7 @@
class="hollowFixedBtn"
value="查询"
@click="resetPageIndex(),getList()"
>
/>
</li>
</ul>
</div>
......@@ -156,7 +176,7 @@
class="normalBtn"
style="margin-left: 0;"
@click="getDetail(item)"
>
/>
</td>
</tr>
</table>
......@@ -175,6 +195,11 @@
export default {
data() {
return {
imageOptions: {
navbar: false,
title: false
},
images: [''],
layerShow: false,
msg: {
pageIndex: 1,
......@@ -182,9 +207,10 @@ export default {
SDate: "",
EDate: "",
ApplyState: "-1",
RB_Branch_Id: -2,
},
Reason:"",
RB_Branch_Id: -2
},
viewerObj: null,
Reason: "",
showlayer: false,
loading: false,
isTransition: false,
......@@ -193,20 +219,37 @@ export default {
answerDetailList: [],
list: [],
CompanyList: [],
getCompanyMsg:{ // 公司
RB_Group_Id:'0',
Status:'0',
},
getCompanyMsg: {
// 公司
RB_Group_Id: "0",
Status: "0"
}
};
},
methods: {
getCompanyList(){ //获取公司列表
this.apipost('admin_get_BranchGetList',this.getCompanyMsg,res=>{
if(res.data.resultCode==1){
this.CompanyList=res.data.data;
}else{}
},err=>{})
inited(viewer) {
this.viewerObj = viewer;
},
imgPrev(url) {
this.$set(this.images, 0, url);
setTimeout(() => {
this.viewerObj.show();
}, 1000);
},
getCompanyList() {
//获取公司列表
this.apipost(
"admin_get_BranchGetList",
this.getCompanyMsg,
res => {
if (res.data.resultCode == 1) {
this.CompanyList = res.data.data;
} else {
}
},
err => {}
);
},
// 结束日期不能大于开始日期
dataDui() {
if (this.msg.SDate > this.msg.EDate && this.msg.EDate !== "") {
......@@ -220,12 +263,12 @@ export default {
_this.showlayer = false;
}, 300);
this.isTransition = false;
this.Reason= "";
this.Reason = "";
},
saveIdea(obj,applyState) {
console.log(obj,"sdsdsd");
obj.applyState=applyState;
obj.Reason=this.Reason;
saveIdea(obj, applyState) {
console.log(obj, "sdsdsd");
obj.applyState = applyState;
obj.Reason = this.Reason;
this.apipost(
"app_customer_UpdateCertification",
obj,
......@@ -265,7 +308,7 @@ export default {
_this.showlayer = false;
}, 300);
this.isTransition = false;
this.Reason=''
this.Reason = "";
},
getDetail(obj) {
this.showlayer = true;
......@@ -275,8 +318,8 @@ export default {
{ ID: obj.ID },
res => {
if (res.data.resultCode == 1) {
this.answerDetailList = res.data.data;
this.Reason = this.answerDetailList[0].Reason;
this.answerDetailList = res.data.data;
this.Reason = this.answerDetailList[0].Reason;
} else {
this.$message.error(res.data.message);
}
......@@ -294,10 +337,10 @@ export default {
}
},
mounted() {
let userInfo=this.getLocalStorage();
this.getCompanyMsg.RB_Group_Id= userInfo.RB_Group_id; //集团ID
let userInfo = this.getLocalStorage();
this.getCompanyMsg.RB_Group_Id = userInfo.RB_Group_id; //集团ID
this.getList();
this.getCompanyList()
this.getCompanyList();
}
};
</script>
......@@ -409,28 +452,28 @@ export default {
right: 0;
background-color: white;
transition: all linear 0.5s;
height: 100%;
overflow: hidden;
height: 100%;
overflow: hidden;
}
.salesApprovalLayercontentDiv {
width: 450px !important;
}
.salesApprovalLayercontentBtn .img_box img{
.salesApprovalLayercontentBtn .img_box img {
height: 120px;
}
._status_str{
._status_str {
float: right;
}
._status_str_y{
color: #E6A23C;
._status_str_y {
color: #e6a23c;
}
._status_str_g{
color: #67C23A;
._status_str_g {
color: #67c23a;
}
._status_str_r{
color: #F56C6C;
._status_str_r {
color: #f56c6c;
}
td ._status_str{
float: initial
td ._status_str {
float: initial;
}
</style>
\ No newline at end of file
src/components/SignName.vue 0 → 100644
View file @ 864c1c5e
<style scoped>
.SignName .CanvasDiv{
width: 100%;
height: calc(100% - 100px);
padding-top: 5%;
}
.SignName .CanvasDiv #canvas{
width: 100%;
height: 100%;
}
.SignName .dash{
padding: 10px;
box-sizing: border-box;
border: 1px dashed #ccc;
width: 95%;
height: 95%;
margin:0 auto;
}
.SignName .bg{
display: inline-block;
width: 25px;
height: 25px;
}
.SignName .bg1{
background-image: url('../assets/img/dzht/bg1.png');
background-size: 132px;
background-position: -1px -2px;
}
.SignName .bg2{
background-image: url('../assets/img/dzht/bg1.png');
background-size: 132px;
background-position: 28px -2px;
}
.SignName .bottom .el-col>div{
display: inline-flex;
align-items: center;
justify-content: center;
}
.SignName .signTc{
position: fixed;
top: 0;
left: 0;
width: 100%;
height: 100%;
background: rgba(0, 0, 0, 0.5);
z-index: 200;
text-align: center;
}
.SignName .signTc .closeTc{
position: relative;
display: inline-block;
width: 60%;
height: 70px;
line-height: 70px;
color: #fff;
border: 1px solid #fff;
margin: 0 auto;
top: 50%;
font-size: 2rem;
}
</style>
<template>
<div class="SignName">
<div class="signTc" v-show="tcStatus">
<span @click="tcStatus=false;" class="closeTc">去签字</span>
</div>
<div class="CliSignDiv" style="height:100%;background:#fff;z-index:100">
<div class="CanvasDiv">
<div class="dash">
<div id="canvas" style="position:relative;top:0;">
</div>
</div>
</div>
<div class="bottom" style="text-align:center;height:80px;line-height:80px">
<el-row>
<el-col :span="12">
<div style="width:100%;" @click="handelClearEl()">
<span class="bg bg1"></span>
<span style="font-size:2rem">重置签名</span>
</div>
</el-col>
<el-col :span="12">
<div style="width:100%;" @click="handelSaveEl()">
<span class="bg bg2"></span>
<span style="font-size:2rem">完成签名</span>
</div>
</el-col>
</el-row>
<!-- <input type="button" @click="handelClearEl()" class="CV_Btn" value="清除" />
<input type="button" @click="handelSaveEl()" class="CV_Btn" value="保存" /> -->
</div>
</div>
</div>
</template>
<script>
let canvas = document.createElement("canvas");
let cxt = canvas.getContext("2d");
export default {
data (){
return{
tcStatus:false,
linewidth: 3, //线条粗细，选填
color: "black", //线条颜色，选填
background: "#fff", //线条背景，选填
SignInfo:{},
msg:{
TCID:0,
orderID:0
},
}
},
created(){
this.SignInfo = JSON.parse(sessionStorage.getItem("SignInfo"));
console.log("this.SignInfo",this.SignInfo)
},
mounted(){
this.msg.TCID = this.$route.query.TCID;
this.msg.orderID = this.$route.query.orderID;
this.getCanvas();
},
methods:{
getCanvas() {
let el = document.getElementById("canvas");
el.appendChild(canvas);
canvas.width = el.clientWidth;
canvas.height = el.clientHeight;
cxt.fillStyle = this.background; //填充绘图的背景颜色
cxt.fillRect(0, 0, canvas.width, canvas.height); //绘制“已填色”的矩形
cxt.strokeStyle = this.color; //笔触的颜色
cxt.lineCap = "round"; //线条末端线帽的样式
let linewidth = this.linewidth;
//开始绘制
canvas.addEventListener(
"touchstart",
function(e) {
cxt.beginPath();
cxt.lineWidth = linewidth; //当前线条的宽度，以像素计
cxt.moveTo(e.changedTouches[0].pageX, e.changedTouches[0].pageY);
}.bind(this),
false
);
//绘制中
canvas.addEventListener(
"touchmove",
function(e) {
cxt.lineTo(e.changedTouches[0].pageX, e.changedTouches[0].pageY);
cxt.stroke();
}.bind(this),
false
);
//结束绘制
canvas.addEventListener(
"touchend",
function() {
cxt.closePath();
}.bind(this),
false
);
},
handelClearEl() {
cxt.clearRect(0, 0, canvas.width, canvas.height);
},
handelSaveEl() {
let imgBase64 = canvas.toDataURL();
this.SignInfo.companySignature = imgBase64;
this.SaveMsg();
},
//提交数据
SaveMsg(){
this.apiJavaPost("/api/contract/dosaveOrUpdate",this.SignInfo,res => {
console.log("233",res);
if (res.data.resultCode === 1) {
this.Success(res.data.message);
this.$router.push({ name: "clientConfirm",query: {TCID: this.msg.TCID,orderID: this.msg.orderID,str:1}})
} else {
this.Error(res.data.message);
}
},null);
},
}
}
</script>
\ No newline at end of file
src/components/TravelContractDetail.vue
View file @ 864c1c5e
......@@ -5,7 +5,6 @@
padding-top: 10px;
font: normal 13px 'Microsoft Yahei';
color:#555;
height:auto!important;
}
.TD_MainContent .container-fluid{
padding:0 20px;
......@@ -23,7 +22,7 @@
border-bottom: 1px solid #cdcdcd;
background-color: #efefef;
}
.blockTitle span.icon{
.TD_MainContent .blockTitle span.icon{
border-right: 1px solid #CDCDCD;
position: absolute;
left: 10px;
......@@ -31,7 +30,7 @@
padding-right: 10px;
padding-top: 8px;
}
.blockTitle h2 {
.TD_MainContent .blockTitle h2 {
font-size: 15px;
min-height: 40px;
margin: 0;
......@@ -41,7 +40,7 @@
padding-left: 48px;
line-height: 40px;
}
.blockTitle h2 span{
.TD_MainContent .blockTitle h2 span{
position: absolute;
right:10px;
top:0;
......@@ -134,15 +133,7 @@
.TD_MainContent h1,.TD_MainContent h2,.TD_MainContent h3{
line-height: 40px!important;
}
/* .TD_MainContent .contract h1,.TD_MainContent .contract h2,..TD_MainContent .contract h3,..TD_MainContent .contract h4,..TD_MainContent .contract h5,..TD_MainContent .contract h6 {
margin: 10px 0;
font-family: inherit;
font-weight: bold;
line-height: 20px;
color: inherit;
text-rendering: optimizelegibility;
} */
.checkedNav{
.TD_MainContent .checkedNav{
display: block!important;
}
.TD_MainContent .SignTable {
......@@ -197,27 +188,24 @@
margin: 20px 30px 30px 30px;
display: none;
}
.ZTable {
.TD_MainContent .ZTable {
width: 100%;
border: none;
table-layout: fixed;
border-collapse: collapse;
border-spacing: 0;
}
.ZTable>tbody>tr>td {
.TD_MainContent .ZTable>tbody>tr>td {
word-break: break-word;
border: solid #ddd 1px;
padding: 8px;
line-height: 25px;
}
.convention h1 {
/* font-size: 24px; */
}
.text_center{
.TD_MainContent .text_center{
text-align: center;
}
.TD_MainContent .page_break_avoid p{
padding-bottom:10px;
padding-bottom:15px;
}
.TDteam_Table{
width: 900px;
......@@ -570,7 +558,7 @@
</td>
<td>
<span>{{dataList.company}}</span>
<img class="esealDiv" src="" alt="">
<img class="esealDiv" src='../assets/img/dzht/zhang.png' alt=""/>
</td>
</tr>
<tr>
......@@ -752,7 +740,7 @@
</div>
<!-- 自愿购物 -->
<div class="shoppings" :class="{'checkedNav':cked==6}">
<table class="ZTable">
<table class="ZTable" v-if="dataList.shopProtocolList&&dataList.shopProtocolList.length>0">
<tbody>
<tr>
<td width="5%">序号</td>
......@@ -779,7 +767,7 @@
</div>
<!-- 自愿补充协议 -->
<div class="activitys" :class="{'checkedNav':cked==7}">
<table class="ZTable">
<table class="ZTable" v-if="dataList.payProtocolList&&dataList.payProtocolList.length>0">
<tbody>
<tr>
<td width="5%">序号</td>
......@@ -807,7 +795,7 @@
<!-- 文明旅游公约 -->
<div class="TD-convention" :class="{'checkedNav':cked==8}">
<div class="page_break_avoid">
<h1 class="text_center" style="font-size:30px;color:#555;">中国公民出境旅游文明行为指南</h1>
<h1 class="text_center" style="font-size:30px;color:#555;margin:30px 0;">中国公民出境旅游文明行为指南</h1>
<p class="text_center">中国公民， 出境旅游， 注重礼仪， 保持尊严。</p>
<p class="text_center">讲究卫生， 爱护环境； 衣着得体， 请勿喧哗。</p>
<p class="text_center">尊老爱幼， 助人为乐； 女士优先， 礼貌谦让。</p>
......@@ -1370,7 +1358,6 @@
}
}
this.trifficList.forEach((x,index)=>{
console.log(x.airportPickUp==1||x.airportPickUp==2,'ssssss');
if(x.airportPickUp==1||x.airportPickUp==2){
if(x.isUseBus==1){
this.tripList[index].TrifficType='飞机+车'
......
src/components/TravelContractNew.vue
View file @ 864c1c5e
......@@ -11,14 +11,14 @@
color:#555;
height:auto!important;
}
.fixedMenu {
.TC-MainContent .fixedMenu {
position: fixed;
left: 20px;
top: 75px;
margin: 0;
padding-top: 10px;
}
.fixedMenu li {
.TC-MainContent .fixedMenu li {
padding: 5px 15px;
position: relative;
border-right: 2px solid #e2e2e2;
......@@ -26,7 +26,7 @@
list-style: none;
font-size:13px;
}
.fixedMenu li:after {
.TC-MainContent .fixedMenu li:after {
content: '';
display: block;
width: 0;
......@@ -37,7 +37,7 @@
right: -12px;
top: 11px;
}
.contractTit {
.TC-MainContent .contractTit {
position: fixed;
left: 0;
top:0;
......@@ -50,29 +50,29 @@
font-size: 18px;
color: #555;
}
.contractTit span{
.TC-MainContent .contractTit span{
font-size: 21px;
font-weight: bold;
}
.block {
.TC-MainContent .block {
border: 1px solid #cdcdcd;
background: #f9f9f9;
position: relative;
margin-bottom: 20px;
}
.container-fluid {
.TC-MainContent .container-fluid {
padding-right: 20px;
padding-left: 20px;
*zoom: 1;
}
.mtop15{
.TC-MainContent .mtop15{
margin-top:15px;
}
.blockTitle {
.TC-MainContent .blockTitle {
border-bottom: 1px solid #cdcdcd;
background-color: #efefef;
}
.blockTitle span.icon {
.TC-MainContent .blockTitle span.icon {
border-right: 1px solid #CDCDCD;
position: absolute;
left: 10px;
......@@ -80,7 +80,7 @@
padding-right: 10px;
padding-top: 8px;
}
.blockTitle h2 {
.TC-MainContent .blockTitle h2 {
font-size: 15px;
min-height: 40px;
margin: 0;
......@@ -90,7 +90,7 @@
padding-left: 48px;
line-height: 40px;
}
.blockTitle h2 {
.TC-MainContent .blockTitle h2 {
font-size: 15px;
min-height: 40px;
margin: 0;
......@@ -99,16 +99,16 @@
padding-right: 15px;
padding-left: 48px;
}
.block em {
.TC-MainContent .block em {
font-style: normal;
}
div.createTableTitle {
.TC-MainContent .createTableTitle {
padding: 10px 0;
margin: 5px 30px 0;
border-bottom: 1px dashed #ccc;
font: normal 15px 'microsoft yahei';
}
.createTable{
.TC-MainContent .createTable{
background-color: #f9f9f9;
width:100%;
}
......@@ -127,7 +127,7 @@
.TC-MainContent .singeRowTable tr:nth-child(2n+1){background:#fafafa; }
.TC-MainContent .singeRowTable tr:hover{background: #f2f2f2;}
.TC-MainContent .singeRowTable tr td{font-size: 12px;border: 1px solid #E5E5E5;}
.TC_NewAddBtn{
.TC-MainContent .TC_NewAddBtn{
background-color: #006dcc;
width:83px;
height:26px;
......@@ -139,21 +139,21 @@
.TC-MainContent .singeRowTable .el-button.is-circle{
padding:5px;
}
.TcNewTable td{
.TC-MainContent .TcNewTable td{
padding:5px;
}
.fixedMenu li.active {
.TC-MainContent .fixedMenu li.active {
background: #90b7ec;
color: #fff;
border-right-color: #5882bb;
}
.fixedMenu li.active:after {
.TC-MainContent .fixedMenu li.active:after {
border-left-color: #5882bb;
}
.pull-right{
.TC-MainContent .pull-right{
float:right;
}
.TCbtn-info {
.TC-MainContent .TCbtn-info {
color: #ffffff;
text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
background-color: #49afcd;
......@@ -172,7 +172,7 @@
outline: none;
cursor: pointer;
}
.btn-warning{
.TC-MainContent .btn-warning{
color: #ffffff;
text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
background-color: #faa732;
......@@ -823,7 +823,7 @@
<tr>
<td>
<el-form-item label="投诉电话">
<el-input type="text" class="w210" v-model="CtObj.companyComplainCall"></el-input>
<el-input type="text" class="w300" v-model="CtObj.companyComplainCall"></el-input>
</el-form-item>
</td>
</tr>
......@@ -1265,7 +1265,6 @@
singleRemark:'',
nobedRemark:'',
aloneRemark:'',
healthRemark:'',
tcid:0,
orderId:0,
tCNum:'',
......@@ -1304,7 +1303,6 @@
terminateOpinion:[{ required: true, validator: validateterminateOpinion, trigger: "change" }],
carpoolOpinion:[{ required: true, validator: validatecarpoolOpinion, trigger: "change" }],
settleDisputeMode:[{ required: true, validator: validatesettleDisputeMode, trigger: "change" }],
healthRemark:[{ required: true, message: "请填写参团旅客健康情况说明", trigger: "blur" }]
},
//自愿购物活动补充协议
VoluntaryArr:[],
......@@ -1319,7 +1317,7 @@
//跳转锚点
goAnchor(selector) {
var anchor = this.$el.querySelector(selector)
document.documentElement.scrollTop = anchor.offsetTop-80
document.documentElement.scrollTop = anchor.offsetTop-70
},
getList(){
this.apiJavaPost("/api/contract/getContractInfo",this.msg,res => {
......@@ -1595,7 +1593,7 @@
//滚动条滚动选中tab
menu() {
var _self = this;
_self.scroll = document.documentElement.scrollTop || document.body.scrollTop;
_self.scroll = (document.documentElement.scrollTop || document.body.scrollTop)+70;
//滑动到指定位置相应菜单高亮
var a_0 = $("#anchor-0").offset().top;
var a_1 = $("#anchor-1").offset().top;
......@@ -1607,17 +1605,17 @@
var a_7 = $("#anchor-7").offset().top;
if (_self.scroll < a_0) {
this.ckedIndex = 0
} else if (_self.scroll < a_1) {
} else if (_self.scroll>a_0 && _self.scroll < a_1) {
this.ckedIndex = 1
} else if (_self.scroll > a_2) {
} else if (_self.scroll > a_2 && _self.scroll<a_3) {
this.ckedIndex = 2
}else if (_self.scroll > a_3) {
}else if (_self.scroll > a_3 && _self.scroll<a_4) {
this.ckedIndex = 3
}else if (_self.scroll > a_4) {
}else if (_self.scroll > a_4 && _self.scroll<a_5) {
this.ckedIndex = 4
}else if (_self.scroll > a_5) {
}else if (_self.scroll > a_5 && _self.scroll<a_6) {
this.ckedIndex = 5
}else if (_self.scroll > a_6) {
}else if (_self.scroll > a_6 && _self.scroll<a_7) {
this.ckedIndex = 6
}else if (_self.scroll > a_7) {
this.ckedIndex = 7
......
src/components/TravelManager/TravelList/RegistrationList.vue
View file @ 864c1c5e
......@@ -938,7 +938,7 @@
color: blue;
display: block;
cursor: pointer;
width: 60px;
width: 200px;
}
.RegistrationList .leftSetInfo,.RegistrationList .GO_TPright{
float:left;
......
src/components/clientConfirm.vue
View file @ 864c1c5e
This diff is collapsed.
src/router/config.js
View file @ 864c1c5e
import login from '../components/Login'
import index from '../components/index'
import clientConfirm from '../components/clientConfirm'
import SignName from '../components/SignName'
import supplierLogin from '../components/SupplierLogin'
import supplierIndex from '../components/SupplierIndex'
export default {
......@@ -3822,6 +3823,11 @@ export default {
name: 'clientConfirm',
component: clientConfirm
},
{
path: '/SignName',
name: 'SignName',
component: SignName
},
{
path: '/leaderPay2', //领队报账
name: 'leaderPay2',
......
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