bug修改

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

@@ -19,10 +19,12 @@ Page({
    */
   data: {
     // 路由
+    activeNames_goods:[1],
     routeObjName: 'customer',
     imageUrl: config.image_url + '/static/img/',
     cusFollowService: app.globalData['cusFollowService'],
     orderService: app.globalData['orderService'],
+    saleOutBoundService: app.globalData['saleOutBoundService'],
     cusReceiptPaymentService: app.globalData['cusReceiptPaymentService'],
     item: {},
     customerFollowList: [],
@@ -36,9 +38,20 @@ Page({
     gradeCode: app.globalData.company.gradeCode,
   },
 
+  /**
+ * @desc : 查询客户跟进
+ * @date : 2024/2/1 15:49
+ * @author : 于继渤
+ */
   getCusFollowList(cusId) {
+    this.setData({
+      loading: true
+    })
     return this.excute(this.data.cusFollowService, this.data.cusFollowService.selectByList, { cusId: cusId }).then(res => {
       if (res.data.code == 200) {
+        this.setData({
+          loading: false
+        })
         console.log('getCusFollowList', res.data.data)
         let list = res.data.data
         let followList = []
@@ -110,9 +123,146 @@ Page({
     this.setData({
       item: data
     })
+
     this.getCusFollowList(data.cusId)
-    this.getPayRecords(data.cusId, '收付款类型-收款')
-    this.getPayRecords(data.cusId, '收付款类型-退收款')
+
+
+
+  },
+  onChange(e) {
+    console.log(e)
+    let data = this.data.item
+    let name = e.detail.name
+    if (name == 0) {
+      this.getCusFollowList(data.cusId)
+    }
+    if (name == 1) {
+      this.getOrderList(data.cusId)
+      // this.getOrderOut(data.cusId)
+      // this.getOrderOutReturn(data.cusId)
+    }
+    if (name == 2) {
+      this.getPayRecords(data.cusId, '收付款类型-收款')
+    }
+    if (name == 3) {
+      this.getPayRecords(data.cusId, '收付款类型-退收款')
+    }
+  },
+
+  /**
+* @desc : 交易记录切换
+* @date : 2024/2/1 15:49
+* @author : 于继渤
+*/
+  changeTag(e) {
+    let data = this.data.item
+    let name = e.detail.name
+    this.setData({
+      activeCard: e.detail.name
+    })
+    if (name == 0) {
+      this.getOrderList(data.cusId)
+    }
+    if (name == 1) {
+      this.getOrderOut(data.cusId,Constants.outType.sale)
+    }
+    if (name == 2) {
+      this.getOrderOut(data.cusId,Constants.outType.intoReturn)
+    }
+  },
+  /**
+   * @desc : 查询订单
+   * @date : 2024/2/1 15:49
+   * @author : 于继渤
+   */
+  getOrderList(cusId) {
+    let params = {}
+    params.cusId = cusId
+    this.setData({
+      loading: true
+    })
+    this.excute(this.data.orderService, this.data.orderService.selectTotalSingleTapeDetailPage, params).then(res => {
+      if (res.data.code == 200) {
+        this.setData({
+          loading: false
+        })
+        res.data.data.list.forEach(item => {
+          if (item.orderItemResponseList && item.orderItemResponseList.length > 0) {
+            item.orderItemResponseList.forEach(it => {
+              it.packageDetailsFlag = true
+              if (it.skuImages && it.skuImages.value) {
+                it.skuImages.value = JSON.parse(it.skuImages.value)
+            
+                it['imagesUrl'] = it.skuImages.value.length > 0 ? it.skuImages.value[0].url : null
+              }
+            })
+          }
+
+
+        })
+
+        let list = res.data.data.list
+        this.setData({
+          orderList: list
+        })
+      }
+    })
+  },
+
+  /**
+   * @desc : 查询订单出库
+   * @date : 2024/2/1 15:49
+   * @author : 于继渤
+   */
+  getOrderOut(cusId,orderType) {
+    
+    let params = {}
+    params.cusId = cusId
+    params.outType = orderType
+    this.setData({
+      loading: true
+    })
+    this.excute(this.data.saleOutBoundService, this.data.saleOutBoundService.selectByCondDetail, params).then(res => {
+      if (res.data.code == 200) {
+        this.setData({
+          loading: false
+        })
+        res.data.data.list.forEach(item => {
+          if (item.goodsList && item.goodsList.length > 0) {
+            item.goodsList.forEach(it => {
+              it.packageDetailsFlag = true
+              if (it.skuImages && it.skuImages.value) {
+                it.skuImages.value = JSON.parse(it.skuImages.value)
+            
+                it['imagesUrl'] = it.skuImages.value.length > 0 ? it.skuImages.value[0].url : null
+              }
+            })
+          }
+
+
+        })
+
+        let list = res.data.data.list
+        if(orderType == Constants.outType.sale){
+          this.setData({
+            orderOutList: list
+          })
+        }else{
+          this.setData({
+            orderOutReturnList: list
+          })
+        }
+      
+      }
+    })
+  },
+  /**
+* @desc : 查询订单退货
+* @date : 2024/2/1 15:49
+* @author : 于继渤
+*/
+  getOrderOutReturn(cusId) {
+
   },
 
   /**
@@ -136,7 +286,7 @@ Page({
     if (key == 'receipt') {
       if (gradeCode == Constants.gradeCode.STD) { //标准
         url = this.data.route.collection.url
-        
+
       } else if (gradeCode == Constants.gradeCode.PRO) {
         url = this.data.route.toReceipt.url
       }
@@ -169,15 +319,28 @@ Page({
     let params = {}
     params.objectId = cusId
     params.rpTypeList = [type]
+    this.setData({
+      loading: true
+    })
     this.excute(this.data.cusReceiptPaymentService, this.data.cusReceiptPaymentService.selectByCond, params).then(res => {
       if (res.data.code == 200) {
+        this.setData({
+          loading: false
+        })
+        let list = res.data.data.list
+        if (list && list.length > 0) {
+          list = list.filter(res => {
+            return res.receiptResidue > 0
+          })
+
+        }
         if (type == '收付款类型-收款') {
           this.setData({
-            paymentRecordsList: res.data.data.list
+            paymentRecordsList: list
           })
         } else {
           this.setData({
-            refundRecordsList: res.data.data.list
+            refundRecordsList: list
           })
         }
 

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

@@ -1,6 +1,6 @@
 <!-- 前台导入wxmlUtil.wxs -->
 <wxs src='/utils/wxmlUtil.wxs' module="wxmlUtil"></wxs>
-
+<loading wx:if="{{loading}}"></loading>
 <view class="detail-top" data-item="{{item}}" bind:tap="toDetail">
   <image class="scan-image" fit="fill" src="{{imageUrl+'/customer_detail_04.png'}}"></image>
   <view class="detail-top-sup" style="display: flex;">
@@ -206,290 +206,412 @@
 
 
   <van-tab title-style="color:#96A7C5;" title="交易记录">
-    <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="成交订单">
+    <view style="margin-top: 20rpx;">
+      <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>
-
-        <van-tab title="销售退货">
-
-        </van-tab>
-      </van-tabs> -->
+        <van-tab title="销售订单">
+          <view wx:for="{{orderList}}" data-index="{{index}}" data-item="item">
 
-      <view wx:if="{{activeCard == 0}}">
-        <view wx:for="{{orderList}}" 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 class="dk-card-outer-class">
+              <view class="dk-card-class">
+                <view style="display:flex;padding: 2vw;">
+                  <image style="width:20px;height:20px;" src="{{imageUrl + 'customer_detail_icon_04.png'}}"> </image>
+                  <view style="font-weight:bold;font-size: 13px;white-space:nowrap;align-self:center;margin-left: 20rpx;">{{item.orderNo}}
+                  </view>
                 </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 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="#FF7B1A" fontWeight="600" title="" content="{{item.sumAmount}}"></dk-cell>
+                      </view>
+                      <view class="out-oreder-detail">
+                        成交金额
+                      </view>
                     </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 class="number-out-order">
+                      <view class="order-summary">
+                        <dk-text fontSize="17" color="#1B365D" value="{{item.orderItemResponseList.length}}">
+                        </dk-text>
+                      </view>
+                      <view class="out-oreder-detail">
+                        品类数
+                      </view>
                     </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 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>
-                </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>
+                </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>
 
-                  <view wx:for="{{item.orderItemVOList}}" data-item="{{item}}" wx:for-item="item" wx:key="index" wx:for-index="childindex" border="{{ true }}">
+                    <view 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}}">
+                      <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 slot="thumb">
+                          <van-image radius="5px" width="80" height="80" src="{{item.imagesUrl }}" />
+                        </view>
+                        <view slot="title" style="display: flex;">
 
-                        <view style="display: flex;">
+                          <view style="display: flex;">
+
+                            <dk-title titleTag="{{item.brandName}}" title="{{item.skuModel}}"></dk-title>
+                          </view>
 
-                          <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 slot="desc">
+                          <view style="display:flex;width: 100%;">
+                            <view style="width: 80%;">
+                              <dk-text fontWeight="nomal" value="{{item.skuName}}"></dk-text>
+
+                            </view>
 
                           </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 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="#FF7B1A" fontWeight="600" title="" content="{{item.priceSale}}"></dk-cell>
+                            </view>
+                            <view style="width: 100%;text-align: right;font-size: 3.5vw;color: #95A8CB;">x <span style="line-height:56rpx;">{{item.itemQty}}</span></view>
                           </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 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>
 
-                          <view wx:if="{{item.packageDetailsFlag}}">
+                            <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 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;">
+                                      <view style="display: flex;">
 
 
-                                      <dk-title titleTag="{{item2.titleTag}}" title="{{item2.skuModel}}"></dk-title>
-                                    </view>
+                                        <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>{{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 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="#FF7B1A" 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 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>
                           </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 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>
-                          <!-- <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>
+                        </view>
 
-                    </van-card>
+                      </van-card>
 
-                    <van-divider />
-                  </view>
+                      <van-divider />
+                    </view>
 
-                </van-collapse-item>
-              </van-collapse>
+                  </van-collapse-item>
+                </van-collapse>
 
+              </view>
             </view>
-          </view>
 
 
-        </view>
-        <van-empty wx:if="{{orderList.length==0}}" description="暂无数据" />
-      </view>
+          </view>
+          <van-empty wx:if="{{orderList.length==0}}" description="暂无数据" />
 
+        </van-tab>
+        <van-tab title="销售出库">
 
+          <view wx:for="{{orderOutList}}" 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>
+                  <image style="width:20px;height:20px;" src="{{imageUrl + 'customer_detail_icon_04.png'}}"> </image>
+                  <view style="font-weight:bold;font-size: 13px;white-space:nowrap;align-self:center;margin-left: 20rpx;">{{item.outNo}}
                   </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 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="#FF7B1A" fontWeight="600" title="" content="{{item.outAmt}}"></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>
+                        <dk-text fontSize="17" color="#1B365D" value="{{item.goodsList.length}}">
+                        </dk-text>
                       </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>
+                        <dk-text fontSize="17" color="#1B365D" value="{{item.outQty}}">
+                        </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.goodsList}}" 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 }}" />
+                        </view>
+                        <view slot="title" style="display: flex;">
+
+                          <view style="display: flex;">
+
+                            <dk-title titleTag="{{item.brandName}}" title="{{item.skuModel}}"></dk-title>
+                          </view>
+
+
+                        </view>
+
+                        <view slot="desc">
+                          <view style="display:flex;width: 100%;">
+                            <view style="width: 80%;">
+                              <dk-text fontWeight="nomal" value="{{item.skuName}}"></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="#FF7B1A" fontWeight="600" title="" content="{{item.priceOut}}"></dk-cell>
+                            </view>
+                            <view style="width: 100%;text-align: right;font-size: 3.5vw;color: #95A8CB;">x <span style="line-height:56rpx;">{{item.outQty}}</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="#FF7B1A" 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>
+                          </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>
+
+                        </view>
+
+                      </van-card>
+
+                      <van-divider />
+                    </view>
+
+                  </van-collapse-item>
+                </van-collapse>
+
+              </view>
+            </view>
+
+
+          </view>
+
+          <van-empty wx:if="{{orderOutList.length==0}}" description="暂无数据" />
+        </van-tab>
+        <van-tab title="销售退货">
+          <view wx:for="{{orderOutReturnList}}" 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:20px;height:20px;" src="{{imageUrl + 'customer_detail_icon_04.png'}}"> </image>
+                  <view style="font-weight:bold;font-size: 13px;white-space:nowrap;align-self:center;margin-left: 20rpx;">{{item.outNo}}
                   </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.sumReceiptAmount}}"></dk-cell>
+                        <dk-cell center="center" height="46rpx" spaceWidth="1rpx" left="0" fontSize="17" contentColor="#FF7B1A" fontWeight="600" title="" content="{{item.outAmt}}"></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.goodsList.length}}">
+                        </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.outQty}}">
+                        </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>
@@ -497,30 +619,27 @@
                       </view>
                     </view>
 
-                    <view wx:for="{{item.orderItemVOList}}" data-item="{{item}}" wx:for-item="item" wx:key="index" wx:for-index="childindex" border="{{ true }}">
+                    <view wx:for="{{item.goodsList}}" 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 }}" />
+                          <van-image radius="5px" width="80" height="80" src="{{item.imagesUrl }}" />
                         </view>
                         <view slot="title" style="display: flex;">
 
                           <view style="display: flex;">
 
-                            <dk-title titleTag="{{item.titleTag}}" title="{{item.title}}"></dk-title>
+                            <dk-title titleTag="{{item.brandName}}" title="{{item.skuModel}}"></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>
+                              <dk-text fontWeight="nomal" value="{{item.skuName}}"></dk-text>
 
                             </view>
 
@@ -529,9 +648,9 @@
                         <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>
+                              <dk-cell center="center" height="46rpx" spaceWidth="1rpx" left="0" fontSize="16" contentColor="#FF7B1A" fontWeight="600" title="" content="{{item.priceOut}}"></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.outQty}}</span></view>
                           </view>
                         </view>
 
@@ -544,7 +663,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>
@@ -562,6 +681,7 @@
 
                                       <view style="display: flex;">
 
+
                                         <dk-title titleTag="{{item2.titleTag}}" title="{{item2.skuModel}}"></dk-title>
                                       </view>
 
@@ -575,9 +695,9 @@
                                       <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>
+                                            <dk-cell center="center" height="46rpx" spaceWidth="1rpx" left="0" fontSize="16" contentColor="#FF7B1A" 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>
@@ -592,9 +712,7 @@
                             <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>
@@ -606,131 +724,26 @@
 
                   </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>
-
-              <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="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 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>
-              </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>
-                  </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}}">
+          </view>
 
-                      <view slot="thumb">
-                        <van-image radius="5px" width="80" height="80" src="{{item.iconThumPath }}" />
-                      </view>
-                      <view slot="title" style="display: flex;">
+          <van-empty wx:if="{{orderOutReturnList.length==0}}" description="暂无数据" />
+        </van-tab>
+      </van-tabs>
 
-                        <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="width: 100%;text-align: right;font-size: 3.5vw;">销售数量：<span style="line-height:56rpx;color:red;">{{item.orderQuantity}}</span></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>
-                          <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>
 
-            </view>
-          </view>
-        </view>
-        <van-empty wx:if="{{orderList_out.length==0}}" description="暂无数据" />
-      </view>
 
 
 
@@ -763,7 +776,7 @@
             <view class="table-content-row">
               <view style="display: flex;">
                 <view class="table-content-row-font">
-                  <dk-text fontSize="14px" color="#95A8CB" fontWeight="nomal" value="门店/导购"></dk-text>
+                  <dk-text fontSize="14px" color="#95A8CB" fontWeight="nomal" value="门店/业务员"></dk-text>
                 </view>
                 <view class="table-content-class">
                   {{item.orgName}} | {{item.staffName}}
@@ -787,9 +800,9 @@
                 </view>
 
                 <view style="text-align:right;width: 50%;">
-                  <!-- <dk-text fontSize="17" color="#CAA977" value=" ￥{{item.sumAmount}}">
+                  <!-- <dk-text fontSize="17" color="#FF7B1A" value=" ￥{{item.sumAmount}}">
                   </dk-text> -->
-                  <dk-cell height="46rpx" contentRight="{{true}}" spaceWidth="15rpx" fontSize="17" contentColor="#CAA977" fontWeight="" title=" " content="{{item.receiptResidue ? item.receiptResidue : 0}}"></dk-cell>
+                  <dk-cell height="46rpx" contentRight="{{true}}" spaceWidth="15rpx" fontSize="17" contentColor="#FF7B1A" fontWeight="" title=" " content="{{item.receiptResidue ? item.receiptResidue : 0}}"></dk-cell>
                 </view>
               </view>
 
@@ -826,7 +839,7 @@
             <view class="table-content-row">
               <view style="display: flex;">
                 <view class="table-content-row-font">
-                  <dk-text fontSize="14px" color="#95A8CB" fontWeight="nomal" value="门店/导购"></dk-text>
+                  <dk-text fontSize="14px" color="#95A8CB" fontWeight="nomal" value="门店/业务员"></dk-text>
                 </view>
                 <view class="table-content-class">
                   {{item.orgName}} | {{item.staffName}}
@@ -850,9 +863,9 @@
                 </view>
 
                 <view style="text-align:right;width: 50%;">
-                  <!-- <dk-text fontSize="17" color="#CAA977" value=" ￥{{item.sumAmount}}">
+                  <!-- <dk-text fontSize="17" color="#FF7B1A" value=" ￥{{item.sumAmount}}">
                   </dk-text> -->
-                  <dk-cell height="46rpx" contentRight="{{true}}" spaceWidth="15rpx" fontSize="17" contentColor="#CAA977" fontWeight="" title=" " content="{{item.sumAmtRec ? item.sumAmtRec : 0}}"></dk-cell>
+                  <dk-cell height="46rpx" contentRight="{{true}}" spaceWidth="15rpx" fontSize="17" contentColor="#FF7B1A" fontWeight="" title=" " content="{{item.sumAmtRec ? item.sumAmtRec : 0}}"></dk-cell>
                 </view>
               </view>
 
@@ -900,6 +913,4 @@
     </view>
 
   </van-tab>
-</van-tabs>
-
-
+</van-tabs>

package-sales/pages/order-billing/detail/detail.wxml

@@ -93,7 +93,7 @@
 
 
 
-<dk-form-bill type="sale" id="dk-form-bill" routeObjName="{{routeObjName}}" cardList="{{cardList}}" titleTagCol="shortName" titleCol="skuCode" descCol="skuModel" priceCol="priceSale" quantityCol="itemQty" sumAmountCol="sumAmount" discountStandardCol="saleDiscount" contentObj="{{contentObj}}" model:value="{{formData}}" bind:chooseData="chooseData" bind:setGoods="setGoods" readonly="{{true}}" showPopFlag="{{true}}" bind:editItems="editItems" saleStaffAndOrgFlag="{{false}}" bind:customersChoose="customersChoose" popType="sale" priceTitle="售价：">
+<dk-form-bill type="sale" id="dk-form-bill" routeObjName="{{routeObjName}}" cardList="{{cardList}}" titleTagCol="shortName" titleCol="skuModel" descCol="skuName" priceCol="priceSale" quantityCol="itemQty" sumAmountCol="sumAmount" discountStandardCol="saleDiscount" contentObj="{{contentObj}}" model:value="{{formData}}" bind:chooseData="chooseData" bind:setGoods="setGoods" readonly="{{true}}" showPopFlag="{{true}}" bind:editItems="editItems" saleStaffAndOrgFlag="{{false}}" bind:customersChoose="customersChoose" popType="sale" priceTitle="售价：">
 </dk-form-bill>
 <view style="height: 200rpx;"></view>
 <view style="position: fixed;bottom: 230rpx;right: 30rpx;" wx:if="{{formMode =='other'}}">