修改

package-base-select/pages/select-source-purchase-order/select-source-purchase-order.js

@@ -125,11 +125,11 @@ Page({
       if (res.inboundItemList && res.inboundItemList.length > 0) {
         res.inboundItemList.forEach(item => {
           if (item.checked) {
-            item.itemQty = Number(item.rejectQty * -1)
-            item.itemQtyMin = Number(item.rejectQty * -1)
+            item.itemQty = Number(item.canReturnQty )
+            item.itemQtyMin = Number(item.canReturnQty)
             item.itemQtyMax = Number(-1)
-            item.priceReturn = Number(item.priceInto * -1)
-            item.itemAmt = Number(item.rejectQty * item.priceInto * -1)
+            item.priceReturn = Number(item.priceInto )
+            item.itemAmt = Number(item.canReturnQty * item.priceInto)
             choooseInboundItemList.push(item)
           }
         })
@@ -161,7 +161,12 @@ Page({
       if(fromNo.indexOf(res.intoNo) == -1){
         fromNo.push(res.intoNo)
       }
-
+      res.sPurId = res.fromId
+      res.sPurItemId = res.fromItemId
+      res.fromId = res.intoId
+      res.fromItemId = res.intoItemId
+      res.sIntoId = res.intoId
+      res.sIntoItemId = res.intoItemId
      delete res['itemId']
     })
 
@@ -169,6 +174,8 @@ Page({
     let formData = that.data.formData
     let item = that.data.item
     item.fromNo = fromNo
+    item.fromId = choooseInboundItemList[0].intoId
+    item.sPurId = item.purId
     if(this.data.id){
       wx.navigateTo({
         url: this.data.route.addReturn.url,

package-base-select/pages/select-source-purchase-order/select-source-purchase-order.wxml

@@ -52,7 +52,7 @@
                 <view style="width: 40%;">
                   <dk-cell contentFontSize="15" height="25rpx" fontWeight="bold" left="0rpx" contentColor="#FF7B1A" title="" content="{{ item_.priceInto ? item_.priceInto : 0}}"></dk-cell>
                 </view>
-                <view style="width: 60%;font-size:24rpx;color: #95A8CB;line-height: 34rpx;text-align: right;">{{ ' x ' + (item_.rejectQty ? item_.rejectQty : 0)}}</view>
+                <view style="width: 60%;font-size:24rpx;color: #95A8CB;line-height: 34rpx;text-align: right;">{{ ' x ' + (item_.canReturnQty ? item_.canReturnQty : 0)}}</view>
               </view>
             </view>
           </view>

package-purchase/pages/purchase-return/add/add.js

@@ -169,11 +169,17 @@ Page({
   setParams(params) {
     let itemIndex = 0
     let formData = JSON.parse(this.data.formData)
+
+
     params.fromNo = (params.fromNo && params.fromNo.length > 0) ? params.fromNo[0] : null
-    params.fromId = this.data.item ? (this.data.item.purId ? this.data.item.purId : params.purId) : null
+    //采购订单ID
+    params.fromId = this.data.item ? (this.data.item.fromId ? this.data.item.fromId : null) : null
+    params.sPurId = this.data.item ? (this.data.item.sPurId ? this.data.item.sPurId : null) : null
     params.factAmt = params.intoingAmt
-    params.intoQty = this.convertToNegative(params.intoQty)
-    params.intoAmt = this.convertToNegative(params.intoAmt)
+    params.intoQty = this.convertToNegative(params.intoQty) ? this.convertToNegative(params.intoQty) : 0
+    params.intoAmt = this.convertToNegative(params.intoAmt) ?  this.convertToNegative(params.intoAmt) : 0
+    params.returnQty = Math.abs(params.sumQuantity) 
+    params.returnAmt = Math.abs(params.sumAmount)
     if (this.data.formMode == 'edit') {
       delete params['intoType']
     }
@@ -184,15 +190,13 @@ Page({
       if (this.data.formMode == 'edit') {
         delete res['intoType']
       }
-      res.sIntoId = res.sIntoId ? res.sIntoId : params.outId
-      res.sPurId = res.sPurId ? res.sPurId : params.purId
       res.supId = res.supId ? res.supId : null
-      res.fromId = res.fromId ? res.fromId : res.sIntoId
-      res.fromItemId = res.fromItemId ? res.fromItemId : res.sIntoItemId
       res.factPrice = res.priceInto
       res.factAmt = res.intoingAmt
       res.costAmt = Number(res.intoingQty * res.costPrice)
       res.itemIndex = itemIndex++
+      res.returnQty = Math.abs(params.intoingQty) 
+      res.returnAmt = Math.abs(params.intoingAmt)
     })
     let btnFormData = this.data.btnFormData ? JSON.parse(this.data.btnFormData) : ''
     params.flgAutoHandle = btnFormData ? btnFormData.flag : false //自动出库标识 
@@ -388,10 +392,11 @@ Page({
     * @author : 于继渤
     */
   saveData() {
+    // return
     if (this.data.formMode == Constants.formMode.edit) {
       return this.excute(this.data.inboundPurchaseReturnService, this.data.inboundPurchaseReturnService.inboundUpdate, this.data.params);
     } else {
-      return this.excute(this.data.inboundPurchaseReturnService, this.data.inboundPurchaseReturnService.inboundInsert, this.data.params);
+      return this.excute(this.data.service, this.data.service.insert, this.data.params);
     }
   },
   /**