Merge branch 'master' of http://git.dongkesoft.com:9001/iBOSS-2.0-Mini/iboss_wx_app

components/dkbase/dk-form-bill/dk-form-bill.wxml

@@ -117,6 +117,7 @@
             <view wx:if="{{!readonly}}" slot="right">删除</view>
           </van-swipe-cell>
         </view>
+        <van-empty wx:if="{{!form[itemName] || form[itemName].length == 0}}" description="暂未选择商品" />
         <block style="text-align: center; " wx:if="{{card.displayNum && form[itemName].length > card.displayNum}}">
           <view wx:if="{{card.showMore}}" class="expand-class" data-card="{{card}}" data-index="{{cardIndex}}" bindtap='expand'>
             点击收起部分
@@ -133,14 +134,12 @@
           <!--标价折扣-->
           <dk-cell amount="{{false}}" contentColor="#FF7B1A" contentFontWeight="700" titleColor="#95A8CB;" title="标价折扣" content="{{card[discountStandardCol]?card[discountStandardCol]:''  +'折'}}"></dk-cell>
         </view> 
-
         <view wx:if="{{sumAmountColFlag}}" class="amount-item-class">
           <!--条数-->
           <dk-cell titleColor="#95A8CB;" title="{{$t['together'] + (form[itemName]?form[itemName].length:0) + $t['piece']}}" amount="{{false}}"></dk-cell>
           <!--标价折扣-->
           <dk-cell fontSize="16" fontWeight="bold" contentFontWeight="700" contentColor="#FF7B1A" titleColor="#1B365D;" title="合计金额" content="{{card[sumAmountCol]?card[sumAmountCol]:0}}"></dk-cell>
         </view>
-
         <view class="amount-item-class" wx:if="{{type === 'sale'}}">
           <view style="display: flex;">
             <!--使用收款-->

package-basic-data/pages/customer-list/detail/detail.js

