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

src/views/ecw/customer/query.vue

@@ -164,8 +164,20 @@
                 <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>
+<!--                    <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>-->
+                    <component
+                      :is="row.orderType ==  2 ? 'el-tooltip' : 'div'"
+                      class="item"
+                      :style="{
+            color: row.orderType ==  2 ? 'red' : null
+          }"
+                      effect="dark"
+                      :content="(row.wvolume||0)+'m³'"
+                      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>
                   </template>
                 </el-table-column>
                 <el-table-column :label="$t('始发仓')" align="center" prop="startWarehouseName">