Merge remote-tracking branch 'origin/orderChange' into zhairh

src/views/business/stockOrderWaitCheck.vue

@@ -607,6 +607,7 @@ export default {
         getStockOrderDetailList(row) {
             if (this.$isNotBlank(row)) {
                 this.detailQuery.orderIdFk = row.id;
+                this.detailQuery.page=1;
             }
             this.detailLoading = true;
             stockOrderDetail(this.detailQuery)

src/views/thrsys/thrOrderNew.vue

@@ -480,7 +480,7 @@ export default {
         },
         subStorageChange(item) {
             // this.formData.fromSubInvCode = null;
-            this.formData.locStorageCode= this.subInvList.find(item => item.code == this.formData.invWarehouseCode)
+            this.formData.locStorageCode= this.subInvList.find(item => item.code == this.formData.invWarehouseCode).parentId
             this.formData.corpId=this.subInvList.find(item => item.code == this.formData.invWarehouseCode).code
             this.formData.corpName=this.subInvList.find(item => item.code == this.formData.invWarehouseCode).warehouseName
             this.findSubStorageMethod();