修改退款 付款的校验问题

package-basic-data/pages/register/company-register/company-register.wxml

@@ -5,8 +5,8 @@
 <view class="task-progress">
   <view class="task-progress-header">
     <view class="task-progress-header-name">{{$t['registerCommany']}}</view>
-    <van-button size='mini' bind:click="productDetail" type="default">{{$t['productDetail']}}
-    </van-button>
+    <!-- <van-button size='mini' bind:click="productDetail" type="default">{{$t['productDetail']}}
+    </van-button> -->
   </view>
 </view>
 

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

@@ -133,23 +133,29 @@ Page({
   open(e) {
     let _this = this
     let data = JSON.parse(_this.data.formData)
-    if (!_this.validDatas(data)) {
-      return
-    }
     // 校验供应商
-    if(!data.supId){
+    if (!data.supId) {
       util.showToast('请先选择供应商');
       return;
     }
-    if (!data.sumAmtPay || data.sumAmtPay == 0) {
-      // 是否弹出询问框
-      Dialog.confirm({
-        message: '请输入金额',
-        showCancelButton: false,
-      }).then(() => {
-      }).catch(() => { })
-      return
+    // if (!_this.validDatas(data)) {
+    //   return
+    // }
+    // 校验
+    let valid = this.selectComponent('#dkForm').validData();
+    if(!valid){
+      return;
     }
+
+    // if (!data.sumAmtPay || data.sumAmtPay == 0) {
+    //   // 是否弹出询问框
+    //   Dialog.confirm({
+    //     message: '请输入金额',
+    //     showCancelButton: false,
+    //   }).then(() => {
+    //   }).catch(() => { })
+    //   return
+    // }
     wx.navigateTo({
       url: this.data.route.selectCollectionConfirm.url,
       events: {
@@ -281,14 +287,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)
     })
@@ -310,10 +316,10 @@ Page({
           supCode: data.supCode,
           payableResidue: data.payableResidue,
           paymentResidue: data.paymentResidue,
-          arrearsResidue:Number(data.payableResidue - data.paymentResidue)
+          arrearsResidue: Number(data.payableResidue - data.paymentResidue)
         }
 
-        
+
 
         this.setData({
           formData: JSON.stringify(data),
@@ -371,8 +377,8 @@ Page({
         title: '编辑供应商付款',
       })
       this.getRpForUpdate(this.data.id)
-    }else{
-      if(this.data.formReturnMode == 'supplier'){
+    } else {
+      if (this.data.formReturnMode == 'supplier') {
         let item = this.data.item
         //供应商详情跳转来的 新建 
         formData.supId = item.supId
@@ -382,7 +388,7 @@ Page({
           supName: item.supName,
           payableResidue: item.payableResidue,
           paymentResidue: item.paymentResidue,
-          arrearsResidue:Number(item.payableResidue - item.paymentResidue)
+          arrearsResidue: Number(item.payableResidue - item.paymentResidue)
         }
       }
     }

package-purchase/pages/pur-refund/add/add.js

@@ -11,6 +11,7 @@
 const Constants = require('@/utils/Constants.js');
 import Dialog from '@/dist/dialog/dialog.js';
 const mixins = require('@/mixins/index.js')
+import util from '@/utils/util';
 const app = getApp()
 Page({
   mixins: [mixins],
@@ -136,18 +137,28 @@ Page({
   open(e) {
     let _this = this
     let data = JSON.parse(_this.data.formData)
-    if (!_this.validDatas(data)) {
-      return
+    // 校验供应商
+    if (!data.supId) {
+      util.showToast('请先选择供应商');
+      return;
     }
-    if (!data.sumAmtPay || data.sumAmtPay == 0) {
-      // 是否弹出询问框
-      Dialog.confirm({
-        message: '请输入金额',
-        showCancelButton: false,
-      }).then(() => {
-      }).catch(() => { })
-      return
+    // if (!_this.validDatas(data)) {
+    //   return
+    // }
+    // 校验
+    let valid = this.selectComponent('#dkForm').validData();
+    if(!valid){
+      return;
     }
+    // if (!data.sumAmtPay || data.sumAmtPay == 0) {
+    //   // 是否弹出询问框
+    //   Dialog.confirm({
+    //     message: '请输入金额',
+    //     showCancelButton: false,
+    //   }).then(() => {
+    //   }).catch(() => { })
+    //   return
+    // }
     wx.navigateTo({
       url: this.data.route.selectCollectionConfirm.url,
       events: {

package-sales/pages/customer-collection/refund/refund.js

@@ -28,7 +28,7 @@ Page({
         { code: 'accDate', name: 'accDate', type: 'date', required: true, },
         { code: 'staffId', name: 'staffName', required: true, title: mixins.$t("staffId"), type: 'choose', urlKey: 'chooseStaff' },
         { code: 'orgId', name: 'orgName', required: true, type: 'choose', urlKey: 'chooseOrg' },
-        { code: 'sumAmtRec', type: 'number', negative: true, min: Constants.MIN_VALUE, maxFlag: false, title: mixins.$t("thisRefund"), readonly: false },
+        { code: 'sumAmtRec', type: 'number', negative: true, required: true,min: Constants.MIN_VALUE, maxFlag: false, title: mixins.$t("thisRefund"), readonly: false },
         { code: 'remarks', type: 'textarea', title: mixins.$t("remarks"), readonly: false },
         { code: 'file', type: 'uploader', title: mixins.$t("uploader") }
       ],
@@ -89,17 +89,28 @@ Page({
   open(e) {
     let _this = this
     let data = JSON.parse(_this.data.formData)
-    if (!data.sumAmtRec || data.sumAmtRec == 0) {
-      // 是否弹出询问框
-      Dialog.confirm({
-        message: '请输入金额',
-        showCancelButton: false,
-      }).then(() => {
-
-      }).catch(() => {
-      })
-      return
+    // 校验
+    if(!data.cusId){
+      util.showToast('请先选择客户');
+      return;
+    }
+    // 校验
+    let valid = this.selectComponent('#dk-form-bill').validData();
+    if(!valid){
+      return;
     }
+    // if (!data.sumAmtRec || data.sumAmtRec == 0) {
+    //   // 是否弹出询问框
+    //   Dialog.confirm({
+    //     message: '请输入金额',
+    //     showCancelButton: false,
+    //   }).then(() => {
+
+    //   }).catch(() => {
+    //   })
+    //   return
+    // }
+
     wx.navigateTo({
       url: this.data.route.selectCollectionConfirm.url,
       events: {

pages/index/index.js

@@ -402,6 +402,10 @@ Page({
     }
     let url = e.currentTarget.dataset.url
     let code = e.currentTarget.dataset.code
+    if(comFlag){
+      url = e.detail.data.objectPath
+      code = e.detail.data.objectCode
+    }
     if (!url) {
       wx.showToast({
         title: '功能开发中',