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

components/dkbase/dk-form-bill/dk-form-bill.js

@@ -632,7 +632,7 @@ Component({
           return
         }
         //数量等于 包乘以包装数 加上片数 
-        dataItem['itemQty'] = dataItem['box'] * dataItem['packBox'] + dataItem['piece']
+        dataItem['itemQty'] =Number(dataItem['box'])  * Number(dataItem['packBox']) + Number(dataItem['piece'])
         dataItem.packageBox = dataItem['box'] + dataItem.subUnitName + dataItem['piece'] + dataItem.unitName
         if (this.data.type == Constants.billType.pur) { // 采购订单
           dataItem.sumPrice = dataItem['itemQty'] * dataItem.pricePur

components/dkbase/dk-form-bill/dk-form-bill.wxml

@@ -291,4 +291,4 @@
 
 <dk-popup id="dkPopup" stepperDecimal ="decimalPlaces"   type="{{popType}}" routeObjName="{{routeObjName}}"   titleTagCol="{{titleTagCol}}" titleCol="{{titleCol}}" subCol="{{subCol}}" descCol="{{descCol}}" iconCol="{{iconCol}}" priceCol="{{pupPriceCol}}" priceTitle="{{priceTitle}}" value="{{dataItem}}" show="{{showPop}}" contentObj="{{popContent_sku}}" popupTopObj="{{popupTopObj_sku}}" bind:changeStep="changeStep" bind:changeCheckBox="changeCheckBox" readonly="{{readonly}}" bind:blurNumberField="blurNumberField" bind:commit="editItems" bind:openPackageBox="openPackageBox"></dk-popup>
 <!-- 箱片 -->
-<dk-popup type="basic" title="修改包装数量" titleCol="skuModel" iconCol="imagesUrl" value="{{dataItem}}" show="{{showPopBox}}" routeObjName="{{routeObjName}}" contentObj="{{popContentBox}}" bind:changeStep="changeStep" bind:commit="editItemsBox"></dk-popup>
+<dk-popup type="basic" title="修改包装数量" titleCol="skuModel" iconCol="imagesUrl" value="{{dataItem}}" show="{{showPopBox}}" routeObjName="{{routeObjName}}" contentObj="{{popContentBox}}" bind:changeStep="changeStep" bind:commit="editItemsBox"stepperDecimal ="decimalPlaces"></dk-popup>

components/dkbase/dk-popup/dk-popup.wxml

@@ -68,8 +68,8 @@
       </van-field>
       <!--数量step-->  
       <van-cell wx:if="{{item.type=='step'}}" border="{{ false }}" title-class="cell_title"  title="{{item.title?item.title:'数量'}}" required="{{item.required?true:false }}">
-        <van-stepper wx:if="{{item.code == 'box'}}" value="{{form[item.code]}}" integer="{{true}}"  data-index="{{index}}" data-item="{{item}}" data-key="{{item.code}}" min="{{form[item.code + '_min']?form[item.code + '_min']:( item.min?item.min:0)}}" max="{{form[item.code + '_max']?form[item.code + '_max']:( item.max?item.max:999999999)}}" bind:change="changeStep" disabled="{{!!readonly}}" />
-        <van-stepper wx:else value="{{form[item.code]}}" integer="{{ form[stepperDecimal]==0}}"decimal-length="{{ form[stepperDecimal] }}" data-index="{{index}}" data-item="{{item}}" data-key="{{item.code}}" min="{{form[item.code + '_min']?form[item.code + '_min']:( item.min?item.min:0)}}" max="{{form[item.code + '_max']?form[item.code + '_max']:( item.max?item.max:999999999)}}" bind:change="changeStep" disabled="{{!!readonly}}" />
+        <van-stepper wx:if="{{item.code == 'box'}}"input-width="50px" value="{{form[item.code]}}" integer="{{true}}"  data-index="{{index}}" data-item="{{item}}" data-key="{{item.code}}" min="{{form[item.code + '_min']?form[item.code + '_min']:( item.min?item.min:0)}}" max="{{form[item.code + '_max']?form[item.code + '_max']:( item.max?item.max:999999999)}}" bind:change="changeStep" disabled="{{!!readonly}}" />
+        <van-stepper wx:else value="{{form[item.code]}}" input-width="50px" integer="{{ form[stepperDecimal]==0}}"decimal-length="{{ form[stepperDecimal] }}" data-index="{{index}}" data-item="{{item}}" data-key="{{item.code}}" min="{{form[item.code + '_min']?form[item.code + '_min']:( item.min?item.min:0)}}" max="{{form[item.code + '_max']?form[item.code + '_max']:( item.max?item.max:999999999)}}" bind:change="changeStep" disabled="{{!!readonly}}" />
       </van-cell>
       <!--数字类-->
       <dk-number-input wx:if="{{item.type=='number'}}" sign="{{(item.sign || item.sign == '')?item.sign:'¥'}}" digits="{{(item.digits || item.digits == 0)?item.digits:2}}" fontSize="14" left="30rpx" data-key="{{item.code}}" data-item="{{item}}" max="{{(item.max || item.max == '')?item.max:10000000}}" min="{{(item.min || item.min == '')?item.min:-10000000}}"  data-index="{{index}}" center="{{'right'}}" readonly="{{!!readonly || !!item.readonly}}" 

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

@@ -211,7 +211,7 @@ mixins: [mixins],
       params.makeStaff = app.globalData.user.staffId  // 制单人 
       let tableData = this.data.tableData.filter(res => { return res.checked })
       //  根据formtype不同值 
-      // formType ：1 收款单 ，2 付款单，3 客户收款保存参数,4 客户退款 5 退收款单 6 退付款单  7 订单开单收款
+      // formType ：1 收款单 ，2 付款单，3 客户收款保存参数,4 客户退款 5 退收款单 6 退付款单  7 其他收入单 8 订单开单收款 9 其他支出 10 销售退款 的退款 11 销售出库的收款
       if (this.data.formType == 1) {
         params.rpType = Constants.rpType.receipt
         // 1 收款单
@@ -523,7 +523,51 @@ mixins: [mixins],
              })
              params.accDate = params.accDate ? params.accDate : utils.formatDayTime(new Date())  
              params.itemListRecPayItemVO = itemListRecPayItemVO
-      }
+      }else if (this.data.formType == 10) { //销售出库>>> 客户收款 
+              //新建销售退货参数
+              let itemIndex = 0
+              let formData = JSON.parse(this.data.formData) 
+              params.fromId = formData.orderId
+              let btnFormData = formData.btnFormData 
+              params.flgAutoHandle = btnFormData ? btnFormData.flag : false //自动出库标识 
+              formData.goodsList.forEach(res => { 
+                res.itemIndex = itemIndex++
+                res.canNegativeFlag = true 
+                if (params.flgAutoHandle) {
+                  res.outBox = res.box
+                  res.outPiece = res.piece
+                } else {
+                  res.outingBox = res.box
+                  res.outingPiece = res.piece
+                } 
+                  delete res['itemId']  
+              }) 
+               itemList = formData.goodsList //明细  
+              params.makeStaff = app.globalData.user.staffId
+              // params.deleteItemList = params.deleteList ? params.deleteList : []  
+              params.addressName = formData.addressName
+              params.objectId = formData.cusId
+              params.canNegativeFlag = true
+              params.outDate = utils.formatDayTime(new Date())  
+                 //客户退款保存参数 
+                 params.sumAmtRec = Number(formData.sumAmtRec)
+                 params.rpType = Constants.rpType.returnReceipt
+                 //编辑退款 
+                 let itemListRecPayItemVO = []
+                   tableData.forEach(item => {
+                    itemListRecPayItemVO.push(
+                       {
+                         amtRec: item.sumAmount,
+                         balance: item.balance,
+                         macCode: item.macCode,
+                         macId: item.macId,
+                         macName: item.macName,
+                       }
+                     )
+                   })
+                   params.accDate = params.accDate ? params.accDate : utils.formatDayTime(new Date())  
+                   params.itemListRecPayItemVO = itemListRecPayItemVO
+            }
 
       if (this.data.formType !== 8) {
         params.itemList = itemList
@@ -573,11 +617,10 @@ mixins: [mixins],
         return this.excute(this.data.otherPayableService, this.data.otherPayableService.insert, this.data.params);
       }else if (this.data.formType == 10) { //销售退货 >>> 客户退款
         return this.excute(this.data.saleOutBoundReturnService, this.data.saleOutBoundReturnService.outboundInsertRefund, this.data.params);
-      }
-      outbound_insert_refund
-
-
-
+ 
+      }else if (this.data.formType == 11) { //销售出库 >>> 客户收款
+        return this.excute(this.data.saleOutBoundReturnService, this.data.saleOutBoundReturnService.outboundInsertRefund, this.data.params);
+      } 
     },
     /**
       * @desc :   处理保存返回数据
@@ -586,9 +629,9 @@ mixins: [mixins],
       */
     handleData() {
       if (this.data.formType == 3 || this.data.formType == 4) { //客户收款/退款
-        console.log('处理保存返回数据')
+        
         let pages = getCurrentPages();
-        let prevPage = pages[pages.length - 3]; //上二页
+        let prevPage = pages[pages.length - 2]; //上二页
         prevPage.setData({
           refreshByAdd: true
         })

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

@@ -696,7 +696,7 @@ Page({
       this.data.item == Constants.billType.purReturn ||
       this.data.item == Constants.billType.saleOut) {
       item['box'] = parseInt(item.itemQty / item.packBox)
-      item['piece'] = Number(item.itemQty % item.packBox)
+      item['piece'] = parseFloat( Number(item.itemQty % item.packBox)).toFixed(item.decimalPlaces);  
       item.packageBox = item['box'] + item.subUnitName + item['piece'] + item.unitName
       if (this.data.item == Constants.billType.pur) { //采购订单 采购数量 
         item.pricePur = item.pricePurchase?item.pricePurchase:0 //采购价

package-sales/pages/order-return/add/add.js

@@ -423,7 +423,7 @@ Page({
       if( formData.goodsList){ //算出 要退款 的钱
         let nmb = 0
         formData.goodsList.forEach(element => {
-          nmb = element.priceOut + nmb
+          nmb = element.outingAmt + nmb
         });
         formData.sumAmtRec = nmb 
       } 

package-sales/pages/sales-outbound/add/add.js

@@ -155,10 +155,7 @@ Page({
       ]
     },
     //按钮
-    buttonSaveList: [{
-      code: 'collection',
-      title: mixins.$t("collection")
-    },
+    buttonSaveList: [ 
     {
       code: 'save',
       title: mixins.$t("save")
@@ -365,6 +362,13 @@ Page({
    * @author : 于继渤
    */
   saveData() {
+    if(this.data.collectionFlag){
+      this.setData({
+        collectionFlag:false
+      })
+      this.handCollection()
+      return
+    }
     if (this.data.formMode == Constants.formMode.detailEdit) { //编辑
       //limitEdit 编辑标识 true 大
       this.data.params.limitEdit = true
@@ -383,7 +387,33 @@ Page({
       }
     }
   },
-
+ /**
+   * @desc : 收款
+   * @date : 2024/2/1 15:49
+   * @author : 于
+   */
+  handCollection(e) {
+    let _this = this
+    wx.navigateTo({
+      url: '/package-base-select/pages/select-collection_confirm/select-collection_confirm',
+      events: {
+        // 回调后
+        refresh: function (data) {
+         // 保存成功后 回调
+         wx.navigateBack({
+          data: 1
+        })
+        }
+      },
+      success: function (res) {
+        // 通过eventChannel向被打开页面传送数据 
+        res.eventChannel.emit('params', {
+          item: _this.data.formData,
+          formType: 11
+        })
+      }
+    })
+  },
   /**
    * @desc : 自定义保存参数
    * @date : 2024/2/1 15:49
@@ -600,7 +630,27 @@ Page({
     if (name == 'save' || name == 'detail') { //保存
       this.save({})
     } else if (name == 'collection') { 
-
+      let formData = JSON.parse(this.data.formData)
+      formData.btnFormData = this.data.btnFormData ? JSON.parse(this.data.btnFormData) : '' 
+      if( formData.goodsList){ //算出 要收的钱
+        let nmb = 0
+        formData.goodsList.forEach(element => {
+          nmb = element.outingAmt + nmb
+        });
+        formData.sumAmtRec = nmb 
+      } 
+      formData.objInfo = {} //退款页面的 客户信息
+      formData.objInfo['cusPhone'] = formData.cusPhone
+      formData.objInfo['cusName'] = formData.cusName
+      formData.objInfo['objectId'] = formData.cusId
+      formData.objInfo['addressFull'] = formData.addressFull 
+   
+      this.setData({
+        formData:JSON.stringify(formData),
+        collectionFlag:true,
+      })
+      this.save({})
+   
     } 
     // })
   },
@@ -1370,12 +1420,26 @@ Page({
       })
       // 标准版，自动出库办理标识默认勾上
       if (this.data.gradeCode == Constants.gradeCode.STD) {
+            //处理默认值  业务员业务部门
+            let buttonSaveList = this.data.buttonSaveList
+            //按钮
+            buttonSaveList =  [{
+              code: 'collection',
+              title: mixins.$t("collection")
+            },
+            {
+              code: 'save',
+              title: mixins.$t("save")
+            }
+          ] 
         let btnFormData = JSON.parse(this.data.btnFormData) || {}
         btnFormData.flag = true
         this.setData({
-          btnFormData: JSON.stringify(btnFormData)
+          btnFormData: JSON.stringify(btnFormData),
+          buttonSaveList: buttonSaveList
         })
       }
+   
 
       //设置显示
       this.setFlagView()