Commit 9820da26 authored by 华国豪's avatar 华国豪 🙄

1

parents f1f33c31 447180e5
......@@ -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";
......
......@@ -646,4 +646,7 @@ vertical-align:middle
border: none;
color: white;
}
.MyInput .el-input--mini .el-input__inner{
height:28px!important;
}
/************************** luochao 重新定义表格样式 END *******************************/
\ No newline at end of file
......@@ -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) {
......
......@@ -382,6 +382,7 @@
<span v-if="GetDetail.TemplateId==36 || GetDetail.TemplateId==37 || GetDetail.TemplateId==53 ||GetDetail.TemplateId==48 || (GetDetail.TemplateId==43&&GetDetail.IsPublic==4) || (GetDetail.TemplateId==56&&GetDetail.IsPublic==4)" class="sqs" @click="goUrl('Application',GetDetail.FrID)">
申请书{{GetDetail.FApplyForNumber}}下载
</span>
<span v-show="huijiShow" class="_Printing" @click="goPrintPageNew(GetDetail.Type,GetDetail.FrID,GetDetail.Is_Merge,OrderSource)">凭证打印</span>
<span class="_Printing" @click="goPrintPage(GetDetail.Type,GetDetail.FrID,GetDetail.Is_Merge,OrderSource)">打印单据</span>
</div>
......@@ -924,6 +925,7 @@ export default {
danjuType: '',
showModel: false,
CostTypeState:false,
huijiShow:false,
}
},components:{
'my-FlowChartModule': myFlowChartModule,
......@@ -946,6 +948,10 @@ export default {
this.pageIndex = this.$route.query.pageIndex;
let userinfo = this.getLocalStorage();
this.bossID = userinfo.EmployeeId;
let ActionMenuCode=userinfo.ActionMenuCode;
if(ActionMenuCode.indexOf('F_Update_KJCostType')!=-1){
this.huijiShow=true;
}
},methods:{
GourlCostType(path,num){
this.$router.push({
......@@ -1098,6 +1104,21 @@ export default {
}
},err=>{})
},
goPrintPageNew(type,id,Merge,OrderSource){
if(type===1){
let routeData = this.$router.resolve({
name: 'PrintPageN',
query: { type: type,id:id,isKehu:0,Merge:Merge,OrderSource:OrderSource?OrderSource:-1}
});
window.open(routeData.href, "_blank");
}else{
let routeData = this.$router.resolve({
name: 'PrintPageN',
query: { type: type,id:id,Merge:Merge,OrderSource:OrderSource?OrderSource:-1}
});
window.open(routeData.href, "_blank");
}
},
goPrintPage(type,id,Merge,OrderSource){
if(type===1){
// this.$confirm('是否打印客户联?', '提示', {
......
......@@ -286,6 +286,22 @@
</el-date-picker>
</el-form-item>
</el-col>
<!-- <el-col :span="4">
<el-form-item label="凭证费用:">
<el-select filterable v-model='msg.KJCostTypeId' >
<el-option :value="0" label="不限"></el-option>
<el-option v-for="item in GetCostTypeList" :key="item.ID" :value="item.ID" :label="item.Name"></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="4">
<el-form-item label="只查询凭证:">
<el-select filterable v-model='msg.IsSelectKJSetCostType' >
<el-option :value="0" label="否"></el-option>
<el-option :value="1" label="是"></el-option>
</el-select>
</el-form-item>
</el-col> -->
</template>
</el-row>
</el-form>
......@@ -802,6 +818,8 @@ export default {
QStartDate:'',
UpdateBy:'',
IsFormRecPayQuery:'1',
KJCostTypeId:0,
IsSelectKJSetCostType:0,
Sort:'2',
EmployeeId:'',
},
......@@ -1027,6 +1045,8 @@ export default {
if(!this.msg.Conditon)this.msg.Conditon=1;
if(!this.msg.TradeWay)this.msg.TradeWay=0;
if(!this.msg.AccountType)this.msg.AccountType=0;
if(!this.msg.KJCostTypeId)this.msg.KJCostTypeId=0;
if(!this.msg.IsSelectKJSetCostType)this.msg.IsSelectKJSetCostType=0;
this.loading= true;
this.apipost('Financial_post_GetALLPageList',this.msg,res=>{
if(res.data.resultCode == 1) {
......@@ -1075,6 +1095,8 @@ export default {
if(!this.msg.Conditon)this.msg.Conditon=1;
if(!this.msg.TradeWay)this.msg.TradeWay=0;
if(!this.msg.AccountType)this.msg.AccountType=0;
if(!this.msg.KJCostTypeId)this.msg.KJCostTypeId=0;
if(!this.msg.IsSelectKJSetCostType)this.msg.IsSelectKJSetCostType=0;
this.GetLocalFile("Financial_post_DownInOrOut", this.msg,"收支款.xls");
} ,
financeRemove(id){//作废
......@@ -1367,6 +1389,8 @@ export default {
OrderID:this.msg.OrderID==0?'':this.msg.OrderID,
Sort:this.msg.Sort,
EmployeeId:this.msg.EmployeeId,
KJCostTypeId:this.msg.KJCostTypeId==0?'':this.msg.KJCostTypeId,
IsSelectKJSetCostType:this.msg.IsSelectKJSetCostType==0?'':this.msg.IsSelectKJSetCostType,
}
this.msg = msg;
},
......
<style scoped>
._PrintPage{
width: 100%;
background-color: white;
position: absolute;
padding-top: 20px;
}
._PrintPage_box{
width: 1000px;
margin: 0 auto;
padding: 0 !important;
}
._border_1{
border: 1px solid #333333;
margin-bottom:30px;
/* page-break-after: always; */
}
/* @media print {
._PrintPage{
margin-left:-145px;
}
} */
._PrintPage_box{
position: relative;
}
._PrintPage_box .SetDiv{
position: absolute;
top:10px;
color:#106BAF;
left: -110px;
}
._PrintPage_box .SetDiv span{
color:#106BAF;
cursor: pointer;
}
</style>
<template v-loading="loading">
<div class="_PrintPage">
<div class="_PrintPage_box">
<template v-if="type==='2'&&(Merge==='0'||Merge===null)">
<div class="SetDiv">
<span @click="disabled=false">编辑</span>
<span @click="disabled=true">保存</span>
</div>
<div class="_border_1" v-for="(item,index) in loopNumT">
<my-Bill :disabled.sysc="disabled" :ID="id" :width="widthSon" :isPrintPage="true" :color="colorSon" :OrderSource="OrderSource" :name='index+1'></my-Bill>
</div>
</template>
<template v-else-if="type==='1'&&(Merge==='0'||Merge===null)">
<div class="SetDiv">
<span @click="disabled1=false">编辑</span>
<span @click="disabled1=true">保存</span>
</div>
<div class="_border_1" v-for="(item,index) in loopNumN">
<my-RVB-Bill :disabled.sysc="disabled1" v-on:helloPP="numAdd" :Num="num" :ID="id" :width="widthSon" :isPrintPage="true" :OrderSource="OrderSource" :color="colorSon" :name='index+1'></my-RVB-Bill>
</div>
</template>
<template v-if="type==='7'&&(Merge==='0'||Merge===null)">
<div class="_border_1" v-for="(item,index) in loopNumT">
<my-GZ-Bill :ID="id" :width="widthSon" :isPrintPage="true" :color="colorSon" :OrderSource="OrderSource" :name='index+1'></my-GZ-Bill>
</div>
</template>
<template v-if="Merge==='1'">
<div class="_border_1" v-for="(item,index) in loopNumN">
<my-HB-Bill v-on:helloPP="numAdd" :Num="num" :ID="id" :width="widthSon" :isPrintPage="true" :color="colorSon" :name='index+1'></my-HB-Bill>
</div>
</template>
</div>
</div>
</template>
<script>
import myBill from "./FinancialModule/FinancialSubmodule/BillModuleNew.vue";
import myrbvBill from "./FinancialModule/FinancialSubmodule/ReceivablesModuleNew.vue";
import myhrBill from "./FinancialModule/FinancialSubmodule/MergeBillModule.vue";
import myGZBill from "./FinancialModule/FinancialSubmodule/GZBillModule.vue";
export default {
data(){
return{
disabled1:true,
disabled:true,
loading:true,
id:null,
type:null,
isKehu:null,
widthSon:"100%",
colorSon:"#ffffff",
num:0,
loopNumN:this.$route.query.isKehu==='1'?3:2,
loopNumT:2,
Merge:null,
OrderSource:-1
}
},components:{
'my-Bill': myBill,
'my-RVB-Bill':myrbvBill,
'my-HB-Bill':myhrBill,
'my-GZ-Bill': myGZBill
},methods:{
numAdd(){
this.num = this.num + 1
}
},mounted(){
},created(){
this.id = this.$route.query.id;
this.type = this.$route.query.type;
this.isKehu = this.$route.query.isKehu;
this.Merge = this.$route.query.Merge;
this.OrderSource = this.$route.query.OrderSource;
}
}
</script>
......@@ -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() {
......
This diff is collapsed.
This source diff could not be displayed because it is too large. You can view the blob instead.
......@@ -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>
......
......@@ -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>
......@@ -203,7 +203,7 @@
<th width="80">{{$t('Operation.Op_daishou')}}</th>
<th width="60">{{$t('admin.admin_status')}}</th>
<th width="60">{{$t('fnc.khxinxi')}}</th>
<th v-if="userId==1" width="130">{{$t('system.table_operation')}}</th>
<th v-if="isEditOrderCreate==1||userId==1" width="130">{{$t('system.table_operation')}}</th>
</tr>
<tr>
<td v-show="OrderList.length==0" colspan="17" align="center">{{$t('system.content_noData')}}</td>
......@@ -380,7 +380,7 @@
</div>
</div>
</td>
<td :colspan="userId==1?9:8" class="groupTourOrder_tickets" style="height: 20px;cursor: pointer;"
<td :colspan="(isEditOrderCreate==1||userId==1)?9:8" class="groupTourOrder_tickets" style="height: 20px;cursor: pointer;"
@click="goUrlSFD('SalesFinancialDetail', '销售财务单据', item)">
<div>
<div style="white-space: nowrap">{{$t('fnc.skdanju')}}<span v-if="item.financeList.length===0"
......
......@@ -194,11 +194,11 @@ export default {
return {
modeList: [
{
name: "小程序",
name: "APP",
id: 1
},
{
name: "APP",
name: "小程序",
id: 2
}
],
......
......@@ -26,7 +26,9 @@
position: relative;
top: -3px;
}
.ContractManage .el-button+.el-button{
margin-left:0!important;
}
</style>
<template>
......@@ -85,10 +87,10 @@
<el-select v-model="msg.Status" :placeholder="$t('pub.pleaseSel')">
<el-option label="请选择" :value="-1" :key="-1"> </el-option>
<el-option label="草稿" :value="0" :key="0"> </el-option>
<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-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>
......@@ -116,12 +118,6 @@
</el-dropdown-menu>
</el-dropdown>
</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> -->
</ul>
</div>
<table class="singeRowTable" border="0" cellspacing="0" cellpadding="0" v-loading="loading">
......@@ -163,7 +159,7 @@
<td>{{ item.CreateByName }}</td>
<td>{{ item.CreateTimeStr }}</td>
<td>
<el-tooltip class="item" effect="dark" content="修改" placement="top-start">
<el-tooltip class="item" effect="dark" content="修改" placement="top-start" v-if="item.Status==0||item.Status==3">
<template v-if="item.CType == 3">
<el-button type="primary" icon="el-icon-edit" circle
@click="goContract('onedayTripContract', item.ID, '一日游合同')"></el-button>
......@@ -182,25 +178,26 @@
<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-tooltip class="item" effect="dark" content="下载" placement="top-start" v-if="item.Status==2">
<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-tooltip class="item" effect="dark" content="提交审核" placement="top-start" v-if="item.Status==0">
<el-button type="info" icon="el-icon-upload2" circle @click="SubmitContract(item)"></el-button>
</el-tooltip>
<el-tooltip class="item" effect="dark" content="复制链接发送给客户" placement="top-start">
<el-button type="info" icon="el-icon-upload2" circle @click="CopyUrl(item)"></el-button>
<el-tooltip class="item" v-if="item.Status==2" effect="dark" content="复制链接发送给客户">
<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-tooltip class="item" effect="dark" content="取消" placement="top-start" v-if="item.Status==0">
<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="iconfont icon-chakan" circle @click="ViewContract(item)" style="padding:4px;"></el-button>
</el-tooltip>
</td>
</tr>
</table>
<!-- 隐藏的复制项 -->
<input type="text" v-model="hidInput" id="copyObj" style="opacity:0">
<el-pagination background @current-change="handleCurrentChange" :current-page.sync="currentPage"
layout="total,prev, pager, next, jumper" :page-size="msg.pageSize" :total="total">
</el-pagination>
......@@ -215,7 +212,6 @@
currentPage: 1,
dataList: [],
loading: false, //页面加载
hidInput:'',
msg: {
T_ContractNum: "", //合同编号
CType: 0, //合同类型
......@@ -259,7 +255,7 @@
that.apipost(
"travelcontract_post_UpdateTravelContractStatusService", {
ID: item.ID,
Status: 2
Status: 1
},
res => {
if (res.data.resultCode == 1) {
......@@ -296,17 +292,14 @@
},
//复制URL
CopyUrl(item){
let Url="";
if(this.isOnline){
Url= window.location.hostname+'#/TravelContractConfirm?ContractId='+item.ID;
}
else{
Url= window.location.hostname+"/8080"+'#/TravelContractConfirm?ContractId='+item.ID;
}
this.hidInput=Url;
let url = document.querySelector('#copyObj');
url.select(); // 选择对象
document.execCommand("Copy");
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) {
......@@ -356,7 +349,7 @@
this.Confirm("是否取消此合同?", function () {
var msg = {
ID: item.ID,
Status: 1
Status: 4
};
that.apipost(
"travelcontract_post_UpdateTravelContractStatusService",
......@@ -383,6 +376,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);
......@@ -399,6 +402,17 @@
this.msg.pageIndex = val;
this.getList();
},
ViewContract(item)
{
this.$router.push({
name: "TravelContractView",
query: {
id: item.ID,
blank: "y",
tab: '预览合同'
}
});
},
goContract(path, Id, title) {
var nId = 0;
if (Id && Id > 0) {
......
......@@ -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 => {}
);
}
},
//提交
......
......@@ -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({
......
......@@ -56,6 +56,7 @@ export default {
title: '财务打印页面'
},
},
{
path: '/confirmationOrder',
name: 'confirmationOrder',
......@@ -4266,13 +4267,21 @@ export default {
},
},
{
path: '/TravelContractConfirm', //电子合同签名
path: '/TravelContractConfirm', //其他电子合同签名
name: 'TravelContractConfirm',
component: resolve => require(['@/components/TravelContractConfirm'], resolve),
meta: {
title: '电子合同签名'
},
},
{
path: '/TravelContractView', //其他电子合同签名
name: 'TravelContractView',
component: resolve => require(['@/components/TravelContractView'], resolve),
meta: {
title: '电子合同签名'
},
},
{
path: '/TravelContractDetail', //新电子合同详情
name: 'TravelContractDetail',
......@@ -4287,6 +4296,15 @@ export default {
name: 'supplierLogin',
component: supplierLogin
},
{ //财务打印页面
path: '/PrintPageN',
name: 'PrintPageN',
component: resolve => require(['@/components/PrintPageN'], resolve),
meta: {
title: '财务凭证打印页面'
},
},
{
path: '/supplierIndex', //供应商首页
name: 'supplierIndex',
......
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