diff --git a/src/views/modules/schedule/order_schedule.vue b/src/views/modules/schedule/order_schedule.vue
index 7a75fd4..a5aa962 100644
--- a/src/views/modules/schedule/order_schedule.vue
+++ b/src/views/modules/schedule/order_schedule.vue
@@ -193,6 +193,8 @@
:disabled="primaryMenuButton.partStockFlag">查看物料库存
+ {{ buttons.settingTable }}
+ {{ buttons.defaultTable }}
查看物料库存
+ {{ buttons.settingTable }}
+ {{ buttons.defaultTable }}
+
+
+
@@ -336,6 +343,16 @@
import comBatchWorkCalendar from "../common/com_batch_work_calendar";/*批量维护工作日历外组件*/
import comPartStock from "../common/com_part_stock";/*展示物料库存的组件*/
import comChangeWaitTime from "./com_change_wait_time";/*修改等待派工单的等待时间*/
+ import column from '@/views/modules/common/column';/*动态表头*/
+
+ /*动态表头*/
+ import {
+ saveTableDefaultList,
+ getTableDefaultListLanguage,
+ getTableUserListLanguage,
+ removerDefault,
+ removerUser
+ } from "@/api/table.js";
import updateRoutingRev from "../common/updateRoutingRev";
import {
@@ -359,6 +376,8 @@ export default {
return {
height: 200,
tagNo: '',
+ showDefault: false,
+ visible: false,
updateProductRouting:false,
showWorkCalendarOut: false,
showBatchWorkCalendar: false,
@@ -403,7 +422,7 @@ export default {
columnTimeArray: [
{
userId: this.$store.state.user.name,
- functionId: 5301,
+ functionId: 5303,
serialNumber: '5301ShiftShiftDate',
tableId: "5301Shift",
tableName: "工作日历",
@@ -417,11 +436,11 @@ export default {
columnSortable: false,
sortLv: 0,
status: true,
- fixed: false
+ fixed: ''
},
{
userId: this.$store.state.user.name,
- functionId: 5301,
+ functionId: 5303,
serialNumber: '5301ShiftShiftInfo',
tableId: "5301Shift",
tableName: "工作日历",
@@ -435,15 +454,15 @@ export default {
columnSortable: false,
sortLv: 0,
status: true,
- fixed: false
+ fixed: ''
}
],
columnOrderArray: [
{
userId: this.$store.state.user.name,
- functionId: 5301,
- serialNumber: '5301OrderOrderNo',
- tableId: "5301Order",
+ functionId: 5303,
+ serialNumber: '5303OrderOrderNo',
+ tableId: "5303Order",
tableName: "工单表",
columnProp: "orderNo",
headerAlign: "center",
@@ -455,13 +474,13 @@ export default {
columnSortable: true,
sortLv: 0,
status: true,
- fixed: false
+ fixed: ''
},
{
userId: this.$store.state.user.name,
- functionId: 5301,
- serialNumber: '5301OrderItemNo',
- tableId: "5301Order",
+ functionId: 5303,
+ serialNumber: '5303OrderItemNo',
+ tableId: "5303Order",
tableName: "工单表",
columnProp: "itemNo",
headerAlign: "center",
@@ -473,13 +492,13 @@ export default {
columnSortable: true,
sortLv: 0,
status: true,
- fixed: false
+ fixed: ''
},
{
userId: this.$store.state.user.name,
- functionId: 5301,
- serialNumber: '5301OrderItemDesc',
- tableId: "5301Order",
+ functionId: 5303,
+ serialNumber: '5303OrderItemDesc',
+ tableId: "5303Order",
tableName: "工单表",
columnProp: "itemDesc",
headerAlign: "center",
@@ -491,13 +510,13 @@ export default {
columnSortable: false,
sortLv: 0,
status: true,
- fixed: false
+ fixed: ''
},
{
userId: this.$store.state.user.name,
- functionId: 5301,
- serialNumber: '5301OrderNeedDate',
- tableId: "5301Order",
+ functionId: 5303,
+ serialNumber: '5303OrderNeedDate',
+ tableId: "5303Order",
tableName: "工单表",
columnProp: "needDate",
headerAlign: "center",
@@ -509,13 +528,13 @@ export default {
columnSortable: true,
sortLv: 0,
status: true,
- fixed: false
+ fixed: ''
},
{
userId: this.$store.state.user.name,
- functionId: 5301,
- serialNumber: '5301OrderPartNo',
- tableId: "5301Order",
+ functionId: 5303,
+ serialNumber: '5303OrderPartNo',
+ tableId: "5303Order",
tableName: "工单表",
columnProp: "partNo",
headerAlign: "center",
@@ -527,13 +546,13 @@ export default {
columnSortable: true,
sortLv: 0,
status: true,
- fixed: false
+ fixed: ''
},
{
userId: this.$store.state.user.name,
- functionId: 5301,
- serialNumber: '5301OrderCustomerName',
- tableId: "5301Order",
+ functionId: 5303,
+ serialNumber: '5303OrderCustomerName',
+ tableId: "5303Order",
tableName: "工单表",
columnProp: "customerName",
headerAlign: "center",
@@ -545,13 +564,13 @@ export default {
columnSortable: false,
sortLv: 0,
status: true,
- fixed: false
+ fixed: ''
},
{
userId: this.$store.state.user.name,
- functionId: 5301,
- serialNumber: '5301OrderCustPartNo',
- tableId: "5301Order",
+ functionId: 5303,
+ serialNumber: '5303OrderCustPartNo',
+ tableId: "5303Order",
tableName: "工单表",
columnProp: "custPartNo",
headerAlign: "center",
@@ -563,13 +582,13 @@ export default {
columnSortable: true,
sortLv: 0,
status: true,
- fixed: false
+ fixed: ''
},
{
userId: this.$store.state.user.name,
- functionId: 5301,
- serialNumber: '5301OrderPartDesc',
- tableId: "5301Order",
+ functionId: 5303,
+ serialNumber: '5303OrderPartDesc',
+ tableId: "5303Order",
tableName: "工单表",
columnProp: "partDesc",
headerAlign: "center",
@@ -581,13 +600,13 @@ export default {
columnSortable: false,
sortLv: 0,
status: true,
- fixed: false
+ fixed: ''
},
{
userId: this.$store.state.user.name,
- functionId: 5301,
- serialNumber: '5301OrderLotSize',
- tableId: "5301Order",
+ functionId: 5303,
+ serialNumber: '5303OrderLotSize',
+ tableId: "5303Order",
tableName: "工单表",
columnProp: "lotSize",
headerAlign: "center",
@@ -599,13 +618,13 @@ export default {
columnSortable: true,
sortLv: 0,
status: true,
- fixed: false
+ fixed: ''
},
{
userId: this.$store.state.user.name,
- functionId: 5301,
- serialNumber: '5301OrderQtyToSchedule',
- tableId: "5301Order",
+ functionId: 5303,
+ serialNumber: '5303OrderQtyToSchedule',
+ tableId: "5303Order",
tableName: "工单表",
columnProp: "qtyToSchedule",
headerAlign: "center",
@@ -617,13 +636,13 @@ export default {
columnSortable: true,
sortLv: 0,
status: true,
- fixed: false
+ fixed: ''
},
{
userId: this.$store.state.user.name,
- functionId: 5301,
- serialNumber: '5301OrderQtyScheduled',
- tableId: "5301Order",
+ functionId: 5303,
+ serialNumber: '5303OrderQtyScheduled',
+ tableId: "5303Order",
tableName: "工单表",
columnProp: "qtyScheduled",
headerAlign: "center",
@@ -635,13 +654,13 @@ export default {
columnSortable: true,
sortLv: 0,
status: true,
- fixed: false
+ fixed: ''
},
{
userId: this.$store.state.user.name,
- functionId: 5301,
- serialNumber: '5301OrderQtyReported',
- tableId: "5301Order",
+ functionId: 5303,
+ serialNumber: '5303OrderQtyReported',
+ tableId: "5303Order",
tableName: "工单表",
columnProp: "qtyReported",
headerAlign: "center",
@@ -653,13 +672,13 @@ export default {
columnSortable: true,
sortLv: 0,
status: true,
- fixed: false
+ fixed: ''
},
{
userId: this.$store.state.user.name,
- functionId: 5301,
- serialNumber: '5301OrderSpec',
- tableId: "5301Order",
+ functionId: 5303,
+ serialNumber: '5303OrderSpec',
+ tableId: "5303Order",
tableName: "工单表",
columnProp: "spec",
headerAlign: "center",
@@ -671,13 +690,13 @@ export default {
columnSortable: false,
sortLv: 0,
status: true,
- fixed: false
+ fixed: ''
},
{
userId: this.$store.state.user.name,
- functionId: 5301,
- serialNumber: '5301OrderSite',
- tableId: "5301Order",
+ functionId: 5303,
+ serialNumber: '5303OrderSite',
+ tableId: "5303Order",
tableName: "工单表",
columnProp: "site",
headerAlign: "center",
@@ -689,13 +708,13 @@ export default {
columnSortable: false,
sortLv: 0,
status: true,
- fixed: false
+ fixed: ''
},
{
userId: this.$store.state.user.name,
- functionId: 5301,
- serialNumber: '5301OrderWorkCenterNo',
- tableId: "5301Order",
+ functionId: 5303,
+ serialNumber: '5303OrderWorkCenterNo',
+ tableId: "5303Order",
tableName: "工单表",
columnProp: "workCenterNo",
headerAlign: "center",
@@ -707,13 +726,13 @@ export default {
columnSortable: true,
sortLv: 0,
status: true,
- fixed: false
+ fixed: ''
},
{
userId: this.$store.state.user.name,
- functionId: 5301,
- serialNumber: '5301OrderNextItemNo',
- tableId: "5301Order",
+ functionId: 5303,
+ serialNumber: '5303OrderNextItemNo',
+ tableId: "5303Order",
tableName: "工单表",
columnProp: "nextItemNo",
headerAlign: "center",
@@ -725,13 +744,13 @@ export default {
columnSortable: true,
sortLv: 0,
status: true,
- fixed: false
+ fixed: ''
},
{
userId: this.$store.state.user.name,
- functionId: 5301,
- serialNumber: '5301OrderNextItemDesc',
- tableId: "5301Order",
+ functionId: 5303,
+ serialNumber: '5303OrderNextItemDesc',
+ tableId: "5303Order",
tableName: "工单表",
columnProp: "nextItemDesc",
headerAlign: "center",
@@ -743,13 +762,13 @@ export default {
columnSortable: false,
sortLv: 0,
status: true,
- fixed: false
+ fixed: ''
},
{
userId: this.$store.state.user.name,
- functionId: 5301,
- serialNumber: '5301OrderNextScheduledFlag',
- tableId: "5301Order",
+ functionId: 5303,
+ serialNumber: '5303OrderNextScheduledFlag',
+ tableId: "5303Order",
tableName: "工单表",
columnProp: "nextScheduledFlag",
headerAlign: "center",
@@ -761,13 +780,13 @@ export default {
columnSortable: true,
sortLv: 0,
status: true,
- fixed: false
+ fixed: ''
},
{
userId: this.$store.state.user.name,
- functionId: 5301,
- serialNumber: '5301OrderPreItemNo',
- tableId: "5301Order",
+ functionId: 5303,
+ serialNumber: '5303OrderPreItemNo',
+ tableId: "5303Order",
tableName: "工单表",
columnProp: "preItemNo",
headerAlign: "center",
@@ -779,13 +798,13 @@ export default {
columnSortable: true,
sortLv: 0,
status: true,
- fixed: false
+ fixed: ''
},
{
userId: this.$store.state.user.name,
- functionId: 5301,
- serialNumber: '5301OrderPreItemDesc',
- tableId: "5301Order",
+ functionId: 5303,
+ serialNumber: '5303OrderPreItemDesc',
+ tableId: "5303Order",
tableName: "工单表",
columnProp: "preItemDesc",
headerAlign: "center",
@@ -797,13 +816,13 @@ export default {
columnSortable: false,
sortLv: 0,
status: true,
- fixed: false
+ fixed: ''
},
{
userId: this.$store.state.user.name,
- functionId: 5301,
- serialNumber: '5301OrderPreScheduledFlag',
- tableId: "5301Order",
+ functionId: 5303,
+ serialNumber: '5303OrderPreScheduledFlag',
+ tableId: "5303Order",
tableName: "工单表",
columnProp: "preScheduledFlag",
headerAlign: "center",
@@ -815,13 +834,13 @@ export default {
columnSortable: true,
sortLv: 0,
status: true,
- fixed: false
+ fixed: ''
},
{
userId: this.$store.state.user.name,
- functionId: 5301,
- serialNumber: '5301OrderScheduledFlag',
- tableId: "5301Order",
+ functionId: 5303,
+ serialNumber: '5303OrderScheduledFlag',
+ tableId: "5303Order",
tableName: "工单表",
columnProp: "scheduledFlag",
headerAlign: "center",
@@ -833,13 +852,13 @@ export default {
columnSortable: false,
sortLv: 0,
status: true,
- fixed: false
+ fixed: ''
},
{
userId: this.$store.state.user.name,
- functionId: 5301,
- serialNumber: '5301OrderAvailResource',
- tableId: "5301Order",
+ functionId: 5303,
+ serialNumber: '5303OrderAvailResource',
+ tableId: "5303Order",
tableName: "工单表",
columnProp: "availResource",
headerAlign: "center",
@@ -851,13 +870,13 @@ export default {
columnSortable: false,
sortLv: 0,
status: true,
- fixed: false
+ fixed: ''
},
{
userId: this.$store.state.user.name,
- functionId: 5301,
- serialNumber: '5301OrderEnterDate',
- tableId: "5301Order",
+ functionId: 5303,
+ serialNumber: '5303OrderEnterDate',
+ tableId: "5303Order",
tableName: "工单表",
columnProp: "enterDate",
headerAlign: "center",
@@ -869,13 +888,13 @@ export default {
columnSortable: false,
sortLv: 0,
status: true,
- fixed: false
+ fixed: ''
},
{
userId: this.$store.state.user.name,
- functionId: 5301,
- serialNumber: '5301OrderScheduleToPlanTime',
- tableId: "5301Order",
+ functionId: 5303,
+ serialNumber: '5303OrderScheduleToPlanTime',
+ tableId: "5303Order",
tableName: "工单表",
columnProp: "scheduleToPlanTime",
headerAlign: "center",
@@ -887,13 +906,13 @@ export default {
columnSortable: false,
sortLv: 0,
status: true,
- fixed: false
+ fixed: ''
},
{
userId: this.$store.state.user.name,
- functionId: 5301,
- serialNumber: '5301OrderMachRunFactor',
- tableId: "5301Order",
+ functionId: 5303,
+ serialNumber: '5303OrderMachRunFactor',
+ tableId: "5303Order",
tableName: "工单表",
columnProp: "machRunFactor",
headerAlign: "center",
@@ -905,13 +924,13 @@ export default {
columnSortable: false,
sortLv: 0,
status: true,
- fixed: false
+ fixed: ''
},
{
userId: this.$store.state.user.name,
- functionId: 5301,
- serialNumber: '5301OrderMachSetupTime',
- tableId: "5301Order",
+ functionId: 5303,
+ serialNumber: '5303OrderMachSetupTime',
+ tableId: "5303Order",
tableName: "工单表",
columnProp: "machSetupTime",
headerAlign: "center",
@@ -923,13 +942,13 @@ export default {
columnSortable: false,
sortLv: 0,
status: true,
- fixed: false
+ fixed: ''
},
{
userId: this.$store.state.user.name,
- functionId: 5301,
- serialNumber: '5301OrderFactorUnit',
- tableId: "5301Order",
+ functionId: 5303,
+ serialNumber: '5303OrderFactorUnit',
+ tableId: "5303Order",
tableName: "工单表",
columnProp: "factorUnit",
headerAlign: "center",
@@ -941,13 +960,13 @@ export default {
columnSortable: false,
sortLv: 0,
status: true,
- fixed: false
+ fixed: ''
},
{
userId: this.$store.state.user.name,
- functionId: 5301,
- serialNumber: '5301OrderQtyScheduledPreOps',
- tableId: "5301Order",
+ functionId: 5303,
+ serialNumber: '5303OrderQtyScheduledPreOps',
+ tableId: "5303Order",
tableName: "工单表",
columnProp: "qtyScheduledPreOps",
headerAlign: "center",
@@ -959,13 +978,13 @@ export default {
columnSortable: false,
sortLv: 0,
status: true,
- fixed: false
+ fixed: ''
},
{
userId: this.$store.state.user.name,
- functionId: 5301,
- serialNumber: '5301OrderQtyApprovedPreOps',
- tableId: "5301Order",
+ functionId: 5303,
+ serialNumber: '5303OrderQtyApprovedPreOps',
+ tableId: "5303Order",
tableName: "工单表",
columnProp: "qtyApprovedPreOps",
headerAlign: "center",
@@ -977,13 +996,13 @@ export default {
columnSortable: false,
sortLv: 0,
status: true,
- fixed: false
+ fixed: ''
},
{
userId: this.$store.state.user.name,
- functionId: 5301,
- serialNumber: '5301OrderOriSOOrderNo',
- tableId: "5301Order",
+ functionId: 5303,
+ serialNumber: '5303OrderOriSOOrderNo',
+ tableId: "5303Order",
tableName: "工单表",
columnProp: "oriSOOrderNo",
headerAlign: "center",
@@ -995,13 +1014,13 @@ export default {
columnSortable: false,
sortLv: 0,
status: true,
- fixed: false
+ fixed: ''
},
{
userId: this.$store.state.user.name,
- functionId: 5301,
- serialNumber: '5301OrderEficiency',
- tableId: "5301Order",
+ functionId: 5303,
+ serialNumber: '5303OrderEficiency',
+ tableId: "5303Order",
tableName: "工单表",
columnProp: "efficiency",
headerAlign: "center",
@@ -1013,13 +1032,13 @@ export default {
columnSortable: false,
sortLv: 0,
status: true,
- fixed: false
+ fixed: ''
},
{
userId: this.$store.state.user.name,
- functionId: 5301,
- serialNumber: '5301OrderCostRollUpFlag',
- tableId: "5301Order",
+ functionId: 5303,
+ serialNumber: '5303OrderCostRollUpFlag',
+ tableId: "5303Order",
tableName: "工单表",
columnProp: "costRollUpFlag",
headerAlign: "center",
@@ -1031,13 +1050,13 @@ export default {
columnSortable: false,
sortLv: 0,
status: true,
- fixed: false
+ fixed: ''
},
{
userId: this.$store.state.user.name,
- functionId: 5301,
- serialNumber: '5301OrderManualFlag',
- tableId: "5301Order",
+ functionId: 5303,
+ serialNumber: '5303OrderManualFlag',
+ tableId: "5303Order",
tableName: "工单表",
columnProp: "manualFlag",
headerAlign: "center",
@@ -1049,13 +1068,13 @@ export default {
columnSortable: false,
sortLv: 0,
status: true,
- fixed: false
+ fixed: ''
},
{
userId: this.$store.state.user.name,
- functionId: 5301,
- serialNumber: '5301OrderRepairSOFlag',
- tableId: "5301Order",
+ functionId: 5303,
+ serialNumber: '5303OrderRepairSOFlag',
+ tableId: "5303Order",
tableName: "工单表",
columnProp: "repairSOFlag",
headerAlign: "center",
@@ -1067,15 +1086,15 @@ export default {
columnSortable: false,
sortLv: 0,
status: true,
- fixed: false
+ fixed: ''
},
],
columnOrderScheduleArray: [
{
userId: this.$store.state.user.name,
- functionId: 5301,
- serialNumber: '5301ScheduleScheduledSeqNo',
- tableId: "5301Schedule",
+ functionId: 5303,
+ serialNumber: '5303ScheduleScheduledSeqNo',
+ tableId: "5303Schedule",
tableName: "排产明细表",
columnProp: "scheduledSeqNo",
headerAlign: "center",
@@ -1087,13 +1106,13 @@ export default {
columnSortable: false,
sortLv: 0,
status: true,
- fixed: false
+ fixed: ''
},
{
userId: this.$store.state.user.name,
- functionId: 5301,
- serialNumber: '5301SchedulePlanStartTime',
- tableId: "5301Schedule",
+ functionId: 5303,
+ serialNumber: '5303SchedulePlanStartTime',
+ tableId: "5303Schedule",
tableName: "排产明细表",
columnProp: "planStartTime",
headerAlign: "center",
@@ -1105,13 +1124,13 @@ export default {
columnSortable: false,
sortLv: 0,
status: true,
- fixed: false
+ fixed: ''
},
{
userId: this.$store.state.user.name,
- functionId: 5301,
- serialNumber: '5301SchedulePlanFinishTime',
- tableId: "5301Schedule",
+ functionId: 5303,
+ serialNumber: '5303SchedulePlanFinishTime',
+ tableId: "5303Schedule",
tableName: "排产明细表",
columnProp: "planFinishTime",
headerAlign: "center",
@@ -1123,13 +1142,13 @@ export default {
columnSortable: false,
sortLv: 0,
status: true,
- fixed: false
+ fixed: ''
},
{
userId: this.$store.state.user.name,
- functionId: 5301,
- serialNumber: '5301ScheduleTimeRequired',
- tableId: "5301Schedule",
+ functionId: 5303,
+ serialNumber: '5303ScheduleTimeRequired',
+ tableId: "5303Schedule",
tableName: "排产明细表",
columnProp: "timeRequired",
headerAlign: "center",
@@ -1141,13 +1160,13 @@ export default {
columnSortable: false,
sortLv: 0,
status: true,
- fixed: false
+ fixed: ''
},
{
userId: this.$store.state.user.name,
- functionId: 5301,
- serialNumber: '5301ScheduleOrderNo',
- tableId: "5301Schedule",
+ functionId: 5303,
+ serialNumber: '5303ScheduleOrderNo',
+ tableId: "5303Schedule",
tableName: "排产明细表",
columnProp: "orderNo",
headerAlign: "center",
@@ -1159,13 +1178,13 @@ export default {
columnSortable: true,
sortLv: 0,
status: true,
- fixed: false
+ fixed: ''
},
{
userId: this.$store.state.user.name,
- functionId: 5301,
- serialNumber: '5301ScheduleNeedDate',
- tableId: "5301Schedule",
+ functionId: 5303,
+ serialNumber: '5303ScheduleNeedDate',
+ tableId: "5303Schedule",
tableName: "排产明细表",
columnProp: "needDate",
headerAlign: "center",
@@ -1177,13 +1196,13 @@ export default {
columnSortable: true,
sortLv: 0,
status: true,
- fixed: false
+ fixed: ''
},
{
userId: this.$store.state.user.name,
- functionId: 5301,
- serialNumber: '5301ScheduleItemNo',
- tableId: "5301Schedule",
+ functionId: 5303,
+ serialNumber: '5303ScheduleItemNo',
+ tableId: "5303Schedule",
tableName: "排产明细表",
columnProp: "itemNo",
headerAlign: "center",
@@ -1195,13 +1214,13 @@ export default {
columnSortable: true,
sortLv: 0,
status: true,
- fixed: false
+ fixed: ''
},
{
userId: this.$store.state.user.name,
- functionId: 5301,
- serialNumber: '5301ScheduleItemDesc',
- tableId: "5301Schedule",
+ functionId: 5303,
+ serialNumber: '5303ScheduleItemDesc',
+ tableId: "5303Schedule",
tableName: "排产明细表",
columnProp: "itemDesc",
headerAlign: "center",
@@ -1213,13 +1232,13 @@ export default {
columnSortable: false,
sortLv: 0,
status: true,
- fixed: false
+ fixed: ''
},
{
userId: this.$store.state.user.name,
- functionId: 5301,
- serialNumber: '5301SchedulePartNo',
- tableId: "5301Schedule",
+ functionId: 5303,
+ serialNumber: '5303SchedulePartNo',
+ tableId: "5303Schedule",
tableName: "排产明细表",
columnProp: "partNo",
headerAlign: "center",
@@ -1231,13 +1250,13 @@ export default {
columnSortable: true,
sortLv: 0,
status: true,
- fixed: false
+ fixed: ''
},
{
userId: this.$store.state.user.name,
- functionId: 5301,
- serialNumber: '5301SchedulePartDesc',
- tableId: "5301Schedule",
+ functionId: 5303,
+ serialNumber: '5303SchedulePartDesc',
+ tableId: "5303Schedule",
tableName: "排产明细表",
columnProp: "partDesc",
headerAlign: "center",
@@ -1249,13 +1268,13 @@ export default {
columnSortable: false,
sortLv: 0,
status: true,
- fixed: false
+ fixed: ''
},
{
userId: this.$store.state.user.name,
- functionId: 5301,
- serialNumber: '5301OrderSpec',
- tableId: "5301Schedule",
+ functionId: 5303,
+ serialNumber: '5303OrderSpec',
+ tableId: "5303Schedule",
tableName: "排产明细表",
columnProp: "spec",
headerAlign: "center",
@@ -1267,13 +1286,13 @@ export default {
columnSortable: false,
sortLv: 0,
status: true,
- fixed: false
+ fixed: ''
},
{
userId: this.$store.state.user.name,
- functionId: 5301,
- serialNumber: '5301ScheduleQtyRequired',
- tableId: "5301Schedule",
+ functionId: 5303,
+ serialNumber: '5303ScheduleQtyRequired',
+ tableId: "5303Schedule",
tableName: "排产明细表",
columnProp: "qtyRequired",
headerAlign: "center",
@@ -1285,13 +1304,13 @@ export default {
columnSortable: true,
sortLv: 0,
status: true,
- fixed: false
+ fixed: ''
},
{
userId: this.$store.state.user.name,
- functionId: 5301,
- serialNumber: '5301ScheduleQtyRequired',
- tableId: "5301Schedule",
+ functionId: 5303,
+ serialNumber: '5303ScheduleQtyRequired',
+ tableId: "5303Schedule",
tableName: "排产明细表",
columnProp: "qtyRequired",
headerAlign: "center",
@@ -1303,13 +1322,13 @@ export default {
columnSortable: true,
sortLv: 0,
status: true,
- fixed: false
+ fixed: ''
},
{
userId: this.$store.state.user.name,
- functionId: 5301,
- serialNumber: '5301ScheduleQtyReported',
- tableId: "5301Schedule",
+ functionId: 5303,
+ serialNumber: '5303ScheduleQtyReported',
+ tableId: "5303Schedule",
tableName: "排产明细表",
columnProp: "qtyReported",
headerAlign: "center",
@@ -1321,13 +1340,13 @@ export default {
columnSortable: true,
sortLv: 0,
status: true,
- fixed: false
+ fixed: ''
},
{
userId: this.$store.state.user.name,
- functionId: 5301,
- serialNumber: '5301SchedulePreItemNo',
- tableId: "5301Schedule",
+ functionId: 5303,
+ serialNumber: '5303SchedulePreItemNo',
+ tableId: "5303Schedule",
tableName: "排产明细表",
columnProp: "preItemNo",
headerAlign: "center",
@@ -1339,13 +1358,13 @@ export default {
columnSortable: false,
sortLv: 0,
status: true,
- fixed: false
+ fixed: ''
},
{
userId: this.$store.state.user.name,
- functionId: 5301,
- serialNumber: '5301SchedulePreItemDesc',
- tableId: "5301Schedule",
+ functionId: 5303,
+ serialNumber: '5303SchedulePreItemDesc',
+ tableId: "5303Schedule",
tableName: "排产明细表",
columnProp: "preItemDesc",
headerAlign: "center",
@@ -1357,13 +1376,13 @@ export default {
columnSortable: false,
sortLv: 0,
status: true,
- fixed: false
+ fixed: ''
},
{
userId: this.$store.state.user.name,
- functionId: 5301,
- serialNumber: '5301SchedulePreScheduledFlag',
- tableId: "5301Schedule",
+ functionId: 5303,
+ serialNumber: '5303SchedulePreScheduledFlag',
+ tableId: "5303Schedule",
tableName: "排产明细表",
columnProp: "preScheduledFlag",
headerAlign: "center",
@@ -1375,13 +1394,13 @@ export default {
columnSortable: true,
sortLv: 0,
status: true,
- fixed: false
+ fixed: ''
},
{
userId: this.$store.state.user.name,
- functionId: 5301,
- serialNumber: '5301ScheduleNextItemNo',
- tableId: "5301Schedule",
+ functionId: 5303,
+ serialNumber: '5303ScheduleNextItemNo',
+ tableId: "5303Schedule",
tableName: "排产明细表",
columnProp: "nextItemNo",
headerAlign: "center",
@@ -1393,13 +1412,13 @@ export default {
columnSortable: false,
sortLv: 0,
status: true,
- fixed: false
+ fixed: ''
},
{
userId: this.$store.state.user.name,
- functionId: 5301,
- serialNumber: '5301ScheduleNextItemDesc',
- tableId: "5301Schedule",
+ functionId: 5303,
+ serialNumber: '5303ScheduleNextItemDesc',
+ tableId: "5303Schedule",
tableName: "排产明细表",
columnProp: "nextItemDesc",
headerAlign: "center",
@@ -1411,13 +1430,13 @@ export default {
columnSortable: false,
sortLv: 0,
status: true,
- fixed: false
+ fixed: ''
},
{
userId: this.$store.state.user.name,
- functionId: 5301,
- serialNumber: '5301ScheduleNextScheduledFlag',
- tableId: "5301Schedule",
+ functionId: 5303,
+ serialNumber: '5303ScheduleNextScheduledFlag',
+ tableId: "5303Schedule",
tableName: "排产明细表",
columnProp: "nextScheduledFlag",
headerAlign: "center",
@@ -1429,13 +1448,13 @@ export default {
columnSortable: true,
sortLv: 0,
status: true,
- fixed: false
+ fixed: ''
},
{
userId: this.$store.state.user.name,
- functionId: 5301,
- serialNumber: '5301ScheduleResourceId',
- tableId: "5301Schedule",
+ functionId: 5303,
+ serialNumber: '5303ScheduleResourceId',
+ tableId: "5303Schedule",
tableName: "排产明细表",
columnProp: "resourceId",
headerAlign: "center",
@@ -1447,13 +1466,13 @@ export default {
columnSortable: false,
sortLv: 0,
status: true,
- fixed: false
+ fixed: ''
},
{
userId: this.$store.state.user.name,
- functionId: 5301,
- serialNumber: '5301ScheduleCustomerName',
- tableId: "5301Schedule",
+ functionId: 5303,
+ serialNumber: '5303ScheduleCustomerName',
+ tableId: "5303Schedule",
tableName: "排产明细表",
columnProp: "customerName",
headerAlign: "center",
@@ -1465,13 +1484,13 @@ export default {
columnSortable: false,
sortLv: 0,
status: true,
- fixed: false
+ fixed: ''
},
{
userId: this.$store.state.user.name,
- functionId: 5301,
- serialNumber: '5301ScheduleEnterDate',
- tableId: "5301Schedule",
+ functionId: 5303,
+ serialNumber: '5303ScheduleEnterDate',
+ tableId: "5303Schedule",
tableName: "排产明细表",
columnProp: "enterDate",
headerAlign: "center",
@@ -1483,13 +1502,13 @@ export default {
columnSortable: false,
sortLv: 0,
status: true,
- fixed: false
+ fixed: ''
},
{
userId: this.$store.state.user.name,
- functionId: 5301,
- serialNumber: '5301ScheduleAvailResource',
- tableId: "5301Schedule",
+ functionId: 5303,
+ serialNumber: '5303ScheduleAvailResource',
+ tableId: "5303Schedule",
tableName: "排产明细表",
columnProp: "availResource",
headerAlign: "center",
@@ -1501,13 +1520,13 @@ export default {
columnSortable: false,
sortLv: 0,
status: true,
- fixed: false
+ fixed: ''
},
{
userId: this.$store.state.user.name,
- functionId: 5301,
- serialNumber: '5301ScheduleWorkCenterNo',
- tableId: "5301Schedule",
+ functionId: 5303,
+ serialNumber: '5303ScheduleWorkCenterNo',
+ tableId: "5303Schedule",
tableName: "排产明细表",
columnProp: "workCenterNo",
headerAlign: "center",
@@ -1519,13 +1538,13 @@ export default {
columnSortable: false,
sortLv: 0,
status: true,
- fixed: false
+ fixed: ''
},
{
userId: this.$store.state.user.name,
- functionId: 5301,
- serialNumber: '5301ScheduleMachRunFactor',
- tableId: "5301Schedule",
+ functionId: 5303,
+ serialNumber: '5303ScheduleMachRunFactor',
+ tableId: "5303Schedule",
tableName: "排产明细表",
columnProp: "machRunFactor",
headerAlign: "center",
@@ -1537,13 +1556,13 @@ export default {
columnSortable: false,
sortLv: 0,
status: true,
- fixed: false
+ fixed: ''
},
{
userId: this.$store.state.user.name,
- functionId: 5301,
- serialNumber: '5301ScheduleMachSetupTime',
- tableId: "5301Schedule",
+ functionId: 5303,
+ serialNumber: '5303ScheduleMachSetupTime',
+ tableId: "5303Schedule",
tableName: "排产明细表",
columnProp: "machSetupTime",
headerAlign: "center",
@@ -1555,13 +1574,13 @@ export default {
columnSortable: false,
sortLv: 0,
status: true,
- fixed: false
+ fixed: ''
},
{
userId: this.$store.state.user.name,
- functionId: 5301,
- serialNumber: '5301ScheduleFactorUnit',
- tableId: "5301Schedule",
+ functionId: 5303,
+ serialNumber: '5303ScheduleFactorUnit',
+ tableId: "5303Schedule",
tableName: "排产明细表",
columnProp: "factorUnit",
headerAlign: "center",
@@ -1573,13 +1592,13 @@ export default {
columnSortable: false,
sortLv: 0,
status: true,
- fixed: false
+ fixed: ''
},
{
userId: this.$store.state.user.name,
- functionId: 5301,
- serialNumber: '5301ScheduleSite',
- tableId: "5301Schedule",
+ functionId: 5303,
+ serialNumber: '5303ScheduleSite',
+ tableId: "5303Schedule",
tableName: "排产明细表",
columnProp: "site",
headerAlign: "center",
@@ -1591,13 +1610,13 @@ export default {
columnSortable: false,
sortLv: 0,
status: true,
- fixed: false
+ fixed: ''
},
{
userId: this.$store.state.user.name,
- functionId: 5301,
- serialNumber: '5301ScheduleQtyScheduledPreOps',
- tableId: "5301Schedule",
+ functionId: 5303,
+ serialNumber: '5303ScheduleQtyScheduledPreOps',
+ tableId: "5303Schedule",
tableName: "排产明细表",
columnProp: "qtyScheduledPreOps",
headerAlign: "center",
@@ -1609,13 +1628,13 @@ export default {
columnSortable: false,
sortLv: 0,
status: true,
- fixed: false
+ fixed: ''
},
{
userId: this.$store.state.user.name,
- functionId: 5301,
- serialNumber: '5301ScheduleDelayFlag',
- tableId: "5301Schedule",
+ functionId: 5303,
+ serialNumber: '5303ScheduleDelayFlag',
+ tableId: "5303Schedule",
tableName: "排产明细表",
columnProp: "laterShipFlag",
headerAlign: "center",
@@ -1627,13 +1646,13 @@ export default {
columnSortable: false,
sortLv: 0,
status: true,
- fixed: false
+ fixed: ''
},
{
userId: this.$store.state.user.name,
- functionId: 5301,
- serialNumber: '5301ScheduleClosedFlag',
- tableId: "5301Schedule",
+ functionId: 5303,
+ serialNumber: '5303ScheduleClosedFlag',
+ tableId: "5303Schedule",
tableName: "排产明细表",
columnProp: "closedFlag",
headerAlign: "center",
@@ -1645,13 +1664,13 @@ export default {
columnSortable: false,
sortLv: 0,
status: true,
- fixed: false
+ fixed: ''
},
{
userId: this.$store.state.user.name,
- functionId: 5301,
- serialNumber: '5301ScheduleParkFlag',
- tableId: "5301Schedule",
+ functionId: 5303,
+ serialNumber: '5303ScheduleParkFlag',
+ tableId: "5303Schedule",
tableName: "排产明细表",
columnProp: "parkFlag",
headerAlign: "center",
@@ -1663,13 +1682,13 @@ export default {
columnSortable: false,
sortLv: 0,
status: true,
- fixed: false
+ fixed: ''
},
{
userId: this.$store.state.user.name,
- functionId: 5301,
- serialNumber: '5301ScheduleTimeRequired',
- tableId: "5301Schedule",
+ functionId: 5303,
+ serialNumber: '5303ScheduleTimeRequired',
+ tableId: "5303Schedule",
tableName: "排产明细表",
columnProp: "timeRequired",
headerAlign: "center",
@@ -1681,13 +1700,13 @@ export default {
columnSortable: false,
sortLv: 0,
status: true,
- fixed: false
+ fixed: ''
},
{
userId: this.$store.state.user.name,
- functionId: 5301,
- serialNumber: '5301SchedulePreOpsPlanFinishTime',
- tableId: "5301Schedule",
+ functionId: 5303,
+ serialNumber: '5303SchedulePreOpsPlanFinishTime',
+ tableId: "5303Schedule",
tableName: "排产明细表",
columnProp: "earlierItemFlag",
headerAlign: "center",
@@ -1699,13 +1718,13 @@ export default {
columnSortable: false,
sortLv: 0,
status: true,
- fixed: false
+ fixed: ''
},
{
userId: this.$store.state.user.name,
- functionId: 5301,
- serialNumber: '5301ScheduleRemark',
- tableId: "5301Schedule",
+ functionId: 5303,
+ serialNumber: '5303ScheduleRemark',
+ tableId: "5303Schedule",
tableName: "排产明细表",
columnProp: "remark",
headerAlign: "center",
@@ -1717,13 +1736,13 @@ export default {
columnSortable: false,
sortLv: 0,
status: true,
- fixed: false
+ fixed: ''
},
{
userId: this.$store.state.user.name,
- functionId: 5301,
- serialNumber: '5301ScheduleOriSOOrderNo',
- tableId: "5301Schedule",
+ functionId: 5303,
+ serialNumber: '5303ScheduleOriSOOrderNo',
+ tableId: "5303Schedule",
tableName: "排产明细表",
columnProp: "oriSOOrderNo",
headerAlign: "center",
@@ -1735,13 +1754,13 @@ export default {
columnSortable: false,
sortLv: 0,
status: true,
- fixed: false
+ fixed: ''
},
{
userId: this.$store.state.user.name,
- functionId: 5301,
- serialNumber: '5301ScheduleCustPartNo',
- tableId: "5301Schedule",
+ functionId: 5303,
+ serialNumber: '5303ScheduleCustPartNo',
+ tableId: "5303Schedule",
tableName: "排产明细表",
columnProp: "custPartNo",
headerAlign: "center",
@@ -1753,13 +1772,13 @@ export default {
columnSortable: false,
sortLv: 0,
status: true,
- fixed: false
+ fixed: ''
},
{
userId: this.$store.state.user.name,
- functionId: 5301,
- serialNumber: '5301ScheduleEficiency',
- tableId: "5301Schedule",
+ functionId: 5303,
+ serialNumber: '5303ScheduleEficiency',
+ tableId: "5303Schedule",
tableName: "排产明细表",
columnProp: "eficiency",
headerAlign: "center",
@@ -1771,13 +1790,13 @@ export default {
columnSortable: false,
sortLv: 0,
status: true,
- fixed: false
+ fixed: ''
},
{
userId: this.$store.state.user.name,
- functionId: 5301,
- serialNumber: '5301ScheduleDelayHours',
- tableId: "5301Schedule",
+ functionId: 5303,
+ serialNumber: '5303ScheduleDelayHours',
+ tableId: "5303Schedule",
tableName: "排产明细表",
columnProp: "delayHours",
headerAlign: "center",
@@ -1789,13 +1808,13 @@ export default {
columnSortable: false,
sortLv: 0,
status: true,
- fixed: false
+ fixed: ''
},
{
userId: this.$store.state.user.name,
- functionId: 5301,
- serialNumber: '5301ScheduleCostRollUpFlag',
- tableId: "5301Schedule",
+ functionId: 5303,
+ serialNumber: '5303ScheduleCostRollUpFlag',
+ tableId: "5303Schedule",
tableName: "排产明细表",
columnProp: "costRollUpFlag",
headerAlign: "center",
@@ -1807,13 +1826,13 @@ export default {
columnSortable: false,
sortLv: 0,
status: true,
- fixed: false
+ fixed: ''
},
{
userId: this.$store.state.user.name,
- functionId: 5301,
- serialNumber: '5301Schedule',
- tableId: "5301Schedule",
+ functionId: 5303,
+ serialNumber: '5303Schedule',
+ tableId: "5303Schedule",
tableName: "排产明细表",
columnProp: "finishPreItemFlag",
headerAlign: "center",
@@ -1825,7 +1844,7 @@ export default {
columnSortable: false,
sortLv: 0,
status: true,
- fixed: false
+ fixed: ''
}
],
calendarOutList: [],
@@ -1845,7 +1864,37 @@ export default {
changeScheduleByRoutingFlag: true,
changeScheduleByCalendarFlag: true,
partStockFlag: true,
- }
+ },
+ buttons: {
+ settingLanguageList: '按语言设置',
+ edit: '编辑',
+ delete: '删除',
+ deleteList: '批量删除',
+ cz: '操作',
+ search: '查询',
+ download: '导出',
+ settingTable: '设置列表',
+ defaultTable: '设置默认配置',
+ list: "列表",
+ addList: '批量添加',
+ settingLanguage: "按控件设置"
+ },
+ queryTable:{
+ userId: this.$store.state.user.name,
+ functionId: this.$route.meta.menuId,
+ tableId: "5303Order",
+ languageCode: this.$i18n.locale
+ },
+ // 用户table 查询参数
+ queryTableUser: {
+ userId: this.$store.state.user.name,
+ functionId: this.$route.meta.menuId,
+ tableId: "5303Order",
+ status: true,
+ languageCode: this.$i18n.locale
+ },
+ // 用户table 配置集合
+ userColumnList: [],
}
},
@@ -1859,6 +1908,7 @@ export default {
comPartStock,/*展示物料库存的组件*/
comChangeWaitTime,/*修改等待派工单的等待时间*/
updateProductRouting,/*修改工艺路线*/
+ column,/*动态列*/
},
mounted() {
@@ -2600,15 +2650,128 @@ export default {
}
},
+ // 打开页面设置
+ userSetting(tableId) {
+ this.visible = true;
+ let queryTable = {
+ userId: this.$store.state.user.name,
+ functionId: this.$route.meta.menuId,
+ tableId: tableId,
+ languageCode: this.$i18n.locale
+ }
+ this.$nextTick(() => {
+ this.$refs.column.init(queryTable);
+ });
+ },
+ // 获取 用户保存的 格式列
+ getTableUserColumn(tableId) {
+ //判断是否是null
+ if(!(null === tableId || "" === tableId)){
+ this.queryTableUser.tableId = tableId;
+ }
+ getTableUserListLanguage(this.queryTableUser).then(({data}) => {
+ if (data.rows.length > 0) {
+ //this.columnList = []
+ //如果是订单表
+ if('5303Order' === tableId){
+ this.columnOrderArray = data.rows;
+ }else if('5303Schedule' === tableId){
+ this.columnOrderScheduleArray = data.rows;
+ }
+ } else {
+ this.getColumnList(tableId);
+ }
+
+ })
+ },
+ // 保存 默认配置 列
+ async saveColumnList(tableId) {
+ //重置tableId
+ this.queryTable.tableId = tableId;
+ this.queryTableUser.tableId = tableId;
+ // 删除所有的该页面下保存的数据
+ if (this.userColumnList) {
+ //删除 user自定义的数据
+ await removerUser(this.queryTable)
+ }
+ // 删除默认配置
+ await removerDefault(this.queryTable)
+ // 保存页面 table属性
+ let sumColumnList = this.columnOrderArray.concat(this.columnOrderScheduleArray);
+ sumColumnList = sumColumnList.map(item => {
+ return item = {
+ tableId: item.tableId,
+ tableName: item.tableName,
+ columnProp: item.columnProp,
+ columnLabel: item.columnLabel,
+ columnHidden: false,
+ columnImage: false,
+ columnSortable: false,
+ columnWidth: item.columnWidth,
+ format: item.format,
+ functionId: this.$route.meta.menuId,
+ sortLv: item.sortLv,
+ status: true,
+ fixed: item.fixed,
+ serialNumber: item.serialNumber,
+ columnType: item.columnType,
+ align: item.align
+ }
+ })
+
+ await saveTableDefaultList(sumColumnList)
+ // 保存页面 button label title 属性
+ /* let buttons = this.buttonList.map(item => {
+ return item = {
+ functionId: this.$route.meta.menuId,
+ languageValue: item.languageValue,
+ objectId: item.objectId,
+ objectType: item.objectType,
+ tableId: item.tableId
+ }
+ })
+ await saveButtonList(buttons)*/
+ this.getFunctionButtonList()
+ this.getColumnList()
+ },
+ // 获取 tableDefault 列
+ getColumnList(tableId) {
+ //判断是否是null
+ if(!(null === tableId || "" === tableId)){
+ this.queryTable.tableId = tableId;
+ }
+ getTableDefaultListLanguage(this.queryTable).then(({data}) => {
+ if (!data.rows.length == 0) {
+ // this.showDefault = false
+ //如果是订单表
+ if('5304Order' === tableId){
+ this.columnOrderArray = data.rows;
+ }else if('5304Schedule' === tableId){
+ this.columnOrderScheduleArray = data.rows;
+ }
+ } else {
+ // this.showDefault = true
+ }
+ })
+ },
+
},
created() {
+ //获取动态表头的信息
+ this.getTableUserColumn('5303Order');
//执行查询休息时间数据
this.getResourceShiftData();
//查询工单的数据
this.getShopOrderList();
//查询派工的数据
this.getOrderScheduleList();
+
+ //延迟操作
+ setTimeout(item =>{
+ //分布执行
+ this.getTableUserColumn('5303Schedule');
+ },3000);
},
watch:{