Commit 12a063cd authored by youjie's avatar youjie

no message

parent 48e1ce26
...@@ -17,9 +17,12 @@ ...@@ -17,9 +17,12 @@
label="订单Id" label="订单Id"
show-overflow-tooltip> show-overflow-tooltip>
<template slot-scope="scope"> <template slot-scope="scope">
<div> <div @click="goDetails(scope.row)">
<p style="font-size: 18px;display: flex;align-items: center;"><el-tag style="margin-right: 5px;" size="mini">{{scope.row.OrderTypeName}}</el-tag><span>{{scope.row.OrderId}}</span> </p> <p style="font-size: 18px;display: flex;align-items: center;">
<p>下单日期:{{scope.row.CreateTimeStr}}</p> <el-tag style="margin-right: 5px;" size="mini">{{scope.row.OrderTypeName}}</el-tag>
<span class="cp blue">{{scope.row.OrderId}}</span>
</p>
<p>{{scope.row.CreateTimeStr}}</p>
</div> </div>
</template> </template>
</el-table-column> </el-table-column>
...@@ -125,13 +128,13 @@ ...@@ -125,13 +128,13 @@
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <!-- <el-table-column
label="操作" label="操作"
show-overflow-tooltip> show-overflow-tooltip>
<template slot-scope="scope"> <template slot-scope="scope">
<el-button size="mini" type="primary" @click="goDetails(scope.row)">查看</el-button> <el-button size="mini" type="primary" @click="goDetails(scope.row)">查看</el-button>
</template> </template>
</el-table-column> </el-table-column> -->
</el-table> </el-table>
<el-drawer :with-header="false" size='70%' :visible.sync="drawer" direction="rtl" :before-close="handleClose"> <el-drawer :with-header="false" size='70%' :visible.sync="drawer" direction="rtl" :before-close="handleClose">
<customerInfoBox :CustomerId="CustomerId" :activeNameNum="activeNameNum" :receiptType="receiptType"/> <customerInfoBox :CustomerId="CustomerId" :activeNameNum="activeNameNum" :receiptType="receiptType"/>
...@@ -221,7 +224,12 @@ export default { ...@@ -221,7 +224,12 @@ export default {
if (row.OrderType == 1) { if (row.OrderType == 1) {
let name = '' let name = ''
if(this.pagesTitle=='销售'||this.pagesTitle=='详情'){ if(this.pagesTitle=='销售'||this.pagesTitle=='详情'){
if(this.pagesTitle=='销售'){
name = 'myCustomerOrder' name = 'myCustomerOrder'
}
if(this.pagesTitle=='详情'){
name = 'myCustomerOrder'
}
}else{ }else{
name = 'customerOrder' name = 'customerOrder'
} }
......
...@@ -120,7 +120,7 @@ ...@@ -120,7 +120,7 @@
Domain: "fcrmyx.oytour.com", Domain: "fcrmyx.oytour.com",
}; };
if (!this.isOnline()) { if (!this.isOnline()) {
msg.Domain = "localhost";//www.test.com localhost msg.Domain = "www.test.com";//www.test.com localhost
} }
this.apipost("/api/Login/UserLogin", msg, (res) => { this.apipost("/api/Login/UserLogin", msg, (res) => {
var jsonData = res.data; var jsonData = res.data;
......
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