Skip to content

S
SuperMan
Commit 2767a96d authored by 罗超's avatar 罗超
Browse files
Options

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

parents 7c9f21f3 ee7870f9
Hide whitespace changes
Inline Side-by-side
Showing with 275 additions and 122 deletions
src/components/Contract/ElectronicContract.vue
View file @ 2767a96d
...@@ -1171,7 +1171,7 @@ ...@@ -1171,7 +1171,7 @@
</div> </div>
<div class="EC_floatdiv"> <div class="EC_floatdiv">
<input type="button" class="normalBtn" v-if="dataList.status==1" @click="getinvalid()" value="作废" /> <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)" /> <input type="button" class="normalBtn" v-if="dataList.companySignature!=''" value="下载" @click="toContractPDF(dataList.contractNum)" />
</div> </div>
</div> </div>
......
src/components/Contract/TravelContract.vue
View file @ 2767a96d
...@@ -10,7 +10,6 @@ ...@@ -10,7 +10,6 @@
float:left; float:left;
width: 150px; width: 150px;
height: 100%; height: 100%;
/* margin-left: 30px; */
position: fixed; position: fixed;
margin-top:100px; margin-top:100px;
} }
...@@ -822,7 +821,7 @@ ...@@ -822,7 +821,7 @@
</el-form> </el-form>
<div style="margin-top:20px;"> <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" 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="goUrl()" value="预览">
<input type="button" class="normalBtn" v-if="CtObj.status==1" @click="getinvalid()" value="作废"> <input type="button" class="normalBtn" v-if="CtObj.status==1" @click="getinvalid()" value="作废">
</div> </div>
......
src/components/FinancialModule/addFinancialDocuments.vue
View file @ 2767a96d
...@@ -196,14 +196,14 @@ ...@@ -196,14 +196,14 @@
<div class="rb_top_row _r_mb5"> <div class="rb_top_row _r_mb5">
<p >{{$t('fnc.fkduixiang')}}： <p >{{$t('fnc.fkduixiang')}}：
<el-select filterable v-model='msg.IsPublic' placeholder="付款类型" @change="IsPublicChange" class="w135 _border_b_1"> <el-select filterable v-model='msg.IsPublic' placeholder="付款类型" @change="IsPublicChange" class="w135 _border_b_1">
<el-option :label="$t('fnc.gongzhang')" :value='1' :key='1' v-if='msg.TemplateId!==36 && msg.TemplateId!==37 && msg.TemplateId!==43 && msg.TemplateId!==48'></el-option> <el-option :label="$t('fnc.gongzhang')" :value='1' :key='1' v-if='msg.TemplateId!==36 && msg.TemplateId!==37 && msg.TemplateId!==43 && msg.TemplateId!==48 && msg.TemplateId !==53'></el-option>
<el-option :label="$t('fnc.sizhang')" :value='0' :key='0' v-if='msg.TemplateId!==36 && msg.TemplateId!==37 && msg.TemplateId!==43 && msg.TemplateId!==48'></el-option> <el-option :label="$t('fnc.sizhang')" :value='0' :key='0' v-if='msg.TemplateId!==36 && msg.TemplateId!==37 && msg.TemplateId!==43 && msg.TemplateId!==48 && msg.TemplateId !==53'></el-option>
<el-option :label="$t('fnc.rmbxianjin')" :value='2' :key='2' v-if='msg.TemplateId!==36 && msg.TemplateId!==37 && msg.TemplateId!==43 && msg.TemplateId!==48'></el-option> <el-option :label="$t('fnc.rmbxianjin')" :value='2' :key='2' v-if='msg.TemplateId!==36 && msg.TemplateId!==37 && msg.TemplateId!==43 && msg.TemplateId!==48 && msg.TemplateId !==53'></el-option>
<el-option :label="$t('fnc.wbxianjin')" :value='3' :key='3' v-if='msg.TemplateId!==36 && msg.TemplateId!==37 && msg.TemplateId!==48'></el-option> <el-option :label="$t('fnc.wbxianjin')" :value='3' :key='3' v-if='msg.TemplateId!==36 && msg.TemplateId!==37 && msg.TemplateId!==48 && msg.TemplateId !==53'></el-option>
<el-option :label="$t('fnc.zjinchi')" :value='4' :key='4' v-if='msg.TemplateId===36 || msg.TemplateId===37 || msg.TemplateId===48'></el-option> <el-option :label="$t('fnc.zjinchi')" :value='4' :key='4' v-if='msg.TemplateId===36 || msg.TemplateId===37 || msg.TemplateId===48 || msg.TemplateId===53'></el-option>
<el-option :label="$t('fnc.ptxnzhanghu')" :value='5' :key='5' v-if='msg.TemplateId!==36 && msg.TemplateId!==37 && msg.TemplateId!==43 && msg.TemplateId!==48'></el-option> <el-option :label="$t('fnc.ptxnzhanghu')" :value='5' :key='5' v-if='msg.TemplateId!==36 && msg.TemplateId!==37 && msg.TemplateId!==43 && msg.TemplateId!==48 && msg.TemplateId !==53'></el-option>
<el-option :label="$t('fnc.djxnzhanghu')" :value='6' :key='6' v-if='msg.TemplateId!==36 && msg.TemplateId!==37 && msg.TemplateId!==43 && msg.TemplateId!==48'></el-option> <el-option :label="$t('fnc.djxnzhanghu')" :value='6' :key='6' v-if='msg.TemplateId!==36 && msg.TemplateId!==37 && msg.TemplateId!==43 && msg.TemplateId!==48 && msg.TemplateId !==53'></el-option>
<el-option :label="$t('fnc.szxiangdi')" :value='7' :key='7' v-if='msg.TemplateId!==36 && msg.TemplateId!==37 && msg.TemplateId!==43 && msg.TemplateId!==48'></el-option> <el-option :label="$t('fnc.szxiangdi')" :value='7' :key='7' v-if='msg.TemplateId!==36 && msg.TemplateId!==37 && msg.TemplateId!==43 && msg.TemplateId!==48 && msg.TemplateId !==53'></el-option>
<el-option label="原路退款" :value='8' :key='8' v-if='msg.TemplateId===2 || msg.TemplateId===12 ||msg.TemplateId===61 || msg.TemplateId===62'></el-option> <el-option label="原路退款" :value='8' :key='8' v-if='msg.TemplateId===2 || msg.TemplateId===12 ||msg.TemplateId===61 || msg.TemplateId===62'></el-option>
<el-option label="地接预支款" :value='9' :key='9' v-if='msg.TemplateId===67'></el-option> <el-option label="地接预支款" :value='9' :key='9' v-if='msg.TemplateId===67'></el-option>
......
src/components/FinancialModule/addReceivablesDocuments.vue
View file @ 2767a96d
...@@ -1406,7 +1406,7 @@ export default { ...@@ -1406,7 +1406,7 @@ export default {
this.msg.Obj = this.orderObj.Obj?this.orderObj.Obj:''; this.msg.Obj = this.orderObj.Obj?this.orderObj.Obj:'';
this.msg.SourceID = this.orderObj.SourceID?this.orderObj.SourceID:0; this.msg.SourceID = this.orderObj.SourceID?this.orderObj.SourceID:0;
this.msg.CallType=this.orderObj.CallType?this.orderObj.CallType:0; this.msg.CallType=this.orderObj.CallType?this.orderObj.CallType:0;
if (!JSON.parse(sessionStorage.getItem("saveGuestInfo"))){ if (!JSON.parse(sessionStorage.getItem("saveGuestInfo")) && !JSON.parse(sessionStorage.getItem("TipGuestList"))){
this.Description = this.orderObj.laRemark?this.orderObj.laRemark:''; this.Description = this.orderObj.laRemark?this.orderObj.laRemark:'';
} }
} }
......
src/components/Hotel/HotelWorkList.vue
View file @ 2767a96d
...@@ -16,35 +16,49 @@ ...@@ -16,35 +16,49 @@
</ul> </ul>
</div> </div>
<div class="hotelProductManage2_tableBox" style="margin-bottom: 20px;"> <div class="hotelProductManage2_tableBox" style="margin-bottom: 20px;">
<span style="color:#FFFFFF; background-color:green ; padding: 2px 4px; border-radius: 5px;">OK</span> <span style="color:#FFFFFF; background-color:green ; padding: 2px 4px; border-radius: 5px;">OK</span>
<span style="color:#FFFFFF; background-color:#3333CC; padding: 2px 4px; border-radius: 5px;">暂定</span> <span style="color:#FFFFFF; background-color:#3333CC; padding: 2px 4px; border-radius: 5px;">暂定</span>
<span style="color:#FFFFFF; background-color:red; padding: 2px 4px; border-radius: 5px;">未操作</span> <span style="color:#FFFFFF; background-color:red; padding: 2px 4px; border-radius: 5px;">未操作</span>
<span style="color:#FFFFFF; background-color:#000; padding: 2px 4px; border-radius: 5px;">无库存</span>
</div> </div>
<el-table :data="dataList" style="width:100%" border v-loading='loading' height="700"> <template v-if="isShow">
<el-table-column fixed label="酒店名称" min-width="180"> <el-table :data="dataList" style="width:100%" border v-loading='loading' height="700">
<template slot-scope="scope"> <el-table-column fixed label="酒店名称" min-width="180">
<div style="text-decoration: underline;cursor:pointer" @click="GotoHotel(scope.row.Hotel)"> <template slot-scope="scope">
{{scope.row.HotelName}} <div style="text-decoration: underline;cursor:pointer" @click="GotoHotel(scope.row.Hotel)">
</div> {{scope.row.HotelName}}
</template> </div>
</el-table-column>
<el-table-column v-for='(item,index) in dataList[0].DayList' :label="item.DateStr" :key='index' min-width="150">
<template slot-scope="scope">
<template v-if="scope.row.DayList[index].IsHaveStock==0">
<div style="background-color: #000!important;width:100%;height:100%;"></div>
</template> </template>
<template v-else v-for="childItem in scope.row.DayList[index].HotelJourneyOrderList"> </el-table-column>
<div style="white-space:nowrap;color:red;" :title="childItem.TCID+'【未操作】'" v-if="childItem.DMCState==0">{{childItem.BookGroup}}</div> <el-table-column v-for='(item,index) in dataList[0].DayList' :label="item.DateStr" :key='index' min-width="150">
<div style="white-space:nowrap;color:green;" :title="childItem.TCID+'【OK】'" v-if="childItem.DMCState==1">{{childItem.BookGroup}}</div> <template slot-scope="scope">
<div style="white-space:nowrap;color:#3333CC;" :title="childItem.TCID+'【暂定】'" v-if="childItem.DMCState==2">{{childItem.BookGroup}}</div> <template v-if="scope.row.DayList[index].IsHaveStock==0">
<div style="background-color:#000!important;width:50px;height:100%;margin:0,padding:0;color:#FFFFFF">无库存
</div>
</template>
<template v-else v-for="childItem in scope.row.DayList[index].HotelJourneyOrderList">
<template
v-if="scope.row.DayList[index].HotelJourneyOrderList&&scope.row.DayList[index].HotelJourneyOrderList.length>0">
<div style="white-space:nowrap;color:red;" :title="childItem.TCID+'【未操作】'" v-if="childItem.DMCState==0">
{{childItem.BookGroup}}</div>
<div style="white-space:nowrap;color:green;" :title="childItem.TCID+'【OK】'"
v-if="childItem.DMCState==1">
{{childItem.BookGroup}}</div>
<div style="white-space:nowrap;color:#3333CC;" :title="childItem.TCID+'【暂定】'"
v-if="childItem.DMCState==2">{{childItem.BookGroup}}</div>
</template>
<template v-else>
<a style="text-decoration:underline;cursor:pointer;">添加酒店</a>
</template>
</template>
</template> </template>
</template> </el-table-column>
</el-table-column> </el-table>
</el-table> <div class="noDataNotice" v-if="dataList.length==0">
<div class="noDataNotice" v-if="dataList.length==0"> <i class="iconfont icon-kong"></i>
<i class="iconfont icon-kong"></i> <p>{{$t("active.ld_noData")}}</p>
<p>{{$t("active.ld_noData")}}</p> </div>
</div> </template>
</div> </div>
</template> </template>
<script> <script>
...@@ -59,6 +73,7 @@ ...@@ -59,6 +73,7 @@
defaultSelectValue: 0, defaultSelectValue: 0,
dataList: [], dataList: [],
loading: false, loading: false,
isShow: false,
}; };
}, },
methods: { methods: {
...@@ -83,7 +98,8 @@ ...@@ -83,7 +98,8 @@
this.loading = false; this.loading = false;
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
this.dataList = res.data.data; this.dataList = res.data.data;
//console.log("this.dataList", this.dataList); this.isShow = true;
console.log("this.dataList", this.dataList);
} else { } else {
this.Error(res.data.message); this.Error(res.data.message);
} }
......
src/components/LeaderManagement/leaderReimbursement.vue
View file @ 2767a96d
...@@ -123,17 +123,27 @@ ...@@ -123,17 +123,27 @@
</span> </span>
</td> </td>
</tr> </tr>
<tr v-if="TotalNav.busPrice"> <template>
<td>总金额</td> <tr v-if="TotalNav.busPrice && TotalNav.busPrice.length">
<td colspan="16"> <td>总金额</td>
<span v-for="item in TotalNav.busPrice"> <td colspan="16">
<span v-for="item in TotalNav.busPrice">
<span v-for="plan in TotalNav.planPriceList" v-if="plan.UserType==4">
现付：{{plan.PlanTotalPrice}}
</span>
<span v-if="item.PayType!=1">{{item.Str + '：' +item.TotalPrice}} &nbsp;&nbsp;&nbsp;&nbsp;</span>
</span>
</td>
</tr>
<tr v-else>
<td>总金额</td>
<td colspan="16">
<span v-for="plan in TotalNav.planPriceList" v-if="plan.UserType==4"> <span v-for="plan in TotalNav.planPriceList" v-if="plan.UserType==4">
现付：{{plan.PlanTotalPrice}} 现付：{{plan.PlanTotalPrice}}
</span> </span>
<span v-if="item.PayType!=1">{{item.Str + '：' +item.TotalPrice}} &nbsp;&nbsp;&nbsp;&nbsp;</span> </td>
</span> </tr>
</td> </template>
</tr>
</table> </table>
<table class="leaderReimbursementTable" border="0" cellspacing="1" cellpadding="0"> <table class="leaderReimbursementTable" border="0" cellspacing="1" cellpadding="0">
<tr> <tr>
......
src/components/TravelManager/TravelList/HotelOrderTotal.vue
View file @ 2767a96d
...@@ -137,10 +137,7 @@ ...@@ -137,10 +137,7 @@
color: #000000; color: #000000;
text-decoration: underline; 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> </style>
<template> <template>
...@@ -296,6 +293,7 @@ ...@@ -296,6 +293,7 @@
<tr> <tr>
<th>订单号</th> <th>订单号</th>
<th>第三方订单号</th> <th>第三方订单号</th>
<th>团号</th>
<th>房间数</th> <th>房间数</th>
<th>总额</th> <th>总额</th>
<th>实收</th> <th>实收</th>
...@@ -304,11 +302,9 @@ ...@@ -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>
<th>客户手机号</th>
<th>创建人</th> <th>创建人</th>
<th>结束时间</th> <th>结束时间</th>
<th>操作</th> <th>操作</th>
...@@ -317,36 +313,41 @@ ...@@ -317,36 +313,41 @@
<tr> <tr>
<td style="border-bottom:2px solid #333" rowspan="2">{{item.OrderID}}</td> <td style="border-bottom:2px solid #333" rowspan="2">{{item.OrderID}}</td>
<td>{{item.ThirdOrderNo}}</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.Number}}</td>
<td>{{item.TotalPrice}}</td> <td>{{item.TotalPrice}}</td>
<td>{{item.Income}}</td> <td>{{item.Income}}</td>
<td>{{item.RedEnvelopeMoney}}</td> <td>{{item.RedEnvelopeMoney}}</td>
<td>{{item.DiscountMoney}}</td> <td>{{item.DiscountMoney}}</td>
<td>{{item.DueinMoney}}</td> <td>{{item.DueinMoney}}</td>
<td> <td>
<span :class="item.OrderStatus=='已取消'?'color_red_order':''">{{item.OrderStatus}}</span> <span :class="item.OrderStatus=='已取消'?'color_red_order':''">{{item.OrderStatus}}</span>
</td> </td>
<td>{{item.CreateDateStr}}</td> <td>{{item.CreateDateStr}}</td>
<td>{{item.CheckInStr}}</td> <td>{{item.CheckInStr}}-{{item.CheckOutStr}}</td>
<td>{{item.CheckOutStr}}</td>
<td>{{item.CancelFee}}</td> <td>{{item.CancelFee}}</td>
<td>{{item.CustomerName}}</td> <td>{{item.CustomerName}}/{{item.CustomerPhone}}</td>
<td>{{item.CustomerPhone}}</td>
<td>{{item.CreateByStr}}</td> <td>{{item.CreateByStr}}</td>
<td>{{item.EndTime}}</td> <td>{{item.EndTime}}</td>
<td> <td>
<el-row> <el-row>
<el-tooltip class="item" effect="dark" content="付款" placement="top-start"> <el-button-group>
<el-button type="primary" icon="iconfont icon-fukuan2" @click="getShouKuan(item)" circle></el-button> <el-tooltip class="item" effect="dark" content="付款" placement="top-start">
</el-tooltip> <el-button type="primary" icon="iconfont icon-fukuan2" @click="getShouKuan(item)" ></el-button>
<el-tooltip class="item" v-if="item.ShowBtn" effect="dark" content="取消" placement="top-start"> </el-tooltip>
<el-button type="danger" icon="iconfont icon-quxiao1" circle @click="cancelHTorder(item.ThirdOrderNo)"></el-button> <el-tooltip class="item" v-if="item.ShowBtn" effect="dark" content="取消订单" placement="top-start">
</el-tooltip> <el-button type="info" icon="iconfont icon-quxiao1" @click="cancelHTorder(item.ThirdOrderNo)"></el-button>
<el-tooltip class="item" effect="dark" content="详情" placement="top-start"> </el-tooltip>
<i class="Logo_iconfont iconfont icon-sousuo" @click="goOrderDetails(item.OrderID)"></i> <el-tooltip class="item" effect="dark" content="确定" placement="top-start">
</el-tooltip> <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> </el-row>
</td> </td>
</tr> </tr>
...@@ -395,7 +396,32 @@ ...@@ -395,7 +396,32 @@
<i class="iconfont icon-kong"></i> <i class="iconfont icon-kong"></i>
<p>{{$t("active.ld_noData")}}</p> <p>{{$t("active.ld_noData")}}</p>
</div> </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" <el-pagination background @current-change="handleCurrentChange" :current-page.sync="currentPage" layout="total,prev, pager, next, jumper"
:page-size=msg.pageSize :total=total> :page-size=msg.pageSize :total=total>
</el-pagination> </el-pagination>
...@@ -418,6 +444,8 @@ export default { ...@@ -418,6 +444,8 @@ export default {
CStartTime:'', CStartTime:'',
CEndTime:'' CEndTime:''
}, },
TCID: '',
GLOrderID: '',
total:0, total:0,
currentPage: 1, currentPage: 1,
loading:false, loading:false,
...@@ -490,10 +518,71 @@ export default { ...@@ -490,10 +518,71 @@ export default {
DepartmentList:[], DepartmentList:[],
EmployeeList:[], EmployeeList:[],
//统计快 //统计快
TotalMsg:[] TotalMsg:[],
searchList: [],
loading2: false,
dialogFormVisible: false,
}; };
}, },
methods: { 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){ goOrderDetails(ID){
this.$router.push({ this.$router.push({
name: 'OpHotelOrderDetail', name: 'OpHotelOrderDetail',
...@@ -518,7 +607,7 @@ export default { ...@@ -518,7 +607,7 @@ export default {
let userInfo = this.getLocalStorage(); let userInfo = this.getLocalStorage();
let EmployeeId = userInfo.EmployeeId; let EmployeeId = userInfo.EmployeeId;
this.dataList.forEach(x=>{ this.dataList.forEach(x=>{
if(x.CreateBy==EmployeeId||EmployeeId==1){ if((x.CreateBy == EmployeeId ||EmployeeId == 1 || EmployeeId == 5) && x.IsCanOrder){
x.ShowBtn = true; x.ShowBtn = true;
}else{ }else{
x.ShowBtn = false; x.ShowBtn = false;
......
src/components/TravelManager/TravelList/RegistrationList.vue
View file @ 2767a96d
...@@ -5057,15 +5057,27 @@ ...@@ -5057,15 +5057,27 @@
}, },
//跳转至领取合同 //跳转至领取合同
goContract(item){ goContract(item){
let routeData = this.$router.resolve({ if(item.ContractNum){
name: 'TravelContract', let routeData = this.$router.resolve({
query: { name: 'ElectronicContract',
TCID: item.TCID, query: {
orderID:item.OrderId, TCID: item.TCID,
blank: 'y' orderID:item.OrderId,
} blank: 'y'
}) }
window.open(routeData.href, '_blank') })
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) { Discount(TCID) {
this.SpecialOffer = true this.SpecialOffer = true
......
src/components/TravelManager/TravelList/TeamBalancePayment.vue
View file @ 2767a96d
...@@ -1505,6 +1505,7 @@ ...@@ -1505,6 +1505,7 @@
arr.push(obj); arr.push(obj);
} }
}) })
})
sessionStorage.setItem("TipGuestList",JSON.stringify(arr)) sessionStorage.setItem("TipGuestList",JSON.stringify(arr))
var TCArr = [this.TCID]; var TCArr = [this.TCID];
let orderObj = { let orderObj = {
...@@ -1524,8 +1525,6 @@ ...@@ -1524,8 +1525,6 @@
} }
}); });
this.tipdialog=false; this.tipdialog=false;
})
}, },
checkThis(){ // 单选 checkThis(){ // 单选
......
src/components/VisaCenter/addVisaNew.vue
View file @ 2767a96d
...@@ -271,13 +271,15 @@ ...@@ -271,13 +271,15 @@
</el-form-item> </el-form-item>
<el-form-item label="在职证明" prop="IncumbencyCertificationType"> <el-form-item label="在职证明" prop="IncumbencyCertificationType">
<el-select v-model="item.IncumbencyCertificationType" placeholder="请选择"> <el-select v-model="item.IncumbencyCertificationType" placeholder="请选择">
<el-option label="不选" :value="0"></el-option>
<el-option label="已确认为真" :value="1"></el-option> <el-option label="已确认为真" :value="1"></el-option>
<el-option label="已确认为假" :value="2"></el-option> <el-option label="已确认为假" :value="2"></el-option>
<el-option label="无法确认" :value="3"></el-option> <el-option label="无法确认" :value="3"></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label=" 银行流水" prop="AccountStatementType"> <el-form-item label=" 银行流水" prop="AccountStatementType">
<el-select v-model="item.IncumbencyCertificationType" placeholder="请选择"> <el-select v-model="item.AccountStatementType" placeholder="请选择">
<el-option label="不选" :value="0"></el-option>
<el-option label="已确认为真" :value="1"></el-option> <el-option label="已确认为真" :value="1"></el-option>
<el-option label="已确认为假" :value="2"></el-option> <el-option label="已确认为假" :value="2"></el-option>
<el-option label="无法确认" :value="3"></el-option> <el-option label="无法确认" :value="3"></el-option>
......
src/components/administrative/ElectronicAudit.vue
View file @ 2767a96d
<style> <style>
.ElectronicAudit .icon-shenhebohui{
color:#fff;
}
</style> </style>
<template> <template>
...@@ -6,28 +9,49 @@ ...@@ -6,28 +9,49 @@
<div class="query-box"> <div class="query-box">
<ul> <ul>
<li> <li>
<label class="">合同编号</label> <span>
<el-input :placeholder="$t('system.ph_in')" v-model="msg.contractNum" @keyup.native.enter="getList" class="w210"></el-input> <em>合同编号</em>
<el-input :placeholder="$t('system.ph_in')" v-model="msg.contractNum" @keyup.native.enter="getList" class="w210"></el-input>
</span>
</li> </li>
<li> <li>
<label class="">产品名称</label> <span>
<el-input :placeholder="$t('system.ph_in')" v-model="msg.productName" @keyup.native.enter="getList" class="w210"></el-input> <em>产品名称</em>
<el-input :placeholder="$t('system.ph_in')" v-model="msg.productName" @keyup.native.enter="getList" class="w210"></el-input>
</span>
</li> </li>
<li> <li>
<label class="">订单号</label> <span>
<el-input :placeholder="$t('system.ph_in')" v-model="msg.orderID" @keyup.native.enter="getList" class="w210"></el-input> <em>订单号</em>
<el-input :placeholder="$t('system.ph_in')" v-model="msg.orderID" @keyup.native.enter="getList" class="w210"></el-input>
</span>
</li> </li>
<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> <el-input :placeholder="$t('system.ph_in')" v-model="msg.tcid" @keyup.native.enter="getList" class="w210"></el-input>
</span>
</li> </li>
<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" <el-date-picker v-model='msg.startDate' class='w135' value-format="yyyy-MM-dd" type="date"
:picker-options="pickerBeginDateBefore"></el-date-picker> :picker-options="pickerBeginDateBefore"></el-date-picker>
- -
<el-date-picker v-model='msg.returnDate' class='w135' value-format="yyyy-MM-dd" type="date" <el-date-picker v-model='msg.returnDate' class='w135' value-format="yyyy-MM-dd" type="date"
:picker-options="pickerBeginDateAfter"></el-date-picker> :picker-options="pickerBeginDateAfter"></el-date-picker>
</span>
</li> </li>
<li> <li>
<input type="button" class="hollowFixedBtn" value="查询" @click="getList()" /> <input type="button" class="hollowFixedBtn" value="查询" @click="getList()" />
...@@ -43,6 +67,7 @@ ...@@ -43,6 +67,7 @@
<th>产品名称</th> <th>产品名称</th>
<th>出发日期</th> <th>出发日期</th>
<th>返回日期</th> <th>返回日期</th>
<th>状态</th>
<th width="200">操作</th> <th width="200">操作</th>
</tr> </tr>
<tr v-for="item in dataList"> <tr v-for="item in dataList">
...@@ -50,15 +75,28 @@ ...@@ -50,15 +75,28 @@
<td>{{item.orderId}}</td> <td>{{item.orderId}}</td>
<td>{{item.tcid}}</td> <td>{{item.tcid}}</td>
<td>{{item.productName}}</td> <td>{{item.productName}}</td>
<td>{{getDate(item.startDate)}}</td> <td>
<td>{{getDate(item.returnDate)}}</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> <td>
<el-row> <el-row>
<el-tooltip class="item" effect="dark" content="审核通过" placement="top-start"> <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>
<el-tooltip class="item" effect="dark" content="驳回" placement="top-start"> <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>
<el-tooltip class="item" effect="dark" content="查看" placement="top-start"> <el-tooltip class="item" effect="dark" content="查看" placement="top-start">
<el-button type="danger" icon="iconfont icon-chakan" @click="goToDetail(item)" circle></el-button> <el-button type="danger" icon="iconfont icon-chakan" @click="goToDetail(item)" circle></el-button>
...@@ -86,7 +124,8 @@ export default { ...@@ -86,7 +124,8 @@ export default {
orderID:'', orderID:'',
tcid:'', tcid:'',
startDate:'', startDate:'',
returnDate:'' returnDate:'',
auditContract:''
}, },
dataList:[], dataList:[],
loading:false, loading:false,
...@@ -130,7 +169,6 @@ export default { ...@@ -130,7 +169,6 @@ export default {
this.loading=true; this.loading=true;
this.apiJavaPost("/api/contract/auditContract",this.msg,res => { this.apiJavaPost("/api/contract/auditContract",this.msg,res => {
this.loading=false; this.loading=false;
console.log(res,'ressss');
if (res.data.resultCode === 1) { if (res.data.resultCode === 1) {
this.dataList = res.data.data; this.dataList = res.data.data;
} else { } else {
...@@ -139,10 +177,9 @@ export default { ...@@ -139,10 +177,9 @@ export default {
},null); },null);
}, },
//审核通过或者驳回 //审核通过或者驳回
AuditElec(type){ AuditElec(item,type){
let msg = this.dataList[0]; item.auditContract=type;
msg.auditContract=type; this.apiJavaPost("/api/contract/dosaveOrUpdate",item,res => {
this.apiJavaPost("/api/contract/dosaveOrUpdate",msg,res => {
if (res.data.resultCode === 1) { if (res.data.resultCode === 1) {
this.Success(res.data.message); this.Success(res.data.message);
this.getList(); this.getList();
...@@ -152,9 +189,8 @@ export default { ...@@ -152,9 +189,8 @@ export default {
},null); },null);
}, },
getDate(date) { getDate(date) {
return moment(date).format("YYYY-MM-DD"); return moment(date).format("YYYY-MM-DD");
}, }
}, },
mounted() { mounted() {
this.getList(); this.getList();
......
src/components/clientConfirm.vue
View file @ 2767a96d
...@@ -34,17 +34,6 @@ ...@@ -34,17 +34,6 @@
.dic_content .content_table font{min-width:0;} .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 .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 .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 .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;} .dic_content .leftSign span{display:inline-block;width:170px;text-align:right;}
...@@ -748,12 +737,12 @@ ...@@ -748,12 +737,12 @@
<p style="margin:20px 0;">出境社经办人：<font>{{dataList.agentName}}</font></p> <p style="margin:20px 0;">出境社经办人：<font>{{dataList.agentName}}</font></p>
</div> </div>
<div style="text-align:center;margin:20px 0"> <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>
</div> </div>
<div class="CliSignDiv" :class="dialogVisible?'isShowSign':''" @touchmove.prevent> <div class="CliSignDiv" :class="dialogVisible?'isShowSign':''" @touchmove.prevent>
<div id="canvas"> <div id="canvas" style="position:relative;top:0">
</div> </div>
<div style="text-align:center;margin-top:20px;"> <div style="text-align:center;margin-top:20px;">
<input type="button" @click="handelClearEl()" class="CV_Btn" value="清除" /> <input type="button" @click="handelClearEl()" class="CV_Btn" value="清除" />
...@@ -789,7 +778,6 @@ ...@@ -789,7 +778,6 @@
//获取数据 //获取数据
getList(){ getList(){
this.apiJavaPost("/api/contract/getContractInfo",this.msg,res => { this.apiJavaPost("/api/contract/getContractInfo",this.msg,res => {
console.log(res,'resss');
if (res.data.resultCode === 1) { if (res.data.resultCode === 1) {
this.dataList = res.data.data; this.dataList = res.data.data;
} else { } else {
...@@ -886,7 +874,6 @@ ...@@ -886,7 +874,6 @@
//提交数据 //提交数据
SaveMsg(){ SaveMsg(){
this.apiJavaPost("/api/contract/dosaveOrUpdate",this.dataList,res => { this.apiJavaPost("/api/contract/dosaveOrUpdate",this.dataList,res => {
console.log(res,'ressss');
if (res.data.resultCode === 1) { if (res.data.resultCode === 1) {
this.Success(res.data.message); this.Success(res.data.message);
this.dialogVisible = false; this.dialogVisible = false;
...@@ -903,7 +890,7 @@ ...@@ -903,7 +890,7 @@
this.msg.orderID = this.$route.query.orderID; this.msg.orderID = this.$route.query.orderID;
var h = window.screen.height; var h = window.screen.height;
var cHeight=document.getElementsByClassName("CliSignDiv")[0]; var cHeight=document.getElementsByClassName("CliSignDiv")[0];
cHeight.style.height=700+'px'; cHeight.style.height=900+'px';
this.getList(); this.getList();
this.getCanvas(); this.getCanvas();
} }
......
src/components/leaderPay2.vue
View file @ 2767a96d
...@@ -593,6 +593,7 @@ input[type="number"] { ...@@ -593,6 +593,7 @@ input[type="number"] {
<span v-if="item.UserType==1">酒店</span> <span v-if="item.UserType==1">酒店</span>
<span v-if="item.UserType==2">餐饮</span> <span v-if="item.UserType==2">餐饮</span>
<span v-if="item.UserType==4">交通</span> <span v-if="item.UserType==4">交通</span>
(<span style="color:red">{{item.CurrencyName}}</span>)
</td> </td>
<td>{{item.PlanTotalPrice}}</td> <td>{{item.PlanTotalPrice}}</td>
<td>{{item.UserTotalPrice}}</td> <td>{{item.UserTotalPrice}}</td>
...@@ -1251,7 +1252,7 @@ export default { ...@@ -1251,7 +1252,7 @@ export default {
money = money + Math.round(list[i].OriginalMoney * (list[i].Rate - list[i].Fee) * 100) / 100 money = money + Math.round(list[i].OriginalMoney * (list[i].Rate - list[i].Fee) * 100) / 100
} }
console.log(money) console.log(money)
if (money != 0) { if (money == 0 && !money) {
this.$message.error('金额小于0，无法制单') this.$message.error('金额小于0，无法制单')
return return
} else { } else {
......
src/components/systemManagement/Maninfo.vue
View file @ 2767a96d
...@@ -177,6 +177,7 @@ ...@@ -177,6 +177,7 @@
<table class="po_content singeRowTable" style="border:1px solid #E6E6E6;" cellspacing="0" cellpadding="0" v-loading="loading"> <table class="po_content singeRowTable" style="border:1px solid #E6E6E6;" cellspacing="0" cellpadding="0" v-loading="loading">
<tr> <tr>
<th>编号</th>
<th>别名</th> <th>别名</th>
<th>户名</th> <th>户名</th>
<th>开户行</th> <th>开户行</th>
...@@ -187,6 +188,7 @@ ...@@ -187,6 +188,7 @@
<th>支</th> <th>支</th>
</tr> </tr>
<tr v-for="(item,index) in DataList" :key="index"> <tr v-for="(item,index) in DataList" :key="index">
<td>{{item.ID}}</td>
<td>{{item.Alias}}</td> <td>{{item.Alias}}</td>
<td>{{item.AccountName}}</td> <td>{{item.AccountName}}</td>
<td>{{item.OpeningBank}}</td> <td>{{item.OpeningBank}}</td>
......
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