王英杰 2 tahun lalu
induk
melakukan
0c48a0f8a5

+ 20 - 2
package-accounts-manage/pages/funds-transfer/funds-transfer.js

@@ -56,8 +56,26 @@ Page({
               // 路由
       routeObjName: 'transfer',
         // 主键Id 
-      primaryKey: 'trfId',
-          tableData: [{  collectStatus: '11', collectAmount: 1000, }]
+      primaryKey: 'trfId', 
+          // 列表区(脚部金额)
+    footerAmount: {
+      name: 'amtTrf',
+      title: mixins.$t('totalAmount')
+    },
+               // 列表区(脚部信息)
+     footerInfo: [{   name: 'amtTrf',  }],
+contentnFootList: [
+  {
+    title: mixins.$t('totalAmount'),
+    code: 'amtTrf',
+    content: 0,
+    type: 'number'
+  }, {
+    type: 'count',
+    code: 'count',
+    bill: 1,
+  }
+],
   },
 
  /** 

+ 1 - 1
package-accounts-manage/pages/funds-transfer/funds-transfer.wxml

@@ -16,7 +16,7 @@
 <van-empty wx:if="{{tableData.length<=0}}" description="{{$t['nodata']}}"  />
 
 <!-- 列表区 -->
-<dk-list  bind:toDetail="toDetail"   list="{{tableData}}" flgPoint = "{{true}}" title="trfOutMacName" collectCol = "amtTrf"  content="{{contentList}}"    ></dk-list>
+<dk-list  bind:toDetail="toDetail"   list="{{tableData}}" flgPoint = "{{true}}" title="trfOutMacName"   content="{{contentList}}" footerAmount="{{footerAmount}}" footerInfo="{{footerInfo}}"   ></dk-list>
 
 <van-divider wx:if="{{noMore}}" contentPosition="center" borderColor="#DCDCDC">{{$t['noMore']}}~</van-divider>
 <view style="height: 200rpx;"></view>

+ 12 - 0
package-base-select/pages/select-collection_confirm/select-collection_confirm.js

@@ -376,6 +376,18 @@ mixins: [mixins],
           item.amtReceivable = element.receiptResidue //收入金额  
           itemList.push(item)
         });
+        let receiptList = []
+        tableData.forEach(item => {
+          payment.push(
+            {
+              amtRec: item.sumAmount, 
+              macCode: item.macCode,
+              macId: item.macId,
+              macName: item.macName,
+            }
+          )
+        })
+        params.receiptList = receiptList
         params.sumAmtReceivable = itemNumber
       } else if (this.data.formType == 8) { //订单开单收款
 

+ 1 - 0
package-purchase/pages/supplier-list/add/add.js

@@ -160,6 +160,7 @@ Page({
        params.serviceCategories = (params.serviceCategories && params.serviceCategories.length > 0) ? params.serviceCategories.split(',') : []
        params.brandIds = (params.brandIds && params.brandIds.length > 0) ? params.brandIds.split(',') : []
        params.returnAddress   = saveData.addressFull
+       params.makeStaff = app.globalData.user.staffId
        return params
    },