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

src/views/equipment/application.vue

@@ -3,21 +3,21 @@
     <el-form ref="form" :model="form" :rules="rule" label-width="80px">
       <div class="info"><span class="title">设备申请</span></div>
       <el-row :gutter="40">
-        <el-col :span="12" style="padding-left: 16%;">
+        <el-col :span="12" style="padding-left: 10%;">
           <el-form-item label="pn" style="flex-basis: 50%;" prop="pn">
-            <el-input ref="input1" v-model="form.pn" placeholder="请输入pn" :minlength="3" :style="{ width: '400px', height: '30px' }" :maxlength="100" @keyup.enter.native="handelTab(1,$event)" />
+            <el-input ref="input1" v-model="form.pn" placeholder="请输入pn" :minlength="3" style="width: 400px" :maxlength="100" @keyup.enter.native="handelTab(1,$event)" />
           </el-form-item>
         </el-col>
         <el-col :span="12">
           <el-form-item label="phd" style="flex-basis: 50%;" prop="phd">
-            <el-input ref="input2" v-model="form.phd" placeholder="请输入phd" :style="{ width: '400px', height: '30px' }" :maxlength="10" @keyup.enter.native="handelTab(2,$event)" />
+            <el-input ref="input2" v-model="form.phd" placeholder="请输入phd" style="width: 400px" :maxlength="10" @keyup.enter.native="handelTab(2,$event)" />
           </el-form-item>
         </el-col>
       </el-row>
       <el-row :gutter="40">
-        <el-col :span="12" style="padding-left: 16%;">
+        <el-col :span="12" style="padding-left: 10%;">
           <el-form-item label="prank" style="flex-basis: 50%;" prop="prank">
-            <el-input ref="input3" v-model="form.prank" placeholder="请输入prank" :style="{ width: '400px', height: '30px' }" :maxlength="10" @keyup.enter.native="handelTab(3,$event)" />
+            <el-input ref="input3" v-model="form.prank" placeholder="请输入prank" style="width: 400px" :maxlength="10" @keyup.enter.native="handelTab(3,$event)" />
           </el-form-item>
         </el-col>
         <el-col :span="12">
@@ -26,7 +26,7 @@
               v-model="form.pissb"
               clearable
               placeholder="请选择pissb"
-              :style="{ width: '400px', height: '30px' }"
+              style="width: 400px"
             >
               <el-option
                 v-for="(dict,index) in pgxList"
@@ -38,14 +38,14 @@
           </el-form-item>
         </el-col>
       </el-row>
-      <el-row>
-        <el-col :span="12" style="padding-left: 15.1%;">
+      <el-row :gutter="40">
+        <el-col :span="12" style="padding-left: 10%;">
           <el-form-item label="pgx" style="flex-basis: 50%;" prop="pgx">
             <el-select
               v-model="form.pgx"
               clearable
               placeholder="请选择pgx"
-              :style="{ width: '400px', height: '30px' }"
+              style="width: 400px"
             >
               <el-option
                 v-for="(dict,index) in pissbList"
@@ -58,13 +58,22 @@
         </el-col>
         <el-col :span="12">
           <el-form-item label="pnumber" style="flex-basis: 50%;" prop="pnumber">
-            <el-input ref="input4" v-model="form.pnumber" placeholder="请输入phd" :style="{ width: '400px', height: '30px' }" :maxlength="10" @keyup.enter.native="handelTab(4,$event)" />
+            <el-input ref="input4" v-model="form.pnumber" placeholder="请输入phd" style="width: 400px" :maxlength="10" @keyup.enter.native="handelTab(4,$event)" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <!--      <div class="button">-->
+      <!--        <el-button type="primary" @click="submitForm">提交</el-button>-->
+      <!--      </div>-->
+    </el-form>
+    <el-form label-width="80px">
+      <el-row style="padding-left: 8.7%; padding-top: 1%">
+        <el-col :span="12">
+          <el-form-item style="flex-basis: 50%;">
+            <el-button type="primary" @click="submitForm">提交</el-button>
           </el-form-item>
         </el-col>
       </el-row>
-      <div class="button">
-        <el-button type="primary" @click="submitForm">提交</el-button>
-      </div>
     </el-form>
   </div>
 </template>

src/views/equipment/basicInfo.vue

@@ -168,7 +168,7 @@
           />
         </el-form-item>
         <el-form-item label="prank" prop="prank">
-          <el-input ref="input3" v-model.trim="form.prank" :maxlength="9" placeholder="请输入prank" @keyup.enter.native="handelTab(3,$event)"/>
+          <el-input ref="input3" v-model.trim="form.prank" :maxlength="9" placeholder="请输入prank" @keyup.enter.native="handelTab(3,$event)" />
         </el-form-item>
         <el-form-item label="pissb" prop="pissb">
           <el-select

src/views/equipment/income.vue

@@ -93,6 +93,9 @@ export default {
     return {
       index: 0,
       flag: false,
+      // TODO: 判断页面路由跳转前是否有数据存在
+      existForm: false,
+      existTableData: false,
       form: {
         pn: '',
         lot: '',
@@ -130,7 +133,21 @@ export default {
       this.$refs.input1.$refs.input.focus()
     })
   },
+  // 路由跳转,是存储页面的值
+  beforeRouteLeave(to, from, next) {
+    localStorage.setItem('form', JSON.stringify(this.form))
+    localStorage.setItem('tableData', JSON.stringify(this.tableData))
+    next()
+  },
   created() {
+    localStorage.getItem('form') ? this.existForm = true : this.existForm = false
+    localStorage.getItem('tableData') ? this.existTableData = true : this.existTableData = false
+    if (this.existForm) {
+      this.form = JSON.parse(localStorage.getItem('form'))
+    }
+    if (this.existTableData) {
+      this.tableData = JSON.parse(localStorage.getItem('tableData'))
+    }
     this.init()
   },
   methods: {

src/views/processManagement/deviceReuse/index.vue

@@ -70,6 +70,8 @@ export default {
   name: 'Role',
   data() {
     return {
+      // 缓存判断
+      exist: false,
       form: {
         pn: '',
         lot: '',
@@ -117,7 +119,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'))
+    }
   },
   methods: {
     // 回车跳转下一个输入框