Commit 23178d8e authored by youjie's avatar youjie

no message

parent 10339e3a
...@@ -362,7 +362,7 @@ ...@@ -362,7 +362,7 @@
</div> </div>
</div> </div>
</div> </div>
<div class="flexOne-form-bj"> <div class="flexOne-form-bj" v-if="msg.details.length>0">
<h3>订单信息</h3> <h3>订单信息</h3>
<div class="flexOne-infor-box"> <div class="flexOne-infor-box">
<b></b> <b></b>
...@@ -433,7 +433,7 @@ ...@@ -433,7 +433,7 @@
</div> </div>
</template> </template>
</template> </template>
<div v-else class="noData">没有选择车型</div> <div v-else class="noData">没有订单信息</div>
</div> </div>
</div> </div>
<div class="right-Money"> <div class="right-Money">
...@@ -747,7 +747,7 @@ ...@@ -747,7 +747,7 @@
}, },
created() { created() {
this.msg.Id = this.$route.query.OrderId?this.$route.query.OrderId:0 this.msg.Id = this.$route.query.Id?this.$route.query.Id:0
this.vehicleinit() this.vehicleinit()
this.vehicleList() this.vehicleList()
if(this.msg.Id){ if(this.msg.Id){
......
...@@ -969,11 +969,6 @@ ...@@ -969,11 +969,6 @@
makeAdocument(row, index, num, name) { makeAdocument(row, index, num, name) {
this.BillMakingMsg.ReFinanceId = row.OrderId; this.BillMakingMsg.ReFinanceId = row.OrderId;
this.BillMakingMsg.ReFinanceId2 = num; this.BillMakingMsg.ReFinanceId2 = num;
// if (name == "Hand") {
// this.BillMakingMsg.OtherType = 62;
// } else {
// this.BillMakingMsg.OtherType = 66;
// }
this.BillMakingMsg.OtherType = 67; this.BillMakingMsg.OtherType = 67;
let text = ""; let text = "";
let query = {}; let query = {};
......
...@@ -47,7 +47,7 @@ ...@@ -47,7 +47,7 @@
:style="{ height: boxHeight + 'px' }"> :style="{ height: boxHeight + 'px' }">
<table border="0" cellspacing="1" cellpadding="0" class="busStatisticsTalbe" v-loading='loading'> <table border="0" cellspacing="1" cellpadding="0" class="busStatisticsTalbe" v-loading='loading'>
<tr> <tr>
<th class="w100">序号</th> <th class="w100">订单ID</th>
<th width="130">订车公司</th> <th width="130">订车公司</th>
<th width="110">订车人</th> <th width="110">订车人</th>
<th width="110">团体名称</th> <th width="110">团体名称</th>
...@@ -59,8 +59,8 @@ ...@@ -59,8 +59,8 @@
<th width="110">申请人</th> <th width="110">申请人</th>
<th width="130">下单时间</th> <th width="130">下单时间</th>
<th width="110">报价状态</th> <th width="110">报价状态</th>
<th width="110">确认状态</th> <!-- <th width="110">确认状态</th> -->
<th width="110">操作</th> <th width="200">操作</th>
</tr> </tr>
<tbody v-for="(item, index) in DataList" :key="index"> <tbody v-for="(item, index) in DataList" :key="index">
<tr> <tr>
...@@ -100,24 +100,23 @@ ...@@ -100,24 +100,23 @@
<td> <td>
{{ item.OfferStateName }} {{ item.OfferStateName }}
</td> </td>
<td> <!-- <td>
<!-- <template v-if="item.SureId == 0"> <template v-if="item.SureId == 0">
<span style="color:red">待确认</span> <span style="color:red">待确认</span>
</template> </template>
<template v-else> <template v-else>
<span style="color:red">已确认</span><br /> <span style="color:red">已确认</span><br />
<span style="color:red">确认人:{{ item.SureByName }}</span><br /> <span style="color:red">确认人:{{ item.SureByName }}</span><br />
<span style="color:red">确认时间:{{ item.SureTime }}</span> <span style="color:red">确认时间:{{ item.SureTime }}</span>
</template> --> </template>
</td> </td> -->
<td> <td>
<div class="link" style="display: flex; <div class="link" style="display: flex;
flex-flow: wrap; width: 135px;justify-content: space-around;"> flex-flow: nowrap;">
<el-button size="mini" v-if="item.OfferState == 2" @click="SetTripBusPrice(item, 1)" type="primary">报价 <button class="hollowFixedBtn" type="primary" @click="goUrl(item.Id)">编辑</button>
</el-button> <button class="hollowFixedBtn" type="primary" @click="SetTripBusPrice(item, 2)">详情</button>
<el-button size="mini" @click="SetTripBusPrice(item, 2)" type="primary">详情</el-button> <button class="normalBtn" type="primary" v-if="item.OfferState == 2" @click="SetTripBusPrice(item, 1)">报价</button>
<el-button v-if="item.OfferState==4" style="margin-top: 10px;" size="mini" @click="driver(item.Id)" <button class="normalBtn" type="primary" v-if="item.OfferState==4" @click="driver(item.Id)">添加司机车牌号</button>
type="primary">添加司机车牌号</el-button>
</div> </div>
</td> </td>
</tr> </tr>
...@@ -405,10 +404,11 @@ ...@@ -405,10 +404,11 @@
}, },
methods: { methods: {
goUrl(){ goUrl(Id){
this.$router.push({ this.$router.push({
name: 'CharterAddEditVehicle', name: 'CharterAddEditVehicle',
query: { query: {
Id: Id,
blank: "y", blank: "y",
tab: "新增/编辑团订" tab: "新增/编辑团订"
} }
......
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