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

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

@@ -1793,7 +1793,7 @@ Component({
         } = e.detail;
         let index = e.currentTarget.dataset.index
         // 删除明细
-        this.delItem(index);
+        this.delItem(index); 
         let goodList = this.data.form[this.data.itemName]
         if (!goodList || goodList.length == 0) {
           // 还原选择组件
@@ -1801,9 +1801,10 @@ Component({
         }
         instance.close();
       }
+      let form = JSON.stringify(this.data.form)
       // 外露setGoods方法
       this.triggerEvent("onCloseDel", {
-
+        form:form
       })
 
     },
@@ -1875,7 +1876,7 @@ Component({
       if (this.data.type == Constants.billType.saleOutReturn) {
         this.setGoodsOutReturnAmount()
       }
-
+   console.log('delItem11',form);
       // 外露setGoods方法
       this.triggerEvent("delItem", {
         data: goodsList

package-inventory/pages/ivt-detail-report/detail/detail.wxml

@@ -1,7 +1,7 @@
 <wxs src='/utils/wxmlUtil.wxs' module="wxmlUtil"></wxs>
 
 <!-- 期初 入库 出库 期末 -->
-<view style="display: flex;padding:10rpx;  margin: 10px 22rpx 10px 22rpx;margin-top: 10px;border-radius: 15rpx;">
+<view wx:if="{{gradeCode == 'PRO'}}" style="display: flex;padding:10rpx;  margin: 10px 22rpx 10px 22rpx;margin-top: 10px;border-radius: 15rpx;">
   <view style="background-color:#F4F9FF;width:33%;padding:10rpx;border-radius: 16rpx;">
     <view style="font-size:13px;text-align: center;margin-top: 10rpx;">{{$t['storageNum']}}</view>
     <dk-cell left="0rpx" center="center" fontSize="13" contentFontSize="18" contentColor="#1B365D" spaceWidth="0" contentFontWeight="700" amount="{{false}}" content="{{item.invQty}}"></dk-cell>
@@ -23,7 +23,7 @@
 
 <view style="display: flex;">
   <!-- 商品信息 -->
-  <view style="width: 100%;">
+  <view style="width: 100%; margin: 10rpx 30rpx;border-radius: 25rpx;    box-shadow: 2px 2px 5px #e5e5e6;">
     <van-card>
       <view slot="thumb">
         <van-image radius="5px" width="80" height="80" src="{{item.imagesUrl }}" />
@@ -31,7 +31,7 @@
       <view slot="title" style="display: flex;">
         <!-- 标题 -->
         <view style="display: flex;">
-          <dk-title  title="{{item.skuModel}}"></dk-title>
+          <dk-title title="{{item.skuModel}}"></dk-title>
         </view>
       </view>
       <!-- 描述 -->
@@ -41,8 +41,9 @@
         </view>
       </view>
       <view slot="price">
-        <view style="display: flex;width: 100%;flex-direction: row; ">
-          <view style="width: 100%;text-align: right;font-size:24rpx;color: #95A8CB;line-height: 34rpx;">x {{ item.invQty  }}{{ item.unitName  }} </view>
+        <view style="display: flex;width: 100%;justify-content: space-between; ">
+          <view >库存量： {{ item.invQty }}{{ item.unitName }} </view>
+          <view wx:if="{{item.packageBox}}">包装数： {{ item.packageBox }}</view>
         </view>
       </view>
     </van-card>
@@ -50,5 +51,5 @@
 </view>
 
 <!-- 列表区 -->
-<dk-form id="{{formName}}" routeObjName="{{routeObjName}}" cardList="{{cardList}}" contentObj="{{contentObj}}" model:value="{{formData}}"   bind:chooseData="chooseData">
+<dk-form id="{{formName}}" routeObjName="{{routeObjName}}" cardList="{{cardList}}" contentObj="{{contentObj}}" model:value="{{formData}}" bind:chooseData="chooseData">
 </dk-form>

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

@@ -635,9 +635,9 @@ Page({
    * @date : 2024/2/1 15:49
    * @author : 于继渤
    */
-  deleteItemList() {
-    console.log('deleteItemList')
-    let formData = JSON.parse(this.data.formData)
+  deleteItemList(e) {  
+    let formData = JSON.parse(e.detail.form)
+    console.log('deleteItemList',formData)
     this.calculateAmount(formData)
   },
   /**

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

@@ -68,7 +68,7 @@ Page({
     ],
     // 列表区（脚部金额）
     footerAmount: {
-      name: 'sumAmount',
+      name: 'factAmt',
       title: mixins.$t("actualTotalAmount")
     },
     // 列表区（脚部信息）