订单列表泡货标红并显示泡重

src/views/ecw/order/index.vue

@@ -195,13 +195,13 @@
         <template slot-scope="{row}">
           <!--入仓前是填单数据，入仓后是入仓数据，装柜审核通过等状态inwarehouseState会变成0，所以只能通过sumNum来判断-->
           <component
-          :is="row.orderType ==  2 ? 'el-tooltip' : 'div'"
+          :is="row.orderType > 1 ? 'el-tooltip' : 'div'"
           class="item"
           :style="{
-            color: row.orderType ==  2 ? 'red' : null
+            color: row.orderType > 1 ? 'red' : null
           }"
           effect="dark"
-          :content="(row.wvolume||0)+'m³'"
+          :content="row.orderType===2 ? (row.wvolume||0)+'m³' : (row.vweight || 0) + 'kg'"
           placement="bottom">
             <div v-if="row.sumNum > 0">{{row.sumVolume}}m³ /{{row.sumWeight}}Kg</div>
             <div v-else>{{row.costVO.totalVolume}}m³ /{{row.costVO.totalWeight}}Kg</div>

src/views/ecw/order/penddingList.vue

@@ -136,14 +136,14 @@
         <template slot-scope="{row}">
           <!--入仓前是填单数据，入仓后是入仓数据，装柜审核通过等状态inwarehouseState会变成0，所以只能通过sumNum来判断-->
           <component
-          :is="row.orderType ==  2 ? 'el-tooltip' : 'div'"
-          class="item"
-          :style="{
-            color: row.orderType ==  2 ? 'red' : null
+            :is="row.orderType > 1 ? 'el-tooltip' : 'div'"
+            class="item"
+            :style="{
+            color: row.orderType > 1 ? 'red' : null
           }"
-          effect="dark"
-          :content="(row.wvolume||0)+'m³'"
-          placement="bottom">
+            effect="dark"
+            :content="row.orderType===2 ? (row.wvolume||0)+'m³' : (row.vweight || 0) + 'kg'"
+            placement="bottom">
             <div v-if="row.sumNum > 0">{{row.sumVolume}}m³ /{{row.sumWeight}}Kg</div>
             <div v-else>{{row.costVO.totalVolume}}m³ /{{row.costVO.totalWeight}}Kg</div>
           </component>

src/views/ecw/order/stockingList.vue

@@ -134,14 +134,14 @@
         <template slot-scope="{row}">
           <!--入仓前是填单数据，入仓后是入仓数据，装柜审核通过等状态inwarehouseState会变成0，所以只能通过sumNum来判断-->
           <component
-          :is="row.orderType ==  2 ? 'el-tooltip' : 'div'"
-          class="item"
-          :style="{
-            color: row.orderType ==  2 ? 'red' : null
+            :is="row.orderType > 1 ? 'el-tooltip' : 'div'"
+            class="item"
+            :style="{
+            color: row.orderType > 1 ? 'red' : null
           }"
-          effect="dark"
-          :content="(row.wvolume||0)+'m³'"
-          placement="bottom">
+            effect="dark"
+            :content="row.orderType===2 ? (row.wvolume||0)+'m³' : (row.vweight || 0) + 'kg'"
+            placement="bottom">
             <div v-if="row.sumNum > 0">{{row.sumVolume}}m³ /{{row.sumWeight}}Kg</div>
             <div v-else>{{row.costVO.totalVolume}}m³ /{{row.costVO.totalWeight}}Kg</div>
           </component>