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

api/pages/mac/receiptPayment.js

@@ -13,7 +13,8 @@ module.exports = {
 		prefix: 'mdm-server/mac/recPay/',
 		insertReceivableReceipt:'insert_receivable_receipt',
     insertPayableReceipt:'insert_payable_receipt',
-    insertReceipt:'insert_receipt'
+    insertReceipt:'insert_receipt',
+    insertRefund:'insert_refund'
 	},
 
 	routeUrl: {

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

@@ -112,7 +112,7 @@ mixins: [mixins],
       let form = this.data.form
       let itemList = []
       //收付款类型-收款的查询参数
-      params.rpType = Constants.rpType.receipt
+      params.rpType =  params.rpType ?  params.rpType : Constants.rpType.receipt
       params.orgId = form.orgId  //组织部门
       params.staffId = form.staffId  // 员工
       // 合计优惠金额
@@ -182,7 +182,24 @@ mixins: [mixins],
             }
           )
         })
-        params.accDate = utils.formatDayTime(new Date())
+        params.accDate = params.accDate ? params.accDate: utils.formatDayTime(new Date())
+      }else if (this.data.formType == 4) {
+        //客户退款保存参数
+        console.log('params', params)
+        params.sumAmtRec = Number(params.sumAmtRec)
+
+        tableData.forEach(item => {
+          itemList.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.itemList = itemList
       return params
@@ -195,13 +212,15 @@ mixins: [mixins],
     */
     saveData() {
       //  根据formtype不同值 
-      // formType ：1 收款单 ，2 付款单， 3 客户收款
+      // formType ：1 收款单 ，2 付款单， 3 客户收款  4 客户退款
       if (this.data.formType == 1) {
         return this.excute(this.data.service, this.data.service.insertReceivableReceipt, this.data.params)
       } else if (this.data.formType == 2) {
         return this.excute(this.data.service, this.data.service.insertPayableReceipt, this.data.params)
       } else if (this.data.formType == 3) {
         return this.excute(this.data.service, this.data.service.insertReceipt, this.data.params)
+      } else if (this.data.formType == 4) {
+        return this.excute(this.data.service, this.data.service.insertRefund, this.data.params)
       }
 
 

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

@@ -23,10 +23,10 @@ Page({
     ],
     contentObj: {
       main: [
-        { code: 'receiptDate', name: 'receiptDate', type: 'date',required: true,},
-        {code: 'staffId', name: 'staffName', required: true,title: mixins.$t("staffId"), type: 'choose',  urlKey: 'chooseStaff'},
-        { code: 'orgId', name: 'orgName', required: true, type: 'choose',urlKey: 'chooseOrg'},
-        { code: 'sumAmtRec', type: 'number',negative:true,maxFlag:false, title: mixins.$t("thisRefund"), readonly: false },
+        { code: 'accDate', name: 'accDate', type: 'date', required: true, },
+        { code: 'staffId', name: 'staffName', required: true, title: mixins.$t("staffId"), type: 'choose', urlKey: 'chooseStaff' },
+        { code: 'orgId', name: 'orgName', required: true, type: 'choose', urlKey: 'chooseOrg' },
+        { code: 'sumAmtRec', type: 'number', negative: true, maxFlag: false, title: mixins.$t("thisRefund"), readonly: false },
         { code: 'remarks', type: 'textarea', title: mixins.$t("remarks"), readonly: false },
         { code: 'file', type: 'uploader', title: mixins.$t("uploader") }
       ],
@@ -38,21 +38,47 @@ Page({
     routeObjName: 'cusReceiptPayment',
     accountService: app.globalData['accountService'],
   },
-    /**
-  * @desc : 计算需收款
-  * @date : 2024/2/1 15:49
-  * @author : 于继渤
-  */
-  changeNumberBlur(e){
-    // let formData = JSON.parse(this.data.formData)
-    // let contentSaveList = this.data.contentSaveList
-    // contentSaveList[1].content = formData.sumAmtRec ? formData.sumAmtRec : 0
-   
-    // this.setData({
-    //   contentSaveList:contentSaveList
-    // })
+  /**
+* @desc : 计算需收款
+* @date : 2024/2/1 15:49
+* @author : 于继渤
+*/
+  changeNumberBlur(e) {
+    let formData = JSON.parse(this.data.formData)
+    let contentSaveList = this.data.contentSaveList
+    contentSaveList[1].content = formData.sumAmtRec ? formData.sumAmtRec : 0
+
+    this.setData({
+      contentSaveList:contentSaveList
+    })
+  },
+  chooseObjTypeData(e){
+    let formData = JSON.parse(this.data.formData)
+    console.log('chooseObjTypeData',formData)
   },
 
+
+   /**
+    * @desc   : 选择回调
+    * @author : 于继渤
+    * @date   : 2024/1/26 11:46
+    */
+  chooseData(e) {
+    let formData = JSON.parse(this.data.formData)
+    let code = e.detail.code
+    let data = e.detail.data.data
+    if (code == "staffId") { //员工
+      formData.staffId = data.id
+      formData.staffName = data.name
+    }
+    if (code == "orgId") { //部门
+      formData.orgId = data.id
+      formData.orgName = data.name
+    }
+    this.setData({
+      formData: JSON.stringify(formData)
+    })
+  },
   /**
   * @desc : 保存数据服务-跳转收款页面
   * @date : 2024/2/1 15:49
@@ -74,7 +100,7 @@ Page({
       success: function (res) {
         //设置参数
         let item = _this.setSaveData()
-        res.eventChannel.emit('params', { item: item, formType: 3 })
+        res.eventChannel.emit('params', { item: item, formType: 4 })
       }
     })
   },
@@ -102,107 +128,19 @@ Page({
     param.staffId = app.globalData.user.staffId
     param.staffName = app.globalData.user.staffName
     param.annexPaths = formData.annexPaths
-    if (this.data.item) {
-      param.rpType = '收付款类型-退款'
-      param.sumAmtRec = formData.receivableResidue
-    } else {
-      param.rpType = '收付款类型-收款'
-      param.sumAmtRec = formData.sumAmtRec
-      param.sumAmount = formData.sumAmtRec
-    }
+    param.rpType = '收付款类型-退收款'
+    param.sumAmtRec = formData.sumAmtRec
+    param.sumAmount = formData.sumAmtRec
+    console.log(param)
     return JSON.stringify(param)
   },
 
-  /**
-    * @desc   : 选择回调
-    * @author : 于继渤
-    * @date   : 2024/1/26 11:46
-    */
-  chooseData(e) {
-    console.log('eee1', e);
-    let item = e.detail.data
-    let code = e.detail.code
-    let formData = JSON.parse(this.data.formData)
-    //设置客户信息
-    if (code == 'cusName') {
-      formData.cusCode = item.cusCode
-      formData.cusId = item.cusId
-      formData.cusName = item.cusName
-      formData.cusPhone = item.cusPhone
-      formData.cusFromName = item.cusFromName
-      formData.cusFrom = item.cusFrom
-      //处理地址
-      formData.address = {
-        address: item.addressFull,
-        addressFull: item.addressFull,
-        addressArea: item.addressArea,
-        addressGcj02: item.addressGcj02,
-        addressName: item.addressName,
-      }
-      formData.addressArea = item.addressArea
-      formData.addressFull = item.addressFull
-      formData.addressGcj02 = item.addressGcj02
-      formData.addressName = item.addressName
-      formData.addressNo = item.addressNo
-      //订单销售渠道 ,默认取的客户的渠道
-      formData.salesChannel = item.channelId
-      formData.channelId = item.channelId
-      formData.channelName = item.channelName
-      formData.contactPhone = item.contactPhone
-      formData.contactPhone = item.contactPhone
-    }
-    ///设置主从业务员
-    if (code == 'staff') {
-      formData.staff = item.staffItem
-      formData['staffId'] = item.staffMain.staffId
-      formData['staffName'] = item.staffMain.staffName
-      formData['staffList'] = item.staffList
-      console.log(item.staffList)
-    }
-    ///设置主从业务部门
-    if (code == 'org') {
-      console.log('item', item)
-      formData.org = item.orgItem
-      formData['orgId'] = item.orgMain.orgId
-      formData['orgName'] = item.orgMain.orgName
-      formData['orgList'] = item.orgList
-    }
-    this.setData({
-      formData: JSON.stringify(formData)
-    })
+ 
 
-  },
 
 
 
 
-  /**
-   * @desc : 加载数据
-   * @author : 于继渤
-   * @date : 2024/1/23 9:16
-   */
-  getRpInfoById(id, item) {
-    return this.excute(this.data.accountService, this.data.accountService.selectByCond, {
-      objectId: id
-    }).then(res => {
-      if (res.data.code == 200) {
-        //设置客户信息
-        let formData = JSON.parse(this.data.formData)
-        formData['receiptResidue'] = res.data.data.list[0].receiptResidue
-        //处理地址
-        formData.address = {
-          address: item.addressFull,
-          addressFull: item.addressFull,
-          addressArea: item.addressArea,
-          addressGcj02: item.addressGcj02,
-          addressName: item.addressName,
-        }
-        this.setData({
-          formData: JSON.stringify(formData)
-        })
-      }
-    });
-  },
 
 
   /**
@@ -210,33 +148,11 @@ Page({
   */
   loadInit() {
     let formData = JSON.parse(this.data.formData)
-
-    formData['staff'] = {
-      text: app.globalData.user.staffName,
-      value: [app.globalData.user.staffId]
-    }
-    formData['org'] = {
-      text: app.globalData.user.orgName,
-      value: [app.globalData.user.orgId]
-    }
     formData.orgId = app.globalData.user.orgId
-    formData.orgList = [
-      {
-        orgId: app.globalData.user.orgId,
-        orgName: app.globalData.user.orgName,
-        ownerFlag: true,
-        allocationRatio: 100,
-      }
-    ]
+    formData.orgName = app.globalData.user.orgName
     formData.staffId = app.globalData.user.staffId
-    formData.staffList = [
-      {
-        staffId: app.globalData.user.staffId,
-        staffName: app.globalData.user.staffName,
-        ownerFlag: true,
-        allocationRatio: 100,
-      }
-    ]
+    formData.staffName =app.globalData.user.staffName
+ 
     this.setData({
       formData: JSON.stringify(formData)
     })

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

@@ -2,7 +2,7 @@
 <van-dialog id="van-dialog" />
 <loading wx:if="{{loading}}" ></loading>
 <dk-form-bill type="sale" id="dk-form-bill" routeObjName="{{routeObjName}}" cardList="{{cardList}}"  saleStaffAndOrgFlag="{{false}}"
-objCol="customerId" objLabel="客户名称" amountTitle="客户欠款" chooseText="选客户" objType="customer" sumAmountCol="sumAmount" discountStandardCol="saleDiscount" contentObj="{{contentObj}}" model:value="{{formData}}"  bind:customersChoose="customersChoose"   bind:changeNumberBlur="changeNumberBlur">
+objCol="customerId" objLabel="客户名称" amountTitle="客户欠款" chooseText="选客户" objType="customer" sumAmountCol="sumAmount" bind:chooseData="chooseData" discountStandardCol="saleDiscount" contentObj="{{contentObj}}" model:value="{{formData}}"  bind:customersChoose="customersChoose" bind:chooseObjTypeData="chooseObjTypeData"  bind:changeNumberBlur="changeNumberBlur">
 </dk-form-bill>
 
 <dk-save-button model:value="{{btnFormData}}" btnAutoWidthFlag="{{true}}" btnRightFlag="{{true}}" buttonList="{{buttonSaveList}}" contentList="{{contentSaveList}}" bind:open="open"></dk-save-button>