From c716fcd0479b00d0c8e849305135d1310d2cff52 Mon Sep 17 00:00:00 2001
From: "[li_she]" <[li.she@xujiesoft.com]>
Date: Mon, 20 Jun 2022 09:14:35 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B7=A5=E5=BA=8F=E6=8A=A5=E5=91=8A,=E7=94=9F?=
 =?UTF-8?q?=E4=BA=A7=E8=AE=A2=E5=8D=95=E5=B7=A5=E5=BA=8F=E7=BB=B4=E6=8A=A4?=
 =?UTF-8?q?=202022-06-14=20sxm?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/shopOrder/productionReport.js         |    3 +
 src/api/shopOrder/shopOrder.js                |   24 +
 src/assets/scss/global.scss                   |    4 +-
 src/main.js                                   |    2 +-
 src/utils/common.js                           |   27 +-
 src/{ => utils}/directives.js                 |    0
 .../common/productionLineYieldReport.vue      |  353 ++
 .../searchItemToBeProduct.vue                 |  253 +-
 .../shopOrder/shopOrder/common/routing.vue    |  631 +++
 .../shopOrder/common/routingAddAndEdit.vue    |  376 ++
 .../modules/shopOrder/shopOrder/shopOrder.vue | 3590 +++++++++--------
 src/views/modules/sys/language/common.vue     |    6 +-
 src/views/modules/sys/user.vue                |    4 +-
 13 files changed, 3419 insertions(+), 1854 deletions(-)
 rename src/{ => utils}/directives.js (100%)
 create mode 100644 src/views/modules/shopOrder/productionReport/common/productionLineYieldReport.vue
 create mode 100644 src/views/modules/shopOrder/shopOrder/common/routing.vue
 create mode 100644 src/views/modules/shopOrder/shopOrder/common/routingAddAndEdit.vue

