修改问题

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

@@ -1253,6 +1253,7 @@ Page({
           }
           if (that.data.formType == 'customer-reception') { //客户接待跳转过来
             data['formItem'] = that.data.formItem
+            data['formMode'] = 'add'
           }
           // 通过eventChannel向被打开页面传送数据
           res.eventChannel.emit('params', data)

package-basic-data/pages/customer-reception/add/add.js

@@ -184,7 +184,7 @@ Page({
     wx.navigateTo({
       url: this.data.route.toSelectGoods.url,
       success: function (res) {
-        res.eventChannel.emit('params', { choose: true, item: 'sale', formItem: that.data.formData, formType: 'customer-reception', route: '/package-sales/pages/order-billing/add/add' })
+        res.eventChannel.emit('params', { choose: true, item: 'inventory', formItem: that.data.formData, formType: 'customer-reception', route: '/package-sales/pages/order-billing/add/add' })
       }
     })
   },

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

@@ -280,6 +280,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 )
+    }
+   
     this.setData({
       formData: JSON.stringify(formData)
     })
@@ -299,7 +307,9 @@ Page({
           supName: data.supName,
           supPhone: data.supPhone,
           supCode: data.supCode,
-          payableResidue: data.payableResidue
+          payableResidue: data.payableResidue,
+          paymentResidue: data.paymentResidue,
+          arrearsResidue:Number(data.payableResidue - data.paymentResidue)
         }
 
         

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

@@ -3,7 +3,7 @@
 <!-- 添加模版 -->
 <!-- <import src="/utils/template.wxml" />
 <template is="myTemplate" /> -->
-<dk-form-bill type="sale" id="{{formName}}" routeObjName="{{routeObjName}}" cardList="{{cardList}}" titleCol="skuCode" descCol="skuModel" priceCol="priceStandard" quantityCol="itemQty" sumAmountCol="sumAmount"  amountTitle="应付金额" amountCol="payableResidue"
+<dk-form-bill type="sale" id="{{formName}}" routeObjName="{{routeObjName}}" cardList="{{cardList}}" titleCol="skuCode" descCol="skuModel" priceCol="priceStandard" quantityCol="itemQty" sumAmountCol="sumAmount"  amountTitle="欠款金额" amountCol="arrearsResidue"
 objIdCol="supId" objTitle="supName"   objCol="supId" objLabel="{{$t['supName']}}" objType="supplier" cardList="{{cardList}}" discountStandardCol="saleDiscount" contentObj="{{contentObj}}" model:value="{{formData}}" popContent="{{popContent}}" saleStaffAndOrgFlag="{{false}}" bind:chooseData="chooseData" popType="sale" staff="staff" org="org" bind:changeNumberBlur="changeNumberBlur" bind:chooseObjTypeData="chooseObjTypeData" bind:clickAttach="clickAttach" bind:uploadSucess="uploadSucess" bind:uploadError="uploadError"
 saleStaffAndOrgFlag="{{false}}" 
 >

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

@@ -21,7 +21,7 @@ Page({
     // 预存金额 预收金额
     amountArr: [{
       title: mixins.$t('receivableAmount'),
-      code: 'receivableResidue'
+      code: 'arrearsResidue'
     },
     {
       title: mixins.$t('advancePaymentAmount'),
@@ -249,6 +249,11 @@ Page({
           contactPhone: data.contactPhone,
           contactName: data.contactName
         }
+        if(data.paymentResidue && data.paymentResidue < 0){
+          data.objInfo.arrearsResidue = Number(data.payableResidue + data.paymentResidue )
+        }else{
+          data.objInfo.arrearsResidue = Number(data.payableResidue - data.paymentResidue )
+        }
       
         this.selectRpInfoById(data.rpId)
         this.setData({

package-purchase/pages/pur-receipt/detail/detail.wxml

@@ -4,7 +4,7 @@
 <!-- <import src="/utils/template.wxml" />
 <template is="myTemplate" /> -->
 
-<dk-form-bill type="sale" id="{{formName}}" routeObjName="{{routeObjName}}" cardList="{{cardList}}" titleCol="skuCode" descCol="skuModel" priceCol="priceStandard" quantityCol="itemQty" sumAmountCol="sumAmount"    amountTitle="应付金额" amountCol="payableResidue"
+<dk-form-bill type="sale" id="{{formName}}" routeObjName="{{routeObjName}}" cardList="{{cardList}}" titleCol="skuCode" descCol="skuModel" priceCol="priceStandard" quantityCol="itemQty" sumAmountCol="sumAmount"    amountTitle="欠款金额" amountCol="arrearsResidue"
 objIdCol="supId" objTitle="supName"   objCol="supId" objLabel="{{$t['supName']}}" objType="supplier" cardList="{{cardList}}" discountStandardCol="saleDiscount" contentObj="{{contentObj}}" model:value="{{formData}}" popContent="{{popContent}}" saleStaffAndOrgFlag="{{false}}" bind:chooseData="chooseData" popType="sale" staff="staff" org="org" bind:changeNumberBlur="changeNumberBlur" bind:chooseObjTypeData="chooseObjTypeData" readonly="{{true}}" 
 saleStaffAndOrgFlag="{{false}}" 
 >

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

@@ -24,7 +24,7 @@ Page({
       defaultValue: 5,
       searchType: Constants.searchType.date
     }, {
-      code: 'staff',
+      code: 'makeStaff',
       title: '业务员',
       dropType: 'staff'
     },

package-purchase/pages/pur-receipt/pur-receipt.wxml

@@ -5,7 +5,7 @@
   <!-- 自定义导航 -->
   <dk-navbar titleFontColor="#000000" navbarTitle="{{navigationBarTitle}}" bind:clickBack="handleNavBack" operateShow="{{ guideUrl ? true: false}}" operateUrl="{{guideUrl}}" bind:getNavbarHeight="getNavbarHeight"/>
   <!-- 查询条件 -->
-  <dk-dropdown-menu model:value="{{searchForm}}" menuList="{{searchContent}}" pullMenuList="{{pullMenuList}}" navBarHeight="{{navBarHeight}}" bind:search="searchData" searchTextPlaceholder="{{wxmlUtil.setSearchPlaceholder($t,['customerName','orderNo','telephone','adddress'])}}">
+  <dk-dropdown-menu model:value="{{searchForm}}" menuList="{{searchContent}}" pullMenuList="{{pullMenuList}}" navBarHeight="{{navBarHeight}}" bind:search="searchData" searchTextPlaceholder="{{wxmlUtil.setSearchPlaceholder($t,['supplierName','rpNo'])}}">
   </dk-dropdown-menu>
 </van-sticky>
 

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

@@ -281,6 +281,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 )
+    }
+   
     this.setData({
       formData: JSON.stringify(formData)
     })
@@ -356,7 +364,9 @@ Page({
           supName: data.data.supName,
           receiptResidue: data.data.receiptResidue,
           receivableResidue: data.data.receivableResidue,
-          payableResidue: data.data.payableResidue
+          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

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

@@ -3,7 +3,7 @@
 <!-- 添加模版 -->
 <!-- <import src="/utils/template.wxml" />
 <template is="myTemplate" /> -->
-<dk-form-bill type="sale" id="{{formName}}" routeObjName="{{routeObjName}}" cardList="{{cardList}}" titleCol="skuCode" descCol="skuModel" priceCol="priceStandard" quantityCol="itemQty" sumAmountCol="sumAmount"  amountTitle="应付金额" amountCol="payableResidue"
+<dk-form-bill type="sale" id="{{formName}}" routeObjName="{{routeObjName}}" cardList="{{cardList}}" titleCol="skuCode" descCol="skuModel" priceCol="priceStandard" quantityCol="itemQty" sumAmountCol="sumAmount"  amountTitle="欠款金额" amountCol="arrearsResidue"
 objIdCol="supId" objTitle="supName"   objCol="supId" objLabel="{{$t['supName']}}" objType="supplier" cardList="{{cardList}}" discountStandardCol="saleDiscount" contentObj="{{contentObj}}" model:value="{{formData}}" popContent="{{popContent}}" saleStaffAndOrgFlag="{{false}}" bind:chooseData="chooseData" popType="sale" staff="staff" org="org" bind:changeNumberBlur="changeNumberBlur" bind:chooseObjTypeData="chooseObjTypeData" bind:clickAttach="clickAttach" bind:uploadSucess="uploadSucess" bind:uploadError="uploadError"
 saleStaffAndOrgFlag="{{false}}" 
 >

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

@@ -250,6 +250,12 @@ Page({
           contactPhone: data.contactPhone,
           contactName: data.contactName
         }
+
+        if(data.objInfo.paymentResidue && data.objInfo.paymentResidue < 0){
+          data.objInfo.arrearsResidue = Number(data.objInfo.payableResidue + data.objInfo.paymentResidue )
+        }else{
+          data.objInfo.arrearsResidue = Number(data.objInfo.payableResidue - data.objInfo.paymentResidue )
+        }
       
         this.selectRpInfoById(data.rpId)
         this.setData({

package-purchase/pages/pur-refund/detail/detail.wxml

@@ -4,7 +4,7 @@
 <!-- <import src="/utils/template.wxml" />
 <template is="myTemplate" /> -->
 
-<dk-form-bill type="sale" id="{{formName}}" routeObjName="{{routeObjName}}" cardList="{{cardList}}" titleCol="skuCode" descCol="skuModel" priceCol="priceStandard" quantityCol="itemQty" sumAmountCol="sumAmount"    amountTitle="应付金额" amountCol="payableResidue"
+<dk-form-bill type="sale" id="{{formName}}" routeObjName="{{routeObjName}}" cardList="{{cardList}}" titleCol="skuCode" descCol="skuModel" priceCol="priceStandard" quantityCol="itemQty" sumAmountCol="sumAmount"    amountTitle="欠款金额" amountCol="arrearsResidue"
 objIdCol="supId" objTitle="supName"   objCol="supId" objLabel="{{$t['supName']}}" objType="supplier" cardList="{{cardList}}" discountStandardCol="saleDiscount" contentObj="{{contentObj}}" model:value="{{formData}}" popContent="{{popContent}}" saleStaffAndOrgFlag="{{false}}" bind:chooseData="chooseData" popType="sale" staff="staff" org="org" bind:changeNumberBlur="changeNumberBlur" bind:chooseObjTypeData="chooseObjTypeData" readonly="{{true}}" 
 saleStaffAndOrgFlag="{{false}}" 
 >

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

@@ -24,7 +24,7 @@ Page({
       defaultValue: 5,
       searchType: Constants.searchType.date
     }, {
-      code: 'staff',
+      code: 'makeStaff',
       title: '业务员',
       dropType: 'staff'
     },

package-purchase/pages/pur-refund/pur-refund.wxml

@@ -5,7 +5,7 @@
   <!-- 自定义导航 -->
   <dk-navbar titleFontColor="#000000" navbarTitle="{{navigationBarTitle}}" bind:clickBack="handleNavBack" operateShow="{{ guideUrl ? true: false}}" operateUrl="{{guideUrl}}" bind:getNavbarHeight="getNavbarHeight"/>
   <!-- 查询条件 -->
-  <dk-dropdown-menu model:value="{{searchForm}}" menuList="{{searchContent}}" pullMenuList="{{pullMenuList}}" navBarHeight="{{navBarHeight}}" bind:search="searchData" searchTextPlaceholder="{{wxmlUtil.setSearchPlaceholder($t,['customerName','orderNo','telephone','adddress'])}}">
+  <dk-dropdown-menu model:value="{{searchForm}}" menuList="{{searchContent}}" pullMenuList="{{pullMenuList}}" navBarHeight="{{navBarHeight}}" bind:search="searchData" searchTextPlaceholder="{{wxmlUtil.setSearchPlaceholder($t,['supplierName','rpNo'])}}">
   </dk-dropdown-menu>
 </van-sticky>