首付款

api/pages/mac/payment.js

@@ -29,7 +29,7 @@ module.exports = {
 			// 付款单新建
 			addReturnPay: { key: 'addReturnPay', url: '/package-accounts-manage/pages/payment-order/add-return/add-return' },
 
-			edit: { key: 'edit', url: '/package-accounts-manage/pages/receipt/detail/detail' },
+			edit: { key: 'edit', url: '/package-accounts-manage/pages/payment-order/detail/detail' },
 			detail: {
 				key: 'detail', url: '/package-purchase/pages/purchase-return/detail/detail'
 			},

components/dkbase/dk-popup/dk-popup.js

@@ -96,6 +96,7 @@ Component({
     value: {
       type: String,
       observer: function (newVal) {
+        console.log("newVal-结果集",newVal);
         if (newVal) {
           this.setData({
             form: JSON.parse(newVal) || {}

package-accounts-manage/pages/payment-order/detail/detail.js

@@ -86,11 +86,16 @@ Page({
     payableResidue: 0,
     paymentResidue: 0,
     bill: 0,
-    objInfo: {},
+    objInfo: null,
     table: Constants.tables.recPay,
     form:{},
     showPop:false,
     popContent:[],
+    // 底部保存按钮
+    buttonFootList: [{
+      name: 'paymentInfo',
+      title: mixins.$t('paymentInfo')
+    }],
   },
 
 
@@ -103,7 +108,7 @@ Page({
     console.log("setValuesByEdit", data, this.data.item);
     let contentObj = this.data.contentObj
     let formData = { ...this.data.item }
-    let form = this.data.form
+    let form = {}
     formData.objInfo = this.data.item
     formData.receivableList = data.recPayHandleItem
     formData.objInfo.cusId = this.data.item.objectId
@@ -128,21 +133,20 @@ Page({
           popContent.push(
             { 
               //新建的 各个控件信息
-              code: 'amtPay' + element.macReceitpCode,
+              code: element.macCode,
               type: 'str',
-              title: element.macReceitpCode, 
+              title: element.macTypeName, 
               readonly: true
             }
           )
-          form[element.macReceitpCode] = element.macTypeNme
-          form['amtPay' + element.macReceitpCode] = element.amtPay          
+          form[element.macCode] =  Number(element.amtPay).toFixed(2)           
         }
     }
 
     this.setData({
       itemData: data,
       popContent,
-      form,
+      form:JSON.stringify(form),
       contentObj,
       formData: JSON.stringify(formData),
     })

package-accounts-manage/pages/payment-order/detail/detail.wxml

@@ -11,7 +11,7 @@
 
 
 <!-- 详情 -->
-<dk-save-button model:value="{{btnFormData}}" btnAutoWidthFlag="{{false}}" btnRightFlag="{{true}}" buttonList="{{buttonList}}" bind:open="openInfo"></dk-save-button>
+<dk-save-button model:value="{{btnFormData}}" btnAutoWidthFlag="{{true}}" btnRightFlag="{{true}}" buttonList="{{buttonList}}" bind:open="openInfo"></dk-save-button>
 
 <!-- 底部编辑 以后要做 todo......... -->
 <!-- <view style="position: fixed;bottom: 230rpx;right: 30rpx;"  >

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

@@ -86,9 +86,14 @@ Page({
     bill: 0,
     objInfo: {},
     table: Constants.tables.recPay,
-    form: {},
+    form: null,
     showPop: false,
     popContent: [],
+    // 底部保存按钮
+    buttonFootList: [{
+      name: 'receiptInfo',
+      title: mixins.$t('receiptInfo')
+    }],
   },
 
 
@@ -101,7 +106,7 @@ Page({
     console.log("setValuesByEdit", data, this.data.item);
     let contentObj = this.data.contentObj
     let formData = { ...this.data.item }
-    let form = this.data.form
+    let form = {}
     formData.objInfo = this.data.item
     formData.receivableList = data.recPayHandleItem
     formData.objInfo.cusId = this.data.item.objectId
@@ -122,26 +127,24 @@ Page({
     let popContent = this.data.popContent
     if (data.recPayItem != null && data.recPayItem.length > 0) {
       for (let index = 0; index < data.recPayItem.length; index++) {
-        const element = data.recPayItem[index];
+        const element = data.recPayItem[index]; 
         popContent.push(
           {
             //新建的 各个控件信息
-            code: 'amtRec' + element.macReceitpCode,
+            code: element.macCode,
             type: 'str',
-            title: element.macReceitpCode,
+            title: element.macTypeName,
             readonly: true
           }
-        )
-        form[element.macReceitpCode] = element.macTypeNme
-        form['amtRec' + element.macReceitpCode] = element.amtRec
+        ) 
+        form[element.macCode] =  Number(element.amtRec).toFixed(2)  
       }
     }
 
-
     this.setData({
       itemData: data,
       popContent,
-      form,
+      form: JSON.stringify(form),
       contentObj,
       formData: JSON.stringify(formData),
     })

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

@@ -4,10 +4,10 @@
 </dk-form-more-items>
 
 <view style="height: 60rpx;"></view>
-
+<dk-save-button model:value="{{btnFormData}}" btnAutoWidthFlag="{{true}}" btnRightFlag="{{true}}" buttonList="{{buttonFootList}}" contentList="{{contentnFootList}}" bind:open="openInfo"></dk-save-button>
 
 <!-- 弹出收付款的信息 -->
-<dk-popup routeObjName="{{routeObjName}}" type="basic" title="{{$t['payment']}}" value="{{form}}" show="{{showPop}}" contentObj="{{popContent}}" bind:commit="editItems" readonly="{{true}}" bind:onClosePopup="onClosePopup">
+<dk-popup routeObjName="{{routeObjName}}" type="basic" title="{{$t['receiptInfo']}}" value="{{form}}" show="{{showPop}}" contentObj="{{popContent}}" bind:commit="editItems" readonly="{{true}}" bind:onClosePopup="onClosePopup">
 </dk-popup>