Skip to content

S
SuperMan
Commit 4cbe1fc9 authored by 黄奎's avatar 黄奎
Browse files
Options

11

parent bc98be53
Show whitespace changes
Inline Side-by-side
Showing with 106 additions and 171 deletions
src/components/SignName.vue
View file @ 4cbe1fc9
...@@ -117,6 +117,7 @@ ...@@ -117,6 +117,7 @@
guestId: 0, //旅客编号 guestId: 0, //旅客编号
ProtocolId: 0, //保密协议编号 ProtocolId: 0, //保密协议编号
TypeStr: "", //跳转页面地址 TypeStr: "", //跳转页面地址
ContractId:0,//单项合同Id
}, },
} }
}, },
...@@ -142,6 +143,9 @@ ...@@ -142,6 +143,9 @@
if (this.$route.query && this.$route.query.TypeStr) { if (this.$route.query && this.$route.query.TypeStr) {
this.msg.TypeStr = this.$route.query.TypeStr; this.msg.TypeStr = this.$route.query.TypeStr;
} }
if(this.$route.query && this.$route.query.ContractId) {
this.msg.ContractId = this.$route.query.ContractId;
}
this.getCanvas(); this.getCanvas();
document.getElementsByTagName('body')[0].style = "overscroll-behavior-y: contain;" document.getElementsByTagName('body')[0].style = "overscroll-behavior-y: contain;"
}, },
...@@ -342,6 +346,26 @@ ...@@ -342,6 +346,26 @@
} }
}, null); }, null);
} }
else if (this.msg.TypeStr == 'TravelContractConfirm') {
var postMsg = {
ID: this.msg.ContractId,
Tourists_Sign: this.SignInfo
}
this.apipost("travelcontract_post_UpdateTravelContractSignService", postMsg, res => {
if (res.data.resultCode === 1) {
this.Success(res.data.message);
var path = "TravelContractConfirm";
this.$router.push({
name: path,
query: {
ContractId: this.msg.ContractId,
}
})
} else {
this.Error(res.data.message);
}
});
}
}, },
} }
} }
......
src/components/TravelContractConfirm.vue
View file @ 4cbe1fc9
...@@ -16,6 +16,7 @@ ...@@ -16,6 +16,7 @@
margin: 0 auto; margin: 0 auto;
background-color: #fff; background-color: #fff;
height: 100%; height: 100%;
margin-bottom: 8vh;
} }
.TCdiv_content .contractLeft { .TCdiv_content .contractLeft {
...@@ -281,12 +282,46 @@ ...@@ -281,12 +282,46 @@
cursor: pointer; cursor: pointer;
border-radius: 15px; border-radius: 15px;
margin-left: 10px; margin-left: 10px;
}
.TcConfirmMain {
padding-bottom: 8vh;
padding-bottom: 8dvh;
} }
.TcConfirmMain .isShowSign { .TcConfirmMain .isShowSign {
z-index: 999 !important; z-index: 999 !important;
} }
.TCdiv_content .signSpan {
position: fixed;
bottom: 0;
width: 100%;
left: 0;
background: #fff;
border-top: 1px solid #ccc;
z-index: 1000;
height: 8vh;
height: 8dvh;
}
.TCdiv_content .signSpan .sign {
width: 75%;
margin: 0 auto;
padding: 1rem 0 0 0;
text-align: center;
cursor: pointer;
}
.TCdiv_content .signSpan .sign .sp1 {
display: inline-block;
width: 25px;
height: 25px;
background-image: url('../assets/img/dzht/bg1.png');
background-size: 132px;
background-position: 52px 29px;
}
.CisHideen { .CisHideen {
display: none; display: none;
overflow: hidden; overflow: hidden;
...@@ -341,34 +376,7 @@ ...@@ -341,34 +376,7 @@
z-index: 1000; z-index: 1000;
} }
.TCdiv_content .signSpan {
position: fixed;
bottom: 0;
width: 100%;
left: 0;
background: #fff;
border-top: 1px solid #ccc;
z-index: 1000;
}
.TCdiv_content .signSpan .sign {
width: 75%;
margin: 0 auto;
padding: 1rem 0 0 0;
text-align: center;
cursor: pointer;
}
.TCdiv_content .signSpan .sign .sp1 {
display: inline-block;
width: 25px;
height: 25px;
background-image: url('../assets/img/dzht/bg1.png');
background-size: 132px;
background-position: 52px 29px;
}
.TCdiv_content li { .TCdiv_content li {
list-style: none; list-style: none;
...@@ -495,7 +503,7 @@ ...@@ -495,7 +503,7 @@
.CanvasDiv { .CanvasDiv {
width: 100%; width: 100%;
height: calc(100% - 10vh); height: calc(100% - 8rem);
padding-top: 5%; padding-top: 5%;
} }
...@@ -605,10 +613,17 @@ ...@@ -605,10 +613,17 @@
<template> <template>
<div class="TcConfirmMain"> <div class="TcConfirmMain">
<template v-if="CtObj.CType==1">
<div class="TCdiv_content" :class="dialogVisible?'CisHideen':''"> <div class="TCdiv_content" :class="dialogVisible?'CisHideen':''">
<!-- 签字 -->
<div class="signSpan">
<div @click="goUrl()" :class="dialogVisible?'CisHideen':''" class="sign">
<p><span style="font-size:3rem" class="iconfont icon-qianming"></span></p>
<span style="font-size:2rem"
v-if="CtObj.Tourists_Sign==''||CtObj.Tourists_Sign==null">{{$t('objFill.v101.qianzhi')}}</span>
<span style="font-size:2rem" v-else>重新签字</span>
</div>
<!-- <div style="width:100%;height:4vh">&nbsp;</div> -->
</div>
<!-- 开始进入弹窗 --> <!-- 开始进入弹窗 -->
<div class=TipTc v-if="tcShow"> <div class=TipTc v-if="tcShow">
<div class="TipsDiv" style="text-align:center;line-height:2"> <div class="TipsDiv" style="text-align:center;line-height:2">
...@@ -623,6 +638,7 @@ ...@@ -623,6 +638,7 @@
<span @click="tcShow=false" class="readSpan">已阅知</span> <span @click="tcShow=false" class="readSpan">已阅知</span>
</div> </div>
</div> </div>
<template v-if="CtObj.CType==1">
<!-- 头部境内旅游 --> <!-- 头部境内旅游 -->
<div class="NavFixed"> <div class="NavFixed">
<p style="background:#24ade5;text-align:center;color:#fff;padding:6px 0;font-size:3rem">合同详情</p> <p style="background:#24ade5;text-align:center;color:#fff;padding:6px 0;font-size:3rem">合同详情</p>
...@@ -1570,25 +1586,8 @@ ...@@ -1570,25 +1586,8 @@
</div> </div>
</div> </div>
</div> </div>
</div>
</template> </template>
<template v-if="CtObj.CType==2"> <template v-if="CtObj.CType==2">
<div class="TCdiv_content" :class="dialogVisible?'CisHideen':''">
<!-- 开始进入弹窗 -->
<div class=TipTc v-if="tcShow">
<div class="TipsDiv" style="text-align:center;line-height:2">
<h4 style="font-size: 2.5rem;color: #24ade5;">中国公民文明旅游公约</h4>
<ul style="font-size:2rem" class="conventionList">
<li>重安全，讲礼仪；</li>
<li>不喧哗，杜陋习；</li>
<li>守良俗，明事理；</li>
<li>爱环境，护古迹；</li>
<li>文明行，最得体。</li>
</ul>
<span @click="tcShow=false" class="readSpan">已阅知</span>
</div>
</div>
<!-- 头部境内旅游 --> <!-- 头部境内旅游 -->
<div class="NavFixed"> <div class="NavFixed">
<p style="background:#24ade5;text-align:center;color:#fff;padding:6px 0;font-size:3rem">合同详情</p> <p style="background:#24ade5;text-align:center;color:#fff;padding:6px 0;font-size:3rem">合同详情</p>
...@@ -2444,29 +2443,10 @@ ...@@ -2444,29 +2443,10 @@
</div> </div>
</div> </div>
</div> </div>
</div>
</template> </template>
<!-- 一日游 --> <!-- 一日游 -->
<template v-if="CtObj.CType==3"> <template v-if="CtObj.CType==3">
<div class="TCdiv_content" :class="dialogVisible?'CisHideen':''"> <!-- 一日游 -->
<!-- 开始进入弹窗 -->
<div class=TipTc v-if="tcShow">
<div class="TipsDiv" style="text-align:center;line-height:2">
<h4 style="font-size: 2.5rem;color: #24ade5;">中国公民文明旅游公约</h4>
<ul style="font-size:2rem" class="conventionList">
<li>重安全，讲礼仪；</li>
<li>不喧哗，杜陋习；</li>
<li>守良俗，明事理；</li>
<li>爱环境，护古迹；</li>
<li>文明行，最得体。</li>
</ul>
<span @click="tcShow=false" class="readSpan">已阅知</span>
</div>
</div>
<!-- 头部境内旅游 -->
<div class="NavFixed"> <div class="NavFixed">
<p style="background:#24ade5;text-align:center;color:#fff;padding:6px 0;font-size:3rem">合同详情</p> <p style="background:#24ade5;text-align:center;color:#fff;padding:6px 0;font-size:3rem">合同详情</p>
<div class="navHidden"> <div class="navHidden">
...@@ -3946,46 +3926,9 @@ ...@@ -3946,46 +3926,9 @@
</div> </div>
</div> </div>
</div> </div>
</div>
</template> </template>
<!-- 签字 -->
<div class="TCdiv_content">
<div class="signSpan">
<div @click="dialogVisible=true" :class="dialogVisible?'CisHideen':''" class="sign">
<p><span style="font-size:3rem" class="iconfont icon-qianming"></span></p>
<span style="font-size:2rem"
v-if="CtObj.Tourists_Sign==''||CtObj.Tourists_Sign==null">{{$t('objFill.v101.qianzhi')}}</span>
<span style="font-size:2rem" v-else>重新签字</span>
<div style="width:100%;height:4vh">&nbsp;</div>
</div>
</div>
</div>
<div class="CliSignDiv" :class="dialogVisible?'isShowSign':''" @touchmove.prevent>
<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:10vh;">
<el-row>
<el-col :span="12">
<div style="width:100%;" @click="handelClearEl()">
<span style="font-size:3rem;color:rgb(36, 173, 229)" class="iconfont icon-zhongzhi1"></span>
<span style="font-size:2rem">{{$t('objFill.v101.chongzhiqianm')}}</span>
</div>
</el-col>
<el-col :span="12">
<div style="width:100%;" @click="handelSaveEl()">
<span style="font-size:3rem;color:rgb(36, 173, 229)" class="iconfont icon-wancheng1"></span>
<span style="font-size:2rem">{{$t('objFill.v101.wanchengqmin')}}</span>
</div>
</el-col>
</el-row>
</div>
</div>
</div> </div>
</div> </div>
</template> </template>
<script> <script>
...@@ -4138,6 +4081,16 @@ ...@@ -4138,6 +4081,16 @@
} }
}, },
methods: { methods: {
//跳转签名页面
goUrl() {
this.$router.push({
name: "SignName",
query: {
ContractId: this.msg.ContractId,
TypeStr: 'TravelContractConfirm'
}
})
},
getCurrencyStr() { getCurrencyStr() {
var str = "元"; var str = "元";
if (this.CtObj.SignType == 1) { if (this.CtObj.SignType == 1) {
...@@ -4571,45 +4524,7 @@ ...@@ -4571,45 +4524,7 @@
/零([亿|万])/g, '$1').replace(/零+元/, '元').replace(/亿零{0,3}万/, '亿').replace(/^元/, "零元") /零([亿|万])/g, '$1').replace(/零+元/, '元').replace(/亿零{0,3}万/, '亿').replace(/^元/, "零元")
} }
}, },
getCanvas() {
let el = document.getElementById("canvas");
el.appendChild(canvas);
canvas.width = el.clientWidth;
canvas.height = el.clientHeight;
//cxt.fillStyle = this.background; //填充绘图的背景颜色
cxt.fillStyle = 'rgba(255, 255, 255, 0)';
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() { handelClearEl() {
cxt.clearRect(0, 0, canvas.width, canvas.height); cxt.clearRect(0, 0, canvas.width, canvas.height);
}, },
...@@ -4629,7 +4544,7 @@ ...@@ -4629,7 +4544,7 @@
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
this.dialogVisible = false; this.dialogVisible = false;
this.getList(); this.getList();
this.handelClearEl();
} }
}, },
err => {} err => {}
...@@ -4644,11 +4559,7 @@ ...@@ -4644,11 +4559,7 @@
mounted() { mounted() {
this.CurrentUserInfo = this.getLocalStorage(); this.CurrentUserInfo = this.getLocalStorage();
this.msg.ContractId = this.$route.query.ContractId; this.msg.ContractId = this.$route.query.ContractId;
var h = window.screen.height;
var cHeight = document.getElementsByClassName("CliSignDiv")[0];
cHeight.style.height = 900 + 'px';
this.getList(); this.getList();
this.getCanvas();
} }
}; };
......
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