增加字段-解开密码校验

sgzb-ui/src/store/modules/user.js

@@ -115,7 +115,7 @@ const user = {
         getInfo().then(async res => {
           const href = window.location.href
           if (!href.includes('resetPassword') && JSON.parse(localStorage.getItem('isReset'))) {
-            // await checkPasswordStatus()
+            await checkPasswordStatus()
           }
 
           const user = res.user

sgzb-ui/src/views/claimAndreturn/return/receive/component/handlePage.vue

@@ -114,9 +114,6 @@
                 prop="lotName"
                 show-overflow-tooltip
             >
-                <template slot-scope="scope">
-                    <span>{{ lotName }}</span>
-                </template>
             </el-table-column>
             <el-table-column
                 label="类型名称"
@@ -171,6 +168,12 @@
                 prop="typeCode"
                 :show-overflow-tooltip="true"
             />
+            <el-table-column
+                label="工程在用量"
+                align="center"
+                prop="usNum"
+                show-overflow-tooltip
+            />
             <el-table-column
                 label="申请数量"
                 align="center"

sgzb-ui/src/views/newLogin.vue

@@ -527,7 +527,7 @@ export default {
                             const password = encrypt(this.loginForm.password)
                             localStorage.setItem('username', username)
                             localStorage.setItem('pw', password)
-                            // const res = await checkPasswordStatus()
+                            const res = await checkPasswordStatus()
                             // console.log('🚀 ~ .then ~ res:', res)
                             this.$router.push({ path: '/' }).catch(() => {})
                         })