productDev/gtzxinglijicun.git

			@@ -32,11 +32,7 @@
			<el-option label="已接单" :value="3"></el-option>
			<el-option label="派送中" :value="4"></el-option>
			<el-option label="已到店/已送达" :value="5"></el-option>
			<el-option label="存在逾期" :value="6"></el-option>
			<el-option label="已完成" :value="7"></el-option>
			<el-option label="订单关闭（退款）" :value="96"></el-option>
			<el-option label="取消逾期" :value="97"></el-option>
			<el-option label="取消中" :value="98"></el-option>
			<el-option label="已取消" :value="99"></el-option>
			</el-select>
			</el-form-item>
			@@ -94,7 +90,14 @@
			<el-table-column label="异常金额" min-width="100px">
			<template slot-scope="{row}">¥{{ (row.exceptionAmount / 100).toFixed(2) }}</template>
			</el-table-column>
			<el-table-column label="结算状态" min-width="100px">
			<el-table-column prop="statusDesc" label="订单状态" min-width="100px">
			<template slot-scope="{row}">
			<span :style="{ color: row.status <7 ? '#e6a23c' : (row.status ===7 ? '#67c23a' : 'grey' )}">
			{{ row.statusDesc }}
			</span>
			</template>
			</el-table-column>
			<el-table-column label="结算状态" min-width="100px">
			<template slot-scope="{row}">
			<span :style="{ color: row.settlementStatus === 1 ? '#67c23a' : '#e6a23c' }">
			{{ row.settlementStatus === 1 ? '已结算' : '未结算' }}
			@@ -103,7 +106,7 @@
			</el-table-column>
			<el-table-column label="操作" min-width="120" fixed="right">
			<template slot-scope="{row}">
			<el-button type="text" @click="handleDispatch(row)">手动派单</el-button>
			<el-button type="text" v-if="row.status ===2" @click="handleDispatch(row)">手动派单</el-button>
			</template>
			</el-table-column>
			</el-table>
			@@ -113,8 +116,8 @@
			:pagination="tableData.pagination"
			></pagination>
			</template>
			<OperaDispatch ref="operaDispatch" />
			<OperaOrderDetail ref="operaOrderDetail" />
			<OperaDispatch ref="operaDispatch" @success="handlePageChange" />
			<OperaOrderDetail ref="operaOrderDetail" @success="handlePageChange" />
			</TableLayout>
			</template>