Skip to content

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

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

parents 7fd94634 8b5a2f07
Show whitespace changes
Inline Side-by-side
Showing with 476 additions and 19 deletions
src/assets/css/cssReset.css
View file @ bdf0757b
......@@ -649,4 +649,16 @@ vertical-align:middle
.MyInput .el-input--mini .el-input__inner{
height:28px!important;
}
.font-color-blur{
color: #409EFF;
}
.font-color-org{
color: #E6A23C;
}
.font-color-red{
color: #F56C6C;
}
.font-color-green{
color: #67C23A;
}
/************************** luochao 重新定义表格样式 END *******************************/
\ No newline at end of file
src/components/SalesModule/SpecialList.vue 0 → 100644
View file @ bdf0757b
<style>
.w595{width:595px!important;}
.LuckyDraw .singeRowTable i{
font-size:15px;
}
.LuckyDraw ._addUpload_box{
display: block;
margin: 10px 0 0 100px;
}
.LuckyDraw ._addUpload_box img{
width: 100%;
height:100%;
}
.LuckyDraw ._addUpload_box>div{
float: left;
width:138px;
height:92px;
border:1px dashed rgba(210,210,210,1);
border-radius:2px;
cursor: pointer;
margin-bottom: 10px;
padding: 5px;
margin-right: 10px;
position: relative;
}
.LuckyDraw ._addUpload_box .icon-guanbi1 {
font-size: 12px;
color: white;
display: inline-block;
margin-left: 15px;
position: absolute;
right: -6px;
top: -9px;
background-color: #f56c6c;
border-radius: 50%;
height: 20px;
width: 20px;
text-align: center;
line-height: 20px;
}
.LuckyDraw ._addUpload_box>div:hover{
background-color: #f5f5f5;
}
.LuckyDraw .el-upload-dragger{
font-size: 28px;
color: #8c939d;
width: 126px;
height: 80px;
line-height: 41px;
text-align: center;
}
.LuckyDraw ._show_img_box{
position: fixed;
background: rgba(0,0,0,.6);
left: 0;
top:0;
width: 100%;
height: 100%;
z-index: 9999;
text-align: center;
}
.LuckyDraw .ql-container{
min-height: 100px;
}
.LuckyDraw .avatar-uploader-icon{
height: auto
}
</style>
<template>
<div class="flexOne LuckyDraw">
<div class="query-box">
<ul class="user_time_picker">
<li>
<span>
<em>{{$t('hotel.order_Number')}}</em>
<el-input v-model="msg.OrderId" @keyup.enter.native="getList"></el-input>
</span>
</li>
<li>
<span>
<em>{{$t('visa.v_tuanhao')}}</em>
<el-input v-model="msg.TCNUM" @keyup.enter.native="getList"></el-input>
</span>
</li>
<li>
<span>
<em>团编号</em>
<el-input v-model="msg.TCID" @keyup.enter.native="getList"></el-input>
</span>
</li>
<li>
<span>
<em>创建人</em>
<el-select filterable v-model="msg.CreateBy">
<el-option :label="$t('system.ph_buxian')" :value="-1"></el-option>
<el-option v-for='item in employeeList' :label='item.EmName' :value='item.EmployeeId'
:key='item.EmployeeId'></el-option>
</el-select>
</span>
</li>
<li>
<span>
<em>审核状态</em>
<el-select filterable v-model="msg.ApplyState">
<el-option :label="$t('system.ph_buxian')" :value="-2"></el-option>
<el-option label="拒绝" :value="-1"></el-option>
<el-option label="审批中" :value="0"></el-option>
<el-option label="通过" :value="1"></el-option>
</el-select>
</span>
</li>
<li>
<input
type="button"
class="hollowFixedBtn"
:value="$t('pub.searchBtn')"
@click="resetPageIndex(),getList()"
>
</li>
</ul>
</div>
<div class="clearfix"></div>
<table class="singeRowTable" border="0" cellspacing="0" cellpadding="0" v-loading="loading">
<tr>
<th>编号</th>
<th>团号</th>
<th>订单号</th>
<th>创建人</th>
<th>申请说明</th>
<th>审批状态</th>
<th>审批意见</th>
<th>创建时间</th>
<th>{{$t('hotel.table_operat')}}</th>
</tr>
<tr v-for="(item, index) in dataList" :key="index">
<td>{{item.ID}}</td>
<td>{{item.OrderId}}</td>
<td>{{item.TCID}}</td>
<td>{{item.CreateBy}}</td>
<td>{{item.ApplyReason}}</td>
<td>{{item.ApplyStateStr}}</td>
<td>{{item.Reason}}</td>
<td>{{item.CreateDateStr}}</td>
<td>
<el-tooltip class="item" effect="dark" :content="$t('fnc.shenhe')" placement="top">
<el-button
v-if="item.ApplyState === 0"
type="primary"
icon="iconfont icon-ico_commodity_defaul"
circle
@click="SpecialAppMsg.ID = item.ID,SpecialAppShow=true"
></el-button>
</el-tooltip>
</td>
</tr>
</table>
<div class="noDataNotice" v-if="dataList.length<1">
<i class="iconfont icon-kong"></i>
<p>{{$t("active.ld_noData")}}</p>
</div>
<el-pagination
background
@current-change="handleCurrentChange"
v-if="dataList.length>0"
:current-page.sync="currentPage"
layout="total,prev, pager, next, jumper"
:page-size="msg.PageSize"
:total="total"
></el-pagination>
<el-dialog custom-class='w450' title="申请函审批" :visible.sync="SpecialAppShow" center>
<el-form :model="SpecialAppMsg" label-width="80px">
<el-form-item label="审批结果">
<el-select v-model="SpecialAppMsg.ApplyState" :placeholder="$t('pub.pleaseSel')">
<el-option label="通过" :value="1" :key="1"></el-option>
<el-option label="拒绝" :value="-1" :key="-1"></el-option>
</el-select>
</el-form-item>
<el-form-item label="审批意见">
<el-input type="textarea" v-model="SpecialAppMsg.Reason"></el-input>
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<button class="hollowFixedBtn" @click="SpecialAppShow=false,SpecialAppMsg.ApplyState = 1,SpecialAppMsg.Reason = ''">{{$t('pub.cancelBtn')}}</button>
<button class="normalBtn" type="primary" @click="SpecialAppPost">{{$t('pub.sureBtn')}}</button>
</div>
</el-dialog>
</div>
</template>
<script>
export default {
data() {
return {
//请求
msg: {
PageIndex: 1,
PageSize: 15,
TCNUM: '',
ApplyState: -2,
UpdateBy : -1,
CreateBy: -1,
TCID: '',
OrderId: '',
},
SpecialAppMsg: {
ApplyState: 1,
Reason: '',
ID: 0,
},
SpecialAppShow: false,
loading:false,
currentPage: 1,
total:0,
dataList:[],
outerVisible: false,
dialogTitle:'',
employeeList: [],
employeeMsg: {
BranchId: '-1',
IsLeave: 0
},
};
},
mounted() {
let userinfo = this.getLocalStorage();
this.msg.UpdateBy = userinfo.EmployeeId
this.getList();
this.getEmployee()
},
methods: {
sapost(){
this.apipost('sellorder_get_UpdateOrderSpecialOffer', this.SpecialAppMsg, res => {
if (res.data.resultCode == 1) {
this.SpecialAppShow = false
this.getList()
}
},null)
},
SpecialAppPost(){
if (this.SpecialAppMsg.ApplyState !== 1) {
this.$confirm('一旦拒绝此申请，订单会立即取消，是否拒绝？', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
this.sapost()
}).catch(() => {
});
} else {
this.sapost()
}
},
getEmployee() {
//员工
this.apipost(
'admin_get_EmployeeGetList',
this.employeeMsg,
res => {
if (res.data.resultCode == 1) {
this.employeeList = res.data.data
} else {}
},
err => {}
)
},
getList(){
if (this.msg.TCID === '') {
this.msg.TCID = 0
}
if (this.msg.OrderId === '') {
this.msg.OrderId = 0
}
this.apipost('sellorder_get_GetOrderSpecialOfferList', this.msg, res => {
if (res.data.resultCode == 1) {
this.dataList = res.data.data.pageData
if (this.msg.TCID === 0) {
this.msg.TCID = ''
}
if (this.msg.OrderId === 0) {
this.msg.OrderId = ''
}
}
},null)
},
handleCurrentChange(val) {
this.msg.PageIndex = val;
this.getList();
},
resetPageIndex() {
this.msg.PageIndex = 1;
this.currentPage = 1;
},
}
};
</script>
\ No newline at end of file
src/components/SalesModule/enrollTotal.vue
View file @ bdf0757b
......@@ -412,7 +412,26 @@
</div>
</div>
</td>
<td colspan="9" class="groupTourOrder_tickets" style="height: 40px;cursor: pointer;">
<td colspan="4" class="groupTourOrder_SpecialAPP" stysle="height: 40px;">
<div>
特价申请函:
<template v-if="item.orderspecialofferId === 0">
<span class="font-color-blur" >未申请</span>
</template>
<template v-else>
<span class="font-color-red" v-if="item.orderspecialofferState === -1">拒绝</span>
<span class="font-color-org" v-if="item.orderspecialofferState === 0">审批中</span>
<span class="font-color-green" v-if="item.orderspecialofferState === 1">通过</span>
</template>
</div>
<div class="font-color-red" v-if="item.orderspecialofferId !== 0">
申请说明：<span>{{item.orderspecialofferApplyReason}}</span>
</div>
<div class="font-color-red" v-if="item.orderspecialofferId !== 0">
审批说明：<span>{{item.orderspecialofferReason}}</span>
</div>
</td>
<td colspan="5" class="groupTourOrder_tickets" style="height: 40px;cursor: pointer;">
<div @click="goUrlSFD('SalesFinancialDetail', '销售财务单据', item)">
<div>{{$t('fnc.skdanju')}}：</div>
<div>
......
src/components/SalesModule/groupTourOrder.vue
View file @ bdf0757b
......@@ -1816,6 +1816,7 @@
<div v-if="item.isOrder=='1'&&(item.orderState=='1'||item.orderState=='2'||item.orderState=='3') && item.isCanClear==0"
@click='deleteItem(item)'>{{$t('pub.cancelBtn')}}
</div>
<div @click='SpecialAPP(item.tcid, item.orderId)'>特价申请函</div>
<div v-if="item.isOrder=='1'&&(item.orderState=='1'||item.orderState=='2'||item.orderState=='3') && item.isCanClear==1" title="如需取消订单清联系OP" style="color:red;">
{{$t('salesModule.OrderSured')}}
</div>
......@@ -1898,7 +1899,7 @@
</div>
</div>
</td>
<td colspan="5" class="groupTourOrder_remarks" style="height: 40px;">
<td colspan="4" class="groupTourOrder_remarks" style="height: 40px;">
<div>
<div>
<span>{{$t('Operation.Op_remark')}}:</span>
......@@ -1906,7 +1907,26 @@
</div>
</div>
</td>
<td colspan="7" class="groupTourOrder_tickets" style="height: 40px;">
<td colspan="4" class="groupTourOrder_SpecialAPP" stysle="height: 40px;">
<div>
特价申请函:
<template v-if="item.orderspecialofferId === 0">
<span class="font-color-blur" >未申请</span>
</template>
<template v-else>
<span class="font-color-red" v-if="item.orderspecialofferState === -1">拒绝</span>
<span class="font-color-org" v-if="item.orderspecialofferState === 0">审批中</span>
<span class="font-color-green" v-if="item.orderspecialofferState === 1">通过</span>
</template>
</div>
<div class="font-color-red" v-if="item.orderspecialofferId !== 0">
申请说明：<span>{{item.orderspecialofferApplyReason}}</span>
</div>
<div class="font-color-red" v-if="item.orderspecialofferId !== 0">
审批说明：<span>{{item.orderspecialofferReason}}</span>
</div>
</td>
<td colspan="4" class="groupTourOrder_tickets" style="height: 40px;">
<div @click="goUrlSFD('SalesFinancialDetail', '销售财务单据', item)">
<div>{{$t('fnc.skdanju')}}：</div>
<div>
......@@ -1960,7 +1980,27 @@
<tripDownLoadCommon ref="tripDownLoadCommon" :tripObj="tripObj" @headCallBack="hideTripDown" :downType="2">
</tripDownLoadCommon>
</el-dialog>
<el-dialog custom-class='w450' title="特价申请函" :visible.sync="SpecialAppShow" center>
<el-form :model="SpecialAppMsg" label-width="80px">
<el-form-item label="审核人">
<el-select filterable v-model="SpecialAppMsg.UpdateBy" :placeholder="$t('pub.pleaseSel')">
<el-option
v-for="item in employeeList"
:label="item.EmName"
:value="item.EmployeeId"
:key="item.EmployeeId">
</el-option>
</el-select>
</el-form-item>
<el-form-item label="申请说明">
<el-input type="textarea" v-model="SpecialAppMsg.ApplyReason"></el-input>
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<button class="hollowFixedBtn" @click="SpecialAppShow=false,SpecialAppMsg.UpdateBy = '',SpecialAppMsg.ApplyReason = ''">{{$t('pub.cancelBtn')}}</button>
<button class="normalBtn" type="primary" @click="SpecialAppPost">{{$t('pub.sureBtn')}}</button>
</div>
</el-dialog>
<div class="groupTourOrder_transfer" v-show="transferData.show">
<div class="transfer_header">
<div>{{$t('salesModule.OrderGroup')}}</div>
......@@ -2027,6 +2067,12 @@
export default {
data() {
return {
SpecialAppShow: false,
SpecialAppMsg: {
ApplyReason: '',
UpdateBy: '',
OrderId: 0
},
//是否有修改业务员权限，1-有
isEditOrderCreate:0,
happy:false,
......@@ -2343,6 +2389,25 @@
}
},
methods: {
SpecialAppPost(){
if (this.SpecialAppMsg.ApplyReason === '') {
return this.$message.error('请填写申请说明')
}
if (this.SpecialAppMsg.UpdateBy === ''){
return this.$message.error('请选择审核人')
}
this.apipost('sellorder_get_AddOrderSpecialOffer', this.SpecialAppMsg, res => {
if (res.data.resultCode == 1) {
this.$message.success('操作成功')
this.getList()
this.SpecialAppShow = false
}
},null)
},
SpecialAPP(tcid, orderId){
this.SpecialAppMsg.OrderId = orderId
this.SpecialAppShow = true
},
SQPhoto(){
let checkID = []
this.SQguestList.map(x=>{
......
src/components/SalesModule/groupTourOrderByTuan.vue
View file @ bdf0757b
......@@ -2187,7 +2187,7 @@
</td>
</tr>
<tr>
<td colspan="5" class="groupTourOrder_remarksBytuan" style="height: 40px;">
<td colspan="4" class="groupTourOrder_remarksBytuan" style="height: 40px;">
<div>
<div style="width:95%;display:inline-block;">
<div style="color:red;"><span>备注时间：{{item.rematksTime}}</span></div>
......@@ -2229,7 +2229,7 @@
</div>
</div>
</td>
<td colspan="5" class="groupTourOrder_remarksBytuan" style="height: 40px;">
<td colspan="4" class="groupTourOrder_remarksBytuan" style="height: 40px;">
<div>
<div style="color:red;">
<span>OP备注:</span>
......@@ -2237,7 +2237,27 @@
</div>
</div>
</td>
<td colspan="6" class="groupTourOrder_tickets" style="height: 40px;">
<td colspan="4" class="groupTourOrder_SpecialAPP" stysle="height: 40px;">
<div v-if="item.isOwn==1 || userId==1||userId==5 || isUpdateOrder">
特价申请函:
<template v-if="item.orderspecialofferId === 0">
<span class="font-color-blur" >未申请</span>
</template>
<template v-else>
<span class="font-color-red" v-if="item.orderspecialofferState === -1">拒绝</span>
<span class="font-color-org" v-if="item.orderspecialofferState === 0">审批中</span>
<span class="font-color-green" v-if="item.orderspecialofferState === 1">通过</span>
</template>
</div>
<div class="font-color-red" v-if="item.orderspecialofferId !== 0">
申请说明：<span>{{item.orderspecialofferApplyReason}}</span>
</div>
<div class="font-color-red" v-if="item.orderspecialofferId !== 0">
审批说明：<span>{{item.orderspecialofferReason}}</span>
</div>
<div v-else>******</div>
</td>
<td colspan="4" class="groupTourOrder_tickets" style="height: 40px;">
<div @click="goUrlSFD('SalesFinancialDetail', '销售财务单据', item)">
<div>收款单据：</div>
<div>
......
src/components/TravelManager/TravelList/RegistrationList.vue
View file @ bdf0757b
......@@ -2339,7 +2339,7 @@
</td>
</tr>
<tr>
<td colspan="5" class="groupTourOrder_remarks" style="height: 40px;">
<td colspan="4" class="groupTourOrder_remarks" style="height: 40px;">
<div class="clearfix RL-MARK">
<div style="display:inline-block;width:100%">
<span class="RL-remarkTitle">{{$t('ground.beizhushijian')}}:</span>
......@@ -2361,7 +2361,7 @@
</div>
</div>
</td>
<td colspan="6" style="height: 40px;">
<td colspan="4" style="height: 40px;">
<div class="clearfix RL-MARK" style="width:75%;float:left;">
<span class="RL-opremarkTitle">{{$t('Operation.Op_remark')}}:</span>
<span class="RL-redType RL-remarkCon"
......@@ -2385,7 +2385,26 @@
</div>
</template>
</td>
<td colspan="4" style="height: 40px;cursor: pointer;">
<td colspan="4" class="groupTourOrder_SpecialAPP" stysle="height: 40px;">
<div>
特价申请函:
<template v-if="childItem.OrderspecialofferId === 0">
<span class="font-color-blur" >未申请</span>
</template>
<template v-else>
<span class="font-color-red" v-if="childItem.OrderspecialofferState === -1">拒绝</span>
<span class="font-color-org" v-if="childItem.OrderspecialofferState === 0">审批中</span>
<span class="font-color-green" v-if="childItem.OrderspecialofferState === 1">通过</span>
</template>
</div>
<div class="font-color-red" v-if="childItem.OrderspecialofferId !== 0">
申请说明：<span>{{childItem.OrderspecialofferApplyReason}}</span>
</div>
<div class="font-color-red" v-if="childItem.OrderspecialofferId !== 0">
审批说明：<span>{{childItem.OrderspecialofferReason}}</span>
</div>
</td>
<td colspan="3" style="height: 40px;cursor: pointer;">
<div @click="goUrlSFD('SalesFinancialDetail', '销售财务单据', childItem)">
<span>收款单据：</span>
<span v-for="(item2,index2) in childItem.FinanceList" :key="index2">
......@@ -2675,7 +2694,7 @@
</td>
</tr>
<tr>
<td colspan="5" class="groupTourOrder_remarks" style="height: 40px;">
<td colspan="4" class="groupTourOrder_remarks" style="height: 40px;">
<div class="clearfix RL-MARK">
<span class="RL-remarkTitle">{{$t('pub.pubRemark')}}:</span>
<span class="RL-redType RL-remarkCon">
......@@ -2685,13 +2704,32 @@
</span>
</div>
</td>
<td colspan="6" class="groupTourOrder_remarks" style="height: 40px;">
<td colspan="4" class="groupTourOrder_remarks" style="height: 40px;">
<div class="clearfix RL-MARK">
<span class="RL-opremarkTitle">{{$t('Operation.Op_remark')}}:</span>
<span class="RL-redType RL-remarkCon">{{item.OP_Remarks ? item.OP_Remarks : '无'}}</span>
</div>
</td>
<td colspan="4" style="height: 40px;cursor: pointer;"
<td colspan="4" class="groupTourOrder_SpecialAPP" stysle="height: 40px;">
<div>
特价申请函:
<template v-if="item.OrderspecialofferId === 0">
<span class="font-color-blur" >未申请</span>
</template>
<template v-else>
<span class="font-color-red" v-if="item.OrderspecialofferState === -1">拒绝</span>
<span class="font-color-org" v-if="item.OrderspecialofferState === 0">审批中</span>
<span class="font-color-green" v-if="item.OrderspecialofferState === 1">通过</span>
</template>
</div>
<div class="font-color-red" v-if="item.OrderspecialofferId !== 0">
申请说明：<span>{{item.OrderspecialofferApplyReason}}</span>
</div>
<div class="font-color-red" v-if="item.OrderspecialofferId !== 0">
审批说明：<span>{{item.OrderspecialofferReason}}</span>
</div>
</td>
<td colspan="3" style="height: 40px;cursor: pointer;"
@click="goUrlSFD('SalesFinancialDetail', '销售财务单据', item)">
<div>
<span>{{$t('hotel.hotel_Order')}}：</span>
......
src/router/config.js
View file @ bdf0757b
......@@ -2718,6 +2718,14 @@ export default {
title: '跟团游订单'
},
},
{ // 销售 特价申请函
path: '/SpecialList',
name: 'SpecialList',
component: resolve => require(['@/components/SalesModule/SpecialList'], resolve),
meta: {
title: '特价申请函'
},
},
{ // 销售 一日游订单
path: '/groupTourOrderOne',
name: 'groupTourOrderOne',
......
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