From da81d15c42fdf970a3a8f9a3404260e99d2c53ce Mon Sep 17 00:00:00 2001
From: hou <1601990943@qq.com>
Date: Wed, 12 Jan 2022 17:28:36 +0800
Subject: [PATCH] =?UTF-8?q?=E6=88=90=E5=93=81=E6=8A=A5=E5=BA=9F=20=20?=
 =?UTF-8?q?=E9=A2=86=E7=94=A8=20=20=E5=A2=9E=E5=8A=A0=20=E5=B7=B2=E6=89=AB?=
 =?UTF-8?q?=E6=95=B0=E9=87=8F=E5=B1=95=E7=A4=BA=20&&=20=E5=8E=9F=E6=9D=90?=
 =?UTF-8?q?=E6=96=99=20=E6=8A=A5=E5=BA=9F=20=E9=A2=86=E7=94=A8=20=E5=8F=AF?=
 =?UTF-8?q?=E4=BB=A5=E4=BF=AE=E6=94=B9=E6=95=B0=E9=87=8F=20&&=20=E5=85=B6?=
 =?UTF-8?q?=E4=BB=96=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .hbuilderx/launch.json                        |  16 +++
 src/i18n/lang/en.ts                           |   2 +-
 src/pages/login/login/index.vue               | 117 ++++++------------
 .../product/warehouse/wholeCollect/index.vue  |   5 +
 .../product/warehouse/wholeScrap/index.vue    |   5 +
 .../product/warehouse/wholeTransfer/index.vue |   4 +
 .../product/warehouse/wholeTransfer/model.ts  |   1 +
 src/pages/raw/warehouse/rowCollect/index.vue  |   2 +-
 src/pages/raw/warehouse/rowScrap/index.vue    |   2 +-
 src/store/modules/session.ts                  |  47 +++----
 10 files changed, 87 insertions(+), 114 deletions(-)
 create mode 100644 .hbuilderx/launch.json

