报废

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

@@ -1,7 +1,7 @@
-<loading wx:if="{{loading}}" loadingName="加载中" backgroundColor="#f2f2f2;" opacity="0.8"></loading>
+<loading wx:if="{{loading}}"></loading>
 <wxs src='/utils/wxmlUtil.wxs' module="wxmlUtil"></wxs>
 <van-sticky scroll-top="0">
-  <view style="height: {{(chooseFlag || (tagList && tagList.length > 0))?'190rpx': ((searchContent && searchContent.length > 0)?'200rpx':'90rpx')}}">
+  <view id = "" style="height: {{(chooseFlag || (tagList && tagList.length > 0))?'190rpx': ((searchContent && searchContent.length > 0)?'200rpx':'90rpx')}}">
     <!-- 查询条件 -->
     <dk-dropdown-menu model:value="{{searchForm}}" menuList="{{searchContent}}" pullMenuList="{{pullMenuList}}" bind:search="searchData" searchTextPlaceholder="{{wxmlUtil.setSearchPlaceholder($t,placeholder)}}">
     </dk-dropdown-menu>
@@ -42,12 +42,7 @@
   <view bind:tap="toAdd" class="btn-add-class">
     <van-icon name="plus" color="#FFFFFF" size="60rpx" />
   </view>
-</view>
-
-<!-- <view style="position: fixed;bottom: 230rpx;right: 30rpx;z-index: 99;" bindtap="toAdd" wx:if="{{addUrl || (popContent && popContent.length > 0)}}">
-  <image src="{{imageUrl + 'btn-new.png'}} " class="edit-class"  />
-</view> -->
-
+</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>

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

@@ -270,6 +270,11 @@ Page({
       params.outStatus = Constants.outStatus.outBounded
     }
     params.outTypes = params.outTypeList
+    if (!params.flgValid){
+      params.flgValidList = [true]
+    }else{
+      params.flgValidList = [true,false]
+    }
     //采购订单明细 跳转到出库办理  
     let isfirst = this.data.isfirst
     let purNo = this.data.item ? this.data.item.purNo : null

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

@@ -320,6 +320,12 @@ Page({
     } else {
       params.intoTypes = params.intoTypeStList
     }
+    if (!params.flgValid){
+      params.flgValidList = [true]
+    }else{
+      params.flgValidList = [true,false]
+    }
+    
     return params;
   },
   /**