|
@ -114,14 +114,14 @@ |
|
|
<el-popover placement="right" trigger="click" width="500"> |
|
|
<el-popover placement="right" trigger="click" width="500"> |
|
|
<div> |
|
|
<div> |
|
|
<el-table :data="commodityData" v-loading="commodityLoading" highlight-current-row @current-change="commodityCurrentChange($event, scope.row)"> |
|
|
<el-table :data="commodityData" v-loading="commodityLoading" highlight-current-row @current-change="commodityCurrentChange($event, scope.row)"> |
|
|
<el-table-column fixed prop="goodsSpuName" label="商品名称" align="center" /> |
|
|
<el-table-column fixed prop="goodsSkuTitle" label="商品名称" align="center" /> |
|
|
<el-table-column prop="goodsSkuCode" label="图号" align="center" /> |
|
|
<el-table-column prop="goodsSkuCode" label="图号" align="center" /> |
|
|
<el-table-column prop="goodsSkuOwnSpec" label="规格" align="center" /> |
|
|
<el-table-column prop="goodsSkuOwnSpec" label="规格" align="center" /> |
|
|
<el-table-column prop="unit" label="单位" align="center" /> |
|
|
<el-table-column prop="unit" label="单位" align="center" /> |
|
|
</el-table> |
|
|
</el-table> |
|
|
<el-pagination :page.sync="commodityQuery.current" :page-size="commodityQuery.size" layout="total, pager" :total="commodityQuery.total" /> |
|
|
<el-pagination :page.sync="commodityQuery.current" :page-size="commodityQuery.size" layout="total, pager" :total="commodityQuery.total" /> |
|
|
</div> |
|
|
</div> |
|
|
<el-input slot="reference" v-model="scope.row.goodsSpuName" @input="commodityInput(scope.row.goodsSpuName)" clearable placeholder="商品名称"/> |
|
|
<el-input slot="reference" v-model="scope.row.goodsSkuTitle" @input="commodityInput(scope.row.goodsSkuTitle)" clearable placeholder="商品名称"/> |
|
|
</el-popover> |
|
|
</el-popover> |
|
|
</template> |
|
|
</template> |
|
|
</el-table-column> |
|
|
</el-table-column> |
|
@ -390,7 +390,7 @@ export default { |
|
|
let clf = '0' |
|
|
let clf = '0' |
|
|
if (this.formobj.goodsVos.length > 0) { |
|
|
if (this.formobj.goodsVos.length > 0) { |
|
|
this.formobj.goodsVos.forEach((e) => { |
|
|
this.formobj.goodsVos.forEach((e) => { |
|
|
if (e.goodsSpuName !== '') { |
|
|
if (e.goodsSkuTitle !== '') { |
|
|
clf = Math.round((parseFloat(clf) + (parseFloat(e.price !== '' ? e.price : '0') * parseFloat(e.count !== '' ? e.count : '0'))) * 100) / 100 |
|
|
clf = Math.round((parseFloat(clf) + (parseFloat(e.price !== '' ? e.price : '0') * parseFloat(e.count !== '' ? e.count : '0'))) * 100) / 100 |
|
|
} |
|
|
} |
|
|
}) |
|
|
}) |
|
@ -610,6 +610,7 @@ export default { |
|
|
goodsSpuName: '', // 商品名称 |
|
|
goodsSpuName: '', // 商品名称 |
|
|
goodsSkuCode: '', // 商品编码(图号) |
|
|
goodsSkuCode: '', // 商品编码(图号) |
|
|
goodsSkuOwnSpec: '', // 规格型号 |
|
|
goodsSkuOwnSpec: '', // 规格型号 |
|
|
|
|
|
goodsSkuTitle: '', // 商品名称 |
|
|
unit: '', // 计量单位 |
|
|
unit: '', // 计量单位 |
|
|
warehouseName: '', // 仓库名称 |
|
|
warehouseName: '', // 仓库名称 |
|
|
warehouseSid: '', |
|
|
warehouseSid: '', |
|
@ -656,6 +657,7 @@ export default { |
|
|
row.goodsSkuSid = value.goodsSkuSid |
|
|
row.goodsSkuSid = value.goodsSkuSid |
|
|
row.goodsSpuName = value.goodsSpuName |
|
|
row.goodsSpuName = value.goodsSpuName |
|
|
row.goodsSkuCode = value.goodsSkuCode |
|
|
row.goodsSkuCode = value.goodsSkuCode |
|
|
|
|
|
row.goodsSkuTitle = value.goodsSkuTitle |
|
|
row.goodsSkuOwnSpec = value.goodsSkuOwnSpec |
|
|
row.goodsSkuOwnSpec = value.goodsSkuOwnSpec |
|
|
row.unit = value.unit |
|
|
row.unit = value.unit |
|
|
row.warehouseName = value.warehouseName |
|
|
row.warehouseName = value.warehouseName |
|
|