diff --git a/src/views/modules/schedule/com_schedule_order_expand.vue b/src/views/modules/schedule/com_schedule_order_expand.vue
index db7ff3b..66ce357 100644
--- a/src/views/modules/schedule/com_schedule_order_expand.vue
+++ b/src/views/modules/schedule/com_schedule_order_expand.vue
@@ -612,10 +612,10 @@ export default {
{
userId: this.$store.state.user.name,
functionId: 5301,
- serialNumber: '5301ScheduleQtyRequired',
+ serialNumber: '5301ScheduleQtyToReport',
tableId: "5301Schedule",
tableName: "排产明细表",
- columnProp: "qtyRequired",
+ columnProp: "qtyToReport",
headerAlign: "center",
align: "right",
columnLabel: "未完数量",
diff --git a/src/views/modules/schedule/order_schedule_expand.vue b/src/views/modules/schedule/order_schedule_expand.vue
index 6fe61ec..ff28d94 100644
--- a/src/views/modules/schedule/order_schedule_expand.vue
+++ b/src/views/modules/schedule/order_schedule_expand.vue
@@ -560,14 +560,14 @@ export default {
{
userId: this.$store.state.user.name,
functionId: 5301,
- serialNumber: '5301OrderCustomerName',
+ serialNumber: '5301OrderLotSize',
tableId: "5301Order",
tableName: "工单表",
- columnProp: "customerName",
+ columnProp: "lotSize",
headerAlign: "center",
- align: "left",
- columnLabel: "客户名称",
- columnWidth: 120,
+ align: "right",
+ columnLabel: "订单量",
+ columnWidth: 80,
columnHidden: false,
columnImage: false,
columnSortable: true,
@@ -578,14 +578,14 @@ export default {
{
userId: this.$store.state.user.name,
functionId: 5301,
- serialNumber: '5301OrderCustPartNo',
+ serialNumber: '5301OrderQtyToSchedule',
tableId: "5301Order",
tableName: "工单表",
- columnProp: "custPartNo",
+ columnProp: "qtyToSchedule",
headerAlign: "center",
- align: "left",
- columnLabel: "客户产品料号",
- columnWidth: 120,
+ align: "center",
+ columnLabel: "可排产数",
+ columnWidth: 80,
columnHidden: false,
columnImage: false,
columnSortable: true,
@@ -596,13 +596,13 @@ export default {
{
userId: this.$store.state.user.name,
functionId: 5301,
- serialNumber: '5301OrderLotSize',
+ serialNumber: '5301OrderQtyScheduled',
tableId: "5301Order",
tableName: "工单表",
- columnProp: "lotSize",
+ columnProp: "qtyScheduled",
headerAlign: "center",
align: "right",
- columnLabel: "订单量",
+ columnLabel: "已排产数",
columnWidth: 80,
columnHidden: false,
columnImage: false,
@@ -614,13 +614,13 @@ export default {
{
userId: this.$store.state.user.name,
functionId: 5301,
- serialNumber: '5301OrderQtyToSchedule',
+ serialNumber: '5301OrderQtyReported',
tableId: "5301Order",
tableName: "工单表",
- columnProp: "qtyToSchedule",
+ columnProp: "qtyReported",
headerAlign: "center",
- align: "center",
- columnLabel: "可排产数",
+ align: "right",
+ columnLabel: "完工数量",
columnWidth: 80,
columnHidden: false,
columnImage: false,
@@ -632,14 +632,32 @@ export default {
{
userId: this.$store.state.user.name,
functionId: 5301,
- serialNumber: '5301OrderQtyScheduled',
+ serialNumber: '5301OrderAvailResource',
tableId: "5301Order",
tableName: "工单表",
- columnProp: "qtyScheduled",
+ columnProp: "availResource",
headerAlign: "center",
- align: "right",
- columnLabel: "已排产数",
- columnWidth: 80,
+ align: "left",
+ columnLabel: "可用机台",
+ columnWidth: 200,
+ columnHidden: false,
+ columnImage: false,
+ columnSortable: false,
+ sortLv: 0,
+ status: true,
+ fixed: false
+ },
+ {
+ userId: this.$store.state.user.name,
+ functionId: 5301,
+ serialNumber: '5301OrderCustomerName',
+ tableId: "5301Order",
+ tableName: "工单表",
+ columnProp: "customerName",
+ headerAlign: "center",
+ align: "left",
+ columnLabel: "客户名称",
+ columnWidth: 120,
columnHidden: false,
columnImage: false,
columnSortable: true,
@@ -650,14 +668,14 @@ export default {
{
userId: this.$store.state.user.name,
functionId: 5301,
- serialNumber: '5301OrderQtyReported',
+ serialNumber: '5301OrderCustPartNo',
tableId: "5301Order",
tableName: "工单表",
- columnProp: "qtyReported",
+ columnProp: "custPartNo",
headerAlign: "center",
- align: "right",
- columnLabel: "完工数量",
- columnWidth: 80,
+ align: "left",
+ columnLabel: "客户料号",
+ columnWidth: 120,
columnHidden: false,
columnImage: false,
columnSortable: true,
@@ -827,24 +845,6 @@ export default {
status: true,
fixed: false
},
- {
- userId: this.$store.state.user.name,
- functionId: 5301,
- serialNumber: '5301OrderAvailResource',
- tableId: "5301Order",
- tableName: "工单表",
- columnProp: "availResource",
- headerAlign: "center",
- align: "left",
- columnLabel: "可用机台",
- columnWidth: 120,
- columnHidden: false,
- columnImage: false,
- columnSortable: false,
- sortLv: 0,
- status: true,
- fixed: false
- },
{
userId: this.$store.state.user.name,
functionId: 5301,
@@ -1479,11 +1479,11 @@ export default {
/*设置当前行的下标*/
routingRowClassName({row, rowIndex}) {
- row.index = rowIndex;
- //判断当前行颜色参数
- if (row.qtyScheduled > 0) {
- return 'customer-row-gray';
- }
+ // row.index = rowIndex;
+ // //判断当前行颜色参数
+ // if (row.qtyScheduled > 0) {
+ // return 'customer-row-gray';
+ // }
},
/*设置工艺的行*/
@@ -1757,12 +1757,12 @@ div.customer-el-card-blue {
/*灰色的表格行背景颜色*/
.customer-css /deep/ tr.customer-row-gray:hover {
- background: #7e819e;
+ background: #bce3ef;
}
/*灰色的表格行背景颜色*/
.customer-css /deep/ tr.customer-row-gray > td {
- background: #7e819e;
+ background: #bce3ef;
}
/*去掉悬浮的样式*/
diff --git a/src/views/modules/shopOrder/productionOrderScheduling/searchProductionDispatchList.vue b/src/views/modules/shopOrder/productionOrderScheduling/searchProductionDispatchList.vue
index d5b574a..81b2108 100644
--- a/src/views/modules/shopOrder/productionOrderScheduling/searchProductionDispatchList.vue
+++ b/src/views/modules/shopOrder/productionOrderScheduling/searchProductionDispatchList.vue
@@ -447,20 +447,20 @@ export default {
{
userId: this.$store.state.user.name,
functionId: 6023,
- serialNumber: '6023TableLotSize',
+ serialNumber: '6023TableQtyRequiredOriginal',
tableId: "6023Table",
tableName: "查询生产派工单表",
- columnProp: "lotSize",
+ columnProp: "LotSize",
headerAlign: "center",
align: "right",
- columnLabel: "未完数量",
+ columnLabel: "需求数量",
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: '',
- columnWidth: 80
+ columnWidth: 100
},
{
userId: this.$store.state.user.name,
@@ -480,6 +480,24 @@ export default {
fixed: '',
columnWidth: 80
},
+ {
+ userId: this.$store.state.user.name,
+ functionId: 6023,
+ serialNumber: '6023TableLotSize',
+ tableId: "6023Table",
+ tableName: "查询生产派工单表",
+ columnProp: "qtyToReport",
+ headerAlign: "center",
+ align: "right",
+ columnLabel: "未完数量",
+ columnHidden: false,
+ columnImage: false,
+ columnSortable: false,
+ sortLv: 0,
+ status: true,
+ fixed: '',
+ columnWidth: 80
+ },
{
userId: this.$store.state.user.name,
functionId: 6023,
@@ -858,24 +876,6 @@ export default {
fixed: '',
columnWidth: 60
},
- {
- userId: this.$store.state.user.name,
- functionId: 6023,
- serialNumber: '6023TableQtyRequiredOriginal',
- tableId: "6023Table",
- tableName: "查询生产派工单表",
- columnProp: "qtyRequiredOriginal",
- headerAlign: "center",
- align: "right",
- columnLabel: "派工单需求数量",
- columnHidden: false,
- columnImage: false,
- columnSortable: false,
- sortLv: 0,
- status: true,
- fixed: '',
- columnWidth: 100
- },
{
userId: this.$store.state.user.name,
functionId: 6023,
diff --git a/src/views/modules/yieldReport/produce_order.vue b/src/views/modules/yieldReport/produce_order.vue
index ece5f53..79fe30e 100644
--- a/src/views/modules/yieldReport/produce_order.vue
+++ b/src/views/modules/yieldReport/produce_order.vue
@@ -15,36 +15,6 @@
style="margin-left: 10px; margin-bottom: 5px;">{{ buttons.reportButton }}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -53,7 +23,7 @@
- 机台编号:
+ 机台编号:
@@ -373,14 +343,14 @@ export default {
{
userId: this.$store.state.user.name,
functionId: 5302,
- serialNumber: '5302ProducePreResourceInfo',
+ serialNumber: '5302ProduceOrderNo',
tableId: '5302Produce',
tableName: '待生产工单',
- columnProp: 'preResourceInfo',
+ columnProp: 'orderNo',
headerAlign: 'center',
align: 'left',
- columnLabel: '上工序机台信息',
- columnWidth: 100,
+ columnLabel: '生产订单号',
+ columnWidth: 120,
columnHidden: false,
columnImage: false,
columnSortable: false,
@@ -391,14 +361,14 @@ export default {
{
userId: this.$store.state.user.name,
functionId: 5302,
- serialNumber: '5302ProducePreQtyFinished',
+ serialNumber: '5302ProduceSeqNo',
tableId: '5302Produce',
tableName: '待生产工单',
- columnProp: 'preQtyFinished',
+ columnProp: 'seqNo',
headerAlign: 'center',
- align: 'right',
- columnLabel: '上工序完工数',
- columnWidth: 100,
+ align: 'left',
+ columnLabel: '派工单号',
+ columnWidth: 80,
columnHidden: false,
columnImage: false,
columnSortable: false,
@@ -409,14 +379,14 @@ export default {
{
userId: this.$store.state.user.name,
functionId: 5302,
- serialNumber: '5302ProducePlanStartTime',
+ serialNumber: '5302ProduceItemNo',
tableId: '5302Produce',
tableName: '待生产工单',
- columnProp: 'planStartTime',
+ columnProp: 'itemNo',
headerAlign: 'center',
- align: 'center',
- columnLabel: '计划开工时间',
- columnWidth: 125,
+ align: 'right',
+ columnLabel: '生产工序',
+ columnWidth: 80,
columnHidden: false,
columnImage: false,
columnSortable: true,
@@ -427,17 +397,17 @@ export default {
{
userId: this.$store.state.user.name,
functionId: 5302,
- serialNumber: '5302ProducePlanFinishTime',
+ serialNumber: '5302ProduceItemDesc',
tableId: '5302Produce',
tableName: '待生产工单',
- columnProp: 'planFinishTime',
+ columnProp: 'itemDesc',
headerAlign: 'center',
- align: 'center',
- columnLabel: '计划完工时间',
- columnWidth: 125,
+ align: 'left',
+ columnLabel: '工序名称',
+ columnWidth: 100,
columnHidden: false,
columnImage: false,
- columnSortable: true,
+ columnSortable: false,
sortLv: 0,
status: true,
fixed: ''
@@ -445,17 +415,17 @@ export default {
{
userId: this.$store.state.user.name,
functionId: 5302,
- serialNumber: '5302ProduceTimeRequired',
+ serialNumber: '5302ProduceResourceId',
tableId: '5302Produce',
tableName: '待生产工单',
- columnProp: 'timeRequired',
+ columnProp: 'resourceId',
headerAlign: 'center',
- align: 'center',
- columnLabel: '需求时间',
- columnWidth: 60,
+ align: 'left',
+ columnLabel: '生产机台',
+ columnWidth: 100,
columnHidden: false,
columnImage: false,
- columnSortable: false,
+ columnSortable: true,
sortLv: 0,
status: true,
fixed: ''
@@ -463,17 +433,17 @@ export default {
{
userId: this.$store.state.user.name,
functionId: 5302,
- serialNumber: '5302ProduceTimeReported',
+ serialNumber: '5302ProducePartNo',
tableId: '5302Produce',
tableName: '待生产工单',
- columnProp: 'timeReported',
+ columnProp: 'partNo',
headerAlign: 'center',
- align: 'center',
- columnLabel: '已报告时间',
- columnWidth: 70,
+ align: 'left',
+ columnLabel: '产品编码',
+ columnWidth: 120,
columnHidden: false,
columnImage: false,
- columnSortable: false,
+ columnSortable: true,
sortLv: 0,
status: true,
fixed: ''
@@ -481,14 +451,14 @@ export default {
{
userId: this.$store.state.user.name,
functionId: 5302,
- serialNumber: '5302ProduceOrderNo',
+ serialNumber: '5302ProducePartDesc',
tableId: '5302Produce',
tableName: '待生产工单',
- columnProp: 'orderNo',
+ columnProp: 'partDesc',
headerAlign: 'center',
- align: 'center',
- columnLabel: '生产订单号',
- columnWidth: 70,
+ align: 'left',
+ columnLabel: '产品名称',
+ columnWidth: 200,
columnHidden: false,
columnImage: false,
columnSortable: false,
@@ -499,17 +469,17 @@ export default {
{
userId: this.$store.state.user.name,
functionId: 5302,
- serialNumber: '5302ProduceItemNo',
+ serialNumber: '5302ProduceSpec',
tableId: '5302Produce',
tableName: '待生产工单',
- columnProp: 'itemNo',
+ columnProp: 'spec',
headerAlign: 'center',
- align: 'center',
- columnLabel: '工序号',
- columnWidth: 80,
+ align: 'left',
+ columnLabel: '规格型号',
+ columnWidth: 100,
columnHidden: false,
columnImage: false,
- columnSortable: true,
+ columnSortable: false,
sortLv: 0,
status: true,
fixed: ''
@@ -517,14 +487,14 @@ export default {
{
userId: this.$store.state.user.name,
functionId: 5302,
- serialNumber: '5302ProduceItemDesc',
+ serialNumber: '5302ProduceQtyRequired',
tableId: '5302Produce',
tableName: '待生产工单',
- columnProp: 'itemDesc',
+ columnProp: 'qtyRequired',
headerAlign: 'center',
- align: 'center',
- columnLabel: '工序描述',
- columnWidth: 80,
+ align: 'right',
+ columnLabel: '需求数量',
+ columnWidth: 100,
columnHidden: false,
columnImage: false,
columnSortable: false,
@@ -535,14 +505,14 @@ export default {
{
userId: this.$store.state.user.name,
functionId: 5302,
- serialNumber: '5302ProduceResourceId',
+ serialNumber: '5302ProduceQtyReported',
tableId: '5302Produce',
tableName: '待生产工单',
- columnProp: 'resourceId',
+ columnProp: 'qtyReported',
headerAlign: 'center',
- align: 'center',
- columnLabel: '机台',
- columnWidth: 60,
+ align: 'right',
+ columnLabel: '完工数量',
+ columnWidth: 100,
columnHidden: false,
columnImage: false,
columnSortable: true,
@@ -553,17 +523,17 @@ export default {
{
userId: this.$store.state.user.name,
functionId: 5302,
- serialNumber: '5302ProduceQtyRequired',
+ serialNumber: '5302ProduceQtyToReport',
tableId: '5302Produce',
tableName: '待生产工单',
- columnProp: 'qtyRequired',
+ columnProp: 'qtyToReport',
headerAlign: 'center',
- align: 'center',
- columnLabel: '需求数量',
- columnWidth: 60,
+ align: 'right',
+ columnLabel: '未完数量',
+ columnWidth: 100,
columnHidden: false,
columnImage: false,
- columnSortable: false,
+ columnSortable: true,
sortLv: 0,
status: true,
fixed: ''
@@ -571,17 +541,17 @@ export default {
{
userId: this.$store.state.user.name,
functionId: 5302,
- serialNumber: '5302ProduceQtyReported',
+ serialNumber: '5302ProduceTimeRequired',
tableId: '5302Produce',
tableName: '待生产工单',
- columnProp: 'qtyReported',
+ columnProp: 'timeRequired',
headerAlign: 'center',
align: 'right',
- columnLabel: '已报告数量',
- columnWidth: 100,
+ columnLabel: '需求时间',
+ columnWidth: 80,
columnHidden: false,
columnImage: false,
- columnSortable: true,
+ columnSortable: false,
sortLv: 0,
status: true,
fixed: ''
@@ -589,17 +559,17 @@ export default {
{
userId: this.$store.state.user.name,
functionId: 5302,
- serialNumber: '5302ProduceNeedDate',
+ serialNumber: '5302ProduceTimeReported',
tableId: '5302Produce',
tableName: '待生产工单',
- columnProp: 'needDate',
+ columnProp: 'timeReported',
headerAlign: 'center',
- align: 'center',
- columnLabel: '生产订单要求完工日期',
- columnWidth: 170,
+ align: 'right',
+ columnLabel: '累计工时(m)',
+ columnWidth: 80,
columnHidden: false,
columnImage: false,
- columnSortable: true,
+ columnSortable: false,
sortLv: 0,
status: true,
fixed: ''
@@ -607,14 +577,14 @@ export default {
{
userId: this.$store.state.user.name,
functionId: 5302,
- serialNumber: '5302ProduceClosedFlag',
+ serialNumber: '5302ProduceQtyApprove',
tableId: '5302Produce',
tableName: '待生产工单',
- columnProp: 'closedFlag',
+ columnProp: 'qtyApprove',
headerAlign: 'center',
- align: 'center',
- columnLabel: '已关闭',
- columnWidth: 50,
+ align: 'right',
+ columnLabel: '合格数量',
+ columnWidth: 80,
columnHidden: false,
columnImage: false,
columnSortable: false,
@@ -625,17 +595,17 @@ export default {
{
userId: this.$store.state.user.name,
functionId: 5302,
- serialNumber: '5302ProducePartNo',
+ serialNumber: '5302ProduceQtyScrapt',
tableId: '5302Produce',
tableName: '待生产工单',
- columnProp: 'partNo',
+ columnProp: 'qtyScrapt',
headerAlign: 'center',
- align: 'center',
- columnLabel: '产品编码',
- columnWidth: 110,
+ align: 'right',
+ columnLabel: '不良数量',
+ columnWidth: 80,
columnHidden: false,
columnImage: false,
- columnSortable: true,
+ columnSortable: false,
sortLv: 0,
status: true,
fixed: ''
@@ -643,14 +613,14 @@ export default {
{
userId: this.$store.state.user.name,
functionId: 5302,
- serialNumber: '5302ProducePartDesc',
+ serialNumber: '5302ProduceScheduledDate',
tableId: '5302Produce',
tableName: '待生产工单',
- columnProp: 'partDesc',
+ columnProp: 'scheduledDate',
headerAlign: 'center',
align: 'center',
- columnLabel: '产品名称',
- columnWidth: 180,
+ columnLabel: '排产日期',
+ columnWidth: 100,
columnHidden: false,
columnImage: false,
columnSortable: false,
@@ -661,17 +631,17 @@ export default {
{
userId: this.$store.state.user.name,
functionId: 5302,
- serialNumber: '5302ProduceSpec',
+ serialNumber: '5302ProducePlanStartTime',
tableId: '5302Produce',
tableName: '待生产工单',
- columnProp: 'spec',
+ columnProp: 'planStartTime',
headerAlign: 'center',
align: 'center',
- columnLabel: '规格型号',
- columnWidth: 80,
+ columnLabel: '计划开工时间',
+ columnWidth: 130,
columnHidden: false,
columnImage: false,
- columnSortable: false,
+ columnSortable: true,
sortLv: 0,
status: true,
fixed: ''
@@ -679,17 +649,17 @@ export default {
{
userId: this.$store.state.user.name,
functionId: 5302,
- serialNumber: '5302ProduceSeqNo',
+ serialNumber: '5302ProducePlanFinishTime',
tableId: '5302Produce',
tableName: '待生产工单',
- columnProp: 'seqNo',
+ columnProp: 'planFinishTime',
headerAlign: 'center',
align: 'center',
- columnLabel: '次序号',
- columnWidth: 80,
+ columnLabel: '计划完工时间',
+ columnWidth: 130,
columnHidden: false,
columnImage: false,
- columnSortable: false,
+ columnSortable: true,
sortLv: 0,
status: true,
fixed: ''
@@ -697,13 +667,13 @@ export default {
{
userId: this.$store.state.user.name,
functionId: 5302,
- serialNumber: '5302ProduceQtyApprove',
+ serialNumber: '5302ProduceShiftNo',
tableId: '5302Produce',
tableName: '待生产工单',
- columnProp: 'qtyApprove',
+ columnProp: 'shiftNo',
headerAlign: 'center',
- align: 'center',
- columnLabel: '合格数量',
+ align: 'left',
+ columnLabel: '班次',
columnWidth: 80,
columnHidden: false,
columnImage: false,
@@ -715,13 +685,13 @@ export default {
{
userId: this.$store.state.user.name,
functionId: 5302,
- serialNumber: '5302ProduceBarcodeId',
+ serialNumber: '5302ProduceMachSetupTime',
tableId: '5302Produce',
- tableName: '条形码',
- columnProp: 'barcodeId',
+ tableName: '待生产工单',
+ columnProp: 'machSetupTime',
headerAlign: 'center',
- align: 'center',
- columnLabel: '条形码',
+ align: 'right',
+ columnLabel: '调机时间',
columnWidth: 80,
columnHidden: false,
columnImage: false,
@@ -733,13 +703,13 @@ export default {
{
userId: this.$store.state.user.name,
functionId: 5302,
- serialNumber: '5302ProduceRemark',
+ serialNumber: '5302ProduceMachRunFactor',
tableId: '5302Produce',
tableName: '待生产工单',
- columnProp: 'remark',
+ columnProp: 'machRunFactor',
headerAlign: 'center',
- align: 'center',
- columnLabel: '备注',
+ align: 'right',
+ columnLabel: '单位产出',
columnWidth: 80,
columnHidden: false,
columnImage: false,
@@ -751,13 +721,13 @@ export default {
{
userId: this.$store.state.user.name,
functionId: 5302,
- serialNumber: '5302ProduceCrewSize',
+ serialNumber: '5302ProduceFactorUnit',
tableId: '5302Produce',
tableName: '待生产工单',
- columnProp: 'crewSize',
+ columnProp: 'factorUnit',
headerAlign: 'center',
- align: 'center',
- columnLabel: '操作工人数',
+ align: 'left',
+ columnLabel: '产出单位',
columnWidth: 80,
columnHidden: false,
columnImage: false,
@@ -769,13 +739,13 @@ export default {
{
userId: this.$store.state.user.name,
functionId: 5302,
- serialNumber: '5302ProduceQtyScrapt',
+ serialNumber: '5302ProduceEfficiency',
tableId: '5302Produce',
tableName: '待生产工单',
- columnProp: 'qtyScrapt',
+ columnProp: 'efficiency',
headerAlign: 'center',
- align: 'center',
- columnLabel: '报废数量',
+ align: 'right',
+ columnLabel: '效率',
columnWidth: 80,
columnHidden: false,
columnImage: false,
@@ -787,13 +757,13 @@ export default {
{
userId: this.$store.state.user.name,
functionId: 5302,
- serialNumber: '5302ProduceOutWorkFlag',
+ serialNumber: '5302ProduceNextItemNo',
tableId: '5302Produce',
tableName: '待生产工单',
- columnProp: 'outWorkFlag',
+ columnProp: 'nextItemNo',
headerAlign: 'center',
- align: 'center',
- columnLabel: '是否外协',
+ align: 'right',
+ columnLabel: '下道工序号',
columnWidth: 80,
columnHidden: false,
columnImage: false,
@@ -805,14 +775,14 @@ export default {
{
userId: this.$store.state.user.name,
functionId: 5302,
- serialNumber: '5302ProduceScheduledDate',
+ serialNumber: '5302ProduceNextItemDesc',
tableId: '5302Produce',
tableName: '待生产工单',
- columnProp: 'scheduledDate',
+ columnProp: 'nextItemDesc',
headerAlign: 'center',
- align: 'center',
- columnLabel: '排产日期',
- columnWidth: 80,
+ align: 'left',
+ columnLabel: '下道工序名称',
+ columnWidth: 100,
columnHidden: false,
columnImage: false,
columnSortable: false,
@@ -823,13 +793,13 @@ export default {
{
userId: this.$store.state.user.name,
functionId: 5302,
- serialNumber: '5302ProduceScheduledSeqNo',
+ serialNumber: '5302ProducePreItemNo',
tableId: '5302Produce',
tableName: '待生产工单',
- columnProp: 'scheduledSeqNo',
+ columnProp: 'preItemNo',
headerAlign: 'center',
- align: 'center',
- columnLabel: '次序号',
+ align: 'right',
+ columnLabel: '前道工序号',
columnWidth: 80,
columnHidden: false,
columnImage: false,
@@ -841,14 +811,14 @@ export default {
{
userId: this.$store.state.user.name,
functionId: 5302,
- serialNumber: '5302ProduceShiftNo',
+ serialNumber: '5302ProducePreItemDesc',
tableId: '5302Produce',
tableName: '待生产工单',
- columnProp: 'shiftNo',
+ columnProp: 'preItemDesc',
headerAlign: 'center',
- align: 'center',
- columnLabel: '班次',
- columnWidth: 80,
+ align: 'left',
+ columnLabel: '前道工序名称',
+ columnWidth: 100,
columnHidden: false,
columnImage: false,
columnSortable: false,
@@ -859,14 +829,14 @@ export default {
{
userId: this.$store.state.user.name,
functionId: 5302,
- serialNumber: '5302ProduceMachSetupTime',
+ serialNumber: '5302ProduceCustomerName',
tableId: '5302Produce',
tableName: '待生产工单',
- columnProp: 'machSetupTime',
+ columnProp: 'customerName',
headerAlign: 'center',
- align: 'center',
- columnLabel: '调机时间',
- columnWidth: 80,
+ align: 'left',
+ columnLabel: '客户名称',
+ columnWidth: 100,
columnHidden: false,
columnImage: false,
columnSortable: false,
@@ -877,14 +847,14 @@ export default {
{
userId: this.$store.state.user.name,
functionId: 5302,
- serialNumber: '5302ProduceMachRunFactor',
+ serialNumber: '5302ProduceCustPartNo',
tableId: '5302Produce',
tableName: '待生产工单',
- columnProp: 'machRunFactor',
+ columnProp: 'custPartNo',
headerAlign: 'center',
- align: 'center',
- columnLabel: '单位产出',
- columnWidth: 80,
+ align: 'left',
+ columnLabel: '客户料号',
+ columnWidth: 100,
columnHidden: false,
columnImage: false,
columnSortable: false,
@@ -895,14 +865,14 @@ export default {
{
userId: this.$store.state.user.name,
functionId: 5302,
- serialNumber: '5302ProduceFactorUnit',
+ serialNumber: '5302ProducePreResourceInfo',
tableId: '5302Produce',
tableName: '待生产工单',
- columnProp: 'factorUnit',
+ columnProp: 'preResourceInfo',
headerAlign: 'center',
- align: 'center',
- columnLabel: '产出单位',
- columnWidth: 80,
+ align: 'left',
+ columnLabel: '上工序机台信息',
+ columnWidth: 100,
columnHidden: false,
columnImage: false,
columnSortable: false,
@@ -913,14 +883,14 @@ export default {
{
userId: this.$store.state.user.name,
functionId: 5302,
- serialNumber: '5302ProduceEfficiency',
+ serialNumber: '5302ProducePreQtyFinished',
tableId: '5302Produce',
tableName: '待生产工单',
- columnProp: 'efficiency',
+ columnProp: 'preQtyFinished',
headerAlign: 'center',
- align: 'center',
- columnLabel: '效率',
- columnWidth: 80,
+ align: 'right',
+ columnLabel: '上工序完工数',
+ columnWidth: 100,
columnHidden: false,
columnImage: false,
columnSortable: false,
@@ -931,17 +901,17 @@ export default {
{
userId: this.$store.state.user.name,
functionId: 5302,
- serialNumber: '5302ProduceNextItemNo',
+ serialNumber: '5302ProduceNeedDate',
tableId: '5302Produce',
tableName: '待生产工单',
- columnProp: 'nextItemNo',
+ columnProp: 'needDate',
headerAlign: 'center',
align: 'center',
- columnLabel: '下道工序号',
- columnWidth: 80,
+ columnLabel: '生产订单要求完工日期',
+ columnWidth: 160,
columnHidden: false,
columnImage: false,
- columnSortable: false,
+ columnSortable: true,
sortLv: 0,
status: true,
fixed: ''
@@ -949,14 +919,14 @@ export default {
{
userId: this.$store.state.user.name,
functionId: 5302,
- serialNumber: '5302ProduceNextItemDesc',
+ serialNumber: '5302ProduceClosedFlag',
tableId: '5302Produce',
tableName: '待生产工单',
- columnProp: 'nextItemDesc',
+ columnProp: 'closedFlag',
headerAlign: 'center',
align: 'center',
- columnLabel: '下道工序名称',
- columnWidth: 80,
+ columnLabel: '已关闭',
+ columnWidth: 50,
columnHidden: false,
columnImage: false,
columnSortable: false,
@@ -967,13 +937,13 @@ export default {
{
userId: this.$store.state.user.name,
functionId: 5302,
- serialNumber: '5302ProducePreItemNo',
+ serialNumber: '5302ProduceBarcodeId',
tableId: '5302Produce',
- tableName: '待生产工单',
- columnProp: 'preItemNo',
+ tableName: '条形码',
+ columnProp: 'barcodeId',
headerAlign: 'center',
- align: 'center',
- columnLabel: '前道工序号',
+ align: 'left',
+ columnLabel: '条形码',
columnWidth: 80,
columnHidden: false,
columnImage: false,
@@ -985,14 +955,14 @@ export default {
{
userId: this.$store.state.user.name,
functionId: 5302,
- serialNumber: '5302ProducePreItemDesc',
+ serialNumber: '5302ProduceRemark',
tableId: '5302Produce',
tableName: '待生产工单',
- columnProp: 'preItemDesc',
+ columnProp: 'remark',
headerAlign: 'center',
- align: 'center',
- columnLabel: '前道工序名称',
- columnWidth: 80,
+ align: 'left',
+ columnLabel: '备注',
+ columnWidth: 200,
columnHidden: false,
columnImage: false,
columnSortable: false,
@@ -1003,14 +973,14 @@ export default {
{
userId: this.$store.state.user.name,
functionId: 5302,
- serialNumber: '5302ProduceSite',
+ serialNumber: '5302ProduceCrewSize',
tableId: '5302Produce',
tableName: '待生产工单',
- columnProp: 'site',
+ columnProp: 'crewSize',
headerAlign: 'center',
- align: 'center',
- columnLabel: '工厂编号',
- columnWidth: 80,
+ align: 'right',
+ columnLabel: '操作工人数',
+ columnWidth: 100,
columnHidden: false,
columnImage: false,
columnSortable: false,
@@ -1021,13 +991,13 @@ export default {
{
userId: this.$store.state.user.name,
functionId: 5302,
- serialNumber: '5302ProduceParkFlag',
+ serialNumber: '5302ProduceOutWorkFlag',
tableId: '5302Produce',
tableName: '待生产工单',
- columnProp: 'parkFlag',
+ columnProp: 'outWorkFlag',
headerAlign: 'center',
align: 'center',
- columnLabel: '暂停',
+ columnLabel: '是否外协',
columnWidth: 80,
columnHidden: false,
columnImage: false,
@@ -1039,13 +1009,13 @@ export default {
{
userId: this.$store.state.user.name,
functionId: 5302,
- serialNumber: '5302ProduceCustomerName',
+ serialNumber: '5302ProduceScheduledSeqNo',
tableId: '5302Produce',
tableName: '待生产工单',
- columnProp: 'customerName',
+ columnProp: 'scheduledSeqNo',
headerAlign: 'center',
- align: 'center',
- columnLabel: '客户名称',
+ align: 'left',
+ columnLabel: '次序号',
columnWidth: 80,
columnHidden: false,
columnImage: false,
@@ -1057,13 +1027,13 @@ export default {
{
userId: this.$store.state.user.name,
functionId: 5302,
- serialNumber: '5302ProduceCustPartNo',
+ serialNumber: '5302ProduceParkFlag',
tableId: '5302Produce',
tableName: '待生产工单',
- columnProp: 'custPartNo',
+ columnProp: 'parkFlag',
headerAlign: 'center',
align: 'center',
- columnLabel: '客户产品料号',
+ columnLabel: '暂停',
columnWidth: 80,
columnHidden: false,
columnImage: false,
@@ -1080,7 +1050,7 @@ export default {
tableName: '待生产工单',
columnProp: 'qtyRequiredOriginal',
headerAlign: 'center',
- align: 'center',
+ align: 'right',
columnLabel: '原始派工单需求数量',
columnWidth: 80,
columnHidden: false,
@@ -1100,7 +1070,7 @@ export default {
headerAlign: 'center',
align: 'center',
columnLabel: '关闭人',
- columnWidth: 80,
+ columnWidth: 100,
columnHidden: false,
columnImage: false,
columnSortable: false,
@@ -1118,7 +1088,7 @@ export default {
headerAlign: 'center',
align: 'center',
columnLabel: '关闭日期',
- columnWidth: 80,
+ columnWidth: 130,
columnHidden: false,
columnImage: false,
columnSortable: false,
@@ -1126,7 +1096,6 @@ export default {
status: true,
fixed: ''
}
-
],
reportButton: {
normalReportButton: true,
@@ -2108,7 +2077,7 @@ export default {
/* 列表方法的回调 */
getBaseData(val) {
- if (this.tagNo === 88) {
+ if (this.tagNo === 95) {
this.searchData.resourceId = val.ResourceID
}
},
@@ -2289,7 +2258,7 @@ export default {
this.searchData.resourceId = data.rows[0].resourceID
}
}
-
+
// 等待getResourceByUser执行完成后，再查询生产排程列表
this.searchData.searchFlag = true;
// 不查询