|
|
@@ -3,12 +3,7 @@
|
|
|
<x-crud class="liu-crud-wrap order-list-wrap" @load="onLoad">
|
|
|
<!-- tabs -->
|
|
|
<template #slot-tabs="{ scope }">
|
|
|
- <el-tabs
|
|
|
- class="liu-tabs"
|
|
|
- type="border-card"
|
|
|
- v-model="tabIndex"
|
|
|
- @tab-click="handleClick"
|
|
|
- >
|
|
|
+ <el-tabs class="liu-tabs" type="border-card" v-model="tabIndex" @tab-click="handleClick">
|
|
|
<el-tab-pane
|
|
|
v-for="(item, index) in tabsData"
|
|
|
:key="index"
|
|
|
@@ -24,8 +19,7 @@
|
|
|
:underline="true"
|
|
|
@click="detailShowFn(scope.row)"
|
|
|
style="font-size:12px;display:inline-block;"
|
|
|
- >{{ scope.row.orderSn }}</el-link
|
|
|
- >
|
|
|
+ >{{ scope.row.orderSn }}</el-link>
|
|
|
</template>
|
|
|
|
|
|
<!-- 订花人 -->
|
|
|
@@ -74,11 +68,7 @@
|
|
|
finish-status="success"
|
|
|
size="mini"
|
|
|
>
|
|
|
- <el-step
|
|
|
- title=""
|
|
|
- v-for="(item, index) in parseInt(scope.row.totalFlow)"
|
|
|
- :key="index"
|
|
|
- ></el-step>
|
|
|
+ <el-step title v-for="(item, index) in parseInt(scope.row.totalFlow)" :key="index"></el-step>
|
|
|
</el-steps>
|
|
|
</div>
|
|
|
<!-- <div>{{ scope.row.currentFlow }}</div> -->
|
|
|
@@ -97,11 +87,7 @@
|
|
|
<template #table-column-inform="{scope}">
|
|
|
<span v-if="scope.row.sendType == 0">-</span>
|
|
|
<span v-else>
|
|
|
- <i
|
|
|
- class="el-icon-success"
|
|
|
- v-if="scope.row.inform == 1"
|
|
|
- style="color:#67C23A;font-size:19px;"
|
|
|
- ></i>
|
|
|
+ <i class="el-icon-success" v-if="scope.row.inform == 1" style="color:#67C23A;font-size:19px;"></i>
|
|
|
<i class="el-icon-success" v-else style="color:#C0C4CC;font-size:19px;"></i>
|
|
|
</span>
|
|
|
</template>
|
|
|
@@ -113,28 +99,16 @@
|
|
|
<el-button type="text" size="small" disabled>发货</el-button>
|
|
|
</template>
|
|
|
|
|
|
- <template v-else-if="['4', '5', '6'].indexOf(scope.row.status) != -1"> </template>
|
|
|
+ <template v-else-if="['4', '5', '6'].indexOf(scope.row.status) != -1"></template>
|
|
|
<template v-else>
|
|
|
<template v-if="scope.row.currentFlow == 1">
|
|
|
<el-popover placement="top" width="160" :ref="'popover-' + scope.row.id">
|
|
|
<p>确认已自取？</p>
|
|
|
<div style="text-align: right; margin: 0">
|
|
|
- <el-button
|
|
|
- size="mini"
|
|
|
- type="text"
|
|
|
- @click="selfGetCancel(scope.row.id)"
|
|
|
- >取消</el-button
|
|
|
- >
|
|
|
- <el-button
|
|
|
- type="primary"
|
|
|
- size="mini"
|
|
|
- @click="noSendShipFn(scope.row)"
|
|
|
- >确定</el-button
|
|
|
- >
|
|
|
+ <el-button size="mini" type="text" @click="selfGetCancel(scope.row.id)">取消</el-button>
|
|
|
+ <el-button type="primary" size="mini" @click="noSendShipFn(scope.row)">确定</el-button>
|
|
|
</div>
|
|
|
- <el-button slot="reference" size="mini" type="primary" plain
|
|
|
- >自取</el-button
|
|
|
- >
|
|
|
+ <el-button slot="reference" size="mini" type="primary" plain>自取</el-button>
|
|
|
</el-popover>
|
|
|
|
|
|
<el-button
|
|
|
@@ -143,13 +117,10 @@
|
|
|
type="primary"
|
|
|
plain
|
|
|
style="margin-left:14px;"
|
|
|
- >发货</el-button
|
|
|
- >
|
|
|
+ >发货</el-button>
|
|
|
</template>
|
|
|
<template v-else>
|
|
|
- <el-button size="mini" type="primary" plain @click="shipDrawFn(scope.row)"
|
|
|
- >继续</el-button
|
|
|
- >
|
|
|
+ <el-button size="mini" type="primary" plain @click="shipDrawFn(scope.row)">发货</el-button>
|
|
|
</template>
|
|
|
</template>
|
|
|
</template>
|
shish