From 32a460c97817095ce7246b8c4f173f28b2e5f665 Mon Sep 17 00:00:00 2001
From: rui_li <877258667@qq.com>
Date: Tue, 2 Nov 2021 15:43:47 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AF=BC=E5=85=A5=E6=97=B6=E9=97=B4=E6=8F=92?=
 =?UTF-8?q?=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package.json                                  |    3 +-
 .../{order_schedule.js => produce_order.js}   |    4 +-
 src/main.js                                   |    4 +-
 src/views/modules/schedule/order_schedule.vue |  317 ++-
 .../modules/yieldReport/produce_order.vue     |  968 +++++++++
 .../yieldReport/produce_report_normal.vue     |   83 +
 .../modules/yieldReport/production_order.vue  | 1807 -----------------
 7 files changed, 1208 insertions(+), 1978 deletions(-)
 rename src/api/yieldReport/{order_schedule.js => produce_order.js} (67%)
 create mode 100644 src/views/modules/yieldReport/produce_order.vue
 create mode 100644 src/views/modules/yieldReport/produce_report_normal.vue
 delete mode 100644 src/views/modules/yieldReport/production_order.vue

diff --git a/package.json b/package.json
index 3d17a3b..44a2a48 100644
--- a/package.json
+++ b/package.json
@@ -37,7 +37,8 @@
     "vue-json-excel": "^0.3.0",
     "vue-router": "3.0.1",
     "vuex": "3.0.1",
