Skip to content

S
SuperMan
Commit 1d461a32 authored by Mac's avatar Mac
Browse files
Options

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

parents c99c2169 96b540fb
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 606 additions and 832 deletions
src/App.vue
View file @ 1d461a32
......@@ -113,7 +113,7 @@ export default {
}
</script>
<style>
@import "//at.alicdn.com/t/font_635492_b8jianjuawm.css";
@import "//at.alicdn.com/t/font_635492_ea4o8lkzm2b.css";
@import "./assets/css/Semibold.css";
@import "./assets/css/global/config.css";
@import "./assets/css/fileIcon.css";
......
src/assets/css/summaryLogin.css
View file @ 1d461a32
......@@ -45,7 +45,7 @@
font-size:18px;
color:#333333;
}
.Summary_login_Div .icon-login-name,.icon-login-password{
.Summary_login_Div .icon-login-name, .Summary_login_Div .icon-login-password{
width:16px;
height:15px;
display:inline-block;
......
src/components/EditTemplate.vue
View file @ 1d461a32
......@@ -193,7 +193,7 @@
</select>
</span>
<span class="ql-formats" v-if="toolbar.fontColor||toolbar.fontBackgroundColor">
<span class="ql-color ql-picker ql-color-picker" v-if="toolbar.fontColor">
<span class="ql-color ql-picker ql-color-picker" v-if="toolbar.fontColor" style="display:none">
<span class="ql-picker-label" tabindex="0" role="button" aria-expanded="false" aria-controls="ql-picker-options-35">
<svg viewbox="0 0 18 18">
<line class="ql-color-label ql-stroke ql-transparent" x1="3" x2="15" y1="15" y2="15"></line>
......@@ -237,7 +237,7 @@
tabindex="0" role="button" class="ql-picker-item" data-value="#002966" style="background-color: rgb(0, 41, 102);"></span><span
tabindex="0" role="button" class="ql-picker-item" data-value="#3d1466" style="background-color: rgb(61, 20, 102);"></span></span>
</span>
<select class="ql-color" style="display: none;" v-if="toolbar.fontColor">
<select class="ql-color" v-if="toolbar.fontColor">
<option selected="selected"></option>
<option value="#e60000"></option>
<option value="#ff9900"></option>
......@@ -273,8 +273,8 @@
<option value="#003700"></option>
<option value="#002966"></option>
<option value="#3d1466"></option>
</select>
<span class="ql-background ql-picker ql-color-picker" v-if="toolbar.fontBackgroundColor">
</select>
<span class="ql-background ql-picker ql-color-picker" v-if="toolbar.fontBackgroundColor" style="display:none;">
<span class="ql-picker-label" tabindex="0" role="button" aria-expanded="false" aria-controls="ql-picker-options-36">
<svg viewbox="0 0 18 18">
<g class="ql-fill ql-color-label">
......@@ -365,7 +365,7 @@
tabindex="0" role="button" class="ql-picker-item" data-value="#002966" style="background-color: rgb(0, 41, 102);"></span><span
tabindex="0" role="button" class="ql-picker-item" data-value="#3d1466" style="background-color: rgb(61, 20, 102);"></span></span>
</span>
<select class="ql-background" style="display: none;" v-if="toolbar.fontBackgroundColor">
<select class="ql-background" v-if="toolbar.fontBackgroundColor">
<option value="#000000"></option>
<option value="#e60000"></option>
<option value="#ff9900"></option>
......
src/components/FinancialModule/BasicDocuments.vue
View file @ 1d461a32
......@@ -271,6 +271,8 @@
background-color: white;
padding: 15px;
border: 1px solid #e0e0e0;
max-height: 400px;
overflow: auto;
}
.page_bdm .chongdi_list em{
font-size: 14px;
......@@ -591,7 +593,7 @@
<span v-else class="yixuanze_money">已选择金额：{{ChongDiMoney}}</span>
</div>
<div v-if="shifouChongDi" class="chongdi_list">
<!-- <div>
<div>
<em>发团时间：</em>
<el-date-picker class="h34"
@change="timeAdd(1)"
......@@ -600,7 +602,7 @@
value-format="yyyy-MM-dd"
range-separator="-">
</el-date-picker>
</div> -->
</div>
<div class="_kehu">
<em>{{$t('fnc.khleixing')}}：</em>
<el-select filterable v-model='ChongDiMsg.ClientType' :placeholder="$t('fnc.khleixing')" @change="financeinfo_post_GetClientAccountList(ChongDiMsg.ClientType, '1')" class="w135 _border_b_1">
......@@ -902,7 +904,7 @@
<span v-else class="yixuanze_money">已选择金额：{{ChongDiMoney}}</span>
</div>
<div v-if="shifouChongDi" class="chongdi_list">
<!-- <div>
<div>
<em>发团时间：</em>
<el-date-picker class="h34"
@change="timeAdd(1)"
......@@ -911,7 +913,7 @@
value-format="yyyy-MM-dd"
range-separator="-">
</el-date-picker>
</div> -->
</div>
<div class="_kehu">
<em>{{$t('fnc.khleixing')}}：</em>
<el-select filterable v-model='ChongDiMsg.ClientType' :placeholder="$t('fnc.khleixing')" @change="financeinfo_post_GetClientAccountList(ChongDiMsg.ClientType, '1')" class="w135 _border_b_1">
......@@ -1470,7 +1472,6 @@ export default {
methods:{
// 单选计算
checkdIteam(item){
console.log(item.checked)
if (item.checked) {
if (item.HangingAccountsTypeStr === '收') {
this.ChongDiMoney += item.Money
......@@ -1514,7 +1515,6 @@ export default {
this.apipost('Financial_post_GetHangingAccountList', this.ChongDiMsg, res=>{
if(res.data.resultCode == 1) {
let data = res.data.data;
console.log(data)
data.map(item=>{
item.checked = false
})
......@@ -1623,7 +1623,7 @@ export default {
let allMoney = 0
this.payMsgList.forEach(x=>{
allMoney+= x.allMoney;
// x.allMoney=(Math.round(x.allMoney * 100)) / 100;
x.allMoney=(Math.round(x.allMoney * 100)) / 100;
})
if(allMoney.toString().split(".")[1]){
let num=allMoney.toString().split(".")[1].length;
......
src/components/FinancialModule/FinancialSubmodule/BillModule.vue
View file @ 1d461a32
......@@ -100,6 +100,7 @@
<span class="_r_name _r_IsPublic" v-if="GetDetail.IsPublic==4">{{$t('fnc.zjinchi')}}</span>
<span class="_r_name _r_IsPublic" v-if="GetDetail.IsPublic==5">{{$t('fnc.ptxnzhanghu')}}</span>
<span class="_r_name _r_IsPublic" v-if="GetDetail.IsPublic==6">{{$t('fnc.djxnzhanghu')}}</span>
<span class="_r_name _r_IsPublic" v-if="GetDetail.IsPublic==7">收支相抵</span>
</p>
<p style="font-weight: bold"><span class="">{{$t('hotel.hotel_SerialNumber')}}：</span>{{GetDetail.FrID}}</p>
</div>
......
src/components/FinancialModule/RecPayQuery.vue
View file @ 1d461a32
......@@ -842,6 +842,14 @@ export default {
if(this.$route.query.Type){
this.msg.Type = this.$route.query.Type+'';
}
if(this.$route.query.rec){
this.msg.AccountType=15;
this.msg.TradeWay=4;
this.getAccountList(this.msg.AccountType,this.msg.TradeWay)
this.msg.BankID=14;
this.transactionDate[0]=this.$route.query.StartDate;
this.transactionDate[1]=this.$route.query.StartDate;
}
},components: {
"my-Bill": myBill,
"my-RVB-Bill":myrbvBill,
......@@ -949,7 +957,7 @@ export default {
this.$message.error(res.data.message);
}
// this.msg.TCID= this.msg.TCID==0?this.msg.TCID:'';
this.queryInfoInit();
// this.queryInfoInit();
this.currentPage = parseInt(this.msg.pageIndex);
},err=>{})
},
......@@ -1049,7 +1057,6 @@ export default {
},
getAccountList(i,t){ //收款账户
let accountList = [];
this.msg.BankID="";
if(t==1){ // 银行
this.apipost('bankaccount_post_GetList',{TypeId:i}, res => {
if(res.data.resultCode == 1) {
......@@ -1264,8 +1271,8 @@ export default {
QEndDate:this.msg.QEndDate,
QStartDate:this.msg.QStartDate,
OrderID:this.msg.OrderID==0?'':this.msg.OrderID,
Sort:this.msg.Sort,
EmployeeId:this.msg.EmployeeId,
Sort:this.msg.Sort,
EmployeeId:this.msg.EmployeeId,
}
this.msg = msg;
},
......
src/components/FinancialModule/ReportForm/TeamRevenueReport.vue
View file @ 1d461a32
......@@ -614,6 +614,7 @@ tr._item_list td:last-child {
</div>
</template>
<script>
import moment from 'moment'
import Vue from "vue";
import XLSX from "xlsx";
import downloadExcelEasy from "../../../assets/utils/downloadExcelEasy";
......@@ -663,8 +664,8 @@ Vue.component("TCNUMJump", {
<span style="cursor: pointer" v-if="rowData.DataType===2" @click="goUrlExtend('individualTicket',rowData.TCID)">{{rowData.TCNUM}}</span>
<span style="cursor: pointer" v-if="rowData.DataType===3" @click="goUrlVisa('VisaProductOrder',rowData.TCID)">{{rowData.TCNUM}}</span>
<span style="cursor: pointer" v-if="rowData.DataType===4" @click="goUrlExtend('SettlementOrder',rowData.TCID)">{{rowData.TCNUM}}</span>
<span style="cursor: pointer" v-if="rowData.DataType===6">{{rowData.TCNUM}}</span>
<span style="cursor: pointer" v-if="rowData.DataType===7">{{rowData.TCNUM}}</span>
<span style="cursor: pointer" v-if="rowData.DataType===6" @click="goRec('RecPayQuery',rowData)">{{rowData.TCNUM}}</span>
<span style="cursor: pointer" v-if="rowData.DataType===7" @click="goRec('RecPayQuery',rowData)">{{rowData.TCNUM}}</span>
</div>`,
props: {
rowData: {
......@@ -678,6 +679,23 @@ Vue.component("TCNUMJump", {
}
},
methods: {
goRec(path,rowData){
let BankID="";
let StartDate="";
if(rowData.DataType===6){
BankID=14;
}
if(rowData.DataType===7){
BankID=15;
}
if(rowData.TCNUM.indexOf('JAP')!=-1 || rowData.TCNUM.indexOf('LAO')!=-1){
StartDate=moment(rowData.StartDate).format("YYYY-MM-DD");
}
this.$router.push({
path: "/" + path,
query: {'rec':'rec','StartDate':StartDate,"BankID":BankID,blank: "y"}
});
},
goUrl(path, id) {
this.$router.push({
path: "/" + path,
......
src/components/FinancialModule/accDetail/CompanyAccDetail.vue
View file @ 1d461a32
......@@ -75,7 +75,7 @@
<el-form-item :label="$t('fnc.fkduixiang')">
<el-select filterable v-model='msg.ClientID' >
<el-option v-for='item in ClientAccountList'
:label='item.AccountAlias'
:label='`${item.AccountAlias}(${item.AccountHolder})`'
:value='item.ID'
:key='item.ID'>
</el-option>
......
src/components/SalesModule/addPassenger.vue
View file @ 1d461a32
......@@ -302,7 +302,7 @@
<el-option v-for="item in roomlist" :key="item.ID" :label="item.HouseInfo" :value="item.ID">
</el-option>
</el-select>
<input type="button" value="新增" class="normalBtn" @click="addhouse()" />
<input type="button" value="新增房间" class="normalBtn" @click="addhouse()" title="需要拼房，但没有双人间（半间）的点击新增房间"/>
</el-form-item>
</li>
<li>
......
src/components/SalesModule/groupTourOrder.vue
View file @ 1d461a32
......@@ -1723,8 +1723,11 @@
<div
@click='Discount(item.tcid),SOMsg.OrderId = item.orderId,SOMsg.OrderUnitPrice = item.unit_Price'>
申请优惠</div>
<div v-if="item.isOrder=='1'&&(item.orderState=='1'||item.orderState=='2'||item.orderState=='3')"
@click='deleteItem(item)'>取消
<div v-if="item.isOrder=='1'&&(item.orderState=='1'||item.orderState=='2'||item.orderState=='3') && item.isCanClear==0"
@click='deleteItem(item)'>取消
</div>
<div v-if="item.isOrder=='1'&&(item.orderState=='1'||item.orderState=='2'||item.orderState=='3') && item.isCanClear==1" title="如需取消订单清联系OP" style="color:red;">
订单已确认,取消请联系OP
</div>
</div>
......
src/components/SalesModule/groupTourOrderByTuan.vue
View file @ 1d461a32
......@@ -1735,7 +1735,10 @@
</div>
<div v-if="item.orderState==2" @click='Discount(item.tcid),SOMsg.OrderId = item.orderId,SOMsg.OrderUnitPrice = item.unit_Price'>申请优惠</div>
<div v-if="item.isOrder=='1'&&(item.orderState=='1'||item.orderState=='2'||item.orderState=='3')" @click='deleteItem(item)'>取消</div>
<div v-if="item.isOrder=='1'&&(item.orderState=='1'||item.orderState=='2'||item.orderState=='3')&& item.isCanClear==0" @click='deleteItem(item)'>取消</div>
<div v-if="item.isOrder=='1'&&(item.orderState=='1'||item.orderState=='2'||item.orderState=='3') && item.isCanClear==1" title="如需取消订单清联系OP" style="color:red;">
订单已确认,取消请联系OP
</div>
</div>
<el-button slot="reference" type="primary" style='background:#297BEF; border-color:#297BEF;border-top-left-radius: 0;border-bottom-left-radius: 0;' icon="iconfont icon-more"></el-button>
</el-popover>
......
src/components/SalesModule/passengerSaleList.vue
View file @ 1d461a32
......@@ -67,7 +67,7 @@
</tbody>
<tbody v-show="tableList.length===0" class="passengerSaleList_table_noInfo">
<tr>
<td colspan="17" class="">暂无数据</td>
<td colspan="18" class="">暂无数据</td>
</tr>
</tbody>
</table>
......
src/components/SalesVisa/ModifyVisaProduct.vue
View file @ 1d461a32
......@@ -699,7 +699,7 @@
<i class="iconfont icon-huidaodingbu"></i>
</div>
<!-- @click="submitForm(1)" -->
<div class="DTSaveBtn" @click="SaveVisaProduct('addMsg')">保存</div>
<div v-show="saveBtn" class="DTSaveBtn" @click="SaveVisaProduct('addMsg')">保存</div>
<!-- <div class="DTSaveBtn">提交</div> -->
<!-- <div v-if="ConfigId>0" class="DTSaveBtn" :class="{'disClick':!isSubmit}" @click="goB2B()">预览</div> -->
</div>
......@@ -733,6 +733,7 @@ export default {
},
data() {
return {
saveBtn:true,
fileList:[],
checkList:[],
......@@ -837,7 +838,9 @@ export default {
};
},
mounted() {
if(this.$route.query.save){
this.saveBtn=false;
}
if(this.$route.query.Id){
this.Pid=this.$route.query.Id;
this.GetVisaProductDetails(this.Pid);
......
src/components/SalesVisa/VisaProduct.vue
View file @ 1d461a32
......@@ -300,10 +300,10 @@
<table class="VisaProductTable" border="0" cellspacing="0" cellpadding="0" v-loading="loading">
<tr>
<th width="10%">产品名称</th>
<th width="8%">签证类型</th>
<th width="8%">价格有效日期</th>
<th width="5%">签证类型</th>
<th width="12%">价格有效日期</th>
<th width="8%">成本价</th>
<th width="8%">同业价</th>
<th width="7%">同业价</th>
<th width="8%">直客价</th>
<th width="6%">状态</th>
<th width="6%">订单数</th>
......@@ -320,7 +320,14 @@
<span v-else class="tuanqian">团签</span>
</td>
<td>
<span class="fbold">{{item.SendVisaDate}}</span>
<p>
结束日期：<span class="fbold">{{item.SendVisaDate}}</span>
</p>
<p>
开始日期：<span class="fbold">{{item.EffectiveStartDate}}</span>
</p>
</td>
<td>
<span class="totalPrice fbold" style="color: #47BF8C;">￥{{moneyFormat(item.CostPrice)}}</span>
......@@ -409,20 +416,36 @@
@click="getDetail(item)"
></el-button>
</el-tooltip> -->
<el-tooltip
class="item"
effect="dark"
content="修改"
placement="top-start"
v-if="item.SendVisaStatus==1&&msg.isFinacial==1"
>
<el-button
type="primary"
style="background:#409EFF; border-color:#409EFF"
icon="iconfont icon-img_bianji_small"
@click="EditVisaProduct(item)"
></el-button>
</el-tooltip>
<div style="display:inline-block">
<el-tooltip
class="item"
effect="dark"
content="修改"
placement="top-start"
v-if="item.SendVisaStatus==1&&msg.isFinacial==1"
>
<el-button
type="primary"
style="background:#409EFF; border-color:#409EFF"
icon="iconfont icon-img_bianji_small"
@click="EditVisaProduct(item)"
></el-button>
</el-tooltip>
<el-tooltip
class="item"
effect="dark"
content="查看详情"
placement="top-start"
v-else
>
<el-button
style="background:#E95252; border-color:#E95252;color:#fff"
icon="iconfont icon-chakan"
@click="ChaKan(item)"
></el-button>
</el-tooltip>
</div>
<el-tooltip effect="dark" content="查看" placement="top-start" v-if="msg.isFinacial==1">
<el-button
type="primary"
......@@ -677,6 +700,18 @@ export default {
},
methods: {
// 只能查看，不能修改
ChaKan(item){
this.$router.push({
name: "ModifyVisaProduct",
query: {
Id:item.Id,
blank: "y",
save:false,
tab: "配置签证产品"
}
});
},
// 修改签证产品
EditVisaProduct(item){
this.$router.push({
......
src/components/Supplier/roomQuery2.vue
View file @ 1d461a32
This diff is collapsed.
src/components/activity/IntegralMall.vue
View file @ 1d461a32
......@@ -54,6 +54,7 @@
<tr>
<th width='80'>商品编号</th>
<th>商品名称</th>
<th>商品数量</th>
<th>购买等级要求</th>
<th>价格</th>
<th>市场价</th>
......@@ -66,6 +67,7 @@
<tr v-for="item in dataList">
<td>{{item.id}}</td>
<td>{{item.name}}</td>
<td>{{item.storeNum}}</td>
<td>{{item.isReqRate === -1 ? '不限' : `${item.isReqRate}级`}}</td>
<td>{{item.price}}{{item.priceUnit === 1 ? '人民币' : '积分'}}</td>
<td>{{item.marketPrice}}</td>
......
src/components/activity/addIntegralMall.vue
View file @ 1d461a32
......@@ -194,6 +194,9 @@
.addIntegralMall .bottom_sub {
padding-top: 25px;
}
.addIntegralMall .ql-editor{
min-height: 200px;
}
</style>
<template>
<el-row class="addIntegralMall">
......@@ -240,6 +243,9 @@
></el-option>
</el-select>
</el-form-item>
<el-form-item label="商品数量" prop="storeNum">
<el-input v-model="addMsg.storeNum" class="w217"/>
</el-form-item>
<el-form-item label="商品状态">
<el-select filterable v-model="addMsg.state">
<el-option label="上架" :value="1" :key="1"></el-option>
......@@ -313,8 +319,11 @@
</div>
<p class="tips tips2">最多上传5张图片</p>
<span class="resource-lititle resource-lititle2">商品描述</span>
<quill-editor :options="editorOption" v-model="addMsg.description"></quill-editor>
<span class="resource-lititle resource-lititle2">图片介绍</span>
<my-edit v-on:edit-value="addMsg.description = arguments[0]" v-bind:editValue="addMsg.description"
v-bind:toolbarShow="toolbar" v-bind:placeholder="placeholder"></my-edit>
<!-- <span class="resource-lititle resource-lititle2">图片介绍</span>
<div class="resource-imglist clearfix">
<div class="re-img re-img2" v-for="(item,index) in DiningImageArray2" :key="index">
<img v-if="!item" src="../../assets/img/bg_c3@3x.png">
......@@ -361,7 +370,7 @@
</div>
</div>
</div>
</div>
</div> -->
</div>
<div class="bottom_sub">
<button
......@@ -378,9 +387,23 @@
</template>
<script>
import { setInterval, setTimeout } from "timers";
import MyEdit from "../EditTemplate.vue";
export default {
data() {
return {
toolbar: {
clean: true,
font: false, //字体
narrative: false, //叙述,
image:true,
bold: true, //加粗
underline: true, //下划线
header1: true, //H1
header2: true, //H2
fontColor: true, //字体颜色
fontBackgroundColor: true, //背景颜色
},
placeholder: "请输入内容",
editorOption: {
modules: {
toolbar: [
......@@ -410,6 +433,7 @@ export default {
quota: 0,
ishot: 0,
descripImg: '',
storeNum:''
},
MenberList: [],
GoodsTypeList: [],
......@@ -431,7 +455,8 @@ export default {
tradePeopleReq: [
{ required: true, message: "交易人头数要求", trigger: "blur" }
],
remark: [{ required: true, message: "请输入备注", trigger: "blur" }]
remark: [{ required: true, message: "请输入备注", trigger: "blur" }],
storeNum:[{ required: true, message: "请输入商品数量", trigger: "blur" }]
},
//上传的文件数组
DiningImageArray: [],
......@@ -446,6 +471,9 @@ export default {
GoodsSeriesList: [],
};
},
components: {
"my-edit": MyEdit
},
methods: {
getGoodsSeries() {
this.loading = true;
......
src/components/platformModule/companyManagement.vue
View file @ 1d461a32
......@@ -53,6 +53,7 @@
<th>{{$t('restaurant.res_ContactNumber')}}</th>
<th>{{$t('admin.admin_status')}}</th>
<th>{{$t('admin.admin_isshow')}}</th>
<th>B2B是否显示</th>
<th>公司类型</th>
<th width="200">{{$t('admin.admin_operate')}}</th>
</tr>
......@@ -65,6 +66,7 @@
<td>{{item.MobilePhone}}</td>
<td>{{item.Status==0? $t('pub.openSel'): $t('pub.closeSel')}}</td>
<td>{{item.is_show==0?'显示':'不显示'}}</td>
<td>{{item.B2BShow==0?'显示':'不显示'}}</td>
<td>{{item.IsParentCompany=='1'?'总公司':'分公司'}}</td>
<td>
<el-row>
......@@ -152,6 +154,9 @@
</el-form-item>
<el-form-item class='w400' :label='$t("admin.admin_isshow")' prop="is_show">
<el-switch v-model="addMsg.is_show" active-value="0" inactive-value="1"></el-switch>
</el-form-item>
<el-form-item class='w400' label='B2B是否显示' prop="B2BShow">
<el-switch v-model="addMsg.B2BShow" active-value="0" inactive-value="1"></el-switch>
</el-form-item>
<el-form-item class='w400' label='是否为总公司' prop="IsParentCompany">
<el-switch v-model="addMsg.IsParentCompany" active-value="1" inactive-value="2"></el-switch>
......@@ -305,6 +310,7 @@
AirportServicePerson: '',
AirportServicePhone: '',
is_show: '0',
B2BShow:'0',
BranchManager: '',
IsParentCompany:'1',
BeginTier:'',
......@@ -411,6 +417,7 @@
this.getCityList(this.addMsg.Province,2);
this.addMsg.Status=this.addMsg.Status.toString();
this.addMsg.is_show=this.addMsg.is_show.toString();
this.addMsg.B2BShow=this.addMsg.B2BShow.toString();
this.addMsg.IsParentCompany=this.addMsg.IsParentCompany.toString();
this.imageUrl = this.addMsg.ConfirmationSignet;
this.imageUrlLogo=this.addMsg.TravelLogo;
......
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