From 4899040ab31be8240f9ffa9ca165013585afbe0a Mon Sep 17 00:00:00 2001
From: hou <1601990943@qq.com>
Date: Fri, 14 Jan 2022 14:30:16 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E5=A7=94=E5=A4=96=E7=BB=86=E8=8A=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/raw/commission/entrant/index.vue    |  2 +-
 src/pages/raw/commission/goOut/detail.vue     | 23 ++++++-------------
 src/pages/raw/commission/goOut/index.vue      | 19 +++++++++------
 src/pages/raw/handover/feeding/Location.vue   |  2 +-
 src/pages/raw/handover/returning/index.vue    |  2 +-
 src/pages/raw/ingoods/dnReceipt/ImportDN.vue  |  5 ++--
 .../raw/ingoods/dnReceipt/dnReceiving.vue     |  6 +++--
 7 files changed, 29 insertions(+), 30 deletions(-)

diff --git a/src/pages/raw/commission/entrant/index.vue b/src/pages/raw/commission/entrant/index.vue
index 947cd44..ed4ec6c 100644
--- a/src/pages/raw/commission/entrant/index.vue
+++ b/src/pages/raw/commission/entrant/index.vue
@@ -253,7 +253,7 @@ export default class dnReceiptDom extends BasePage {
     this.list.forEach((item: any) => {
       num += parseFloat(item.nowAmount);
     });
-    this.every.receiptAmount = num;
+    this.every.receiptAmount += num;
   }
 }
 </script>
diff --git a/src/pages/raw/commission/goOut/detail.vue b/src/pages/raw/commission/goOut/detail.vue
index 5975e58..c48fa6e 100644
--- a/src/pages/raw/commission/goOut/detail.vue
+++ b/src/pages/raw/commission/goOut/detail.vue
@@ -4,27 +4,19 @@
       <view class="left">
         <u-icon class="icon" name="arrow-left" @click="uni.navigateBack()" />
       </view>
-      <view class="title">{{ $t("message.Pi_QueryResults") }}</view>
+      <view class="title">{{ $t('message.Pi_QueryResults') }}</view>
       <view class="right"></view>
     </view>
     <view class="table-wrapper">
-      <wyb-table
-        class="table"
-        ref="table"
-        width="100%"
-        show-left-and-right-border
-        :headers="headers"
-        :contents="model.detailedList"
-        :show-vert-border="false"
-      ></wyb-table>
+      <wyb-table class="table" ref="table" width="100%" show-left-and-right-border :headers="headers" :contents="model.detailedList" :show-vert-border="false"></wyb-table>
     </view>
   </view>
 </template>
 <script lang="ts">
