diff --git a/src/components/Business/ProdOrder/ProdOrderNewDrawer.vue b/src/components/Business/ProdOrder/ProdOrderNewDrawer.vue index 77bb643..d5d9b59 100644 --- a/src/components/Business/ProdOrder/ProdOrderNewDrawer.vue +++ b/src/components/Business/ProdOrder/ProdOrderNewDrawer.vue @@ -65,6 +65,14 @@
计划跟踪号:
{{ item.erpMtoNo | dv}}
+
+
颜色:
+
{{ item.fauxProp | dv}}
+
+
+
数量:
+
{{ item.erpQty | dv}} {{item.unitName}}
+
diff --git a/src/views/yh/logImport/index.vue b/src/views/yh/logImport/index.vue index 28ad539..72d788c 100644 --- a/src/views/yh/logImport/index.vue +++ b/src/views/yh/logImport/index.vue @@ -246,9 +246,9 @@ export default { {key: 'createTime', visible: true, label: '创建时间', minWidth: null, sortable: true, overflow: false, align: 'center', width: "180"}, {key: 'finishedTime', visible: true, label: '完成时间', minWidth: null, sortable: false, overflow: false, align: 'center', width: "180"}, {key: 'seconds', visible: true, label: '耗时', minWidth: null, sortable: false, overflow: false, align: 'center', width: null}, - {key: 'addCount', visible: true, label: '新增', minWidth: null, sortable: false, overflow: false, align: 'center', width: "80"}, - {key: 'updateCount', visible: true, label: '修改', minWidth: null, sortable: false, overflow: false, align: 'center', width: "80"}, - {key: 'failCount', visible: true, label: '失败', minWidth: null, sortable: false, overflow: false, align: 'center', width: "80"}, + // {key: 'addCount', visible: true, label: '新增', minWidth: null, sortable: false, overflow: false, align: 'center', width: "80"}, + // {key: 'updateCount', visible: true, label: '修改', minWidth: null, sortable: false, overflow: false, align: 'center', width: "80"}, + // {key: 'failCount', visible: true, label: '失败', minWidth: null, sortable: false, overflow: false, align: 'center', width: "80"}, ], // 排序方式 orderSorts: ['ascending', 'descending', null], diff --git a/src/views/yh/prodOrder/index.vue b/src/views/yh/prodOrder/index.vue index 08545b8..1116f2a 100644 --- a/src/views/yh/prodOrder/index.vue +++ b/src/views/yh/prodOrder/index.vue @@ -229,7 +229,7 @@ export default { {key: 'erpDocumentStatus', visible: false, label: '单据', minWidth: null, sortable: true, overflow: false, align: 'center', width: "80"}, {key: 'erpDescription', visible: false, label: '主备注', minWidth: null, sortable: true, overflow: false, align: 'center', width: null}, {key: 'materialNumber', visible: true, label: '物料', minWidth: null, sortable: false, overflow: false, align: 'center', width: null}, - {key: 'fauxPropId', visible: true, label: '辅助属性', minWidth: null, sortable: true, overflow: true, align: 'center', width: null}, + {key: 'fauxProp', visible: true, label: '辅助属性', minWidth: null, sortable: true, overflow: true, align: 'center', width: null}, {key: 'workShopName', visible: true, label: '车间', minWidth: null, sortable: true, overflow: false, align: 'center', width: "100"}, {key: 'erpIsRework', visible: true, label: '返工', minWidth: null, sortable: true, overflow: false, align: 'center', width: "80"}, {key: 'percentage', visible: true, label: '进度', minWidth: null, sortable: false, overflow: false, align: 'left', width: "120"}, diff --git a/src/views/yh/reportOrderProd/index.vue b/src/views/yh/reportOrderProd/index.vue index 38ae76b..e7ea67e 100644 --- a/src/views/yh/reportOrderProd/index.vue +++ b/src/views/yh/reportOrderProd/index.vue @@ -202,6 +202,7 @@ export default { {key: 'id', visible: false, label: 'ID', minWidth: null, sortable: true, overflow: false, align: 'center', width: "100"}, {key: 'orderErpMtoNo', visible: true, label: '计划跟踪号', minWidth: null, sortable: true, overflow: false, align: 'center', width: null}, {key: 'orderErpBillNo', visible: true, label: '生产订单', minWidth: null, sortable: true, overflow: false, align: 'center', width: null}, + {key: 'orderFauxProp', visible: true, label: '辅助属性', minWidth: null, sortable: true, overflow: false, align: 'center', width: null}, {key: 'reportId', visible: false, label: '报表编号', minWidth: null, sortable: true, overflow: false, align: 'center', width: "100"}, {key: 'reportDeptName', visible: true, label: '车间', minWidth: null, sortable: true, overflow: false, align: 'center', width: null}, {key: 'reportDate', visible: true, label: '日期', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},