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

Html/src/view/qms/manual/collection.vue

@@ -975,7 +975,7 @@ export default {
         savedata() {
             this.resultData.details = [];
             this.resultData.productid = this.product.id;
-            this.resultData.materialid = this.material.id;
+            this.resultData.routeid = this.material.id;
             this.resultData.sectionid = this.station.id;
             this.resultData.sn = this.qrcode;
             this.resultData.checktype = this.checktype.id;

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

@@ -231,7 +231,7 @@ export default {
                 page: this.page,
                 pageSize: this.pagesize,
                 id: this.whid, // 仓库id
-                isWarehouse: 1,
+                isWavehouse: 1,
             };
             this.detailobj = {};
             this.request("/wms/Location/GetLocationList", data, "get").then(

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

@@ -309,7 +309,7 @@ export default {
             this.storageList1 = [];
             this.addstorageid = "";
             if(value != undefined){
-                this.warehouseid = value.value;
+                this.addwarehouseid = value.value;
                 this.addinitStorage();
             }
         },
@@ -460,6 +460,14 @@ export default {
         },
         add(){
             this.type = 1;
+            this.initFrockType();//工装类型
+            this.addstorageid = '';//仓库id
+            this.parentType = [];//工装类型
+            this.parentTypeid = '';//工装类型id
+            this.addfrockid = '';//工装id
+            this.addremark = '';//备注
+            this.filename = '';
+            this.fileurl = '';
             this.addmodal = true;
         },
         /*********文件上传 start******** */