Skip to content

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

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

parents 31065a4b cec46e20
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 1307 additions and 32 deletions
src/App.vue
View file @ e5d24f62
......@@ -131,6 +131,7 @@
document.URL.indexOf("SupplierLogin") == -1 &&
document.URL.indexOf("clientConfirm") == -1 &&
document.URL.indexOf("clientProtocol") == -1 &&
document.URL.indexOf("clientDisclaimerProtocol") == -1 &&
document.URL.indexOf("TravelContractConfirm") == -1 &&
document.URL.indexOf("ViittoContractConfirm") == -1
) {
......@@ -141,6 +142,7 @@
if (
document.URL.indexOf("clientConfirm") != -1 ||
document.URL.indexOf("clientProtocol") != -1 ||
document.URL.indexOf("clientDisclaimerProtocol") != -1 ||
document.URL.indexOf("TravelContractConfirm") != -1 ||
document.URL.indexOf("ViittoContractConfirm") != -1
) {
......
src/components/FinancialModule/FinancialDocumentsDetail.vue
View file @ e5d24f62
......@@ -1117,11 +1117,28 @@
<div class="shangchuanfujian"><button class="hollowFixedBtn" @click="upLoadFuJian">上传附件</button></div>
</div>
</div>
<!-- 是否需要发票 -->
<div style="border-top: 1px solid #dedede;margin-top: 10px;
</div>
<div class="_fujian_box" v-if="GetDetail.VorcherInos
&&GetDetail.VorcherInos.length===0
&&GetDetail.IsUploadPic===1
&&saveMsg.length===0">
<div style="margin-top: 80px;">
<div class="_pic_upload" v-if="GetDetail.IsUploadPic===1">
<!--<div class="_pic_upload" v-if="saveMsg.length!==5 && ((saveMsg.length + GetDetail.VorcherInos.length) < 5)">-->
<el-upload drag :http-request="uploadFileBtn" :multiple="true" :show-file-list="false" action="">
<i class="el-icon-plus avatar-uploader-icon"></i>
<div class="el-upload__text">点击/拖拽上传</div>
</el-upload>
</div>
<div class="shangchuanfujian"><button class="hollowFixedBtn" @click="upLoadFuJian">上传附件</button></div>
</div>
</div>
<!-- 是否需要发票 -->
<div class="_fujian_box" style="border-top: 1px solid #dedede;margin-top: 650px;
padding: 0 0 10px 0;"
v-if="GetDetail.KingdeeInvoice&&(GetDetail.KingdeeInvoice==1||GetDetail.KingdeeInvoice==3)
&&(GetDetail.CreateBy==userInfo.EmployeeId
v-if="(GetDetail.CreateBy==userInfo.EmployeeId
||GetDetail.InvoiceExamineBy==userInfo.EmployeeId
||ActionMenuCode.indexOf('F_Query_AllIncomPay')!= -1)">
<p
......@@ -1133,7 +1150,7 @@
</span>
</p>
<div class="_addUpload_box _addUpload_box_btm clearfix">
<template v-if="GetDetail.InvoiceVoucherInfo&&GetDetail.InvoiceVoucherInfo.length>0"
<!-- <template v-if="GetDetail.InvoiceVoucherInfo&&GetDetail.InvoiceVoucherInfo.length>0"
v-for="(file,fIndex) in GetDetail.InvoiceVoucherInfo">
<div v-if="file.Type==3">
<div style="width:100%;height:100%;overflow: hidden;">
......@@ -1151,7 +1168,7 @@
@click="showUpLoadFile(file)">
</div>
</div>
</template>
</template> -->
<template v-if="InvoiceVoucherList.length>0"
v-for="(file,fIndex) in InvoiceVoucherList">
<div v-if="file.Type==3">
......@@ -1192,25 +1209,6 @@
</div>
</div>
</div>
<div class="_fujian_box" v-if="GetDetail.VorcherInos
&&GetDetail.VorcherInos.length===0
&&GetDetail.IsUploadPic===1
&&saveMsg.length===0">
<div style="margin-top: 80px;">
<div class="_pic_upload" v-if="GetDetail.IsUploadPic===1">
<!--<div class="_pic_upload" v-if="saveMsg.length!==5 && ((saveMsg.length + GetDetail.VorcherInos.length) < 5)">-->
<el-upload drag :http-request="uploadFileBtn" :multiple="true" :show-file-list="false" action="">
<i class="el-icon-plus avatar-uploader-icon"></i>
<div class="el-upload__text">点击/拖拽上传</div>
</el-upload>
</div>
<div class="shangchuanfujian"><button class="hollowFixedBtn" @click="upLoadFuJian">上传附件</button></div>
</div>
</div>
</div>
<p class="_splic">
///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
......@@ -1536,7 +1534,7 @@
<p style="font-size:24px;">为了更好地打印效果，请点击页面上的“打印单据”再来进行打印，谢谢。</p>
</div>
<viewer :images="images" :options='imageOptions' @inited="inited" class="viewer" ref="viewer">
<img v-for="src in images" :src="src" :key="src">
<img v-for="src in images" :src="src">
</viewer>
<el-dialog custom-class='w400' title="特殊驳回" :visible.sync="finacialDialog" center>
......@@ -2190,6 +2188,8 @@
Id: this.ID,
InvoiceVoucherList: this.InvoiceVoucherList
};
console.log("this.InvoiceVoucherList",this.InvoiceVoucherList);
this.apipost('Financial_post_UpdateInvoiceVoucher', msg, res => {
if (res.data.resultCode === 1) {
this.$message.success('上传成功');
......@@ -2568,8 +2568,17 @@
});
},
deleteUploadFile(i,type) { // 删除上传文件
if(type==1){
this.InvoiceVoucherList.splice(i, 1);
this.$confirm("一旦删除不可恢复， 确认删除？", "提示", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning"
})
.then(() => {
this.InvoiceVoucherList.splice(i, 1);
})
.catch(() => {});
}else{
this.saveMsg.splice(i, 1);
}
......@@ -2640,6 +2649,10 @@
}, res => {
if (res.data.resultCode == 1) {
let data = res.data.data;
//2023-11-23 add by:W
if(data.InvoiceVoucherInfo){
this.InvoiceVoucherList=data.InvoiceVoucherInfo;
}
data.DetailList.forEach(x => {
x.UnitPrice = this.$commonUtils.addCommas(Math.round(x.UnitPrice * 100) / 100)
x.Money = Math.round(x.Money * 100) / 100
......
src/components/SalesModule/groupTourOrder.vue
View file @ e5d24f62
......@@ -2144,6 +2144,7 @@
<span style="color:#f56c6c">{{childItem.ticketOutTypeStr}} </span>
<span v-if="childItem.isApplyPhoto == 1" style="color: red">({{ $t("salesModule.Zhao") }})</span>
<span style="cursor:pointer;" @click="goProtocol(item,childItem)">{{childItem.protocolId>0?"查看保密协议":"签订保密协议"}}</span>
<span v-if="isShow===index||childItem.disclaimerId>0" style="cursor:pointer;" @click="goDisclaimer(item,childItem)">{{childItem.disclaimerId>0?"查看参团免责承诺函":"签订参团免责承诺函"}}</span>
&nbsp;&nbsp;
</span>
<span v-if="item.photoNum > 0">（{{ $t("salesModule.NoPhoto") }} {{ item.photoNum
......@@ -2174,10 +2175,14 @@
" v-for="(id, i) in item.tipFrId" :key="i">{{ id }}</span>
</span>
</div>
<div class="order-show GO_Contract" v-if="item.isShowDisclaimer==1" @click="showMore(item,index)" >
<span>{{isShow===index ? "隐藏参团免责承诺函" : "显示参团免责承诺函"}}
</span>
</div>
<div v-if="item.otherContractList&&(qjGroupId == userInfo.RB_Group_id || F_ContractManagement)">
<span class="GO_Contract"
@click="goSingleContract(item)">{{item.otherContractList.length==0?"单项合同":"查看单项合同"}}</span>
</div>
<div v-if="
......@@ -2472,6 +2477,7 @@
export default {
data() {
return {
isShow:'',
pagesTitle: '跟团游订单',
SpecialAppShow: false,
SpecialAppMsg: {
......@@ -2812,6 +2818,13 @@
},
},
methods: {
showMore(item,index){
if (this.isShow===index){
this.isShow=''
}else{
this.isShow= index;
}
},
//关闭弹窗
closeDialog() {
this.isShowLayerRemarks = false;
......@@ -2979,6 +2992,33 @@
});
window.open(routeData.href, "_blank");
},
//跳转到老人/孕妇免责协议
goDisclaimer(item, sItem) {
let ProtocolId = 0;
let guestId = 0;
var path = "disclaimerProtocol";
if (sItem) {
if (sItem.disclaimerId) {
ProtocolId = sItem.disclaimerId;
}
if (sItem.guestId) {
guestId = sItem.guestId;
}
}
var pMsg = {
TCID: item.tcid,
GuestId: guestId,
OrderId: item.orderId,
ProtocolId: ProtocolId,
blank: "y",
}
let routeData = this.$router.resolve({
name: path,
query: pMsg,
});
window.open(routeData.href, "_blank");
},
//跳转至领取合同
goContract(item, sItem) {
let cid = 0;
......
src/components/SalesModule/groupTourOrderByTuan.vue
View file @ e5d24f62
......@@ -2342,6 +2342,7 @@
<span style="color:#f56c6c">{{childItem.ticketOutTypeStr}} </span>
<span style="cursor:pointer;"
@click="goProtocol(item,childItem)">{{childItem.protocolId>0?"查看保密协议":"签订保密协议"}}</span>
<span v-if="item.isShowDisclaimer==1&&( isShow===index||childItem.disclaimerId>0)" style="cursor:pointer;" @click="goDisclaimer(item,childItem)">{{childItem.disclaimerId>0?"查看参团免责承诺函":"签订参团免责承诺函"}}</span>
<span v-if="childItem.isApplyPhoto == 1" style="color: red">(照)</span>&nbsp;&nbsp;</span>
<span v-if="item.photoNum > 0">（照片一人 {{ item.photoNum }}份）</span>
</span>
......@@ -2377,6 +2378,10 @@
" style="color: #f56c6c; margin-left: 20px; cursor: pointer">退景点</span>
</el-popover>
</span>
<div class="order-show GO_Contract" v-if="item.isShowDisclaimer==1" @click="showMore(item,index)" >
<span>{{isShow===index ? "隐藏参团免责承诺函" : "显示参团免责承诺函"}}
</span>
</div>
<div>
<span v-if="item.opTipMoney == '' && item.tipMoney != ''"
style="color: red">（小费：{{ item.tipMoney }}）</span>
......@@ -3227,6 +3232,7 @@
export default {
data() {
return {
isShow:"",
timer: false,
fullHeight: document.documentElement.clientHeight,
ScreenHeight: 0,
......@@ -3652,6 +3658,13 @@
},
},
methods: {
showMore(item,index){
if (this.isShow===index){
this.isShow=''
}else{
this.isShow= index;
}
},
//跳转到保密协议
goProtocol(item, sItem) {
let ProtocolId = 0;
......@@ -3678,6 +3691,33 @@
});
window.open(routeData.href, "_blank");
},
//跳转到老人/孕妇免责协议
goDisclaimer(item, sItem) {
let ProtocolId = 0;
let guestId = 0;
var path = "disclaimerProtocol";
if (sItem) {
if (sItem.disclaimerId) {
ProtocolId = sItem.disclaimerId;
}
if (sItem.guestId) {
guestId = sItem.guestId;
}
}
var pMsg = {
TCID: item.tcid,
GuestId: guestId,
OrderId: item.orderId,
ProtocolId: ProtocolId,
blank: "y",
}
let routeData = this.$router.resolve({
name: path,
query: pMsg,
});
window.open(routeData.href, "_blank");
},
//关闭弹窗
closeDialog() {
this.isShowLayerRemarks = false;
......
src/components/SignName.vue
View file @ e5d24f62
......@@ -294,6 +294,29 @@
}
}, null);
}
//老人/孕妇免责协议
else if (this.msg.TypeStr == 'clientDisclaimerProtocol') {
var clientDisclaimerProtocolMsg = {
ProtocolId: this.msg.ProtocolId,
GuestSignature: this.SignInfo
}
this.apipost("travelcontract_post_UpdateDisclaimerGuestSignature", clientDisclaimerProtocolMsg, res => {
if (res.data.resultCode === 1) {
this.Success(res.data.message);
this.$router.push({
name: 'clientDisclaimerProtocol',
query: {
TCID: this.msg.TCID,
OrderId: this.msg.orderID,
GuestId: this.msg.guestId,
ProtocolId:this.msg.ProtocolId,
}
})
} else {
this.Error(res.data.message);
}
}, null);
}
},
}
}
......
src/components/clientDisclaimerProtocol.vue 0 → 100644
View file @ e5d24f62
This diff is collapsed.
src/components/disclaimerProtocol.vue 0 → 100644
View file @ e5d24f62
This diff is collapsed.
src/plug/index.js
View file @ e5d24f62
......@@ -120,10 +120,10 @@ export default {
let crmUrl = ""; //crm API
let locationName = window.location.hostname;
let isOnline = 0; //0-本地测试，1-线上
let ocrUrl = "http://192.168.10.68:8888";
let ocrUrl = "http://192.168.10.214:8140";
// domainUrl = "http://192.168.10.238:8083"; // 刘东电脑
// domainUrl = "http://192.168.10.226"; //春姐
domainUrl = "http://192.168.10.160"; //奎哥
domainUrl = "http://192.168.10.68"; //奎哥
let crmLocalFileStreamDownLoadUrl = "";
crmLocalFileStreamDownLoadUrl = locationName.indexOf('oytour') !== -1 ? "http://crm.oytour.com" : "http://testcrm.oytour.com";
......@@ -262,6 +262,7 @@ export default {
this.$route.name.indexOf('confirmationOrderDownLoadNew') === -1 && this.$route.name.indexOf('PrintPage') === -1 &&
this.$route.name.indexOf('TravelContractConfirm') === -1 && this.$route.name.indexOf('ViittoContractConfirm') === -1 &&
this.$route.name.indexOf('OrderProfitLossList') === -1 && this.$route.name.indexOf('clientProtocol') === -1
&& this.$route.name.indexOf('clientDisclaimerProtocol')===-1
) {
let previousPathInfo = {
path: this.$route.name,
......@@ -279,7 +280,6 @@ export default {
}
var timestamp = (new Date()).valueOf();
this.apiurl = apiurl;
if (this.$route.path.toLowerCase() == "/signature") {
this.$router.push({
path: '/signature'
......@@ -327,7 +327,22 @@ export default {
guestId: guestId,
}
})
} else if (this.$route.path == "/TravelContractConfirm") {
}
else if(this.$route.path=="/clientDisclaimerProtocol")
{
let TCID = this.$route.query.TCID;
let OrderId = this.$route.query.OrderId;
let GuestId = this.$route.query.GuestId;
this.$router.push({
name: "clientDisclaimerProtocol",
query: {
TCID: TCID,
OrderId: OrderId,
GuestId: GuestId,
}
})
}
else if (this.$route.path == "/TravelContractConfirm") {
let ContractId = this.$route.query.ContractId;
this.$router.push({
name: "TravelContractConfirm",
......
src/router/config.js
View file @ e5d24f62
......@@ -4,6 +4,7 @@ import index from '../components/index'
import clientConfirm from '../components/clientConfirm'
import clientConfirmRB from '../components/clientConfirmRB'
import clientProtocol from '../components/clientProtocol'
import clientDisclaimerProtocol from '../components/clientDisclaimerProtocol'
import SignName from '../components/SignName'
import supplierLogin from '../components/SupplierLogin'
import supplierIndex from '../components/SupplierIndex'
......@@ -5882,6 +5883,11 @@ export default {
name: 'clientProtocol',
component: clientProtocol,
},
{
path: '/clientDisclaimerProtocol', //老人/孕妇免责协议签订
name: 'clientDisclaimerProtocol',
component: clientDisclaimerProtocol,
},
{
path: '/SignName',
name: 'SignName',
......@@ -5918,6 +5924,13 @@ export default {
meta: {
title: '价格保密协议'
}
},{
path: '/disclaimerProtocol', //老年人/孕妇参团免责
name: 'disclaimerProtocol',
component: resolve => require(['@/components/disclaimerProtocol'], resolve),
meta: {
title: '老年人/孕妇参团免责'
}
},
{
path: '/SingleContract', //单项合同
......
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