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

src/views/processManagement/inventoryRecord/index.vue

@@ -430,6 +430,11 @@ export default {
     next()
   },
   created() {
+    if (this.$store.getters.searchParams[this.$route.path]) {
+      const { searchParams } = this.$store.getters; const { path } = this.$route
+      const param = JSON.parse(searchParams[path]) // 保留着的查询条件
+      this.queryParams = { ...param }
+    }
     this.getList()
   },
   mounted() {
@@ -483,6 +488,7 @@ export default {
     /** TODO: 重置按钮操作 */
     resetQuery() {
       this.queryEntity = {
+        tableSortMark: 0,
         entity: {
           pn: '',
           lot: '',

src/views/sample/inventoryRecord/index.vue

@@ -389,6 +389,7 @@ export default {
     /** TODO: 重置按钮操作 */
     resetQuery() {
       this.queryEntity = {
+        tableSortMark: 0,
         entity: {
           pn: '',
           lot: '',