销售订单bug

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

@@ -1702,11 +1702,11 @@ Component({
         if (this.data.type == Constants.billType.pur) {
           // this.setPurGoodsAmount(e.data);
         }
-        console.log('jm3', this.data.cardList);
+        console.log('jm3', this.data.form);
         // 设置是否进行收缩
         let card = this.data.cardList.filter(it => it.name == 'items');
         this.handleContentObj(card[0])
-        console.log('jm2', this.data.cardList);
+        console.log('jm2', this.data.form);
         // 外露setGoods方法
         this.triggerEvent("setGoods", {
           data: goodsList
@@ -1878,14 +1878,14 @@ Component({
             item.discount = Number(0)
             item.discAmt = Number(0)
           }
-          item.itemAmt = item.priceSale * item.itemQty //商品金额
-          item.sumPrice = item.priceSale * item.itemQty //商品金额
-          item.priceDiscount = item.priceStd ? Number((item.priceSale / item.priceStd) * 100).toFixed(2) : 100 //售价折扣  
+          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 += item.itemQty //数量
-          sumAmount += item.priceSale * item.itemQty //没有售价默认取标价
-          factAmt += item.factAmt
-          sumStandard += (item.priceStd ? item.priceStd : item.priceStandard) * 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

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

@@ -173,7 +173,7 @@
             </view>
             <view wx:if="{{sumAmountColFlag}}" class="amount-item-class">
               <!--条数-->
-              <dk-cell titleColor="#95A8CB;" title="{{$t['goodsQuantity']+':' + (card[sumQuantityCol]?card[sumQuantityCol]:0) + $t['piece']}}" amount="{{false}}"></dk-cell>
+              <dk-cell titleColor="#95A8CB;" contentColor="#95A8CB" title="{{$t['goodsQuantity'] }}"contentFontWeight="700"  amount="{{false}}"content="{{(card[sumQuantityCol]?card[sumQuantityCol]:0) + $t['piece']}}"></dk-cell>
               <!--合计金额-->
               <dk-cell fontSize="16" fontWeight="bold" contentFontWeight="700" contentColor="#FF7B1A" titleColor="#1B365D;" title="合计金额" content="{{card[sumAmountCol]?card[sumAmountCol]:0}}"></dk-cell>
               <!-- <view style="display: flex;width: calc(100% - 260rpx);">
@@ -186,7 +186,7 @@
             </view>
             <view wx:if="{{reverseCalculationFlag}}" class="amount-item-class">
               <!--整单折扣-->
-              <dk-cell titleColor="#95A8CB;" title="{{$t['wholeOrderDiscount']+':' + (card[wholeOrderDiscountCol]?card[wholeOrderDiscountCol]:100) + '%'}}" amount="{{false}}"></dk-cell>
+              <dk-cell contentColor="#95A8CB" titleColor="#95A8CB;"  title="{{$t['wholeOrderDiscount']}}" amount="{{false}}"content="{{(card[wholeOrderDiscountCol]?card[wholeOrderDiscountCol]:100) + '%'}}"></dk-cell>
               <!--优惠金额-->
               <dk-cell   contentColor="#95A8CB" titleColor="#95A8CB;" title="优惠金额" content="{{card[discountAmountCol]?card[discountAmountCol]:0}}"></dk-cell>
            

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

@@ -404,7 +404,7 @@
 </dk-popup>
 
 <!-- 库存 -->
-<dk-popup wx:if="{{ billType == 'inventory' }}" type="sale" descCol="skuName"stepperDecimal ="decimalPlaces"  subCol="calculationFormula" titleTagCol="" titleCol="skuModel" iconCol="imagesUrl" value="{{dataItem}}" show="{{showPop}}" routeObjName="{{routeObjName}}" priceTitle="标价：" priceCol="sumPrice" contentObj="{{popContent}}" bind:commit="editItems" bind:openPackageBox="openPackageBox"bind:changeStep="changeStep" bind:blurNumberField="blurNumberField" bind:changeField= "changeField" >
+<dk-popup wx:if="{{ billType == 'inventory' }}" type="sale" descCol="skuName"stepperDecimal ="decimalPlaces"  subCol="calculationFormula" titleTagCol="" titleCol="skuModel" iconCol="imagesUrl" value="{{dataItem}}" show="{{showPop}}" routeObjName="{{routeObjName}}" priceTitle="" priceCol="sumPrice" contentObj="{{popContent}}" bind:commit="editItems" bind:openPackageBox="openPackageBox"bind:changeStep="changeStep" bind:blurNumberField="blurNumberField" bind:changeField= "changeField" >
 </dk-popup>
 
 

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

@@ -714,7 +714,7 @@ Page({
    * @author : 于继渤
    */
   setGoods(e) {
-    console.log("jm1", this.data.cardList);
+    console.log("jm1", this.data.formData);
     //校验库存
     let btnFormData = this.data.btnFormData ? JSON.parse(this.data.btnFormData) : ''
     if (btnFormData.flag) {
@@ -1042,14 +1042,14 @@ Page({
     formData.goodsList.forEach(item => {
       //标价合计 =  商品标价 x  商品数量
       item.priceStd = item.priceStd ? item.priceStd : item.priceStandard //标价
-      item.amtStd = Number(item.priceStd * item.itemQty) //合计标价金额
-      item.itemAmt = item.priceSale * item.itemQty
-      item.factAmt = item.factPrice * item.itemQty
-      item.priceDiscount = item.priceStandard ? Number((item.priceSale / item.priceStandard) * 100).toFixed(2) : 100 //售价折扣
-      sumStandard += item.priceStandard * item.itemQty
-      sumAmount += item.itemAmt
-      factAmt += item.factAmt
-      sumQuantity += item.itemQty //数量
+      item.amtStd = Number(item.priceStd) *  Number(item.itemQty) //合计标价金额
+      item.itemAmt =  Number(item.priceSale) *  Number(item.itemQty)
+      item.factAmt =  Number(item.factPrice) *  Number(item.itemQty)
+      item.priceDiscount = item.priceStandard ? Number(( Number(item.priceSale) /  Number(item.priceStandard)) * 100).toFixed(2) : 100 //售价折扣
+      sumStandard +=  Number(item.priceStandard) *  Number(item.itemQty)
+      sumAmount +=  Number(item.itemAmt)
+      factAmt +=  Number(item.factAmt)
+      sumQuantity += Number( item.itemQty) //数量
 
     })
     formData.sumStandard = sumStandard

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

@@ -11,7 +11,7 @@ bind:customersChoose="customersChoose" bind:changeCheckBox="changeCheckBox" bind
 <view style="height: 200rpx;"></view>
 
 <!--  保存 -->
-<dk-save-button id="saveButton"  model:value="{{btnFormData}}" btnAutoWidthFlag="{{true}}" contentLineFlag="{{true}}" btnRightFlag="{{true}}" buttonList="{{buttonSaveList}}" bind:open="saveButton" contentList="{{contentSaveList}}" bind:change="saveChange"></dk-save-button>
+<dk-save-button id="saveButton"  model:value="{{btnFormData}}" btnAutoWidthFlag="{{true}}" contentLineFlag="{{false}}" btnRightFlag="{{true}}" buttonList="{{buttonSaveList}}" bind:open="saveButton" contentList="{{contentSaveList}}" bind:change="saveChange"></dk-save-button>
 <!-- 修改价格反算 -->
 <dk-popup type="basic" title="修改价格"   value="{{dataItem}}" show="{{showReverseCalculationPop}}" routeObjName="{{routeObjName}}" contentObj="{{popContentReverse}}" validFlag="{{true}}"  bind:blurNumberField ="blurNumberField"   bind:commit="editItemsReverse"  ></dk-popup>
 <!--  新手引导 -->