bug修改

components/dkbase/dk-form-bill/dk-form-bill.js

@@ -1669,15 +1669,25 @@ Component({
       if (form.goodsList && form.goodsList.length > 0) {
         let sumAmount = Number(0)
         let sumQuantity = Number(0)
+        let sumStandard = Number(0)
         form.goodsList.forEach(item => {
           //标价合计 =  商品标价 x  商品数量
           item.priceStd = item.priceStandard //标价
           item.outingAmt = item.priceOut * item.outingQty
           sumQuantity += item.outingQty //数量
           sumAmount += item.priceOut * item.outingQty //没有售价默认取标价
-
+          sumStandard += (item.priceStd ? item.priceStd : item.priceStandard) * item.outingQty
         })
+        //标价合计
+        cardList[index].sumStandard = sumStandard
+        //销售折扣 (合计金额/标价合计)
+        cardList[index].saleDiscount = sumStandard ? Number((sumAmount / sumStandard) * 100).toFixed(2) : 100
 
+        //TODO   需要获取当前客户可用预存
+        cardList[index].canUseCollect = 0 //可用
+        cardList[index].useCollect = 0 //使用
+        form.sumStandard = sumStandard
+        form.saleDiscount = cardList[index].saleDiscount
         //合计金额
         cardList[index].sumAmount = sumAmount
         cardList[index].sumQuantity = sumQuantity

components/dkbase/dk-form-bill/dk-form-bill.wxml

@@ -165,7 +165,7 @@
               <van-icon name="arrow-down" />
             </view>
           </block>
-          <view class="amount-item-class" wx:if="{{type === 'sale'}}">
+          <view class="amount-item-class" wx:if="{{type === 'sale' || type === 'saleOut' }}">
             <!--标价总额-->
             <dk-cell contentColor="#FF7B1A" titleColor="#95A8CB;" contentFontWeight="700" title="标价总额" content="{{card[sumStandardCol]?card[sumStandardCol]:0}}"></dk-cell>
             <!--标价折扣-->
@@ -177,7 +177,7 @@
             <!--标价折扣-->
             <dk-cell fontSize="16" fontWeight="bold" contentFontWeight="700" contentColor="#FF7B1A" titleColor="#1B365D;" title="合计金额" content="{{card[sumAmountCol]?card[sumAmountCol]:0}}"></dk-cell>
           </view>
-          <view class="amount-item-class" wx:if="{{type === 'sale'}}">
+          <view class="amount-item-class" wx:if="{{type === 'sale' || type === 'saleOut' }}">
             <view style="display: flex;">
               <!--使用收款-->
               <dk-cell contentColor="#FF7B1A" titleColor="#95A8CB" contentFontWeight="700" title="使用收款(可用" content="{{card[canUseCollectCol]?card[canUseCollectCol]:0}}"></dk-cell>

package-base-select/pages/select-source-sale-order/select-source-sale-order.js

@@ -10,6 +10,7 @@ Page({
   data: {
     returnTotalAmount: 0,
     allChecked: false,
+    tableDataItem:{},
     // 路由
     routeObjName: 'saleOutBound',
     orderService: app.globalData['orderService'],
@@ -75,7 +76,11 @@ Page({
         res.checked = tableData[index].checked
       })
     }
-
+    if(e.detail){
+      this.setData({
+        tableDataItem: tableData[index]
+      })
+    }
     this.setData({
       tableData: tableData
     })
@@ -104,7 +109,11 @@ Page({
     //   })
     // })
     tableData[index].orderItemResponseList[index_].checked = e.detail
-
+    if(e.detail){
+      this.setData({
+        tableDataItem: tableData[index]
+      })
+    }
     this.setData({
       tableData: tableData
     })
@@ -185,7 +194,7 @@ Page({
   toAdd() {
     let itemList = this.data.choooseInboundItemList
     const eventChannel = this.getOpenerEventChannel();
-    eventChannel.emit('bindData', { itemList: itemList, fromNo: itemList[0].orderNo ,fromId: itemList[0].orderId })
+    eventChannel.emit('bindData', { itemList: itemList, fromNo: itemList[0].orderNo , item:this.data.tableDataItem, fromId: itemList[0].orderId })
     wx.navigateBack({
       data: 1
     })

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

@@ -17,8 +17,9 @@ Page({
     saleOutBoundService: app.globalData['saleOutBoundService'],
     commonService: app.globalData['commonService'],
     cardList: [
-      { name: 'main', title: mixins.$t("customerInformation") },
       { name: 'relation' },
+      { name: 'main', title: mixins.$t("customerInformation") },
+    
       {
         name: 'items', title: mixins.$t("goodsDetail"),
         chooseGoodsFlag: false,
@@ -49,8 +50,8 @@ Page({
         code: 'fromNo',
         name: 'fromNo',
         type: 'choose',
-        titpsKey: 'cusId',
-        titpsMessage: '请选择客户',
+        // titpsKey: 'cusId',
+        // titpsMessage: '请选择客户',
         chooseVisible: true,
         controlChooseFlag: true,
         title: mixins.$t("sourceOrder"),//'关联源单'
@@ -670,7 +671,7 @@ Page({
       formData.cusFromName = e.detail.data.data.name
     }
     if (code == 'fromNo') {
-      console.log('item.itemList', item.itemList)
+      console.log('item.itemList', item)
       let btnFormData = JSON.parse(this.data.btnFormData)
       if (item.itemList && item.itemList.length > 0) {
         item.itemList.forEach(res => {
@@ -691,6 +692,29 @@ Page({
         formData.fromId = item.fromId
         this.calculateAmount(formData)
       }
+
+
+
+      formData.cusCode = item.item.cusCode
+      formData.cusId = item.item.cusId
+      formData.objectId = item.item.cusId
+      formData.cusName = item.item.cusName
+      formData.cusPhone = item.item.cusPhone
+      formData.cusFromName = item.item.cusFromName
+      formData.cusFrom = item.item.cusFrom
+      //处理地址
+      formData.address = this.setAddress(item.item)
+      formData.addressArea = item.item.addressArea
+      formData.addressFull = item.item.addressFull
+      formData.addressGcj02 = item.item.addressGcj02
+      formData.addressName = item.item.addressName
+      formData.addressNo = item.item.addressNo
+      //订单销售渠道 ,默认取的客户的渠道
+      formData.salesChannel = item.item.channelId
+      formData.channelId = item.item.channelId
+      formData.channelName = item.item.channelName
+      formData.contactPhone = item.item.contactPhone
+      formData.contactPhone = item.item.contactPhone
     }
     this.setData({
       formData: JSON.stringify(formData)
@@ -727,15 +751,20 @@ Page({
     ///设置总单信息
     let sumAmount = Number(0)
     let sumQuantity = Number(0)
+    let sumStandard = Number(0)
     formData.goodsList.forEach(item => {
       //标价合计 =  商品标价 x  商品数量
       item.outingAmt = item.outingQty * item.priceOut
       sumAmount += item.outingQty * item.priceOut
       sumQuantity += item.outingQty //数量
+      item.priceDiscount = Number((item.priceOut / item.priceStandard) * 100).toFixed(2)//售价折扣
+      sumStandard += item.priceStandard * item.outingQty
     })
 
     formData.sumAmount = sumAmount
     formData.outingAmt = sumAmount
+    formData.sumStandard = sumStandard
+    formData.saleDiscount = Number((sumAmount / sumStandard) * 100).toFixed(2)
     formData.canUseCollect = 0
     formData.useCollect = 0
     formData.sumQuantity = sumQuantity
@@ -745,6 +774,8 @@ Page({
     console.log(' formData.sumAmount', formData.sumAmount)
     cardList[2].sumAmount = formData.sumAmount
     cardList[2].sumQuantity = formData.sumQuantity
+    cardList[2].sumStandard = formData.sumStandard
+    cardList[2].saleDiscount = formData.saleDiscount
 
     //详情 办理
     if (this.data.formMode == Constants.formMode.add) {
@@ -998,8 +1029,8 @@ Page({
         code: 'fromNo',
         name: 'fromNo',
         type: 'choose',
-        titpsKey: 'cusId',
-        titpsMessage: '请选择客户',
+        // titpsKey: 'cusId',
+        // titpsMessage: '请选择客户',
         chooseVisible: true,
         controlChooseFlag: true,
         title: mixins.$t("sourceOrder"),//'关联源单'