问题修复

src/store/index.js

@@ -7,6 +7,7 @@ import tagsView from './modules/tagsView'
 import permission from './modules/permission'
 import settings from './modules/settings'
 import getters from './getters'
+import claimAndReturn from './modules/claimAndReturn'
 
 Vue.use(Vuex)
 
@@ -17,9 +18,10 @@ const store = new Vuex.Store({
     user,
     tagsView,
     permission,
-    settings
+    settings,
+    claimAndReturn
   },
   getters
 })
 
-export default store
+export default store

src/store/modules/claimAndReturn.js

@@ -0,0 +1,32 @@
+const state = {
+  claimAndReturnPickingQueryParams: {
+    pageNum: 1,
+    pageSize: 10,
+    dictName: undefined,
+    dictType: undefined,
+    status: undefined,
+    keyWord: '',
+    time: [],
+    unitId: '',
+    proId: '',
+    types: 1, // 1申请列表 2审核列表
+  }
+}
+
+const mutations = {
+  setClaimAndReturnPickingQueryParams(state, queryParams) {
+    state.claimAndReturnPickingQueryParams = queryParams
+  }
+}
+
+const actions = {}
+
+const getters = {}
+
+export default {
+  namespaced: true,
+  state,
+  mutations,
+  actions,
+  getters
+}

src/views/claimAndreturn/picking/apply/component/home1.vue

@@ -154,6 +154,27 @@
                 :show-overflow-tooltip="true"
                 width="150"
             />
+            <el-table-column
+                label="计划领料时间"
+                align="center"
+                prop="estimateLeaseTime"
+                :show-overflow-tooltip="true"
+                width="200"
+            />
+            <el-table-column
+                label="领料工程"
+                align="center"
+                prop="proName"
+                :show-overflow-tooltip="true"
+                width="220"
+            />
+            <el-table-column
+                label="领料单位"
+                align="center"
+                prop="unitName"
+                :show-overflow-tooltip="true"
+                width="220"
+            />
             <el-table-column
                 label="领料类型"
                 align="center"
@@ -166,21 +187,6 @@
 
                 </template>
             </el-table-column>
-
-            <el-table-column
-                label="领料单位"
-                align="center"
-                prop="unitName"
-                :show-overflow-tooltip="true"
-                width="220"
-            />
-            <el-table-column
-                label="领料工程"
-                align="center"
-                prop="proName"
-                :show-overflow-tooltip="true"
-                width="220"
-            />
             <el-table-column
                 label="协议号"
                 align="center"
@@ -209,13 +215,6 @@
                 :show-overflow-tooltip="true"
                 width="100"
             />
-            <el-table-column
-                label="预计领料时间"
-                align="center"
-                prop="estimateLeaseTime"
-                :show-overflow-tooltip="true"
-                width="200"
-            />
             <!-- <el-table-column
                 label="申请时间"
                 align="center"
