From c73ca99f86abda0cb37b1c7cf1cb51f094c59e07 Mon Sep 17 00:00:00 2001
From: guoshuang <guoshuang@qq.com>
Date: Tue, 22 Nov 2022 13:44:41 +0800
Subject: [PATCH] =?UTF-8?q?cosmoim-852=20fix=20=E6=B3=B0=E5=9B=BD=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
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/i18n/lang/ru.ts                         |  1 +
 src/pages/login/login/index.vue             | 30 ++++++++++++++++++++-
 src/pages/raw/handover/feeding/Location.vue | 18 +++++++++++--
 src/pages/raw/handover/returning/index.vue  | 10 +++++--
 6 files changed, 56 insertions(+), 5 deletions(-)

diff --git a/src/i18n/lang/cn.ts b/src/i18n/lang/cn.ts
index c9f5236..31283a4 100644
--- a/src/i18n/lang/cn.ts
+++ b/src/i18n/lang/cn.ts
@@ -537,5 +537,6 @@ export default {
     Targetfactory: '目标工厂',
     Transferissue: '调拨出库',
     Transferreceipt: '调拨入库',
+    Pleasecenter: '请选择成本中心',
   },
 };
diff --git a/src/i18n/lang/en.ts b/src/i18n/lang/en.ts
index 52e39b8..c354d2d 100644
--- a/src/i18n/lang/en.ts
+++ b/src/i18n/lang/en.ts
@@ -536,5 +536,6 @@ export default {
     Targetfactory: 'Target factory',
     Transferissue: 'Transfer issue',
     Transferreceipt: 'Transfer receipt',
+    Pleasecenter: 'Please select cost center',
   },
 };
diff --git a/src/i18n/lang/ru.ts b/src/i18n/lang/ru.ts
index ab650e0..08939eb 100644
--- a/src/i18n/lang/ru.ts
+++ b/src/i18n/lang/ru.ts
@@ -536,5 +536,6 @@ export default {
     Targetfactory: 'объектный завод',
     Transferissue: 'распределительный склад',
     Transferreceipt: 'переброска на склад',
+    Pleasecenter: 'Выберите центр затрат',
   },
 };
diff --git a/src/pages/login/login/index.vue b/src/pages/login/login/index.vue
index 39ef863..3fcd023 100644
--- a/src/pages/login/login/index.vue
+++ b/src/pages/login/login/index.vue
@@ -24,6 +24,9 @@
         }"
       >
         <u-input
+          @confirm="onBarCodeConfirm"
+          class="input"
+          @keyup.enter="EnterPress"
           v-model="form.username"
           :placeholder="$t('message.PleaseInputUserName')"
           placeholder-style="color: rgba(255, 255, 255, 0.36)"
@@ -47,6 +50,10 @@
         }"
       >
         <u-input
+          :focus="focustwo"
+          @confirm="onBarCodeConfirmteo"
+          class="input"
+          @keyup.enter="EnterPress"
           v-model="form.password"
           :placeholder="$t('message.PleaseInputPassword')"
           type="password"
@@ -124,6 +131,7 @@ export default class LoginPage extends BasePage {
     username: '',
     password: '',
   };
+  focustwo = false;
 
   rules = {
     username: [{ required: true, message: this.$t('message.PleaseInputUserName') }],
@@ -165,7 +173,7 @@ export default class LoginPage extends BasePage {
       //修改俄罗斯版本号
       this.Version = '1.1.10';
     } else {
-      this.Version = '1.0.40';
+      this.Version = '1.0.41';
     }
     console.log('////', this.Version);
   }
@@ -344,6 +352,26 @@ export default class LoginPage extends BasePage {
       }
     });
   }
+  EnterPress(e) {
+    console.log(e);
+    let inputs = document.getElementsByTagName('input');
+    console.log('aaaaa', inputs);
+    let inputlength = inputs.length;
+    for (var i = 0; i < inputs.length; i++) {
+      if (i == inputlength - 1) {
+        inputs[0].focus();
+        break;
+      }
+    }
+  }
+  onBarCodeConfirm() {
+    this.focustwo = true;
+    console.log('zhaobudao');
+  }
+  onBarCodeConfirmteo() {
+    this.focustwo = false;
+    this.login();
+  }
 }
 </script>
 
