From bc144a3f9812bc36ca88092cc7a2a5d62882dcc6 Mon Sep 17 00:00:00 2001
From: ruanqi <qi.ruan@xujiesoft.com>
Date: Fri, 22 Oct 2021 18:06:38 +0800
Subject: [PATCH] =?UTF-8?q?20211020=20=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/base/site.js                          |   14 +-
 src/api/shopOrder/shopOrder.js                |    3 +
 src/views/modules/base/workCenter.vue         |  877 ++++++++++++++
 .../shopOrder/shopOrder/searchShopOrder.vue   | 1066 +++++++++++++++++
 4 files changed, 1959 insertions(+), 1 deletion(-)
 create mode 100644 src/views/modules/base/workCenter.vue
 create mode 100644 src/views/modules/shopOrder/shopOrder/searchShopOrder.vue

diff --git a/src/api/base/site.js b/src/api/base/site.js
index 4cea2e1..842e57b 100644
--- a/src/api/base/site.js
+++ b/src/api/base/site.js
@@ -65,6 +65,18 @@ export const getProductionLineData = data => createAPI(`/base/getProductionLineD
 // 保存修改停机原因
 export const saveProductionLineData = data => createAPI(`/base/saveProductionLineData`,'post',data)
 
-
 // 删除停机原因
 export const deleteProductionLineData = data => createAPI(`/base/deleteProductionLineData`,'post',data)
+
+//------------加工中心----------------
+// 加工中心数据
+export const getWorkCenterData = data => createAPI(`/base/getWorkCenterData`,'post',data)
+// 获取加工中心子数据
+export const getWorkCenterDataDetail = data => createAPI(`/base/getWorkCenterDataDetail`,'post',data)
+
+// 生产线数据
+export const getProLineNoDetail = data => createAPI(`/base/getProLineNoDetail`,'post',data)
+// 保存加工中心数据
+export const saveWorkCenterData = data => createAPI(`/base/saveWorkCenterData`,'post',data)
+// 删除加工中心数据
+export const deleteWorkCenterData = data => createAPI(`/base/deleteWorkCenterData`,'post',data)
diff --git a/src/api/shopOrder/shopOrder.js b/src/api/shopOrder/shopOrder.js
index d9c8f20..4d97261 100644
--- a/src/api/shopOrder/shopOrder.js
+++ b/src/api/shopOrder/shopOrder.js
@@ -27,3 +27,6 @@ export const searchShopOrderWithNoProcessRoute = data => createAPI(`/shopOrder/s
 
 // -------------查询-生产派工单--------------
 export const searchProductionDispatchList = data => createAPI(`/shopOrder/searchProductionDispatchList`,'post',data)
+
+// -------------查询-生产订单--------------
+export const searchShopOrder = data => createAPI(`/shopOrder/searchShopOrder`,'post',data)
diff --git a/src/views/modules/base/workCenter.vue b/src/views/modules/base/workCenter.vue
new file mode 100644
index 0000000..cd502ec
--- /dev/null
+++ b/src/views/modules/base/workCenter.vue
@@ -0,0 +1,877 @@
+<template>
+  <div class="mod-config">
+    <el-form :inline="true" label-position="top" label-width="100px" style="margin-top: -5px;">
+      <el-form-item :label="'加工中心编码：'">
+        <el-input v-model="modelData.workCenterNo"  readonly style="width: 130px"></el-input>
+        <el-button @click="getData()" type="primary" style="margin-left: 2px;margin-top: 0px">{{'列表'}}</el-button>
+      </el-form-item>
+      <el-form-item :label="'名称：'">
+        <el-input v-model="modelData.workCenterDesc" readonly style="width: 130px"></el-input>
+      </el-form-item>
+      <el-form-item :label="'工厂编号：'">
+        <el-input v-model="modelData.site" readonly style="width: 130px"></el-input>
+      </el-form-item>
+      <el-form-item :label="'是否在用：'">
+        <el-input v-model="modelData.active" readonly style="width: 40px"></el-input>
+        <el-button @click="addModal()" type="primary" style="margin-left: 2px;margin-top: 0px">{{'新增'}}</el-button>
+      </el-form-item>
+    </el-form>
+    <el-tabs v-model="activeName" >
+      <el-tab-pane :label="'基本信息'" name="first">
+        <el-form :inline="true" label-position="top" label-width="100px" style="margin-top: -5px;">
+          <el-form-item :label="'加工中心类型：'">
+            <el-input v-model="modelData.workCenterType" readonly style="width: 130px"></el-input>
+          </el-form-item>
+          <el-form-item :label="'生产线编码：'">
+            <el-input v-model="modelData.proLineNo" readonly style="width: 130px"></el-input>
+          </el-form-item>
+          <el-form-item :label="'生产线名称：'">
+            <el-input v-model="modelData.productionLineDesc" readonly style="width: 130px"></el-input>
+          </el-form-item>
+          <el-form-item :label="'是否可以创建新卷：'">
+            <el-input v-model="modelData.canCreateNewRollFlag" readonly style="width: 40px"></el-input>
+          </el-form-item>
+        </el-form>
+        <el-form :inline="true" label-position="top" label-width="100px" style="margin-top: -5px;">
+          <el-form-item :label="'新增日期：'">
+            <el-input v-model="modelData.createdDate" readonly style="width: 130px"></el-input>
+          </el-form-item>
+          <el-form-item :label="'备注：'">
+            <el-input v-model="modelData.remark" readonly style="width: 130px"></el-input>
+          </el-form-item>
+          <el-form-item :label="'生产是否需要调机：'">
+            <el-input v-model="modelData.needSetupFlag" readonly style="width: 40px"></el-input>
+          </el-form-item>
+        </el-form>
+      </el-tab-pane>
+      <el-tab-pane :label="'涉及产品'" name="second">
+        <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>
+      </el-tab-pane>
+      <el-tab-pane :label="'机台'" name="third">
+        <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-tab-pane>
+    </el-tabs>
+    <el-dialog title="数据表" :close-on-click-modal="false" v-drag :visible.sync="modelFlag2" width="680px" >
+      <el-table
+        height="400"
+        :data="dataList3"
+        border
+        @row-dblclick="tableHanddle"
+        v-loading="dataListLoading"
+        style="width: 100%;">
+        <el-table-column
+          header-align="center"
+          align="center"
+          width="80"
+          label="操作">
+          <template slot-scope="scope">
+            <a type="text" size="small" @click="editModel(scope.row)">修改</a>
+            <a type="text" size="small" @click="deleteData(scope.row)">删除</a>
+          </template>
+        </el-table-column>
+        <el-table-column
+          v-for="(item,index) in columnList3" :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-footer  style="height:40px;margin-top: 20px;text-align:center">
+              <el-button type="primary" @click="modelFlag2 = false">关闭</el-button>
+            </el-footer>
+    </el-dialog>
+    <el-dialog title="数据维护" :close-on-click-modal="false" v-drag :visible.sync="modelFlag" width="619px" >
+      <el-form :inline="true" label-position="top" style="margin-left: 7px;margin-top: -5px;">
+          <el-form-item :label="'加工中心编码：'">
+            <el-input v-model="modelData2.workCenterNo"   style="width: 130px"></el-input>
+          </el-form-item>
+          <el-form-item :label="'名称：'">
+            <el-input v-model="modelData2.workCenterDesc" style="width: 130px"></el-input>
+          </el-form-item>
+          <el-form-item :label="'工厂编号：'">
+            <el-input v-model="modelData2.site" style="width: 130px"></el-input>
+          </el-form-item>
+          <el-form-item :label="'是否在用：'">
+            <el-select filterable v-model="modelData2.active" style="width: 130px">
+              <el-option label="Y" value="Y"></el-option>
+              <el-option label="N" value="N"></el-option>
+            </el-select>
+          </el-form-item>
+      </el-form>
+      <el-form :inline="true" label-position="top" style="margin-left: 7px;margin-top: -5px;">
+        <el-form-item :label="'加工中心类型：'">
+          <el-select filterable v-model="modelData2.workCenterType" style="width: 130px">
+            <el-option label="内部" value="内部"></el-option>
+            <el-option label="外部" value="外部"></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item :label="'生产线编码：'">
+          <el-input v-model="modelData2.proLineNo" @change="getProLineNo" style="width: 130px"></el-input>
+        </el-form-item>
+        <el-form-item :label="'生产线名称：'">
+          <el-input v-model="modelData2.productionLineDesc" disabled style="width: 130px"></el-input>
+        </el-form-item>
+        <el-form-item :label="'是否可以创建新卷：'">
+          <el-select filterable v-model="modelData2.canCreateNewRollFlag" style="width: 130px">
+            <el-option label="Y" value="Y"></el-option>
+            <el-option label="N" value="N"></el-option>
+          </el-select>
+        </el-form-item>
+      </el-form>
+      <el-form :inline="true" label-position="top" style="margin-left: 7px;margin-top: -5px;">
+        <el-form-item :label="'新增日期：'">
+          <el-date-picker
+            style="width: 130px"
+            v-model="modelData2.createdDate"
+            value-format="yyyy-MM-dd"
+            placeholder="选择日期">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item :label="'备注：'">
+          <el-input v-model="modelData2.remark" style="width: 130px"></el-input>
+        </el-form-item>
+        <el-form-item :label="'生产是否需要调机：'">
+          <el-select filterable v-model="modelData2.needSetupFlag" style="width: 130px">
+            <el-option label="Y" value="Y"></el-option>
+            <el-option label="N" value="N"></el-option>
+          </el-select>
+        </el-form-item>
+      </el-form>
+      <el-footer  style="height:40px;margin-top: 20px;text-align:center">
+        <el-button type="primary" @click="ModelSave()">保存</el-button>
+        <el-button type="primary" @click="modelFlag = false">关闭</el-button>
+      </el-footer>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+  import {
+    getWorkCenterData,
+    getWorkCenterDataDetail,
+    getProLineNoDetail,
+    saveWorkCenterData,
+    deleteWorkCenterData,
+  }from "@/api/base/site.js"
+  export default {
+    //加工中心
+    name: "workCenter",
+    data() {
+      return {
+        activeName:'first',
+        height: 200,
+        modelFlag2:false,
+        modelFlag:false,
+        modelInputFlag:true,
+        selectList:[],
+        modelData: {
+          add:'',
+          workCenterNo:'',
+          workCenterDesc:'',
+          site:'',
+          active:'',
+          workCenterType:'',
+          proLineNo:'',
+          productionLineDesc:'',
+          canCreateNewRollFlag:'',
+          createdDate:'',
+          remark:'',
+          needSetupFlag:'',
+          user:this.$store.state.user.name,
+        },
+        modelData2: {
+          add:'',
+          workCenterNo:'',
+          workCenterDesc:'',
+          site:'',
+          active:'',
+          workCenterType:'',
+          proLineNo:'',
+          productionLineDesc:'',
+          canCreateNewRollFlag:'',
+          createdDate:'',
+          remark:'',
+          needSetupFlag:'',
+          user:this.$store.state.user.name,
+        },
+        dataList:[],
+        dataList2:[],
+        dataList3:[],
+        dataListLoading: false,
+        buttons:{
+          search:'查询',
+        },
+        columnList: [
+          {
+            userId: this.$store.state.user.name,
+            functionId: 6029,
+            serialNumber: '6029TableXXX',
+            tableId: "6029Table",
+            tableName: "加工中心涉及产品表",
+            columnProp: "XXX",
+            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: 6029,
+            serialNumber: '6029TableXXX',
+            tableId: "6029Table",
+            tableName: "加工中心涉及产品表",
+            columnProp: "XXX",
+            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: 6029,
+            serialNumber: '6029TableXXX',
+            tableId: "6029Table",
+            tableName: "加工中心涉及产品表",
+            columnProp: "XXX",
+            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: 6029,
+            serialNumber: '6029TableXXX',
+            tableId: "6029Table",
+            tableName: "加工中心涉及产品表",
+            columnProp: "XXX",
+            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: 6029,
+            serialNumber: '6029TableXXX',
+            tableId: "6029Table",
+            tableName: "加工中心涉及产品表",
+            columnProp: "XXX",
+            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: 6029,
+            serialNumber: '6029TableXXX',
+            tableId: "6029Table",
+            tableName: "加工中心涉及产品表",
+            columnProp: "XXX",
+            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: 6029,
+            serialNumber: '6029TableXXX',
+            tableId: "6029Table",
+            tableName: "加工中心涉及产品表",
+            columnProp: "XXX",
+            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: 6029,
+            serialNumber: '6029TableXXX',
+            tableId: "6029Table",
+            tableName: "加工中心涉及产品表",
+            columnProp: "XXX",
+            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: 6029,
+            serialNumber: '6029TableXXX',
+            tableId: "6029Table",
+            tableName: "加工中心涉及产品表",
+            columnProp: "XXX",
+            headerAlign: "center",
+            align: "right",
+            columnLabel: "效率",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: false,
+            columnWidth: 50
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 6029,
+            serialNumber: '6029TableXXX',
+            tableId: "6029Table",
+            tableName: "加工中心涉及产品表",
+            columnProp: "XXX",
+            headerAlign: "center",
+            align: "left",
+            columnLabel: "状态",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: false,
+            columnWidth: 50
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 6029,
+            serialNumber: '6029TableXXX',
+            tableId: "6029Table",
+            tableName: "加工中心涉及产品表",
+            columnProp: "XXX",
+            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: 6029,
+            serialNumber: '6029TableXXX',
+            tableId: "6029Table",
+            tableName: "加工中心涉及产品表",
+            columnProp: "XXX",
+            headerAlign: "center",
+            align: "left",
+            columnLabel: "备注",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: false,
+            columnWidth: 300
+          }
+        ],
+        columnList2: [
+          {
+            userId: this.$store.state.user.name,
+            functionId: 6029,
+            serialNumber: '6029Table2ResourceID',
+            tableId: "6029Table2",
+            tableName: "加工中心涉及机台表",
+            columnProp: "resourceID",
+            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: 6029,
+            serialNumber: '6029Table2ResourceDesc',
+            tableId: "6029Table2",
+            tableName: "加工中心涉及机台表",
+            columnProp: "resourceDesc",
+            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: 6029,
+            serialNumber: '6029Table2Efficiency',
+            tableId: "6029Table2",
+            tableName: "加工中心涉及机台表",
+            columnProp: "efficiency",
+            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: 6029,
+            serialNumber: '6029Table2Utilization',
+            tableId: "6029Table2",
+            tableName: "加工中心涉及机台表",
+            columnProp: "utilization",
+            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: 6029,
+            serialNumber: '6029Table2Active',
+            tableId: "6029Table2",
+            tableName: "加工中心涉及机台表",
+            columnProp: "active",
+            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: 6029,
+            serialNumber: '6029Table2CreatedDate',
+            tableId: "6029Table2",
+            tableName: "加工中心涉及机台表",
+            columnProp: "createdDate",
+            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: 6029,
+            serialNumber: '6029Table2Remark',
+            tableId: "6029Table2",
+            tableName: "加工中心涉及机台表",
+            columnProp: "remark",
+            headerAlign: "center",
+            align: "left",
+            columnLabel: "备注",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: false,
+            columnWidth: 400
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 6029,
+            serialNumber: '6029Table2CalendarID',
+            tableId: "6029Table2",
+            tableName: "加工中心涉及机台表",
+            columnProp: "calendarID",
+            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: 6029,
+            serialNumber: '6029Table2VirturlFlag',
+            tableId: "6029Table2",
+            tableName: "加工中心涉及机台表",
+            columnProp: "virturlFlag",
+            headerAlign: "center",
+            align: "left",
+            columnLabel: "虚拟机台",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: false,
+            columnWidth: 80
+          }
+        ],
+        columnList3: [
+          {
+            userId: this.$store.state.user.name,
+            functionId: 6029,
+            serialNumber: '6029Table3WorkCenterNo',
+            tableId: "6029Table3",
+            tableName: "加工中心表",
+            columnProp: "workCenterNo",
+            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: 6029,
+            serialNumber: '6029Table3WorkCenterDesc',
+            tableId: "6029Table3",
+            tableName: "加工中心表",
+            columnProp: "workCenterDesc",
+            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: 6029,
+            serialNumber: '6029Table3WorkCenterType',
+            tableId: "6029Table3",
+            tableName: "加工中心表",
+            columnProp: "workCenterType",
+            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: 6029,
+            serialNumber: '6029Table3Active',
+            tableId: "6029Table3",
+            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: 6029,
+            serialNumber: '6029Table3Site',
+            tableId: "6029Table3",
+            tableName: "加工中心表",
+            columnProp: "site",
+            headerAlign: "center",
+            align: "left",
+            columnLabel: "工厂编号",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: false,
+            columnWidth: 80
+          }
+        ],
+      }
+    },
+    mounted() {
+      this.$nextTick(() => {
+        this.height = window.innerHeight - 230;
+      })
+    },
+    methods: {
+      getData(){
+        let inData={
+          user:this.$store.state.user.name
+        }
+        getWorkCenterData(inData).then(({data}) => {
+          this.dataList3 = data.rows;
+          this.modelFlag2=true;
+        })
+      },
+      addModal(){
+        this.modelData2={};
+        this.modelData2.add=0;
+        this.modelInputFlag=false;
+        this.modelData2.active='Y';
+        this.modelData2.canCreateNewRollFlag='Y';
+        this.modelData2.needSetupFlag='Y';
+        this.modelData2.workCenterType='内部',
+        this.modelData2.createdDate=new Date();
+        this.modelFlag=true;
+      },
+      editModel(row){
+        this.modelData2=JSON.parse(JSON.stringify(row));
+        this.modelData2.add=1;
+        this.modelInputFlag=true;
+        this.modelFlag=true;
+      },
+      ModelSave(){
+        if(this.modelData2.workCenterNo==''||this.modelData2.workCenterNo==null){
+          this.$alert("请输入加工中心编码！",'错误',{
+            confirmButtonText:'确定'
+          })
+          return false;
+        }
+        if(this.modelData2.workCenterDesc==''||this.modelData2.workCenterDesc==null){
+          this.$alert("请输入加工中心名称！",'错误',{
+            confirmButtonText:'确定'
+          })
+          return false;
+        }
+        if(this.modelData2.site==''||this.modelData2.site==null){
+          this.$alert("请输入工厂编码！",'错误',{
+            confirmButtonText:'确定'
+          })
+          return false;
+        }
+        if(this.modelData2.createdDate==''||this.modelData2.createdDate==null){
+          this.$alert("请选择新增日期！",'错误',{
+            confirmButtonText:'确定'
+          })
+          return false;
+        }
+
+        this.modelData2.user=this.$store.state.user.name;
+
+        saveWorkCenterData(this.modelData2).then(({data}) => {
+          if (data && data.code == 200) {
+            this.modelFlag = false
+            this.getData();
+            this.$message({
+              message: '操作成功',
+              type: 'success',
+              duration: 1500,
+              onClose: () => {
+              }
+            })
+          } else {
+            this.$alert(data.msg, '错误', {
+              confirmButtonText: '确定'
+            })
+          }
+        })
+      },
+      deleteData(row){
+        this.$confirm(`是否删除此加工中心?`, '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+
+        }).then(() => {
+          let inData = {
+            workCenterNo: row.workCenterNo,
+            site:row.site
+          }
+          deleteWorkCenterData(inData).then(({data}) => {
+            if (data && data.code == 200) {
+              this.modelFlag = false
+              this.getData();
+              this.$message({
+                message: '操作成功',
+                type: 'success',
+                duration: 1500,
+                onClose: () => {
+                }
+              })
+            } else {
+              this.$alert(data.msg, '错误', {
+                confirmButtonText: '确定'
+              })
+            }
+          })
+        })
+      },
+      tableHanddle(row){
+        this.modelData=row;
+        this.modelFlag2=false;
+        getWorkCenterDataDetail(this.modelData).then(({data}) => {
+          this.dataList2 = data.rows2;
+        })
+      },
+      getProLineNo(){
+        let inData={
+          site : this.$store.state.user.site,
+          proLineNo : this.modelData2.proLineNo
+        }
+        getProLineNoDetail(inData).then(({data}) => {
+          let outList = data.rows
+          if (outList.length>0){
+            this.modelData2.productionLineDesc=outList[0].proLineDesc;
+            this.modelData2=JSON.parse(JSON.stringify(this.modelData2));
+          }else {
+            this.modelData2.proLineNo='';
+            this.modelData2.productionLineDesc='';
+            this.$alert('该生产线不存在', '错误', {
+              confirmButtonText: '确定'
+            })
+          }
+        })
+      }
+    },
+    created() {
+
+    }
+  }
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/views/modules/shopOrder/shopOrder/searchShopOrder.vue b/src/views/modules/shopOrder/shopOrder/searchShopOrder.vue
new file mode 100644
index 0000000..dbae5d2
--- /dev/null
+++ b/src/views/modules/shopOrder/shopOrder/searchShopOrder.vue
@@ -0,0 +1,1066 @@
+<template>
+  <div class="mod-config">
+    <el-form :inline="true" label-position="top" label-width="100px" style="margin-top: -5px;">
+      <el-form-item :label="'录入日期：'">
+        <el-date-picker
+          style="width: 130px"
+          v-model="searchData.date1"
+          value-format="yyyy-MM-dd"
+          placeholder="选择日期">
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item :label="'至：'">
+        <el-date-picker
+          style="width: 130px"
+          v-model="searchData.date2"
+          value-format="yyyy-MM-dd"
+          placeholder="选择日期">
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item :label="'订单类型：'">
+        <el-input v-model="searchData.orderType" style="width: 130px"></el-input>
+      </el-form-item>
+      <el-form-item :label="'计划者：'">
+        <el-input v-model="searchData.planner" style="width: 130px"></el-input>
+      </el-form-item>
+      <el-form-item :label="'工厂编号：'">
+        <el-input v-model="searchData.site" style="width: 130px"></el-input>
+      </el-form-item>
+      <el-form-item :label="'物料类别：'">
+        <el-select filterable v-model="searchData.partType" style="width: 130px">
+          <el-option label="全部" value=""></el-option>
+          <el-option label="原材料" value="原材料"></el-option>
+          <el-option label="产成品" value="产成品"></el-option>
+          <el-option label="半成品" value="半成品"></el-option>
+          <el-option label="贸易商品" value="贸易商品"></el-option>
+          <el-option label="低值易耗品" value="低值易耗品"></el-option>
+          <el-option label="其他" value="其他"></el-option>
+        </el-select>
+      </el-form-item>
+    </el-form>
+    <!--  物料状态  -->
+    <fieldset style="margin-left: 880px; margin-top: -55px; width: 170px;">
+      <legend>物料状态</legend>
+        <el-checkbox :indeterminate="isIndeterminate" v-model="checkAll" @change="handleCheckAllChange">全选</el-checkbox>
+
+        <el-checkbox-group v-model="checkedCities" @change="handleCheckedCitiesChange">
+          <el-checkbox v-for="city in cities" :label="city" :key="city">{{city}}</el-checkbox>
+        </el-checkbox-group>
+    </fieldset>
+    <el-form :inline="true" label-position="top" label-width="100px" style="margin-top: -82px;">
+      <el-form-item :label="'要求完工日期：'">
+        <el-date-picker
+          style="width: 130px"
+          v-model="searchData.date3"
+          value-format="yyyy-MM-dd"
+          placeholder="选择日期">
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item :label="'至：'">
+        <el-date-picker
+          style="width: 130px"
+          v-model="searchData.date4"
+          value-format="yyyy-MM-dd"
+          placeholder="选择日期">
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item :label="'产成品编码：'">
+        <el-input v-model="searchData.partNo" style="width: 130px"></el-input>
+      </el-form-item>
+      <el-form-item :label="'产品名称：'">
+        <el-input v-model="searchData.partDescription" style="width: 130px"></el-input>
+      </el-form-item>
+      <el-form-item :label="'项目编码：'">
+        <el-input v-model="searchData.projectID" style="width: 130px"></el-input>
+      </el-form-item>
+      <el-form-item :label="'销售订单备注：'">
+        <el-input v-model="searchData.remark" style="width: 130px"></el-input>
+      </el-form-item>
+    </el-form>
+    <el-form :inline="true" label-position="top" label-width="100px" style="margin-top:0px;">
+      <el-form-item :label="'生产订单号：'">
+        <el-input v-model="searchData.orderNo" style="width: 130px"></el-input>
+      </el-form-item>
+      <el-form-item :label="'销售订单号：'">
+        <el-input v-model="searchData.orderRef1" style="width: 130px"></el-input>
+      </el-form-item>
+      <el-form-item :label="'是否排料：'">
+        <el-select filterable v-model="searchData.costRollUpFlag" style="width: 130px">
+          <el-option label="全部" value=""></el-option>
+          <el-option label="Y" value="Y"></el-option>
+          <el-option label="N" value="N"></el-option>
+        </el-select>
+      </el-form-item>
+      <el-button @click="getData()" type="primary" style="margin-left: 2px;margin-top: 33px">{{'查询'}}</el-button>
+    </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>
+    <el-form :inline="true" label-position="top" label-width="100px" style="margin-top: 0px">
+      <span>合计：订单量</span>
+      <el-input v-model="sum1" style="width: 130px;text-align: right"></el-input>
+      <span>已入库数量</span>
+      <el-input v-model="sum2" style="width: 130px;text-align: right"></el-input>
+    </el-form>
+  </div>
+</template>
+
+<script>
+
+  import {
+    searchShopOrder
+  } from "@/api/shopOrder/shopOrder.js"
+  const cityOptions = ['已计划', '已下达', '已排产', '已发料', '已入库', '已关闭', '已取消', '已停工', '已开工'];
+  export default {
+    //查询-生产订单
+    name: "searchShopOrder",
+    data() {
+      return {
+        checkAll: true,
+        checkedCities:  ['已计划', '已下达', '已排产', '已发料', '已入库', '已关闭', '已取消', '已停工', '已开工'],
+        cities: cityOptions,
+        isIndeterminate: true,
+        height: 200,
+        modelFlag:false,
+        modelInputFlag:true,
+        selectList:[],
+        sum1:0,
+        sum2:0,
+        searchData: {
+          orderType:'',
+          planner:'',
+          site:'',
+          partType:'',
+          partNo:'',
+          partDescription:'',
+          projectID:'',
+          remark:'',
+          orderNo:'',
+          orderRef1:'',
+          costRollUpFlag:'',
+          status:'',
+          date1:new Date(),
+          date2:'',
+          date3:new Date(),
+          date4:'',
+          user:this.$store.state.user.name
+        },
+        dataList:[],
+        dataListLoading: false,
+        buttons:{
+          search:'查询',
+        },
+        columnList: [
+          {
+            userId: this.$store.state.user.name,
+            functionId: 6028,
+            serialNumber: '6028TableOrderNo',
+            tableId: "6028Table",
+            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: 6028,
+            serialNumber: '6028TableOriSOOrderNo',
+            tableId: "6028Table",
+            tableName: "查询生产订单表",
+            columnProp: "oriSOOrderNo",
+            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: 6028,
+            serialNumber: '6028TableEnterDate',
+            tableId: "6028Table",
+            tableName: "查询生产订单表",
+            columnProp: "enterDate",
+            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: 6028,
+            serialNumber: '6028TableNeedDate',
+            tableId: "6028Table",
+            tableName: "查询生产订单表",
+            columnProp: "needDate",
+            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: 6028,
+            serialNumber: '6028TableOrderType',
+            tableId: "6028Table",
+            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: 6028,
+            serialNumber: '6028TablePartNo',
+            tableId: "6028Table",
+            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: 6028,
+            serialNumber: '6028TablePartDescription',
+            tableId: "6028Table",
+            tableName: "查询生产订单表",
+            columnProp: "partDescription",
+            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: 6028,
+            serialNumber: '6028TableLotSize',
+            tableId: "6028Table",
+            tableName: "查询生产订单表",
+            columnProp: "lotSize",
+            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: 6028,
+            serialNumber: '6028TablePlanner',
+            tableId: "6028Table",
+            tableName: "查询生产订单表",
+            columnProp: "planner",
+            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: 6028,
+            serialNumber: '6028TableXXX',
+            tableId: "6028Table",
+            tableName: "查询生产订单表",
+            columnProp: "XXX",
+            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: 6028,
+            serialNumber: '6028TableStatus',
+            tableId: "6028Table",
+            tableName: "查询生产订单表",
+            columnProp: "status",
+            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: 6028,
+            serialNumber: '6028TablePlanStartDate',
+            tableId: "6028Table",
+            tableName: "查询生产订单表",
+            columnProp: "planStartDate",
+            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: 6028,
+            serialNumber: '6028TableLeadtime',
+            tableId: "6028Table",
+            tableName: "查询生产订单表",
+            columnProp: "leadtime",
+            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: 6028,
+            serialNumber: '6028TableUsername',
+            tableId: "6028Table",
+            tableName: "查询生产订单表",
+            columnProp: "username",
+            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: 6028,
+            serialNumber: '6028TableFinishedQty',
+            tableId: "6028Table",
+            tableName: "查询生产订单表",
+            columnProp: "finishedQty",
+            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: 6028,
+            serialNumber: '6028TablereleaseDate',
+            tableId: "6028Table",
+            tableName: "查询生产订单表",
+            columnProp: "ReleaseDate",
+            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: 6028,
+            serialNumber: '6028TableReleaseGuys',
+            tableId: "6028Table",
+            tableName: "查询生产订单表",
+            columnProp: "releaseGuys",
+            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: 6028,
+            serialNumber: '6028TableScheduleDate',
+            tableId: "6028Table",
+            tableName: "查询生产订单表",
+            columnProp: "scheduleDate",
+            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: 6028,
+            serialNumber: '6028TableScheduler',
+            tableId: "6028Table",
+            tableName: "查询生产订单表",
+            columnProp: "scheduler",
+            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: 6028,
+            serialNumber: '6028TableIssueDate',
+            tableId: "6028Table",
+            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: 6028,
+            serialNumber: '6028TableReportDate',
+            tableId: "6028Table",
+            tableName: "查询生产订单表",
+            columnProp: "reportDate",
+            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: 6028,
+            serialNumber: '6028TableReceiveDate',
+            tableId: "6028Table",
+            tableName: "查询生产订单表",
+            columnProp: "receiveDate",
+            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: 6028,
+            serialNumber: '6028TablePrinted',
+            tableId: "6028Table",
+            tableName: "查询生产订单表",
+            columnProp: "printed",
+            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: 6028,
+            serialNumber: '6028TableProjectID',
+            tableId: "6028Table",
+            tableName: "查询生产订单表",
+            columnProp: "projectID",
+            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: 6028,
+            serialNumber: '6028TableProjectName',
+            tableId: "6028Table",
+            tableName: "查询生产订单表",
+            columnProp: "projectName",
+            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: 6028,
+            serialNumber: '6028TableBOMRevNo',
+            tableId: "6028Table",
+            tableName: "查询生产订单表",
+            columnProp: "bOMRevNo",
+            headerAlign: "center",
+            align: "left",
+            columnLabel: "BOM版本",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: false,
+            columnWidth: 80
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 6028,
+            serialNumber: '6028TableRoutingRevNo',
+            tableId: "6028Table",
+            tableName: "查询生产订单表",
+            columnProp: "routingRevNo",
+            headerAlign: "center",
+            align: "left",
+            columnLabel: "Routing版本",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: false,
+            columnWidth: 100
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 6028,
+            serialNumber: '6028TableOriginalNeedDate',
+            tableId: "6028Table",
+            tableName: "查询生产订单表",
+            columnProp: "originalNeedDate",
+            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: 6028,
+            serialNumber: '6028TableOrderRef1',
+            tableId: "6028Table",
+            tableName: "查询生产订单表",
+            columnProp: "orderRef1",
+            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: 6028,
+            serialNumber: '6028TableOrderRef2',
+            tableId: "6028Table",
+            tableName: "查询生产订单表",
+            columnProp: "orderRef2",
+            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: 6028,
+            serialNumber: '6028TableRemark',
+            tableId: "6028Table",
+            tableName: "查询生产订单表",
+            columnProp: "remark",
+            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: 6028,
+            serialNumber: '6028TableSite',
+            tableId: "6028Table",
+            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: 6028,
+            serialNumber: '6028TableCostRollUpFlag',
+            tableId: "6028Table",
+            tableName: "查询生产订单表",
+            columnProp: "costRollUpFlag",
+            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: 6028,
+            serialNumber: '6028TableManualFlag',
+            tableId: "6028Table",
+            tableName: "查询生产订单表",
+            columnProp: "manualFlag",
+            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: 6028,
+            serialNumber: '6028TableFamilyName',
+            tableId: "6028Table",
+            tableName: "查询生产订单表",
+            columnProp: "familyName",
+            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: 6028,
+            serialNumber: '6028TableGroupID',
+            tableId: "6028Table",
+            tableName: "查询生产订单表",
+            columnProp: "GroupID",
+            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: 6028,
+            serialNumber: '6028TableGroupName',
+            tableId: "6028Table",
+            tableName: "查询生产订单表",
+            columnProp: "groupName",
+            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: 6028,
+            serialNumber: '6028TableFamilyID',
+            tableId: "6028Table",
+            tableName: "查询生产订单表",
+            columnProp: "familyID",
+            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: 6028,
+            serialNumber: '6028TableReceiveStatus',
+            tableId: "6028Table",
+            tableName: "查询生产订单表",
+            columnProp: "receiveStatus",
+            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: 6028,
+            serialNumber: '6028TableRepairSOFlag',
+            tableId: "6028Table",
+            tableName: "查询生产订单表",
+            columnProp: "repairSOFlag",
+            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: 6028,
+            serialNumber: '6028TableEOriginalOrderType',
+            tableId: "6028Table",
+            tableName: "查询生产订单表",
+            columnProp: "eOriginalOrderType",
+            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: 6028,
+            serialNumber: '6028TableEOriginalOrderNo',
+            tableId: "6028Table",
+            tableName: "查询生产订单表",
+            columnProp: "eOriginalOrderNo",
+            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: 6028,
+            serialNumber: '6028TableELevels',
+            tableId: "6028Table",
+            tableName: "查询生产订单表",
+            columnProp: "eLevels",
+            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: 6028,
+            serialNumber: '6028TablePartType',
+            tableId: "6028Table",
+            tableName: "查询生产订单表",
+            columnProp: "partType",
+            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: 6028,
+            serialNumber: '6028TableCOPlanShipDate',
+            tableId: "6028Table",
+            tableName: "查询生产订单表",
+            columnProp: "cOPlanShipDate",
+            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: 6028,
+            serialNumber: '6028TableCustPartNo',
+            tableId: "6028Table",
+            tableName: "查询生产订单表",
+            columnProp: "custPartNo",
+            headerAlign: "center",
+            align: "left",
+            columnLabel: "客户产品料号",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: false,
+            columnWidth: 160
+          }
+        ],
+      }
+    },
+    mounted() {
+      this.$nextTick(() => {
+        this.height = window.innerHeight - 310;
+      })
+    },
+    methods: {
+      handleCheckAllChange(val) {
+        this.checkedCities = val ? cityOptions : [];
+        this.isIndeterminate = false;
+      },
+      handleCheckedCitiesChange(value) {
+        let checkedCount = value.length;
+        this.checkAll = checkedCount === this.cities.length;
+        this.isIndeterminate = checkedCount > 0 && checkedCount < this.cities.length;
+      },
+      getData(){
+        if(this.checkedCities.length==0){
+          this.$alert('请选择订单状态', '错误', {
+            confirmButtonText: '确定'
+          })
+        }
+        let newStr='(';
+        for (let i = 0; i < this.checkedCities.length-1; i++) {
+          newStr+='\''+this.checkedCities[i]+'\','
+        }
+        newStr+='\''+this.checkedCities[this.checkedCities.length-1]+'\')';
+        this.searchData.status=newStr;
+        searchShopOrder(this.searchData).then(({data}) => {
+          this.dataList = data.rows;
+          this.sum1=0;
+          this.sum2=0;
+          if(this.dataList.length==0){
+            this.sum1=0;
+            this.sum2=0;
+          }else {
+
+            for (let i = 0; i < this.dataList.length; i++) {
+              this.sum2 =this.decimalUtil.add(this.sum2,this.dataList[i].lotSize);
+              this.sum2 =this.decimalUtil.add(this.sum2,this.dataList[i].finishedQty);
+            }
+          }
+        })
+      },
+    },
+    created() {
+
+    }
+  }
+</script>
+
+<style >
+  .el-textarea__inner {
+    padding: 5px 5px;
+  }
+  /*清掉样式*/
+  .el-checkbox+.el-checkbox {
+    margin-left: 0px;
+  }
+  .el-checkbox{
+    width: 70px;
+  }
+</style>