@@ -373,17 +372,16 @@ export default {
             // 日期范围
             dateRange: [],
             // 查询参数
-            queryParams: {
+            queryParams: this.$store.state.claimAndReturn.claimAndReturnPickingQueryParams || {
                 pageNum: 1,
                 pageSize: 10,
                 dictName: undefined,
                 dictType: undefined,
                 status: undefined,
                 keyWord: '',
-                time: null, //申请时间
+                time: [],
-                unitId: null, //来往单位id
+                unitId: '',
-                proId: null, //工程id
+                proId: '',
-
                 types: 1, // 1申请列表 2审核列表
             },
             unitList: [], //来往单位集合
@@ -395,6 +393,9 @@ export default {
         this.GetUnitData()
         this.GetProData()
     },
+    beforeDestroy() {
+        this.$store.commit('claimAndReturn/setClaimAndReturnPickingQueryParams', this.queryParams)
+    },
     methods: {
         // 获取 申请列表
         async getList() {
@@ -456,10 +457,19 @@ export default {
         },
         /** 重置按钮操作 */
         resetQuery() {
-            this.queryParams.time = []
+            this.queryParams = {
-            this.queryParams.unitId = ''
+                pageNum: 1,
-            this.queryParams.proId = ''
+                pageSize: 10,
-            this.resetForm('queryForm')
+                dictName: undefined,
+                dictType: undefined,
+                status: undefined,
+                keyWord: '',
+                time: [],
+                unitId: '',
+                proId: '',
+                types: 1, // 1申请列表 2审核列表
+            }
+            this.$store.commit('claimAndReturn/setClaimAndReturnPickingQueryParams', this.queryParams)
             this.GetUnitData()
             this.GetProData()
             this.handleQuery()
@@ -558,4 +568,4 @@ export default {
     width: 60px !important;
     margin-bottom: 10px;
 }
-</style>
+</style>

src/views/claimAndreturn/picking/apply/index.vue

@@ -6,6 +6,7 @@
             :pageContent="pageContent"
             @goBack="goBack"
         />
+        <keep-alive include="Home">
         <component
             :is="isShowComponent"
             :viewTaskId="viewTaskId"
@@ -17,6 +18,7 @@
             @editPicking="editPicking"
             @goBackPage="goBack"
         />
+        </keep-alive>
     </div>
 </template>
 
@@ -74,4 +76,4 @@ export default {
         },
     },
 }
-</script>
+</script>

src/views/claimAndreturn/picking/auditing/component/home1.vue

@@ -108,25 +108,25 @@
                 :index="indexContinuation(queryParams.pageNum, queryParams.pageSize)"
             />
             <el-table-column label="领料单号" align="center" prop="code" :show-overflow-tooltip="true" width="150"/>
+            <el-table-column
+                label="计划领料时间"
+                align="center"
+                prop="estimateLeaseTime"
+                :show-overflow-tooltip="true"
+                width="200"
+            />
+            <el-table-column label="领料工程" align="center" prop="proName" :show-overflow-tooltip="true" width="220"/>
+            <el-table-column label="领料单位" align="center" prop="unitName" :show-overflow-tooltip="true" width="220"/>
             <el-table-column label="领料类型" align="center" prop="leaseType" :show-overflow-tooltip="true">
                 <template slot-scope="scope">
                     <span v-if="scope.row.leaseType == 0">工程租赁</span>
                     <span v-if="scope.row.leaseType == 1">长期领用</span>
                 </template>
             </el-table-column>
-            <el-table-column label="领料单位" align="center" prop="unitName" :show-overflow-tooltip="true" width="220"/>
-            <el-table-column label="领料工程" align="center" prop="proName" :show-overflow-tooltip="true" width="220"/>
             <el-table-column label="协议号" align="center" prop="agreementCode" :show-overflow-tooltip="true" width="150"/>
             <el-table-column label="领料人" align="center" prop="leasePerson" :show-overflow-tooltip="true" width="100"/>
             <el-table-column label="联系电话" align="center" prop="leasePhone" :show-overflow-tooltip="true" width="120"/>
             <el-table-column label="申请人" align="center" prop="applyFor" :show-overflow-tooltip="true" width="100"/>
-            <el-table-column
-                label="预计领料时间"
-                align="center"
-                prop="estimateLeaseTime"
-                :show-overflow-tooltip="true"
-                width="200"
-            />
             <!-- <el-table-column label="申请时间" align="center" prop="createTimes" :show-overflow-tooltip="true" width="200"/>
             <el-table-column
                 label="任务状态"

src/views/claimAndreturn/picking/outbound/index.vue

@@ -63,8 +63,8 @@
         :index="indexContinuation(queryParams.pageNum, queryParams.pageSize)"
       />
       <el-table-column label="领料单号" align="center" prop="code" :show-overflow-tooltip="true" width="220"/>
-      <el-table-column label="领料申请单位" align="center" prop="unitName" :show-overflow-tooltip="true" />
       <el-table-column label="领料申请工程" align="center" prop="proName" :show-overflow-tooltip="true" />
+      <el-table-column label="领料申请单位" align="center" prop="unitName" :show-overflow-tooltip="true" />
       <el-table-column
         label="申请数量"
         align="center"

src/views/claimAndreturn/return/receive/component/home.vue

@@ -135,12 +135,12 @@
                 :index="indexContinuation(queryParams.pageNum, queryParams.pageSize)"
             />
             <el-table-column label="退料单号" align="center" prop="code" show-overflow-tooltip width="150px"/>
+            <el-table-column label="计划退料时间" align="center" prop="backTime" show-overflow-tooltip width="100px"/>
+            <el-table-column label="退料工程" align="center" prop="lotName" show-overflow-tooltip width="200px"/>
             <el-table-column label="退料单位" align="center" prop="unitName" show-overflow-tooltip width="150px"/>
-            <el-table-column label="退料工程" align="center" prop="lotName" show-overflow-tooltip width="150px"/>
             <el-table-column label="退料类型名称" align="center" prop="typeName" show-overflow-tooltip width="170px"/>
             <el-table-column label="退料人员" align="center" prop="backPerson" show-overflow-tooltip width="100px"/>
             <el-table-column label="联系电话" align="center" prop="phone" show-overflow-tooltip width="120px"/>
-            <el-table-column label="申请时间" align="center" prop="backTime" show-overflow-tooltip width="100px"/>
             <el-table-column label="协议号" align="center" prop="agreementCode" show-overflow-tooltip width="150px"/>
             <el-table-column label="退料状态" align="center" prop="taskName" show-overflow-tooltip width="100px"></el-table-column>