Commit 8b7f71f4 authored by dcy's avatar dcy

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

parents d7828b8f 91b21e55
...@@ -58,6 +58,7 @@ ...@@ -58,6 +58,7 @@
v-slot="{row}" v-slot="{row}"
label="状态"> label="状态">
<dict-tag v-if="row.warehouseInInfoVO && row.warehouseInInfoVO.diffType" :type="DICT_TYPE.ORDER_WAREHOUSE_IN_STATUS" :value="row.warehouseInInfoVO.diffType" class="red" :class="{green: row.warehouseInInfoVO.diffType === 4}"/> <dict-tag v-if="row.warehouseInInfoVO && row.warehouseInInfoVO.diffType" :type="DICT_TYPE.ORDER_WAREHOUSE_IN_STATUS" :value="row.warehouseInInfoVO.diffType" class="red" :class="{green: row.warehouseInInfoVO.diffType === 4}"/>
<span class="red" v-show="row.warehouseInInfoVO.cartonsNumDiff">{{ row.warehouseInInfoVO.cartonsNumDiff }}箱</span>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="address" prop="address"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment