姜永辉 hai 1 ano
pai
achega
b1757182fd

+ 2 - 2
package-base-select/pages/select-customers/select-customers.wxml

@@ -13,13 +13,13 @@
       <van-field label-class="nomal-label" value="{{ item.cusPhone }}" input-align="left" label="客户电话" placeholder="" data-type='name' readonly="{{true}}" autosize border="{{ false }}">
       </van-field>
 
-      <van-field label-class="nomal-label"  input-align="left" label="应收余额" placeholder="" data-type='name' readonly="{{true}}" autosize border="{{ false }}">
+      <!-- <van-field label-class="nomal-label"  input-align="left" label="应收余额" placeholder="" data-type='name' readonly="{{true}}" autosize border="{{ false }}">
         <dk-cell slot="inputbefor" contentRight="{{false}}" left="0" height="60rpx" fontSize="14" contentFontSize="14" contentColor="#FF7B1A" titleColor="#95A8CB" contentFontWeight="bold"  content="{{item.receivableResidue?item.receivableResidue:0}}"></dk-cell>
       </van-field>
 
       <van-field label-class="nomal-label" input-align="left" label="预收余额" placeholder="" data-type='name' readonly="{{true}}" autosize border="{{ false }}">
         <dk-cell slot="inputbefor" contentRight="{{false}}" left="0" height="60rpx" fontSize="14" contentFontSize="14" contentColor="#FF7B1A" titleColor="#95A8CB" contentFontWeight="bold"  content="{{item.receiptResidue?item.receiptResidue:0}}"></dk-cell>
-      </van-field>
+      </van-field> -->
 
       <van-field label-class="nomal-label" input-align="left" label="客户欠款" placeholder="" data-type='name' readonly="{{true}}" autosize border="{{ false }}">
         <dk-cell slot="inputbefor" contentRight="{{false}}" left="0" height="60rpx" fontSize="14" contentFontSize="14" contentColor="#FF7B1A" titleColor="#95A8CB" contentFontWeight="bold"  content="{{(item.receivableResidue?item.receivableResidue:0)-(item.receiptResidue?item.receiptResidue:0)}}"></dk-cell>

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

@@ -10,13 +10,13 @@
   <view style="background-color:#F4F9FF;width: 33%;padding:10rpx;border-radius: 16rpx;margin-left: 20rpx;">
     <view style="font-size:13px;text-align: center;margin-top: 10rpx;">{{$t['freezeQty']}}</view>
     <dk-cell left="0rpx" center="center" fontSize="15" contentFontSize="18" contentColor="#1B365D" spaceWidth="0" contentFontWeight="700" amount="{{false}}" content="{{item.freezeQty}}"></dk-cell>
-    <view style="font-size:13px;text-align: center;margin-top: 10rpx;">{{item.packageBox?item.packageBox:''}}</view>
+    <view style="font-size:13px;text-align: center;margin-top: 10rpx;">{{item.packageBoxFreeze?item.packageBoxFreeze:''}}</view>
   </view>
 
   <view style="background-color:#F4F9FF;width:33%;padding:10rpx;border-radius: 16rpx;margin-left: 20rpx;">
     <view style="font-size:13px;text-align: center;margin-top: 10rpx;">{{$t['sellableQuantity']}}</view>
     <dk-cell left="0rpx" center="center" fontSize="13" contentFontSize="18" contentColor="#1B365D" spaceWidth="0" contentFontWeight="700" amount="{{false}}" content="{{item.usableQty}}"></dk-cell>
-    <view style="font-size:13px;text-align: center;margin-top: 10rpx;">{{item.packageBox?item.packageBox:''}}</view>
+    <view style="font-size:13px;text-align: center;margin-top: 10rpx;">{{item.packageBoxUsable?item.packageBoxUsable:''}}</view>
   </view>
 
 </view>
@@ -42,7 +42,7 @@
       </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  }} </view>
+          <view style="width: 100%;text-align: right;font-size:24rpx;color: #95A8CB;line-height: 34rpx;">x {{ item.invQty  }}{{ item.unitName  }} </view>
         </view>
       </view>
     </van-card>

+ 4 - 4
package-inventory/pages/ivt-detail-report/ivt-detail-report.js

@@ -191,11 +191,11 @@ Page({
         value: item.nonStdCode ? item.nonStdCode : '',
         copyValue: item.nonStdCode ? item.nonStdCode : '',
       })
-      // 可售
+      // 库存
       list.push({
         title: mixins.$t('storageNum'), 
-        value: item.usableQty ? item.usableQty : '0',
-        copyValue: item.usableQty ? item.usableQty : '0',
+        value: (item.invQty ? item.invQty : '0') +  item.unitName,
+        copyValue: item.invQty ? item.invQty : '0',
       })
       // 可售包装 
       if (item.flgSubUnit) {
@@ -207,7 +207,7 @@ Page({
           value: item.packageBox,
           copyValue: item.packageBox,
         })
-      }
+      } 
       item.list = list
       if (item.skuImages && item.skuImages.length > 0) {
         item.skuImages.forEach(it => {

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

@@ -38,7 +38,7 @@
             <view class="table-content-row">
               <view style="display:flex;width:100%;">
                 <view data-item="{{item}}" style="display:flex;font-size: 15px;">
-                  <dk-text style="font-size:30rpx;" fontWeight="nomal" value="{{item.skuCode}}"></dk-text>
+                  <dk-text style="font-size:30rpx;" fontWeight="nomal" value="{{item.skuModel }}"></dk-text>
                 </view>
               </view>
             </view>