Skip to content

S
SuperMan
Commit 3c3734a6 authored by youjie's avatar youjie
Browse files
Options

流程 是否开启、团队支出单据类型 房、车、门票

parents c385cc6b 07109a04
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 7126 additions and 4778 deletions
src/components/Buying/BuyingAdd.vue
View file @ 3c3734a6
This diff is collapsed.
src/components/Contract/ElectronicContract.vue
View file @ 3c3734a6
......@@ -920,7 +920,7 @@
<div class="EC_div" :class="{'checkedNav':cked==7}">
<div class="EC_ComTitle">委托授权书</div>
<template v-for="(item,index) in dataList.guestList">
<p class="shouquanNum" >{{index+1}}</p>
<p class="shouquanNum">{{index+1}}</p>
<div class="shouquanDiv">
<p class="ShouDiv_Title">委托授权书</p>
<p><span>{{dataList.company}}</span>：</p>
......@@ -939,7 +939,7 @@
联系电话：<span>{{dataList.clientCall}}</span>
</p>
<p>受托人承诺：本授权委托书为<span>{{item.surName+''+item.name}}
</span>（委托人姓名）本人出具，若不属实，因此产生的全部法律责任由受托人承担。受托人代表其他委托人在本合同书上签字，将严格履行受托人的权利和义务，将本合同的全部内容逐一向我代表的每一位委托人转达。>
</span>（委托人姓名）本人出具，若不属实，因此产生的全部法律责任由受托人承担。受托人代表其他委托人在本合同书上签字，将严格履行受托人的权利和义务，将本合同的全部内容逐一向我代表的每一位委托人转达。>
</p>
<p style="text-align:right;margin:20px 40px 20px 0">委托日期：<span>{{getDate(dataList.payDate)}}</span></p>
</div>
......@@ -1171,8 +1171,10 @@
</div>
<div class="EC_floatdiv">
<input type="button" class="normalBtn" v-if="dataList.status==1" @click="getinvalid()" value="作废" />
<input type="button" class="normalBtn" v-if="dataList.companySignature==''" @click="isShowFade=true,GetQrCode()" value="客户签字" />
<input type="button" class="normalBtn" v-if="dataList.companySignature!=''" value="下载" @click="toContractPDF(dataList.contractNum)" />
<input type="button" class="normalBtn" v-if="dataList.companySignature==''" @click="isShowFade=true,GetQrCode()"
value="客户签字" />
<input type="button" class="normalBtn" v-if="dataList.companySignature!=''" value="下载"
@click="toContractPDF(dataList.contractNum)" />
</div>
</div>
<div class="fade" v-show="isShowFade"></div>
......@@ -1201,7 +1203,7 @@
dataList: [],
isShowFade: false,
QRCodeStr: "",
pdfLoading:false
pdfLoading: false
};
},
methods: {
......@@ -1229,8 +1231,7 @@
} else {
}
}).catch(err => {
})
}).catch(err => {})
},
// 生成pdf
......@@ -1240,7 +1241,7 @@
TCID: this.$route.query.TCID,
orderID: this.$route.query.orderID,
};
this.pdfLoading=true;
this.pdfLoading = true;
this.$http({
headers: {
'Content-Type': 'application/json'
......@@ -1268,8 +1269,7 @@
},
//获取数据
getList() {
//this.apiJavaPost("/api/contract/getContractInfo", this.msg, res => {
this.apipost("travelcontract_post_GetContractInfoService", this.msg, res => {
this.apipost("travelcontract_post_GetContractInfoService", this.msg, res => {
if (res.data.resultCode === 1) {
this.dataList = res.data.data;
} else {
......@@ -1318,21 +1318,20 @@
//作废
getinvalid() {
this.$confirm('是否作废?', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
this.dataList.status=0;
//this.apiJavaPost("/api/contract/dosaveOrUpdate",this.dataList,res => {
this.apipost("travelcontract_post_UpdateStatusContractService", this.dataList, res => {
if (res.data.resultCode === 1) {
this.Success(res.data.message);
} else {
this.Error(res.data.message);
}
},null);
this.dataList.status = 0;
this.apipost("travelcontract_post_UpdateStatusContractService", this.dataList, res => {
if (res.data.resultCode === 1) {
this.Success(res.data.message);
} else {
this.Error(res.data.message);
}
}, null);
}).catch(() => {
this.$message.info('取消删除');
this.$message.info('取消删除');
});
}
},
......
src/components/Contract/TravelContract.vue
View file @ 3c3734a6
This source diff could not be displayed because it is too large. You can view the blob instead.
src/components/FinancialModule/ChoiceAddFinancialDocuments2.vue
View file @ 3c3734a6
......@@ -333,7 +333,7 @@
this.GetList = newList;
}else{
this.GetList.forEach(y=>{
y.showYes = true
y.showYes = false
newList.push(JSON.parse(JSON.stringify(y)))
})
}
......
src/components/FinancialModule/FProcessManagement.vue
View file @ 3c3734a6
......@@ -102,13 +102,24 @@
<span>注：财务基本流程包括（收款流程，付款流程，发票流程），如果需要其他的流程，比如退款流程等请在自定义流程下新增流程设置</span>
</li> -->
<li><input type="button" class="normalBtn" value="新增流程" @click="goUrl('addFinancialProcess',0,8)"/>
<input type="button" class="hollowFixedBtn" :value="$t('pub.searchBtn')" @click="resetPageIndex();getTemplateList();"/>
<input type="button" class="hollowFixedBtn" :value="$t('pub.searchBtn')" @click="resetPageIndex()"/>
</li>
</ul>
</div>
<ul class="_nav clearfix">
<li class="_active" @click="getTemplateList()">流程列表</li>
<!-- <li :class="active==1?'_active':''" @click="active=1,msg.TempLateWay=8,getTemplateList()">自定义流程</li> -->
<li>
<span>是否启用：</span>
<el-tooltip :content="msg.Status==1?'启用':'停用'" placement="top">
<el-switch
@change="resetPageIndex"
v-model="msg.Status"
active-value="1"
inactive-value="2">
</el-switch>
</el-tooltip>
</li>
</ul>
<el-form class="_info_box clearfix" label-width="110px">
<el-row>
......@@ -284,7 +295,8 @@ export default {
pageSize:6,
RB_BranchId:-1,
Name:'',
CostTypeID:0
CostTypeID:0,
Status:'1'
}
}
},created(){
......@@ -419,6 +431,7 @@ export default {
resetPageIndex() {
this.msg.pageIndex = 1
this.currentPage = 1
this.getTemplateList()
},
goUrl(path,id,isZ,Branch_Id) {
this.$router.push({ name: path,query:{"id":id,"isZ":isZ,"blank":'y',tab:"修改流程"} })
......
src/components/FinancialModule/ReportForm/ElectricalProfits.vue
View file @ 3c3734a6
<template>
<div class="Sheepcommission">
<div class="query-box">
<div class="query-box">
<ul>
<li>
<span>
<em>名称</em>
<el-input type="text" v-model="msg.Name" :placeholder="$t('pub.pleaseImport')"></el-input>
</span>
<span>
<em>名称</em>
<el-input type="text" v-model="msg.Name" :placeholder="$t('pub.pleaseImport')"></el-input>
</span>
</li>
<li>
<span>
<em>手机</em>
<el-input type="text" v-model="msg.Moblie" :placeholder="$t('pub.pleaseImport')"></el-input>
</span>
<span>
<em>手机</em>
<el-input type="text" v-model="msg.Moblie" :placeholder="$t('pub.pleaseImport')"></el-input>
</span>
</li>
<li>
<input type="button" class="hollowFixedBtn" :value="$t('pub.searchBtn')" @click="getList()" />
<input type="button" class="hollowFixedBtn" :value="$t('pub.searchBtn')" @click="getList()" />
</li>
</ul>
</div>
<table class="singeRowTable" border="0" cellspacing="0" cellpadding="0" v-loading="loading">
<tr>
<tr>
<th>用户ID</th>
<th>名称</th>
<th>手机</th>
<th>分销等级</th>
<th>累计佣金</th>
<th>可提现佣金</th>
<th>待结算佣金</th>
<th>可提现佣金</th>
<th>待结算佣金</th>
<th>已结算佣金</th>
</tr>
<tr v-for="(item,i) in dataList" :key="i">
<td>{{item.UserId}}</td>
......@@ -40,88 +39,82 @@
<td>{{item.TotalCommission}}</td>
<td>{{item.CommissionWithdrawal}}</td>
<td>
<span @click="goUrl(item)" class="underline point">{{item.WaitCommission}}</span>
<span @click="goUrl(item)" class="underline point">{{item.WaitCommission}}</span>
</td>
<td>
<span @click="goUrl(item)" class="underline point">{{item.Commission}}</span>
<span @click="goUrl(item)" class="underline point">{{item.Commission}}</span>
</td>
</tr>
<tr v-if="dataList.length==0">
<td colspan="15" align="center">暂无数据</td>
</tr>
</table>
<el-pagination background @current-change="handleCurrentChange"
layout="total,prev, pager, next, jumper" :page-size="msg.pageSize" :total='total'>
</el-pagination>
<el-pagination background @current-change="handleCurrentChange" layout="total,prev, pager, next, jumper"
:page-size="msg.pageSize" :total='total'>
</el-pagination>
</div>
</template>
<script>
import moment from "moment";
export default {
name: "Feedback",
data() {
return {
total: 0,
msg: {
pageIndex: 1,
pageSize: 10,
Name:'',
Moblie:'',
IsSelectCommpany:1
},
dataList: [],
loading: false
};
},
created() {
this.getList();
},
mounted() {},
methods: {
goUrl(item) {
this.$router.push({
name: "commissionSubsidiary",
query: {
UserId: item.UserId,
blank:'y'
}
})
import moment from "moment";
export default {
name: "Feedback",
data() {
return {
total: 0,
msg: {
pageIndex: 1,
pageSize: 10,
Name: '',
Moblie: '',
IsSelectCommpany: 1
},
dataList: [],
loading: false
};
},
handleCurrentChange(val) {
this.msg.pageIndex = val;
created() {
this.getList();
},
getList() {
this.loading = true;
this.apipost('Financial_get_GetMallUserCommissionPageList',this.msg,res=>{
mounted() {},
methods: {
goUrl(item) {
this.$router.push({
name: "commissionSubsidiary",
query: {
UserId: item.UserId,
blank: 'y'
}
})
},
handleCurrentChange(val) {
this.msg.pageIndex = val;
this.getList();
},
getList() {
this.loading = true;
this.apipost('Financial_get_GetMallUserCommissionPageList', this.msg, res => {
this.loading = false;
if(res.data.resultCode==1){
if (res.data.resultCode == 1) {
this.total = res.data.data.count;
this.dataList = res.data.data.pageData;
}else{
this.$message.error(res.data.message);
}
},err=>{})
// this.apiJavaPostSmall("/api/ERPOrderCommission/GetDistributionCommissionPageList", this.msg, res => {
// if (res.data.resultCode === 1) {
// this.total = res.data.data.count;
// this.dataList = res.data.data.pageData;
// } else {
// this.Error(res.data.message);
// }
// }, null);
} else {
this.$message.error(res.data.message);
}
}, err => {})
},
}
};
}
};
</script>
<style>
.Sheepcommission .underline{
.Sheepcommission .underline {
text-decoration: underline;
}
.Sheepcommission .point{
}
.Sheepcommission .point {
cursor: pointer;
}
}
</style>
src/components/FinancialModule/ReportForm/TeamRevenueReport.vue
View file @ 3c3734a6
......@@ -1526,6 +1526,36 @@ export default {
isResize: true,
componentName: "TCIDJumpWang"
},
{
field: "RoomFee",
formatter: this.moneyFormat,
title: "房费",
width: 90,
titleAlign: "left",
columnAlign: "right",
isResize: true,
componentName: "TCIDJumpWang"
},
{
field: "MealFee",
formatter: this.moneyFormat,
title: "餐费",
width: 90,
titleAlign: "left",
columnAlign: "right",
isResize: true,
componentName: "TCIDJumpWang"
},
{
field: "TicketFee",
formatter: this.moneyFormat,
title: "门票费",
width: 90,
titleAlign: "left",
columnAlign: "right",
isResize: true,
componentName: "TCIDJumpWang"
},
{
field: "JiPiao",
formatter: this.moneyFormat,
......
src/components/FinancialModule/Sheepcommission.vue
View file @ 3c3734a6
<template>
<div class="Sheepcommission">
<div class="query-box">
<div class="query-box">
<ul>
<li>
<span>
<em>名称</em>
<el-input type="text" v-model="msg.Name" :placeholder="$t('pub.pleaseImport')"></el-input>
</span>
<span>
<em>名称</em>
<el-input type="text" v-model="msg.Name" :placeholder="$t('pub.pleaseImport')"></el-input>
</span>
</li>
<li>
<span>
<em>手机</em>
<el-input type="text" v-model="msg.Moblie" :placeholder="$t('pub.pleaseImport')"></el-input>
</span>
<span>
<em>手机</em>
<el-input type="text" v-model="msg.Moblie" :placeholder="$t('pub.pleaseImport')"></el-input>
</span>
</li>
<li>
<input type="button" class="hollowFixedBtn" :value="$t('pub.searchBtn')" @click="getList()" />
<input type="button" class="hollowFixedBtn" :value="$t('pub.searchBtn')" @click="getList()" />
</li>
</ul>
</div>
<table class="singeRowTable" border="0" cellspacing="0" cellpadding="0" v-loading="loading">
<tr>
<tr>
<th>用户ID</th>
<th>名称</th>
<th>手机</th>
<th>分销等级</th>
<th>累计佣金</th>
<th>可提现佣金</th>
<th>待结算佣金</th>
<th>可提现佣金</th>
<th>待结算佣金</th>
<th>已结算佣金</th>
</tr>
<tr v-for="(item,i) in dataList" :key="i">
<td>{{item.UserId}}</td>
......@@ -40,87 +39,81 @@
<td>{{item.TotalCommission}}</td>
<td>{{item.CommissionWithdrawal}}</td>
<td>
<span @click="goUrl(item)" class="underline point">{{item.WaitCommission}}</span>
<span @click="goUrl(item)" class="underline point">{{item.WaitCommission}}</span>
</td>
<td>
<span @click="goUrl(item)" class="underline point">{{item.Commission}}</span>
<span @click="goUrl(item)" class="underline point">{{item.Commission}}</span>
</td>
</tr>
<tr v-if="dataList.length==0">
<td colspan="15" align="center">暂无数据</td>
</tr>
</table>
<el-pagination background @current-change="handleCurrentChange"
layout="total,prev, pager, next, jumper" :page-size="msg.pageSize" :total='total'>
</el-pagination>
<el-pagination background @current-change="handleCurrentChange" layout="total,prev, pager, next, jumper"
:page-size="msg.pageSize" :total='total'>
</el-pagination>
</div>
</template>
<script>
import moment from "moment";
export default {
name: "Feedback",
data() {
return {
total: 0,
msg: {
pageIndex: 1,
pageSize: 10,
Name:'',
Moblie:'',
},
dataList: [],
loading: false
};
},
created() {
this.getList();
},
mounted() {},
methods: {
goUrl(item) {
this.$router.push({
name: "commissionSubsidiary",
query: {
UserId: item.UserId,
blank:'y'
}
})
import moment from "moment";
export default {
name: "Feedback",
data() {
return {
total: 0,
msg: {
pageIndex: 1,
pageSize: 10,
Name: '',
Moblie: '',
},
dataList: [],
loading: false
};
},
handleCurrentChange(val) {
this.msg.pageIndex = val;
created() {
this.getList();
},
getList() {
this.loading = true;
this.apipost('Financial_get_GetMallUserCommissionPageList',this.msg,res=>{
mounted() {},
methods: {
goUrl(item) {
this.$router.push({
name: "commissionSubsidiary",
query: {
UserId: item.UserId,
blank: 'y'
}
})
},
handleCurrentChange(val) {
this.msg.pageIndex = val;
this.getList();
},
getList() {
this.loading = true;
this.apipost('Financial_get_GetMallUserCommissionPageList', this.msg, res => {
this.loading = false;
if(res.data.resultCode==1){
if (res.data.resultCode == 1) {
this.total = res.data.data.count;
this.dataList = res.data.data.pageData;
}else{
this.$message.error(res.data.message);
}
},err=>{})
// this.apiJavaPostSmall("/api/ERPOrderCommission/GetDistributionCommissionPageList", this.msg, res => {
// if (res.data.resultCode === 1) {
// this.total = res.data.data.count;
// this.dataList = res.data.data.pageData;
// } else {
// this.Error(res.data.message);
// }
// }, null);
} else {
this.$message.error(res.data.message);
}
}, err => {})
},
}
};
}
};
</script>
<style>
.Sheepcommission .underline{
.Sheepcommission .underline {
text-decoration: underline;
}
.Sheepcommission .point{
}
.Sheepcommission .point {
cursor: pointer;
}
}
</style>
src/components/FinancialModule/commissionSubsidiary.vue
View file @ 3c3734a6
......@@ -170,14 +170,6 @@ export default {
},
err => {}
);
// this.apiJavaPostSmall("/api/ERPOrderCommission/GetDistributionOrderCommissionPageList", this.msg, res => {
// if (res.data.resultCode === 1) {
// this.total = res.data.data.count;
// this.dataList = res.data.data.pageData;
// } else {
// this.Error(res.data.message);
// }
// }, null);
}
}
};
......
src/components/Hotel/roomReservationsDetails.vue
View file @ 3c3734a6
......@@ -193,7 +193,8 @@
</td>
</tr>
</table>
<span style="color:red;font-weight:bold">报价金额：{{subItem.OfferUnitPrice}}/人</span>
<span style="font-weight:bold;font-size:14px;">报价酒店：<font style="color:red;">{{subItem.OfferHotelName}}(
{{subItem.OfferUnitPrice}}/标间)</font></span>
</td>
<!-- 机位总数/(Y/E/F) -->
<td v-if="childIndex==0" :rowspan="6">
......@@ -215,9 +216,9 @@
<tr>
<td width="70" style="text-align:center;" colspan="2">
<span style="color:green">{{subItem.NewHotelName}}</span>
<el-popover placement="right" width="540" trigger="click" >
<el-popover placement="right" width="540" trigger="click">
<comCheckHotel :ref="'comCheckHotel'+index+subIndex+''" v-on:childHotel="childHotelList"
:UseDate="item.UseTimeStr" :Country="ChooseCountry" >
:UseDate="item.UseTimeStr" :Country="ChooseCountry">
</comCheckHotel>
<el-button size="small" type="danger" :data-index="'comCheckHotel'+index+subIndex+''"
slot="reference" style="cursor:pointer;"
......@@ -953,6 +954,7 @@
}
}
this.apipost('dmcstatistics_get_GetHotelStaticsDetail_V2', msg, res => {
console.log("dmcstatistics_get_GetHotelStaticsDetail_V2", res.data);
if (res.data.resultCode == 1) {
this.IsOperation = res.data.data.IsOperation;
if (this.IsEditHotel == 0) {
......@@ -969,10 +971,7 @@
if (list != null && list.length > 0) {
list.forEach((item, sIndex) => {
item.HotelOrderList.forEach(subItem => {
//默认不更新
if (this.LineId != 14) {
subItem.IsSyncHotelCount = 1;
}
subItem.hotelList.push({
Name: subItem.NewHotelName,
ID: subItem.NewHotelId
......
src/components/LeaderManagement/leaderReimbursement.vue
View file @ 3c3734a6
......@@ -150,6 +150,9 @@
</div>
</template>
</template>
<template v-if="item.BusOfferPrice&&item.BusOfferPrice">
<br /> 报价:<font style="color:red;">{{item.BusOfferPrice}}</font>
</template>
</td>
<td>
{{item.CostPrice >= 0 && item.CostPrice !== null ? moneyFormat(item.CostPrice) : ''}}
......@@ -305,9 +308,10 @@
{{subItem.HotelName}}
</template>
<br />
<span style="color:green">报价金额 :{{subItem.OfferUnitPrice}}/人(标准间)</span>
<span style="font-weight:bold;font-size:14px;">报价酒店：<font style="color:red;">{{subItem.OfferHotelName}}(
{{subItem.OfferUnitPrice}}/标间)</font></span>
<br />
<span style="color:red" v-if="subItem.StandardRoomPrice">实际金额 :{{subItem.StandardRoomPrice}}/人(标准间)</span>
<span style="color:red" v-if="subItem.StandardRoomPrice">实际金额 :{{subItem.StandardRoomPrice}}/人(标间)</span>
</td>
<td v-if="childIndex==0" :rowspan="subItem.OrderDetailsList.length" style="text-align:left; ">
<a target="_blank" v-if="subItem.ContractUrl!==''" :href="subItem.ContractUrl"
......@@ -572,6 +576,12 @@
<template v-else>
{{subItem.RealName? subItem.RealName : subItem.DiningName}}
</template>
<template v-if="subItem.DinnerOfferPrice&&subItem.DinnerOfferPrice>0">
<br />
<span style="font-weight:bold;font-size:14px;">报价餐厅:<font style="color:red;">
{{subItem.DinnerOfferName}}({{subItem.DinnerOfferPrice}}/人)
</font></span>
</template>
</td>
<td v-if="childIndex==0" :rowspan="3">
{{subItem.UseDinnerTypeStr}}
......@@ -700,6 +710,13 @@
</td>
<td v-if="childIndex==0" :rowspan="3">
{{subItem.ScenicName}}
<template v-if="subItem.ScenicOfferPrice&& subItem.ScenicOfferPrice>0">
<br />
<span style="font-weight:bold;font-size:14px;">报价景点：<font style="color:red;">
{{subItem.ScenicOfferName}}
({{subItem.ScenicOfferPrice}}/人)</font>
</span>
</template>
</td>
<td v-if="childIndex==0" :rowspan="3">
{{subItem.UseAccount}}
......@@ -1906,6 +1923,7 @@
this.msg,
res => {
this.loading = false;
console.log("dmcstatistics_post_GetGroupLeaderUserMoneyPlan", res.data);
if (res.data.resultCode == 1) {
let data = res.data.data
let arrList = function (arr) {
......
src/components/Restaurant/bookDinnerStatisticsDetails.vue
View file @ 3c3734a6
......@@ -101,6 +101,12 @@
{{$t('ground.cantingxuanz')}}
</el-button>
</el-popover>
<template v-if="subItem.DinnerOfferPrice&&subItem.DinnerOfferPrice>0">
<br />
<span style="font-weight:bold;font-size:14px;">报价餐厅:<font style="color:red;">
{{subItem.DinnerOfferName}}({{subItem.DinnerOfferPrice}}/人)
</font></span>
</template>
</td>
<td v-if="childIndex==0" :rowspan="3">
{{subItem.UseDinnerTypeStr}}
......@@ -177,17 +183,17 @@
<el-select class='w135 sel' v-model='subItem.PayStyle' :placeholder="$t('pub.pleaseSel')">
<el-option :label="$t('pub.pleaseSel')" :value='0'></el-option>
<!--v-if="subItem.PayStyleExt==1||LineId==90||LineId==168"-->
<el-option :label='$t("ground.xianfu")' :value='1' >
<el-option :label='$t("ground.xianfu")' :value='1'>
</el-option>
<!--v-if="subItem.PayStyleExt==2||LineId==90||LineId==168"-->
<el-option :label='$t("ground.qiandan")' :value='2' >
<el-option :label='$t("ground.qiandan")' :value='2'>
</el-option>
<!--v-if="subItem.PayStyleExt==3"-->
<el-option :label='$t("ground.shiwudk")' :value='3' ></el-option>
<el-option :label='$t("ground.shiwudk")' :value='3'></el-option>
<!--v-if="subItem.PayStyleExt==4"-->
<el-option :label='$t("ground.yufu")' :value='4' ></el-option>
<el-option :label='$t("ground.yufu")' :value='4'></el-option>
<!--v-if="subItem.PayStyleExt==5"-->
<el-option :label='$t("ground.yufukuandk")' :value='5' >
<el-option :label='$t("ground.yufukuandk")' :value='5'>
</el-option>
<el-option :label='$t("ground.lingduidydf")' :value='10'></el-option>
<el-option :label='$t("ground.gongsihetzf")' :value='6'></el-option>
......@@ -349,6 +355,7 @@
},
res => {
this.loading = false;
console.log("dmcstatistics_get_GetDinnerStaticsDetail", res.data);
if (res.data.resultCode == 1) {
var resultArray = res.data.data.DiningList;
this.IsOperation = res.data.data.IsOperation;
......
src/components/SalesModule/CouponsList.vue
View file @ 3c3734a6
This diff is collapsed.
src/components/TravelContractDetail.vue
View file @ 3c3734a6
......@@ -1061,7 +1061,6 @@
},
//获取数据
getList() {
//this.apiJavaPost("/api/contract/getContractInfo", this.msg, res => {
this.apipost("travelcontract_post_GetContractInfoService", this.msg, res => {
if (res.data.resultCode === 1) {
this.dataList = res.data.data;
......@@ -1135,7 +1134,6 @@
type: 'warning'
}).then(() => {
this.dataList.status = 0;
// this.apiJavaPost("/api/contract/dosaveOrUpdate", this.dataList, res => {
this.apipost("travelcontract_post_UpdateStatusContractService", this.dataList, res => {
if (res.data.resultCode === 1) {
this.Success(res.data.message);
......
src/components/TravelContractNew.vue
View file @ 3c3734a6
......@@ -1499,7 +1499,6 @@
document.documentElement.scrollTop = anchor.offsetTop - 70
},
getList() {
// this.apiJavaPost("/api/contract/getContractInfo", this.msg, res => {
this.apipost("travelcontract_post_GetContractInfoService", this.msg, res => {
if (res.data.resultCode === 1) {
var tempObj = res.data.data;
......@@ -1698,7 +1697,6 @@
}
this.CtObj.travelContent = this.$refs.TcTravel_Table.innerHTML;
this.CtObj.rbGroupId = this.CurrentUserInfo.RB_Group_id
// this.apiJavaPost("/api/contract/dosaveOrUpdate", this.CtObj, res => {
this.apipost("travelcontract_post_SetContractService", this.CtObj, res => {
if (res.data.resultCode === 1) {
this.Success(res.data.message);
......@@ -1730,7 +1728,6 @@
}).then(() => {
this.CtObj.status = 0;
this.CtObj.auditContract = 0;
//this.apiJavaPost("/api/contract/dosaveOrUpdate", this.CtObj, res => {
this.apipost("travelcontract_post_UpdateStatusContractService", this.CtObj, res => {
if (res.data.resultCode === 1) {
this.Success(res.data.message);
......@@ -1759,8 +1756,6 @@
});
},
sendAudit() {
//this.CtObj.auditContract = 1;
//this.apiJavaPost("/api/contract/dosaveOrUpdate", this.CtObj, res => {
this.apipost("travelcontract_get_UpdateAuditContractService", {
"AuditContract": 1,
"Id": this.CtObj.Id
......@@ -1881,7 +1876,6 @@
let msg = {
orderId: this.msg.orderID
}
// this.apiJavaPost("/api/contract/getContractGuestByOrderId", msg, res => {
this.apipost("travelcontract_post_GetContractGuestByOrderId", msg, res => {
if (res.data.resultCode === 1) {
this.backGuest = res.data.data;
......
src/components/TravelManager/TravelList/TravelControlListSale.vue
View file @ 3c3734a6
......@@ -1776,10 +1776,7 @@
this.queryMsg.StartGroupDate = nowDate;
}
if (
this.queryCommonData.IsParentCompany != 1 &&
userInfo.RB_Branch_id != 49
) {
if ( this.queryCommonData.IsParentCompany != 1 && userInfo.RB_Branch_id != 49 && userInfo.RB_Branch_id!=1224) {
this.queryMsg.OutBranchIds.push(userInfo.RB_Branch_id);
}
//默认查询全部团队状态
......
src/components/TravelManager/TravelList/Usersuggest.vue
View file @ 3c3734a6
<template>
<div id="Usersuggest">
<div style="margin:0 auto;width:1200px">
<div style="font-size:14px;color:#666666;margin:10px 0">
<span @click="goUrl('FeedbackChart')" style="cursor:pointer">旅客反馈数据分析 > </span>
<span style="color:#3751FE">用户建议</span>
</div>
<div class="people">
<p>
<span>用户建议</span>
<!-- <span style="float:right;font-size:12px;color:#333333">查看全部</span> -->
</p>
<ul class="ul">
<li v-for="(item,index) in SuggestList" :key="index">
<img style="width:40px;height:40px" src="../../../assets/img/fk/8.png" alt="">
<div class="Item">
<p style="color:#3751FE">({{item.TCNUM}}){{item.OrderID}}</p>
<p>{{item.TextContent}}</p>
</div>
</li>
<div v-if="SuggestList.length==0" style="text-align:center;padding:40px 0;">
<i style="font-size:80px" class="iconfont icon-wushuju"></i>
</div>
</ul>
<div>
<el-pagination
background
@current-change="handleCurrentChange"
:current-page.sync="currentPage"
layout="total,prev, pager, next, jumper"
:page-size="msg.pageSize"
:total="total"
></el-pagination>
</div>
<div style="margin:0 auto;width:1200px">
<div style="font-size:14px;color:#666666;margin:10px 0">
<span @click="goUrl('FeedbackChart')" style="cursor:pointer">旅客反馈数据分析 > </span>
<span style="color:#3751FE">用户建议</span>
</div>
<div class="people">
<p>
<span>用户建议</span>
</p>
<ul class="ul">
<li v-for="(item,index) in SuggestList" :key="index">
<img style="width:40px;height:40px" src="../../../assets/img/fk/8.png" alt="">
<div class="Item">
<p style="color:#3751FE">({{item.TCNUM}}){{item.OrderID}}</p>
<p>{{item.TextContent}}</p>
</div>
</li>
<div v-if="SuggestList.length==0" style="text-align:center;padding:40px 0;">
<i style="font-size:80px" class="iconfont icon-wushuju"></i>
</div>
</ul>
<div>
<el-pagination background @current-change="handleCurrentChange" :current-page.sync="currentPage"
layout="total,prev, pager, next, jumper" :page-size="msg.pageSize" :total="total"></el-pagination>
</div>
</div>
</div>
</div>
</template>
<script>
export default {
export default {
name: 'Feedbackchart',
data (){
return{
msg:{},
currentPage:1,
total:0,
SuggestList:[],
}
data() {
return {
msg: {},
currentPage: 1,
total: 0,
SuggestList: [],
}
},
created(){
if(this.$route.query.msg){
this.msg=JSON.parse(this.$route.query.msg);
}
this.getList();
created() {
if (this.$route.query.msg) {
this.msg = JSON.parse(this.$route.query.msg);
}
this.getList();
},
mounted(){
mounted() {
},
methods:{
getList(){
this.apiJavaPost("/api/erp/survey/getSuggest", this.msg, res => {
if (res.data.resultCode === 1) {
this.SuggestList=res.data.data.pageData;
this.total=res.data.data.count;
} else {
this.Error(res.data.message)
}
}, null);
},
goUrl(path){
this.$router.push({ name:path,query:{"msg":JSON.stringify(this.msg),blank: 'y'} })
},
handleCurrentChange(val) {
this.msg.pageIndex = val;
this.getList();
},
}
}
methods: {
getList() {
this.apiJavaPost("/api/erp/survey/getSuggest", this.msg, res => {
if (res.data.resultCode === 1) {
this.SuggestList = res.data.data.pageData;
this.total = res.data.data.count;
} else {
this.Error(res.data.message)
}
}, null);
},
goUrl(path) {
this.$router.push({
name: path,
query: {
"msg": JSON.stringify(this.msg),
blank: 'y'
}
})
},
handleCurrentChange(val) {
this.msg.pageIndex = val;
this.getList();
},
}
}
</script>
<style>
#Usersuggest .el-pagination{
border-top:none!important;
}
#Usersuggest .people .ul li{
padding:15px 0;
#Usersuggest .el-pagination {
border-top: none !important;
}
#Usersuggest .people .ul li {
padding: 15px 0;
border-bottom: 1px dashed #DCDCDC;
display: flex;
align-items: center;
}
#Usersuggest .people .Item{
}
#Usersuggest .people .Item {
font-size: 12px;
display: inline-block;
margin-left:10px;
width:90%;
}
#Usersuggest .people{
background:rgba(255,255,255,1);
border:2px solid rgba(235, 237, 244, 1);
border-radius:8px;
margin-left: 10px;
width: 90%;
}
#Usersuggest .people {
background: rgba(255, 255, 255, 1);
border: 2px solid rgba(235, 237, 244, 1);
border-radius: 8px;
margin-top: 20px;
padding: 30px;
box-sizing: border-box;
}
}
</style>
src/components/TravelManager/TravelNewQuotation/CostNewPriceMun.vue
View file @ 3c3734a6
......@@ -218,7 +218,7 @@
LineTeamList: [], //系列下拉列表
companyList: [], //出团公司
teamList: [],
teamList: [],//团队类型
payTypeList: [{
value: 1,
label: '现金'
......@@ -338,7 +338,6 @@
this.orderList.forEach(rootItem => {
if (rootItem && rootItem.dayCostPrice && rootItem.dayCostPrice.length > 0) {
rootItem.dayCostPrice.forEach(dItem => {
console.log(dItem.CurrencyId, "dItem.CurrencyId ");
if (dItem.CurrencyId == 0 && rootItem.CostCurrencyList && rootItem.CostCurrencyList.length >
0) {
dItem.CurrencyId = rootItem.CostCurrencyList[0].CurrencyId;
......
src/components/TravelManager/TravelNewQuotation/QuotationNewPrice.vue
View file @ 3c3734a6
......@@ -231,7 +231,6 @@
msg,
res => {
this.loading = false;
console.log("travel_get_GetMyTravelInfo_V3",res.data);
if (res.data.resultCode == 1) {
var tempData = res.data.data;
if (tempData.ID && tempData.ID > 0) {
......
src/components/activity/CommodityActive.vue
View file @ 3c3734a6
This diff is collapsed.
src/components/activity/CommodityType.vue
View file @ 3c3734a6
This diff is collapsed.
src/components/activity/CouponList.vue
View file @ 3c3734a6
......@@ -570,10 +570,7 @@
return this.$message.error(this.$t('rule.yxjzrbxdyksshijian'))
}
this.isleaveBtn = false;
this.apiJavaPost(
"/api/sell/coupon/setCoupon",
this.addMsg,
res => {
this.apiJavaPost("/api/sell/coupon/setCoupon", this.addMsg, res => {
if (res.data.resultCode == 1) {
this.$message.success(res.data.message);
this.outerVisible = false;
......
src/components/activity/IntegralMall.vue
View file @ 3c3734a6
This diff is collapsed.
src/components/activity/TravelInfoList.vue
View file @ 3c3734a6
This diff is collapsed.
src/components/administrative/Survey.vue
View file @ 3c3734a6
This diff is collapsed.
src/components/busManagement/BusInfo.vue
View file @ 3c3734a6
This diff is collapsed.
src/components/scenicSpot/admissionStatisticsDetails.vue
View file @ 3c3734a6
......@@ -52,6 +52,7 @@
<span class="spanlink" @click="goUrl('ticketManagement',subItem,'门票管理')">
{{subItem.ScenicName}}
</span>
</td>
</tr>
<tr>
......@@ -71,6 +72,13 @@
</td>
</tr>
</table>
<template v-if="subItem.ScenicOfferPrice&& subItem.ScenicOfferPrice>0">
<br />
<span style="font-weight:bold;font-size:14px;">报价景点：<font style="color:red;">
{{subItem.ScenicOfferName}}
({{subItem.ScenicOfferPrice}}/人)</font>
</span>
</template>
</td>
<td v-if="childIndex==0" :rowspan="3">
{{subItem.UseAccount}}
......@@ -126,10 +134,10 @@
币种选择：
</td>
<td style="text-align:left;">
<el-select class='w135 sel' filterable v-model='subItem.CurrencyId'>
<el-option v-for='item in currencyList' :label='item.Name' :value='item.ID' :key='item.ID'>
</el-option>
</el-select>
<el-select class='w135 sel' filterable v-model='subItem.CurrencyId'>
<el-option v-for='item in currencyList' :label='item.Name' :value='item.ID' :key='item.ID'>
</el-option>
</el-select>
</td>
</tr>
<tr>
......
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