收款单据

api/pages/mac/account.js

@@ -13,6 +13,7 @@ module.exports = {
 		prefix: 'mdm-server/mac/account/',
 		getAccount:'get_account/',
 		getReceivableAccountItem:'get_receivable_account_item/',
+		getReceivableAccountItemCount:'get_account_item_count/',
 	},
 
 	routeUrl: {

components/dkbase/dk-form-more-items/dk-form-more-items.js

@@ -696,6 +696,7 @@ Component({
  * @date   : 2024/1/26 11:46
  */
     onChange(e) {
+      console.log("onChange", e);
       // 只读
       if (this.data.readonly) {
         return;
@@ -708,6 +709,7 @@ Component({
         value: JSON.stringify(form),
         form: form
       })
+      this.triggerEvent("onCheckChange", { data: form, })
     },
     /**
      * @desc   : 清空输入框的值

components/dkbase/dk-form-more-items/dk-form-more-items.wxml

@@ -110,7 +110,7 @@
       <!--核销-->
       <van-field wx:if="{{item.type=='cancel'}}" input-width="200rpx" input-class="dk-cell-nomal-class" label-class="nomal-label" input-align="left" value="{{ item.title?item.title:$t[item.code] }}{{item.bill?(' 已选' + item.bill + '单，共' + item.amount + '元'):''}}" autosize border="{{ false }}" readonly="{{true}}" errorMessage="{{item.errMsg}}">
         <view slot="inputbefor" class="cancel-class" data-item="{{item}}" data-index="{{index}}" data-card="{{card.name}}" data-value="{{form[item.code]}}" data-key="{{item.code}}" catchtap="onChange">
-          <van-checkbox shape="round" value="{{form[item.code]}}" />
+          <van-checkbox shape="round" value="{{form[item.code]}}" /> 
         </view>
       </van-field>
       <!--客户地址-->

package-accounts-manage/pages/receipt/add/add.js

@@ -43,11 +43,11 @@ Page({
 
       ],
       bill: [
-        { code: 'cancelAmount', type: 'cancel', title: '核销应收', bill: 3, amount: 500 },
-        { code: 'receivableWaive', type: 'number', title: '待核销金额', readonly: true, },
+        { code: 'cancelAmount', type: 'cancel', title: '核销应收', bill: 4, amount: 500 },
+        { code: 'receivableResidue', type: 'number', title: '待核销金额', readonly: true, },
         { code: 'receiptResidue', type: 'number', title: '使用预存', },
         { code: 'sumWaiveAmt', type: 'number', title: '优惠金额', },
-        { code: 'currentReceivableWaive', type: 'number', title: '本次核销', required: true },
+        { code: 'currentReceivableResidue', type: 'number', title: '本次核销', required: true },
       ],
       file: [{
         code: 'remarks', type: 'textarea', title: '备注'
@@ -71,6 +71,10 @@ Page({
     btnFormData: null,
     routeObjName: 'receiptPayment',
     accountService: app.globalData['accountService'],
+    receivableResidue: 0,
+    receiptResidue: 0,
+    bill: 0,
+    objInfo: {},
   },
 
   /**
@@ -82,6 +86,7 @@ Page({
     console.log("chooseData", e, this.data.formData);
     let formData = JSON.parse(this.data.formData)
     let cardList_ = this.data.cardList
+    let contentObj = this.data.contentObj
     let code = e.detail.code
     let data = e.detail.data.data
     if (code == "supId") { //供应商
@@ -96,12 +101,16 @@ Page({
       formData.orgId = data.id
       formData.orgName = data.name
     }
-    if (code == "bill") { //选取应收的返回值
-      formData.orgId = data.id
-      formData.orgName = data.name
+    if (code == "bill") { //选取应收的返回值     
+      _this.setData({
+        objInfo: data.objInfo,
+        receivableResidue: data.receivableResidue,
+        receiptResidue: data.receiptResidue,
+        bill: data.itemLists.length,
+      })
+      this.setForm(formData, contentObj, data.receivableResidue, data.receiptResidue, data.itemLists.length)
+      return
     }
-
-
     this.setData({
       cardList: cardList_,
       formData: JSON.stringify(formData)
@@ -114,20 +123,68 @@ Page({
    * @author : 姜永辉
    */
   chooseObjTypeData(e) {
+    let _this = this
     console.log("chooseObjTypeData", e, this.data.formData);
     let formData = JSON.parse(this.data.formData)
+    let contentObj = this.data.contentObj
     let objInfo = e.detail.data.objInfo
     let cusId = e.detail.data.cusId
     let params = {
-      objectId: cusId
+      objectId: cusId,
+      accItemType: '账款类型-应收',
+      amtResidueFlg: true,
     }
-    this.excute(this.data.accountService, this.data.service.getReceivableAccountItem, params).then(res => {
-      console.log("chooseObjTypeData-res", res);
-      this.setData({
-        objectItem: res.data.data
+    this.excute(this.data.accountService, this.data.accountService.getReceivableAccountItemCount, params).then(res => {
+      formData.cancelAmount = true
+      _this.setForm(formData, contentObj, objInfo.receivableResidue,
+        objInfo.receiptResidue, res.data.data)
+      _this.setData({
+        objInfo,
+        receivableResidue: objInfo.receivableResidue,
+        receiptResidue: objInfo.receiptResidue,
+        bill: res.data.data
       })
+
     })
+  },
 
+  /**
+ * @desc : 设置表单的数据
+ * @date : 2024/2/1 15:49
+ * @author : 姜永辉
+ */
+  onCheckChange(e) { 
+    let cancelAmount = e.detail.data.cancelAmount
+    let formData = JSON.parse(this.data.formData)
+    let contentObj = this.data.contentObj
+    if (cancelAmount) {
+      this.setForm(formData, contentObj, this.data.receivableResidue, this.data.receiptResidue, this.data.bill)
+    } else {
+
+      this.setForm(formData, contentObj, 0, 0, 0)
+    }
+  },
+
+  /**
+   * @desc : 设置表单的数据
+   * @date : 2024/2/1 15:49
+   * @author : 姜永辉
+   */
+  setForm(formData, contentObj, receivableResidue, receiptResidue, bill) {
+    formData.receivableResidue = receivableResidue  // 总剩余应收
+    formData.currentReceivableResidue = receivableResidue  // 总剩余应收
+    formData.receiptResidue = receiptResidue  // 预存 
+    contentObj['bill'].forEach(itcard => {
+      if (itcard.code === 'cancelAmount') {
+        //单数和金额
+        itcard.bill = bill
+        itcard.amount = receivableResidue //总应收
+      }
+    })
+    this.setData({
+      contentObj,
+      formData: JSON.stringify(formData)
+    })
   },
 
   /**

package-accounts-manage/pages/receipt/add/add.wxml

@@ -3,7 +3,9 @@
 
 <loading wx:if="{{loading}}"></loading>
 
-<dk-form-more-items id="{{formName}}" routeObjName="{{routeObjName}}" objCol="customerId" objLabel="客户名称" objType="customer"  cardList="{{cardList}}" contentObj="{{contentObj}}" model:value="{{formData}}" bind:chooseData="chooseData" bind:chooseObjTypeData="chooseObjTypeData" >
+<dk-form-more-items id="{{formName}}" routeObjName="{{routeObjName}}" objCol="customerId" objLabel="客户名称" objType="customer"  cardList="{{cardList}}" contentObj="{{contentObj}}" model:value="{{formData}}" bind:chooseData="chooseData" bind:chooseObjTypeData="chooseObjTypeData" 
+bind:onCheckChange="onCheckChange" 
+>
 </dk-form-more-items>
 
 <view style="height: 220rpx;"></view>

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

@@ -15,9 +15,9 @@ Page({
    * 页面的初始数据
    */
   data: {
-    returnTotalAmount: 0,
+    totalAmount: 0,
     allChecked: false,
-    objectItem: {},
+    objInfo: {},
 
     tableData: [
       {
@@ -318,7 +318,7 @@ Page({
     this.excute(this.data.service, this.data.service.getAccount + this.data.item.cusId, null).then(res => {
       console.log("loadInit", res);
       this.setData({
-        objectItem: res.data.data
+        objInfo: res.data.data
       })
 
     })
@@ -383,15 +383,15 @@ Page({
     */
   calculateTotal() {
     let tableData = this.data.tableData
-    let returnTotalAmount = Number(0)
+    let totalAmount = Number(0)
     //过滤出已选数据
     tableData.forEach(item => {
       if (item.checked) {
-        returnTotalAmount += Number(item.amtResidue)
+        totalAmount += Number(item.amtResidue)
       }
     })
     this.setData({
-      returnTotalAmount: returnTotalAmount.toFixed(2),
+      totalAmount: totalAmount.toFixed(2),
     })
   },
   /**
@@ -416,9 +416,9 @@ Page({
     eventChannel.emit('bindData', {
       data: {
         itemLists: itemLists,
-        receivableWaive: that.data.returnTotalAmount,
-        currentReceivableWaive: that.data.returnTotalAmount,
-        receiptResidue: that.data.objectItem.receiptResidue, //剩余预存
+        objInfo: that.data.objInfo,
+        receivableResidue: that.data.totalAmount,
+        receiptResidue: that.data.objInfo.receiptResidue, //剩余预存
       }
     })
     wx.navigateBack({