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

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

@@ -828,8 +828,8 @@ export default {
             remarks: this.shopForm.remarks,
             volume: this.putin.volume,
             weight: this.putin.weight,
-            chargeWeight: this.putin.chargeWeight,
-            chargeVolume: this.putin.chargeVolume,
+            chargeWeight: this.shopForm.chargeWeight,
+            chargeVolume: this.shopForm.chargeVolume,
             worth: this.shopForm.worth || 0,
             specsRecordVOList:this.shopForm.specsRecordVOList,
             shipmentSplit: true
@@ -950,8 +950,17 @@ export default {
       // 根据比例计算默认的收费方数和收费重量
       const orderItem = this.orderData.orderItemVOList.find(item => item.orderItemId == this.shopForm.orderItemId)
       const rate = this.putin.num / orderItem.warehouseInInfoVO.cartonsNum
-      this.$set(this.shopForm, 'chargeVolume', (orderItem.chargeVolume*rate).toFixed(2))
-      this.$set(this.shopForm, 'chargeWeight', (orderItem.chargeWeight*rate).toFixed(2))
+
+      /*
+      * 1 普货 2 重货 3 泡货
+      * 普货 收费数据=入仓数据
+      * 泡货 收费方数=入仓方数 收费重量 = 品名收费重量*比例
+      * 重货 收费方数=品名收费方数*比例 收费重量 = 入仓重量
+      * */
+      const chargeVolume = orderItem.itemType === 2 ? (orderItem.chargeVolume*rate).toFixed(2) : this.putin.volume
+      const chargeWeight = orderItem.itemType === 3 ? (orderItem.chargeWeight*rate).toFixed(2) : this.putin.weight
+      this.$set(this.shopForm, 'chargeVolume', chargeVolume)
+      this.$set(this.shopForm, 'chargeWeight', chargeWeight)
       this.$set(this.shopForm, 'worth', (orderItem.worth*rate).toFixed(2))
     },
     // 清空放入记录

src/views/ecw/order/edit.vue

@@ -940,19 +940,19 @@ export default {
         this.$set(this, 'showWorkFlow', true)
       }
     },
-    '$route.query.transportType'(transportType){
-      this.$set(this.form, 'transportId', +transportType)
-    }
+    /*'$route.query.transportType'(transportType){
+      this.$set(this.form, 'transportId', transportType ? +transportType : undefined)
+    }*/
   },
   activated(){
     if(this.$route.query.id != this.form.id){
         this.getOrder()
     }
-    if(this.$route.query.transportType != this.transportId){
     let transportType = undefined
     if(this.$route.query.transportType){
       transportType = +this.$route.query.transportType
     }
+    if(transportType != this.transportId){
       this.$set(this.form, 'transportId', transportType)
     }
 
@@ -990,7 +990,6 @@ export default {
         })
     }
 
-
   },
   methods: {
     onTableMounted(e){

src/views/ecw/order/splitApply/index.vue

@@ -1148,11 +1148,18 @@ export default {
       })
       this.currentPutIn = null
 
-      // 根据比例计算默认的收费方数和收费重量
       const orderItem = this.orderData.orderItemVOList.find(item => item.orderItemId == this.shopForm.orderItemId)
       const rate = this.putin.num / orderItem.warehouseInInfoVO.cartonsNum
-      this.$set(this.shopForm, 'chargeVolume', (orderItem.chargeVolume*rate).toFixed(2))
-      this.$set(this.shopForm, 'chargeWeight', (orderItem.chargeWeight*rate).toFixed(2))
+      /*
+      * 1 普货 2 重货 3 泡货
+      * 普货 收费数据=入仓数据
+      * 泡货 收费方数=入仓方数 收费重量 = 品名收费重量*比例
+      * 重货 收费方数=品名收费方数*比例 收费重量 = 入仓重量
+      * */
+      const chargeVolume = orderItem.itemType === 2 ? (orderItem.chargeVolume*rate).toFixed(2) : this.putin.volume
+      const chargeWeight = orderItem.itemType === 3 ? (orderItem.chargeWeight*rate).toFixed(2) : this.putin.weight
+      this.$set(this.shopForm, 'chargeVolume', chargeVolume)
+      this.$set(this.shopForm, 'chargeWeight', chargeWeight)
       this.$set(this.shopForm, 'worth', (orderItem.worth*rate).toFixed(2))
     },
     // 清空放入记录

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

@@ -65,7 +65,7 @@
               </el-col>
               <el-col :span="16">
                 <el-form-item :label="$t('入仓特性')" style="margin-top: 20px">
-                  <el-checkbox-group v-model="form.prodAttrIds">
+                  <el-checkbox-group v-model="form.warehouseInProdAttrIds">
                     <el-checkbox v-for="item in attrList" :key="item.id" :label="item.id">{{ item.attrName }}</el-checkbox>
                   </el-checkbox-group>
                 </el-form-item>
