|
|
@@ -75,7 +75,12 @@
|
|
|
<span v-if="scope.row.payTimeType == '1'">取衣付款</span>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
- <el-table-column label="状态" align="center" width="150">
|
|
|
+ <el-table-column label="预约配送状态" align="center" width="150">
|
|
|
+ <template slot-scope="scope">
|
|
|
+ <dict-tag :options="dict.type.cloth_appointment_status" :value="scope.row.refundStatus" />
|
|
|
+ </template>
|
|
|
+ </el-table-column>
|
|
|
+ <el-table-column label="订单状态" align="center" width="150">
|
|
|
<template slot-scope="scope">
|
|
|
<dict-tag :options="dict.type.cloth_order_status" :value="scope.row.orderStatus" />
|
|
|
</template>
|
|
|
@@ -130,7 +135,7 @@
|
|
|
{{ orderDetail.createTime }}
|
|
|
</el-descriptions-item>
|
|
|
<el-descriptions-item :span="2" v-if="userInfoVO.userType == '00'">
|
|
|
- <template slot="label"> 门店/工厂名称 </template>
|
|
|
+ <template slot="label"> 门店名称 </template>
|
|
|
{{ orderDetail.sysOrg ? orderDetail.sysOrg.name : '' }}
|
|
|
</el-descriptions-item>
|
|
|
<el-descriptions-item>
|
|
|
@@ -143,7 +148,6 @@
|
|
|
<el-table :data="orderClothDetails" fit highlight-current-row border stripe>
|
|
|
<el-table-column label="衣物条码" align="center" prop="washCode" width="180" fixed="left" />
|
|
|
<el-table-column label="衣服名称" align="center" prop="clothItemName" width="200">
|
|
|
-
|
|
|
<template slot-scope="scope">
|
|
|
<span> {{ calculateClothName(scope.row) }} </span>
|
|
|
</template>
|
|
|
@@ -156,11 +160,11 @@
|
|
|
</span>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
- <el-table-column label="瑕疵" align="center">
|
|
|
+ <el-table-column label="瑕疵" align="center" width="150">
|
|
|
<template slot-scope="scope">
|
|
|
- <el-tag size="small" v-for="item in scope.row.orderClothFlaws" style="margin-right: 10px; margin-bottom: 2.5px; margin-top: 2.5px">
|
|
|
- {{ item.clothFlawName }}
|
|
|
- </el-tag>
|
|
|
+ <span v-for="(item, index) in scope.row.orderClothFlaws">
|
|
|
+ {{ index == 0 ? item.clothFlawName : ',' + item.clothFlawName }}
|
|
|
+ </span>
|
|
|
<el-tag v-if="!scope.row.orderClothFlaws">暂无</el-tag>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
@@ -227,7 +231,7 @@ import { allOrg } from '@/api/system/store'
|
|
|
|
|
|
export default {
|
|
|
name: 'ClothItem',
|
|
|
- dicts: ['sys_yes_no', 'order_cloth_flow_status', 'order_cloth_flow_action', 'cloth_order_status', 'goods_order_refund_status'],
|
|
|
+ dicts: ['sys_yes_no','cloth_appointment_status', 'order_cloth_flow_status', 'order_cloth_flow_action', 'cloth_order_status', 'goods_order_refund_status'],
|
|
|
data() {
|
|
|
return {
|
|
|
orgList: [],
|
