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

components/dkbusiness/dk-label-multiple-select/dk-label-multiple-select.js

@@ -198,12 +198,12 @@ Component({
         name = '入库类型'
       }
       //入库原因
-      if (typeName === 'inBoundReason') {
+      if (typeName === 'intoReason') {
         dataSourceCode = 'inReason'
         name = '入库原因'
         let stowList = [{
-          name: '其他采购',
-          id: '基础资料-入库',
+          name: '盘盈入库',
+          id: '10112024-0314-0000-0000-000010d79635',
           infotype: 'default'
         },         
       
@@ -215,7 +215,7 @@ Component({
         })
       }
       //出库类型
-      if (typeName === 'outboundType') {
+      if (typeName === 'outType') {
         dataSourceCode = 'outType'
         name = '出库类型'
         let stowList = [{
@@ -244,12 +244,12 @@ Component({
       }
 
       //出库原因
-      if (typeName === 'outboundReason') {
+      if (typeName === 'outReason') {
         dataSourceCode = 'outReason'
         name = '出库原因'
         let stowList = [{
           name: '破损出库',
-          id: '基础资料-出库',
+          id: '10112024-0312-0000-0000-00000f5759fd',
           infotype: 'default'
         },         
       

package-base-select/pages/select-data/select-data.json

@@ -1,3 +1,4 @@
 {
-    "usingComponents": {}
+    "usingComponents": {},
+    "navigationBarTitleText": ""
 }

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

@@ -35,6 +35,11 @@ Page({
         { code: 'skuSpec', title: '规格', type: 'str', readonly: true, dropType: '' },
         { code: 'nonStdCode', title: '商品批次', type: 'str', },
       ],
+      // 确定按钮
+      buttonList: [{
+        name: 'confirm',
+        title: '确定'
+    }],
   },
   changeSidebar(e) {
     console.log(e.detail)

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

@@ -156,7 +156,7 @@
       </view>
     </view>
   </view>
-
+   
   <!--已选列表-->
   <view wx:if="{{active == 1}}" class="goods-selected-class">
     <view class="goods-class" style="height:calc({{windowHeight+'px'}} - 295rpx);overflow: scroll;"></view>
@@ -222,7 +222,7 @@
     </van-cell-group>
 
 
-    <view style="height:180rpx;"></view>
+    <view style="height:220rpx;"></view>
   </view>
 </view>
 
@@ -247,8 +247,5 @@
 </dk-popup>
 
 
-
-
-
-<!-- 合计保存相关组件 -->
-<dk-save-bottom flagTypeName="order-choose-goods" selectTotallength="{{sumQuantity}}" selectlength="{{categoryQuantity}}" totallength="{{numberFormat.toThousandCents(sumGoodsAmount)}}" bind:submit="submit" />
+<dk-save-button model:value="{{btnFormData}}" btnAutoWidthFlag="{{false}}" btnRightFlag="{{true}}" buttonList="{{buttonList}}" contentList="{{contentList}}" bind:open="submit"></dk-save-button>
+ 

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

@@ -195,14 +195,14 @@ Page({
         let totalAmout = Number(0)
         // 各个明细的金额数量
         formData.goodsList.forEach(element => {  //循环出商品总共价格 
-            element.outingAmt = element.priceSale * element.itemQty
+            element.outingAmt = element.priceStandard * element.itemQty
             element.outingQty = element.itemQty
-            element.priceOut = element.priceSale
+            element.priceOut = element.priceStandard
             element.outAmt = 0     //  已出库金额
             element.outQty = 0     //  已出库数量
             // 显示库区和可售量开关
             element.usableQtyInsufficientFlag = true
-            totalAmout += Number(element.priceSale * element.itemQty)
+            totalAmout += Number(element.priceStandard * element.itemQty)
         })
         // 左下角的合计金额
         contentList_.forEach(card => {

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

@@ -35,12 +35,12 @@ Page({
       {
         code: 'outType',
         pullType: 'mSelect',
-        typeName: 'outboundType'
+        typeName: 'outType'
       },
       {
         code: 'outReason',
         pullType: 'mSelect',
-        typeName: 'outboundReason'
+        typeName: 'outReason'
       },
       {
         code: 'cusName',

package-inventory/pages/warehousing-processing/warehousing-processing.js

@@ -42,7 +42,7 @@ Page({
       {
         code: 'inReason',
         pullType: 'mSelect',
-        typeName: 'inBoundReason'
+        typeName: 'intoReason'
       },
       {
         code: 'cusName',
@@ -226,6 +226,8 @@ Page({
       //已入库的查询参数 
       params.intoStatus = Constants.intoStatus.inBounded
     }
+    params.intoTypes = params.intoTypeList
+
     return params;
   },
   /**