From 56750cfb7033418d70ee6c9b38a6313e82d1f15e Mon Sep 17 00:00:00 2001
From: hou <1601990943@qq.com>
Date: Thu, 31 Mar 2022 18:08:16 +0800
Subject: [PATCH] =?UTF-8?q?dam-7=20feat=20=E5=B0=8F=E9=97=AE=E9=A2=98?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/login/login/index.vue              | 2 +-
 src/pages/raw/handover/aggregating/index.vue | 4 ++--
 src/pages/raw/handover/feeding/model.ts      | 2 +-
 src/utils/url.ts                             | 3 ++-
 4 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/pages/login/login/index.vue b/src/pages/login/login/index.vue
index 5a95aaa..f1049bb 100644
--- a/src/pages/login/login/index.vue
+++ b/src/pages/login/login/index.vue
@@ -150,7 +150,7 @@ export default class LoginPage extends BasePage {
     console.log('image', this.image);
     console.log('Version////', this.Version);
   }
-  Version = '1.0.14';
+  Version = '1.0.15';
   compareVersion(version1: any, version2: any) {
     //如果version1 大 会返回1  &&&  如果version2 大 会返回 -1
     const newVersion1 = `${version1}`.split('.').length < 3 ? `${version1}`.concat('.0') : `${version1}`;
diff --git a/src/pages/raw/handover/aggregating/index.vue b/src/pages/raw/handover/aggregating/index.vue
index 86195a5..fc080dd 100644
--- a/src/pages/raw/handover/aggregating/index.vue
+++ b/src/pages/raw/handover/aggregating/index.vue
@@ -239,10 +239,10 @@ export default class Aggregating extends BasePage {
   /**
    * 定单查询
    */
-  onQuery() {
+  async onQuery() {
     this.$form.validate(async (valid: boolean) => {
       if (!valid) return;
-      this.model.queryProOrder(this.formParams);
+      await this.model.queryProOrder(this.formParams);
       this.isFormChange = false;
       this.model.isFormChange = this.formParams;
     });
diff --git a/src/pages/raw/handover/feeding/model.ts b/src/pages/raw/handover/feeding/model.ts
index c3d78c8..0d77d06 100644
--- a/src/pages/raw/handover/feeding/model.ts
+++ b/src/pages/raw/handover/feeding/model.ts
@@ -84,7 +84,7 @@ export class FeedingModule extends VuexModule {
   }
   @MutationAction
   async queryItemLoc(params: any = {}) {
-    const res: any = await http.post(url.sortscan.save.queryWlByMat, params);
+    const res: any = await http.post(url.sortscan.save.queryWlByMatBL, params);
     const LocList = [];
     res.forEach((item: any) => {
       const arr: any = {
diff --git a/src/utils/url.ts b/src/utils/url.ts
index 0ec21dc..f9f225b 100644
--- a/src/utils/url.ts
+++ b/src/utils/url.ts
@@ -167,7 +167,8 @@ export const url = {
     save: {
       aggregate: '/wmspda/sortscan/save/aggregate',
       order: '/wmspda/sortscan/save/order',
-      queryWlByMat: '/wmspda/sortscan/queryWlByMatBL',
+      queryWlByMat: '/wmspda/sortscan/queryWlByMat',
+      queryWlByMatBL: '/wmspda/sortscan/queryWlByMatBL',
     },
     unlock: {
       list: '/wmspda/sortscan/unlock/list',