-    "xlsx": "^0.17.0"
+    "xlsx": "^0.17.0",
+    "dayjs": "1.10.7"
   },
   "devDependencies": {
     "autoprefixer": "7.1.2",
diff --git a/src/api/yieldReport/order_schedule.js b/src/api/yieldReport/produce_order.js
similarity index 67%
rename from src/api/yieldReport/order_schedule.js
rename to src/api/yieldReport/produce_order.js
index a412d0d..a2b782d 100644
--- a/src/api/yieldReport/order_schedule.js
+++ b/src/api/yieldReport/produce_order.js
@@ -1,7 +1,7 @@
 import { createAPI } from '@/utils/httpRequest.js'
 
-// 获取机台休息班次的信息
-export const getResourceRestList = data => createAPI('schedule/getResourceRestList', 'POST', data)
+// 获取
+export const getProduceScheduleList = data => createAPI('schedule/getProduceScheduleData', 'POST', data)
 
 // 获取信息
 export const getShopOrderList = data => createAPI('schedule/getShopOrderList', 'POST', data)
diff --git a/src/main.js b/src/main.js
index d17428e..9ee8001 100644
--- a/src/main.js
+++ b/src/main.js
@@ -2,7 +2,8 @@ import Vue from 'vue'
 import App from '@/App'
 import router from '@/router'                 // api: https://github.com/vuejs/vue-router
 import store from '@/store'                   // api: https://github.com/vuejs/vuex
-import VueCookie from 'vue-cookie'            // api: https://github.com/alfhen/vue-cookie
+import VueCookie from 'vue-cookie'            // api: https://github.com/alfhen/vue-cookie // 时间处理
+import dayjs from 'dayjs';
 import '@/element-ui'                         // api: https://github.com/ElemeFE/element
 import '@/icons'                              // api: http://www.iconfont.cn/
 import '@/element-ui-theme'
@@ -29,6 +30,7 @@ if (process.env.NODE_ENV !== 'production') {
 Vue.prototype.$http = httpRequest // ajax请求方法
 Vue.prototype.isAuth = isAuth     // 权限方法
 Vue.prototype.decimalUtil = decimalUtil    // 计算
+Vue.prototype.dayjs = dayjs  //时间格式化插件 2021-11-02
 
 // 保存整站vuex本地储存初始状态
 window.SITE_CONFIG['storeState'] = cloneDeep(store.state)
diff --git a/src/views/modules/schedule/order_schedule.vue b/src/views/modules/schedule/order_schedule.vue
index 297387e..b164e67 100644
--- a/src/views/modules/schedule/order_schedule.vue
+++ b/src/views/modules/schedule/order_schedule.vue
@@ -1,4 +1,3 @@
-<script src="../../../api/schedule/order_schedule.js" xmlns="http://www.w3.org/1999/html"></script>
 <template>
   <div class="customer-css" >
     <!--  菜单按钮区域  -->
@@ -350,7 +349,7 @@ export default {
         {
           userId: this.$store.state.user.name,
           functionId: 5301,
-          serialNumber: '5301OrderItemDesc',
+          serialNumber: '5301OrderNeedDate',
           tableId: "5301Order",
           tableName: "工单表",
           columnProp: "needDate",
@@ -368,7 +367,7 @@ export default {
         {
           userId: this.$store.state.user.name,
           functionId: 5301,
-          serialNumber: '5301OrderItemDesc',
+          serialNumber: '5301OrderPartNo',
           tableId: "5301Order",
           tableName: "工单表",
           columnProp: "partNo",
@@ -386,7 +385,7 @@ export default {
         {
           userId: this.$store.state.user.name,
           functionId: 5301,
-          serialNumber: '5301OrderItemDesc',
+          serialNumber: '5301OrderCustomerName',
           tableId: "5301Order",
           tableName: "工单表",
           columnProp: "customerName",
@@ -404,7 +403,7 @@ export default {
         {
           userId: this.$store.state.user.name,
           functionId: 5301,
-          serialNumber: '5301OrderItemDesc',
+          serialNumber: '5301OrderCustPartNo',
           tableId: "5301Order",
           tableName: "工单表",
           columnProp: "custPartNo",
@@ -422,7 +421,7 @@ export default {
         {
           userId: this.$store.state.user.name,
           functionId: 5301,
-          serialNumber: '5301OrderItemDesc',
+          serialNumber: '5301OrderPartDesc',
           tableId: "5301Order",
           tableName: "工单表",
           columnProp: "partDesc",
@@ -440,7 +439,7 @@ export default {
         {
           userId: this.$store.state.user.name,
           functionId: 5301,
-          serialNumber: '5301OrderItemDesc',
+          serialNumber: '5301OrderLotSize',
           tableId: "5301Order",
           tableName: "工单表",
           columnProp: "lotSize",
@@ -458,7 +457,7 @@ export default {
         {
           userId: this.$store.state.user.name,
           functionId: 5301,
-          serialNumber: '5301OrderItemDesc',
+          serialNumber: '5301OrderQtyToSchedule',
           tableId: "5301Order",
           tableName: "工单表",
           columnProp: "qtyToSchedule",
@@ -476,7 +475,7 @@ export default {
         {
           userId: this.$store.state.user.name,
           functionId: 5301,
-          serialNumber: '5301OrderItemDesc',
+          serialNumber: '5301OrderQtyScheduled',
           tableId: "5301Order",
           tableName: "工单表",
           columnProp: "qtyScheduled",
@@ -494,7 +493,7 @@ export default {
         {
           userId: this.$store.state.user.name,
           functionId: 5301,
-          serialNumber: '5301OrderItemDesc',
+          serialNumber: '5301OrderQtyReported',
           tableId: "5301Order",
           tableName: "工单表",
           columnProp: "qtyReported",
@@ -512,7 +511,7 @@ export default {
         {
           userId: this.$store.state.user.name,
           functionId: 5301,
-          serialNumber: '5301OrderItemDesc',
+          serialNumber: '5301OrderSpec',
           tableId: "5301Order",
           tableName: "工单表",
           columnProp: "spec",
@@ -530,7 +529,7 @@ export default {
         {
           userId: this.$store.state.user.name,
           functionId: 5301,
-          serialNumber: '5301OrderItemDesc',
+          serialNumber: '5301OrderSite',
           tableId: "5301Order",
           tableName: "工单表",
           columnProp: "site",
@@ -548,7 +547,7 @@ export default {
         {
           userId: this.$store.state.user.name,
           functionId: 5301,
-          serialNumber: '5301OrderItemDesc',
+          serialNumber: '5301OrderWorkCenterNo',
           tableId: "5301Order",
           tableName: "工单表",
           columnProp: "workCenterNo",
@@ -566,7 +565,7 @@ export default {
         {
           userId: this.$store.state.user.name,
           functionId: 5301,
-          serialNumber: '5301OrderItemDesc',
+          serialNumber: '5301OrderNextItemNo',
           tableId: "5301Order",
           tableName: "工单表",
           columnProp: "nextItemNo",
@@ -584,7 +583,7 @@ export default {
         {
           userId: this.$store.state.user.name,
           functionId: 5301,
-          serialNumber: '5301OrderItemDesc',
+          serialNumber: '5301OrderNextItemDesc',
           tableId: "5301Order",
           tableName: "工单表",
           columnProp: "nextItemDesc",
@@ -602,7 +601,7 @@ export default {
         {
           userId: this.$store.state.user.name,
           functionId: 5301,
-          serialNumber: '5301OrderItemDesc',
+          serialNumber: '5301OrderNextScheduledFlag',
           tableId: "5301Order",
           tableName: "工单表",
           columnProp: "nextScheduledFlag",
@@ -620,7 +619,7 @@ export default {
         {
           userId: this.$store.state.user.name,
           functionId: 5301,
-          serialNumber: '5301OrderItemDesc',
+          serialNumber: '5301OrderPreItemNo',
           tableId: "5301Order",
           tableName: "工单表",
           columnProp: "preItemNo",
@@ -638,7 +637,7 @@ export default {
         {
           userId: this.$store.state.user.name,
           functionId: 5301,
-          serialNumber: '5301OrderItemDesc',
+          serialNumber: '5301OrderPreItemDesc',
           tableId: "5301Order",
           tableName: "工单表",
           columnProp: "preItemDesc",
@@ -656,7 +655,7 @@ export default {
         {
           userId: this.$store.state.user.name,
           functionId: 5301,
-          serialNumber: '5301OrderItemDesc',
+          serialNumber: '5301OrderPreScheduledFlag',
           tableId: "5301Order",
           tableName: "工单表",
           columnProp: "preScheduledFlag",
@@ -674,7 +673,7 @@ export default {
         {
           userId: this.$store.state.user.name,
           functionId: 5301,
-          serialNumber: '5301OrderItemDesc',
+          serialNumber: '5301OrderScheduledFlag',
           tableId: "5301Order",
           tableName: "工单表",
           columnProp: "scheduledFlag",
@@ -692,7 +691,7 @@ export default {
         {
           userId: this.$store.state.user.name,
           functionId: 5301,
-          serialNumber: '5301OrderItemDesc',
+          serialNumber: '5301OrderAvailResource',
           tableId: "5301Order",
           tableName: "工单表",
           columnProp: "availResource",
@@ -710,7 +709,7 @@ export default {
         {
           userId: this.$store.state.user.name,
           functionId: 5301,
-          serialNumber: '5301OrderItemDesc',
+          serialNumber: '5301OrderEnterDate',
           tableId: "5301Order",
           tableName: "工单表",
           columnProp: "enterDate",
@@ -728,13 +727,13 @@ export default {
         {
           userId: this.$store.state.user.name,
           functionId: 5301,
-          serialNumber: '5301OrderItemDesc',
+          serialNumber: '5301Order',
           tableId: "5301Order",
           tableName: "工单表",
           columnProp: "计划时间",
           headerAlign: "center",
           align: "center",
-          columnLabel: "计划时间",
+          columnLabel: "",
           columnWidth: 80,
           columnHidden: false,
           columnImage: false,
@@ -746,7 +745,7 @@ export default {
         {
           userId: this.$store.state.user.name,
           functionId: 5301,
-          serialNumber: '5301OrderItemDesc',
+          serialNumber: '5301OrderMachRunFactor',
           tableId: "5301Order",
           tableName: "工单表",
           columnProp: "machRunFactor",
@@ -764,7 +763,7 @@ export default {
         {
           userId: this.$store.state.user.name,
           functionId: 5301,
-          serialNumber: '5301OrderItemDesc',
+          serialNumber: '5301OrderQtyScheduledPreOps',
           tableId: "5301Order",
           tableName: "工单表",
           columnProp: "qtyScheduledPreOps",
@@ -782,7 +781,7 @@ export default {
         {
           userId: this.$store.state.user.name,
           functionId: 5301,
-          serialNumber: '5301OrderItemDesc',
+          serialNumber: '5301OrderQtyApprovedPreOps',
           tableId: "5301Order",
           tableName: "工单表",
           columnProp: "qtyApprovedPreOps",
@@ -800,7 +799,7 @@ export default {
         {
           userId: this.$store.state.user.name,
           functionId: 5301,
-          serialNumber: '5301OrderItemDesc',
+          serialNumber: '5301Order',
           tableId: "5301Order",
           tableName: "工单表",
           columnProp: "",
@@ -818,10 +817,10 @@ export default {
         {
           userId: this.$store.state.user.name,
           functionId: 5301,
-          serialNumber: '5301OrderItemDesc',
+          serialNumber: '5301OrderTimeRequired',
           tableId: "5301Order",
           tableName: "工单表",
-          columnProp: "待排产时间",
+          columnProp: "timeRequired",
           headerAlign: "center",
           align: "center",
           columnLabel: "待排产时间",
@@ -836,7 +835,7 @@ export default {
         {
           userId: this.$store.state.user.name,
           functionId: 5301,
-          serialNumber: '5301OrderItemDesc',
+          serialNumber: '5301OrderEfficiency',
           tableId: "5301Order",
           tableName: "工单表",
           columnProp: "efficiency",
@@ -854,13 +853,13 @@ export default {
         {
           userId: this.$store.state.user.name,
           functionId: 5301,
-          serialNumber: '5301OrderItemDesc',
+          serialNumber: '5301Order',
           tableId: "5301Order",
           tableName: "工单表",
           columnProp: "刀模已发",
           headerAlign: "center",
           align: "center",
-          columnLabel: "刀模已发",
+          columnLabel: "",
           columnWidth: 80,
           columnHidden: false,
           columnImage: false,
@@ -872,13 +871,13 @@ export default {
         {
           userId: this.$store.state.user.name,
           functionId: 5301,
-          serialNumber: '5301OrderItemDesc',
+          serialNumber: '5301Order',
           tableId: "5301Order",
           tableName: "工单表",
           columnProp: "印版已发",
           headerAlign: "center",
           align: "center",
-          columnLabel: "印版已发",
+          columnLabel: "",
           columnWidth: 80,
           columnHidden: false,
           columnImage: false,
@@ -892,10 +891,10 @@ export default {
         {
           userId: this.$store.state.user.name,
           functionId: 5301,
-          serialNumber: '5301OrderOrderNo',
-          tableId: "5301Order",
+          serialNumber: '5301Schedule',
+          tableId: "5301Schedule",
           tableName: "排产明细表",
-          columnProp: "排产序号",
+          columnProp: "",
           headerAlign: "center",
           align: "center",
           columnLabel: "排产序号",
@@ -910,8 +909,8 @@ export default {
         {
           userId: this.$store.state.user.name,
           functionId: 5301,
-          serialNumber: '5301OrderItemNo',
-          tableId: "5301Order",
+          serialNumber: '5301SchedulePlanStartTime',
+          tableId: "5301Schedule",
           tableName: "排产明细表",
           columnProp: "planStartTime",
           headerAlign: "center",
@@ -928,8 +927,8 @@ export default {
         {
           userId: this.$store.state.user.name,
           functionId: 5301,
-          serialNumber: '5301OrderItemDesc',
-          tableId: "5301Order",
+          serialNumber: '5301SchedulePlanFinishTime',
+          tableId: "5301Schedule",
           tableName: "排产明细表",
           columnProp: "planFinishTime",
           headerAlign: "center",
@@ -946,8 +945,8 @@ export default {
         {
           userId: this.$store.state.user.name,
           functionId: 5301,
-          serialNumber: '5301OrderItemDesc',
-          tableId: "5301Order",
+          serialNumber: '5301ScheduleTimeRequired',
+          tableId: "5301Schedule",
           tableName: "排产明细表",
           columnProp: "timeRequired",
           headerAlign: "center",
@@ -964,8 +963,8 @@ export default {
         {
           userId: this.$store.state.user.name,
           functionId: 5301,
-          serialNumber: '5301OrderItemDesc',
-          tableId: "5301Order",
+          serialNumber: '5301ScheduleOrderNo',
+          tableId: "5301Schedule",
           tableName: "排产明细表",
           columnProp: "orderNo",
           headerAlign: "center",
@@ -982,8 +981,8 @@ export default {
         {
           userId: this.$store.state.user.name,
           functionId: 5301,
-          serialNumber: '5301OrderItemDesc',
-          tableId: "5301Order",
+          serialNumber: '5301ScheduleNeedDate',
+          tableId: "5301Schedule",
           tableName: "排产明细表",
           columnProp: "needDate",
           headerAlign: "center",
@@ -1000,8 +999,8 @@ export default {
         {
           userId: this.$store.state.user.name,
           functionId: 5301,
-          serialNumber: '5301OrderItemDesc',
-          tableId: "5301Order",
+          serialNumber: '5301ScheduleItemNo',
+          tableId: "5301Schedule",
           tableName: "排产明细表",
           columnProp: "itemNo",
           headerAlign: "center",
@@ -1018,8 +1017,8 @@ export default {
         {
           userId: this.$store.state.user.name,
           functionId: 5301,
-          serialNumber: '5301OrderItemDesc',
-          tableId: "5301Order",
+          serialNumber: '5301ScheduleItemDesc',
+          tableId: "5301Schedule",
           tableName: "排产明细表",
           columnProp: "itemDesc",
           headerAlign: "center",
@@ -1036,8 +1035,8 @@ export default {
         {
           userId: this.$store.state.user.name,
           functionId: 5301,
-          serialNumber: '5301OrderItemDesc',
-          tableId: "5301Order",
+          serialNumber: '5301SchedulePartNo',
+          tableId: "5301Schedule",
           tableName: "排产明细表",
           columnProp: "partNo",
           headerAlign: "center",
@@ -1054,8 +1053,8 @@ export default {
         {
           userId: this.$store.state.user.name,
           functionId: 5301,
-          serialNumber: '5301OrderItemDesc',
-          tableId: "5301Order",
+          serialNumber: '5301SchedulePartDesc',
+          tableId: "5301Schedule",
           tableName: "排产明细表",
           columnProp: "partDesc",
           headerAlign: "center",
@@ -1072,8 +1071,8 @@ export default {
         {
           userId: this.$store.state.user.name,
           functionId: 5301,
-          serialNumber: '5301OrderItemDesc',
-          tableId: "5301Order",
+          serialNumber: '5301OrderSpec',
+          tableId: "5301Schedule",
           tableName: "排产明细表",
           columnProp: "spec",
           headerAlign: "center",
@@ -1090,13 +1089,13 @@ export default {
         {
           userId: this.$store.state.user.name,
           functionId: 5301,
-          serialNumber: '5301OrderItemDesc',
-          tableId: "5301Order",
+          serialNumber: '5301ScheduleLotSize',
+          tableId: "5301Schedule",
           tableName: "排产明细表",
-          columnProp: "待生产数量",
+          columnProp: "lotSize",
           headerAlign: "center",
           align: "center",
-          columnLabel: "",
+          columnLabel: "待生产数量",
           columnWidth: 80,
           columnHidden: false,
           columnImage: false,
@@ -1108,8 +1107,8 @@ export default {
         {
           userId: this.$store.state.user.name,
           functionId: 5301,
-          serialNumber: '5301OrderItemDesc',
-          tableId: "5301Order",
+          serialNumber: '5301ScheduleLotSize',
+          tableId: "5301Schedule",
           tableName: "排产明细表",
           columnProp: "lotSize",
           headerAlign: "center",
@@ -1126,8 +1125,8 @@ export default {
         {
           userId: this.$store.state.user.name,
           functionId: 5301,
-          serialNumber: '5301OrderItemDesc',
-          tableId: "5301Order",
+          serialNumber: '5301ScheduleQtyReported',
+          tableId: "5301Schedule",
           tableName: "排产明细表",
           columnProp: "qtyReported",
           headerAlign: "center",
@@ -1144,8 +1143,8 @@ export default {
         {
           userId: this.$store.state.user.name,
           functionId: 5301,
-          serialNumber: '5301OrderItemDesc',
-          tableId: "5301Order",
+          serialNumber: '5301SchedulePreItemNo',
+          tableId: "5301Schedule",
           tableName: "排产明细表",
           columnProp: "preItemNo",
           headerAlign: "center",
@@ -1162,8 +1161,8 @@ export default {
         {
           userId: this.$store.state.user.name,
           functionId: 5301,
-          serialNumber: '5301OrderItemDesc',
-          tableId: "5301Order",
+          serialNumber: '5301SchedulePreItemDesc',
+          tableId: "5301Schedule",
           tableName: "排产明细表",
           columnProp: "preItemDesc",
           headerAlign: "center",
@@ -1180,8 +1179,8 @@ export default {
         {
           userId: this.$store.state.user.name,
           functionId: 5301,
-          serialNumber: '5301OrderItemDesc',
-          tableId: "5301Order",
+          serialNumber: '5301SchedulePreScheduledFlag',
+          tableId: "5301Schedule",
           tableName: "排产明细表",
           columnProp: "preScheduledFlag",
           headerAlign: "center",
@@ -1198,13 +1197,13 @@ export default {
         {
           userId: this.$store.state.user.name,
           functionId: 5301,
-          serialNumber: '5301OrderItemDesc',
-          tableId: "5301Order",
+          serialNumber: '5301ScheduleNextItemNo',
+          tableId: "5301Schedule",
           tableName: "排产明细表",
-          columnProp: "后道工序",
+          columnProp: "nextItemNo",
           headerAlign: "center",
           align: "center",
-          columnLabel: "nextItemNo",
+          columnLabel: "后道工序",
           columnWidth: 80,
           columnHidden: false,
           columnImage: false,
@@ -1216,8 +1215,8 @@ export default {
         {
           userId: this.$store.state.user.name,
           functionId: 5301,
-          serialNumber: '5301OrderItemDesc',
-          tableId: "5301Order",
+          serialNumber: '5301ScheduleNextItemDesc',
+          tableId: "5301Schedule",
           tableName: "排产明细表",
           columnProp: "nextItemDesc",
           headerAlign: "center",
@@ -1234,8 +1233,8 @@ export default {
         {
           userId: this.$store.state.user.name,
           functionId: 5301,
-          serialNumber: '5301OrderItemDesc',
-          tableId: "5301Order",
+          serialNumber: '5301ScheduleNextScheduledFlag',
+          tableId: "5301Schedule",
           tableName: "排产明细表",
           columnProp: "nextScheduledFlag",
           headerAlign: "center",
@@ -1252,10 +1251,10 @@ export default {
         {
           userId: this.$store.state.user.name,
           functionId: 5301,
-          serialNumber: '5301OrderItemDesc',
-          tableId: "5301Order",
+          serialNumber: '5301ScheduleResourceId',
+          tableId: "5301Schedule",
           tableName: "排产明细表",
-          columnProp: "sResourceId",
+          columnProp: "resourceId",
           headerAlign: "center",
           align: "center",
           columnLabel: "机台号",
@@ -1270,8 +1269,8 @@ export default {
         {
           userId: this.$store.state.user.name,
           functionId: 5301,
-          serialNumber: '5301OrderItemDesc',
-          tableId: "5301Order",
+          serialNumber: '5301ScheduleCustomerName',
+          tableId: "5301Schedule",
           tableName: "排产明细表",
           columnProp: "customerName",
           headerAlign: "center",
@@ -1288,8 +1287,8 @@ export default {
         {
           userId: this.$store.state.user.name,
           functionId: 5301,
-          serialNumber: '5301OrderItemDesc',
-          tableId: "5301Order",
+          serialNumber: '5301ScheduleEnterDate',
+          tableId: "5301Schedule",
           tableName: "排产明细表",
           columnProp: "enterDate",
           headerAlign: "center",
@@ -1306,13 +1305,13 @@ export default {
         {
           userId: this.$store.state.user.name,
           functionId: 5301,
-          serialNumber: '5301OrderItemDesc',
-          tableId: "5301Order",
+          serialNumber: '5301ScheduleAvailResource',
+          tableId: "5301Schedule",
           tableName: "排产明细表",
-          columnProp: "可用机台",
+          columnProp: "availResource",
           headerAlign: "center",
           align: "center",
-          columnLabel: "",
+          columnLabel: "可用机台",
           columnWidth: 80,
           columnHidden: false,
           columnImage: false,
@@ -1324,8 +1323,8 @@ export default {
         {
           userId: this.$store.state.user.name,
           functionId: 5301,
-          serialNumber: '5301OrderItemDesc',
-          tableId: "5301Order",
+          serialNumber: '5301ScheduleWorkCenterNo',
+          tableId: "5301Schedule",
           tableName: "排产明细表",
           columnProp: "workCenterNo",
           headerAlign: "center",
@@ -1342,8 +1341,8 @@ export default {
         {
           userId: this.$store.state.user.name,
           functionId: 5301,
-          serialNumber: '5301OrderItemDesc',
-          tableId: "5301Order",
+          serialNumber: '5301ScheduleMachRunFactor',
+          tableId: "5301Schedule",
           tableName: "排产明细表",
           columnProp: "machRunFactor",
           headerAlign: "center",
@@ -1360,8 +1359,8 @@ export default {
         {
           userId: this.$store.state.user.name,
           functionId: 5301,
-          serialNumber: '5301OrderItemDesc',
-          tableId: "5301Order",
+          serialNumber: '5301ScheduleMachSetupTime',
+          tableId: "5301Schedule",
           tableName: "排产明细表",
           columnProp: "machSetupTime",
           headerAlign: "center",
@@ -1378,8 +1377,8 @@ export default {
         {
           userId: this.$store.state.user.name,
           functionId: 5301,
-          serialNumber: '5301OrderItemDesc',
-          tableId: "5301Order",
+          serialNumber: '5301ScheduleFactorUnit',
+          tableId: "5301Schedule",
           tableName: "排产明细表",
           columnProp: "factorUnit",
           headerAlign: "center",
@@ -1396,8 +1395,8 @@ export default {
         {
           userId: this.$store.state.user.name,
           functionId: 5301,
-          serialNumber: '5301OrderItemDesc',
-          tableId: "5301Order",
+          serialNumber: '5301ScheduleSite',
+          tableId: "5301Schedule",
           tableName: "排产明细表",
           columnProp: "site",
           headerAlign: "center",
@@ -1414,8 +1413,8 @@ export default {
         {
           userId: this.$store.state.user.name,
           functionId: 5301,
-          serialNumber: '5301OrderItemDesc',
-          tableId: "5301Order",
+          serialNumber: '5301ScheduleQtyScheduledPreOps',
+          tableId: "5301Schedule",
           tableName: "排产明细表",
           columnProp: "qtyScheduledPreOps",
           headerAlign: "center",
@@ -1432,13 +1431,13 @@ export default {
         {
           userId: this.$store.state.user.name,
           functionId: 5301,
-          serialNumber: '5301OrderItemDesc',
-          tableId: "5301Order",
+          serialNumber: '5301ScheduleDelayHours',
+          tableId: "5301Schedule",
           tableName: "排产明细表",
-          columnProp: "晚于发货时间",
+          columnProp: "delayHours",
           headerAlign: "center",
           align: "center",
-          columnLabel: "",
+          columnLabel: "晚于发货时间",
           columnWidth: 80,
           columnHidden: false,
           columnImage: false,
@@ -1450,8 +1449,8 @@ export default {
         {
           userId: this.$store.state.user.name,
           functionId: 5301,
-          serialNumber: '5301OrderItemDesc',
-          tableId: "5301Order",
+          serialNumber: '5301Schedule',
+          tableId: "5301Schedule",
           tableName: "排产明细表",
           columnProp: "RecordType",
           headerAlign: "center",
@@ -1468,13 +1467,13 @@ export default {
         {
           userId: this.$store.state.user.name,
           functionId: 5301,
-          serialNumber: '5301OrderItemDesc',
-          tableId: "5301Order",
+          serialNumber: '5301ScheduleClosedFlag',
+          tableId: "5301Schedule",
           tableName: "排产明细表",
-          columnProp: "是否关闭",
+          columnProp: "closedFlag",
           headerAlign: "center",
           align: "center",
-          columnLabel: "",
+          columnLabel: "是否关闭",
           columnWidth: 80,
           columnHidden: false,
           columnImage: false,
@@ -1486,8 +1485,8 @@ export default {
         {
           userId: this.$store.state.user.name,
           functionId: 5301,
-          serialNumber: '5301OrderItemDesc',
-          tableId: "5301Order",
+          serialNumber: '5301Schedule',
+          tableId: "5301Schedule",
           tableName: "排产明细表",
           columnProp: "是否关闭",
           headerAlign: "center",
@@ -1504,13 +1503,13 @@ export default {
         {
           userId: this.$store.state.user.name,
           functionId: 5301,
-          serialNumber: '5301OrderItemDesc',
-          tableId: "5301Order",
+          serialNumber: '5301ScheduleParkFlag',
+          tableId: "5301Schedule",
           tableName: "排产明细表",
-          columnProp: "是否关闭",
+          columnProp: "parkFlag",
           headerAlign: "center",
           align: "center",
-          columnLabel: "",
+          columnLabel: "暂停",
           columnWidth: 80,
           columnHidden: false,
           columnImage: false,
@@ -1522,31 +1521,13 @@ export default {
         {
           userId: this.$store.state.user.name,
           functionId: 5301,
-          serialNumber: '5301OrderItemDesc',
-          tableId: "5301Order",
+          serialNumber: '5301ScheduleTimeRequired',
+          tableId: "5301Schedule",
           tableName: "排产明细表",
-          columnProp: "暂停",
-          headerAlign: "center",
-          align: "center",
-          columnLabel: "",
-          columnWidth: 80,
-          columnHidden: false,
-          columnImage: false,
-          columnSortable: false,
-          sortLv: 0,
-          status: true,
-          fixed: false
-        },
-        {
-          userId: this.$store.state.user.name,
-          functionId: 5301,
-          serialNumber: '5301OrderItemDesc',
-          tableId: "5301Order",
-          tableName: "排产明细表",
-          columnProp: "派工单需求工时",
+          columnProp: "timeRequired",
           headerAlign: "center",
           align: "center",
-          columnLabel: "",
+          columnLabel: "派工单需求工时",
           columnWidth: 80,
           columnHidden: false,
           columnImage: false,
@@ -1558,13 +1539,13 @@ export default {
         {
           userId: this.$store.state.user.name,
           functionId: 5301,
-          serialNumber: '5301OrderItemDesc',
-          tableId: "5301Order",
+          serialNumber: '5301SchedulePreOpsPlanFinishTime',
+          tableId: "5301Schedule",
           tableName: "排产明细表",
-          columnProp: "派工单早于上工序",
+          columnProp: "preOpsPlanFinishTime",
           headerAlign: "center",
           align: "center",
-          columnLabel: "",
+          columnLabel: "派工单早于上工序",
           columnWidth: 80,
           columnHidden: false,
           columnImage: false,
@@ -1576,13 +1557,13 @@ export default {
         {
           userId: this.$store.state.user.name,
           functionId: 5301,
-          serialNumber: '5301OrderItemDesc',
-          tableId: "5301Order",
+          serialNumber: '5301ScheduleRemark',
+          tableId: "5301Schedule",
           tableName: "排产明细表",
-          columnProp: "备注",
+          columnProp: "remark",
           headerAlign: "center",
           align: "center",
-          columnLabel: "",
+          columnLabel: "备注",
           columnWidth: 80,
           columnHidden: false,
           columnImage: false,
@@ -1594,8 +1575,8 @@ export default {
         {
           userId: this.$store.state.user.name,
           functionId: 5301,
-          serialNumber: '5301OrderItemDesc',
-          tableId: "5301Order",
+          serialNumber: '5301Schedule',
+          tableId: "5301Schedule",
           tableName: "排产明细表",
           columnProp: "SAP参考号",
           headerAlign: "center",
@@ -1612,13 +1593,13 @@ export default {
         {
           userId: this.$store.state.user.name,
           functionId: 5301,
-          serialNumber: '5301OrderItemDesc',
-          tableId: "5301Order",
+          serialNumber: '5301ScheduleCustPartNo',
+          tableId: "5301Schedule",
           tableName: "排产明细表",
-          columnProp: "客户产品料号",
+          columnProp: "custPartNo",
           headerAlign: "center",
           align: "center",
-          columnLabel: "",
+          columnLabel: "客户产品料号",
           columnWidth: 80,
           columnHidden: false,
           columnImage: false,
@@ -1630,13 +1611,13 @@ export default {
         {
           userId: this.$store.state.user.name,
           functionId: 5301,
-          serialNumber: '5301OrderItemDesc',
-          tableId: "5301Order",
+          serialNumber: '5301ScheduleEficiency',
+          tableId: "5301Schedule",
           tableName: "排产明细表",
-          columnProp: "效率",
+          columnProp: "eficiency",
           headerAlign: "center",
           align: "center",
-          columnLabel: "",
+          columnLabel: "效率",
           columnWidth: 80,
           columnHidden: false,
           columnImage: false,
@@ -1648,13 +1629,13 @@ export default {
         {
           userId: this.$store.state.user.name,
           functionId: 5301,
-          serialNumber: '5301OrderItemDesc',
-          tableId: "5301Order",
+          serialNumber: '5301ScheduleDelayHours',
+          tableId: "5301Schedule",
           tableName: "排产明细表",
-          columnProp: "延误小时数",
+          columnProp: "delayHours",
           headerAlign: "center",
           align: "center",
-          columnLabel: "",
+          columnLabel: "延误小时数",
           columnWidth: 80,
           columnHidden: false,
           columnImage: false,
@@ -1666,8 +1647,8 @@ export default {
         {
           userId: this.$store.state.user.name,
           functionId: 5301,
-          serialNumber: '5301OrderItemDesc',
-          tableId: "5301Order",
+          serialNumber: '5301Schedule',
+          tableId: "5301Schedule",
           tableName: "排产明细表",
           columnProp: "已排料",
           headerAlign: "center",
@@ -1684,8 +1665,8 @@ export default {
         {
           userId: this.$store.state.user.name,
           functionId: 5301,
-          serialNumber: '5301OrderItemDesc',
-          tableId: "5301Order",
+          serialNumber: '5301Schedule',
+          tableId: "5301Schedule",
           tableName: "排产明细表",
           columnProp: "排产完成时间早于上工序",
           headerAlign: "center",
@@ -1742,6 +1723,8 @@ export default {
     this.getResourceShiftData();
     //查询工单的数据
     this.getShopOrderList();
+    //查询派工的数据
+    this.getOrderScheduleList();
   }
 }
 </script>
diff --git a/src/views/modules/yieldReport/produce_order.vue b/src/views/modules/yieldReport/produce_order.vue
new file mode 100644
index 0000000..b9d9764
--- /dev/null
+++ b/src/views/modules/yieldReport/produce_order.vue
@@ -0,0 +1,968 @@
+<template>
+  <div class="customer-css" >
+    <!--  菜单按钮区域  -->
+    <fieldset class="customer-field" style="width: 675px; padding: 0.35em 0.75em 0.425em;" >
+      <legend>菜单</legend>
+      <el-form :inline="true" label-position="top" label-width="100px" style="margin-top: -5px;" >
+        <el-form-item :label="''">
+          <el-button type="primary" style="margin-left: 10px; margin-top: 13px; margin-bottom: 5px;">列表</el-button>
+        </el-form-item>
+        <el-form-item :label="''">
+          <el-button type="primary" style="margin-left: 10px; margin-top: 13px; margin-bottom: 5px;">关闭</el-button>
+        </el-form-item>
+        <el-form-item :label="''">
+          <el-button type="primary" @click="refreshPageTables()" style="margin-left: 10px; margin-top: 13px; margin-bottom: 5px;">查询</el-button>
+        </el-form-item>
+        <el-form-item :label="''">
+          <el-button type="primary" @click="refreshPageTables()" style="margin-left: 10px; margin-top: 13px; margin-bottom: 5px;">报工</el-button>
+        </el-form-item>
+        <el-form-item :label="''">
+          <el-button type="primary" @click="refreshPageTables()" style="margin-left: 10px; margin-top: 13px; margin-bottom: 5px;">FQC报工</el-button>
+        </el-form-item>
+        <el-form-item :label="''">
+          <el-button type="primary" @click="refreshPageTables()" style="margin-left: 10px; margin-top: 13px; margin-bottom: 5px;">返工重检</el-button>
+        </el-form-item>
+        <el-form-item :label="''">
+          <el-button type="primary" @click="refreshPageTables()" style="margin-left: 10px; margin-top: 13px; margin-bottom: 5px;">换包装</el-button>
+        </el-form-item>
+        <el-form-item :label="''">
+          <el-button type="primary" @click="refreshPageTables()" style="margin-left: 10px; margin-top: 13px; margin-bottom: 5px;">FQC分卷</el-button>
+        </el-form-item>
+      </el-form>
+    </fieldset>
+    <!--  查询时间和产品  -->
+    <el-form :inline="true" label-position="top" label-width="100px" style="margin-top: 5px;" >
+      <el-form-item :label="'工厂编号:'">
+        <el-input v-model="searchData.site" style="width: 85px"></el-input>
+      </el-form-item>
+      <el-form-item :label="'机台编号:'">
+        <el-input v-model="searchData.resourceId" style="width: 120px"></el-input>
+      </el-form-item>
+      <el-form-item :label="'计划开工时间:'">
+        <el-date-picker class="el-time-width"
+                        style=""
+                        v-model="searchData.planStartTime1"
+                        value-format="yyyy-MM-dd">
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item :label="''">
+        <el-date-picker class="el-time-width"
+                        style="margin-top: 30px;"
+                        v-model="searchData.planStartTime2"
+                        format="yyyy-MM-dd"
+                        value-format="yyyy-MM-dd"
+                        placeholder="">
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item :label="'生产订单号:'">
+        <el-input v-model="searchData.orderNo" style="width: 120px"></el-input>
+      </el-form-item>
+      <el-form-item :label="'派工单号:'">
+        <el-input v-model="searchData.seqNo" style="width: 120px"></el-input>
+      </el-form-item>
+      <el-form-item :label="''" style="margin-left: -5px;">
+        <el-checkbox style="margin-top: 28px;" true-label="Y" false-label="N"  v-model="searchData.closedFlag">显示已结束派工单</el-checkbox>
+      </el-form-item>
+    </el-form>
+
+    <!--  工单主表信息  -->
+    <el-main style="margin-left: -20px; margin-top: -20px; width: 104%;">
+      <el-table
+        :height="height"
+        :data="produceScheduleList"
+        border
+        v-loading="dataListLoading"
+        style="width: 100%;">
+        <el-table-column
+          v-for="(item,index) in columnProduceScheduleArray" :key="index"
+          :sortable="item.columnSortable"
+          :prop="item.columnProp"
+          :header-align="item.headerAlign"
+          :show-overflow-tooltip="item.showOverflowTooltip"
+          :align="item.align"
+          :fixed="item.fixed"
+          :width="item.columnWidth"
+          :label="item.columnLabel">
+          <template slot-scope="scope">
+            <span v-if="!item.columnHidden"> {{scope.row[item.columnProp]}}</span>
+            <span v-if="item.columnImage"><img :src="scope.row[item.columnProp]"
+                                               style="width: 100px; height: 80px"/></span>
+          </template>
+        </el-table-column>
+      </el-table>
+    </el-main>
+  </div>
+</template>
+
+<script>
+
+import {
+  getProduceScheduleList,
+} from '@/api/yieldReport/produce_order.js'
+
+export default {
+  data() {
+    return {
+      height: 800,
+      modelFlag: false,
+      modelInputFlag: true,
+      selectList: [],
+      searchData: {
+        site: this.$store.state.user.site,
+        resourceId: '',
+        orderNo: '',
+        seqNo: '',
+        planStartTime1: '',
+        planStartTime2: this.dayjs(new Date()).format('YYYY-MM-DD'),
+        closedFlag: 'N',
+        status: 1,
+        user: this.$store.state.user.name
+      },
+      produceScheduleList: [],
+      dataListLoading: false,
+      buttons: {
+        search: '查询',
+      },
+      columnProduceScheduleArray: [
+        {
+          userId: this.$store.state.user.name,
+          functionId: 5302,
+          serialNumber: '5302ProducePlanStartTime',
+          tableId: "5302Produce",
+          tableName: "待生产工单",
+          columnProp: "planStartTime",
+          headerAlign: "center",
+          align: "center",
+          columnLabel: "计划开工时间",
+          columnWidth: 60,
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: false
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 5302,
+          serialNumber: '5302ProducePlanFinishTime',
+          tableId: "5302Produce",
+          tableName: "待生产工单",
+          columnProp: "planFinishTime",
+          headerAlign: "center",
+          align: "center",
+          columnLabel: "计划完工时间",
+          columnWidth: 80,
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: false
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 5302,
+          serialNumber: '5302ProduceTimeRequired',
+          tableId: "5302Produce",
+          tableName: "待生产工单",
+          columnProp: "timeRequired",
+          headerAlign: "center",
+          align: "center",
+          columnLabel: "需求时间",
+          columnWidth: 80,
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: false
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 5302,
+          serialNumber: '5302ProduceTimeReported',
+          tableId: "5302Produce",
+          tableName: "待生产工单",
+          columnProp: "timeReported",
+          headerAlign: "center",
+          align: "center",
+          columnLabel: "已报告时间",
+          columnWidth: 80,
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: false
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 5302,
+          serialNumber: '5302ProduceOrderNo',
+          tableId: "5302Produce",
+          tableName: "待生产工单",
+          columnProp: "orderNo",
+          headerAlign: "center",
+          align: "center",
+          columnLabel: "生产订单号",
+          columnWidth: 80,
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: false
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 5302,
+          serialNumber: '5302ProduceItemNo',
+          tableId: "5302Produce",
+          tableName: "待生产工单",
+          columnProp: "itemNo",
+          headerAlign: "center",
+          align: "center",
+          columnLabel: "工序号",
+          columnWidth: 80,
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: false
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 5302,
+          serialNumber: '5302ProduceItemDesc',
+          tableId: "5302Produce",
+          tableName: "待生产工单",
+          columnProp: "itemDesc",
+          headerAlign: "center",
+          align: "center",
+          columnLabel: "工序描述",
+          columnWidth: 80,
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: false
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 5302,
+          serialNumber: '5302ProduceResourceId',
+          tableId: "5302Produce",
+          tableName: "待生产工单",
+          columnProp: "resourceId",
+          headerAlign: "center",
+          align: "center",
+          columnLabel: "机台",
+          columnWidth: 80,
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: false
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 5302,
+          serialNumber: '5302ProduceQtyRequired',
+          tableId: "5302Produce",
+          tableName: "待生产工单",
+          columnProp: "qtyRequired",
+          headerAlign: "center",
+          align: "center",
+          columnLabel: "需求数量",
+          columnWidth: 80,
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: false
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 5302,
+          serialNumber: '5302ProduceQtyReported',
+          tableId: "5302Produce",
+          tableName: "待生产工单",
+          columnProp: "qtyReported",
+          headerAlign: "center",
+          align: "center",
+          columnLabel: "已报告数量",
+          columnWidth: 80,
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: false
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 5302,
+          serialNumber: '5302ProduceNeedDate',
+          tableId: "5302Produce",
+          tableName: "待生产工单",
+          columnProp: "needDate",
+          headerAlign: "center",
+          align: "center",
+          columnLabel: "生产订单要求完工日期",
+          columnWidth: 80,
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: false
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 5302,
+          serialNumber: '5302ProduceClosedFlag',
+          tableId: "5302Produce",
+          tableName: "待生产工单",
+          columnProp: "closedFlag",
+          headerAlign: "center",
+          align: "center",
+          columnLabel: "已关闭",
+          columnWidth: 80,
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: false
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 5302,
+          serialNumber: '5302ProducePartNo',
+          tableId: "5302Produce",
+          tableName: "待生产工单",
+          columnProp: "partNo",
+          headerAlign: "center",
+          align: "center",
+          columnLabel: "产品编码",
+          columnWidth: 80,
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: false
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 5302,
+          serialNumber: '5302ProducePartDesc',
+          tableId: "5302Produce",
+          tableName: "待生产工单",
+          columnProp: "partDesc",
+          headerAlign: "center",
+          align: "center",
+          columnLabel: "产品名称",
+          columnWidth: 80,
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: false
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 5302,
+          serialNumber: '5302ProduceSpec',
+          tableId: "5302Produce",
+          tableName: "待生产工单",
+          columnProp: "spec",
+          headerAlign: "center",
+          align: "center",
+          columnLabel: "规格型号",
+          columnWidth: 80,
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: false
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 5302,
+          serialNumber: '5302ProduceSeqNo',
+          tableId: "5302Produce",
+          tableName: "待生产工单",
+          columnProp: "seqNo",
+          headerAlign: "center",
+          align: "center",
+          columnLabel: "次序号",
+          columnWidth: 80,
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: false
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 5302,
+          serialNumber: '5302ProduceQtyApprove',
+          tableId: "5302Produce",
+          tableName: "待生产工单",
+          columnProp: "qtyApprove",
+          headerAlign: "center",
+          align: "center",
+          columnLabel: "合格数量",
+          columnWidth: 80,
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: false
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 5302,
+          serialNumber: '5302ProduceNextItemDesc',
+          tableId: "5302Produce",
+          tableName: "条形码",
+          columnProp: "nextItemDesc",
+          headerAlign: "center",
+          align: "center",
+          columnLabel: "条形码",
+          columnWidth: 80,
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: false
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 5302,
+          serialNumber: '5302ProduceRemark',
+          tableId: "5302Produce",
+          tableName: "待生产工单",
+          columnProp: "remark",
+          headerAlign: "center",
+          align: "center",
+          columnLabel: "备注",
+          columnWidth: 80,
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: false
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 5302,
+          serialNumber: '5302ProduceCrewSize',
+          tableId: "5302Produce",
+          tableName: "待生产工单",
+          columnProp: "crewSize",
+          headerAlign: "center",
+          align: "center",
+          columnLabel: "操作工人数",
+          columnWidth: 80,
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: false
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 5302,
+          serialNumber: '5302ProduceQtyScrapt',
+          tableId: "5302Produce",
+          tableName: "待生产工单",
+          columnProp: "qtyScrapt",
+          headerAlign: "center",
+          align: "center",
+          columnLabel: "报废数量",
+          columnWidth: 80,
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: false
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 5302,
+          serialNumber: '5302ProduceOutWorkFlag',
+          tableId: "5302Produce",
+          tableName: "待生产工单",
+          columnProp: "outWorkFlag",
+          headerAlign: "center",
+          align: "center",
+          columnLabel: "是否外协",
+          columnWidth: 80,
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: false
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 5302,
+          serialNumber: '5302ProduceScheduledDate',
+          tableId: "5302Produce",
+          tableName: "待生产工单",
+          columnProp: "scheduledDate",
+          headerAlign: "center",
+          align: "center",
+          columnLabel: "排产日期",
+          columnWidth: 80,
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: false
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 5302,
+          serialNumber: '5302ProduceScheduledSeqNo',
+          tableId: "5302Produce",
+          tableName: "待生产工单",
+          columnProp: "scheduledSeqNo",
+          headerAlign: "center",
+          align: "center",
+          columnLabel: "次序号",
+          columnWidth: 80,
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: false
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 5302,
+          serialNumber: '5302ProduceShiftNo',
+          tableId: "5302Produce",
+          tableName: "待生产工单",
+          columnProp: "shiftNo",
+          headerAlign: "center",
+          align: "center",
+          columnLabel: "班次",
+          columnWidth: 80,
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: false
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 5302,
+          serialNumber: '5302ProduceMachSetupTime',
+          tableId: "5302Produce",
+          tableName: "待生产工单",
+          columnProp: "machSetupTime",
+          headerAlign: "center",
+          align: "center",
+          columnLabel: "调机时间",
+          columnWidth: 80,
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: false
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 5302,
+          serialNumber: '5302ProduceFactorUnit',
+          tableId: "5302Produce",
+          tableName: "待生产工单",
+          columnProp: "factorUnit",
+          headerAlign: "center",
+          align: "center",
+          columnLabel: "产出单位",
+          columnWidth: 80,
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: false
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 5302,
+          serialNumber: '5302ProduceEfficiency',
+          tableId: "5302Produce",
+          tableName: "待生产工单",
+          columnProp: "efficiency",
+          headerAlign: "center",
+          align: "center",
+          columnLabel: "效率",
+          columnWidth: 80,
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: false
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 5302,
+          serialNumber: '5302ProduceNextItemNo',
+          tableId: "5302Produce",
+          tableName: "待生产工单",
+          columnProp: "nextItemNo",
+          headerAlign: "center",
+          align: "center",
+          columnLabel: "下道工序号",
+          columnWidth: 80,
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: false
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 5302,
+          serialNumber: '5302ProduceNextItemDesc',
+          tableId: "5302Produce",
+          tableName: "待生产工单",
+          columnProp: "nextItemDesc",
+          headerAlign: "center",
+          align: "center",
+          columnLabel: "下道工序名称",
+          columnWidth: 80,
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: false
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 5302,
+          serialNumber: '5302ProducePreItemNo',
+          tableId: "5302Produce",
+          tableName: "待生产工单",
+          columnProp: "preItemNo",
+          headerAlign: "center",
+          align: "center",
+          columnLabel: "前道工序号",
+          columnWidth: 80,
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: false
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 5302,
+          serialNumber: '5302ProducePreItemDesc',
+          tableId: "5302Produce",
+          tableName: "待生产工单",
+          columnProp: "preItemDesc",
+          headerAlign: "center",
+          align: "center",
+          columnLabel: "前道工序名称",
+          columnWidth: 80,
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: false
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 5302,
+          serialNumber: '5302ProduceSite',
+          tableId: "5302Produce",
+          tableName: "待生产工单",
+          columnProp: "site",
+          headerAlign: "center",
+          align: "center",
+          columnLabel: "工厂编号",
+          columnWidth: 80,
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: false
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 5302,
+          serialNumber: '5302ProduceParkFlag',
+          tableId: "5302Produce",
+          tableName: "待生产工单",
+          columnProp: "parkFlag",
+          headerAlign: "center",
+          align: "center",
+          columnLabel: "暂停",
+          columnWidth: 80,
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: false
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 5302,
+          serialNumber: '5302ProduceCustomerName',
+          tableId: "5302Produce",
+          tableName: "待生产工单",
+          columnProp: "customerName",
+          headerAlign: "center",
+          align: "center",
+          columnLabel: "客户名称",
+          columnWidth: 80,
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: false
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 5302,
+          serialNumber: '5302ProduceCustPartNo',
+          tableId: "5302Produce",
+          tableName: "待生产工单",
+          columnProp: "custPartNo",
+          headerAlign: "center",
+          align: "center",
+          columnLabel: "客户产品料号",
+          columnWidth: 80,
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: false
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 5302,
+          serialNumber: '5302ProduceQtyRequiredOriginal',
+          tableId: "5302Produce",
+          tableName: "待生产工单",
+          columnProp: "qtyRequiredOriginal",
+          headerAlign: "center",
+          align: "center",
+          columnLabel: "原始派工单需求数量",
+          columnWidth: 80,
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: false
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 5302,
+          serialNumber: '5302ProduceClosedBy',
+          tableId: "5302Produce",
+          tableName: "待生产工单",
+          columnProp: "closedBy",
+          headerAlign: "center",
+          align: "center",
+          columnLabel: "关闭人",
+          columnWidth: 80,
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: false
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 5302,
+          serialNumber: '5302ProduceClosedDate',
+          tableId: "5302Produce",
+          tableName: "待生产工单",
+          columnProp: "closedDate",
+          headerAlign: "center",
+          align: "center",
+          columnLabel: "关闭日期",
+          columnWidth: 80,
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: false
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 5302,
+          serialNumber: '5302ProduceCostRollUpFlag',
+          tableId: "5302Produce",
+          tableName: "待生产工单",
+          columnProp: "costRollUpFlag",
+          headerAlign: "center",
+          align: "center",
+          columnLabel: "已排料",
+          columnWidth: 80,
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: false
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 5302,
+          serialNumber: '5302Produce',
+          tableId: "5302Produce",
+          tableName: "待生产工单",
+          columnProp: "",
+          headerAlign: "center",
+          align: "center",
+          columnLabel: "刀模已发",
+          columnWidth: 80,
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: false
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 5302,
+          serialNumber: '5302Produce',
+          tableId: "5302Produce",
+          tableName: "待生产工单",
+          columnProp: "",
+          headerAlign: "center",
+          align: "center",
+          columnLabel: "印版已发",
+          columnWidth: 80,
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: false
+        }
+      ],
+    }
+  },
+  mounted() {
+    this.$nextTick(() => {
+      this.height = window.innerHeight - 225;
+    })
+  },
+  methods: {
+    getProduceScheduleList() {
+      getProduceScheduleList(this.searchData).then(({data}) => {
+        this.produceScheduleList = data.rows
+      })
+    },
+
+    /*刷新页面table*/
+    refreshPageTables(){
+      this.getProduceScheduleList();
+    },
+  },
+  created() {
+    //查询工单的数据
+    this.getProduceScheduleList();
+  }
+}
+</script>
+
+<style>
+.el-textarea__inner {
+  padding: 5px 5px;
+}
+
+</style>
+
+<!--当前页面的标签样式-->
+<style scoped lang="scss">
+
+/*针对el-card*/
+.customer-card .el-form-item__content{
+  margin-top: -15px;
+}
+.customer-card .el-form-item{
+  height: 22px;
+}
+
+.customer-border .el-form-item__content{
+  margin-top: -30px;
+}
+
+/*全局年与日类型  宽度*/
+div.el-time-width{
+  width: 190px !important;
+}
+/* 全局时间右边框*/
+.customer-css input.el-input__inner{
+  height: 22px !important;
+  padding-right: 0px !important;
+}
+/* 控制el-card标签的数据*/
+div.customer-el-card {
+  margin-left: 110px;
+  margin-top: -15px;
+  height: 20px;
+  width: 60px;
+}
+/* 颜色控制 */
+div.customer-el-card-pink {
+  background: #FF00FF;
+}
+
+div.customer-el-card-orange {
+  background: #FFD700;
+}
+
+div.customer-el-card-blue {
+  background: #0000CD;
+}
+
+/*清掉样式*/
+.el-radio+.el-radio {
+  margin-left: 0px;
+}
+
+
+/*控制上下间距*/
+</style>
diff --git a/src/views/modules/yieldReport/produce_report_normal.vue b/src/views/modules/yieldReport/produce_report_normal.vue
new file mode 100644
index 0000000..338830d
--- /dev/null
+++ b/src/views/modules/yieldReport/produce_report_normal.vue
@@ -0,0 +1,83 @@
+<template>
+  <div class="user-add-or-update">
+    <el-dialog
+      width="530px"
+      :title="'生产报工'"
+      :close-on-click-modal="false"
+      :visible.sync="visible">
+      <el-form :inline="true" :model="dataForm" label-position="top" ref="dataForm"
+               @keyup.enter.native="dataFormSubmit()"
+               label-width="80px">
+        <el-form>
+          <el-form-item label="用户账号" prop="userName">
+            <el-input v-model="dataForm.userName" style="width: 150px;" placeholder="登录帐号"></el-input>
+          </el-form-item>
+          <el-form-item label="密码" prop="password" :class="{ 'is-required': !dataForm.id }">
+            <el-input v-model="dataForm.password" style="width: 150px;" type="password" placeholder="密码"></el-input>
+          </el-form-item>
+          <el-form-item label="确认密码" prop="comfirmPassword" :class="{ 'is-required': !dataForm.id }">
+            <el-input v-model="dataForm.comfirmPassword" style="width: 150px;" type="password"
+                      placeholder="确认密码"></el-input>
+          </el-form-item>
+        </el-form>
+        <el-form>
+          <el-form-item label="用户名" prop="email">
+            <el-input v-model="dataForm.userDisplay" style="width: 150px;" placeholder="用户昵称"></el-input>
+          </el-form-item>
+          <el-form-item label="邮箱" prop="email">
+            <el-input v-model="dataForm.email" style="width: 150px;" placeholder="邮箱"></el-input>
+          </el-form-item>
+          <el-form-item label="手机号" prop="mobile">
+            <el-input v-model="dataForm.mobile" style="width: 150px;" placeholder="手机号"></el-input>
+          </el-form-item>
+        </el-form>
+        <el-form>
+          <el-form-item label="工厂" size="mini" prop="site">
+            <el-select filterable v-model="dataForm.site" style="width: 150px;">
+              <el-option :value="item.site" :label="item.baseDesc" v-for="(item,index) in factorys" :key="index"
+              ></el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item label="语言" prop="languageDefault">
+            <el-select filterable v-model="dataForm.languageDefault" clearable style="width: 150px;">
+              <el-option :label="item.languageName" :value="item.languageCode" v-for="(item,index) in languageList "
+                         :key="index"></el-option>
+            </el-select>
+          </el-form-item>
+        </el-form>
+        <el-form>
+          <el-form-item label="角色" size="mini" prop="roleIdList">
+            <el-checkbox-group v-model="dataForm.roleIdList">
+              <el-checkbox v-for="role in roleList" :key="role.roleId" :label="role.roleId">{{
+                  role.roleName
+                }}
+              </el-checkbox>
+            </el-checkbox-group>
+          </el-form-item>
+        </el-form>
+        <el-form>
+          <el-form-item label="状态" size="mini" prop="status">
+            <el-radio-group v-model="dataForm.status">
+              <el-radio :label="0">禁用</el-radio>
+              <el-radio :label="1">正常</el-radio>
+            </el-radio-group>
+          </el-form-item>
+        </el-form>
+      </el-form>
+      <span slot="footer" class="dialog-footer">
+         <el-button type="primary" @click="dataFormSubmit()">确定</el-button>
+         <el-button @click="visible = false">取消</el-button>
+    </span>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+export default {
+  name: "produce_report_normal"
+}
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/views/modules/yieldReport/production_order.vue b/src/views/modules/yieldReport/production_order.vue
deleted file mode 100644
index f139c1e..0000000
--- a/src/views/modules/yieldReport/production_order.vue
+++ /dev/null
@@ -1,1807 +0,0 @@
-<script src="../../../api/schedule/order_schedule.js" xmlns="http://www.w3.org/1999/html"></script>
-<template>
-  <div class="customer-css" >
-    <!--  菜单按钮区域  -->
-    <fieldset class="customer-field" style="width: 612px; padding: 0.35em 0.75em 0.425em;" >
-      <legend>菜单</legend>
-      <el-form :inline="true" label-position="top" label-width="100px" style="margin-top: -5px;" >
-        <el-form-item :label="''">
-          <el-button type="primary" style="margin-left: 10px; margin-top: 13px; margin-bottom: 5px;">列表</el-button>
-        </el-form-item>
-        <el-form-item :label="''">
-          <el-button type="primary" style="margin-left: 10px; margin-top: 13px; margin-bottom: 5px;">关闭</el-button>
-        </el-form-item>
-        <el-form-item :label="''">
-          <el-button type="primary" @click="refreshPageTables()" style="margin-left: 10px; margin-top: 13px; margin-bottom: 5px;">查询</el-button>
-        </el-form-item>
-      </el-form>
-    </fieldset>
-    <!--  查询时间和产品  -->
-    <el-form :inline="true" label-position="top" label-width="100px" style="margin-top: -5px;" >
-      <el-form-item :label="'录入日期:'">
-        <el-date-picker class="el-time-width"
-                        style=""
-                        v-model="searchData.enterTime1"
-                        value-format="yyyy-MM-dd">
-        </el-date-picker>
-      </el-form-item>
-      <el-form-item :label="''">
-        <el-date-picker class="el-time-width"
-                        style="margin-top: 30px;"
-                        v-model="searchData.enterTime2"
-                        value-format="yyyy-MM-dd" placeholder="">
-        </el-date-picker>
-      </el-form-item>
-      <el-form-item :label="'要求完工日期:'">
-        <el-date-picker class="el-time-width"
-                        style=""
-                        v-model="searchData.needTime1"
-                        value-format="yyyy-MM-dd" placeholder="">
-        </el-date-picker>
-      </el-form-item>
-      <el-form-item :label="''">
-        <el-date-picker class="el-time-width"
-                        style="margin-top: 30px;"
-                        v-model="searchData.needTime2"
-                        value-format="yyyy-MM-dd" placeholder="">
-        </el-date-picker>
-      </el-form-item>
-      <el-form-item :label="'产成品编码:'">
-        <el-input v-model="searchData.partNo" style="width: 120px"></el-input>
-      </el-form-item>
-    </el-form>
-    <!--  排序规则  -->
-    <fieldset class="customer-field" style="margin-left: 640px; margin-top: -90px; width: 135px;" >
-      <legend>排序</legend><br>
-      <el-form :inline="true" label-position="top" label-width="100px" >
-        <el-form-item :label="''" style="margin-bottom: 5px;">
-          <el-radio-group v-model="searchData.sortField">
-            <el-radio label="needDate">要求完工日期</el-radio>
-            <el-radio label="orderNo">订单号</el-radio>
-            <el-radio label="partNo">产品编码</el-radio>
-          </el-radio-group>
-        </el-form-item>
-      </el-form>
-    </fieldset>
-    <!-- 排产信息   -->
-    <fieldset class="customer-field" style="margin-top: 10px; width: 612px; padding: 0.125em;" >
-      <legend>排产信息</legend>
-      <!--  排产日期  -->
-      <el-form :inline="true" label-position="top" label-width="100px"  >
-        <el-form-item :label="'排产日期:'">
-          <el-date-picker class="el-time-width"
-                          style=""
-                          v-model="searchData.scheduleDate"
-                          value-format="yyyy-MM-dd">
-          </el-date-picker>
-        </el-form-item>
-        <el-form-item :label="''">
-          <el-time-picker
-            format="HH:mm"
-            arrow-control
-            style="margin-top: 30px; width: 65px"
-            v-model="searchData.timePeriod"
-            value-format="HH:mm">
-          </el-time-picker>
-        </el-form-item>
-        <el-form-item :label="''" style="margin-left: -5px;">
-          <el-checkbox style="margin-top: 28px;" label="仅查看前道工序已排产的工序" name="type"></el-checkbox>
-        </el-form-item>
-      </el-form>
-      <!--  记录示意图  -->
-      <fieldset style="margin-left: 380px; margin-top: -40px; width: 180px;">
-        <legend>记录示意图</legend>
-        <el-form :inline="true" label-position="top" label-width="100px" class="customer-card">
-          <el-form-item :label="'已关闭,已达数量'">
-            <el-card class="customer-el-card customer-el-card-pink"></el-card>
-          </el-form-item>
-          <el-form-item :label="'已关闭,未达数量'">
-            <el-card class="customer-el-card customer-el-card-orange"></el-card>
-          </el-form-item>
-          <el-form-item :label="'未关闭,未达数量'">
-            <el-card class="customer-el-card customer-el-card-blue"></el-card>
-          </el-form-item>
-        </el-form>
-      </fieldset>
-      <!--  等待订单  -->
-      <fieldset  style="margin-left: 585px; margin-top: -93px; width: 180px; ">
-        <legend>等待订单</legend>
-        <el-form :inline="true" label-position="left" label-width="100px" class="customer-border">
-          <el-form-item :label="'等待时间(分钟):'" >
-            <el-input type="number" v-model="searchData.waitTimes"
-                      style="margin-top: 15px; width: 48px;">
-            </el-input>
-          </el-form-item>
-          <el-form-item :label="''" style="text-align: center;">
-            <el-button type="primary" style="margin-left: 30px; margin-top: 13px; margin-bottom: 5px;">插入等待订单</el-button>
-          </el-form-item>
-        </el-form>
-      </fieldset>
-      <el-form :inline="true" label-position="top" label-width="100px" style="margin-top: -50px;">
-      <el-form-item :label="'工厂编号:'">
-        <el-input v-model="searchData.site" style="width: 85px"></el-input>
-      </el-form-item>
-      <el-form-item :label="'机台编号:'">
-        <el-input v-model="searchData.resourceId" style="width: 120px"></el-input>
-      </el-form-item>
-      <el-form-item :label="'加工中心编码:'">
-        <el-input v-model="searchData.workCenterNo" style="width: 120px"></el-input>
-      </el-form-item>
-    </el-form>
-    </fieldset >
-    <!--  机台班次信息  -->
-    <el-main style="margin-left: 950px; margin-top: -245px; width: 452px;">
-      <el-table
-        height="235"
-        :data="resourceShiftList"
-        border
-        v-loading="dataListLoading"
-        style="width: 100%;">
-        <el-table-column
-          v-for="(item,index) in columnTimeArray" :key="index"
-          :sortable="item.columnSortable"
-          :prop="item.columnProp"
-          :header-align="item.headerAlign"
-          :show-overflow-tooltip="item.showOverflowTooltip"
-          :align="item.align"
-          :fixed="item.fixed"
-          :width="item.columnWidth"
-          :label="item.columnLabel">
-          <template slot-scope="scope">
-            <span v-if="!item.columnHidden"> {{scope.row[item.columnProp]}}</span>
-            <span v-if="item.columnImage"><img :src="scope.row[item.columnProp]"
-                                               style="width: 100px; height: 80px"/></span>
-          </template>
-        </el-table-column>
-      </el-table>
-    </el-main>
-
-    <!--  工单主表信息  -->
-    <el-main style="margin-left: -20px; margin-top: -35px; width: 104%;">
-      <el-form :inline="true"  label-position="top" label-width="100px">
-        <el-form-item :label="'主记录'">
-        </el-form-item>
-      </el-form>
-      <el-table
-        height="120"
-        :data="shopOrderList"
-        border
-        v-loading="dataListLoading"
-        style="width: 100%;">
-        <el-table-column
-          v-for="(item,index) in columnOrderArray" :key="index"
-          :sortable="item.columnSortable"
-          :prop="item.columnProp"
-          :header-align="item.headerAlign"
-          :show-overflow-tooltip="item.showOverflowTooltip"
-          :align="item.align"
-          :fixed="item.fixed"
-          :width="item.columnWidth"
-          :label="item.columnLabel">
-          <template slot-scope="scope">
-            <span v-if="!item.columnHidden"> {{scope.row[item.columnProp]}}</span>
-            <span v-if="item.columnImage"><img :src="scope.row[item.columnProp]"
-                                               style="width: 100px; height: 80px"/></span>
-          </template>
-        </el-table-column>
-      </el-table>
-    </el-main>
-    <!--  工单明细表信息  -->
-    <el-main style="margin-left: -20px; margin-top: -35px; width: 104%;">
-      <el-form :inline="true"  label-position="top" label-width="100px">
-        <el-form-item :label="'明细记录'">
-        </el-form-item>
-      </el-form>
-      <el-table
-        height="135"
-        :data="orderScheduleList"
-        border
-        v-loading="dataListLoading"
-        style="width: 100%;">
-        <el-table-column
-          v-for="(item,index) in columnOrderScheduleArray" :key="index"
-          :sortable="item.columnSortable"
-          :prop="item.columnProp"
-          :header-align="item.headerAlign"
-          :show-overflow-tooltip="item.showOverflowTooltip"
-          :align="item.align"
-          :fixed="item.fixed"
-          :width="item.columnWidth"
-          :label="item.columnLabel">
-          <template slot-scope="scope">
-            <span v-if="!item.columnHidden"> {{scope.row[item.columnProp]}}</span>
-            <span v-if="item.columnImage"><img :src="scope.row[item.columnProp]"
-                                               style="width: 100px; height: 80px"/></span>
-          </template>
-        </el-table-column>
-      </el-table>
-    </el-main>
-  </div>
-</template>
-
-<script>
-
-import {
-  getResourceRestList,
-  getShopOrderList,
-  getOrderScheduleList,
-} from '@/api/schedule/order_schedule.js'
-
-export default {
-  data() {
-    return {
-      height: 200,
-      modelFlag: false,
-      modelInputFlag: true,
-      selectList: [],
-      searchData: {
-        site: this.$store.state.user.site,
-        resourceId: '',
-        workCenterNo: '',
-        enterTime1: '',
-        enterTime2: new Date(),
-        needTime1: '',
-        needTime2: new Date(),
-        scheduleDate: '',
-        sortField: '',
-        status: 1,
-        user: this.$store.state.user.name
-      },
-      resourceShiftList: [],
-      shopOrderList: [],
-      orderScheduleList: [],
-      dataListLoading: false,
-      buttons: {
-        search: '查询',
-      },
-      columnTimeArray: [
-        {
-          userId: this.$store.state.user.name,
-          functionId: 5301,
-          serialNumber: '5301ShiftShiftDate',
-          tableId: "5301Shift",
-          tableName: "工作日历",
-          columnProp: "shiftDate",
-          headerAlign: "center",
-          align: "center",
-          columnLabel: "日期字段",
-          columnWidth: 90,
-          columnHidden: false,
-          columnImage: false,
-          columnSortable: false,
-          sortLv: 0,
-          status: true,
-          fixed: false
-        },
-        {
-          userId: this.$store.state.user.name,
-          functionId: 5301,
-          serialNumber: '5301ShiftShiftInfo',
-          tableId: "5301Shift",
-          tableName: "工作日历",
-          columnProp: "shiftInfo",
-          headerAlign: "center",
-          align: "center",
-          columnLabel: "休息时间览表",
-          columnWidth: 320,
-          columnHidden: false,
-          columnImage: false,
-          columnSortable: false,
-          sortLv: 0,
-          status: true,
-          fixed: false
-        }
-      ],
-      columnOrderArray: [
-        {
-          userId: this.$store.state.user.name,
-          functionId: 5301,
-          serialNumber: '5301OrderOrderNo',
-          tableId: "5301Order",
-          tableName: "工单表",
-          columnProp: "orderNo",
-          headerAlign: "center",
-          align: "center",
-          columnLabel: "订单号",
-          columnWidth: 80,
-          columnHidden: false,
-          columnImage: false,
-          columnSortable: false,
-          sortLv: 0,
-          status: true,
-          fixed: false
-        },
-        {
-          userId: this.$store.state.user.name,
-          functionId: 5301,
-          serialNumber: '5301OrderItemNo',
-          tableId: "5301Order",
-          tableName: "工单表",
-          columnProp: "itemNo",
-          headerAlign: "center",
-          align: "center",
-          columnLabel: "工序号",
-          columnWidth: 60,
-          columnHidden: false,
-          columnImage: false,
-          columnSortable: false,
-          sortLv: 0,
-          status: true,
-          fixed: false
-        },
-        {
-          userId: this.$store.state.user.name,
-          functionId: 5301,
-          serialNumber: '5301OrderItemDesc',
-          tableId: "5301Order",
-          tableName: "工单表",
-          columnProp: "itemDesc",
-          headerAlign: "center",
-          align: "center",
-          columnLabel: "工序名称",
-          columnWidth: 80,
-          columnHidden: false,
-          columnImage: false,
-          columnSortable: false,
-          sortLv: 0,
-          status: true,
-          fixed: false
-        },
-        {
-          userId: this.$store.state.user.name,
-          functionId: 5301,
-          serialNumber: '5301OrderItemDesc',
-          tableId: "5301Order",
-          tableName: "工单表",
-          columnProp: "needDate",
-          headerAlign: "center",
-          align: "center",
-          columnLabel: "要求完工日期",
-          columnWidth: 80,
-          columnHidden: false,
-          columnImage: false,
-          columnSortable: false,
-          sortLv: 0,
-          status: true,
-          fixed: false
-        },
-        {
-          userId: this.$store.state.user.name,
-          functionId: 5301,
-          serialNumber: '5301OrderItemDesc',
-          tableId: "5301Order",
-          tableName: "工单表",
-          columnProp: "partNo",
-          headerAlign: "center",
-          align: "center",
-          columnLabel: "产品编码",
-          columnWidth: 80,
-          columnHidden: false,
-          columnImage: false,
-          columnSortable: false,
-          sortLv: 0,
-          status: true,
-          fixed: false
-        },
-        {
-          userId: this.$store.state.user.name,
-          functionId: 5301,
-          serialNumber: '5301OrderItemDesc',
-          tableId: "5301Order",
-          tableName: "工单表",
-          columnProp: "customerName",
-          headerAlign: "center",
-          align: "center",
-          columnLabel: "客户名称",
-          columnWidth: 80,
-          columnHidden: false,
-          columnImage: false,
-          columnSortable: false,
-          sortLv: 0,
-          status: true,
-          fixed: false
-        },
-        {
-          userId: this.$store.state.user.name,
-          functionId: 5301,
-          serialNumber: '5301OrderItemDesc',
-          tableId: "5301Order",
-          tableName: "工单表",
-          columnProp: "custPartNo",
-          headerAlign: "center",
-          align: "center",
-          columnLabel: "客户产品料号",
-          columnWidth: 80,
-          columnHidden: false,
-          columnImage: false,
-          columnSortable: false,
-          sortLv: 0,
-          status: true,
-          fixed: false
-        },
-        {
-          userId: this.$store.state.user.name,
-          functionId: 5301,
-          serialNumber: '5301OrderItemDesc',
-          tableId: "5301Order",
-          tableName: "工单表",
-          columnProp: "partDesc",
-          headerAlign: "center",
-          align: "center",
-          columnLabel: "产成品名称",
-          columnWidth: 80,
-          columnHidden: false,
-          columnImage: false,
-          columnSortable: false,
-          sortLv: 0,
-          status: true,
-          fixed: false
-        },
-        {
-          userId: this.$store.state.user.name,
-          functionId: 5301,
-          serialNumber: '5301OrderItemDesc',
-          tableId: "5301Order",
-          tableName: "工单表",
-          columnProp: "lotSize",
-          headerAlign: "center",
-          align: "center",
-          columnLabel: "订单量",
-          columnWidth: 80,
-          columnHidden: false,
-          columnImage: false,
-          columnSortable: false,
-          sortLv: 0,
-          status: true,
-          fixed: false
-        },
-        {
-          userId: this.$store.state.user.name,
-          functionId: 5301,
-          serialNumber: '5301OrderItemDesc',
-          tableId: "5301Order",
-          tableName: "工单表",
-          columnProp: "qtyToSchedule",
-          headerAlign: "center",
-          align: "center",
-          columnLabel: "待排产数量",
-          columnWidth: 80,
-          columnHidden: false,
-          columnImage: false,
-          columnSortable: false,
-          sortLv: 0,
-          status: true,
-          fixed: false
-        },
-        {
-          userId: this.$store.state.user.name,
-          functionId: 5301,
-          serialNumber: '5301OrderItemDesc',
-          tableId: "5301Order",
-          tableName: "工单表",
-          columnProp: "qtyScheduled",
-          headerAlign: "center",
-          align: "center",
-          columnLabel: "已排产数量",
-          columnWidth: 80,
-          columnHidden: false,
-          columnImage: false,
-          columnSortable: false,
-          sortLv: 0,
-          status: true,
-          fixed: false
-        },
-        {
-          userId: this.$store.state.user.name,
-          functionId: 5301,
-          serialNumber: '5301OrderItemDesc',
-          tableId: "5301Order",
-          tableName: "工单表",
-          columnProp: "qtyReported",
-          headerAlign: "center",
-          align: "center",
-          columnLabel: "已报工数量",
-          columnWidth: 80,
-          columnHidden: false,
-          columnImage: false,
-          columnSortable: false,
-          sortLv: 0,
-          status: true,
-          fixed: false
-        },
-        {
-          userId: this.$store.state.user.name,
-          functionId: 5301,
-          serialNumber: '5301OrderItemDesc',
-          tableId: "5301Order",
-          tableName: "工单表",
-          columnProp: "spec",
-          headerAlign: "center",
-          align: "center",
-          columnLabel: "规格型号",
-          columnWidth: 80,
-          columnHidden: false,
-          columnImage: false,
-          columnSortable: false,
-          sortLv: 0,
-          status: true,
-          fixed: false
-        },
-        {
-          userId: this.$store.state.user.name,
-          functionId: 5301,
-          serialNumber: '5301OrderItemDesc',
-          tableId: "5301Order",
-          tableName: "工单表",
-          columnProp: "site",
-          headerAlign: "center",
-          align: "center",
-          columnLabel: "工厂编号",
-          columnWidth: 80,
-          columnHidden: false,
-          columnImage: false,
-          columnSortable: false,
-          sortLv: 0,
-          status: true,
-          fixed: false
-        },
-        {
-          userId: this.$store.state.user.name,
-          functionId: 5301,
-          serialNumber: '5301OrderItemDesc',
-          tableId: "5301Order",
-          tableName: "工单表",
-          columnProp: "workCenterNo",
-          headerAlign: "center",
-          align: "center",
-          columnLabel: "加工中心",
-          columnWidth: 80,
-          columnHidden: false,
-          columnImage: false,
-          columnSortable: false,
-          sortLv: 0,
-          status: true,
-          fixed: false
-        },
-        {
-          userId: this.$store.state.user.name,
-          functionId: 5301,
-          serialNumber: '5301OrderItemDesc',
-          tableId: "5301Order",
-          tableName: "工单表",
-          columnProp: "nextItemNo",
-          headerAlign: "center",
-          align: "center",
-          columnLabel: "下道工序",
-          columnWidth: 80,
-          columnHidden: false,
-          columnImage: false,
-          columnSortable: false,
-          sortLv: 0,
-          status: true,
-          fixed: false
-        },
-        {
-          userId: this.$store.state.user.name,
-          functionId: 5301,
-          serialNumber: '5301OrderItemDesc',
-          tableId: "5301Order",
-          tableName: "工单表",
-          columnProp: "nextItemDesc",
-          headerAlign: "center",
-          align: "center",
-          columnLabel: "下道工序名称",
-          columnWidth: 80,
-          columnHidden: false,
-          columnImage: false,
-          columnSortable: false,
-          sortLv: 0,
-          status: true,
-          fixed: false
-        },
-        {
-          userId: this.$store.state.user.name,
-          functionId: 5301,
-          serialNumber: '5301OrderItemDesc',
-          tableId: "5301Order",
-          tableName: "工单表",
-          columnProp: "nextScheduledFlag",
-          headerAlign: "center",
-          align: "center",
-          columnLabel: "下道工序已排产",
-          columnWidth: 80,
-          columnHidden: false,
-          columnImage: false,
-          columnSortable: false,
-          sortLv: 0,
-          status: true,
-          fixed: false
-        },
-        {
-          userId: this.$store.state.user.name,
-          functionId: 5301,
-          serialNumber: '5301OrderItemDesc',
-          tableId: "5301Order",
-          tableName: "工单表",
-          columnProp: "preItemNo",
-          headerAlign: "center",
-          align: "center",
-          columnLabel: "上道工序",
-          columnWidth: 80,
-          columnHidden: false,
-          columnImage: false,
-          columnSortable: false,
-          sortLv: 0,
-          status: true,
-          fixed: false
-        },
-        {
-          userId: this.$store.state.user.name,
-          functionId: 5301,
-          serialNumber: '5301OrderItemDesc',
-          tableId: "5301Order",
-          tableName: "工单表",
-          columnProp: "preItemDesc",
-          headerAlign: "center",
-          align: "center",
-          columnLabel: "上道工序名称",
-          columnWidth: 80,
-          columnHidden: false,
-          columnImage: false,
-          columnSortable: false,
-          sortLv: 0,
-          status: true,
-          fixed: false
-        },
-        {
-          userId: this.$store.state.user.name,
-          functionId: 5301,
-          serialNumber: '5301OrderItemDesc',
-          tableId: "5301Order",
-          tableName: "工单表",
-          columnProp: "preScheduledFlag",
-          headerAlign: "center",
-          align: "center",
-          columnLabel: "上道工序已排产",
-          columnWidth: 80,
-          columnHidden: false,
-          columnImage: false,
-          columnSortable: false,
-          sortLv: 0,
-          status: true,
-          fixed: false
-        },
-        {
-          userId: this.$store.state.user.name,
-          functionId: 5301,
-          serialNumber: '5301OrderItemDesc',
-          tableId: "5301Order",
-          tableName: "工单表",
-          columnProp: "scheduledFlag",
-          headerAlign: "center",
-          align: "center",
-          columnLabel: "是否排产",
-          columnWidth: 80,
-          columnHidden: false,
-          columnImage: false,
-          columnSortable: false,
-          sortLv: 0,
-          status: true,
-          fixed: false
-        },
-        {
-          userId: this.$store.state.user.name,
-          functionId: 5301,
-          serialNumber: '5301OrderItemDesc',
-          tableId: "5301Order",
-          tableName: "工单表",
-          columnProp: "availResource",
-          headerAlign: "center",
-          align: "center",
-          columnLabel: "可用机台",
-          columnWidth: 80,
-          columnHidden: false,
-          columnImage: false,
-          columnSortable: false,
-          sortLv: 0,
-          status: true,
-          fixed: false
-        },
-        {
-          userId: this.$store.state.user.name,
-          functionId: 5301,
-          serialNumber: '5301OrderItemDesc',
-          tableId: "5301Order",
-          tableName: "工单表",
-          columnProp: "enterDate",
-          headerAlign: "center",
-          align: "center",
-          columnLabel: "录入日期",
-          columnWidth: 80,
-          columnHidden: false,
-          columnImage: false,
-          columnSortable: false,
-          sortLv: 0,
-          status: true,
-          fixed: false
-        },
-        {
-          userId: this.$store.state.user.name,
-          functionId: 5301,
-          serialNumber: '5301OrderItemDesc',
-          tableId: "5301Order",
-          tableName: "工单表",
-          columnProp: "计划时间",
-          headerAlign: "center",
-          align: "center",
-          columnLabel: "计划时间",
-          columnWidth: 80,
-          columnHidden: false,
-          columnImage: false,
-          columnSortable: false,
-          sortLv: 0,
-          status: true,
-          fixed: false
-        },
-        {
-          userId: this.$store.state.user.name,
-          functionId: 5301,
-          serialNumber: '5301OrderItemDesc',
-          tableId: "5301Order",
-          tableName: "工单表",
-          columnProp: "machRunFactor",
-          headerAlign: "center",
-          align: "center",
-          columnLabel: "单位产出",
-          columnWidth: 80,
-          columnHidden: false,
-          columnImage: false,
-          columnSortable: false,
-          sortLv: 0,
-          status: true,
-          fixed: false
-        },
-        {
-          userId: this.$store.state.user.name,
-          functionId: 5301,
-          serialNumber: '5301OrderItemDesc',
-          tableId: "5301Order",
-          tableName: "工单表",
-          columnProp: "qtyScheduledPreOps",
-          headerAlign: "center",
-          align: "center",
-          columnLabel: "前道工序已排产数量",
-          columnWidth: 80,
-          columnHidden: false,
-          columnImage: false,
-          columnSortable: false,
-          sortLv: 0,
-          status: true,
-          fixed: false
-        },
-        {
-          userId: this.$store.state.user.name,
-          functionId: 5301,
-          serialNumber: '5301OrderItemDesc',
-          tableId: "5301Order",
-          tableName: "工单表",
-          columnProp: "qtyApprovedPreOps",
-          headerAlign: "center",
-          align: "center",
-          columnLabel: "前道工序已报合格数",
-          columnWidth: 80,
-          columnHidden: false,
-          columnImage: false,
-          columnSortable: false,
-          sortLv: 0,
-          status: true,
-          fixed: false
-        },
-        {
-          userId: this.$store.state.user.name,
-          functionId: 5301,
-          serialNumber: '5301OrderItemDesc',
-          tableId: "5301Order",
-          tableName: "工单表",
-          columnProp: "",
-          headerAlign: "center",
-          align: "center",
-          columnLabel: "SAP参考号",
-          columnWidth: 80,
-          columnHidden: false,
-          columnImage: false,
-          columnSortable: false,
-          sortLv: 0,
-          status: true,
-          fixed: false
-        },
-        {
-          userId: this.$store.state.user.name,
-          functionId: 5301,
-          serialNumber: '5301OrderItemDesc',
-          tableId: "5301Order",
-          tableName: "工单表",
-          columnProp: "待排产时间",
-          headerAlign: "center",
-          align: "center",
-          columnLabel: "待排产时间",
-          columnWidth: 80,
-          columnHidden: false,
-          columnImage: false,
-          columnSortable: false,
-          sortLv: 0,
-          status: true,
-          fixed: false
-        },
-        {
-          userId: this.$store.state.user.name,
-          functionId: 5301,
-          serialNumber: '5301OrderItemDesc',
-          tableId: "5301Order",
-          tableName: "工单表",
-          columnProp: "efficiency",
-          headerAlign: "center",
-          align: "center",
-          columnLabel: "效率",
-          columnWidth: 80,
-          columnHidden: false,
-          columnImage: false,
-          columnSortable: false,
-          sortLv: 0,
-          status: true,
-          fixed: false
-        },
-        {
-          userId: this.$store.state.user.name,
-          functionId: 5301,
-          serialNumber: '5301OrderItemDesc',
-          tableId: "5301Order",
-          tableName: "工单表",
-          columnProp: "刀模已发",
-          headerAlign: "center",
-          align: "center",
-          columnLabel: "刀模已发",
-          columnWidth: 80,
-          columnHidden: false,
-          columnImage: false,
-          columnSortable: false,
-          sortLv: 0,
-          status: true,
-          fixed: false
-        },
-        {
-          userId: this.$store.state.user.name,
-          functionId: 5301,
-          serialNumber: '5301OrderItemDesc',
-          tableId: "5301Order",
-          tableName: "工单表",
-          columnProp: "印版已发",
-          headerAlign: "center",
-          align: "center",
-          columnLabel: "印版已发",
-          columnWidth: 80,
-          columnHidden: false,
-          columnImage: false,
-          columnSortable: false,
-          sortLv: 0,
-          status: true,
-          fixed: false
-        }
-      ],
-      columnOrderScheduleArray: [
-        {
-          userId: this.$store.state.user.name,
-          functionId: 5301,
-          serialNumber: '5301OrderOrderNo',
-          tableId: "5301Order",
-          tableName: "排产明细表",
-          columnProp: "排产序号",
-          headerAlign: "center",
-          align: "center",
-          columnLabel: "排产序号",
-          columnWidth: 80,
-          columnHidden: false,
-          columnImage: false,
-          columnSortable: false,
-          sortLv: 0,
-          status: true,
-          fixed: false
-        },
-        {
-          userId: this.$store.state.user.name,
-          functionId: 5301,
-          serialNumber: '5301OrderItemNo',
-          tableId: "5301Order",
-          tableName: "排产明细表",
-          columnProp: "planStartTime",
-          headerAlign: "center",
-          align: "center",
-          columnLabel: "计划开工时间",
-          columnWidth: 60,
-          columnHidden: false,
-          columnImage: false,
-          columnSortable: false,
-          sortLv: 0,
-          status: true,
-          fixed: false
-        },
-        {
-          userId: this.$store.state.user.name,
-          functionId: 5301,
-          serialNumber: '5301OrderItemDesc',
-          tableId: "5301Order",
-          tableName: "排产明细表",
-          columnProp: "planFinishTime",
-          headerAlign: "center",
-          align: "center",
-          columnLabel: "计划完工时间",
-          columnWidth: 80,
-          columnHidden: false,
-          columnImage: false,
-          columnSortable: false,
-          sortLv: 0,
-          status: true,
-          fixed: false
-        },
-        {
-          userId: this.$store.state.user.name,
-          functionId: 5301,
-          serialNumber: '5301OrderItemDesc',
-          tableId: "5301Order",
-          tableName: "排产明细表",
-          columnProp: "timeRequired",
-          headerAlign: "center",
-          align: "center",
-          columnLabel: "计划时间",
-          columnWidth: 80,
-          columnHidden: false,
-          columnImage: false,
-          columnSortable: false,
-          sortLv: 0,
-          status: true,
-          fixed: false
-        },
-        {
-          userId: this.$store.state.user.name,
-          functionId: 5301,
-          serialNumber: '5301OrderItemDesc',
-          tableId: "5301Order",
-          tableName: "排产明细表",
-          columnProp: "orderNo",
-          headerAlign: "center",
-          align: "center",
-          columnLabel: "订单号",
-          columnWidth: 80,
-          columnHidden: false,
-          columnImage: false,
-          columnSortable: false,
-          sortLv: 0,
-          status: true,
-          fixed: false
-        },
-        {
-          userId: this.$store.state.user.name,
-          functionId: 5301,
-          serialNumber: '5301OrderItemDesc',
-          tableId: "5301Order",
-          tableName: "排产明细表",
-          columnProp: "needDate",
-          headerAlign: "center",
-          align: "center",
-          columnLabel: "需求日期",
-          columnWidth: 80,
-          columnHidden: false,
-          columnImage: false,
-          columnSortable: false,
-          sortLv: 0,
-          status: true,
-          fixed: false
-        },
-        {
-          userId: this.$store.state.user.name,
-          functionId: 5301,
-          serialNumber: '5301OrderItemDesc',
-          tableId: "5301Order",
-          tableName: "排产明细表",
-          columnProp: "itemNo",
-          headerAlign: "center",
-          align: "center",
-          columnLabel: "工序号",
-          columnWidth: 80,
-          columnHidden: false,
-          columnImage: false,
-          columnSortable: false,
-          sortLv: 0,
-          status: true,
-          fixed: false
-        },
-        {
-          userId: this.$store.state.user.name,
-          functionId: 5301,
-          serialNumber: '5301OrderItemDesc',
-          tableId: "5301Order",
-          tableName: "排产明细表",
-          columnProp: "itemDesc",
-          headerAlign: "center",
-          align: "center",
-          columnLabel: "工序名称",
-          columnWidth: 80,
-          columnHidden: false,
-          columnImage: false,
-          columnSortable: false,
-          sortLv: 0,
-          status: true,
-          fixed: false
-        },
-        {
-          userId: this.$store.state.user.name,
-          functionId: 5301,
-          serialNumber: '5301OrderItemDesc',
-          tableId: "5301Order",
-          tableName: "排产明细表",
-          columnProp: "partNo",
-          headerAlign: "center",
-          align: "center",
-          columnLabel: "产品编码",
-          columnWidth: 80,
-          columnHidden: false,
-          columnImage: false,
-          columnSortable: false,
-          sortLv: 0,
-          status: true,
-          fixed: false
-        },
-        {
-          userId: this.$store.state.user.name,
-          functionId: 5301,
-          serialNumber: '5301OrderItemDesc',
-          tableId: "5301Order",
-          tableName: "排产明细表",
-          columnProp: "partDesc",
-          headerAlign: "center",
-          align: "center",
-          columnLabel: "产品名称",
-          columnWidth: 80,
-          columnHidden: false,
-          columnImage: false,
-          columnSortable: false,
-          sortLv: 0,
-          status: true,
-          fixed: false
-        },
-        {
-          userId: this.$store.state.user.name,
-          functionId: 5301,
-          serialNumber: '5301OrderItemDesc',
-          tableId: "5301Order",
-          tableName: "排产明细表",
-          columnProp: "spec",
-          headerAlign: "center",
-          align: "center",
-          columnLabel: "规格型号",
-          columnWidth: 80,
-          columnHidden: false,
-          columnImage: false,
-          columnSortable: false,
-          sortLv: 0,
-          status: true,
-          fixed: false
-        },
-        {
-          userId: this.$store.state.user.name,
-          functionId: 5301,
-          serialNumber: '5301OrderItemDesc',
-          tableId: "5301Order",
-          tableName: "排产明细表",
-          columnProp: "待生产数量",
-          headerAlign: "center",
-          align: "center",
-          columnLabel: "",
-          columnWidth: 80,
-          columnHidden: false,
-          columnImage: false,
-          columnSortable: false,
-          sortLv: 0,
-          status: true,
-          fixed: false
-        },
-        {
-          userId: this.$store.state.user.name,
-          functionId: 5301,
-          serialNumber: '5301OrderItemDesc',
-          tableId: "5301Order",
-          tableName: "排产明细表",
-          columnProp: "lotSize",
-          headerAlign: "center",
-          align: "center",
-          columnLabel: "派工单需求数量",
-          columnWidth: 80,
-          columnHidden: false,
-          columnImage: false,
-          columnSortable: false,
-          sortLv: 0,
-          status: true,
-          fixed: false
-        },
-        {
-          userId: this.$store.state.user.name,
-          functionId: 5301,
-          serialNumber: '5301OrderItemDesc',
-          tableId: "5301Order",
-          tableName: "排产明细表",
-          columnProp: "qtyReported",
-          headerAlign: "center",
-          align: "center",
-          columnLabel: "已报告数量",
-          columnWidth: 80,
-          columnHidden: false,
-          columnImage: false,
-          columnSortable: false,
-          sortLv: 0,
-          status: true,
-          fixed: false
-        },
-        {
-          userId: this.$store.state.user.name,
-          functionId: 5301,
-          serialNumber: '5301OrderItemDesc',
-          tableId: "5301Order",
-          tableName: "排产明细表",
-          columnProp: "preItemNo",
-          headerAlign: "center",
-          align: "center",
-          columnLabel: "前道工序",
-          columnWidth: 80,
-          columnHidden: false,
-          columnImage: false,
-          columnSortable: false,
-          sortLv: 0,
-          status: true,
-          fixed: false
-        },
-        {
-          userId: this.$store.state.user.name,
-          functionId: 5301,
-          serialNumber: '5301OrderItemDesc',
-          tableId: "5301Order",
-          tableName: "排产明细表",
-          columnProp: "preItemDesc",
-          headerAlign: "center",
-          align: "center",
-          columnLabel: "前道工序名称",
-          columnWidth: 80,
-          columnHidden: false,
-          columnImage: false,
-          columnSortable: false,
-          sortLv: 0,
-          status: true,
-          fixed: false
-        },
-        {
-          userId: this.$store.state.user.name,
-          functionId: 5301,
-          serialNumber: '5301OrderItemDesc',
-          tableId: "5301Order",
-          tableName: "排产明细表",
-          columnProp: "preScheduledFlag",
-          headerAlign: "center",
-          align: "center",
-          columnLabel: "前道工序是否排产",
-          columnWidth: 80,
-          columnHidden: false,
-          columnImage: false,
-          columnSortable: false,
-          sortLv: 0,
-          status: true,
-          fixed: false
-        },
-        {
-          userId: this.$store.state.user.name,
-          functionId: 5301,
-          serialNumber: '5301OrderItemDesc',
-          tableId: "5301Order",
-          tableName: "排产明细表",
-          columnProp: "后道工序",
-          headerAlign: "center",
-          align: "center",
-          columnLabel: "nextItemNo",
-          columnWidth: 80,
-          columnHidden: false,
-          columnImage: false,
-          columnSortable: false,
-          sortLv: 0,
-          status: true,
-          fixed: false
-        },
-        {
-          userId: this.$store.state.user.name,
-          functionId: 5301,
-          serialNumber: '5301OrderItemDesc',
-          tableId: "5301Order",
-          tableName: "排产明细表",
-          columnProp: "nextItemDesc",
-          headerAlign: "center",
-          align: "center",
-          columnLabel: "后道工序名称",
-          columnWidth: 80,
-          columnHidden: false,
-          columnImage: false,
-          columnSortable: false,
-          sortLv: 0,
-          status: true,
-          fixed: false
-        },
-        {
-          userId: this.$store.state.user.name,
-          functionId: 5301,
-          serialNumber: '5301OrderItemDesc',
-          tableId: "5301Order",
-          tableName: "排产明细表",
-          columnProp: "nextScheduledFlag",
-          headerAlign: "center",
-          align: "center",
-          columnLabel: "后道工序是否排产",
-          columnWidth: 80,
-          columnHidden: false,
-          columnImage: false,
-          columnSortable: false,
-          sortLv: 0,
-          status: true,
-          fixed: false
-        },
-        {
-          userId: this.$store.state.user.name,
-          functionId: 5301,
-          serialNumber: '5301OrderItemDesc',
-          tableId: "5301Order",
-          tableName: "排产明细表",
-          columnProp: "sResourceId",
-          headerAlign: "center",
-          align: "center",
-          columnLabel: "机台号",
-          columnWidth: 80,
-          columnHidden: false,
-          columnImage: false,
-          columnSortable: false,
-          sortLv: 0,
-          status: true,
-          fixed: false
-        },
-        {
-          userId: this.$store.state.user.name,
-          functionId: 5301,
-          serialNumber: '5301OrderItemDesc',
-          tableId: "5301Order",
-          tableName: "排产明细表",
-          columnProp: "customerName",
-          headerAlign: "center",
-          align: "center",
-          columnLabel: "客户名称",
-          columnWidth: 80,
-          columnHidden: false,
-          columnImage: false,
-          columnSortable: false,
-          sortLv: 0,
-          status: true,
-          fixed: false
-        },
-        {
-          userId: this.$store.state.user.name,
-          functionId: 5301,
-          serialNumber: '5301OrderItemDesc',
-          tableId: "5301Order",
-          tableName: "排产明细表",
-          columnProp: "enterDate",
-          headerAlign: "center",
-          align: "center",
-          columnLabel: "录入日期",
-          columnWidth: 80,
-          columnHidden: false,
-          columnImage: false,
-          columnSortable: false,
-          sortLv: 0,
-          status: true,
-          fixed: false
-        },
-        {
-          userId: this.$store.state.user.name,
-          functionId: 5301,
-          serialNumber: '5301OrderItemDesc',
-          tableId: "5301Order",
-          tableName: "排产明细表",
-          columnProp: "可用机台",
-          headerAlign: "center",
-          align: "center",
-          columnLabel: "",
-          columnWidth: 80,
-          columnHidden: false,
-          columnImage: false,
-          columnSortable: false,
-          sortLv: 0,
-          status: true,
-          fixed: false
-        },
-        {
-          userId: this.$store.state.user.name,
-          functionId: 5301,
-          serialNumber: '5301OrderItemDesc',
-          tableId: "5301Order",
-          tableName: "排产明细表",
-          columnProp: "workCenterNo",
-          headerAlign: "center",
-          align: "center",
-          columnLabel: "加工中心",
-          columnWidth: 80,
-          columnHidden: false,
-          columnImage: false,
-          columnSortable: false,
-          sortLv: 0,
-          status: true,
-          fixed: false
-        },
-        {
-          userId: this.$store.state.user.name,
-          functionId: 5301,
-          serialNumber: '5301OrderItemDesc',
-          tableId: "5301Order",
-          tableName: "排产明细表",
-          columnProp: "machRunFactor",
-          headerAlign: "center",
-          align: "center",
-          columnLabel: "单位产出",
-          columnWidth: 80,
-          columnHidden: false,
-          columnImage: false,
-          columnSortable: false,
-          sortLv: 0,
-          status: true,
-          fixed: false
-        },
-        {
-          userId: this.$store.state.user.name,
-          functionId: 5301,
-          serialNumber: '5301OrderItemDesc',
-          tableId: "5301Order",
-          tableName: "排产明细表",
-          columnProp: "machSetupTime",
-          headerAlign: "center",
-          align: "center",
-          columnLabel: "调机时间",
-          columnWidth: 80,
-          columnHidden: false,
-          columnImage: false,
-          columnSortable: false,
-          sortLv: 0,
-          status: true,
-          fixed: false
-        },
-        {
-          userId: this.$store.state.user.name,
-          functionId: 5301,
-          serialNumber: '5301OrderItemDesc',
-          tableId: "5301Order",
-          tableName: "排产明细表",
-          columnProp: "factorUnit",
-          headerAlign: "center",
-          align: "center",
-          columnLabel: "产出单位",
-          columnWidth: 80,
-          columnHidden: false,
-          columnImage: false,
-          columnSortable: false,
-          sortLv: 0,
-          status: true,
-          fixed: false
-        },
-        {
-          userId: this.$store.state.user.name,
-          functionId: 5301,
-          serialNumber: '5301OrderItemDesc',
-          tableId: "5301Order",
-          tableName: "排产明细表",
-          columnProp: "site",
-          headerAlign: "center",
-          align: "center",
-          columnLabel: "工厂编号",
-          columnWidth: 80,
-          columnHidden: false,
-          columnImage: false,
-          columnSortable: false,
-          sortLv: 0,
-          status: true,
-          fixed: false
-        },
-        {
-          userId: this.$store.state.user.name,
-          functionId: 5301,
-          serialNumber: '5301OrderItemDesc',
-          tableId: "5301Order",
-          tableName: "排产明细表",
-          columnProp: "qtyScheduledPreOps",
-          headerAlign: "center",
-          align: "center",
-          columnLabel: "前道工序已排产数量",
-          columnWidth: 80,
-          columnHidden: false,
-          columnImage: false,
-          columnSortable: false,
-          sortLv: 0,
-          status: true,
-          fixed: false
-        },
-        {
-          userId: this.$store.state.user.name,
-          functionId: 5301,
-          serialNumber: '5301OrderItemDesc',
-          tableId: "5301Order",
-          tableName: "排产明细表",
-          columnProp: "晚于发货时间",
-          headerAlign: "center",
-          align: "center",
-          columnLabel: "",
-          columnWidth: 80,
-          columnHidden: false,
-          columnImage: false,
-          columnSortable: false,
-          sortLv: 0,
-          status: true,
-          fixed: false
-        },
-        {
-          userId: this.$store.state.user.name,
-          functionId: 5301,
-          serialNumber: '5301OrderItemDesc',
-          tableId: "5301Order",
-          tableName: "排产明细表",
-          columnProp: "RecordType",
-          headerAlign: "center",
-          align: "center",
-          columnLabel: "",
-          columnWidth: 80,
-          columnHidden: false,
-          columnImage: false,
-          columnSortable: false,
-          sortLv: 0,
-          status: true,
-          fixed: false
-        },
-        {
-          userId: this.$store.state.user.name,
-          functionId: 5301,
-          serialNumber: '5301OrderItemDesc',
-          tableId: "5301Order",
-          tableName: "排产明细表",
-          columnProp: "是否关闭",
-          headerAlign: "center",
-          align: "center",
-          columnLabel: "",
-          columnWidth: 80,
-          columnHidden: false,
-          columnImage: false,
-          columnSortable: false,
-          sortLv: 0,
-          status: true,
-          fixed: false
-        },
-        {
-          userId: this.$store.state.user.name,
-          functionId: 5301,
-          serialNumber: '5301OrderItemDesc',
-          tableId: "5301Order",
-          tableName: "排产明细表",
-          columnProp: "是否关闭",
-          headerAlign: "center",
-          align: "center",
-          columnLabel: "",
-          columnWidth: 80,
-          columnHidden: false,
-          columnImage: false,
-          columnSortable: false,
-          sortLv: 0,
-          status: true,
-          fixed: false
-        },
-        {
-          userId: this.$store.state.user.name,
-          functionId: 5301,
-          serialNumber: '5301OrderItemDesc',
-          tableId: "5301Order",
-          tableName: "排产明细表",
-          columnProp: "是否关闭",
-          headerAlign: "center",
-          align: "center",
-          columnLabel: "",
-          columnWidth: 80,
-          columnHidden: false,
-          columnImage: false,
-          columnSortable: false,
-          sortLv: 0,
-          status: true,
-          fixed: false
-        },
-        {
-          userId: this.$store.state.user.name,
-          functionId: 5301,
-          serialNumber: '5301OrderItemDesc',
-          tableId: "5301Order",
-          tableName: "排产明细表",
-          columnProp: "暂停",
-          headerAlign: "center",
-          align: "center",
-          columnLabel: "",
-          columnWidth: 80,
-          columnHidden: false,
-          columnImage: false,
-          columnSortable: false,
-          sortLv: 0,
-          status: true,
-          fixed: false
-        },
-        {
-          userId: this.$store.state.user.name,
-          functionId: 5301,
-          serialNumber: '5301OrderItemDesc',
-          tableId: "5301Order",
-          tableName: "排产明细表",
-          columnProp: "派工单需求工时",
-          headerAlign: "center",
-          align: "center",
-          columnLabel: "",
-          columnWidth: 80,
-          columnHidden: false,
-          columnImage: false,
-          columnSortable: false,
-          sortLv: 0,
-          status: true,
-          fixed: false
-        },
-        {
-          userId: this.$store.state.user.name,
-          functionId: 5301,
-          serialNumber: '5301OrderItemDesc',
-          tableId: "5301Order",
-          tableName: "排产明细表",
-          columnProp: "派工单早于上工序",
-          headerAlign: "center",
-          align: "center",
-          columnLabel: "",
-          columnWidth: 80,
-          columnHidden: false,
-          columnImage: false,
-          columnSortable: false,
-          sortLv: 0,
-          status: true,
-          fixed: false
-        },
-        {
-          userId: this.$store.state.user.name,
-          functionId: 5301,
-          serialNumber: '5301OrderItemDesc',
-          tableId: "5301Order",
-          tableName: "排产明细表",
-          columnProp: "备注",
-          headerAlign: "center",
-          align: "center",
-          columnLabel: "",
-          columnWidth: 80,
-          columnHidden: false,
-          columnImage: false,
-          columnSortable: false,
-          sortLv: 0,
-          status: true,
-          fixed: false
-        },
-        {
-          userId: this.$store.state.user.name,
-          functionId: 5301,
-          serialNumber: '5301OrderItemDesc',
-          tableId: "5301Order",
-          tableName: "排产明细表",
-          columnProp: "SAP参考号",
-          headerAlign: "center",
-          align: "center",
-          columnLabel: "",
-          columnWidth: 80,
-          columnHidden: false,
-          columnImage: false,
-          columnSortable: false,
-          sortLv: 0,
-          status: true,
-          fixed: false
-        },
-        {
-          userId: this.$store.state.user.name,
-          functionId: 5301,
-          serialNumber: '5301OrderItemDesc',
-          tableId: "5301Order",
-          tableName: "排产明细表",
-          columnProp: "客户产品料号",
-          headerAlign: "center",
-          align: "center",
-          columnLabel: "",
-          columnWidth: 80,
-          columnHidden: false,
-          columnImage: false,
-          columnSortable: false,
-          sortLv: 0,
-          status: true,
-          fixed: false
-        },
-        {
-          userId: this.$store.state.user.name,
-          functionId: 5301,
-          serialNumber: '5301OrderItemDesc',
-          tableId: "5301Order",
-          tableName: "排产明细表",
-          columnProp: "效率",
-          headerAlign: "center",
-          align: "center",
-          columnLabel: "",
-          columnWidth: 80,
-          columnHidden: false,
-          columnImage: false,
-          columnSortable: false,
-          sortLv: 0,
-          status: true,
-          fixed: false
-        },
-        {
-          userId: this.$store.state.user.name,
-          functionId: 5301,
-          serialNumber: '5301OrderItemDesc',
-          tableId: "5301Order",
-          tableName: "排产明细表",
-          columnProp: "延误小时数",
-          headerAlign: "center",
-          align: "center",
-          columnLabel: "",
-          columnWidth: 80,
-          columnHidden: false,
-          columnImage: false,
-          columnSortable: false,
-          sortLv: 0,
-          status: true,
-          fixed: false
-        },
-        {
-          userId: this.$store.state.user.name,
-          functionId: 5301,
-          serialNumber: '5301OrderItemDesc',
-          tableId: "5301Order",
-          tableName: "排产明细表",
-          columnProp: "已排料",
-          headerAlign: "center",
-          align: "center",
-          columnLabel: "",
-          columnWidth: 80,
-          columnHidden: false,
-          columnImage: false,
-          columnSortable: false,
-          sortLv: 0,
-          status: true,
-          fixed: false
-        },
-        {
-          userId: this.$store.state.user.name,
-          functionId: 5301,
-          serialNumber: '5301OrderItemDesc',
-          tableId: "5301Order",
-          tableName: "排产明细表",
-          columnProp: "排产完成时间早于上工序",
-          headerAlign: "center",
-          align: "center",
-          columnLabel: "",
-          columnWidth: 80,
-          columnHidden: false,
-          columnImage: false,
-          columnSortable: false,
-          sortLv: 0,
-          status: true,
-          fixed: false
-        }
-      ],
-    }
-  },
-  mounted() {
-    this.$nextTick(() => {
-      this.height = window.innerHeight - 300;
-    })
-  },
-  methods: {
-    getResourceShiftData() {
-      let queryData = {
-        site: this.$store.state.user.site,
-        workCenterNo: this.searchData.workCenterNo,
-        resourceId: this.searchData.resourceId,
-        scheduleDate: this.searchData.scheduleDate
-      }
-      getResourceRestList(queryData).then(({data}) => {
-        this.resourceShiftList = data.rows
-      })
-    },
-    getShopOrderList() {
-      getShopOrderList(this.searchData).then(({data}) => {
-        this.shopOrderList = data.rows
-      })
-    },
-    getOrderScheduleList() {
-      getOrderScheduleList(this.searchData).then(({data}) => {
-        this.orderScheduleList = data.rows
-      })
-    },
-
-    /*刷新页面table*/
-    refreshPageTables(){
-      this.getResourceShiftData();
-      this.getShopOrderList();
-      this.getOrderScheduleList();
-    },
-  },
-  created() {
-    //执行查询休息时间数据
-    this.getResourceShiftData();
-    //查询工单的数据
-    this.getShopOrderList();
-  }
-}
-</script>
-
-<style>
-.el-textarea__inner {
-  padding: 5px 5px;
-}
-
-</style>
-
-<!--当前页面的标签样式-->
-<style scoped lang="scss">
-
-/*针对el-card*/
-.customer-card .el-form-item__content{
-  margin-top: -15px;
-}
-.customer-card .el-form-item{
-  height: 22px;
-}
-
-.customer-border .el-form-item__content{
-  margin-top: -30px;
-}
-
-/*全局年与日类型  宽度*/
-div.el-time-width{
-  width: 110px !important;
-}
-/* 全局时间右边框*/
-.customer-css input.el-input__inner{
-  height: 22px !important;
-  padding-right: 0px !important;
-}
-/* 控制el-card标签的数据*/
-div.customer-el-card {
-  margin-left: 110px;
-  margin-top: -15px;
-  height: 20px;
-  width: 60px;
-}
-/* 颜色控制 */
-div.customer-el-card-pink {
-  background: #FF00FF;
-}
-
-div.customer-el-card-orange {
-  background: #FFD700;
-}
-
-div.customer-el-card-blue {
-  background: #0000CD;
-}
-
-/*清掉样式*/
-.el-radio+.el-radio {
-  margin-left: 0px;
-}
-
-
-/*控制上下间距*/
-</style>