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

src/views/equipment/application.vue

@@ -85,6 +85,8 @@ export default {
   name: 'Role',
   data() {
     return {
+      // 判断是否存在缓存
+      exist: false,
       form: {
         pn: '',
         phd: '',
@@ -118,7 +120,17 @@ export default {
       this.$refs.input1.$refs.input.focus()
     })
   },
+  // 路由跳转,是存储页面的值
+  beforeRouteLeave(to, from, next) {
+    console.log('form')
+    localStorage.setItem('form', 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'))
+    }
     this.init()
   },
   methods: {

src/views/equipment/equipmentAbandonment.vue

@@ -267,6 +267,9 @@ export default {
   name: 'Role',
   data() {
     return {
+      Rowform: {
+
+      },
       abandonTitle: '',
       abandonOpen: false,
       abandonFrom: {
@@ -779,7 +782,18 @@ export default {
     handleDelete(row) {
       console.log('row', row)
       this.abandonTitle = '废弃表单信息'
+      this.Rowform = row
       this.abandonFrom.businessId = row.businessId
+      this.abandonFrom.pn = row.pn
+      this.abandonFrom.createBy = row.createBy
+      this.abandonFrom.createDate = row.createDate
+      this.abandonFrom.delFlag = row.delFlag
+      this.abandonFrom.lot = row.lot
+      this.abandonFrom.phd = row.phd
+      this.abandonFrom.plocation = row.plocation
+      this.abandonFrom.prank = row.prank
+      this.abandonFrom.psm = row.psm
+      this.abandonFrom.pzl = row.pzl
       this.abandonOpen = true
 
       // const EquipmentIds = row.businessId || this.ids;