选择物料

src/pages/modules/clean/man-pour.vue

@@ -97,6 +97,7 @@ export default {
     next()
   },
   activated () {
+    console.log(this.$store.getters.materObj, 666)
     if (this.$store.getters.materObj !== '') {
       this.material_spec = JSON.parse(this.$store.getters.materObj).material_spec
       this.material_code = JSON.parse(this.$store.getters.materObj).material_code

src/pages/modules/clean/select-mater.vue

@@ -49,6 +49,7 @@ export default {
       dataList: [],
       pkId: '',
       pkObj: {},
+      // pkObj: {material_spec: '规格01', material_code: 'A01', material_name: '物料01'},
       page: 1,
       size: '22',
       busy: false,
@@ -65,23 +66,27 @@ export default {
       this.busy = false
       this.desc = ''
       let res = await washmaterialList(this.page + '', this.size, this.val1)
-      this.dataList = []
-      this.dataList = [...res.content]
-      if (res.content.length < 22) {
-        this.busy = true
-        this.desc = '已加载全部数据'
+      if (res.code === 200) {
+        this.dataList = []
+        this.dataList = [...res.content]
+        if (res.content.length < 22) {
+          this.busy = true
+          this.desc = '已加载全部数据'
+        }
       }
     },
     async loadMore () {
       this.busy = true
       this.page++
       let res = await washmaterialList(this.page + '', this.size, this.val1)
-      this.dataList = [...this.dataList, ...res.content]
-      if (res.content.length < 22) {
-        this.busy = true
-        this.desc = '已加载全部数据'
-      } else {
-        this.busy = false
+      if (res.code === 200) {
+        this.dataList = [...this.dataList, ...res.content]
+        if (res.content.length < 22) {
+          this.busy = true
+          this.desc = '已加载全部数据'
+        } else {
+          this.busy = false
+        }
       }
     },
     colseUp () {