Merge remote-tracking branch 'origin/dev' into dev

src/views/ecw/order/warehousing/components/editDialog.vue

@@ -390,12 +390,12 @@ export default {
         recordMode: undefined
       },
       tableFormRules: {
-        cartonsNum: [{required: true, message: "箱数不能为空", trigger: "blur"}],
-        boxGauge1: [{required: true, message: "货物长不能为空", trigger: "blur"}],
-        boxGauge2: [{required: true, message: "货物宽不能为空", trigger: "blur"}],
-        boxGauge3: [{required: true, message: "货物高不能为空", trigger: "blur"}],
-        volume: [{required: true, message: "体积不能为空", trigger: "blur"}],
-        weight: [{required: true, message: "重量不能为空", trigger: "blur"}],
+        cartonsNum: [{required: true, message: this.$t("箱数不能为空"), trigger: "blur"}],
+        boxGauge1: [{required: true, message: this.$t("货物长不能为空"), trigger: "blur"}],
+        boxGauge2: [{required: true, message: this.$t("货物宽不能为空"), trigger: "blur"}],
+        boxGauge3: [{required: true, message: this.$t("货物高不能为空"), trigger: "blur"}],
+        volume: [{required: true, message: this.$t("体积不能为空"), trigger: "blur"}],
+        weight: [{required: true, message: this.$t("重量不能为空"), trigger: "blur"}],
         quantityAll: [{required: true, message: "数量不能为空", trigger: "blur"}]
       },
       form1: {
@@ -533,7 +533,7 @@ export default {
               orderId: this.warehousing.orderId,
               orderItemId: this.warehousing.orderItemId,
               orderNo: this.warehousing.orderNo,
-              cartonsNum: this.warehousing.num,
+              num: this.warehousing.num,
               volume: this.warehousing.volume.toFixed(2),
               weight: this.warehousing.weight.toFixed(2),
               prodId: this.warehousing.prodId,