diff --git a/src/api/schedule/order_schedule_fqc.js b/src/api/schedule/order_schedule_fqc.js
index 73ee05e..f7f20c2 100644
--- a/src/api/schedule/order_schedule_fqc.js
+++ b/src/api/schedule/order_schedule_fqc.js
@@ -1,13 +1,13 @@
 import { createAPI } from '@/utils/httpRequest.js'
 
-// 获取机台休息班次的信息
-export const getResourceRestList = data => createAPI('schedule/getResourceRestList', 'POST', data)
+// 获取FQC待排产的工单
+export const getShopOrderListWithFqc = data => createAPI('scheduling/getShopOrderListWithFqc', 'POST', data)
 
-// 获取信息
-export const getShopOrderList = data => createAPI('schedule/getShopOrderList', 'POST', data)
+// 获取FQC的操作员信息
+export const getOperatorListWithFqc = data => createAPI('scheduling/getOperatorListWithFqc', 'POST', data)
 
-// 获取信息
-export const getOrderScheduleList = data => createAPI('schedule/getOrderScheduleList', 'POST', data)
+// 获取FQC的排产记录
+export const getOrderScheduleListWithFqc = data => createAPI('scheduling/getOrderScheduleListWithFqc', 'POST', data)
 
 //获取当前加工中心对应的机台数据
 export const getCurrentWorkCenterNoByResourceId = data => createAPI('scheduling/getCurrentWorkCenterNoByResourceId', 'POST', data)
