From 2091a5d9085133aec794b3b95b86764642ba7c86 Mon Sep 17 00:00:00 2001
From: suiwei <136693118@qq.com>
Date: Thu, 18 May 2023 18:40:55 +0800
Subject: [PATCH] =?UTF-8?q?overseamom-253=20feat=20=E6=8B=A3=E9=85=8D?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E5=A2=9E=E5=8A=A0=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/raw/handover/picking-vn/index.vue | 22 +++++++++++++++------
 1 file changed, 16 insertions(+), 6 deletions(-)

diff --git a/src/pages/raw/handover/picking-vn/index.vue b/src/pages/raw/handover/picking-vn/index.vue
index b7aa07a..ec63891 100644
--- a/src/pages/raw/handover/picking-vn/index.vue
+++ b/src/pages/raw/handover/picking-vn/index.vue
@@ -15,7 +15,7 @@
             <u-input v-model="form.mrpCodeRegion" :border="border" :placeholder="$t('message.po_PleaseInput')" />
           </u-form-item>
           <!-- 订单号 -->
-          <u-form-item :label="$t('message.Pi_OrderNo')">
+          <u-form-item :required="true" :label="$t('message.Pi_OrderNo')" prop="prdOrderFrom">
             <u-input v-model="form.prdOrderFrom" :border="border" :placeholder="$t('message.po_PleaseInput')" />
           </u-form-item>
           <!-- 工厂 -->
@@ -40,14 +40,18 @@
               <!-- 表头行 -->
               <uni-tr>
                 <uni-th width="80" align="center">{{ $t('message.Pi_OrderNo') }}</uni-th>
+                <!-- 需求数量 -->
                 <uni-th width="80" align="center">{{ $t('message.po_DemandQuantity') }}</uni-th>
-                <uni-th width="80" align="center">{{ $t('message.po_DemandQuantity') }}</uni-th>
+                <!-- 已拣配数量 -->
+                <uni-th width="80" align="center">Picked Qty</uni-th>
+                <!-- 本次拣配数量 -->
+                <uni-th width="80" align="center">Selection Qty</uni-th>
                 <uni-th width="380" align="center">{{ $t('message.product_Location') }} </uni-th>
                 <uni-th width="50" align="center">{{ $t('message.Pi_materielNo') }}</uni-th>
                 <uni-th width="100" align="center">{{ $t('message.CommissionedMaterielDesc') }}</uni-th>
                 <uni-th width="100" align="center">{{ $t('message.Summary_ProductionDate') }}</uni-th>
                 <uni-th width="50" align="center">{{ $t('message.product_FGCode') }}</uni-th>
-                <uni-th width="50" align="center">{{ $t('message.Pi_FinishedProductModel') }}</uni-th>
+                <uni-th width="50" align="center">FG desc</uni-th>
               </uni-tr>
               <!-- 表格数据行 -->
               <uni-tr v-for="(item, index) in model.proOrderList" :key="index">
@@ -55,6 +59,11 @@
                 <uni-td align="center">
                   <view>{{ item.amount }}</view>
                 </uni-td>
+                <!-- 已拣配数量 -->
+                <uni-td align="center">
+                  <view>{{ item.totalMoAmount }}</view>
+                </uni-td>
+                <!-- 本次拣配数量 -->
                 <uni-td align="center">
                   <view v-if="selectIndex.indexOf(index) == -1">{{ item.amount }}</view>
                   <view v-else>
@@ -73,7 +82,7 @@
                       : '-'
                   }}</view> -->
                   <!-- 此处为地址展示,字段替换下方loc即可 -->
-                  <view>{{ item.loc ? item.loc : '此处为地址展示,替换loc即可' }}</view>
+                  <view>{{ item.wkposCode }}</view>
                   <!-- <view v-if="index == indexChoose">
                     <u-select v-model="showList" :list="loclist" @confirm="locConfirm" :default-value="subjectAarr"></u-select>
                   </view> -->
@@ -92,7 +101,7 @@
     <view class="bottom-bar">
       <u-row class="button-bar">
         <u-col :span="6">
-          <u-button type="primary" @click="onQuery">{{ $t('message.Pi_order') }}</u-button>
+          <u-button type="primary" @click="onQueryVN">{{ $t('message.Pi_order') }}</u-button>
         </u-col>
         <u-col :span="3">
           <u-button type="success" @click="onOk">{{ $t('message.dn_Confirm') }}</u-button>
@@ -200,6 +209,7 @@ export default class pickingDom extends BasePage {
   };
   mrpRules = {
     sapFactoryCode: [{ required: true, message: this.$t('message.Pi_InputFactory') as string }],
+    prdOrderFrom: [{ required: true, message: 'Please input the order ' }],
   };
 
   /**
@@ -338,7 +348,7 @@ export default class pickingDom extends BasePage {
   /**
    * 订单查询
    */
-  onQuery() {
+  onQueryVN() {
     this.$form.validate(async (valid: boolean) => {
       if (!valid) return;
       await this.model.queryProOrder(this.formParams);