Merge branch 'master' of http://121.40.234.130:8899/root/wuHanXinRui

mes/qd/src/views/wms/basedata/master/bagrecord/index.vue

@@ -244,6 +244,7 @@ export default {
         { 'code': '02', 'name': '组桶' },
         { 'code': '03', 'name': '清洗' }
       ],
+      open: true,
       permission: {
       },
       rules: {
@@ -252,7 +253,12 @@ export default {
   methods: {
     // 钩子：在获取表格数据之前执行，false 则代表不获取数据
     [CRUD.HOOK.beforeRefresh]() {
+      if (this.open) {
+        this.open = false
+        return false
+      } else {
         return true
+      }
     },
     hand(value) {
       this.crud.toQuery()

mes/qd/src/views/wms/basedata/master/bucketrecord/index.vue

@@ -232,6 +232,7 @@ export default {
     return {
       StatusList: [],
       TypeList: [],
+      open: true,
       QualityList: [],
       IvtList: [],
       permission: {
@@ -257,7 +258,12 @@ export default {
   methods: {
     // 钩子：在获取表格数据之前执行，false 则代表不获取数据
     [CRUD.HOOK.beforeRefresh]() {
+      if (this.open) {
+        this.open = false
+        return false
+      } else {
         return true
+      }
     },
     hand(value) {
       this.crud.toQuery()

mes/qd/src/views/wms/basedata/master/material/index.vue

@@ -202,6 +202,7 @@ export default {
   data() {
     return {
       classes: [],
+      open: true,
       class_idStr: null,
       fullscreenLoading: false,
       measure_unit: [],
@@ -247,7 +248,12 @@ export default {
   methods: {
     // 钩子：在获取表格数据之前执行，false 则代表不获取数据
     [CRUD.HOOK.beforeRefresh]() {
+      if (this.open) {
+        this.open = false
+        return false
+      } else {
         return true
+      }
     },
     initTree() {
       const param = {
@@ -256,7 +262,6 @@ export default {
       crudMaterialbase.getMaterOptType(param).then(res => {
         this.class_idStr = res.class_idStr
         this.crud.query.class_idStr = res.class_idStr
-        this.crud.toQuery()
         this.queryClassId()
       })
     },

mes/qd/src/views/wms/basedata/master/materialParameters/index.vue

@@ -167,6 +167,7 @@ export default {
       viewDialogVisible: false,
       fullscreen: false,
       material_id: '',
+      open: true,
       currentComponent: '',
       openParam: {},
       dialogTitle: null,
@@ -181,7 +182,6 @@ export default {
     crudMaterialbase.getMaterOptType(param).then(res => {
       this.class_idStr = res.class_idStr
       this.crud.query.class_idStr = this.class_idStr
-      this.crud.toQuery()
       this.queryClassId()
     })
     crudMaterialparameters.getSeries().then(res => {
@@ -191,7 +191,12 @@ export default {
   methods: {
     // 钩子：在获取表格数据之前执行，false 则代表不获取数据
     [CRUD.HOOK.beforeRefresh]() {
+      if (this.open) {
+        this.open = false
+        return false
+      } else {
         return true
+      }
     },
     stockIsNeedMove(row, clou) {
       if (row.stock_is_need_move === '0') return '否'