diff --git a/src/pages/raw/handover/feeding/Location.vue b/src/pages/raw/handover/feeding/Location.vue
index 0030c80..b137c30 100644
--- a/src/pages/raw/handover/feeding/Location.vue
+++ b/src/pages/raw/handover/feeding/Location.vue
@@ -82,7 +82,7 @@
       <u-form ref="form2" :model="form2" :error-type="['toast']" style="background: rgb(255, 255, 255)">
         <u-row class="bottom-info">
           <u-col :span="6">
-            <u-form-item prop="operatorPass" :label="$t('message.Summary_Receiver')" label-width="120rpx">
+            <u-form-item prop="operatorPass" :label="$t('message.return_OperatorName')" label-width="120rpx">
               <u-input v-model="operatorName" :border="border" @confirm="onOperatorConfirm" :placeholder="$t('message.po_PleaseInput')" />
             </u-form-item>
           </u-col>
@@ -150,6 +150,7 @@ export default class RawReceiptDetail extends BasePage {
   LocationList: any = [];
   //库位
   Location: any = [];
+  isconfirmflg = false;
   someIndex = 0;
   some: any = {};
   qty: any = '';
@@ -296,6 +297,8 @@ export default class RawReceiptDetail extends BasePage {
     this.wlCode = e.pickerName;
   }
   async onOperatorConfirm(loginName: string) {
+    //this.isconfirmflg = true;
+    console.log('哎咿呀', loginName);
     try {
       const { userName } = await auth.getUserInfo({ loginName });
       this.form2.operatorPass = loginName;
@@ -441,6 +444,16 @@ export default class RawReceiptDetail extends BasePage {
         item.wlList = null;
       });
     });
+    if ((this.form2.operatorPass ? this.form2.operatorPass : this.operatorName) == session.loginName) {
+      this.customToast(this.$t('message.different') as string);
+      return;
+    }
+    await auth.checkPassword({
+      rfPwd: this.form2.rfPwd,
+      factoryCode: session.factoryCode as string,
+      // loginName: this.submitForm.receiver,
+      loginName: this.form2.operatorPass ? this.form2.operatorPass : this.operatorName,
+    });
     let dataList = this.model.blDetailList;
     const params = {
       dataList,
@@ -450,7 +463,8 @@ export default class RawReceiptDetail extends BasePage {
       factoryCode: this.session.factoryCode,
       loginName: this.session.loginName,
     };
-    console.log(params);
+    //this.isconfirmflg = false;
+    console.log('fdsfrcfwdvcesfvxsdz', params);
     await this.model.saveBlDetailUpload(params).then(() => {
       this.qty = '';
       this.LocationList = [];
diff --git a/src/pages/raw/handover/returning/index.vue b/src/pages/raw/handover/returning/index.vue
index e0ee86c..e63fea1 100644
--- a/src/pages/raw/handover/returning/index.vue
+++ b/src/pages/raw/handover/returning/index.vue
@@ -210,10 +210,16 @@ export default class returningDom extends BasePage {
     } else {
       this.$form.validate(async (valid: boolean) => {
         if (!valid) return;
-        if (this.form.operator != session.loginName) {
-          this.customToast(this.$t('message.returner') as string);
+        if (this.form.operator == session.loginName) {
+          this.customToast(this.$t('message.different') as string);
           return;
         }
+        await auth.checkPassword({
+          rfPwd: this.form.rfPwd,
+          factoryCode: session.factoryCode as string,
+          // loginName: this.submitForm.receiver,
+          loginName: this.form.operator,
+        });
         (this.form.sapFactoryCode as any) = this.model.orderInInfo.sapFactoryCode;
         this.form.wlCode = this.wlCode.label;
         await this.model.tluSubmit(this.form);