Skip to content

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

修复合同功能

parent 5da0ded0
Hide whitespace changes
Inline Side-by-side
Showing with 1750 additions and 1602 deletions
package-lock.json
View file @ a3d2147a
......@@ -515,7 +515,6 @@
"version": "1.0.10",
"resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz",
"integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==",
"dev": true,
"requires": {
"sprintf-js": "~1.0.2"
}
......@@ -1685,6 +1684,34 @@
"integrity": "sha512-MKiLiV+I1AA596t9w1sQJ8jkiSr5+ZKi0WKrYGUn6d1Fx+Ij4tIj+m2WMQSGczs5jZVxV339chE8iwk6F64wjA==",
"dev": true
},
"bmaplib.curveline": {
"version": "1.0.0",
"resolved": "https://registry.npmmirror.com/bmaplib.curveline/-/bmaplib.curveline-1.0.0.tgz",
"integrity": "sha512-9wcFMVhiYxNPqpvsLDAADn3qDhNzXp2mA6VyHSHg2XOAgSooC7ZiujdFhy0sp+0QYjTfJ/MjmLuNoUg2HHxH4Q=="
},
"bmaplib.heatmap": {
"version": "1.0.4",
"resolved": "https://registry.npmmirror.com/bmaplib.heatmap/-/bmaplib.heatmap-1.0.4.tgz",
"integrity": "sha512-rmhqUARBpUSJ9jXzUI2j7dIOqnc38bqubkx/8a349U2qtw/ulLUwyzRD535OrA8G7w5cz4aPKm6/rNvUAarg/Q=="
},
"bmaplib.lushu": {
"version": "1.0.7",
"resolved": "https://registry.npmmirror.com/bmaplib.lushu/-/bmaplib.lushu-1.0.7.tgz",
"integrity": "sha512-LVvgpESPii6xGxyjnQjq8u+ic4NjvhdCPV/RiSS/PGTUdZKeTDS7prSpleJLZH3ES0+oc0gYn8bw0LtPYUSz2w=="
},
"bmaplib.markerclusterer": {
"version": "1.0.13",
"resolved": "https://registry.npmmirror.com/bmaplib.markerclusterer/-/bmaplib.markerclusterer-1.0.13.tgz",
"integrity": "sha512-VrLyWSiuDEVNi0yUfwOhFQ6z1oEEHS4w36GNu3iASu6p52QIx9uAXMUkuSCHReNR0bj2Cp9SA1dSx5RpojXajQ==",
"requires": {
"bmaplib.texticonoverlay": "^1.0.2"
}
},
"bmaplib.texticonoverlay": {
"version": "1.0.2",
"resolved": "https://registry.npmmirror.com/bmaplib.texticonoverlay/-/bmaplib.texticonoverlay-1.0.2.tgz",
"integrity": "sha512-4ZTWr4ZP3B6qEWput5Tut16CfZgII38YwM3bpyb4gFTQyORlKYryFp9WHWrwZZaHlOyYDAXG9SX0hka43jTADg=="
},
"bn.js": {
"version": "4.11.8",
"resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.8.tgz",
......@@ -3842,8 +3869,7 @@
"entities": {
"version": "1.1.1",
"resolved": "https://registry.npmjs.org/entities/-/entities-1.1.1.tgz",
"integrity": "sha1-blwtClYhtdra7O+AuQ7ftc13cvA=",
"dev": true
"integrity": "sha1-blwtClYhtdra7O+AuQ7ftc13cvA="
},
"errno": {
"version": "0.1.7",
......@@ -7069,6 +7095,14 @@
"type-check": "~0.3.2"
}
},
"linkify-it": {
"version": "2.2.0",
"resolved": "https://registry.npmmirror.com/linkify-it/-/linkify-it-2.2.0.tgz",
"integrity": "sha512-GnAl/knGn+i1U/wjBz3akz2stz+HrHLsxMwHQGofCDfPvlf+gDKN58UtfmUquTY4/MXeE2x7k19KQmeoZi94Iw==",
"requires": {
"uc.micro": "^1.0.1"
}
},
"load-json-file": {
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-2.0.0.tgz",
......@@ -7284,6 +7318,18 @@
"object-visit": "^1.0.0"
}
},
"markdown-it": {
"version": "8.4.2",
"resolved": "https://registry.npmmirror.com/markdown-it/-/markdown-it-8.4.2.tgz",
"integrity": "sha512-GcRz3AWTqSUphY3vsUqQSFMbgR38a4Lh3GWlHRh/7MRwz8mcu9n2IO7HOh+bXHrR9kOPDl5RNCaEsrneb+xhHQ==",
"requires": {
"argparse": "^1.0.7",
"entities": "~1.1.1",
"linkify-it": "^2.0.0",
"mdurl": "^1.0.1",
"uc.micro": "^1.0.5"
}
},
"material-colors": {
"version": "1.2.6",
"resolved": "http://registry.npm.taobao.org/material-colors/download/material-colors-1.2.6.tgz",
......@@ -7317,6 +7363,11 @@
"integrity": "sha512-iV3XNKw06j5Q7mi6h+9vbx23Tv7JkjEVgKHW4pimwyDGWm0OIQntJJ+u1C6mg6mK1EaTv42XQ7w76yuzH7M2cA==",
"dev": true
},
"mdurl": {
"version": "1.0.1",
"resolved": "https://registry.npmmirror.com/mdurl/-/mdurl-1.0.1.tgz",
"integrity": "sha512-/sKlQJCBYVY9Ers9hqzKou4H6V5UWc/M59TH2dvkt+84itfnq7uFOMLpOiOS4ujvHP4etln18fmIxA5R5fll0g=="
},
"media-typer": {
"version": "0.3.0",
"resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz",
......@@ -11532,8 +11583,7 @@
"sprintf-js": {
"version": "1.0.3",
"resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz",
"integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=",
"dev": true
"integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw="
},
"ssf": {
"version": "0.10.2",
......@@ -12310,6 +12360,11 @@
"resolved": "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz",
"integrity": "sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c="
},
"uc.micro": {
"version": "1.0.6",
"resolved": "https://registry.npmmirror.com/uc.micro/-/uc.micro-1.0.6.tgz",
"integrity": "sha512-8Y75pvTYkLJW2hWQHXxoqRgV7qb9B+9vFEtidML+7koHUFapnVJAZ6cKs+Qjz5Aw3aZWHMC6u0wJE3At+nSGwA=="
},
"uglify-js": {
"version": "3.3.18",
"resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.3.18.tgz",
......@@ -12959,6 +13014,18 @@
"uppercamelcase": "^1.1.0"
}
},
"vue-baidu-map": {
"version": "0.21.22",
"resolved": "https://registry.npmmirror.com/vue-baidu-map/-/vue-baidu-map-0.21.22.tgz",
"integrity": "sha512-WQMPCih4UTh0AZCKKH/OVOYnyAWjfRNeK6BIeoLmscyY5aF8zzlJhz/NOHLb3mdztIpB0Z6aohn4Jd9mfCSjQw==",
"requires": {
"bmaplib.curveline": "^1.0.0",
"bmaplib.heatmap": "^1.0.4",
"bmaplib.lushu": "^1.0.7",
"bmaplib.markerclusterer": "^1.0.13",
"markdown-it": "^8.4.0"
}
},
"vue-draggable-resizable": {
"version": "1.7.2",
"resolved": "https://registry.npmjs.org/vue-draggable-resizable/-/vue-draggable-resizable-1.7.2.tgz",
......
src/components/TravelContractDetail.vue
View file @ a3d2147a
......@@ -742,7 +742,7 @@
<td>旅游者代表签字（盖章）：</td>
<td>
<span>{{dataList.clientName}}</span>
<img class="signDiv" :src="dataList.companySignature" alt="">
<img class="signDiv" :src="dataList.companySignature" v-if="dataList.companySignature" alt="">
</td>
<td>
出境社盖章：
......
src/components/TravelContractNew.vue
View file @ a3d2147a
......@@ -293,6 +293,9 @@
<span style="color:blue;font-size:14px;">{{CtObj.contractNum}}</span>
</span>
<div class="pull-right">
<input type="button" class="TCbtn-info" v-if="CtObj.companySignature=='' && CtObj.auditContract==2"
@click="isShowFade=true,GetQrCode()" value="客户签字链接" />
<span v-if="CtObj.auditContract==1" style="font-size:12px;color:red;">等待行政审批通过后获取签字链接</span>
<input type="button" v-if="CtObj.status==1&&CtObj.auditContract==0" class="TCbtn-info" @click="sendAudit()"
value="提交审核" />
<input type="button" v-if="CtObj.status==1&&CtObj.auditContract==3" class="TCbtn-info" @click="sendAudit()"
......@@ -300,8 +303,8 @@
<input type="button" class="TCbtn-info" v-if="CtObj.status==1" @click="goUrl()" value="预览">
<input type="button" class="TCbtn-info" v-if="CtObj.auditContract==2" @click="getinvalid()" value="作废">
<input type="button" class="TCbtn-info" @click="dialogVisible=true,getGuestList()" value="复制合同" />
<input type="button" class="TCbtn-info" v-if="CtObj.status==1" @click="msgDialog=true,getMsgList()"
value="发送短信" />
<!-- <input type="button" class="TCbtn-info" v-if="CtObj.status==1" @click="msgDialog=true,getMsgList()"
value="发送短信" /> -->
<input type="button" v-if="CtObj.auditContract!=2" class="btn-warning" @click="submitForm('CtObj')"
value="保存" />
</div>
......@@ -891,11 +894,16 @@
</td>
</tr>
<tr>
<td colspan="5">日本周游</td>
<td colspan="5">
<div style="display:flex">
<span>地接社名称：</span>
<div contenteditable="true" style="width:250px;"></div>
</div>
</td>
</tr>
<tr>
<!-- <tr>
<td colspan="5">地址：</td>
</tr>
</tr> -->
<tr>
<td style="width:15%">行程时间</td>
<td style="width:50%">主要景点名称（游览时间）</td>
......@@ -1193,6 +1201,14 @@
</tr>
</table>
</el-dialog>
<div class="fade" v-show="isShowFade"></div>
<div class="qrCodeDiv" v-show="isShowFade">
<div style="margin-top:15px;">请扫码签字</div>
<div id="qrcode" style="margin:25px;" ref="qrcode">
<img class="WeiXinShare" :src="'data:image/png;base64,'+QRCodeStr" />
</div>
<i class="iconfont icon-cha Ec_cha" @click="isShowFade=false"></i>
</div>
</div>
</template>
<script>
......@@ -1230,6 +1246,8 @@
return {
//国家列表
CountryList: [],
isShowFade: false,
QRCodeStr: "",
//客户省份列表
ClientProvinceList: [],
//客户城市列表
......@@ -1337,7 +1355,8 @@
orderId: 0,
tCNum: '',
payProtocol: '',
shopProtocol: ''
shopProtocol: '',
dmcName:''
},
//旅客名单
guestList: [],
......@@ -1465,6 +1484,42 @@
};
},
methods: {
goContract() {
let routeData = this.$router.resolve({
name: "TravelContractDetail",
query: {
TCID: this.$route.query.TCID,
guestId: this.$route.query.guestId,
orderID: this.$route.query.orderID,
},
});
console.log(routeData.href)
location.href=routeData.href
},
GetQrCode: function () {
let urlObj = this.domainManager();
let msg = {
TCID: this.$route.query.TCID,
orderID: this.$route.query.orderID,
pUrl: "clientConfirm",
};
this.$http({
headers: {
'Content-Type': 'application/json'
},
method: 'post',
url: urlObj.DomainUrl + '/api/file/GetQrCodeImage?',
data: {
"msg": msg
}
}).then(res => {
if (res.data.resultCode === 1) {
this.QRCodeStr = res.data.data;
} else {
}
}).catch(err => {})
},
//跳转锚点
goAnchor(selector) {
var anchor = this.$el.querySelector(selector)
......@@ -1508,7 +1563,10 @@
this.CtObj.regulatorComplainCall = '17708046437';
this.CtObj.companyComplainCall = '028-96927';
}
if(this.CtObj.auditContract==2){
this.goContract()
}
} else {
this.Error(res.data.message);
}
......@@ -1648,6 +1706,7 @@
}
}
this.CtObj.travelContent = this.$refs.TcTravel_Table.innerHTML;
this.CtObj.rbGroupId=this.CurrentUserInfo.RB_Group_id
this.apiJavaPost("/api/contract/dosaveOrUpdate", this.CtObj, res => {
if (res.data.resultCode === 1) {
this.Success(res.data.message);
......
src/components/clientConfirm.vue
View file @ a3d2147a
......@@ -321,7 +321,6 @@
border-radius: 5px;
height: 3.4rem;
width: 18rem;
line-height: 3.4rem;
color: #fff;
font-size: 2rem;
margin-top: 1rem;
......@@ -511,14 +510,14 @@
<template>
<div class="dic_content" :class="dialogVisible?'CisHideen':''">
<!-- 签字 -->
<div class="signSpan">
<div @click="goUrl" class="sign">
<div class="signSpan" v-if="dataList.companySignature==''">
<div @click="goUrl" class="sign" >
<p><span style="font-size:3rem" class="iconfont icon-qianming"></span></p>
<span style="font-size:2rem">签字</span>
</div>
</div>
<!-- 开始进入弹窗 -->
<div class=TipTc v-show="tcShow">
<div class=TipTc v-if="tcShowDialog" id="tcShowDialog">
<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">
......@@ -528,7 +527,7 @@
<li>爱环境，护古迹；</li>
<li>文明行，最得体。</li>
</ul>
<span @click="tcShow=false" class="readSpan">已阅知</span>
<el-button type="primary" @click="closeTcShowHandler" class="readSpan">已阅知</el-button>
</div>
......@@ -950,7 +949,10 @@
<li>
<el-row>
<el-col :span="12">旅游者代表签字（盖章）：</el-col>
<el-col :span="12">{{dataList.clientName}}</el-col>
<el-col :span="12">
{{dataList.companySignature!=''?'':dataList.clientName}}
<img style="width:120px;" :src="dataList.companySignature" v-if="dataList.companySignature!=''" alt="" />
</el-col>
</el-row>
</li>
<li>
......@@ -1005,7 +1007,7 @@
<li>
<el-row>
<el-col :span="12">出境社盖章：</el-col>
<el-col :span="12"><img class="signImg" :src="CurrentUserInfo.ZhangImg" alt="" /></el-col>
<el-col :span="12"><img class="signImg" :src="CurrentUserInfo.ZhangImg" alt="" v-if="dataList.isTravelAgencySignature==1"/></el-col>
</el-row>
</li>
<li>
......@@ -1546,7 +1548,7 @@
<div class="item_content">
<label id="l3">签章信息</label>
<div class="leftSign">
<div><span>旅游者代表签字（盖章）：</span>
<div><span>旅游者代表签字（盖章）1：</span>
<img style="width:120px;" :src="dataList.companySignature" alt="" />
</div>
<div><span>证件号码：</span>
......@@ -2067,7 +2069,7 @@
return {
CurrentUserInfo: {},
signShow: true,
tcShow: true,
tcShowDialog: true,
ActiveTab: 1,
//查询参数
msg: {
......@@ -2095,12 +2097,25 @@
};
},
created() {
if (this.$route.query.str) {
this.tcShow = false;
this.signShow = false;
try {
if (this.$route.query.str) {
this.tcShowDialog = false;
this.signShow = false;
}
} catch (error) {
//("mounted："+error.message)
}
},
methods: {
closeTcShowHandler(){
// this.tcShowDialog = false
// this.$forceUpdate();
// alert('点击了'+this.tcShowDialog)
let domtemp=document.querySelector("#tcShowDialog")
domtemp.remove()
//alert('删除完成')
},
goUrl() {
sessionStorage.setItem("SignInfo", JSON.stringify(this.dataList))
this.$router.push({
......@@ -2119,6 +2134,7 @@
this.apiJavaPost("/api/contract/getContractInfo", this.msg, res => {
if (res.data.resultCode === 1) {
this.dataList = res.data.data;
this.dataList.travelContent = this.dataList.travelContent.replaceAll(/contenteditable="true"/ig,'')
} else {
this.Error(res.data.message);
}
......@@ -2626,16 +2642,22 @@
}
},
mounted() {
this.CurrentUserInfo = this.getLocalStorage();
this.msg.TCID = this.$route.query.TCID;
this.msg.orderID = this.$route.query.orderID;
this.msg.guestId = this.$route.query.guestId;
var h = window.screen.height;
var cHeight = document.getElementsByClassName("CliSignDiv")[0];
cHeight.style.height = 900 + 'px';
this.getList();
this.getCanvas();
this.GetTrip(0, this.msg.TCID);
try {
this.CurrentUserInfo = this.getLocalStorage();
this.CurrentUserInfo = this.CurrentUserInfo?his.CurrentUserInfo:{}
this.CurrentUserInfo.ZhangImg='http://imgfile.oytour.com/New/Upload/CompanyImage/hepingzhang.png'
this.msg.TCID = this.$route.query.TCID;
this.msg.orderID = this.$route.query.orderID;
this.msg.guestId = this.$route.query.guestId;
var h = window.screen.height;
var cHeight = document.getElementsByClassName("CliSignDiv")[0];
cHeight.style.height = 900 + 'px';
this.getList();
this.getCanvas();
this.GetTrip(0, this.msg.TCID);
} catch (error) {
//alert("mounted："+error.message)
}
}
};
......
src/plug/index.js
View file @ a3d2147a
This source diff could not be displayed because it is too large. You can view the blob instead.
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