于继渤 1 год назад
Родитель
Сommit
7efc4c45af
1 измененных файлов с 93 добавлено и 58 удалено
  1. 93 58
      package-sales/pages/order-billing/add/add.js

+ 93 - 58
package-sales/pages/order-billing/add/add.js

@@ -1482,8 +1482,29 @@ Page({
       }
       //客户接待过来的
       if (data.formItem) {
+        let item = JSON.parse(data.formItem) 
+        formData.cusCode = item.cusCode
+        formData.cusId = item.cusId
+        formData.cusName = item.cusName
+        formData.cusPhone = item.cusPhone
+        formData.cusFromName = item.cusFromName
+        formData.cusFrom = item.cusFrom
+        //处理地址
+        formData.address = {
+          address: item.addressFull,
+          addressFull: item.addressFull,
+          addressArea: item.addressArea,
+          addressGcj02: item.addressGcj02,
+          addressName: item.addressName,
+        }
+        formData.addressArea = item.addressArea
+        formData.addressFull = item.addressFull
+        formData.addressGcj02 = item.addressGcj02
+        formData.addressName = item.addressName
+        formData.addressNo = item.addressNo
         that.setData({
-          item: data.formItem
+          formData: JSON.stringify(formData),
+          item: item
         })
       }
       // 设置客户信息
@@ -1550,64 +1571,78 @@ Page({
     })
   },
   /**
-   * @desc : 计算商品金额
-   * @date : 2024/5/24 15:49
-   * @author : 周兴
-   */
-  setGoodsAmount(formData) {
-    let cardList = this.data.cardList
-
-    let index = cardList.findIndex(it => it.name == 'items');
-    if (formData.goodsList && formData.goodsList.length > 0) {
-      let sumStandard = Number(0)
-      let sumAmount = Number(0)
-      let sumQuantity = Number(0)
-      formData.goodsList.forEach(item => {
-        //标价合计 =  商品标价 x  商品数量
-        item.priceStd = item.priceStd ? item.priceStd : (item.priceStandard ? item.priceStandard : 0) //标价
-        item.amtStd = Number(item.priceStd * item.itemQty) //合计标价金额
-        item.priceSale = item.priceSale ? item.priceSale : item.priceStandard
-        item.itemAmt = item.priceSale * item.itemQty //商品金额
-        item.priceDiscount = item.priceStd ? Number((item.priceSale / item.priceStd) * 100).toFixed(2) : 100 //售价折扣
-        sumQuantity += item.itemQty //数量
-        sumAmount += item.priceSale * item.itemQty //没有售价默认取标价 
-        sumStandard += (item.priceStd ? item.priceStd : item.priceStandard) * item.itemQty
+     * @desc : 设置商品明细金额相关信息 TODO 
+     * @author : 周兴
+     * @date : 2024/1/19
+     */
+    setGoodsAmount(formdata) {
+      let cardList = this.data.cardList
+      let form = formdata
+      let index = cardList.findIndex(it => it.name == 'items');
+      if (form.goodsList && form.goodsList.length > 0) {
+        let sumStandard = Number(0)
+        let sumAmount = Number(0)
+        let factAmt = Number(0)
+        let sumQuantity = Number(0)
+        form.goodsList.forEach(item => {
+          //标价合计 =  商品标价 x  商品数量
+          item.priceStd = Number(item.priceStd ? item.priceStd : (item.priceStandard ? item.priceStandard : 0)) //标价
+          item.amtStd = Number(item.priceStd * item.itemQty) //合计标价金额
+          item.priceSale = Number(item.priceSale ? item.priceSale : item.priceStandard)
+          item.factPrice = Number(item.factPrice ? item.factPrice : item.priceSale) 
+          if (item.flgGift) { //赠品
+            item.priceSale = Number(0)
+            item.factPrice = Number(0) 
+          }
+          item.itemAmt = Number(item.priceSale) * Number(item.itemQty) //商品金额
+          item.sumPrice = Number(item.priceSale) * Number(item.itemQty) //商品金额
+          item.priceDiscount = item.priceStd ? Number((Number(item.priceSale) / Number(item.priceStd)) * 100).toFixed(2) : 100 //售价折扣  
+          item.factAmt = Number(item.factPrice) * Number(item.itemQty)
+          sumQuantity += Number(item.itemQty) //数量
+          sumAmount += Number(item.priceSale) * Number(item.itemQty) //没有售价默认取标价
+          factAmt += Number(item.factAmt)
+          sumStandard += Number((item.priceStd ? item.priceStd : item.priceStandard)) * Number(item.itemQty)
+        })
+        //标价合计
+        cardList[index].sumStandard = sumStandard
+        //销售折扣 (合计金额/标价合计)
+        cardList[index].saleDiscount = sumStandard ? Number((sumAmount / sumStandard) * 100).toFixed(2) : 100
+        //合计金额
+        cardList[index].sumAmount = sumAmount
+        cardList[index].sumQuantity = sumQuantity
+        //TODO   需要获取当前客户可用预存
+        cardList[index].canUseCollect = 0 //可用
+        cardList[index].useCollect = 0 //使用 
+        form.factAmt = factAmt
+        form.sumStandard = sumStandard
+        form.saleDiscount = cardList[index].saleDiscount
+        form.sumAmount = sumAmount
+        form.canUseCollect = 0
+        form.useCollect = 0
+        form.sumQuantity = sumQuantity
+        form.discount = 100 //整单折扣
+        form.discAmt = 0 //优惠金额
+      } else {
+        cardList[index].sumStandard = 0
+        cardList[index].saleDiscount = 0
+        cardList[index].sumAmount = 0
+        cardList[index].canUseCollect = 0
+        cardList[index].useCollect = 0
+
+        form.sumStandard = 0
+        form.saleDiscount = 0
+        form.sumAmount = 0
+        form.canUseCollect = 0
+        form.useCollect = 0
+        form.factAmt = 0
+        form.discount = 100 //整单折扣
+        form.discAmt = 0 //优惠金额
+      }
+      this.setData({
+        cardList: cardList,
       })
-      //标价合计
-      cardList[index].sumStandard = sumStandard
-      //销售折扣 (合计金额/标价合计)
-      cardList[index].saleDiscount = sumStandard ? Number((sumAmount / sumStandard) * 100).toFixed(2) : 100
-      //合计金额
-      cardList[index].sumAmount = sumAmount
-      cardList[index].sumQuantity = sumQuantity
-      //TODO   需要获取当前客户可用预存
-      // 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.sumQuantity = sumQuantity
-    } else {
-      cardList[index].sumStandard = 0
-      cardList[index].saleDiscount = 0
-      cardList[index].sumAmount = 0
-      cardList[index].canUseCollect = 0
-      cardList[index].useCollect = 0
-
-      formData.sumStandard = 0
-      formData.saleDiscount = 0
-      formData.sumAmount = 0
-      formData.canUseCollect = 0
-      formData.useCollect = 0
-    }
-
-    this.setData({
-      cardList: cardList,
-      formData: JSON.stringify(formData)
-    })
-  },
+      return form
+    },