王英杰 1 год назад
Родитель
Сommit
73a5ba0cab

+ 2 - 2
api/pages/pur/purchase.js

@@ -40,8 +40,8 @@ module.exports = {
       detailSup:{
         key:'detailSup',url:'/package-purchase/pages/supplier-list/detail/detail'
       }, 
-      supCollection:{ key: 'supCollection', url: '/package-purchase/pages/pur-receipt/add/add', formMode: 'add', idKey: 'supId',image:'btn-customer-collection.png',formType:'add' }, //跳转客户收款
-      supReturnCollection: { key: 'supReturnCollection', url: '/package-purchase/pages/pur-refund/add/add', idKey: 'supId', formType: 'add', image: 'btn-customer-refund.png' },
+      supCollection:{ key: 'supCollection', url: '/package-purchase/pages/pur-receipt/add/add', formMode: 'add', idKey: 'supId',image:'btn-customer-collection.png',formType:'purOrder' }, //跳转客户收款
+      supReturnCollection: { key: 'supReturnCollection', url: '/package-purchase/pages/pur-refund/add/add', idKey: 'supId', formType: 'purOrder', image: 'btn-customer-refund.png' },
     }
   } 
 };

+ 1 - 1
package-purchase/pages/pur-receipt/add/add.js

@@ -393,7 +393,7 @@ Page({
     this.setData({
       formData: JSON.stringify(formData)
     })
-    if (this.data.formType == Constants.formMode.add) { //采购订单 转 新建供应商付款
+    if (this.data.formType == 'purOrder') { //采购订单 转 新建供应商付款
       let formData = JSON.parse(this.data.formData)
       formData.supId = this.data.item.supId
       formData.supCode = this.data.item.supCode

+ 44 - 43
package-purchase/pages/pur-refund/add/add.js

@@ -22,11 +22,10 @@ Page({
     amountArr: [{
       title: mixins.$t('payAmount'),
       code: 'payableResidue'
-    }
-    ],
+    }],
     cardList: [{
       name: 'main'
-    },],
+    }, ],
     contentObj: {
       main: [
 
@@ -49,7 +48,9 @@ Page({
         {
           code: 'sumAmtPay',
           type: 'number',
-          negative: true, min: Constants.MIN_VALUE, maxFlag: false,
+          negative: true,
+          min: Constants.MIN_VALUE,
+          maxFlag: false,
           title: mixins.$t("paymentAmount"),
           readonly: false,
           required: true,
@@ -147,7 +148,7 @@ Page({
     // }
     // 校验
     let valid = this.selectComponent('#dkForm').validData();
-    if(!valid){
+    if (!valid) {
       return;
     }
     // if (!data.sumAmtPay || data.sumAmtPay == 0) {
@@ -292,14 +293,14 @@ Page({
     formData.returnAddress = objInfo.returnAddress
     formData.supName = objInfo.supName
     formData.supId = objInfo.supId
-    if(objInfo.paymentResidue && objInfo.paymentResidue < 0){
-      formData.arrearsResidue = Number(objInfo.payableResidue + objInfo.paymentResidue )
-      formData.objInfo.arrearsResidue = Number(objInfo.payableResidue + objInfo.paymentResidue )
-    }else{
-      formData.arrearsResidue = Number(objInfo.payableResidue - objInfo.paymentResidue )
-      formData.objInfo.arrearsResidue = Number(objInfo.payableResidue - objInfo.paymentResidue )
+    if (objInfo.paymentResidue && objInfo.paymentResidue < 0) {
+      formData.arrearsResidue = Number(objInfo.payableResidue + objInfo.paymentResidue)
+      formData.objInfo.arrearsResidue = Number(objInfo.payableResidue + objInfo.paymentResidue)
+    } else {
+      formData.arrearsResidue = Number(objInfo.payableResidue - objInfo.paymentResidue)
+      formData.objInfo.arrearsResidue = Number(objInfo.payableResidue - objInfo.paymentResidue)
     }
-   
+
     this.setData({
       formData: JSON.stringify(formData)
     })
@@ -322,7 +323,7 @@ Page({
           payableResidue: data.payableResidue
         }
 
-        
+
 
         this.setData({
           formData: JSON.stringify(data),
@@ -336,10 +337,10 @@ Page({
   },
 
   /**
-  * @desc : 获取当前客户的账款信息
-  * @date : 2024/2/1 15:49
-  * @author : 姜永辉
-  */
+   * @desc : 获取当前客户的账款信息
+   * @date : 2024/2/1 15:49
+   * @author : 姜永辉
+   */
   getAccount(id) {
     return this.excute(this.data.accountService, this.data.accountService.getAccount + id, {}).then(res => {
       if (res.data.code == 200) {
@@ -364,28 +365,28 @@ Page({
     });
   },
   /**
-     * @desc : 给表单赋值
-     * @date : 2024/2/1 15:49
-     * @author : 于继渤
-     */
-    setValuesByEdit(data) {
-      data.data.supId = data.data.supId ? data.data.supId : data.data.objectId,
-        data.data.objInfo = {
-          supId: data.data.supId ? data.data.supId : data.data.objectId,
-          supName: data.data.supName,
-          receiptResidue: data.data.receiptResidue,
-          receivableResidue: data.data.receivableResidue,
-          payableResidue: data.data.payableResidue,
-          paymentResidue: data.data.paymentResidue,
-          arrearsResidue:Number(data.data.payableResidue - data.data.paymentResidue)
-        }
-      if (this.data.formMode == Constants.formMode.edit) {
-        data.data.sumAmtPay = 0
+   * @desc : 给表单赋值
+   * @date : 2024/2/1 15:49
+   * @author : 于继渤
+   */
+  setValuesByEdit(data) {
+    data.data.supId = data.data.supId ? data.data.supId : data.data.objectId,
+      data.data.objInfo = {
+        supId: data.data.supId ? data.data.supId : data.data.objectId,
+        supName: data.data.supName,
+        receiptResidue: data.data.receiptResidue,
+        receivableResidue: data.data.receivableResidue,
+        payableResidue: data.data.payableResidue,
+        paymentResidue: data.data.paymentResidue,
+        arrearsResidue: Number(data.data.payableResidue - data.data.paymentResidue)
       }
-      this.setData({
-        formData: JSON.stringify(data.data)
-      })
-    },
+    if (this.data.formMode == Constants.formMode.edit) {
+      data.data.sumAmtPay = 0
+    }
+    this.setData({
+      formData: JSON.stringify(data.data)
+    })
+  },
   /**
    * 生命周期函数--监听页面加载
    */
@@ -406,7 +407,7 @@ Page({
     this.setData({
       formData: JSON.stringify(formData)
     })
-    if (this.data.formType == Constants.formMode.add) { //采购订单 转 新建供应商付款
+    if (this.data.formType == 'purOrder') { //采购订单 转 新建供应商付款
       let formData = JSON.parse(this.data.formData)
       formData.supId = this.data.item.supId
       formData.supCode = this.data.item.supCode
@@ -424,10 +425,10 @@ Page({
       }
       this.setData({
         formData: JSON.stringify(formData)
-      }) 
-         // 获取当前客户的账款信息
-   this.getAccount(formData.supId)
-    } 
+      })
+      // 获取当前客户的账款信息
+      this.getAccount(formData.supId)
+    }
   },