Skip to content

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

页面修改

parent 7316f2b3
Show whitespace changes
Inline Side-by-side
Showing with 256 additions and 252 deletions
src/components/SignName.vue
View file @ a0d079ae
<style scoped>
.SignName .CanvasDiv{
.SignName .CanvasDiv {
width: 100%;
height: calc(100% - 8rem);
padding-top: 20px;
}
.SignName .CanvasDiv #canvas{
.SignName .CanvasDiv #canvas {
width: 100%;
height: 100%;
}
.SignName .dash{
.SignName .dash {
padding: 10px;
box-sizing: border-box;
border: 1px dashed #ccc;
width: 95%;
height: 98%;
margin:0 auto;
margin: 0 auto;
overflow: hidden;
}
.SignName .bg{
.SignName .bg {
display: inline-block;
width: 25px;
height: 25px;
}
.SignName .bg1{
.SignName .bg1 {
background-image: url('../assets/img/dzht/bg1.png');
background-size: 132px;
background-position: -1px -2px;
}
.SignName .bg2{
.SignName .bg2 {
background-image: url('../assets/img/dzht/bg1.png');
background-size: 132px;
background-position: 28px -2px;
}
.SignName .bottom .el-col>div{
.SignName .bottom .el-col>div {
display: inline-flex;
align-items: center;
justify-content: center;
}
.SignName .signTc{
.SignName .signTc {
position: fixed;
top: 0;
left: 0;
......@@ -48,7 +54,8 @@
z-index: 200;
text-align: center;
}
.SignName .signTc .closeTc{
.SignName .signTc .closeTc {
position: relative;
display: inline-block;
width: 60%;
......@@ -60,6 +67,7 @@
top: 50%;
font-size: 2rem;
}
</style>
<template>
......@@ -71,68 +79,61 @@
<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:3rem;color:rgb(36, 173, 229)" class="iconfont icon-zhongzhi1"></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:3rem;color:rgb(36, 173, 229)" class="iconfont icon-wancheng1"></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>
import tripBusOrderVue from './busManagement/tripBusOrder.vue';
let canvas = document.createElement("canvas");
let cxt = canvas.getContext("2d");
export default {
data (){
return{
tcStatus:false,
import tripBusOrderVue from './busManagement/tripBusOrder.vue';
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
SignInfo: {},
msg: {
TCID: 0,
orderID: 0,
guestId: 0,
},
}
},
created(){
created() {
this.SignInfo = JSON.parse(sessionStorage.getItem("SignInfo"));
},
mounted(){
mounted() {
this.msg.TCID = this.$route.query.TCID;
this.msg.orderID = this.$route.query.orderID;
this.getCanvas();
document.getElementsByTagName('body')[0].style="overscroll-behavior-y: contain;"
document.getElementsByTagName('body')[0].style = "overscroll-behavior-y: contain;"
},
beforeDestroy() {
document.getElementsByTagName('body')[0].style=""
document.getElementsByTagName('body')[0].style = ""
},
methods:{
methods: {
getCanvas() {
let el = document.getElementById("canvas");
el.appendChild(canvas);
......@@ -146,7 +147,7 @@ export default {
//开始绘制
canvas.addEventListener(
"touchstart",
function(e) {
function (e) {
cxt.beginPath();
cxt.lineWidth = linewidth; //当前线条的宽度，以像素计
cxt.moveTo(e.changedTouches[0].pageX, e.changedTouches[0].pageY);
......@@ -156,7 +157,7 @@ export default {
//绘制中
canvas.addEventListener(
"touchmove",
function(e) {
function (e) {
cxt.lineTo(e.changedTouches[0].pageX, e.changedTouches[0].pageY);
cxt.stroke();
}.bind(this),
......@@ -165,7 +166,7 @@ export default {
//结束绘制
canvas.addEventListener(
"touchend",
function() {
function () {
cxt.closePath();
}.bind(this),
false
......@@ -173,7 +174,7 @@ export default {
//开始绘制
canvas.addEventListener(
"mousedown",
function(e) {
function (e) {
this.isMouseDown = tripBusOrderVue
cxt.beginPath();
cxt.lineWidth = linewidth; //当前线条的宽度，以像素计
......@@ -184,8 +185,8 @@ export default {
//绘制中
canvas.addEventListener(
"mousemove",
function(e) {
if(this.isMouseDown) {
function (e) {
if (this.isMouseDown) {
cxt.lineTo(e.pageX - 20, e.pageY - 20);
cxt.stroke();
}
......@@ -195,7 +196,7 @@ export default {
//结束绘制
canvas.addEventListener(
"mouseup",
function() {
function () {
this.isMouseDown = false
cxt.closePath();
}.bind(this),
......@@ -211,21 +212,25 @@ export default {
this.SaveMsg();
},
//提交数据
SaveMsg(){
// this.apiJavaPost("/api/contract/dosaveOrUpdate",this.SignInfo,res => {
SaveMsg() {
this.apipost("travelcontract_post_UpdateCompanySignatureService", this.SignInfo, 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}})
this.$router.push({
name: "clientConfirm",
query: {
TCID: this.msg.TCID,
orderID: this.msg.orderID,
str: 1,
guestId: this.msg.guestId,
}
})
} else {
this.Error(res.data.message);
}
},null);
}, null);
},
}
}
}
</script>
src/components/TravelContractConfirm.vue
View file @ a0d079ae
......@@ -3681,19 +3681,10 @@
}
return serviceCount;
},
goUrl() {
sessionStorage.setItem("SignInfo", JSON.stringify(this.dataList))
this.$router.push({
name: "SignName",
query: {
ContractId: this.msg.ContractId,
}
})
},
ChangeTab(num) {
this.ActiveTab = num;
},
//获取数据
getList() {
this.apipost(
......
src/components/clientConfirm.vue
View file @ a0d079ae
......@@ -2115,6 +2115,7 @@
query: {
TCID: this.msg.TCID,
orderID: this.msg.orderID,
guestId:this.msg.guestId
}
})
},
......@@ -2123,7 +2124,7 @@
},
//获取数据
getList() {
// this.apiJavaPost("/api/contract/getContractInfo", this.msg, res => {
this.apipost("travelcontract_post_GetContractInfoService", this.msg, res => {
if (res.data.resultCode === 1) {
this.dataList = res.data.data;
......@@ -2219,7 +2220,7 @@
},
//提交数据
SaveMsg() {
// this.apiJavaPost("/api/contract/dosaveOrUpdate", this.dataList, res => {
this.apipost("travelcontract_post_UpdateCompanySignatureService", this.dataList, res => {
if (res.data.resultCode === 1) {
this.Success(res.data.message);
......@@ -2246,7 +2247,7 @@
this.getList();
this.getCanvas();
} catch (error) {
//alert("mounted："+error.message)
}
}
};
......
src/plug/index.js
View file @ a0d079ae
......@@ -119,9 +119,9 @@ export default {
let lxymallUrl = ''; //国内游api
let crmUrl = ""; //crm API
let locationName = window.location.hostname;
// domainUrl = "http://192.168.10.128";
domainUrl = "http://192.168.10.128";
// domainUrl = "http://192.168.10.9:8083" // 刘东电脑
domainUrl = "http://192.168.10.226";
// domainUrl = "http://192.168.10.226";
//domainUrl = "http://reborn.oytour.com";
let crmLocalFileStreamDownLoadUrl = "";
crmLocalFileStreamDownLoadUrl = locationName.indexOf('oytour') !== -1 ? "http://crm.oytour.com" : "http://testcrm.oytour.com";
......@@ -253,7 +253,7 @@ export default {
}
//HTTP提交数据
Vue.prototype.apipost = function (cmd, msg, successCall, faildCall, isOnline,isTerminate) {
Vue.prototype.apipost = function (cmd, msg, successCall, faildCall, isOnline, isTerminate) {
if (this.$route.name.indexOf('login') === -1 && this.$route.name.indexOf('clientConfirm') === -1 &&
this.$route.name.indexOf('confirmationOrderDownLoad') === -1 && this.$route.name.indexOf('PrintPage') === -1 &&
this.$route.name.indexOf('TravelContractConfirm') === -1 && this.$route.name.indexOf('ViittoContractConfirm') === -1 &&
......@@ -283,11 +283,13 @@ export default {
} else if (this.$route.path == "/clientConfirm") {
let TCID = this.$route.query.TCID;
let orderID = this.$route.query.orderID;
let guestId = this.$route.query.guestId;
this.$router.push({
name: "clientConfirm",
query: {
TCID: TCID,
orderID: orderID
orderID: orderID,
guestId: guestId,
}
})
} else if (this.$route.path == "/TravelContractConfirm") {
......@@ -338,20 +340,23 @@ export default {
let pending = []; //声明一个数组用于存储每个请求的取消函数和axios标识
let cancelToken = axios.CancelToken;
let removePending = (config) => {
for(let p in pending){
if(pending[p].u === config.url + '&' + config.method) { //当当前请求在数组中存在时执行函数体
for (let p in pending) {
if (pending[p].u === config.url + '&' + config.method) { //当当前请求在数组中存在时执行函数体
pending[p].f(); //执行取消操作
pending.splice(p, 1);
}
}
}
// 我的财务单防止多次请求导致数据混乱
if(isTerminate>0){
if (isTerminate > 0) {
this.$http.interceptors.request.use(config => {
removePending(config); //在一个axios发送前执行一下取消操作
config.cancelToken = new cancelToken((c)=>{
config.cancelToken = new cancelToken((c) => {
// 这里的axios标识我是用请求地址&请求方式拼接的字符串，当然你可以选择其他的一些方式
pending.push({ u: config.url + '&' + config.method, f: c });
pending.push({
u: config.url + '&' + config.method,
f: c
});
});
return Promise.resolve(config)
......@@ -445,11 +450,13 @@ export default {
} else if (this.$route.path == "/clientConfirm") {
let TCID = this.$route.query.TCID;
let orderID = this.$route.query.orderID;
let guestId = this.$route.query.guestId;
this.$router.push({
name: "clientConfirm",
query: {
TCID: TCID,
orderID: orderID
orderID: orderID,
guestId: guestId
}
})
} else if (this.$route.path == "/TravelContractConfirm") {
......@@ -1657,28 +1664,28 @@ export default {
window.open(newUrl.href, '_blank');
}
//验证文件格式
Vue.prototype.verificationFile = function (img,type) {
if(type==1){
if(img.indexOf('.DOCX')!=-1||img.indexOf('.docx')!=-1
||img.indexOf('.DOC')!=-1||img.indexOf('.doc')!=-1
||img.indexOf('.XLSX')!=-1||img.indexOf('.xlsx')!=-1
||img.indexOf('.XLS')!=-1||img.indexOf('.xls')!=-1
||img.indexOf('.PPT')!=-1||img.indexOf('.ppt')!=-1
||img.indexOf('.PPTX')!=-1||img.indexOf('.pptx')!=-1
||img.indexOf('.PDF')!=-1||img.indexOf('.pdf')!=-1){
Vue.prototype.verificationFile = function (img, type) {
if (type == 1) {
if (img.indexOf('.DOCX') != -1 || img.indexOf('.docx') != -1 ||
img.indexOf('.DOC') != -1 || img.indexOf('.doc') != -1 ||
img.indexOf('.XLSX') != -1 || img.indexOf('.xlsx') != -1 ||
img.indexOf('.XLS') != -1 || img.indexOf('.xls') != -1 ||
img.indexOf('.PPT') != -1 || img.indexOf('.ppt') != -1 ||
img.indexOf('.PPTX') != -1 || img.indexOf('.pptx') != -1 ||
img.indexOf('.PDF') != -1 || img.indexOf('.pdf') != -1) {
return true
}else{
} else {
return false
}
}
if(type==3){
if(img.indexOf('.png')!=-1||img.indexOf('.PNG')!=-1
||img.indexOf('.GIF')!=-1||img.indexOf('.gif')!=-1
||img.indexOf('.JPEG')!=-1||img.indexOf('.jpeg')!=-1
||img.indexOf('.JPG')!=-1||img.indexOf('.jpg')!=-1
||img.indexOf('.BMP')!=-1||img.indexOf('.bmp')!=-1){
if (type == 3) {
if (img.indexOf('.png') != -1 || img.indexOf('.PNG') != -1 ||
img.indexOf('.GIF') != -1 || img.indexOf('.gif') != -1 ||
img.indexOf('.JPEG') != -1 || img.indexOf('.jpeg') != -1 ||
img.indexOf('.JPG') != -1 || img.indexOf('.jpg') != -1 ||
img.indexOf('.BMP') != -1 || img.indexOf('.bmp') != -1) {
return true
}else{
} else {
return false
}
}
......
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