From 51304553a5b0ab21edf5870945d1db4af9fdf4b0 Mon Sep 17 00:00:00 2001
From: zhoulei <zhoulei@kehaida.com>
Date: Fri, 17 Dec 2021 17:42:12 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E6=88=90=E5=93=81=E7=9B=98=E7=82=B9?=
 =?UTF-8?q?=E6=97=B6=E6=89=AB=E6=8F=8F=E5=8D=95=E5=8F=B7=EF=BC=8C=E6=80=BB?=
 =?UTF-8?q?=E6=95=B0=E7=B4=AF=E8=AE=A1=E4=B8=8D=E5=87=86=E7=A1=AE=EF=BC=9B?=
 =?UTF-8?q?=E9=80=BB=E8=BE=91=E4=BB=A3=E7=A0=81=E4=BC=98=E5=8C=96=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../warehouse/wholeLnventory/index.vue        | 175 +++++++-----------
 .../product/warehouse/wholeLnventory/model.ts | 102 +++-------
 src/utils/filter.ts                           |  17 ++
 3 files changed, 118 insertions(+), 176 deletions(-)

diff --git a/src/pages/product/warehouse/wholeLnventory/index.vue b/src/pages/product/warehouse/wholeLnventory/index.vue
index 73f54b1..e28294c 100644
--- a/src/pages/product/warehouse/wholeLnventory/index.vue
+++ b/src/pages/product/warehouse/wholeLnventory/index.vue
@@ -1,97 +1,57 @@
 <template>
   <view class="page-product-receipt">
-    <view
-      class="header"
-      :style="{ backgroundColor: `rgba(23, 83, 234, ${scrollTop / 100})` }"
-    >
+    <view class="header" :style="{ backgroundColor: `rgba(23, 83, 234, ${scrollTop / 100})` }">
       <view class="left">
-        <u-icon class="icon" name="arrow-left" @click="uni.navigateBack()" />
+        <u-icon class="icon" name="arrow-left" @click="uni.navigateBack({})" />
       </view>
-      <view class="title">{{ $t("message.Inventory") }}</view>
+      <view class="title">{{ $t('message.Inventory') }}</view>
       <view class="right"></view>
     </view>
     <u-form class="form" ref="form" :model="form" label-width="180rpx">
-      <u-form-item
-        :required="true"
-        :label="$t('message.Warehouse_OrderNo')"
-        prop="pddNo"
-      >
-        <u-search
-          :placeholder="$t('message.po_PleaseInput')"
-          v-model="form.pddNo"
-          @search="model.getProductCode"
-          :show-action="false"
-        ></u-search>
+      <!-- 单号 -->
+      <u-form-item :required="true" :label="$t('message.Warehouse_OrderNo')" prop="pddNo">
+        <u-search :placeholder="$t('message.po_PleaseInput')" v-model="form.pddNo" @search="model.getProductCode" :show-action="false"></u-search>
       </u-form-item>
+      <!-- 库位 -->
       <u-form-item :required="true" :label="$t('message.product_Location')">
-        <u-input
-          v-model="form.originWl.locCode"
-          type="select"
-          @click="originWlSelect = true"
-          :placeholder="$t('message.po_PleaseInput')"
-        />
-        <u-select
-          :confirm-text="$t('message.product_Confirm')"
-          :cancel-text="$t('message.product_Cancel')"
-          v-model="originWlSelect"
-          :list="model.WlList"
-          @confirm="onchange"
-        ></u-select>
+        <u-input v-model="form.originWl.locCode" type="select" @click="originWlSelect = true" :placeholder="$t('message.po_PleaseInput')" />
+        <u-select :confirm-text="$t('message.product_Confirm')" :cancel-text="$t('message.product_Cancel')" v-model="originWlSelect" :list="model.WlList" @confirm="onchange"></u-select>
       </u-form-item>
