|
@@ -140,13 +140,10 @@
|
|
</el-table-column>
|
|
</el-table-column>
|
|
<el-table-column align="left" label="订单号" prop="orderId" min-width="130" show-overflow-tooltip>
|
|
<el-table-column align="left" label="订单号" prop="orderId" min-width="130" show-overflow-tooltip>
|
|
<template slot-scope="scope">
|
|
<template slot-scope="scope">
|
|
-<<<<<<< Updated upstream
|
|
|
|
|
|
+
|
|
<CopyButton :copyText="scope.row.enginOrderType =='HOME' || scope.row.enginOrderType =='TRADE'? scope.row.enginOrderNo :scope.row.mainOrderId " />
|
|
<CopyButton :copyText="scope.row.enginOrderType =='HOME' || scope.row.enginOrderType =='TRADE'? scope.row.enginOrderNo :scope.row.mainOrderId " />
|
|
<span>{{scope.row.enginOrderType =='HOME' || scope.row.enginOrderType =='TRADE'? scope.row.enginOrderNo :scope.row.mainOrderId }}</span>
|
|
<span>{{scope.row.enginOrderType =='HOME' || scope.row.enginOrderType =='TRADE'? scope.row.enginOrderNo :scope.row.mainOrderId }}</span>
|
|
-=======
|
|
|
|
- <CopyButton :copyText="scope.row.enginOrderType =='HOME' || scope.row.enginOrderType =='TRADE'? scope.row.enginOrderNo :scope.row.mainOrderId" />
|
|
|
|
- <span>{{scope.row.enginOrderType =='HOME' || scope.row.enginOrderType =='TRADE'? scope.row.enginOrderNo :scope.row.mainOrderId}}</span>
|
|
|
|
->>>>>>> Stashed changes
|
|
|
|
|
|
+
|
|
</template>
|
|
</template>
|
|
</el-table-column>
|
|
</el-table-column>
|
|
<el-table-column align="left" label="经销商编码" prop="customerNumber" min-width="100" show-overflow-tooltip>
|
|
<el-table-column align="left" label="经销商编码" prop="customerNumber" min-width="100" show-overflow-tooltip>
|