Merge branch 'master' of http://106.12.13.113:3000/haier_cosmo/wms_haiwai_app

src/components/J-Picker/jPicker.vue

@@ -22,7 +22,7 @@
           <view class="lefBtn" @click="cancelSel">{{ $t('message.product_Cancel') }} </view>
           <view class="midInput">
             <template v-if="searchPosition == 'middle'">
-              <input class="searchArea" @input="filterOp" />
+              <input class="searchArea" :focus="focus" @input="filterOp" />
               <!-- <image class="searchIcon" src="../../static/search.png"></image> -->
               <icon class="searchIcon" type="search" />
             </template>
@@ -67,7 +67,7 @@ export default {
       selStyle: 'height:50px;',
     };
   },
-  props: ['options', 'showKey', 'valKey', 'val', 'position', 'disabled', 'bgColor', 'sureColor'],
+  props: ['options', 'showKey', 'valKey', 'val', 'position', 'disabled', 'bgColor', 'sureColor', 'focus'],
   //选项数组，列表显示的对象键名，取值的对象键名,默认选中值,搜索框位置,是否禁用,整体背景色,确认键颜色
   watch: {
     options(n) {

src/pages/product/inbound/finishProductOffline/index.vue

@@ -11,7 +11,7 @@
       <u-row align="top">
         <u-col :span="12">
           <u-form-item :required="true" :label="$t('message.product_Location')" prop="dockName">
-            <jPicker sureColor="#ff0000" @bindpicker="bookTypeChange" showKey="value" valKey="value" :val="form.aimWl.value" :options="model.returningTypeList" />
+            <jPicker sureColor="#ff0000" @bindpicker="bookTypeChange" showKey="value" valKey="value" :val="form.aimWl.value" :options="model.returningTypeList" :focus="true" />
             <!--            <u-input v-model="form.dockName" type="select" @click="returningTypeSelect = true" />-->
             <!--            <u-select-->
             <!--              v-model="returningTypeSelect"-->