+      <!-- 扫码 -->
       <u-form-item :label="$t('message.Warehouse_ScanCode')">
-        <u-search
-          v-model="form.code"
-          :placeholder="$t('message.po_PleaseInput')"
-          @search="scanCode"
-          :show-action="false"
-        ></u-search>
+        <u-search v-model="form.code" :placeholder="$t('message.po_PleaseInput')" @search="scanCode" :show-action="false"></u-search>
       </u-form-item>
       <u-row>
+        <!-- 已扫 -->
         <u-col :span="6">
           <u-form-item :label="$t('message.product_Swept')" label-width="80rpx">
-            <u-input
-              :disabled="true"
-              v-model="aaa"
-              placeholder=""
-            />
+            <u-input :disabled="true" v-model="form.spQty" placeholder="" />
           </u-form-item>
         </u-col>
+        <!-- 总数 -->
         <u-col :span="6">
-          <u-form-item
-            :label="$t('message.Warehouse_TotalNumber')"
-            label-width="80rpx"
-          >
-            <u-input
-              v-model="bbb"
-              :placeholder="$t('message.po_PleaseInput')"
-            />
+          <u-form-item :label="$t('message.Warehouse_TotalNumber')" label-width="80rpx">
+            <u-input v-model="form.ypQty" :placeholder="$t('message.po_PleaseInput')" />
           </u-form-item>
         </u-col>
       </u-row>
+      <!-- 成品描述 -->
       <u-form-item :label="$t('message.product_FGDes')">
-        <u-input
-          v-model="productDescZh"
-          :placeholder="$t('message.po_PleaseInput')"
-        />
+        <u-input v-model="productDescZh" :placeholder="$t('message.po_PleaseInput')" />
       </u-form-item>
+      <!-- 成品编码 -->
       <u-form-item :label="$t('message.product_FGCode')">
-        <u-input
-          v-model="productCode"
-          :placeholder="$t('message.po_PleaseInput')"
-        />
+        <u-input v-model="productCode" :placeholder="$t('message.po_PleaseInput')" />
       </u-form-item>
     </u-form>
+    <!-- 底部Button -->
     <view class="bottom-bar">
       <u-row class="button-bar">
         <u-col :span="6">
-          <u-button type="primary" @click="onSubmit">{{
-            $t("message.workArea_Confirm")
-          }}</u-button>
+          <u-button type="primary" @click="onSubmit">{{ $t('message.workArea_Confirm') }}</u-button>
         </u-col>
         <u-col :span="6">
-          <u-button type="error" @click="uni.navigateBack()">{{
-            $t("message.po_Return")
-          }}</u-button>
+          <u-button type="error" @click="uni.navigateBack({})">{{ $t('message.po_Return') }}</u-button>
         </u-col>
       </u-row>
     </view>
@@ -99,11 +59,11 @@
 </template>
 
 <script lang="ts">
