弹框

api/pages/ivt/outboundOther.js

@@ -24,7 +24,7 @@ module.exports = {
       chooseWh: { key: 'chooseWh', url: '/package-base-select/pages/select-warehouse/select-warehouse'  },      
       chooseStorageObject: { key: 'chooseStorageObject', url: '/package-base-select/pages/select-storage-object/select-storage-object'  },
       chooseStorageOutReason: { key: 'chooseStorageOutReason', url: '/package-base-select/pages/select-data-dictionary/select-data-dictionary'  },
-
+      openingInventory: { key: 'openingInventory', url: '/package-base-select/pages/select-warehouse/select-warehouse'  },
     }
   }
 };

api/pages/mst/goodsSku.js

@@ -22,6 +22,7 @@ module.exports = {
           unit: { key: 'unit', url: '/package-basic-data/pages/product-file/metering-unit/metering-unit'  },
           goodsSeries: { key: 'goodsSeries', url: '/package-basic-data/pages/product-file/product-series/product-series'  }, 
           openingInventory: { key: 'openingInventory', url: '/package-base-select/pages/select-warehouse/select-warehouse'  },
+          
         }
     }
 };

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

@@ -31,7 +31,7 @@ Page({
     popContent:
       [
         { code: 'itemQty', type: 'step', title: '数量', required: true },
-        { code: 'whId', name: 'whName', title: '仓库', type: 'drop', dropType: 'warehouse' },
+        { code: 'whId', name: 'whName', title: '仓库',  type: 'choose',urlKey: 'openingInventory' },
         { code: 'skuSpec', title: '规格', type: 'str', readonly: true, dropType: '' },
         { code: 'nonStdCode', title: '商品批次', type: 'str', },
       ],

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

@@ -242,7 +242,7 @@
 
 
 
-<dk-popup type="sale" descCol="skuModel" titleCol="skuModel" priceCol="pricePromotion" subCol="desc" value="{{dataItem}}" show="{{showPop}}" routeObjName="{{routeObjNameGoTo}}" contentObj="{{popContent}}" bind:commit="editItems">
+<dk-popup type="sale" descCol="skuModel" titleCol="skuModel" priceCol="pricePromotion" subCol="desc" value="{{dataItem}}" show="{{showPop}}" routeObjName="{{routeObjName}}" contentObj="{{popContent}}" bind:commit="editItems">
 </dk-popup>
 
 

package-inventory/pages/other-outbound/other-outbound.js

@@ -47,8 +47,8 @@ Page({
             code: 'whId',
             name: 'whName',
             title: mixins.$t('warehouseId'),
-            type: 'drop',
-            dropType: 'warehouse'
+            type: 'choose',
+            urlKey: 'openingInventory'
         },
         { code: 'skuSpec', title: mixins.$t('goodSpec'), type: 'str', readonly: true, },
         {
@@ -74,6 +74,10 @@ Page({
             title: mixins.$t('otherInfo')
         }
         ],
+
+        cardContentList:[
+            { code: 'whId',name: 'whName',  title: '库区', type: 'choose', }
+          ],
         contentObj: {
             main: [
                 {
@@ -196,6 +200,8 @@ Page({
             element.priceOut = element.priceSale
             element.outAmt = 0     //  已出库金额
             element.outQty = 0     //  已出库数量
+            // 显示库区和可售量开关
+            element.usableQtyInsufficientFlag = true
             totalAmout += Number(element.priceSale * element.itemQty)
         })
         // 左下角的合计金额

package-inventory/pages/other-outbound/other-outbound.wxml

@@ -4,7 +4,12 @@
 <loading wx:if="{{loading}}" ></loading>
 
 <dk-form-bill type="sale" id="{{formName}}"routeObjName="{{routeObjName}}" cardList="{{cardList}}" titleTagCol="shortName" titleCol="skuCode" descCol="skuModel" priceCol="pricePur" quantityCol="itemQty" sumAmountCol="itemAmt" contentObj="{{contentObj}}" model:value="{{formData}}" popContent="{{popContent}}" bind:chooseData="chooseData" popType="sale" bind:editItems="setGoods" 
-bind:delItem="setGoods" bind:setGoods="setGoods" >
+bind:delItem="setGoods" bind:setGoods="setGoods"
+cardContentList="{{cardContentList}}"
+quantityRedTitle="可售量："
+quantityRedCol="usableQty"
+quantityRedColFlagKey="usableQtyInsufficientFlag"
+ >
 </dk-form-bill> 
 <view style="height: 200rpx;"></view>
 <!-- 新建按钮 -->