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

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

@@ -17,6 +17,7 @@ Page({
    * 页面的初始数据
    */
   data: {
+    
     firstFlag: true,
     orderBy: [{
       "text": "可售量升序",
@@ -77,6 +78,17 @@ Page({
     contentList: []
   },
   selectedProduct(e) {
+    if(e.currentTarget.dataset.active == 0&&this.data.controlFlags&& this.data.controlFlags.choosewhFlag){
+      this.setData({
+        searchContent: [
+          { code: 'whId', title: mixins.$t('whName'), dropType: 'warehouse',searchType:'dropSingle' }, 
+        ],
+      })
+    }else{
+      this.setData({
+        searchContent: [],
+      })
+    }
     this.setData({
       active: e.currentTarget.dataset.active
     })
@@ -228,6 +240,13 @@ Page({
       //controlFlags.paramsByWhId 查询商品列表 是否开启顶部选择库区的 库区id 作为参数查询  
       //controlFlags.choosewhReadonly 顶部的选择库区是否可点击选择  直接用布尔值在xml控制了
       //controlFlags.chooseWhByUserDefault 顶部的选择库区是否选择用户默认的库区
+      if(controlFlags.choosewhFlag){
+        this.setData({
+          searchContent: [
+            { code: 'whId', title: mixins.$t('whName'), dropType: 'warehouse',searchType:'dropSingle' }, 
+          ],
+        })
+      }
     }
 
   },

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

@@ -14,43 +14,20 @@
 <wxs src='/utils/numberFormat.wxs' module="numberFormat"></wxs>
 <wxs src='/utils/wxmlUtil.wxs' module="wxmlUtil"></wxs>
 <loading wx:if="{{loading}}" loadingName="加载中" backgroundColor="#f2f2f2;" opacity="0.8"></loading>
-<van-dialog id="van-dialog" />
-
-
+<van-dialog id="van-dialog" /> 
 <van-sticky offset-top="{{ 0 }}">
   <van-nav-bar title="选择商品" left-text="" border="{{false}}" left-arrow="{{true}}" bind:click-left="onClickLeft" />
-  <view style="display: flex;">
-    <view style="width: 85%;">
-      <van-search border="{{false}}" bind:search="doSearch" custom-class="search-class" bind:change="onSearchText" model:value="{{ searchText }}" placeholder="输入商品名/商品编码/唯一编码" use-right-icon-slot="{{true}}" placeholder-style="color:#95A8CB">
-      </van-search>
-    </view>
-
-    <view class="scan-class" style="width: 15%;display: flex;align-items: center;">
-      <image class="scan-image" fit="fill" src="{{imageUrl+'scan_image.png'}}"></image>
-    </view>
-  </view>
-
-  <view wx:if="{{active == 0 && controlFlags.choosewhFlag}}" style="display: flex;margin-left: 24rpx;margin-right: 24rpx;margin-top: 10rpx;">
-  <van-dropdown-menu active-color="#1B365D" style=" width: calc(100% ) !important; ">
-    <!-- 库区 -->
-    <van-dropdown-item id="statusItemWareHouse" disabled="{{controlFlags.choosewhReadonly}}" title="{{ form.whName ? form.whName:'仓库' }}" bind:open="dropdowncommit">
-    </van-dropdown-item>
-    <!-- 可售量排序 -->
-    <van-dropdown-item title="{{ orderBy.text?orderBy.text:'可售量升序' }}" value="{{value}}" options="{{ orderBy }}" bind:change="onSwitchChange">
-    </van-dropdown-item>
-  </van-dropdown-menu>
-</view>
-
+  
+<!-- 查询条件 -->
+<dk-dropdown-menu model:value="{{searchForm}}" menuList="{{searchContent}}"   bind:search="searchData" searchTextPlaceholder="{{wxmlUtil.setSearchPlaceholder($t,['skuName','skuCode','onlyCode'])}}">
+  </dk-dropdown-menu>
+ 
   <view style="display: flex;margin-left: 24rpx;margin-right: 24rpx;margin-top: 10rpx;">
     <view bind:tap="selectedProduct" data-active="{{0}}" class="{{ active == 0 ?'selected-product selected-product-color-01' : 'selected-product selected-product-color-02'}}">
       商品列表
-    </view>
-
-    <view bind:tap="selectedProduct" data-active="{{1}}" class="{{ active == 0 ? 'selected-product selected-product-color-02' : 'selected-product selected-product-color-01'}}" style="position: relative;" >
-
-        <view>已选商品</view>
-     
-  
+    </view> 
+    <view bind:tap="selectedProduct" data-active="{{1}}" class="{{ active == 0 ? 'selected-product selected-product-color-02' : 'selected-product selected-product-color-01'}}" style="position: relative;" > 
+        <view>已选商品</view> 
       <view wx:if="{{choosedGoodsList.length > 0}}" style="position: absolute;top:16rpx;right: 40rpx;">
         <view class="icon">{{choosedGoodsList.length}}</view>
       </view>

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

@@ -3,7 +3,7 @@ page {
   /* height: 100%; */
 } 
  .addtop{
-  padding-top: 49px;
+  padding-top: 9px;
  }
  .addsidebar{
   padding-top: 49px;