收款

api/pages/mac/receiptPayment.js

@@ -11,6 +11,7 @@ module.exports = {
 	receiptPaymentService: {
 		// 前缀
 		prefix: 'mdm-server/mac/recPay/',
+		insertReceivableReceipt:'insert_receivable_receipt',
 	},
 
 	routeUrl: {

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

@@ -173,6 +173,7 @@ Page({
   setForm(formData, contentObj, receivableResidue, receiptResidue, bill) {
     formData.receivableResidue = receivableResidue  // 总剩余应收
     formData.currentReceivableResidue = receivableResidue  // 总剩余应收
+    formData.sumAmount = receivableResidue  // 总剩余应收
     formData.receiptResidue = receiptResidue  // 预存 
     contentObj['bill'].forEach(itcard => {
       if (itcard.code === 'cancelAmount') {
@@ -187,64 +188,56 @@ Page({
     })
   },
 
-  // /**
-  //  * @desc : 保存数据服务--校验
-  //  * @date : 2024/2/1 15:49
-  //  * @author : 姜永辉
-  //  */
-  // validData() {
-  //   let formData = JSON.parse(this.data.formData)
-  //   if (formData.goodsList == null || formData.goodsList.length == 0) {
-  //     wx.showToast({
-  //       title: mixins.$t("chooseGoodsInfo"),
-  //       icon: 'none'
-  //     })
-  //     return false
-  //   }
-  //   return true
-  // },
+   
 
-  // /**
-  //  * @desc : 保存的參數設置
-  //  * @date : 2024/2/1 15:49
-  //  * @author : 姜永辉
-  //  */
-  // setParams(params) {
-  //   let btnFormData = this.data.btnFormData ? JSON.parse(this.data.btnFormData) : ''
-  //   let formData = JSON.parse(this.data.formData)
+  /**
+   * @desc : 保存的參數設置
+   * @date : 2024/2/1 15:49
+   * @author : 姜永辉
+   */
+  setParams(params) {
+    let btnFormData = this.data.btnFormData ? JSON.parse(this.data.btnFormData) : ''
+    let formData = JSON.parse(this.data.formData)
+
+    //收付款类型-收款的查询参数
+    params.rpType = Constants.rpType.receipt
+    params.orgId = formData.orgId  //组织部门
+    params.staffId = formData.staffId  // 员工
+    //  // 供应商1 客户2 所有 传空
+    params.objectId = this.data.objInfo.cusId  // 客户
+    // 收款金额					
+    params.sumAmtRec = 0
+    // 合计应收冲抵金额								
+    params.sumAmtReceivableHandle = formData.sumAmount
+    // 合计优惠金额
+    params.sumWaiveAmt = 0
+    params.annexPaths = {}
+    // params.biznisType = null
+    // params.biznisId	 = null
+    // params.biznisNo	= null	 
+    params.accDate = formData.accDate  // 
+    params.remarks = formData.remarks  // 备注
+    params.makeStaff = app.globalData.user.staffId  // 制单人
+ 
+    params.itemList = [] //明细 
+    return params
+  },
 
-  //   //收付款类型-收款的查询参数
-  //   params.rpType = Constants.rpType.receipt
-  //   params.orgId = formData.orgId  //组织部门
-  //   params.staffId = formData.staffId  // 员工
-  //   //  // 供应商1 客户2 所有 传空
-  //   if (formData.objType == 1) {
-  //     params.supId = formData.outObject  // 供应商
-  //   }
-  //   if (formData.objType == 2) {
-  //     params.cusId = formData.outObject  // 客户
-  //   }
-  //   // params.whId = formData.whId  // 仓库
-  //   params.remarks = formData.remarks  // 备注
-  //   params.makeStaff = app.globalData.user.staffId  // 制单人
-  //   // 明细的顺序
-  //   let i = 0
-  //   formData.goodsList.forEach(it => {
-  //     it.itemIndex = (i++)
-  //   })
-  //   params.itemList = formData.goodsList //商品明细
-  //   console.log("setParams", params);
-  //   return params
-  // },
+  /**
+  * @desc : 保存数据服务
+  * @date : 2024/2/1 15:49
+  * @author : 姜永辉
+  */
+  saveData() {   
+    let formData = JSON.parse(this.data.formData)
 
-  // /**
-  // * @desc : 保存数据服务
-  // * @date : 2024/2/1 15:49
-  // * @author : 姜永辉
-  // */
-  // saveData() {
-  //   return this.excute(this.data.service, this.data.service.save, this.data.params)
-  // },
+    if (formData.currentReceivableResidue == 0) {
+      return this.excute(this.data.service, this.data.service.insertReceivableReceipt, this.data.params)
+    } else {
+      this.open()
+    }
+    
+  },
 
 
   /**
@@ -253,6 +246,7 @@ Page({
   * @author : 姜永辉
   */
   open(e) {
+    let _this = this
     wx.navigateTo({
       url: '/package-base-select/pages/select-collection_confirm/select-collection_confirm',
       events: {
@@ -265,8 +259,8 @@ Page({
         }
       },
       success: function (res) {
-        // 通过eventChannel向被打开页面传送数据
-        res.eventChannel.emit('params', { data: this.data.formData })
+        // 通过eventChannel向被打开页面传送数据 
+        res.eventChannel.emit('params', { item: _this.data.formData,  formType: 1 })
       }
     })
   }

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

@@ -11,4 +11,4 @@ bind:onCheckChange="onCheckChange"
 <view style="height: 220rpx;"></view>
 
 <!-- 新建按钮 -->
-<dk-save-button model:value="{{btnFormData}}" btnAutoWidthFlag="{{false}}" btnRightFlag="{{true}}" buttonList="{{buttonList}}" contentList="{{contentList}}" bind:open="save"></dk-save-button>
+<dk-save-button model:value="{{btnFormData}}" btnAutoWidthFlag="{{false}}" btnRightFlag="{{true}}" buttonList="{{buttonList}}" contentList="{{contentList}}" bind:open="open"></dk-save-button>

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

@@ -9,6 +9,7 @@
  *******************************************************************************/
 const app = getApp()
 const Constants = require('@/utils/Constants');
+const util = require('@/utils/util');
 const mixins = require('@/mixins/index.js')
 mixins: [mixins],
     Page({
@@ -17,164 +18,48 @@ mixins: [mixins],
          * 页面的初始数据
          */
         data: {
-            active: 0,
-            activeNames: [
-                "1"
-            ],
             annexPaths: [],
             dealFalg: "true",
             disabledSave: true,
             fileList: [],
-            form: {
-                balanceAmount: 0,
-                customer: {
-                    addressFull: "辽宁省沈阳市浑南区沈阳市浑南区人民政府(新聪街西)1",
-                    addressName: "沈阳市浑南区人民政府(新聪街西)",
-                    bankAccount: "",
-                    customerName: "ZHANGZAHNG",
-                    customerPhone: "13512341234"
-                },
-                fileList: [],
-                order: {},
-                orderDetail: [],
-                orderId: "",
-                orgCode: "",
-                receivable: 0,
-                remarks: "",
-                staffCode: "",
-                sumAmount: "99990"
-            },
+
             guId: "474fd125-7b97-4c30-88f2-5dd731fd111b",
             page: "orderBillingAdd",
             pageIndex: "undefined",
-            settlementTypeFlag: true,
-            settlementTypeList: [
-                {
-                    accountType: "收款账户类型-现金",
-                    accountname: "现金",
-                    addressFull: null,
-                    ascpId: null,
-                    categoryCode: null,
-                    categoryId: null,
-                    categoryName: null,
-                    channelId: null,
-                    checked: true,
-                    code: null,
-                    contactName: null,
-                    deliveryPhone: null,
-                    cpId: null,
-                    customerPhone: null,
-                    defSettlementType: 516,
-                    defWhId: null,
-                    erpOrgCode: null,
-                    erpStaffCode: null,
-                    flgStore: false,
-                    flgValid: null,
-                    id: null,
-                    imageReceiptCode: null,
-                    imageReceiptCode_ping: "https://hgscrm-dev.oss-cn-shenzhen.aliyuncs.com/null",
-                    jobId: 0,
-                    keyWords: null,
-                    name: null,
-                    objCode: null,
-                    objId: null,
-                    objName: null,
-                    objType: null,
-                    objTypeName: null,
-                    orgAscpId: null,
-                    orgAscpName: null,
-                    orgCode: null,
-                    orgId: null,
-                    orgName: null,
-                    orgSale2Id: null,
-                    orgSale2Name: null,
-                    orgSalesChannel: null,
-                    orgSalesChannelName: null,
-                    parentId: null,
-                    phone: null,
-                    postId: null,
-                    postName: null,
-                    qvUserid: null,
-                    remarks: null,
-                    sale1Id: null,
-                    sale2Id: null,
-                    salesChannel: null,
-                    salesChannelName: null,
-                    sumAmount: "70000",
-                    toiletsNum: null,
-                    typeId: 516,
-                    typeName: "无库无ERP00001",
-                    whId: null,
-                    whName: null
-                },
-                {
-                    accountType: "收款账户类型-现金",
-                    accountname: "现金",
-                    addressFull: null,
-                    ascpId: null,
-                    categoryCode: null,
-                    categoryId: null,
-                    categoryName: null,
-                    channelId: null,
-                    code: null,
-                    contactName: null,
-                    deliveryPhone: null,
-                    cpId: null,
-                    customerPhone: null,
-                    defSettlementType: 516,
-                    defWhId: null,
-                    erpOrgCode: null,
-                    erpStaffCode: null,
-                    flgStore: false,
-                    flgValid: null,
-                    id: null,
-                    imageReceiptCode: null,
-                    imageReceiptCode_ping: "https://hgscrm-dev.oss-cn-shenzhen.aliyuncs.com/null",
-                    jobId: 0,
-                    keyWords: null,
-                    name: null,
-                    objCode: null,
-                    objId: null,
-                    objName: null,
-                    objType: null,
-                    objTypeName: null,
-                    orgAscpId: null,
-                    orgAscpName: null,
-                    orgCode: null,
-                    orgId: null,
-                    orgName: null,
-                    orgSale2Id: null,
-                    orgSale2Name: null,
-                    orgSalesChannel: null,
-                    orgSalesChannelName: null,
-                    parentId: null,
-                    phone: null,
-                    postId: null,
-                    postName: null,
-                    qvUserid: null,
-                    remarks: null,
-                    sale1Id: null,
-                    sale2Id: null,
-                    salesChannel: null,
-                    salesChannelName: null,
-                    sumAmount: 0,
-                    toiletsNum: null,
-                    typeId: 548,
-                    typeName: "无库无ERP00002",
-                    whId: null,
-                    whName: null
-                }
-            ],
             routeObjName: 'receiptPayment',
-            accountService: app.globalData['accountService'],
+            moneyAccountService: app.globalData['moneyAccountService'],
         },
 
+        /**
+        * @desc : 设置查询参数
+        * @date : 2024年3月8日
+        * @author : 姜永辉
+        */
+        setSearchParams(params) {
+            return params;
+        },
+
+        /** 
+         * @desc : 查询 入库单
+         * @date : 2024年3月8日
+         * @author : 姜永辉
+         */
+        getData(params) {
+            return this.excute(this.data.moneyAccountService, this.data.moneyAccountService.selectByCond, params);
+        },
 
         /**
-         * 生命周期函数--监听页面加载
+         * @desc :   处理接口返回数据
+         * @date : 2024年3月8日
+         * @author : 姜永辉
          */
-        onLoad: function (options) {
+        handleSearchData(tableData) {
+            let formData = JSON.parse(this.data.item)
 
+            this.setData({
+                formData: this.data.item,
+                form: formData,
+            })
         },
 
 
@@ -184,14 +69,34 @@ mixins: [mixins],
          * @author : 姜永辉
          */
         validData() {
-            let formData = JSON.parse(this.data.formData)
-            if (formData.goodsList == null || formData.goodsList.length == 0) {
+            let msgError = null
+           
+            // 请选择支付方式
+            if (this.data.settlementTypeListLength == null || this.data.settlementTypeListLength == 0) {
+                msgError = '请选择支付方式'
+            } 
+            let sumAmount = Number(0)
+            this.data.tableData.forEach(item => {
+                if (item.checked && item.balance < item.sumAmount) { 
+                    sumAmount += Number(item.sumAmount)
+                }
+            })            
+
+            if (msgError != null) {
                 wx.showToast({
-                    title: mixins.$t("chooseGoodsInfo"),
+                    title: msgError,
                     icon: 'none'
                 })
                 return false
             }
+            if (sumAmount != form.sumAmount) {
+                wx.showToast({
+                    title: '输入收款金额不正确',
+                    icon: 'none'
+                })
+                return false
+            }
+
             return true
         },
 
@@ -200,26 +105,25 @@ mixins: [mixins],
          * @date : 2024/2/1 15:49
          * @author : 姜永辉
          */
-        setParams(params) {
-            let formData = JSON.parse(this.data.formData)
-
+        setParams(params) { 
+            let form = this.data.form
             //收付款类型-收款的查询参数
             params.rpType = Constants.rpType.receipt
-            params.orgId = formData.orgId  //组织部门
-            params.staffId = formData.staffId  // 员工
+            params.orgId = form.orgId  //组织部门
+            params.staffId = form.staffId  // 员工
             //  // 供应商1 客户2 所有 传空
-            if (formData.objType == 1) {
-                params.supId = formData.outObject  // 供应商
-            }
-            if (formData.objType == 2) {
-                params.cusId = formData.outObject  // 客户
-            }
-            // params.whId = formData.whId  // 仓库
-            params.remarks = formData.remarks  // 备注
+            params.objectId = this.data.objInfo.cusId  // 客户
+            // 收款金额					
+            params.sumAmtRec = 0
+            // 合计应收冲抵金额								
+            params.sumAmtReceivableHandle = form.sumAmount
+            // 合计优惠金额
+            params.sumWaiveAmt = 0
+            params.annexPaths = {}
+            params.accDate = form.accDate  // 
+            params.remarks = form.remarks  // 备注
             params.makeStaff = app.globalData.user.staffId  // 制单人
-
-            params.itemList = formData.goodsList //商品明细
-            console.log("setParams", params);
+            params.itemList = [] //明细 
             return params
         },
 
@@ -229,7 +133,7 @@ mixins: [mixins],
         * @author : 姜永辉
         */
         saveData() {
-            return this.excute(this.data.service, this.data.service.save, this.data.params)
+            return this.excute(this.data.service, this.data.service.insertReceivableReceipt, this.data.params)
         },
 
         /**
@@ -254,83 +158,38 @@ mixins: [mixins],
          */
         catchtapCheck(e) {
             let item = e.currentTarget.dataset.item
-            let list = this.data.settlementTypeList
+            let list = this.data.tableData
             let form = this.data.form
             let index = e.target.dataset.index
-
-
             if (list && list.length > 0) {
-                if (this.data.type == 0 || this.data.type == 4 || this.data.type == 3 || (this.data.page == 'orderBilling' && this.data.type == 1)) {
-                    //客户收款结算方式单选
-                    list.forEach(item => {
-                        item.checked = false
-                    })
-                    list.forEach(res => {
-                        if (res.typeId === item.typeId) {
-                            res.checked = !res.checked
-                        }
-                    })
-                    let settlementTypeListLength = list.filter(item => {
-                        return item.checked
-                    })
-                    if (settlementTypeListLength.length == 1) {
-                        list.forEach(res => {
-                            if (res.checked) {
-                                res.sumAmount = form.sumAmount
-                            }
-                        })
-                    }
-                    this.setData({
-                        settlementTypeList: list,
-                        settlementTypeListLength: settlementTypeListLength.length //已选数量
-                    })
-                } else {
-                    //客户收款结算方式多选
-                    if (list[index].checked) {
-                        list[index].sumAmount = Number(0)
+                // formType ：1 收款单 ，2 付款单，
+                //客户收款结算方式多选
+                if (list[index].checked) {
+                    list[index].sumAmount = Number(0)
+                }
+                list.forEach(res => {
+                    if (res.macId === item.macId) {
+                        res.checked = !res.checked
                     }
+                })
+                //已选数量
+                let settlementTypeListLength = list.filter(item => {
+                    return item.checked
+                })
+
+                if (settlementTypeListLength.length == 1) {
                     list.forEach(res => {
-                        if (res.typeId === item.typeId) {
-                            res.checked = !res.checked
+                        if (res.checked) {
+                            res.sumAmount = form.receivableResidue
                         }
                     })
-                    //已选数量
-                    let settlementTypeListLength = list.filter(item => {
-                        return item.checked
-                    })
-
-                    if (settlementTypeListLength.length == 1) {
-                        list.forEach(res => {
-                            if (res.checked) {
-                                res.sumAmount = form.sumAmount
-                            }
-                        })
-                    }
-                    let sumAmountFlag = true
-                    if (settlementTypeListLength.length == 0) {
-                        form.sumAmount = form.sumTempAmount
-                        sumAmountFlag = false
-                        this.setData({
-                            sumAmountFlag: false
-                        })
-
-                    } else {
-                        sumAmountFlag = true
-                        this.setData({
-                            sumAmountFlag: true
-                        })
-                    }
-
-                    this.setData({
-                        form: form,
-                        settlementTypeList: list,
-                        settlementTypeListLength: settlementTypeListLength.length //已选数量
-                    })
-                    if (sumAmountFlag) {
-                        this.getSumAmount(list)
-                    }
-
                 }
+                console.log(list);
+                this.setData({
+                    tableData: list,
+                    settlementTypeListLength: settlementTypeListLength.length //已选数量
+                })
+
             }
         },
 
@@ -340,52 +199,33 @@ mixins: [mixins],
          * @param {*} e 
          */
         sumAmountBindValue(e) {
-            let settlementTypeList = this.data.settlementTypeList
+            let tableData = this.data.tableData
             let value = e.detail.value ? Number(e.detail.value) : 0
             let index = e.currentTarget.dataset.index
-            settlementTypeList[index].sumAmount = value
+            tableData[index].sumAmount = value
             this.setData({
-                settlementTypeList: settlementTypeList
+                tableData: tableData
             })
-            this.getSumAmount(settlementTypeList)
-        },
-
-        getSumAmount(settlementTypeList) {
-            let form = this.data.form
-            let sumAmountTemp = Number(0)
-            if (settlementTypeList && settlementTypeList.length > 0) {
-                settlementTypeList.forEach(res => {
-                    if (res.checked) {
-                        sumAmountTemp = util.AddNumber(sumAmountTemp, res.sumAmount ? res.sumAmount : 0)
-                    }
-                })
-                form.sumAmount = sumAmountTemp
-                this.setData({
-                    form: form
-                })
-            }
-
         },
 
         /**
          * @desc : 销售价格编辑
-         * @author : 常皓宁
+         * @author : 姜永辉
          * @date : 2022/5/31 14:45
          */
         changeSalesPriceField(e) {
             let form = this.data.form
             form.sumAmount = e.detail.value;
-            let settlementTypeList = this.data.settlementTypeList
-            if (settlementTypeList && settlementTypeList.length > 0) {
-                settlementTypeList.forEach(res => {
+            let tableData = this.data.tableData
+            if (tableData && tableData.length > 0) {
+                tableData.forEach(res => {
                     if (res.checked) {
                         res.sumAmount = Number(e.detail.value ? e.detail.value : 0);
                     }
                 })
             }
-
             this.setData({
-                settlementTypeList: settlementTypeList,
+                tableData: tableData,
                 form
             })
         },
@@ -411,8 +251,4 @@ mixins: [mixins],
 
         },
 
-
-        
-
-
     })

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

@@ -1,13 +1,8 @@
 <wxs src='/utils/numberFormat.wxs' module="numberFormat"></wxs>
 <wxs src='/utils/wxmlUtil.wxs' module="wxmlUtil"></wxs>
-<loading wx:if="{{loading}}" ></loading>
+<loading wx:if="{{loading}}"></loading>
 <!-- 客户资料 -->
-<!-- 客户信息组件 -->
-<!-- <dk-customer-detail customerName="{{form.customer.customerName}}" textColor="black" backgroundColor="white,white,white"
- customerPhone="{{form.customer.customerPhone}}"  
- addressFull="{{form.customer.addressFull}}"></dk-customer-detail> -->
- <van-dialog id="van-dialog" />
-
+<van-dialog id="van-dialog" />
 <!-- 客户信息 -->
 <view style="margin: 42rpx 34rpx 0rpx 34rpx;border-radius: 15rpx;box-shadow:2px 2px 5px #e5e5e6;">
   <view style="flex-direction: column;justify-content: center;align-items: flex-start;background: linear-gradient(90.12deg, #718AC6 0.84%, #4A5E98 99.43%);border-radius: 15rpx;">
@@ -21,61 +16,61 @@
       </view>
       <!-- 客户名称 供应商名称  -->
       <view style="padding-left: 14rpx;padding-top: 19rpx;font-size: 13px;line-height: 36rpx;color: #FFFFFF;">
-        {{form.customer.customerName}}
+        {{form.objInfo.cusName}}
       </view>
       <!-- 客户电话 供应商电话  -->
       <view style="padding-left: 22rpx;padding-top: 19rpx;font-size: 13px;line-height: 36rpx;color: #FFFFFF;">
-        {{form.customer.customerPhone}}
+        {{form.objInfo.cusPhone}}
       </view>
     </view>
-     <!-- 地址  -->
+    <!-- 地址  -->
     <view style="display: flex;padding-right: 32rpx;padding-bottom: 15rpx;">
       <view style="padding-left: 32rpx;padding-top: 15rpx;font-size: 13px;line-height: 36rpx;color: #FFFFFF;">
-        {{wxmlUtil.addressToIndexOf(form.customer.addressFull)}}
+        {{wxmlUtil.addressToIndexOf(form.objInfo.addressFull)}}
       </view>
     </view>
 
- 
+
   </view>
 </view>
- 
+
 
 <!-- 收款方式 -->
-<view   style="margin: 24rpx 34rpx 26rpx 34rpx;">
-  <scroll-view scroll-y="true" style="height:775rpx;" bindscrolltolower="paging" scroll-top="{{topNum}}">
-    <view wx:for="{{settlementTypeList}}" style="width: 100%;">
-    <view class="choose-item {{(item.checked == true && item.imageReceiptCode_ping) ? 'choose-item-select' : 'choose-item-unchecked'}}">
-      <view class="thick-line" wx:if="{{item.checked}}"></view>
-      <view style="width:40rpx;place-self: center;padding-left: 34rpx;">
+<view style="margin: 24rpx 34rpx 26rpx 34rpx;">
+  <scroll-view scroll-y="true" style="height:860rpx;" bindscrolltolower="paging" scroll-top="{{topNum}}">
+    <view wx:for="{{tableData}}" style="width: 100%;">
+      <view class="choose-item {{(item.checked == true && item.imageReceiptCode_ping) ? 'choose-item-select' : 'choose-item-unchecked'}}">
+        <view class="thick-line" wx:if="{{item.checked}}"></view>
+        <view style="width:40rpx;place-self: center;padding-left: 34rpx;">
 
-        <view style="position: relative;">
-          <van-checkbox value="{{item.checked}}" data-index="{{index}}" data-item="{{item}}" catchtap="catchtapCheck"  checked-color="#1989FA" />
+          <view style="position: relative;">
+            <van-checkbox value="{{item.checked}}" data-index="{{index}}" data-item="{{item}}" catchtap="catchtapCheck" checked-color="#1989FA" />
+          </view>
         </view>
-      </view>
 
-      <view class="choose-item-two" style="{{(item.checked == true && item.imageReceiptCode_ping) ? 'padding-top:63rpx;' : 'display: flex;  align-items: center;'}}">
+        <view class="choose-item-two" style="{{(item.checked == true && item.imageReceiptCode_ping) ? 'padding-top:63rpx;' : 'display: flex;  align-items: center;'}}">
 
-        <view class="type-name">
-          {{item.typeName ? item.typeName : ''}}
-        </view>
+          <view class="type-name">
+            {{item.macTypeName ? item.macTypeName : ''}}
+          </view>
 
 
-        <view style="margin-left:{{item.checked == true ? '0rpx' : '27rpx'}}; ">
-          <dk-van-tag color="#EAF1FF" textColor="#606EB2" radius="3rpx" roundFlag="{{true}}" value="{{item.accountname ? item.accountname : ''}}账户"></dk-van-tag>
+          <view style="margin-left:{{item.checked == true ? '0rpx' : '27rpx'}}; ">
+            <dk-tag border="1rpx solid #606EB2" height="35rpx" color="transparent" textColor="#606EB2" radius="5rpx" roundFlag="{{true}}" size="large" value="{{item.macName ? item.macName : ''}}"></dk-tag>
+          </view>
+       
+          <view wx:if="{{item.checked && settlementTypeListLength > 1 }}" style="text-align:left;padding-top: 10rpx;">
+            <dk-number-input negative="{{form.sumTempAmount < 0 ?true:false}}" signSize="11px" center="left" fontSize="15" inputColor="#CAA977;" fontWeight="500" data-key="priceSale" inputValue="{{item.sumAmount ? item.sumAmount : 0}}" data-value="{{item.sumAmount}}" data-index="{{index}}" bind:triggerBindValue="sumAmountBindValue" bind:triggerBindBlur=""></dk-number-input>
+          </view>
         </view>
-
-        <view wx:if="{{item.checked && settlementTypeListLength > 1 }}" style="text-align:left;padding-top: 10rpx;">
-          <dk-number-input  negative="{{form.sumTempAmount < 0 ?true:false}}"  signSize="11px" center="left" fontSize="15" inputColor="#CAA977;" fontWeight="500" data-key="priceSale"  inputValue="{{item.sumAmount ? item.sumAmount : 0}}" data-value="{{item.sumAmount}}" data-index="{{index}}" bind:triggerBindValue="sumAmountBindValue" bind:triggerBindBlur=""></dk-number-input>
+        <view class="image-code" wx:if="{{item.checked && item.imageReceiptCode && item.imageReceiptCode_ping}}" style="margin-top: 32rpx;margin-right: 40rpx;margin-bottom: 26rpx;border: 1rpx solid #000000;border-radius: 15rpx;">
+          <image wx:if="{{item.imageReceiptCode && item.imageReceiptCode_ping}}" style="height:166rpx;width:166rpx;border-radius: 15rpx;" src="{{item.imageReceiptCode_ping}}" bindtap="previewImg" data-imgUrl="{{item.imageReceiptCode_ping}}" />
         </view>
       </view>
-      <view class="image-code" wx:if="{{item.checked && item.imageReceiptCode && item.imageReceiptCode_ping}}" style="margin-top: 32rpx;margin-right: 40rpx;margin-bottom: 26rpx;border: 1rpx solid #000000;border-radius: 15rpx;">
-        <image wx:if="{{item.imageReceiptCode && item.imageReceiptCode_ping}}" style="height:166rpx;width:166rpx;border-radius: 15rpx;" src="{{item.imageReceiptCode_ping}}" bindtap="previewImg" data-imgUrl="{{item.imageReceiptCode_ping}}" />
-      </view>
     </view>
-  </view>
-  <view style="height: 180rpx;"></view>
+    <view style="height: 90rpx;"></view>
   </scroll-view>
-</view> 
+</view>
 
 <!-- 确认收款 -->
 <view style="position:fixed;bottom:0;width:100%;z-index: 10; ">
@@ -88,13 +83,13 @@
     </view>
     <view style="padding-top: 10rpx; text-align:center; display: flex; justify-content: center;">
 
-      <dk-number-input readonly="{{settlementTypeListLength > 1}}" negative="{{form.sumTempAmount < 0 ?true:false}}" signSize="15px" fontSize="27" color fontWeight="600" data-key="priceSale"  inputValue="{{form.sumAmount}}" data-value="{{form.sumAmount}}" bind:triggerBindValue="changeSalesPriceField" bind:triggerBindBlur="sumAmountBindinputBlur"></dk-number-input>
+      <dk-number-input readonly="{{settlementTypeListLength > 1}}" negative="{{form.sumAmount < 0 ?true:false}}" signSize="15px" fontSize="27" color fontWeight="600" data-key="priceSale" inputValue="{{form.sumAmount}}" data-value="{{form.sumAmount}}" bind:triggerBindValue="changeSalesPriceField" ></dk-number-input>
     </view>
 
     <view style="z-index: 12;margin-top:40rpx;box-shadow: 0px 4rpx 16rpx rgba(190, 144, 73, 0.5);border-radius: 15rpx;">
 
       <van-button round size="large" disabled="{{loadingButtonFlag}}" loading="{{loadingButtonFlag}}" color="#CAA977" custom-style="width:100%;" bind:click="save" type="info">确认收款
-        </van-button>
+      </van-button>
     </view>
   </view>
 

package-inventory/pages/outbound-processing/detail/detail.js

@@ -264,10 +264,7 @@ Page({
     let formData = JSON.parse(this.data.formData)
     params.allEdit = true //大编辑
     // 由于办理后直接生成出库单，将画面的删除的数据放入deleteItemList数组中
-
-
-
-    params.deleteItemList = formData.deleteItemList  || []
+    params.deleteItemList = formData.deleteList  || []
 
     params.fromId = formData.fromId  //来源id
     params.fromNo = formData.fromNo  //来源单号

package-inventory/pages/warehousing-processing/detail/detail.js

@@ -256,7 +256,7 @@ Page({
         let formData = JSON.parse(this.data.formData)
         params.allEdit = true //大编辑
         // 由于办理后直接生成出库单，将画面的删除的数据放入deleteItemList数组中
-        params.deleteItemList = formData.deleteItemList || []
+        params.deleteItemList = formData.deleteList  || []
 
         params.fromId = formData.fromId  //来源id
         params.fromNo = formData.fromNo  //来源单号