-import { Component, Ref } from "vue-property-decorator";
-import { BasePage } from "@/components/base/page";
-import { VForm, VFormRules } from "vue/types/form";
-import model from "./model";
-import { session } from "@/store/modules/session";
+import { Component, Ref } from 'vue-property-decorator';
+import { BasePage } from '@/components/base/page';
+import { VForm, VFormRules } from 'vue/types/form';
+import model from './model';
+import { session } from '@/store/modules/session';
 
 interface OptionType {
   label: string;
@@ -121,7 +81,7 @@ export default class productCheckReceipt extends BasePage {
   /**
    * 表单引用
    */
-  @Ref("form") readonly $form!: VForm;
+  @Ref('form') readonly $form!: VForm;
 
   /**
    * 页面Module
@@ -134,21 +94,25 @@ export default class productCheckReceipt extends BasePage {
    */
   form = {
     originWl: {} as OptionType,
-    pddNo: "",
-    code: "",
-    pdMode: "",
+    pddNo: '',
+    code: '',
+    pdMode: '',
+    // 已扫
+    spQty: null,
+    // 总数
+    ypQty: null,
   };
-  productCode: any = ""; //成品编码
-  productDescZh: any = ""; //成品描述
-  // aaa: any = "";
-  // bbb: any = "";
+
+  productCode: any = ''; //成品编码
+  productDescZh: any = ''; //成品描述
+  // 库位select是否显示
   originWlSelect = false;
   aimWlSelect = false;
   cboPlaceSelect = false;
 
   rules: VFormRules<any> = {
     originWl: [
-      { required: true, message: this.$t("message.Warehouse_Tip2") as string }, //请选择库位地点
+      { required: true, message: this.$t('message.Warehouse_Tip2') as string }, //请选择库位地点
     ],
   };
   show = false;
@@ -156,24 +120,31 @@ export default class productCheckReceipt extends BasePage {
     this.$form.setRules(this.rules);
   }
   onchange(e: any) {
-    console.log("e", e);
-    this.model.WlListaa.forEach((item: any) => {
-      if (item.locCode == e[0].value) {
-        this.form.originWl = item;
-        // aaa += item.spQty;
-        this.aaa += item.spQty;
-        this.bbb += item.ypQty;
-        return;
-      }
-      
+    // 获取选择库位的集合
+    const storeList = this.model.WlListaa.filter((item) => item.locCode === e[0].value);
+    // 获取现有的 spQty、ypQty 总数
+    const total = storeList.reduce(
+      (total, item) => {
+        return {
+          spQty: total.spQty + item.spQty,
+          ypQty: total.ypQty + item.ypQty,
+        };
+      },
+      { spQty: 0, ypQty: 0 },
+    );
+    const originWl = this.model.WlListaa.find((item) => item.locCode === e[0].value);
+    // 为form表单绑定值
+    Object.assign(this.form, {
+      originWl: originWl,
+      ...total,
     });
-    console.log("this.form.originwl",this.form.originWl);
   }
+  // 成功查询后，已扫+1
   async scanCode(e: any) {
     if (!this.form.pddNo) {
       uni.showToast({
-        icon: "none",
-        title: this.$t("message.Warehouse_Tip5") as string, //请扫描单号
+        icon: 'none',
+        title: this.$t('message.Warehouse_Tip5') as string, //请扫描单号
       });
       return;
     }
@@ -191,8 +162,8 @@ export default class productCheckReceipt extends BasePage {
       qty: 1,
     };
     await this.model.toScanCode(list);
-    if (this.model.records.code == "1") {
-      this.aaa += 1;
+    if (this.model.records.code == '1') {
+      this.form.spQty = this.form.spQty + 1;
       this.productCode = this.model.productCode;
       this.productDescZh = this.model.productDescZh;
     }
@@ -202,15 +173,15 @@ export default class productCheckReceipt extends BasePage {
       if (!valid) return;
       if (!this.form.pddNo) {
         uni.showToast({
-          icon: "none",
-          title: this.$t("message.Warehouse_Tip5") as string, //请扫描单号
+          icon: 'none',
+          title: this.$t('message.Warehouse_Tip5') as string, //请扫描单号
         });
         return;
       }
       if (!this.form.originWl.productCode) {
         uni.showToast({
-          icon: "none",
-          title: this.$t("message.Warehouse_Tip6") as string, //请选择物料
+          icon: 'none',
+          title: this.$t('message.Warehouse_Tip6') as string, //请选择物料
         });
         return;
       }
@@ -218,10 +189,10 @@ export default class productCheckReceipt extends BasePage {
         this.commit();
       } else {
         uni.showModal({
-          title: "Tip",
-          content: this.$t("message.Warehouse_Tip7") as string, //盘点未完成 确定继续嘛
-          confirmText: this.$t("message.workArea_Confirm") as string, //确定
-          cancelText: this.$t("message.Cancel") as string, //取消
+          title: 'Tip',
+          content: this.$t('message.Warehouse_Tip7') as string, //盘点未完成 确定继续嘛
+          confirmText: this.$t('message.workArea_Confirm') as string, //确定
+          cancelText: this.$t('message.Cancel') as string, //取消
           showCancel: true,
           success: (res) => {
             if (res.confirm) {
@@ -248,7 +219,6 @@ export default class productCheckReceipt extends BasePage {
       sn: this.form.code,
       spQty: this.aaa,
     };
-    console.log("orderlist", list);
     await this.model.onTakeoutConfirm(list);
   }
 }
@@ -256,8 +226,7 @@ export default class productCheckReceipt extends BasePage {
 
 <style lang="scss" scoped>
 .page-product-receipt {
-  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: 118rpx 30rpx 162rpx;
   min-height: 100%;
diff --git a/src/pages/product/warehouse/wholeLnventory/model.ts b/src/pages/product/warehouse/wholeLnventory/model.ts
index a03b4fc..5e60d13 100644
--- a/src/pages/product/warehouse/wholeLnventory/model.ts
+++ b/src/pages/product/warehouse/wholeLnventory/model.ts
@@ -1,16 +1,11 @@
-import {
-  Action,
-  getModule,
-  Module,
-  MutationAction,
-  VuexModule,
-} from "vuex-module-decorators";
-import store from "@/store";
-import http from "@/utils/request";
-import { url } from "@/utils/url";
-import { session } from "@/store/modules/session";
+import { Action, getModule, Module, MutationAction, VuexModule } from 'vuex-module-decorators';
+import store from '@/store';
+import http from '@/utils/request';
+import { url } from '@/utils/url';
+import { session } from '@/store/modules/session';
 // import { page } from '@/utils/page';
-import vm from "@/main";
+import vm from '@/main';
+import { removeDuplicates } from '@/utils/filter';
 
 class OrderInInfo {
   productDescZh?: string;
@@ -22,7 +17,7 @@ class OrderInInfo {
   namespaced: true,
   dynamic: true,
   store,
-  name: "product.warehouse.wholeLnventory",
+  name: 'product.warehouse.wholeLnventory',
 })
 export class wholeLnventory extends VuexModule {
   /**
@@ -30,8 +25,8 @@ export class wholeLnventory extends VuexModule {
    */
   WlList = [];
   WlListaa = [];
-  productCode: any = "";
-  productDescZh: any = "";
+  productCode: any = '';
+  productDescZh: any = '';
   /**
    * 物料型号类型
    */
@@ -44,46 +39,14 @@ export class wholeLnventory extends VuexModule {
   /**
    * 隐藏看单号
    */
-  dnNo = "";
+  dnNo = '';
   records = {
-    code: "",
+    code: '',
   };
   /**
    * 看单号查询结果
    */
   orderInInfo: OrderInInfo = new OrderInInfo();
-
-  // /**
-  //  * 更新看单明细库位
-  //  * @param kw 库位
-  //  */
-  // @Mutation
-  // updateOrderInInfoListKw(kw: string) {
-  //   this.orderInInfoList = this.orderInInfoList.map((item) => {
-  //     item.kw = kw;
-  //     return item;
-  //   });
-  // }
-
-  /**
-   * 查询库位列表
-   */
-  // @MutationAction
-  // async queryLocation() {
-  //   const result: any = await http.get(url.warehouse.wholeTransfer.list, {
-  //     params: {
-  //       factoryCode: '1999',
-  //       loginName: '1999',
-  //     },
-  //   });
-  //   // console.log('库位数据',result)
-  //   const WlList = result.data.map((_: any) => ({
-  //     label: _.locationCode,
-  //     value: _.locationCode,
-  //   }));
-  //   return { WlList };
-  // }
-
   /**
    * 查询单号
    * 查询DN单号
@@ -100,28 +63,24 @@ export class wholeLnventory extends VuexModule {
     });
     const WlListaa = res.data;
     let arr: any = [];
-    res.data.forEach((item: any) => {
-      arr.push(item.locCode);
-    });
-    let newArr = Array.from(new Set(arr));
-    const WlList = newArr.map((item: any) => ({
-      label: item,
-      value: item,
+    // 去重
+    arr = removeDuplicates([...res.data], 'locCode');
+    const WlList = arr.map((item: any) => ({
+      label: item.locCode,
+      value: item.locCode,
     }));
-    console.log("WlList", WlList);
+    // WlList select结构，只有lbael,value
+    // WlListaa 原始结构
     return { WlList, WlListaa };
   }
 
   @MutationAction
   async onTakeoutConfirm(list: any) {
-    const records: any = await http.post(
-      url.warehouse.wholeLnventory.commit,
-      list
-    );
+    const records: any = await http.post(url.warehouse.wholeLnventory.commit, list);
     if (records.code == 1) {
       uni.showToast({
-        icon: "success",
-        title: "success",
+        icon: 'success',
+        title: 'success',
       });
       // uni.navigateTo({ url: page.product.warehouse.index });
     }
@@ -130,15 +89,12 @@ export class wholeLnventory extends VuexModule {
 
   @MutationAction
   async toScanCode(list: any) {
-    const records: any = await http.post(
-      url.warehouse.wholeLnventory.scanCode,
-      list
-    );
+    const records: any = await http.post(url.warehouse.wholeLnventory.scanCode, list);
     if (records.code == 1) {
-      console.log("数据啊啊啊", records);
+      console.log('数据啊啊啊', records);
       uni.showToast({
-        icon: "none",
-        title: vm.$t("message.Warehouse_Tip9") as any,
+        icon: 'none',
+        title: vm.$t('message.Warehouse_Tip9') as any,
       });
       this.productCode = records.data.productCode;
       this.productDescZh = records.data.productDescZh;
@@ -152,12 +108,12 @@ export class wholeLnventory extends VuexModule {
   /**
    * 修改库位
    */
-  @Action({ commit: "updateCheckedOrderInInfoListKw" })
+  @Action({ commit: 'updateCheckedOrderInInfoListKw' })
   async changeOrderInLocation(kw: string) {
-    await http.post("/wmspda/material/orderin/enter", {
+    await http.post('/wmspda/material/orderin/enter', {
       // loginName: '1999',
       loginName: session.loginName,
-      warehouseCode: "",
+      warehouseCode: '',
       // factoryCode: '1999',
       factoryCode: session.factoryCode,
       locationCode: kw,
diff --git a/src/utils/filter.ts b/src/utils/filter.ts
index 2074e53..9587885 100644
--- a/src/utils/filter.ts
+++ b/src/utils/filter.ts
@@ -5,12 +5,29 @@ export const PATTERN_DATETIME = 'YYYY-MM-DD HH:mm:ss';
 export const PATTERN_DATE = 'YYYY-MM-DD';
 export const PATTERN_TIME = 'HH:mm:ss';
 
+/**
+ * 对象数组去重
+ * 传入数组 list 返回去重后的数组对象
+ * @param list 数据
+ * @param valueKey 去重的属性 valueKey
+ */
+export const removeDuplicates = (list: any, valueKey: string) => {
+  const temp = {};
+  let arr = [];
+  arr = list.reduce(function (item, next) {
+    temp[next[valueKey]] ? '' : (temp[next[valueKey]] = true && item.push(next));
+    return item;
+  }, []);
+  return arr;
+};
+
 /**
  * 数据NULL处理
  * @param object 数据或对象
  * @param path 如果object传的是对象，path代表字段名称，支持 a.b.c 层级查询
  * @param defaultValue
  */
+
 export const optional = (object: any, path: any, defaultValue: any) => {
   try {
     if (defaultValue === undefined) {