@@ -269,7 +269,7 @@
               </el-col>
               <el-col :span="16">
                 <el-form-item :label="$t('入仓特性')" style="margin-top: 20px">
-                  <el-checkbox-group v-model="form1.prodAttrIds">
+                  <el-checkbox-group v-model="form1.warehouseInProdAttrIds">
                     <el-checkbox v-for="item in attrList" :key="item.id" :label="item.id">{{ item.attrName }}</el-checkbox>
                   </el-checkbox-group>
                 </el-form-item>
@@ -638,7 +638,7 @@ export default {
         inTime: undefined,
         material: undefined,
         orderItemId: undefined,
-        prodAttrIds: [],
+        warehouseInProdAttrIds: [],
         prodId: undefined,
         prodTitleEn: undefined,
         prodTitleZh: undefined,
@@ -657,7 +657,7 @@ export default {
         inTime: undefined,
         material: undefined,
         orderItemId: undefined,
-        prodAttrIds: [],
+        warehouseInProdAttrIds: [],
         prodId: undefined,
         prodTitleEn: undefined,
         prodTitleZh: undefined,
@@ -728,7 +728,10 @@ export default {
       this.form.orderId = this.warehousing.orderId
       this.form.orderItemId = this.warehousing.orderItemId
       this.form.orderNo = this.warehousing.orderNo
-      this.form.prodAttrIds = this.warehousing.prodAttrIds?.split(',').map(e => +e) || []
+      this.form.warehouseInProdAttrIds =
+        this.warehousing.warehouseInProdAttrIds?.split(',').map(e => +e)
+        || this.warehousing.prodAttrIds?.split(',').map(e => +e)
+        || []
       this.form.prodId = this.warehousing.prodId
       this.form.prodTitleEn = this.warehousing.prodTitleEn
       this.form.prodTitleZh = this.warehousing.prodTitleZh
@@ -784,7 +787,7 @@ export default {
     handleSubmit() {
       if (this.activeName !== "first"){
         // 添加非填单货物
-        if (this.form1.prodAttrIds.indexOf(4) !== -1) {
+        if (this.form1.warehouseInProdAttrIds.indexOf(4) !== -1) {
           return this.$notify({
             title: this.$t('提示'),
             message: this.$t("订单包含不接受货物，请检查"),
@@ -802,7 +805,7 @@ export default {
               orderId: this.warehousing.orderId,
               orderItemId: undefined,
               orderNo: this.warehousing.orderNo,
-              prodAttrIds: this.form.prodAttrIds.join(','),
+              warehouseInProdAttrIds: this.form.warehouseInProdAttrIds.join(','),
               orderWarehouseInItemDoList: this.form1.table.map(e => {
                 return {
                   ...e,
@@ -821,7 +824,7 @@ export default {
           })
         })
       } else {
-        if (this.form.prodAttrIds.indexOf(4) !== -1) {
+        if (this.form.warehouseInProdAttrIds.indexOf(4) !== -1) {
           return this.$notify({
             title: this.$t('提示'),
             message: this.$t("订单包含不接受货物，请检查"),
@@ -845,7 +848,7 @@ export default {
                 volume: (+this.warehousing.volume)?.toFixed(2) || '',
                 weight: (+this.warehousing.weight)?.toFixed(2) || '',
                 prodId: this.form.prodId,
-                prodAttrIds: this.form.prodAttrIds.join(','),
+                warehouseInProdAttrIds: this.form.warehouseInProdAttrIds.join(','),
                 "orderWarehouseInUpdateItemDoList": this.form.table.map(e => {
                   return {
                     ...e,
@@ -871,7 +874,7 @@ export default {
                 orderItemId: this.warehousing.orderItemId,
                 orderNo: this.warehousing.orderNo,
                 isAppend: this.isAdd ? true : undefined,
-                prodAttrIds: this.form.prodAttrIds.join(','),
+                warehouseInProdAttrIds: this.form.warehouseInProdAttrIds.join(','),
                 orderWarehouseInItemDoList: this.form.table.map(e => {
                   return {
                     ...e,
@@ -910,13 +913,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) : []
+      this.form.warehouseInProdAttrIds = 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) : []
+      this.form1.warehouseInProdAttrIds = product.attrId ? product.attrId.split(',').map(e => +e) : []
     },
     getProductBrandPage(titleZh = undefined) {
       getProductBrankPage({pageSize: 20, titleZh}).then(r => {
@@ -1011,10 +1014,10 @@ export default {
           this.$modal.msgSuccess(this.$t("新增成功"))
           if (this.activeName === 'first') {
             this.form.prodId = response.data
-            this.form.prodAttrIds = this.productForm.attrArray
+            this.form.warehouseInProdAttrIds = this.productForm.attrArray
           } else {
             this.form1.prodId = response.data
-            this.form1.prodAttrIds = this.productForm.attrArray
+            this.form1.warehouseInProdAttrIds = this.productForm.attrArray
           }
           this.productCancel()
         })