Merge branch 'master' of http://test.siger-data.com:9000/jiawei.su/Laisi_AutoMES2

Html/src/view/wms/config/storagemaintenance.vue

@@ -255,10 +255,10 @@ export default {
                         pid: item.pid,
                         serialNumber: item.serialNumber,
                         storageName: item.storageName,
-                        sm_0: item.field[0].val,
-                        sm_1: item.field[1].val,
-                        sm_2: item.field[2].val,
-                        sm_3: item.field[3].val,
+                        sm_0: item.field[0]?item.field[0].val:'',
+                        sm_1: item.field[1]?item.field[1].val:'',
+                        sm_2: item.field[2]?item.field[2].val:'',
+                        sm_3: item.field[3]?item.field[3].val:'',
                         state: item.state == 1 ? "否" : "是",
                         status: item.state,
                         storeID: item.storeID,

Html/src/view/wms/whStatusQuery/storageInfoQuery.vue

@@ -209,6 +209,7 @@ export default {
                 {
                     title:'物料状态',
                     key:'materialstate',
+                    width:150,
                     render:(h,params)=>{
                         let str = '';
                         //materialstate:1:有工装无工件2:有工装有工件3:无工装无工件4:无工装有工件
@@ -397,7 +398,7 @@ export default {
                 }
             });
         },
-        contentTree1 (arr) {
+        contentTree1 (arr=[]) {
             let max = 0;
             function eachfun(arr,floor){
                 arr.forEach(ele => {
@@ -440,13 +441,14 @@ export default {
             })
             .then((res) => {
                 if (res.data.ret == 1) {
-                    let arr = res.data.data;
+                    let arr=[];
+                    arr= res.data.data?res.data.data:[];
                     this.contentTree2(arr);
                     this.frockTypeTree = arr;
                 }
             });
         },
-        contentTree2(arr) {
+        contentTree2(arr=[]) {
             arr.forEach(ele => {
                 ele.disabled = false;
                 if (