Skip to content

S
SuperMan
Commit 3ebcfff5 authored by zhengke's avatar zhengke
Browse files
Options

修改

parents 16cd652e 62a270f5
Show whitespace changes
Inline Side-by-side
Showing with 120 additions and 116 deletions
src/components/FinancialModule/ReportForm/TeamRevenueReport.vue
View file @ 3ebcfff5
...@@ -616,6 +616,7 @@ tr._item_list td:last-child { ...@@ -616,6 +616,7 @@ tr._item_list td:last-child {
:footer="footer" :footer="footer"
:footer-row-height="33" :footer-row-height="33"
:multiple-sort="multipleSort" :multiple-sort="multipleSort"
:row-click="rowClick"
> >
<!-- 多个排序 --> <!-- 多个排序 -->
</v-table> </v-table>
...@@ -1795,6 +1796,20 @@ export default { ...@@ -1795,6 +1796,20 @@ export default {
this.getPageList(); this.getPageList();
}, },
methods: { methods: {
rowClick(rowIndex,rowData,column){
let path='RegistrationList';
if(this.msg.DataType==1 || this.msg.DataType=='1'){
if(column.title=="待收金额" || column.title=="溢收金额"){
this.$router.push({
name: path,
query: {
id: rowData.TCID,
blank: "y",
}
});
}
}
},
//获取目的地列表 //获取目的地列表
getLinePlaceList(lineId) { getLinePlaceList(lineId) {
let msg = { let msg = {
......
src/components/SalesVisa/VisaProductOrder.vue
View file @ 3ebcfff5
...@@ -124,10 +124,11 @@ ...@@ -124,10 +124,11 @@
</ul> </ul>
</div> </div>
<div style=" padding-bottom: 10px;"> <div style="padding-bottom: 10px;">
<span>应收总额：{{moneyFormat(PreferPrice)}}</span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; <span>应收总额：{{moneyFormat(PreferPrice)}}</span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
<span>实收：{{moneyFormat(IncomePrice)}}</span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; <span>实收：{{moneyFormat(IncomePrice)}}</span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
<span>待收：<span :class="{color_red:(PreferPrice-IncomePrice)!==0}">{{moneyFormat(PreferPrice-IncomePrice)}}</span></span> <span>优惠：{{moneyFormat(DiscountMoneyAll)}}</span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
<span>待收：<span :class="{color_red:(PreferPrice-IncomePrice-DiscountMoneyAll)!==0}">{{moneyFormat(PreferPrice-IncomePrice-DiscountMoneyAll)}}</span></span>
</div> </div>
<table class="VisaProductTable" border="0" cellspacing="0" cellpadding="0" v-loading='loading'> <table class="VisaProductTable" border="0" cellspacing="0" cellpadding="0" v-loading='loading'>
<tr> <tr>
...@@ -321,6 +322,7 @@ export default { ...@@ -321,6 +322,7 @@ export default {
isShow:0, isShow:0,
PreferPrice:0, PreferPrice:0,
IncomePrice:0, IncomePrice:0,
DiscountMoneyAll:0,
EmployeeId:0, EmployeeId:0,
EditVisible:false, EditVisible:false,
EditMsg:{ EditMsg:{
...@@ -402,6 +404,7 @@ export default { ...@@ -402,6 +404,7 @@ export default {
this.apipost('dmc_get_visa_GetVisaOrderList',this.msg,res=>{ this.apipost('dmc_get_visa_GetVisaOrderList',this.msg,res=>{
this.PreferPrice=0; this.PreferPrice=0;
this.IncomePrice=0; this.IncomePrice=0;
this.DiscountMoneyAll=0;
if(res.data.resultCode==0){ if(res.data.resultCode==0){
this.loading = false; this.loading = false;
this.dataList=[] this.dataList=[]
...@@ -412,8 +415,11 @@ export default { ...@@ -412,8 +415,11 @@ export default {
this.dataList.forEach(x=>{ this.dataList.forEach(x=>{
if(x.VisaOrderStatus!=2){ if(x.VisaOrderStatus!=2){
this.PreferPrice+=x.TotalPrice; this.PreferPrice+=x.TotalPrice;
} this.DiscountMoneyAll+=x.DiscountMoney;
this.IncomePrice+=(x.Income+x.PlatformTax-x.RefundMoney); this.IncomePrice+=(x.Income+x.PlatformTax-x.RefundMoney);
}
}) })
} }
},err=>{}) },err=>{})
......
src/components/scenicSpot/scenicRecommentList.vue
View file @ 3ebcfff5
...@@ -219,9 +219,11 @@ ...@@ -219,9 +219,11 @@
.scenicRecommentList .comCursorUrl { .scenicRecommentList .comCursorUrl {
cursor: pointer; cursor: pointer;
} }
.scenicRecommentList .ql-container{
.scenicRecommentList .ql-container {
min-height: 150px; min-height: 150px;
} }
.scenicRecommentList .el-upload-dragger { .scenicRecommentList .el-upload-dragger {
font-size: 28px; font-size: 28px;
color: #8c939d; color: #8c939d;
...@@ -230,9 +232,11 @@ ...@@ -230,9 +232,11 @@
line-height: 41px; line-height: 41px;
text-align: center; text-align: center;
} }
.scenicRecommentList .ql-editor{
.scenicRecommentList .ql-editor {
min-height: 150px; min-height: 150px;
} }
/* 景区推荐列表 */ /* 景区推荐列表 */
</style> </style>
...@@ -242,7 +246,7 @@ ...@@ -242,7 +246,7 @@
<ul> <ul>
<li> <li>
<span class="hotel_name"> <span class="hotel_name">
<em>名称</em> <em>攻略名称</em>
<el-input maxlength="50" @keyup.native.enter="resetPageIndex(),getList()" v-model="msg.Name"> <el-input maxlength="50" @keyup.native.enter="resetPageIndex(),getList()" v-model="msg.Name">
</el-input> </el-input>
</span> </span>
...@@ -259,22 +263,22 @@ ...@@ -259,22 +263,22 @@
<div class="hotelResource clearfix" v-loading="loading"> <div class="hotelResource clearfix" v-loading="loading">
<table class="singeRowTable" border="0" cellspacing="0" cellpadding="0" v-loading="loading"> <table class="singeRowTable" border="0" cellspacing="0" cellpadding="0" v-loading="loading">
<tr> <tr>
<th> <th width="80">
编号 编号
</th> </th>
<th width="300"> <th width="150">
名称 名称
</th> </th>
<th width="300"> <th width="150">
封面 封面
</th> </th>
<th> <th width="100">
操作人 操作人
</th> </th>
<th> <th width="120">
操作时间 操作时间
</th> </th>
<th> <th width="120">
操作 操作
</th> </th>
</tr> </tr>
...@@ -286,7 +290,7 @@ ...@@ -286,7 +290,7 @@
{{item.Name}} {{item.Name}}
</td> </td>
<td> <td>
<img :src="item.ImgCover" style="width:180px;"/> <img :src="item.ImgCover" style="width:50px;height:30px"/>
</td> </td>
<td> <td>
{{item.UpdateName}} {{item.UpdateName}}
...@@ -296,69 +300,47 @@ ...@@ -296,69 +300,47 @@
</td> </td>
<td> <td>
<el-tooltip class="item" effect="dark" content="修改" placement="top"> <el-tooltip class="item" effect="dark" content="修改" placement="top">
<el-button <el-button type="primary" icon="el-icon-edit" circle @click="GetScenic(item.Id)"></el-button>
type="primary"
icon="el-icon-edit"
circle
@click="UpdateScenic(item.Id)"
></el-button>
</el-tooltip> </el-tooltip>
<el-tooltip class="item" effect="dark" content="删除" placement="top"> <el-tooltip class="item" effect="dark" content="删除" placement="top">
<el-button <el-button type="danger" icon="iconfont icon-img_delete_small" circle
type="danger" @click="removeScenicRecomment(item.Id)"></el-button>
icon="iconfont icon-img_delete_small"
circle
@click="removeScenicRecomment(item.Id)"
></el-button>
</el-tooltip> </el-tooltip>
</td> </td>
</tr> </tr>
<tr v-if="!(DataList && DataList.length>0)">
<td colspan="6">
暂无数据...
</td>
</tr>
</table> </table>
</div> </div>
<el-dialog <el-dialog custom-class="w800" title="新增" :visible.sync="outerVisible" center :before-close="closeChangeMachie">
custom-class="w800"
title="新增"
:visible.sync="outerVisible"
center
:before-close="closeChangeMachie"
>
<el-form :model="addMsg" :rules="rules" ref="addMsg" label-width="80px"> <el-form :model="addMsg" :rules="rules" ref="addMsg" label-width="80px">
<el-form-item label="名称" prop="Name"> <el-form-item label="攻略名称" prop="Name">
<el-input v-model="addMsg.Name" class="w217"/> <el-input v-model="addMsg.Name" class="w217" />
</el-form-item> </el-form-item>
<el-form-item label="封面图"> <el-form-item label="封面图">
<div class="_addUpload_box"> <div class="_addUpload_box">
<div class="_pic_upload"> <div class="_pic_upload">
<template v-if="addMsg.ImgCover!==''"> <template v-if="addMsg.ImgCover!==''">
<div> <div>
<div <div style="width:125px;height:80px;overflow: hidden;display: flex;align-items: center;">
style="width:125px;height:80px;overflow: hidden;display: flex;align-items: center;"
>
<img :src="addMsg.ImgCover"> <img :src="addMsg.ImgCover">
</div> </div>
<div <div style="font-size:12px; color:#666666;cursor: pointer;line-height: 20px;"
style="font-size:12px; color:#666666;cursor: pointer;line-height: 20px;" @click="addMsg.ImgCover=''">重新上传</div>
@click="addMsg.ImgCover=''"
>重新上传</div>
</div> </div>
</template> </template>
<el-upload <el-upload v-else drag :http-request="uploadFileBtn" :multiple="false" :show-file-list="false" action>
v-else
drag
:http-request="uploadFileBtn"
:multiple="false"
:show-file-list="false"
action
>
<i class="el-icon-plus avatar-uploader-icon"></i> <i class="el-icon-plus avatar-uploader-icon"></i>
<div class="el-upload__text">{{$t("active.ld_djscwj")}}</div> <div class="el-upload__text">{{$t("active.ld_djscwj")}}</div>
</el-upload> </el-upload>
</div> </div>
</div> </div>
</el-form-item> </el-form-item>
<el-form-item label="内容" prop="lotteryRules"> <el-form-item label="攻略内容" prop="lotteryRules">
<quill-editor class="w595" :options="editorOption" v-model="addMsg.Content"></quill-editor> <quill-editor class="w595" :options="editorOption" v-model="addMsg.Content"></quill-editor>
</el-form-item> </el-form-item>
</el-form> </el-form>
...@@ -384,7 +366,7 @@ ...@@ -384,7 +366,7 @@
DataList: "", DataList: "",
noData: false, noData: false,
loading: true, loading: true,
outerVisible:false, outerVisible: false,
defaultImg: 'this.src="' + require("../../assets/img/bg_z1@2x.png") + '"', defaultImg: 'this.src="' + require("../../assets/img/bg_z1@2x.png") + '"',
msg: { msg: {
pageIndex: 1, pageIndex: 1,
...@@ -397,22 +379,26 @@ ...@@ -397,22 +379,26 @@
currentPage: 1, currentPage: 1,
Id: 0 Id: 0
}, },
addMsg:{ addMsg: {
Id:0, Id: 0,
Name:'', Name: '',
ImgCover:'', ImgCover: '',
Content:'' Content: ''
}, },
editorOption:{ editorOption: {
modules:{ modules: {
toolbar:[ toolbar: [
['bold', 'italic', 'underline', 'strike'], // toggled buttons ['bold', 'italic', 'underline', 'strike'], // toggled buttons
['blockquote', 'code-block','align'] ['blockquote', 'code-block', 'align']
] ]
} }
}, },
rules:{ rules: {
Name: [{ required: true, message: '请输入名称', trigger: "change" }], Name: [{
required: true,
message: '请输入名称',
trigger: "change"
}],
}, },
}; };
...@@ -462,15 +448,17 @@ ...@@ -462,15 +448,17 @@
null null
); );
}, },
uploadFileBtn(file) {
uploadFileBtn(file){
//上传 //上传
if (file.file.size > 1024 * 1024 * 10) { if (file.file.size > 1024 * 1024 * 10) {
this.$message.warning(this.$t("tips.wjdxbncgsz")); this.$message.warning(this.$t("tips.wjdxbncgsz"));
return; return;
} }
// 1 文档 2 数据 3 图片 // 1 文档 2 数据 3 图片
let typeArr = [{ stringArr: "GIF|JPG|JPEG|PNG|BMP", type: 3 }]; let typeArr = [{
stringArr: "GIF|JPG|JPEG|PNG|BMP",
type: 3
}];
let ft = file.file.name let ft = file.file.name
.substring(file.file.name.lastIndexOf(".") + 1, file.file.name.length) .substring(file.file.name.lastIndexOf(".") + 1, file.file.name.length)
.toUpperCase(); .toUpperCase();
...@@ -489,9 +477,9 @@ ...@@ -489,9 +477,9 @@
this.Success(this.$t("tips.shangchuanzhong")); this.Success(this.$t("tips.shangchuanzhong"));
this.UploadSelfFileT(path, newArr, x => { this.UploadSelfFileT(path, newArr, x => {
let fileSize = let fileSize =
file.file.size < 1024 file.file.size < 1024 ?
? file.file.size file.file.size :
: (file.file.size / 1024).toFixed(0); (file.file.size / 1024).toFixed(0);
this.addMsg.ImgCover = this.domainManager().ViittoFileUrl + x.data.FilePath; this.addMsg.ImgCover = this.domainManager().ViittoFileUrl + x.data.FilePath;
this.Success(this.$t("tips.scchenggong")); this.Success(this.$t("tips.scchenggong"));
this.$forceUpdate(); this.$forceUpdate();
...@@ -522,7 +510,7 @@ ...@@ -522,7 +510,7 @@
}); });
}, },
//新增 //新增
addScenic(){ addScenic() {
this.apipost( this.apipost(
"ScenicRecomment_Post_SetScenicRecommentService", "ScenicRecomment_Post_SetScenicRecommentService",
this.addMsg, this.addMsg,
...@@ -530,7 +518,12 @@ ...@@ -530,7 +518,12 @@
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
this.Success(res.data.message); this.Success(res.data.message);
this.getList(); this.getList();
}else{ this.outerVisible = false;
this.addMsg.Id = 0;
this.addMsg.Name = "";
this.addMsg.ImgCover = "";
this.addMsg.Content = "";
} else {
this.Error(res.data.message); this.Error(res.data.message);
} }
}, },
...@@ -538,43 +531,23 @@ ...@@ -538,43 +531,23 @@
); );
}, },
//修改 //修改
UpdateScenic(id){ GetScenic(id) {
this.apipost( this.apipost(
"ScenicRecomment_Get_GetScenicRecommentService",{Id:id}, "ScenicRecomment_Get_GetScenicRecommentService", {
Id: id
},
res => { res => {
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
this.outerVisible=true; this.addMsg.Id = res.data.data.Id;
this.addMsg=res.data.data; this.addMsg.Name = res.data.data.Name;
}else{ this.addMsg.ImgCover = res.data.data.ImgCover;
this.Error(res.data.message); this.addMsg.Content = res.data.data.Content;
this.outerVisible = true;
} }
}, },
null null
); );
}, },
goUrl(path, id) {
this.$store.commit("pageConditionUpdate", this.msg);
this.$router.push({
path: path,
query: {
id: id,
blank: 'y',
tab: '修改景区信息'
}
});
},
goUrlT(path, id) {
this.$router.push({
path: path,
query: {
id: id,
blank: 'y',
tab: '门票管理'
}
});
}
}, },
mounted() { mounted() {
//this.getCountryList(); //this.getCountryList();
......
src/components/work/workDetails.vue
View file @ 3ebcfff5
...@@ -57,7 +57,8 @@ ...@@ -57,7 +57,8 @@
<p v-if="d.w">{{d.w.CreateName}} 提交于 {{item.CreateDate}}</p> <p v-if="d.w">{{d.w.CreateName}} 提交于 {{item.CreateDate}}</p>
<div class="cont">{{item.Content}}</div> <div class="cont">{{item.Content}}</div>
<div class="attach"> <div class="attach">
<a href="http://baidu.com" target="_blank">附件：baidu.jpg</a> 附件：无
<!--<a href="http://baidu.com" target="_blank"></a>-->
</div> </div>
</el-card> </el-card>
</div> </div>
......
src/components/work/workManager.vue
View file @ 3ebcfff5
...@@ -357,6 +357,15 @@ export default { ...@@ -357,6 +357,15 @@ export default {
err => {} err => {}
); );
}, },
query(id){
this.$router.push({
name: "workDetails",
query: {
"id": id,
blank: 'y'
}
})
},
query2(id){ query2(id){
this.$router.push({ this.$router.push({
name: "workDetails", name: "workDetails",
......
src/plug/index.js
View file @ 3ebcfff5
...@@ -118,7 +118,7 @@ export default { ...@@ -118,7 +118,7 @@ export default {
javaUrldo=locationName.indexOf('oytour') !== -1 || locationName.indexOf('viitto') !== -1 ? (locationName.indexOf('oytour') !== -1 ? "http://efficient.oytour.com" : "http://47.96.12.235:9001") : "http://192.168.2.215:9000"; javaUrldo=locationName.indexOf('oytour') !== -1 || locationName.indexOf('viitto') !== -1 ? (locationName.indexOf('oytour') !== -1 ? "http://efficient.oytour.com" : "http://47.96.12.235:9001") : "http://192.168.2.215:9000";
if (locationName.indexOf('testerp.oytour') !== -1) { if (locationName.indexOf('testerp.oytour') !== -1) {
domainUrl = "http://127.0.0.1:8082"; domainUrl = "http://testapi.oytour.com";
} }
else if (locationName.indexOf('oytour') !== -1) { else if (locationName.indexOf('oytour') !== -1) {
domainUrl = "http://reborn.oytour.com"; domainUrl = "http://reborn.oytour.com";
......
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