@@ -24,5 +24,11 @@ export const addWaitSchedule = data => createAPI('scheduling/addWaitSchedule', '
 //重新排产生产工单的操作
 export const reScheduleWorkOrders = data => createAPI('scheduling/reScheduleWorkOrders', 'POST', data)
 
+//上移派工单
+export const moveUpSchedule = data => createAPI('scheduling/moveUpSchedule', 'POST', data)
+
+//上移派工单
+export const moveDownSchedule = data => createAPI('scheduling/moveDownSchedule', 'POST', data)
+
 
 
diff --git a/src/views/modules/schedule/order_schedule_fqc.vue b/src/views/modules/schedule/order_schedule_fqc.vue
index 0012294..6833346 100644
--- a/src/views/modules/schedule/order_schedule_fqc.vue
+++ b/src/views/modules/schedule/order_schedule_fqc.vue
@@ -5,54 +5,54 @@
       <el-row style="width: 780px;">
         <el-col :span="4">
           <el-form-item :label="'生产订单号:'">
-            <el-input v-model="pageData.workCenterNo" readonly="readonly" style="width: 100px"></el-input>
+            <el-input v-model="pageData.orderNo" class="customer-input-color-red" readonly="readonly" style="width: 100px"></el-input>
           </el-form-item>
         </el-col>
         <el-col :span="2" style="margin-left: -15px;">
           <el-form-item :label="'工序号:'">
-            <el-input v-model="pageData.workCenterNo" readonly="readonly" style="width: 80px"></el-input>
+            <el-input v-model="pageData.itemNo" class="customer-input-color-red" readonly="readonly" style="width: 80px"></el-input>
           </el-form-item>
         </el-col>
         <el-col :span="4" style="margin-left: 20px;">
           <el-form-item :label="'工序名称:'">
-            <el-input v-model="pageData.workCenterNo" readonly="readonly" style="width: 100px"></el-input>
+            <el-input v-model="pageData.itemDesc" class="customer-input-color-red" readonly="readonly" style="width: 100px"></el-input>
           </el-form-item>
         </el-col>
         <el-col :span="4" style="margin-left: -15px;">
           <el-form-item :label="'加工中心编码:'">
-            <el-input v-model="pageData.workCenterNo" readonly="readonly" style="width: 90px"></el-input>
+            <el-input v-model="pageData.workCenterNo" class="customer-input-color-red" readonly="readonly" style="width: 90px"></el-input>
           </el-form-item>
         </el-col>
         <el-col :span=4 style="margin-left: -25px;">
           <el-form-item :label="'加工中心名称:'">
-            <el-input v-model="pageData.workCenterNo" readonly="readonly" style="width: 120px"></el-input>
+            <el-input v-model="pageData.workCenterDesc" class="customer-input-color-red" readonly="readonly" style="width: 120px"></el-input>
           </el-form-item>
         </el-col>
       </el-row>
       <el-row style="width: 780px;">
         <el-col :span="4">
           <el-form-item :label="'产品编码:'">
-            <el-input v-model="pageData.workCenterNo" readonly="readonly" style="width: 100px"></el-input>
+            <el-input v-model="pageData.partNo" class="customer-input-color-red" readonly="readonly" style="width: 100px"></el-input>
           </el-form-item>
         </el-col>
         <el-col :span="6" style="margin-left: -15px;">
           <el-form-item :label="'产品名称:'">
-            <el-input v-model="pageData.workCenterNo" readonly="readonly" style="width: 185px"></el-input>
+            <el-input v-model="pageData.partDesc" class="customer-input-color-red" readonly="readonly" style="width: 185px"></el-input>
           </el-form-item>
         </el-col>
         <el-col :span="3" style="margin-left: 5px;">
           <el-form-item :label="'需求数量:'">
-            <el-input v-model="pageData.workCenterNo" readonly="readonly" style="width: 70px"></el-input>
+            <el-input v-model="pageData.qtyRequired" class="customer-input-color-red" readonly="readonly" style="width: 70px"></el-input>
           </el-form-item>
         </el-col>
         <el-col :span="3" style="margin-left: -20px;">
           <el-form-item :label="'已排产数量:'">
-            <el-input v-model="pageData.workCenterNo" readonly="readonly" style="width: 70px"></el-input>
+            <el-input v-model="pageData.qtyScheduled" class="customer-input-color-red" readonly="readonly" style="width: 70px"></el-input>
           </el-form-item>
         </el-col>
         <el-col :span="3" style="margin-left: -20px;">
           <el-form-item :label="'待排产数量:'">
-            <el-input v-model="pageData.workCenterNo" readonly="readonly" style="width: 70px"></el-input>
+            <el-input v-model="pageData.qtyToSchedule" class="customer-input-color-red" readonly="readonly" style="width: 70px"></el-input>
           </el-form-item>
         </el-col>
       </el-row>
@@ -121,7 +121,7 @@
                 </el-button>
               </el-col>
               <el-col :span="8">
-                <el-button class="customer-bun-mid" type="primary" @click=""
+                <el-button class="customer-bun-mid" type="primary" @click="getOperatorList"
                            style="margin-left: 10px; margin-bottom: 5px;">
                   刷新数据
                 </el-button>
@@ -139,6 +139,10 @@
                           :height="tableHeight" :width="tableLeftWidth"
                           :data="operatorList"
                           border
+                          :cell-style="customerCellStyle" :cell-class-name="customerCellClassName"
+                          @row-click="setCurrentOperatorRow"
+                          highlight-current-row
+                          ref="operatorTable"
                           v-loading="dataListLoading"
                           style="margin-left: -15px; margin-top: -5px;">
                   <el-table-column
@@ -152,7 +156,10 @@
                     :width="item.columnWidth"
                     :label="item.columnLabel">
                     <template slot-scope="scope">
-                      <span v-if="!item.columnHidden"> {{ scope.row[item.columnProp] }}</span>
+                      <!--<el-input type="number" class="table-input" align="right" @blur="checkValidQty(scope.row)"-->
+                      <el-input type="number" class="table-input" align="right" v-if="item.columnHidden"
+                                v-model="scope.row[item.columnProp]"></el-input>
+                      <span v-else>{{scope.row[item.columnProp]}}</span>
                       <span v-if="item.columnImage"><img :src="scope.row[item.columnProp]"
                                                          style="width: 100px; height: 80px"/></span>
                     </template>
@@ -182,12 +189,15 @@
               <el-main class="customer-right-main">
                 <el-table class="customer-left-table"
                           :height="tableHeight" :width="tableRightWidth"
-                          :data="operatorList"
+                          :data="orderScheduleList"
                           border
+                          ref="scheduleTable"
+                          @row-click="setCurrentScheduleRow"
+                          @current-change="changeScheduleRow"
                           v-loading="dataListLoading"
                           style="margin-left: -15px; margin-top: -5px;">
                   <el-table-column
-                    v-for="(item,index) in columnOperatorArray" :key="index"
+                    v-for="(item,index) in columnOrderScheduleArray" :key="index"
                     :sortable="item.columnSortable"
                     :prop="item.columnProp"
                     :header-align="item.headerAlign"
@@ -207,57 +217,57 @@
             </el-container>
           </fieldset>
         </el-tab-pane>
-        <el-tab-pane label="待排产清单" name="wait_schedule">
+        <el-tab-pane label="待排产清单" name="shop_order">
           <fieldset style="margin-left: 0px; margin-top: 2px;">
             <el-form :inline="true" label-position="top" style="margin-top: 5px;">
               <el-form-item :label="'录入日期'" style="margin-top: 0px;">
                 <el-date-picker class="el-time-width"
                                 style=""
-                                v-model="pageData.enterTime1"
+                                v-model="searchData.enterTime1"
                                 value-format="yyyy-MM-dd">
                 </el-date-picker>
               </el-form-item>
               <el-form-item :label="' '" style="margin-top: 0px;">
                 <el-date-picker class="el-time-width"
                                 style=""
-                                v-model="pageData.enterTime2"
+                                v-model="searchData.enterTime2"
                                 value-format="yyyy-MM-dd">
                 </el-date-picker>
               </el-form-item>
               <el-form-item :label="'要求完工日期'" style="margin-top: 0px;">
                 <el-date-picker class="el-time-width"
                                 style=""
-                                v-model="pageData.needTime1"
+                                v-model="searchData.needTime1"
                                 value-format="yyyy-MM-dd">
                 </el-date-picker>
               </el-form-item>
               <el-form-item :label="' '" style="margin-top: 0px;">
                 <el-date-picker class="el-time-width"
                                 style=""
-                                v-model="pageData.needTime2"
+                                v-model="searchData.needTime2"
                                 value-format="yyyy-MM-dd">
                 </el-date-picker>
               </el-form-item>
               <el-form-item :label="'产品编码'" style="margin-top: 0px;">
-                <el-input v-model="pageData.partNo" style="width: 80px"></el-input>
+                <el-input v-model="searchData.partNo" style="width: 80px"></el-input>
               </el-form-item>
               <el-form-item :label="'生产订单'" style="margin-top: 0px;">
-                <el-input v-model="pageData.orderNo" style="width: 80px"></el-input>
+                <el-input v-model="searchData.orderNo" style="width: 80px"></el-input>
               </el-form-item>
               <el-form-item :label="''" style="margin-left: 5px;">
                 <el-row>
                   <el-col :span="24">
-                    <el-checkbox class="customer-checkbox" style=""
+                    <el-checkbox v-model="searchData.fulledFlag" class="customer-checkbox" true-label="Y" false-label="N" style=""
                                  label="查看已排满的工序"></el-checkbox>
                   </el-col>
                   <el-col :span="24" style="margin-top: 0px; ">
-                    <el-checkbox class="customer-checkbox" style="margin-top: 5px;"
+                    <el-checkbox v-model="searchData.preScheduledFlag" class="customer-checkbox" true-label="Y" false-label="N" style="margin-top: 5px;"
                                  label="仅查看前道工序已排产的工序"></el-checkbox>
                   </el-col>
                 </el-row>
               </el-form-item>
               <el-form-item :label="''" style="margin-left: -100px; margin-top: 5px;">
-                <el-button class="customer-bun-max" type="primary">刷新排产清单
+                <el-button class="customer-bun-max" @click="getShopOrderList" type="primary">刷新排产清单
                 </el-button>
               </el-form-item>
 
@@ -265,12 +275,14 @@
                 <el-main class="customer-left-main">
                   <el-table class="customer-left-table"
                             :height="tableHeight" :width="tableLeftWidth"
-                            :data="operatorList"
+                            :data="shopOrderList"
                             border
+                            highlight-current-row
                             v-loading="dataListLoading"
+                            @row-dblclick="startScheduleBun"
                             style="margin-left: -15px; margin-top: -5px;">
                     <el-table-column
-                      v-for="(item,index) in columnOperatorArray" :key="index"
+                      v-for="(item,index) in columnOrderArray" :key="index"
                       :sortable="item.columnSortable"
                       :prop="item.columnProp"
                       :header-align="item.headerAlign"
@@ -296,47 +308,16 @@
       </el-tabs>
     </fieldset>
 
-    <!--列表的组件-->
-    <Chooselist ref="baseList" @getBaseData="getBaseData"></Chooselist>
-
-    <!-- routing的menu -->
-    <comSplitSchedule ref="comSplitSchedule" :close-on-click-modal="false"
-                      :visible.sync="showSplitScheduleFlag"
-                      @initAddSplitSchedule="initAddSplitSchedule">
-
-    </comSplitSchedule>
-
-    <!-- schedule的menu -->
-    <comSplitSchedule ref="comSplitSchedule" :close-on-click-modal="false"
-                      :visible.sync="showSplitScheduleFlag"
-                      @initAddSplitSchedule="initAddSplitSchedule">
-
-    </comSplitSchedule>
-
-    <!-- 分批排产的组件 -->
-    <comSplitSchedule ref="comSplitSchedule" :close-on-click-modal="false"
-                      :visible.sync="showSplitScheduleFlag"
-                      @initAddSplitSchedule="initAddSplitSchedule">
-
-    </comSplitSchedule>
-
-
   </div>
 </template>
 
 <script>
-import Chooselist from '@/views/modules/common/Chooselist';/*列表组件*/
-import comSplitSchedule from '@/views/modules/schedule/com_split_schedule';/*分批排产的modal*/
 import {
-  getResourceRestList,
-  getShopOrderList,
-  getOrderScheduleList,
-  getCurrentWorkCenterNoByResourceId,
-  scheduleWorkOrder,
-  cancelSoSchedule,
-  addWaitSchedule,
-  reScheduleWorkOrders,
+  getShopOrderListWithFqc,
+  getOperatorListWithFqc,
+  getOrderScheduleListWithFqc,
 } from '@/api/schedule/order_schedule_fqc.js'
+import dayjs from "dayjs";
 
 export default {
   data() {
@@ -344,189 +325,54 @@ export default {
       tableHeight: 0,
       tableLeftWidth: 0,
       tableRightWidth: 0,
-      tagNo: '',
-      activeTable: '',
-      showScheduleMenu: false,
-      showSplitScheduleFlag: false,
+      operatorIndex: 0,
       scheduleIndex: -1,
+      activeTable: 'shop_order',
       modelFlag: false,
       modelInputFlag: true,
       currentRoutingRow: {},
+      currentOperatorRow: {},
       currentSchedlingRow: {},
       pageData: {
         site: this.$store.state.user.site,
         username: this.$store.state.user.name,
         orderNo: '',
         itemNo: '',
-        seqNo: 0,
-        resourceId: '',
+        itemDesc: '',
+        workCenterNo: '',
+        workCenterDesc: '',
+        qtyRequired: '',
+        qtyScheduled: '',
+        qtyToSchedule: '',
+        scheduleDate: this.dayjs(new Date()).format('YYYY-MM-DD'),
+        scheduleTime: '08:30',
+        specifiedTime: 'Y',
+      },
+      searchData: {
+        site: this.$store.state.user.site,
+        username: this.$store.state.user.name,
+        orderNo: '',
+        itemNo: '',
         workCenterNo: '',
+        resourceId: '',
         enterTime1: '',
         enterTime2: '',
         needTime1: '',
         needTime2: '',
-        specifiedTime: 'N',
-        scheduledQty: 0,
         waitTimes: 0,
-        sortField: '',
-        status: 1
+        fulledFlag: 'N',
+        preScheduledFlag: 'Y'
       },
       operatorList: [],
-      columnOperatorArray: [
-        {
-          userId: this.$store.state.user.name,
-          functionId: 5303,
-          serialNumber: '5303Operator',
-          tableId: "5303Operator",
-          tableName: "操作员表",
-          columnProp: "operatorId",
-          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: 5303,
-          serialNumber: '5303Operator',
-          tableId: "5303Operator",
-          tableName: "操作员表",
-          columnProp: "operatorName",
-          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: 5303,
-          serialNumber: '5303Operator',
-          tableId: "5303Operator",
-          tableName: "操作员表",
-          columnProp: "operatorId",
-          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: 5303,
-          serialNumber: '5303Operator',
-          tableId: "5303Operator",
-          tableName: "操作员表",
-          columnProp: "operatorName",
-          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: 5303,
-          serialNumber: '5303Operator',
-          tableId: "5303Operator",
-          tableName: "操作员表",
-          columnProp: "operatorName",
-          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: 5303,
-          serialNumber: '5303Operator',
-          tableId: "5303Operator",
-          tableName: "操作员表",
-          columnProp: "operatorName",
-          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: 5303,
-          serialNumber: '5303Operator',
-          tableId: "5303Operator",
-          tableName: "操作员表",
-          columnProp: "operatorName",
-          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: 5303,
-          serialNumber: '5303Operator',
-          tableId: "5303Operator",
-          tableName: "操作员表",
-          columnProp: "operatorName",
-          headerAlign: "center",
-          align: "center",
-          columnLabel: "虚拟机台",
-          columnWidth: 80,
-          columnHidden: false,
-          columnImage: false,
-          columnSortable: false,
-          sortLv: 0,
-          status: true,
-          fixed: false
-        }
-      ],
       shopOrderList: [],
       orderScheduleList: [],
       dataListLoading: false,
       columnOrderArray: [
         {
           userId: this.$store.state.user.name,
-          functionId: 5301,
-          serialNumber: '5301OrderOrderNo',
-          tableId: "5301Order",
+          functionId: 5304,
+          serialNumber: '5304OrderOrderNo',
+          tableId: "5304Order",
           tableName: "工单表",
           columnProp: "orderNo",
           headerAlign: "center",
@@ -542,9 +388,9 @@ export default {
         },
         {
           userId: this.$store.state.user.name,
-          functionId: 5301,
-          serialNumber: '5301OrderItemNo',
-          tableId: "5301Order",
+          functionId: 5304,
+          serialNumber: '5304OrderItemNo',
+          tableId: "5304Order",
           tableName: "工单表",
           columnProp: "itemNo",
           headerAlign: "center",
@@ -560,9 +406,9 @@ export default {
         },
         {
           userId: this.$store.state.user.name,
-          functionId: 5301,
-          serialNumber: '5301OrderItemDesc',
-          tableId: "5301Order",
+          functionId: 5304,
+          serialNumber: '5304OrderItemDesc',
+          tableId: "5304Order",
           tableName: "工单表",
           columnProp: "itemDesc",
           headerAlign: "center",
@@ -578,15 +424,15 @@ export default {
         },
         {
           userId: this.$store.state.user.name,
-          functionId: 5301,
-          serialNumber: '5301OrderNeedDate',
-          tableId: "5301Order",
+          functionId: 5304,
+          serialNumber: '5304OrderNeedDate',
+          tableId: "5304Order",
           tableName: "工单表",
           columnProp: "needDate",
           headerAlign: "center",
           align: "center",
           columnLabel: "要求完工日期",
-          columnWidth: 80,
+          columnWidth: 85,
           columnHidden: false,
           columnImage: false,
           columnSortable: false,
@@ -596,50 +442,14 @@ export default {
         },
         {
           userId: this.$store.state.user.name,
-          functionId: 5301,
-          serialNumber: '5301OrderPartNo',
-          tableId: "5301Order",
+          functionId: 5304,
+          serialNumber: '5304OrderPartNo',
+          tableId: "5304Order",
           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: '5301OrderCustomerName',
-          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: '5301OrderCustPartNo',
-          tableId: "5301Order",
-          tableName: "工单表",
-          columnProp: "custPartNo",
-          headerAlign: "center",
-          align: "center",
-          columnLabel: "客户产品料号",
+          columnLabel: "产成品编码",
           columnWidth: 80,
           columnHidden: false,
           columnImage: false,
@@ -650,87 +460,15 @@ export default {
         },
         {
           userId: this.$store.state.user.name,
-          functionId: 5301,
-          serialNumber: '5301OrderPartDesc',
-          tableId: "5301Order",
+          functionId: 5304,
+          serialNumber: '5304OrderPartDesc',
+          tableId: "5304Order",
           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: '5301OrderLotSize',
-          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: '5301OrderQtyToSchedule',
-          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: '5301OrderQtyScheduled',
-          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: '5301OrderQtyReported',
-          tableId: "5301Order",
-          tableName: "工单表",
-          columnProp: "qtyReported",
-          headerAlign: "center",
-          align: "center",
-          columnLabel: "已报工数量",
-          columnWidth: 80,
+          columnLabel: "产成品名称/规格",
+          columnWidth: 185,
           columnHidden: false,
           columnImage: false,
           columnSortable: false,
@@ -740,15 +478,15 @@ export default {
         },
         {
           userId: this.$store.state.user.name,
-          functionId: 5301,
-          serialNumber: '5301OrderSpec',
-          tableId: "5301Order",
+          functionId: 5304,
+          serialNumber: '5304OrderSpec',
+          tableId: "5304Order",
           tableName: "工单表",
           columnProp: "spec",
           headerAlign: "center",
           align: "center",
-          columnLabel: "规格型号",
-          columnWidth: 80,
+          columnLabel: "规格",
+          columnWidth: 60,
           columnHidden: false,
           columnImage: false,
           columnSortable: false,
@@ -758,15 +496,15 @@ export default {
         },
         {
           userId: this.$store.state.user.name,
-          functionId: 5301,
-          serialNumber: '5301OrderSite',
-          tableId: "5301Order",
+          functionId: 5304,
+          serialNumber: '5304OrderSite',
+          tableId: "5304Order",
           tableName: "工单表",
           columnProp: "site",
           headerAlign: "center",
           align: "center",
-          columnLabel: "工厂编号",
-          columnWidth: 80,
+          columnLabel: "规格",
+          columnWidth: 60,
           columnHidden: false,
           columnImage: false,
           columnSortable: false,
@@ -776,9 +514,9 @@ export default {
         },
         {
           userId: this.$store.state.user.name,
-          functionId: 5301,
-          serialNumber: '5301OrderWorkCenterNo',
-          tableId: "5301Order",
+          functionId: 5304,
+          serialNumber: '5304OrderWorkCenterNo',
+          tableId: "5304Order",
           tableName: "工单表",
           columnProp: "workCenterNo",
           headerAlign: "center",
@@ -794,9 +532,9 @@ export default {
         },
         {
           userId: this.$store.state.user.name,
-          functionId: 5301,
-          serialNumber: '5301OrderNextItemNo',
-          tableId: "5301Order",
+          functionId: 5304,
+          serialNumber: '5304OrderNextItemNo',
+          tableId: "5304Order",
           tableName: "工单表",
           columnProp: "nextItemNo",
           headerAlign: "center",
@@ -812,9 +550,9 @@ export default {
         },
         {
           userId: this.$store.state.user.name,
-          functionId: 5301,
-          serialNumber: '5301OrderNextItemDesc',
-          tableId: "5301Order",
+          functionId: 5304,
+          serialNumber: '5304OrderNextItemDesc',
+          tableId: "5304Order",
           tableName: "工单表",
           columnProp: "nextItemDesc",
           headerAlign: "center",
@@ -830,376 +568,14 @@ export default {
         },
         {
           userId: this.$store.state.user.name,
-          functionId: 5301,
-          serialNumber: '5301OrderNextScheduledFlag',
-          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: '5301OrderPreItemNo',
-          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: '5301OrderPreItemDesc',
-          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: '5301OrderPreScheduledFlag',
-          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: '5301OrderScheduledFlag',
-          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: '5301OrderAvailResource',
-          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: '5301OrderEnterDate',
-          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: '5301OrderScheduleToPlanTime',
-          tableId: "5301Order",
-          tableName: "工单表",
-          columnProp: "scheduleToPlanTime",
-          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: '5301OrderMachRunFactor',
-          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: '5301OrderMachSetupTime',
-          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: '5301OrderFactorUnit',
-          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: '5301OrderQtyScheduledPreOps',
-          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: '5301OrderQtyApprovedPreOps',
-          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: '5301Order',
-          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: '5301OrderTimeRequired',
-          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: '5301OrderEfficiency',
-          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: '5301Order',
-          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: '5301Order',
-          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: '5301ScheduleScheduledSeqNo',
-          tableId: "5301Schedule",
-          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: 5301,
-          serialNumber: '5301SchedulePlanStartTime',
-          tableId: "5301Schedule",
-          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: '5301SchedulePlanFinishTime',
-          tableId: "5301Schedule",
-          tableName: "排产明细表",
-          columnProp: "planFinishTime",
+          functionId: 5304,
+          serialNumber: '5304OrderNextScheduledFlag',
+          tableId: "5304Order",
+          tableName: "工单表",
+          columnProp: "nextScheduledFlag",
           headerAlign: "center",
           align: "center",
-          columnLabel: "计划完工时间",
+          columnLabel: "下道工序已排产",
           columnWidth: 80,
           columnHidden: false,
           columnImage: false,
@@ -1210,14 +586,14 @@ export default {
         },
         {
           userId: this.$store.state.user.name,
-          functionId: 5301,
-          serialNumber: '5301ScheduleTimeRequired',
-          tableId: "5301Schedule",
-          tableName: "排产明细表",
-          columnProp: "timeRequired",
+          functionId: 5304,
+          serialNumber: '5304OrderPreItemNo',
+          tableId: "5304Order",
+          tableName: "工单表",
+          columnProp: "preItemNo",
           headerAlign: "center",
           align: "center",
-          columnLabel: "计划时间",
+          columnLabel: "上道工序",
           columnWidth: 80,
           columnHidden: false,
           columnImage: false,
@@ -1228,14 +604,14 @@ export default {
         },
         {
           userId: this.$store.state.user.name,
-          functionId: 5301,
-          serialNumber: '5301ScheduleOrderNo',
-          tableId: "5301Schedule",
-          tableName: "排产明细表",
-          columnProp: "orderNo",
+          functionId: 5304,
+          serialNumber: '5304OrderPreItemDesc',
+          tableId: "5304Order",
+          tableName: "工单表",
+          columnProp: "preItemDesc",
           headerAlign: "center",
           align: "center",
-          columnLabel: "订单号",
+          columnLabel: "上道工序名称",
           columnWidth: 80,
           columnHidden: false,
           columnImage: false,
@@ -1246,14 +622,14 @@ export default {
         },
         {
           userId: this.$store.state.user.name,
-          functionId: 5301,
-          serialNumber: '5301ScheduleNeedDate',
-          tableId: "5301Schedule",
-          tableName: "排产明细表",
-          columnProp: "needDate",
+          functionId: 5304,
+          serialNumber: '5304OrderPreScheduledFlag',
+          tableId: "5304Order",
+          tableName: "工单表",
+          columnProp: "preScheduledFlag",
           headerAlign: "center",
           align: "center",
-          columnLabel: "需求日期",
+          columnLabel: "上道工序已排产",
           columnWidth: 80,
           columnHidden: false,
           columnImage: false,
@@ -1264,14 +640,14 @@ export default {
         },
         {
           userId: this.$store.state.user.name,
-          functionId: 5301,
-          serialNumber: '5301ScheduleItemNo',
-          tableId: "5301Schedule",
-          tableName: "排产明细表",
-          columnProp: "itemNo",
+          functionId: 5304,
+          serialNumber: '5304OrderQtyReported',
+          tableId: "5304Order",
+          tableName: "工单表",
+          columnProp: "qtyReported",
           headerAlign: "center",
           align: "center",
-          columnLabel: "工序号",
+          columnLabel: "已报工数量",
           columnWidth: 80,
           columnHidden: false,
           columnImage: false,
@@ -1282,14 +658,14 @@ export default {
         },
         {
           userId: this.$store.state.user.name,
-          functionId: 5301,
-          serialNumber: '5301ScheduleItemDesc',
-          tableId: "5301Schedule",
-          tableName: "排产明细表",
-          columnProp: "itemDesc",
+          functionId: 5304,
+          serialNumber: '5304OrderScheduledFlag',
+          tableId: "5304Order",
+          tableName: "工单表",
+          columnProp: "scheduledFlag",
           headerAlign: "center",
           align: "center",
-          columnLabel: "工序名称",
+          columnLabel: "是否排产",
           columnWidth: 80,
           columnHidden: false,
           columnImage: false,
@@ -1300,14 +676,14 @@ export default {
         },
         {
           userId: this.$store.state.user.name,
-          functionId: 5301,
-          serialNumber: '5301SchedulePartNo',
-          tableId: "5301Schedule",
-          tableName: "排产明细表",
-          columnProp: "partNo",
+          functionId: 5304,
+          serialNumber: '5304OrderLotSize',
+          tableId: "5304Order",
+          tableName: "工单表",
+          columnProp: "lotSize",
           headerAlign: "center",
           align: "center",
-          columnLabel: "产品编码",
+          columnLabel: "订单量",
           columnWidth: 80,
           columnHidden: false,
           columnImage: false,
@@ -1318,14 +694,14 @@ export default {
         },
         {
           userId: this.$store.state.user.name,
-          functionId: 5301,
-          serialNumber: '5301SchedulePartDesc',
-          tableId: "5301Schedule",
-          tableName: "排产明细表",
-          columnProp: "partDesc",
+          functionId: 5304,
+          serialNumber: '5304OrderAvailResource',
+          tableId: "5304Order",
+          tableName: "工单表",
+          columnProp: "availResource",
           headerAlign: "center",
           align: "center",
-          columnLabel: "产品名称",
+          columnLabel: "可用机台",
           columnWidth: 80,
           columnHidden: false,
           columnImage: false,
@@ -1336,14 +712,14 @@ export default {
         },
         {
           userId: this.$store.state.user.name,
-          functionId: 5301,
-          serialNumber: '5301OrderSpec',
-          tableId: "5301Schedule",
-          tableName: "排产明细表",
-          columnProp: "spec",
+          functionId: 5304,
+          serialNumber: '5304OrderEnterDate',
+          tableId: "5304Order",
+          tableName: "工单表",
+          columnProp: "enterDate",
           headerAlign: "center",
           align: "center",
-          columnLabel: "规格型号",
+          columnLabel: "录入日期",
           columnWidth: 80,
           columnHidden: false,
           columnImage: false,
@@ -1354,14 +730,14 @@ export default {
         },
         {
           userId: this.$store.state.user.name,
-          functionId: 5301,
-          serialNumber: '5301ScheduleQtyRequired',
-          tableId: "5301Schedule",
-          tableName: "排产明细表",
-          columnProp: "qtyRequired",
+          functionId: 5304,
+          serialNumber: '5304OrderScheduleToPlanTime',
+          tableId: "5304Order",
+          tableName: "工单表",
+          columnProp: "scheduleToPlanTime",
           headerAlign: "center",
           align: "center",
-          columnLabel: "待生产数量",
+          columnLabel: "计划时间",
           columnWidth: 80,
           columnHidden: false,
           columnImage: false,
@@ -1372,14 +748,14 @@ export default {
         },
         {
           userId: this.$store.state.user.name,
-          functionId: 5301,
-          serialNumber: '5301ScheduleQtyRequired',
-          tableId: "5301Schedule",
-          tableName: "排产明细表",
-          columnProp: "qtyRequired",
+          functionId: 5304,
+          serialNumber: '5304OrderCustomerName',
+          tableId: "5304Order",
+          tableName: "工单表",
+          columnProp: "customerName",
           headerAlign: "center",
           align: "center",
-          columnLabel: "派工单需求数量",
+          columnLabel: "客户名称",
           columnWidth: 80,
           columnHidden: false,
           columnImage: false,
@@ -1390,14 +766,14 @@ export default {
         },
         {
           userId: this.$store.state.user.name,
-          functionId: 5301,
-          serialNumber: '5301ScheduleQtyReported',
-          tableId: "5301Schedule",
-          tableName: "排产明细表",
-          columnProp: "qtyReported",
+          functionId: 5304,
+          serialNumber: '5304OrderMachRunFactor',
+          tableId: "5304Order",
+          tableName: "工单表",
+          columnProp: "machRunFactor",
           headerAlign: "center",
           align: "center",
-          columnLabel: "已报告数量",
+          columnLabel: "单位产出",
           columnWidth: 80,
           columnHidden: false,
           columnImage: false,
@@ -1408,14 +784,14 @@ export default {
         },
         {
           userId: this.$store.state.user.name,
-          functionId: 5301,
-          serialNumber: '5301SchedulePreItemNo',
-          tableId: "5301Schedule",
-          tableName: "排产明细表",
-          columnProp: "preItemNo",
+          functionId: 5304,
+          serialNumber: '5304OrderMachSetupTime',
+          tableId: "5304Order",
+          tableName: "工单表",
+          columnProp: "machSetupTime",
           headerAlign: "center",
           align: "center",
-          columnLabel: "前道工序",
+          columnLabel: "调机时间",
           columnWidth: 80,
           columnHidden: false,
           columnImage: false,
@@ -1426,14 +802,14 @@ export default {
         },
         {
           userId: this.$store.state.user.name,
-          functionId: 5301,
-          serialNumber: '5301SchedulePreItemDesc',
-          tableId: "5301Schedule",
-          tableName: "排产明细表",
-          columnProp: "preItemDesc",
+          functionId: 5304,
+          serialNumber: '5304OrderFactorUnit',
+          tableId: "5304Order",
+          tableName: "工单表",
+          columnProp: "factorUnit",
           headerAlign: "center",
           align: "center",
-          columnLabel: "前道工序名称",
+          columnLabel: "产出单位",
           columnWidth: 80,
           columnHidden: false,
           columnImage: false,
@@ -1444,14 +820,14 @@ export default {
         },
         {
           userId: this.$store.state.user.name,
-          functionId: 5301,
-          serialNumber: '5301SchedulePreScheduledFlag',
-          tableId: "5301Schedule",
-          tableName: "排产明细表",
-          columnProp: "preScheduledFlag",
+          functionId: 5304,
+          serialNumber: '5304OrderQtyScheduled',
+          tableId: "5304Order",
+          tableName: "工单表",
+          columnProp: "qtyScheduled",
           headerAlign: "center",
           align: "center",
-          columnLabel: "前道工序是否排产",
+          columnLabel: "已排产数量",
           columnWidth: 80,
           columnHidden: false,
           columnImage: false,
@@ -1462,14 +838,14 @@ export default {
         },
         {
           userId: this.$store.state.user.name,
-          functionId: 5301,
-          serialNumber: '5301ScheduleNextItemNo',
-          tableId: "5301Schedule",
-          tableName: "排产明细表",
-          columnProp: "nextItemNo",
+          functionId: 5304,
+          serialNumber: '5304OrderQtyToSchedule',
+          tableId: "5304Order",
+          tableName: "工单表",
+          columnProp: "qtyToSchedule",
           headerAlign: "center",
           align: "center",
-          columnLabel: "后道工序",
+          columnLabel: "待排产数量",
           columnWidth: 80,
           columnHidden: false,
           columnImage: false,
@@ -1480,14 +856,14 @@ export default {
         },
         {
           userId: this.$store.state.user.name,
-          functionId: 5301,
-          serialNumber: '5301ScheduleNextItemDesc',
-          tableId: "5301Schedule",
-          tableName: "排产明细表",
-          columnProp: "nextItemDesc",
+          functionId: 5304,
+          serialNumber: '5304OrderQtyScheduledPreOps',
+          tableId: "5304Order",
+          tableName: "工单表",
+          columnProp: "qtyScheduledPreOps",
           headerAlign: "center",
           align: "center",
-          columnLabel: "后道工序名称",
+          columnLabel: "前道工序已排产数量",
           columnWidth: 80,
           columnHidden: false,
           columnImage: false,
@@ -1498,14 +874,14 @@ export default {
         },
         {
           userId: this.$store.state.user.name,
-          functionId: 5301,
-          serialNumber: '5301ScheduleNextScheduledFlag',
-          tableId: "5301Schedule",
-          tableName: "排产明细表",
-          columnProp: "nextScheduledFlag",
+          functionId: 5304,
+          serialNumber: '5304OrderCustPartNo',
+          tableId: "5304Order",
+          tableName: "工单表",
+          columnProp: "custPartNo",
           headerAlign: "center",
           align: "center",
-          columnLabel: "后道工序是否排产",
+          columnLabel: "客户产品料号",
           columnWidth: 80,
           columnHidden: false,
           columnImage: false,
@@ -1516,14 +892,14 @@ export default {
         },
         {
           userId: this.$store.state.user.name,
-          functionId: 5301,
-          serialNumber: '5301ScheduleResourceId',
-          tableId: "5301Schedule",
-          tableName: "排产明细表",
-          columnProp: "resourceId",
+          functionId: 5304,
+          serialNumber: '5304OrderTimeRequired',
+          tableId: "5304Order",
+          tableName: "工单表",
+          columnProp: "timeRequired",
           headerAlign: "center",
           align: "center",
-          columnLabel: "机台号",
+          columnLabel: "待排产时间",
           columnWidth: 80,
           columnHidden: false,
           columnImage: false,
@@ -1534,14 +910,14 @@ export default {
         },
         {
           userId: this.$store.state.user.name,
-          functionId: 5301,
-          serialNumber: '5301ScheduleCustomerName',
-          tableId: "5301Schedule",
-          tableName: "排产明细表",
-          columnProp: "customerName",
+          functionId: 5304,
+          serialNumber: '5304OrderQtyApprovedPreOps',
+          tableId: "5304Order",
+          tableName: "工单表",
+          columnProp: "qtyApprovedPreOps",
           headerAlign: "center",
           align: "center",
-          columnLabel: "客户名称",
+          columnLabel: "前道工序已报合格数",
           columnWidth: 80,
           columnHidden: false,
           columnImage: false,
@@ -1552,14 +928,14 @@ export default {
         },
         {
           userId: this.$store.state.user.name,
-          functionId: 5301,
-          serialNumber: '5301ScheduleEnterDate',
-          tableId: "5301Schedule",
-          tableName: "排产明细表",
-          columnProp: "enterDate",
+          functionId: 5304,
+          serialNumber: '5304OrderPrePlanStartTime',
+          tableId: "5304Order",
+          tableName: "工单表",
+          columnProp: "prePlanStartTime",
           headerAlign: "center",
           align: "center",
-          columnLabel: "录入日期",
+          columnLabel: "上道工序计划开工日期",
           columnWidth: 80,
           columnHidden: false,
           columnImage: false,
@@ -1570,14 +946,14 @@ export default {
         },
         {
           userId: this.$store.state.user.name,
-          functionId: 5301,
-          serialNumber: '5301ScheduleAvailResource',
-          tableId: "5301Schedule",
-          tableName: "排产明细表",
-          columnProp: "availResource",
+          functionId: 5304,
+          serialNumber: '5304OrderPrePlanFinishTime',
+          tableId: "5304Order",
+          tableName: "工单表",
+          columnProp: "prePlanFinishTime",
           headerAlign: "center",
           align: "center",
-          columnLabel: "可用机台",
+          columnLabel: "上道工序计划完工日期",
           columnWidth: 80,
           columnHidden: false,
           columnImage: false,
@@ -1588,14 +964,14 @@ export default {
         },
         {
           userId: this.$store.state.user.name,
-          functionId: 5301,
-          serialNumber: '5301ScheduleWorkCenterNo',
-          tableId: "5301Schedule",
-          tableName: "排产明细表",
-          columnProp: "workCenterNo",
+          functionId: 5304,
+          serialNumber: '5304OrderEfficiency',
+          tableId: "5304Order",
+          tableName: "工单表",
+          columnProp: "efficiency",
           headerAlign: "center",
           align: "center",
-          columnLabel: "加工中心",
+          columnLabel: "效率",
           columnWidth: 80,
           columnHidden: false,
           columnImage: false,
@@ -1603,17 +979,19 @@ export default {
           sortLv: 0,
           status: true,
           fixed: false
-        },
+        }
+      ],
+      columnOperatorArray: [
         {
           userId: this.$store.state.user.name,
-          functionId: 5301,
-          serialNumber: '5301ScheduleMachRunFactor',
-          tableId: "5301Schedule",
-          tableName: "排产明细表",
-          columnProp: "machRunFactor",
+          functionId: 5304,
+          serialNumber: '5304OperatorOperatorId',
+          tableId: "5304Operator",
+          tableName: "操作员表",
+          columnProp: "operatorId",
           headerAlign: "center",
           align: "center",
-          columnLabel: "单位产出",
+          columnLabel: "员工编号",
           columnWidth: 80,
           columnHidden: false,
           columnImage: false,
@@ -1624,14 +1002,14 @@ export default {
         },
         {
           userId: this.$store.state.user.name,
-          functionId: 5301,
-          serialNumber: '5301ScheduleMachSetupTime',
-          tableId: "5301Schedule",
-          tableName: "排产明细表",
-          columnProp: "machSetupTime",
+          functionId: 5304,
+          serialNumber: '5304OperatorOperatorName',
+          tableId: "5304Operator",
+          tableName: "操作员表",
+          columnProp: "operatorName",
           headerAlign: "center",
           align: "center",
-          columnLabel: "调机时间",
+          columnLabel: "员工姓名",
           columnWidth: 80,
           columnHidden: false,
           columnImage: false,
@@ -1642,15 +1020,15 @@ export default {
         },
         {
           userId: this.$store.state.user.name,
-          functionId: 5301,
-          serialNumber: '5301ScheduleFactorUnit',
-          tableId: "5301Schedule",
-          tableName: "排产明细表",
-          columnProp: "factorUnit",
+          functionId: 5304,
+          serialNumber: '5304OperatorLastScheduledTime',
+          tableId: "5304Operator",
+          tableName: "操作员表",
+          columnProp: "lastScheduledTime",
           headerAlign: "center",
           align: "center",
-          columnLabel: "产出单位",
-          columnWidth: 80,
+          columnLabel: "最后排产时间",
+          columnWidth: 125,
           columnHidden: false,
           columnImage: false,
           columnSortable: false,
@@ -1660,14 +1038,14 @@ export default {
         },
         {
           userId: this.$store.state.user.name,
-          functionId: 5301,
-          serialNumber: '5301ScheduleSite',
-          tableId: "5301Schedule",
-          tableName: "排产明细表",
-          columnProp: "site",
+          functionId: 5304,
+          serialNumber: '5304OperatorEfficiency',
+          tableId: "5304Operator",
+          tableName: "操作员表",
+          columnProp: "efficiency",
           headerAlign: "center",
           align: "center",
-          columnLabel: "工厂编号",
+          columnLabel: "效率",
           columnWidth: 80,
           columnHidden: false,
           columnImage: false,
@@ -1678,16 +1056,16 @@ export default {
         },
         {
           userId: this.$store.state.user.name,
-          functionId: 5301,
-          serialNumber: '5301ScheduleQtyScheduledPreOps',
-          tableId: "5301Schedule",
-          tableName: "排产明细表",
-          columnProp: "qtyScheduledPreOps",
+          functionId: 5304,
+          serialNumber: '5304OperatorQtyToSchedule',
+          tableId: "5304Operator",
+          tableName: "操作员表",
+          columnProp: "qtyToSchedule",
           headerAlign: "center",
           align: "center",
-          columnLabel: "前道工序已排产数量",
+          columnLabel: "排产数量",
           columnWidth: 80,
-          columnHidden: false,
+          columnHidden: true,
           columnImage: false,
           columnSortable: false,
           sortLv: 0,
@@ -1696,14 +1074,14 @@ export default {
         },
         {
           userId: this.$store.state.user.name,
-          functionId: 5301,
-          serialNumber: '5301ScheduleDelayHours',
-          tableId: "5301Schedule",
-          tableName: "排产明细表",
-          columnProp: "delayHours",
+          functionId: 5304,
+          serialNumber: '5304OperatorCalendarId',
+          tableId: "5304Operator",
+          tableName: "操作员表",
+          columnProp: "calendarId",
           headerAlign: "center",
           align: "center",
-          columnLabel: "晚于发货时间",
+          columnLabel: "工作日历",
           columnWidth: 80,
           columnHidden: false,
           columnImage: false,
@@ -1714,14 +1092,14 @@ export default {
         },
         {
           userId: this.$store.state.user.name,
-          functionId: 5301,
-          serialNumber: '5301Schedule',
-          tableId: "5301Schedule",
-          tableName: "排产明细表",
-          columnProp: "RecordType",
+          functionId: 5304,
+          serialNumber: '5304OperatorVirturlFlag',
+          tableId: "5304Operator",
+          tableName: "操作员表",
+          columnProp: "virturlFlag",
           headerAlign: "center",
           align: "center",
-          columnLabel: "",
+          columnLabel: "虚拟机台",
           columnWidth: 80,
           columnHidden: false,
           columnImage: false,
@@ -1729,17 +1107,19 @@ export default {
           sortLv: 0,
           status: true,
           fixed: false
-        },
+        }
+      ],
+      columnOrderScheduleArray: [
         {
           userId: this.$store.state.user.name,
-          functionId: 5301,
-          serialNumber: '5301ScheduleClosedFlag',
-          tableId: "5301Schedule",
+          functionId: 5304,
+          serialNumber: '5304ScheduleScheduledSeqNo',
+          tableId: "5304Schedule",
           tableName: "排产明细表",
-          columnProp: "closedFlag",
+          columnProp: "scheduledSeqNo",
           headerAlign: "center",
           align: "center",
-          columnLabel: "是否关闭",
+          columnLabel: "排产序号",
           columnWidth: 80,
           columnHidden: false,
           columnImage: false,
@@ -1750,14 +1130,14 @@ export default {
         },
         {
           userId: this.$store.state.user.name,
-          functionId: 5301,
-          serialNumber: '5301Schedule',
-          tableId: "5301Schedule",
+          functionId: 5304,
+          serialNumber: '5304ScheduleQtyRequired',
+          tableId: "5304Schedule",
           tableName: "排产明细表",
-          columnProp: "是否关闭",
+          columnProp: "qtyRequired",
           headerAlign: "center",
           align: "center",
-          columnLabel: "",
+          columnLabel: "待生产数量",
           columnWidth: 80,
           columnHidden: false,
           columnImage: false,
@@ -1768,15 +1148,15 @@ export default {
         },
         {
           userId: this.$store.state.user.name,
-          functionId: 5301,
-          serialNumber: '5301ScheduleParkFlag',
-          tableId: "5301Schedule",
+          functionId: 5304,
+          serialNumber: '5304SchedulePlanStartTime',
+          tableId: "5304Schedule",
           tableName: "排产明细表",
-          columnProp: "parkFlag",
+          columnProp: "planStartTime",
           headerAlign: "center",
           align: "center",
-          columnLabel: "暂停",
-          columnWidth: 80,
+          columnLabel: "计划开工时间",
+          columnWidth: 125,
           columnHidden: false,
           columnImage: false,
           columnSortable: false,
@@ -1786,15 +1166,15 @@ export default {
         },
         {
           userId: this.$store.state.user.name,
-          functionId: 5301,
-          serialNumber: '5301ScheduleTimeRequired',
-          tableId: "5301Schedule",
+          functionId: 5304,
+          serialNumber: '5304SchedulePlanFinishTime',
+          tableId: "5304Schedule",
           tableName: "排产明细表",
-          columnProp: "timeRequired",
+          columnProp: "planFinishTime",
           headerAlign: "center",
           align: "center",
-          columnLabel: "派工单需求工时",
-          columnWidth: 80,
+          columnLabel: "计划完工时间",
+          columnWidth: 125,
           columnHidden: false,
           columnImage: false,
           columnSortable: false,
@@ -1804,14 +1184,14 @@ export default {
         },
         {
           userId: this.$store.state.user.name,
-          functionId: 5301,
-          serialNumber: '5301SchedulePreOpsPlanFinishTime',
-          tableId: "5301Schedule",
+          functionId: 5304,
+          serialNumber: '5304ScheduleOrderNo',
+          tableId: "5304Schedule",
           tableName: "排产明细表",
-          columnProp: "preOpsPlanFinishTime",
+          columnProp: "orderNo",
           headerAlign: "center",
           align: "center",
-          columnLabel: "派工单早于上工序",
+          columnLabel: "订单号",
           columnWidth: 80,
           columnHidden: false,
           columnImage: false,
@@ -1822,14 +1202,14 @@ export default {
         },
         {
           userId: this.$store.state.user.name,
-          functionId: 5301,
-          serialNumber: '5301ScheduleRemark',
-          tableId: "5301Schedule",
+          functionId: 5304,
+          serialNumber: '5304ScheduleItemNo',
+          tableId: "5304Schedule",
           tableName: "排产明细表",
-          columnProp: "remark",
+          columnProp: "itemNo",
           headerAlign: "center",
           align: "center",
-          columnLabel: "备注",
+          columnLabel: "工序号",
           columnWidth: 80,
           columnHidden: false,
           columnImage: false,
@@ -1840,14 +1220,14 @@ export default {
         },
         {
           userId: this.$store.state.user.name,
-          functionId: 5301,
-          serialNumber: '5301Schedule',
-          tableId: "5301Schedule",
+          functionId: 5304,
+          serialNumber: '5304ScheduleRemark',
+          tableId: "5304Schedule",
           tableName: "排产明细表",
-          columnProp: "SAP参考号",
+          columnProp: "remark",
           headerAlign: "center",
           align: "center",
-          columnLabel: "",
+          columnLabel: "备注",
           columnWidth: 80,
           columnHidden: false,
           columnImage: false,
@@ -1858,14 +1238,14 @@ export default {
         },
         {
           userId: this.$store.state.user.name,
-          functionId: 5301,
-          serialNumber: '5301ScheduleCustPartNo',
-          tableId: "5301Schedule",
+          functionId: 5304,
+          serialNumber: '5304SchedulePartNo',
+          tableId: "5304Schedule",
           tableName: "排产明细表",
-          columnProp: "custPartNo",
+          columnProp: "partNo",
           headerAlign: "center",
           align: "center",
-          columnLabel: "客户产品料号",
+          columnLabel: "产品编码",
           columnWidth: 80,
           columnHidden: false,
           columnImage: false,
@@ -1876,14 +1256,14 @@ export default {
         },
         {
           userId: this.$store.state.user.name,
-          functionId: 5301,
-          serialNumber: '5301ScheduleEficiency',
-          tableId: "5301Schedule",
+          functionId: 5304,
+          serialNumber: '5304ScheduleCustomerName',
+          tableId: "5304Schedule",
           tableName: "排产明细表",
-          columnProp: "eficiency",
+          columnProp: "customerName",
           headerAlign: "center",
           align: "center",
-          columnLabel: "效率",
+          columnLabel: "客户名称",
           columnWidth: 80,
           columnHidden: false,
           columnImage: false,
@@ -1894,14 +1274,14 @@ export default {
         },
         {
           userId: this.$store.state.user.name,
-          functionId: 5301,
-          serialNumber: '5301ScheduleDelayHours',
-          tableId: "5301Schedule",
+          functionId: 5304,
+          serialNumber: '5304ScheduleCustPartNo',
+          tableId: "5304Schedule",
           tableName: "排产明细表",
-          columnProp: "delayHours",
+          columnProp: "custPartNo",
           headerAlign: "center",
           align: "center",
-          columnLabel: "延误小时数",
+          columnLabel: "客户产品料号",
           columnWidth: 80,
           columnHidden: false,
           columnImage: false,
@@ -1912,14 +1292,14 @@ export default {
         },
         {
           userId: this.$store.state.user.name,
-          functionId: 5301,
-          serialNumber: '5301Schedule',
-          tableId: "5301Schedule",
+          functionId: 5304,
+          serialNumber: '5304SchedulePartDesc',
+          tableId: "5304Schedule",
           tableName: "排产明细表",
-          columnProp: "已排料",
+          columnProp: "partDesc",
           headerAlign: "center",
           align: "center",
-          columnLabel: "",
+          columnLabel: "产品名称",
           columnWidth: 80,
           columnHidden: false,
           columnImage: false,
@@ -1930,14 +1310,14 @@ export default {
         },
         {
           userId: this.$store.state.user.name,
-          functionId: 5301,
-          serialNumber: '5301Schedule',
-          tableId: "5301Schedule",
+          functionId: 5304,
+          serialNumber: '5304OrderSpec',
+          tableId: "5304Schedule",
           tableName: "排产明细表",
-          columnProp: "排产完成时间早于上工序",
+          columnProp: "spec",
           headerAlign: "center",
           align: "center",
-          columnLabel: "",
+          columnLabel: "规格型号",
           columnWidth: 80,
           columnHidden: false,
           columnImage: false,
@@ -1950,12 +1330,6 @@ export default {
     }
   },
 
-  /*组件*/
-  components: {
-    Chooselist,/*列表的组件*/
-    comSplitSchedule,/* 分批排产的组件 */
-  },
-
   mounted() {
     this.$nextTick(() => {
       this.tableHeight = (window.innerHeight - 270);
@@ -1969,61 +1343,55 @@ export default {
 
     //列表表格选择替换
     tabClick(tab, event) {
-      //刷新列表数据
-      //this.refreshCurrentTabTable();
+      let tabName = tab.name;
+      //区分两个页签
+      if(tabName == 'shop_order'){
+        //刷新当前的table
+        //this.getShopOrderList();
+      }else if(tabName == 'scheduling'){
+        //刷新刷新FQC员工
+        this.getOperatorList();
+      }
     },
 
-    /*获取工单信息*/
+    /*获取FQC工单信息*/
     getShopOrderList() {
-      getShopOrderList(this.pageData).then(({data}) => {
+      getShopOrderListWithFqc(this.searchData).then(({data}) => {
         this.shopOrderList = data.rows;
-        //清空已经选好的行数据
-        this.currentRoutingRow = null;
       })
     },
 
+    /*获取FQC操作员信息*/
+    getOperatorList() {
+      getOperatorListWithFqc(this.searchData).then(({data}) => {
+        //设置列表
+        this.operatorList = data.rows;
+        //判断是否选中行
+        if(this.operatorIndex >= 0){
+          //选中当前是的行
+          setTimeout(() =>{
+            this.$refs.operatorTable.setCurrentRow(this.operatorList[this.operatorIndex]);
+            //设置默认选中的人员
+            this.searchData.resourceId = this.operatorList[this.operatorIndex].operatorId;
+            //刷新当前的派工单记录
+            this.getOrderScheduleList();
+          },500);
+
+        }
+      });
+    },
+
     /*获取派工单的信息*/
     getOrderScheduleList() {
-      getOrderScheduleList(this.pageData).then(({data}) => {
+      getOrderScheduleListWithFqc(this.searchData).then(({data}) => {
         this.orderScheduleList = data.rows;
+        //清空已经选好的行数据
+        this.currentSchedeRow = null;
         //判断是否需要选中当前行
         if (this.scheduleIndex >= 0) {
           //选中当前是的行
-          this.$refs.scheduleTable.setCurrentRow(this.$refs.scheduleTable.data[index]);
-        }
-        //清空已经选好的行数据
-        this.currentScheduleRow = null;
-      })
-    },
-
-    /*刷新页面table*/
-    refreshPageTables() {
-      this.getShopOrderList();
-      this.getOrderScheduleList();
-    },
-
-    /*列表方法的回调*/
-    getBaseData(val) {
-      if (this.tagNo === 88) {
-        this.pageData.resourceId = val.ResourceID;
-        //调用方法获取加工中心
-        this.getCurrentWorkCenterNoByResourceId();
-      } else if (this.tagNo == 24) {
-        this.pageData.workCenterNo = val.WorkCenterNo;
-      }
-    },
-
-    // 获取基础数据列表
-    getBaseList(val) {
-      this.tagNo = val
-      this.$nextTick(() => {
-        let strVal = "";
-        if (val === 88) {
-          strVal = this.pageData.resourceId;
-        } else if (val === 24) {
-          strVal = this.pageData.workCenterNo;
+          this.$refs.scheduleTable.setCurrentRow(this.orderScheduleList[this.scheduleIndex]);
         }
-        this.$refs.baseList.init(val, strVal)
       })
     },
 
@@ -2036,53 +1404,77 @@ export default {
         //调用提示的方法
         this.warnReScheduleConfirm();
       }
-
     },
 
-    /*打开分批排产*/
-    openSplitScheduleModal() {
-      let routingRow = this.currentRoutingRow;
-      //首先判断是否选好
-      if (null == routingRow) {
-        this.$message.error("请先单击选择行!")
-        return false;
-      }
-      //调用分批排产的方法
-      this.showSplitScheduleFlag = true;
-      //调用组件
-      this.$refs.comSplitSchedule.init(this.currentRoutingRow);
+    /*设置工艺的行*/
+    setCurrentRoutingRow(row, column, event) {
+      this.currentRoutingRow = row;
     },
 
-    /*区分不同的菜单  调用不同的方法  调用不同的方法*/
-    initProcessScheduleMenu(menuName) {
-
+    /*开始排产*/
+    startScheduleBun(row, column, event){
+      //设置页面参数
+      setTimeout(() =>{
+        this.pageData.orderNo = row.orderNo;
+        this.pageData.itemNo = row.itemNo;
+        this.pageData.itemDesc = row.itemDesc;
+        this.pageData.workCenterNo = row.workCenterNo;
+        this.pageData.workCenterDesc = '全检';
+        this.pageData.partNo = row.partNo;
+        this.pageData.partDesc = row.partDesc;
+        this.pageData.qtyRequired = row.lotSize;
+        this.pageData.qtyScheduled = row.qtyScheduled;
+        this.pageData.qtyToSchedule = row.qtyToSchedule;
+        //设置页签
+        this.activeTable = 'scheduling';
+        //刷新页签的参数
+        this.getOperatorList();
+      }, 500)
     },
 
-    /*获取当前的机台对应的加工中心*/
-    getCurrentWorkCenterNoByResourceId() {
-      getCurrentWorkCenterNoByResourceId(this.pageData).then(({data}) => {
-        //区分是否成功
-        if (data.code == 500) {
-          this.$message.error(data.msg);
-        } else {
-          this.pageData.workCenterNo = data.workCenterNo;
-        }
-        this.pageData.workCenterNo = data.workCenterNo;
-      });
+    /*设置当前的操作员行*/
+    setCurrentOperatorRow(row, column, event) {
+      this.currentOperatorRow = JSON.parse(JSON.stringify(row));
+      //设置查询的条件
+      this.searchData.resourceId = row.operatorId;
+      //刷新table
+      this.getOrderScheduleList();
     },
 
-    /*设置当前行的下标*/
-    routingRowClassName({row, rowIndex}) {
+    /*设置当前派工单行的下标*/
+    scheduleRowClassName({row, rowIndex}){
       row.index = rowIndex;
-      //判断当前行颜色参数
-      if (row.qtyScheduled > 0) {
-        return 'customer-row-gray';
+    },
+
+    /*添加定制的css类*/
+    customerCellClassName({row, column, rowIndex, columnIndex}) {
+      if(column.property == 'qtyToSchedule'){
+        return 'customer-number-cell';
+      }
+    },
+    /*添加定制的cess样式*/
+    customerCellStyle({row, column, rowIndex, columnIndex}) {
+      if(column.property == 'qtyToSchedule'){
+        return 'padding: 0px 0px;';
       }
     },
 
-    /*设置工艺的行*/
-    setCurrentRoutingRow(row, column, event) {
-      this.currentRoutingRow = row;
+
+    /*设置当前的派工单行*/
+    setCurrentScheduleRow(row, column, event) {
+      this.currentSchedeRow = JSON.parse(JSON.stringify(row));
+      //设置当前的序号
+      this.scheduleIndex = row.index;
+    },
+
+    /*当前值发生变化的时候修改*/
+    changeScheduleRow(row, oldRow){
+      //判断是否是获取焦点的事件
+      if(row){
+        this.currentScheduleRow = JSON.parse(JSON.stringify(row));
+        //设置当前的序号
+        this.scheduleIndex = row.index;
+      }
     },
 
     /*开始排产的操作*/
@@ -2146,12 +1538,6 @@ export default {
       });
     },
 
-
-    /*设置派工单的行*/
-    setCurrentSchedulingRow(row, column, event) {
-      this.currentSchedlingRow = JSON.parse(JSON.stringify(row));
-    },
-
     /*提示取消派工单*/
     warnCancelScheduleConfirm(row, $event, column) {
       //提示操作
@@ -2260,9 +1646,9 @@ export default {
   },
   created() {
     //查询工单的数据
-    this.getShopOrderList();
+    //this.getShopOrderList();
     //查询派工的数据
-    this.getOrderScheduleList();
+    //this.getOrderScheduleList();
   }
 }
 </script>
@@ -2411,4 +1797,19 @@ div.customer-el-card-blue {
 .customer-checkbox + .customer-checkbox {
   margin-top: 20px;
 }
+
+/*统一的input内容颜色样式*/
+.customer-input-color-red /deep/ .el-input__inner {
+  color: red;
+}
+
+/deep/ .customer-tab .el-tabs__content{
+  padding: 0px !important;
+}
+
+/*table中input*/
+div.table-input /deep/ input.el-input__inner{
+  text-align: right;
+}
+
 </style>
diff --git a/src/views/modules/yieldReport/com_merge_roll.vue b/src/views/modules/yieldReport/com_merge_roll.vue
index a3daf16..5e09f9e 100644
--- a/src/views/modules/yieldReport/com_merge_roll.vue
+++ b/src/views/modules/yieldReport/com_merge_roll.vue
@@ -13,7 +13,7 @@
           </el-col>
           <el-col :span="8">
             <el-form-item class="customer-item" label="当前卷数量:">
-              <el-input v-model="pageData.rollQty" readonly style="width: 80px;"></el-input>
+              <el-input v-model="pageData.rollQty" style="width: 80px;"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="6">
@@ -158,13 +158,14 @@ export default {
       //首先判断数值是否通过判断
       let newRollQty = this.pageData.newRollQty;
       if (newRollQty == null || newRollQty == '') {
-        this.$message.error('请输入新卷数量!');
+        //this.$message.error('请输入新卷数量!');
         this.pageData.newRollQty = 0;//重新赋值
         return false;
       }
-
+      //转换成整数
+      newRollQty = parseInt(newRollQty);
       if (newRollQty <= 0 || !Number.isInteger(newRollQty)) {
-        this.$message.error('新卷数量必须是大于零的整数!');
+        //this.$message.error('新卷数量必须是大于零的整数!');
         this.pageData.newRollQty = 0;//重新赋值
         return false;
       }