修复bug，重货提示待完善

src/views/ecw/order/edit.vue

@@ -811,6 +811,9 @@ export default {
             })
         }
     },
+    'form.isCargoControl'(isCargoControl){
+        this.$set(this.form, 'drawee', isCargoControl ? 1 : 2)
+    },
     /* 'form.orderItemVOList'(){
         console.log('form.orderItemVOList', this.form.orderItemVOList.length, this.form.orderItemVOList)
     }, */

src/views/ecw/order/index.vue

@@ -146,8 +146,19 @@
       <el-table-column :label="$t('体积/重量')" align="center" prop="sumWeight">
         <template slot-scope="{row}">
           <!--入仓前是填单数据，入仓后是入仓数据-->
-          <template v-if="row.inWarehouseState <= 1">{{row.costVO.totalVolume}}m³ /{{row.costVO.totalWeight}}Kg</template>
-          <template v-else>{{row.sumVolume}}m³ /{{row.sumWeight}}Kg</template>
+          {{row.orderType ==  2}}
+          <el-tooltip
+          :is="row.orderType ==  2 ? 'el-tooltip' : 'div'"
+          class="item" effect="dark"
+          :content="(row.wvolume||0)+'m³'"
+          placement="bottom">
+            <div v-if="row.inWarehouseState <= 1">{{row.costVO.totalVolume}}m³ /{{row.costVO.totalWeight}}Kg</div>
+            <div v-else>{{row.sumVolume}}m³ /{{row.sumWeight}}Kg</div>
+          </el-tooltip>
+          <!-- <el-tooltip v-if="scope.row.orderExceptionType=='order_heavy_cargo_exception'" class="item" effect="dark" :content="(scope.row.wvolume||0)+'m³'" placement="bottom">
+            <span style="color:#ff4949" v-if="scope.row.orderStatus >= 5 ">{{scope.row.volume+"m³/"+scope.row.weight+"kg"}}</span>
+            <span style="color:#ff4949" v-else>{{scope.row.totalVolume+"m³/"+scope.row.totalWeight+"kg"}}</span>
+          </el-tooltip> -->
         </template>
       </el-table-column>
       <el-table-column :label="$t('始发仓')" align="center" prop="startWarehouseName">

src/views/ecw/order/special/Commission.vue

@@ -213,7 +213,6 @@ export default {
         this.$set(this.form, 'shadeCommissionAmount', 0)
       }
       
-      
       // 暗佣需要查询暗佣设置
       if(val == 2){
         this.getCommission()

src/views/ecw/productPrice/edit.vue

@@ -471,20 +471,22 @@ export default {
     getCurrencyList().then(res => this.currencyList = res.data)
     getUnitList().then(res => this.unitList = res.data)
 
-    if(!this.form.specialList){
+    if(!this.form.specialList || !this.form.specialList.length){
+      console.log('specialList默认给[]')
       this.$set(this.form, 'specialList', [])
-    }
-    this.getDictDatas(this.DICT_TYPE.ECW_SPECIAL_REQ_FOR_LINE_PRODUCTS).forEach(item => {
-      this.form.specialList.push({
-        "clearancePrice": !this.$route.query.action ? 0 : null, // 新建默认给0，否则默认是null
-        "clearancePriceUnit": null,
-        "clearanceVolumeUnit": null,
-        "specialDictType": item.value,
-        "transportPrice": !this.$route.query.action ? 0 : null, // 新建默认给0，否则默认是null
-        "transportPriceUnit": null,
-        "transportVolumeUnit": null,
+      this.getDictDatas(this.DICT_TYPE.ECW_SPECIAL_REQ_FOR_LINE_PRODUCTS).forEach(item => {
+        this.form.specialList.push({
+          "clearancePrice": !this.$route.query.action ? 0 : null, // 新建默认给0，否则默认是null
+          "clearancePriceUnit": null,
+          "clearanceVolumeUnit": null,
+          "specialDictType": item.value,
+          "transportPrice": !this.$route.query.action ? 0 : null, // 新建默认给0，否则默认是null
+          "transportPriceUnit": null,
+          "transportVolumeUnit": null,
+        })
       })
-    })
+    }
+    
   },
   methods: {
     priceValidator(rule, value, callback){
@@ -522,7 +524,7 @@ export default {
         }
         let data = Object.assign({}, this.form, {
           // lineChannelList: this.selectedRoutes,
-          specialList: this.specialProducts,
+          // specialList: this.specialProducts,
           isAllProduct: 0
         })
         if(this.form.stepPrice != 1){