|
|
@@ -1,9 +1,9 @@
|
|
|
<template>
|
|
|
<view class="app-content">
|
|
|
- <stepStatus
|
|
|
- v-if="!$util.isEmpty(detailInfo)"
|
|
|
- :stepOptions="detailInfo.progress"
|
|
|
- ></stepStatus>
|
|
|
+<!-- <stepStatus-->
|
|
|
+<!-- v-if="!$util.isEmpty(detailInfo)"-->
|
|
|
+<!-- :stepOptions="detailInfo.progress"-->
|
|
|
+<!-- ></stepStatus>-->
|
|
|
<view v-if="!$util.isEmpty(detailInfo)" class="info-content_box">
|
|
|
<view class="title">
|
|
|
客户
|
|
|
@@ -54,13 +54,21 @@
|
|
|
<view>出货日期：</view>
|
|
|
<view>{{ detailInfo.outTime }}</view>
|
|
|
</view>
|
|
|
+ <view class="order-info_box">
|
|
|
+ <view>欠款：</view>
|
|
|
+ <view>{{ detailInfo.debt==1?'是':'否' }}</view>
|
|
|
+ </view>
|
|
|
+ <view class="order-info_box">
|
|
|
+ <view>订单状态：</view>
|
|
|
+ <view>{{ detailInfo.status==1?'待付款':detailInfo.status==2?'待配送':detailInfo.status==3?'配送中':detailInfo.status==4?'已完成':detailInfo.status==5?'已取消':'已退款' }}</view>
|
|
|
+ </view>
|
|
|
<!-- <view class="order-info_box">
|
|
|
<view>销售门店：</view>
|
|
|
<view>2020 11-22</view>
|
|
|
</view> -->
|
|
|
</view>
|
|
|
- <view class="content-box shipping-address">
|
|
|
- <view> 配送进展：<text>骑手已接单，取货中</text> </view>
|
|
|
+ <view class="content-box shipping-address" v-if="detailInfo.expressProgress!=''">
|
|
|
+ <view> 配送进展：<text>{{ detailInfo.expressProgress.progressName }}</text> </view>
|
|
|
<i class="iconfont iconqishouyinying"></i>
|
|
|
</view>
|
|
|
<view class="title">
|
|
|
@@ -86,28 +94,21 @@
|
|
|
</text>
|
|
|
</view>
|
|
|
<view class="info-line">
|
|
|
- <text class="item-type">{{ s.price }}</text>
|
|
|
+ <text class="item-type">{{ s.property }}</text>
|
|
|
<text class="item-count">{{ `${s.bigNum}/${s.smallNum}` }}</text>
|
|
|
</view>
|
|
|
</view>
|
|
|
</view>
|
|
|
</view>
|
|
|
<view class="summary-bar">
|
|
|
- <view
|
|
|
- v-if="
|
|
|
- detailInfo.status == ORDER_STATUS.NOPAY ||
|
|
|
- detailInfo.status == ORDER_STATUS.UNDIS
|
|
|
- "
|
|
|
- class="operate-view"
|
|
|
- @click="gotoSelect"
|
|
|
- >
|
|
|
+<!-- <view v-if="detailInfo.status == ORDER_STATUS.NOPAY || detailInfo.status == ORDER_STATUS.UNDIS" class="operate-view" @click="gotoSelect">-->
|
|
|
+ <view v-if="detailInfo.showResetItem == 1" class="operate-view" @click="gotoSelect">
|
|
|
<text class="iconfont icongouwuche"></text>
|
|
|
- 重选花材
|
|
|
+ 改花材
|
|
|
</view>
|
|
|
<view class="describe-view">
|
|
|
- 共{{ detailInfo.product.length || 0 }}种, 共{{ detailInfo.bigNum }}扎{{
|
|
|
- detailInfo.smallNum
|
|
|
- }}支，合计 ¥<text class="price">{{ detailInfo.actPrice }}</text>
|
|
|
+ 共{{ detailInfo.productStat.kind || 0 }}种, 共{{ detailInfo.productStat.bigNum }}扎{{
|
|
|
+ detailInfo.productStat.smallNun}}支，合计 ¥<text class="price">{{ detailInfo.productStat.totalPrice }}</text>
|
|
|
</view>
|
|
|
</view>
|
|
|
</view>
|
|
|
@@ -146,19 +147,19 @@
|
|
|
<button
|
|
|
:key="s.type"
|
|
|
@click="openBt(s, detailInfo)"
|
|
|
- v-if="s.disable == 1"
|
|
|
- class="admin-button-com default"
|
|
|
- >
|
|
|
- {{ s.type === "item" ? "花材" : s.type === "selfGet" ? "自取" : "发货" }}
|
|
|
+ v-if="s.show == 1"
|
|
|
+ :disabled="s.disable === 1"
|
|
|
+ class="admin-button-com default" :class="s.disable === 1?'active':''">
|
|
|
+ {{ s.type === "item" ? "花材" : s.type === "selfGet" ? "自取" :s.type === "print" ? "打印" : "发货" }}
|
|
|
</button>
|
|
|
</template>
|
|
|
- <button
|
|
|
- @click="pageTo({
|
|
|
- url:'/pagesOrder/print'
|
|
|
- })"
|
|
|
- class="admin-button-com default">
|
|
|
- 打印
|
|
|
- </button>
|
|
|
+<!-- <button-->
|
|
|
+<!-- @click="pageTo({-->
|
|
|
+<!-- url:'/pagesOrder/print'-->
|
|
|
+<!-- })"-->
|
|
|
+<!-- class="admin-button-com default">-->
|
|
|
+<!-- 打印-->
|
|
|
+<!-- </button>-->
|
|
|
</div>
|
|
|
<!-- 免发货弹窗 -->
|
|
|
<modal-module
|
|
|
@@ -492,6 +493,12 @@ export default {
|
|
|
height: 70px;
|
|
|
line-height: 70px;
|
|
|
text-align: center;
|
|
|
+ color: #3385ff;
|
|
|
+ border: 1px solid #3385ff;
|
|
|
+ &.active{
|
|
|
+ color: #666666;
|
|
|
+ border: 1px solid #ccc;
|
|
|
+ }
|
|
|
}
|
|
|
}
|
|
|
</style>
|
jf