Merge branch 'master' of http://git.dongkesoft.com:9001/iBOSS-2.0-Mini/iboss_wx_app

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

@@ -82,9 +82,9 @@
                   <!-- <view style="color: #002340A6;font-size:22rpx;font-weight: 500;">采购价</view> -->
                   <dk-cell height="46rpx" spaceWidth="1rpx" left="0" fontSize="14" contentColor="#FF7B1A" fontWeight="700" title="" content="{{item.pricePurchase?item.pricePurchase:0}}"></dk-cell>
                 </view>
-                <view wx:else>
+                <view wx:else style="margin-top: 30rpx;">
                   <!-- <view style="color: #002340A6;font-size:22rpx;font-weight: 500;margin-top: 18rpx;">标价</view> -->
-                  <dk-cell height="46rpx" spaceWidth="1rpx" left="0" fontSize="14" contentColor="#FF7B1A" fontWeight="700" title="" content="{{item.priceStandard?item.priceStandard:0}}"></dk-cell>
+                  <dk-cell  height="46rpx" spaceWidth="1rpx" left="0" fontSize="14" contentColor="#FF7B1A" fontWeight="700" title="" content="{{item.priceStandard?item.priceStandard:0}}"></dk-cell>
                 </view>
 
 

package-sales/pages/order-billing/add/add.js

@@ -10,7 +10,7 @@ Page({
   data: {
     // 路由
     routeObjName: 'order',
-    validFlag:true,
+    validFlag: true,
     customerService: app.globalData['customerService'],
     saleChannelService: app.globalData['saleChannelService'],
     cardList: [
@@ -42,17 +42,17 @@ Page({
     },
     //按钮
     buttonSaveList: [
-      { code: 'collection', title: mixins.$t("collection"),plain:true},
-      { code: 'save', title: mixins.$t("save")}
+      { code: 'collection', title: mixins.$t("collection"), plain: true },
+      { code: 'save', title: mixins.$t("save") }
     ],
     contentSaveList: [
       { code: 'flag', title: mixins.$t("saleOutBoundFlag"), type: 'checkbox' },
       // { code: 'need', title: mixins.$t("saleCollection"), type: 'str' },
-      { code: 'receivable', content: 0, type: 'number',title:mixins.$t("saleCollection") }
+      { code: 'receivable', content: 0, type: 'number', title: mixins.$t("saleCollection") }
     ],
     popContent: [
       { code: 'itemQty', type: 'step', title: mixins.$t("count"), required: true },
-      { code: 'priceSale', type: 'number', title: mixins.$t("priceSale"), required: true ,center:'right'},
+      { code: 'priceSale', type: 'number', title: mixins.$t("priceSale"), required: true, center: 'right' },
       {
         code: 'whId', name: 'whName', title: mixins.$t("warehouseId"), type: 'choose', urlKey: 'openingInventory',
       },
@@ -61,7 +61,7 @@ Page({
     ],
     table: Constants.tables.order,
   },
- 
+
 
   /**
     * @desc   : 手机号离焦事件
@@ -158,6 +158,17 @@ Page({
       formData.channelName = item.channelName
       formData.contactPhone = item.contactPhone
       formData.contactPhone = item.contactPhone
+     
+      formData.collectAmount =  item.receiptResidue
+      let cardList = this.data.cardList
+      cardList[1].canUseCollect =   item.receiptResidue  //可用
+      cardList[1].useCollect =   item.receiptResidue  //可用
+    
+      formData.canUseCollect =  item.receiptResidue  //可用
+      formData.useCollect =  item.receiptResidue  //使用
+      this.setData({
+        cardList:cardList
+      })
     }
     ///设置主从业务员
     if (code == 'staff') {
@@ -279,11 +290,11 @@ Page({
    * @date : 2024/4/25 15:49
    * @author : 周兴
    */
-  clearAmount(){
+  clearAmount() {
     let contentSaveList = this.data.contentSaveList
     contentSaveList[1]['content'] = 0
     this.setData({
-      contentSaveList:contentSaveList
+      contentSaveList: contentSaveList
     })
   },
   /**
@@ -366,14 +377,14 @@ Page({
       }
     });
   },
-  
+
   /**
      * @desc : 查询默认渠道
      * @date : 2024/2/1 15:49
      * @author : 于继渤
      */
   getSaleChannelDef() {
-    return this.excute(this.data.saleChannelService, this.data.saleChannelService.selectByCoud , {
+    return this.excute(this.data.saleChannelService, this.data.saleChannelService.selectByCoud, {
 
     }).then(res => {
       if (res.data.code == 200) {
@@ -451,8 +462,8 @@ Page({
     formData.sumStandard = sumStandard
     formData.saleDiscount = Number((sumAmount / sumStandard) * 100).toFixed(2)
     formData.sumAmount = sumAmount
-    formData.canUseCollect = 0
-    formData.useCollect = 0
+    // formData.canUseCollect = 0
+    // formData.useCollect = 0
     formData.sumQuantity = sumQuantity
 
     cardList[1].sumAmount = formData.sumAmount
@@ -480,7 +491,7 @@ Page({
       })
       this.setData({
         buttonSaveList: [
-          { code: 'save', title: mixins.$t("save")}
+          { code: 'save', title: mixins.$t("save") }
         ]
       })
 
@@ -490,11 +501,11 @@ Page({
       this.setTopStaffAndOrg(formData)
 
       // 设置送货日期 当前日期 加一天
-      var currentDate = new Date(); 
+      var currentDate = new Date();
       currentDate.setDate(currentDate.getDate() + 7);
-      formData.deliveryDate =   util.formatDayTime(currentDate)
+      formData.deliveryDate = util.formatDayTime(currentDate)
       this.setData({
-        formData:JSON.stringify(formData)
+        formData: JSON.stringify(formData)
       })
     }
     let that = this
@@ -565,13 +576,13 @@ Page({
       //合计金额
       cardList[index].sumAmount = sumAmount
       //TODO   需要获取当前客户可用预存
-      cardList[index].canUseCollect = 0  //可用
-      cardList[index].useCollect = 0  //使用
+      // cardList[index].canUseCollect = 0  //可用
+      // cardList[index].useCollect = 0  //使用
       formData.sumStandard = sumStandard
       formData.saleDiscount = cardList[index].saleDiscount
       formData.sumAmount = sumAmount
-      formData.canUseCollect = 0
-      formData.useCollect = 0
+      // formData.canUseCollect = 0
+      // formData.useCollect = 0
       formData.sumQuantity = sumQuantity
     } else {
       cardList[index].sumStandard = 0

package-sales/pages/sales-outbound/add/add.js

@@ -145,15 +145,6 @@ Page({
     console.log(e)
     let name = e.detail.name
     if (name == 'save') { //保存
-      //校验库存
-      let btnFormData = JSON.parse(this.data.btnFormData)
-      let titpsFlag = this.data.titpsFlag
-      if (!btnFormData.flag) {
-
-
-
-
-      }
       this.save({})
     } else if (name == 'collection') { //收款