Skip to content

S
SuperMan
Commit 6528c717 authored by youjie's avatar youjie
Browse files
Options

no message

parent d73087b9
Hide whitespace changes
Inline Side-by-side
Showing with 127 additions and 36 deletions
src/components/busManagement/BookAcar/components/tripBusOrderList.vue
View file @ 6528c717
......@@ -408,10 +408,10 @@
<el-table :data="[item]" style="width:100%" border>
<el-table-column
label="开始日期"
min-width="100"
width="100"
style="background:#EAEAEA"
>
<template width="120" slot-scope="scope">
<template slot-scope="scope">
<template>
<div>{{ item.StartDate }}</div>
<!-- <span style="color: #999999;">{{scope.row.CreateTime}}</span> -->
......@@ -432,7 +432,7 @@
{{item.UseDayNum}}
</template>
</el-table-column>
<el-table-column width="400" label="行程信息" style="background:#EAEAEA;" >
<el-table-column min-width="350" label="行程信息" style="background:#EAEAEA;" >
<template slot-scope="scope">
<div class="RoomList">
<div class="fz12 c9e" v-for="(x, i) in item.DetailList">
......@@ -597,7 +597,6 @@
</div>
</div>
<div
v-if="item.OfferState!=2"
class="column justify-c px15 bgE8F5E9 radius5 ml fz12 orderop pa20 flex-s"
>
<div
......@@ -621,6 +620,13 @@
<i v-loading="msg.OrderId==item.Id&&loading1"></i>
<span class="c20C997">确认订单</span>
</div>
<div
v-if="item.OfferState == 2"
class="row-c cursor-pointer radius5 confirm py5"
@click="clickSee(item)"
>
<span class="c20C997">查看报价</span>
</div>
<div
v-if="item.OfferState == 1&&pagesTitle=='销售'"
class="row-c cursor-pointer radius5 change py5"
......@@ -780,19 +786,40 @@
</el-table>
</div>
<div class="total">
<span>
手配费：
<div class="flex">
<span style="margin-right: 20px;">
币种：
<span>
<template v-if="priceType == 1">
<el-select filterable v-model='postMsg.CurrencyId'
:placeholder="$t('rule.qxzbzhong')" class=" _border_b_1 w150">
<!-- <el-option :value="0" label="不限"></el-option> -->
<el-option v-for='item in coinGetList'
:label='item.Name'
:value='item.ID'
:key='item.ID'>
</el-option>
</el-select>
</template>
<template v-else>
{{ postMsg.CustomerName }}
</template>
</span>
</span>
<span>
<template v-if="priceType == 1">
<el-input-number v-model="postMsg.ShouPeiFee" :min="0"
@input="calcPrice()" style="width:120px;">
</el-input-number>
</template>
<template v-else>
{{ postMsg.ShouPeiFee }}
</template>
手配费：
<span>
<template v-if="priceType == 1">
<el-input-number v-model="postMsg.ShouPeiFee" :min="0"
@input="calcPrice()" style="width:120px;">
</el-input-number>
</template>
<template v-else>
{{ postMsg.ShouPeiFee }}
</template>
</span>
</span>
</span>
</div>
<span>
<span class="fz17 cF1416C" style="margin-left: 10px;">
总计：{{ postMsg.TotalPrice }}
......@@ -808,7 +835,7 @@
</el-input>
</template>
<template v-else>
{{ postMsg.Remark }}
{{ postMsg.Remark?postMsg.Remark:'--' }}
</template>
</span>
</el-col>
......@@ -820,18 +847,34 @@
</el-input>
</template>
<template v-else>
{{ postMsg.AttentionInfo }}
{{ postMsg.AttentionInfo?postMsg.AttentionInfo:'--' }}
</template>
</span>
</el-col>
</el-row>
<div slot="footer" class="dialog-footer">
<button class="hollowFixedBtn" @click="isShowPrice = false">关闭</button> &nbsp;
<button v-if="priceType == 1" class="normalBtn" type="primary" @click="confirmFun">{{
<button v-if="priceType == 1" class="hollowFixedBtn" @click="confirmFun(1)">暂存报价</button>
<button v-else class="hollowFixedBtn" @click="isShowPrice = false">取消</button> &nbsp;
<button v-if="priceType == 1" class="normalBtn" type="primary" @click="confirmFun(2)">保存并{{
$t('pub.sureBtn')
}}</button>
</div>
</el-dialog>
<!-- 添加司机车辆弹窗 -->
<el-dialog title="车辆信息" :visible.sync="dialogVisible" width="20%" :before-close="handleClose">
<div style="display: flex;margin-bottom: 20px;">
<span style="width: 70px;">司机：</span>
<el-input style="width: 150px;" v-model="drivermsg.DriverInfo" placeholder=""></el-input>
</div>
<div style="display: flex;">
<span style="width: 70px;">车牌号：</span>
<el-input style="width: 150px;" v-model="drivermsg.BusNo" placeholder=""></el-input>
</div>
<span slot="footer" class="dialog-footer">
<el-button @click="dialogVisible = false">取 消</el-button>
<el-button type="primary" @click="driverdetermine()">确 定</el-button>
</span>
</el-dialog>
</div>
</template>
<script>
......@@ -839,6 +882,13 @@
props: ["OrderList","pagesTitle"],
data() {
return {
drivermsg: {
Id: '',
DriverInfo: "",
BusNo: ""
},
dialogVisible: false,
coinGetList: [],//币种
labelPosition: 'right',
priceType: 1,
dialogTitle: '设置报价',
......@@ -1001,6 +1051,37 @@
}
},
methods: {
handleClose(done) {
this.$confirm('确认关闭？')
.then(_ => {
done();
})
.catch(_ => {});
},
// 司机确定
driverdetermine() {
this.apipost('tripbus_SetBusPriceInfo', this.drivermsg, res => {
if (res.data.resultCode == 1) {
this.dialogVisible = false
this.$forceUpdate();
} else {
this.Error(res.data.message);
}
}, err => {})
},
// 添加司机车号
driver(id) {
this.drivermsg.Id = id
this.dialogVisible = true
},
//获取币种
financeinfo_post_GetList(){
this.apipost('financeinfo_post_GetList',{Name:''}, res => {
if(res.data.resultCode == 1) {
this.coinGetList = res.data.data;
}
}, err => {})
},
submit2(){
if(this.loading3) return
this.$refs['msgParameter'].validate((valid) => {
......@@ -1101,7 +1182,7 @@
makeAdocument(row, index, num, name) {
this.BillMakingMsg.ReFinanceId = row.OrderId;
this.BillMakingMsg.ReFinanceId2 = num;
this.BillMakingMsg.OtherType = 67;
this.BillMakingMsg.OtherType = 68;
let text = "";
let query = {};
if (num == 1) {
......@@ -1133,6 +1214,9 @@
}
});
},
clickSee(item){
this.SetTripBusPrice(item)
},
clickRightButtom(item, type) {
// 0取消订单 1确认订单 2收损
this.msg.OrderId = item.Id;
......@@ -1184,7 +1268,6 @@
}, res => {
if (res.data.resultCode == 1) {
var tempData = res.data.data;
this.postMsg.Id = item.Id;
this.postMsg.UseCompName = tempData.UseCompName;
this.postMsg.UseName = tempData.UseName;
......@@ -1204,7 +1287,8 @@
this.postMsg.PayType = tempData.PayType;
this.postMsg.IsSure = tempData.IsSure;
this.postMsg.TeamName = tempData.TeamName;
this.postMsg.CurrencyId = tempData.CurrencyId;
this.postMsg.CurrencyId = tempData.CurrencyId>0?tempData.CurrencyId:1;
this.postMsg.CustomerName = tempData.CustomerName
this.postMsg.DiscountPrice = tempData.DiscountPrice;
this.postMsg.TotalPrice = tempData.TotalPrice;
this.postMsg.CustomerId = tempData.CustomerId;
......@@ -1286,17 +1370,17 @@
return sums;
},
//提交报价
submitTripBusOffer() {
// tripbus_SureSellBusTripOffer
this.apipost('tripbus_ErpSubmitTripBusOffer', this.postMsg, res => {
if (res.data.resultCode == 1) {
this.loading1 = false
this.isShowPrice = false;
this.getList();
} else {
this.loading1 = false
this.Error(res.data.message);
}
submitTripBusOffer() {
// tripbus_SureSellBusTripOffer
this.apipost('tripbus_ErpSubmitTripBusOffer', this.postMsg, res => {
if (res.data.resultCode == 1) {
this.loading1 = false
this.isShowPrice = false;
this.$emit('success')
} else {
this.loading1 = false
this.Error(res.data.message);
}
}, err => {})
},
// 销售取消订单
......@@ -1414,8 +1498,14 @@
})
.catch(() => {});
},
confirmFun() {
let text = '是否确认订单?'
confirmFun(type) {
this.postMsg.OfferState = type
let text
if(type==1){
text = '是否暂存该订单报价?'
}else{
text = '是否保存报价并确认订单?'
}
this.$confirm(text, "提示", {
confirmButtonText: "确定",
cancelButtonText: "取消",
......@@ -1462,6 +1552,7 @@
}
},
mounted() {
this.financeinfo_post_GetList()
this.userInfo = this.getLocalStorage();
//自适应高度调节
this.com_onresize();
......
src/components/busManagement/tripBusOrder.vue
View file @ 6528c717
......@@ -56,7 +56,7 @@
</li>
<li>
<input type="button" class="normalBtn" value="查询" @click="getList(); resetPageIndex()" />
<button class="hollowFixedBtn" type="primary" @click="goUrl(0)">
<button v-if="pagesTitle=='销售'" class="hollowFixedBtn" type="primary" @click="goUrl(0)">
添加
</button>
</li>
......
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