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

package-base-select/pages/select-collection_confirm/select-collection_confirm.js

@@ -638,9 +638,9 @@ mixins: [mixins],
         prevPage.setData({
           refreshByAdd: true
         })
-        wx.navigateBack({
-          delta: 1
-        })
+        // wx.navigateBack({
+        //   delta: 1
+        // })
  
       } else if (this.data.formType == 8) { //订单收款
         let pages = getCurrentPages();

package-inventory/pages/ivt-detail-report/detail/detail.js

@@ -44,11 +44,11 @@ Page({
     // 可售包装 
     if (item.flgSubUnit) {
       item['freezeBox'] = parseInt(item.freezeQty / item.packBox)
-      item['freezePiece'] = Number(item.freezeQty % item.packBox)
+      item['freezePiece'] = parseFloat(Number(item.freezeQty % item.packBox)).toFixed(item.decimalPlace)
       item.packageBoxFreeze = item['freezeBox'] + item.subUnitName + item['freezePiece'] + item.unitName
 
       item['usableBox'] = parseInt(item.usableQty / item.packBox)
-      item['usablePiece'] = Number(item.usableQty % item.packBox)
+      item['usablePiece'] = parseFloat(Number(item.usableQty % item.packBox)).toFixed(item.decimalPlace) 
       item.packageBoxUsable = item['usableBox'] + item.subUnitName + item['usablePiece'] + item.unitName
     }
 

package-inventory/pages/ivt-detail-report/ivt-detail-report.js

@@ -77,7 +77,7 @@ Page({
         "skuSpec": "商品规格",
         "whName": "仓库名称",
         "invQty": "库存数量",
-        "outingQty": "出库中数量",
+        // "outingQty": "出库中数量",
         "freezeQty": "冻结数量",
         "usableQty": "可用数量",
         "remarks": "备注",
@@ -199,8 +199,8 @@ Page({
       })
       // 可售包装 
       if (item.flgSubUnit) {
-        item['box'] = parseInt(item.invQty / item.packBox)
-        item['piece'] = Number(item.invQty % item.packBox)
+        item['box'] = parseInt(item.invQty / item.packBox) 
+        item['piece'] = parseFloat( Number(item.invQty % item.packBox)).toFixed(item.decimalPlaces)
         item.packageBox = item['box'] + item.subUnitName + item['piece'] + item.unitName
         list.push({
           title: mixins.$t('packageIvtBox'),

package-sales/pages/customer-collection/add/add.js

@@ -118,17 +118,18 @@ Page({
         refresh: function (data) { 
           //销售订单跳转
           if (_this.data.formType == Constants.formMode.add) {
-            const eventChannel = this.getOpenerEventChannel();
+            _this.setData({
+              loading: true
+            })
+            const eventChannel = _this.getOpenerEventChannel();
             eventChannel.emit('refresh', {
               id: 1
-            })
-            console.log("refreshrefreshrefresh");
+            }) 
             // 保存成功后 回调
             wx.navigateBack({
               data: 1
             })
-          } else {
-            console.log("adddddddd");
+          } else { 
             let formData = {}
             formData['staff'] = {
               text: app.globalData.user.staffName,

package-sales/pages/customer-collection/refund/refund.js

@@ -104,11 +104,31 @@ Page({
       url: this.data.route.selectCollectionConfirm.url,
       events: {
         // 回调后
-        bindData: function (data) {
-          // 保存成功后 回调
-          wx.navigateBack({
-            data: 1
-          })
+        refresh: function (data) {
+          //销售订单跳转
+          if (_this.data.formType == Constants.formMode.add) {
+            _this.setData({
+              loading: true
+            })
+            const eventChannel = _this.getOpenerEventChannel();
+            eventChannel.emit('refresh', {
+              id: 1
+            })
+            // 保存成功后 回调
+            wx.navigateBack({
+              data: 1
+            })
+          } else {
+            let formData = {}
+            formData.orgId = app.globalData.user.orgId
+            formData.orgName = app.globalData.user.orgName
+            formData.staffId = app.globalData.user.staffId
+            formData.staffName = app.globalData.user.staffName
+            formData.accDate = util.formatDayTime(new Date()) 
+            _this.setData({
+              formData: JSON.stringify(formData)
+            })
+          }
         }
       },
       success: function (res) {