于继渤 2 lat temu
rodzic
commit
553d7d5786

+ 2 - 0
package-sales/pages/order-return/add/add.js

@@ -186,6 +186,7 @@ Page({
       res['sOrderItemId'] = res.sorderItemId
       res['sOrderId'] = res.sorderId
       res.itemIndex = itemIndex++
+      res.canNegativeFlag = true
     })
 
 
@@ -196,6 +197,7 @@ Page({
     params.flgAutoHandle = btnFormData ? btnFormData.flag : false //自动出库标识 
     params.addressName = params.address.addressName
     params.objectId = params.cusId
+    params.canNegativeFlag = true
     params.outDate = utils.formatDayTime(new Date())
     delete params['goodsList']
     delete params['orderItemResponseList']

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

@@ -46,16 +46,16 @@
   <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.returnAmt}}"></dk-cell>
+      <dk-cell left="0rpx" center="center" fontSize="13" contentFontSize="18" contentColor="#1B365D" spaceWidth="0" contentFontWeight="700" car="" 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.outAmt}}"></dk-cell>
+      <dk-cell left="0rpx" center="center" fontSize="15" contentFontSize="18" contentColor="#1B365D" spaceWidth="0" contentFontWeight="700" car="" 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.returnAmt}}"></dk-cell>
+      <dk-cell left="0rpx" center="center" fontSize="13" contentFontSize="18" contentColor="#1B365D" spaceWidth="0" contentFontWeight="700" car="" 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>

+ 1 - 1
package-sales/pages/sales-tracking-report/sales-tracking-report.js

@@ -19,7 +19,7 @@ Page({
     contentList: [
       {  lebel: '销售订单',numberKeyLabel:'订单数量', numberKey:'sumQuantity' ,amountKeyLabel:'订单金额',amountKey:'sumAmount'},
       { lebel: '销售出库',numberKeyLabel:'出库数量', numberKey:'outQty' ,amountKeyLabel:'退货金额',amountKey:'returnAmt'},
-      {  lebel: '核销信息',numberKeyLabel:'已核销', numberKey:'amtHandle' ,amountKeyLabel:'未核销',amountKey:'amtReceivable'},
+      {  lebel: '核销信息',numberKeyLabel:'已核销', numberKey:'sumUsePaymentResidue' ,amountKeyLabel:'未核销',amountKey:'sumShouldHandle'},
     ],
   },