Merge branch 'master' of git.echepei.com:zhujiawei/Warehouse_management_ui into master

src/views/kaihe/domesticTrade/orderInformation/index.vue

@@ -1681,6 +1681,9 @@ export default {
           }
         }
       }
+      for (let li in this.warehouseCrList) {
+        this.warehouseCrList[li].fMblno = this.form.fMblno
+      }
       formData.append('tWarehousebills', JSON.stringify(form))
       formData.append('tWarehousebillsCntritems', JSON.stringify(this.dataList))
       formData.append('tWarehousebillsfeesDr', JSON.stringify(this.warehouseDrList))

src/views/warehouseBusiness/goodsTransfer/index.vue

@@ -2986,6 +2986,7 @@ export default {
             fGrossweight: 0,
             fMblno: this.dialogWhgenlegList[whgen].fMblno,
             fMarks: this.dialogWhgenlegList[whgen].fMarks,
+            fCntrno: this.dialogWhgenlegList[whgen].fCntrno,
             fPlanqty: this.dialogWhgenlegList[whgen].fQtyblc,
             fGoodsid: this.dialogWhgenlegList[whgen].fGoodsid,
             fVolumn: this.dialogWhgenlegList[whgen].fVolumnblc,