Skip to content

S
SuperMan
Commit c7d19ed4 authored by 黄奎's avatar 黄奎
Browse files
Options

页面修改11

parent bb050fb5
Hide whitespace changes
Inline Side-by-side
Showing with 261 additions and 134 deletions
src/components/TravelManager/TravelList/TravelControlList.vue
View file @ c7d19ed4
......@@ -1544,9 +1544,12 @@
<el-dropdown-item @click.native="CopyTripAndFeature(item, 2)">
{{ $t("objFill.v101.xiugaictriqi") }}
</el-dropdown-item>
<el-dropdown-item @click.native="ckChangePrice(item)">
<el-dropdown-item @click.native="ckChangePrice(item,1)">
价格变更
</el-dropdown-item>
<el-dropdown-item @click.native="ckChangePrice(item,2)">
团队类型变更
</el-dropdown-item>
</el-dropdown-menu>
</el-dropdown>
</div>
......@@ -1621,7 +1624,7 @@
<div class="TC_remarkContent" v-if="item.PriceChangeModel&&item.PriceChangeModel.ID > 0">
<div class="clearfix TCL-redType">
<div class="TCL_remarkTitle" style="width: auto">
<span style="color: black">价格变更： {{ item.PriceChangeModel.ChangeRemark }}
<span style="color: black">价格变更： {{ item.PriceChangeModel.ChangeRemark }}
(<font style="color:red;">
{{$t("Operation.Op_tradePrice")}}：{{item.PriceChangeModel.NewB2BPrice}}&nbsp;
{{$t("Operation.Op_directPrice")}}：{{item.PriceChangeModel.NewB2CPrice}}
......@@ -1650,6 +1653,37 @@
</div>
</div>
</div>
<div class="TC_remarkContent" v-if="item.TeamTypeChangeModel&&item.TeamTypeChangeModel.ID > 0">
<div class="clearfix TCL-redType">
<div class="TCL_remarkTitle" style="width: auto">
<span style="color: black">团队类型变更： {{ item.TeamTypeChangeModel.ChangeRemark }}
(<font style="color:red;">
{{$t('objFill.tuanduilx')}}：{{item.TeamTypeChangeModel.NewTeamTypeName}}
</font>
)</span>
<template v-if="item.TeamTypeChangeModel.ChangePriceStatus == 1">
<span
style="color: blue; font-weight: bold">【{{ item.TeamTypeChangeModel.ChangePriceStatusStr }}】</span>
</template>
<template v-if="item.TeamTypeChangeModel.ChangePriceStatus == 2">
<span
style="color: green; font-weight: bold">【{{ item.TeamTypeChangeModel.ChangePriceStatusStr }}】</span>
</template>
<template v-if="item.TeamTypeChangeModel.ChangePriceStatus == 3">
<span
style="color: red; font-weight: bold">【{{ item.TeamTypeChangeModel.ChangePriceStatusStr }}】</span>
<span style="color: red">{{ $t("objFill.yuanyin") }}:
<template v-if="item.TeamTypeChangeModel.MAContent">
{{item.TeamTypeChangeModel.MAContent}}
</template>
<template v-else>
{{item.TeamTypeChangeModel.AuditContent}}
</template>
</span>
</template>
</div>
</div>
</div>
</li>
</ul>
<div class="noData" v-show="queryMsg.noData">
......@@ -1842,19 +1876,31 @@
<!--价格变更-->
<div class="combottomDiv OPremarkDiv" style="height: 150px" v-show="changePriceMsg.isShowChangePrice">
<div class="combottomTitle">
价格变更申请
{{changePriceMsg.ChangeType==1?"价格":"团队类型"}}变更申请
</div>
<el-form label-width="100px">
<el-col :span="4">
<el-form-item :label="$t('Operation.Op_tradePrice')" prop="Remark">
<el-input v-model="changePriceMsg.NewB2BPrice"></el-input>
</el-form-item>
</el-col>
<el-col :span="4">
<el-form-item :label="$t('Operation.Op_directPrice')" prop="Remark">
<el-input v-model="changePriceMsg.NewB2CPrice"></el-input>
</el-form-item>
</el-col>
<template v-if="changePriceMsg.ChangeType==1">
<el-col :span="4">
<el-form-item :label="$t('Operation.Op_tradePrice')" prop="Remark">
<el-input v-model="changePriceMsg.NewB2BPrice"></el-input>
</el-form-item>
</el-col>
<el-col :span="4">
<el-form-item :label="$t('Operation.Op_directPrice')" prop="Remark">
<el-input v-model="changePriceMsg.NewB2CPrice"></el-input>
</el-form-item>
</el-col>
</template>
<template v-else>
<el-col :span="4">
<el-form-item :label="$t('objFill.tuanduilx')" prop="Remark">
<el-select class="multiple_input" v-model="changePriceMsg.NewB2BPrice">
<el-option v-for='item in teamList' v-if="item.ID!=2" :key="item.ID" :label="item.Name" :value="item.ID">
</el-option>
</el-select>
</el-form-item>
</el-col>
</template>
<el-col :span="4">
<el-form-item label="变更原因" prop="Remark">
<el-input v-model="changePriceMsg.ChangeRemark" maxlength="50"></el-input>
......@@ -2096,6 +2142,7 @@
//价格变更
changePriceMsg: {
isShowChangePrice: false,
ChangeType: 1, //1-价格变更，2-团队类型变更
TCID: 0,
NewB2BPrice: "",
NewB2CPrice: "",
......@@ -2197,6 +2244,7 @@
return startTime.getTime() >= time.getTime();
},
},
teamList: [], //团队类型列表
};
},
//监听器
......@@ -2208,6 +2256,16 @@
},
},
methods: {
//团队类型
getTravelTeamList() {
this.apipost(
"travel_GetTeamTypeEnumList", {},
res => {
if (res.data.resultCode == 1) {
this.teamList = res.data.data;
}
});
},
setLeaderOrGuide(item, type) {
var NameStr = "设置领队";
var path = "RegistrationList";
......@@ -3340,9 +3398,10 @@
);
});
},
ckChangePrice(item) {
ckChangePrice(item, changeType) {
this.changePriceMsg.isShowChangePrice = true;
this.changePriceMsg.TCID = item.TCID;
this.changePriceMsg.ChangeType = changeType;
},
//价格变更
SetChangePrice() {
......@@ -3359,6 +3418,7 @@
that.changePriceMsg.NewB2CPrice = "";
that.changePriceMsg.ChangeRemark = "";
that.changePriceMsg.TCID = 0;
that.changePriceMsg.ChangeType = 1;
that.getControlList();
} else {
that.Error(res.data.message);
......@@ -3850,6 +3910,7 @@
}
this.getControlList();
this.getTeamList();
this.getTravelTeamList();
},
};
......
src/components/TravelManager/TravelList/TravelControlListSale.vue
View file @ c7d19ed4
......@@ -1054,9 +1054,12 @@
</el-dropdown-item>
<el-dropdown-item @click.native='CopyTripAndFeature(item,2)'>{{$t('objFill.v101.xiugaictriqi')}}
</el-dropdown-item>
<el-dropdown-item @click.native="ckChangePrice(item)">
<el-dropdown-item @click.native="ckChangePrice(item,1)">
价格变更
</el-dropdown-item>
<el-dropdown-item @click.native="ckChangePrice(item,2)">
团队类型变更
</el-dropdown-item>
</el-dropdown-menu>
</el-dropdown>
</div>
......@@ -1149,6 +1152,37 @@
</div>
</div>
</div>
<div class="TC_remarkContent" v-if="item.TeamTypeChangeModel&&item.TeamTypeChangeModel.ID > 0">
<div class="clearfix TCL-redType">
<div class="TCL_remarkTitle" style="width: auto">
<span style="color: black">团队类型变更： {{ item.TeamTypeChangeModel.ChangeRemark }}
(<font style="color:red;">
{{$t('objFill.tuanduilx')}}：{{item.TeamTypeChangeModel.NewTeamTypeName}}
</font>
)</span>
<template v-if="item.TeamTypeChangeModel.ChangePriceStatus == 1">
<span
style="color: blue; font-weight: bold">【{{ item.TeamTypeChangeModel.ChangePriceStatusStr }}】</span>
</template>
<template v-if="item.TeamTypeChangeModel.ChangePriceStatus == 2">
<span
style="color: green; font-weight: bold">【{{ item.TeamTypeChangeModel.ChangePriceStatusStr }}】</span>
</template>
<template v-if="item.TeamTypeChangeModel.ChangePriceStatus == 3">
<span
style="color: red; font-weight: bold">【{{ item.TeamTypeChangeModel.ChangePriceStatusStr }}】</span>
<span style="color: red">{{ $t("objFill.yuanyin") }}:
<template v-if="item.TeamTypeChangeModel.MAContent">
{{item.TeamTypeChangeModel.MAContent}}
</template>
<template v-else>
{{item.TeamTypeChangeModel.AuditContent}}
</template>
</span>
</template>
</div>
</div>
</div>
</li>
</ul>
<div class="noData" v-show="queryMsg.noData">{{$t('system.content_noData')}}</div>
......@@ -1279,19 +1313,31 @@
<!--价格变更-->
<div class="combottomDiv OPremarkDiv" style="height: 150px" v-show="changePriceMsg.isShowChangePrice">
<div class="combottomTitle">
价格变更申请
{{changePriceMsg.ChangeType==1?"价格":"团队类型"}}变更申请
</div>
<el-form label-width="100px">
<el-col :span="4">
<el-form-item :label="$t('Operation.Op_tradePrice')" prop="Remark">
<el-input v-model="changePriceMsg.NewB2BPrice"></el-input>
</el-form-item>
</el-col>
<el-col :span="4">
<el-form-item :label="$t('Operation.Op_directPrice')" prop="Remark">
<el-input v-model="changePriceMsg.NewB2CPrice"></el-input>
</el-form-item>
</el-col>
<template v-if="changePriceMsg.ChangeType==1">
<el-col :span="4">
<el-form-item :label="$t('Operation.Op_tradePrice')" prop="Remark">
<el-input v-model="changePriceMsg.NewB2BPrice"></el-input>
</el-form-item>
</el-col>
<el-col :span="4">
<el-form-item :label="$t('Operation.Op_directPrice')" prop="Remark">
<el-input v-model="changePriceMsg.NewB2CPrice"></el-input>
</el-form-item>
</el-col>
</template>
<template v-else>
<el-col :span="4">
<el-form-item :label="$t('objFill.tuanduilx')" prop="Remark">
<el-select class="multiple_input" v-model="changePriceMsg.NewB2BPrice">
<el-option v-for='item in teamList' v-if="item.ID!=2" :key="item.ID" :label="item.Name" :value="item.ID">
</el-option>
</el-select>
</el-form-item>
</el-col>
</template>
<el-col :span="4">
<el-form-item label="变更原因" prop="Remark">
<el-input v-model="changePriceMsg.ChangeRemark" maxlength="50"></el-input>
......@@ -1525,6 +1571,7 @@
//价格变更
changePriceMsg: {
isShowChangePrice: false,
ChangeType: 1, //1-价格变更，2-团队类型变更
TCID: 0,
NewB2BPrice: "",
NewB2CPrice: "",
......@@ -1548,10 +1595,21 @@
let startTime = new Date(this.queryMsg.StartGroupDate);
return startTime.getTime() >= time.getTime();
}
}
},
teamList: [], //团队基础类型
};
},
methods: {
//团队类型
getTravelTeamList() {
this.apipost(
"travel_GetTeamTypeEnumList", {},
res => {
if (res.data.resultCode == 1) {
this.teamList = res.data.data;
}
});
},
setLeaderOrGuide(item, type) {
var NameStr = "设置领队";
var path = "RegistrationList";
......@@ -1781,9 +1839,10 @@
);
});
},
ckChangePrice(item) {
ckChangePrice(item, changeType) {
this.changePriceMsg.isShowChangePrice = true;
this.changePriceMsg.TCID = item.TCID;
this.changePriceMsg.ChangeType = changeType;
},
//价格变更
SetChangePrice() {
......@@ -1800,6 +1859,7 @@
that.changePriceMsg.NewB2CPrice = "";
that.changePriceMsg.ChangeRemark = "";
that.changePriceMsg.TCID = 0;
that.changePriceMsg.ChangeType = 1;
that.getControlList();
} else {
that.Error(res.data.message);
......@@ -2724,6 +2784,7 @@
this.$tripUtils.TeamStatesList.TeamStates.forEach(states => {
this.queryMsg.TCState.push(states.Id);
})
this.getTravelTeamList();
this.getControlList();
}
};
......
src/components/administrative/VoucherInquiry.vue
View file @ c7d19ed4
......@@ -98,12 +98,9 @@
</li>
<li>
<input type="button" @click="getList" class="hollowFixedBtn" :value="$t('pub.searchBtn')">
<input
type="button"
<input type="button"
@click="outerVisible = true,dialogTitle=$t('pub.addBtn'), addMsg.reqType = 'add',resetInfo()"
class="normalBtn"
:value="$t('pub.addBtn')"
>
class="normalBtn" :value="$t('pub.addBtn')">
</li>
</ul>
</div>
......@@ -126,21 +123,12 @@
{{item.Sort}}
</td>
<td>
{{item.IsShow === 1 ? $t('system.table_isShows') : $t('MarketingActi.notShow')}}
{{item.IsShow === 1 ? $t('system.table_isShows') : $t('MarketingActi.notShow')}}
</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=$t('pub.updateMsg'),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=$t('pub.updateMsg'),updateData(item)"></el-button>
</el-tooltip>
<el-tooltip class="item" effect="dark" :content="$t('system.table_delete')" placement="top">
<el-button type="primary" class="bg_color_delete" icon="el-icon-delete" circle @click="Delete(item)">
......@@ -160,7 +148,7 @@
:before-close="closeChangeMachie">
<el-form :model="addMsg" :rules="rules" ref="addMsg" label-width="130px">
<el-form-item :label="$t('objFill.wentiminc')" prop="Title">
<el-input v-model="addMsg.Title" class="w217"/>
<el-input v-model="addMsg.Title" class="w217" />
</el-form-item>
<el-form-item :label="$t('objFill.wentileixing')" prop="SurveyType">
<el-select filterable v-model="addMsg.SurveyType" @change="changeType(addMsg.SurveyType)">
......@@ -173,22 +161,21 @@
</el-form-item>
<el-form-item :label="$t('system.table_rank')" prop="Sort">
<el-input v-model="addMsg.Sort" class="w217"/>
<el-input v-model="addMsg.Sort" class="w217" />
</el-form-item>
<template>
<div v-if="addMsg.SurveyType === '2' || addMsg.SurveyType === '3'">
<template v-for="(item, index) in addMsg.SurveyOptionsList">
<el-form-item :label="`${$t('objFill.xuanxiang')}${index+1}`" >
<el-form-item :label="`${$t('objFill.xuanxiang')}${index+1}`">
<el-input v-model="item.OptionsName" class="w217">
<el-button @click="deleItem(index)" slot="append" icon="el-icon-delete"></el-button>
</el-input>
</el-form-item>
<el-form-item :label="$t('system.table_rank')" >
<el-input v-model="item.Sort" class="w217"/>
<el-form-item :label="$t('system.table_rank')">
<el-input v-model="item.Sort" class="w217" />
</el-form-item>
</template>
<el-form-item label="" >
<el-form-item label="">
<span @click="addList()">{{$t('objFill.zhengjia')}}</span>
</el-form-item>
</div>
......@@ -217,6 +204,7 @@
},
addMsg: {
MainId: 0,
ID: 0,
Title: "",
SurveyType: '1',
IsShow: 1,
......@@ -229,12 +217,16 @@
},
total: 0,
rules: {
Title: [
{ required: true, message: this.$t('system.ph_name'), trigger: "blur" }
],
Sort: [
{ required: true, message: this.$t('objFill.v101.administrative.qingshurpx'), trigger: "blur" }
]
Title: [{
required: true,
message: this.$t('system.ph_name'),
trigger: "blur"
}],
Sort: [{
required: true,
message: this.$t('objFill.v101.administrative.qingshurpx'),
trigger: "blur"
}]
},
loading: false,
outerVisible: false,
......@@ -247,7 +239,6 @@
if (this.$route.query.MainId && this.$route.query.MainId > 0) {
this.msg.MainId = this.$route.query.MainId;
this.addMsg.MainId = this.$route.query.MainId;
}
},
mounted() {
......@@ -281,61 +272,62 @@
deleItem: function (i) {
if (this.addMsg.SurveyOptionsList.length) {
this.addMsg.SurveyOptionsList.splice(i, 1)
}
},
// 删除
Delete(item) {
this.$confirm(this.$t('objFill.shifouscbkhf'), this.$t('tips.tips'), {
confirmButtonText: this.$t('pub.sureBtn'),
cancelButtonText: this.$t('pub.cancelBtn'),
type: "warning"
})
.then(() => {
this.apipost(
"survey_post_DelSurvey",
{SurveyID: item.ID },
res => {
if (res.data.resultCode == 1) {
this.Success(res.data.message);
this.getList();
} else {
this.Error(res.data.message);
}
},
err => {}
);
})
.catch(() => {});
},
//获取数据
getList() {
this.loading = true;
this.apipost(
"survey_post_GetPageList",
this.msg,
res => {
this.loading = false;
if (res.data.resultCode === 1) {
this.dataList = res.data.data.pageData;
this.total= res.data.data.count;
}
},
// 删除
Delete(item) {
this.$confirm(this.$t('objFill.shifouscbkhf'), this.$t('tips.tips'), {
confirmButtonText: this.$t('pub.sureBtn'),
cancelButtonText: this.$t('pub.cancelBtn'),
type: "warning"
})
.then(() => {
this.apipost(
"survey_post_DelSurvey", {
SurveyID: item.ID
},
res => {
if (res.data.resultCode == 1) {
this.Success(res.data.message);
this.getList();
} else {
this.Error(res.data.message);
}
},
err => {}
);
})
.catch(() => {});
},
//获取数据
getList() {
this.loading = true;
this.apipost(
"survey_post_GetPageList",
this.msg,
res => {
this.loading = false;
if (res.data.resultCode === 1) {
this.dataList = res.data.data.pageData;
this.total = res.data.data.count;
} else {
this.Error(res.data.message);
}
},
null
);
},
//提交
submitForm(addMsg) {
//提交创建、修改表单
this.$refs[addMsg].validate(valid => {
if (valid) {
this.addAward();
} else {
this.Error(res.data.message);
return false;
}
},
null
);
},
//提交
submitForm(addMsg) {
//提交创建、修改表单
this.$refs[addMsg].validate(valid => {
if (valid) {
this.addAward();
} else {
return false;
}
})
},
})
},
// 新增选项
addList: function () {
this.addMsg.SurveyOptionsList.push({
......@@ -350,8 +342,8 @@
}
}, null)
},
//修改信息
updateData(item) {
//修改信息
updateData(item) {
this.outerVisible = true;
this.apipost(
"survey_post_GetSurvey", {
......@@ -390,8 +382,9 @@
//重置信息
resetInfo() {
this.addMsg.ID = 0;
this.addMsg.Title = "";
this.addMsg.SurveyType = "";
this.addMsg.SurveyType = "1";
this.addMsg.IsShow = 1;
this.addMsg.Sort = 0;
this.addMsg.SurveyOptionsList = [{
......@@ -414,4 +407,5 @@
},
}
};
</script>
src/components/dmc/manager/changePriceAudit.vue
View file @ c7d19ed4
......@@ -61,6 +61,11 @@
</el-table-column>
<el-table-column prop="StartDate" :label="$t('hotel.hotel_StarDate')" width="120" show-overflow-tooltip>
</el-table-column>
<el-table-column prop="PriceTeamTypeName" :label="$t('objFill.v101.commissonBill.col.t3')" width="100">
<template slot-scope="scope">
<template v-if="scope.row.TeamTypeName">{{scope.row.TeamTypeName}}</template>
</template>
</el-table-column>
<el-table-column prop="LtName" :label="$t('advmanager.v_xilie')" width="200" show-overflow-tooltip>
<template slot-scope="scope">
{{scope.row.LineName}}<br />
......@@ -69,34 +74,40 @@
</el-table-column>
<el-table-column prop="Title" :label="$t('Operation.Op_TeamName')" width="200" show-overflow-tooltip>
</el-table-column>
<el-table-column prop="" :label="$t('visaT.Applicant')+'/'+$t('objFill.shengqirq')" width="200">
<el-table-column prop="ChangeTypeStr" label="变更类型" width="120">
<template slot-scope="scope">
<p> {{scope.row.CreateByName}}</p>
<p> {{scope.row.CreateTime}}</p>
<template v-if="scope.row.ChangeTypeStr">{{scope.row.ChangeTypeStr}}</template>
</template>
</el-table-column>
<el-table-column prop="OPName" :label="$t('objFill.v101.dmc.shengqyy')" show-overflow-tooltip>
<el-table-column prop="ChangeTypeStr" label="变更内容" width="180">
<template slot-scope="scope">
{{scope.row.ChangeRemark}}
</template>
</el-table-column>
<el-table-column prop="PriceTeamTypeName" :label="$t('objFill.v101.commissonBill.col.t3')" width="130">
<template slot-scope="scope">
<template v-if="scope.row.TeamTypeName">{{scope.row.TeamTypeName}}</template>
<template v-if="scope.row.ChangeType==1">
<span>
{{$t('Operation.Op_tradePrice')}}: {{scope.row.B2BPrice}}=><font style="color:red">
{{scope.row.NewB2BPrice}}</font>
</span>
<br />
<span>
{{$t('Operation.Op_directPrice')}}: {{scope.row.B2CPrice}}=><font style="color:red;">
{{scope.row.NewB2CPrice}}</font>
</span>
</template>
<template v-if="scope.row.ChangeType==2">
<span>
{{scope.row.TeamTypeName}}=><font style="color:red">{{scope.row.ChangeTeamTypeName}}</font>
</span>
</template>
</template>
</el-table-column>
<el-table-column prop="B2BPrice" :label="$t('Operation.Op_tradePrice')" width="130">
<el-table-column prop="OPName" :label="$t('objFill.v101.dmc.shengqyy')" show-overflow-tooltip>
<template slot-scope="scope">
<span>
{{scope.row.B2BPrice}}=><font style="color:red">{{scope.row.NewB2BPrice}}</font>
</span>
{{scope.row.ChangeRemark}}
</template>
</el-table-column>
<el-table-column prop="B2CPrice" :label="$t('Operation.Op_directPrice')" width="130">
<el-table-column prop="" :label="$t('visaT.Applicant')+'/'+$t('objFill.shengqirq')" width="150">
<template slot-scope="scope">
<span>
{{scope.row.B2CPrice}}=><font style="color:red;">{{scope.row.NewB2CPrice}}</font>
</span>
<p> {{scope.row.CreateByName}}</p>
<p> {{scope.row.CreateTime}}</p>
</template>
</el-table-column>
<el-table-column prop="" :label="$t('fnc.shzhuangtai')" width="100">
......
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