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

src/pages/raw/handover/feeding/Location.vue

@@ -189,11 +189,20 @@ export default class RawReceiptDetail extends BasePage {
     this.materialList = []
     this.model.blDetailList.length = 0
   }
+  LocEmpty(){
+    this.some = {}
+    this.someIndex = 0
+    this.qty = ''
+    this.wlCode = ''
+    this.materialList = []
+    this.model.blDetailList.length = 0
+  }
   async query(){
     if(this.form.documentNo == ''){
       this.customToast(this.$t('message.Commission_tips1') as string);
     }
-    this.empty()
+    this.LocEmpty()
+    this.wlCode = this.Location[0]
     let inPrdOrderList = this.form.documentNo.split(",")
     let params = {
       inPrdOrderList

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

@@ -304,10 +304,9 @@ export default class RawReceiptDetail extends BasePage {
   async GetLocation() {
     this.Location = [];
     let means: any = JSON.parse(localStorage.getItem('__GWMS_APP_STATE_DATA__') as any);
-    let sendSpot = JSON.parse(localStorage.getItem('sendSpot') as any);
     let content = {
       loginName: means.session.user.loginName,
-      sendSpot: sendSpot,
+      sendSpot: null,
       factoryCode: means.session.user.factoryCode,
       workArea: session.workareaCode,
     };

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

@@ -139,7 +139,7 @@ export default class RawReceiptDetail extends BasePage {
     this.wlCode = e.pickerName;
   }
   //选取某一条需要分配库位的物料数据
-  handleRow({ data }: any) {
+  async handleRow({ data }: any) {
     if (!this.model.aggregateList[data[0].index].sendSpot) {
       uni.showModal({
         content: this.$t('message.SAPLocation') as any,
@@ -159,6 +159,24 @@ export default class RawReceiptDetail extends BasePage {
     this.model.aggregateList[this.someIndex].currentAmount = 0;
     this.LocationList = [];
     this.qty = '';
+    this.model.LocList.length = 0
+    await this.model.queryItemLoc({
+      workArea:session.workareaCode,
+      loginName:session.loginName,
+      sendSpot:null,
+      materialCode:this.some.materialCode,
+      factoryCode:this.some.factoryCode
+    })
+    this.Location = [];
+    this.model.LocList.forEach((item:any) =>{
+      let arr:any = {
+        label:item.locationCode,
+        value:item.locationCode + '(' + item.sendSpot + ')' + '(' + item.amount + ')',
+        sendSpot:item.sendSpot
+      }
+      this.Location.push(arr)
+    })
+    console.log('this.Location',this.Location)
   }
   //添加库位和数量到数据和表格中
   Add() {

src/pages/raw/handover/picking/model.ts

@@ -22,6 +22,7 @@ export class PickingModule extends VuexModule {
   code = '';
   orderOutIdList: any;
   NEWparams: any;
+  LocList:any = []
 
   /**
    * 查询结果列表（按单列表）
@@ -334,7 +335,13 @@ export class PickingModule extends VuexModule {
     console.log('code', code);
     return { code };
   }
-
+  @MutationAction
+  async queryItemLoc(params:any = {}) {
+    const res: any = await http.post(url.sortscan.save.order, params);
+    const LocList = res.data
+    console.log('list',LocList)
+    return { LocList };
+  }
   /**
    * 解锁数据
    * @param list

src/pages/raw/handover/returning/index.vue

@@ -10,7 +10,7 @@
     <u-form class="form" ref="form" :model="form" :error-type="['toast']" label-width="150rpx">
       <!-- 订单号 -->
       <u-form-item :required="true" :label="$t('message.Pi_OrderNo')" prop="prdOrder">
-        <u-search :placeholder="$t('message.po_PleaseInput')" v-model.trim="prdOrder" @search="model.queryOrderInInfo" :show-action="false"></u-search>
+        <u-search :placeholder="$t('message.po_PleaseInput')" v-model.trim="form.prdOrder" @search="query" :show-action="false"></u-search>
         <u-button size="mini" style="margin-left: 10rpx" type="primary" @click="screen">{{ $t('message.screen') }}</u-button>
         <!-- <jPicker
           sureColor="#ff0000"
@@ -42,7 +42,7 @@
             v-model="form.wkposCode"
             :placeholder="this.$t('message.po_PleaseInput')"
           /> -->
-          <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" />
         </u-form-item>
       </view>
       <!-- 工厂 -->
@@ -119,7 +119,7 @@ export default class returningDom extends BasePage {
     // tlName: null, // 退料类型name
     materialCode: null, // 物料类型code
     wlName: '', // 物料类型name
-    wlCode: '',
+    wlCode: '' as any,
     totalBackAmount: '0',
   };
   prdOrder: any = [];
@@ -149,9 +149,14 @@ export default class returningDom extends BasePage {
   screen() {
     this.redirectTo(this.page.raw.handover.returning.filter);
   }
+  async query(){
+    await this.model.queryOrderInInfo(this.form.prdOrder)
+    this.form.wlName = this.model.orderInInfo.materialCode;
+    this.form.sendSpot = this.model.orderInInfo.sendSpot
+  }
   LocationChoice(e: any) {
     console.log('e>>>>>>>>>>>>>>>>>>>>>>>>', e);
-    this.form.wlCode = e.pickerName.label;
+    this.wlCode = e.pickerName;
     this.form.wkposCode = e.pickerName.sendSpot;
   }
   // 必须要在onReady生命周期，因为onLoad生命周期组件可能尚未创建完毕
@@ -164,8 +169,7 @@ export default class returningDom extends BasePage {
     let sendSpot = JSON.parse(localStorage.getItem('sendSpot') as any);
     if (JSON.parse(sessionStorage.getItem('data') as any)) {
       this.data = JSON.parse(sessionStorage.getItem('data') as any);
-      console.log('this.data',this.data)
-      this.prdOrder = this.data.label;
+      this.form.prdOrder = this.data.label;
       this.form.wlName = this.data.value;
       this.form.sendSpot = this.data.sendSpot;
       // this.form.amount = this.data.amount;
@@ -189,6 +193,7 @@ export default class returningDom extends BasePage {
       pickerName.sendSpot = item.sendSpot;
       this.Location.push(pickerName);
     });
+    this.wlCode = this.Location[0];
   }
   back() {
     // this.form.sendSpot = '';
@@ -201,6 +206,7 @@ export default class returningDom extends BasePage {
     this.$form.resetFields();
   }
   materialConfirm(v: any) {
+    console.log('vvvvvv',v)
     this.form.materialCode = v[0].value;
     this.form.wlName = v[0].label;
     this.model.materielList.forEach((item: any) => {
@@ -222,23 +228,31 @@ export default class returningDom extends BasePage {
     } else {
       this.$form.validate(async (valid: boolean) => {
         if (!valid) return;
-        if (!this.model.orderInInfo.sapFactoryCode) {
-          this.customToast(this.$t('message.return_Tip2') as string);
-        }
+        // if (!this.model.orderInInfo.sapFactoryCode) {
+        //   this.customToast(this.$t('message.return_Tip2') as string);
+        // }
         // (this.form.sendSpot as any) = this.model.orderInInfo.sendSpot;
         (this.form.sapFactoryCode as any) = this.model.orderInInfo.sapFactoryCode;
         // delete this.form.wlName;
+        this.form.wlCode = this.wlCode.label
         await this.model.tluSubmit(this.form);
-        this.$form.resetFields();
+        // this.$form.resetFields();
         this.operatorName = '';
         // this.form.sendSpot = '';
         // this.form.wkposCode = '';
         this.model.orderInInfo.sapFactoryCode = '';
-        this.model.materielList = [];
+        // this.model.materielList = [];
+        this.model.materielList.length = 0;
+        this.empty()
       });
     }
   }
-
+  async empty(){
+    this.form.wlName = ''
+    this.form.sendSpot = ''
+    this.form.amount = ''
+    await this.query()
+  }
   /**
    * 操作人输入回车
    */

src/pages/raw/handover/returning/model.ts

@@ -14,6 +14,8 @@ import { session } from "@/store/modules/session";
 class OrderInInfo {
   amount?: any;
   sapFactoryCode?: any;
+  materialCode?: any;
+  sendSpot?: any;
 }
 
 @Module({