Skip to content

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

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

parents c385cc6b 07109a04
Expand all Show 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>
......@@ -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,7 +1269,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;
......@@ -1322,15 +1322,14 @@
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
this.dataList.status=0;
//this.apiJavaPost("/api/contract/dosaveOrUpdate",this.dataList,res => {
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);
}, null);
}).catch(() => {
this.$message.info('取消删除');
});
......
src/components/Contract/TravelContract.vue
View file @ 3c3734a6
This diff is collapsed.
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">
......@@ -50,16 +49,16 @@
<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 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 {
import moment from "moment";
export default {
name: "Feedback",
data() {
return {
......@@ -67,9 +66,9 @@ export default {
msg: {
pageIndex: 1,
pageSize: 10,
Name:'',
Moblie:'',
IsSelectCommpany:1
Name: '',
Moblie: '',
IsSelectCommpany: 1
},
dataList: [],
loading: false
......@@ -85,7 +84,7 @@ export default {
name: "commissionSubsidiary",
query: {
UserId: item.UserId,
blank:'y'
blank: 'y'
}
})
},
......@@ -95,33 +94,27 @@ export default {
},
getList() {
this.loading = true;
this.apipost('Financial_get_GetMallUserCommissionPageList',this.msg,res=>{
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{
} 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);
}, 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">
......@@ -50,16 +49,16 @@
<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 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 {
import moment from "moment";
export default {
name: "Feedback",
data() {
return {
......@@ -67,8 +66,8 @@ export default {
msg: {
pageIndex: 1,
pageSize: 10,
Name:'',
Moblie:'',
Name: '',
Moblie: '',
},
dataList: [],
loading: false
......@@ -84,7 +83,7 @@ export default {
name: "commissionSubsidiary",
query: {
UserId: item.UserId,
blank:'y'
blank: 'y'
}
})
},
......@@ -94,33 +93,27 @@ export default {
},
getList() {
this.loading = true;
this.apipost('Financial_get_GetMallUserCommissionPageList',this.msg,res=>{
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{
} 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);
}, 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">
......@@ -6,11 +5,9 @@
<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">
......@@ -25,90 +22,89 @@
</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>
<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);
created() {
if (this.$route.query.msg) {
this.msg = JSON.parse(this.$route.query.msg);
}
this.getList();
},
mounted(){
mounted() {
},
methods:{
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;
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'} })
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/CostNewPriceAudit.vue
View file @ 3c3734a6
......@@ -167,16 +167,16 @@
<td rowspan="2" class="CP_ComTitle2 CostcomCenter" style="width:80px;">币种</td>
<td rowspan="2" class="CP_ComTitle2 CostcomCenter" style="width:250px;">行程</td>
<td colspan="2" class="CP_ComTitle2 CostcomCenter">酒店</td>
<td colspan="2" class="CP_ComTitle2 CostcomCenter">车</td>
<td colspan="2" class="CP_ComTitle2 CostcomCenter">门票</td>
<td colspan="2" class="CP_ComTitle2 CostcomCenter">车/天</td>
<td colspan="2" class="CP_ComTitle2 CostcomCenter">餐</td>
<td colspan="2" class="CP_ComTitle2 CostcomCenter">门票</td>
<td colspan="2" class="CP_ComTitle2 CostcomCenter">其它费用<br />(保险、司导杂费等)</td>
</tr>
<tr>
<td class="CP_ComTitle2 CostcomCenter" style="width:150px">酒店名称</td>
<td class="CP_ComTitle2 CostcomCenter" style="width:50px">价格/间</td>
<td class="CP_ComTitle2 CostcomCenter" style="width:50px">总车资</td>
<td class="CP_ComTitle2 CostcomCenter" style="width:50px">过路费</td>
<td class="CP_ComTitle2 CostcomCenter" style="width:50px">价格/人</td>
<td class="CP_ComTitle2 CostcomCenter" style="width:50px">车资/天</td>
<td class="CP_ComTitle2 CostcomCenter" style="width:50px">过路费<br />停车费/天</td>
<td class="CP_ComTitle2 CostcomCenter" style="width:110px">餐厅名称</td>
<td class="CP_ComTitle2 CostcomCenter" style="width:90px">价格/餐</td>
<td class="CP_ComTitle2 CostcomCenter" style="width:100px">景点名称</td>
......@@ -304,7 +304,7 @@
<tr>
<td colspan="2">
<el-form-item label="机票">
{{OtherPrice.AirTicketShareMoney}}
{{OtherPrice.AirTicketMoeny}}
</el-form-item>
</td>
<td>
......@@ -322,18 +322,24 @@
{{teamPrice.NightPrice}}
</el-form-item>
</td>
<td colspan="2">
<td>
<el-form-item label="签证">
{{teamPrice.VisaPrice}}
</el-form-item>
</td>
<td colspan="2">
<td>
<el-form-item label="保险">
{{OtherPrice.SafeMoney}}
</el-form-item>
</td>
<td colspan="2">
小计(机票+税金+联运+过夜+签证+保险):{{getCostTotalMoney()}}
<el-form-item label="领队导游分摊">
{{OtherPrice.AirTicketShareMoney}}
</el-form-item>
</td>
<td colspan="2">
小计(机票+税金+联运+过夜+签证+保险+领队导游分摊):
<br />{{getCostTotalMoney()}}
</td>
</tr>
<tr>
......@@ -401,7 +407,7 @@
<td colspan="2">
地接成本<br />(人民币)
</td>
<td colspan="4">
<td colspan="2">
成本<br />[地接成本(人民币)+机票+税金+联运+过夜+签证+保险]
</td>
<td colspan="2">
......@@ -414,6 +420,10 @@
<br />(日币)
</template>
</td>
<td colspan="2">
备注
</td>
</tr>
<!--已填写人数-->
<template v-if="CostNumberList&&CostNumberList.length>0">
......@@ -434,9 +444,17 @@
{{getLocalJpyTotalMoney(subItem.PeopleNumber)}}
</td>
<td colspan="2">
<template v-if="postConfig.LineId==14">
{{getLocalTotalMoney(subItem.PeopleNumber)}}
</template>
<template v-else-if="postConfig.LineId==168">
{{getLocalTotalMoney(subItem.PeopleNumber)}}
</template>
<template v-else>
{{subItem.SubtotalMoney}}
</template>
</td>
<td colspan="4">
<td colspan="2">
{{subItem.TotalMoney}}
</td>
<td colspan="2">
......@@ -447,10 +465,12 @@
{{subItem.JPYSalePrice}}
</template>
</td>
<td colspan="2">
{{subItem.CostRemark}}
</td>
</tr>
</template>
</template>
<tr>
<td colspan="13"></td>
</tr>
......@@ -588,13 +608,14 @@
},
//其它成本价格
getCostTotalMoney() {
//机票+税金+联运+过夜+保险
let totalMoney = this.getConvertMoney(this.OtherPrice.AirTicketShareMoney) +
//机票+税金+联运+过夜+保险+领队导游分摊
let totalMoney = this.getConvertMoney(this.OtherPrice.AirTicketMoeny) +
this.getConvertMoney(this.teamPrice.TaxPrice) +
this.getConvertMoney(this.teamPrice.UnionPrice) +
this.getConvertMoney(this.teamPrice.NightPrice) +
this.getConvertMoney(this.teamPrice.VisaPrice) +
this.getConvertMoney(this.teamPrice.SafeMoney)
this.getConvertMoney(this.teamPrice.SafeMoney) +
this.getConvertMoney(this.OtherPrice.AirTicketShareMoney)
return totalMoney;
},
//获取汇率
......
src/components/TravelManager/TravelNewQuotation/CostNewPriceCC.vue
View file @ 3c3734a6
......@@ -74,16 +74,16 @@
<td rowspan="2" class="CP_ComTitle2 CostcomCenter" style="width:80px;">币种</td>
<td rowspan="2" class="CP_ComTitle2 CostcomCenter" style="width:250px;">行程</td>
<td colspan="2" class="CP_ComTitle2 CostcomCenter">酒店</td>
<td colspan="2" class="CP_ComTitle2 CostcomCenter">车</td>
<td colspan="2" class="CP_ComTitle2 CostcomCenter">门票</td>
<td colspan="2" class="CP_ComTitle2 CostcomCenter">车/天</td>
<td colspan="2" class="CP_ComTitle2 CostcomCenter">餐</td>
<td colspan="2" class="CP_ComTitle2 CostcomCenter">门票</td>
<td colspan="2" class="CP_ComTitle2 CostcomCenter">其它费用<br />(保险、司导杂费等)</td>
</tr>
<tr>
<td class="CP_ComTitle2 CostcomCenter" style="width:150px">酒店名称</td>
<td class="CP_ComTitle2 CostcomCenter" style="width:50px">价格/间</td>
<td class="CP_ComTitle2 CostcomCenter" style="width:50px">总车资</td>
<td class="CP_ComTitle2 CostcomCenter" style="width:50px">过路费</td>
<td class="CP_ComTitle2 CostcomCenter" style="width:50px">车资/天</td>
<td class="CP_ComTitle2 CostcomCenter" style="width:50px">过路费<br />停车费/天</td>
<td class="CP_ComTitle2 CostcomCenter" style="width:110px">餐厅名称</td>
<td class="CP_ComTitle2 CostcomCenter" style="width:90px">价格/餐</td>
<td class="CP_ComTitle2 CostcomCenter" style="width:100px">景点名称</td>
......@@ -229,18 +229,23 @@
{{teamPrice.NightPrice}}
</el-form-item>
</td>
<td colspan="2">
<td>
<el-form-item label="签证">
{{teamPrice.VisaPrice}}
</el-form-item>
</td>
<td colspan="2">
<td>
<el-form-item label="保险">
{{OtherPrice.SafeMoney}}
</el-form-item>
</td>
<td colspan="2">
小计(机票+税金+联运+过夜+签证+保险):{{getCostTotalMoney()}}
<el-form-item label="领队导游分摊">
{{OtherPrice.AirTicketShareMoney}}
</el-form-item>
</td>
<td colspan="2">
小计(机票+税金+联运+过夜+签证+保险+领队导游分摊):{{getCostTotalMoney()}}
</td>
</tr>
<tr>
......@@ -308,7 +313,7 @@
<td colspan="2">
地接成本<br />(人民币)
</td>
<td colspan="4">
<td colspan="2">
成本<br />[地接成本(人民币)+机票+税金+联运+过夜+签证+保险]
</td>
<td colspan="2">
......@@ -321,6 +326,9 @@
<br />(日币)
</template>
</td>
<td colspan="2">
备注
</td>
</tr>
<!--已填写人数-->
<template v-if="CostNumberList&&CostNumberList.length>0">
......@@ -341,9 +349,17 @@
{{getLocalJpyTotalMoney(subItem.PeopleNumber)}}
</td>
<td colspan="2">
<template v-if="postConfig.LineId==14">
{{getLocalTotalMoney(subItem.PeopleNumber)}}
</template>
<template v-else-if="postConfig.LineId==168">
{{getLocalTotalMoney(subItem.PeopleNumber)}}
</template>
<template v-else>
{{subItem.SubtotalMoney}}
</template>
</td>
<td colspan="4">
<td colspan="2">
{{subItem.TotalMoney}}
</td>
<td colspan="2">
......@@ -354,6 +370,9 @@
{{subItem.JPYSalePrice}}
</template>
</td>
<td colspan="2">
{{subItem.CostRemark}}
</td>
</tr>
</template>
</template>
......@@ -447,13 +466,14 @@
},
//其它成本价格
getCostTotalMoney() {
//机票+税金+联运+过夜+保险
let totalMoney = this.getConvertMoney(this.OtherPrice.AirTicketShareMoney) +
//机票+税金+联运+过夜+保险+领队导游分摊
let totalMoney = this.getConvertMoney(this.OtherPrice.AirTicketMoeny) +
this.getConvertMoney(this.teamPrice.TaxPrice) +
this.getConvertMoney(this.teamPrice.UnionPrice) +
this.getConvertMoney(this.teamPrice.NightPrice) +
this.getConvertMoney(this.teamPrice.VisaPrice) +
this.getConvertMoney(this.teamPrice.SafeMoney)
this.getConvertMoney(this.teamPrice.SafeMoney) +
this.getConvertMoney(this.OtherPrice.AirTicketShareMoney)
return totalMoney;
},
//获取汇率
......
src/components/TravelManager/TravelNewQuotation/CostNewPriceForm.vue
View file @ 3c3734a6
......@@ -136,16 +136,16 @@
<td rowspan="2" style="width:120px" class="CP_ComTitle2 CostcomCenter">币种</td>
<td rowspan="2" style="width:180px" class="CP_ComTitle2 CostcomCenter">行程</td>
<td colspan="2" style="width:220px;" class="CP_ComTitle2 CostcomCenter">酒店</td>
<td colspan="2" style="width:120px" class="CP_ComTitle2 CostcomCenter">车</td>
<td colspan="2" style="width:120px" class="CP_ComTitle2 CostcomCenter">车/天</td>
<td colspan="2" style="width:200px" class="CP_ComTitle2 CostcomCenter">餐</td>
<td colspan="2" style="width:150px" class="CP_ComTitle2 CostcomCenter">门票</td>
<td colspan="2" style="width:100px" class="CP_ComTitle2 CostcomCenter">其它费用<br />(保险、司导杂费等)</td>
</tr>
<tr>
<td style="width:150px" class="CP_ComTitle2 CostcomCenter">酒店名称</td>
<td style="width:50px" class="CP_ComTitle2 CostcomCenter">价格/间</td>
<td style="width:50px" class="CP_ComTitle2 CostcomCenter">总车资</td>
<td style="width:50px" class="CP_ComTitle2 CostcomCenter">过路费<br />停车费</td>
<td style="width:50px" class="CP_ComTitle2 CostcomCenter">价格/人</td>
<td style="width:50px" class="CP_ComTitle2 CostcomCenter">车资/天</td>
<td style="width:50px" class="CP_ComTitle2 CostcomCenter">过路费<br />停车费/天</td>
<td style="width:110px" class="CP_ComTitle2 CostcomCenter">餐厅名称</td>
<td style="width:90px" class="CP_ComTitle2 CostcomCenter">价格/餐</td>
<td style="width:100px" class="CP_ComTitle2 CostcomCenter">景点名称</td>
......@@ -299,8 +299,8 @@
<tr>
<td colspan="2">
<el-form-item label="机票">
<el-input type="text" v-model='OtherPrice.AirTicketShareMoney' class="w100"
@keyup.native="checkPrice(OtherPrice,'AirTicketShareMoney'),getchange()"></el-input>
<el-input type="text" v-model='OtherPrice.AirTicketMoeny' class="w100"
@keyup.native="checkPrice(OtherPrice,'AirTicketMoeny'),getchange()"></el-input>
</el-form-item>
</td>
<td>
......@@ -321,20 +321,27 @@
@keyup.native="checkPrice(teamPrice,'NightPrice'),getchange()"></el-input>
</el-form-item>
</td>
<td colspan="2">
<td>
<el-form-item label="签证">
<el-input type="text" v-model='teamPrice.VisaPrice' class="w100"
@keyup.native="checkPrice(teamPrice,'VisaPrice'),getchange()"></el-input>
</el-form-item>
</td>
<td colspan="2">
<td>
<el-form-item label="保险">
<el-input type='text' class="w70" v-model="OtherPrice.SafeMoney"
@keyup.native="checkPrice(OtherPrice,'SafeMoney'),getchange()"></el-input>
</el-form-item>
</td>
<td colspan="2">
小计(机票+税金+联运+过夜+签证+保险):{{getCostTotalMoney()}}
<el-form-item label="领队导游分摊">
<el-input type='text' class="w120" v-model="OtherPrice.AirTicketShareMoney"
@keyup.native="checkPrice(OtherPrice,'AirTicketShareMoney'),getchange()"></el-input>
</el-form-item>
</td>
<td colspan="2">
小计(机票+税金+联运+过夜+签证+保险+领队导游分摊):
<br /> {{getCostTotalMoney()}}
</td>
</tr>
<tr>
......@@ -416,8 +423,8 @@
<td>
地接成本<br />(人民币)
</td>
<td colspan="4">
成本<br />[地接成本(人民币)+机票+税金+联运+过夜+签证+保险]
<td colspan="2">
成本<br />[地接成本(人民币)+机票+税金+联运+过夜+签证+保险+领队导游分摊]
</td>
<td colspan="2">
销售价格
......@@ -429,6 +436,9 @@
<br />(日币)
</template>
</td>
<td colspan="2">
备注
</td>
</tr>
<!--已填写人数-->
<template v-if="CostNumberList&&CostNumberList.length>0">
......@@ -441,6 +451,7 @@
{{subItem.PeopleNumber}}
</td>
<td colspan="2">
{{getDayXiaoJi(1,1)}}(酒)+
{{ (getDayXiaoJi(2,1)/subItem.PeopleNumber).toFixed(2)}}(车=总车资/人数)+{{getDayXiaoJi(4,1)}}(餐)+{{getDayXiaoJi(3,1)}}(门票)
+{{(getDayXiaoJi(9,1)/subItem.PeopleNumber).toFixed(2)}}(杂支=总杂支/人数)
......@@ -449,9 +460,19 @@
{{getLocalJpyTotalMoney(subItem.PeopleNumber)}}
</td>
<td>
<template v-if="postConfig.LineId==14">
{{getLocalTotalMoney(subItem.PeopleNumber)}}
</template>
<template v-else-if="postConfig.LineId==168">
{{getLocalTotalMoney(subItem.PeopleNumber)}}
</template>
<template v-else>
<el-input placeholder="" v-model="subItem.SubtotalMoney"
@keyup.native="checkPrice(subItem,'SubtotalMoney')" class="w70">
</el-input>
</template>
</td>
<td colspan="4">
<td colspan="2">
{{subItem.TotalMoney}}
</td>
<td colspan="2">
......@@ -462,6 +483,9 @@
<el-input v-if="postConfig.LineId==14" type='text' class="w70" v-model="subItem.JPYSalePrice"
@keyup.native="checkPrice(subItem,'JPYSalePrice')" maxlength="8"></el-input>
</td>
<td colspan="2">
<el-input type="textarea" v-model="subItem.CostRemark"></el-input>
</td>
</tr>
</template>
</template>
......@@ -667,13 +691,14 @@
},
//其它成本价格
getCostTotalMoney() {
//机票+税金+联运+过夜+保险
let totalMoney = this.getConvertMoney(this.OtherPrice.AirTicketShareMoney) +
//机票+税金+联运+过夜+保险+领队导游分摊
let totalMoney = this.getConvertMoney(this.OtherPrice.AirTicketMoeny) +
this.getConvertMoney(this.teamPrice.TaxPrice) +
this.getConvertMoney(this.teamPrice.UnionPrice) +
this.getConvertMoney(this.teamPrice.NightPrice) +
this.getConvertMoney(this.teamPrice.VisaPrice) +
this.getConvertMoney(this.teamPrice.SafeMoney)
this.getConvertMoney(this.teamPrice.SafeMoney) +
this.getConvertMoney(this.OtherPrice.AirTicketShareMoney)
return totalMoney;
},
//获取币种对应 的人数报价
......
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
<style>
.height_auto.el-select .el-input {
.height_auto.el-select .el-input {
height: auto;
}
.CommodityType ._addUpload_box {
}
.CommodityType ._addUpload_box {
display: block;
margin: 10px 0 0;
}
.CommodityType ._addUpload_box img {
}
.CommodityType ._addUpload_box img {
height: 15px;
display: block;
margin-right: 25px;
}
.CommodityType ._addUpload_box > div.el-upload {
}
.CommodityType ._addUpload_box>div.el-upload {
float: left;
width: 138px;
height: 92px;
......@@ -22,8 +25,9 @@
padding: 5px;
margin-right: 10px;
position: relative;
}
.CommodityType ._addUpload_box .icon-guanbi1 {
}
.CommodityType ._addUpload_box .icon-guanbi1 {
font-size: 12px;
color: white;
display: inline-block;
......@@ -37,22 +41,26 @@
width: 15px;
text-align: center;
line-height: 15px;
}
.CommodityType ._addUpload_box > div:hover {
}
.CommodityType ._addUpload_box>div:hover {
background-color: #f5f5f5;
}
.CommodityType .el-upload-dragger {
}
.CommodityType .el-upload-dragger {
font-size: 28px;
color: #8c939d;
width: 126px;
height: 80px;
line-height: 41px;
text-align: center;
}
.CommodityType .bg_color_delete{
}
.CommodityType .bg_color_delete {
background-color: #ee4454;
border-color: #ee4454;
}
}
</style>
<template>
......@@ -61,12 +69,8 @@
<ul class>
<li>
<input type="button" @click="getList" class="hollowFixedBtn" :value="$t('pub.searchBtn')">
<input
type="button"
@click="outerVisible = true,dialogTitle='新增商品活动', addMsg.reqType = 'add',resetInfo()"
class="normalBtn"
:value="$t('pub.addBtn')"
>
<input type="button" @click="outerVisible = true,dialogTitle='新增商品活动', addMsg.reqType = 'add',resetInfo()"
class="normalBtn" :value="$t('pub.addBtn')">
</li>
</ul>
</div>
......@@ -90,18 +94,9 @@
<td>{{item.descrip}}</td>
<td>{{item.createTime.replace('T', ' ')}}</td>
<td>
<el-tooltip
class="item"
effect="dark"
:content="$t('active.ld_editInfo')"
placement="top"
>
<el-button
type="primary"
icon="el-icon-edit"
circle
@click="outerVisible=true,dialogTitle='修改商品活动',updateData(item)"
></el-button>
<el-tooltip class="item" effect="dark" :content="$t('active.ld_editInfo')" placement="top">
<el-button type="primary" icon="el-icon-edit" circle
@click="outerVisible=true,dialogTitle='修改商品活动',updateData(item)"></el-button>
</el-tooltip>
<!-- <el-tooltip class="item" effect="dark" content="删除" placement="top">
<el-button type="primary" class="bg_color_delete" icon="el-icon-delete" circle @click="Delete(item)"></el-button>
......@@ -113,16 +108,11 @@
<i class="iconfont icon-kong"></i>
<p>{{$t("active.ld_noData")}}</p>
</div>
<el-dialog
custom-class="w400"
:title="dialogTitle"
:visible.sync="outerVisible"
center
:before-close="closeChangeMachie"
>
<el-dialog custom-class="w400" :title="dialogTitle" :visible.sync="outerVisible" center
:before-close="closeChangeMachie">
<el-form :model="addMsg" :rules="rules" ref="addMsg" label-width="130px">
<el-form-item :label="$t('MarketingActi.commActivityName')" prop="name">
<el-input v-model="addMsg.name" class="w217"/>
<el-input v-model="addMsg.name" class="w217" />
</el-form-item>
<el-form-item :label="$t('MarketingActi.ActivityPro')" prop="descrip">
<el-input type="textarea" v-model="addMsg.descrip" class="w217"></el-input>
......@@ -132,25 +122,14 @@
<div class="_pic_upload">
<template v-if="addMsg.images!==''">
<div>
<div
style="width:100%;height:100%;overflow: hidden;display: flex;align-items: center;"
>
<div style="width:100%;height:100%;overflow: hidden;display: flex;align-items: center;">
<img :src="addMsg.images">
<span
style="font-size:12px; color:#666666;cursor: pointer;line-height: 20px;"
@click="addMsg.images=''"
>{{$t('system.up_againUp')}}</span>
<span style="font-size:12px; color:#666666;cursor: pointer;line-height: 20px;"
@click="addMsg.images=''">{{$t('system.up_againUp')}}</span>
</div>
</div>
</template>
<el-upload
v-else
drag
:http-request="uploadFileBtn"
:multiple="false"
:show-file-list="false"
action
>
<el-upload v-else drag :http-request="uploadFileBtn" :multiple="false" :show-file-list="false" action>
<i class="el-icon-plus avatar-uploader-icon"></i>
<div class="el-upload__text">{{$t("active.ld_djscwj")}}</div>
</el-upload>
......@@ -159,17 +138,15 @@
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<button
class="hollowFixedBtn"
@click="outerVisible = false, resetForm('addMsg')"
>{{$t('pub.cancelBtn')}}</button> &nbsp;
<button class="hollowFixedBtn"
@click="outerVisible = false, resetForm('addMsg')">{{$t('pub.cancelBtn')}}</button> &nbsp;
<button class="normalBtn" @click="submitForm('addMsg')">{{$t('pub.saveBtn')}}</button>
</div>
</el-dialog>
</div>
</template>
<script>
export default {
export default {
data() {
return {
//请求
......@@ -184,12 +161,16 @@ export default {
id: 0
},
rules: {
name: [
{ required: true, message: "请输入名称", trigger: "blur" }
],
descrip: [
{ required: true, message: "请输入描述", trigger: "blur" }
]
name: [{
required: true,
message: "请输入名称",
trigger: "blur"
}],
descrip: [{
required: true,
message: "请输入描述",
trigger: "blur"
}]
},
loading: false,
outerVisible: false,
......@@ -207,15 +188,16 @@ export default {
methods: {
// 删除
Delete(item) {
this.$confirm("是否删除"+ item.name+"? 删除后不可恢复", "提示", {
this.$confirm("是否删除" + item.name + "? 删除后不可恢复", "提示", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning"
})
.then(() => {
this.apiJavaPost(
"/api/IntegralManager/goodsTypeManager",
{ reqType: 'delete', id: item.id },
this.apiJavaPost("/api/IntegralManager/goodsTypeManager", {
reqType: 'delete',
id: item.id
},
res => {
if (res.data.resultCode == 1) {
this.Success(res.data.message);
......@@ -237,7 +219,10 @@ export default {
return;
}
// 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
.substring(file.file.name.lastIndexOf(".") + 1, file.file.name.length)
.toUpperCase();
......@@ -256,9 +241,9 @@ export default {
this.$message.info(this.$t("tips.shangchuanzhong"));
this.UploadSelfFileT(path, newArr, x => {
let fileSize =
file.file.size < 1024
? file.file.size
: (file.file.size / 1024).toFixed(0);
file.file.size < 1024 ?
file.file.size :
(file.file.size / 1024).toFixed(0);
this.addMsg.images = this.domainManager().ViittoFileUrl + x.data.FilePath;
this.$message.success(this.$t("tips.scchenggong"));
this.$forceUpdate();
......@@ -267,10 +252,7 @@ export default {
//获取数据
getList() {
this.loading = true;
this.apiJavaPost(
"/api/IntegralManager/getGoodsSeries",
{},
res => {
this.apiJavaPost("/api/IntegralManager/getGoodsSeries", {}, res => {
this.loading = false;
if (res.data.resultCode === 1) {
this.dataList = res.data.data;
......@@ -295,10 +277,7 @@ export default {
//提交添加
addAward() {
if (this.addMsg.images === "") return this.Error("请上传图片");
this.apiJavaPost(
"/api/IntegralManager/AddGoodsSeries",
this.addMsg,
res => {
this.apiJavaPost("/api/IntegralManager/AddGoodsSeries", this.addMsg, res => {
if (res.data.resultCode === 1) {
this.Success(res.data.message);
this.outerVisible = false;
......@@ -337,5 +316,6 @@ export default {
this.$refs[formName].resetFields();
}
}
};
};
</script>
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.
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