diff --git a/.hbuilderx/launch.json b/.hbuilderx/launch.json
new file mode 100644
index 0000000..582561b
--- /dev/null
+++ b/.hbuilderx/launch.json
@@ -0,0 +1,16 @@
+{ // launch.json 配置了启动调试时相关设置，configurations下节点名称可为 app-plus/h5/mp-weixin/mp-baidu/mp-alipay/mp-qq/mp-toutiao/mp-360/
+  // launchtype项可配置值为local或remote, local代表前端连本地云函数，remote代表前端连云端云函数
+    "version": "0.0",
+    "configurations": [{
+     	"app-plus" : 
+     	{
+     		"launchtype" : "local"
+     	},
+     	"default" : 
+     	{
+     		"launchtype" : "local"
+     	},
+     	"type" : "uniCloud"
+     }
+    ]
+}
diff --git a/src/i18n/lang/en.ts b/src/i18n/lang/en.ts
index 0b95391..f84290d 100644
--- a/src/i18n/lang/en.ts
+++ b/src/i18n/lang/en.ts
@@ -290,7 +290,7 @@ export default {
     Access_type: 'Access type',
 
     //报废
-    Scrap_ScrapNo: 'Scrap No',
+    Scrap_ScrapNo: 'Scrap',
     Scrap_Tip: 'Please input scrap No',
     Scrap_ScrapDetails: 'Scrap detail',
     operatingTime: 'operatingTime',
diff --git a/src/pages/login/login/index.vue b/src/pages/login/login/index.vue
index 59220b7..24c8e89 100644
--- a/src/pages/login/login/index.vue
+++ b/src/pages/login/login/index.vue
@@ -1,38 +1,17 @@
 <template>
-  <view
-    class="page-login"
-    :style="{ backgroundImage: `url(${image.login.bg3})` }"
-  >
-    <view
-      class="header"
-      :style="{ backgroundColor: `rgba(23, 83, 234, ${scrollTop / 100})` }"
-    >
+  <view class="page-login" :style="{ backgroundImage: `url(${image.login.bg3})` }">
+    <view class="header" :style="{ backgroundColor: `rgba(23, 83, 234, ${scrollTop / 100})` }">
       <view class="left"></view>
       <view class="title"></view>
       <view class="right">
-        <u-icon
-          class="setting"
-          @click="uni.navigateTo({ url: page.login.server })"
-          size="30"
-          name="/static/icons/icon-47.png"
-        ></u-icon>
+        <u-icon class="setting" @click="uni.navigateTo({ url: page.login.server })" size="30" name="/static/icons/icon-47.png"></u-icon>
       </view>
     </view>
     <view class="logo">
-      <u-image
-        width="288rpx"
-        height="85rpx"
-        :src="image.global.logo1"
-      ></u-image>
+      <u-image width="288rpx" height="85rpx" :src="image.global.logo1"></u-image>
       <span>V1.6</span>
     </view>
-    <u-form
-      class="form"
-      :model="form"
-      ref="form"
-      :border-bottom="false"
-      :error-type="['toast']"
-    >
+    <u-form class="form" :model="form" ref="form" :border-bottom="false" :error-type="['toast']">
       <u-form-item
         class="form-item"
         prop="username"
@@ -76,19 +55,9 @@
       /></u-form-item>
     </u-form>
     <view class="i18n" @click="i18nOptionsShow = true">
-      <view class="dropdown-text">{{
-        $i18n.locale === "en" ? "English" : "简体中文"
-      }}</view>
-      <u-icon
-        :class="i18nOptionsShow ? 'dropdown-icon-active' : 'dropdown-icon'"
-        size="16"
-        name="/static/icons/icon-50.png"
-      ></u-icon>
-      <u-action-sheet
-        :list="i18nList"
-        v-model="i18nOptionsShow"
-        @click="onLanguageSelect"
-      ></u-action-sheet>
+      <view class="dropdown-text">{{ $i18n.locale === 'en' ? 'English' : '简体中文' }}</view>
+      <u-icon :class="i18nOptionsShow ? 'dropdown-icon-active' : 'dropdown-icon'" size="16" name="/static/icons/icon-50.png"></u-icon>
+      <u-action-sheet :list="i18nList" v-model="i18nOptionsShow" @click="onLanguageSelect"></u-action-sheet>
     </view>
     <u-button
       shape="circle"
@@ -101,21 +70,21 @@
       hover-class="button-hover"
       type="primary"
       @click="login"
-      >{{ $t("message.Login") }}</u-button
+      >{{ $t('message.Login') }}</u-button
     >
     <alerts />
   </view>
 </template>
 
 <script lang="ts">
-import { Component, Ref } from "vue-property-decorator";
-import { server } from "@/pages/login/server/model";
-import Alerts from "@/components/alert/alerts.vue";
-import { page } from "@/utils/page";
-import { session } from "@/store/modules/session";
-import { BasePage } from "@/components/base/page";
-import { VForm } from "vue/types/form";
-import { Lang } from "@/i18n";
+import { Component, Ref } from 'vue-property-decorator';
+import { server } from '@/pages/login/server/model';
+import Alerts from '@/components/alert/alerts.vue';
+import { page } from '@/utils/page';
+import { session } from '@/store/modules/session';
+import { BasePage } from '@/components/base/page';
+import { VForm } from 'vue/types/form';
+import { Lang } from '@/i18n';
 // import { any } from 'lodash/fp';
 
 @Component({
@@ -131,57 +100,53 @@ export default class LoginPage extends BasePage {
   /**
    * 表单引用
    */
-  @Ref("form") readonly $form!: VForm;
+  @Ref('form') readonly $form!: VForm;
 
   get serverAddress(): string | null {
     return server.serverAddress;
   }
 
   form = {
-    username: "",
-    password: "",
+    username: '',
+    password: '',
   };
 
   rules = {
-    username: [
-      { required: true, message: this.$t("message.PleaseInputUserName") },
-    ],
-    password: [
-      { required: true, message: this.$t("message.PleaseInputPassword") },
-    ],
+    username: [{ required: true, message: this.$t('message.PleaseInputUserName') }],
+    password: [{ required: true, message: this.$t('message.PleaseInputPassword') }],
   };
 
   i18nOptionsShow = false;
 
   i18nList = [
     {
-      text: "简体中文",
-      color: "black",
+      text: '简体中文',
+      color: 'black',
     },
     {
-      text: "English",
-      color: "black",
+      text: 'English',
+      color: 'black',
     },
   ];
 
   onLanguageSelect(index: number) {
-    const languages = ["cn", "en"];
+    const languages = ['cn', 'en'];
     this.$i18n.locale = languages[index];
   }
 
   onReady(): void {
     this.$form.setRules(this.rules);
-    console.log("image", this.image);
+    console.log('image', this.image);
   }
-  Version: string = "1.0.0";
+  Version: string = '1.0.0';
   async update() {
     await session.QueryVersion();
     if (this.Version != session.Version) {
       await uni.downloadFile({
-        url: "http://106.13.174.133:5210/HaierWMS.apk",
+        url: 'http://106.13.174.133:5210/HaierWMS.apk',
         success: (res) => {
-          console.log("res.statusCode", res.statusCode);
-          console.log("res.tempFilePath", res.tempFilePath);
+          console.log('res.statusCode', res.statusCode);
+          console.log('res.tempFilePath', res.tempFilePath);
         },
       });
     }
@@ -192,8 +157,8 @@ export default class LoginPage extends BasePage {
       if (valid) {
         if (!server.isServerAddressSet) {
           await uni.showToast({
-            icon: "none",
-            title: this.$t("message.Tip") as string,
+            icon: 'none',
+            title: this.$t('message.Tip') as string,
           });
           setTimeout(() => {
             uni.navigateTo({ url: page.login.server });
@@ -205,15 +170,7 @@ export default class LoginPage extends BasePage {
             password,
             lang: this.$i18n.locale as Lang,
           });
-          const {
-            code,
-            factoryCode,
-            list,
-            loginName,
-            msg,
-            userId,
-            userName,
-          } = loginResult;
+          const { code, factoryCode, list, loginName, msg, userId, userName } = loginResult;
           session.setUser({
             code,
             factoryCode,
@@ -225,8 +182,8 @@ export default class LoginPage extends BasePage {
             lang: this.$i18n.locale as Lang,
           });
           uni.showToast({
-            icon: "success",
-            title: this.$t("message.LoginSuccessful") as string,
+            icon: 'success',
+            title: this.$t('message.LoginSuccessful') as string,
           });
           uni.navigateTo({
             url: page.login.area,
diff --git a/src/pages/product/warehouse/wholeCollect/index.vue b/src/pages/product/warehouse/wholeCollect/index.vue
index e1de294..1957bfd 100644
--- a/src/pages/product/warehouse/wholeCollect/index.vue
+++ b/src/pages/product/warehouse/wholeCollect/index.vue
@@ -38,6 +38,10 @@
       <u-form-item :label="$t('message.product_costCenter')">
         <u-input v-model="Some.costCenter" :disabled="true" :placeholder="$t('message.po_PleaseInput')" />
       </u-form-item>
+      <!-- 已扫 -->
+      <u-form-item :label="$t('message.product_Swept')">
+        <u-input :disabled="true" v-model="Some.actualQty" placeholder="" />
+      </u-form-item>
       <!-- 条码 -->
       <u-form-item :label="$t('message.product_BarCode')">
         <u-search :placeholder="$t('message.barcode')" v-model="form.barcode" @search="scanning" :show-action="false"></u-search>
@@ -162,6 +166,7 @@ export default class ProductCheckReceipt extends BasePage {
         icon: 'none',
         title: this.$t('message.product_Tip8') as string,
       });
+      this.Some.actualQty += 1;
     }
   }
   //确定
diff --git a/src/pages/product/warehouse/wholeScrap/index.vue b/src/pages/product/warehouse/wholeScrap/index.vue
index 942b9d7..eda2d9c 100644
--- a/src/pages/product/warehouse/wholeScrap/index.vue
+++ b/src/pages/product/warehouse/wholeScrap/index.vue
@@ -46,6 +46,10 @@
       <u-form-item :label="$t('message.DocumentNumber')">
         <u-input v-model="Some.fileNo" placeholder="" />
       </u-form-item>
+      <!-- 已扫 -->
+      <u-form-item :label="$t('message.product_Swept')">
+        <u-input :disabled="true" v-model="Some.actualQty" placeholder="" />
+      </u-form-item>
       <!-- 条码 -->
       <u-form-item :label="$t('message.product_BarCode')">
         <u-search :placeholder="$t('message.barcode')" v-model="form.barcode" @search="scanning" :show-action="false"></u-search>
@@ -138,6 +142,7 @@ export default class productCheckReceipt extends BasePage {
         icon: 'none',
         title: this.$t('message.product_Tip8') as string,
       });
+      this.Some.actualQty += 1;
     }
   }
   value = '';
diff --git a/src/pages/product/warehouse/wholeTransfer/index.vue b/src/pages/product/warehouse/wholeTransfer/index.vue
index 36777cf..6e950e9 100644
--- a/src/pages/product/warehouse/wholeTransfer/index.vue
+++ b/src/pages/product/warehouse/wholeTransfer/index.vue
@@ -17,6 +17,10 @@
       <u-form-item :required="true" :label="$t('message.product_barCode')" prop="productCode">
         <u-search :placeholder="$t('message.po_PleaseInput')" v-model="form.productCode" @search="query" :show-action="false"></u-search>
       </u-form-item>
+      <!-- 已扫 -->
+      <!-- <u-form-item :label="$t('message.product_Swept')">
+        <u-input :disabled="true" v-model="model.orderInInfo.actualQty" placeholder="" />
+      </u-form-item> -->
       <!-- 成品编码 -->
       <u-form-item :label="$t('message.product_FGCode')">
         <u-input :disabled="true" v-model="model.orderInInfo.productCode" placeholder="" />
diff --git a/src/pages/product/warehouse/wholeTransfer/model.ts b/src/pages/product/warehouse/wholeTransfer/model.ts
index 6f1e886..31937f2 100644
--- a/src/pages/product/warehouse/wholeTransfer/model.ts
+++ b/src/pages/product/warehouse/wholeTransfer/model.ts
@@ -14,6 +14,7 @@ class OrderInInfo {
   productCode?: string;
   locCode?: string;
   barcode?: string;
+  // actualQty?: string;
 }
 
 @Module({
diff --git a/src/pages/raw/warehouse/rowCollect/index.vue b/src/pages/raw/warehouse/rowCollect/index.vue
index c4a8d4f..270f797 100644
--- a/src/pages/raw/warehouse/rowCollect/index.vue
+++ b/src/pages/raw/warehouse/rowCollect/index.vue
@@ -28,7 +28,7 @@
       </u-form-item>
       <!-- 数量 -->
       <u-form-item :label="$t('message.Summary_Number')">
-        <u-input :disabled="true" v-model="Some.qty" placeholder="" />
+        <u-input v-model="Some.qty" placeholder="" />
       </u-form-item>
       <!-- 原库位 -->
       <u-form-item :label="$t('message.Warehouse_OriginalLocation')">
diff --git a/src/pages/raw/warehouse/rowScrap/index.vue b/src/pages/raw/warehouse/rowScrap/index.vue
index 392adf4..f7b5d41 100644
--- a/src/pages/raw/warehouse/rowScrap/index.vue
+++ b/src/pages/raw/warehouse/rowScrap/index.vue
@@ -28,7 +28,7 @@
       </u-form-item>
       <!-- 数量 -->
       <u-form-item :label="$t('message.Summary_Number')">
-        <u-input :disabled="true" v-model="Some.qty" placeholder="" />
+        <u-input v-model="Some.qty" placeholder="" />
       </u-form-item>
       <!-- 原库位 -->
       <u-form-item :label="$t('message.Warehouse_OriginalLocation')">
diff --git a/src/store/modules/session.ts b/src/store/modules/session.ts
index fdcd992..60308c8 100644
--- a/src/store/modules/session.ts
+++ b/src/store/modules/session.ts
@@ -1,19 +1,12 @@
-import {
-  Action,
-  getModule,
-  Module,
-  Mutation,
-  VuexModule,
-  MutationAction,
-} from "vuex-module-decorators";
-import { Area } from "@/pages/login/area/model";
-import { Lang } from "@/i18n";
-import request from "@/utils/request";
-import { url } from "@/utils/url";
-import { stringify } from "query-string";
-import store from "@/store";
-import { page } from "@/utils/page";
-import { result } from "lodash";
+import { Action, getModule, Module, Mutation, VuexModule, MutationAction } from 'vuex-module-decorators';
+import { Area } from '@/pages/login/area/model';
+import { Lang } from '@/i18n';
+import request from '@/utils/request';
+import { url } from '@/utils/url';
+import { stringify } from 'query-string';
+import store from '@/store';
+import { page } from '@/utils/page';
+import { result } from 'lodash';
 
 export interface User {
   code?: string;
@@ -31,14 +24,14 @@ export interface User {
   dynamic: true,
   store,
   namespaced: true,
-  name: "session",
+  name: 'session',
 })
 class SessionService extends VuexModule {
   /**
    * 当前登录用户
    */
   user: User | null = null;
-  Version: string = "";
+  Version: string = '';
 
   /**
    * 当前工作区
@@ -125,7 +118,7 @@ class SessionService extends VuexModule {
   // 用户 getter
   get getUser(): User {
     if (this.user === null) {
-      throw new Error("当前无登录用户");
+      throw new Error('当前无登录用户');
     } else {
       return this.user;
     }
@@ -133,22 +126,14 @@ class SessionService extends VuexModule {
 
   // 登录
   @Action({ rawError: true })
-  async login({
-    username,
-    password,
-    lang,
-  }: {
-    username: string;
-    password: string;
-    lang: Lang;
-  }): Promise<User> {
+  async login({ username, password, lang }: { username: string; password: string; lang: Lang }): Promise<User> {
     return request.post(
       url.wmspda.system.login,
       stringify({
         userName: username,
         passWord: password,
-        lang: lang == "en" ? "en_US" : "zh_CN",
-      })
+        lang: lang == 'en' ? 'en_US' : 'zh_CN',
+      }),
     );
   }
 
@@ -175,7 +160,7 @@ class SessionService extends VuexModule {
   //查询版本号
   @MutationAction
   async QueryVersion() {
-    let res: any = await request.get("http://106.13.174.133:5210/setup.json");
+    let res: any = await request.get('http://seamom.haier.net/sgNginxDownload/Debug/setup.json');
     let Version = res.version;
     return { Version };
   }