修改全等的问题

.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"

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',

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;

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() {

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