|
@@ -89,6 +89,7 @@
|
|
<!-- 售价 -->
|
|
<!-- 售价 -->
|
|
<template slot="price" slot-scope="text, record">
|
|
<template slot="price" slot-scope="text, record">
|
|
<editable-cell
|
|
<editable-cell
|
|
|
|
+ size="small"
|
|
:text="record.price"
|
|
:text="record.price"
|
|
id="salesEdit-price"
|
|
id="salesEdit-price"
|
|
:max="999999"
|
|
:max="999999"
|
|
@@ -100,6 +101,7 @@
|
|
<!-- 销售数量 -->
|
|
<!-- 销售数量 -->
|
|
<template slot="salesNums" slot-scope="text, record">
|
|
<template slot="salesNums" slot-scope="text, record">
|
|
<editable-cell
|
|
<editable-cell
|
|
|
|
+ size="small"
|
|
:text="record.qty"
|
|
:text="record.qty"
|
|
id="salesEdit-salesNums"
|
|
id="salesEdit-salesNums"
|
|
:max="999999"
|
|
:max="999999"
|
|
@@ -164,11 +166,11 @@ export default {
|
|
columns: [
|
|
columns: [
|
|
{ title: '序号', dataIndex: 'no', width: 80, align: 'center' },
|
|
{ title: '序号', dataIndex: 'no', width: 80, align: 'center' },
|
|
{ title: '产品编码', dataIndex: 'dealerProductEntity.code', scopedSlots: { customRender: 'productCode' }, width: 140, align: 'center', sorter: true },
|
|
{ title: '产品编码', dataIndex: 'dealerProductEntity.code', scopedSlots: { customRender: 'productCode' }, width: 140, align: 'center', sorter: true },
|
|
- { title: '产品名称', dataIndex: 'dealerProductEntity.name', align: 'center' },
|
|
|
|
- { title: '原厂编码', dataIndex: 'dealerProductEntity.origCode', width: 140, align: 'center' },
|
|
|
|
- { title: '品牌', dataIndex: 'dealerProductEntity.productBrandName', width: 100, align: 'center', sorter: true },
|
|
|
|
- { title: '仓库', dataIndex: 'warehouseEntity.name', width: 100, align: 'center', sorter: true },
|
|
|
|
- { title: '仓位', dataIndex: 'warehouseLocationEntity.name', width: 100, align: 'center' },
|
|
|
|
|
|
+ { title: '产品名称', dataIndex: 'dealerProductEntity.name', align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
|
+ { title: '原厂编码', dataIndex: 'dealerProductEntity.origCode', width: 140, align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
|
+ { title: '品牌', dataIndex: 'dealerProductEntity.productBrandName', width: 100, align: 'center', sorter: true, customRender: function (text) { return text || '--' } },
|
|
|
|
+ { title: '仓库', dataIndex: 'warehouseEntity.name', width: 100, align: 'center', sorter: true, customRender: function (text) { return text || '--' } },
|
|
|
|
+ { title: '仓位', dataIndex: 'warehouseLocationEntity.name', width: 100, align: 'center', customRender: function (text) { return text || '--' } },
|
|
{ title: '售价', scopedSlots: { customRender: 'price' }, width: 150, align: 'center' },
|
|
{ title: '售价', scopedSlots: { customRender: 'price' }, width: 150, align: 'center' },
|
|
{ title: '销售数量', scopedSlots: { customRender: 'salesNums' }, width: 150, align: 'center' },
|
|
{ title: '销售数量', scopedSlots: { customRender: 'salesNums' }, width: 150, align: 'center' },
|
|
{ title: '单位', dataIndex: 'dealerProductEntity.unit', width: 100, align: 'center', customRender: function (text) { return text || '--' } },
|
|
{ title: '单位', dataIndex: 'dealerProductEntity.unit', width: 100, align: 'center', customRender: function (text) { return text || '--' } },
|
|
@@ -337,7 +339,9 @@ export default {
|
|
salesDetailInsert({
|
|
salesDetailInsert({
|
|
buyerSn: this.detailData.buyerSn,
|
|
buyerSn: this.detailData.buyerSn,
|
|
productSn: row.productSn,
|
|
productSn: row.productSn,
|
|
- price: row.dealerProduct.cityPrice,
|
|
|
|
|
|
+ // productCode: row.productCode,
|
|
|
|
+ // productOrigCode: row.productOrigCode,
|
|
|
|
+ price: row.salePrice,
|
|
qty: row.salesNums,
|
|
qty: row.salesNums,
|
|
salesBillSn: this.detailData.salesBillSn,
|
|
salesBillSn: this.detailData.salesBillSn,
|
|
salesBillNo: this.detailData.salesBillNo,
|
|
salesBillNo: this.detailData.salesBillNo,
|