|
@@ -111,8 +111,8 @@
|
|
|
:summary-method="getSummaries"
|
|
|
class="detail-table"
|
|
|
>
|
|
|
- <el-table-column prop="goodsId" label="辅材编号" />
|
|
|
- <el-table-column prop="goodsName" label="辅材名称" min-width="180" />
|
|
|
+ <el-table-column prop="goodsId" label="辅材编号" min-width="140" />
|
|
|
+ <el-table-column prop="goodsName" label="辅材名称" min-width="140" />
|
|
|
<el-table-column prop="purchaseQty" label="订货数量" header-align="left" align="center" />
|
|
|
<el-table-column prop="deliverQty" label="供应数量" header-align="left" align="center" />
|
|
|
<el-table-column prop="estimateCost" label="预估进价" header-align="left" align="center" />
|
|
@@ -133,7 +133,7 @@
|
|
|
</el-table-column>
|
|
|
<el-table-column prop="recQty" label="验收数量" header-align="left" align="center" width="100">
|
|
|
<template slot-scope="{ $index, row }">
|
|
|
- <label v-if="inputParam.openType === 'view'">{{ row.recQty + ' /' + row.measureUnit }}</label>
|
|
|
+ <label v-if="inputParam.openType === 'view'">{{ row.recQty + ' /' + row.goodsStockUnit }}</label>
|
|
|
<el-form-item
|
|
|
v-else
|
|
|
style="margin: 18px 0"
|
|
@@ -143,14 +143,14 @@
|
|
|
:rules="dataFormRules.recQty"
|
|
|
>
|
|
|
<el-input v-model="row.recQty" size="mini" @change="changeCostValue($index, row)">
|
|
|
- <template slot="suffix">{{ row.measureUnit }}</template>
|
|
|
+ <template slot="suffix">{{ row.goodsStockUnit }}</template>
|
|
|
</el-input>
|
|
|
</el-form-item>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
<el-table-column prop="recGiftQty" label="赠品数量" header-align="left" align="center">
|
|
|
<template slot-scope="{ $index, row }">
|
|
|
- <label v-if="inputParam.openType === 'view'">{{ row.recGiftQty + ' /' + row.measureUnit }}</label>
|
|
|
+ <label v-if="inputParam.openType === 'view'">{{ row.recGiftQty + ' /' + row.goodsStockUnit }}</label>
|
|
|
<el-form-item
|
|
|
v-else
|
|
|
style="margin: 18px 0"
|
|
@@ -160,7 +160,7 @@
|
|
|
:rules="dataFormRules.recGiftQty"
|
|
|
>
|
|
|
<el-input v-model="row.recGiftQty" size="mini">
|
|
|
- <template slot="suffix">{{ row.measureUnit }}</template>
|
|
|
+ <template slot="suffix">{{ row.goodsStockUnit }}</template>
|
|
|
</el-input>
|
|
|
</el-form-item>
|
|
|
</template>
|
|
@@ -168,19 +168,16 @@
|
|
|
<el-table-column prop="costValue" label="验收金额" header-align="left" align="center" />
|
|
|
<el-table-column prop="inStockQty" label="入库数量" header-align="left" align="center" width="100">
|
|
|
<template slot-scope="{ $index, row }">
|
|
|
- <label>{{ row.inStockQty + ' ' + row.salesUnit }}</label>
|
|
|
+ <label>{{ row.inStockQty }}</label>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
<el-table-column prop="inStockCost" label="入库进价" header-align="left" align="center" width="100">
|
|
|
<template slot-scope="{ $index, row }">
|
|
|
- <label>{{ row.inStockCost + ' 元/' + row.salesUnit }}</label>
|
|
|
+ <label>{{ row.inStockCost + ' 元' }}</label>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
- <el-table-column prop="measureUnit" label="采购单位" />
|
|
|
- <el-table-column prop="unitQty" label="转换系数" header-align="left" align="center" width="95" />
|
|
|
- <el-table-column prop="salesUnit" label="售卖单位" />
|
|
|
- <el-table-column prop="productModel" label="商品型号" />
|
|
|
- <el-table-column prop="specification" label="规格" />
|
|
|
+ <el-table-column prop="goodsStockUnit" label="采购单位" />
|
|
|
+ <el-table-column prop="goodsSpecification" label="规格" />
|
|
|
</el-table>
|
|
|
<el-row>
|
|
|
<el-col :span="24"
|