Merge branch 'dev' of http://gitlab.jdshangmen.com/jiedao-app/jiedao-app-operator into dev

src/views/ecw/box/shippingSea/nodePage/cabinet/splitOrder.vue

@@ -252,7 +252,7 @@
             <el-input-number v-model="shopForm.chargeWeight" controls-position="right"  :min="0" :max="mainOrderItem.chargeWeight"></el-input-number>
           </el-form-item>
           <!--按照原型这里需要显示剩余数量，但是事实无法计算剩余数量，因为已装数量是未知的-->
-          <el-form-item :label="$t('放入数量(个)')+'：'" prop="quantity">
+          <el-form-item :label="$t('放入数量(个)')+'：'" prop="quantity" v-if="isQuantity">
             <el-input-number v-model="shopForm.quantity" controls-position="right" :min="0" :max="mainOrderItem.quantity || undefined"></el-input-number>
           </el-form-item>
           <el-form-item :label="$t('备注信息')+'：'">
@@ -552,7 +552,7 @@ export default {
       const rate = leftNum / this.mainOrderItem.num
 
       // 放入个数，剩余个数是算不出来的，因为不知道已装数量,所以放入数量只能按照总数的比例计算
-      this.$set(this.shopForm, 'quantity',      Math.ceil(this.mainOrderItem.quantity|| 0 * rate))
+      this.$set(this.shopForm, 'quantity',      Math.ceil(this.mainOrderItem.quantity*rate|| 0 * rate))
       // 数量，体积，重量等按照比例给默认值
       this.$set(this.shopForm, 'volume',        (this.mainOrderItem.volume * rate).toFixed(2))
       this.$set(this.shopForm, 'chargeVolume',  (this.mainOrderItem.chargeVolume * rate).toFixed(2))
@@ -660,7 +660,7 @@ export default {
 
           let params = {
             num: this.shopForm.num,
-            quantity: this.shopForm.quantity,
+            // quantity: this.shopForm.quantity,
             orderItemId: this.shopForm.orderItemId,
             orderSplitId: this.splitData.id,
             remarks: this.shopForm.remarks,
@@ -669,6 +669,10 @@ export default {
             chargeWeight: this.shopForm.chargeWeight,
             chargeVolume: this.shopForm.chargeVolume
           };
+          // 按数量计费的才需要传递数量
+          if(this.isQuantity){
+            params.quantity = this.shopForm.quantity
+          }
           createSplitItem(params).then((res) => {
             this.$message.success(this.$t("放入成功"));
             this.querySplitGoods();

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

@@ -886,11 +886,13 @@ export default {
       this.form.prodTitleZh = product.titleZh
       this.form.prodTitleEn = product.titleEn
       this.handleBrandChange(parseInt(this.form.brand))
+      this.form.prodAttrIds = product.attrId ? product.attrId.split(',').map(e => +e) : []
     },
     onProductChange1(product){
       this.form1.prodTitleZh = product.titleZh
       this.form1.prodTitleEn = product.titleEn
       this.handleBrandChange(parseInt(this.form1.brand))
+      this.form1.prodAttrIds = product.attrId ? product.attrId.split(',').map(e => +e) : []
     },
     getProductBrandPage(titleZh = undefined) {
       getProductBrankPage({pageSize: 20, titleZh}).then(r => {