Commit c5188b1b authored by youjie's avatar youjie

no message

parent 54bc52f2
...@@ -2626,6 +2626,7 @@ ...@@ -2626,6 +2626,7 @@
PayStatus: "-1", PayStatus: "-1",
IsAirTicket: "2", IsAirTicket: "2",
IsOneDay: 0, IsOneDay: 0,
OrderId: ''
}, },
checkedObj: {}, checkedObj: {},
//返回数据 //返回数据
...@@ -4785,6 +4786,9 @@ ...@@ -4785,6 +4786,9 @@
this.userId = this.getLocalStorage().EmployeeId; this.userId = this.getLocalStorage().EmployeeId;
if (this.$route.query.id) { if (this.$route.query.id) {
this.msg.tempOrderId = this.$route.query.id; this.msg.tempOrderId = this.$route.query.id;
}else if(this.$route.query.crmOrderObj){
let crmOrderObj = JSON.parse(this.$route.query.crmOrderObj)
this.msg.tempOrderId = crmOrderObj.OrderId
} else { } else {
this.msg.QStartDate = new Date().Format("yyyy-MM-dd"); this.msg.QStartDate = new Date().Format("yyyy-MM-dd");
} }
......
...@@ -4076,6 +4076,9 @@ ...@@ -4076,6 +4076,9 @@
this.userId = this.getLocalStorage().EmployeeId this.userId = this.getLocalStorage().EmployeeId
if (this.$route.query.id) { if (this.$route.query.id) {
this.msg.tempOrderId = this.$route.query.id this.msg.tempOrderId = this.$route.query.id
}else if(this.$route.query.crmOrderObj){
let crmOrderObj = JSON.parse(this.$route.query.crmOrderObj)
this.msg.tempOrderId = crmOrderObj.OrderId
} }
this.msg.QStartDate = new Date().Format('yyyy-MM-dd') this.msg.QStartDate = new Date().Format('yyyy-MM-dd')
......
...@@ -631,7 +631,7 @@ ...@@ -631,7 +631,7 @@
@click="CheckOutDetails(scope.row)"></i> @click="CheckOutDetails(scope.row)"></i>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <!-- <el-table-column
label="操作" label="操作"
min-width="70" min-width="70"
style="background:#EAEAEA" style="background:#EAEAEA"
...@@ -640,7 +640,7 @@ ...@@ -640,7 +640,7 @@
<input type="button" class="normalBtn" value="查看" <input type="button" class="normalBtn" value="查看"
@click="goDetails(scope.row)" /> @click="goDetails(scope.row)" />
</template> </template>
</el-table-column> </el-table-column> !-->
<template slot="append" v-if="item.Remark"> <template slot="append" v-if="item.Remark">
<div style="padding:10px;color:#f1416c">客户备注:{{item.Remark}}</div> <div style="padding:10px;color:#f1416c">客户备注:{{item.Remark}}</div>
</template> </template>
......
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