Skip to content

S
SuperMan
Commit a2fc78b9 authored by 罗超's avatar 罗超
Browse files
Options

解决冲突

parents 823d44dd 5a364a6f
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 802 additions and 144 deletions
src/components/BusExport.vue 0 → 100644
View file @ a2fc78b9
<style>
.BusExportTitle{
width:800px;
margin:0 auto;
text-align: center;
font-weight: bold;
margin-top:10px;
font-size:16px;
}
.Bus_Content{
width:100%;
height:auto;
margin:auto;
}
.Bus_detailTable {
width: 800px;
font-size: 12px;
color: #333;
margin: 10px auto;
border-collapse: collapse;
background-color: #fff;
border: 1px solid #d1d1d1;
}
.Bus_detailTable td {
border: 1px solid #d1d1d1;
padding: 3px 10px;
font-size:16px;
}
.Bus_detailTable th {
background-color: #fff;
border: 1px solid #d1d1d1;
font-size:16px;
font-weight:bold;
}
.txLeft{
text-align: left;
}
.txRight{
text-align: right;
}
.fontBold{
font-weight:bold;
}
.totalTabal td{
height:33px;
}
body{
min-width: 100%!important;
}
</style>
<template>
<div class="Bus_Content">
<div class="BusExportTitle">
{{Year}}年{{Month}}月公社车账
</div>
<table class="Bus_detailTable">
<thead>
<tr>
<th>做账主体</th>
<th width="200">团号</th>
<th>单号</th>
<th>车配号</th>
<th style="width:20%">{{msg.CurrName}}</th>
<th style="width:20%">人民币</th>
</tr>
</thead>
<tbody v-for="item in dataList">
<tr v-for="subItem in item.RBobj">
<td class="txLeft">{{subItem.BranchName}}</td>
<td class="txLeft">{{subItem.TCNUM}}</td>
<td class="txRight">{{subItem.FrID}}</td>
<td class="txRight">{{subItem.CarDistribution}}</td>
<td class="txRight">{{subItem.sMoney}}</td>
<td class="txRight">{{subItem.Money}}</td>
</tr>
<tr>
<td colspan="4" class="txRight">{{item.BranchName}}应付总金额：</td>
<td class="txRight">{{item.SumOMoney}}</td>
<td class="txRight">{{item.SumMoney}}</td>
</tr>
<tr style="height:12px">
<td colspan="6" style="background:#999; height:12px;"></td>
</tr>
</tbody>
</table>
<table class="Bus_detailTable totalTabal" style="border:0px;page-break-before:always;margin:0 auto;">
<tr>
<td class="txRight" colspan="4">
<div style="width:275px;text-align:right;float:right;">{{Year}}年{{Month}}月应付公社车资：</div>
</td>
<td class="txRight fontBold" style="width:20%">{{TotalJan}}</td>
<td class="txRight fontBold" style="width:20%">{{TotalCn}}</td>
</tr>
<tr v-for="item in dataList">
<td class="txRight" colspan="4">{{item.BranchName}}应付总金额：</td>
<td class="txRight fontBold">{{item.SumOMoney}}</td>
<td class="txRight fontBold">{{item.SumMoney}}</td>
</tr>
<tr>
<td colspan="3" style="padding-top:30px;border:0px;">总经理：</td>
<td colspan="1" style="padding-top:30px;border:0px;width:25%">部门主管：</td>
<td colspan="1" style="padding-top:30px;border:0px;float:right">制表：</td>
<td style="padding-top:30px;border:0px;"></td>
</tr>
<tr>
<td colspan="6" style="padding-top:10px;border:0px;">
<div style="style=float:right;margin-right:30%;text-align:right;">制表日期：</div>
</td>
</tr>
</table>
<table class="Bus_detailTable" v-for="item in dataList" style="margin: 5px auto;border:0px;page-break-before:always;">
<tr>
<th>做账主体</th>
<th width="200">团号</th>
<th>单号</th>
<th>车配号</th>
<th style="width:20%">{{msg.CurrName}}</th>
<th style="width:20%">人民币</th>
</tr>
<tr v-for="subItem in item.RBobj">
<td class="txLeft">{{subItem.BranchName}}</td>
<td class="txLeft">{{subItem.TCNUM}}</td>
<td class="txRight">{{subItem.FrID}}</td>
<td class="txRight">{{subItem.CarDistribution}}</td>
<td class="txRight">{{subItem.sMoney}}</td>
<td class="txRight">{{subItem.Money}}</td>
</tr>
<tr>
<td colspan="4" class="txRight">{{item.BranchName}}应付总金额：</td>
<td class="txRight">{{item.SumOMoney}}</td>
<td class="txRight">{{item.SumMoney}}</td>
</tr>
</table>
</div>
</template>
<script>
export default {
data() {
return {
msg:{
Month:'',
MakeStartDate:'',
MakeEndDate:'',
CurrType:'',
CurrName:'',
},
Year:'',
Month:'',
dataList:[],
TotalJan:'',
TotalCn:'',
}
},
mounted() {
this.msg.Month = this.$route.query.Month;
this.msg.MakeStartDate = this.$route.query.MakeStartDate;
this.msg.MakeEndDate = this.$route.query.MakeEndDate;
this.msg.CurrType = this.$route.query.CurrType;
this.Year = this.msg.Month.split('-')[0];
this.Month = this.msg.Month.split('-')[1];
this.getList();
},
methods: {
getList(){
this.apipost('bus_get_CarfareApportionExport',this.msg, res => {
if(res.data.resultCode == 1) {
this.dataList = res.data.data.RObj;
this.msg.CurrName = res.data.data.CurrName;
this.TotalJan = res.data.data.TotalStatistics.TSumOMoney;
this.TotalCn = res.data.data.TotalStatistics.TSumMoney;
}else{
this.Error(res.data.message);
}
}, err => {})
}
},
}
</script>
src/components/Details.vue
View file @ a2fc78b9
......@@ -793,7 +793,7 @@ export default {
},
getTitleByRouter(name){
let obj={}
routerConfig.routes[9].children[10].children.forEach(x=>{
routerConfig.routes[10].children[10].children.forEach(x=>{
if(x.name==name){
obj.comp=x.component
if(x.meta && x.meta.title)
......
src/components/DomesticModule/SettlementOrder.vue
View file @ a2fc78b9
......@@ -20,23 +20,13 @@
<div class="flexOne page_SettlementOrder">
<div class='query-box'>
<ul>
<li>
<!-- <li>
<span>
<em>期数</em>
<el-input v-model="msg.Term" class="w210"></el-input>
</span>
</li>
<li>
<span>
<em>状态</em>
<el-select filterable v-model='msg.status' >
<el-option label='全部' value='-1'></el-option>
<el-option label='已完成' value='1'></el-option>
<el-option label='未完成' value='0'></el-option>
</el-select>
</span>
</li>
<!-- <li>
</li> -->
<li>
<span>
<em>期数日期</em>
<el-date-picker
......@@ -47,7 +37,17 @@
value-format="yyyy-MM-dd">
</el-date-picker>
</span>
</li> -->
</li>
<li>
<span>
<em>状态</em>
<el-select filterable v-model='msg.status' >
<el-option label='全部' value='-1'></el-option>
<el-option label='已完成' value='1'></el-option>
<el-option label='未完成' value='0'></el-option>
</el-select>
</span>
</li>
<li>
<input type="button" class="hollowFixedBtn" value="查询" @click="getList()"/>
<button class="normalBtn" @click="method5()">导出</button>
......@@ -269,7 +269,7 @@ export default {
},null)
},
method5: function() {
this.GetLocalFile("DomesticTicket_post_DownBill", {'Term':this.msg.Term,'Status':this.msg.Status},"历史账单.xls");
this.GetLocalFile("DomesticTicket_post_DownBill", {'Term':this.msg.Term,'Status':this.msg.Status,'sDate':this.msg.sDate,'eDate':this.msg.eDate},"历史账单.xls");
} ,
resetPageIndex() {//查询初始化页码
this.msg.pageIndex = 1;
......
src/components/FinancialModule/addFinancialDocuments.vue
View file @ a2fc78b9
......@@ -868,8 +868,15 @@ export default {
this.loading = true;
this.apipost('Financial_post_Set',this.msg,res=>{
if(res.data.resultCode==1){
// this.MsgBus.$emit('msg');
this.$router.push({name:'FinancialDocuments',query:{'Type':this.$route.query.Type}})
this.$confirm('是否继续制单?', '提示', {
confirmButtonText: '继续制单',
cancelButtonText: '不了，谢谢',
type: 'warning'
}).then(() => {
this.$router.push({ name:'addFinancialDocuments',query:{"id":this.$route.query.id,"Name":this.$route.query.Name,"Type":this.$route.query.Type,"orderObj":this.$route.query.orderObj,'IsUploadPic':this.$route.query.IsUploadPic,'companyID':this.$route.query.companyID}})
}).catch(() => {
this.$router.push({name:'FinancialDocuments',query:{'Type':this.$route.query.Type}}) ;
});
}else{
this.resultCode = res.data.resultCode;
this.$message.error(res.data.message);
......
src/components/FinancialModule/addReceivablesDocuments.vue
View file @ a2fc78b9
......@@ -1044,7 +1044,16 @@ export default {
console.log(this.msg);
this.apipost('Financial_post_Set',this.msg,res=>{
if(res.data.resultCode==1){
this.$router.push({name:'FinancialDocuments',query:{'Type':this.$route.query.Type}})
this.$confirm('是否继续制单?', '提示', {
confirmButtonText: '继续制单',
cancelButtonText: '不了，谢谢',
type: 'warning'
}).then(() => {
this.$router.push({name:'addReceivablesDocuments',query:{"id":this.$route.query.id,"Name":this.$route.query.Name,"Type":this.$route.query.Type,"orderObj":this.$route.query.orderObj,'IsUploadPic':this.$route.query.IsUploadPic,'companyID':this.$route.query.companyID}});
}).catch(() => {
this.$router.push({name:'FinancialDocuments',query:{'Type':this.$route.query.Type}}) ;
});
}else{
this.resultCode = res.data.resultCode;
this.$message.error(res.data.message);
......
src/components/SalesModule/groupTourOrder.vue
View file @ a2fc78b9
......@@ -806,9 +806,17 @@
</el-col>
<el-col :span="4">
<el-form-item label="成交单价" prop="Unit_Price">
<el-input v-model='addMsg.Unit_Price' :disabled="true"
@keyup.native="checkPrice(addMsg,'Unit_Price');getTotalPrice()"></el-input>
<el-select v-model='addMsg.Unit_Price'
filterable :placeholder="$t('pub.pleaseSel')" @change="getTotalPrice()">
<el-option v-for="item in Unit_PriceList" :label='item.LessMoney' :value='item.ID' :key='item.ID'>
</el-option>
</el-select>
<!-- <el-input v-model='addMsg.Unit_Price' :disabled="true" @keyup.native="checkPrice(addMsg,'Unit_Price');getTotalPrice()"></el-input> -->
</el-form-item>
<el-form-item>
<p v-if="LessMoney==0" style="line-height: 18px; color: #E95252;">注：如果超出本团的最低让价，差价将由你来承担</p>
<p v-else="LessMoney>0" style="line-height: 18px; color: #E95252;">注：最多少价{{LessMoney}}元，如需少价更多请联系上级主管</p>
</el-form-item>
<!--<el-form-item>
<p style="line-height: 18px; color: #E95252;">注：如果超出本团的最低让价，差价将由你来承担</p>
</el-form-item>-->
......@@ -1751,6 +1759,8 @@
},
IsUnion: 2,
IsChargeLossOrders: 0,
Unit_PriceList:[],//成交单价下拉数据
LessMoney:0,
addMsg: {
OrderId: '0',
TCID: '0',
......@@ -2414,7 +2424,50 @@
err => {
}
)
this.Unit_PriceList=[];
this.apipost('sellorder_post_GetLessPrice', {}, res => {
this.LessMoney = res.data.data.lessMoney;
if (parseFloat(this.LessMoney)>0){
for (var i = 0; i <= parseInt(this.LessMoney)/10; i++) {
var obj = {
ID: '',
LessMoney: ''
}
obj.ID = this.addMsg.TC_Price-i*10;
obj.LessMoney = this.addMsg.TC_Price-i*10;
this.Unit_PriceList.push(obj);
}
// this.Unit_PriceList.forEach(person => {
if(this.Unit_PriceList.findIndex(markers => markers.ID == this.addMsg.Unit_Price)<0) {
var obj = {
ID: '',
LessMoney: ''
}
obj.ID = this.addMsg.Unit_Price;
obj.LessMoney = this.addMsg.Unit_Price;
this.Unit_PriceList.push(obj);
}
// });
//判断下拉价格里面是否包含了成交单价，未包含就添加进来
// const option = {ID:this.addMsg.TC_Price,LessMoney:this.addMsg.TC_Price}
// // 如果数组里面本身不存在这个对象则把这个加进去
// if(JSON.stringify(this.Unit_PriceList).indexOf(JSON.stringify(option))==-1){
// this.Unit_PriceList.push(option); // 进行动态的操作
// }
}
else{
var obj = {
ID: '',
LessMoney: ''
}
obj.ID = this.addMsg.Unit_Price;
obj.LessMoney = this.addMsg.Unit_Price;
this.Unit_PriceList.push(obj);
}
}, err => {})
this.getKhmdList(this.addMsg.CustomerType, obj.lineId)
this.getDdlyList(this.addMsg.CustomerType)
} else {
......@@ -2520,6 +2573,30 @@
this.addMsg.CustomerId = '0'
this.addMsg.CommissionShareMoney = '0'
}
this.Unit_PriceList=[];
this.apipost('sellorder_post_GetLessPrice', {}, res => {
this.LessMoney = res.data.data.lessMoney;
if (parseFloat(this.LessMoney)>0){
for (var i = 0; i <= parseInt(this.LessMoney)/10; i++) {
var obj = {
ID: '',
LessMoney: ''
}
obj.ID = this.addMsg.TC_Price-i*10;
obj.LessMoney = this.addMsg.TC_Price-i*10;
this.Unit_PriceList.push(obj);
}
}
else{
var obj = {
ID: '',
LessMoney: ''
}
obj.ID = this.addMsg.Unit_Price;
obj.LessMoney = this.addMsg.Unit_Price;
this.Unit_PriceList.push(obj);
}
}, err => {})
},
getTicheng () {
//提成
......
src/components/SalesModule/groupTourOrderByTuan.vue
View file @ a2fc78b9
......@@ -727,9 +727,14 @@
</el-form-item>
</el-col>
<el-col :span="4">
<el-form-item label="成交单价" prop="Unit_Price">
<el-input v-model='addMsg.Unit_Price' :disabled="true" @keyup.native="checkPrice(addMsg,'Unit_Price');getTotalPrice()" ></el-input>
</el-form-item>
<el-form-item label="成交单价" prop="Unit_Price">
<!-- <el-select v-model='addMsg.Unit_Price'
filterable :placeholder="$t('pub.pleaseSel')" @change="getTotalPrice()">
<el-option v-for="item in Unit_PriceList" :label='item.LessMoney' :value='item.ID' :key='item.ID'>
</el-option>
</el-select> -->
<el-input v-model='addMsg.Unit_Price' :disabled="true" @keyup.native="checkPrice(addMsg,'Unit_Price');getTotalPrice()"></el-input>
</el-form-item>
<!-- <el-form-item>
<p style="line-height: 18px; color: #E95252;">注：如果超出本团的最低让价，差价将由你来承担</p>
</el-form-item> -->
......@@ -1041,12 +1046,21 @@
</el-form-item>
</el-col>
<el-col :span="4">
<el-form-item label="成交单价" prop="Unit_Price">
<!-- <el-form-item label="成交单价" prop="Unit_Price">
<el-input v-model='addMsg.Unit_Price' @keyup.native="checkPrice(addMsg,'Unit_Price');getTotalPrice()" ></el-input>
</el-form-item>
<el-form-item>
<p style="line-height: 18px; color: #E95252;">注：如果超出本团的最低让价，差价将由你来承担</p>
</el-form-item>
</el-form-item> -->
<el-form-item label="成交单价" prop="Unit_Price">
<el-select v-model='addMsg.Unit_Price'
filterable :placeholder="$t('pub.pleaseSel')" @change="getTotalPrice()">
<el-option v-for="item in Unit_PriceList" :label='item.LessMoney' :value='item.ID' :key='item.ID'>
</el-option>
</el-select>
<!-- <el-input v-model='addMsg.Unit_Price' :disabled="true" @keyup.native="checkPrice(addMsg,'Unit_Price');getTotalPrice()"></el-input> -->
</el-form-item>
<el-form-item>
<p v-if="LessMoney==0" style="line-height: 18px; color: #E95252;">注：如果超出本团的最低让价，差价将由你来承担</p>
<p v-else="LessMoney>0" style="line-height: 18px; color: #E95252;">注：最多少价{{LessMoney}}元，如需少价更多请联系上级主管</p>
</el-form-item>
</el-col>
</el-row>
<div style="width: 100%; border-top:1px dashed #ccc;margin-bottom:25px;"></div>
......@@ -2044,6 +2058,8 @@ export default {
isOrder:1
},
IsChargeLossOrders:0,
Unit_PriceList:[],//成交单价下拉数据
LessMoney:0,
addMsg: {
OrderId: "0",
TCID: "0",
......@@ -2691,7 +2707,7 @@ export default {
this.addMsg.GroupType = x.GroupType.toString();
this.addMsg.TradeWay = x.TradeWay.toString();
this.addMsg.PredictRoomNum = x.PredictRoomNum;
this.addMsg.IsIntermodal = x.IsIntermodal.toString();
this.addMsg.IsIntermodal = x.IsIntermodal?x.IsIntermodal.toString():2;
this.addMsg.IsReturnIntermodal = x.IsReturnIntermodal.toString();
this.addMsg.ChirdNum = x.ChirdNum.toString();
this.addMsg.ChirdNeedBedNum = x.ChirdNeedBedNum.toString();
......@@ -2724,6 +2740,40 @@ export default {
this.isShowLayer2 = true;
}
this.Unit_PriceList=[];
this.apipost('sellorder_post_GetLessPrice', {}, res => {
this.LessMoney = res.data.data.lessMoney;
if (parseFloat(this.LessMoney)>0){
for (var i = 0; i <= parseInt(this.LessMoney)/10; i++) {
var obj = {
ID: '',
LessMoney: ''
}
obj.ID = this.addMsg.TC_Price-i*10;
obj.LessMoney = this.addMsg.TC_Price-i*10;
this.Unit_PriceList.push(obj);
}
if(this.Unit_PriceList.findIndex(markers => markers.ID == this.addMsg.Unit_Price)<0) {
var obj = {
ID: '',
LessMoney: ''
}
obj.ID = this.addMsg.Unit_Price;
obj.LessMoney = this.addMsg.Unit_Price;
this.Unit_PriceList.push(obj);
}
}
else{
var obj = {
ID: '',
LessMoney: ''
}
obj.ID = this.addMsg.Unit_Price;
obj.LessMoney = this.addMsg.Unit_Price;
this.Unit_PriceList.push(obj);
}
}, err => {})
this.isShowLayerRemarks = false;
this.apipost(
"app_today_visit_GetCustomerBrandByCustomerId",
......@@ -2856,6 +2906,30 @@ export default {
this.addMsg.TC_Price = this.addObj.B2CPrice;
//this.addMsg.CustomerId=0
}
this.Unit_PriceList=[];
this.apipost('sellorder_post_GetLessPrice', {}, res => {
this.LessMoney = res.data.data.lessMoney;
if (parseFloat(this.LessMoney)>0){
for (var i = 0; i <= parseInt(this.LessMoney)/10; i++) {
var obj = {
ID: '',
LessMoney: ''
}
obj.ID = this.addMsg.TC_Price-i*10;
obj.LessMoney = this.addMsg.TC_Price-i*10;
this.Unit_PriceList.push(obj);
}
}
else{
var obj = {
ID: '',
LessMoney: ''
}
obj.ID = this.addMsg.Unit_Price;
obj.LessMoney = this.addMsg.Unit_Price;
this.Unit_PriceList.push(obj);
}
}, err => {})
},
getTicheng() {
if (this.addMsg.GroupType !=5) {
......@@ -2932,7 +3006,7 @@ export default {
getTotalPrice() {
if (this.addMsg.GroupType !=5) {
this.addMsg.ChirdNum = this.addMsg.ChirdNoNeedBedNum*1 + this.addMsg.ChirdNeedBedNum*1
if (this.addObj.IsBirdDiscount == 1) {
if (this.addObj.IsBirdDiscount&&this.addObj.IsBirdDiscount == 1) {
//早鸟优惠
//this.addMsg.Unit_Price //成交单价
//BabyPrice 婴儿价
......
src/components/SalesModule/productQuery.vue
View file @ a2fc78b9
......@@ -234,9 +234,22 @@
</el-form-item>
</el-col>
<el-col :span="4">
<el-form-item label="成交单价" prop="Unit_Price">
<!-- <el-form-item label="成交单价" prop="Unit_Price">
<el-input v-model='addMsg.Unit_Price' :disabled="true" @keyup.native="checkPrice(addMsg,'Unit_Price');getTotalPrice()"></el-input>
</el-form-item> -->
<el-form-item label="成交单价" prop="Unit_Price">
<el-select v-model='addMsg.Unit_Price'
filterable :placeholder="$t('pub.pleaseSel')" @change="getTotalPrice()">
<el-option v-for="item in Unit_PriceList" :label='item.LessMoney' :value='item.ID' :key='item.ID'>
</el-option>
</el-select>
<!-- <el-input v-model='addMsg.Unit_Price' :disabled="true" @keyup.native="checkPrice(addMsg,'Unit_Price');getTotalPrice()"></el-input> -->
</el-form-item>
<el-form-item>
<p v-if="LessMoney==0" style="line-height: 18px; color: #E95252;">注：如果超出本团的最低让价，差价将由你来承担</p>
<p v-else="LessMoney>0" style="line-height: 18px; color: #E95252;">注：最多少价{{LessMoney}}元，如需少价更多请联系上级主管</p>
</el-form-item>
<!--<el-form-item>
<p style="line-height: 18px; color: #E95252;">注：如果超出本团的最低让价，差价将由你来承担</p>
</el-form-item>-->
......@@ -869,6 +882,8 @@
currentPage: 1,
total: 0,
addObj: {},
Unit_PriceList:[],//成交单价下拉数据
LessMoney:0,
addMsg: {
OrderId: '0',
TCID: '0',
......@@ -1465,6 +1480,39 @@
this.addMsg.CustomerId = '0'
this.addMsg.CommissionShareMoney = '0'
}
this.Unit_PriceList=[];
this.apipost('sellorder_post_GetLessPrice', {}, res => {
this.LessMoney = res.data.data.lessMoney;
if (parseFloat(this.LessMoney)>0){
for (var i = 0; i <= parseInt(this.LessMoney)/10; i++) {
var obj = {
ID: '',
LessMoney: ''
}
obj.ID = this.addMsg.Unit_Price-i*10;
obj.LessMoney = this.addMsg.Unit_Price-i*10;
this.Unit_PriceList.push(obj);
}
if(this.Unit_PriceList.findIndex(markers => markers.ID == this.addMsg.Unit_Price)<0) {
var obj = {
ID: '',
LessMoney: ''
}
obj.ID = this.addMsg.Unit_Price;
obj.LessMoney = this.addMsg.Unit_Price;
this.Unit_PriceList.push(obj);
}
}
else{
var obj = {
ID: '',
LessMoney: ''
}
obj.ID = this.addMsg.Unit_Price;
obj.LessMoney = this.addMsg.Unit_Price;
this.Unit_PriceList.push(obj);
}
}, err => {})
},
getTicheng() { //提成
let num = Number(this.addMsg.ManNum) + Number(this.addMsg.ChirdNum) + Number(this.addMsg.OldPeopleNum)
......
src/components/TravelManager/TravelList/RegistrationList.vue
View file @ a2fc78b9
......@@ -862,9 +862,17 @@
</el-form-item>
</el-col>
<el-col :span="4">
<el-form-item label="成交单价" prop="Unit_Price">
<el-input v-model='addMsg.Unit_Price' @keyup.native="checkPrice(addMsg,'Unit_Price');getTotalPrice()"></el-input>
<el-form-item label="成交单价" prop="Unit_Price">
<!-- <el-select v-model='addMsg.Unit_Price'
filterable :placeholder="$t('pub.pleaseSel')" @change="getTotalPrice()">
<el-option v-for="item in Unit_PriceList" :label='item.LessMoney' :value='item.ID' :key='item.ID'>
</el-option>
</el-select> -->
<el-input v-model='addMsg.Unit_Price' :disabled="true" @keyup.native="checkPrice(addMsg,'Unit_Price');getTotalPrice()"></el-input>
</el-form-item>
<!-- <el-form-item label="成交单价" prop="Unit_Price">
<el-input v-model='addMsg.Unit_Price' @keyup.native="checkPrice(addMsg,'Unit_Price');getTotalPrice()"></el-input>
</el-form-item> -->
</el-col>
</el-row>
<div style="width: 100%; border-top:1px dashed #ccc;margin-bottom:25px;"></div>
......@@ -1083,10 +1091,17 @@
</el-col>
<el-col :span="5">
<el-form-item label="成交单价" prop="Unit_Price">
<el-input v-model='addMsg.Unit_Price' :disabled="isChecked" @keyup.native="checkPrice(addMsg,'Unit_Price');getTotalPrice()"></el-input>
<el-select v-model='addMsg.Unit_Price'
filterable :placeholder="$t('pub.pleaseSel')" @change="getTotalPrice()">
<el-option v-for="item in Unit_PriceList" :label='item.LessMoney' :value='item.ID' :key='item.ID'>
</el-option>
</el-select>
<!-- <el-input v-model='addMsg.Unit_Price' :disabled="true" @keyup.native="checkPrice(addMsg,'Unit_Price');getTotalPrice()"></el-input> -->
</el-form-item>
<el-form-item>
<p style="line-height: 18px; color: #E95252;">注：如果超出本团的最低让价，差价将由你来承担</p>
<p v-if="LessMoney==0" style="line-height: 18px; color: #E95252;">注：如果超出本团的最低让价，差价将由你来承担</p>
<p v-else="LessMoney>0" style="line-height: 18px; color: #E95252;">注：最多少价{{LessMoney}}元，如需少价更多请联系上级主管</p>
</el-form-item>
</el-col>
</el-row>
......@@ -2177,6 +2192,8 @@ import updateSalesMan from "../../commonPage/updateSalesMan.vue";
},
IsUnion: 2,
IsChargeLossOrders:0,
Unit_PriceList:[],//成交单价下拉数据
LessMoney:0,
addMsg: {
OrderId: "0",
TCID: "0",
......@@ -2817,6 +2834,42 @@ import updateSalesMan from "../../commonPage/updateSalesMan.vue";
this.isShowLayer = false;
this.isShowLayer2 = true;
}
this.Unit_PriceList=[];
this.apipost('sellorder_post_GetLessPrice', {}, res => {
this.LessMoney = res.data.data.lessMoney;
if (parseFloat(this.LessMoney)>0){
for (var i = 0; i <= parseInt(this.LessMoney)/10; i++) {
var obj = {
ID: '',
LessMoney: ''
}
obj.ID = this.addMsg.TC_Price-i*10;
obj.LessMoney = this.addMsg.TC_Price-i*10;
this.Unit_PriceList.push(obj);
}
if(this.Unit_PriceList.findIndex(markers => markers.ID == this.addMsg.Unit_Price)<0) {
var obj = {
ID: '',
LessMoney: ''
}
obj.ID = this.addMsg.Unit_Price;
obj.LessMoney = this.addMsg.Unit_Price;
this.Unit_PriceList.push(obj);
}
}
else{
var obj = {
ID: '',
LessMoney: ''
}
obj.ID = this.addMsg.Unit_Price;
obj.LessMoney = this.addMsg.Unit_Price;
this.Unit_PriceList.push(obj);
}
}, err => {})
this.isShowLayerRemarks = false;
this.showSetLeader = false;
this.apipost(
......
src/components/administrative/empBankAccount.vue
View file @ a2fc78b9
......@@ -35,12 +35,12 @@
</el-col>
<el-col :span="4" v-if='addMsg.AccountClassify==2' :gutter="35">
<el-form-item label="银行：" prop="BankName">
<el-input type="text" v-model="addMsg.BankName"></el-input>
<el-input type="text" v-model="addMsg.BankName" placeholder="例如：中国建行"></el-input>
</el-form-item>
</el-col>
<el-col :span="4" v-if='addMsg.AccountClassify!=3' :gutter="35">
<el-form-item :label="nameA" prop="OpenBankName">
<el-input type="text" v-model="addMsg.OpenBankName"></el-input>
<el-input type="text" v-model="addMsg.OpenBankName" placeholder="例如：锦江支行"></el-input>
</el-form-item>
</el-col>
<el-col :span="4" v-if='addMsg.AccountClassify!=3' :gutter="35">
......
src/components/confirmationOrderDownLoad.vue
View file @ a2fc78b9
......@@ -8,8 +8,7 @@
<div class="travelControlTrip detail-box">
<div class="trip_cover" v-show="pdfLoading" v-loading="pdfLoading"></div>
<input type="button" class="travelControlTripBtn" value="下载PDF" @click="toPDF(orderMsg.startDate + orderMsg.lineteamName+orderMsg.dayNum+'日游')" />
<input type="button" class="travelControlTripBtn" value="下载WORD" @click="gernalFeature()" /><!-- ToWord(orderMsg.startDate + orderMsg.lineteamName+orderMsg.dayNum+'日游') -->
<!-- <input type="button" class="travelControlTripBtn" value="下载Word" @click="toWord(orderMsg.startDate + orderMsg.lineteamName+orderMsg.dayNum+'日游')" /> -->
<input style="display:none;" type="button" class="travelControlTripBtn" value="下载WORD" @click="ToWord(orderMsg.startDate + orderMsg.lineteamName+orderMsg.dayNum+'日游')" />
<!--&&isopOperation HK 注释 可以让销售修改基本信息-->
<input type="button" v-if="orderId>0" class="travelControlTripBtn" value="修改信息" @click="editMsgShow=true" />
<div id="pdfNode">
......@@ -213,7 +212,7 @@
<div class="zidingyi" v-if="showType==3&&loadNone==false&&vshowC">
<div v-html="feature.featureContent"></div>
</div>
<div class="template-box" v-if="(showType==4||showType==5)&&loadNone==false&&vshowC" id='gernalCanvas'>
<div class="template-box" v-if="(showType==4||showType==5)&&loadNone==false&&vshowC">
<div v-if="vshowC" class="module-title">
<h2>行程特色</h2>
<div class="short-line"></div>
......@@ -642,33 +641,6 @@
}, 2000)
},
methods: {
gernalFeature(){
console.log(document.querySelector("#gernalCanvas").querySelectorAll('img'))
document.querySelector("#gernalCanvas").querySelectorAll('img').forEach(x => {
if(x.src.indexOf('http')!=-1){
x.setAttribute('crossOrigin','anonymous')
}
});
document.querySelectorAll('.feature-box').forEach(x => {
html2Canvas(x,{
useCORS:true,
scale:0.7,
backgroundColor:'#FFFFFF'
}).then((canvas) => {
if(canvas){
var context = canvas.getContext('2d')
context.mozImageSmoothingEnabled = false
context.webkitImageSmoothingEnabled = false
context.msImageSmoothingEnabled = false
context.imageSmoothingEnabled = false
var image = new Image();
image.src = canvas.toDataURL("image/png");
document.body.appendChild(image)
}
});
});
},
//保存基础数据
submitForm: function () {
this.editForm.travelOrderFlightList.forEach(x => {
......@@ -853,7 +825,31 @@
cityId: this.$route.query.cityId,
tcid: this.$route.query.tcid,
orderId: this.$route.query.orderId,
FileName:title
FileName:title,
//是否显示基础信息
isShowBase:this.vshowA?1:0,
//是否显示航班
isShowFlight:this.vshowB?1:0,
//是否显示行程特色
isShowFeature:this.vshowC?1:0,
//自费、费用包含、费用不含
isShowFee:this.vshowE?1:0,
//购物说明，购物安排
isShowShop:this.vshowF?1:0,
//重要提示、温馨提示
isShowTip:this.vshowG?1:0,
//是否显示同行备注
isShowB2B:this.vshowI?1:0,
//是否显示行程
isShowTrip:this.vshowK?1:0,
//是否显示标题
isShowTitle:this.vshowL?1:0,
//是否显示旅客名单
isShowGuest:this.vshowM?1:0,
//是否显示紧急联系人
isShowMan:this.vshowLLR?1:0,
//是否显示团号
isShowTCNUM:this.vshowTCNUM?1:0
};
this.GetLocalFile("DownLoadTripWord", msg,title+ ".doc");
},
......
src/components/newTravelmanager/TravelGroupControl/TravelFeature.vue
View file @ a2fc78b9
......@@ -7,7 +7,8 @@
<span class="foldList" @click="fold" v-if="isFold==''">点击折叠</span>
<span class="foldList" @click="fold" v-if="isFold==1">点击展开</span>
<div class="TrfList clearfix">
<div class="TFslide" v-for="item in TypeArray" :class="{'TFcked':item.isShow}" @click="clickFeature(item)"
<!-- v-if="item.TypeState === 4 && this.FeatureData.FeatureType!==4" -->
<div class="TFslide" v-for="item in TypeArray" :class="{'TFcked':item.isShow,'display_none':(item.TypeState===4 && FeatureData.FeatureType !== 4) || (item.TypeState===4 && !$route.query.configId)}" @click="clickFeature(item)"
:key="item.subCode">
<img v-bind:src="item.imgUrl">
<div>{{item.ckTitle}}</div>
......@@ -447,18 +448,57 @@
},
//切换tab事件
clickFeature(item) {
if (item.TypeState === 5) {
this.$message.warning('尊敬的用户，行程特色"1"暂时无法直接切换为行程特色"2"!')
let state = this.FeatureData.FeatureType
if (state === 4 && item.TypeState === 5) {
this.$confirm('尊敬的用户，行程特色“1”切换为行程特色“2”将会清空行程特色“1”里面的所有内容，您确定切换吗？', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
this.$message({
type: 'success',
message: '已切换!'
});
this.TypeArray.forEach(x => {
if (x.TypeState == item.TypeState) {
x.isShow = true;
this.ckTitle = x.ckTitle;
this.FeatureData.FeatureType = item.TypeState;
} else {
x.isShow = false;
}
});
this.FeatureData.FeatureHtmlJson = null
this.FeatureData.FeatureHtmlJsonDelete = null
this.FeatureData.switch4or5 = true
this.$forceUpdate()
}).catch(() => {
this.$message({
type: 'info',
message: '已取消'
});
this.TypeArray.forEach(x => {
if (x.TypeState == 4) {
x.isShow = true;
this.ckTitle = x.ckTitle;
} else {
x.isShow = false;
}
});
this.FeatureData.FeatureType = state;
});
// this.$message.warning('尊敬的用户，行程特色"1"暂时无法直接切换为行程特色"2"!')
}else{
this.TypeArray.forEach(x => {
if (x.TypeState == item.TypeState) {
x.isShow = true;
this.ckTitle = x.ckTitle;
this.FeatureData.FeatureType = item.TypeState;
} else {
x.isShow = false;
}
});
}
this.TypeArray.forEach(x => {
if (x.TypeState == item.TypeState) {
x.isShow = true;
this.ckTitle = x.ckTitle;
this.FeatureData.FeatureType = item.TypeState;
} else {
x.isShow = false;
}
});
this.initFileList();
},
//点击折叠
......@@ -570,7 +610,7 @@
url("../../../assets/webfont/FZDBSJW.ttf") format("truetype"),
url("../../../assets/webfont/FZDBSJW.svg") format("svg");
}
.TravelFeature .display_none{display: none !important;}
.travelSpecial {
box-sizing: border-box;
-webkit-box-sizing: border-box;
......
src/components/newTravelmanager/TravelGroupControl/TravelTemp/travelFeature3.vue
View file @ a2fc78b9
......@@ -1353,8 +1353,8 @@
let dataList = JSON.parse(JSON.stringify(this.FeatureData));
let deleteDataList = JSON.parse(JSON.stringify(this.FeatureData.FeatureHtmlJsonDelete));
this.deleteArray = deleteDataList==="" ? this.deleteArray : deleteDataList;
console.log("dataList",dataList)
if (!this.$route.query.configId){
console.log("dataList",dataList,!this.$route.query.configId,dataList.switch4or5)
if (!this.$route.query.configId || (this.$route.query.configId && dataList.switch4or5) ){
for (let i = 0; i < dataList.DayList.length; i++) { //组装数据
let restaurantObj = travelFeatureTwo.DinnerInit(i, dataList.DayList) // 餐饮
let hotelObj = travelFeatureTwo.HotelInit(i, dataList.DayList) // 酒店
......
src/components/systemManagement/LessPriceManagement.vue
View file @ a2fc78b9
......@@ -81,7 +81,7 @@
<table border="0" cellspacing="0" cellpadding="0" class="LP_table" v-loading="this.loading">
<tr>
<th class="first">
<span class="Lp_role">角色</span>
<span class="Lp_role">岗位</span>
<span class="Lp_company">公司</span>
</th>
<template v-for="item in BranchList">
......@@ -97,13 +97,13 @@
<td>
<el-select :placeholder="$t('pub.pleaseSel')" class="w150" v-model="item.RoleId">
<el-option label="不限" :value="0"></el-option>
<el-option v-for="item in RoleList" :label="item.Name" :value="item.Id" :key="item.Id"></el-option>
<el-option v-for="item in RoleList" :label="item.PostName" :value="item.PostId" :key="item.PostId"></el-option>
</el-select>
</td>
<template v-for="subItem in item.DetailExtList">
<td>
<el-input class="w80" placeholder="金額" v-model="subItem.LessMoney"></el-input>
<el-input class="w80" placeholder="百分比" v-model="subItem.LessPercent"></el-input>
<el-input class="w80" placeholder="少价金額" v-model="subItem.LessMoney"></el-input>
<el-input class="w80" placeholder="减少提成百分比" v-model="subItem.LessPercent"></el-input>
</td>
</template>
<td>
......@@ -184,8 +184,9 @@
},
//获取列表
GetRoleList() {
let userInfo=this.getLocalStorage();
this.apipost(
"admin_get_RoleGetList", {},
"admin_get_PostGetList", {"RB_Group_Id":userInfo.RB_Group_id},
res => {
if (res.data.resultCode == 1) {
this.RoleList = res.data.data;
......
src/router/config.js
View file @ a2fc78b9
......@@ -53,6 +53,11 @@ export default {
name: 'TravelControlTrip',
component: resolve => require(['@/components/TravelControlTrip'], resolve),
},
{
path: '/BusExport',
name: 'BusExport',
component: resolve => require(['@/components/BusExport'], resolve),
},
{
path: '/index',
name: 'index',
......
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