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

src/pages/raw/handover/aggregating/config.ts

@@ -89,6 +89,10 @@ export const summaryHeaders = [
     label: vm.$t('message.Pi_HandoverQuantity'),
     key: 'totalHvAmount',
   },
+  {
+    label: vm.$t('message.po_DemandQuantity'),
+    key: 'amount',
+  },
   {
     label: vm.$t('message.Pi_Station'),
     key: 'sendSpot',
@@ -138,6 +142,10 @@ export const orderHeaders = [
     label: vm.$t('message.Pi_HandoverQuantity'),
     key: 'totalHvAmount',
   },
+  {
+    label: vm.$t('message.po_DemandQuantity'),
+    key: 'amount',
+  },
   {
     label: vm.$t('message.Pi_Station'),
     key: 'sendSpot',

src/pages/raw/handover/picking/BySummary.vue

@@ -25,7 +25,7 @@
     <view class="library">
       <view class="library-left">
         <view>{{ $t('message.CommissionedLocation') }}:</view>
-        <jPicker sureColor="#ff0000" style="width: 230rpx" @bindpicker="LocationChoice" showKey="value" valKey="value" :val="wlCode" class="search" :options="Location" />
+        <jPicker sureColor="#ff0000" style="width: 230rpx" @bindpicker="LocationChoice" showKey="value" valKey="value" :val="wlCode.value" class="search" :options="Location" />
       </view>
       <view class="library-right">
         <view class="library-right-title">{{ $t('message.CommissionedThisNumber') }}:</view>
@@ -319,7 +319,7 @@ export default class RawReceiptDetail extends BasePage {
     await this.model.saveAggregateUpload(params).then(() => {
       this.model.queryProOrderResult(this.again).then(() => {
         // this.toPage(this.page.raw.handover.picking.result);
-        this.model.queryAggregate()
+        this.model.queryAggregate();
         this.toPage(this.page.raw.handover.picking.bysummary);
       });
     });

src/pages/raw/handover/returning/Time-filter.vue

@@ -83,12 +83,8 @@ export default class returningDom extends BasePage {
     this.endMobile = endParams.year + '-' + endParams.month + '-' + endParams.day;
   }
   onCheck(e: any) {
-    // 修改退料 筛选后选择一条可以将相关信息赋值到退料页面
     console.log('eeeee', e.data[0].lineData);
-    this.data.label = e.data[0].lineData.label;
-    this.data.value = e.data[0].lineData.value;
-    this.data.sendSpot = e.data[0].lineData.sendSpot;
-    this.data.amount = e.data[0].lineData.amount;
+    this.data = e.data[0].lineData;
   }
   back() {
     if (this.data.label == '' || this.data.label == null) {