禅道bug修正 - 收发存 入库明细

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

@@ -6,7 +6,7 @@
     <dk-dropdown-menu model:value="{{searchForm}}" menuList="{{searchContent}}" pullMenuList="{{pullMenuList}}" bind:search="searchData" searchTextPlaceholder="{{wxmlUtil.setSearchPlaceholder($t,placeholder)}}">
     </dk-dropdown-menu>
     <!-- 多选 -->
-    <van-tabs wx:if="{{chooseFlag}}" type="card" custom-class="tags-class" tab-active-class="{{active==0?'dk-tab-active-left':'dk-tab-active-right'}}" animated="{{true}}" swipeable="{{true}}" active="{{ active }}" dot bind:change="changeTag">
+    <van-tabs wx:if="{{chooseFlag}}" type="card" tab-active-class="{{active==0?'dk-tab-active-left':'dk-tab-active-right'}}" animated="{{true}}" swipeable="{{true}}" active="{{ active }}" dot bind:change="changeTag">
       <van-tab title="待选列表"></van-tab>
       <van-tab title="已选列表" info="{{choosedData.length==0?'':choosedData.length}}"></van-tab>
     </van-tabs>
@@ -19,13 +19,16 @@
 
 <!--简单列表-->
 <view wx:if="{{simpleFlag}}" style="margin-top:30rpx;">
-  <view wx:for="{{tableData}}" data-item="{{item}}" wx:key="index" class="main-class main-item-class" style="{{item.checked? 'border: 1px solid #1B365D;':''}}" data-index="{{index}}"  catchtap="choose">
+  <view wx:for="{{tableData}}" data-item="{{item}}" wx:key="index" class="main-class main-item-class" style="{{item.checked? 'border: 1px solid #1B365D;':''}}" data-index="{{index}}" catchtap="choose">
     {{item[title]}}
   </view>
 </view>
 
-<!-- 列表区 -->
-<dk-list wx:if="{{!simpleFlag && active == 0}}" id="list" list="{{tableData}}" title="{{title}}" flgPoint="{{false}}" titleImageFlag="{{false}}" content="{{contentList}}" footerInfo="{{footerInfo}}" chooseFlag="{{chooseFlag}}" bind:toDetail="toDetail" bind:choose="chooseData"></dk-list>
+<!-- 列表区 防止遮住-->
+<view style="{{chooseFlag?'margin-top:120rpx;':''}}">
+  <dk-list wx:if="{{!simpleFlag && active == 0}}" id="list" list="{{tableData}}" title="{{title}}" flgPoint="{{false}}" titleImageFlag="{{false}}" content="{{contentList}}" footerInfo="{{footerInfo}}" chooseFlag="{{chooseFlag}}" bind:toDetail="toDetail" bind:choose="chooseData"></dk-list>
+</view>
+
 
 <!-- 已选列表区 -->
 <dk-list wx:if="{{ !simpleFlag && chooseFlag && active == 1}}" id="choosed" list="{{choosedData}}" title="{{title}}" flgPoint="{{false}}" titleImageFlag="{{false}}" content="{{contentList}}" footerInfo="{{footerInfo}}" swipeDisabled="{{false}}" swipeDeleteFlag="{{true}}" bind:swipe="delChoosed"></dk-list>
@@ -43,5 +46,5 @@
 </view>
 
 
-<dk-popup id="popup" type="basic" validFlag="{{true}}" priceTitle=""  title="{{popTitle}}" value="{{dataItem}}" show="{{showPop}}" routeObjName="{{routeObjNamePop}}" contentObj="{{popContent}}" bind:commit="editItems">
+<dk-popup id="popup" type="basic" validFlag="{{true}}" priceTitle="" title="{{popTitle}}" value="{{dataItem}}" show="{{showPop}}" routeObjName="{{routeObjNamePop}}" contentObj="{{popContent}}" bind:commit="editItems">
 </dk-popup>

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

@@ -31,8 +31,7 @@
 .tags-class>van-sticky {
 	position: fixed !important;
 	width: 100%;
-	height: 84rpx !important;
-	z-index: 99;
+	height: 84rpx !important; 
 	top: 104rpx;
 }
 

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

@@ -3,7 +3,7 @@
 <loading wx:if="{{loading}}"></loading>
 <van-sticky scroll-top="0">
   <!-- 查询条件 -->
-  <dk-dropdown-menu model:value="{{searchForm}}" menuList="{{searchContent}}" pullMenuList="{{pullMenuList}}" bind:search="searchData" searchTextPlaceholder="{{wxmlUtil.setSearchPlaceholder($t,['skuName','skuCode','skuModel'])}}">
+  <dk-dropdown-menu model:value="{{searchForm}}" menuList="{{searchContent}}" pullMenuList="{{pullMenuList}}" bind:search="searchData" searchTextPlaceholder="{{wxmlUtil.setSearchPlaceholder($t,['skuName','skuModel'])}}">
   </dk-dropdown-menu>
 </van-sticky>
 

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

@@ -38,7 +38,7 @@ Page({
         contentObj: {},
         popContent: [
             {
-                code: 'intoingQty',
+                code: 'itemQty',
                 type: 'step',
                 title: mixins.$t('count'),
             },