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

mixins/index.js

@@ -531,6 +531,7 @@ module.exports = {
           })
         }, 2000)
       } else {
+        console.log('ffff',result);
         setTimeout(() => {
           this.setData({
             loading: false

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

@@ -34,6 +34,8 @@ mixins: [mixins],
       orderService: app.globalData['orderService'],
       otherPayableService: app.globalData['otherPayableService'],
       saleOutBoundReturnService: app.globalData['saleOutBoundReturnService'],
+      outboundService: app.globalData['outboundService'],
+
     },
 
     /**
@@ -619,7 +621,9 @@ mixins: [mixins],
         return this.excute(this.data.saleOutBoundReturnService, this.data.saleOutBoundReturnService.outboundInsertRefund, this.data.params);
  
       }else if (this.data.formType == 11) { //销售出库 >>> 客户收款
-        return this.excute(this.data.saleOutBoundReturnService, this.data.saleOutBoundReturnService.outboundInsertRefund, this.data.params);
+    
+        return this.excute(this.data.outboundService, this.data.outboundService.outboundInsertRefund, this.data.params);
+       
       } 
     },
     /**
@@ -628,16 +632,16 @@ mixins: [mixins],
       * @author : 姜永辉
       */
     handleData() {
-      if (this.data.formType == 3 || this.data.formType == 4) { //客户收款/退款
-        
+      if (this.data.formType == 3 || this.data.formType == 4) { //客户收款/退款 
         let pages = getCurrentPages();
-        let prevPage = pages[pages.length - 2]; //上二页
+        let prevPage = pages[pages.length - 3]; //上二页
         prevPage.setData({
           refreshByAdd: true
         })
         wx.navigateBack({
           delta: 1
         })
+ 
       } else if (this.data.formType == 8) { //订单收款
         let pages = getCurrentPages();
         let prevPage = pages[pages.length - 2]; //上1页

package-basic-data/pages/product-attribute/product-attribute.js

@@ -58,6 +58,7 @@ Page({
       ],
     sideKey: 0,
     pageFlag: false,
+    navigateBackFlag:true,
   },
 
   /**
@@ -212,22 +213,8 @@ Page({
       id = params.unitId
     }
     if (id) { //编辑
-      return this.excute(service, service.update, params).then(result => {
-        if (result && result.data && result.data.code === Constants.SUCESS_CODE) {
-          wx.showToast({
-            title: '保存成功',
-            image: '/static/image/success.png',
-            duration: 2000
-          })
-          // 执行查询方法
-          this.searchData()
-          // 编辑后关闭窗体
-          this.setData({
-            showPop: false
-          })
-        }
-      });;
-    } else { //新建
+      return this.excute(service, service.update, params);
+    } else { //新建 TODO
       return this.excute(service, service.insert, params).then(result => {
         if (result && result.data && result.data.code === Constants.SUCESS_CODE) {
           wx.showToast({
@@ -235,7 +222,6 @@ Page({
             image: '/static/image/success.png',
             duration: 2000
           })
-
           // console.log('dataItem', this.data.dataItem)
           this.setData({
             dataItem: null
@@ -251,9 +237,17 @@ Page({
         }
       });;
     }
-
   },
-
+  /**
+   * @desc : 关闭表单弹窗
+   * @author : 刘尧
+   * @date : 2022/5/28 17:28
+   */
+  handleData(){
+    this.setData({
+      showPop:false
+    })
+  },
   /**
    * @desc : 分类切换
    * @author : 于继渤