Commit a1344fd8 by yubin

修bug

parent d5f05998
...@@ -458,7 +458,7 @@ export default { ...@@ -458,7 +458,7 @@ export default {
delete params.pageNum delete params.pageNum
delete params.pageSize delete params.pageSize
this.download('inventory/items/inboundOutbound/export', { ...params }, `出库统计_${new Date().getTime()}.xlsx`) this.download('inventory/items/export', { ...params }, `出库统计_${new Date().getTime()}.xlsx`)
}, },
handleViewDetail(row) { handleViewDetail(row) {
this.currentDetailRow = row this.currentDetailRow = row
......
...@@ -89,9 +89,7 @@ ...@@ -89,9 +89,7 @@
width="100" width="100"
> >
<template slot-scope="scope"> <template slot-scope="scope">
<el-tag size="mini" :type="scope.row.inventoryType === 1 ? 'primary' : 'success'"> <dict-tag v-if="dict.type.inventory_type" :options="dict.type.inventory_type" :value="scope.row.inventoryType"/>
{{ scope.row.inventoryType === 1 ? '正品' : '次品' }}
</el-tag>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="可用数量" width="100"> <el-table-column label="可用数量" width="100">
...@@ -279,7 +277,7 @@ function debounce(fn, delay = 500) { ...@@ -279,7 +277,7 @@ function debounce(fn, delay = 500) {
export default { export default {
name: 'OutboundOrderFormWithItems', name: 'OutboundOrderFormWithItems',
dicts: ['inbound_order_status', 'inbound_order_type', 'inbound_order_item_status', 'label_color'], dicts: ['inbound_order_status', 'inbound_order_type', 'inbound_order_item_status', 'label_color','inventory_type'],
components: { components: {
MaterialSelector MaterialSelector
}, },
......
...@@ -317,7 +317,7 @@ ...@@ -317,7 +317,7 @@
v-for="item in dict.type.order_type" v-for="item in dict.type.order_type"
:key="item.value" :key="item.value"
:label="item.label" :label="item.label"
:value="Number(item.value)" :value="item.value"
> >
<span style="margin-left: 8px;">{{ item.label }}</span> <span style="margin-left: 8px;">{{ item.label }}</span>
</el-option> </el-option>
...@@ -455,7 +455,7 @@ ...@@ -455,7 +455,7 @@
<el-table-column label="库位编号" prop="locationName" width="150" /> <el-table-column label="库位编号" prop="locationName" width="150" />
<el-table-column label="批次编号" prop="batchCode" width="150" /> <el-table-column label="批次编号" prop="batchCode" width="150" />
<el-table-column label="计划数量" prop="plannedQuantity" width="150" fixed="right"/> <el-table-column label="计划数量" prop="plannedQuantity" width="150"/>
<el-table-column label="实际数量" prop="actualQuantity" width="150" fixed="right"/> <el-table-column label="实际数量" prop="actualQuantity" width="150" fixed="right"/>
<el-table-column label="约数" prop="divisor" width="150"></el-table-column> <el-table-column label="约数" prop="divisor" width="150"></el-table-column>
<el-table-column label="标签颜色" prop="labelColor" width="150"> <el-table-column label="标签颜色" prop="labelColor" width="150">
...@@ -463,7 +463,7 @@ ...@@ -463,7 +463,7 @@
<dict-tag v-if="dict.type.label_color" :options="dict.type.label_color" :value="scope.row.labelColor"/> <dict-tag v-if="dict.type.label_color" :options="dict.type.label_color" :value="scope.row.labelColor"/>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="单价(元)" prop="unitPrice" width="150" /> <el-table-column label="单价(元)" prop="unitPrice" width="150" fixed="right" />
<el-table-column label="凭证号" prop="voucherNumber" width="150" /> <el-table-column label="凭证号" prop="voucherNumber" width="150" />
<el-table-column label="发货方" prop="shippedBy" width="150" /> <el-table-column label="发货方" prop="shippedBy" width="150" />
<el-table-column label="备注" prop="remark" width="150" /> <el-table-column label="备注" prop="remark" width="150" />
......
...@@ -209,7 +209,7 @@ ...@@ -209,7 +209,7 @@
v-for="dict in dict.type.owner_type" v-for="dict in dict.type.owner_type"
:key="dict.value" :key="dict.value"
:label="dict.label" :label="dict.label"
:value="dict.value" :value="Number(dict.value)"
></el-option> ></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论