良品数
@@ -276,6 +288,8 @@ export default {
num: null,
defectNum: null,
totalAmount: 0,
+ surface: null,
+ color: null,
orderProdList: [],
userProdList: [],
...data
diff --git a/src/views/yh/report/edit/components/ReportProductRowEdit.vue b/src/views/yh/report/edit/components/ReportProductRowEdit.vue
index 88e80ef..27aaef0 100644
--- a/src/views/yh/report/edit/components/ReportProductRowEdit.vue
+++ b/src/views/yh/report/edit/components/ReportProductRowEdit.vue
@@ -28,6 +28,12 @@
{{ row.totalAmount | dv }} 元
+
+
+
+
+
+
{{row.priceUnit}}
diff --git a/src/views/yh/reportProd/index.vue b/src/views/yh/reportProd/index.vue
index 24b4ba6..e026935 100644
--- a/src/views/yh/reportProd/index.vue
+++ b/src/views/yh/reportProd/index.vue
@@ -78,6 +78,8 @@
{{d.row.pricePattern | dv}}
{{d.row.priceSpec | dv}}
{{d.row.priceClassify | dv}}
+ {{d.row.surface | dv}}
+ {{d.row.color | dv}}
{{formatFraction(d.row.priceQuantityNumerator, d.row.priceQuantityDenominator)}}
@@ -277,6 +279,8 @@ export default {
{key: 'priceName', visible: true, label: '工序', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
{key: 'priceSubName', visible: true, label: '子工序', minWidth: null, sortable: true, overflow: false, align: 'center', width: "100"},
{key: 'priceType', visible: true, label: '类型', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
+ {key: 'surface', visible: false, label: '表面处理', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
+ {key: 'color', visible: false, label: '颜色', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
{key: 'num', visible: true, label: '良品', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
{key: 'defectNum', visible: true, label: '不良品', minWidth: null, sortable: true, overflow: false, align: 'center', width: "100"},
{key: 'priceUnit', visible: true, label: '单位', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},