From 6752fe62bf3ae5e608a4e9af310b25922f122ab5 Mon Sep 17 00:00:00 2001
From: "[li_she]" <[li.she@xujiesoft.com]>
Date: Fri, 2 Dec 2022 15:53:49 +0800
Subject: [PATCH] =?UTF-8?q?11=E6=9C=88=E4=BB=BD=E9=97=AE=E9=A2=98=E6=B8=85?=
 =?UTF-8?q?=E5=8D=95=20=202022=E5=B9=B412=E6=9C=882=E6=97=A5=20sxm?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/schedule/order_schedule.js            |    3 +
 src/views/modules/schedule/order_schedule.vue |  736 +++---
 .../schedule/order_schedule_expand.vue        |   69 +-
 .../searchProductionDispatchList.vue          | 2068 +++++++++--------
 .../shopOrder/common/tool_add_and_edit.vue    |   13 +-
 .../modules/shopOrder/shopOrder/shopOrder.vue |   16 +-
 6 files changed, 1509 insertions(+), 1396 deletions(-)

diff --git a/src/api/schedule/order_schedule.js b/src/api/schedule/order_schedule.js
index e8be05e..93cfc82 100644
--- a/src/api/schedule/order_schedule.js
+++ b/src/api/schedule/order_schedule.js
@@ -38,3 +38,6 @@ export const refreshScheduleByRouting = data => createAPI('scheduling/refreshSch
 
 //派工单按照日历
 export const refreshScheduleByCalendar = data => createAPI('scheduling/refreshScheduleByCalendar', 'POST', data)
+
+// 产能汇总
+export const sumProductionCapacity = data => createAPI('schedule/sumProductionCapacity', 'POST', data)
diff --git a/src/views/modules/schedule/order_schedule.vue b/src/views/modules/schedule/order_schedule.vue
index 6dfd25b..7f4748f 100644
--- a/src/views/modules/schedule/order_schedule.vue
+++ b/src/views/modules/schedule/order_schedule.vue
@@ -1,38 +1,43 @@
 <template>
-  <div class="customer-css" >
+  <div class="customer-css">
     <!--  菜单按钮区域  -->
-    <fieldset class="customer-field" style="margin-top: -3px; width: 612px; padding: 0.35em 0.35em 0.35em;" >
-      <legend>{{buttons.menuButton}}</legend>
-      <el-form :inline="true" label-position="top" label-width="100px" style="margin-top: -5px;" >
-      <el-form-item :label="''" style="margin-left: 30px;">
-        <el-button class="customer-bun-min" type="primary" @click="refreshPageTables" style="margin-left: 10px; margin-bottom: 5px;">{{buttons.refreshButton}}</el-button>
-      </el-form-item>
-      <el-form-item :label="''">
-        <el-button class="customer-bun-min"  :disabled = "authEdit" type="primary" @click="moveUpScheduleBun" style="margin-left: 10px; margin-bottom: 5px;">{{buttons.moveUp}}</el-button>
-      </el-form-item>
-      <el-form-item :label="''">
-          <el-button class="customer-bun-min"  :disabled = "authEdit" type="primary" @click="moveDownScheduleBun" style="margin-left: 10px; margin-bottom: 5px;">{{buttons.moveDown}}</el-button>
-      </el-form-item>
-       <el-form-item :label="''">
-          <el-button v-if="showDefault" @click="saveMultiLanguage()" type="primary">多语言设置</el-button>
-       </el-form-item>
+    <fieldset class="customer-field" style="margin-top: -3px; width: 612px; padding: 0.35em 0.35em 0.35em;">
+      <legend>{{ buttons.menuButton }}</legend>
+      <el-form :inline="true" label-position="top" label-width="100px" style="margin-top: -5px;">
+        <el-form-item :label="''" style="margin-left: 30px;">
+          <el-button class="customer-bun-min" type="primary" @click="refreshPageTables"
+                     style="margin-left: 10px; margin-bottom: 5px;">{{ buttons.refreshButton }}
+          </el-button>
+        </el-form-item>
+        <el-form-item :label="''">
+          <el-button class="customer-bun-min" :disabled="authEdit" type="primary" @click="moveUpScheduleBun"
+                     style="margin-left: 10px; margin-bottom: 5px;">{{ buttons.moveUp }}
+          </el-button>
+        </el-form-item>
+        <el-form-item :label="''">
+          <el-button class="customer-bun-min" :disabled="authEdit" type="primary" @click="moveDownScheduleBun"
+                     style="margin-left: 10px; margin-bottom: 5px;">{{ buttons.moveDown }}
+          </el-button>
+        </el-form-item>
+
       </el-form>
     </fieldset>
     <!--  排序规则  -->
-    <fieldset class="customer-field" style="margin-left: 640px; margin-top: -41px; width: 135px;" >
-      <legend>{{labels.sortNo}}</legend><br>
-      <el-form :inline="true" style="margin-top: -10px; margin-bottom: 10px;" label-position="top" label-width="100px" >
+    <fieldset class="customer-field" style="margin-left: 640px; margin-top: -41px; width: 135px;">
+      <legend>{{ labels.sortNo }}</legend>
+      <br>
+      <el-form :inline="true" style="margin-top: -10px; margin-bottom: 10px;" label-position="top" label-width="100px">
         <el-form-item :label="''" style="margin-bottom: 10px;">
           <el-radio-group v-model="pageData.sortField">
-            <el-radio label="needDate">{{labels.sortNeedDate}}</el-radio>
-            <el-radio label="orderNo">{{labels.sortOrderNo}}</el-radio>
-            <el-radio label="partNo">{{labels.sortPartNo}}</el-radio>
+            <el-radio label="needDate">{{ labels.sortNeedDate }}</el-radio>
+            <el-radio label="orderNo">{{ labels.sortOrderNo }}</el-radio>
+            <el-radio label="partNo">{{ labels.sortPartNo }}</el-radio>
           </el-radio-group>
         </el-form-item>
       </el-form>
     </fieldset>
     <!--  查询时间和产品  -->
-    <el-form :inline="true" label-position="top" label-width="100px" style="margin-top: -32px;" >
+    <el-form :inline="true" label-position="top" label-width="100px" style="margin-top: -32px;">
       <el-form-item :label=labels.enterDate>
         <el-date-picker class="el-time-width"
                         style=""
@@ -68,10 +73,10 @@
     </el-form>
 
     <!-- 排产信息   -->
-    <fieldset class="customer-field" style="margin-top: 0px; width: 612px; padding: 0.125em;" >
-      <legend>{{labels.scheduleInfo}}</legend>
+    <fieldset class="customer-field" style="margin-top: 0px; width: 612px; padding: 0.125em;">
+      <legend>{{ labels.scheduleInfo }}</legend>
       <!--  排产日期  -->
-      <el-form :inline="true" label-position="top" label-width="100px"  style="margin-top: -5px;">
+      <el-form :inline="true" label-position="top" label-width="100px" style="margin-top: -5px;">
         <el-form-item :label=labels.scheduledDate>
           <el-date-picker class="el-time-width"
                           style=""
@@ -80,7 +85,8 @@
           </el-date-picker>
         </el-form-item>
         <el-form-item :label="''" style="margin-top: -10px;">
-          <el-checkbox v-model="pageData.specifiedTime" true-label="Y"  false-label="N" style="margin-top: 28px; margin-right: -20px;" ></el-checkbox>
+          <el-checkbox v-model="pageData.specifiedTime" true-label="Y" false-label="N"
+                       style="margin-top: 28px; margin-right: -20px;"></el-checkbox>
           <el-time-picker
             format="HH:mm"
             arrow-control
@@ -98,8 +104,9 @@
           <el-input v-model="pageData.site" style="width: 85px"></el-input>
         </el-form-item>
         <el-form-item>
-          <span slot="label" style="" @click="getBaseList(88)"><a herf="#">{{labels.resourceId}}</a></span>
-          <el-input v-model="pageData.resourceId" @blur="getCurrentWorkCenterNoByResourceId" style="width: 120px"></el-input>
+          <span slot="label" style="" @click="getBaseList(88)"><a herf="#">{{ labels.resourceId }}</a></span>
+          <el-input v-model="pageData.resourceId" @blur="getCurrentWorkCenterNoByResourceId"
+                    style="width: 120px"></el-input>
         </el-form-item>
         <el-form-item :label=labels.workCenterNo>
           <el-input v-model="pageData.workCenterNo" readonly="readonly" style="width: 120px"></el-input>
@@ -107,7 +114,7 @@
       </el-form>
       <!--  记录示意图  -->
       <fieldset style="margin-left: 380px; margin-top: -88px; width: 180px;">
-        <legend>{{labels.recordDiagram}}</legend>
+        <legend>{{ labels.recordDiagram }}</legend>
         <el-form :inline="true" label-position="top" label-width="100px" class="customer-card">
           <el-form-item :label=labels.closedAndQtyReached>
             <el-card class="customer-el-card customer-el-card-pink"></el-card>
@@ -122,7 +129,7 @@
       </fieldset>
       <!--  等待订单  -->
       <fieldset style="margin-left: 585px; margin-top: -93px; width: 180px; margin-bottom: 5px;">
-        <legend>{{labels.waitOrder}}</legend>
+        <legend>{{ labels.waitOrder }}</legend>
         <el-form :inline="true" label-position="left" label-width="100px" class="customer-border">
           <el-form-item :label=labels.waitTimes>
             <el-input type="number" v-model="pageData.waitTimes"
@@ -130,12 +137,14 @@
             </el-input>
           </el-form-item>
           <el-form-item :label="''" style="text-align: center; margin-top: 15px; margin-bottom: 9px;">
-            <el-button type="primary" :disabled = "authAdd"  @click="addWaitScheduleBun" style="margin-left: 30px; margin-top: 10px; margin-bottom: 15px;">{{buttons.insertWaitOrder}}</el-button>
+            <el-button type="primary" :disabled="authAdd" @click="addWaitScheduleBun"
+                       style="margin-left: 30px; margin-top: 10px; margin-bottom: 15px;">{{ buttons.insertWaitOrder }}
+            </el-button>
           </el-form-item>
         </el-form>
       </fieldset>
 
-    </fieldset >
+    </fieldset>
     <!--  机台班次信息  -->
     <el-main style="margin-left: 770px; margin-top: -215px; width: 452px;">
       <el-table
@@ -155,7 +164,7 @@
           :width="item.columnWidth"
           :label="item.columnLabel">
           <template slot-scope="scope">
-            <span v-if="!item.columnHidden"> {{scope.row[item.columnProp]}}</span>
+            <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>
@@ -165,39 +174,56 @@
 
     <!--  工单主表信息  -->
     <el-main style="margin-left: -20px; margin-top: -35px; width: 104%;">
-      <el-form :inline="true"  label-position="top" label-width="100px">
+      <el-form :inline="true" label-position="top" label-width="100px">
         <el-form-item :label=labels.primaryRecord>
         </el-form-item>
         <el-dropdown trigger="click" class="customer-dropdown" size="small" @command="orderHandleCommand">
-          <el-button type="primary" :disabled = "authEdit" @click="controlPrimaryMenuBun">
-            {{buttons.primaryMenu}}<i class="el-icon-arrow-down el-icon--right"></i>
+          <el-button type="primary" :disabled="authEdit" @click="controlPrimaryMenuBun">
+            {{ buttons.primaryMenu }}<i class="el-icon-arrow-down el-icon--right"></i>
           </el-button>
           <el-dropdown-menu slot="dropdown">
             <el-dropdown-item class="customer-li" command="生产工单"
-                              :disabled="primaryMenuButton.shopOrderFlag">{{buttons.shopOrder}}</el-dropdown-item>
+                              :disabled="primaryMenuButton.shopOrderFlag">{{ buttons.shopOrder }}
+            </el-dropdown-item>
             <el-dropdown-item class="customer-li" command="工作日历"
-                              :disabled="primaryMenuButton.workCalendarOutFlag">{{buttons.workCalendar}}</el-dropdown-item>
-            <hr width="95%" />
+                              :disabled="primaryMenuButton.workCalendarOutFlag">{{ buttons.workCalendar }}
+            </el-dropdown-item>
+            <hr width="95%"/>
             <el-dropdown-item class="customer-li" command="批量维护工作日历"
-                              :disabled="primaryMenuButton.batchWorkCalendarFlag">{{buttons.batchWorkCalendar}}</el-dropdown-item>
-            <hr width="95%" />
+                              :disabled="primaryMenuButton.batchWorkCalendarFlag">{{ buttons.batchWorkCalendar }}
+            </el-dropdown-item>
+            <hr width="95%"/>
             <el-dropdown-item class="customer-li" command="分批排产"
-                              :disabled="primaryMenuButton.splitScheduleFlag">{{buttons.splitScheduleOrder}}</el-dropdown-item>
-            <hr width="95%" />
-            <el-dropdown-item class="customer-li"  command="重新排产"
-                              :disabled="primaryMenuButton.reScheduleOrderFlag">{{buttons.reScheduleOrder}}</el-dropdown-item>
+                              :disabled="primaryMenuButton.splitScheduleFlag">{{ buttons.splitScheduleOrder }}
+            </el-dropdown-item>
+            <hr width="95%"/>
+            <el-dropdown-item class="customer-li" command="重新排产"
+                              :disabled="primaryMenuButton.reScheduleOrderFlag">{{ buttons.reScheduleOrder }}
+            </el-dropdown-item>
             <hr width="95%"/>
-            <el-dropdown-item class="customer-li"  command="更改工艺路线"
-                              :disabled="primaryMenuButton.updateProductRouting">{{buttons.changeRouting}}</el-dropdown-item>
-            <el-dropdown-item class="customer-li"  command="更改工艺路线版本"
-                              :disabled="primaryMenuButton.updateProductRouting">{{buttons.changeRoutingRev}}</el-dropdown-item>
-            <hr width="95%" />
-            <el-dropdown-item class="customer-li"  command="查看物料库存"
-                              :disabled="primaryMenuButton.partStockFlag">{{buttons.viewPartStock}}</el-dropdown-item>
+            <el-dropdown-item class="customer-li" command="更改工艺路线"
+                              :disabled="primaryMenuButton.updateProductRouting">{{ buttons.changeRouting }}
+            </el-dropdown-item>
+            <el-dropdown-item class="customer-li" command="更改工艺路线版本"
+                              :disabled="primaryMenuButton.updateProductRouting">{{ buttons.changeRoutingRev }}
+            </el-dropdown-item>
+            <hr width="95%"/>
+            <el-dropdown-item class="customer-li" command="查看物料库存"
+                              :disabled="primaryMenuButton.partStockFlag">{{ buttons.viewPartStock }}
+            </el-dropdown-item>
           </el-dropdown-menu>
         </el-dropdown>
         <el-button @click="userSetting('5303Order')" type="primary">{{ buttons.settingTable }}</el-button>
-        <el-button v-if="showDefault" @click="saveColumnList('5303Order')" type="primary">{{ buttons.defaultTable }}</el-button>
+        <el-button v-if="showDefault" @click="saveColumnList('5303Order')" type="primary">{{
+            buttons.defaultTable
+          }}
+        </el-button>
+        <el-link style="margin-left: 30px;color: #0000cc" :underline="false">
+          {{ '加工中心: ' + pageData.workCenterNo }}
+        </el-link>
+        <el-link style="margin-left: 10px;color: #0000cc" :underline="false">
+          {{ '总产能需求: ' + sumProductionCapacity }}
+        </el-link>
       </el-form>
       <el-table
         :height="height - 50"
@@ -221,7 +247,7 @@
           :width="item.columnWidth"
           :label="item.columnLabel">
           <template slot-scope="scope">
-            <span v-if="!item.columnHidden"> {{scope.row[item.columnProp]}}</span>
+            <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>
@@ -230,47 +256,59 @@
     </el-main>
     <!--  工单明细表信息  -->
     <el-main style="margin-top: -15px; width: 104%; padding: 0px;">
-      <el-form :inline="true"  label-position="top" label-width="100px">
+      <el-form :inline="true" label-position="top" label-width="100px">
         <el-form-item :label=labels.detailRecord>
         </el-form-item>
         <el-dropdown trigger="click" class="customer-dropdown" size="mini" @command="scheduleHandleCommand">
-          <el-button type="primary" :disabled = "authEdit" @click="controlDetailMenuBun">
-            {{buttons.detailMenu}}<i class="el-icon-arrow-down el-icon--right"></i>
+          <el-button type="primary" :disabled="authEdit" @click="controlDetailMenuBun">
+            {{ buttons.detailMenu }}<i class="el-icon-arrow-down el-icon--right"></i>
           </el-button>
           <el-dropdown-menu slot="dropdown">
             <el-dropdown-item class="customer-li" command="生产工单"
-                              :disabled="detailMenuButton.shopOrderFlag">{{buttons.shopOrder}}</el-dropdown-item>
+                              :disabled="detailMenuButton.shopOrderFlag">{{ buttons.shopOrder }}
+            </el-dropdown-item>
             <el-dropdown-item class="customer-li" command="工作日历"
-                              :disabled="detailMenuButton.workCalendarOutFlag">{{buttons.workCalendar}}</el-dropdown-item>
+                              :disabled="detailMenuButton.workCalendarOutFlag">{{ buttons.workCalendar }}
+            </el-dropdown-item>
             <hr width="95%"/>
             <el-dropdown-item class="customer-li" command="更改等待时间"
-                              :disabled="detailMenuButton.changeWaitTimeFlag">{{buttons.updateWaitTimes}}</el-dropdown-item>
+                              :disabled="detailMenuButton.changeWaitTimeFlag">{{ buttons.updateWaitTimes }}
+            </el-dropdown-item>
             <el-dropdown-item class="customer-li" command="根据工艺路线调整"
-                              :disabled="detailMenuButton.changeScheduleByRoutingFlag">{{buttons.baseRoutingUpdate}}</el-dropdown-item>
+                              :disabled="detailMenuButton.changeScheduleByRoutingFlag">{{ buttons.baseRoutingUpdate }}
+            </el-dropdown-item>
+            <hr width="95%"/>
+            <el-dropdown-item class="customer-li" command="根据工作日历调整"
+                              :disabled="detailMenuButton.changeScheduleByRoutingFlag">{{ buttons.baseCalendarUpdate }}
+            </el-dropdown-item>
             <hr width="95%"/>
-            <el-dropdown-item class="customer-li"  command="根据工作日历调整"
-                              :disabled="detailMenuButton.changeScheduleByRoutingFlag">{{buttons.baseCalendarUpdate}}</el-dropdown-item>
+            <el-dropdown-item class="customer-li" command="查看物料库存"
+                              :disabled="detailMenuButton.partStockFlag">{{ buttons.viewPartStock }}
+            </el-dropdown-item>
             <hr width="95%"/>
-            <el-dropdown-item class="customer-li"  command="查看物料库存"
-                              :disabled="detailMenuButton.partStockFlag">{{buttons.viewPartStock}}</el-dropdown-item>
+<!--            <el-dropdown-item class="customer-li" command="copyShopOrder"-->
+<!--                              :disabled="this.currentSchedlingRow?false:true">{{ '复制派工单' }}-->
+<!--            </el-dropdown-item>-->
+<!--            <el-dropdown-item class="customer-li" command="insertShopOrder"-->
+<!--                              :disabled="this.currentSchedlingRow?false:true">{{ '插入派工单' }}-->
+<!--            </el-dropdown-item>-->
           </el-dropdown-menu>
         </el-dropdown>
         <el-button @click="userSetting('5303Schedule')" type="primary">{{ buttons.settingTable }}</el-button>
-        <el-button v-if="showDefault" @click="saveColumnList('5303Schedule')" type="primary">{{ buttons.defaultTable }}</el-button>
       </el-form>
       <el-table class="schedule-table"
-        :height="height + 50"
-        :data="orderScheduleList"
-        border
-        highlight-current-row
-        ref="scheduleTable"
-        :row-class-name="scheduleRowClassName"
-        :row-style="controlRowStyle"
-        @row-click="setCurrentSchedulingRow"
-        @current-change="currentSchedulingRow"
-        @row-dblclick="warnCancelScheduleConfirm"
-        v-loading="dataListLoading"
-        style="margin-top: -20px; width: 96%;">
+                :height="height + 25"
+                :data="orderScheduleList"
+                border
+                highlight-current-row
+                ref="scheduleTable"
+                :row-class-name="scheduleRowClassName"
+                :row-style="controlRowStyle"
+                @row-click="setCurrentSchedulingRow"
+                @current-change="currentSchedulingRow"
+                @row-dblclick="warnCancelScheduleConfirm"
+                v-loading="dataListLoading"
+                style="margin-top: -20px; width: 96%;">
         <el-table-column
           v-for="(item,index) in columnOrderScheduleArray" :key="index"
           :sortable="item.columnSortable"
@@ -282,7 +320,7 @@
           :width="item.columnWidth"
           :label="item.columnLabel">
           <template slot-scope="scope">
-            <span v-if="!item.columnHidden"> {{scope.row[item.columnProp]}}</span>
+            <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>
@@ -291,7 +329,7 @@
     </el-main>
 
     <!--列表的组件-->
-    <Chooselist ref="baseList"  @getBaseData="getBaseData"></Chooselist>
+    <Chooselist ref="baseList" @getBaseData="getBaseData"></Chooselist>
 
     <!-- 分批排产的组件 -->
     <comSplitSchedule ref="comSplitSchedule" :close-on-click-modal="false"
@@ -302,33 +340,33 @@
 
     <!-- 工作日历外的组件 -->
     <comWorkCalendarOut ref="comWorkCalendarOut" :close-on-click-modal="false"
-                      :visible.sync="showWorkCalendarOut">
+                        :visible.sync="showWorkCalendarOut">
 
     </comWorkCalendarOut>
 
     <!-- 批量工作日历的组件 -->
     <comBatchWorkCalendar ref="comBatchWorkCalendar" :close-on-click-modal="false"
-                    :visible.sync="showBatchWorkCalendar">
+                          :visible.sync="showBatchWorkCalendar">
     </comBatchWorkCalendar>
 
     <!-- 物料库存查询 -->
     <comPartStock ref="comPartStock" :close-on-click-modal="false"
-                          :visible.sync="showPartStockFlag">
+                  :visible.sync="showPartStockFlag">
     </comPartStock>
 
     <!-- 更改等待时间 -->
     <comChangeWaitTime ref="comChangeWaitTime" :close-on-click-modal="false"
-                  :visible.sync="showChangeWaitTime"
+                       :visible.sync="showChangeWaitTime"
                        @changeScheduleWaitTimes="changeScheduleWaitTimes">
     </comChangeWaitTime>
 
     <updateProductRouting ref="updateProductRouting" :close-on-click-modal="false"
                           :visible.sync="updateProductRouting"
-                         >
-      </updateProductRouting>
+    >
+    </updateProductRouting>
 
     <updateRoutingRev ref="updateRoutingRev" :close-on-click-modal="false"
-                          :visible.sync="updateRoutingRev"
+                      :visible.sync="updateRoutingRev"
                       @updateRoutingRevClosed="updateRoutingRevClosed"
     >
     </updateRoutingRev>
@@ -339,25 +377,25 @@
 </template>
 
 <script>
-  import updateProductRouting from "../common/updateProductRouting";
-  import Chooselist from '@/views/modules/common/Chooselist';/*列表组件*/
-  import comSplitSchedule from '@/views/modules/schedule/com_split_schedule';/*分批排产的modal*/
-  import comWorkCalendarOut from "../common/com_work_calendar_out";/*工作日历外组件*/
-  import comBatchWorkCalendar from "../common/com_batch_work_calendar";/*批量维护工作日历外组件*/
-  import comPartStock from "../common/com_part_stock";/*展示物料库存的组件*/
-  import comChangeWaitTime from "./com_change_wait_time";/*修改等待派工单的等待时间*/
-  import column from '@/views/modules/common/column';/*动态表头*/
-
-  /*动态表头*/
-  import {
-    saveTableDefaultList,
-    getTableDefaultListLanguage,
-    getTableUserListLanguage,
-    removerDefault,
-    removerUser
-  } from "@/api/table.js";
-
-  import updateRoutingRev from "../common/updateRoutingRev";
+import updateProductRouting from "../common/updateProductRouting";
+import Chooselist from '@/views/modules/common/Chooselist';/*列表组件*/
+import comSplitSchedule from '@/views/modules/schedule/com_split_schedule';/*分批排产的modal*/
+import comWorkCalendarOut from "../common/com_work_calendar_out";/*工作日历外组件*/
+import comBatchWorkCalendar from "../common/com_batch_work_calendar";/*批量维护工作日历外组件*/
+import comPartStock from "../common/com_part_stock";/*展示物料库存的组件*/
+import comChangeWaitTime from "./com_change_wait_time";/*修改等待派工单的等待时间*/
+import column from '@/views/modules/common/column';/*动态表头*/
+
+/*动态表头*/
+import {
+  saveTableDefaultList,
+  getTableDefaultListLanguage,
+  getTableUserListLanguage,
+  removerDefault,
+  removerUser
+} from "@/api/table.js";
+
+import updateRoutingRev from "../common/updateRoutingRev";
 import {
   getResourceRestList,
   getShopOrderList,
@@ -372,26 +410,28 @@ import {
   updateScheduleWaitTimes,
   refreshScheduleByRouting,
   refreshScheduleByCalendar,
+  sumProductionCapacity
 } from '@/api/schedule/order_schedule.js'
 
-  import {
-    searchSysLanguagePackList,
-    searchSysLanguageParam,
-    searchFunctionButtonList,
-    saveButtonList,
-    searchSysLanguage,
-    searchLanguageListByLanguageCode,
-    saveSysLanguageOne,
-    searchPageLanguageData,
-    removerLanguage,
-    saveSysLanguageList
-  } from "@/api/sysLanguage.js";
-
-  var functionId = '104002001';
+import {
+  searchSysLanguagePackList,
+  searchSysLanguageParam,
+  searchFunctionButtonList,
+  saveButtonList,
+  searchSysLanguage,
+  searchLanguageListByLanguageCode,
+  saveSysLanguageOne,
+  searchPageLanguageData,
+  removerLanguage,
+  saveSysLanguageList
+} from "@/api/sysLanguage.js";
+
+var functionId = '104002001';
 
 export default {
   data() {
     return {
+      sumProductionCapacity: 0,
       height: 200,
       authEdit: false,
       authAdd: false,
@@ -400,11 +440,11 @@ export default {
       tagNo: '',
       showDefault: false,
       visible: false,
-      updateProductRouting:false,
+      updateProductRouting: false,
       showWorkCalendarOut: false,
       showBatchWorkCalendar: false,
       showSplitScheduleFlag: false,
-      updateRoutingRev:false,
+      updateRoutingRev: false,
       showPartStockFlag: false,
       showChangeWaitTime: false,
       scheduleIndex: -1,
@@ -413,6 +453,8 @@ export default {
       currentRoutingRow: {},
       currentSchedlingRow: {},
       selectList: [],
+      copyShopOrder: {},
+      insertShopOrder: {},
       pageData: {
         site: this.$store.state.user.site,
         username: this.$store.state.user.name,
@@ -1871,7 +1913,7 @@ export default {
       ],
       calendarOutList: [],
       primaryMenuButton: {
-        updateProductRouting:true,
+        updateProductRouting: true,
         shopOrderFlag: true,
         workCalendarOutFlag: true,
         batchWorkCalendarFlag: true,
@@ -1887,7 +1929,7 @@ export default {
         changeScheduleByCalendarFlag: true,
         partStockFlag: true,
       },
-      queryTable:{
+      queryTable: {
         userId: this.$store.state.user.name,
         functionId: this.$route.meta.menuId,
         tableId: "5303Order",
@@ -1974,7 +2016,7 @@ export default {
           objectId: 'workCalendar',
           objectType: 'button',
           tableId: '*'
-        },  {
+        }, {
           functionId: functionId,
           languageValue: '批量维护工作日历',
           objectId: 'batchWorkCalendar',
@@ -2186,7 +2228,7 @@ export default {
           objectId: 'closedAndQtyNotReached',
           objectType: 'label',
           tableId: '*'
-        },  {
+        }, {
           functionId: functionId,
           languageValue: '未关闭,未达数量',
           objectId: 'notClosedAndQtyNotReached',
@@ -2322,8 +2364,8 @@ export default {
     getResourceShiftData() {
       let queryData = {
         site: this.$store.state.user.site,
-        workCenterNo: this.pageData.workCenterNo,
-        resourceId: this.pageData.resourceId,
+        workCenterNo: this.pageData.workCenterNo.trim(),
+        resourceId: this.pageData.resourceId.trim(),
         scheduleDate: this.pageData.scheduleDate
       }
       getResourceRestList(queryData).then(({data}) => {
@@ -2341,7 +2383,14 @@ export default {
         this.currentRoutingRow = null;
       })
     },
-
+    // 加工中心产能汇总
+    getSumProductionCapacity() {
+      sumProductionCapacity(this.pageData).then(({data}) => {
+        if (data && data.code == 0) {
+          this.sumProductionCapacity = data.data.toFixed(2)
+        }
+      })
+    },
     /*获取派工单的信息*/
     getOrderScheduleList() {
       getOrderScheduleList(this.pageData).then(({data}) => {
@@ -2349,53 +2398,54 @@ export default {
         //清空已经选好的行数据
         this.currentSchedlingRow = null;
         //判断是否需要选中当前行
-        if(this.scheduleIndex >= 0){
+        if (this.scheduleIndex >= 0) {
           //选中当前是的行
-          setTimeout(() =>{
+          setTimeout(() => {
             this.$refs.scheduleTable.setCurrentRow(this.orderScheduleList[this.scheduleIndex]);
-          },300);
+          }, 300);
         }
       })
     },
 
     /*刷新页面table*/
-    refreshPageTables(){
+    refreshPageTables() {
       this.getResourceShiftData();
       this.getShopOrderList();
       this.getOrderScheduleList();
+      this.getSumProductionCapacity()
     },
 
-     /*列表方法的回调*/
-    getBaseData(val){
-      if (this.tagNo === 88){
+    /*列表方法的回调*/
+    getBaseData(val) {
+      if (this.tagNo === 88) {
         this.pageData.resourceId = val.ResourceID;
         //调用方法获取加工中心
         this.getCurrentWorkCenterNoByResourceId();
-      }else if(this.tagNo == 24){
+      } else if (this.tagNo == 24) {
         this.pageData.workCenterNo = val.WorkCenterNo;
       }
     },
 
     // 获取基础数据列表
-    getBaseList(val){
+    getBaseList(val) {
       this.tagNo = val
       this.$nextTick(() => {
         let strVal = "";
-        if (val === 88){
+        if (val === 88) {
           strVal = this.pageData.resourceId;
-        }else if(val === 24){
+        } else if (val === 24) {
           strVal = this.pageData.workCenterNo;
         }
-        this.$refs.baseList.init(val,strVal, " AND WorkCenterNo <> 'FQC'");
+        this.$refs.baseList.init(val, strVal, " AND WorkCenterNo <> 'FQC'");
       })
     },
 
     /*区分不同的菜单  调用不同的方法  调用不同的方法*/
-    orderHandleCommand(menuName){
+    orderHandleCommand(menuName) {
       //区分是哪一个方法调用
-      if('生产工单' === menuName){
+      if ('生产工单' === menuName) {
         //判断是否选择好了工单
-        if(this.currentRoutingRow == null || this.currentRoutingRow == {}){
+        if (this.currentRoutingRow == null || this.currentRoutingRow == {}) {
           //重置按钮
           this.primaryMenuButton.shopOrderFlag = true;
           //返回错误
@@ -2410,42 +2460,46 @@ export default {
             user: this.$store.state.user.name
           }
         })
-      }else if('工作日历' === menuName){
+      } else if ('工作日历' === menuName) {
         //判断是否选择好了工单
-        if(this.currentRoutingRow == null || this.currentRoutingRow == {}){
+        if (this.currentRoutingRow == null || this.currentRoutingRow == {}) {
           //重置按钮
           this.primaryMenuButton.workCalendarOutFlag = true;
           //返回错误
           //this.$message.error('请选择工单!');
           //return false;
         }
-        let tempData = {'site': this.pageData.site, 'calendarId': this.pageData.calendarId,
-          'calendarDesc': this.pageData.calendarDesc, 'scheduledDate': this.pageData.scheduleDate};
+        let tempData = {
+          'site': this.pageData.site, 'calendarId': this.pageData.calendarId,
+          'calendarDesc': this.pageData.calendarDesc, 'scheduledDate': this.pageData.scheduleDate
+        };
         //打开组件  需要的数据 展示需要的数据
         this.$nextTick(() => {
           this.showWorkCalendarOut = true;
           this.$refs.comWorkCalendarOut.init(tempData);
         })
 
-      }else if('批量维护工作日历' === menuName){
+      } else if ('批量维护工作日历' === menuName) {
         //判断是否选择好了工单
-        if(this.currentRoutingRow == null || this.currentRoutingRow == {}){
+        if (this.currentRoutingRow == null || this.currentRoutingRow == {}) {
           //重置按钮
           this.primaryMenuButton.workCalendarOutFlag = true;
           //返回错误
           //this.$message.error('请选择工单!');
           //return false;
         }
-        let tempData = {'site': this.pageData.site, 'calendarId': this.pageData.calendarId,
-          'calendarDesc': this.pageData.calendarDesc, 'scheduledDate': this.pageData.scheduleDate};
+        let tempData = {
+          'site': this.pageData.site, 'calendarId': this.pageData.calendarId,
+          'calendarDesc': this.pageData.calendarDesc, 'scheduledDate': this.pageData.scheduleDate
+        };
         //打开组件  需要的数据 展示需要的数据
         this.$nextTick(() => {
           this.showBatchWorkCalendar = true;
           this.$refs.comBatchWorkCalendar.init(tempData);
         })
-      }else if('分批排产' === menuName){
+      } else if ('分批排产' === menuName) {
         //判断是否选择好了工单
-        if(this.currentRoutingRow == null || this.currentRoutingRow == {}){
+        if (this.currentRoutingRow == null || this.currentRoutingRow == {}) {
           //重置按钮
           this.primaryMenuButton.workCalendarOutFlag = true;
           //返回错误
@@ -2453,9 +2507,9 @@ export default {
           return false;
         }
         this.openSplitScheduleModal();
-      }else if('重新排产' === menuName){
+      } else if ('重新排产' === menuName) {
         //判断是否选择好了工单
-        if(this.currentRoutingRow == null || this.currentRoutingRow == {}){
+        if (this.currentRoutingRow == null || this.currentRoutingRow == {}) {
           //重置按钮
           this.primaryMenuButton.workCalendarOutFlag = true;
           //返回错误
@@ -2463,10 +2517,10 @@ export default {
           //return false;
         }
         //调用提示的方法
-       this.warnReScheduleConfirm();
-      }else if('查看物料库存' === menuName){
+        this.warnReScheduleConfirm();
+      } else if ('查看物料库存' === menuName) {
         //判断是否选择好了工单
-        if(this.currentRoutingRow == null || this.currentRoutingRow == {}){
+        if (this.currentRoutingRow == null || this.currentRoutingRow == {}) {
           //重置按钮
           this.primaryMenuButton.partStockFlag = true;
           //返回错误
@@ -2479,7 +2533,7 @@ export default {
           this.showPartStockFlag = true;
           this.$refs.comPartStock.init(tempData);
         })
-      }else if('更改工艺路线' === menuName) {
+      } else if ('更改工艺路线' === menuName) {
         //判断是否选择好了工单
         if (this.currentRoutingRow == null || this.currentRoutingRow == {}) {
           //重置按钮
@@ -2488,13 +2542,18 @@ export default {
           this.$message.error(this.labels.pleaseSelectOrder);
           return false;
         }
-        let tempData = {'site': this.pageData.site, 'orderNo': this.currentRoutingRow.orderNo,'partNo': this.currentRoutingRow.partNo,'partDesc': this.currentRoutingRow.partDesc};
+        let tempData = {
+          'site': this.pageData.site,
+          'orderNo': this.currentRoutingRow.orderNo,
+          'partNo': this.currentRoutingRow.partNo,
+          'partDesc': this.currentRoutingRow.partDesc
+        };
         //打开组件  需要的数据 展示需要的数据
         this.$nextTick(() => {
           this.updateProductRouting = true;
           this.$refs.updateProductRouting.init(tempData);
         })
-      }else if('更改工艺路线版本' === menuName) {
+      } else if ('更改工艺路线版本' === menuName) {
         //判断是否选择好了工单
         if (this.currentRoutingRow == null || this.currentRoutingRow == {}) {
           //重置按钮
@@ -2503,7 +2562,11 @@ export default {
           this.$message.error(this.labels.pleaseSelectOrder);
           return false;
         }
-        let tempData = {'site': this.pageData.site, 'orderNo': this.currentRoutingRow.orderNo,'partNo': this.currentRoutingRow.partNo};
+        let tempData = {
+          'site': this.pageData.site,
+          'orderNo': this.currentRoutingRow.orderNo,
+          'partNo': this.currentRoutingRow.partNo
+        };
         //打开组件  需要的数据 展示需要的数据
         this.$nextTick(() => {
           this.updateRoutingRev = true;
@@ -2513,11 +2576,11 @@ export default {
     },
 
     /*区分不同的菜单  调用不同的方法  调用不同的方法*/
-    scheduleHandleCommand(menuName){
+    scheduleHandleCommand(menuName) {
       //区分是哪一个方法调用
-      if('生产工单' === menuName){
+      if ('生产工单' === menuName) {
         //判断是否选择好了工单
-        if(this.currentSchedlingRow == null || this.currentSchedlingRow == {}){
+        if (this.currentSchedlingRow == null || this.currentSchedlingRow == {}) {
           //重置按钮
           this.detailMenuButton.shopOrderFlag = true;
           //返回错误
@@ -2532,26 +2595,28 @@ export default {
             order: this.currentSchedlingRow.orderNo,
           }
         })
-      }else if('工作日历' === menuName){
+      } else if ('工作日历' === menuName) {
         //判断是否选择好了工单
-        if(this.currentSchedlingRow == null || this.currentSchedlingRow == {}){
+        if (this.currentSchedlingRow == null || this.currentSchedlingRow == {}) {
           //重置按钮
           this.detailMenuButton.workCalendarOutFlag = true;
           //返回错误
           this.$message.error(this.labels.pleaseSelectSchedule);
           return false;
         }
-        let tempData = {'site': this.pageData.site, 'calendarId': this.pageData.calendarId,
-          'calendarDesc': this.pageData.calendarDesc, 'scheduledDate': this.pageData.scheduleDate};
+        let tempData = {
+          'site': this.pageData.site, 'calendarId': this.pageData.calendarId,
+          'calendarDesc': this.pageData.calendarDesc, 'scheduledDate': this.pageData.scheduleDate
+        };
         //打开组件  需要的数据 展示需要的数据
         this.$nextTick(() => {
           this.showWorkCalendarOut = true;
           this.$refs.comWorkCalendarOut.init(tempData);
         })
 
-      }else if('更改等待时间' === menuName){
+      } else if ('更改等待时间' === menuName) {
         //判断是否选择好了工单
-        if(this.currentSchedlingRow == null || this.currentSchedlingRow == {}){
+        if (this.currentSchedlingRow == null || this.currentSchedlingRow == {}) {
           //重置按钮
           this.detailMenuButton.changeWaitTimeFlag = true;
           //返回错误
@@ -2561,17 +2626,19 @@ export default {
         let waitTimes = parseFloat(this.currentSchedlingRow.timeRequired) * 60;
         //等待时间取整
         waitTimes = parseInt(waitTimes);
-        let tempData = {'site': this.pageData.site, 'orderNo': this.currentSchedlingRow.orderNo,
+        let tempData = {
+          'site': this.pageData.site, 'orderNo': this.currentSchedlingRow.orderNo,
           'itemNo': this.currentSchedlingRow.itemNo, 'seqNo': this.currentSchedlingRow.seqNo,
-          'waitTimes': waitTimes};
+          'waitTimes': waitTimes
+        };
         //打开组件  需要的数据 展示需要的数据
         this.$nextTick(() => {
           this.showChangeWaitTime = true;
           this.$refs.comChangeWaitTime.init(tempData);
         })
-      }else if('根据工艺路线调整' === menuName){
+      } else if ('根据工艺路线调整' === menuName) {
         //判断是否选择好了工单
-        if(this.currentSchedlingRow == null || this.currentSchedlingRow == {}){
+        if (this.currentSchedlingRow == null || this.currentSchedlingRow == {}) {
           //重置按钮
           this.detailMenuButton.changeScheduleByRoutingFlag = true;
           //返回错误
@@ -2579,9 +2646,9 @@ export default {
           return false;
         }
         this.changeScheduleByRouting(this.currentSchedlingRow);
-      }else if('根据工作日历调整' === menuName){
+      } else if ('根据工作日历调整' === menuName) {
         //判断是否选择好了工单
-        if(this.currentSchedlingRow == null || this.currentSchedlingRow == {}){
+        if (this.currentSchedlingRow == null || this.currentSchedlingRow == {}) {
           //重置按钮
           this.detailMenuButton.changeScheduleByCalendarFlag = true;
           //返回错误
@@ -2590,9 +2657,9 @@ export default {
         }
         //调用提示的方法
         this.warnChangeScheduleByCalendar(this.currentSchedlingRow);
-      }else if('查看物料库存' === menuName){
+      } else if ('查看物料库存' === menuName) {
         //判断是否选择好了工单
-        if(this.currentSchedlingRow == null || this.currentSchedlingRow == {}){
+        if (this.currentSchedlingRow == null || this.currentSchedlingRow == {}) {
           //重置按钮
           this.detailMenuButton.partStockFlag = true;
           //返回错误
@@ -2605,14 +2672,34 @@ export default {
           this.showPartStockFlag = true;
           this.$refs.comPartStock.init(tempData);
         })
+      }else if(menuName == 'copyShopOrder'){
+        // 复制订单
+        this.copyShopOrder = JSON.parse(JSON.stringify(this.currentSchedlingRow))
+      }else if(menuName == 'insertShopOrder'){
+        // 插入订单
+        this.insertShopOrder = JSON.parse(JSON.stringify(this.currentSchedlingRow))
       }
     },
+    // 复制订单操作
+    copyShopOrder(){
 
+    },
+    // 插入订单操作
+    insertShopOrder(){
+       if (!this.copyShopOrder){
+         this.$message.warning('请复制派工单,再执行插入派工单操作!')
+         return;
+       }
+      if (this.copyShopOrder){
+        this.$message.warning('请复制派工单,再执行插入派工单操作!')
+        return;
+      }
+    },
     /*打开分批排产*/
-    openSplitScheduleModal(){
+    openSplitScheduleModal() {
       let routingRow = this.currentRoutingRow;
       //首先判断是否选好
-      if(null == routingRow){
+      if (null == routingRow) {
         this.$message.error(this.labels.pleaseSelectSchedule)
         return false;
       }
@@ -2623,12 +2710,12 @@ export default {
     },
 
     /*获取当前的机台对应的加工中心*/
-    getCurrentWorkCenterNoByResourceId(){
+    getCurrentWorkCenterNoByResourceId() {
       getCurrentWorkCenterNoByResourceId(this.pageData).then(({data}) => {
         //区分是否成功
         if (data.code == 500) {
           //this.$message.error(data.msg);
-        } else{
+        } else {
           this.pageData.workCenterNo = data.workCenterNo;
         }
         this.pageData.workCenterNo = data.workCenterNo;
@@ -2636,23 +2723,22 @@ export default {
     },
 
     /*设置当前行的下标*/
-    routingRowClassName({row, rowIndex}){
+    routingRowClassName({row, rowIndex}) {
       row.index = rowIndex;
       //判断当前行颜色参数
-      if(row.qtyScheduled  > 0){
+      if (row.qtyScheduled > 0) {
         return 'customer-row-gray';
       }
     },
 
 
-
     /*设置工艺的行*/
     setCurrentRoutingRow(row, column, event) {
       this.currentRoutingRow = row;
     },
 
     /*设置当前派工单行的下标*/
-    scheduleRowClassName({row, rowIndex}){
+    scheduleRowClassName({row, rowIndex}) {
       row.index = rowIndex;
     },
 
@@ -2664,9 +2750,9 @@ export default {
     },
 
     /*当前值发生变化的时候修改*/
-    currentSchedulingRow(row, oldRow){
+    currentSchedulingRow(row, oldRow) {
       //判断是否是获取焦点的事件
-      if(row){
+      if (row) {
         this.currentSchedlingRow = JSON.parse(JSON.stringify(row));
         //设置当前的序号
         this.scheduleIndex = row.index;
@@ -2674,59 +2760,59 @@ export default {
     },
 
     /*开始排产的操作*/
-    startScheduleOperation(row, $event, column){
+    startScheduleOperation(row, $event, column) {
       //判断排产的加工中心和机台是否为空
-      if(this.pageData.workCenterNo == null || '' == this.pageData.workCenterNo){
+      if (this.pageData.workCenterNo == null || '' == this.pageData.workCenterNo) {
         this.$message.error(this.labels.workCenterNoCantBeNull)
         return false;
       }
-      if(this.pageData.resourceId == null || '' == this.pageData.resourceId){
+      if (this.pageData.resourceId == null || '' == this.pageData.resourceId) {
         this.$message.error(this.labels.resourceIdCantBeNull)
         return false;
       }
       //赋值排产的数量
       let scheduledQty = row.qtyToSchedule;
       row.qtyScheduled = scheduledQty;
-      row.qtyToSchedule = parseFloat(row.qtyToSchedule) -  parseFloat(row.qtyScheduled);
+      row.qtyToSchedule = parseFloat(row.qtyToSchedule) - parseFloat(row.qtyScheduled);
       this.pageData.scheduledQty = scheduledQty;
       //设置工单和工序
       this.pageData.orderNo = row.orderNo;
       this.pageData.itemNo = row.itemNo;
       //执行排产的方法
-     this.scheduleWorkOrderOperation(scheduledQty);
+      this.scheduleWorkOrderOperation(scheduledQty);
     },
 
     /*分批排产*/
-    initAddSplitSchedule(scheduledQty){
+    initAddSplitSchedule(scheduledQty) {
       //设置工单和工序
       this.pageData.orderNo = this.currentRoutingRow.orderNo;
       this.pageData.itemNo = this.currentRoutingRow.itemNo;
       //判断排产的加工中心和机台是否为空
-      if(this.pageData.workCenterNo == null || '' == this.pageData.workCenterNo){
+      if (this.pageData.workCenterNo == null || '' == this.pageData.workCenterNo) {
         this.$message.error(this.labels.workCenterNoCantBeNull)
         return false;
       }
-      if(this.pageData.resourceId == null || '' == this.pageData.resourceId){
+      if (this.pageData.resourceId == null || '' == this.pageData.resourceId) {
         this.$message.error(this.labels.resourceIdCantBeNull)
         return false;
       }
-      this.currentRoutingRow.qtyScheduled =  parseFloat(this.currentRoutingRow.qtyScheduled) + parseFloat(scheduledQty);
-      this.currentRoutingRow.qtyToSchedule =  parseFloat(this.currentRoutingRow.qtyToSchedule) -  parseFloat(scheduledQty);
+      this.currentRoutingRow.qtyScheduled = parseFloat(this.currentRoutingRow.qtyScheduled) + parseFloat(scheduledQty);
+      this.currentRoutingRow.qtyToSchedule = parseFloat(this.currentRoutingRow.qtyToSchedule) - parseFloat(scheduledQty);
       //执行排产的方法
       this.scheduleWorkOrderOperation(scheduledQty);
     },
 
     /*排产生产工单*/
-    scheduleWorkOrderOperation(scheduledQty){
+    scheduleWorkOrderOperation(scheduledQty) {
       //重置请求的参数
       this.pageData.scheduledQty = scheduledQty;
       scheduleWorkOrder(this.pageData).then(({data}) => {
-        if(data.code == 500){
-          this.currentRoutingRow.qtyScheduled =  parseFloat(this.currentRoutingRow.qtyScheduled) - parseFloat(scheduledQty);
-          this.currentRoutingRow.qtyToSchedule =  parseFloat(this.currentRoutingRow.qtyToSchedule) +  parseFloat(scheduledQty);
+        if (data.code == 500) {
+          this.currentRoutingRow.qtyScheduled = parseFloat(this.currentRoutingRow.qtyScheduled) - parseFloat(scheduledQty);
+          this.currentRoutingRow.qtyToSchedule = parseFloat(this.currentRoutingRow.qtyToSchedule) + parseFloat(scheduledQty);
           this.$message.error(data.msg);
           this.pageData.scheduledQty = 0;
-        }else{
+        } else {
           this.$message.success(data.msg);
           //刷新明细的报工页面
           this.getOrderScheduleList();
@@ -2735,20 +2821,20 @@ export default {
     },
 
     /*提示取消派工单*/
-    warnCancelScheduleConfirm(row, $event, column){
+    warnCancelScheduleConfirm(row, $event, column) {
       //提示操作
       this.$confirm(this.labels.sureCancelSchedule, '提示', {
         confirmButtonText: this.labels.confirmLabel,
         celButtonText: this.labels.cancelLabel,
         type: 'warning'
-      }).then(() =>{
+      }).then(() => {
         //执行创建新卷的操作
         this.cancelScheduleBun(row);
       });
     },
 
     /*取消派工单的操作*/
-    cancelScheduleBun(scheduleRow){
+    cancelScheduleBun(scheduleRow) {
       //设置参数
       this.pageData.orderNo = scheduleRow.orderNo;
       this.pageData.itemNo = scheduleRow.itemNo;
@@ -2760,9 +2846,9 @@ export default {
       this.pageData.planStartTime = scheduleRow.planStartTime;
       //取消排产
       cancelSoSchedule(this.pageData).then(({data}) => {
-        if(data.code == 500){
+        if (data.code == 500) {
           this.$message.error(data.msg);
-        }else{
+        } else {
           this.$message.success(data.msg);
           //刷新排产的数据
           this.getShopOrderList();
@@ -2773,20 +2859,20 @@ export default {
     },
 
     /*分批排产*/
-    addWaitScheduleBun(){
+    addWaitScheduleBun() {
       //重置请求的参数
-     let waitTimes = this.pageData.waitTimes;
-     if(waitTimes <= 0){
-       this.$message.error(this.labels.waitTimeMustMoreTanZero)
-       return false;
-     }
+      let waitTimes = this.pageData.waitTimes;
+      if (waitTimes <= 0) {
+        this.$message.error(this.labels.waitTimeMustMoreTanZero)
+        return false;
+      }
       //发送请求
       //判断排产的加工中心和机台是否为空
-      if(this.pageData.workCenterNo == null || '' == this.pageData.workCenterNo){
+      if (this.pageData.workCenterNo == null || '' == this.pageData.workCenterNo) {
         this.$message.error(this.labels.workCenterNoCantBeNull)
         return false;
       }
-      if(this.pageData.resourceId == null || '' == this.pageData.resourceId){
+      if (this.pageData.resourceId == null || '' == this.pageData.resourceId) {
         this.$message.error(this.labels.resourceIdCantBeNull)
         return false;
       }
@@ -2795,11 +2881,11 @@ export default {
     },
 
     /*插入等待的派工单信息*/
-    addWaitScheduleOperation(){
+    addWaitScheduleOperation() {
       addWaitSchedule(this.pageData).then(({data}) => {
-        if(data.code == 500){
+        if (data.code == 500) {
           this.$message.error(data.msg);
-        }else{
+        } else {
           this.$message.success(data.msg);
           //刷新明细
           this.getOrderScheduleList();
@@ -2808,14 +2894,14 @@ export default {
     },
 
     /*提示取消派工单*/
-    warnReScheduleConfirm(){
+    warnReScheduleConfirm() {
       //判断加工中心和机台
       //判断排产的加工中心和机台是否为空
-      if(this.pageData.workCenterNo == null || '' == this.pageData.workCenterNo){
+      if (this.pageData.workCenterNo == null || '' == this.pageData.workCenterNo) {
         this.$message.error(this.labels.workCenterNoCantBeNull)
         return false;
       }
-      if(this.pageData.resourceId == null || '' == this.pageData.resourceId){
+      if (this.pageData.resourceId == null || '' == this.pageData.resourceId) {
         this.$message.error(this.labels.resourceIdCantBeNull)
         return false;
       }
@@ -2824,18 +2910,18 @@ export default {
         confirmButtonText: this.labels.confirmLabel,
         celButtonText: this.labels.cancelLabel,
         type: 'warning'
-      }).then(() =>{
+      }).then(() => {
         //执行创建新卷的操作
         this.initReScheduleWorkOrders();
       });
     },
 
     /*重新排产的方法*/
-    initReScheduleWorkOrders(){
+    initReScheduleWorkOrders() {
       reScheduleWorkOrders(this.pageData).then(({data}) => {
-        if(data.code != 200){
+        if (data.code != 200) {
           this.$message.error(data.msg);
-        }else{
+        } else {
           this.$message.success(data.msg);
           //刷新明细的报工页面
           this.getOrderScheduleList();
@@ -2844,28 +2930,30 @@ export default {
     },
 
     /*上移派工单*/
-    moveUpScheduleBun(){
+    moveUpScheduleBun() {
       //判断是否选择好了移动的行
       let scheduleRow = this.currentSchedlingRow;
-      if(null == scheduleRow || scheduleRow == ''){
+      if (null == scheduleRow || scheduleRow == '') {
         this.$message.error(this.labels.pleaseSelectSchedule);
         return false;
       }
       //判断是否是第一行
-      if(scheduleRow.index == 0){
+      if (scheduleRow.index == 0) {
         this.$message.error(this.labels.thisIsFirstRowCantMoveUp);
         return false;
       }
       //请求的参数
-      let requestData = {'site': this.pageData.site,
-                         'workCenterNo': this.pageData.workCenterNo,
-                         'resourceId': this.pageData.resourceId,
-                         'scheduleSeqNo': scheduleRow.scheduledSeqNo};
+      let requestData = {
+        'site': this.pageData.site,
+        'workCenterNo': this.pageData.workCenterNo.trim(),
+        'resourceId': this.pageData.resourceId.trim(),
+        'scheduleSeqNo': scheduleRow.scheduledSeqNo
+      };
       //请求处理当前的参数
       moveUpSchedule(requestData).then(({data}) => {
-        if(data.code != 200){
+        if (data.code != 200) {
           this.$message.error(data.msg);
-        }else{
+        } else {
           this.$message.success(data.msg);
           //重置当前行
           this.scheduleIndex = this.scheduleIndex - 1;
@@ -2876,29 +2964,31 @@ export default {
     },
 
     /*上移派工单*/
-    moveDownScheduleBun(){
+    moveDownScheduleBun() {
       //判断是否选择好了移动的行
       let scheduleRow = this.currentSchedlingRow;
-      if(null == scheduleRow || scheduleRow == ''){
+      if (null == scheduleRow || scheduleRow == '') {
         this.$message.error(this.labels.pleaseSelectSchedule);
         return false;
       }
       let countNums = this.orderScheduleList.length;
       //判断是否是第一行
-      if(scheduleRow.index == countNums - 1){
+      if (scheduleRow.index == countNums - 1) {
         this.$message.error(this.labels.thisIsEndRowCantMoveDown);
         return false;
       }
       //请求的参数
-      let requestData = {'site': this.pageData.site,
-        'workCenterNo': this.pageData.workCenterNo,
-        'resourceId': this.pageData.resourceId,
-        'scheduleSeqNo': scheduleRow.scheduledSeqNo};
+      let requestData = {
+        'site': this.pageData.site,
+        'workCenterNo': this.pageData.workCenterNo.trim(),
+        'resourceId': this.pageData.resourceId.trim(),
+        'scheduleSeqNo': scheduleRow.scheduledSeqNo
+      };
       //请求处理当前的参数
       moveDownSchedule(requestData).then(({data}) => {
-        if(data.code != 200){
+        if (data.code != 200) {
           this.$message.error(data.msg);
-        }else{
+        } else {
           this.$message.success(data.msg);
           //重置当前行
           this.scheduleIndex = this.scheduleIndex + 1;
@@ -2909,21 +2999,21 @@ export default {
     },
 
     /*判断主菜单的样式*/
-    controlPrimaryMenuBun(){
+    controlPrimaryMenuBun() {
       //没有选择行 所有的按钮都是灰色
-      if(this.currentRoutingRow == null || this.currentRoutingRow == {}){
+      if (this.currentRoutingRow == null || this.currentRoutingRow == {}) {
         this.primaryMenuButton.shopOrderFlag = true;
         this.primaryMenuButton.workCalendarOutFlag = false;
         this.primaryMenuButton.batchWorkCalendarFlag = false;
         this.primaryMenuButton.splitScheduleFlag = true;
         this.primaryMenuButton.reScheduleOrderFlag = false;
         this.primaryMenuButton.partStockFlag = true;
-        this.primaryMenuButton.updateProductRouting=true;
-      }else{
+        this.primaryMenuButton.updateProductRouting = true;
+      } else {
         // 判断是否具有该页面权限
         let menList = JSON.parse(sessionStorage.getItem('dynamicMenuRoutes') || '[]')
           .filter(item => item.path == 'shopOrder-shopOrder/shopOrder')
-        if (menList.length>0){
+        if (menList.length > 0) {
           this.primaryMenuButton.shopOrderFlag = false;
         }
         this.primaryMenuButton.workCalendarOutFlag = false;
@@ -2931,56 +3021,58 @@ export default {
         this.primaryMenuButton.splitScheduleFlag = false;
         this.primaryMenuButton.reScheduleOrderFlag = false;
         this.primaryMenuButton.partStockFlag = false;
-        this.primaryMenuButton.updateProductRouting=false;
+        this.primaryMenuButton.updateProductRouting = false;
       }
     },
 
     /*控制明细菜单是否显示*/
-    controlDetailMenuBun(){
+    controlDetailMenuBun() {
       //没有选择行 所有的按钮都是灰色
-      if(this.currentSchedlingRow == null || this.currentSchedlingRow == {}){
+      if (this.currentSchedlingRow == null || this.currentSchedlingRow == {}) {
         this.detailMenuButton.shopOrderFlag = true;
         this.detailMenuButton.workCalendarOutFlag = true;
         this.detailMenuButton.changeWaitTimeFlag = true;
         this.detailMenuButton.changeScheduleByRoutingFlag = true;
         this.detailMenuButton.changeScheduleByCalendarFlag = true;
         this.detailMenuButton.partStockFlag = true;
-      }else{
+      } else {
         // 判断是否具有该页面权限
         let menList = JSON.parse(sessionStorage.getItem('dynamicMenuRoutes') || '[]')
           .filter(item => item.path == 'shopOrder-shopOrder/shopOrder')
         //如果存在权限
-        if (menList.length > 0){
+        if (menList.length > 0) {
           this.detailMenuButton.shopOrderFlag = false;
         }
         this.detailMenuButton.workCalendarOutFlag = false;
         //需要判断是否是等待工单(只有等待工单才可以修改时间)
-        if(this.currentSchedlingRow.orderNo === '9999'){
+        if (this.currentSchedlingRow.orderNo === '9999') {
           this.detailMenuButton.changeWaitTimeFlag = false;
-        }else{
+        } else {
           this.detailMenuButton.changeWaitTimeFlag = true;
         }
         this.detailMenuButton.changeScheduleByRoutingFlag = false;
         this.detailMenuButton.changeScheduleByCalendarFlag = false;
         //等待订单无法查询物料库存
-        if(this.currentSchedlingRow.orderNo === '9999'){
+        if (this.currentSchedlingRow.orderNo === '9999') {
           this.detailMenuButton.partStockFlag = true;
-        }else{
+        } else {
           this.detailMenuButton.partStockFlag = false;
         }
       }
     },
 
     /*调整等待派工单的等待时间*/
-    changeScheduleWaitTimes(tempData){
+    changeScheduleWaitTimes(tempData) {
       //修改当前等待派工单的等待时间
-      let requestData = {'site': tempData.site, 'orderNo': tempData.orderNo, 'itemNo': tempData.itemNo,
-      'seqNo': tempData.seqNo, 'waitTimes': tempData.waitTimes, 'workCenterNo': this.pageData.workCenterNo,
-      'resourceId': this.pageData.resourceId, 'scheduleSeqNo': this.currentSchedlingRow.scheduledSeqNo};
+      let requestData = {
+        'site': tempData.site, 'orderNo': tempData.orderNo, 'itemNo': tempData.itemNo,
+        'seqNo': tempData.seqNo, 'waitTimes': tempData.waitTimes, 'workCenterNo': this.pageData.workCenterNo.trim(),
+        'resourceId': this.pageData.resourceId.trim(), 'scheduleSeqNo': this.currentSchedlingRow.scheduledSeqNo
+      };
       updateScheduleWaitTimes(requestData).then(({data}) => {
-        if(data.code != 200){
+        if (data.code != 200) {
           this.$message.error(data.msg);
-        }else{
+        } else {
           this.$message.success(data.msg);
           //刷新派工单的数据
           this.getOrderScheduleList();
@@ -2989,15 +3081,17 @@ export default {
     },
 
     /*根据工艺路线调整派工单*/
-    changeScheduleByRouting(tempData){
+    changeScheduleByRouting(tempData) {
       //修改当前等待派工单的等待时间
-      let requestData = {'site': tempData.site, 'orderNo': tempData.orderNo, 'itemNo': tempData.itemNo,
-        'seqNo': tempData.seqNo, 'workCenterNo': this.pageData.workCenterNo,
-        'resourceId': this.pageData.resourceId, 'scheduleSeqNo': this.currentSchedlingRow.scheduledSeqNo};
+      let requestData = {
+        'site': tempData.site, 'orderNo': tempData.orderNo, 'itemNo': tempData.itemNo,
+        'seqNo': tempData.seqNo, 'workCenterNo': this.pageData.workCenterNo.trim(),
+        'resourceId': this.pageData.resourceId.trim(), 'scheduleSeqNo': this.currentSchedlingRow.scheduledSeqNo
+      };
       refreshScheduleByRouting(requestData).then(({data}) => {
-        if(data.code != 200){
+        if (data.code != 200) {
           this.$message.error(data.msg);
-        }else{
+        } else {
           this.$message.success(data.msg);
           //刷新派工单的数据
           this.getOrderScheduleList();
@@ -3006,47 +3100,49 @@ export default {
     },
 
     /*提示是否按照工作日历调整派工单*/
-    warnChangeScheduleByCalendar(scheduleRow){
+    warnChangeScheduleByCalendar(scheduleRow) {
       //提示操作
       this.$confirm(this.labels.sureNoFinishOrderToSchedule, '提示', {
         confirmButtonText: this.labels.confirmLabel,
-        celButtonText:  this.labels.cancelLabel,
+        celButtonText: this.labels.cancelLabel,
         type: 'warning'
-      }).then(() =>{
+      }).then(() => {
         //执行创建新卷的操作
         this.changeScheduleByCalendar(scheduleRow);
       });
     },
 
     /*根据日历调整派工单*/
-    changeScheduleByCalendar(tempData){
+    changeScheduleByCalendar(tempData) {
       //修改当前等待派工单的等待时间
-      let requestData = {'site': tempData.site, 'orderNo': tempData.orderNo, 'itemNo': tempData.itemNo,
-        'seqNo': tempData.seqNo, 'workCenterNo': this.pageData.workCenterNo,
-        'resourceId': this.pageData.resourceId, 'scheduleSeqNo': this.currentSchedlingRow.scheduledSeqNo};
+      let requestData = {
+        'site': tempData.site, 'orderNo': tempData.orderNo, 'itemNo': tempData.itemNo,
+        'seqNo': tempData.seqNo, 'workCenterNo': this.pageData.workCenterNo.trim(),
+        'resourceId': this.pageData.resourceId.trim(), 'scheduleSeqNo': this.currentSchedlingRow.scheduledSeqNo
+      };
       refreshScheduleByCalendar(requestData).then(({data}) => {
-        if(data.code != 200){
+        if (data.code != 200) {
           this.$message.error(data.msg);
-        }else{
+        } else {
           this.$message.success(data.msg);
           //刷新派工单的数据
           this.getOrderScheduleList();
         }
       });
     },
-    updateRoutingRevClosed(){
+    updateRoutingRevClosed() {
       this.getShopOrderList();
     },
 
     /*控制单行的背景颜色*/
-    controlRowStyle({row, rowIndex}){
+    controlRowStyle({row, rowIndex}) {
       let colorStyle = row.colorStyle;
       //区分不同的样式对应不同的颜色
-      if(colorStyle == 'firstColor'){
+      if (colorStyle == 'firstColor') {
         return "background-color: #2fff00";
-      }else if(colorStyle == 'secondColor'){
+      } else if (colorStyle == 'secondColor') {
         return "background-color: #fff200";
-      }else if(colorStyle == 'thirdColor'){
+      } else if (colorStyle == 'thirdColor') {
         return "background-color: #00aecd";
       }
     },
@@ -3067,16 +3163,16 @@ export default {
     // 获取 用户保存的 格式列
     getTableUserColumn(tableId) {
       //判断是否是null
-      if(!(null === tableId || "" === tableId)){
+      if (!(null === tableId || "" === tableId)) {
         this.queryTableUser.tableId = tableId;
       }
       getTableUserListLanguage(this.queryTableUser).then(({data}) => {
         if (data.rows.length > 0) {
           //this.columnList = []
           //如果是订单表
-          if('5303Order' === tableId){
+          if ('5303Order' === tableId) {
             this.columnOrderArray = data.rows;
-          }else if('5303Schedule' === tableId){
+          } else if ('5303Schedule' === tableId) {
             this.columnOrderScheduleArray = data.rows;
           }
         } else {
@@ -3138,16 +3234,16 @@ export default {
     // 获取 tableDefault 列
     getColumnList(tableId) {
       //判断是否是null
-      if(!(null === tableId || "" === tableId)){
+      if (!(null === tableId || "" === tableId)) {
         this.queryTable.tableId = tableId;
       }
       getTableDefaultListLanguage(this.queryTable).then(({data}) => {
         if (!data.rows.length == 0) {
           // this.showDefault = false
           //如果是订单表
-          if('5304Order' === tableId){
+          if ('5304Order' === tableId) {
             this.columnOrderArray = data.rows;
-          }else if('5304Schedule' === tableId){
+          } else if ('5304Schedule' === tableId) {
             this.columnOrderScheduleArray = data.rows;
           }
         } else {
@@ -3157,12 +3253,12 @@ export default {
     },
 
     //获取按钮的权限数据
-    getButtonAuthData(){
-      let updateFlag = this.isAuth(this.menuId+":revise");
-      let fullControFlag = this.isAuth(this.menuId+":fullContro");
-      let deleteFlag = this.isAuth(this.menuId+":remove");
+    getButtonAuthData() {
+      let updateFlag = this.isAuth(this.menuId + ":revise");
+      let fullControFlag = this.isAuth(this.menuId + ":fullContro");
+      let deleteFlag = this.isAuth(this.menuId + ":remove");
       //处理页面的权限数据
-      this.authEdit = !updateFlag ||!fullControFlag;
+      this.authEdit = !updateFlag || !fullControFlag;
       this.authAdd = !fullControFlag;
       this.authDelete = !deleteFlag;
     },
@@ -3179,7 +3275,7 @@ export default {
     getMultiLanguageList() {
       //首先查询当前按钮的多语言
       searchFunctionButtonList(this.queryButton).then(({data}) => {
-        if (data && data.code == 0 ) {
+        if (data && data.code == 0) {
           this.buttons = data.data
         } else {
           // saveButtonList(this.buttonList).then(({data}) => {
@@ -3188,7 +3284,7 @@ export default {
       });
       //其次查询当前标签的多语言
       searchFunctionButtonList(this.queryLabel).then(({data}) => {
-        if (data && data.code == 0 ) {
+        if (data && data.code == 0) {
           this.labels = data.data
         } else {
           // saveButtonList(this.buttonList).then(({data}) => {
@@ -3209,10 +3305,10 @@ export default {
     this.getOrderScheduleList();
 
     //延迟操作
-    setTimeout(item =>{
+    setTimeout(item => {
       //分布执行
       this.getTableUserColumn('5303Schedule');
-    },3000);
+    }, 3000);
 
     //获取按钮的权限
     this.getButtonAuthData();
@@ -3222,7 +3318,7 @@ export default {
 
   },
 
-  watch:{
+  watch: {
     pageData: {
       deep: true,
       handler: function (newV, oldV) {
@@ -3237,26 +3333,29 @@ export default {
 <style scoped lang="scss">
 
 /*针对el-card*/
-.customer-card .el-form-item__content{
+.customer-card .el-form-item__content {
   margin-top: -15px;
 }
-.customer-card .el-form-item{
+
+.customer-card .el-form-item {
   height: 22px;
 }
 
-.customer-border .el-form-item__content{
+.customer-border .el-form-item__content {
   margin-top: -30px;
 }
 
 /*全局年与日类型  宽度*/
-div.el-time-width{
+div.el-time-width {
   width: 110px !important;
 }
+
 /* 全局时间右边框*/
-.customer-css input.el-input__inner{
+.customer-css input.el-input__inner {
   height: 22px !important;
   padding-right: 0px !important;
 }
+
 /* 控制el-card标签的数据*/
 div.customer-el-card {
   margin-left: 110px;
@@ -3264,6 +3363,7 @@ div.customer-el-card {
   height: 20px;
   width: 60px;
 }
+
 /* 颜色控制 */
 div.customer-el-card-pink {
   background: #2fff00;
@@ -3278,26 +3378,27 @@ div.customer-el-card-blue {
 }
 
 /*清掉样式*/
-.el-radio+.el-radio {
+.el-radio + .el-radio {
   margin-left: 0px;
 }
 
 
 /*当前按钮的通用样式*/
-.customer-css .customer-bun-mid{
+.customer-css .customer-bun-mid {
   width: 60px;
   text-align: center;
 }
 
-.customer-css .customer-bun-min{
+.customer-css .customer-bun-min {
   width: 50px;
   text-align: center;
 }
 
-.customer-css .customer-bun-max{
+.customer-css .customer-bun-max {
   width: 80px;
   text-align: center;
 }
+
 /*当前按钮的通用样式*/
 .customer-css .el-button--medium {
   padding: 5px 5px;
@@ -3309,7 +3410,7 @@ div.customer-el-card-blue {
 }
 
 /*灰色的表格行背景颜色*/
-.customer-css /deep/ tr.customer-row-gray > td{
+.customer-css /deep/ tr.customer-row-gray > td {
   background: #7e819e;
 }
 
@@ -3327,21 +3428,22 @@ div.customer-el-card-blue {
 }*/
 
 /*添加主菜单和明细菜单的样式*/
-.customer-css .customer-dropdown .el-button--primary{
+.customer-css .customer-dropdown .el-button--primary {
   padding: 2px;
   font-size: 12px;
 }
 
 /*设置间距*/
-.el-dropdown-menu /deep/ li.customer-li{
+.el-dropdown-menu /deep/ li.customer-li {
   font-size: 12px;
   line-height: 16px;
   padding: 4px 8px;
 }
 
-.el-input /deep/ .el-icon-time{
+.el-input /deep/ .el-icon-time {
   display: none;
 }
+
 /*控制上下间距*/
 hr {
   margin-top: 0px;
@@ -3353,7 +3455,7 @@ hr {
   background-color: unset !important;
 }*/
 
-/deep/ .schedule-table tbody tr:hover:not(.current-row) >td  {
+/deep/ .schedule-table tbody tr:hover:not(.current-row) > td {
   background-color: unset !important;
 }
 
diff --git a/src/views/modules/schedule/order_schedule_expand.vue b/src/views/modules/schedule/order_schedule_expand.vue
index d547a95..9ff3871 100644
--- a/src/views/modules/schedule/order_schedule_expand.vue
+++ b/src/views/modules/schedule/order_schedule_expand.vue
@@ -76,7 +76,8 @@
                          style="margin-left: 10px; margin-bottom: 5px;">{{ buttons.refreshButton }}
               </el-button>
               <el-button :disabled="dataListSelections.length <= 0" type="primary" @click="scheduleBatchDialog()"
-                         style="margin-left: 10px; margin-bottom: 5px;">{{ buttons.scheduleBatch }}
+                         style="margin-left: 10px; margin-bottom: 5px;">
+                {{ buttons.scheduleBatch ? buttons.scheduleBatch : '批量排产' }}
               </el-button>
             </el-form-item>
           </el-form-item>
@@ -137,8 +138,8 @@
           <template slot-scope="scope">
             <span v-if="!item.columnHidden && item.columnProp == 'resourceList'">
               <el-select class="table-select-input" v-model="scope.row.resourceId">
-                <el-option v-for="(item,index) in scope.row.resourceList.split(';')" :key="index"
-                           :value="item.split(':')[0]" :label="item.split(':')[1]">
+                <el-option v-for="(item,index) in scope.row.resourceList" :key="index"
+                           :value="item.resourceId" :label="item.resourceDesc">
                 </el-option>
               </el-select>
             </span>
@@ -1316,46 +1317,13 @@ export default {
           this.scheduleVisible = false
           this.getShopOrderList()
         } else if (data.code == 201) {
-          this.$message.warning(data.msg.substring(0,data.msg.indexOf(','))+"!")
+          this.$message.warning(data.msg.substring(0, data.msg.indexOf(',')) + "!")
         } else if (data.code == 500) {
           this.$message.error(data.msg)
         }
       })
     },
-    /**
-     *     this.$confirm(data.msg, '提示', {
-     *             confirmButtonText: this.labels.confirmLabel,
-     *             celButtonText: this.labels.cancelLabel,
-     *             type: 'warning'
-     *           }).then(() => {
-     *             newItemList = []
-     *             for (let i = 0; i < this.dataListSelections.length; i++) {
-     *               let item = this.dataListSelections[i]
-     *               let newItem = {
-     *                 checkFlag: false,
-     *                 itemNo: item.itemNo,
-     *                 orderNo: item.orderNo,
-     *                 qtyToSchedule: item.scheduledQty,
-     *                 resourceId: item.resourceId,
-     *                 scheduleDate: this.scheduleDate,
-     *                 scheduleTime: this.scheduleTime,
-     *                 scheduledQty: item.qtyToSchedule,
-     *                 site: item.site,
-     *                 specifiedTime: this.specifiedTime,
-     *                 username: this.$store.state.user.name,
-     *                 workCenterNo: item.workCenterNo
-     *               }
-     *               newItemList.push(newItem)
-     *             }
-     *             batchScheduleOrderWithExpand(newItemList).then(({data}) => {
-     *               if (data.code == 200) {
-     *                 this.$message.success(data.msg)
-     *               } else if (data.code == 500) {
-     *                 this.$message.error(data.msg)
-     *               }
-     *             })
-     *           });
-     */
+
     // scheduleBatchDialog
     scheduleBatchDialog() {
       if (this.dataListSelections.find(item => item.resourceId == '' || item.resourceId == null)) {
@@ -1376,7 +1344,30 @@ export default {
     /*获取工单信息*/
     getShopOrderList() {
       getShopOrderList(this.pageData).then(({data}) => {
-        this.shopOrderList = data.rows;
+        if (this.pageData.resourceId) {
+          this.shopOrderList = data.rows.map(item => {
+            item.resourceId = this.pageData.resourceId
+            item.resourceList = item.resourceList.split(';').map(resItem => {
+              let newItem = {
+                resourceId: resItem.split(':')[0],
+                resourceDesc: resItem.split(':')[1]
+              }
+              return newItem;
+            })
+            return item;
+          })
+        } else {
+          this.shopOrderList = data.rows.map(item => {
+            item.resourceList = item.resourceList.split(';').map(resItem => {
+              let newItem = {
+                resourceId: resItem.split(':')[0],
+                resourceDesc: resItem.split(':')[1]
+              }
+              return newItem;
+            })
+            return item;
+          })
+        }
         //清空已经选好的行数据
         this.currentRoutingRow = null;
       })
diff --git a/src/views/modules/shopOrder/productionOrderScheduling/searchProductionDispatchList.vue b/src/views/modules/shopOrder/productionOrderScheduling/searchProductionDispatchList.vue
index d6c7ab8..b8e4f36 100644
--- a/src/views/modules/shopOrder/productionOrderScheduling/searchProductionDispatchList.vue
+++ b/src/views/modules/shopOrder/productionOrderScheduling/searchProductionDispatchList.vue
@@ -51,27 +51,30 @@
       </el-form-item>
     </el-form>
     <el-form :inline="true" label-position="top" label-width="100px" style="margin-top: 0px;">
-      <el-form-item >
+      <el-form-item>
         <span slot="label" style="" @click="getBaseList(24)"><a herf="#">加工中心编码：</a></span>
         <el-input v-model="searchData.workCenterNo" style="width: 130px"></el-input>
       </el-form-item>
-      <el-form-item >
+      <el-form-item>
         <span slot="label" style="" @click="getBaseList(88)"><a herf="#">机台编号：</a></span>
         <el-input v-model="searchData.sResourceID" style="width: 130px"></el-input>
       </el-form-item>
-      <el-form-item >
+      <el-form-item>
         <span slot="label" style="" @click="getBaseList(5)"><a herf="#">产成品编码：</a></span>
         <el-input v-model="searchData.partNo" style="width: 130px"></el-input>
       </el-form-item>
       <el-form-item :label="'生产订单号：'">
         <el-input v-model="searchData.orderNo" style="width: 130px"></el-input>
       </el-form-item>
-      <el-form-item >
+      <el-form-item>
         <span slot="label" style="" @click="getBaseList(18)"><a herf="#">工厂编码：</a></span>
         <el-input v-model="searchData.site" style="width: 80px"></el-input>
-        <el-checkbox style="margin-left: 2px;margin-top: 0px" v-model="searchData.checked">仅显示当前排产的派工单</el-checkbox>
-        <el-button @click="getData()" type="primary" style="margin-left: 100px;margin-top: 0px">{{'查询'}}</el-button>
-        <el-button @click="warnCancelScheduleConfirm" type="primary" style="margin-left: 30px; margin-top: 0px; margin-right: 20px;">{{'取消排产'}}</el-button>
+        <el-checkbox style="margin-left: 2px;margin-top: 0px" v-model="searchData.checked">仅显示当前排产的派工单
+        </el-checkbox>
+        <el-button @click="getData()" type="primary" style="margin-left: 100px;margin-top: 0px">{{ '查询' }}</el-button>
+        <el-button @click="warnCancelScheduleConfirm" type="primary"
+                   style="margin-left: 30px; margin-top: 0px; margin-right: 20px;">{{ '取消排产' }}
+        </el-button>
         <download-excel
           :fields="fields()"
           :data="exportData"
@@ -111,14 +114,14 @@
         :width="item.columnWidth"
         :label="item.columnLabel">
         <template slot-scope="scope">
-          <span v-if="!item.columnHidden"> {{scope.row[item.columnProp]}}</span>
+          <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>
 
-    <Chooselist ref="baseList"  @getBaseData="getBaseData"></Chooselist>
+    <Chooselist ref="baseList" @getBaseData="getBaseData"></Chooselist>
 
     <!-- 动态列    -->
     <column v-if="visible" ref="column" @refreshData="getTableUserColumn" v-drag></column>
@@ -126,1069 +129,1080 @@
 </template>
 
 <script>
-  import Chooselist from '@/views/modules/common/Chooselist';
-  import column from '@/views/modules/common/column';/*动态表头*/
+import Chooselist from '@/views/modules/common/Chooselist';
+import column from '@/views/modules/common/column';/*动态表头*/
 
-  /*动态表头*/
-  import {
-    saveTableDefaultList,
-    getTableDefaultListLanguage,
-    getTableUserListLanguage,
-    removerDefault,
-    removerUser
-  } from "@/api/table.js";
+/*动态表头*/
+import {
+  saveTableDefaultList,
+  getTableDefaultListLanguage,
+  getTableUserListLanguage,
+  removerDefault,
+  removerUser
+} from "@/api/table.js";
 
 
-  import {
-    searchProductionDispatchList,
-    cancelScheduleWithScheduleQuery,
-  } from "@/api/shopOrder/shopOrder.js"
+import {
+  searchProductionDispatchList,
+  cancelScheduleWithScheduleQuery,
+} from "@/api/shopOrder/shopOrder.js"
 
-  export default {
-    //查询-生产派工单
-    name: "searchProductionDispatchList",
-    watch: {
+export default {
+  data() {
+    return {
+      tagNo: '',
+      showDefault: false,
+      visible: false,
+      // 导出 start
+      exportData: [],
+      exportName: "生产派工单" + this.dayjs().format('YYYYMMDDHHmmss'),
+      exportHeader: ["生产派工单"],
+      exportFooter: [],
+      // 导出 end
+      height: 200,
+      modelFlag: false,
+      modelInputFlag: true,
+      selectList: [],
+      scheduleRow: {},
+      pageData: {
+        site: this.$store.state.user.site,
+        username: this.$store.state.user.name,
+        orderNo: '',
+        itemNo: '',
+        seqNo: 0,
+        resourceId: '',
+        workCenterNo: '',
+        lotSize: 0,
+        scheduleSeqNo: 0,
+        planStartTime: '',
+      },
       searchData: {
-        deep: true,
-        handler: function (newV, oldV) {
-          this.searchData.partNo = this.searchData.partNo.toUpperCase()
-          this.searchData.sResourceID = this.searchData.sResourceID.toUpperCase()
-          this.searchData.orderNo = this.searchData.orderNo.toUpperCase()
-          this.searchData.workCenterNo = this.searchData.workCenterNo.toUpperCase()
-        }
-      }
-    },
-    data() {
-      return {
-        tagNo:'',
-        showDefault: false,
-        visible: false,
-        // 导出 start
-        exportData: [],
-        exportName: "生产派工单"+this.dayjs().format('YYYYMMDDHHmmss'),
-        exportHeader: ["生产派工单"],
-        exportFooter: [],
-        // 导出 end
-        height: 200,
-        modelFlag:false,
-        modelInputFlag:true,
-        selectList:[],
-        scheduleRow: {},
-        pageData: {
-          site: this.$store.state.user.site,
-          username: this.$store.state.user.name,
-          orderNo: '',
-          itemNo: '',
-          seqNo: 0,
-          resourceId: '',
-          workCenterNo: '',
-          lotSize: 0,
-          scheduleSeqNo: 0,
-          planStartTime: '',
+        site: '',
+        orderNo: this.$route.query.orderNo,
+        checked: true,
+        partNo: '',
+        sResourceID: '',
+        workCenterNo: '',
+        date1: '',
+        date2: '',
+        date3: '',
+        date4: '',
+        date5: '',
+        date6: '',
+        user: this.$store.state.user.name
+      },
+      dataList: [],
+      dataListLoading: false,
+      buttons: {
+        settingLanguageList: '按语言设置',
+        edit: '编辑',
+        delete: '删除',
+        deleteList: '批量删除',
+        cz: '操作',
+        search: '查询',
+        download: '导出',
+        settingTable: '设置列表',
+        defaultTable: '设置默认配置',
+        list: "列表",
+        addList: '批量添加',
+        settingLanguage: "按控件设置"
+      },
+      columnList: [
+        {
+          userId: this.$store.state.user.name,
+          functionId: 6023,
+          serialNumber: '6023TableOrderNo',
+          tableId: "6023Table",
+          tableName: "查询生产派工单表",
+          columnProp: "orderNo",
+          headerAlign: "center",
+          align: "left",
+          columnLabel: "订单号",
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 80
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 6023,
+          serialNumber: '6023TableItemNo',
+          tableId: "6023Table",
+          tableName: "查询生产派工单表",
+          columnProp: "itemNo",
+          headerAlign: "center",
+          align: "left",
+          columnLabel: "工序号",
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 80
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 6023,
+          serialNumber: '6023TableOperationDesc',
+          tableId: "6023Table",
+          tableName: "查询生产派工单表",
+          columnProp: "operationDesc",
+          headerAlign: "center",
+          align: "left",
+          columnLabel: "工序名称",
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 160
         },
-        searchData: {
-          site:'',
-          orderNo:this.$route.query.orderNo,
-          checked: true,
-          partNo:'',
-          sResourceID:'',
-          workCenterNo:'',
-          date1:'',
-          date2:'',
-          date3:'',
-          date4:'',
-          date5:'',
-          date6:'',
-          user:this.$store.state.user.name
+        {
+          userId: this.$store.state.user.name,
+          functionId: 6023,
+          serialNumber: '6023TablePlanStartTime',
+          tableId: "6023Table",
+          tableName: "查询生产派工单表",
+          columnProp: "planStartTime",
+          headerAlign: "center",
+          align: "left",
+          columnLabel: "计划开工时间",
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 120
         },
-        dataList:[],
-        dataListLoading: false,
-        buttons: {
-          settingLanguageList: '按语言设置',
-          edit: '编辑',
-          delete: '删除',
-          deleteList: '批量删除',
-          cz: '操作',
-          search: '查询',
-          download: '导出',
-          settingTable: '设置列表',
-          defaultTable: '设置默认配置',
-          list: "列表",
-          addList: '批量添加',
-          settingLanguage: "按控件设置"
+        {
+          userId: this.$store.state.user.name,
+          functionId: 6023,
+          serialNumber: '6023TablePlanFinishTime',
+          tableId: "6023Table",
+          tableName: "查询生产派工单表",
+          columnProp: "planFinishTime",
+          headerAlign: "center",
+          align: "left",
+          columnLabel: "计划完工时间",
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 120
         },
-        columnList: [
-          {
-            userId: this.$store.state.user.name,
-            functionId: 6023,
-            serialNumber: '6023TableOrderNo',
-            tableId: "6023Table",
-            tableName: "查询生产派工单表",
-            columnProp: "orderNo",
-            headerAlign: "center",
-            align: "left",
-            columnLabel: "订单号",
-            columnHidden: false,
-            columnImage: false,
-            columnSortable: false,
-            sortLv: 0,
-            status: true,
-            fixed: '',
-            columnWidth: 80
-          },
-          {
-            userId: this.$store.state.user.name,
-            functionId: 6023,
-            serialNumber: '6023TableItemNo',
-            tableId: "6023Table",
-            tableName: "查询生产派工单表",
-            columnProp: "itemNo",
-            headerAlign: "center",
-            align: "left",
-            columnLabel: "工序号",
-            columnHidden: false,
-            columnImage: false,
-            columnSortable: false,
-            sortLv: 0,
-            status: true,
-            fixed: '',
-            columnWidth: 80
-          },
-          {
-            userId: this.$store.state.user.name,
-            functionId: 6023,
-            serialNumber: '6023TableOperationDesc',
-            tableId: "6023Table",
-            tableName: "查询生产派工单表",
-            columnProp: "operationDesc",
-            headerAlign: "center",
-            align: "left",
-            columnLabel: "工序名称",
-            columnHidden: false,
-            columnImage: false,
-            columnSortable: false,
-            sortLv: 0,
-            status: true,
-            fixed: '',
-            columnWidth: 160
-          },
-          {
-            userId: this.$store.state.user.name,
-            functionId: 6023,
-            serialNumber: '6023TablePlanStartTime',
-            tableId: "6023Table",
-            tableName: "查询生产派工单表",
-            columnProp: "planStartTime",
-            headerAlign: "center",
-            align: "left",
-            columnLabel: "计划开工时间",
-            columnHidden: false,
-            columnImage: false,
-            columnSortable: false,
-            sortLv: 0,
-            status: true,
-            fixed: '',
-            columnWidth: 120
-          },
-          {
-            userId: this.$store.state.user.name,
-            functionId: 6023,
-            serialNumber: '6023TablePlanFinishTime',
-            tableId: "6023Table",
-            tableName: "查询生产派工单表",
-            columnProp: "planFinishTime",
-            headerAlign: "center",
-            align: "left",
-            columnLabel: "计划完工时间",
-            columnHidden: false,
-            columnImage: false,
-            columnSortable: false,
-            sortLv: 0,
-            status: true,
-            fixed: '',
-            columnWidth: 120
-          },
-          {
-            userId: this.$store.state.user.name,
-            functionId: 6023,
-            serialNumber: '6023TableInAdvancedFlag',
-            tableId: "6023Table",
-            tableName: "查询生产派工单表",
-            columnProp: "inAdvancedFlag",
-            headerAlign: "center",
-            align: "left",
-            columnLabel: "排产早于上工序",
-            columnHidden: false,
-            columnImage: false,
-            columnSortable: false,
-            sortLv: 0,
-            status: true,
-            fixed: '',
-            columnWidth: 120
-          },
-          {
-            userId: this.$store.state.user.name,
-            functionId: 6023,
-            serialNumber: '6023TablePreOpsPlanStartTime',
-            tableId: "6023Table",
-            tableName: "查询生产派工单表",
-            columnProp: "preOpsPlanStartTime",
-            headerAlign: "center",
-            align: "left",
-            columnLabel: "上道工序计划开工日期",
-            columnHidden: false,
-            columnImage: false,
-            columnSortable: false,
-            sortLv: 0,
-            status: true,
-            fixed: '',
-            columnWidth: 150
-          },
-          {
-            userId: this.$store.state.user.name,
-            functionId: 6023,
-            serialNumber: '6023TablePreOpsPlanFinishTime',
-            tableId: "6023Table",
-            tableName: "查询生产派工单表",
-            columnProp: "preOpsPlanFinishTime",
-            headerAlign: "center",
-            align: "left",
-            columnLabel: "上道工序计划完工日期",
-            columnHidden: false,
-            columnImage: false,
-            columnSortable: false,
-            sortLv: 0,
-            status: true,
-            fixed: '',
-            columnWidth: 150
-          },
-          {
-            userId: this.$store.state.user.name,
-            functionId: 6023,
-            serialNumber: '6023TablePartNo',
-            tableId: "6023Table",
-            tableName: "查询生产派工单表",
-            columnProp: "partNo",
-            headerAlign: "center",
-            align: "left",
-            columnLabel: "产品编码",
-            columnHidden: false,
-            columnImage: false,
-            columnSortable: false,
-            sortLv: 0,
-            status: true,
-            fixed: '',
-            columnWidth: 80
-          },
-          {
-            userId: this.$store.state.user.name,
-            functionId: 6023,
-            serialNumber: '6023TablePartDescription',
-            tableId: "6023Table",
-            tableName: "查询生产派工单表",
-            columnProp: "partDescription",
-            headerAlign: "center",
-            align: "left",
-            columnLabel: "产品名称",
-            columnHidden: false,
-            columnImage: false,
-            columnSortable: false,
-            sortLv: 0,
-            status: true,
-            fixed: '',
-            columnWidth: 80
-          },
-          {
-            userId: this.$store.state.user.name,
-            functionId: 6023,
-            serialNumber: '6023TableSpec',
-            tableId: "6023Table",
-            tableName: "查询生产派工单表",
-            columnProp: "spec",
-            headerAlign: "center",
-            align: "left",
-            columnLabel: "规格型号",
-            columnHidden: false,
-            columnImage: false,
-            columnSortable: false,
-            sortLv: 0,
-            status: true,
-            fixed: '',
-            columnWidth: 80
-          },
-          {
-            userId: this.$store.state.user.name,
-            functionId: 6023,
-            serialNumber: '6023TableLotSize',
-            tableId: "6023Table",
-            tableName: "查询生产派工单表",
-            columnProp: "lotSize",
-            headerAlign: "center",
-            align: "left",
-            columnLabel: "待生产数量",
-            columnHidden: false,
-            columnImage: false,
-            columnSortable: false,
-            sortLv: 0,
-            status: true,
-            fixed: '',
-            columnWidth: 100
-          },
-          {
-            userId: this.$store.state.user.name,
-            functionId: 6023,
-            serialNumber: '6023TableQtyReported',
-            tableId: "6023Table",
-            tableName: "查询生产派工单表",
-            columnProp: "qtyReported",
-            headerAlign: "center",
-            align: "left",
-            columnLabel: "已报告数量",
-            columnHidden: false,
-            columnImage: false,
-            columnSortable: false,
-            sortLv: 0,
-            status: true,
-            fixed: '',
-            columnWidth: 100
-          },
-          {
-            userId: this.$store.state.user.name,
-            functionId: 6023,
-            serialNumber: '6023TableClosedFlag',
-            tableId: "6023Table",
-            tableName: "查询生产派工单表",
-            columnProp: "closedFlag",
-            headerAlign: "center",
-            align: "left",
-            columnLabel: "是否关闭",
-            columnHidden: false,
-            columnImage: false,
-            columnSortable: false,
-            sortLv: 0,
-            status: true,
-            fixed: '',
-            columnWidth: 80
-          },
-          {
-            userId: this.$store.state.user.name,
-            functionId: 6023,
-            serialNumber: '6023TableTimeRequired',
-            tableId: "6023Table",
-            tableName: "查询生产派工单表",
-            columnProp: "timeRequired",
-            headerAlign: "center",
-            align: "left",
-            columnLabel: "计划时间",
-            columnHidden: false,
-            columnImage: false,
-            columnSortable: false,
-            sortLv: 0,
-            status: true,
-            fixed: '',
-            columnWidth: 100
-          },
-          {
-            userId: this.$store.state.user.name,
-            functionId: 6023,
-            serialNumber: '6023TableNeedDate',
-            tableId: "6023Table",
-            tableName: "查询生产派工单表",
-            columnProp: "needDate",
-            headerAlign: "center",
-            align: "left",
-            columnLabel: "需求日期",
-            columnHidden: false,
-            columnImage: false,
-            columnSortable: false,
-            sortLv: 0,
-            status: true,
-            fixed: '',
-            columnWidth: 100
-          },
-          {
-            userId: this.$store.state.user.name,
-            functionId: 6023,
-            serialNumber: '6023TablePreItemNo',
-            tableId: "6023Table",
-            tableName: "查询生产派工单表",
-            columnProp: "preItemNo",
-            headerAlign: "center",
-            align: "left",
-            columnLabel: "前道工序",
-            columnHidden: false,
-            columnImage: false,
-            columnSortable: false,
-            sortLv: 0,
-            status: true,
-            fixed: '',
-            columnWidth: 100
-          },
-          {
-            userId: this.$store.state.user.name,
-            functionId: 6023,
-            serialNumber: '6023TablePreOperationDesc',
-            tableId: "6023Table",
-            tableName: "查询生产派工单表",
-            columnProp: "preOperationDesc",
-            headerAlign: "center",
-            align: "left",
-            columnLabel: "前道工序名称",
-            columnHidden: false,
-            columnImage: false,
-            columnSortable: false,
-            sortLv: 0,
-            status: true,
-            fixed: '',
-            columnWidth: 120
-          },
-          {
-            userId: this.$store.state.user.name,
-            functionId: 6023,
-            serialNumber: '6023TablePreScheduledFlag',
-            tableId: "6023Table",
-            tableName: "查询生产派工单表",
-            columnProp: "preScheduledFlag",
-            headerAlign: "center",
-            align: "left",
-            columnLabel: "前道工序是否排产",
-            columnHidden: false,
-            columnImage: false,
-            columnSortable: false,
-            sortLv: 0,
-            status: true,
-            fixed: '',
-            columnWidth: 150
-          },
-          {
-            userId: this.$store.state.user.name,
-            functionId: 6023,
-            serialNumber: '6023TableNextItemNo',
-            tableId: "6023Table",
-            tableName: "查询生产派工单表",
-            columnProp: "nextItemNo",
-            headerAlign: "center",
-            align: "left",
-            columnLabel: "后道工序",
-            columnHidden: false,
-            columnImage: false,
-            columnSortable: false,
-            sortLv: 0,
-            status: true,
-            fixed: '',
-            columnWidth: 80
-          },
-          {
-            userId: this.$store.state.user.name,
-            functionId: 6023,
-            serialNumber: '6023TableNextOperationDesc',
-            tableId: "6023Table",
-            tableName: "查询生产派工单表",
-            columnProp: "nextOperationDesc",
-            headerAlign: "center",
-            align: "left",
-            columnLabel: "后道工序名称",
-            columnHidden: false,
-            columnImage: false,
-            columnSortable: false,
-            sortLv: 0,
-            status: true,
-            fixed: '',
-            columnWidth: 120
-          },
-          {
-            userId: this.$store.state.user.name,
-            functionId: 6023,
-            serialNumber: '6023TableNextScheduledFlag',
-            tableId: "6023Table",
-            tableName: "查询生产派工单表",
-            columnProp: "nextScheduledFlag",
-            headerAlign: "center",
-            align: "left",
-            columnLabel: "后道工序是否排产",
-            columnHidden: false,
-            columnImage: false,
-            columnSortable: false,
-            sortLv: 0,
-            status: true,
-            fixed: '',
-            columnWidth: 150
-          },
-          {
-            userId: this.$store.state.user.name,
-            functionId: 6023,
-            serialNumber: '6023TableSResourceID',
-            tableId: "6023Table",
-            tableName: "查询生产派工单表",
-            columnProp: "sResourceID",
-            headerAlign: "center",
-            align: "left",
-            columnLabel: "机台号",
-            columnHidden: false,
-            columnImage: false,
-            columnSortable: false,
-            sortLv: 0,
-            status: true,
-            fixed: '',
-            columnWidth: 80
-          },
-          {
-            userId: this.$store.state.user.name,
-            functionId: 6023,
-            serialNumber: '6023TableConfigurationTemplateID',
-            tableId: "6023Table",
-            tableName: "查询生产派工单表",
-            columnProp: "configurationTemplateID",
-            headerAlign: "center",
-            align: "left",
-            columnLabel: "客户名称",
-            columnHidden: false,
-            columnImage: false,
-            columnSortable: false,
-            sortLv: 0,
-            status: true,
-            fixed: '',
-            columnWidth: 80
-          },
-          {
-            userId: this.$store.state.user.name,
-            functionId: 6023,
-            serialNumber: '6023TableEnterDate',
-            tableId: "6023Table",
-            tableName: "查询生产派工单表",
-            columnProp: "enterDate",
-            headerAlign: "center",
-            align: "left",
-            columnLabel: "录入日期",
-            columnHidden: false,
-            columnImage: false,
-            columnSortable: false,
-            sortLv: 0,
-            status: true,
-            fixed: '',
-            columnWidth: 100
-          },
-          {
-            userId: this.$store.state.user.name,
-            functionId: 6023,
-            serialNumber: '6023TableAvailResource',
-            tableId: "6023Table",
-            tableName: "查询生产派工单表",
-            columnProp: "availResource",
-            headerAlign: "center",
-            align: "left",
-            columnLabel: "可用机台",
-            columnHidden: false,
-            columnImage: false,
-            columnSortable: false,
-            sortLv: 0,
-            status: true,
-            fixed: '',
-            columnWidth: 80
-          },
-          {
-            userId: this.$store.state.user.name,
-            functionId: 6023,
-            serialNumber: '6023TableWorkCenterNo',
-            tableId: "6023Table",
-            tableName: "查询生产派工单表",
-            columnProp: "workCenterNo",
-            headerAlign: "center",
-            align: "left",
-            columnLabel: "加工中心",
-            columnHidden: false,
-            columnImage: false,
-            columnSortable: false,
-            sortLv: 0,
-            status: true,
-            fixed: '',
-            columnWidth: 80
-          },
-          {
-            userId: this.$store.state.user.name,
-            functionId: 6023,
-            serialNumber: '6023TableMachRunFactor',
-            tableId: "6023Table",
-            tableName: "查询生产派工单表",
-            columnProp: "machRunFactor",
-            headerAlign: "center",
-            align: "left",
-            columnLabel: "单位产出",
-            columnHidden: false,
-            columnImage: false,
-            columnSortable: false,
-            sortLv: 0,
-            status: true,
-            fixed: '',
-            columnWidth: 80
-          },
-          {
-            userId: this.$store.state.user.name,
-            functionId: 6023,
-            serialNumber: '6023TableMachSetupTime',
-            tableId: "6023Table",
-            tableName: "查询生产派工单表",
-            columnProp: "machSetupTime",
-            headerAlign: "center",
-            align: "left",
-            columnLabel: "调机时间",
-            columnHidden: false,
-            columnImage: false,
-            columnSortable: false,
-            sortLv: 0,
-            status: true,
-            fixed: '',
-            columnWidth: 80
-          },
-          {
-            userId: this.$store.state.user.name,
-            functionId: 6023,
-            serialNumber: '6023TableFactorUnit',
-            tableId: "6023Table",
-            tableName: "查询生产派工单表",
-            columnProp: "factorUnit",
-            headerAlign: "center",
-            align: "left",
-            columnLabel: "产出单位",
-            columnHidden: false,
-            columnImage: false,
-            columnSortable: false,
-            sortLv: 0,
-            status: true,
-            fixed: '',
-            columnWidth: 80
-          },
-          {
-            userId: this.$store.state.user.name,
-            functionId: 6023,
-            serialNumber: '6023TableSite',
-            tableId: "6023Table",
-            tableName: "查询生产派工单表",
-            columnProp: "site",
-            headerAlign: "center",
-            align: "left",
-            columnLabel: "工厂编号",
-            columnHidden: false,
-            columnImage: false,
-            columnSortable: false,
-            sortLv: 0,
-            status: true,
-            fixed: '',
-            columnWidth: 80
-          },
-          {
-            userId: this.$store.state.user.name,
-            functionId: 6023,
-            serialNumber: '6023TableSeqNo',
-            tableId: "6023Table",
-            tableName: "查询生产派工单表",
-            columnProp: "seqNo",
-            headerAlign: "center",
-            align: "left",
-            columnLabel: "派工单单号",
-            columnHidden: false,
-            columnImage: false,
-            columnSortable: false,
-            sortLv: 0,
-            status: true,
-            fixed: '',
-            columnWidth: 80
-          },
-          {
-            userId: this.$store.state.user.name,
-            functionId: 6023,
-            serialNumber: '6023TableQtyScheduledPreOps',
-            tableId: "6023Table",
-            tableName: "查询生产派工单表",
-            columnProp: "qtyScheduledPreOps",
-            headerAlign: "center",
-            align: "left",
-            columnLabel: "前道工序已排产数量",
-            columnHidden: false,
-            columnImage: false,
-            columnSortable: false,
-            sortLv: 0,
-            status: true,
-            fixed: '',
-            columnWidth: 150
-          },
-          {
-            userId: this.$store.state.user.name,
-            functionId: 6023,
-            serialNumber: '6023TableLatethanShipTime',
-            tableId: "6023Table",
-            tableName: "查询生产派工单表",
-            columnProp: "latethanShipTime",
-            headerAlign: "center",
-            align: "left",
-            columnLabel: "晚于发货时间",
-            columnHidden: false,
-            columnImage: false,
-            columnSortable: false,
-            sortLv: 0,
-            status: true,
-            fixed: '',
-            columnWidth: 100
-          },
-          {
-            userId: this.$store.state.user.name,
-            functionId: 6023,
-            serialNumber: '6023TableTimeRequiredOriginal',
-            tableId: "6023Table",
-            tableName: "查询生产派工单表",
-            columnProp: "requiredOriginal",
-            headerAlign: "center",
-            align: "left",
-            columnLabel: "派工单需求工时",
-            columnHidden: false,
-            columnImage: false,
-            columnSortable: false,
-            sortLv: 0,
-            status: true,
-            fixed: '',
-            columnWidth: 120
-          },
-          {
-            userId: this.$store.state.user.name,
-            functionId: 6023,
-            serialNumber: '6023TableParkFlag',
-            tableId: "6023Table",
-            tableName: "查询生产派工单表",
-            columnProp: "parkFlag",
-            headerAlign: "center",
-            align: "left",
-            columnLabel: "暂停",
-            columnHidden: false,
-            columnImage: false,
-            columnSortable: false,
-            sortLv: 0,
-            status: true,
-            fixed: '',
-            columnWidth: 60
-          },
-          {
-            userId: this.$store.state.user.name,
-            functionId: 6023,
-            serialNumber: '6023TableQtyRequiredOriginal',
-            tableId: "6023Table",
-            tableName: "查询生产派工单表",
-            columnProp: "qtyRequiredOriginal",
-            headerAlign: "center",
-            align: "left",
-            columnLabel: "派工单需求数量",
-            columnHidden: false,
-            columnImage: false,
-            columnSortable: false,
-            sortLv: 0,
-            status: true,
-            fixed: '',
-            columnWidth: 100
-          },
-          {
-            userId: this.$store.state.user.name,
-            functionId: 6023,
-            serialNumber: '6023TableCustPartNo',
-            tableId: "6023Table",
-            tableName: "查询生产派工单表",
-            columnProp: "custPartNo",
-            headerAlign: "center",
-            align: "left",
-            columnLabel: "客户产品料号",
-            columnHidden: false,
-            columnImage: false,
-            columnSortable: false,
-            sortLv: 0,
-            status: true,
-            fixed: '',
-            columnWidth: 100
-          },
-          {
-            userId: this.$store.state.user.name,
-            functionId: 6023,
-            serialNumber: '6023TableClosedby',
-            tableId: "6023Table",
-            tableName: "查询生产派工单表",
-            columnProp: "closedby",
-            headerAlign: "center",
-            align: "left",
-            columnLabel: "关闭人",
-            columnHidden: false,
-            columnImage: false,
-            columnSortable: false,
-            sortLv: 0,
-            status: true,
-            fixed: '',
-            columnWidth: 80
-          },
-          {
-            userId: this.$store.state.user.name,
-            functionId: 6023,
-            serialNumber: '6023TableClosedDate',
-            tableId: "6023Table",
-            tableName: "查询生产派工单表",
-            columnProp: "closedDate",
-            headerAlign: "center",
-            align: "left",
-            columnLabel: "关闭日期",
-            columnHidden: false,
-            columnImage: false,
-            columnSortable: false,
-            sortLv: 0,
-            status: true,
-            fixed: '',
-            columnWidth: 100
-          }
-        ],
-        queryTable:{
+        {
           userId: this.$store.state.user.name,
-          functionId: this.$route.meta.menuId,
+          functionId: 6023,
+          serialNumber: '6023TableInAdvancedFlag',
           tableId: "6023Table",
-          languageCode: this.$i18n.locale
+          tableName: "查询生产派工单表",
+          columnProp: "inAdvancedFlag",
+          headerAlign: "center",
+          align: "left",
+          columnLabel: "排产早于上工序",
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 120
         },
-        // 用户table 查询参数
-        queryTableUser: {
+        {
           userId: this.$store.state.user.name,
-          functionId: this.$route.meta.menuId,
+          functionId: 6023,
+          serialNumber: '6023TablePreOpsPlanStartTime',
+          tableId: "6023Table",
+          tableName: "查询生产派工单表",
+          columnProp: "preOpsPlanStartTime",
+          headerAlign: "center",
+          align: "left",
+          columnLabel: "上道工序计划开工日期",
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 150
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 6023,
+          serialNumber: '6023TablePreOpsPlanFinishTime',
+          tableId: "6023Table",
+          tableName: "查询生产派工单表",
+          columnProp: "preOpsPlanFinishTime",
+          headerAlign: "center",
+          align: "left",
+          columnLabel: "上道工序计划完工日期",
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 150
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 6023,
+          serialNumber: '6023TablePartNo',
+          tableId: "6023Table",
+          tableName: "查询生产派工单表",
+          columnProp: "partNo",
+          headerAlign: "center",
+          align: "left",
+          columnLabel: "产品编码",
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 80
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 6023,
+          serialNumber: '6023TablePartDescription',
+          tableId: "6023Table",
+          tableName: "查询生产派工单表",
+          columnProp: "partDescription",
+          headerAlign: "center",
+          align: "left",
+          columnLabel: "产品名称",
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 80
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 6023,
+          serialNumber: '6023TableSpec',
+          tableId: "6023Table",
+          tableName: "查询生产派工单表",
+          columnProp: "spec",
+          headerAlign: "center",
+          align: "left",
+          columnLabel: "规格型号",
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 80
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 6023,
+          serialNumber: '6023TableLotSize',
+          tableId: "6023Table",
+          tableName: "查询生产派工单表",
+          columnProp: "lotSize",
+          headerAlign: "center",
+          align: "left",
+          columnLabel: "待生产数量",
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 100
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 6023,
+          serialNumber: '6023TableQtyReported',
+          tableId: "6023Table",
+          tableName: "查询生产派工单表",
+          columnProp: "qtyReported",
+          headerAlign: "center",
+          align: "left",
+          columnLabel: "已报告数量",
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 100
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 6023,
+          serialNumber: '6023TableClosedFlag',
+          tableId: "6023Table",
+          tableName: "查询生产派工单表",
+          columnProp: "closedFlag",
+          headerAlign: "center",
+          align: "left",
+          columnLabel: "是否关闭",
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 80
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 6023,
+          serialNumber: '6023TableTimeRequired',
+          tableId: "6023Table",
+          tableName: "查询生产派工单表",
+          columnProp: "timeRequired",
+          headerAlign: "center",
+          align: "left",
+          columnLabel: "计划时间",
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 100
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 6023,
+          serialNumber: '6023TableNeedDate',
+          tableId: "6023Table",
+          tableName: "查询生产派工单表",
+          columnProp: "needDate",
+          headerAlign: "center",
+          align: "left",
+          columnLabel: "需求日期",
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 100
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 6023,
+          serialNumber: '6023TablePreItemNo',
+          tableId: "6023Table",
+          tableName: "查询生产派工单表",
+          columnProp: "preItemNo",
+          headerAlign: "center",
+          align: "left",
+          columnLabel: "前道工序",
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 100
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 6023,
+          serialNumber: '6023TablePreOperationDesc',
+          tableId: "6023Table",
+          tableName: "查询生产派工单表",
+          columnProp: "preOperationDesc",
+          headerAlign: "center",
+          align: "left",
+          columnLabel: "前道工序名称",
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 120
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 6023,
+          serialNumber: '6023TablePreScheduledFlag',
+          tableId: "6023Table",
+          tableName: "查询生产派工单表",
+          columnProp: "preScheduledFlag",
+          headerAlign: "center",
+          align: "left",
+          columnLabel: "前道工序是否排产",
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 150
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 6023,
+          serialNumber: '6023TableNextItemNo',
+          tableId: "6023Table",
+          tableName: "查询生产派工单表",
+          columnProp: "nextItemNo",
+          headerAlign: "center",
+          align: "left",
+          columnLabel: "后道工序",
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 80
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 6023,
+          serialNumber: '6023TableNextOperationDesc',
+          tableId: "6023Table",
+          tableName: "查询生产派工单表",
+          columnProp: "nextOperationDesc",
+          headerAlign: "center",
+          align: "left",
+          columnLabel: "后道工序名称",
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 120
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 6023,
+          serialNumber: '6023TableNextScheduledFlag',
+          tableId: "6023Table",
+          tableName: "查询生产派工单表",
+          columnProp: "nextScheduledFlag",
+          headerAlign: "center",
+          align: "left",
+          columnLabel: "后道工序是否排产",
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 150
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 6023,
+          serialNumber: '6023TableSResourceID',
+          tableId: "6023Table",
+          tableName: "查询生产派工单表",
+          columnProp: "sResourceID",
+          headerAlign: "center",
+          align: "left",
+          columnLabel: "机台号",
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 80
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 6023,
+          serialNumber: '6023TableConfigurationTemplateID',
+          tableId: "6023Table",
+          tableName: "查询生产派工单表",
+          columnProp: "configurationTemplateID",
+          headerAlign: "center",
+          align: "left",
+          columnLabel: "客户名称",
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 80
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 6023,
+          serialNumber: '6023TableEnterDate',
+          tableId: "6023Table",
+          tableName: "查询生产派工单表",
+          columnProp: "enterDate",
+          headerAlign: "center",
+          align: "left",
+          columnLabel: "录入日期",
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 100
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 6023,
+          serialNumber: '6023TableAvailResource',
+          tableId: "6023Table",
+          tableName: "查询生产派工单表",
+          columnProp: "availResource",
+          headerAlign: "center",
+          align: "left",
+          columnLabel: "可用机台",
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 80
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 6023,
+          serialNumber: '6023TableWorkCenterNo',
+          tableId: "6023Table",
+          tableName: "查询生产派工单表",
+          columnProp: "workCenterNo",
+          headerAlign: "center",
+          align: "left",
+          columnLabel: "加工中心",
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 80
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 6023,
+          serialNumber: '6023TableMachRunFactor',
+          tableId: "6023Table",
+          tableName: "查询生产派工单表",
+          columnProp: "machRunFactor",
+          headerAlign: "center",
+          align: "left",
+          columnLabel: "单位产出",
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 80
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 6023,
+          serialNumber: '6023TableMachSetupTime',
+          tableId: "6023Table",
+          tableName: "查询生产派工单表",
+          columnProp: "machSetupTime",
+          headerAlign: "center",
+          align: "left",
+          columnLabel: "调机时间",
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 80
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 6023,
+          serialNumber: '6023TableFactorUnit',
           tableId: "6023Table",
+          tableName: "查询生产派工单表",
+          columnProp: "factorUnit",
+          headerAlign: "center",
+          align: "left",
+          columnLabel: "产出单位",
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
           status: true,
-          languageCode: this.$i18n.locale
+          fixed: '',
+          columnWidth: 80
         },
-        // 用户table 配置集合
-        userColumnList: [],
+        {
+          userId: this.$store.state.user.name,
+          functionId: 6023,
+          serialNumber: '6023TableSite',
+          tableId: "6023Table",
+          tableName: "查询生产派工单表",
+          columnProp: "site",
+          headerAlign: "center",
+          align: "left",
+          columnLabel: "工厂编号",
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 80
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 6023,
+          serialNumber: '6023TableSeqNo',
+          tableId: "6023Table",
+          tableName: "查询生产派工单表",
+          columnProp: "seqNo",
+          headerAlign: "center",
+          align: "left",
+          columnLabel: "派工单单号",
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 80
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 6023,
+          serialNumber: '6023TableQtyScheduledPreOps',
+          tableId: "6023Table",
+          tableName: "查询生产派工单表",
+          columnProp: "qtyScheduledPreOps",
+          headerAlign: "center",
+          align: "left",
+          columnLabel: "前道工序已排产数量",
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 150
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 6023,
+          serialNumber: '6023TableLatethanShipTime',
+          tableId: "6023Table",
+          tableName: "查询生产派工单表",
+          columnProp: "latethanShipTime",
+          headerAlign: "center",
+          align: "left",
+          columnLabel: "晚于发货时间",
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 100
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 6023,
+          serialNumber: '6023TableTimeRequiredOriginal',
+          tableId: "6023Table",
+          tableName: "查询生产派工单表",
+          columnProp: "requiredOriginal",
+          headerAlign: "center",
+          align: "left",
+          columnLabel: "派工单需求工时",
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 120
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 6023,
+          serialNumber: '6023TableParkFlag',
+          tableId: "6023Table",
+          tableName: "查询生产派工单表",
+          columnProp: "parkFlag",
+          headerAlign: "center",
+          align: "left",
+          columnLabel: "暂停",
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 60
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 6023,
+          serialNumber: '6023TableQtyRequiredOriginal',
+          tableId: "6023Table",
+          tableName: "查询生产派工单表",
+          columnProp: "qtyRequiredOriginal",
+          headerAlign: "center",
+          align: "left",
+          columnLabel: "派工单需求数量",
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 100
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 6023,
+          serialNumber: '6023TableCustPartNo',
+          tableId: "6023Table",
+          tableName: "查询生产派工单表",
+          columnProp: "custPartNo",
+          headerAlign: "center",
+          align: "left",
+          columnLabel: "客户产品料号",
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 100
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 6023,
+          serialNumber: '6023TableClosedby',
+          tableId: "6023Table",
+          tableName: "查询生产派工单表",
+          columnProp: "closedby",
+          headerAlign: "center",
+          align: "left",
+          columnLabel: "关闭人",
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 80
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 6023,
+          serialNumber: '6023TableClosedDate',
+          tableId: "6023Table",
+          tableName: "查询生产派工单表",
+          columnProp: "closedDate",
+          headerAlign: "center",
+          align: "left",
+          columnLabel: "关闭日期",
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 100
+        }
+      ],
+      queryTable: {
+        userId: this.$store.state.user.name,
+        functionId: this.$route.meta.menuId,
+        tableId: "6023Table",
+        languageCode: this.$i18n.locale
+      },
+      // 用户table 查询参数
+      queryTableUser: {
+        userId: this.$store.state.user.name,
+        functionId: this.$route.meta.menuId,
+        tableId: "6023Table",
+        status: true,
+        languageCode: this.$i18n.locale
+      },
+      // 用户table 配置集合
+      userColumnList: [],
+    }
+  },
+  components: {
+    Chooselist,
+    column,/*动态列*/
+  },
+  watch: {
+    searchData: {
+      deep: true,
+      handler: function (newV, oldV) {
+        this.searchData.partNo = this.searchData.partNo.toUpperCase()
+        this.searchData.sResourceID = this.searchData.sResourceID.toUpperCase()
+        this.searchData.orderNo = this.searchData.orderNo.toUpperCase()
+        this.searchData.workCenterNo = this.searchData.workCenterNo.toUpperCase()
       }
     },
-    components: {
-      Chooselist,
-      column,/*动态列*/
+    $route: {
+      handler: function (val, oldVal) {
+        this.$router.onReady(() => {
+          if (this.$route.query.orderNo) {
+            this.searchData.orderNo = this.$route.query.orderNo,
+              this.getData()
+          }
+        })
+      },
+      // 深度观察监听
+      deep: true
+    },
+  },
+  mounted() {
+    this.$nextTick(() => {
+      this.height = window.innerHeight - 180;
+    })
+  },
+
+  methods: {
+    getBaseData(val) {
+      if (this.tagNo === 24) {
+        this.searchData.workCenterNo = val.WorkCenterNo
+      }
+      if (this.tagNo === 88) {
+        this.searchData.sResourceID = val.ResourceID
+      }
+      if (this.tagNo === 5) {
+        this.searchData.partNo = val.PartNo
+      }
+      if (this.tagNo === 18) {
+        this.searchData.site = val.Site
+      }
     },
-    mounted() {
+    // 获取基础数据列表
+    getBaseList(val) {
+      this.tagNo = val
       this.$nextTick(() => {
-        this.height = window.innerHeight - 180;
-      })
-    },
-    methods: {
-      getBaseData(val){
-        if (this.tagNo === 24){
-          this.searchData.workCenterNo = val.WorkCenterNo
+        let strVal = "";
+        if (val === 24) {
+          strVal = this.searchData.workCenterNo
         }
-        if (this.tagNo === 88){
-          this.searchData.sResourceID = val.ResourceID
+        if (val === 88) {
+          strVal = this.searchData.sResourceID
         }
-        if (this.tagNo === 5){
-          this.searchData.partNo = val.PartNo
+        if (val === 5) {
+          strVal = this.searchData.partNo
         }
-        if (this.tagNo === 18){
-          this.searchData.site = val.Site
+        if (val === 18) {
+          strVal = this.searchData.site
         }
-      },
-      // 获取基础数据列表
-      getBaseList(val){
-        this.tagNo = val
-        this.$nextTick(() => {
-          let strVal = "";
-          if (val === 24){
-            strVal = this.searchData.workCenterNo
-          }
-          if (val === 88){
-            strVal = this.searchData.sResourceID
-          }
-          if (val === 5){
-            strVal = this.searchData.partNo
-          }
-          if (val === 18){
-            strVal = this.searchData.site
-          }
-          this.$refs.baseList.init(val,strVal)
-        })
-      },
+        this.$refs.baseList.init(val, strVal)
+      })
+    },
 
-      getData(){
-        searchProductionDispatchList(this.searchData).then(({data}) => {
-          this.dataList = data.rows
-        });
-        this.scheduleRow = null;
-      },
-      //导出excel
-      createExportData() {
+    getData() {
+      searchProductionDispatchList(this.searchData).then(({data}) => {
+        this.dataList = data.rows
+      });
+      this.scheduleRow = null;
+    },
+    //导出excel
+    createExportData() {
 
-        return this.dataList;
+      return this.dataList;
 
-      },
-      startDownload() {
-        //  this.exportData = this.dataList
+    },
+    startDownload() {
+      //  this.exportData = this.dataList
 
-      },
-      finishDownload() {
+    },
+    finishDownload() {
 
-      },
-      fields() {
-        let json = "{"
-        this.columnList.forEach((item, index) => {
-          if (index == this.columnList.length - 1) {
-            json += "\"" + item.columnLabel + "\"" + ":" + "\"" + item.columnProp + "\""
-          } else {
-            json += "\"" + item.columnLabel + "\"" + ":" + "\"" + item.columnProp + "\"" + ","
-          }
-        })
-        json += "}"
-        let s = eval("(" + json + ")")
+    },
+    fields() {
+      let json = "{"
+      this.columnList.forEach((item, index) => {
+        if (index == this.columnList.length - 1) {
+          json += "\"" + item.columnLabel + "\"" + ":" + "\"" + item.columnProp + "\""
+        } else {
+          json += "\"" + item.columnLabel + "\"" + ":" + "\"" + item.columnProp + "\"" + ","
+        }
+      })
+      json += "}"
+      let s = eval("(" + json + ")")
 
-        return s
-      },
-      // 导出 end
+      return s
+    },
+    // 导出 end
+
+    /*设置派工单的行*/
+    setCurrentSchedulingRow(row, column, event) {
+      this.scheduleRow = JSON.parse(JSON.stringify(row));
+    },
 
-      /*设置派工单的行*/
-      setCurrentSchedulingRow(row, column, event) {
+    /*当前值发生变化的时候修改*/
+    currentSchedulingRow(row, oldRow) {
+      //判断是否是获取焦点的事件
+      if (row) {
         this.scheduleRow = JSON.parse(JSON.stringify(row));
-      },
+      }
+    },
 
-      /*当前值发生变化的时候修改*/
-      currentSchedulingRow(row, oldRow){
-        //判断是否是获取焦点的事件
-        if(row){
-          this.scheduleRow = JSON.parse(JSON.stringify(row));
-        }
-      },
+    /*提示取消派工单*/
+    warnCancelScheduleConfirm(row, $event, column) {
+      //先判断是否已经选好了行要操作
+      if (!this.scheduleRow) {
+        this.$message.warning('请先选择派工单!');
+        return false;
+      }
+      //提示操作
+      this.$confirm('确实要取消该派工单吗?', '提示', {
+        confirmButtonText: '确认',
+        celButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        //执行创建新卷的操作
+        this.cancelScheduleBun();
+      });
+    },
 
-      /*提示取消派工单*/
-      warnCancelScheduleConfirm(row, $event, column){
-        //先判断是否已经选好了行要操作
-        if(!this.scheduleRow){
-          this.$message.warning('请先选择派工单!');
-          return false;
+    /*取消派工单的操作*/
+    cancelScheduleBun() {
+      //设置参数
+      this.pageData.orderNo = this.scheduleRow.orderNo;
+      this.pageData.itemNo = this.scheduleRow.itemNo;
+      this.pageData.seqNo = this.scheduleRow.seqNo;
+      this.pageData.scheduledQty = this.scheduleRow.qtyRequired;
+      this.pageData.workCenterNo = this.scheduleRow.workCenterNo;
+      this.pageData.resourceId = this.scheduleRow.sResourceID;
+      this.pageData.scheduleSeqNo = this.scheduleRow.sScheduledSeqNo;
+      this.pageData.lotSize = this.scheduleRow.lotSize;
+      this.pageData.planStartTime = this.scheduleRow.planStartTime;
+      //取消排产
+      cancelScheduleWithScheduleQuery(this.pageData).then(({data}) => {
+        if (data.code == 500) {
+          this.$message.error(data.msg);
+        } else {
+          this.$message.success(data.msg);
+          //刷新排产的数据
+          this.getData();
         }
-        //提示操作
-        this.$confirm('确实要取消该派工单吗?', '提示', {
-          confirmButtonText: '确认',
-          celButtonText: '取消',
-          type: 'warning'
-        }).then(() =>{
-          //执行创建新卷的操作
-          this.cancelScheduleBun();
-        });
-      },
+      });
+    },
 
-      /*取消派工单的操作*/
-      cancelScheduleBun(){
-        //设置参数
-        this.pageData.orderNo = this.scheduleRow.orderNo;
-        this.pageData.itemNo = this.scheduleRow.itemNo;
-        this.pageData.seqNo = this.scheduleRow.seqNo;
-        this.pageData.scheduledQty = this.scheduleRow.qtyRequired;
-        this.pageData.workCenterNo = this.scheduleRow.workCenterNo;
-        this.pageData.resourceId = this.scheduleRow.sResourceID;
-        this.pageData.scheduleSeqNo = this.scheduleRow.sScheduledSeqNo;
-        this.pageData.lotSize = this.scheduleRow.lotSize;
-        this.pageData.planStartTime = this.scheduleRow.planStartTime;
-        //取消排产
-        cancelScheduleWithScheduleQuery(this.pageData).then(({data}) => {
-          if(data.code == 500){
-            this.$message.error(data.msg);
-          }else{
-            this.$message.success(data.msg);
-            //刷新排产的数据
-            this.getData();
-          }
-        });
-      },
 
+    // 打开页面设置
+    userSetting() {
+      this.visible = true;
+      let queryTable = {
+        userId: this.$store.state.user.name,
+        functionId: this.$route.meta.menuId,
+        tableId: "6023Table",
+        languageCode: this.$i18n.locale
+      }
+      this.$nextTick(() => {
+        this.$refs.column.init(queryTable);
+      });
+    },
+    // 获取 用户保存的 格式列
+    getTableUserColumn() {
+      getTableUserListLanguage(this.queryTableUser).then(({data}) => {
+        if (data.rows.length > 0) {
+          //this.columnList = []
+          this.columnList = data.rows;
+        } else {
+          this.getColumnList()
+        }
 
-      // 打开页面设置
-      userSetting() {
-        this.visible = true;
-        let queryTable = {
-          userId: this.$store.state.user.name,
+      })
+    },
+    // 保存 默认配置 列
+    async saveColumnList() {
+      // 删除所有的该页面下保存的数据
+      if (this.userColumnList) {
+        //删除 user自定义的数据
+        await removerUser(this.queryTable)
+      }
+      // 删除默认配置
+      await removerDefault(this.queryTable)
+      // 保存页面 table属性
+      let sumColumnList = this.columnList;//concat(this.columnList1);
+      sumColumnList = sumColumnList.map(item => {
+        return item = {
+          tableId: item.tableId,
+          tableName: item.tableName,
+          columnProp: item.columnProp,
+          columnLabel: item.columnLabel,
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: item.columnSortable,
+          columnWidth: item.columnWidth,
+          format: item.format,
           functionId: this.$route.meta.menuId,
-          tableId: "6023Table",
-          languageCode: this.$i18n.locale
+          sortLv: item.sortLv,
+          status: true,
+          fixed: item.fixed,
+          serialNumber: item.serialNumber,
+          columnType: item.columnType,
+          align: item.align
         }
-        this.$nextTick(() => {
-          this.$refs.column.init(queryTable);
-        });
-      },
-      // 获取 用户保存的 格式列
-      getTableUserColumn() {
-        getTableUserListLanguage(this.queryTableUser).then(({data}) => {
-          if (data.rows.length > 0) {
-            //this.columnList = []
-            this.columnList = data.rows;
-          } else {
-            this.getColumnList()
-          }
+      })
 
-        })
-      },
-      // 保存 默认配置 列
-      async saveColumnList() {
-        // 删除所有的该页面下保存的数据
-        if (this.userColumnList) {
-          //删除 user自定义的数据
-          await removerUser(this.queryTable)
+      await saveTableDefaultList(sumColumnList)
+      // 保存页面 button label title 属性
+      /* let buttons = this.buttonList.map(item => {
+         return item = {
+           functionId: this.$route.meta.menuId,
+           languageValue: item.languageValue,
+           objectId: item.objectId,
+           objectType: item.objectType,
+           tableId: item.tableId
+         }
+       })
+       await saveButtonList(buttons)*/
+      this.getFunctionButtonList()
+      this.getColumnList()
+    },
+    // 获取 tableDefault 列
+    getColumnList() {
+      getTableDefaultListLanguage(this.queryTable).then(({data}) => {
+        if (!data.rows.length == 0) {
+          // this.showDefault = false
+          this.columnList = data.rows
+        } else {
+          // this.showDefault = true
         }
-        // 删除默认配置
-        await removerDefault(this.queryTable)
-        // 保存页面 table属性
-        let sumColumnList = this.columnList;//concat(this.columnList1);
-        sumColumnList = sumColumnList.map(item => {
-          return item = {
-            tableId: item.tableId,
-            tableName: item.tableName,
-            columnProp: item.columnProp,
-            columnLabel: item.columnLabel,
-            columnHidden: false,
-            columnImage: false,
-            columnSortable: item.columnSortable,
-            columnWidth: item.columnWidth,
-            format: item.format,
-            functionId: this.$route.meta.menuId,
-            sortLv: item.sortLv,
-            status: true,
-            fixed: item.fixed,
-            serialNumber: item.serialNumber,
-            columnType: item.columnType,
-            align: item.align
-          }
-        })
-
-        await saveTableDefaultList(sumColumnList)
-        // 保存页面 button label title 属性
-        /* let buttons = this.buttonList.map(item => {
-           return item = {
-             functionId: this.$route.meta.menuId,
-             languageValue: item.languageValue,
-             objectId: item.objectId,
-             objectType: item.objectType,
-             tableId: item.tableId
-           }
-         })
-         await saveButtonList(buttons)*/
-        this.getFunctionButtonList()
-        this.getColumnList()
-      },
-      // 获取 tableDefault 列
-      getColumnList() {
-        getTableDefaultListLanguage(this.queryTable).then(({data}) => {
-          if (!data.rows.length == 0) {
-            // this.showDefault = false
-            this.columnList = data.rows
-          } else {
-            // this.showDefault = true
-          }
-        })
-      },
-
+      })
     },
-    created() {
 
-      //初始化动态的表头
-      this.getTableUserColumn();
+  },
+  created() {
+
+    //初始化动态的表头
+    this.getTableUserColumn();
 
-    }
   }
+}
 </script>
 
-<style >
-  .el-textarea__inner {
-    padding: 5px 5px;
-  }
+<style>
+.el-textarea__inner {
+  padding: 5px 5px;
+}
 </style>
diff --git a/src/views/modules/shopOrder/shopOrder/common/tool_add_and_edit.vue b/src/views/modules/shopOrder/shopOrder/common/tool_add_and_edit.vue
index fc11e50..8df3c2f 100644
--- a/src/views/modules/shopOrder/shopOrder/common/tool_add_and_edit.vue
+++ b/src/views/modules/shopOrder/shopOrder/common/tool_add_and_edit.vue
@@ -5,7 +5,7 @@
       @close="closeDialog"
       width="390px"
       class="sxm"
-      :title="titleCon"
+      :title="titile"
       :close-on-click-modal="false"
       :visible.sync="visible">
       <el-form :inline="true" label-position="top" style="margin-left: 7px;margin-top: 0px;">
@@ -130,7 +130,9 @@
           objectType: 'button'
         },
         labels: {
-          titleCon: '工具信息维护',
+          titleCon: '工具新增',
+          titleEdit: '工具信息维护',
+          titleCopy: '复制工具信息',
           itemNo: '工序号：',
           itemDesc: '工序名称：',
           toolId: '工具编码：',
@@ -159,16 +161,17 @@
           this.oriToolId = selectRow.toolId;
         } else  if (operationType === 2){
           this.operationFlag = true;
+          this.selectRow.itemNo = '';
         } else {
           this.operationFlag = false;
         }
         //设置标题
         if(operationType === 0){
-          this.titile = '新增工具信息';
+          this.titile = this.labels.titleCon
         }else if(operationType === 1){
-          this.titile = '编辑工具信息';
+          this.titile = this.labels.titleEdit
         }else if(operationType === 2){
-          this.titile = '复制工具信息';
+          this.titile = this.labels.titleCopy
         }
         //查询当前工单的工序信息
         this.searchShopOrderSoRouting();
diff --git a/src/views/modules/shopOrder/shopOrder/shopOrder.vue b/src/views/modules/shopOrder/shopOrder/shopOrder.vue
index 9e15449..a603c4e 100644
--- a/src/views/modules/shopOrder/shopOrder/shopOrder.vue
+++ b/src/views/modules/shopOrder/shopOrder/shopOrder.vue
@@ -35,14 +35,16 @@
         <el-form :inline="true" label-position="top" label-width="100px" style="margin-top: 0px;">
           <el-dropdown trigger="click" style="margin-top: 3px" class="customer-dropdown" @command="handleCommand">
             <el-button type="primary" :disabled="authEdit">
-              {{ buttons.orderPrimaryMenu }}<i class="el-icon-arrow-down el-icon--right"></i>
+              {{ buttons.orderPrimaryMenu?buttons.orderPrimaryMenu:'主菜单' }}<i class="el-icon-arrow-down el-icon--right"></i>
             </el-button>
             <el-dropdown-menu slot="dropdown">
               <el-dropdown-item class="customer-li" command="orderToScheduling"><span>{{
-                  buttons.orderToScheduling
+                  buttons.orderToScheduling?buttons.orderToScheduling: '查看派工单信息'
                 }}</span>
               </el-dropdown-item>
-              <el-dropdown-item class="customer-li" command="changeRouting"><span>{{ buttons.changeRouting }}</span>
+              <el-dropdown-item class="customer-li" command="changeRouting"><span>{{
+                  buttons.changeRouting ? buttons.changeRouting :'变更工艺路线'
+                }}</span>
               </el-dropdown-item>
             </el-dropdown-menu>
           </el-dropdown>
@@ -264,10 +266,8 @@
                 {{ buttons.routingPrimaryMenu }}<i class="el-icon-arrow-down el-icon--right"></i>
               </el-button>
               <el-dropdown-menu slot="dropdown">
-                <el-dropdown-item class="customer-li" command="0"><span>{{ buttons.routingMenu }}</span>
+                <el-dropdown-item class="customer-li" command="routingMenu"><span>{{ buttons.routingMenu }}</span>
                 </el-dropdown-item>
-              </el-dropdown-menu>
-              <el-dropdown-menu slot="dropdown">
                 <el-dropdown-item class="customer-li" command="routingResource"><span>{{ buttons.resources }}</span>
                 </el-dropdown-item>
               </el-dropdown-menu>
@@ -304,7 +304,7 @@
           </el-col>
         </el-row>
       </el-tab-pane>
-      <el-tab-pane :label=labels.toolLabel name="forth">
+      <el-tab-pane :label="labels.toolLabel?labels.toolLabel:'工具'" name="forth">
         <el-row>
           <el-col :span="24">
             <download-excel
@@ -1979,7 +1979,7 @@ export default {
     // 选中菜单出发
     handleCommand(command) {
       switch (command) {
-        case '0':
+        case 'routingMenu':
           // 工序操作
           this.getRouting()
           break;