Skip to content

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

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

parents bd338d66 2767a96d
Hide whitespace changes
Inline Side-by-side
Showing with 243 additions and 103 deletions
src/components/Contract/ElectronicContract.vue
View file @ fce612a0
......@@ -1171,7 +1171,7 @@
</div>
<div class="EC_floatdiv">
<input type="button" class="normalBtn" v-if="dataList.status==1" @click="getinvalid()" value="作废" />
<input type="button" class="normalBtn" @click="isShowFade=true,GetQrCode()" value="客户签字" />
<input type="button" class="normalBtn" v-if="dataList.companySignature==''" @click="isShowFade=true,GetQrCode()" value="客户签字" />
<input type="button" class="normalBtn" v-if="dataList.companySignature!=''" value="下载" @click="toContractPDF(dataList.contractNum)" />
</div>
</div>
......
src/components/Contract/TravelContract.vue
View file @ fce612a0
......@@ -10,7 +10,6 @@
float:left;
width: 150px;
height: 100%;
/* margin-left: 30px; */
position: fixed;
margin-top:100px;
}
......@@ -822,7 +821,7 @@
</el-form>
<div style="margin-top:20px;">
<input type="button" v-if="CtObj.status==1&&CtObj.auditContract==0" class="normalBtn" style="margin:0 0 30px 60px;" @click="sendAudit()" value="提交审核"/>
<input type="button" class="normalBtn" @click="submitForm('CtObj')" value="保存"/>
<input type="button" v-if="CtObj.auditContract==0" class="normalBtn" @click="submitForm('CtObj')" value="保存"/>
<input type="button" class="normalBtn" v-if="CtObj.status==1" @click="goUrl()" value="预览">
<input type="button" class="normalBtn" v-if="CtObj.status==1" @click="getinvalid()" value="作废">
</div>
......
src/components/TravelManager/TravelList/HotelOrderTotal.vue
View file @ fce612a0
......@@ -137,10 +137,7 @@
color: #000000;
text-decoration: underline;
}
.SalesHotelOrder i.icon-sousuo,.icon-zhuanhuan1{background-color: #47BF8C;}
.SalesHotelOrder i.icon-sousuo:hover{background-color: #66bb97}
.SalesHotelOrder i.icon-sousuo:active{background-color: #35ab79}
.SalesHotelOrder i.Logo_iconfont{width: 30px;height: 30px;display: inline-block;color: white !important;border-radius: 50%;text-align: center;line-height: 30px;margin-right: 10px;cursor: pointer;outline: none;}
</style>
<template>
......@@ -296,6 +293,7 @@
<tr>
<th>订单号</th>
<th>第三方订单号</th>
<th>团号</th>
<th>房间数</th>
<th>总额</th>
<th>实收</th>
......@@ -304,11 +302,9 @@
<th>待收金额</th>
<th>订单状态</th>
<th>创建时间</th>
<th>入住时间</th>
<th>离店时间</th>
<th>入住/离店时间</th>
<th>取消费用</th>
<th>客户名称</th>
<th>客户手机号</th>
<th>客户信息</th>
<th>创建人</th>
<th>结束时间</th>
<th>操作</th>
......@@ -317,36 +313,41 @@
<tr>
<td style="border-bottom:2px solid #333" rowspan="2">{{item.OrderID}}</td>
<td>{{item.ThirdOrderNo}}</td>
<td><span class="cursorpointer text-decoration" @click="GotoUrl(item.TCNUM)" v-if="item.TCID">{{item.TCNUM}}({{item.TCID}})</span></td>
<td>{{item.Number}}</td>
<td>{{item.TotalPrice}}</td>
<td>{{item.Income}}</td>
<td>{{item.RedEnvelopeMoney}}</td>
<td>{{item.DiscountMoney}}</td>
<td>{{item.DueinMoney}}</td>
<td>
<span :class="item.OrderStatus=='已取消'?'color_red_order':''">{{item.OrderStatus}}</span>
</td>
<td>{{item.CreateDateStr}}</td>
<td>{{item.CheckInStr}}</td>
<td>{{item.CheckOutStr}}</td>
<td>{{item.CheckInStr}}-{{item.CheckOutStr}}</td>
<td>{{item.CancelFee}}</td>
<td>{{item.CustomerName}}</td>
<td>{{item.CustomerPhone}}</td>
<td>{{item.CustomerName}}/{{item.CustomerPhone}}</td>
<td>{{item.CreateByStr}}</td>
<td>{{item.EndTime}}</td>
<td>
<el-row>
<el-tooltip class="item" effect="dark" content="付款" placement="top-start">
<el-button type="primary" icon="iconfont icon-fukuan2" @click="getShouKuan(item)" circle></el-button>
</el-tooltip>
<el-tooltip class="item" v-if="item.ShowBtn" effect="dark" content="取消" placement="top-start">
<el-button type="danger" icon="iconfont icon-quxiao1" circle @click="cancelHTorder(item.ThirdOrderNo)"></el-button>
</el-tooltip>
<el-tooltip class="item" effect="dark" content="详情" placement="top-start">
<i class="Logo_iconfont iconfont icon-sousuo" @click="goOrderDetails(item.OrderID)"></i>
</el-tooltip>
<el-button-group>
<el-tooltip class="item" effect="dark" content="付款" placement="top-start">
<el-button type="primary" icon="iconfont icon-fukuan2" @click="getShouKuan(item)" ></el-button>
</el-tooltip>
<el-tooltip class="item" v-if="item.ShowBtn" effect="dark" content="取消订单" placement="top-start">
<el-button type="info" icon="iconfont icon-quxiao1" @click="cancelHTorder(item.ThirdOrderNo)"></el-button>
</el-tooltip>
<el-tooltip class="item" effect="dark" content="确定" placement="top-start">
<el-button type="success" icon="iconfont icon-duigou" @click="queren(1, item.OrderID)" ></el-button>
</el-tooltip>
<el-tooltip class="item" effect="dark" content="取消确认" placement="top-start">
<el-button type="info" icon=" iconfont icon-quxiao1" @click="queren(0, item.OrderID)"></el-button>
</el-tooltip>
<el-tooltip class="item" effect="dark" content="关联团" placement="top-start">
<el-button type="warning" icon="iconfont icon-guanlian" @click="TCID = '',GLOrderID = item.OrderID,dialogFormVisible = true"></el-button>
</el-tooltip>
</el-button-group>
</el-row>
</td>
</tr>
......@@ -395,7 +396,32 @@
<i class="iconfont icon-kong"></i>
<p>{{$t("active.ld_noData")}}</p>
</div>
<el-dialog title="请选择团号" width="400px" :visible.sync="dialogFormVisible" center :before-close="closeChangeMachie">
<el-form label-width="110px">
<el-form-item label="团号">
<el-select
v-model="TCID"
filterable
remote
reserve-keyword
:placeholder="$t('pub.pleaseImport')"
:remote-method="remoteMethodTCNum"
:loading="loading2">
<el-option
v-for="item in searchList"
:key="item.TCID"
:label="item.TCNUM"
:value="item.TCID">
<span style="float: left">{{ item.TCNUM }}</span>
</el-option>
</el-select>
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<button class="hollowFixedBtn" @click="dialogFormVisible=false,GLOrderID = ''">{{$t('pub.cancelBtn')}}</button>
<button class="normalBtn" type="primary" @click="querenGL">{{$t('pub.sureBtn')}}</button>
</div>
</el-dialog>
<el-pagination background @current-change="handleCurrentChange" :current-page.sync="currentPage" layout="total,prev, pager, next, jumper"
:page-size=msg.pageSize :total=total>
</el-pagination>
......@@ -418,6 +444,8 @@ export default {
CStartTime:'',
CEndTime:''
},
TCID: '',
GLOrderID: '',
total:0,
currentPage: 1,
loading:false,
......@@ -490,10 +518,71 @@ export default {
DepartmentList:[],
EmployeeList:[],
//统计快
TotalMsg:[]
TotalMsg:[],
searchList: [],
loading2: false,
dialogFormVisible: false,
};
},
methods: {
GotoUrl(TCNUM) {
this.$router.push({
path: "TravelControlList",
query: {
tcmun: TCNUM,
blank: 'y',
tab: "团控查询",
}
});
},
querenGL(){
this.apipost("dmc_post_get_RelevanceTCID",{ TCID: this.TCID, OrderID: this.GLOrderID },res => {
if (res.data.resultCode == 1) {
this.Success(res.data.message);
this.getList();
this.dialogFormVisible = false
}
},err => {});
},
closeChangeMachie(done) { // 弹=窗口关闭
done();
},
remoteMethodTCNum(query) {
if (query !== ''||this.addShow) {
this.loading2 = true;
this.apipost("InvoiceApply_get_GetPriceList",{ TCNUM:query },res => {
if (res.data.resultCode == 1) {
this.searchList = res.data.data;
this.loading2 = false;
}
},err => {});
} else {
this.searchList = [];
this.loading2 = false;
}
},
queren(type, OrderID){
let text = type == 1 ? '确认' : '取消'
this.$confirm('确定“'+ text +'”订单？', this.$t('tips.tips'), {
confirmButtonText: this.$t('pub.sureBtn'),
cancelButtonText: this.$t('pub.cancelBtn'),
type: 'warning'
}).then(() => {
this.apipost('dmc_post_get_UpdateOrderCanClear',{OrderID: OrderID, IsCanClear: type},res=>{
if(res.data.resultCode==1){
this.Success(res.data.message);
this.getList();
}else{
this.Error(res.data.message);
}
},err=>{})
}).catch(() => {
this.$message({
type: 'info',
message: this.$t('ios.yi') + this.$t('pub.cancelBtn')
});
});
},
goOrderDetails(ID){
this.$router.push({
name: 'OpHotelOrderDetail',
......@@ -518,7 +607,7 @@ export default {
let userInfo = this.getLocalStorage();
let EmployeeId = userInfo.EmployeeId;
this.dataList.forEach(x=>{
if(x.CreateBy==EmployeeId||EmployeeId==1){
if((x.CreateBy == EmployeeId ||EmployeeId == 1 || EmployeeId == 5) && x.IsCanOrder){
x.ShowBtn = true;
}else{
x.ShowBtn = false;
......
src/components/TravelManager/TravelList/RegistrationList.vue
View file @ fce612a0
......@@ -5057,15 +5057,27 @@
},
//跳转至领取合同
goContract(item){
let routeData = this.$router.resolve({
name: 'TravelContract',
query: {
TCID: item.TCID,
orderID:item.OrderId,
blank: 'y'
}
})
window.open(routeData.href, '_blank')
if(item.ContractNum){
let routeData = this.$router.resolve({
name: 'ElectronicContract',
query: {
TCID: item.TCID,
orderID:item.OrderId,
blank: 'y'
}
})
window.open(routeData.href, '_blank')
}else{
let routeData = this.$router.resolve({
name: 'TravelContract',
query: {
TCID: item.TCID,
orderID:item.OrderId,
blank: 'y'
}
})
window.open(routeData.href, '_blank')
}
},
Discount(TCID) {
this.SpecialOffer = true
......
src/components/activity/PersonnelManagement.vue
View file @ fce612a0
......@@ -127,6 +127,8 @@
<th @click="sort" data-key="IncomeMoney">收款次数</th>
<th @click="sort" data-key="Tousu">处理投诉</th>
<th @click="sort" data-key="SeeOldClient">拜访老客户</th>
<th @click="sort" data-key="ClientSelfOrders">同行自行报名</th>
<th @click="sort" data-key="Balance">幸福存折余额</th>
</tr>
</thead>
</table>
......@@ -347,6 +349,18 @@
@click="chosen(index,32)"
class="even"
>{{item.SeeOldClient}}</td>
<td
@mouseleave="outTable"
@mouseover="activeTd(index,33)"
@click="chosen(index,33)"
class="even"
>{{item.ClientSelfOrders}}</td>
<td
@mouseleave="outTable"
@mouseover="activeTd(index,34)"
@click="chosen(index,34)"
class="even"
>{{item.Balance}}</td>
</tr>
</tbody>
</table>
......@@ -414,6 +428,9 @@ export default {
this.init();
this.startMove();
},
destroyed() {
document.onkeydown=null;
},
methods: {
showCareer(){
let temp=this.tableData[this.chosenTD.row].EmployeeId
......@@ -474,7 +491,7 @@ export default {
that.chosen(that.chosenTD.row, that.chosenTD.col - 1);
}
} else if (e.keyCode == 39) {
if (that.chosenTD.col + 1 < 33) {
if (that.chosenTD.col + 1 < 35) {
that.chosen(that.chosenTD.row, that.chosenTD.col + 1);
}
} else if (e.keyCode == 188) {
......
src/components/administrative/ElectronicAudit.vue
View file @ fce612a0
<style>
.ElectronicAudit .icon-shenhebohui{
color:#fff;
}
</style>
<template>
......@@ -6,28 +9,49 @@
<div class="query-box">
<ul>
<li>
<label class="">合同编号</label>
<el-input :placeholder="$t('system.ph_in')" v-model="msg.contractNum" @keyup.native.enter="getList" class="w210"></el-input>
<span>
<em>合同编号</em>
<el-input :placeholder="$t('system.ph_in')" v-model="msg.contractNum" @keyup.native.enter="getList" class="w210"></el-input>
</span>
</li>
<li>
<label class="">产品名称</label>
<el-input :placeholder="$t('system.ph_in')" v-model="msg.productName" @keyup.native.enter="getList" class="w210"></el-input>
<span>
<em>产品名称</em>
<el-input :placeholder="$t('system.ph_in')" v-model="msg.productName" @keyup.native.enter="getList" class="w210"></el-input>
</span>
</li>
<li>
<label class="">订单号</label>
<el-input :placeholder="$t('system.ph_in')" v-model="msg.orderID" @keyup.native.enter="getList" class="w210"></el-input>
<span>
<em>订单号</em>
<el-input :placeholder="$t('system.ph_in')" v-model="msg.orderID" @keyup.native.enter="getList" class="w210"></el-input>
</span>
</li>
<li>
<label class="">团号</label>
<span>
<em>团号</em>
<el-input :placeholder="$t('system.ph_in')" v-model="msg.tcid" @keyup.native.enter="getList" class="w210"></el-input>
</span>
</li>
<li>
<label>日期</label>
<span>
<em>状态</em>
<el-select v-model='msg.auditContract' filterable :placeholder="$t('pub.pleaseSel')">
<el-option label='不限' value=''></el-option>
<el-option label='驳回' :value='0'></el-option>
<el-option label='待审核' :value='1'></el-option>
<el-option label='审核通过' :value='2'></el-option>
</el-select>
</span>
</li>
<li>
<span>
<em>日期</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.returnDate' class='w135' value-format="yyyy-MM-dd" type="date"
:picker-options="pickerBeginDateAfter"></el-date-picker>
</span>
</li>
<li>
<input type="button" class="hollowFixedBtn" value="查询" @click="getList()" />
......@@ -43,6 +67,7 @@
<th>产品名称</th>
<th>出发日期</th>
<th>返回日期</th>
<th>状态</th>
<th width="200">操作</th>
</tr>
<tr v-for="item in dataList">
......@@ -50,15 +75,28 @@
<td>{{item.orderId}}</td>
<td>{{item.tcid}}</td>
<td>{{item.productName}}</td>
<td>{{getDate(item.startDate)}}</td>
<td>{{getDate(item.returnDate)}}</td>
<td>
<template v-if="item.startDate!=null">
{{getDate(item.startDate)}}
</template>
</td>
<td>
<template v-if="item.returnDate!=null">
{{getDate(item.returnDate)}}
</template>
</td>
<td>
<span v-if="item.auditContract==0" style="color:red;">已驳回</span>
<span v-if="item.auditContract==1" style="color:blue;">待审核</span>
<span v-if="item.auditContract==2" style="color:green;">审核通过</span>
</td>
<td>
<el-row>
<el-tooltip class="item" effect="dark" content="审核通过" placement="top-start">
<el-button type="primary" icon="iconfont icon-shenpi" @click="AuditElec(2)" circle></el-button>
<el-button type="primary" icon="iconfont icon-shenpi" @click="AuditElec(item,2)" circle></el-button>
</el-tooltip>
<el-tooltip class="item" effect="dark" content="驳回" placement="top-start">
<el-button type="danger" icon="iconfont icon-shenhebohui" @click="AuditElec(0)" circle></el-button>
<el-button type="danger" v-if="item.auditContract!=0" icon="iconfont icon-shenhebohui" @click="AuditElec(item,0)" circle></el-button>
</el-tooltip>
<el-tooltip class="item" effect="dark" content="查看" placement="top-start">
<el-button type="danger" icon="iconfont icon-chakan" @click="goToDetail(item)" circle></el-button>
......@@ -86,7 +124,8 @@ export default {
orderID:'',
tcid:'',
startDate:'',
returnDate:''
returnDate:'',
auditContract:''
},
dataList:[],
loading:false,
......@@ -130,7 +169,6 @@ export default {
this.loading=true;
this.apiJavaPost("/api/contract/auditContract",this.msg,res => {
this.loading=false;
console.log(res,'ressss');
if (res.data.resultCode === 1) {
this.dataList = res.data.data;
} else {
......@@ -139,10 +177,9 @@ export default {
},null);
},
//审核通过或者驳回
AuditElec(type){
let msg = this.dataList[0];
msg.auditContract=type;
this.apiJavaPost("/api/contract/dosaveOrUpdate",msg,res => {
AuditElec(item,type){
item.auditContract=type;
this.apiJavaPost("/api/contract/dosaveOrUpdate",item,res => {
if (res.data.resultCode === 1) {
this.Success(res.data.message);
this.getList();
......@@ -152,9 +189,8 @@ export default {
},null);
},
getDate(date) {
return moment(date).format("YYYY-MM-DD");
},
return moment(date).format("YYYY-MM-DD");
}
},
mounted() {
this.getList();
......
src/components/administrative/ExaminationStatistics.vue
View file @ fce612a0
......@@ -238,30 +238,30 @@ export default {
return `<span>${rowData.rejectCount <= 0 ? '' : rowData.rejectCount}</span>`
}
};
let receivedPeopleCount = {
field: "receivedPeopleCount",
title: "收客总人数",
titleAlign: "left",
columnAlign: "left",
isResize: true,
width: 100,
orderBy: "",
formatter: function(rowData, rowIndex, pagingIndex, field) {
return `<span>${rowData.receivedPeopleCount <= 0 ? '' : rowData.receivedPeopleCount}</span>`
}
};
let orderCount = {
field: "orderCount",
title: "订单数量",
titleAlign: "left",
columnAlign: "left",
isResize: true,
width: 80,
orderBy: "",
formatter: function(rowData, rowIndex, pagingIndex, field) {
return `<span>${rowData.orderCount <= 0 ? '' : rowData.orderCount}</span>`
}
};
// let receivedPeopleCount = {
// field: "receivedPeopleCount",
// title: "收客总人数",
// titleAlign: "left",
// columnAlign: "left",
// isResize: true,
// width: 100,
// orderBy: "",
// formatter: function(rowData, rowIndex, pagingIndex, field) {
// return `<span>${rowData.receivedPeopleCount <= 0 ? '' : rowData.receivedPeopleCount}</span>`
// }
// };
// let orderCount = {
// field: "orderCount",
// title: "订单数量",
// titleAlign: "left",
// columnAlign: "left",
// isResize: true,
// width: 80,
// orderBy: "",
// formatter: function(rowData, rowIndex, pagingIndex, field) {
// return `<span>${rowData.orderCount <= 0 ? '' : rowData.orderCount}</span>`
// }
// };
let uncollected = {
field: "uncollected",
title: "未收款金额",
......
src/components/clientConfirm.vue
View file @ fce612a0
......@@ -34,17 +34,6 @@
.dic_content .content_table font{min-width:0;}
.dic_content .float_div {position:fixed;bottom:0;line-height:50px;background-color:#F2F2F2;width:1190px;padding-left:10px;height:50px;display:block;vertical-align:middle;text-align:match-parent;}
.dic_content .btn_mine {font-size: 15px;color: #fff;text-align: center;position: relative;display: inline-block;height: 24px;background-color: #b00;border-radius: 5px;-webkit-border-radius: 5px;-moz-border-radius: 5px;border: none;
cursor: pointer;
min-width: 80px;
background-image: -webkit-gradient(
linear,
0% 0%,
0% 100%,
color-stop(0, #d95454),
color-stop(1,#b00)
);
}
.dic_content .leftSign{float:left;width:50%;margin:70px 0;height:auto;line-height:45px;}
.dic_content .rightSign{float:right;width:49%;height:auto;margin:70px 0;line-height:45px;}
.dic_content .leftSign span{display:inline-block;width:170px;text-align:right;}
......@@ -748,12 +737,12 @@
<p style="margin:20px 0;">出境社经办人：<font>{{dataList.agentName}}</font></p>
</div>
<div style="text-align:center;margin:20px 0">
<input type="button" class="CliConfirmBtn" value="签字确认" @click="dialogVisible=true" />
<input type="button" class="CliConfirmBtn" v-if="dataList.companySignature==''" value="签字确认" @click="dialogVisible=true" />
</div>
</div>
</div>
<div class="CliSignDiv" :class="dialogVisible?'isShowSign':''" @touchmove.prevent>
<div id="canvas">
<div id="canvas" style="position:relative;top:0">
</div>
<div style="text-align:center;margin-top:20px;">
<input type="button" @click="handelClearEl()" class="CV_Btn" value="清除" />
......@@ -789,7 +778,6 @@
//获取数据
getList(){
this.apiJavaPost("/api/contract/getContractInfo",this.msg,res => {
console.log(res,'resss');
if (res.data.resultCode === 1) {
this.dataList = res.data.data;
} else {
......@@ -886,7 +874,6 @@
//提交数据
SaveMsg(){
this.apiJavaPost("/api/contract/dosaveOrUpdate",this.dataList,res => {
console.log(res,'ressss');
if (res.data.resultCode === 1) {
this.Success(res.data.message);
this.dialogVisible = false;
......@@ -903,7 +890,7 @@
this.msg.orderID = this.$route.query.orderID;
var h = window.screen.height;
var cHeight=document.getElementsByClassName("CliSignDiv")[0];
cHeight.style.height=700+'px';
cHeight.style.height=900+'px';
this.getList();
this.getCanvas();
}
......
src/plug/index.js
View file @ fce612a0
......@@ -118,8 +118,8 @@ export default {
Vue.prototype.domainManager = function() {
let domainUrl = '';
let locationName = window.location.hostname;
//domainUrl = "http://192.168.2.214:8082";
domainUrl = "http://192.168.2.65:8025";
//domainUrl = "http://192.168.2.214:8082";
domainUrl = "http://localhost:13491";
//domainUrl = "http://192.168.2.16:8083";
//domainUrl = "http://192.168.0.110";
......@@ -403,7 +403,7 @@ export default {
})
} else if (res.resultCode == 10005) {
this.$router.go(-1)
} else if(res.data.data.isJumpTwoCode==1){
} else if (res.data.data.isJumpTwoCode == 1) {
this.$router.push({
path: '/clientConfirm'
})
......
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