diff --git a/src/api/shopOrder/productionReport.js b/src/api/shopOrder/productionReport.js
index d18f0a0..4eda136 100644
--- a/src/api/shopOrder/productionReport.js
+++ b/src/api/shopOrder/productionReport.js
@@ -29,3 +29,6 @@ export const searchReportInOrderNo = data => createAPI(`/productionReport/search
 
 // 取消报工
 export const cancelReport = data => createAPI(`/productionReport/cancelReport`,'post',data)
+
+// 工序报工
+export const saveYieldReport = data => createAPI(`/schedule/saveYieldReport`,'post',data)
diff --git a/src/api/shopOrder/shopOrder.js b/src/api/shopOrder/shopOrder.js
index 9ca9806..b51c45e 100644
--- a/src/api/shopOrder/shopOrder.js
+++ b/src/api/shopOrder/shopOrder.js
@@ -53,5 +53,29 @@ export const closeShopOrder = data => createAPI('/shopOrder/closeShopOrder', 'po
 //打开工单
 export const openShopOrder = data => createAPI('/shopOrder/openShopOrder', 'post', data)
 
+// 获取 订单工序
+export const getRouteInShopOrder = data => createAPI('/shopOrder/getRouteInShopOrder', 'post', data)
+
+// 删除 订单工序
+export const deleteRouteInShopOrder = data => createAPI('/shopOrder/deleteRouteInShopOrder', 'post', data)
+
+// 保存 订单工序
+export const insertRouteInShopOrder = data => createAPI('/shopOrder/insertRouteInShopOrder', 'post', data)
+
+// 修改 工单工序
+export const updateRouteInShopOrder = data => createAPI('/shopOrder/updateRouteInShopOrder', 'post', data)
+
+// 获取工单工序需求时间
+export const getRoutingTimeRequired = data => createAPI('/shopOrder/getRoutingTimeRequired', 'post', data)
+
+// 获取 加工中心信息
+export const getWorkCenterInfo = data => createAPI('/shopOrder/getWorkCenterInfo', 'post', data)
+
+// 获取订单最大工序
+export const getOrderNoRouteInMaxItemNo = data => createAPI('/shopOrder/getOrderNoRouteInMaxItemNo', 'post', data)
+
+// 获取订单可用机台
+export const getOrderNoItemNoCenter = data => createAPI('/shopOrder/getOrderNoItemNoCenter', 'post', data)
+
 
 
diff --git a/src/assets/scss/global.scss b/src/assets/scss/global.scss
index 97e2d69..4bde4e3 100644
--- a/src/assets/scss/global.scss
+++ b/src/assets/scss/global.scss
@@ -49,7 +49,7 @@
   font-size: 12px;
 }
 .el-button--medium {
-  padding: 5px 11px;
+  padding: 3px 10px;
   font-size: 12px;
   border-radius: 4px;
 }
@@ -235,7 +235,7 @@ div.el-time-width{
 }
 /* 全局时间右边框*/
 input.el-input__inner{
-  height: 22px !important;
+  height: 20px !important;
   padding-right: 0px !important;
 }
 
diff --git a/src/main.js b/src/main.js
index 4d00eb4..073463b 100644
--- a/src/main.js
+++ b/src/main.js
@@ -13,7 +13,7 @@ import { isAuth } from '@/utils'
 import cloneDeep from 'lodash/cloneDeep'
 import JsonExcel from 'vue-json-excel'
 import i18n from '@/i18n/i18n'
-import './directives'
+import './utils/directives'
 import decimalUtil from '@/utils/decimalUtil.js'
 import getLodop from '@/utils/LodopFuncs.js'
 import pdf from 'vue-pdf'
diff --git a/src/utils/common.js b/src/utils/common.js
index 05261d5..82c789d 100644
--- a/src/utils/common.js
+++ b/src/utils/common.js
@@ -1,34 +1,31 @@
 // 防抖
-export function debounce(fn,wait = 3000 ){
-  let  timer = null;
+export function debounce(fn, wait = 3000) {
+  let timer = null;
   return function () {
-    console.log('开始抖')
     console.log(wait)
     let args = arguments;
-    let that =  this;
-    if (timer){
+    let that = this;
+    if (timer) {
       clearTimeout(timer)
     }
-    console.log('开始防抖')
     timer = setTimeout(function () {
       timer = null;
-      console.log('开始防抖')
-      fn.apply(that,args)
-    },wait)
+      fn.apply(that, args)
+    }, wait)
   }
 }
 
 // 节流
-export function throttle(fn,wait = 3000 ){
-  let  timer = null;
+export function throttle(fn, wait = 3000) {
+  let timer = null;
   return function () {
-    if (timer !=null  ) return;
+    if (timer != null) return;
     let args = arguments;
-    let that =  this;
+    let that = this;
     clearTimeout(timer)
-    fn.apply(that,args)
+    fn.apply(that, args)
     timer = setTimeout(function () {
       timer = null;
-    },wait)
+    }, wait)
   }
 }
diff --git a/src/directives.js b/src/utils/directives.js
similarity index 100%
rename from src/directives.js
rename to src/utils/directives.js
diff --git a/src/views/modules/shopOrder/productionReport/common/productionLineYieldReport.vue b/src/views/modules/shopOrder/productionReport/common/productionLineYieldReport.vue
new file mode 100644
index 0000000..67b24ee
--- /dev/null
+++ b/src/views/modules/shopOrder/productionReport/common/productionLineYieldReport.vue
@@ -0,0 +1,353 @@
+<template>
+  <div>
+    <el-dialog
+      v-drag
+      @close="closeDialog"
+      width="520px"
+      :title="'产量报告'"
+      :close-on-click-modal="false"
+      :visible.sync="visible">
+      <el-form :inline="true" label-position="top" label-width="100px" style="margin-top: 0px;">
+        <fieldset class="customer-fieldset" style="width: 482px; height: 100% ;margin-top: -10px">
+          <legend class="customer-legend">产量报告</legend>
+          <fieldset class="customer-fieldset" style="width: 482px; height: 100%;margin-top: -5px">
+            <legend class="customer-legend">订单信息</legend>
+            <el-row class="customer-input-color-red">
+              <el-col :span="24" style="margin-top: -10px">
+                <el-form-item :label="'工厂'">
+                  <el-input disabled v-model="itemData.site"></el-input>
+                </el-form-item>
+                <el-form-item :label="'生产订单号'">
+                  <el-input disabled v-model="itemData.orderNo"></el-input>
+                </el-form-item>
+                <el-form-item :label="'物料编码'">
+                  <el-input disabled v-model="itemData.partNo"></el-input>
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row class="customer-input-color-red">
+              <el-col :span="24" style="margin-top: -10px">
+                <el-form-item :label="'订单数量'">
+                  <el-input disabled v-model="itemData.qtyRequired"></el-input>
+                </el-form-item>
+                <el-form-item :label="'工序号'">
+                  <el-input disabled v-model="itemData.itemNo"></el-input>
+                </el-form-item>
+                <el-form-item :label="'工序名称'">
+                  <el-input disabled v-model="itemData.operationDesc"></el-input>
+                </el-form-item>
+              </el-col>
+            </el-row>
+          </fieldset>
+          <div style="margin-left: 5px">
+            <el-row>
+              <el-col :span="24" style="margin-top: 0px">
+                <el-form-item>
+                  <span slot="label"><el-link @click="getBaseList(26)">{{'操作员'}}</el-link></span>
+                  <el-input v-model="itemData.operator"></el-input>
+                </el-form-item>
+                <el-form-item :label="'开工时间'">
+                  <el-date-picker format="yyyy-MM-dd HH:mm:ss" value-format="yyyy-MM-dd HH:mm:ss" type="datetime"
+                                  style='width: 145px;' v-model="itemData.startTime"></el-date-picker>
+                </el-form-item>
+                <el-form-item :label="'生产时间'">
+                  <el-input class="customer-input-color-red" disabled v-model="itemData.produceTime"></el-input>
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row>
+              <el-col :span="24" style="margin-top: -10px">
+                <el-form-item :label="'操作员姓名'">
+                  <el-input v-model="itemData.operatorName" disabled></el-input>
+                </el-form-item>
+                <el-form-item :label="'完工时间'">
+                  <el-date-picker format="yyyy-MM-dd HH:mm:ss" value-format="yyyy-MM-dd HH:mm:ss" type="datetime"
+                                  style='width: 145px;' v-model="itemData.finishTime"></el-date-picker>
+                </el-form-item>
+                <el-form-item :label="'停机时间'">
+                  <el-input type="number" oninput="value=value.replace(/[^0-9.]/g,'')" min="0"
+                            v-model="itemData.downtime"></el-input>
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row>
+              <el-col :span="24" style="margin-top: -10px">
+                <el-form-item :label="'合格数量'">
+                  <el-input type="number" oninput="value=value.replace(/[^0-9.]/g,'')" min="0"
+                            v-model="itemData.qualifiedQty"></el-input>
+                </el-form-item>
+                <el-form-item :label="'不合格数量'">
+                  <el-input type="number" min="0" oninput="value=value.replace(/[^0-9.]/g,'')"
+                            v-model="itemData.qualifiedNotQty"></el-input>
+                </el-form-item>
+                <el-form-item :label="'报告数量'">
+                  <el-input disabled class="customer-input-color-red" v-model="itemData.reportQty"></el-input>
+                </el-form-item>
+              </el-col>
+            </el-row>
+          </div>
+          <el-row>
+            <el-col :span="24" style="margin-top: -10px">
+              <fieldset class="customer-fieldset" style="width: 482px; height: 100% ;margin-top: 5px">
+                <legend class="customer-legend">排产班次信息</legend>
+                <el-row>
+                  <el-col :span="24" style="margin-top: -10px">
+                    <el-form-item class="customer-item" label="排产日期:">
+                      <el-input v-model="pageData.scheduledDate" disabled="disabled" style="width: 120px;"></el-input>
+                    </el-form-item>
+                    <el-form-item class="customer-item" label="班次:">
+                      <el-input v-model="pageData.shiftDesc" class="customer-input-color-red" readonly="readonly"
+                                style="width: 120px;"></el-input>
+                    </el-form-item>
+                    <el-button type="info" :disabled="buttonTags.selectShiftFlag" plain @click="selectSchduleShiftModal"
+                               style="margin-left: -10px; margin-top: 20px; height: 20px; padding: 3px 3px;">
+                      <icon-svg name="ellipsis" style="height: 10px; width: 10px;"></icon-svg>
+                    </el-button>
+                  </el-col>
+                </el-row>
+              </fieldset>
+            </el-col>
+          </el-row>
+          <div style="margin-left: 5px">
+            <el-row>
+              <el-col :span="24">
+                <el-form-item :label="'备注'">
+                  <el-input v-model="itemData.remark" style="width:475PX"></el-input>
+                </el-form-item>
+              </el-col>
+            </el-row>
+          </div>
+        </fieldset>
+      </el-form>
+      <span slot="footer" class="dialog-footer">
+      <el-button type="primary" @click="saveYieldReport">保存</el-button>
+      <el-button @click="visible = false" type="primary">取消</el-button>
+    </span>
+    </el-dialog>
+
+    <!-- 班次选择组件 -->
+    <comSelectShift ref="comSelectShift" :close-on-click-modal="false"
+                    :visible.sync="showShiftFlag"
+                    @initScheduleShift="initScheduleShift">
+    </comSelectShift>
+    <!--基础列表-->
+    <Chooselist ref="baseList" @getBaseData="getBaseData"></Chooselist>
+  </div>
+</template>
+
+<script>
+  import {
+    saveYieldReport
+  } from "@/api/shopOrder/productionReport.js"
+  import {getScheduleShiftData} from '@/api/yieldReport/com_finish_roll.js';
+  import comSelectShift from "../../../yieldReport/com_select_shift";
+  import Chooselist from '@/views/modules/common/Chooselist'
+
+  export default {
+    data() {
+      return {
+        visible: false,
+        showShiftFlag: false,
+        itemData: {
+          site: '',
+          orderNo: '',
+          itemNo: '',
+          rollNo: '*',
+          operator: '',
+          operatorName: '',
+          operationDesc: '',
+          qtyRequired: 0,
+          qualifiedQty: 1,
+          qualifiedNotQty: 0,
+          reportQty: 0,
+          startTime: this.dayjs().format('YYYY-MM-DD HH:mm:ss'),
+          finishTime: this.dayjs().format('YYYY-MM-DD HH:mm:ss'),
+          produceTime: 0,
+          downtime: 0,
+          partNo: '',
+          enterDate: '',
+          remark: ''
+        },
+        pageData: {
+          site: this.$store.state.user.site,
+          username: this.$store.state.user.name,
+          resourceId: '',
+          reportedTime: this.dayjs().format('YYYY-MM-DD HH:mm:ss'),
+          reportedFlag: 'N',
+          scheduledDate: this.dayjs().format('YYYY-MM-DD'),
+          shiftDesc: '无班次'
+        },
+        buttonTags: {
+          selectShiftFlag: false,
+        }
+      }
+    },
+    watch: {
+      itemData: {
+        deep: true,
+        handler: function (newV, oldV) {
+          this.itemData.reportQty = Number(this.itemData.qualifiedQty) + Number(this.itemData.qualifiedNotQty)
+          let time = (this.dayjs(this.itemData.finishTime).diff(this.dayjs(this.itemData.startTime), 'minutes') / 60).toFixed(2)
+          this.itemData.produceTime = isNaN(time) ? 0 : time
+        }
+      }
+    },
+    components: {
+      comSelectShift,/*班次选择的组件*/
+      Chooselist,
+    },
+    mounted() {
+      this.$nextTick(() => {
+        this.height = window.innerHeight - 160;
+      })
+    },
+    methods: {
+      closeDialog() {
+        this.$nextTick(() => {
+          Object.assign(this.$data, this.$options.data.call(this));
+        })
+      },
+      init(row) {
+        this.visible = true
+        this.itemData = Object.assign(this.itemData, row)
+        // this.getScheduleShiftFlag()
+      },
+      // 保存报工信息
+      saveYieldReport() {
+
+        if (!this.itemData.operator) {
+          this.$message.warning('请选择操作员!')
+          return
+        }
+        if (this.itemData.produceTime <= 0) {
+          this.$message.warning('生产时间必须大于0,请检查开工和完工时间是否正确!')
+          return
+        }
+        if (this.itemData.produceTime >= 12) {
+          this.$message.warning('生产时间不能大12个小时,请检查开工和完工时间是否正确!')
+          return
+        }
+        if (this.itemData.qualifiedQty.length == 0 || this.itemData.qualifiedQty <= 0) {
+          this.$message.warning('合格数量，必须输入，并且必须大于0!')
+          return
+        }
+        if (this.itemData.qualifiedNotQty.length == 0) {
+          this.$message.warning('不合格数量，必须输入!')
+          return
+        }
+        if (this.pageData.shiftDesc == '无班次') {
+          this.$message.warning('该时间段内没有匹配的班次信息，请联系相关人员!')
+          return
+        }
+        let reportDto = {
+          site: this.itemData.site,
+          orderNo: this.itemData.orderNo,
+          itemNo: this.itemData.itemNo,
+          seqNo: this.itemData.seqNo,
+          rollNo: '*',
+          sfdcReportedQty: this.itemData.reportQty,
+          sfdcApproveQty: this.itemData.qualifiedQty,
+          sfdcProdTime: this.itemData.produceTime,
+          sfdcDownTime: this.itemData.downtime,
+          startTime: this.itemData.startTime,
+          tillTime: this.itemData.finishTime,
+          remark: this.itemData.remark,
+          defectedQty: this.itemData.qualifiedNotQty,
+          operatorId: this.itemData.operator,
+          currentTime: this.dayjs().format('YYYY-MM-DD HH:mm:ss'),
+          scheduledDate: this.pageData.scheduleDate,
+          shiftNo: this.pageData.shiftNo,
+          sfdcSetupTime: 0,
+          sfdcSetupDownTime: 0,
+          sfdcProdSetupTime: 0,
+          sfdcManufactureTime: Number(this.itemData.produceTime)+Number(this.itemData.downtime)
+        }
+        saveYieldReport(reportDto).then(({data}) => {
+          if (data.code == 0) {
+            this.$message.success(data.msg)
+          } else {
+            this.$message.warning(data.msg)
+          }
+        })
+
+      },
+      // 获取基础数据列表
+      getBaseList(val) {
+        this.tagNo = val
+        this.$nextTick(() => {
+          let query = this.itemData.operator
+          this.$refs.baseList.init(val, query)
+        })
+      },
+      // 操作员信息
+      getBaseData(val) {
+        this.itemData.operator = val.OperatorID
+        this.itemData.operatorName = val.OperatorName
+        this.pageData.resourceId = val.OperatorID
+        this.getScheduleShiftFlag()
+
+      },
+      //刷新派工单的班次信息
+      getScheduleShiftFlag() {
+        getScheduleShiftData(this.pageData).then(({data}) => {
+          let specialAuth = 'N';
+          //区分是否存在班次
+          if (data.code == 500) {
+            this.pageData.shiftDesc = '无班次';//重置班次
+            this.pageData.scheduledDate = '';//重置排产日期
+            this.pageData.shiftNo = '';
+          } else {
+            this.pageData.shiftDesc = data.row.shiftDesc;//重置班次
+            this.pageData.scheduledDate = data.row.scheduledDate.substring(0, 10);//重置排产日期
+            this.pageData.shiftNo = data.row.shiftNo;
+            //设置结果
+            specialAuth = data.row.specialAuth;
+          }
+          //根据不同设置不同的属性
+          if ("Y" === specialAuth) {
+            this.buttonTags.selectShiftFlag = false;
+          } else {
+            this.buttonTags.selectShiftFlag = true;
+          }
+        });
+      },
+      /*打开班次选择页面*/
+      selectSchduleShiftModal() {
+        //1.首先调用菜单判断方式  打开生产过程的材料的页面
+        //checkProduceButton('produceMaterialFlag');
+        //打开生产过程的工具的页面
+        this.$nextTick(() => {
+          this.showShiftFlag = true;
+          this.$refs.comSelectShift.init(this.pageData);
+        });
+      },
+      /*修改页面的班次和排产的时间*/
+      initScheduleShift(scheduleDate, shiftDesc, username) {
+        //重置班次和排产的时间
+        this.pageData.scheduledDate = scheduleDate.substring(0, 10);
+        this.pageData.shiftDesc = shiftDesc;
+        this.pageData.shiftNo = shiftDesc;
+        this.pageData.remark = username + "更改了班次."
+      },
+    },
+    created() {
+      this.getScheduleShiftFlag()
+    }
+  }
+</script>
+
+<style scoped lang="scss">
+  /*统一的input内容颜色样式*/
+  .customer-input-color-red /deep/ .el-input__inner {
+    color: red;
+  }
+
+  .customer-fieldset /deep/ .el-input--prefix .el-input__inner {
+    padding-left: 20px;
+  }
+
+  .customer-fieldset /deep/ .el-input__prefix {
+    left: 0px;
+  }
+
+</style>
diff --git a/src/views/modules/shopOrder/productionReport/searchItemToBeProduct.vue b/src/views/modules/shopOrder/productionReport/searchItemToBeProduct.vue
index d04fcbc..2d69255 100644
--- a/src/views/modules/shopOrder/productionReport/searchItemToBeProduct.vue
+++ b/src/views/modules/shopOrder/productionReport/searchItemToBeProduct.vue
@@ -1,75 +1,119 @@
 <template>
   <div class="mod-config">
+    <el-row>
+      <el-col :span="24">
+        <el-form :inline="true" label-position="top" label-width="100px" style="margin-top: 0px;">
+          <el-form-item>
+            <el-button @click="getData()" type="primary" style="margin-left: 2px;margin-top: 0px">{{ '查询' }}</el-button>
+            <download-excel
+              :fields="fields()"
+              :data="exportData"
+              type="xls"
+              :name="exportName"
+              :header="exportHeader"
+              :footer="exportFooter"
+              :fetch="createExportData"
+              :before-generate="startDownload"
+              :before-finish="finishDownload"
+              worksheet="导出信息"
+              class="el-button el-button--primary el-button--medium">
+              {{ buttons.download }}
+            </download-excel>
+          </el-form-item>
 
-    <el-form :inline="true" label-position="top" label-width="100px" style="margin-top: 0px;">
-      <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-form-item>
-      <el-form-item :label="'生产订单号：'">
-        <el-input v-model="searchData.orderNo" style="width: 130px"></el-input>
-      </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-button @click="getData()" type="primary" style="margin-left: 2px;margin-top: 0px">{{'查询'}}</el-button>
-        <download-excel
-          :fields="fields()"
-          :data="exportData"
-          type="xls"
-          :name="exportName"
-          :header="exportHeader"
-          :footer="exportFooter"
-          :fetch="createExportData"
-          :before-generate="startDownload"
-          :before-finish="finishDownload"
-          worksheet="导出信息"
-          class="el-button el-button--primary el-button--medium">
-          {{ buttons.download }}
-        </download-excel>
-      </el-form-item>
-
-    </el-form>
-    <el-table
-      :height="height"
-      :data="dataList"
-      border
-      v-loading="dataListLoading"
-      style="width: 100%;">
-      <el-table-column
-        v-for="(item,index) in columnList" :key="index"
-        :sortable="item.columnSortable"
-        :prop="item.columnProp"
-        :header-align="item.headerAlign"
-        :show-overflow-tooltip="item.showOverflowTooltip"
-        :align="item.align"
-        :fixed="item.fixed"
-        :width="item.columnWidth"
-        :label="item.columnLabel">
-        <template slot-scope="scope">
-          <span v-if="!item.columnHidden"> {{scope.row[item.columnProp]}}</span>
-          <span v-if="item.columnImage"><img :src="scope.row[item.columnProp]"
-                                             style="width: 100px; height: 80px"/></span>
-        </template>
-      </el-table-column>
-    </el-table>
-    <Chooselist ref="baseList"  @getBaseData="getBaseData"></Chooselist>
+        </el-form>
+      </el-col>
+    </el-row>
+    <el-row>
+      <el-col :span="24">
+        <el-form   :inline="true" label-position="top" label-width="100px" style="margin-top: 0px;">
+          <el-form-item>
+            <span slot="label" style="" @click="getBaseList(18)">  <el-link type="primary">工厂编码：</el-link></span>
+            <el-input v-model="searchData.site" style="width: 80px"></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>
+            <span slot="label" style="" @click="getBaseList(24)"><el-link type="primary" @click="getBaseList(24)">加工中心编码：</el-link></span>
+            <el-input v-model="searchData.workCenterNo" style="width: 130px"></el-input>
+          </el-form-item>
+        </el-form>
+      </el-col>
+    </el-row>
+    <el-row>
+      <el-col>
+        <el-form :inline="true">
+          <el-form-item label="查询结果">
+            <el-dropdown trigger="click" style="margin-top: 3px" class="customer-dropdown" @command="handleCommand">
+              <el-button type="primary">
+                主菜单<i class="el-icon-arrow-down el-icon--right"></i>
+              </el-button>
+              <el-dropdown-menu slot="dropdown">
+                <el-dropdown-item class="customer-li" :disabled="showFlag" command="0"><span>产量报告</span>
+                </el-dropdown-item>
+                <hr>
+                <el-dropdown-item class="customer-li" :disabled="showFlag" command="1"><span>产量查询</span>
+                </el-dropdown-item>
+                <el-divider></el-divider>
+              </el-dropdown-menu>
+            </el-dropdown>
+          </el-form-item>
+        </el-form>
+      </el-col>
+    </el-row>
+    <el-row>
+      <el-col :span="24">
+        <el-table
+          :height="height"
+          :data="dataList"
+          border
+          highlight-current-row
+          @current-change="handleCurrentChange"
+          v-loading="dataListLoading"
+          style="width: 100%;">
+          <el-table-column
+            v-for="(item,index) in columnList" :key="index"
+            :sortable="item.columnSortable"
+            :prop="item.columnProp"
+            :header-align="item.headerAlign"
+            :show-overflow-tooltip="item.showOverflowTooltip"
+            :align="item.align"
+            :fixed="item.fixed"
+            :width="item.columnWidth"
+            :label="item.columnLabel">
+            <template slot-scope="scope">
+              <span v-if="!item.columnHidden"> {{ scope.row[item.columnProp] }}</span>
+              <span v-if="item.columnImage"><img :src="scope.row[item.columnProp]"
+                                                 style="width: 100px; height: 80px"/></span>
+            </template>
+          </el-table-column>
+        </el-table>
+      </el-col>
+    </el-row>
+    <Chooselist ref="baseList" @getBaseData="getBaseData"></Chooselist>
+    <ProductionLineYieldReport ref="productionLineYieldReport" @getBaseData="getBaseData"></ProductionLineYieldReport>
   </div>
 </template>
 
 <script>
 
+
   import {
     searchItemToBeProduct
   } from "@/api/shopOrder/productionReport.js"
 
   import Chooselist from '@/views/modules/common/Chooselist'
+  import ProductionLineYieldReport from './common/productionLineYieldReport'
+
+
   export default {
     //查询-待生产工序
     name: "searchItemToBeProduct",
 
     components: {
-      Chooselist
+      Chooselist,
+      ProductionLineYieldReport
     },
     watch: {
       searchData: {
@@ -78,31 +122,41 @@
           this.searchData.orderNo = this.searchData.orderNo.toUpperCase()
           this.searchData.workCenterNo = this.searchData.workCenterNo.toUpperCase()
         }
+      },
+      selectRow:{
+        deep: true,
+        handler: function (newV, oldV) {
+          if (newV == null){
+            this.showFlag = true
+          }
+        }
       }
     },
     data() {
       return {
-        tagNo:'',
+        tagNo: '',
+        showFlag: true,
+        selectRow: {},
         // 导出 start
         exportData: [],
-        exportName: "待生产工序"+this.dayjs().format('YYYYMMDDHHmmss'),
+        exportName: "待生产工序" + this.dayjs().format('YYYYMMDDHHmmss'),
         exportHeader: ["待生产工序"],
         exportFooter: [],
         // 导出 end
         height: 200,
-        modelFlag:false,
-        modelInputFlag:true,
-        selectList:[],
+        modelFlag: false,
+        modelInputFlag: true,
+        selectList: [],
         searchData: {
-          site:'',
-          orderNo:'',
-          workCenterNo:'',
-          user:this.$store.state.user.name
+          site: '',
+          orderNo: '',
+          workCenterNo: '',
+          user: this.$store.state.user.name
         },
-        dataList:[],
+        dataList: [],
         dataListLoading: false,
-        buttons:{
-          download:'导出',
+        buttons: {
+          download: '导出',
         },
         columnList: [
           {
@@ -884,33 +938,62 @@
     },
     mounted() {
       this.$nextTick(() => {
-        this.height = window.innerHeight - 150;
+        this.height = window.innerHeight - 160;
       })
     },
+
     methods: {
-      getBaseData(val){
-        if (this.tagNo === 18){
+      // 选中菜单出发
+      handleCommand(command) {
+        if (!this.selectRow){
+          this.$message.warning('请选择工序')
+          return
+        }
+        switch (command) {
+          case '0':
+            this.productionLineYieldReport()
+            break
+          case '1':
+            break
+        }
+      },
+      // 产线产量报告
+      productionLineYieldReport() {
+        let row = JSON.parse(JSON.stringify(this.selectRow))
+        this.$nextTick(() => {
+          this.$refs.productionLineYieldReport.init( row )
+        })
+      },
+      // 选中行
+      handleCurrentChange(val) {
+        if (!val) return
+        this.showFlag = false
+        this.selectRow =  val
+      },
+      getBaseData(val) {
+        if (this.tagNo === 18) {
           this.searchData.site = val.Site
         }
-        if (this.tagNo === 24){
+        if (this.tagNo === 24) {
           this.searchData.workCenterNo = val.WorkCenterNo
         }
       },
       // 获取基础数据列表
-      getBaseList(val){
+      getBaseList(val) {
         this.tagNo = val
         this.$nextTick(() => {
           let strVal = "";
-          if (val === 18){
+          if (val === 18) {
             strVal = this.searchData.site
           }
-          if (val === 24){
+          if (val === 24) {
             strVal = this.searchData.workCenterNo
           }
-          this.$refs.baseList.init(val,strVal)
+          this.$refs.baseList.init(val, strVal)
         })
       },
-      getData(){
+      getData() {
+        this.selectRow = null
         searchItemToBeProduct(this.searchData).then(({data}) => {
           this.dataList = data.rows
         })
@@ -950,8 +1033,26 @@
   }
 </script>
 
-<style >
+<style scoped lang="scss">
   .el-textarea__inner {
     padding: 5px 5px;
   }
+
+  .el-dropdown-menu--medium .el-dropdown-menu__item {
+    line-height: 18px;
+    padding: 0 17px;
+    font-size: 12px;
+  }
+
+  hr {
+    margin-top: 0px;
+    width: 95%;
+  }
+
+  .el-dropdown-link {
+    cursor: pointer;
+    color: #409EFF;
+  }
+
+
 </style>
diff --git a/src/views/modules/shopOrder/shopOrder/common/routing.vue b/src/views/modules/shopOrder/shopOrder/common/routing.vue
new file mode 100644
index 0000000..71333e5
--- /dev/null
+++ b/src/views/modules/shopOrder/shopOrder/common/routing.vue
@@ -0,0 +1,631 @@
+<template>
+  <div class="mod-config">
+    <el-dialog
+      v-drag
+      @close="closeDialog"
+      width="880px"
+      :title="'生产订单-工艺路线维护'"
+      :close-on-click-modal="false"
+      :visible.sync="visible">
+      <el-row>
+        <el-col :span="24">
+          <el-button @click="routAddAndEdit(0)" type="primary" style="margin-left: 2px;margin-top: 0px">{{ '新增' }}
+          </el-button>
+          <el-button @click="routAddAndEdit(1)" :disabled="disabledFlag" type="primary"
+                     style="margin-left: 2px;margin-top: 0px">{{ '修改' }}
+          </el-button>
+          <el-button @click="removeRouteInShopOrder" :disabled="disabledFlag" type="primary"
+                     style="margin-left: 2px;margin-top: 0px">{{ '删除' }}
+          </el-button>
+          <el-button @click="copyRouting()" :disabled="disabledFlag" type="primary"
+                     style="margin-left: 2px;margin-top: 0px">{{ '复制' }}
+          </el-button>
+        </el-col>
+      </el-row>
+      <el-row>
+        <el-col style="margin-top: -5px" :span="24">
+          <el-form :inline="true" label-position="top" label-width="100px" style="margin-top: 0px;">
+            <el-form-item :label="'订单号'">
+              <el-input class="customer-input-color-red" disabled v-model="itemData.orderNo"></el-input>
+            </el-form-item>
+            <el-form-item :label="'物料编码'">
+              <el-input class="customer-input-color-red" disabled v-model="itemData.partNo"></el-input>
+            </el-form-item>
+            <el-form-item :label="'物料名称/规格'">
+              <el-input class="customer-input-color-red" disabled style="width: 260px"
+                        v-model="itemData.partDesc"></el-input>
+            </el-form-item>
+            <el-form-item :label="'工厂编号'">
+              <el-input class="customer-input-color-red" disabled style="width: 80px"
+                        v-model="itemData.site"></el-input>
+            </el-form-item>
+          </el-form>
+        </el-col>
+      </el-row>
+      <el-row>
+        <el-col :span="24">
+          <el-table
+            ref="routingTable"
+            :height="height"
+            :data="dataList"
+            highlight-current-row
+            @current-change="handleCurrentChange"
+            border
+            v-loading="dataListLoading"
+            style="width: 100%;">
+            <el-table-column
+              v-for="(item,index) in columnList" :key="index"
+              :sortable="item.columnSortable"
+              :prop="item.columnProp"
+              :header-align="item.headerAlign"
+              :show-overflow-tooltip="item.showOverflowTooltip"
+              :align="item.align"
+              :fixed="item.fixed"
+              :width="item.columnWidth"
+              :label="item.columnLabel">
+              <template slot-scope="scope">
+                <span v-if="!item.columnHidden"> {{ scope.row[item.columnProp] }}</span>
+                <span v-if="item.columnImage"><img :src="scope.row[item.columnProp]"
+                                                   style="width: 100px; height: 80px"/></span>
+              </template>
+            </el-table-column>
+          </el-table>
+        </el-col>
+      </el-row>
+    </el-dialog>
+
+    <RoutingAddAndEdit ref="routingAddAndEdit" @searchRouteInShopOrder="searchRouteInShopOrder"></RoutingAddAndEdit>
+  </div>
+</template>
+
+<script>
+  import {
+    getRouteInShopOrder,
+    deleteRouteInShopOrder,
+    insertRouteInShopOrder,
+    getOrderNoRouteInMaxItemNo
+  } from "@/api/shopOrder/shopOrder.js"
+
+  import RoutingAddAndEdit from './routingAddAndEdit'
+
+  export default {
+    components: {
+      RoutingAddAndEdit
+    },
+    data() {
+      return {
+        visible: false,
+        height: 350,
+        dataListLoading: false,
+        disabledFlag: true,
+        columnList: [
+          {
+            userId: this.$store.state.user.name,
+            functionId: 6031,
+            serialNumber: '6031TableItemNo',
+            tableId: "6031Table",
+            tableName: "生产订单工艺路线表",
+            columnProp: "itemNo",
+            headerAlign: "center",
+            align: "left",
+            columnLabel: "序号",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: false,
+            columnWidth: 40
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 6031,
+            serialNumber: '6031TableOperationDesc',
+            tableId: "6031Table",
+            tableName: "生产订单工艺路线表",
+            columnProp: "operationDesc",
+            headerAlign: "center",
+            align: "left",
+            columnLabel: "工序名称",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: false,
+            columnWidth: 160
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 6031,
+            serialNumber: '6031TableWorkCenterNo',
+            tableId: "6031Table",
+            tableName: "生产订单工艺路线表",
+            columnProp: "workCenterNo",
+            headerAlign: "center",
+            align: "left",
+            columnLabel: "加工中心",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: false,
+            columnWidth: 80
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 6031,
+            serialNumber: '6031TableWorkCenterDesc',
+            tableId: "6031Table",
+            tableName: "生产订单工艺路线表",
+            columnProp: "workCenterDesc",
+            headerAlign: "center",
+            align: "left",
+            columnLabel: "加工中心名称",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: false,
+            columnWidth: 120
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 6031,
+            serialNumber: '6031TableMachSetupTime',
+            tableId: "6031Table",
+            tableName: "生产订单工艺路线表",
+            columnProp: "machSetupTime",
+            headerAlign: "center",
+            align: "right",
+            columnLabel: "准备时间",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: false,
+            columnWidth: 80
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 6031,
+            serialNumber: '6031TableMachRunFactor',
+            tableId: "6031Table",
+            tableName: "生产订单工艺路线表",
+            columnProp: "machRunFactor",
+            headerAlign: "center",
+            align: "right",
+            columnLabel: "单位产出量",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: false,
+            columnWidth: 100
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 6031,
+            serialNumber: '6031TableFactorUnit',
+            tableId: "6031Table",
+            tableName: "生产订单工艺路线表",
+            columnProp: "factorUnit",
+            headerAlign: "center",
+            align: "left",
+            columnLabel: "产出单位",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: false,
+            columnWidth: 80
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 6031,
+            serialNumber: '6031TableTimeRequired',
+            tableId: "6031Table",
+            tableName: "生产订单工艺路线表",
+            columnProp: "timeRequired",
+            headerAlign: "center",
+            align: "right",
+            columnLabel: "需求时间",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: false,
+            columnWidth: 80
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 6031,
+            serialNumber: '6031TableTimeReported',
+            tableId: "6031Table",
+            tableName: "生产订单工艺路线表",
+            columnProp: "timeReported",
+            headerAlign: "center",
+            align: "right",
+            columnLabel: "报告时间",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: false,
+            columnWidth: 80
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 6031,
+            serialNumber: '6031TableEfficiency',
+            tableId: "6031Table",
+            tableName: "生产订单工艺路线表",
+            columnProp: "efficiency",
+            headerAlign: "center",
+            align: "right",
+            columnLabel: "效率",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: false,
+            columnWidth: 60
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 6031,
+            serialNumber: '6031TableQtyRequired',
+            tableId: "6031Table",
+            tableName: "生产订单工艺路线表",
+            columnProp: "qtyRequired",
+            headerAlign: "center",
+            align: "right",
+            columnLabel: "需求数量",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: false,
+            columnWidth: 80
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 6031,
+            serialNumber: '6031TableQtyReported',
+            tableId: "6031Table",
+            tableName: "生产订单工艺路线表",
+            columnProp: "qtyReported",
+            headerAlign: "center",
+            align: "right",
+            columnLabel: "报告数量",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: false,
+            columnWidth: 80
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 6031,
+            serialNumber: '6031TableQtyApprove',
+            tableId: "6031Table",
+            tableName: "生产订单工艺路线表",
+            columnProp: "qtyApprove",
+            headerAlign: "center",
+            align: "right",
+            columnLabel: "合格数量",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: false,
+            columnWidth: 80
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 6031,
+            serialNumber: '6031TablePlanStartTime',
+            tableId: "6031Table",
+            tableName: "生产订单工艺路线表",
+            columnProp: "planStartTime",
+            headerAlign: "center",
+            align: "left",
+            columnLabel: "计划开工时间",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: false,
+            columnWidth: 140
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 6031,
+            serialNumber: '6031TablePlanFinishTime',
+            tableId: "6031Table",
+            tableName: "生产订单工艺路线表",
+            columnProp: "planFinishTime",
+            headerAlign: "center",
+            align: "left",
+            columnLabel: "计划完工时间",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: false,
+            columnWidth: 140
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 6031,
+            serialNumber: '6031TableBarcodeID',
+            tableId: "6031Table",
+            tableName: "生产订单工艺路线表",
+            columnProp: "barcodeID",
+            headerAlign: "center",
+            align: "left",
+            columnLabel: "条形码",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: false,
+            columnWidth: 150
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 6031,
+            serialNumber: '6031TableRemark',
+            tableId: "6031Table",
+            tableName: "生产订单工艺路线表",
+            columnProp: "remark",
+            headerAlign: "center",
+            align: "left",
+            columnLabel: "备注",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: false,
+            columnWidth: 80
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 6031,
+            serialNumber: '6031TableClosedFlag',
+            tableId: "6031Table",
+            tableName: "生产订单工艺路线表",
+            columnProp: "closedFlag",
+            headerAlign: "center",
+            align: "left",
+            columnLabel: "是否关闭",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: false,
+            columnWidth: 80
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 6031,
+            serialNumber: '6031TableActionNotes',
+            tableId: "6031Table",
+            tableName: "生产订单工艺路线表",
+            columnProp: "actionNotes",
+            headerAlign: "center",
+            align: "left",
+            columnLabel: "打开/关闭备忘",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: false,
+            columnWidth: 200
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 6031,
+            serialNumber: '6031TableWorkCenterType',
+            tableId: "6031Table",
+            tableName: "生产订单工艺路线表",
+            columnProp: "workCenterType",
+            headerAlign: "center",
+            align: "left",
+            columnLabel: "加工中心类型",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: false,
+            columnWidth: 120
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 6031,
+            serialNumber: '6031TableAvailResource',
+            tableId: "6031Table",
+            tableName: "生产订单工艺路线表",
+            columnProp: "availResource",
+            headerAlign: "center",
+            align: "left",
+            columnLabel: "可用机台",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: false,
+            columnWidth: 200
+          },
+
+        ],
+        dataList: [],
+        itemData: {
+          orderNo: '',
+          partNo: '',
+          partDesc: '',
+          site: '',
+          lotSize: 0
+        },
+        selectRow: null
+      }
+    },
+    watch: {
+      selectRow: {
+        deep: true,
+        handler: function (newV, oldV) {
+          if (newV == null) {
+            this.disabledFlag = true
+          } else {
+            this.disabledFlag = false
+          }
+        }
+      }
+    },
+    methods: {
+      init(modelData) {
+        this.visible = true
+        this.itemData = modelData
+        this.searchRouteInShopOrder()
+      },
+      // 编辑或新增
+      routAddAndEdit(val) {
+        this.$nextTick(() => {
+          if (val == 1) {
+            this.selectRow.lotSize = this.itemData.lotSize
+            this.$refs.routingAddAndEdit.init(JSON.parse(JSON.stringify(this.selectRow)), 1)
+          } else {
+            let selectRow = {
+              actionNotes: null,
+              availResource: '',
+              barcodeID: '',
+              closedFlag: 'N',
+              crewsize: 1,
+              efficiency: 100,
+              factorUnit: '',
+              factorUnit_DB: null,
+              itemNo: null,
+              machRunFactor: 0,
+              machSetupTime: 0.0,
+              operationDesc: '',
+              orderNo: this.itemData.orderNo,
+              partNo: this.itemData.partNo,
+              planFinishTime:  this.dayjs().format('YYYY-MM-DD HH:mm:ss'),
+              planStartTime:  this.dayjs().format('YYYY-MM-DD HH:mm:ss'),
+              qtyApprove: 0,
+              qtyReported: 0,
+              qtyRequired: 0,
+              remark: null,
+              site: this.itemData.site,
+              timeReported: 0.0,
+              timeRequired: 0.0,
+              workCenterDesc: '',
+              workCenterNo: '',
+              workCenterType: '',
+              lotSize: this.itemData.lotSize,
+            }
+            this.$refs.routingAddAndEdit.init(JSON.parse(JSON.stringify(selectRow)), 0)
+          }
+        })
+      },
+      // 获取数据
+      searchRouteInShopOrder() {
+        getRouteInShopOrder(this.itemData).then(({data}) => {
+          if (data.code == 0) {
+            this.dataList = data.dataList
+          }
+        })
+      },
+      // 删除 订单工序
+      removeRouteInShopOrder() {
+        this.$confirm('确认删除该工序?', '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+          deleteRouteInShopOrder(this.selectRow).then(({data}) => {
+            if (data.code == 0) {
+              this.$message.success(data.msg)
+              this.searchRouteInShopOrder()
+            } else {
+              this.$message.warning(data.msg)
+            }
+          })
+        })
+      },
+      // 复制
+      copyRouting() {
+        // 获取最大工序
+        getOrderNoRouteInMaxItemNo(this.itemData).then(({data}) => {
+          if (data.code == 0) {
+            let maxItem = JSON.parse(JSON.stringify(this.selectRow))
+            maxItem.itemNo = Number(data.data) + 10
+            // 保存信息
+            this.addRouteInShopOrder(maxItem)
+          }
+        })
+      },
+      // 保存订单工序
+      addRouteInShopOrder(val) {
+        insertRouteInShopOrder(val).then(({data}) => {
+          if (data.code == 0) {
+            this.$message.success(data.msg)
+            this.searchRouteInShopOrder()
+          } else {
+            this.$message.warning(data.msg)
+          }
+        })
+      },
+      handleCurrentChange(val) {
+        this.selectRow = val
+      },
+      closeDialog() {
+        this.$nextTick(() => {
+          this.$emit('tableHanddle', this.itemData)
+          Object.assign(this.$data, this.$options.data.call(this));
+        })
+      }
+    },
+    created() {
+
+    }
+  }
+</script>
+
+<style scoped>
+  .mod-config /deep/ .el-card__header {
+    padding: 0px 2px;
+    font-size: 12px;
+  }
+
+  /*统一的input内容颜色样式*/
+  .customer-input-color-red /deep/ .el-input__inner {
+    color: red;
+
+  }
+
+  .mod-config /deep/ .el-form-item--medium .el-form-item__content {
+    height: 20px;
+    line-height: 20px;
+  }
+</style>
diff --git a/src/views/modules/shopOrder/shopOrder/common/routingAddAndEdit.vue b/src/views/modules/shopOrder/shopOrder/common/routingAddAndEdit.vue
new file mode 100644
index 0000000..cb74b7d
--- /dev/null
+++ b/src/views/modules/shopOrder/shopOrder/common/routingAddAndEdit.vue
@@ -0,0 +1,376 @@
+<template>
+  <div class="mod-config">
+    <el-dialog
+      v-drag
+      @close="closeDialog"
+      width="690px"
+      class="sxm"
+      :title="selectRow.itemNo?'编辑工序信息':'新增工序信息'"
+      :close-on-click-modal="false"
+      :visible.sync="visible">
+      <el-form :inline="true" label-position="top" style="margin-left: 7px;margin-top: 0px;">
+        <el-row>
+          <el-col :span="24">
+            <el-form-item :label="'工序号：'">
+              <el-input oninput="value=value.replace(/[^0-9]/g,'')"  :class="itemNoFlag?'customer-input-color-red':''" v-model="selectRow.itemNo"
+                        :disabled="itemNoFlag"
+                        style="width: 150px;text-align: right"
+                        type="number"></el-input>
+            </el-form-item>
+            <el-form-item :label="'工序名称：'">
+              <el-input v-model="selectRow.operationDesc" style="width: 150px"></el-input>
+            </el-form-item>
+            <el-form-item>
+              <span slot="label" style="" @click="getBaseList(24,0)"><a herf="#">加工中心编码：</a></span>
+              <el-input @input="searchWorkCenterInfo()" v-model="selectRow.workCenterNo"
+                        style="width: 100px"></el-input>
+              <el-input v-model="selectRow.workCenterType" class="customer-input-color-red" disabled
+                        style="width: 46px"></el-input>
+            </el-form-item>
+            <el-form-item>
+              <span slot="label" style="">加工中心名称：</span>
+              <el-input v-model="selectRow.workCenterDesc" class="customer-input-color-red" disabled
+                        style="width: 150px"></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="24">
+            <el-form-item :label="'准备时间：'">
+              <el-input oninput="value=value.replace(/[^0-9.]/g,'')" v-model="selectRow.machSetupTime"
+                        style="width: 150px"></el-input>
+            </el-form-item>
+            <el-form-item :label="'单位产出量：'">
+              <el-input oninput="value=value.replace(/[^0-9.]/g,'')" v-model="selectRow.machRunFactor" type="number"
+                        style="width: 150px"></el-input>
+            </el-form-item>
+            <el-form-item :label="'产出单位：'">
+              <el-select filterable v-model="selectRow.factorUnit" style="width: 150px">
+                <el-option label="单位/小时" value="单位/小时"></el-option>
+                <el-option label="小时" value="小时"></el-option>
+              </el-select>
+            </el-form-item>
+            <el-form-item :label="'效率：'">
+              <el-input oninput="value=value.replace(/[^0-9.]/g,'')" v-model="selectRow.efficiency"
+                        style="width: 150px">
+                <span slot="suffix">%</span>
+              </el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="24">
+            <el-form-item :label="'需求时间：'">
+              <el-input class="customer-input-color-red" disabled v-model="selectRow.timeRequired"
+                        style="width: 150px"></el-input>
+            </el-form-item>
+            <el-form-item :label="'计划完工时间：'">
+              <el-date-picker format="yyyy-MM-dd HH:mm:ss" value-format="yyyy-MM-dd HH:mm:ss"  type="datetime" v-model="selectRow.planFinishTime" style="width: 150px"></el-date-picker>
+            </el-form-item>
+            <el-form-item :label="'计划开工时间：'">
+              <el-date-picker format="yyyy-MM-dd HH:mm:ss" value-format="yyyy-MM-dd HH:mm:ss"   type="datetime" v-model="selectRow.planStartTime" style="width: 150px"></el-date-picker>
+            </el-form-item>
+            <el-form-item :label="'操作工人数：'">
+              <el-input oninput="value=value.replace(/[^0-9]/g,'')" v-model="selectRow.crewsize" type="number"
+                        style="width: 150px"></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="24">
+            <el-form-item :label="'备注：'">
+              <el-input v-model="selectRow.remark" style="width: 150px"></el-input>
+            </el-form-item>
+            <el-form-item :label="'可用机台：'">
+              <el-input v-model="selectRow.availResource" class="customer-input-color-red" disabled
+                        style="width: 478px"></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <el-footer style="height:40px;margin-top: 20px;text-align:center">
+        <el-button type="primary" @click="saveOrEdit">保存</el-button>
+        <el-button type="primary" @click="visible = false">关闭</el-button>
+      </el-footer>
+    </el-dialog>
+
+    <Chooselist ref="baseList" @getBaseData="getBaseData"></Chooselist>
+
+  </div>
+</template>
+
+<script>
+  import {
+    getRouteInShopOrder,
+    insertRouteInShopOrder,
+    updateRouteInShopOrder,
+    getRoutingTimeRequired,
+    getWorkCenterInfo,
+    getOrderNoRouteInMaxItemNo,
+    getOrderNoItemNoCenter
+  } from "@/api/shopOrder/shopOrder.js"
+  import Chooselist from '@/views/modules/common/Chooselist'
+
+  import {debounce, throttle} from "../../../../../utils/common";
+
+  export default {
+    components: {
+      Chooselist
+    },
+    data() {
+      return {
+        visible: false,
+        itemNoFlag: true,
+        selectRow: {
+          actionNotes: null,
+          availResource: '',
+          barcodeID: '',
+          closedFlag: '',
+          crewsize: 1,
+          efficiency: 80,
+          factorUnit: '',
+          factorUnit_DB: null,
+          itemNo: null,
+          machRunFactor: 0,
+          machSetupTime: 0.0,
+          operationDesc: '',
+          orderNo: '',
+          partNo: '',
+          planFinishTime: '',
+          planStartTime: '',
+          qtyApprove: 0,
+          qtyReported: 0,
+          qtyRequired: 0,
+          remark: null,
+          site: '',
+          timeReported: 0.0,
+          timeRequired: 0.0,
+          workCenterDesc: '',
+          workCenterNo: '',
+          workCenterType: "内部",
+          lotSize: 0
+        }
+      }
+    },
+    watch: {
+      selectRow: {
+        deep: true,
+        handler: function (newV, oldV) {
+          this.getTimeRequired()
+        }
+      }
+    },
+    methods: {
+      init(selectRow, operationType) {
+        this.visible = true
+        this.selectRow = Object.assign(this.selectRow, selectRow);
+        if (operationType == 1) {
+          this.itemNoFlag = true
+        } else {
+          this.itemNoFlag = false
+          this.searchOrderNoRouteInMaxItemNo()
+        }
+      },
+      // 计算需求时间
+      getTimeRequired() {
+        let dto = {
+          site:this.selectRow.site,
+          lotSize:this.selectRow.lotSize,
+          machSetupTime:this.selectRow.machSetupTime,
+          factorUnit:this.selectRow.factorUnit,
+          efficiency:this.selectRow.efficiency,
+        }
+        getRoutingTimeRequired(this.selectRow).then(({data}) => {
+          if (data.code == 0) {
+            this.selectRow.timeRequired = data.data
+          }
+        })
+      },
+      // 获取最大工序 , 可用机台
+      searchOrderNoRouteInMaxItemNo() {
+        let order = {
+          orderNo: this.selectRow.orderNo,
+          site: this.selectRow.site,
+        }
+        // 工序
+        getOrderNoRouteInMaxItemNo(order).then(({data}) => {
+          if (data.code == 0) {
+            this.selectRow.itemNo = Number(data.data)+10
+            getOrderNoItemNoCenter( this.selectRow).then(({data})=>{
+              this.selectRow.availResource = data.data
+            })
+          }
+        })
+      },
+      // 保存或修改订单工序
+      saveOrEdit() {
+        if (!this.selectRow.itemNo) {
+          this.$message.warning('工序号不能为空!')
+          return
+        }
+        if (!this.selectRow.operationDesc) {
+          this.$message.warning('工序号名称不能为空!')
+          return
+        }
+        if (!this.selectRow.workCenterNo) {
+          this.$message.warning('加工中心编码不能为空!')
+          return
+        }
+        if (!this.selectRow.machSetupTime) {
+          this.$message.warning('准备时间不能为空!')
+          return
+        }
+        if (!this.selectRow.factorUnit) {
+          this.$message.warning('请选择产出单位!')
+          return
+        }
+        if (!this.selectRow.efficiency) {
+          this.$message.warning('效率不能为空!')
+          return
+        }
+        if (!this.selectRow.timeRequired) {
+          this.$message.warning('需求时间不能为空!')
+          return
+        }
+        if (!this.selectRow.planFinishTime) {
+          this.$message.warning('计划完工时间不能为空!')
+          return
+        } if (!this.selectRow.planStartTime) {
+          this.$message.warning('计划开工时间不能为空!')
+          return
+        }
+        if (this.selectRow.planFinishTime>this.selectRow.planStartTime){
+          this.$message.warning('计划开工时间不能早于计划完工时间!')
+          return
+        }
+        let centerInfo = {
+          workCenterNo: this.selectRow.workCenterNo,
+          active: 'Y',
+          site: this.$store.state.user.site
+        }
+        // 校验加功中心
+        getWorkCenterInfo(centerInfo).then(({data}) => {
+          // itemNoFlag = true 修改 false 否则保存
+          if (data.code == 0) {
+            if (this.itemNoFlag) {
+                updateRouteInShopOrder(this.selectRow).then(({data}) => {
+                if (data.code == 0) {
+                  this.$message.success(data.msg)
+                  this.visible = false
+                } else {
+                  this.$message.warning(data.msg)
+                }
+              })
+            } else {
+              this.selectRow.timeRequired = this.selectRow.lotSize
+              let barcodeID = '0000'+this.selectRow.itemNo
+              this.selectRow.barcodeID = this.selectRow.site+'-00000'+this.selectRow.orderNo+"-"+barcodeID.slice(-4)
+              insertRouteInShopOrder(this.selectRow).then(({data}) => {
+                if (data.code == 0) {
+                  this.$message.success(data.msg)
+                  this.visible = false
+                } else {
+                  this.$message.warning(data.msg)
+                }
+              })
+            }
+          } else {
+            this.$message.warning(data.msg)
+          }
+        })
+      },
+      // 获取数据
+      searchRouteInShopOrder() {
+        getRouteInShopOrder(this.itemData).then(({data}) => {
+          if (data.code == 0) {
+            this.selectRow = data.dataList[0]
+          }
+        })
+      },
+      // 保存订单工序
+      addRouteInShopOrder(val) {
+
+        insertRouteInShopOrder(val).then(({data}) => {
+          if (data.code == 0) {
+            this.$message.success(data.msg)
+            this.searchRouteInShopOrder()
+          } else {
+            this.$message.warning(data.msg)
+          }
+        })
+      },
+      handleCurrentChange(val) {
+        this.selectRow = val
+      },
+      getBaseData(val) {
+        if (this.tagNo === 24) {
+          this.selectRow.workCenterNo = val.WorkCenterNo
+        }
+        this.searchWorkCenterInfo()
+      },
+      // 获取加工中心的信息
+      searchWorkCenterInfo: debounce(function () {
+        let centerInfo = {
+          workCenterNo: this.selectRow.workCenterNo,
+          active: 'Y',
+          site: this.$store.state.user.site
+        }
+        getWorkCenterInfo(centerInfo).then(({data}) => {
+          if (data.code == 0) {
+            this.selectRow.workCenterType = data.data.workCenterType
+            this.selectRow.workCenterNo = data.data.workCenterNo
+            this.selectRow.workCenterDesc = data.data.workCenterDesc
+          } else {
+            this.selectRow.workCenterNo = ''
+            this.selectRow.workCenterDesc = ''
+          }
+        })
+      }, 1000),
+      // 获取基础数据列表
+      getBaseList(val, val2) {
+        this.tagNo = val
+        this.tagNo2 = val2
+        this.$nextTick(() => {
+          let strVal = "";
+          if (val === 24) {
+            strVal = this.selectRow.workCenterNo
+          }
+          this.$refs.baseList.init(val, strVal)
+        })
+      },
+      closeDialog() {
+        this.$nextTick(() => {
+          this.$emit('searchRouteInShopOrder')
+          Object.assign(this.$data, this.$options.data.call(this));
+        })
+      }
+    },
+    created() {
+
+    }
+  }
+</script>
+
+<style scoped>
+  .mod-config /deep/ .el-card__header {
+    padding: 0px 2px;
+    font-size: 12px;
+  }
+
+  .mod-config /deep/ .el-form-item--medium .el-form-item__content {
+    height: 20px;
+    line-height: 20px;
+  }
+
+  .customer-input-color-red /deep/ .el-input__inner {
+    color: red;
+  }
+
+  .sxm /deep/ .el-input--prefix .el-input__inner {
+    padding-left: 20px;
+  }
+
+  .sxm /deep/ .el-input__prefix {
+    left: 0px;
+  }
+</style>
diff --git a/src/views/modules/shopOrder/shopOrder/shopOrder.vue b/src/views/modules/shopOrder/shopOrder/shopOrder.vue
index af96b16..13a5b67 100644
--- a/src/views/modules/shopOrder/shopOrder/shopOrder.vue
+++ b/src/views/modules/shopOrder/shopOrder/shopOrder.vue
@@ -30,14 +30,15 @@
         <el-input v-model="modelData.status" readonly style="width: 130px"></el-input>
       </el-form-item>
     </el-form>
-    <el-tabs v-model="activeName">
+    <el-tabs style="font-size: 12px"  class="customer-tab" v-model="activeName" type="border-card" >
       <el-tab-pane :label="'订单'" name="first">
         <el-form :inline="true" label-position="top" label-width="100px" style="margin-top: 0px;">
           <el-button @click="updateModal" type="primary" style="margin-left: 2px;margin-top: 0px">{{ '编辑' }}</el-button>
           <el-button @click="deleteData" type="primary" style="margin-left: 2px;margin-top: 0px">{{ '删除' }}</el-button>
           <el-button @click="printOrder()" type="primary" style="margin-left: 2px;margin-top: 0px">{{ '打印' }}
           </el-button>
-          <el-button @click="warnCancelOrderConfirm()" type="primary" style="margin-left: 2px;margin-top: 0px">{{ '取消' }}
+          <el-button @click="warnCancelOrderConfirm()" type="primary" style="margin-left: 2px;margin-top: 0px">{{ '取消'
+            }}
           </el-button>
           <el-button @click="warnCloseOrderConfirm()" type="primary" style="margin-left: 2px;margin-top: 0px">{{ '关闭' }}
           </el-button>
@@ -222,63 +223,80 @@
         </el-table>
       </el-tab-pane>
       <el-tab-pane :label="'工艺路线'" name="third">
-        <el-form :inline="true" label-position="top" label-width="100px" style="margin-top: 0px;">
-          <download-excel
-            :fields="fields2()"
-            :data="exportData2"
-            type="xls"
-            :name="exportName2"
-            :header="exportHeader2"
-            :footer="exportFooter2"
-            :fetch="createExportData2"
-            :before-generate="startDownload2"
-            :before-finish="finishDownload2"
-            worksheet="导出信息"
-            class="el-button el-button--primary el-button--medium">
-            {{ buttons.download2 }}
-          </download-excel>
-        </el-form>
-        <el-table
-          :height="height"
-          :data="dataList2"
-          border
-          v-loading="dataListLoading"
-          style="width: 100%;">
-          <el-table-column
-            v-for="(item,index) in columnList2" :key="index"
-            :sortable="item.columnSortable"
-            :prop="item.columnProp"
-            :header-align="item.headerAlign"
-            :show-overflow-tooltip="item.showOverflowTooltip"
-            :align="item.align"
-            :fixed="item.fixed"
-            :width="item.columnWidth"
-            :label="item.columnLabel">
-            <template slot-scope="scope">
-              <span v-if="!item.columnHidden"> {{ scope.row[item.columnProp] }}</span>
-              <span v-if="item.columnImage"><img :src="scope.row[item.columnProp]"
-                                                 style="width: 100px; height: 80px"/></span>
-            </template>
-          </el-table-column>
-        </el-table>
+        <el-row>
+          <el-col :span="24" style="  margin-top: -3px;">
+            <download-excel
+              :fields="fields2()"
+              :data="exportData2"
+              type="xls"
+              :name="exportName2"
+              :header="exportHeader2"
+              :footer="exportFooter2"
+              :fetch="createExportData2"
+              :before-generate="startDownload2"
+              :before-finish="finishDownload2"
+              worksheet="导出信息"
+              class="el-button el-button--primary el-button--medium">
+              {{ buttons.download2 }}
+            </download-excel>
+            <el-dropdown trigger="click" style="margin-top: 3px" class="customer-dropdown" @command="handleCommand">
+              <el-button type="primary">
+                主菜单<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>工艺路线</span>
+                </el-dropdown-item>
+              </el-dropdown-menu>
+            </el-dropdown>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="24">
+            <el-table
+              :height="height"
+              :data="dataList2"
+              border
+              v-loading="dataListLoading"
+              style="width: 100%;">
+              <el-table-column
+                v-for="(item,index) in columnList2" :key="index"
+                :sortable="item.columnSortable"
+                :prop="item.columnProp"
+                :header-align="item.headerAlign"
+                :show-overflow-tooltip="item.showOverflowTooltip"
+                :align="item.align"
+                :fixed="item.fixed"
+                :width="item.columnWidth"
+                :label="item.columnLabel">
+                <template slot-scope="scope">
+                  <span v-if="!item.columnHidden"> {{ scope.row[item.columnProp] }}</span>
+                  <span v-if="item.columnImage"><img :src="scope.row[item.columnProp]"
+                                                     style="width: 100px; height: 80px"/></span>
+                </template>
+              </el-table-column>
+            </el-table>
+          </el-col>
+        </el-row>
       </el-tab-pane>
       <el-tab-pane :label="'工具信息'" name="forth">
-        <el-form :inline="true" label-position="top" label-width="100px" style="margin-top: 0px;">
-          <download-excel
-            :fields="fields3()"
-            :data="exportData3"
-            type="xls"
-            :name="exportName3"
-            :header="exportHeader3"
-            :footer="exportFooter3"
-            :fetch="createExportData3"
-            :before-generate="startDownload3"
-            :before-finish="finishDownload3"
-            worksheet="导出信息"
-            class="el-button el-button--primary el-button--medium">
-            {{ buttons.download3 }}
-          </download-excel>
-        </el-form>
+        <el-row>
+          <el-col  :span="24">
+            <download-excel
+              :fields="fields3()"
+              :data="exportData3"
+              type="xls"
+              :name="exportName3"
+              :header="exportHeader3"
+              :footer="exportFooter3"
+              :fetch="createExportData3"
+              :before-generate="startDownload3"
+              :before-finish="finishDownload3"
+              worksheet="导出信息"
+              class="el-button el-button--primary el-button--medium">
+              {{ buttons.download3 }}
+            </download-excel>
+          </el-col>
+        </el-row>
         <el-table
           :height="height"
           :data="dataList4"
@@ -471,1776 +489,1838 @@
     </el-dialog>
     <Chooselist ref="baseList" @getBaseData="getBaseData"></Chooselist>
 
+    <Routing ref="routing" @tableHanddle="tableHanddle" ></Routing>
+
   </div>
 </template>
 
 <script>
-import {
-  getShopOrderData,
-  deleteShopOrderData,
-  saveShopOrderData,
-  getShopOrderDetail,
-  getOrderInfo,
-  getShopOrderSapSOBOM,
-  cancelShopOrderBun,//取消订单
-  closeShopOrder,//关闭订单
-  openShopOrder,//打开订单
-} from "@/api/shopOrder/shopOrder.js"
-import Chooselist from '@/views/modules/common/Chooselist'
+  import Routing  from  './common/routing'
+  import {
+    getShopOrderData,
+    deleteShopOrderData,
+    saveShopOrderData,
+    getShopOrderDetail,
+    getOrderInfo,
+    getShopOrderSapSOBOM,
+    cancelShopOrderBun,//取消订单
+    closeShopOrder,//关闭订单
+    openShopOrder,//打开订单
+  } from "@/api/shopOrder/shopOrder.js"
+  import Chooselist from '@/views/modules/common/Chooselist'
 
-export default {
-  //查询-产线产量报告(分订单)
-  name: "searchProductionLineOutputReportInOrderNo",
-  components: {
-    Chooselist
-  },
-  data() {
-    return {
-      tagNo: '',
-      // 导出 start
-      exportData: [],
-      exportName: "产品结构" + this.dayjs().format('YYYYMMDDHHmmss'),
-      exportHeader: ["产品结构"],
-      exportFooter: [],
-      // 导出 end
-      // 导出 start
-      exportData2: [],
-      exportName2: "工艺路线" + this.dayjs().format('YYYYMMDDHHmmss'),
-      exportHeader2: ["工艺路线"],
-      exportFooter2: [],
-      // 导出 end
-      // 导出 start
-      exportData3: [],
-      exportName3: "工具信息" + this.dayjs().format('YYYYMMDDHHmmss'),
-      exportHeader3: ["工具信息"],
-      exportFooter3: [],
-      // 导出 end
-      activeName: 'first',
-      height: 200,
-      modelFlag2: false,
-      modelFlag3: false,
-      modelInputFlag: true,
-      searchData: {
-        user: this.$store.state.user.name,
-        orderNo: '',
-        site: '',
-        partNo: '',
-        status: '',
-        date1: '',
-        date2: '',
-        date3: '',
-        date4: '',
-      },
-      modelData: {
-        orderNo: '',
-        partNo: '',
-        partDesc: '',
-        site: '',
-        needDate: '',
-        planStartDate: '',
-        lotSize: '',
-        status: '',
-        orderType: '',
-        planner: '',
-        printed: '',
-        orderRef1: '',
-        orderRef2: '',
-        oriSOOrderNo: '',
-        eOriginalOrderType: '',
-        eOriginalOrderNo: '',
-        eSeqNo: '',
-        projectID: '',
-        projectIDName: '',
-        partRemark: '',
-        configurationTemplateID: '',
-        enterDate: '',
-        userName: '',
-        releaseDate: '',
-        releaseGuys: '',
-        scheduleDate: '',
-        scheduler: '',
-        issueDate: '',
-        reportDate: '',
-        receiveDate: '',
-        closeDate: '',
-        finishedQty: '',
-        umid: '',
-        costRollUpFlag: '',
-        manualFlag: '',
-        bOMRevNo: '',
-        routingRevNo: '',
-        sFDCReportedFlag: '',
-        originalNeedDate: '',
-        leadtime: '',
-        receiveStatus: '',
-        techInfo: '',
-        remark: '',
-        repairSOFlag: '',
-        checkFlag: '',/*关单是否校验数量*/
-      },
-      updateData: {
-        needDate: '',
-        planStartDate: '',
-        originalNeedDate: '',
-        orderType: '',
-        planner: '',
-        oriSOOrderNo: '',
-        projectID: '',
-        leadtime: '',
-        repairSOFlag: '',
-        techInfo: '',
-        remark: '',
-        site: '',
-        orderNo: ''
-      },
-      dataList: [],
-      dataList2: [],
-      dataList3: [],
-      dataList4: [],
-      dataListLoading: false,
-      buttons: {
-        download: '导出',
-        download2: '导出',
-        download3: '导出',
-      },
-      columnList: [
-        {
-          userId: this.$store.state.user.name,
-          functionId: 6031,
-          serialNumber: '6031TableItemNo',
-          tableId: "6031Table",
-          tableName: "生产订单产品结构表",
-          columnProp: "itemNo",
-          headerAlign: "center",
-          align: "left",
-          columnLabel: "序号",
-          columnHidden: false,
-          columnImage: false,
-          columnSortable: false,
-          sortLv: 0,
-          status: true,
-          fixed: false,
-          columnWidth: 60
-        },
-        {
-          userId: this.$store.state.user.name,
-          functionId: 6031,
-          serialNumber: '6031TableComponentPartNo',
-          tableId: "6031Table",
-          tableName: "生产订单产品结构表",
-          columnProp: "componentPartNo",
-          headerAlign: "center",
-          align: "left",
-          columnLabel: "零部件编码",
-          columnHidden: false,
-          columnImage: false,
-          columnSortable: false,
-          sortLv: 0,
-          status: true,
-          fixed: false,
-          columnWidth: 120
-        },
-        {
-          userId: this.$store.state.user.name,
-          functionId: 6031,
-          serialNumber: '6031TablePartDesc',
-          tableId: "6031Table",
-          tableName: "生产订单产品结构表",
-          columnProp: "partDesc",
-          headerAlign: "center",
-          align: "left",
-          columnLabel: "零部件名称",
-          columnHidden: false,
-          columnImage: false,
-          columnSortable: false,
-          sortLv: 0,
-          status: true,
-          fixed: false,
-          columnWidth: 150
-        },
-        {
-          userId: this.$store.state.user.name,
-          functionId: 6031,
-          serialNumber: '6031TablePartSpec',
-          tableId: "6031Table",
-          tableName: "生产订单产品结构表",
-          columnProp: "partSpec",
-          headerAlign: "center",
-          align: "left",
-          columnLabel: "规格型号",
-          columnHidden: false,
-          columnImage: false,
-          columnSortable: false,
-          sortLv: 0,
-          status: true,
-          fixed: false,
-          columnWidth: 100
-        },
-        {
-          userId: this.$store.state.user.name,
-          functionId: 6031,
-          serialNumber: '6031TableQtyAssembly',
-          tableId: "6031Table",
-          tableName: "生产订单产品结构表",
-          columnProp: "qtyAssembly",
-          headerAlign: "center",
-          align: "right",
-          columnLabel: "单位用量",
-          columnHidden: false,
-          columnImage: false,
-          columnSortable: false,
-          sortLv: 0,
-          status: true,
-          fixed: false,
-          columnWidth: 80
-        },
-        {
-          userId: this.$store.state.user.name,
-          functionId: 6031,
-          serialNumber: '6031TableQtyFixedScrapt',
-          tableId: "6031Table",
-          tableName: "生产订单产品结构表",
-          columnProp: "qtyFixedScrapt",
-          headerAlign: "center",
-          align: "right",
-          columnLabel: "固定损耗",
-          columnHidden: false,
-          columnImage: false,
-          columnSortable: false,
-          sortLv: 0,
-          status: true,
-          fixed: false,
-          columnWidth: 80
-        },
-        {
-          userId: this.$store.state.user.name,
-          functionId: 6031,
-          serialNumber: '6031TablePartUm',
-          tableId: "6031Table",
-          tableName: "生产订单产品结构表",
-          columnProp: "partUm",
-          headerAlign: "center",
-          align: "left",
-          columnLabel: "计量单位",
-          columnHidden: false,
-          columnImage: false,
-          columnSortable: false,
-          sortLv: 0,
-          status: true,
-          fixed: false,
-          columnWidth: 80
-        },
-        {
-          userId: this.$store.state.user.name,
-          functionId: 6031,
-          serialNumber: '6031TableScraptFactor',
-          tableId: "6031Table",
-          tableName: "生产订单产品结构表",
-          columnProp: "scraptFactor",
-          headerAlign: "center",
-          align: "right",
-          columnLabel: "报废率",
-          columnHidden: false,
-          columnImage: false,
-          columnSortable: false,
-          sortLv: 0,
-          status: true,
-          fixed: false,
-          columnWidth: 80
-        },
-        {
-          userId: this.$store.state.user.name,
-          functionId: 6031,
-          serialNumber: '6031TableQtyRequired',
-          tableId: "6031Table",
-          tableName: "生产订单产品结构表",
-          columnProp: "qtyRequired",
-          headerAlign: "center",
-          align: "right",
-          columnLabel: "需求数量",
-          columnHidden: false,
-          columnImage: false,
-          columnSortable: false,
-          sortLv: 0,
-          status: true,
-          fixed: false,
-          columnWidth: 80
-        },
-        {
-          userId: this.$store.state.user.name,
-          functionId: 6031,
-          serialNumber: '6031TableQtyReserved',
-          tableId: "6031Table",
-          tableName: "生产订单产品结构表",
-          columnProp: "qtyReserved",
-          headerAlign: "center",
-          align: "right",
-          columnLabel: "预留数量",
-          columnHidden: false,
-          columnImage: false,
-          columnSortable: false,
-          sortLv: 0,
-          status: true,
-          fixed: false,
-          columnWidth: 80
-        },
-        {
-          userId: this.$store.state.user.name,
-          functionId: 6031,
-          serialNumber: '6031TableQtyIssue',
-          tableId: "6031Table",
-          tableName: "生产订单产品结构表",
-          columnProp: "qtyIssue",
-          headerAlign: "center",
-          align: "right",
-          columnLabel: "发料数量",
-          columnHidden: false,
-          columnImage: false,
-          columnSortable: false,
-          sortLv: 0,
-          status: true,
-          fixed: false,
-          columnWidth: 80
-        },
-        {
-          userId: this.$store.state.user.name,
-          functionId: 6031,
-          serialNumber: '6031TableIssueDate',
-          tableId: "6031Table",
-          tableName: "生产订单产品结构表",
-          columnProp: "issueDate",
-          headerAlign: "center",
-          align: "left",
-          columnLabel: "发料日期",
-          columnHidden: false,
-          columnImage: false,
-          columnSortable: false,
-          sortLv: 0,
-          status: true,
-          fixed: false,
-          columnWidth: 150
-        },
-        {
-          userId: this.$store.state.user.name,
-          functionId: 6031,
-          serialNumber: '6031TableRemark',
-          tableId: "6031Table",
-          tableName: "生产订单产品结构表",
-          columnProp: "remark",
-          headerAlign: "center",
-          align: "left",
-          columnLabel: "备注",
-          columnHidden: false,
-          columnImage: false,
-          columnSortable: false,
-          sortLv: 0,
-          status: true,
-          fixed: false,
-          columnWidth: 100
-        },
-        {
-          userId: this.$store.state.user.name,
-          functionId: 6031,
-          serialNumber: '6031TableRMTypeDB',
-          tableId: "6031Table",
-          tableName: "生产订单产品结构表",
-          columnProp: "rMTypeDB",
-          headerAlign: "center",
-          align: "left",
-          columnLabel: "是否主材料",
-          columnHidden: false,
-          columnImage: false,
-          columnSortable: false,
-          sortLv: 0,
-          status: true,
-          fixed: false,
-          columnWidth: 100
-        }
-      ],
-      columnList2: [
-        {
-          userId: this.$store.state.user.name,
-          functionId: 6031,
-          serialNumber: '6031TableItemNo',
-          tableId: "6031Table",
-          tableName: "生产订单工艺路线表",
-          columnProp: "itemNo",
-          headerAlign: "center",
-          align: "left",
-          columnLabel: "序号",
-          columnHidden: false,
-          columnImage: false,
-          columnSortable: false,
-          sortLv: 0,
-          status: true,
-          fixed: false,
-          columnWidth: 40
-        },
-        {
-          userId: this.$store.state.user.name,
-          functionId: 6031,
-          serialNumber: '6031TableOperationDesc',
-          tableId: "6031Table",
-          tableName: "生产订单工艺路线表",
-          columnProp: "operationDesc",
-          headerAlign: "center",
-          align: "left",
-          columnLabel: "工序名称",
-          columnHidden: false,
-          columnImage: false,
-          columnSortable: false,
-          sortLv: 0,
-          status: true,
-          fixed: false,
-          columnWidth: 160
-        },
-        {
-          userId: this.$store.state.user.name,
-          functionId: 6031,
-          serialNumber: '6031TableWorkCenterNo',
-          tableId: "6031Table",
-          tableName: "生产订单工艺路线表",
-          columnProp: "workCenterNo",
-          headerAlign: "center",
-          align: "left",
-          columnLabel: "加工中心",
-          columnHidden: false,
-          columnImage: false,
-          columnSortable: false,
-          sortLv: 0,
-          status: true,
-          fixed: false,
-          columnWidth: 80
-        },
-        {
-          userId: this.$store.state.user.name,
-          functionId: 6031,
-          serialNumber: '6031TableWorkCenterDesc',
-          tableId: "6031Table",
-          tableName: "生产订单工艺路线表",
-          columnProp: "workCenterDesc",
-          headerAlign: "center",
-          align: "left",
-          columnLabel: "加工中心名称",
-          columnHidden: false,
-          columnImage: false,
-          columnSortable: false,
-          sortLv: 0,
-          status: true,
-          fixed: false,
-          columnWidth: 120
-        },
-        {
-          userId: this.$store.state.user.name,
-          functionId: 6031,
-          serialNumber: '6031TableMachSetupTime',
-          tableId: "6031Table",
-          tableName: "生产订单工艺路线表",
-          columnProp: "machSetupTime",
-          headerAlign: "center",
-          align: "right",
-          columnLabel: "准备时间",
-          columnHidden: false,
-          columnImage: false,
-          columnSortable: false,
-          sortLv: 0,
-          status: true,
-          fixed: false,
-          columnWidth: 80
-        },
-        {
-          userId: this.$store.state.user.name,
-          functionId: 6031,
-          serialNumber: '6031TableMachRunFactor',
-          tableId: "6031Table",
-          tableName: "生产订单工艺路线表",
-          columnProp: "machRunFactor",
-          headerAlign: "center",
-          align: "right",
-          columnLabel: "单位产出量",
-          columnHidden: false,
-          columnImage: false,
-          columnSortable: false,
-          sortLv: 0,
-          status: true,
-          fixed: false,
-          columnWidth: 100
-        },
-        {
-          userId: this.$store.state.user.name,
-          functionId: 6031,
-          serialNumber: '6031TableFactorUnit',
-          tableId: "6031Table",
-          tableName: "生产订单工艺路线表",
-          columnProp: "factorUnit",
-          headerAlign: "center",
-          align: "left",
-          columnLabel: "产出单位",
-          columnHidden: false,
-          columnImage: false,
-          columnSortable: false,
-          sortLv: 0,
-          status: true,
-          fixed: false,
-          columnWidth: 80
-        },
-        {
-          userId: this.$store.state.user.name,
-          functionId: 6031,
-          serialNumber: '6031TableTimeRequired',
-          tableId: "6031Table",
-          tableName: "生产订单工艺路线表",
-          columnProp: "timeRequired",
-          headerAlign: "center",
-          align: "right",
-          columnLabel: "需求时间",
-          columnHidden: false,
-          columnImage: false,
-          columnSortable: false,
-          sortLv: 0,
-          status: true,
-          fixed: false,
-          columnWidth: 80
-        },
-        {
-          userId: this.$store.state.user.name,
-          functionId: 6031,
-          serialNumber: '6031TableTimeReported',
-          tableId: "6031Table",
-          tableName: "生产订单工艺路线表",
-          columnProp: "timeReported",
-          headerAlign: "center",
-          align: "right",
-          columnLabel: "报告时间",
-          columnHidden: false,
-          columnImage: false,
-          columnSortable: false,
-          sortLv: 0,
-          status: true,
-          fixed: false,
-          columnWidth: 80
-        },
-        {
-          userId: this.$store.state.user.name,
-          functionId: 6031,
-          serialNumber: '6031TableEfficiency',
-          tableId: "6031Table",
-          tableName: "生产订单工艺路线表",
-          columnProp: "efficiency",
-          headerAlign: "center",
-          align: "right",
-          columnLabel: "效率",
-          columnHidden: false,
-          columnImage: false,
-          columnSortable: false,
-          sortLv: 0,
-          status: true,
-          fixed: false,
-          columnWidth: 60
-        },
-        {
-          userId: this.$store.state.user.name,
-          functionId: 6031,
-          serialNumber: '6031TableQtyRequired',
-          tableId: "6031Table",
-          tableName: "生产订单工艺路线表",
-          columnProp: "qtyRequired",
-          headerAlign: "center",
-          align: "right",
-          columnLabel: "需求数量",
-          columnHidden: false,
-          columnImage: false,
-          columnSortable: false,
-          sortLv: 0,
-          status: true,
-          fixed: false,
-          columnWidth: 80
-        },
-        {
-          userId: this.$store.state.user.name,
-          functionId: 6031,
-          serialNumber: '6031TableQtyReported',
-          tableId: "6031Table",
-          tableName: "生产订单工艺路线表",
-          columnProp: "qtyReported",
-          headerAlign: "center",
-          align: "right",
-          columnLabel: "报告数量",
-          columnHidden: false,
-          columnImage: false,
-          columnSortable: false,
-          sortLv: 0,
-          status: true,
-          fixed: false,
-          columnWidth: 80
-        },
-        {
-          userId: this.$store.state.user.name,
-          functionId: 6031,
-          serialNumber: '6031TableQtyApprove',
-          tableId: "6031Table",
-          tableName: "生产订单工艺路线表",
-          columnProp: "qtyApprove",
-          headerAlign: "center",
-          align: "right",
-          columnLabel: "合格数量",
-          columnHidden: false,
-          columnImage: false,
-          columnSortable: false,
-          sortLv: 0,
-          status: true,
-          fixed: false,
-          columnWidth: 80
-        },
-        {
-          userId: this.$store.state.user.name,
-          functionId: 6031,
-          serialNumber: '6031TablePlanStartTime',
-          tableId: "6031Table",
-          tableName: "生产订单工艺路线表",
-          columnProp: "planStartTime",
-          headerAlign: "center",
-          align: "left",
-          columnLabel: "计划开工时间",
-          columnHidden: false,
-          columnImage: false,
-          columnSortable: false,
-          sortLv: 0,
-          status: true,
-          fixed: false,
-          columnWidth: 140
-        },
-        {
-          userId: this.$store.state.user.name,
-          functionId: 6031,
-          serialNumber: '6031TablePlanFinishTime',
-          tableId: "6031Table",
-          tableName: "生产订单工艺路线表",
-          columnProp: "planFinishTime",
-          headerAlign: "center",
-          align: "left",
-          columnLabel: "计划完工时间",
-          columnHidden: false,
-          columnImage: false,
-          columnSortable: false,
-          sortLv: 0,
-          status: true,
-          fixed: false,
-          columnWidth: 140
-        },
-        {
-          userId: this.$store.state.user.name,
-          functionId: 6031,
-          serialNumber: '6031TableBarcodeID',
-          tableId: "6031Table",
-          tableName: "生产订单工艺路线表",
-          columnProp: "barcodeID",
-          headerAlign: "center",
-          align: "left",
-          columnLabel: "条形码",
-          columnHidden: false,
-          columnImage: false,
-          columnSortable: false,
-          sortLv: 0,
-          status: true,
-          fixed: false,
-          columnWidth: 150
-        },
-        {
-          userId: this.$store.state.user.name,
-          functionId: 6031,
-          serialNumber: '6031TableRemark',
-          tableId: "6031Table",
-          tableName: "生产订单工艺路线表",
-          columnProp: "remark",
-          headerAlign: "center",
-          align: "left",
-          columnLabel: "备注",
-          columnHidden: false,
-          columnImage: false,
-          columnSortable: false,
-          sortLv: 0,
-          status: true,
-          fixed: false,
-          columnWidth: 80
-        },
-        {
-          userId: this.$store.state.user.name,
-          functionId: 6031,
-          serialNumber: '6031TableClosedFlag',
-          tableId: "6031Table",
-          tableName: "生产订单工艺路线表",
-          columnProp: "closedFlag",
-          headerAlign: "center",
-          align: "left",
-          columnLabel: "是否关闭",
-          columnHidden: false,
-          columnImage: false,
-          columnSortable: false,
-          sortLv: 0,
-          status: true,
-          fixed: false,
-          columnWidth: 80
-        },
-        {
-          userId: this.$store.state.user.name,
-          functionId: 6031,
-          serialNumber: '6031TableActionNotes',
-          tableId: "6031Table",
-          tableName: "生产订单工艺路线表",
-          columnProp: "actionNotes",
-          headerAlign: "center",
-          align: "left",
-          columnLabel: "打开/关闭备忘",
-          columnHidden: false,
-          columnImage: false,
-          columnSortable: false,
-          sortLv: 0,
-          status: true,
-          fixed: false,
-          columnWidth: 200
-        },
-        {
-          userId: this.$store.state.user.name,
-          functionId: 6031,
-          serialNumber: '6031TableWorkCenterType',
-          tableId: "6031Table",
-          tableName: "生产订单工艺路线表",
-          columnProp: "workCenterType",
-          headerAlign: "center",
-          align: "left",
-          columnLabel: "加工中心类型",
-          columnHidden: false,
-          columnImage: false,
-          columnSortable: false,
-          sortLv: 0,
-          status: true,
-          fixed: false,
-          columnWidth: 120
-        },
-        {
-          userId: this.$store.state.user.name,
-          functionId: 6031,
-          serialNumber: '6031TableAvailResource',
-          tableId: "6031Table",
-          tableName: "生产订单工艺路线表",
-          columnProp: "availResource",
-          headerAlign: "center",
-          align: "left",
-          columnLabel: "可用机台",
-          columnHidden: false,
-          columnImage: false,
-          columnSortable: false,
-          sortLv: 0,
-          status: true,
-          fixed: false,
-          columnWidth: 200
-        },
 
-      ],
-      columnList3: [
-        {
-          userId: this.$store.state.user.name,
-          functionId: 6031,
-          serialNumber: '6031Table3OrderNo',
-          tableId: "6031Table3",
-          tableName: "生产订单数据获取表",
-          columnProp: "orderNo",
-          headerAlign: "center",
-          align: "left",
-          columnLabel: "订单号",
-          columnHidden: false,
-          columnImage: false,
-          columnSortable: false,
-          sortLv: 0,
-          status: true,
-          fixed: false,
-          columnWidth: 120
-        },
-        {
-          userId: this.$store.state.user.name,
-          functionId: 6031,
-          serialNumber: '6031Table3PartNo',
-          tableId: "6031Table3",
-          tableName: "生产订单数据获取表",
-          columnProp: "partNo",
-          headerAlign: "center",
-          align: "left",
-          columnLabel: "物料编码",
-          columnHidden: false,
-          columnImage: false,
-          columnSortable: false,
-          sortLv: 0,
-          status: true,
-          fixed: false,
-          columnWidth: 120
-        },
-        {
-          userId: this.$store.state.user.name,
-          functionId: 6031,
-          serialNumber: '6031Table3PartDesc',
-          tableId: "6031Table3",
-          tableName: "生产订单数据获取表",
-          columnProp: "partDesc",
-          headerAlign: "center",
-          align: "left",
-          columnLabel: "物料名称/规格",
-          columnHidden: false,
-          columnImage: false,
-          columnSortable: false,
-          sortLv: 0,
-          status: true,
-          fixed: false,
-          columnWidth: 160
-        },
-        {
-          userId: this.$store.state.user.name,
-          functionId: 6031,
-          serialNumber: '6031Table3LotSize',
-          tableId: "6031Table3",
-          tableName: "生产订单数据获取表",
-          columnProp: "lotSize",
-          headerAlign: "center",
-          align: "right",
-          columnLabel: "订单数量",
-          columnHidden: false,
-          columnImage: false,
-          columnSortable: false,
-          sortLv: 0,
-          status: true,
-          fixed: false,
-          columnWidth: 100
-        },
-        {
-          userId: this.$store.state.user.name,
-          functionId: 6031,
-          serialNumber: '6031Table3NeedDate',
-          tableId: "6031Table3",
-          tableName: "生产订单数据获取表",
-          columnProp: "needDate",
-          headerAlign: "center",
-          align: "left",
-          columnLabel: "要求完工日期",
-          columnHidden: false,
-          columnImage: false,
-          columnSortable: false,
-          sortLv: 0,
-          status: true,
-          fixed: false,
-          columnWidth: 120
-        },
-        {
-          userId: this.$store.state.user.name,
-          functionId: 6031,
-          serialNumber: '6031Table3Planner',
-          tableId: "6031Table3",
-          tableName: "生产订单数据获取表",
-          columnProp: "planner",
-          headerAlign: "center",
-          align: "left",
-          columnLabel: "计划方式",
-          columnHidden: false,
-          columnImage: false,
-          columnSortable: false,
-          sortLv: 0,
-          status: true,
-          fixed: false,
-          columnWidth: 80
-        },
-        {
-          userId: this.$store.state.user.name,
-          functionId: 6031,
-          serialNumber: '6031Table3OrderType',
-          tableId: "6031Table3",
-          tableName: "生产订单数据获取表",
-          columnProp: "orderType",
-          headerAlign: "center",
-          align: "left",
-          columnLabel: "订单类型",
-          columnHidden: false,
-          columnImage: false,
-          columnSortable: false,
-          sortLv: 0,
-          status: true,
-          fixed: false,
-          columnWidth: 80
-        },
-        {
-          userId: this.$store.state.user.name,
-          functionId: 6031,
-          serialNumber: '6031Table3Status',
-          tableId: "6031Table3",
-          tableName: "生产订单数据获取表",
-          columnProp: "status",
-          headerAlign: "center",
-          align: "left",
-          columnLabel: "状态",
-          columnHidden: false,
-          columnImage: false,
-          columnSortable: false,
-          sortLv: 0,
-          status: true,
-          fixed: false,
-          columnWidth: 60
-        },
-        {
-          userId: this.$store.state.user.name,
-          functionId: 6031,
-          serialNumber: '6031Table3ReceiveStatus',
-          tableId: "6031Table3",
-          tableName: "生产订单数据获取表",
-          columnProp: "receiveStatus",
-          headerAlign: "center",
-          align: "left",
-          columnLabel: "入库状态",
-          columnHidden: false,
-          columnImage: false,
-          columnSortable: false,
-          sortLv: 0,
-          status: true,
-          fixed: false,
-          columnWidth: 80
-        },
-        {
-          userId: this.$store.state.user.name,
-          functionId: 6031,
-          serialNumber: '6031Table3Site',
-          tableId: "6031Table3",
-          tableName: "生产订单数据获取表",
-          columnProp: "site",
-          headerAlign: "center",
-          align: "left",
-          columnLabel: "工厂编号",
-          columnHidden: false,
-          columnImage: false,
-          columnSortable: false,
-          sortLv: 0,
-          status: true,
-          fixed: false,
-          columnWidth: 80
-        },
-        {
-          userId: this.$store.state.user.name,
-          functionId: 6031,
-          serialNumber: '6031Table3RepairSOFlag',
-          tableId: "6031Table3",
-          tableName: "生产订单数据获取表",
-          columnProp: "repairSOFlag",
-          headerAlign: "center",
-          align: "left",
-          columnLabel: "印版已发",
-          columnHidden: false,
-          columnImage: false,
-          columnSortable: false,
-          sortLv: 0,
-          status: true,
-          fixed: false,
-          columnWidth: 80
-        }
-      ],
-      columnList4: [
-        {
-          userId: this.$store.state.user.name,
-          functionId: 6031,
-          serialNumber: '6031Table4ItemNo',
-          tableId: "6031Table4",
-          tableName: "生产订单工具信息表",
-          columnProp: "itemNo",
-          headerAlign: "center",
-          align: "left",
-          columnLabel: "工序号",
-          columnHidden: false,
-          columnImage: false,
-          columnSortable: false,
-          sortLv: 0,
-          status: true,
-          fixed: false,
-          columnWidth: 80
-        },
-        {
-          userId: this.$store.state.user.name,
-          functionId: 6031,
-          serialNumber: '6031Table4ToolID',
-          tableId: "6031Table4",
-          tableName: "生产订单工具信息表",
-          columnProp: "toolID",
-          headerAlign: "center",
-          align: "left",
-          columnLabel: "工具编号",
-          columnHidden: false,
-          columnImage: false,
-          columnSortable: false,
-          sortLv: 0,
-          status: true,
-          fixed: false,
-          columnWidth: 100
-        },
-        {
-          userId: this.$store.state.user.name,
-          functionId: 6031,
-          serialNumber: '6031Table4ToolDescription',
-          tableId: "6031Table4",
-          tableName: "生产订单工具信息表",
-          columnProp: "toolDescription",
-          headerAlign: "center",
-          align: "left",
-          columnLabel: "工具名称",
-          columnHidden: false,
-          columnImage: false,
-          columnSortable: false,
-          sortLv: 0,
-          status: true,
-          fixed: false,
-          columnWidth: 160
-        },
-        {
-          userId: this.$store.state.user.name,
-          functionId: 6031,
-          serialNumber: '6031Table4Spec',
-          tableId: "6031Table4",
-          tableName: "生产订单工具信息表",
-          columnProp: "spec",
-          headerAlign: "center",
-          align: "left",
-          columnLabel: "规格型号",
-          columnHidden: false,
-          columnImage: false,
-          columnSortable: false,
-          sortLv: 0,
-          status: true,
-          fixed: false,
-          columnWidth: 120
-        },
-        {
-          userId: this.$store.state.user.name,
-          functionId: 6031,
-          serialNumber: '6031Table4ToolQty',
-          tableId: "6031Table4",
-          tableName: "生产订单工具信息表",
-          columnProp: "toolQty",
-          headerAlign: "center",
-          align: "right",
-          columnLabel: "工具数量",
-          columnHidden: false,
-          columnImage: false,
-          columnSortable: false,
-          sortLv: 0,
-          status: true,
-          fixed: false,
-          columnWidth: 80
-        },
-        {
-          userId: this.$store.state.user.name,
-          functionId: 6031,
-          serialNumber: '6031Table4UMID',
-          tableId: "6031Table4",
-          tableName: "生产订单工具信息表",
-          columnProp: "uMID",
-          headerAlign: "center",
-          align: "left",
-          columnLabel: "计量单位",
-          columnHidden: false,
-          columnImage: false,
-          columnSortable: false,
-          sortLv: 0,
-          status: true,
-          fixed: false,
-          columnWidth: 80
-        },
-        {
-          userId: this.$store.state.user.name,
-          functionId: 6031,
-          serialNumber: '6031Table4Active',
-          tableId: "6031Table4",
-          tableName: "生产订单工具信息表",
-          columnProp: "active",
-          headerAlign: "center",
-          align: "left",
-          columnLabel: "在用",
-          columnHidden: false,
-          columnImage: false,
-          columnSortable: false,
-          sortLv: 0,
-          status: true,
-          fixed: false,
-          columnWidth: 40
-        },
-        {
-          userId: this.$store.state.user.name,
-          functionId: 6031,
-          serialNumber: '6031Table4FamilyID',
-          tableId: "6031Table4",
-          tableName: "生产订单工具信息表",
-          columnProp: "familyID",
-          headerAlign: "center",
-          align: "left",
-          columnLabel: "工具分类",
-          columnHidden: false,
-          columnImage: false,
-          columnSortable: false,
-          sortLv: 0,
-          status: true,
-          fixed: false,
-          columnWidth: 80
+  export default {
+    //查询-产线产量报告(分订单)
+    name: "searchProductionLineOutputReportInOrderNo",
+    components: {
+      Chooselist,
+      Routing
+    },
+    data() {
+      return {
+        tagNo: '',
+        // 导出 start
+        exportData: [],
+        exportName: "产品结构" + this.dayjs().format('YYYYMMDDHHmmss'),
+        exportHeader: ["产品结构"],
+        exportFooter: [],
+        // 导出 end
+        // 导出 start
+        exportData2: [],
+        exportName2: "工艺路线" + this.dayjs().format('YYYYMMDDHHmmss'),
+        exportHeader2: ["工艺路线"],
+        exportFooter2: [],
+        // 导出 end
+        // 导出 start
+        exportData3: [],
+        exportName3: "工具信息" + this.dayjs().format('YYYYMMDDHHmmss'),
+        exportHeader3: ["工具信息"],
+        exportFooter3: [],
+        // 导出 end
+        activeName: 'first',
+        height: 200,
+        modelFlag2: false,
+        modelFlag3: false,
+        modelInputFlag: true,
+        searchData: {
+          user: this.$store.state.user.name,
+          orderNo: '',
+          site: '',
+          partNo: '',
+          status: '',
+          date1: '',
+          date2: '',
+          date3: '',
+          date4: '',
         },
-        {
-          userId: this.$store.state.user.name,
-          functionId: 6031,
-          serialNumber: '6031Table4FamilyName',
-          tableId: "6031Table4",
-          tableName: "生产订单工具信息表",
-          columnProp: "familyName",
-          headerAlign: "center",
-          align: "left",
-          columnLabel: "工具分类名称",
-          columnHidden: false,
-          columnImage: false,
-          columnSortable: false,
-          sortLv: 0,
-          status: true,
-          fixed: false,
-          columnWidth: 120
+        modelData: {
+          orderNo: '',
+          partNo: '',
+          partDesc: '',
+          site: '',
+          needDate: '',
+          planStartDate: '',
+          lotSize: '',
+          status: '',
+          orderType: '',
+          planner: '',
+          printed: '',
+          orderRef1: '',
+          orderRef2: '',
+          oriSOOrderNo: '',
+          eOriginalOrderType: '',
+          eOriginalOrderNo: '',
+          eSeqNo: '',
+          projectID: '',
+          projectIDName: '',
+          partRemark: '',
+          configurationTemplateID: '',
+          enterDate: '',
+          userName: '',
+          releaseDate: '',
+          releaseGuys: '',
+          scheduleDate: '',
+          scheduler: '',
+          issueDate: '',
+          reportDate: '',
+          receiveDate: '',
+          closeDate: '',
+          finishedQty: '',
+          umid: '',
+          costRollUpFlag: '',
+          manualFlag: '',
+          bOMRevNo: '',
+          routingRevNo: '',
+          sFDCReportedFlag: '',
+          originalNeedDate: '',
+          leadtime: '',
+          receiveStatus: '',
+          techInfo: '',
+          remark: '',
+          repairSOFlag: '',
+          checkFlag: '',/*关单是否校验数量*/
         },
-        {
-          userId: this.$store.state.user.name,
-          functionId: 6031,
-          serialNumber: '6031Table4Remark',
-          tableId: "6031Table4",
-          tableName: "生产订单工具信息表",
-          columnProp: "remark",
-          headerAlign: "center",
-          align: "left",
-          columnLabel: "备注",
-          columnHidden: false,
-          columnImage: false,
-          columnSortable: false,
-          sortLv: 0,
-          status: true,
-          fixed: false,
-          columnWidth: 160
+        updateData: {
+          needDate: '',
+          planStartDate: '',
+          originalNeedDate: '',
+          orderType: '',
+          planner: '',
+          oriSOOrderNo: '',
+          projectID: '',
+          leadtime: '',
+          repairSOFlag: '',
+          techInfo: '',
+          remark: '',
+          site: '',
+          orderNo: ''
         },
-        {
-          userId: this.$store.state.user.name,
-          functionId: 6031,
-          serialNumber: '6031Table4CreateDate',
-          tableId: "6031Table4",
-          tableName: "生产订单工具信息表",
-          columnProp: "createDate",
-          headerAlign: "center",
-          align: "left",
-          columnLabel: "录入日期",
-          columnHidden: false,
-          columnImage: false,
-          columnSortable: false,
-          sortLv: 0,
-          status: true,
-          fixed: false,
-          columnWidth: 160
+        dataList: [],
+        dataList2: [],
+        dataList3: [],
+        dataList4: [],
+        dataListLoading: false,
+        buttons: {
+          download: '导出',
+          download2: '导出',
+          download3: '导出',
         },
-        {
-          userId: this.$store.state.user.name,
-          functionId: 6031,
-          serialNumber: '6031Table4CreatedBy',
-          tableId: "6031Table4",
-          tableName: "生产订单工具信息表",
-          columnProp: "createdBy",
-          headerAlign: "center",
-          align: "left",
-          columnLabel: "录入人",
-          columnHidden: false,
-          columnImage: false,
-          columnSortable: false,
-          sortLv: 0,
-          status: true,
-          fixed: false,
-          columnWidth: 60
-        }
-      ],
-      orderInfo: null,
-      orderSoBom: []
-    }
-  },
-  watch: {
-    $route: {
-      handler: function (val, oldVal) {
-        this.$router.onReady(() => {
-          if (this.$route.query.order) {
-            this.modelData.orderNo = this.$route.query.order
-            this.modelData.site = this.$route.query.site
-            this.modelData.user = this.$route.query.user
-            if (this.modelData.orderNo) {
-              this.tableHanddle(this.modelData)
-            }
+        columnList: [
+          {
+            userId: this.$store.state.user.name,
+            functionId: 6031,
+            serialNumber: '6031TableItemNo',
+            tableId: "6031Table",
+            tableName: "生产订单产品结构表",
+            columnProp: "itemNo",
+            headerAlign: "center",
+            align: "left",
+            columnLabel: "序号",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: false,
+            columnWidth: 60
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 6031,
+            serialNumber: '6031TableComponentPartNo',
+            tableId: "6031Table",
+            tableName: "生产订单产品结构表",
+            columnProp: "componentPartNo",
+            headerAlign: "center",
+            align: "left",
+            columnLabel: "零部件编码",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: false,
+            columnWidth: 120
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 6031,
+            serialNumber: '6031TablePartDesc',
+            tableId: "6031Table",
+            tableName: "生产订单产品结构表",
+            columnProp: "partDesc",
+            headerAlign: "center",
+            align: "left",
+            columnLabel: "零部件名称",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: false,
+            columnWidth: 150
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 6031,
+            serialNumber: '6031TablePartSpec',
+            tableId: "6031Table",
+            tableName: "生产订单产品结构表",
+            columnProp: "partSpec",
+            headerAlign: "center",
+            align: "left",
+            columnLabel: "规格型号",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: false,
+            columnWidth: 100
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 6031,
+            serialNumber: '6031TableQtyAssembly',
+            tableId: "6031Table",
+            tableName: "生产订单产品结构表",
+            columnProp: "qtyAssembly",
+            headerAlign: "center",
+            align: "right",
+            columnLabel: "单位用量",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: false,
+            columnWidth: 80
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 6031,
+            serialNumber: '6031TableQtyFixedScrapt',
+            tableId: "6031Table",
+            tableName: "生产订单产品结构表",
+            columnProp: "qtyFixedScrapt",
+            headerAlign: "center",
+            align: "right",
+            columnLabel: "固定损耗",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: false,
+            columnWidth: 80
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 6031,
+            serialNumber: '6031TablePartUm',
+            tableId: "6031Table",
+            tableName: "生产订单产品结构表",
+            columnProp: "partUm",
+            headerAlign: "center",
+            align: "left",
+            columnLabel: "计量单位",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: false,
+            columnWidth: 80
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 6031,
+            serialNumber: '6031TableScraptFactor',
+            tableId: "6031Table",
+            tableName: "生产订单产品结构表",
+            columnProp: "scraptFactor",
+            headerAlign: "center",
+            align: "right",
+            columnLabel: "报废率",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: false,
+            columnWidth: 80
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 6031,
+            serialNumber: '6031TableQtyRequired',
+            tableId: "6031Table",
+            tableName: "生产订单产品结构表",
+            columnProp: "qtyRequired",
+            headerAlign: "center",
+            align: "right",
+            columnLabel: "需求数量",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: false,
+            columnWidth: 80
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 6031,
+            serialNumber: '6031TableQtyReserved',
+            tableId: "6031Table",
+            tableName: "生产订单产品结构表",
+            columnProp: "qtyReserved",
+            headerAlign: "center",
+            align: "right",
+            columnLabel: "预留数量",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: false,
+            columnWidth: 80
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 6031,
+            serialNumber: '6031TableQtyIssue',
+            tableId: "6031Table",
+            tableName: "生产订单产品结构表",
+            columnProp: "qtyIssue",
+            headerAlign: "center",
+            align: "right",
+            columnLabel: "发料数量",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: false,
+            columnWidth: 80
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 6031,
+            serialNumber: '6031TableIssueDate',
+            tableId: "6031Table",
+            tableName: "生产订单产品结构表",
+            columnProp: "issueDate",
+            headerAlign: "center",
+            align: "left",
+            columnLabel: "发料日期",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: false,
+            columnWidth: 150
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 6031,
+            serialNumber: '6031TableRemark',
+            tableId: "6031Table",
+            tableName: "生产订单产品结构表",
+            columnProp: "remark",
+            headerAlign: "center",
+            align: "left",
+            columnLabel: "备注",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: false,
+            columnWidth: 100
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 6031,
+            serialNumber: '6031TableRMTypeDB',
+            tableId: "6031Table",
+            tableName: "生产订单产品结构表",
+            columnProp: "rMTypeDB",
+            headerAlign: "center",
+            align: "left",
+            columnLabel: "是否主材料",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: false,
+            columnWidth: 100
           }
-        })
-      },
-      // 深度观察监听
-      deep: true
+        ],
+        columnList2: [
+          {
+            userId: this.$store.state.user.name,
+            functionId: 6031,
+            serialNumber: '6031TableItemNo',
+            tableId: "6031Table",
+            tableName: "生产订单工艺路线表",
+            columnProp: "itemNo",
+            headerAlign: "center",
+            align: "left",
+            columnLabel: "序号",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: true,
+            columnWidth: 40
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 6031,
+            serialNumber: '6031TableOperationDesc',
+            tableId: "6031Table",
+            tableName: "生产订单工艺路线表",
+            columnProp: "operationDesc",
+            headerAlign: "center",
+            align: "left",
+            columnLabel: "工序名称",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: true,
+            columnWidth: 160
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 6031,
+            serialNumber: '6031TableWorkCenterNo',
+            tableId: "6031Table",
+            tableName: "生产订单工艺路线表",
+            columnProp: "workCenterNo",
+            headerAlign: "center",
+            align: "left",
+            columnLabel: "加工中心",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: false,
+            columnWidth: 80
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 6031,
+            serialNumber: '6031TableWorkCenterDesc',
+            tableId: "6031Table",
+            tableName: "生产订单工艺路线表",
+            columnProp: "workCenterDesc",
+            headerAlign: "center",
+            align: "left",
+            columnLabel: "加工中心名称",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: false,
+            columnWidth: 120
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 6031,
+            serialNumber: '6031TableMachSetupTime',
+            tableId: "6031Table",
+            tableName: "生产订单工艺路线表",
+            columnProp: "machSetupTime",
+            headerAlign: "center",
+            align: "right",
+            columnLabel: "准备时间",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: false,
+            columnWidth: 80
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 6031,
+            serialNumber: '6031TableMachRunFactor',
+            tableId: "6031Table",
+            tableName: "生产订单工艺路线表",
+            columnProp: "machRunFactor",
+            headerAlign: "center",
+            align: "right",
+            columnLabel: "单位产出量",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: false,
+            columnWidth: 100
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 6031,
+            serialNumber: '6031TableFactorUnit',
+            tableId: "6031Table",
+            tableName: "生产订单工艺路线表",
+            columnProp: "factorUnit",
+            headerAlign: "center",
+            align: "left",
+            columnLabel: "产出单位",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: false,
+            columnWidth: 80
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 6031,
+            serialNumber: '6031TableTimeRequired',
+            tableId: "6031Table",
+            tableName: "生产订单工艺路线表",
+            columnProp: "timeRequired",
+            headerAlign: "center",
+            align: "right",
+            columnLabel: "需求时间",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: false,
+            columnWidth: 80
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 6031,
+            serialNumber: '6031TableTimeReported',
+            tableId: "6031Table",
+            tableName: "生产订单工艺路线表",
+            columnProp: "timeReported",
+            headerAlign: "center",
+            align: "right",
+            columnLabel: "报告时间",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: false,
+            columnWidth: 80
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 6031,
+            serialNumber: '6031TableEfficiency',
+            tableId: "6031Table",
+            tableName: "生产订单工艺路线表",
+            columnProp: "efficiency",
+            headerAlign: "center",
+            align: "right",
+            columnLabel: "效率",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: false,
+            columnWidth: 60
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 6031,
+            serialNumber: '6031TableQtyRequired',
+            tableId: "6031Table",
+            tableName: "生产订单工艺路线表",
+            columnProp: "qtyRequired",
+            headerAlign: "center",
+            align: "right",
+            columnLabel: "需求数量",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: false,
+            columnWidth: 80
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 6031,
+            serialNumber: '6031TableQtyReported',
+            tableId: "6031Table",
+            tableName: "生产订单工艺路线表",
+            columnProp: "qtyReported",
+            headerAlign: "center",
+            align: "right",
+            columnLabel: "报告数量",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: false,
+            columnWidth: 80
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 6031,
+            serialNumber: '6031TableQtyApprove',
+            tableId: "6031Table",
+            tableName: "生产订单工艺路线表",
+            columnProp: "qtyApprove",
+            headerAlign: "center",
+            align: "right",
+            columnLabel: "合格数量",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: false,
+            columnWidth: 80
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 6031,
+            serialNumber: '6031TablePlanStartTime',
+            tableId: "6031Table",
+            tableName: "生产订单工艺路线表",
+            columnProp: "planStartTime",
+            headerAlign: "center",
+            align: "left",
+            columnLabel: "计划开工时间",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: false,
+            columnWidth: 140
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 6031,
+            serialNumber: '6031TablePlanFinishTime',
+            tableId: "6031Table",
+            tableName: "生产订单工艺路线表",
+            columnProp: "planFinishTime",
+            headerAlign: "center",
+            align: "left",
+            columnLabel: "计划完工时间",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: false,
+            columnWidth: 140
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 6031,
+            serialNumber: '6031TableBarcodeID',
+            tableId: "6031Table",
+            tableName: "生产订单工艺路线表",
+            columnProp: "barcodeID",
+            headerAlign: "center",
+            align: "left",
+            columnLabel: "条形码",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: false,
+            columnWidth: 150
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 6031,
+            serialNumber: '6031TableRemark',
+            tableId: "6031Table",
+            tableName: "生产订单工艺路线表",
+            columnProp: "remark",
+            headerAlign: "center",
+            align: "left",
+            columnLabel: "备注",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: false,
+            columnWidth: 80
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 6031,
+            serialNumber: '6031TableClosedFlag',
+            tableId: "6031Table",
+            tableName: "生产订单工艺路线表",
+            columnProp: "closedFlag",
+            headerAlign: "center",
+            align: "left",
+            columnLabel: "是否关闭",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: false,
+            columnWidth: 80
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 6031,
+            serialNumber: '6031TableActionNotes',
+            tableId: "6031Table",
+            tableName: "生产订单工艺路线表",
+            columnProp: "actionNotes",
+            headerAlign: "center",
+            align: "left",
+            columnLabel: "打开/关闭备忘",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: false,
+            columnWidth: 200
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 6031,
+            serialNumber: '6031TableWorkCenterType',
+            tableId: "6031Table",
+            tableName: "生产订单工艺路线表",
+            columnProp: "workCenterType",
+            headerAlign: "center",
+            align: "left",
+            columnLabel: "加工中心类型",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: false,
+            columnWidth: 120
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 6031,
+            serialNumber: '6031TableAvailResource',
+            tableId: "6031Table",
+            tableName: "生产订单工艺路线表",
+            columnProp: "availResource",
+            headerAlign: "center",
+            align: "left",
+            columnLabel: "可用机台",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: false,
+            columnWidth: 200
+          },
+
+        ],
+        columnList3: [
+          {
+            userId: this.$store.state.user.name,
+            functionId: 6031,
+            serialNumber: '6031Table3OrderNo',
+            tableId: "6031Table3",
+            tableName: "生产订单数据获取表",
+            columnProp: "orderNo",
+            headerAlign: "center",
+            align: "left",
+            columnLabel: "订单号",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: false,
+            columnWidth: 120
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 6031,
+            serialNumber: '6031Table3PartNo',
+            tableId: "6031Table3",
+            tableName: "生产订单数据获取表",
+            columnProp: "partNo",
+            headerAlign: "center",
+            align: "left",
+            columnLabel: "物料编码",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: false,
+            columnWidth: 120
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 6031,
+            serialNumber: '6031Table3PartDesc',
+            tableId: "6031Table3",
+            tableName: "生产订单数据获取表",
+            columnProp: "partDesc",
+            headerAlign: "center",
+            align: "left",
+            columnLabel: "物料名称/规格",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: false,
+            columnWidth: 160
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 6031,
+            serialNumber: '6031Table3LotSize',
+            tableId: "6031Table3",
+            tableName: "生产订单数据获取表",
+            columnProp: "lotSize",
+            headerAlign: "center",
+            align: "right",
+            columnLabel: "订单数量",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: false,
+            columnWidth: 100
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 6031,
+            serialNumber: '6031Table3NeedDate',
+            tableId: "6031Table3",
+            tableName: "生产订单数据获取表",
+            columnProp: "needDate",
+            headerAlign: "center",
+            align: "left",
+            columnLabel: "要求完工日期",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: false,
+            columnWidth: 120
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 6031,
+            serialNumber: '6031Table3Planner',
+            tableId: "6031Table3",
+            tableName: "生产订单数据获取表",
+            columnProp: "planner",
+            headerAlign: "center",
+            align: "left",
+            columnLabel: "计划方式",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: false,
+            columnWidth: 80
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 6031,
+            serialNumber: '6031Table3OrderType',
+            tableId: "6031Table3",
+            tableName: "生产订单数据获取表",
+            columnProp: "orderType",
+            headerAlign: "center",
+            align: "left",
+            columnLabel: "订单类型",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: false,
+            columnWidth: 80
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 6031,
+            serialNumber: '6031Table3Status',
+            tableId: "6031Table3",
+            tableName: "生产订单数据获取表",
+            columnProp: "status",
+            headerAlign: "center",
+            align: "left",
+            columnLabel: "状态",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: false,
+            columnWidth: 60
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 6031,
+            serialNumber: '6031Table3ReceiveStatus',
+            tableId: "6031Table3",
+            tableName: "生产订单数据获取表",
+            columnProp: "receiveStatus",
+            headerAlign: "center",
+            align: "left",
+            columnLabel: "入库状态",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: false,
+            columnWidth: 80
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 6031,
+            serialNumber: '6031Table3Site',
+            tableId: "6031Table3",
+            tableName: "生产订单数据获取表",
+            columnProp: "site",
+            headerAlign: "center",
+            align: "left",
+            columnLabel: "工厂编号",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: false,
+            columnWidth: 80
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 6031,
+            serialNumber: '6031Table3RepairSOFlag',
+            tableId: "6031Table3",
+            tableName: "生产订单数据获取表",
+            columnProp: "repairSOFlag",
+            headerAlign: "center",
+            align: "left",
+            columnLabel: "印版已发",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: false,
+            columnWidth: 80
+          }
+        ],
+        columnList4: [
+          {
+            userId: this.$store.state.user.name,
+            functionId: 6031,
+            serialNumber: '6031Table4ItemNo',
+            tableId: "6031Table4",
+            tableName: "生产订单工具信息表",
+            columnProp: "itemNo",
+            headerAlign: "center",
+            align: "left",
+            columnLabel: "工序号",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: false,
+            columnWidth: 80
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 6031,
+            serialNumber: '6031Table4ToolID',
+            tableId: "6031Table4",
+            tableName: "生产订单工具信息表",
+            columnProp: "toolID",
+            headerAlign: "center",
+            align: "left",
+            columnLabel: "工具编号",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: false,
+            columnWidth: 100
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 6031,
+            serialNumber: '6031Table4ToolDescription',
+            tableId: "6031Table4",
+            tableName: "生产订单工具信息表",
+            columnProp: "toolDescription",
+            headerAlign: "center",
+            align: "left",
+            columnLabel: "工具名称",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: false,
+            columnWidth: 160
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 6031,
+            serialNumber: '6031Table4Spec',
+            tableId: "6031Table4",
+            tableName: "生产订单工具信息表",
+            columnProp: "spec",
+            headerAlign: "center",
+            align: "left",
+            columnLabel: "规格型号",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: false,
+            columnWidth: 120
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 6031,
+            serialNumber: '6031Table4ToolQty',
+            tableId: "6031Table4",
+            tableName: "生产订单工具信息表",
+            columnProp: "toolQty",
+            headerAlign: "center",
+            align: "right",
+            columnLabel: "工具数量",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: false,
+            columnWidth: 80
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 6031,
+            serialNumber: '6031Table4UMID',
+            tableId: "6031Table4",
+            tableName: "生产订单工具信息表",
+            columnProp: "uMID",
+            headerAlign: "center",
+            align: "left",
+            columnLabel: "计量单位",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: false,
+            columnWidth: 80
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 6031,
+            serialNumber: '6031Table4Active',
+            tableId: "6031Table4",
+            tableName: "生产订单工具信息表",
+            columnProp: "active",
+            headerAlign: "center",
+            align: "left",
+            columnLabel: "在用",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: false,
+            columnWidth: 40
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 6031,
+            serialNumber: '6031Table4FamilyID',
+            tableId: "6031Table4",
+            tableName: "生产订单工具信息表",
+            columnProp: "familyID",
+            headerAlign: "center",
+            align: "left",
+            columnLabel: "工具分类",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: false,
+            columnWidth: 80
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 6031,
+            serialNumber: '6031Table4FamilyName',
+            tableId: "6031Table4",
+            tableName: "生产订单工具信息表",
+            columnProp: "familyName",
+            headerAlign: "center",
+            align: "left",
+            columnLabel: "工具分类名称",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: false,
+            columnWidth: 120
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 6031,
+            serialNumber: '6031Table4Remark',
+            tableId: "6031Table4",
+            tableName: "生产订单工具信息表",
+            columnProp: "remark",
+            headerAlign: "center",
+            align: "left",
+            columnLabel: "备注",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: false,
+            columnWidth: 160
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 6031,
+            serialNumber: '6031Table4CreateDate',
+            tableId: "6031Table4",
+            tableName: "生产订单工具信息表",
+            columnProp: "createDate",
+            headerAlign: "center",
+            align: "left",
+            columnLabel: "录入日期",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: false,
+            columnWidth: 160
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 6031,
+            serialNumber: '6031Table4CreatedBy',
+            tableId: "6031Table4",
+            tableName: "生产订单工具信息表",
+            columnProp: "createdBy",
+            headerAlign: "center",
+            align: "left",
+            columnLabel: "录入人",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: false,
+            columnWidth: 60
+          }
+        ],
+        orderInfo: null,
+        orderSoBom: []
+      }
     },
-    updateData: {
-      deep: true,
-      handler: function (newV, oldV) {
-        this.updateData.projectID = this.updateData.projectID.toUpperCase();
-        this.updateData.oriSOOrderNo = this.updateData.oriSOOrderNo.toUpperCase();
-        this.updateData.orderType = this.updateData.orderType.toUpperCase();
+    watch: {
+      $route: {
+        handler: function (val, oldVal) {
+          this.$router.onReady(() => {
+            if (this.$route.query.order) {
+              this.modelData.orderNo = this.$route.query.order
+              this.modelData.site = this.$route.query.site
+              this.modelData.user = this.$route.query.user
+              if (this.modelData.orderNo) {
+                this.tableHanddle(this.modelData)
+              }
+            }
+          })
+        },
+        // 深度观察监听
+        deep: true
+      },
+      updateData: {
+        deep: true,
+        handler: function (newV, oldV) {
+          this.updateData.projectID = this.updateData.projectID.toUpperCase();
+          this.updateData.oriSOOrderNo = this.updateData.oriSOOrderNo.toUpperCase();
+          this.updateData.orderType = this.updateData.orderType.toUpperCase();
+        }
       }
-    }
-  },
-  mounted() {
-    this.$nextTick(() => {
-      this.height = window.innerHeight - 255;
-    })
-  },
-  methods: {
-    async getOrderInfo() {
-      await getOrderInfo(this.modelData).then(({data}) => {
-        this.orderInfo = data.orderInfo;
-      })
-
     },
-    async getShopOrderSapSOBOM() {
-      await getShopOrderSapSOBOM(this.modelData).then(({data}) => {
-        this.orderSoBom = data.soBomList
+    mounted() {
+      this.$nextTick(() => {
+        this.height = window.innerHeight - 255;
       })
-
     },
-    // 打印
-    async printOrder() {
-      if (!this.modelData.orderNo) {
-        return this.$message.warning('请先选择订单')
-      }
-      // 获取订单数据
-      await this.getOrderInfo()
-      await this.getShopOrderSapSOBOM();
-      // 获取物料信息
-      const LODOP = this.getLodop()
-      if (LODOP && this.orderInfo) {
-        LODOP.SET_LICENSES("", "7B5624CC84E599D6B17F27DF40F4310C", "", "");
-        LODOP.NewPage();
-        LODOP.SET_PRINT_PAGESIZE(0, 2400, 1400, "");
-        LODOP.ADD_PRINT_LINE(102, 15, 103, 771, 0, 1);
-        LODOP.ADD_PRINT_TEXT(7, 257, 254, 50, this.orderInfo.orderNo);
-        LODOP.SET_PRINT_STYLEA(0, "FontSize", 24);
-        LODOP.SET_PRINT_STYLEA(0, "Alignment", 2);
-        LODOP.ADD_PRINT_LINE(141, 16, 142, 772, 0, 1);
-        LODOP.ADD_PRINT_LINE(181, 16, 182, 772, 0, 1);
-        LODOP.ADD_PRINT_LINE(232, 137, 62, 138, 0, 1);
-        LODOP.ADD_PRINT_LINE(232, 15, 233, 771, 0, 1);
-        LODOP.ADD_PRINT_LINE(270, 16, 271, 772, 0, 1);
-        LODOP.ADD_PRINT_LINE(271, 15, 62, 16, 0, 1);
-        LODOP.ADD_PRINT_LINE(271, 772, 62, 773, 0, 1);
-        LODOP.ADD_PRINT_LINE(62, 16, 63, 772, 0, 1);
-        LODOP.ADD_PRINT_TEXT(71, 20, 100, 30, "产品编码:");
-        LODOP.SET_PRINT_STYLEA(0, "FontSize", 14);
-        LODOP.ADD_PRINT_TEXT(109, 19, 100, 30, "产品描述:");
-        LODOP.SET_PRINT_STYLEA(0, "FontSize", 14);
-        LODOP.ADD_PRINT_TEXT(149, 19, 100, 30, "首 工 序:");
-        LODOP.SET_PRINT_STYLEA(0, "FontSize", 14);
-        LODOP.ADD_PRINT_TEXT(195, 19, 100, 30, "备    注:");
-        LODOP.SET_PRINT_STYLEA(0, "FontSize", 14);
-        LODOP.ADD_PRINT_TEXT(238, 18, 100, 30, "材料信息");
-        LODOP.SET_PRINT_STYLEA(0, "FontSize", 14);
-        LODOP.ADD_PRINT_TEXT(70, 145, 262, 30, this.orderInfo.partNo);
-        LODOP.SET_PRINT_STYLEA(0, "FontSize", 14);
-        LODOP.ADD_PRINT_LINE(102, 413, 62, 414, 0, 1);
-        LODOP.ADD_PRINT_LINE(102, 545, 62, 546, 0, 1);
-        LODOP.ADD_PRINT_TEXT(71, 420, 110, 30, "生产数量");
-        LODOP.SET_PRINT_STYLEA(0, "FontSize", 14);
-        LODOP.ADD_PRINT_TEXT(71, 548, 220, 30, this.orderInfo.lotSize);
-        LODOP.SET_PRINT_STYLEA(0, "FontSize", 14);
-        LODOP.ADD_PRINT_TEXT(196, 144, 554, 30, this.orderInfo.remark);
-        LODOP.SET_PRINT_STYLEA(0, "FontSize", 14);
-        LODOP.ADD_PRINT_TEXT(148, 143, 554, 30, this.orderInfo.firstItemNo);
-        LODOP.SET_PRINT_STYLEA(0, "FontSize", 14);
-        LODOP.ADD_PRINT_TEXT(108, 144, 554, 30, this.orderInfo.partDesc);
-        LODOP.SET_PRINT_STYLEA(0, "FontSize", 14);
-        LODOP.ADD_PRINT_LINE(310, 74, 270, 75, 0, 1);
-        LODOP.ADD_PRINT_LINE(310, 178, 270, 179, 0, 1);
-        LODOP.ADD_PRINT_LINE(310, 372, 270, 373, 0, 1);
-        LODOP.ADD_PRINT_LINE(310, 458, 270, 459, 0, 1);
-        LODOP.ADD_PRINT_LINE(310, 520, 270, 521, 0, 1);
-        LODOP.ADD_PRINT_LINE(310, 653, 270, 654, 0, 1);
-        LODOP.ADD_PRINT_TEXT(279, 20, 48, 30, "序号");
-        LODOP.SET_PRINT_STYLEA(0, "FontSize", 14);
-        LODOP.ADD_PRINT_TEXT(279, 75, 100, 30, "物料编码");
-        LODOP.SET_PRINT_STYLEA(0, "FontSize", 14);
-        LODOP.SET_PRINT_STYLEA(0, "Alignment", 2);
-        LODOP.ADD_PRINT_TEXT(279, 181, 189, 30, "物料名称/规格型号");
-        LODOP.SET_PRINT_STYLEA(0, "FontSize", 14);
-        LODOP.SET_PRINT_STYLEA(0, "Alignment", 2);
-        LODOP.ADD_PRINT_TEXT(279, 374, 83, 30, "库位");
-        LODOP.SET_PRINT_STYLEA(0, "FontSize", 14);
-        LODOP.SET_PRINT_STYLEA(0, "Alignment", 2);
-        LODOP.ADD_PRINT_TEXT(279, 459, 58, 30, "单位");
-        LODOP.SET_PRINT_STYLEA(0, "FontSize", 14);
-        LODOP.SET_PRINT_STYLEA(0, "Alignment", 2);
-        LODOP.ADD_PRINT_TEXT(278, 523, 124, 30, "需求数量");
-        LODOP.SET_PRINT_STYLEA(0, "FontSize", 14);
-        LODOP.SET_PRINT_STYLEA(0, "Alignment", 2);
-        LODOP.ADD_PRINT_TEXT(278, 655, 114, 30, "实发数量");
-        LODOP.SET_PRINT_STYLEA(0, "FontSize", 14);
-        LODOP.SET_PRINT_STYLEA(0, "Alignment", 2);
-        LODOP.ADD_PRINT_LINE(310, 15, 270, 16, 0, 1);
-        LODOP.ADD_PRINT_LINE(311, 16, 310, 772, 0, 1);
-        LODOP.ADD_PRINT_LINE(310, 772, 270, 773, 0, 1);
-        let sumTop = 24
-        for (let i = 0; i < this.orderSoBom.length; i++) {
-          let bom = this.orderSoBom[i]
-          sumTop += 40
-          let top = 40 * (i + 1)
-          let xZTop1 = 270 + top
-          let xZTop2 = xZTop1 +40
-          let xhTop1 = 310 + top
-          let xhTop2 = xhTop1 + 1
-          let label = 279 + top
+    methods: {
+      // 选中菜单出发
+      handleCommand(command) {
+        switch (command) {
+          case '0':
+            this.getRouting()
+            break;
+        }
+      },
+      // 工艺路线管理
+      getRouting(){
+        if (!this.modelData.orderNo){
+          this.$message.warning('请选择生产订单')
+          return
+        }
+        this.$nextTick(() => {
+          this.$refs.routing.init(this.modelData)
+        })
+      },
+      async getOrderInfo() {
+        await getOrderInfo(this.modelData).then(({data}) => {
+          this.orderInfo = data.orderInfo;
+        })
 
-          LODOP.ADD_PRINT_LINE(xZTop2,74,xZTop1,75,0,1);
-          LODOP.ADD_PRINT_LINE(xZTop2,178,xZTop1,179,0,1);
-          LODOP.ADD_PRINT_LINE(xZTop2,372,xZTop1,373,0,1);
-          LODOP.ADD_PRINT_LINE(xZTop2,458,xZTop1,459,0,1);
-          LODOP.ADD_PRINT_LINE(xZTop2,520,xZTop1,521,0,1);
-          LODOP.ADD_PRINT_LINE(xZTop2,653,xZTop1,654,0,1);
-          LODOP.ADD_PRINT_TEXT(label,20,48,30,(i+1));
-          LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
-          LODOP.ADD_PRINT_TEXT(label,75,100,30,bom.componentPartNo);
-          LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
-          LODOP.SET_PRINT_STYLEA(0,"Alignment",2);
-          LODOP.ADD_PRINT_TEXT(label,181,189,30,bom.partDesc);
-          LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
-          LODOP.SET_PRINT_STYLEA(0,"Alignment",2);
-          LODOP.ADD_PRINT_TEXT(label,374,83,30,bom.defaultLocationID);
-          LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
-          LODOP.SET_PRINT_STYLEA(0,"Alignment",2);
-          LODOP.ADD_PRINT_TEXT(label,459,58,30,bom.spec);
-          LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
-          LODOP.SET_PRINT_STYLEA(0,"Alignment",2);
-          LODOP.ADD_PRINT_TEXT(label,523,124,30,bom.qtyRequired);
-          LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
-          LODOP.SET_PRINT_STYLEA(0,"Alignment",3);
-          LODOP.ADD_PRINT_TEXT(label,655,114,30,bom.qtyReserved);
-          LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
-          LODOP.SET_PRINT_STYLEA(0,"Alignment",3);
-          LODOP.ADD_PRINT_LINE(xZTop2,15,xZTop1,16,0,1);
-          LODOP.ADD_PRINT_LINE(xhTop2,16,xhTop1,772,0,1);
-          LODOP.ADD_PRINT_LINE(xZTop2,772,xZTop1,773,0,1);
+      },
+      async getShopOrderSapSOBOM() {
+        await getShopOrderSapSOBOM(this.modelData).then(({data}) => {
+          this.orderSoBom = data.soBomList
+        })
 
+      },
+      // 打印
+      async printOrder() {
+        if (!this.modelData.orderNo) {
+          return this.$message.warning('请先选择订单')
+        }
+        // 获取订单数据
+        await this.getOrderInfo()
+        await this.getShopOrderSapSOBOM();
+        // 获取物料信息
+        const LODOP = this.getLodop()
+        if (LODOP && this.orderInfo) {
+          LODOP.SET_LICENSES("", "7B5624CC84E599D6B17F27DF40F4310C", "", "");
+          LODOP.NewPage();
+          LODOP.SET_PRINT_PAGESIZE(0, 2400, 1400, "");
+          LODOP.ADD_PRINT_LINE(102, 15, 103, 771, 0, 1);
+          LODOP.ADD_PRINT_TEXT(7, 257, 254, 50, this.orderInfo.orderNo);
+          LODOP.SET_PRINT_STYLEA(0, "FontSize", 24);
+          LODOP.SET_PRINT_STYLEA(0, "Alignment", 2);
+          LODOP.ADD_PRINT_LINE(141, 16, 142, 772, 0, 1);
+          LODOP.ADD_PRINT_LINE(181, 16, 182, 772, 0, 1);
+          LODOP.ADD_PRINT_LINE(232, 137, 62, 138, 0, 1);
+          LODOP.ADD_PRINT_LINE(232, 15, 233, 771, 0, 1);
+          LODOP.ADD_PRINT_LINE(270, 16, 271, 772, 0, 1);
+          LODOP.ADD_PRINT_LINE(271, 15, 62, 16, 0, 1);
+          LODOP.ADD_PRINT_LINE(271, 772, 62, 773, 0, 1);
+          LODOP.ADD_PRINT_LINE(62, 16, 63, 772, 0, 1);
+          LODOP.ADD_PRINT_TEXT(71, 20, 100, 30, "产品编码:");
+          LODOP.SET_PRINT_STYLEA(0, "FontSize", 14);
+          LODOP.ADD_PRINT_TEXT(109, 19, 100, 30, "产品描述:");
+          LODOP.SET_PRINT_STYLEA(0, "FontSize", 14);
+          LODOP.ADD_PRINT_TEXT(149, 19, 100, 30, "首 工 序:");
+          LODOP.SET_PRINT_STYLEA(0, "FontSize", 14);
+          LODOP.ADD_PRINT_TEXT(195, 19, 100, 30, "备    注:");
+          LODOP.SET_PRINT_STYLEA(0, "FontSize", 14);
+          LODOP.ADD_PRINT_TEXT(238, 18, 100, 30, "材料信息");
+          LODOP.SET_PRINT_STYLEA(0, "FontSize", 14);
+          LODOP.ADD_PRINT_TEXT(70, 145, 262, 30, this.orderInfo.partNo);
+          LODOP.SET_PRINT_STYLEA(0, "FontSize", 14);
+          LODOP.ADD_PRINT_LINE(102, 413, 62, 414, 0, 1);
+          LODOP.ADD_PRINT_LINE(102, 545, 62, 546, 0, 1);
+          LODOP.ADD_PRINT_TEXT(71, 420, 110, 30, "生产数量");
+          LODOP.SET_PRINT_STYLEA(0, "FontSize", 14);
+          LODOP.ADD_PRINT_TEXT(71, 548, 220, 30, this.orderInfo.lotSize);
+          LODOP.SET_PRINT_STYLEA(0, "FontSize", 14);
+          LODOP.ADD_PRINT_TEXT(196, 144, 554, 30, this.orderInfo.remark);
+          LODOP.SET_PRINT_STYLEA(0, "FontSize", 14);
+          LODOP.ADD_PRINT_TEXT(148, 143, 554, 30, this.orderInfo.firstItemNo);
+          LODOP.SET_PRINT_STYLEA(0, "FontSize", 14);
+          LODOP.ADD_PRINT_TEXT(108, 144, 554, 30, this.orderInfo.partDesc);
+          LODOP.SET_PRINT_STYLEA(0, "FontSize", 14);
+          LODOP.ADD_PRINT_LINE(310, 74, 270, 75, 0, 1);
+          LODOP.ADD_PRINT_LINE(310, 178, 270, 179, 0, 1);
+          LODOP.ADD_PRINT_LINE(310, 372, 270, 373, 0, 1);
+          LODOP.ADD_PRINT_LINE(310, 458, 270, 459, 0, 1);
+          LODOP.ADD_PRINT_LINE(310, 520, 270, 521, 0, 1);
+          LODOP.ADD_PRINT_LINE(310, 653, 270, 654, 0, 1);
+          LODOP.ADD_PRINT_TEXT(279, 20, 48, 30, "序号");
+          LODOP.SET_PRINT_STYLEA(0, "FontSize", 14);
+          LODOP.ADD_PRINT_TEXT(279, 75, 100, 30, "物料编码");
+          LODOP.SET_PRINT_STYLEA(0, "FontSize", 14);
+          LODOP.SET_PRINT_STYLEA(0, "Alignment", 2);
+          LODOP.ADD_PRINT_TEXT(279, 181, 189, 30, "物料名称/规格型号");
+          LODOP.SET_PRINT_STYLEA(0, "FontSize", 14);
+          LODOP.SET_PRINT_STYLEA(0, "Alignment", 2);
+          LODOP.ADD_PRINT_TEXT(279, 374, 83, 30, "库位");
+          LODOP.SET_PRINT_STYLEA(0, "FontSize", 14);
+          LODOP.SET_PRINT_STYLEA(0, "Alignment", 2);
+          LODOP.ADD_PRINT_TEXT(279, 459, 58, 30, "单位");
+          LODOP.SET_PRINT_STYLEA(0, "FontSize", 14);
+          LODOP.SET_PRINT_STYLEA(0, "Alignment", 2);
+          LODOP.ADD_PRINT_TEXT(278, 523, 124, 30, "需求数量");
+          LODOP.SET_PRINT_STYLEA(0, "FontSize", 14);
+          LODOP.SET_PRINT_STYLEA(0, "Alignment", 2);
+          LODOP.ADD_PRINT_TEXT(278, 655, 114, 30, "实发数量");
+          LODOP.SET_PRINT_STYLEA(0, "FontSize", 14);
+          LODOP.SET_PRINT_STYLEA(0, "Alignment", 2);
+          LODOP.ADD_PRINT_LINE(310, 15, 270, 16, 0, 1);
+          LODOP.ADD_PRINT_LINE(311, 16, 310, 772, 0, 1);
+          LODOP.ADD_PRINT_LINE(310, 772, 270, 773, 0, 1);
+          let sumTop = 24
+          for (let i = 0; i < this.orderSoBom.length; i++) {
+            let bom = this.orderSoBom[i]
+            sumTop += 40
+            let top = 40 * (i + 1)
+            let xZTop1 = 270 + top
+            let xZTop2 = xZTop1 + 40
+            let xhTop1 = 310 + top
+            let xhTop2 = xhTop1 + 1
+            let label = 279 + top
 
-          // LODOP.ADD_PRINT_LINE(xZTop+40, 74, xZTop, 75, 0, 1);
-          // LODOP.ADD_PRINT_LINE(xZTop+40,178,xZTop,179,0,1);
-          // LODOP.ADD_PRINT_LINE(xZTop+40,372,xZTop,373,0,1);
-          // LODOP.ADD_PRINT_LINE(xZTop+40,458,xZTop,459,0,1);
-          // LODOP.ADD_PRINT_LINE(xZTop+40,520,xZTop,521,0,1);
-          // LODOP.ADD_PRINT_LINE(xZTop+40,653,xZTop,654,0,1);
-          // LODOP.ADD_PRINT_TEXT(label,20,48,30,(i+1));
-          // LODOP.SET_PRINT_STYLEA(0,"Alignment",2);
-          // LODOP.ADD_PRINT_TEXT(label,75,100,30,bom.componentPartNo);
-          // LODOP.SET_PRINT_STYLEA(0,"Alignment",2);
-          // LODOP.ADD_PRINT_TEXT(label,181,189,30, bom.partDesc);
-          // LODOP.ADD_PRINT_TEXT(label,374,83,30, bom.defaultLocationID);
-          // LODOP.SET_PRINT_STYLEA(0,"Alignment",2);
-          // LODOP.ADD_PRINT_TEXT(label,459,58,30,bom.spec);
-          // LODOP.SET_PRINT_STYLEA(0,"Alignment",2);
-          // LODOP.ADD_PRINT_TEXT(label,523,124,30,bom.qtyRequired);
-          // LODOP.SET_PRINT_STYLEA(0,"Alignment",3);
-          // LODOP.ADD_PRINT_TEXT(label,655,114,30, bom.qtyReserved);
-          // LODOP.SET_PRINT_STYLEA(0,"Alignment",3);
-          // LODOP.ADD_PRINT_LINE(label,15,xZTop,16,0,1);
-          // LODOP.ADD_PRINT_LINE(xhTop,16,xhTop+1,772,0,1);
-          // LODOP.ADD_PRINT_LINE(311,16,310,772,0,1);
-          // LODOP.ADD_PRINT_LINE(xZTop+40,772,xZTop,773,0,1);
+            LODOP.ADD_PRINT_LINE(xZTop2, 74, xZTop1, 75, 0, 1);
+            LODOP.ADD_PRINT_LINE(xZTop2, 178, xZTop1, 179, 0, 1);
+            LODOP.ADD_PRINT_LINE(xZTop2, 372, xZTop1, 373, 0, 1);
+            LODOP.ADD_PRINT_LINE(xZTop2, 458, xZTop1, 459, 0, 1);
+            LODOP.ADD_PRINT_LINE(xZTop2, 520, xZTop1, 521, 0, 1);
+            LODOP.ADD_PRINT_LINE(xZTop2, 653, xZTop1, 654, 0, 1);
+            LODOP.ADD_PRINT_TEXT(label, 20, 48, 30, (i + 1));
+            LODOP.SET_PRINT_STYLEA(0, "FontSize", 10);
+            LODOP.ADD_PRINT_TEXT(label, 75, 100, 30, bom.componentPartNo);
+            LODOP.SET_PRINT_STYLEA(0, "FontSize", 10);
+            LODOP.SET_PRINT_STYLEA(0, "Alignment", 2);
+            LODOP.ADD_PRINT_TEXT(label, 181, 189, 30, bom.partDesc);
+            LODOP.SET_PRINT_STYLEA(0, "FontSize", 10);
+            LODOP.SET_PRINT_STYLEA(0, "Alignment", 2);
+            LODOP.ADD_PRINT_TEXT(label, 374, 83, 30, bom.defaultLocationID);
+            LODOP.SET_PRINT_STYLEA(0, "FontSize", 10);
+            LODOP.SET_PRINT_STYLEA(0, "Alignment", 2);
+            LODOP.ADD_PRINT_TEXT(label, 459, 58, 30, bom.spec);
+            LODOP.SET_PRINT_STYLEA(0, "FontSize", 10);
+            LODOP.SET_PRINT_STYLEA(0, "Alignment", 2);
+            LODOP.ADD_PRINT_TEXT(label, 523, 124, 30, bom.qtyRequired);
+            LODOP.SET_PRINT_STYLEA(0, "FontSize", 10);
+            LODOP.SET_PRINT_STYLEA(0, "Alignment", 3);
+            LODOP.ADD_PRINT_TEXT(label, 655, 114, 30, bom.qtyReserved);
+            LODOP.SET_PRINT_STYLEA(0, "FontSize", 10);
+            LODOP.SET_PRINT_STYLEA(0, "Alignment", 3);
+            LODOP.ADD_PRINT_LINE(xZTop2, 15, xZTop1, 16, 0, 1);
+            LODOP.ADD_PRINT_LINE(xhTop2, 16, xhTop1, 772, 0, 1);
+            LODOP.ADD_PRINT_LINE(xZTop2, 772, xZTop1, 773, 0, 1);
 
-        }
-        let oneTop = sumTop + 310
-        let towTop = sumTop + 360
-        LODOP.ADD_PRINT_TEXT(oneTop, 15, 80, 30, "发料人:");
-        LODOP.SET_PRINT_STYLEA(0, "FontSize", 14);
-        LODOP.ADD_PRINT_TEXT(oneTop, 102, 100, 30, this.$store.state.user.userDisplay);
-        LODOP.SET_PRINT_STYLEA(0, "FontSize", 14);
-        LODOP.ADD_PRINT_TEXT(oneTop, 263, 80, 30, "收料人:");
-        LODOP.SET_PRINT_STYLEA(0, "FontSize", 14);
-        // LODOP.ADD_PRINT_TEXT(oneTop, 348, 100, 30, "slr");
-        LODOP.SET_PRINT_STYLEA(0, "FontSize", 14);
-        // LODOP.ADD_PRINT_TEXT(oneTop, 594, 100, 30, "sg");
-        LODOP.SET_PRINT_STYLEA(0, "FontSize", 14);
-        LODOP.ADD_PRINT_TEXT(oneTop, 516, 65, 30, "生管:");
-        LODOP.SET_PRINT_STYLEA(0, "FontSize", 14);
-        LODOP.ADD_PRINT_TEXT(towTop, 445, 95, 30, "打印时间:");
-        LODOP.SET_PRINT_STYLEA(0, "FontSize", 14);
-        LODOP.ADD_PRINT_TEXT(towTop, 552, 221, 30, this.dayjs().format('YYYY-MM-DD HH:mm:ss'));
-        LODOP.SET_PRINT_STYLEA(0, "FontSize", 14);
 
-        //LODOP.PRINT_DESIGN();
-        //LODOP.PREVIEW();
-         LODOP.PRINT();
-        console.log("操作成功！")
-      }
-    },
+            // LODOP.ADD_PRINT_LINE(xZTop+40, 74, xZTop, 75, 0, 1);
+            // LODOP.ADD_PRINT_LINE(xZTop+40,178,xZTop,179,0,1);
+            // LODOP.ADD_PRINT_LINE(xZTop+40,372,xZTop,373,0,1);
+            // LODOP.ADD_PRINT_LINE(xZTop+40,458,xZTop,459,0,1);
+            // LODOP.ADD_PRINT_LINE(xZTop+40,520,xZTop,521,0,1);
+            // LODOP.ADD_PRINT_LINE(xZTop+40,653,xZTop,654,0,1);
+            // LODOP.ADD_PRINT_TEXT(label,20,48,30,(i+1));
+            // LODOP.SET_PRINT_STYLEA(0,"Alignment",2);
+            // LODOP.ADD_PRINT_TEXT(label,75,100,30,bom.componentPartNo);
+            // LODOP.SET_PRINT_STYLEA(0,"Alignment",2);
+            // LODOP.ADD_PRINT_TEXT(label,181,189,30, bom.partDesc);
+            // LODOP.ADD_PRINT_TEXT(label,374,83,30, bom.defaultLocationID);
+            // LODOP.SET_PRINT_STYLEA(0,"Alignment",2);
+            // LODOP.ADD_PRINT_TEXT(label,459,58,30,bom.spec);
+            // LODOP.SET_PRINT_STYLEA(0,"Alignment",2);
+            // LODOP.ADD_PRINT_TEXT(label,523,124,30,bom.qtyRequired);
+            // LODOP.SET_PRINT_STYLEA(0,"Alignment",3);
+            // LODOP.ADD_PRINT_TEXT(label,655,114,30, bom.qtyReserved);
+            // LODOP.SET_PRINT_STYLEA(0,"Alignment",3);
+            // LODOP.ADD_PRINT_LINE(label,15,xZTop,16,0,1);
+            // LODOP.ADD_PRINT_LINE(xhTop,16,xhTop+1,772,0,1);
+            // LODOP.ADD_PRINT_LINE(311,16,310,772,0,1);
+            // LODOP.ADD_PRINT_LINE(xZTop+40,772,xZTop,773,0,1);
 
-    //提示是否取消订单
-    warnCancelOrderConfirm() {
-      //判断是否存在订单
-      if (!this.modelData.orderNo) {
-        return this.$message.warning('请先选择订单')
-      }
-      //
-      this.$confirm('确实要取消该生产订单吗?', '提示', {
-        confirmButtonText: '确认',
-        celButtonText: '取消',
-        type: 'warning'
-      }).then(() => {
-        //执行重新打开sfdcRolls记录的操作
-        this.cancelShopOrder();
-      });
-    },
+          }
+          let oneTop = sumTop + 310
+          let towTop = sumTop + 360
+          LODOP.ADD_PRINT_TEXT(oneTop, 15, 80, 30, "发料人:");
+          LODOP.SET_PRINT_STYLEA(0, "FontSize", 14);
+          LODOP.ADD_PRINT_TEXT(oneTop, 102, 100, 30, this.$store.state.user.userDisplay);
+          LODOP.SET_PRINT_STYLEA(0, "FontSize", 14);
+          LODOP.ADD_PRINT_TEXT(oneTop, 263, 80, 30, "收料人:");
+          LODOP.SET_PRINT_STYLEA(0, "FontSize", 14);
+          // LODOP.ADD_PRINT_TEXT(oneTop, 348, 100, 30, "slr");
+          LODOP.SET_PRINT_STYLEA(0, "FontSize", 14);
+          // LODOP.ADD_PRINT_TEXT(oneTop, 594, 100, 30, "sg");
+          LODOP.SET_PRINT_STYLEA(0, "FontSize", 14);
+          LODOP.ADD_PRINT_TEXT(oneTop, 516, 65, 30, "生管:");
+          LODOP.SET_PRINT_STYLEA(0, "FontSize", 14);
+          LODOP.ADD_PRINT_TEXT(towTop, 445, 95, 30, "打印时间:");
+          LODOP.SET_PRINT_STYLEA(0, "FontSize", 14);
+          LODOP.ADD_PRINT_TEXT(towTop, 552, 221, 30, this.dayjs().format('YYYY-MM-DD HH:mm:ss'));
+          LODOP.SET_PRINT_STYLEA(0, "FontSize", 14);
 
-    /*执行取消工单的操作*/
-    cancelShopOrder(){
-      //组合数据
-      cancelShopOrderBun(this.modelData).then(({data}) => {
-        //判断是否成功
-        if(data.code == 200){
-          this.$message.success(data.msg);
-          //刷新工单的信息
-          this.tableHanddle(this.modelData);
-        }else{
-          this.$message.error(data.msg);
+          //LODOP.PRINT_DESIGN();
+          //LODOP.PREVIEW();
+          LODOP.PRINT();
+          console.log("操作成功！")
         }
-      })
-    },
+      },
 
-    //提示是否关闭订单
-    warnCloseOrderConfirm(){
-      if (!this.modelData.orderNo) {
-        return this.$message.warning('请先选择订单')
-      }
-      //提示信息
-      this.$confirm('确实要关闭该生产订单吗?', '提示', {
-        confirmButtonText: '确认',
-        celButtonText: '取消',
-        type: 'warning'
-      }).then(() => {
-        //执行重新打开sfdcRolls记录的操作
-        this.closeShopOrderBun(true);
-      });
-    },
+      //提示是否取消订单
+      warnCancelOrderConfirm() {
+        //判断是否存在订单
+        if (!this.modelData.orderNo) {
+          return this.$message.warning('请先选择订单')
+        }
+        //
+        this.$confirm('确实要取消该生产订单吗?', '提示', {
+          confirmButtonText: '确认',
+          celButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+          //执行重新打开sfdcRolls记录的操作
+          this.cancelShopOrder();
+        });
+      },
 
-    /*执行取消工单的操作*/
-    closeShopOrderBun(checkFlag){
-      this.modelData.checkFlag = checkFlag;
-      //组合数据
-      closeShopOrder(this.modelData).then(({data}) => {
-        //判断是否成功
-        if(data.code == 200){
-          this.$message.success(data.msg);
-          //刷新工单的信息
-          this.tableHanddle(this.modelData);
-        }else if (data.code == 201){
-          this.$confirm(data.msg, '提示', {
-            confirmButtonText: '确认',
-            celButtonText: '取消',
-            type: 'warning'
-          }).then(() => {
-            //执行重新打开sfdcRolls记录的操作
-            this.closeShopOrderBun(false);
-          });
-        }else{
-          this.$message.error(data.msg);
+      /*执行取消工单的操作*/
+      cancelShopOrder() {
+        //组合数据
+        cancelShopOrderBun(this.modelData).then(({data}) => {
+          //判断是否成功
+          if (data.code == 200) {
+            this.$message.success(data.msg);
+            //刷新工单的信息
+            this.tableHanddle(this.modelData);
+          } else {
+            this.$message.error(data.msg);
+          }
+        })
+      },
+
+      //提示是否关闭订单
+      warnCloseOrderConfirm() {
+        if (!this.modelData.orderNo) {
+          return this.$message.warning('请先选择订单')
         }
-      })
-    },
+        //提示信息
+        this.$confirm('确实要关闭该生产订单吗?', '提示', {
+          confirmButtonText: '确认',
+          celButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+          //执行重新打开sfdcRolls记录的操作
+          this.closeShopOrderBun(true);
+        });
+      },
 
+      /*执行取消工单的操作*/
+      closeShopOrderBun(checkFlag) {
+        this.modelData.checkFlag = checkFlag;
+        //组合数据
+        closeShopOrder(this.modelData).then(({data}) => {
+          //判断是否成功
+          if (data.code == 200) {
+            this.$message.success(data.msg);
+            //刷新工单的信息
+            this.tableHanddle(this.modelData);
+          } else if (data.code == 201) {
+            this.$confirm(data.msg, '提示', {
+              confirmButtonText: '确认',
+              celButtonText: '取消',
+              type: 'warning'
+            }).then(() => {
+              //执行重新打开sfdcRolls记录的操作
+              this.closeShopOrderBun(false);
+            });
+          } else {
+            this.$message.error(data.msg);
+          }
+        })
+      },
 
-    //提示是否打开订单
-    warnOpenOrderConfirm() {
-      //判断是否存在订单
-      if (!this.modelData.orderNo) {
-        return this.$message.warning('请先选择订单')
-      }
-      //
-      this.$confirm('确实要重新打开该生产订单吗?', '提示', {
-        confirmButtonText: '确认',
-        celButtonText: '取消',
-        type: 'warning'
-      }).then(() => {
-        //执行重新打开
-        this.openShopOrderBun();
-      });
-    },
 
-    /*执行重新打开工单的操作*/
-    openShopOrderBun(){
-      //组合数据
-      openShopOrder(this.modelData).then(({data}) => {
-        //判断是否成功
-        if(data.code == 200){
-          this.$message.success(data.msg);
-          //刷新工单的信息
-          this.tableHanddle(this.modelData);
-        }else{
-          this.$message.error(data.msg);
+      //提示是否打开订单
+      warnOpenOrderConfirm() {
+        //判断是否存在订单
+        if (!this.modelData.orderNo) {
+          return this.$message.warning('请先选择订单')
         }
-      })
-    },
+        //
+        this.$confirm('确实要重新打开该生产订单吗?', '提示', {
+          confirmButtonText: '确认',
+          celButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+          //执行重新打开
+          this.openShopOrderBun();
+        });
+      },
 
-    getBaseData(val) {
-      if (this.tagNo === 16) {
-        this.updateData.orderType = val.OrderType
-      }
-      if (this.tagNo === 15) {
-        this.updateData.planner = val.PlannerType
-      }
-      if (this.tagNo === 17) {
-        this.updateData.projectID = val.ProjectID
-      }
-    },
-    // 获取基础数据列表
-    getBaseList(val) {
-      this.tagNo = val
-      this.$nextTick(() => {
-        let strVal = "";
-        if (val === 16) {
-          strVal = this.updateData.orderType
+      /*执行重新打开工单的操作*/
+      openShopOrderBun() {
+        //组合数据
+        openShopOrder(this.modelData).then(({data}) => {
+          //判断是否成功
+          if (data.code == 200) {
+            this.$message.success(data.msg);
+            //刷新工单的信息
+            this.tableHanddle(this.modelData);
+          } else {
+            this.$message.error(data.msg);
+          }
+        })
+      },
+
+      getBaseData(val) {
+        if (this.tagNo === 16) {
+          this.updateData.orderType = val.OrderType
         }
-        if (val === 15) {
-          strVal = this.updateData.planner
+        if (this.tagNo === 15) {
+          this.updateData.planner = val.PlannerType
         }
-        if (val === 17) {
-          strVal = this.updateData.projectID
+        if (this.tagNo === 17) {
+          this.updateData.projectID = val.ProjectID
         }
-        this.$refs.baseList.init(val, strVal)
-      })
-    },
-
-    getData() {
-      if (this.searchData.site == '' && this.searchData.orderNo == '' && this.searchData.partNo == '' && this.searchData.status == '' && (this.searchData.date1 == '' || this.searchData.date1 == null) && (this.searchData.date2 == '' || this.searchData.date2 == null) && (this.searchData.date3 == '' || this.searchData.date3 == null) && (this.searchData.date4 == '' || this.searchData.date4 == null)) {
-        this.$alert("数据量过于庞大，请至少输入一个查询条件！", '错误', {
-          confirmButtonText: '确定'
+      },
+      // 获取基础数据列表
+      getBaseList(val) {
+        this.tagNo = val
+        this.$nextTick(() => {
+          let strVal = "";
+          if (val === 16) {
+            strVal = this.updateData.orderType
+          }
+          if (val === 15) {
+            strVal = this.updateData.planner
+          }
+          if (val === 17) {
+            strVal = this.updateData.projectID
+          }
+          this.$refs.baseList.init(val, strVal)
         })
-        return false;
-      }
-      getShopOrderData(this.searchData).then(({data}) => {
-        this.dataList3 = data.rows;
-        this.modelFlag2 = true;
-      })
-    },
-    updateModal() {
-      if (this.modelData.orderNo == '' || this.modelData.orderNo == null) {
-        this.$alert("请先选择订单！", '错误', {
-          confirmButtonText: '确定'
+      },
+
+      getData() {
+        if (this.searchData.site == '' && this.searchData.orderNo == '' && this.searchData.partNo == '' && this.searchData.status == '' && (this.searchData.date1 == '' || this.searchData.date1 == null) && (this.searchData.date2 == '' || this.searchData.date2 == null) && (this.searchData.date3 == '' || this.searchData.date3 == null) && (this.searchData.date4 == '' || this.searchData.date4 == null)) {
+          this.$alert("数据量过于庞大，请至少输入一个查询条件！", '错误', {
+            confirmButtonText: '确定'
+          })
+          return false;
+        }
+        getShopOrderData(this.searchData).then(({data}) => {
+          this.dataList3 = data.rows;
+          this.modelFlag2 = true;
         })
-        return false;
-      }
-      this.updateData = {
-        needDate: this.modelData.needDate,
-        planStartDate: this.modelData.planStartDate,
-        originalNeedDate: this.modelData.originalNeedDate,
-        orderType: this.modelData.orderType,
-        planner: this.modelData.planner,
-        oriSOOrderNo: this.modelData.oriSOOrderNo,
-        projectID: this.modelData.projectID,
-        leadtime: this.modelData.leadtime,
-        repairSOFlag: this.modelData.repairSOFlag,
-        techInfo: this.modelData.techInfo,
-        remark: this.modelData.remark,
-        site: this.modelData.site,
-        orderNo: this.modelData.orderNo
       },
-        this.modelFlag3 = true;
-    },
-    tableHanddle(row) {
-      let data1 = {
-        site: row.site,
-        orderNo: row.orderNo,
-        user: this.$store.state.user.name
-      }
-      getShopOrderData(data1).then(({data}) => {
-        this.modelData = data.rows[0];
-        this.modelFlag2 = false;
-        let inData = {
-          site: data.rows[0].site,
-          orderNo: data.rows[0].orderNo,
-          customerID: data.rows[0].customerID,
-          partNo: data.rows[0].partNo,
+      updateModal() {
+        if (this.modelData.orderNo == '' || this.modelData.orderNo == null) {
+          this.$alert("请先选择订单！", '错误', {
+            confirmButtonText: '确定'
+          })
+          return false;
+        }
+        this.updateData = {
+          needDate: this.modelData.needDate,
+          planStartDate: this.modelData.planStartDate,
+          originalNeedDate: this.modelData.originalNeedDate,
+          orderType: this.modelData.orderType,
+          planner: this.modelData.planner,
+          oriSOOrderNo: this.modelData.oriSOOrderNo,
+          projectID: this.modelData.projectID,
+          leadtime: this.modelData.leadtime,
+          repairSOFlag: this.modelData.repairSOFlag,
+          techInfo: this.modelData.techInfo,
+          remark: this.modelData.remark,
+          site: this.modelData.site,
+          orderNo: this.modelData.orderNo
+        },
+          this.modelFlag3 = true;
+      },
+      tableHanddle(row) {
+        let data1 = {
+          site: row.site,
+          orderNo: row.orderNo,
           user: this.$store.state.user.name
         }
-        getShopOrderDetail(inData).then(({data}) => {
-          this.dataList = data.rows1
-          this.dataList2 = data.rows2
-          this.dataList4 = data.rows3;
+        this.modelData.orderNo = row.orderNo
+        getShopOrderData(data1).then(({data}) => {
+          this.modelData = data.rows[0];
+          this.modelFlag2 = false;
+          let inData = {
+            site: data.rows[0].site,
+            orderNo: data.rows[0].orderNo,
+            customerID: data.rows[0].customerID,
+            partNo: data.rows[0].partNo,
+            user: this.$store.state.user.name
+          }
+          getShopOrderDetail(inData).then(({data}) => {
+            this.dataList = data.rows1
+            this.dataList2 = data.rows2
+            this.dataList4 = data.rows3;
+          })
         })
-      })
-    },
-    deleteData() {
-      let inData = {
-        site: this.modelData.site,
-        orderNo: this.modelData.orderNo,
-        status: this.modelData.status
-      }
-      this.$confirm(`是否删除此条生产订单?`, '提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning'
+      },
+      deleteData() {
+        let inData = {
+          site: this.modelData.site,
+          orderNo: this.modelData.orderNo,
+          status: this.modelData.status
+        }
+        this.$confirm(`是否删除此条生产订单?`, '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
 
-      }).then(() => {
-        deleteShopOrderData(inData).then(({data}) => {
+        }).then(() => {
+          deleteShopOrderData(inData).then(({data}) => {
+            if (data && data.code == 200) {
+              this.modelData = {};
+              this.$message.success('操作成功')
+            } else {
+              // this.$alert(data.msg, '错误', {
+              //   confirmButtonText: '确定'
+              // })
+              this.$alert(data.msg, '错误', {
+                confirmButtonText: '确定'
+              })
+            }
+          })
+        })
+      },
+      saveData() {
+        if (this.updateData.needDate == '' || this.updateData.needDate == null) {
+          this.$alert("请选择要求完工日期！", '错误', {
+            confirmButtonText: '确定'
+          })
+          return false;
+        }
+        if (this.updateData.planStartDate == '' || this.updateData.planStartDate == null) {
+          this.$alert("请选择要求开工日期！", '错误', {
+            confirmButtonText: '确定'
+          })
+          return false;
+        }
+        // if(this.updateData.planner==''||this.updateData.planner==null){
+        //   this.$alert("请输入计划方式！",'错误',{
+        //     confirmButtonText:'确定'
+        //   })
+        //   return false;
+        // }
+        // if(this.updateData.leadtime==''||this.updateData.leadtime==null){
+        //   this.$alert("请输入制造提前期！",'错误',{
+        //     confirmButtonText:'确定'
+        //   })
+        //   return false;
+        // }
+        saveShopOrderData(this.updateData).then(({data}) => {
           if (data && data.code == 200) {
-            this.modelData = {};
+            this.modelFlag3 = false
+            this.modelData = JSON.parse(JSON.stringify(this.updateData));
+            if (this.searchData.site == '' && this.searchData.orderNo == '' && this.searchData.partNo == '' && this.searchData.status == '' && (this.searchData.date1 == '' || this.searchData.date1 == null) && (this.searchData.date2 == '' || this.searchData.date2 == null) && (this.searchData.date3 == '' || this.searchData.date3 == null) && (this.searchData.date4 == '' || this.searchData.date4 == null)) {
+              this.dataList3 = [];
+            } else {
+              getShopOrderData(this.searchData).then(({data}) => {
+                this.dataList3 = data.rows;
+
+              })
+            }
             this.$message.success('操作成功')
           } else {
-            // this.$alert(data.msg, '错误', {
-            //   confirmButtonText: '确定'
-            // })
             this.$alert(data.msg, '错误', {
               confirmButtonText: '确定'
             })
           }
         })
-      })
-    },
-    saveData() {
-      if (this.updateData.needDate == '' || this.updateData.needDate == null) {
-        this.$alert("请选择要求完工日期！", '错误', {
-          confirmButtonText: '确定'
-        })
-        return false;
-      }
-      if (this.updateData.planStartDate == '' || this.updateData.planStartDate == null) {
-        this.$alert("请选择要求开工日期！", '错误', {
-          confirmButtonText: '确定'
-        })
-        return false;
-      }
-      // if(this.updateData.planner==''||this.updateData.planner==null){
-      //   this.$alert("请输入计划方式！",'错误',{
-      //     confirmButtonText:'确定'
-      //   })
-      //   return false;
-      // }
-      // if(this.updateData.leadtime==''||this.updateData.leadtime==null){
-      //   this.$alert("请输入制造提前期！",'错误',{
-      //     confirmButtonText:'确定'
-      //   })
-      //   return false;
-      // }
-      saveShopOrderData(this.updateData).then(({data}) => {
-        if (data && data.code == 200) {
-          this.modelFlag3 = false
-          this.modelData = JSON.parse(JSON.stringify(this.updateData));
-          if (this.searchData.site == '' && this.searchData.orderNo == '' && this.searchData.partNo == '' && this.searchData.status == '' && (this.searchData.date1 == '' || this.searchData.date1 == null) && (this.searchData.date2 == '' || this.searchData.date2 == null) && (this.searchData.date3 == '' || this.searchData.date3 == null) && (this.searchData.date4 == '' || this.searchData.date4 == null)) {
-            this.dataList3 = [];
-          } else {
-            getShopOrderData(this.searchData).then(({data}) => {
-              this.dataList3 = data.rows;
+      },
+      //导出excel
+      createExportData() {
 
-            })
-          }
-          this.$message.success('操作成功')
-        } else {
-          this.$alert(data.msg, '错误', {
-            confirmButtonText: '确定'
-          })
-        }
-      })
-    },
-    //导出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
+      //导出excel
+      createExportData2() {
 
-      return s
-    },
-    // 导出 end
-    //导出excel
-    createExportData2() {
+        return this.dataList2;
 
-      return this.dataList2;
+      },
+      startDownload2() {
+        //  this.exportData = this.dataList
 
-    },
-    startDownload2() {
-      //  this.exportData = this.dataList
+      },
+      finishDownload2() {
 
-    },
-    finishDownload2() {
+      },
+      fields2() {
+        let json = "{"
+        this.columnList2.forEach((item, index) => {
+          if (index == this.columnList2.length - 1) {
+            json += "\"" + item.columnLabel + "\"" + ":" + "\"" + item.columnProp + "\""
+          } else {
+            json += "\"" + item.columnLabel + "\"" + ":" + "\"" + item.columnProp + "\"" + ","
+          }
+        })
+        json += "}"
+        let s = eval("(" + json + ")")
 
-    },
-    fields2() {
-      let json = "{"
-      this.columnList2.forEach((item, index) => {
-        if (index == this.columnList2.length - 1) {
-          json += "\"" + item.columnLabel + "\"" + ":" + "\"" + item.columnProp + "\""
-        } else {
-          json += "\"" + item.columnLabel + "\"" + ":" + "\"" + item.columnProp + "\"" + ","
-        }
-      })
-      json += "}"
-      let s = eval("(" + json + ")")
+        return s
+      },
+      // 导出 end
+      //导出excel
+      createExportData3() {
 
-      return s
-    },
-    // 导出 end
-    //导出excel
-    createExportData3() {
+        return this.dataList4;
 
-      return this.dataList4;
+      },
+      startDownload3() {
+        //  this.exportData = this.dataList
 
-    },
-    startDownload3() {
-      //  this.exportData = this.dataList
+      },
+      finishDownload3() {
 
-    },
-    finishDownload3() {
+      },
+      fields3() {
+        let json = "{"
+        this.columnList4.forEach((item, index) => {
+          if (index == this.columnList4.length - 1) {
+            json += "\"" + item.columnLabel + "\"" + ":" + "\"" + item.columnProp + "\""
+          } else {
+            json += "\"" + item.columnLabel + "\"" + ":" + "\"" + item.columnProp + "\"" + ","
+          }
+        })
+        json += "}"
+        let s = eval("(" + json + ")")
 
+        return s
+      },
+      // 导出 end
     },
-    fields3() {
-      let json = "{"
-      this.columnList4.forEach((item, index) => {
-        if (index == this.columnList4.length - 1) {
-          json += "\"" + item.columnLabel + "\"" + ":" + "\"" + item.columnProp + "\""
-        } else {
-          json += "\"" + item.columnLabel + "\"" + ":" + "\"" + item.columnProp + "\"" + ","
+    created() {
+      this.$router.onReady(() => {
+        this.modelData.orderNo = this.$route.query.order
+        this.modelData.site = this.$route.query.site
+        this.modelData.user = this.$route.query.user
+        if (this.modelData.orderNo) {
+          this.tableHanddle(this.modelData)
         }
       })
-      json += "}"
-      let s = eval("(" + json + ")")
-
-      return s
-    },
-    // 导出 end
-  },
-  created() {
-    this.$router.onReady(() => {
-      this.modelData.orderNo = this.$route.query.order
-      this.modelData.site = this.$route.query.site
-      this.modelData.user = this.$route.query.user
-      if (this.modelData.orderNo) {
-        this.tableHanddle(this.modelData)
-      }
-    })
+    }
   }
-}
 </script>
 
 <style scoped>
 
+  /deep/ .customer-tab .el-tabs__content {
+    padding: 3px !important;
+
+  }
+
+  /deep/  .el-tabs__item {
+    padding: 0 20px;
+    height: 30px;
+    -webkit-box-sizing: border-box;
+    box-sizing: border-box;
+    line-height: 30px;
+    display: inline-block;
+    list-style: none;
+    font-size: 12px;
+    font-weight: 500;
+    color: #303133;
+    position: relative;
+  }
+
+  .el-textarea__inner {
+    padding: 5px 5px;
+  }
+
+  .el-dropdown-menu--medium .el-dropdown-menu__item {
+    line-height: 18px;
+    padding: 0 17px;
+    font-size: 12px;
+  }
+
+  hr {
+    margin-top: 0px;
+    width: 95%;
+  }
+
+  .el-dropdown-link {
+    cursor: pointer;
+    color: #409EFF;
+  }
 </style>
 
diff --git a/src/views/modules/sys/language/common.vue b/src/views/modules/sys/language/common.vue
index f963d85..31e98b5 100644
--- a/src/views/modules/sys/language/common.vue
+++ b/src/views/modules/sys/language/common.vue
@@ -1,5 +1,5 @@
 <template>
-  <div  class="hello">
+  <div class="hello">
 
     <el-row>
       <el-col :span="24">
@@ -699,7 +699,7 @@ export default {
       let sumColumnList = this.columnList.concat(this.columnList1);
       sumColumnList = sumColumnList.map(item => {
         return item = {
-    tableId: item.tableId,
+          tableId: item.tableId,
           tableName: item.tableName,
           columnProp: item.columnProp,
           columnLabel: item.columnLabel,
@@ -740,7 +740,7 @@ export default {
           // this.showDefault = false
           this.columnList = data.rows
         } else {
-         // this.showDefault = true
+          // this.showDefault = true
         }
       })
     },
diff --git a/src/views/modules/sys/user.vue b/src/views/modules/sys/user.vue
index d26a3f0..085ba57 100644
--- a/src/views/modules/sys/user.vue
+++ b/src/views/modules/sys/user.vue
@@ -444,7 +444,7 @@ export default {
       })
     },
     // 获取数据列表
-    getDataList :throttle( function () {
+    getDataList: throttle(function () {
       this.dataListLoading = true
       this.$http({
         url: this.$http.adornUrl('/sys/user/list'),
@@ -464,7 +464,7 @@ export default {
         }
         this.dataListLoading = false
       })
-    },1000),
+    }, 1000),
     // 每页数
     sizeChangeHandle(val) {
       this.pageSize = val