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

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

@@ -64,10 +64,10 @@ Page({
     }
     else if (type == 'order') {
       // 销售訂單
-      let orderOutList = this.data.orderOutList;
-      orderOutList[index].showDetailFlag = !orderOutList[index].showDetailFlag
+      let orderList = this.data.orderList;
+      orderList[index].showOrderDetailFlag = !orderList[index].showOrderDetailFlag
       this.setData({
-        orderOutList: orderOutList
+        orderList: orderList
       })
     }
   },

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

@@ -257,13 +257,13 @@
 
                 <view style="height: 1px;background:#E9F0FE;width:90%;margin-left:5vw;" />
 
-                <view style="display: flex; justify-content: space-between;margin: 10rpx 25rpx;font-size: 12px;" catchtap="handleExpandItem" data-type="order-return" data-item="{{item}}" data-index="{{index}}">
+                <view style="display: flex; justify-content: space-between;margin: 10rpx 25rpx;font-size: 12px;" catchtap="handleExpandItem" data-type="order" data-item="{{item}}" data-index="{{index}}">
                   <view>商品明细</view>
                   <view style="display: flex; align-items: center;">{{!item.showOrderDetailFlag?'展开':'收缩'}}
-                    <van-icon style="margin-left: 8rpx;" name="{{!item.showReturnDetailFlag?'arrow-down':'arrow-up'}}" />
+                    <van-icon style="margin-left: 8rpx;" name="{{!item.showOrderDetailFlag?'arrow-down':'arrow-up'}}" />
                   </view>
                 </view>
-                <view  wx:if="{{item.showOrderDetailFlag}}" wx:for="{{item.orderItemResponseList}}" data-item="{{item}}" wx:for-item="item" wx:key="index" wx:for-index="childindex" border="{{ true }}">
+                <view  wx:if="{{!!item.showOrderDetailFlag}}" wx:for="{{item.orderItemResponseList}}" 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.imagesUrl }}" />

package-sales/pages/sales-outbound/add/add.js

@@ -1648,6 +1648,7 @@ Page({
     if (this.data.formMode == Constants.formMode.other) { //转出库
       //查询可出库销售订单/商品
       this.setFormMain()
+      this.setFlagView(this)
       this.getItemDetal(this.data.item.orderId)
       // 设置送货日期 当前日期 加一天
       var currentDate = new Date();
@@ -1658,6 +1659,10 @@ Page({
         formData: JSON.stringify(formData),
         dataTime: dataTime
       })
+      //详情办理
+      wx.setNavigationBarTitle({
+        title: mixins.$t('add') + title
+      })
     } else if (this.data.formMode == Constants.formMode.add) { //新建 
       //购物车 标准版 跳入 销售入库
       let that = this