Skip to content

S
SuperMan
Commit ae6518f4 authored by 黄媛媛's avatar 黄媛媛
Browse files
Options

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

parents cbee39ac 3ba30e45
Hide whitespace changes
Inline Side-by-side
Showing with 3554 additions and 88 deletions
src/App.vue
View file @ ae6518f4
......@@ -117,12 +117,12 @@ export default {
}
},
mounted() {
if (!this.getLocalStorage() && document.URL.indexOf("SupplierLogin")==-1&& document.URL.indexOf("clientConfirm")==-1) {
if (!this.getLocalStorage() && document.URL.indexOf("SupplierLogin")==-1&& document.URL.indexOf("clientConfirm")==-1&& document.URL.indexOf("TravelContractConfirm")==-1) {
this.$router.push({
path: '/login'
})
}else{
if(document.URL.indexOf("clientConfirm")!=-1){
if(document.URL.indexOf("clientConfirm")!=-1||document.URL.indexOf("TravelContractConfirm")!=-1){
localStorage.openMode=0
}else{
......@@ -173,7 +173,7 @@ export default {
}
</script>
<style>
@import "//at.alicdn.com/t/font_635492_jhwh1knmwnd.css";
@import "//at.alicdn.com/t/font_635492_3ih8u0oth65.css";
@import "./assets/css/Semibold.css";
@import "./assets/css/global/config.css";
@import "./assets/css/fileIcon.css";
......
src/components/DomesticTravelcontract.vue
View file @ ae6518f4
......@@ -312,6 +312,19 @@
*background-color: #003bb3;
}
.TC-MainContent .disClick {
background-color: #d1d1d1!important;
color: #fff!important;
background-image: none;
border: 1px solid #d1d1d1!important;
}
.TC-MainContent .disClick:hover {
background-color: #d1d1d1 !important;
cursor: default !important;
box-shadow: none !important;
}
</style>
<template>
<div class="TC-MainContent">
......@@ -328,7 +341,7 @@
<span style="color:blue;font-size:14px;"></span>
</span>
<div class="pull-right">
<input type="button" class="btn-warning" @click="submitForm('CtObj')" value="保存" />
<input type="button" class="btn-warning" :class="{'disClick':!isSubmit}" @click="submitForm('CtObj')" value="保存" />
</div>
</div>
<el-form label-width="180px" :model="CtObj" :rules="rules" ref="CtObj">
......@@ -1309,6 +1322,8 @@
ckedIndex: 0,
TripInfo: '',
tripStr: '切换到标准行程录入',
//防止重复提交
isSubmit: true,
};
},
components: {
......@@ -1336,20 +1351,24 @@
},
//提交数据
SaveMsg() {
this.apipost(
"travelcontract_post_SetTravelContractService",
this.CtObj,
res => {
if (res.data.resultCode == 1) {
this.CtObj.ID = res.data.data;
this.GetData();
this.Success(res.data.message);
} else {
this.Error(res.data.message);
}
},
err => {}
);
if (this.isSubmit) {
this.isSubmit = false;
this.apipost(
"travelcontract_post_SetTravelContractService",
this.CtObj,
res => {
this.isSubmit = true;
if (res.data.resultCode == 1) {
this.CtObj.ID = res.data.data;
this.GetData();
this.Success(res.data.message);
} else {
this.Error(res.data.message);
}
},
err => {}
);
}
},
//提交
submitForm(addMsg) {
......
src/components/SingleContract.vue
View file @ ae6518f4
......@@ -298,6 +298,18 @@
.TC-MainContent .ql-editor {
min-height: 200px;
}
.TC-MainContent .disClick {
background-color: #d1d1d1!important;
color: #fff!important;
background-image: none;
border: 1px solid #d1d1d1!important;
}
.TC-MainContent .disClick:hover {
background-color: #d1d1d1 !important;
cursor: default !important;
box-shadow: none !important;
}
</style>
<template>
......@@ -312,7 +324,7 @@
单项委托协议
</span>
<div class="pull-right">
<input type="button" class="btn-warning" @click="submitForm('CtObj')" value="保存" />
<input type="button" class="btn-warning" :class="{'disClick':!isSubmit}" @click="submitForm('CtObj')" value="保存" />
</div>
</div>
<el-form label-width="180px" :model="CtObj" :rules="rules" ref="CtObj">
......@@ -1399,6 +1411,8 @@
}
},
//防止重复提交
isSubmit: true,
//大写金额
AmountMoney: ''
......@@ -1417,20 +1431,24 @@
},
//提交数据
SaveMsg() {
this.apipost(
"travelcontract_post_SetTravelContractService",
this.CtObj,
res => {
if (res.data.resultCode == 1) {
this.CtObj.ID = res.data.data;
this.GetData();
this.Success(res.data.message);
} else {
this.Error(res.data.message);
}
},
err => {}
);
if (this.isSubmit) {
this.isSubmit = false;
this.apipost(
"travelcontract_post_SetTravelContractService",
this.CtObj,
res => {
this.isSubmit = true;
if (res.data.resultCode == 1) {
this.CtObj.ID = res.data.data;
this.GetData();
this.Success(res.data.message);
} else {
this.Error(res.data.message);
}
},
err => {}
);
}
},
//跳转至预览
goUrl() {
......
src/components/TravelContractConfirm.vue 0 → 100644
View file @ ae6518f4
This source diff could not be displayed because it is too large. You can view the blob instead.
src/components/TravelManager/TravelList/RegistrationList.vue
View file @ ae6518f4
......@@ -1252,7 +1252,7 @@
</el-col>
<el-col :span="4">
<el-form-item :label="$t('system.table_goCity')" prop="DepartureCityId">
<el-select v-model='addMsg.DepartureCityId' :disabled="IsUnion===1" filterable
<el-select v-model='addMsg.DepartureCityId' :disabled="IsUnion===2" filterable
:placeholder="$t('pub.pleaseSel')" @change="addMsg.IsIntermodal=2">
<el-option v-for="item in startCityList" :label='item.Name' :value='item.ID' :key='item.ID'>
</el-option>
......@@ -1270,7 +1270,7 @@
</el-col>
<el-col :span="4">
<el-form-item :label="$t('salesModule.BackCity')" prop="ReturnArriveCityId">
<el-select v-model='addMsg.ReturnArriveCityId' :disabled="IsUnion===1" filterable
<el-select v-model='addMsg.ReturnArriveCityId' :disabled="IsUnion===2" filterable
:placeholder="$t('pub.pleaseSel')" @change="addMsg.IsReturnIntermodal=2">
<el-option v-for="item in startCityList" :label='item.Name' :value='item.ID' :key='item.ID'>
</el-option>
......
src/components/TravelManager/TravelList/todayOrderTotal.vue
View file @ ae6518f4
......@@ -57,7 +57,7 @@
<span>
<em>{{$t('hotel.order_Number')}}</em>
</span>
<el-input class="w135" v-model="msg.tempOrderId" @keyup.native="checkInteger(msg,'tempOrderId')" ></el-input>
<el-input class="w135" v-model="msg.tempOrderId" @keyup.native="checkInteger(msg,'tempOrderId')" maxlength="10" ></el-input>
</li>
<li>
<span>
......
src/components/administrative/ContractManage.vue
View file @ ae6518f4
<style>
.ContractManage .query-box .el-button--primary {
background-color: #fff !important;
color: #e95252 !important;
border-color: #e95252 !important;
}
.ContractManage .query-box .el-button--primary:focus,
.query-box .el-button--primary:hover {
background-color: #fff !important;
color: #e95252 !important;
border-color: #e95252 !important;
}
.ContractManage .query-box .el-button {
border-radius: 16px;
height: 30px;
position: relative;
top:5px;
}
.ContractManage .query-box .el-button i {
color: #e95252;
}
.ContractManage .query-box .el-button span {
position: relative;
top: -3px;
}
.ContractManage .el-button+.el-button{
margin-left:0!important;
}
</style>
<template>
<div class="flexOne">
<div class="flexOne ContractManage">
<div class="query-box">
<ul>
<li>
......@@ -31,12 +64,22 @@
</span>
</li>
<li>
<span><em>{{ $t("sm.Date") }}</em>
<el-date-picker v-model="msg.StartDate" class="w135" value-format="yyyy-MM-dd" type="date"
:picker-options="pickerBeginDateBefore"></el-date-picker>
-
<el-date-picker v-model="msg.EndDate" class="w135" value-format="yyyy-MM-dd" type="date"
:picker-options="pickerBeginDateAfter"></el-date-picker>
<span><em>团号</em>
<el-input class="w210" v-model="msg.C_TCNUM" placeholder="请输入团号" @keyup.enter.native="getList">
</el-input>
</span>
</li>
<li>
<span><em>线路名称</em>
<el-input class="w210" v-model="msg.C_ProductName" placeholder="请输入线路名称" @keyup.enter.native="getList">
</el-input>
</span>
</li>
<li>
<span><em>经办人</em>
<el-input class="w210" v-model="msg.TravelAgency_DealMan" placeholder="请输入经办人"
@keyup.enter.native="getList">
</el-input>
</span>
</li>
<li>
......@@ -47,21 +90,40 @@
<el-option label="已取消" :value="1" :key="1"> </el-option>
<el-option label="已提交" :value="2" :key="2"> </el-option>
<el-option label="已盖章" :value="3" :key="3"> </el-option>
<el-option label="已签字" :value="4" :key="4"> </el-option>
</el-select>
</span>
</li>
<li>
<span><em>{{ $t("sm.Date") }}</em>
<el-date-picker v-model="msg.StartDate" class="w135" value-format="yyyy-MM-dd" type="date"
:picker-options="pickerBeginDateBefore"></el-date-picker>
-
<el-date-picker v-model="msg.EndDate" class="w135" value-format="yyyy-MM-dd" type="date"
:picker-options="pickerBeginDateAfter"></el-date-picker>
</span>
</li>
<li>
<input type="button" class="normalBtn" :value="$t('pub.searchBtn')" @click="
getList();
resetPageIndex();
" />
<el-dropdown @command="getImport">
<el-button type="primary" @click="goContract('onedayTripContract', 0, '一日游合同')" > 一日游合同
<i class="el-icon-arrow-down el-icon--right"></i>
</el-button>
<el-dropdown-menu slot="dropdown">
<el-dropdown-item command="1">境内旅游合同</el-dropdown-item>
<el-dropdown-item command="2">单项委托合同</el-dropdown-item>
</el-dropdown-menu>
</el-dropdown>
</li>
<li>
<!-- <li>
<input type="button" @click="goContract('onedayTripContract', 0, '一日游合同')" class="normalBtn" value="一日游合同" />
<input type="button" @click="goContract('DomesticTravelcontract', 0, '境内旅游合同')" class="normalBtn"
value="境内旅游合同" />
<input type="button" @click="goContract('SingleContract', 0, '单项委托合同')" class="normalBtn" value="单项委托合同" />
</li>
</li> -->
</ul>
</div>
<table class="singeRowTable" border="0" cellspacing="0" cellpadding="0" v-loading="loading">
......@@ -119,17 +181,21 @@
</template>
</el-tooltip>
<el-tooltip class="item" effect="dark" content="复制" placement="top-start">
<el-button type="warning" icon="iconfont icon-copy" circle @click="CopyContract(item)" style="padding:4px;"></el-button>
<el-button type="warning" icon="iconfont icon-copy" circle @click="CopyContract(item)" style="padding:4px;">
</el-button>
</el-tooltip>
<el-tooltip class="item" effect="dark" content="下载" placement="top-start">
<el-button type="success" icon="el-icon-download" circle @click="DownLoadContract(item)"></el-button>
</el-tooltip>
<el-tooltip class="item" effect="dark" content="取消" placement="top-start">
<el-button type="danger" icon="el-icon-close" circle @click="DeleteContract(item)"></el-button>
</el-tooltip>
<el-tooltip class="item" effect="dark" content="提交并盖章" placement="top-start">
<el-button type="danger" icon="el-icon-close" circle @click="SubmitContract(item)"></el-button>
<el-button type="info" icon="el-icon-upload2" circle @click="SubmitContract(item)"></el-button>
</el-tooltip>
<el-tooltip class="item" v-if="item.Status==2" effect="dark" content="复制链接发送给客户" placement="top-start">
<el-button type="info" icon="iconfont icon-copy-l" circle @click="CopyUrl(item)" style="padding:4px;background-color:#9266f9;border-color:#9266f9;"></el-button>
</el-tooltip>
<el-tooltip class="item" effect="dark" content="取消" placement="top-start">
<el-button type="danger" icon="el-icon-close" circle @click="DeleteContract(item)"></el-button>
</el-tooltip>
</td>
</tr>
......@@ -157,7 +223,10 @@
EndDate: "", //结束日期
Status: -1, //合同状态
pageIndex: 1,
pageSize: 15
pageSize: 15,
TravelAgency_DealMan: "", //经办人
C_TCNUM: "", //团号
C_ProductName: "", //线路名称
},
pickerBeginDateBefore: {
disabledDate: time => {
......@@ -182,14 +251,13 @@
},
methods: {
//提交并盖章
SubmitContract(item)
{
SubmitContract(item) {
var that = this;
this.Confirm("是否提交并盖章此合同?", function () {
that.apipost(
"travelcontract_post_UpdateTravelContractStatusService", {
ID: item.ID,
Status:2
Status: 2
},
res => {
if (res.data.resultCode == 1) {
......@@ -224,6 +292,26 @@
);
});
},
//复制URL
CopyUrl(item){
var oInput = document.createElement('input');
oInput.value = item.Url;
document.body.appendChild(oInput);
oInput.select(); // 选择对象
document.execCommand("Copy"); // 执行浏览器复制命令
oInput.className = 'oInput';
oInput.style.display='none';
this.Info("复制成功!");
},
//跳转
getImport(command) {
if(command==1){
this.goContract('DomesticTravelcontract', 0, '境内旅游合同');
}else if(command==2){
this.goContract('SingleContract', 0, '单项委托合同');
}
},
//下载合同
DownLoadContract(item) {
let msg = {
......@@ -263,7 +351,7 @@
this.Confirm("是否取消此合同?", function () {
var msg = {
ID: item.ID,
Status:1
Status: 1
};
that.apipost(
"travelcontract_post_UpdateTravelContractStatusService",
......@@ -290,6 +378,16 @@
this.loading = false;
if (res.data.resultCode == 1) {
this.dataList = res.data.data.pageData;
this.dataList.forEach(x=>{
let Url="";
if(this.isOnline()){
Url= window.location.hostname+'/#/TravelContractConfirm?ContractId='+x.ID;
}
else{
Url= window.location.hostname+":8080/"+'#/TravelContractConfirm?ContractId='+x.ID;
}
x.Url=Url;
})
this.total = res.data.data.count;
} else {
this.Error(res.data.message);
......
src/components/busManagement/busUsePrice.vue
View file @ ae6518f4
......@@ -389,7 +389,7 @@
</el-form-item>
</el-col>
<el-col :span="5">
<el-form-item :label="$t('ground.songjiBj')" prop="SendPrice" style="display:none;">
<el-form-item :label="$t('ground.songjiBj')" style="display:none;">
<el-input v-model="addMsg.SendPrice" @keyup.native="checkPrice(addMsg,'SendPrice')"></el-input>
</el-form-item>
</el-col>
......@@ -404,7 +404,7 @@
</el-form-item>
</el-col>
<el-col :span="5" style="display:none;">
<el-form-item label="小时报价" prop="HourPrice">
<el-form-item label="小时报价" >
<el-input v-model="addMsg.HourPrice" @keyup.native="checkPrice(addMsg,'HourPrice')"></el-input>
</el-form-item>
</el-col>
......
src/components/leaderPay2.vue
View file @ ae6518f4
......@@ -1652,21 +1652,22 @@
let list = []
for (var j = 0; j < Diningdest.length; j++) {
var dj = Diningdest[j];
if (dj.UseTimeStr == ai.UseTimeStr && dj.NewDiningID == ai.NewDiningID) {
if (dj.id == (ai.NewDiningID + ai.UseTimeStr + ai.UseDinnerTypeStr)) {
dj.data.push(ai);
break;
} else {
list.push(ai)
}
}
for (let i = 0; i < list.length; i++) {
Diningdest.push({
UseTimeStr: ai.UseTimeStr,
DiningID: ai.NewDiningID,
id: ai.NewDiningID + ai.UseTimeStr + ai.UseDinnerTypeStr,
data: [ai]
});
}
// else {
// list.push(ai)
// }
}
// for (let i = 0; i < list.length; i++) {
// Diningdest.push({
// UseTimeStr: ai.UseTimeStr,
// DiningID: ai.NewDiningID,
// id: ai.NewDiningID + ai.UseTimeStr + ai.UseDinnerTypeStr,
// data: [ai]
// });
// }
}
}
for (var i = 0; i < Diningdest.length; i++) {
......
src/components/onedayTripContract.vue
View file @ ae6518f4
......@@ -333,6 +333,18 @@
background-color: #0044cc;
*background-color: #003bb3;
}
.TC-MainContent .disClick {
background-color: #d1d1d1!important;
color: #fff!important;
background-image: none;
border: 1px solid #d1d1d1!important;
}
.TC-MainContent .disClick:hover {
background-color: #d1d1d1 !important;
cursor: default !important;
box-shadow: none !important;
}
</style>
<template>
......@@ -351,7 +363,7 @@
<span style="color:blue;font-size:14px;"></span>
</span>
<div class="pull-right">
<input type="button" v-if="CtObj.auditContract != 2" class="btn-warning" @click="submitForm('CtObj')"
<input type="button" :class="{'disClick':!isSubmit}" class="btn-warning" @click="submitForm('CtObj')"
value="保存" />
</div>
</div>
......@@ -1192,6 +1204,8 @@
],
ckedIndex: 0,
TripInfo: '',
//防止重复提交
isSubmit: true,
};
},
components: {
......@@ -1205,20 +1219,24 @@
},
//提交数据
SaveMsg() {
this.apipost(
"travelcontract_post_SetTravelContractService",
this.CtObj,
res => {
if (res.data.resultCode == 1) {
this.CtObj.ID = res.data.data;
this.GetData();
this.Success(res.data.message);
} else {
this.Error(res.data.message);
}
},
err => {}
);
if (this.isSubmit) {
this.isSubmit = false;
this.apipost(
"travelcontract_post_SetTravelContractService",
this.CtObj,
res => {
this.isSubmit = true;
if (res.data.resultCode == 1) {
this.CtObj.ID = res.data.data;
this.GetData();
this.Success(res.data.message);
} else {
this.Error(res.data.message);
}
},
err => {}
);
}
},
//提交
......
src/plug/index.js
View file @ ae6518f4
......@@ -111,9 +111,7 @@ export default {
//域名管理对象
Vue.prototype.domainManager = function () {
let domainUrl = '';
//domainUrl = "http://192.168.2.214:8082";
//domainUrl = "http://192.168.2.65:8025";
domainUrl = "http://192.168.2.16:8083"; // 吴春
domainUrl = "http://192.168.2.214:8082";
let locationName = window.location.hostname;
let javaUrldo="";
......@@ -233,7 +231,7 @@ export default {
//HTTP提交数据
Vue.prototype.apipost = function (cmd, msg, successCall, faildCall, isOnline) {
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) {
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) {
let previousPathInfo = {
path: this.$route.name,
......@@ -261,6 +259,10 @@ export default {
let TCID=this.$route.query.TCID;
let orderID=this.$route.query.orderID;
this.$router.push({ name: "clientConfirm",query: {TCID:TCID,orderID:orderID}})
}
else if (this.$route.path == "/TravelContractConfirm") {
let ContractId=this.$route.query.ContractId;
this.$router.push({ name: "TravelContractConfirm",query: {ContractId:ContractId}})
} else {
if (!localStorage.userInfo && localStorage.userInfo != "" && this.$route.path.toLowerCase() != "/login") {
this.$router.push({
......
src/router/config.js
View file @ ae6518f4
......@@ -4265,6 +4265,14 @@ export default {
title: '一日游合同'
},
},
{
path: '/TravelContractConfirm', //电子合同签名
name: 'TravelContractConfirm',
component: resolve => require(['@/components/TravelContractConfirm'], resolve),
meta: {
title: '电子合同签名'
},
},
{
path: '/TravelContractDetail', //新电子合同详情
name: 'TravelContractDetail',
......
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