于继渤 1 год назад
Родитель
Сommit
545d1602b6

+ 2 - 0
components/dkbase/dk-form-bill/dk-form-bill.js

@@ -2247,6 +2247,8 @@ Component({
           item.intoingAmt = item.priceInto * item.intoingQty
           sumQuantity += Number(item.intoingQty) //数量
           sumAmount += item.priceInto * item.intoingQty //没有售价默认取标价
+          item.intoingQty = item.decimalPlaces ?  item.intoingQty.toFixed(item.decimalPlaces) : item.intoingQty
+          
         })
         //合计金额
         cardList[index].sumAmount = sumAmount

+ 2 - 1
package-base-select/pages/select-source-purchase-order/select-source-purchase-order.js

@@ -29,7 +29,7 @@ Page({
    * @date : 2024/2/1 15:49
    * @author : 于继渤
    */
-  setValuesByEdit() {
+  setValuesByEdit(data) {
     this.setData({
       contentSaveList: [{ code: 'need', title: '退货总额', type: 'str' }, { code: 'amount', content: 0, type: 'number' }]
     })
@@ -176,6 +176,7 @@ Page({
       res.fromItemId = res.intoItemId
       res.sIntoId = res.intoId
       res.sIntoItemId = res.intoItemId
+      res.intoingQty = res.decimalPlaces ?  res.intoingQty.toFixed(res.decimalPlaces) : res.intoingQty
       delete res['itemId']
     })
 

+ 14 - 5
package-purchase/pages/purchase-return/add/add.js

@@ -90,13 +90,20 @@ Page({
       type: 'str',
       readonly: true,
     },
+    // {
+    //   code: 'whId',
+    //   name: 'whName',
+    //   choosePopupType: '',
+    //   title: mixins.$t("warehouseId"),
+    //   type: 'choose',
+    //   urlKey: 'openingInventory',
+    //   readonly: true,
+    // },
     {
-      code: 'whId',
-      name: 'whName',
-      choosePopupType: '',
+      code: 'whName',
       title: mixins.$t("warehouseId"),
-      type: 'choose',
-      urlKey: 'openingInventory',
+      type: 'str',
+      readonly: true,
     },
     {
       code: 'nonStdCode',
@@ -104,6 +111,7 @@ Page({
       type: 'str',
       required: true,
       tip: mixins.$t('tipPop'),
+      readonly: true,
     },
     ],
 
@@ -707,6 +715,7 @@ Page({
       // 原仓库ID 240701
       element.whIdPri = element.whId
       element.nonStdCodePri = element.nonStdCode
+      element.intoingQty = element.decimalPlaces ?  element.intoingQty.toFixed(element.decimalPlaces) : element.intoingQty
     })
     this.setData({
       beforeSumAmount: formData.returnAmt,

+ 2 - 1
package-purchase/pages/purchase-return/detail/detail.js

@@ -135,12 +135,13 @@ Page({
       }
       item.intoingQty_max = 0
       item.priceStd = item.priceInto
+    
       //处理图片
       if (item.skuImages) {
         item['imagesUrl'] = item.skuImages.length > 0 ? item.skuImages[0].url : null
       }
       item.intoingQty_min = item.canReturnQty ? item.canReturnQty : Math.abs(item.invQty) * -1 //可出库最大值
-      console.log('item', item)
+      item.intoingQty = item.decimalPlaces ?  item.intoingQty.toFixed(item.decimalPlaces) : item.intoingQty
     })
     formData.goodsList = data.dataItem
     let searchEditList = data.dataItem