Merge remote-tracking branch 'origin/project1' into project1

src/views/equipment/income.vue

@@ -135,18 +135,18 @@ export default {
   },
   // 路由跳转,是存储页面的值
   beforeRouteLeave(to, from, next) {
-    localStorage.setItem('form', JSON.stringify(this.form))
-    localStorage.setItem('tableData', JSON.stringify(this.tableData))
+    sessionStorage.setItem('inComeForm', JSON.stringify(this.form))
+    sessionStorage.setItem('inComeTableData', JSON.stringify(this.tableData))
     next()
   },
   created() {
-    localStorage.getItem('form') ? this.existForm = true : this.existForm = false
-    localStorage.getItem('tableData') ? this.existTableData = true : this.existTableData = false
+    sessionStorage.getItem('inComeForm') ? this.existForm = true : this.existForm = false
+    sessionStorage.getItem('inComeTableData') ? this.existTableData = true : this.existTableData = false
     if (this.existForm) {
-      this.form = JSON.parse(localStorage.getItem('form'))
+      this.form = JSON.parse(sessionStorage.getItem('inComeForm'))
     }
     if (this.existTableData) {
-      this.tableData = JSON.parse(localStorage.getItem('tableData'))
+      this.tableData = JSON.parse(sessionStorage.getItem('inComeTableData'))
     }
     this.init()
   },

src/views/processManagement/deviceReuse/index.vue

@@ -71,7 +71,7 @@ export default {
   data() {
     return {
       // 缓存判断
-      exist: false,
+      recycleexist: false,
       form: {
         pn: '',
         lot: '',
@@ -121,14 +121,13 @@ export default {
   },
   // 路由跳转,是存储页面的值
   beforeRouteLeave(to, from, next) {
-    console.log('form')
-    localStorage.setItem('form', JSON.stringify(this.form))
+    sessionStorage.setItem('recycleform', JSON.stringify(this.form))
     next()
   },
   created() {
-    localStorage.getItem('form') ? this.exist = true : this.exist = false
-    if (this.exist) {
-      this.form = JSON.parse(localStorage.getItem('form'))
+    sessionStorage.getItem('recycleform') ? this.recycleexist = true : this.recycleexist = false
+    if (this.recycleexist) {
+      this.form = JSON.parse(sessionStorage.getItem('recycleform'))
     }
   },
   methods: {