@@ -28,7 +28,9 @@ Page({
     customerFollowList: [],
     paymentRecordsList: [],
     refundRecordsList: [],
+    orderList: [],
     active: 0,
+    activeCard: 0,
     // 主键Id
     primaryKey: 'cusId',
   },

package-basic-data/pages/customer-list/detail/detail.wxml

@@ -206,293 +206,76 @@
 
 
   <van-tab title-style="color:#96A7C5;" title="交易记录">
-  </van-tab>
-  <view wx:if="{{active == 1}}">
-
-    <view style="margin-bottom: 15rpx;"></view>
-    <van-tabs type="card" border="{{false}}" active="{{ activeCard }}" bind:change="changeTag" tab-active-class="{{activeCard==0?'van-tab-active-left':(activeCard==2?'van-tab-active-right':'van-tab-active-middle')}}">
-      <van-tab title="预算报价">
-
-
-      </van-tab>
-
-      <van-tab title="成交订单">
-
-
-      </van-tab>
-
-      <van-tab title="销售退货">
-
-      </van-tab>
-    </van-tabs>
-
-    <view wx:if="{{activeCard == 0}}">
-      <view wx:for="{{orderList_price}}" data-index="{{index}}" data-item="item">
-
-        <view class="dk-card-outer-class">
-          <view class="dk-card-class">
-            <view style="display:flex;padding: 2vw;">
-              <image style="width:48rpx;height:48rpx;align-self:center;margin: 16rpx;" src="{{imageUrl + 'customer-assignment.png'}}"></image>
-              <view style="font-weight:bold;font-size: 13px;white-space:nowrap;align-self:center;">{{item.orderNo}}
-              </view>
-            </view>
-
-            <view style="height: 1px;background:#E9F0FE;width:90%;margin-left:5vw;" />
-            <view style="display:flex;font-size: 26rpx;">
-              <view style="margin:2vw;margin-left: 32rpx;">门店:{{item.orgName}}</view>
-              <view style="flex:1;text-align:right;margin: 2vw;margin-right: 32rpx;white-space:nowrap;">
-                导购:{{item.staffName}}</view>
-            </view>
-            <van-grid column-num="3">
-              <view style="display: flex;background-color:white;">
-                <view class="number-out-order">
-                  <view class="order-summary">
-                    <dk-cell center="center" height="46rpx" spaceWidth="1rpx" left="0" fontSize="17" contentColor="#CAA977" fontWeight="600" title="" content="{{item.sumAmount}}"></dk-cell>
-                  </view>
-                  <view class="out-oreder-detail">
-                    报价金额
-                  </view>
-                </view>
-
-                <view class="number-out-order">
-                  <view class="order-summary">
-                    <dk-text fontSize="17" color="#1B365D" value="{{item.categoryQuantity}}">
-                    </dk-text>
-                  </view>
-                  <view class="out-oreder-detail">
-                    品类数
-                  </view>
-                </view>
-
-                <view class="number-out-order">
-                  <view class="order-summary">
-                    <dk-text fontSize="17" color="#1B365D" value="{{item.sumQuantity}}">
-                    </dk-text>
-                  </view>
-                  <view class="out-oreder-detail">
-                    产品件数
-                  </view>
-                </view>
-              </view>
-            </van-grid>
-
-            <view style="height: 1px;background:#E9F0FE;width:90%;margin-left:5vw;" />
-            <van-collapse value="{{ activeNames_goods }}" bind:change="onChange_goods">
-              <van-collapse-item name="{{index+1}}" value="展开">
-                <view slot="title">
-                  <view style="display: flex;">
-                    <view>商品明细</view>
-                    <view style="color:#b9b9b9;font-size:10px;flex:1;text-align-last: right;"></view>
-                  </view>
-                </view>
-
-                <view wx:for="{{item.orderItemVOList}}" data-item="{{item}}" wx:for-item="item" wx:key="index" wx:for-index="childindex" border="{{ true }}">
-
-                  <van-card data-item="{{item}}" data-index="{{index}}">
-
-                    <view slot="thumb">
-                      <van-image radius="5px" width="80" height="80" src="{{item.iconThumPath }}" />
-                    </view>
-                    <view slot="title" style="display: flex;">
-
-                      <view style="display: flex;">
-
-                        <dk-title titleTag="{{item.titleTag}}" title="{{item.title}}"></dk-title>
-                      </view>
-
-                      <view wx:if="{{item.flag}}" style="text-align: right;width: 30%;">
-                        <van-tag catchtap="flag_bindtap" wx:if="{{item.flag}}" type="danger" color="red" style="text-align: right;">可换件</van-tag>
-                        <van-tag catchtap="flag_bindtap" wx:if="{{item.flag}}" type="danger" color="red" style="text-align: right;">需设计</van-tag>
-                      </view>
-                    </view>
-
-                    <view slot="desc">
-                      <view style="display:flex;width: 100%;">
-                        <view style="width: 80%;">
-                          <dk-text fontWeight="nomal" value="{{item.desc}}"></dk-text>
-
-                        </view>
-
-                      </view>
-                    </view>
-                    <view slot="price">
-                      <view style="display: flex;width: 100%;flex-direction: row;">
-                        <view style="color: red;font-size: 4vw;width: 100%;">
-                          <dk-cell center="center" height="46rpx" spaceWidth="1rpx" left="0" fontSize="16" contentColor="#CAA977" fontWeight="600" title="" content="{{numberFormat.toThousandCents(item.priceSale ? item.priceSale : 0)}}"></dk-cell>
-                        </view>
-                        <view style="width: 100%;text-align: right;font-size: 3.5vw;color: #95A8CB;">x <span style="line-height:56rpx;">{{item.itemQuantity}}</span></view>
-                      </view>
-                    </view>
-
-
-
-
-                    <view slot="footer">
-                      <view style="margin-top: 15rpx;" wx:if="{{item.bomItems.length > 0}}">
-                        <view style="width: 100%;display: flex;">
-                          <view style="font-size: 14px;width: 50%;text-align: left;color: #95A8CB;">
-                            明细
-                          </view>
-                          <view style="font-size: 14px;width: 50%;text-align: right;color: #95A8CB;" data-item="{{item}}" data-big="{{index}}" data-index="{{childindex}}" catchtap="onPriceOpenGoodsList">
-                            {{item.packageDetailsFlag ? '收起' :'展开'}}
-                            <van-icon name="{{item.packageDetailsFlag ? 'arrow-up' :'arrow-down' }}" />
-                          </view>
-                        </view>
-
-                        <view wx:if="{{item.packageDetailsFlag}}">
-
-                          <view wx:for="{{item.bomItems}}" data-item="{{item2}}" wx:for-item="item2" wx:key="index2">
-                            <view style="text-align: left;width: 100%; padding-left: 15rpx;padding-top:15rpx;">
-                              <view style="display: flex;">
-                                <view>
-                                  <van-image radius="5px" width="65" height="65" src="{{item2.iconThumPath }}" />
-                                </view>
-                                <view style="margin-left:5px;width: 66vw;">
-
-                                  <view style="display: flex;">
-
-
-                                    <dk-title titleTag="{{item2.titleTag}}" title="{{item2.skuModel}}"></dk-title>
-                                  </view>
-
-                                  <view style="display: flex;font-size:3.2vw; ">
-                                    <text decode>{{item2.skuName}}</text>
-                                  </view>
-
-                                  <view style="display: flex;font-size:3.2vw; ">
-                                    <text decode>{{' '}}</text>
-                                  </view>
-                                  <view slot="footer" style="width:100%;justify-content: flex-end;margin-top:20rpx;text-align:right;align-self: flex-end;">
-                                    <view style="display: flex;width: 100%;flex-direction: row;">
-                                      <view style="color: red;font-size: 4vw;width: 100%;text-align: left;">
-                                        <dk-cell center="center" height="46rpx" spaceWidth="1rpx" left="0" fontSize="16" contentColor="#CAA977" fontWeight="600" title="" content="{{numberFormat.toThousandCents(item2.priceSale)}}"></dk-cell>
-                                      </view>
-                                      <view style="width: 100%;text-align: right;font-size: 3.5vw;color: #95A8CB;">x <span style="line-height:56rpx;">{{item2.itemQuantity }}</span></view>
-                                    </view>
-                                  </view>
-                                </view>
-                              </view>
-                            </view>
-                          </view>
+    <view>
+      <!-- <van-tabs type="card" border="{{false}}" active="{{ activeCard }}" bind:change="changeTag" tab-active-class="{{activeCard==0?'van-tab-active-left':(activeCard==2?'van-tab-active-right':'van-tab-active-middle')}}">
+        <van-tab title="预算报价">
 
-                        </view>
-                      </view>
-                      <view class="hr"></view>
-                      <view style="display: flex;width: 100%;margin-top:5px;" data-index="{{index}}">
-                        <view style="width: 70%;text-align: left;font-size: 3.5vw;color: #95A8CB;">
-                          备注：<span style="line-height:56rpx;">{{item.remarks ? item.remarks : ''}}</span>
-                        </view>
-                        <!-- <view style="width: 100%;text-align: right;font-size: 3.5vw;color: #95A8CB;">金额：<span style="line-height:56rpx;color:#CAA977;">
-                            ￥{{ numberFormat.toThousandCents((item.priceSale ?
-                            item.priceSale : 0) * item.itemQuantity)}}</span></view> -->
-                      </view>
 
-                    </view>
+        </van-tab>
 
-                  </van-card>
+        <van-tab title="成交订单">
 
-                  <van-divider />
-                </view>
 
-              </van-collapse-item>
-            </van-collapse>
+        </van-tab>
 
-          </view>
-        </view>
+        <van-tab title="销售退货">
 
+        </van-tab>
+      </van-tabs> -->
 
-      </view>
-      <van-empty wx:if="{{orderList_price.length==0}}" description="暂无数据" />
-    </view>
-
+      <view wx:if="{{activeCard == 0}}">
+        <view wx:for="{{orderList}}" data-index="{{index}}" data-item="item">
 
-
-    <view wx:if="{{activeCard == 1}}">
-      <scroll-view scroll-y="true" style="height: 1300rpx;" bindscrolltolower="paging" scroll-top="{{topNum}}">
-        <view wx:for="{{orderList_ok}}" data-index="{{index}}" wx-key="index" data-item="item">
           <view class="dk-card-outer-class">
             <view class="dk-card-class">
               <view style="display:flex;padding: 2vw;">
                 <image style="width:48rpx;height:48rpx;align-self:center;margin: 16rpx;" src="{{imageUrl + 'customer-assignment.png'}}"></image>
-                <view style="width: 60%;">
-                  <view style="font-weight:bold;font-size: 26rpx;white-space:nowrap;">{{item.orderNo}}</view>
-
-                  <view style="font-size: 12px;color:#95A8CB;">{{wxmlUtil.format(item.makingTime)}}</view>
-                </view>
-                <view style="width: 30%;display: flex;">
-                  <view style="font-size:13px;align-self:center;flex:1;text-align: right;color:#00A7B5;" bindtap="toOriginal_order" data-item="{{item}}">查看原单
-                    <van-icon name="arrow" />
-                  </view>
+                <view style="font-weight:bold;font-size: 13px;white-space:nowrap;align-self:center;">{{item.orderNo}}
                 </view>
-
               </view>
 
               <view style="height: 1px;background:#E9F0FE;width:90%;margin-left:5vw;" />
               <view style="display:flex;font-size: 26rpx;">
-                <view style="margin:2vw;margin-left:32rpx;">门店:{{item.orgName}}</view>
-                <view style="flex:1;text-align:right;margin: 2vw;margin-right:32rpx;white-space:nowrap;">
+                <view style="margin:2vw;margin-left: 32rpx;">门店:{{item.orgName}}</view>
+                <view style="flex:1;text-align:right;margin: 2vw;margin-right: 32rpx;white-space:nowrap;">
                   导购:{{item.staffName}}</view>
               </view>
               <van-grid column-num="3">
                 <view style="display: flex;background-color:white;">
                   <view class="number-out-order">
                     <view class="order-summary">
-                      <dk-cell center="center" height="46rpx" spaceWidth="1rpx" left="0" fontSize="17" contentColor="#CAA977" fontWeight="600" title="" content="{{item.tSumGoodsAmount}}"></dk-cell>
+                      <dk-cell center="center" height="46rpx" spaceWidth="1rpx" left="0" fontSize="17" contentColor="#CAA977" fontWeight="600" title="" content="{{item.sumAmount}}"></dk-cell>
                     </view>
                     <view class="out-oreder-detail">
-                      订单金额
-                    </view>
-                  </view>
-                  <view class="number-out-order">
-                    <view class="order-summary">
-                      <dk-cell center="center" height="46rpx" spaceWidth="1rpx" left="0" fontSize="17" contentColor="#CAA977" fontWeight="600" title="" content="{{item.sumOutAmount}}"></dk-cell>
-                    </view>
-                    <view class="out-oreder-detail">
-                      出库（1单）
-                    </view>
-                  </view>
-                  <view class="number-out-order">
-                    <view class="order-summary">
-                      <dk-cell center="center" height="46rpx" spaceWidth="1rpx" left="0" fontSize="17" contentColor="#CAA977" fontWeight="600" title="" content="{{item.tSumGoodsAmount - item.sumOutAmount?item.tSumGoodsAmount - item.sumOutAmount:0}}">
-                      </dk-cell>
-                    </view>
-                    <view class="out-oreder-detail">
-                      未出库
-                    </view>
-                  </view>
-                </view>
-                <view style="display: flex;background-color:white;">
-                  <view class="number-out-order">
-                    <view class="order-summary">
-                      <dk-cell center="center" height="46rpx" spaceWidth="1rpx" left="0" fontSize="17" contentColor="#CAA977" fontWeight="600" title="" content="{{item.sumReceiptAmount}}"></dk-cell>
-                    </view>
-                    <view class="out-oreder-detail">
-                      定金金额
+                      报价金额
                     </view>
                   </view>
+
                   <view class="number-out-order">
                     <view class="order-summary">
-                      <dk-cell center="center" height="46rpx" spaceWidth="1rpx" left="0" fontSize="17" contentColor="#CAA977" fontWeight="600" title="" content="{{item.receivable}}"></dk-cell>
+                      <dk-text fontSize="17" color="#1B365D" value="{{item.categoryQuantity}}">
+                      </dk-text>
                     </view>
                     <view class="out-oreder-detail">
-                      订单欠款
+                      品类数
                     </view>
                   </view>
+
                   <view class="number-out-order">
                     <view class="order-summary">
-                      <dk-cell center="center" height="46rpx" spaceWidth="1rpx" left="0" fontSize="17" contentColor="#CAA977" fontWeight="600" title="" content="{{item.sumRejectAmount}}"></dk-cell>
+                      <dk-text fontSize="17" color="#1B365D" value="{{item.sumQuantity}}">
+                      </dk-text>
                     </view>
                     <view class="out-oreder-detail">
-                      退货
+                      产品件数
                     </view>
                   </view>
                 </view>
-
               </van-grid>
 
               <view style="height: 1px;background:#E9F0FE;width:90%;margin-left:5vw;" />
               <van-collapse value="{{ activeNames_goods }}" bind:change="onChange_goods">
-                <van-collapse-item name="{{index+1}}" style="color:#95A8CB;border-color:15rpx;" value="展开">
+                <van-collapse-item name="{{index+1}}" value="展开">
                   <view slot="title">
                     <view style="display: flex;">
                       <view>商品明细</view>
@@ -534,7 +317,7 @@
                           <view style="color: red;font-size: 4vw;width: 100%;">
                             <dk-cell center="center" height="46rpx" spaceWidth="1rpx" left="0" fontSize="16" contentColor="#CAA977" fontWeight="600" title="" content="{{numberFormat.toThousandCents(item.priceSale ? item.priceSale : 0)}}"></dk-cell>
                           </view>
-                          <view style="width: 100%;text-align: right;font-size: 3.5vw;color: #95A8CB;">x <span style="line-height:56rpx;">{{item.tItemQuantity}}</span></view>
+                          <view style="width: 100%;text-align: right;font-size: 3.5vw;color: #95A8CB;">x <span style="line-height:56rpx;">{{item.itemQuantity}}</span></view>
                         </view>
                       </view>
 
@@ -547,7 +330,7 @@
                             <view style="font-size: 14px;width: 50%;text-align: left;color: #95A8CB;">
                               明细
                             </view>
-                            <view style="font-size: 14px;width: 50%;text-align: right;color: #95A8CB;" data-item="{{item}}" data-big="{{index}}" data-index="{{childindex}}" catchtap="onChangeOpenGoodsList">
+                            <view style="font-size: 14px;width: 50%;text-align: right;color: #95A8CB;" data-item="{{item}}" data-big="{{index}}" data-index="{{childindex}}" catchtap="onPriceOpenGoodsList">
                               {{item.packageDetailsFlag ? '收起' :'展开'}}
                               <van-icon name="{{item.packageDetailsFlag ? 'arrow-up' :'arrow-down' }}" />
                             </view>
@@ -565,6 +348,7 @@
 
                                     <view style="display: flex;">
 
+
                                       <dk-title titleTag="{{item2.titleTag}}" title="{{item2.skuModel}}"></dk-title>
                                     </view>
 
@@ -580,7 +364,7 @@
                                         <view style="color: red;font-size: 4vw;width: 100%;text-align: left;">
                                           <dk-cell center="center" height="46rpx" spaceWidth="1rpx" left="0" fontSize="16" contentColor="#CAA977" fontWeight="600" title="" content="{{numberFormat.toThousandCents(item2.priceSale)}}"></dk-cell>
                                         </view>
-                                        <view style="width: 100%;text-align: right;font-size: 3.5vw;color: #95A8CB;">x <span style="line-height:56rpx;">{{item2.tItemQuantity }}</span></view>
+                                        <view style="width: 100%;text-align: right;font-size: 3.5vw;color: #95A8CB;">x <span style="line-height:56rpx;">{{item2.itemQuantity }}</span></view>
                                       </view>
                                     </view>
                                   </view>
@@ -595,9 +379,9 @@
                           <view style="width: 70%;text-align: left;font-size: 3.5vw;color: #95A8CB;">
                             备注：<span style="line-height:56rpx;">{{item.remarks ? item.remarks : ''}}</span>
                           </view>
-                          <view style="width: 100%;text-align: right;font-size: 3.5vw;color: #95A8CB;">金额：<span style="line-height:56rpx;color:#CAA977;">￥{{ numberFormat.toThousandCents((item.priceSale
-                              ?
-                              item.priceSale : 0) * item.tItemQuantity)}}</span></view>
+                          <!-- <view style="width: 100%;text-align: right;font-size: 3.5vw;color: #95A8CB;">金额：<span style="line-height:56rpx;color:#CAA977;">
+                        ￥{{ numberFormat.toThousandCents((item.priceSale ?
+                        item.priceSale : 0) * item.itemQuantity)}}</span></view> -->
                         </view>
 
                       </view>
@@ -609,136 +393,351 @@
 
                 </van-collapse-item>
               </van-collapse>
+
             </view>
           </view>
-        </view>
-      </scroll-view>
 
-      <van-empty wx:if="{{orderList_ok.length==0}}" description="暂无数据" />
-    </view>
 
+        </view>
+        <van-empty wx:if="{{orderList.length==0}}" description="暂无数据" />
+      </view>
 
 
-    <view wx:if="{{activeCard == 2}}">
-      <view wx:for="{{orderList_out}}" data-index="{{index}}" data-item="item">
-        <view class="dk-card-outer-class">
-          <view class="dk-card-class">
-            <view style="display:flex;padding: 2vw;">
-              <image style="width:48rpx;height:48rpx;align-self:center;margin: 16rpx;" src="{{imageUrl + 'customer-assignment.png'}}"></image>
-              <view>
-                <view style="font-weight:bold;font-size: 26rpx;white-space:nowrap;">{{item.rejectNo}}</view>
-                <view style="font-size: 12px;color:#95A8CB;">{{wxmlUtil.format(item.makingTime)}}</view>
-              </view>
 
-            </view>
+      <view wx:if="{{activeCard == 1}}">
+        <scroll-view scroll-y="true" style="height: 1300rpx;" bindscrolltolower="paging" scroll-top="{{topNum}}">
+          <view wx:for="{{orderList_ok}}" data-index="{{index}}" wx-key="index" data-item="item">
+            <view class="dk-card-outer-class">
+              <view class="dk-card-class">
+                <view style="display:flex;padding: 2vw;">
+                  <image style="width:48rpx;height:48rpx;align-self:center;margin: 16rpx;" src="{{imageUrl + 'customer-assignment.png'}}"></image>
+                  <view style="width: 60%;">
+                    <view style="font-weight:bold;font-size: 26rpx;white-space:nowrap;">{{item.orderNo}}</view>
 
-            <view style="height: 1px;background:#E9F0FE;width:90%;margin-left:5vw" />
-            <view style="display:flex;font-size: 26rpx;">
-              <view style="margin:2vw;margin-left: 32rpx;">门店:{{item.orgName}}</view>
-              <view style="flex:1;text-align:right;margin: 2vw;margin-right: 32rpx;white-space:nowrap;">
-                导购:{{item.staffName}}</view>
-            </view>
-            <van-grid column-num="3">
-              <view style="display: flex;background-color:white;">
-                <view class="number-out-order">
-                  <view class="order-summary">
-                    <dk-cell center="center" height="46rpx" spaceWidth="1rpx" left="0" fontSize="17" contentColor="#CAA977" fontWeight="600" title="" content="{{item.sumRejectAmount}}"></dk-cell>
+                    <view style="font-size: 12px;color:#95A8CB;">{{wxmlUtil.format(item.makingTime)}}</view>
                   </view>
-                  <view class="out-oreder-detail">
-                    退货金额
+                  <view style="width: 30%;display: flex;">
+                    <view style="font-size:13px;align-self:center;flex:1;text-align: right;color:#00A7B5;" bindtap="toOriginal_order" data-item="{{item}}">查看原单
+                      <van-icon name="arrow" />
+                    </view>
                   </view>
+
                 </view>
 
-                <view class="number-out-order">
-                  <view class="order-summary">
-                    <dk-text fontSize="17" color="#1B365D" value=" {{item.categoryQuantity}}">
-                    </dk-text>
+                <view style="height: 1px;background:#E9F0FE;width:90%;margin-left:5vw;" />
+                <view style="display:flex;font-size: 26rpx;">
+                  <view style="margin:2vw;margin-left:32rpx;">门店:{{item.orgName}}</view>
+                  <view style="flex:1;text-align:right;margin: 2vw;margin-right:32rpx;white-space:nowrap;">
+                    导购:{{item.staffName}}</view>
+                </view>
+                <van-grid column-num="3">
+                  <view style="display: flex;background-color:white;">
+                    <view class="number-out-order">
+                      <view class="order-summary">
+                        <dk-cell center="center" height="46rpx" spaceWidth="1rpx" left="0" fontSize="17" contentColor="#CAA977" fontWeight="600" title="" content="{{item.tSumGoodsAmount}}"></dk-cell>
+                      </view>
+                      <view class="out-oreder-detail">
+                        订单金额
+                      </view>
+                    </view>
+                    <view class="number-out-order">
+                      <view class="order-summary">
+                        <dk-cell center="center" height="46rpx" spaceWidth="1rpx" left="0" fontSize="17" contentColor="#CAA977" fontWeight="600" title="" content="{{item.sumOutAmount}}"></dk-cell>
+                      </view>
+                      <view class="out-oreder-detail">
+                        出库（1单）
+                      </view>
+                    </view>
+                    <view class="number-out-order">
+                      <view class="order-summary">
+                        <dk-cell center="center" height="46rpx" spaceWidth="1rpx" left="0" fontSize="17" contentColor="#CAA977" fontWeight="600" title="" content="{{item.tSumGoodsAmount - item.sumOutAmount?item.tSumGoodsAmount - item.sumOutAmount:0}}">
+                        </dk-cell>
+                      </view>
+                      <view class="out-oreder-detail">
+                        未出库
+                      </view>
+                    </view>
                   </view>
-                  <view class="out-oreder-detail">
-                    品类数
+                  <view style="display: flex;background-color:white;">
+                    <view class="number-out-order">
+                      <view class="order-summary">
+                        <dk-cell center="center" height="46rpx" spaceWidth="1rpx" left="0" fontSize="17" contentColor="#CAA977" fontWeight="600" title="" content="{{item.sumReceiptAmount}}"></dk-cell>
+                      </view>
+                      <view class="out-oreder-detail">
+                        定金金额
+                      </view>
+                    </view>
+                    <view class="number-out-order">
+                      <view class="order-summary">
+                        <dk-cell center="center" height="46rpx" spaceWidth="1rpx" left="0" fontSize="17" contentColor="#CAA977" fontWeight="600" title="" content="{{item.receivable}}"></dk-cell>
+                      </view>
+                      <view class="out-oreder-detail">
+                        订单欠款
+                      </view>
+                    </view>
+                    <view class="number-out-order">
+                      <view class="order-summary">
+                        <dk-cell center="center" height="46rpx" spaceWidth="1rpx" left="0" fontSize="17" contentColor="#CAA977" fontWeight="600" title="" content="{{item.sumRejectAmount}}"></dk-cell>
+                      </view>
+                      <view class="out-oreder-detail">
+                        退货
+                      </view>
+                    </view>
                   </view>
+
+                </van-grid>
+
+                <view style="height: 1px;background:#E9F0FE;width:90%;margin-left:5vw;" />
+                <van-collapse value="{{ activeNames_goods }}" bind:change="onChange_goods">
+                  <van-collapse-item name="{{index+1}}" style="color:#95A8CB;border-color:15rpx;" value="展开">
+                    <view slot="title">
+                      <view style="display: flex;">
+                        <view>商品明细</view>
+                        <view style="color:#b9b9b9;font-size:10px;flex:1;text-align-last: right;"></view>
+                      </view>
+                    </view>
+
+                    <view wx:for="{{item.orderItemVOList}}" data-item="{{item}}" wx:for-item="item" wx:key="index" wx:for-index="childindex" border="{{ true }}">
+
+                      <van-card data-item="{{item}}" data-index="{{index}}">
+
+                        <view slot="thumb">
+                          <van-image radius="5px" width="80" height="80" src="{{item.iconThumPath }}" />
+                        </view>
+                        <view slot="title" style="display: flex;">
+
+                          <view style="display: flex;">
+
+                            <dk-title titleTag="{{item.titleTag}}" title="{{item.title}}"></dk-title>
+                          </view>
+
+                          <view wx:if="{{item.flag}}" style="text-align: right;width: 30%;">
+                            <van-tag catchtap="flag_bindtap" wx:if="{{item.flag}}" type="danger" color="red" style="text-align: right;">可换件</van-tag>
+                            <van-tag catchtap="flag_bindtap" wx:if="{{item.flag}}" type="danger" color="red" style="text-align: right;">需设计</van-tag>
+                          </view>
+                        </view>
+
+                        <view slot="desc">
+                          <view style="display:flex;width: 100%;">
+                            <view style="width: 80%;">
+                              <dk-text fontWeight="nomal" value="{{item.desc}}"></dk-text>
+
+                            </view>
+
+                          </view>
+                        </view>
+                        <view slot="price">
+                          <view style="display: flex;width: 100%;flex-direction: row;">
+                            <view style="color: red;font-size: 4vw;width: 100%;">
+                              <dk-cell center="center" height="46rpx" spaceWidth="1rpx" left="0" fontSize="16" contentColor="#CAA977" fontWeight="600" title="" content="{{numberFormat.toThousandCents(item.priceSale ? item.priceSale : 0)}}"></dk-cell>
+                            </view>
+                            <view style="width: 100%;text-align: right;font-size: 3.5vw;color: #95A8CB;">x <span style="line-height:56rpx;">{{item.tItemQuantity}}</span></view>
+                          </view>
+                        </view>
+
+
+
+
+                        <view slot="footer">
+                          <view style="margin-top: 15rpx;" wx:if="{{item.bomItems.length > 0}}">
+                            <view style="width: 100%;display: flex;">
+                              <view style="font-size: 14px;width: 50%;text-align: left;color: #95A8CB;">
+                                明细
+                              </view>
+                              <view style="font-size: 14px;width: 50%;text-align: right;color: #95A8CB;" data-item="{{item}}" data-big="{{index}}" data-index="{{childindex}}" catchtap="onChangeOpenGoodsList">
+                                {{item.packageDetailsFlag ? '收起' :'展开'}}
+                                <van-icon name="{{item.packageDetailsFlag ? 'arrow-up' :'arrow-down' }}" />
+                              </view>
+                            </view>
+
+                            <view wx:if="{{item.packageDetailsFlag}}">
+
+                              <view wx:for="{{item.bomItems}}" data-item="{{item2}}" wx:for-item="item2" wx:key="index2">
+                                <view style="text-align: left;width: 100%; padding-left: 15rpx;padding-top:15rpx;">
+                                  <view style="display: flex;">
+                                    <view>
+                                      <van-image radius="5px" width="65" height="65" src="{{item2.iconThumPath }}" />
+                                    </view>
+                                    <view style="margin-left:5px;width: 66vw;">
+
+                                      <view style="display: flex;">
+
+                                        <dk-title titleTag="{{item2.titleTag}}" title="{{item2.skuModel}}"></dk-title>
+                                      </view>
+
+                                      <view style="display: flex;font-size:3.2vw; ">
+                                        <text decode>{{item2.skuName}}</text>
+                                      </view>
+
+                                      <view style="display: flex;font-size:3.2vw; ">
+                                        <text decode>{{' '}}</text>
+                                      </view>
+                                      <view slot="footer" style="width:100%;justify-content: flex-end;margin-top:20rpx;text-align:right;align-self: flex-end;">
+                                        <view style="display: flex;width: 100%;flex-direction: row;">
+                                          <view style="color: red;font-size: 4vw;width: 100%;text-align: left;">
+                                            <dk-cell center="center" height="46rpx" spaceWidth="1rpx" left="0" fontSize="16" contentColor="#CAA977" fontWeight="600" title="" content="{{numberFormat.toThousandCents(item2.priceSale)}}"></dk-cell>
+                                          </view>
+                                          <view style="width: 100%;text-align: right;font-size: 3.5vw;color: #95A8CB;">x <span style="line-height:56rpx;">{{item2.tItemQuantity }}</span></view>
+                                        </view>
+                                      </view>
+                                    </view>
+                                  </view>
+                                </view>
+                              </view>
+
+                            </view>
+                          </view>
+                          <view class="hr"></view>
+                          <view style="display: flex;width: 100%;margin-top:5px;" data-index="{{index}}">
+                            <view style="width: 70%;text-align: left;font-size: 3.5vw;color: #95A8CB;">
+                              备注：<span style="line-height:56rpx;">{{item.remarks ? item.remarks : ''}}</span>
+                            </view>
+                            <view style="width: 100%;text-align: right;font-size: 3.5vw;color: #95A8CB;">金额：<span style="line-height:56rpx;color:#CAA977;">￥{{ numberFormat.toThousandCents((item.priceSale
+                                ?
+                                item.priceSale : 0) * item.tItemQuantity)}}</span></view>
+                          </view>
+
+                        </view>
+
+                      </van-card>
+
+                      <van-divider />
+                    </view>
+
+                  </van-collapse-item>
+                </van-collapse>
+              </view>
+            </view>
+          </view>
+        </scroll-view>
+
+        <van-empty wx:if="{{orderList_ok.length==0}}" description="暂无数据" />
+      </view>
+
+
+
+      <view wx:if="{{activeCard == 2}}">
+        <view wx:for="{{orderList_out}}" data-index="{{index}}" data-item="item">
+          <view class="dk-card-outer-class">
+            <view class="dk-card-class">
+              <view style="display:flex;padding: 2vw;">
+                <image style="width:48rpx;height:48rpx;align-self:center;margin: 16rpx;" src="{{imageUrl + 'customer-assignment.png'}}"></image>
+                <view>
+                  <view style="font-weight:bold;font-size: 26rpx;white-space:nowrap;">{{item.rejectNo}}</view>
+                  <view style="font-size: 12px;color:#95A8CB;">{{wxmlUtil.format(item.makingTime)}}</view>
                 </view>
 
-                <view class="number-out-order">
-                  <view class="order-summary">
-                    <dk-text fontSize="17" color="#1B365D" value=" {{item.sumRejectQuantity}}">
-                    </dk-text>
+              </view>
+
+              <view style="height: 1px;background:#E9F0FE;width:90%;margin-left:5vw" />
+              <view style="display:flex;font-size: 26rpx;">
+                <view style="margin:2vw;margin-left: 32rpx;">门店:{{item.orgName}}</view>
+                <view style="flex:1;text-align:right;margin: 2vw;margin-right: 32rpx;white-space:nowrap;">
+                  导购:{{item.staffName}}</view>
+              </view>
+              <van-grid column-num="3">
+                <view style="display: flex;background-color:white;">
+                  <view class="number-out-order">
+                    <view class="order-summary">
+                      <dk-cell center="center" height="46rpx" spaceWidth="1rpx" left="0" fontSize="17" contentColor="#CAA977" fontWeight="600" title="" content="{{item.sumRejectAmount}}"></dk-cell>
+                    </view>
+                    <view class="out-oreder-detail">
+                      退货金额
+                    </view>
                   </view>
-                  <view class="out-oreder-detail">
-                    退货件数
+
+                  <view class="number-out-order">
+                    <view class="order-summary">
+                      <dk-text fontSize="17" color="#1B365D" value=" {{item.categoryQuantity}}">
+                      </dk-text>
+                    </view>
+                    <view class="out-oreder-detail">
+                      品类数
+                    </view>
                   </view>
-                </view>
-              </view>
-            </van-grid>
-
-            <van-collapse value="{{ activeNames_goods2 }}" bind:change="onChange_goods2">
-              <van-collapse-item name="{{index+1}}" style="color:#95A8CB;" value="展开">
-                <view slot="title">
-                  <view style="display: flex;">
-                    <view>商品明细</view>
-                    <view style="color:#b9b9b9;font-size:10px;flex:1;text-align-last: right;"></view>
+
+                  <view class="number-out-order">
+                    <view class="order-summary">
+                      <dk-text fontSize="17" color="#1B365D" value=" {{item.sumRejectQuantity}}">
+                      </dk-text>
+                    </view>
+                    <view class="out-oreder-detail">
+                      退货件数
+                    </view>
                   </view>
                 </view>
-                <view wx:for="{{item.rejectItemVOList}}" data-item="{{item}}" wx:key="index" border="{{ true }}" wx:for-index="childindex">
-
-                  <van-card data-item="{{item}}" data-index="{{index}}">
+              </van-grid>
 
-                    <view slot="thumb">
-                      <van-image radius="5px" width="80" height="80" src="{{item.iconThumPath }}" />
+              <van-collapse value="{{ activeNames_goods2 }}" bind:change="onChange_goods2">
+                <van-collapse-item name="{{index+1}}" style="color:#95A8CB;" value="展开">
+                  <view slot="title">
+                    <view style="display: flex;">
+                      <view>商品明细</view>
+                      <view style="color:#b9b9b9;font-size:10px;flex:1;text-align-last: right;"></view>
                     </view>
-                    <view slot="title" style="display: flex;">
+                  </view>
+                  <view wx:for="{{item.rejectItemVOList}}" data-item="{{item}}" wx:key="index" border="{{ true }}" wx:for-index="childindex">
 
-                      <view style="display: flex;">
+                    <van-card data-item="{{item}}" data-index="{{index}}">
 
-                        <dk-title titleTag="{{item.titleTag}}" title="{{item.title}}"></dk-title>
+                      <view slot="thumb">
+                        <van-image radius="5px" width="80" height="80" src="{{item.iconThumPath }}" />
                       </view>
+                      <view slot="title" style="display: flex;">
 
-                      <view wx:if="{{item.flag}}" style="text-align: right;width: 30%;">
-                        <van-tag catchtap="flag_bindtap" wx:if="{{item.flag}}" type="danger" color="red" style="text-align: right;">可换件</van-tag>
-                        <van-tag catchtap="flag_bindtap" wx:if="{{item.flag}}" type="danger" color="red" style="text-align: right;">需设计</van-tag>
-                      </view>
-                    </view>
+                        <view style="display: flex;">
 
-                    <view slot="desc">
-                      <view style="display:flex;width: 100%;">
-                        <view style="width: 80%;">
-                          <dk-text fontWeight="nomal" value="{{item.desc}}"></dk-text>
+                          <dk-title titleTag="{{item.titleTag}}" title="{{item.title}}"></dk-title>
+                        </view>
 
+                        <view wx:if="{{item.flag}}" style="text-align: right;width: 30%;">
+                          <van-tag catchtap="flag_bindtap" wx:if="{{item.flag}}" type="danger" color="red" style="text-align: right;">可换件</van-tag>
+                          <van-tag catchtap="flag_bindtap" wx:if="{{item.flag}}" type="danger" color="red" style="text-align: right;">需设计</van-tag>
                         </view>
+                      </view>
 
+                      <view slot="desc">
+                        <view style="display:flex;width: 100%;">
+                          <view style="width: 80%;">
+                            <dk-text fontWeight="nomal" value="{{item.desc}}"></dk-text>
+
+                          </view>
+
+                        </view>
                       </view>
-                    </view>
-                    <view slot="price">
-                      <view style="display: flex;width: 100%;flex-direction: row;">
-                        <view style="width: 100%;text-align: right;font-size: 3.5vw;">销售数量：<span style="line-height:56rpx;color:red;">{{item.orderQuantity}}</span></view>
+                      <view slot="price">
+                        <view style="display: flex;width: 100%;flex-direction: row;">
+                          <view style="width: 100%;text-align: right;font-size: 3.5vw;">销售数量：<span style="line-height:56rpx;color:red;">{{item.orderQuantity}}</span></view>
+                        </view>
                       </view>
-                    </view>
 
 
 
-                    <view slot="footer">
-                      <view style="display: flex;width: 100%;margin-top:5px;" data-index="{{index}}">
-                        <view style="width: 70%;text-align: left;font-size: 3.5vw;color: #95A8CB;">
-                          备注：<span style="line-height:56rpx;">{{item.remarks ? item.remarks : ''}}</span>
+                      <view slot="footer">
+                        <view style="display: flex;width: 100%;margin-top:5px;" data-index="{{index}}">
+                          <view style="width: 70%;text-align: left;font-size: 3.5vw;color: #95A8CB;">
+                            备注：<span style="line-height:56rpx;">{{item.remarks ? item.remarks : ''}}</span>
+                          </view>
+                          <view style="width: 100%;text-align: right;font-size: 3.5vw;">售价：<span style="line-height:56rpx;color:#CAA977;">￥{{item.orderPriceSale}}</span></view>
                         </view>
-                        <view style="width: 100%;text-align: right;font-size: 3.5vw;">售价：<span style="line-height:56rpx;color:#CAA977;">￥{{item.orderPriceSale}}</span></view>
                       </view>
-                    </view>
-                  </van-card>
-                </view>
-              </van-collapse-item>
-            </van-collapse>
+                    </van-card>
+                  </view>
+                </van-collapse-item>
+              </van-collapse>
 
+            </view>
           </view>
         </view>
+        <van-empty wx:if="{{orderList_out.length==0}}" description="暂无数据" />
       </view>
-      <van-empty wx:if="{{orderList_out.length==0}}" description="暂无数据" />
-    </view>
 
 
 
 
-  </view>
+    </view>
+  </van-tab>
+
 
 
   <van-tab title-style="color:#96A7C5;" title="收款记录">
@@ -803,7 +802,7 @@
       </view>
     </view>
 
-    <van-empty wx:if="{{listFee.length==0}}" description="暂无数据" />
+    <van-empty wx:if="{{paymentRecordsList.length==0}}" description="暂无数据" />
   </van-tab>
   <van-tab title-style="color:#96A7C5;" title="退款记录">
     <view style="margin-bottom: 1vw;" wx:for="{{refundRecordsList}}" wx:for-index="index">
@@ -866,7 +865,7 @@
       </view>
     </view>
 
-    <van-empty wx:if="{{listRefund.length==0}}" description="暂无数据" />
+    <van-empty wx:if="{{refundRecordsList.length==0}}" description="暂无数据" />
   </van-tab>
 
   <van-tab title-style="color:#96A7C5;" title="客户信息">