From bc8d834143c44e4676f928cdca62581cc9e76c95 Mon Sep 17 00:00:00 2001
From: "LAPTOP-R6EHHS26\\86155" <2217640373@qq.com>
Date: Fri, 19 Jan 2024 14:59:58 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=85=A8=E7=AD=89=E7=9A=84?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .vscode/settings.json                         |  2 +-
 src/pages/login/login/index.vue               |  2 ++
 .../quality/Materialinspection/index.vue      | 20 +++++++++----------
 src/pages/shouye/me.vue                       |  2 +-
 src/store/modules/session.ts                  | 10 +++++++++-
 5 files changed, 23 insertions(+), 13 deletions(-)

diff --git a/.vscode/settings.json b/.vscode/settings.json
index e09ac67..1f13ebc 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -15,7 +15,7 @@
     "editor.defaultFormatter": "esbenp.prettier-vscode"
   },
   "[vue]": {
-    "editor.defaultFormatter": "esbenp.prettier-vscode"
+    "editor.defaultFormatter": "octref.vetur"
   },
   "[json]": {
     "editor.defaultFormatter": "esbenp.prettier-vscode"
diff --git a/src/pages/login/login/index.vue b/src/pages/login/login/index.vue
index 6eb98d0..0bce995 100644
--- a/src/pages/login/login/index.vue
+++ b/src/pages/login/login/index.vue
@@ -238,6 +238,7 @@ export default class LoginPage extends BasePage {
     const userName = loginResultuser.user.userName;
     const loginName = username;
     const userId = loginResultuser.user.userId;
+    const nickName = loginResultuser.user.nickName;
     const createBy = loginResultuser.user.createBy;
     const menuListold = loginResultuser.menuList;
     let menuList = [];
@@ -257,6 +258,7 @@ export default class LoginPage extends BasePage {
       createBy,
       menuList,
       userId,
+      nickName,
     });
     uni.showToast({
       //icon: 'success',
diff --git a/src/pages/quality/Materialinspection/index.vue b/src/pages/quality/Materialinspection/index.vue
index fd026a9..974fdfb 100644
--- a/src/pages/quality/Materialinspection/index.vue
+++ b/src/pages/quality/Materialinspection/index.vue
@@ -487,17 +487,11 @@ export default class PurchaseWHSRM extends BasePage {
       }
     });
     this.detaillistdefects.forEach((item) => {
-      if (item.noOkQuality == null || item.noOkQuality == '') {
+      if (item.noOkQuality === null || item.noOkQuality === '') {
         this.isquality = true;
       }
     });
-    this.detaillistceshi.forEach((item) => {
-      if (item.files.length > 0) {
-        item.files = [];
-      } else {
-        item.files = [];
-      }
-    });
+
     console.log(this.detaillistceshi, this.isvalue, this.isquality);
     if (this.isvalue) {
       (this.$refs.uToast as any).show({
@@ -533,11 +527,18 @@ export default class PurchaseWHSRM extends BasePage {
     } else {
       incomeBatchNo = this.clickitem.incomeBatchNo;
     }
+    this.detaillistceshi.forEach((item) => {
+      if (item.files.length > 0) {
+        item.files = [];
+      } else {
+        item.files = [];
+      }
+    });
     let query = {
       sampleQuality: this.formdata.sampleQuality,
       updateBy: session.userName,
       factoryCode: session.PoolName,
-      updateByName: session.userName,
+      updateByName: session.nickName,
       typeCode: typeCode,
       checkType: this.selectList.value,
       orderCode: this.clickitem.orderNo,
@@ -562,7 +563,6 @@ export default class PurchaseWHSRM extends BasePage {
         type: 'default',
       });
     }
-    //await this.model.OnSubmit(this.form3.barCodewl);
   }
   clear() {
     this.formdata.sampleQuality = null;
diff --git a/src/pages/shouye/me.vue b/src/pages/shouye/me.vue
index eb6549e..20a4ae0 100644
--- a/src/pages/shouye/me.vue
+++ b/src/pages/shouye/me.vue
@@ -65,7 +65,7 @@ export default class RawHome extends BasePage {
   model = model;
   src: 'http://pic2.sc.chinaz.com/Files/pic/pic9/202002/hpic2119_s.jpg';
   today = dayjs().format('YYYY-MM-DD dddd');
-  version = '0.0.35';
+  version = '0.0.36';
   checkversion: any = {};
   sessiondata: any = '';
   onLoad() {
diff --git a/src/store/modules/session.ts b/src/store/modules/session.ts
index 5ce8569..443165c 100644
--- a/src/store/modules/session.ts
+++ b/src/store/modules/session.ts
@@ -16,6 +16,7 @@ export interface User {
   poolNameList?: Array<Area>;
   createBy?: string;
   menuList?: Array<Menu>;
+  nickName?: string;
 }
 export interface FactoryCode {
   factoryCode?: string;
@@ -80,6 +81,13 @@ class SessionService extends VuexModule {
       return this.user.userName;
     }
   }
+  get nickName(): any {
+    if (this.user === null) {
+      return null;
+    } else {
+      return this.user.nickName;
+    }
+  }
   /**
    * 当前选择语言
    */
@@ -97,7 +105,6 @@ class SessionService extends VuexModule {
     if (this.user === null) {
       return null;
     } else {
-      console.log(this.user, '1111111');
       return this.user.loginName;
     }
   }
@@ -222,6 +229,7 @@ class SessionService extends VuexModule {
   // 保存用户信息
   @Mutation
   setUser(user: User): void {
+    console.log(user);
     this.user = user;
   }
   @Mutation