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

src/pages/product/warehouse/wholeTransfer/index.vue

@@ -13,17 +13,14 @@
         <u-input v-model="userDefined4" placeholder="" class="Transfer" />
         <u-button type="primary" style="height: 60rpx; margin-left: 20rpx" @click="generate">{{ $t('message.generate') }}</u-button>
       </u-form-item>
-      <!-- 条码 -->
-      <u-form-item :required="true" :label="$t('message.product_barCode')" prop="productCode">
-        <u-search :placeholder="$t('message.po_PleaseInput')" v-model.trim="form.productCode" @search="query" :show-action="false"></u-search>
-      </u-form-item>
       <!-- 已扫 -->
       <!-- <u-form-item :label="$t('message.product_Swept')">
         <u-input :disabled="true" v-model="model.orderInInfo.actualQty" placeholder="" />
       </u-form-item> -->
       <!-- 成品编码 -->
       <u-form-item :label="$t('message.product_FGCode')">
-        <u-input :disabled="true" v-model="model.orderInInfo.productCode" placeholder="" />
+        <!-- <u-input :disabled="true" v-model="model.orderInInfo.productCode" placeholder="" /> -->
+        <jPicker sureColor="#ff0000" @bindpicker="bookTypeChange" showKey="value" valKey="value" :val="form.aimWl.value" :options="model.WlList" />
       </u-form-item>
       <!-- 成品描述 -->
       <u-form-item :label="$t('message.product_FGDes')">
@@ -37,6 +34,10 @@
       <u-form-item :label="$t('message.product_Location')">
         <u-input :disabled="true" v-model="model.orderInInfo.locCode" placeholder="" />
       </u-form-item>
+      <!-- 条码 -->
+      <u-form-item :required="true" :label="$t('message.product_barCode')" prop="productCode">
+        <u-search :placeholder="$t('message.po_PleaseInput')" v-model.trim="form.productCode" @search="query" :show-action="false"></u-search>
+      </u-form-item>
       <!-- 目标库位 -->
       <u-form-item :required="true" :label="$t('message.Warehouse_TargetLocation')" prop="aimWl">
         <jPicker sureColor="#ff0000" @bindpicker="bookTypeChange" showKey="value" valKey="value" :val="form.aimWl.value" :options="model.WlList" />
@@ -81,7 +82,7 @@ export default class productCheckReceipt extends BasePage {
   @Ref('form') readonly $form!: VForm;
   model = model;
   form = {
-    aimWl: {} as OptionType,
+    aimWl:{} as OptionType,
     productCode: '',
   };
   userDefined4: any = '';
@@ -113,11 +114,11 @@ export default class productCheckReceipt extends BasePage {
     }
   }
   //页面初始化
-  onReady() {
+  async onReady() {
     this.$form.setRules(this.rules);
-    this.model.queryLocation();
-    this.form.aimWl.value = this.model.WlList[0].value;
     this.model.empty();
+    await this.model.queryLocation();
+    this.form.aimWl = this.model.WlList[0];
     this.userDefined4 = JSON.parse(sessionStorage.getItem('userDefined4'));
     sessionStorage.removeItem('userDefined4');
   }