于继渤 2 лет назад
Родитель
Сommit
a543b895f1

+ 8 - 0
components/dkbase/dk-goos-list/dk-goos-list.js

@@ -43,7 +43,15 @@ Component({
       value:''
     },
     
+    sumAmountCol:{
+      type:String,
+      value:''
+    },
 
+    sumQuantity:{
+      type:String,
+      value:''
+    },
   },
 
   options: {

+ 6 - 5
components/dkbase/dk-goos-list/dk-goos-list.wxml

@@ -1,3 +1,4 @@
+<wxs src='/utils/wxmlUtil.wxs' module="wxmlUtil"></wxs>
 <view class="dk-card-outer-class">
   <view class="dk-card-class">
     <view wx:if="{{title}}" class="item-class">
@@ -56,11 +57,11 @@
         <van-icon name="arrow-down" />
       </view>
     </block>
-    <view class="amount-item-class" wx:if="{{type === 'sale'}}">
-      <!--标价总额-->
-      <dk-cell contentColor="#FF7B1A" titleColor="#95A8CB;" contentFontWeight="700" title="标价总额" content="{{card[sumStandardCol]?card[sumStandardCol]:0}}"></dk-cell>
-      <!--标价折扣-->
-      <dk-cell amount="{{false}}" contentColor="#FF7B1A" contentFontWeight="700" titleColor="#95A8CB;" title="标价折扣" content="{{card[discountStandardCol]?card[discountStandardCol]:''  +'折'}}"></dk-cell>
+    <view class="amount-item-class" style="display: flex;" wx:if="{{type === 'sale'}}">
+
+        <dk-cell titleColor="#95A8CB;" title="{{'共计 ' + (sumQuantity ? list[0][sumQuantity] : '') + '件'}}" amount="{{false}}"></dk-cell>
+         
+          <dk-cell fontSize="16" fontWeight="bold" contentFontWeight="700" contentColor="#FF7B1A" titleColor="#1B365D;" title="合计" content="{{sumAmountCol ? list[0][sumAmountCol] : ''}}"></dk-cell>
     </view>
   </view>
 

+ 5 - 5
package-sales/pages/sales-tracking-report/detail/detail.wxml

@@ -46,26 +46,26 @@
   <view style="display: flex;padding:10rpx;  margin: 10px 22rpx 10px 22rpx;margin-top: 10px;border-radius: 15rpx;">
     <view style="background-color:#F4F9FF;width:25%;padding:10rpx;border-radius: 16rpx;">
       <view style="font-size:13px;text-align: center;margin-top: 10rpx;">订单数量</view>
-      <dk-cell left="0rpx" center="center" fontSize="13" contentFontSize="18" contentColor="#1B365D" spaceWidth="0" contentFontWeight="700" car="" content="{{item.sumQuantity}}"></dk-cell>
+      <dk-cell left="0rpx" center="center" fontSize="13" contentFontSize="18" contentColor="#1B365D" spaceWidth="0" contentFontWeight="700" amount="{{false}}" content="{{item.sumQuantity}}"></dk-cell>
     </view>
     <view style="background-color:#F4F9FF;width: 25%;padding:10rpx;border-radius: 16rpx;margin-left: 20rpx;">
       <view style="font-size:13px;text-align: center;margin-top: 10rpx;">销售出库</view>
-      <dk-cell left="0rpx" center="center" fontSize="15" contentFontSize="18" contentColor="#1B365D" spaceWidth="0" contentFontWeight="700" car="" content="{{item.outQty}}"></dk-cell>
+      <dk-cell left="0rpx" center="center" fontSize="15" contentFontSize="18" contentColor="#1B365D" spaceWidth="0" contentFontWeight="700" amount="{{false}}" content="{{item.outQty}}"></dk-cell>
     </view>
 
     <view style="background-color:#F4F9FF;width:25%;padding:10rpx;border-radius: 16rpx;">
       <view style="font-size:13px;text-align: center;margin-top: 10rpx;">退货数量</view>
-      <dk-cell left="0rpx" center="center" fontSize="13" contentFontSize="18" contentColor="#1B365D" spaceWidth="0" contentFontWeight="700" car="" content="{{item.returnQty}}"></dk-cell>
+      <dk-cell left="0rpx" center="center" fontSize="13" contentFontSize="18" contentColor="#1B365D" spaceWidth="0" contentFontWeight="700" amount="{{false}}" content="{{item.returnQty}}"></dk-cell>
     </view>
     <view style="background-color:#F4F9FF;width: 25%;padding:10rpx;border-radius: 16rpx;margin-left: 20rpx;">
       <view style="font-size:13px;text-align: center;margin-top: 10rpx;">销售回库</view>
-      <dk-cell left="0rpx" center="center" fontSize="15" contentFontSize="18" contentColor="#1B365D" spaceWidth="0" contentFontWeight="700" car="" content="{{item.outAmt}}"></dk-cell>
+      <dk-cell left="0rpx" center="center" fontSize="15" contentFontSize="18" contentColor="#1B365D" spaceWidth="0" contentFontWeight="700" amount="{{false}}" content="{{0}}"></dk-cell>
     </view>
   </view>
 
 
 
-  <dk-goos-list type="sale" list="{{saleList}}" title="商品明细" titleCol="skuName" titleTagCol="brandName" descCol="skuCode" priceCol="priceSale" quantityCol="itemQty"></dk-goos-list>
+  <dk-goos-list type="sale" list="{{saleList}}" title="商品明细" titleCol="skuName" titleTagCol="brandName" descCol="skuCode" priceCol="priceSale" sumAmountCol="sumAmount" sumQuantity="sumQuantity" quantityCol="itemQty"></dk-goos-list>
 
   <dk-goos-list list="{{saleOutList}}" no="no" title="销售出库" titleCol="skuName" titleTagCol="brandName" descCol="skuCode" priceCol="priceSale" quantityCol="itemQty"></dk-goos-list>