-import { Component } from "vue-property-decorator";
-import { BasePage } from "@/components/base/page";
-import { headers } from "./config";
-import model from "./model";
+import { Component } from 'vue-property-decorator';
+import { BasePage } from '@/components/base/page';
+import { headers } from './config';
+import model from './model';
 
 @Component
 export default class RawReceiptDetail extends BasePage {
@@ -34,8 +26,7 @@ export default class RawReceiptDetail extends BasePage {
 </script>
 <style lang="scss" scoped>
 .page-receipt-detail {
-  background: #f2f2f2
-    linear-gradient(0deg, #f2f2f2 0%, #4a78ea 51%, #1753ea 100%) no-repeat;
+  background: #f2f2f2 linear-gradient(0deg, #f2f2f2 0%, #4a78ea 51%, #1753ea 100%) no-repeat;
   background-size: 100% 600rpx;
   padding: 30rpx;
   min-height: 100%;
diff --git a/src/pages/raw/commission/goOut/index.vue b/src/pages/raw/commission/goOut/index.vue
index 5b1c134..a837194 100644
--- a/src/pages/raw/commission/goOut/index.vue
+++ b/src/pages/raw/commission/goOut/index.vue
@@ -51,7 +51,7 @@
         </view>
         <view class="library-right">
           <view class="library-right-title">{{ $t('message.CommissionedThisNumber') }}</view>
-          <u-input :placeholder="$t('message.po_PleaseInput')" v-model="nowAmount" :type="type" :border="border" class="input" />
+          <u-input :placeholder="$t('message.po_PleaseInput')" v-model="nowAmount" type="number" :border="border" class="input" />
         </view>
       </view>
       <!-- 添加 -->
@@ -142,8 +142,17 @@ export default class dnReceiptDom extends BasePage {
       this.Location.push(pickerName);
     });
   }
+  empty() {
+    this.list = [];
+    this.wlCode = '';
+    this.nowAmount = '';
+    this.every = '';
+    this.materialList = [];
+    this.Location = [];
+  }
   //输入单号 查询数据
   async query() {
+    this.empty();
     if (this.form.documentNo == '') {
       uni.showToast({
         icon: 'none',
@@ -243,11 +252,7 @@ export default class dnReceiptDom extends BasePage {
       list: this.list,
     };
     await this.model.submitOutsourcing(upload);
-    this.list = [];
-    this.wlCode = '';
-    this.nowAmount = '';
-    this.every = '';
-    this.materialList = [];
+    this.empty();
   }
   async bill() {
     if (this.form.documentNo == '') {
@@ -272,7 +277,7 @@ export default class dnReceiptDom extends BasePage {
     this.list.forEach((item: any) => {
       num += parseFloat(item.nowAmount);
     });
-    this.every.outAmount = num;
+    this.every.outAmount += num;
   }
 }
 </script>
diff --git a/src/pages/raw/handover/feeding/Location.vue b/src/pages/raw/handover/feeding/Location.vue
index a7d7a44..d503c91 100644
--- a/src/pages/raw/handover/feeding/Location.vue
+++ b/src/pages/raw/handover/feeding/Location.vue
@@ -30,7 +30,7 @@
       </view>
       <view class="library-right">
         <view class="library-right-title">{{ $t('message.CommissionedThisNumber') }}</view>
-        <u-input v-model="qty" :type="type" :border="border" class="input" />
+        <u-input v-model="qty" :type="type" :border="border" class="input" :placeholder="$t('message.Summary_PleaseInputNumber')" />
       </view>
     </view>
     <!-- 添加 -->
diff --git a/src/pages/raw/handover/returning/index.vue b/src/pages/raw/handover/returning/index.vue
index dffa84c..a2ef133 100644
--- a/src/pages/raw/handover/returning/index.vue
+++ b/src/pages/raw/handover/returning/index.vue
@@ -60,7 +60,7 @@
       </u-row>
       <!-- 工位退料人 -->
       <u-form-item :required="true" :label="$t('message.return_OperatorName')" prop="operator">
-        <u-input v-model="operatorName" @confirm="onOperatorConfirm" :placeholder="$t('message.po_PleaseInput')" />
+        <u-input v-model="form.operator" :placeholder="$t('message.po_PleaseInput')" />
       </u-form-item>
       <!-- 口令 -->
       <u-form-item :label="$t('message.Summary_Password')">
diff --git a/src/pages/raw/ingoods/dnReceipt/ImportDN.vue b/src/pages/raw/ingoods/dnReceipt/ImportDN.vue
index ba46455..17489e3 100644
--- a/src/pages/raw/ingoods/dnReceipt/ImportDN.vue
+++ b/src/pages/raw/ingoods/dnReceipt/ImportDN.vue
@@ -320,8 +320,8 @@ export default class dnReceiptDom extends BasePage {
     });
   }
   // 重置页面数据
-  resetForm() {
-    this.form.documentNo = '';
+  async resetForm() {
+    // this.form.documentNo = '';
     // 清空 add table
     this.LocationList = [];
     // 仓库
@@ -339,6 +339,7 @@ export default class dnReceiptDom extends BasePage {
     this.materialList = [];
     // 清空 当前累计数量
     this.receiptAmount = null;
+    await this.query();
   }
   async onSubmit() {
     if (this.LocationList.length === 0) {
diff --git a/src/pages/raw/ingoods/dnReceipt/dnReceiving.vue b/src/pages/raw/ingoods/dnReceipt/dnReceiving.vue
index 2eec26b..119d3e8 100644
--- a/src/pages/raw/ingoods/dnReceipt/dnReceiving.vue
+++ b/src/pages/raw/ingoods/dnReceipt/dnReceiving.vue
@@ -145,6 +145,7 @@ export default class dnReceiptDom extends BasePage {
   // 页面初始化
   // 页面需要清空仓库，因此需要复用该方法
   async initLocation(condition): Promise<LocationDetail[]> {
+    console.log('condition>>>>>>>>>>>>>>>>>>.', condition);
     //页面初始化 获取可选库位
     let list: Array<LocationDetail> = [];
     let means: any = JSON.parse(localStorage.getItem('__GWMS_APP_STATE_DATA__') as any);
@@ -314,8 +315,8 @@ export default class dnReceiptDom extends BasePage {
     });
   }
   // 重置页面数据
-  resetForm() {
-    this.form.documentNo = '';
+  async resetForm() {
+    // this.form.documentNo = '';
     // 清空 add table
     this.LocationList = [];
     // 仓库
@@ -335,6 +336,7 @@ export default class dnReceiptDom extends BasePage {
 
     // 清空 当前累计数量
     this.receiptAmount = null;
+    await this.query();
   }
   async onSubmit() {
     if (this.LocationList.length === 0) {

From aa8c01c51b4ea6c6e135506b520122027cb41ff2 Mon Sep 17 00:00:00 2001
From: hou <1601990943@qq.com>
Date: Mon, 17 Jan 2022 18:01:17 +0800
Subject: [PATCH 2/2] =?UTF-8?q?SAP=E5=BA=93=E4=BD=8D=E7=9B=B8=E5=85=B3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/i18n/lang/cn.ts                          |  1 +
 src/i18n/lang/en.ts                          |  1 +
 src/pages/raw/handover/picking/ByOrder.vue   | 12 ++++++++++++
 src/pages/raw/handover/picking/BySummary.vue | 11 +++++++++++
 src/pages/raw/handover/picking/config.ts     |  6 ++++--
 src/pages/raw/handover/returning/index.vue   |  3 ---
 6 files changed, 29 insertions(+), 5 deletions(-)

diff --git a/src/i18n/lang/cn.ts b/src/i18n/lang/cn.ts
index 9830668..ba00d73 100644
--- a/src/i18n/lang/cn.ts
+++ b/src/i18n/lang/cn.ts
@@ -63,6 +63,7 @@ export default {
     po_Supplier: '供应商',
     po_OrderType: '订单类型',
     po_Location: '库存地点',
+    SAPLocation:'所选物料没有SAP库位，请重新选择',
     po_PleaseScan: '请扫描PO单号',
     po_PleaseScanMATcode: '请扫描物料条码',
     PleaseScan: '请扫描',
diff --git a/src/i18n/lang/en.ts b/src/i18n/lang/en.ts
index f84290d..05d1e1d 100644
--- a/src/i18n/lang/en.ts
+++ b/src/i18n/lang/en.ts
@@ -186,6 +186,7 @@ export default {
     return_OperatorName: 'Return by',
     return_Type: 'Return type',
     return_Tip1: 'Return by cannot be empty',
+    SAPLocation: 'There is no SAP location for the selected material, please select again',
     return_Tip2: 'Factory code cannot be empty',
     return_Tip3: 'Qty cannot be empty',
     return_Tip4: 'Return Qty cannot be greater than total Qty',
diff --git a/src/pages/raw/handover/picking/ByOrder.vue b/src/pages/raw/handover/picking/ByOrder.vue
index 6eaccf3..4ea5057 100644
--- a/src/pages/raw/handover/picking/ByOrder.vue
+++ b/src/pages/raw/handover/picking/ByOrder.vue
@@ -152,6 +152,18 @@ export default class RawReceiptDetail extends BasePage {
     this.wlCode = e.pickerName;
   }
   handleRow({ data }: any) {
+    console.log('data[0]', data[0]);
+    if (!this.model.proOrderResultList[data[0].index].sendSpot) {
+      uni.showModal({
+        content: this.$t('message.SAPLocation') as any,
+        success: (res) => {
+          if (res.confirm) {
+            this.model.proOrderResultList[data[0].index].checked = false;
+          }
+        },
+      });
+      return;
+    }
     this.someIndex = data[0].index;
     this.some = data[0].lineData;
     this.model.proOrderResultList[this.someIndex].wlList = [];
diff --git a/src/pages/raw/handover/picking/BySummary.vue b/src/pages/raw/handover/picking/BySummary.vue
index 3ae69e6..ae3413b 100644
--- a/src/pages/raw/handover/picking/BySummary.vue
+++ b/src/pages/raw/handover/picking/BySummary.vue
@@ -140,6 +140,17 @@ export default class RawReceiptDetail extends BasePage {
   }
   //选取某一条需要分配库位的物料数据
   handleRow({ data }: any) {
+    if (!this.model.aggregateList[data[0].index].sendSpot) {
+      uni.showModal({
+        content: this.$t('message.SAPLocation') as any,
+        success: (res) => {
+          if (res.confirm) {
+            this.model.aggregateList[data[0].index].checked = false;
+          }
+        },
+      });
+      return;
+    }
     this.someIndex = data[0].index;
     this.some = data[0].lineData;
     this.model.aggregateList[this.someIndex].wlList = [];
diff --git a/src/pages/raw/handover/picking/config.ts b/src/pages/raw/handover/picking/config.ts
index 481b56c..0b192f6 100644
--- a/src/pages/raw/handover/picking/config.ts
+++ b/src/pages/raw/handover/picking/config.ts
@@ -167,7 +167,8 @@ export const orderHeaders = [
   {
     label: vm.$t('message.po_Location'),
     // key: 'currentWkposCode',
-    key: 'wkposCode',
+    //key: 'wkposCode',
+    key: 'sendSpot',
   },
   {
     label: vm.$t('message.po_MaterielDes'),
@@ -189,7 +190,8 @@ export const orderHeaders = [
   },
   {
     label: vm.$t('message.Pi_Station'),
-    key: 'sendSpot',
+    //key: 'sendSpot',
+    key: 'wkposCode',
   },
   {
     label: vm.$t('message.Pi_OrderNo'),
diff --git a/src/pages/raw/handover/returning/index.vue b/src/pages/raw/handover/returning/index.vue
index a2ef133..7b737ef 100644
--- a/src/pages/raw/handover/returning/index.vue
+++ b/src/pages/raw/handover/returning/index.vue
@@ -322,8 +322,5 @@ export default class returningDom extends BasePage {
     box-shadow: 0 1rpx 20rpx 0 rgba(128, 128, 128, 0.2);
     padding: 20rpx;
   }
-
-  .button-bar {
-  }
 }
 </style>