Skip to content

S
SuperMan
Commit d7277f93 authored by huangyuanyuan's avatar huangyuanyuan
Browse files
Options

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

parents ae3e6e54 4569f7d2
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 4516 additions and 2003 deletions
package.json
View file @ d7277f93
......@@ -5,10 +5,10 @@
"author": "VIITTO",
"private": true,
"scripts": {
"dev": "webpack-dev-server --inline --progress --config build/webpack.dev.conf.js",
"dev": "node --max-old-space-size=4096 node_modules/webpack-dev-server/bin/webpack-dev-server.js --inline --progress --config build/webpack.dev.conf.js",
"start": "npm run dev",
"lint": "eslint --ext .js,.vue src",
"serve" : "node --max_old_space_size=4096 node_modules/.bin/vue-cli-service serve --open",
"serve": "node --max_old_space_size=4096 node_modules/.bin/vue-cli-service serve --open",
"build": "node --max-old-space-size=4096 build/build.js"
},
"dependencies": {
......@@ -28,6 +28,7 @@
"js-md5": "^0.7.3",
"jspdf": "^1.4.1",
"lrz": "^4.9.40",
"moment": "^2.24.0",
"node-sass": "^4.11.0",
"pdfjs-dist": "^2.0.489",
"pinyin": "^2.8.3",
......@@ -59,7 +60,7 @@
"babel-plugin-transform-vue-jsx": "^3.5.0",
"babel-preset-env": "^1.7.0",
"babel-preset-stage-2": "^6.22.0",
"chalk": "^2.0.1",
"chalk": "^2.4.2",
"copy-webpack-plugin": "^4.0.1",
"css-loader": "^0.28.11",
"eslint": "^4.15.0",
......
src/assets/common/lang/H/h-invoicesManager.js
View file @ d7277f93
export const obj = {
qbfapiao: '全部发票'
qbfapiao: '全部发票',
wfqide: '我发起的',
dwspide: '待我审批的',
wspide: '我审批的',
wzfeide: '我作废的',
bbhuide: '被驳回的',
csgwode: '抄送给我的',
shenpi: '审批',
tonggei: '通过',
jujue: '拒绝',
bohui: '驳回',
qrenhan: '确认函',
gongji: '共计',
tdqdi: '条，当前第',
tiao: '条。',
shwanbi: '审核完毕',
yi: '已',
fpkjsqdan: '发票开具申请单',
bumen: '部门',
sqren: '申请人',
kjjine: '开具金额',
dzjine: '到账金额',
dzyinhang: '到账银行',
sqriqi: '申请日期',
dzriqi: '到账日期',
tuanhao: '团号',
ddanhao: '订单号',
cwdanju: '财务单据',
zanwu: '暂无',
kjneirong: '开具内容',
shuihao: '税号',
khuhang: '开户行',
shuihao2: '税号：',
qsrshuihao: '请输入税号',
sfxianshi: '是否显示',
yjshzqbyjxqtcz: '一键审核中请不要进行其他操作。',
}
export default obj;
\ No newline at end of file
src/assets/common/lang/zh.js
View file @ d7277f93
......@@ -1745,4 +1745,4 @@ export const visaT = {
v_Othervisas:'其他'
}
import invoicesManager from './H/h-invoicesManager'
export const invoices = invoicesManager
\ No newline at end of file
export const ios = invoicesManager
\ No newline at end of file
src/assets/css/cssReset.css
View file @ d7277f93
......@@ -48,6 +48,7 @@ input:-webkit-autofill{-webkit-box-shadow: 0 0 0px 1000px white inset;}
.colorccc{color: #ccc!important;}
.colorE95252{color: #E95252!important;}
.cursorpointer{cursor: pointer;}
.text-decoration{text-decoration: underline;}
.fbold{font-weight: bold!important}
.fwnormal{font-weight: normal!important}
.fnormal{font-style: normal;}
......
src/assets/utils/commonUtils.js
View file @ d7277f93
......@@ -139,7 +139,7 @@ var commonUtils = {
// 小数点前进行转化
for (var i = part[0].length - 1; i >= 0; i--) {
if (part[0].length > 10) {
alertWarning("位数过大，无法计算");
// alertWarning("位数过大，无法计算");
return "";
} // 若数量超过拾亿单位，提示
let tmpnewchar = "";
......@@ -219,7 +219,7 @@ var commonUtils = {
// 小数点之后进行转化
if (Num.indexOf(".") != -1) {
if (part[1].length > 2) {
alertWarning("小数点之后只能保留两位,系统将自动截段");
// alertWarning("小数点之后只能保留两位,系统将自动截段");
part[1] = part[1].substr(0, 2);
}
for (var i = 0; i < part[1].length; i++) {
......
src/components/Details.vue
View file @ d7277f93
......@@ -63,7 +63,7 @@
<div class="resource-ttop" style="font-family:PingFangSC-Semibold" v-if="rootName!=''">
{{rootName}}<i class="iconfont icon-weibiaoti102"></i>{{parentName}}<i class="iconfont icon-weibiaoti102"></i><span class="active">{{currentName}}</span>
</div>
<div class="frame-box">
<div class="frame-box" ref="frameBox" name="frameBox">
<router-view></router-view>
</div>
</div>
......
src/components/DomesticModule/FinancialOrder.vue
View file @ d7277f93
......@@ -213,7 +213,6 @@ export default {
}
this.apipost('Financial_post_GetTicketFinanceList',msg,r=>{
if(r.data.resultCode==1){
this.total = r.data.data.count;
if(this.total>0){
this.noData =false;
}else{
......
src/components/DomesticModule/SettlementOrder.vue
View file @ d7277f93
......@@ -149,8 +149,8 @@
@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>
</div>
</div>
......
src/components/FinancialModule/CapitalAllocation.vue
View file @ d7277f93
......@@ -206,8 +206,8 @@
@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>
</div>
</div>
......
src/components/FinancialModule/CapitalAllocationDetail.vue
View file @ d7277f93
......@@ -320,7 +320,6 @@
<div class="clearfix Ca_comLinediv">
<span class="Ca_remarkSpan">{{$t('hotel.hotel_remark')}}：</span>
<div class="Ca_description">{{item.Description}}</div>
<!-- <input type="button" class="hollowFixedBtn Co_oderRight" style="margin-top:25px;" value="上传凭证"/> -->
<input type="button" class="hollowFixedBtn Co_oderRight" style="margin-top:25px;" @click="showFileList(item)" :value="item.comText"/>
<div class="Cafujian clearfix" v-if="item.isShow">
<template v-for="(file,fIndex) in item.vorcherInos">
......@@ -328,19 +327,16 @@
<div style="width:100%;height:100%;overflow: hidden;">
<img :src="file.Content" @click="showImg(file.Content)">
</div>
<!-- <span class="iconfont icon-guanbi1" @click="deleteUploadFile(fIndex)"></span> -->
</div>
<div v-if="file.Type==1">
<div class="iconfont " :class="file.Content.substring(file.Content.lastIndexOf('.')+1,file.Content.length).toUpperCase()=='PDF'? 'icon-pdf' : 'icon-excel'" @click="showUpLoadFile(file)">
</div>
<!-- <span class="iconfont icon-guanbi1" @click="deleteUploadFile(fIndex)"></span> -->
</div>
<div v-if="file.Type==2">
<div class="iconfont icon-excel" @click="showUpLoadFile(file)">
</div>
<!-- <span class="iconfont icon-guanbi1" @click="deleteUploadFile(fIndex)"></span> -->
</div>
</template>
</div>
......@@ -376,7 +372,6 @@
<div class="clearfix Ca_comLinediv" style="width:100%;padding:0 20px;">
<span class="Ca_remarkSpan">{{$t('hotel.hotel_remark')}}：</span>
<div class="Ca_description">{{item.Description}}</div>
<!-- <input type="button" class="hollowFixedBtn Co_oderRight Ca_payBtn" style="margin-top:25px;" @click="upSbankfile(item)" value="上传凭证"/> -->
<input type="button" class="hollowFixedBtn Co_oderRight Ca_payBtn" style="margin-top:25px;" @click="showFuFileList(item)" :value="item.comText"/>
<div class="Cafujian clearfix" v-if="item.isShow">
<template v-for="(file,fIndex) in item.vorcherInos">
......@@ -384,19 +379,16 @@
<div style="width:100%;height:100%;overflow: hidden;">
<img :src="file.Content" @click="showImg(file.Content)">
</div>
<!-- <span class="iconfont icon-guanbi1" @click="deleteUploadFile(fIndex)"></span> -->
</div>
<div v-if="file.Type==1">
<div class="iconfont _wenjian_P" :class="file.Content.substring(file.Content.lastIndexOf('.')+1,file.Content.length).toUpperCase()=='PDF'? 'icon-pdf' : 'icon-excel'" @click="showUpLoadFileT(file)">
</div>
<!-- <span class="iconfont icon-guanbi1" @click="deleteUploadFile(fIndex)"></span> -->
</div>
<div v-if="file.Type==2">
<div class="iconfont icon-excel" @click="showUpLoadFile(file)">
</div>
<!-- <span class="iconfont icon-guanbi1" @click="deleteUploadFile(fIndex)"></span> -->
</div>
</template>
</div>
......@@ -413,17 +405,6 @@
</div>
</div>
</div>
<!-- <div class="Ca_rightFile">
<div class="_addUpload_box" v-for="item in dataList.SBankList">
<div style="width:100%;" v-if="item.vorcherInos.length>0">
<el-carousel trigger="click" height="293px" width="440px" :interval="5000">
<el-carousel-item style="height: 293px;" v-for="subItem in item.vorcherInos" v-if="subItem.Type==3">
<img @click="showImg(subItem)" :src="subItem.Content" alt="" style="width: 100%;">
</el-carousel-item>
</el-carousel>
</div>
</div>
</div> -->
</div>
<viewer :images="images" :options='imageOptions' @inited="inited" class="viewer" ref="viewer">
<img v-for="src in images" :src="src" :key="src.subCode">
......@@ -442,19 +423,6 @@
</div>
<div class="_process clearfix">
<!-- <el-popover
popper-class="detailsIT_Journal"
width="600"
placement="right"
trigger="click">
<div class="InfoChangeLog" >
<div class="changLog">
<p class="_log_t">收款流程</p>
<my-FlowChartModule :data="AuditListData"></my-FlowChartModule>
</div>
</div>
<span slot="reference" class="_flow_chart">流程图</span>
</el-popover> -->
<div class="_process_box">
<template v-for="(item,index) in GetDetail.AuditSteps">
<div class="_pb_son" :class="{_none_after:(item.NextStep==1||item.Status==4),_bohui_after:(GetDetail.Status==3 && !IsBoHui && index===GetDetail.AuditSteps.length-1)}" v-if="item.Sort==0 || (item.Status==1 && item.NextStep==1) || (item.Status==2 && item.Sort!=0) || (item.Status==4)">
......@@ -654,6 +622,7 @@ export default {
GetDetail:{
AuditSteps:[]
},
endDate: ''
}
},
create(){
......@@ -667,7 +636,17 @@ export default {
getList(){
this.apipost('Financial_get_GetFundTransfer', this.msg, res => {
if(res.data.resultCode == 1) {
this.dataList=res.data.data;
this.dataList = res.data.data;
this.GetDetail = JSON.parse(JSON.stringify(this.dataList));
this.GetDetail.AuditSteps = [];
if(this.dataList.Status==2){
let len = this.dataList.AuditSteps.length - 1;
let sLen = this.dataList.AuditSteps[len].AuditRecordList[this.dataList.AuditSteps[len].AuditRecordList.length-1];
let begTime = this.dataList.AuditSteps[0].AuditRecordList[0].AduitDate;
let enTime = sLen && sLen.AduitDate ? sLen.AduitDate : begTime;
let newTime = this.$commonUtils.formatMsgTime2(begTime,enTime);
this.endDate = newTime.replace("前","");
}
this.dataList.AuditSteps.forEach(y=>{
if(y.Sort>0){
y.contentTips = y.AuditDescription+(y.AuditWay=='2'? this.$t('fnc.huiqian') : this.$t('fnc.huoqian'));
......@@ -696,9 +675,8 @@ export default {
}, err => {})
},
AuditOrRefund(){
this.MsgBus.$emit('msg');
// this.$router.push({name:'FinancialDocuments',query:{"returnCode":this.returnCode,"pageIndex":this.pageIndex,blank:'y'}});
},
this.MsgBus.$emit('msg');
},
//点击显示附件
showFileList(item){
if(item.comText== this.$t('fnc.ycfujian')){
......
src/components/FinancialModule/ChoiceAddFinancialDocuments2.vue
View file @ d7277f93
......@@ -32,7 +32,7 @@
<li :class="active==3?'_active':''" v-else>挂账单</li>
</ul>
<ul class="_conten">
<li v-for="(item,index) in GetList">
<li v-for="(item,index) in GetList" v-if="item.IsShow === 1">
<div class="_left">
<span class="_Icon">{{item.Name.substring(0,1)}}</span>
<div>
......@@ -125,7 +125,7 @@
let newList = [];
if (this.templateID) {
this.templateID.forEach(x=>{
this.GetList.forEach(y=>{
this.payList.forEach(y=>{
if(x === y.Id) {
newList.push(y)
}
......@@ -133,7 +133,6 @@
})
this.GetList = newList
}
},
Financial_post_GetList(){ //获取
this.apipost('Financial_post_GetList',{},res=>{
......@@ -174,7 +173,7 @@
this.showTab = this.$route.query.Type?this.$route.query.Type:0;
if(this.showTab==1){
this.GetList = this.collectList;
} else if(this.showTab==1){
} else if(this.showTab==3){
this.GetList = this.GZList;
}else{
this.GetList = this.payList;
......
src/components/FinancialModule/FinancialDocumentsDetail.vue
View file @ d7277f93
......@@ -351,6 +351,7 @@
<td v-if="OrderSource==9&&GetDetail.SourceID>0" @click="jumpPage('FinancialOrder',GetDetail,2)"> <span class="_jump_page _font_bold">国内票务</span> </td>
<td v-else-if="OrderSource==10&&GetDetail.SourceID>0" @click="jumpPage('FinancialOrder',GetDetail,3)"> <span class="_jump_page _font_bold">签证收支</span> </td>
<td v-else-if="OrderSource==4&&GetDetail.SourceID>0"@click="jumpPage('FinancialOrder',GetDetail,4)"> <span class="_jump_page _font_bold">机票收支</span> </td>
<td v-if="GetDetail.TemplateId === 43" @click="jumpPlanPage('leaderReimbursement',o.TCID)"> <span class="_jump_page _font_bold">用款计划</span> </td>
</tr>
</table>
<table border="1" bordercolor="#D2D2D2" style="border-collapse:collapse;margin-top:15px;" width="100%" v-else-if="OrderSource==10">
......@@ -397,36 +398,6 @@
<span slot="reference" style="text-decoration: underline;cursor: pointer;" @click="Financial_post_GetFinancLogList()">单据操作日志</span>
</el-popover>
</div>
<!-- <p class="_TCIDAndTCNUMList">
<span>
团队编号：
</span>
<template v-if="GetDetail.TCIDAndTCNUMList.length>0">
<p class="_TCIDAndTCNUMList_item">
<span v-for="(i,ix) in GetDetail.TCIDAndTCNUMList" class="_jump_page _font_bold" @click="jumpPage('productQuery',i.TCID,1)">
{{i.TCNUM}}（{{i.TCID}}）
<span v-if="ix!=GetDetail.TCIDAndTCNUMList.length-1"></br></span>
</span>
</p>
</template>
<template v-else>
<span>无</span>
</template>
</p>
<p v-if="GetDetail.TCIDAndTCNUMList.length==1" @click="jumpPage('TeamBalancePayment',GetDetail.TCIDAndTCNUMList,5)" class="_jump_page _font_bold">团队收支</p>
<p v-if="GetDetail.TCIDAndTCNUMList.length>1" @click="jumpPage('TeamBalancePayment',GetDetail.TCIDAndTCNUMList,6)" class="_jump_page _font_bold">团队收支</p>
<p v-if="OrderSource==9&&GetDetail.SourceID>0">国内票务：<span class="_jump_page _font_bold" @click="jumpPage('SettlementOrder',GetDetail,2)">{{GetDetail.SourceID}}</span></p>
<p v-if="OrderSource==10&&GetDetail.SourceID>0">签证：<span class="_jump_page _font_bold" @click="jumpPage('VisaProductCopy',GetDetail,3)">{{GetDetail.SourceID}}</span></p>
<p v-if="OrderSource==4&&GetDetail.SourceID>0" class="_TCIDAndTCNUMList">
<span>机票收支：</span>
<span class="_TCIDAndTCNUMList_item">
<template v-for="(i,ix) in GetDetail.TCIDAndTCNUMList">
<span class="_jump_page _font_bold" @click="jumpPage('FinancialOrder',GetDetail,4)">{{i.TCNUM}}（{{GetDetail.SourceID}}）</span>
<span v-if="ix!=GetDetail.TCIDAndTCNUMList.length-1"></br></span>
</template>
</span>
</p>
<p class="_jump_page _font_bold" @click="jumpPage('RegistrationList',GetDetail,7)">报名清单</p> -->
</div>
</div>
<my-HB-Bill v-if="GetDetail.Is_Merge===1 && ZhiDanRen!==bossID" :ID="GetDetail.FrID" :isPrintPage="false" :width="widthSon" :color="colorSon"></my-HB-Bill>
......@@ -543,6 +514,40 @@
</div>
</div>
</div>
<template v-if="tuiDataList.length>0">
<div class="w890px">
<div class="_tit _tit2 w890px _border_bottom_none">
<p>
<span class="_text">原路退款</span>
<span class="_btn" v-if="tableShowTuikuan" @click="tableShowTuikuan=false">收起 <i class="iconfont icon-gengduo _rotate"></i> </span>
<span class="_btn" v-else @click="tableShowTuikuan=true">展开 <i class="iconfont icon-gengduo"></i> </span>
</p>
<div v-show="tableShowTuikuan" >
<table class="singeRowTable" border="0" cellspacing="0" cellpadding="0">
<tr>
<th width="250">平台单号</th>
<th width="100">金额</th>
<th>支付方式</th>
<th>支付日期</th>
<th>状态</th>
<th>退款金额</th>
</tr>
<tr v-for="item in tuiDataList">
<td>{{item.Trade_Order}}</td>
<td>{{item.Money}}</td>
<td>{{item.PayWayName}}</td>
<td>{{item.Pay_Date}}</td>
<td>{{item.PayStatus}}</td>
<td>{{item.RefundMoney}}</td>
</tr>
</table>
<!-- <el-pagination background @current-change="handleCurrentChange" :current-page.sync="queryMsg.currentPage" :page-size="queryMsg.pageSize"
layout="total,prev, pager, next, jumper" :total="queryMsg.total"></el-pagination> -->
</div>
</div>
</div>
</template>
<div class="_process clearfix">
<!-- <el-popover
popper-class="detailsIT_Journal"
......@@ -803,6 +808,16 @@ export default {
GetFinancLogList:[],
LogLoading:false,
IsBoHui: false,
tuiDataList:[],
tableShowTuikuan:false,
queryMsg:{
pageIndex:1,
pageSize:10,
FinanceId:'',
Type:2,
currentPage:1,
total: 0,
},
}
},components:{
'my-FlowChartModule': myFlowChartModule,
......@@ -911,6 +926,12 @@ export default {
window.open(routeData.href, "_blank");
}
},
jumpPlanPage(path, id){
this.$router.push({
name: path,
query: { id: id, isUpdate: false, blank: 'y'}
})
},
jumpPage(path,id,type){
if(type==1){
// let routeData = this.$router.resolve({
......@@ -1177,14 +1198,27 @@ export default {
Vue.component(this.name+this.z,this.componentTemp)
this.c=this.name+this.z
},
//获取列表
getTuikuan(){
this.apipost('OnlinePay_get_GetOrderPayMoneyInfo',this.queryMsg,res=>{
if(res.data.resultCode==1){
this.tuiDataList = res.data.data.pageData;
this.queryMsg.total = res.data.data.count;
}else{
}
},err=>{})
},
},mounted(){
// document.onkeydown = this.KeyDown
// document.onkeyup = this.KeyUp
// document.oncontextmenu = function(){return false;}
this.Financial_post_GetDetail(this.ID)
this.queryMsg.FinanceId = this.$route.query.id;
if(this.$route.query.Conditon){
this.returnCode = this.$route.query.Conditon;
}
this.getTuikuan();
}
}
</script>
src/components/FinancialModule/FinancialSubmodule/BillModule.vue
View file @ d7277f93
......@@ -366,6 +366,7 @@ export default {
})
this.currentMoney = this.currentMoney.toFixed(2);
this.benMoney = this.benMoney.toFixed(2);
this.$emit('headCallBack', this.currentMoney);
data.ChineseMoney = this.$commonUtils.changeMoneyToChinese(data.Money)
data.ChinesePayMoney = this.$commonUtils.changeMoneyToChinese(data.PayMoney)
data.PayMoney = this.$commonUtils.addCommas(data.PayMoney.toFixed(2))
......
src/components/FinancialModule/accDetail/CashAccDetail.vue
View file @ d7277f93
......@@ -99,6 +99,17 @@
</el-date-picker>
</el-form-item>
</el-col>
<el-col :span="8" :gutter="35">
<el-form-item label="发团日期">
<el-date-picker class="h34"
@change="timeAddByTC"
v-model="productionDateByTC"
type="daterange"
value-format="yyyy-MM-dd"
:range-separator="$t('restaurant.res_To')">
</el-date-picker>
</el-form-item>
</el-col>
</el-row>
</el-form>
<ul>
......@@ -362,6 +373,8 @@ export default {
ClientID:'',
sTradeDate:'',
eTradeDate:'',
QStartDate:'',
QEndDate:'',
BankList:[],
Is_Cashier:-1,
},
......@@ -379,6 +392,7 @@ export default {
accountList:[],
accountListT:[],
productionDate:[],
productionDateByTC:[],
ClientAccountList:[],
RB_Branch_Id:null,
loading:false,
......@@ -438,6 +452,7 @@ export default {
this.msg.sTradeDate = this.$route.query.sTradeDate;
this.msg.eTradeDate = this.$route.query.eTradeDate;
this.productionDate = [this.msg.sTradeDate, this.msg.eTradeDate];
this.productionDateByTC = [this.msg.QStartDate, this.msg.QEndDate];
this.getList();
this.BankAccount_post_GetCashAccountList("query");
}
......@@ -773,6 +788,15 @@ export default {
this.msg.sTradeDate = this.productionDate[0];
this.msg.eTradeDate = this.productionDate[1];
},
timeAddByTC(){ // 日期格式
if(!this.productionDateByTC){
this.msg.QStartDate = '';
this.msg.QEndDate = '';
return
}
this.msg.QStartDate = this.productionDateByTC[0];
this.msg.QEndDate = this.productionDateByTC[1];
},
bankaccount_post_GetList(){ // 获取银行账户
this.AccountId = '';
let msg = {
......
src/components/FinancialModule/accDetail/CompanyAccDetail.vue
View file @ d7277f93
......@@ -93,6 +93,17 @@
</el-date-picker>
</el-form-item>
</el-col>
<el-col :span="8" :gutter="35">
<el-form-item label="发团日期">
<el-date-picker class="h34"
@change="timeAddByTC"
v-model="productionDateByTC"
type="daterange"
value-format="yyyy-MM-dd"
:range-separator="$t('restaurant.res_To')">
</el-date-picker>
</el-form-item>
</el-col>
</el-row>
</el-form>
<ul>
......@@ -321,6 +332,8 @@ export default {
ClientID:'',
sTradeDate:'',
eTradeDate:'',
QStartDate:'',
QEndDate:'',
BankList:[],
Is_Cashier:-1,
},
......@@ -333,6 +346,7 @@ export default {
GetAccountType:[],
accountList:[],
productionDate:[],
productionDateByTC:[],
ClientAccountList:[],
loading:false,
date:'',
......@@ -381,6 +395,7 @@ export default {
this.msg.sTradeDate = this.$route.query.sTradeDate;
this.msg.eTradeDate = this.$route.query.eTradeDate;
this.productionDate = [this.msg.sTradeDate, this.msg.eTradeDate];
this.productionDateByTC=[this.msg.QStartDate, this.msg.QEndDate];
this.getList();
this.bankaccount_post_GetListS("query");
}
......@@ -418,6 +433,15 @@ export default {
this.msg.sTradeDate = this.productionDate[0];
this.msg.eTradeDate = this.productionDate[1];
},
timeAddByTC(){ // 日期格式
if(!this.productionDateByTC){
this.msg.QStartDate = '';
this.msg.QEndDate = '';
return
}
this.msg.QStartDate = this.productionDateByTC[0];
this.msg.QEndDate = this.productionDateByTC[1];
},
bankaccount_post_GetList(){ // 获取银行账户
this.AccountId = '';
this.apipost('bankaccount_post_GetList',{TypeId:this.accType}, res => {
......
src/components/FinancialModule/accDetail/PlatformAccDetail.vue
View file @ d7277f93
......@@ -90,6 +90,17 @@
</el-date-picker>
</el-form-item>
</el-col>
<el-col :span="8" :gutter="35">
<el-form-item label="发团日期">
<el-date-picker class="h34"
@change="timeAddByTC"
v-model="productionDateByTC"
type="daterange"
value-format="yyyy-MM-dd"
:range-separator="$t('restaurant.res_To')">
</el-date-picker>
</el-form-item>
</el-col>
</el-row>
</el-form>
<ul>
......@@ -309,6 +320,8 @@ export default {
ClientID:'',
sTradeDate:'',
eTradeDate:'',
QStartDate:'',
QEndDate:'',
BankList:[],
Is_Cashier:-1,
Status:-1,
......@@ -323,6 +336,7 @@ export default {
GetAccountType:[],
accountList:[],
productionDate:[],
productionDateByTC:[],
ClientAccountList:[],
loading:false,
RB_Branch_Id:null,
......@@ -372,6 +386,7 @@ export default {
this.msg.sTradeDate = this.$route.query.sTradeDate;
this.msg.eTradeDate = this.$route.query.eTradeDate;
this.productionDate = [this.msg.sTradeDate, this.msg.eTradeDate];
this.productionDateByTC = [this.msg.QStartDate, this.msg.QEndDate];
this.getList();
this.BankAccount_post_GetPlatformList("query");
}
......@@ -409,6 +424,15 @@ export default {
this.msg.sTradeDate = this.productionDate[0];
this.msg.eTradeDate = this.productionDate[1];
},
timeAddByTC(){ // 日期格式
if(!this.productionDateByTC){
this.msg.QStartDate = '';
this.msg.QEndDate = '';
return
}
this.msg.QStartDate = this.productionDateByTC[0];
this.msg.QEndDate = this.productionDateByTC[1];
},
bankaccount_post_GetList(){ // 获取平台账户
this.AccountId = '';
let msg = {
......
src/components/FinancialModule/accDetail/PoolAccDetail.vue
View file @ d7277f93
......@@ -82,6 +82,17 @@
</el-date-picker>
</el-form-item>
</el-col>
<el-col :span="8" :gutter="35">
<el-form-item label="发团日期">
<el-date-picker class="h34"
@change="timeAddByTC"
v-model="productionDateByTC"
type="daterange"
value-format="yyyy-MM-dd"
:range-separator="$t('restaurant.res_To')">
</el-date-picker>
</el-form-item>
</el-col>
</el-row>
</el-form>
<ul>
......@@ -101,7 +112,7 @@
<th rowspan="2">{{$t('fnc.a_zhaiyao')}}</th>
<th rowspan="2">{{$t('fnc.a_hkrfkduixiang')}}</th>
<th rowspan="2">{{$t('fnc.a_hkfkshijian')}}</th>
<th>{{$t('fnc.jylshuihao')}}</th>
<!-- <th>{{$t('fnc.jylshuihao')}}</th> -->
<th colspan="3">{{$t('fnc.waibi')}}（{{TypeName}}）</th>
<th rowspan="2">{{$t('fnc.a_dhuanlv')}}</th>
<th colspan="3">{{$t('fnc.a_rminbi')}}</th>
......@@ -124,7 +135,7 @@
<td></td>
<td> {{ moneyFormat(StartMoney) }} </td>
</tr>
<tr v-for=" ( item , index ) in DataList ">
<tr v-for=" ( item , index ) in DataList " v-if=" item.Type !== 4">
<td> {{ item.BName }} </td>
<td>
<span class="cursorpointer" :class=" item.Type == 1 ? '_bg_green' : '_bg_red'" @click="goUrl('FinancialDocumentsDetail',item.FinanceId)">{{ item.FinanceId }}</span>
......@@ -339,6 +350,8 @@ export default {
ClientID:'',
sTradeDate:'',
eTradeDate:'',
QStartDate:'',
QEndDate:'',
BankList:[],
Is_Cashier:-1,
},
......@@ -354,6 +367,7 @@ export default {
GetAccountType:[],
accountList:[],
productionDate:[],
productionDateByTC:[],
ClientAccountList:[],
RB_Branch_Id:null,
loading:false,
......@@ -402,6 +416,7 @@ export default {
this.msg.sTradeDate = this.$route.query.sTradeDate;
this.msg.eTradeDate = this.$route.query.eTradeDate;
this.productionDate = [this.msg.sTradeDate, this.msg.eTradeDate];
this.productionDateByTC = [this.msg.QStartDate, this.msg.QEndDate];
this.getList();
this.BankAccount_post_GetCashPoolList("query");
}
......@@ -444,6 +459,15 @@ export default {
this.msg.sTradeDate = this.productionDate[0];
this.msg.eTradeDate = this.productionDate[1];
},
timeAddByTC(){ // 日期格式
if(!this.productionDateByTC){
this.msg.QStartDate = '';
this.msg.QEndDate = '';
return
}
this.msg.QStartDate = this.productionDateByTC[0];
this.msg.QEndDate = this.productionDateByTC[1];
},
bankaccount_post_GetList(){ // 获取银行账户
this.AccountId = '';
let msg = {
......@@ -502,12 +526,12 @@ export default {
endRStartMoney = endStartMoney + x.OriginalMoney;
endStartMoney = endStartMoney + x.Money;
x.enRSMoney = endRStartMoney;
x.enSMoney = endRStartMoney;
x.enSMoney = endStartMoney;
}else if(x.Type==2){
endRStartMoney = endStartMoney - x.OriginalMoney;
endStartMoney = endStartMoney - x.Money;
x.enRSMoney = endRStartMoney;
x.enSMoney = endRStartMoney;
x.enSMoney = endStartMoney;
}
});
this.endStartMoney = endStartMoney;
......
src/components/FinancialModule/addFinancialDocuments.vue
View file @ d7277f93
......@@ -182,14 +182,14 @@
<p class="_yewudanju" v-if="OrderSource==8">{{$t('hotel.order_Number')}}：<span @click="msg.OrderID>0?jumpPage('RegistrationList',GetDetail,8):''">{{msg.OrderID==0?$t('fnc.no'):msg.OrderID}}</span></p>
<div class="rb_top_row _r_mb5">
<el-radio-group v-model="msg.IsPublic" @change="IsPublicChange" class="_IsPublic">
<el-radio :label="1" v-if='msg.TemplateId!==36 && msg.TemplateId!==37'>{{$t('fnc.gongzhang')}}</el-radio>
<el-radio :label="0" v-if='msg.TemplateId!==36 && msg.TemplateId!==37'>{{$t('fnc.sizhang')}}</el-radio>
<el-radio :label="2" v-if='msg.TemplateId!==36 && msg.TemplateId!==37'>{{$t('fnc.rmbxianjin')}}</el-radio>
<el-radio :label="1" v-if='msg.TemplateId!==36 && msg.TemplateId!==37 && msg.TemplateId!==43'>{{$t('fnc.gongzhang')}}</el-radio>
<el-radio :label="0" v-if='msg.TemplateId!==36 && msg.TemplateId!==37 && msg.TemplateId!==43'>{{$t('fnc.sizhang')}}</el-radio>
<el-radio :label="2" v-if='msg.TemplateId!==36 && msg.TemplateId!==37 && msg.TemplateId!==43'>{{$t('fnc.rmbxianjin')}}</el-radio>
<el-radio :label="3" v-if='msg.TemplateId!==36 && msg.TemplateId!==37'>{{$t('fnc.wbxianjin')}}</el-radio>
<el-radio :label="4" v-if='msg.TemplateId===36 || msg.TemplateId===37'>{{$t('fnc.zjinchi')}}</el-radio>
<el-radio :label="5" v-if='msg.TemplateId!==36 && msg.TemplateId!==37'>{{$t('fnc.ptxnzhanghu')}}</el-radio>
<el-radio :label="6" v-if='msg.TemplateId!==36 && msg.TemplateId!==37'>{{$t('fnc.djxnzhanghu')}}</el-radio>
<el-radio :label="7" v-if='msg.TemplateId!==36 && msg.TemplateId!==37'>{{$t('fnc.szxiangdi')}}</el-radio>
<el-radio :label="4" v-if='msg.TemplateId===36 || msg.TemplateId===37 || msg.TemplateId===43'>{{$t('fnc.zjinchi')}}</el-radio>
<el-radio :label="5" v-if='msg.TemplateId!==36 && msg.TemplateId!==37 && msg.TemplateId!==43'>{{$t('fnc.ptxnzhanghu')}}</el-radio>
<el-radio :label="6" v-if='msg.TemplateId!==36 && msg.TemplateId!==37 && msg.TemplateId!==43'>{{$t('fnc.djxnzhanghu')}}</el-radio>
<el-radio :label="7" v-if='msg.TemplateId!==36 && msg.TemplateId!==37 && msg.TemplateId!==43'>{{$t('fnc.szxiangdi')}}</el-radio>
<!-- <el-radio :label="3">资金池</el-radio> -->
</el-radio-group>
</div>
......@@ -1021,8 +1021,14 @@ export default {
if(x.ID == i){
if (t>=0) {
this.msg.detailList[t].CostTypeName = x.Name;
if (x.ID === 56) {
this.msg.detailList[t].Remark = `地接费领取自动生成：${this.orderObj.TCNUMS}`;
}
}else{
this.detailList.CostTypeName = x.Name;
if (x.ID === 56) {
this.detailList.Remark = `地接费领取自动生成：${this.orderObj.TCNUMS}`;
}
}
}
})
......
src/components/FinancialModule/addFinancialProcess.vue
View file @ d7277f93
......@@ -326,6 +326,10 @@
<el-radio v-model="addMsg.IsUploadPic" :label="0">{{$t('fnc.buqiyong')}}</el-radio>
<el-radio v-model="addMsg.IsUploadPic" :label="1">{{$t('fnc.qiyong')}}</el-radio>
</el-form-item>
<el-form-item :label="$t('ios.sfxianshi')">
<el-radio v-model="addMsg.IsShow" :label="1">{{$t('pub.yes')}}</el-radio>
<el-radio v-model="addMsg.IsShow" :label="2">{{$t('pub.no')}}</el-radio>
</el-form-item>
<el-form-item :label="$t('fnc.syfeiyong')" v-if="addMsg.TemplateType==8" class="_treeselect">
<!-- <el-select filterable multiple v-model='CostIdS' class="w200" @change="disabledOption2">
<el-option label='通用' value='0' key='0'></el-option>
......@@ -517,6 +521,7 @@ export default {
AuditList:[],
AuditUserList:[],
},
IsShow: 1,
},
AuditUserList:{
EmName:'',
......@@ -713,6 +718,7 @@ export default {
this.addMsg.DescribeInfo = data.DescribeInfo;
this.addMsg.TempLateClass = data.TempLateClass;
this.addMsg.IsUploadPic = data.IsUploadPic;
this.addMsg.IsShow = data.IsShow;
if (data.list && data.list[0] !== -1) {
this.accListMsg = data.list;
}
......
src/components/FinancialModule/addReceivablesDocuments.vue
View file @ d7277f93
......@@ -795,15 +795,15 @@ export default {
})
var wechat=[];
var zhifu=[];
wechat = OcrStr.match(/(\?<=商户单号)(\d*)/);
zhifu = OcrStr.match(/(\?<=商家可扫码退款或查询交易)(\d*)/);
wechat = OcrStr.match(/商户单号.\d+/);
zhifu = OcrStr.match(/商家可扫码退款或查询交易.\d+/);
if(wechat==null&&zhifu==null){
return;
}
if(zhifu==null&&wechat.length>0){
this.setCode = wechat[wechat.length-1]
this.setCode = wechat[wechat.length-1].replace('商户单号','');
}else if(wechat==null&&zhifu.length>0){
this.setCode = zhifu[zhifu.length-1]
this.setCode = zhifu[zhifu.length-1].replace('商家可扫码退款或查询交易','');
}
this.$confirm('匹配到交易流水号是否替换?', '提示', {
confirmButtonText: '确定',
......
src/components/FinancialModule/invoicesManager.vue
View file @ d7277f93
......@@ -173,7 +173,7 @@
<span>{{item.DpreadPrice - item.ApplyTotalPrice}}</span>
<span v-if="(item.DpreadPrice - item.ApplyTotalPrice) < 0" class="_zhuihui" @click="zhuihui(item.OrderId)">追</span>
</td>
<td>{{item.InvoiceApplyList[0].CreateDate}}</td>
<td>{{item.InvoiceApplyList[0].CreateDate.replace('T', ' ')}}</td>
<td>
<span v-if="item.InvoiceApplyList[0].InvoiceApplyState === 1" class="status_Application">申请中</span>
<span v-else-if="item.InvoiceApplyList[0].InvoiceApplyState === 2" class="status_Cancle">已取消</span>
......@@ -192,7 +192,7 @@
</td>
</tr>
<tr v-for="(item2, index2) in item.InvoiceApplyList" :key="index2" v-if="index2!==0">
<td>{{item2.CreateDate}}</td>
<td>{{item2.CreateDate.replace('T', ' ')}}</td>
<td>
<span v-if="item2.InvoiceApplyState === 1" class="status_Application">申请中</span>
<span v-else-if="item2.InvoiceApplyState === 2" class="status_Cancle">已取消</span>
......
src/components/FinancialModule/refundQuery.vue 0 → 100644
View file @ d7277f93
<style>
</style>
<template>
<div class='flexOne'>
<div class="query-box">
<ul>
<li>
<span>
<em>订单号</em>
<el-input type="text" v-model="msg.OrderId" :placeholder="$t('pub.pleaseImport')"></el-input>
</span>
</li>
<li>
<span>
<em>订单来源</em>
<el-select v-model="msg.OrderSource" filterable clearable>
<el-option :label="$t('pub.unlimitedSel')" :value="0"></el-option>
<el-option v-for="item in orderList" :key="item.ID" :label="item.Name" :value="item.ID"></el-option>
</el-select>
</span>
</li>
<li>
<span><em>商务订单</em>
<el-input type="text" v-model="msg.Pay_Order" :placeholder="$t('pub.pleaseImport')"></el-input>
</span>
</li>
<li>
<span><em>平台订单</em>
<el-input type="text" v-model="msg.Trade_Order" :placeholder="$t('pub.pleaseImport')"></el-input>
</span>
</li>
<li>
<span>
<em>支付方式</em>
<el-select v-model="msg.Pay_Way" filterable clearable>
<el-option :label="$t('pub.unlimitedSel')" :value="0"></el-option>
<el-option label="微信" :value="1"></el-option>
<el-option label="QQ" :value="2"></el-option>
<el-option label="支付宝" :value="3"></el-option>
<el-option label="银联" :value="4"></el-option>
</el-select>
</span>
</li>
<li>
<span><em>商户号</em>
<el-input type="text" v-model="msg.Mch_Id" :placeholder="$t('pub.pleaseImport')"></el-input>
</span>
</li>
<li>
<span>
<em>类型</em>
<el-select v-model="msg.Type" filterable clearable>
<el-option label="收款" :value="1"></el-option>
<el-option label="退款" :value="2"></el-option>
</el-select>
</span>
</li>
<li>
<span>
<em>退款状态</em>
<el-select v-model="msg.RefundStatus" filterable clearable>
<el-option label="不限" :value="0"></el-option>
<el-option label="收款中" :value="1"></el-option>
<el-option label="退款成功" :value="2"></el-option>
<el-option label="退款失败" :value="3"></el-option>
<el-option label="转入代发" :value="4"></el-option>
</el-select>
</span>
</li>
<li>
<span>
<em>财务单据</em>
<el-input type="text" v-model="msg.FinanceId" :placeholder="$t('pub.pleaseImport')"></el-input>
</span>
</li>
<li>
<span>
<em>日期</em>
<el-date-picker type="date" v-model="msg.StartTime"
:picker-options="pickerBeginDateBefore" value-format="yyyy-MM-dd" placeholder></el-date-picker>
<el-date-picker type="date" v-model="msg.EndTime"
:picker-options="pickerBeginDateAfter" value-format="yyyy-MM-dd" placeholder></el-date-picker>
</span>
</li>
<li>
<span>
<em>退款日期</em>
<el-date-picker type="date" v-model="msg.RefundStartTime"
:picker-options="pickerBeginDateBefore" value-format="yyyy-MM-dd" placeholder></el-date-picker> -
<el-date-picker type="date" v-model="msg.RefundEndTime"
:picker-options="pickerBeginDateAfter" value-format="yyyy-MM-dd" placeholder></el-date-picker>
</span>
</li>
<li>
<input type="button" class="hollowFixedBtn" :value="$t('pub.searchBtn')" @click="handleCurrentChange(),getList()" />
</li>
</ul>
</div>
<div class="cm_content">
<table class="singeRowTable" border="0" cellspacing="0" cellpadding="0" v-loading="loading">
<tr>
<th width="250">平台单号</th>
<th width="100">金额</th>
<th>支付方式</th>
<th>支付日期</th>
<th>状态</th>
<th>退款金额</th>
</tr>
<tr v-for="item in dataList">
<td>{{item.Trade_Order}}</td>
<td>{{item.Money}}</td>
<td>{{item.PayWayName}}</td>
<td>{{item.Pay_Date}}</td>
<td>{{item.PayStatus}}</td>
<td>{{item.RefundMoney}}</td>
</tr>
</table>
<div class="noDataNotice" v-if="dataList.length<1">
<i class="iconfont icon-kong"></i>
<p>{{$t("active.ld_noData")}}</p>
</div>
</div>
<el-pagination background @current-change="handleCurrentChange" :current-page.sync="msg.currentPage" :page-size="msg.pageSize"
layout="total,prev, pager, next, jumper" :total="msg.total"></el-pagination>
</div>
</template>
<script>
export default {
data(){
return{
msg:{
pageIndex:1,
pageSize:10,
OrderId:'',
OrderSource:0,
Pay_Order:'',
Trade_Order:'',
Pay_Way:0,
Mch_Id:'',
StartTime:'',
EndTime:'',
RefundStartTime:'',
RefundEndTime:'',
Type:2,
RefundStatus:0,
FinanceId:'',
currentPage:1,
total: 0,
},
loading:false,
orderList:[],
dataList:[],
pickerBeginDateBefore: {
disabledDate: time => {
let endTime = new Date(this.msg.EndTime)
return endTime.getTime() < time.getTime()
}
},
pickerBeginDateAfter: {
disabledDate: time => {
let startTime = new Date(this.msg.StartTime)
return startTime.getTime() >= time.getTime()
}
}
}
},
methods:{
handleCurrentChange(val) {
this.msg.pageIndex = val;
this.getList();
},
getList(){ //获取列表
this.loading =true;
this.apipost('OnlinePay_get_GetOrderPayMoneyInfo',this.msg,res=>{
this.loading = false;
console.log(res,'res');
if(res.data.resultCode==1){
this.dataList = res.data.data.pageData;
this.msg.total = res.data.data.count;
}else{
this.Error(res.data.message);
}
},err=>{})
},
//订单来源
getOrderlist() {
this.apipost(
"order_post_GetOrderSource", {},
res => {
if (res.data.resultCode == 1) {
this.orderList = res.data.data;
}
},null);
},
},
mounted(){
this.getOrderlist();
this.getList();
}
}
</script>
src/components/Hotel/HotelProductManage2.vue
View file @ d7277f93
......@@ -38,7 +38,7 @@
</div>
<div class="hotelProductManage2_calendar">
<div class="hotelProductManage2_calendarItem" v-for="(item, index) in days" :key="index">
<div class="calendarItem_month" @click="calendarShow(item, index)">{{item.date}}</div>
<div class="calendarItem_month" title="点击查看详情" @click="calendarShow(item, index)">{{item.date}}</div>
<div class="hotelproductCkbox">
<el-checkbox v-model="item.isCked" @change="changeHotelStatus(item,index)">全选</el-checkbox>
</div>
......@@ -52,17 +52,44 @@
<div>周日</div>
</div>
<div class="calendarItem_day">
<div v-for="(subItem, index2) in item.days" :key="index2" :class="subItem.month===item.date?'nowMonth':'otherMonth'">
<div :class="stockColor(item,subItem)"
:style="subItem.month===item.date&&msg2.DateList.indexOf(subItem.day)!==-1?'border-color: green':''"
@click="calendarDayOn(item, subItem)">
{{subItem.date.getDate()}}<br />
<template v-if="subItem.data&&subItem.data.SubList && subItem.data.SubList[0]">
<template v-for="(childItem,childIndex) in subItem.data.SubList" >
<span v-if="childItem.BatchNumber>1"> {{childItem.BatchNumber}} </span>
</template>
</template>
</div>
<div v-for="(subItem, index2) in item.days" :key="index2"
:class="subItem.month===item.date?'nowMonth':'otherMonth'">
<div :class="stockColor(item,subItem)"
:style="subItem.month===item.date&&msg2.DateList.indexOf(subItem.day)!==-1?'border-color: green':''"
@click="calendarDayOn(item, subItem)">
{{subItem.date.getDate()}}<br />
<div class="detailInfo" v-if="subItem.data&&subItem.data.SubList && subItem.data.SubList[0]">
<div class="triangle_border_up"></div>
<div class="popContent">
<template v-if="subItem.data&&subItem.data.SubList && subItem.data.SubList[0]">
<div class="popList">
<table style="margin-left:3px;padding-top:2px;">
<tr>
<th width="50">批次</th>
<th width="50">价格</th>
<th width="50">库存</th>
</tr>
<tr v-for="(childItem,childIndex) in subItem.data.SubList">
<td>
{{childItem.BatchNumber}}
</td>
<td>
{{childItem.CostPrice}}
</td>
<td>
{{childItem.Inventory}}
</td>
</tr>
</table>
</div>
</template>
</div>
</div>
<template v-if="subItem.data&&subItem.data.SubList && subItem.data.SubList[0]">
<span v-if="subItem.data.SubList.length>1"> {{subItem.data.SubList.length}} </span>
</template>
</div>
</div>
</div>
</div>
......@@ -112,20 +139,21 @@
<el-select v-model="msg2.BatchNumber" placeholder="请选择">
<el-option label="第一批" :value="1"></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-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="标准间成本价">
<el-input-number v-model="msg2.CostPrice" :precision="2" :min="0" @keyup.native="checkPrice(msg2,'CostPrice')" maxlength="10"></el-input-number>
<el-input-number v-model="msg2.CostPrice" :precision="2" :min="0"
@keyup.native="checkPrice(msg2,'CostPrice')" maxlength="10"></el-input-number>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="散客价">
<el-input-number v-model="msg2.SanKePrice" :precision="2" :min="0"
@keyup.native="checkPrice(msg2,'SanKePrice')" maxlength="10"></el-input-number>
@keyup.native="checkPrice(msg2,'SanKePrice')" maxlength="10"></el-input-number>
</el-form-item>
</el-col>
<el-col :span="6">
......@@ -317,21 +345,21 @@
<el-select v-model="msg.BatchNumber" placeholder="请选择">
<el-option label="第一批" :value="1"></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-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="标准间成本价">
<el-input-number v-model="msg.CostPrice" :precision="2" :min="0"
@keyup.native="checkPrice(msg2,'CostPrice')" maxlength="10"></el-input-number>
@keyup.native="checkPrice(msg2,'CostPrice')" maxlength="10"></el-input-number>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="散客价">
<el-input-number v-model="msg.SanKePrice" :precision="2" :min="0"
@keyup.native="checkPrice(msg2,'SanKePrice')" maxlength="10"></el-input-number>
@keyup.native="checkPrice(msg2,'SanKePrice')" maxlength="10"></el-input-number>
</el-form-item>
</el-col>
......@@ -764,7 +792,7 @@
},
methods: {
//库存类型
stockColor: function (item, item2,childItem) {
stockColor: function (item, item2, childItem) {
if (item.date === item2.month && item2.hasOwnProperty('data')) {
let type = item2.data.SubList[0].InventoryType;
if (type === 1) {
......@@ -806,7 +834,7 @@
}, res => {
if (res.data.resultCode === 1) {
let json = res.data.data;
this.hotelInfo.HotelName = json.HotelName;
this.hotelInfo.TotalInventory = json.TotalInventory;
this.hotelInfo.Validity = json.Validity;
......@@ -860,11 +888,11 @@
this.calendar.show = true;
},
// 获取详情
getDetail: function (date,BatchNumber) {
getDetail: function (date, BatchNumber) {
this.apipost('dict_post_HotelOffer_GetHotelPriceInfo', {
HotelId: this.msg.Hotel,
Time: date,
BatchNumber:BatchNumber
BatchNumber: BatchNumber
}, res => {
if (res.data.resultCode === 1) {
let data = res.data.data;
......@@ -937,12 +965,12 @@
}, err => {});
},
// 打开编辑窗口
goEdit: function (type, date,BatchNumber) {
goEdit: function (type, date, BatchNumber) {
let nowDate = new Date().Format('yyyy-MM-dd');
this.msg.StartDate = date === undefined ? nowDate : date;
this.msg.EndDate = date === undefined ? nowDate : date;
if (type === '2' && date) {
this.getDetail(date,BatchNumber);
this.getDetail(date, BatchNumber);
}
this.editShow = true;
},
......@@ -1163,6 +1191,7 @@
display: inline-block;
margin: 0 5px;
width: 24%;
/* width:438px; */
background-color: #fff;
border: 1px solid #d1d1d1;
border-radius: 4px;
......@@ -1182,6 +1211,7 @@
text-align: center;
font-size: 14px;
cursor: pointer;
text-decoration: underline;
}
.hotelProductManage2_calendarItem>.calendarItem_week {
......@@ -1206,13 +1236,14 @@
display: flex;
justify-content: space-around;
flex-wrap: wrap;
padding-bottom:20px;
padding-bottom: 20px;
}
.hotelProductManage2_calendarItem>.calendarItem_day>div {
display: inline-block;
padding: 15px 0;
width: 14.2%;
position: relative;
}
.hotelProductManage2_calendarItem>.calendarItem_day>div>div {
......@@ -1500,5 +1531,51 @@
color: #606266;
font-size: 14px;
}
.popList{
font-size: 12px;
line-height: 15px;
text-align: left;
}
.hotelProductManage2_calendarItem>.calendarItem_day>.nowMonth:hover .detailInfo{
display:block;
}
.hotelProductManage2 .detailInfo {
display: none;
position: absolute;
left: -52px;
top: 50px;
z-index: 999;
}
.hotelProductManage2 .triangle_border_up {
width: 0;
height: 0;
border-width: 0 86px 30px;
border-style: solid;
opacity: 0.75;
border-color: transparent transparent rgba(233, 82, 82, 1); /*透明 透明 灰*/
}
.hotelProductManage2 .detailInfo .popContent{
width: 170px;
height: 80px;
background-color: #e95252;
text-align: left;
color: #fff;
font-size: 12px;
margin-top:-2px;
overflow: auto;
padding-bottom:10px;
}
.hotelProductManage2 .popList label:first-child{
display: inline-block;
width: 40%;
margin: 10px 0 0 10px;
text-align: left;
}
.hotelProductManage2 .popList label:last-child {
display: inline-block;
width: 40%;
margin: 10px 10px 0 0;
text-align: right;
}
</style>
src/components/Hotel/HotelQueryList.vue
View file @ d7277f93
......@@ -74,57 +74,53 @@
<div style="width: 100%;min-height:200px; overflow-x: auto;padding-bottom: 10px; " class="HotelQueryList"
v-loading="loading">
<div class="hotelProductManage2_tableBox">
<div class="hotelProductManage2_tableBox" style="margin-bottom:20px;">
<span style="color:#000000;background-color: #ff3737;padding:2px 4px;border-radius:5px">红日</span>
<span style="color:#000000;background-color: #ff99cc;padding:2px 4px;border-radius:5px">旺季</span>
<span style="color:#000000;background-color: #bcd6ee;padding:2px 4px;border-radius:5px">平季</span>
<span style="color:#000000;background-color: #DDDDDD;padding:2px 4px;border-radius:5px">淡季</span>
<span style="color:#000000;background-color: #02F78E;padding:2px 4px;border-radius:5px">特别价</span>
</div>
<table border="0" cellspacing="1" cellpadding="0" class="HouseTypeList" v-if="isShow">
<tr>
<th width="300">酒店名称</th>
<th width="80">价格&库存</th>
<template v-if="dataList.length>0">
<th v-for="item in dataList[0].subList">
{{getDateList(item.DateStr)}}<br/>
{{getWeek(item.DateStr)}}
</th>
</template>
</tr>
<tr v-for="item in dataList">
<td>
<div style="min-width:140px; text-align:left;padding-left:5px;cursor:pointer;" >
<span title="点击跳转到酒店查询页面" @click="GotoHotel(item.HotelId)" style="text-decoration: underline;min-width:140px; ">{{item.HotelName}}</span>
<br/>（总库存:{{item.TotalInventory}}）</div>
</td>
<td>
<div class="Hotel_kong">价格</div>
<div class="Hotel_kong" style="min-width:60px;">总/用/剩</div>
<div class="Hotel_kong">超定</div>
</td>
<td v-for="(subItem,subIndex) in item.subList">
<div class="Hotel_kong Com_hoteldiv" >
<template v-if="subItem.PriceList&&subItem.PriceList.length>0">
<template v-for="childItem in subItem.PriceList">
<div :class="getClass(1,childItem.InventoryType)" style="height:100%;float:left;"
:style="{width:(98/subItem.PriceList.length)+'%'}">{{childItem.CostPrice}}</div>
</template>
<template v-if="isShow">
<el-table :data="dataList" style="width:100%" border v-loading='loading' height="500">
<el-table-column fixed label="酒店名称" min-width="180">
<template slot-scope="scope">
<div style="text-decoration: underline;cursor:pointer" @click="GotoHotel(scope.row.HotelId)">{{scope.row.HotelName}}</div>
<div>{{scope.row.TotalInventory}}</div>
</template>
<template v-else>
<div :class="getClass(0,0)" style="width:100%;height:100%">&nbsp;</div>
</el-table-column>
<el-table-column label="价格&库存" fixed min-width="120">
<template slot-scope="scope">
<div class="Hotel_kong">价格</div>
<div class="Hotel_kong" style="min-width:60px;">总/用/剩</div>
<div class="Hotel_kong">超定</div>
</template>
</div>
<div class="Hotel_kong Com_hoteldiv Hq_duoge" @click="GotoUrl(item,subIndex,subItem.UseInventory)">
{{subItem.Inventory}}/{{subItem.UseInventory}}/{{subItem.RemainingInventory}}</div>
<div class="Hotel_kong Com_hoteldiv">
<span v-if="subItem.UseInventory-subItem.Inventory>0" style="color:red;">
{{subItem.UseInventory-subItem.Inventory}}
</span>
</div>
</td>
</tr>
</table>
</el-table-column>
<el-table-column v-for='(item,index) in dataList[0].subList' :label="getDateList(item.DateStr)" :key='index' min-width="120">
<template slot-scope="scope">
<div class="Hotel_kong Com_hoteldiv">
<template v-if="scope.row.subList[index].PriceList.length>0">
<template v-for="childItem in scope.row.subList[index].PriceList">
<div :class="getClass(1,childItem.InventoryType)" style="height:100%;float:left;width:100%"
:style="{width:(100/scope.row.subList[index].PriceList.length)+'%'}">{{childItem.CostPrice}}</div>
</template>
</template>
<template v-else>
<div :class="getClass(0,0)" style="width:100%;height:100%">&nbsp;</div>
</template>
</div>
<div class="Hotel_kong Com_hoteldiv Hq_duoge" @click="GotoUrl(scope.row,index,scope.row.subList[index].UseInventory)">
{{scope.row.subList[index].Inventory}}/{{scope.row.subList[index].UseInventory}}/{{scope.row.subList[index].RemainingInventory}}</div>
<div class="Hotel_kong Com_hoteldiv">
<span v-if="scope.row.subList[index].UseInventory-scope.row.subList[index].Inventory>0" style="color:red;">
{{scope.row.subList[index].UseInventory-scope.row.subList[index].Inventory}}
</span>
</div>
</template>
</el-table-column>
</el-table>
</template>
</div>
<div class="combottomDiv HqCom_bottom" v-if="showNotice">
......@@ -159,11 +155,11 @@
<div>
<table border="0" cellspacing="1" cellpadding="0" class="HouseTypeList Hq_addTable" style="width:97%;">
<tr>
<th>编号</th>
<th width="50">编号</th>
<th>内容</th>
<th>操作人</th>
<th>操作时间</th>
<th>操作</th>
<th width="70">操作人</th>
<th width="150">操作时间</th>
<th width="80">操作</th>
</tr>
<template v-if="queryMsg.total>0">
<tr v-for="(item,index) in HotelTipList">
......@@ -194,15 +190,15 @@
<el-form>
<table border="0" cellspacing="1" cellpadding="0" class="HouseTypeList Hq_addTable" style="width:100%;">
<tr>
<th>编号</th>
<th width="50">编号</th>
<th>内容</th>
<th>操作人</th>
<th>操作时间</th>
<th width="70">操作人</th>
<th width="140">操作时间</th>
</tr>
<template v-if="queryMsg.total>0">
<tr v-for="(item,index) in HotelTipList">
<td>{{item.Id}}</td>
<td><p style="text-align:left;padding-left:5px;" v-html="item.TipContent"></p></td>
<td><p style="text-align:left;padding:0 5px;" v-html="item.TipContent"></p></td>
<td>{{item.CreateByName}}</td>
<td>{{item.CreateTimeStr}}</td>
</tr>
......@@ -289,7 +285,7 @@
['blockquote', 'code-block','align']
]
}
},
},
};
},
methods: {
......@@ -365,7 +361,10 @@
//格式化返回显示日期
getDateList(dateStr) {
var str = dateStr.split('-');
return str[1] + '/' + str[2];
var weekDay = ["天", "一", "二", "三", "四", "五", "六"];
var myDate = new Date(Date.parse(dateStr));
return str[1] + '/' + str[2] + "（"+weekDay[myDate.getDay()]+"）";
},
//获取星期几
getWeek(dateStr) {
......@@ -514,7 +513,7 @@
this.GetHotelList();
this.getList();
this.GetHotelTipList();
}
},
};
</script>
......@@ -567,6 +566,7 @@
.Hotel_kong {
width: 100%;
height: 35px;
text-align: center;
line-height: 35px;
border-bottom: 1px solid #d1d1d1;
}
......@@ -623,4 +623,16 @@
.HQ_miaoshu:first-child{
margin-top:10px;
}
.HotelQueryList .has-gutter tr th, .el-table th.is-leaf{
background: #EAEAEA!important;
}
.HotelQueryList .el-table td, .el-table th.is-leaf{
border-bottom:1px solid #ebeef5;
}
.HotelQueryList .el-table .cell{
padding:0;
}
.HotelQueryList .el-table td{
padding:0;
}
</style>
src/components/Hotel/HotelSalesBoard.vue
View file @ d7277f93
......@@ -199,6 +199,12 @@
background-color: #02F78E;
}
.hotelSalesBoard .stock1 {
color: red;
}
.hotelSalesBoard .stock2 {
color: white;
}
/* 日期样式结束*/
</style>
......@@ -291,7 +297,7 @@
(总: {{subItem.Inventory}} &nbsp;&nbsp;
<a title="点击跳转到订房管理" v-if="subItem.UseInventory>0"
@click="goUrl('roomReservations',subItem,dayItem.DayStr,'订房管理')"
style="cursor:pointer;text-decoration:underline;color:red;">已用:{{subItem.UseInventory}}</a>
style="cursor:pointer;text-decoration:underline;" :class="subItem.InventoryType==4 ? 'stock1' : 'stock2'">已用:{{subItem.UseInventory}}</a>
<span v-else>已用:{{subItem.UseInventory}}</span>
)
</p>
......
src/components/Hotel/roomReservations.vue
View file @ d7277f93
......@@ -28,7 +28,7 @@
</li>
</ul>
</div>
<div style="width: 100%; overflow-x: auto;padding-bottom: 10px; " class="ownScrollbarStyle">
<div style="width: 100%; overflow-x: auto;padding-bottom: 10px; " class="ownScrollbarStyle" :style="{height: boxHeight + 'px'}">
<table border="0" cellspacing="1" cellpadding="0" class="roomReservationsTalbe" v-loading='loading'>
<tr>
<th width="w100">序号</th>
......@@ -201,13 +201,16 @@
//酒店编号
HotelId: 0,
//日期
DateStr: ""
DateStr: "",
//出团公司不限
OutBranchId:-1,
},
LineList: [],
LineTeamList: [],
thLengthTitle: [],
list: [],
colspanTotal: 0,
boxHeight: 0,
}
},
methods: {
......@@ -306,6 +309,7 @@
y.colNum = 9 + y.CommonReport.newHotel.length;
})
})
this.$forceUpdate()
} else {
this.loading = false
this.$message.error(res.data.message)
......@@ -333,6 +337,10 @@
} else {
this.msg.StartDate = nowDate;
}
let width = window.innerWidth - 50
let height = window.innerHeight - 65 - 164
this.boxHeight = height;
this.offsetwidth = width
this.getList()
this.getLineTeamList()
},
......
src/components/LeaderManagement/leaderPay.vue
View file @ d7277f93
......@@ -36,9 +36,11 @@
<td width="150">车辆号</td>
<td width="80">用车方式</td>
<td width="150">实际信息</td>
<td width="150">总金额</td>
<td width="150">实际金额</td>
<td width="150">预计金额</td>
<td width="150">付款方式</td>
<td width="300">备注</td>
<td>凭证</td>
<td width="300">凭证</td>
</tr>
<tr v-for='(item,index) in list.BusList'>
<td>{{item.PlanDateStr}}</td>
......@@ -61,6 +63,14 @@
<td>
{{busTotalPrice(item.ReimburseList.ReimburseDetailsList)}}
</td>
<!-- 添加实际金额和付款方式-->
<td class="jdtd" valign="middle">
{{item.CostPrice*(Number(item.TransferNum)+1)+item.HighSpeedPrice}}
</td>
<td class="jdtd" valign="middle">
{{item.PayType !=null && item.PayType !='' ? (item.PayType== 1? '现付' :(item.PayType ==2 ? '签单' :(item.PayType == 4 ? '预付' :(item.item.PayType ==5 ?'实物抵扣' :'')))):''}}
</td>
<td class="jdtd" valign="middle">
{{item.Remarks}}
</td>
......@@ -82,7 +92,9 @@
<td width="100">占床/不占床</td>
<td width="150">房间类型/数量</td>
<td width="150">实际信息</td>
<td width="80">总金额</td>
<td width="80">实际金额</td>
<td width="80">预计金额</td>
<td width="80">付款方式</td>
<td width="300">备注</td>
<td>凭证</td>
</tr>
......@@ -109,9 +121,21 @@
</div>
</template>
</td>
<td>
{{hotelTotalPrice(item.ReimburseList.ReimburseDetailsList)}}
<div v-for="subItem in outItem.HotelOrderList">
{{hotelTotalPrice(subItem.OrderDetailsList)}}
</div>
</td>
<td class="jdtd" valign="middle">
{{HotelPrice(item)}}
</td>
<td class="jdtd" valign="middle">
{{item.PayType !=null && item.PayType !='' ? (item.PayType== 1? '现付' :(item.PayType ==2 ? '签单' :(item.PayType == 4 ? '预付' :(item.item.PayType ==5 ?'实物抵扣' :'')))):''}}
</td>
<td class="jdtd" valign="middle">
{{item.ReimburseList.Remarks}}
</td>
......@@ -135,7 +159,9 @@
<td width="100">类别</td>
<td width="150">用餐人数</td>
<td width="150">实际信息</td>
<td width="80">总金额</td>
<td width="80">实际金额</td>
<td width="80">预计金额</td>
<td width="80">付款方式</td>
<td width="300">备注</td>
<td>凭证</td>
</tr>
......@@ -171,6 +197,15 @@
{{diningTotalPrice(subItem.ReimburseList.ReimburseDetailsList)}}
</div>
</td>
<td class="jdtd" valign="middle">
<div v-for="subItem in item.DiningSummaryList">
{{calculationPrice(subItem)}}
</div>
</td>
<td class="jdtd" valign="middle">
{{item.PayType !=null && item.PayType !='' ? (item.PayType== 1? '现付' :(item.PayType ==2 ? '签单' :(item.PayType == 4 ? '预付' :(item.item.PayType ==5 ?'实物抵扣' :'')))):''}}
</td>
<td class="jdtd" valign="middle">
{{titem.Remarks}}
</td>
......@@ -194,7 +229,9 @@
<td width="100">总人数</td>
<td width="150">门票类别</td>
<td width="150">实际信息</td>
<td width="80">总金额</td>
<td width="80">实际金额</td>
<td width="80">预计金额</td>
<td width="80">付款方式</td>
<td width="300">备注</td>
<td>凭证</td>
</tr>
......@@ -232,6 +269,14 @@
{{diningTotalPrice(subItem.ReimburseList.ReimburseDetailsList)}}
</div>
</td>
<td class="jdtd" valign="middle">
<div v-for="subItem in item.ScenicStatisticsList">
{{ScenicspotPrice(subItem)}}
</div>
</td>
<td class="jdtd" valign="middle">
{{item.PayType !=null && item.PayType !='' ? (item.PayType== 1? '现付' :(item.PayType ==2 ? '签单' :(item.PayType == 4 ? '预付' :(item.item.PayType ==5 ?'实物抵扣' :'')))):''}}
</td>
<td>
<template v-for='(sitem,sindex) in item.ScenicStatisticsList'>
{{sitem.Remarks}}
......@@ -515,12 +560,13 @@
})
return totalPrice
},
hotelTotalPrice(obj) {
let totalPrice = 0
obj.forEach(x => {
totalPrice += x.UserNum * x.UnitPrice
hotelTotalPrice(obj){
let totalPrice=0
obj.forEach(x=>{
totalPrice+=x.UnitPrice*(x.HouseGuestNum-x.HotelDiscount)*(1-x.RebateRatio/100)
})
return totalPrice
return this.moneyFormat(totalPrice)
},
diningTotalPrice(obj) {
let totalPrice = 0
......@@ -597,6 +643,7 @@
if (str == 3)
return '晚餐'
},
getNav() {
this.apipost('dmcstatistics_post_GetHotelStaticsByTCIDs', {
TCIDs: this.$route.query.id
......@@ -610,7 +657,7 @@
},
getList() {
this.loading = true
this.apipost('dmcstatistics_post_GetNewLeaderPayMoneyStatics', this.msg, res => {
this.apipost('dmcstatistics_post_GetNewLeaderPayMoneyStatics', this.msg, res => {
if (res.data.resultCode == 1) {
this.loading = false;
this.isShow = true;
......@@ -636,7 +683,7 @@
url: this.domainManager().ViittoFileUrl + x.data.FilePath
})
});
},
},
goUrl(path, title) {
this.$router.push({
name: path,
......@@ -647,6 +694,35 @@
}
})
},
// 酒店
HotelPrice(obj) {
let totalPrice = 0;
obj.OrderDetailsList.forEach(item => {
totalPrice += item.UnitPrice * (item.BookNum - item.HotelDiscount) * (1 - item.RebateRatio / 100);
})
obj.TotalPrice = totalPrice.toFixed(2);
return obj.TotalPrice;
},
// 餐饮
calculationPrice(obj){
let totalPrice = 0;
obj.DiningPriceList.forEach(item => {
totalPrice += item.PeoplePrice * (item.PeopleNum - item.Discount) * (1 - item.DiscountPrice / 100);
})
return totalPrice.toFixed(2)
},
// 景点
ScenicspotPrice(obj) {
let totalPrice = 0;
obj.TicketPriceList.forEach(item => {
totalPrice += item.PeoplePrice * (item.UsePeopleNum - item.Discount) * (1 - item.DiscountPrice / 100);
})
obj.TotalPrice = totalPrice.toFixed(2);
return obj.TotalPrice
},
},
mounted() {
this.isUpdate = this.$route.query.isUpdate;
......
src/components/Restaurant/bookDinnerStatistics.vue
View file @ d7277f93
......@@ -27,7 +27,7 @@
</li>
</ul>
</div>
<div style="width: 100%; overflow-x: auto;padding-bottom: 10px; " class="ownScrollbarStyle">
<div style="width: 100%; overflow-x: auto;padding-bottom: 10px; " class="ownScrollbarStyle" :style="{height: boxHeight + 'px'}">
<table border="0" cellspacing="1" cellpadding="0" class="bookDinnerStatisticsTalbe" v-loading='loading'>
<tr>
<th width="50">序号</th>
......@@ -175,6 +175,7 @@
thLengthTitle: [],
list: [],
colspanTotal: 0,
boxHeight: 0,
}
},
methods: {
......@@ -283,6 +284,7 @@
}
});
});
this.$forceUpdate()
} else {
this.$message.error(res.data.message);
}
......@@ -298,6 +300,11 @@
"-" +
myDate.getDate();
this.msg.StartDate = nowDate;
let width = window.innerWidth - 50
let height = window.innerHeight - 65 - 164
console.log(height)
this.boxHeight = height;
this.offsetwidth = width
this.getList()
},
}
......
src/components/SalesModule/Lowpricemanagement.vue 0 → 100644
View file @ d7277f93
This diff is collapsed.
src/components/SalesModule/VisaFinancialDocuments.vue
View file @ d7277f93
......@@ -140,7 +140,7 @@
<th width="100">实收</th>
<th width="100">平台税金</th>
<th width="150">交易日期</th>
<th width="150">旅客名单</th>
<!-- <th width="150">旅客名单</th> -->
<th width="100">制单人员</th>
<th width="120">当前状态</th>
</tr>
......@@ -179,7 +179,7 @@
<td width="">{{item.TradeDate}}</td>
<!-- 旅客名单 -->
<!-- <td width="">旅客名单</td> -->
<td>
<!-- <td>
<span v-if="item.GuestInfoList.length>0" >
<el-popover class="item" effect="dark" placement="top-start" width="350" trigger="click">
<span style="display:inline-block;cursor:pointer;margin:6px;word-break:break-all;" v-for="item2 in item.GuestInfoList" :key="item2.GuestId">{{item2.GuestName}} </span>
......@@ -189,7 +189,7 @@
</el-popover>
</span>
<span v-if="item.GuestInfoList.length==0">暂无名单</span>
</td>
</td> -->
<td width="">{{item.EmName}}</td>
<td width="">
<i v-if="item.Status==1" class="iconfont icon-daiqueren" style="color: #4BCA81"></i>
......@@ -240,7 +240,7 @@
<th width="100">实付</th>
<th width="100">平台税金</th>
<th width="150">交易日期</th>
<th width="150">旅客名单</th>
<!-- <th width="150">旅客名单</th> -->
<th width="100">制单人员</th>
<th width="120">当前状态</th>
</tr>
......@@ -277,7 +277,7 @@
<p style="line-height:20px"><span>{{moneyFormat(item.Fee)}}</span></p>
</td>
<td width="">{{item.TradeDate}}</td>
<td>
<!-- <td>
<span v-if="item.GuestInfoList.length>0" >
<el-popover class="item" effect="dark" placement="top-start" width="350" trigger="click">
<span style="display:inline-block;cursor:pointer;margin:6px;word-break:break-all;" v-for="item2 in item.GuestInfoList" :key="item2.GuestId">{{item2.GuestName}} </span>
......@@ -287,7 +287,7 @@
</el-popover>
</span>
<span v-if="item.GuestInfoList.length==0">暂无名单</span>
</td>
</td> -->
<td width="">{{item.EmName}}</td>
<td width="">
<i v-if="item.Status==1" class="iconfont icon-daiqueren" style="color: #4BCA81"></i>
......
src/components/SalesModule/enrollTotal.vue
View file @ d7277f93
This diff is collapsed.
src/components/SalesModule/productQuery.vue
View file @ d7277f93
This diff is collapsed.
src/components/busManagement/BusInfo.vue
View file @ d7277f93
This diff is collapsed.
src/components/index.vue
View file @ d7277f93
This diff is collapsed.
src/components/leaderPay2.vue
View file @ d7277f93
This diff is collapsed.
src/plug/index.js
View file @ d7277f93
This diff is collapsed.
src/router/config.js
View file @ d7277f93
This diff is collapsed.
yarn.lock
View file @ d7277f93
This diff is collapsed.
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