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

---
 src/api/shopOrder/reportFormSearch.js         |  25 +
 .../searchProcessRouteTool.vue                |   4 +-
 .../searchProductProcessRoute.vue             |   4 +-
 .../searchRollInformation.vue                 |   4 +-
 .../searchMachineEfficiency.vue               | 316 ++++++++
 .../searchResourceCapacity.vue                | 310 ++++++++
 .../searchScheduleItemWaste.vue               | 728 +++++++++++++++++
 .../searchShopOrderAbnormalRecord.vue         | 307 ++++++++
 .../searchShopOrderEfficiency.vue             | 732 ++++++++++++++++++
 .../searchShopOrderItemWaste.vue              | 674 ++++++++++++++++
 .../searchShopOrderScript.vue                 | 452 +++++++++++
 .../searchShopOrderStatusCheck.vue            | 431 +++++++++++
 .../searchWorkCenterCapacity.vue              | 270 +++++++
 src/views/modules/sys/menu.vue                |   2 +-
 14 files changed, 4252 insertions(+), 7 deletions(-)
 create mode 100644 src/api/shopOrder/reportFormSearch.js
 create mode 100644 src/views/modules/shopOrder/reportFormSearch/searchMachineEfficiency.vue
 create mode 100644 src/views/modules/shopOrder/reportFormSearch/searchResourceCapacity.vue
 create mode 100644 src/views/modules/shopOrder/reportFormSearch/searchScheduleItemWaste.vue
 create mode 100644 src/views/modules/shopOrder/reportFormSearch/searchShopOrderAbnormalRecord.vue
 create mode 100644 src/views/modules/shopOrder/reportFormSearch/searchShopOrderEfficiency.vue
 create mode 100644 src/views/modules/shopOrder/reportFormSearch/searchShopOrderItemWaste.vue
 create mode 100644 src/views/modules/shopOrder/reportFormSearch/searchShopOrderScript.vue
 create mode 100644 src/views/modules/shopOrder/reportFormSearch/searchShopOrderStatusCheck.vue
 create mode 100644 src/views/modules/shopOrder/reportFormSearch/searchWorkCenterCapacity.vue

diff --git a/src/api/shopOrder/reportFormSearch.js b/src/api/shopOrder/reportFormSearch.js
new file mode 100644
index 0000000..94bbcc9
--- /dev/null
+++ b/src/api/shopOrder/reportFormSearch.js
@@ -0,0 +1,25 @@
+import { createAPI } from "@/utils/httpRequest.js";
+
+// -------------查询-生产订单不良--------------
+
+export const searchShopOrderScript = data => createAPI(`/reportFormSearch/searchShopOrderScript`,'post',data)
+// -------------查询-生产订单工序浪费--------------
+export const searchShopOrderItemWaste = data => createAPI(`/reportFormSearch/searchShopOrderItemWaste`,'post',data)
+
+// -------------查询-机台效率--------------
+export const searchMachineEfficiency = data => createAPI(`/reportFormSearch/searchMachineEfficiency`,'post',data)
+
+// -------------查询-生产订单效率--------------
+export const searchShopOrderEfficiency = data => createAPI(`/reportFormSearch/searchShopOrderEfficiency`,'post',data)
+// -------------查询-加工中心产能负荷--------------
+export const searchWorkCenterCapacity = data => createAPI(`/reportFormSearch/searchWorkCenterCapacity`,'post',data)
+
+// -------------查询-机台产能负荷--------------
+export const searchResourceCapacity = data => createAPI(`/reportFormSearch/searchResourceCapacity`,'post',data)
+
+// -------------查询-生产订单状态检查--------------
+export const searchShopOrderStatusCheck = data => createAPI(`/reportFormSearch/searchShopOrderStatusCheck`,'post',data)
+
+// -------------查询-生产订单生产异常记录--------------
+export const searchShopOrderAbnormalRecord = data => createAPI(`/reportFormSearch/searchShopOrderAbnormalRecord`,'post',data)
+
diff --git a/src/views/modules/productProcessRoute/searchProcessRouteTool.vue b/src/views/modules/productProcessRoute/searchProcessRouteTool.vue
index 3b80def..5610c55 100644
--- a/src/views/modules/productProcessRoute/searchProcessRouteTool.vue
+++ b/src/views/modules/productProcessRoute/searchProcessRouteTool.vue
@@ -149,9 +149,9 @@
           status:'',
           active:'',
           defaultflag:'',
-          date1:'',
+          date1:new Date(),
           date2:'',
-          date3:'',
+          date3:new Date(),
           date4:'',
           user:this.$store.state.user.name
         },
diff --git a/src/views/modules/productProcessRoute/searchProductProcessRoute.vue b/src/views/modules/productProcessRoute/searchProductProcessRoute.vue
index a57075f..0e641b8 100644
--- a/src/views/modules/productProcessRoute/searchProductProcessRoute.vue
+++ b/src/views/modules/productProcessRoute/searchProductProcessRoute.vue
@@ -134,9 +134,9 @@
           workCenterDesc:'',
           defaultflag:'',
           status:'',
-          date1:'',
+          date1:new Date(),
           date2:'',
-          date3:'',
+          date3:new Date(),
           date4:'',
           user:this.$store.state.user.name
         },
diff --git a/src/views/modules/purchasingManagement/searchRollInformation.vue b/src/views/modules/purchasingManagement/searchRollInformation.vue
index 1ce6a8f..4e26c9e 100644
--- a/src/views/modules/purchasingManagement/searchRollInformation.vue
+++ b/src/views/modules/purchasingManagement/searchRollInformation.vue
@@ -149,9 +149,9 @@
           orderRef6:'',
           orderRef7:'',
           frozenflag:'',
-          date1:'',
+          date1:new Date(),
           date2:'',
-          date3:'',
+          date3:new Date(),
           date4:'',
           user:this.$store.state.user.name
         },
diff --git a/src/views/modules/shopOrder/reportFormSearch/searchMachineEfficiency.vue b/src/views/modules/shopOrder/reportFormSearch/searchMachineEfficiency.vue
new file mode 100644
index 0000000..8abb1e4
--- /dev/null
+++ b/src/views/modules/shopOrder/reportFormSearch/searchMachineEfficiency.vue
@@ -0,0 +1,316 @@
+<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.sWorkCenterNo" style="width: 130px"></el-input>
+      </el-form-item>
+      <el-form-item :label="'机台编号：'">
+        <el-input v-model="searchData.sResourceID" 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-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"></el-input>
+      <span>实际小时数</span>
+      <el-input v-model="sum2" style="width: 130px"></el-input>
+      <span>计时小时数</span>
+      <el-input v-model="sum3" style="width: 130px"></el-input>
+    </el-form>
+  </div>
+</template>
+
+<script>
+
+  import {
+    searchMachineEfficiency
+  } from "@/api/shopOrder/reportFormSearch.js"
+
+  export default {
+    //查询-机台效率
+    name: "searchMachineEfficiency",
+    data() {
+      return {
+        height: 200,
+        modelFlag:false,
+        modelInputFlag:true,
+        selectList:[],
+        sum1:0,
+        sum2:0,
+        sum3:0,
+        searchData: {
+          site:'',
+          sWorkCenterNo:'',
+          sResourceID:'',
+          date1:new Date(),
+          date2:'',
+          user:this.$store.state.user.name
+        },
+        dataList:[],
+        dataListLoading: false,
+        buttons:{
+          search:'查询',
+        },
+        columnList: [
+          {
+            userId: this.$store.state.user.name,
+            functionId: 6015,
+            serialNumber: '6015TableSWorkCenterNo',
+            tableId: "6015Table",
+            tableName: "生产订单不良表",
+            columnProp: "sWorkCenterNo",
+            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: 6015,
+            serialNumber: '6015TableWorkCenterDesc',
+            tableId: "6015Table",
+            tableName: "生产订单不良表",
+            columnProp: "workCenterDesc",
+            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: 6015,
+            serialNumber: '6015TableSResourceID',
+            tableId: "6015Table",
+            tableName: "生产订单不良表",
+            columnProp: "sResourceID",
+            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: 6015,
+            serialNumber: '6015TableReportDate',
+            tableId: "6015Table",
+            tableName: "生产订单不良表",
+            columnProp: "reportDate",
+            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: 6015,
+            serialNumber: '6015TableResouceEfficiency',
+            tableId: "6015Table",
+            tableName: "生产订单不良表",
+            columnProp: "resouceEfficiency",
+            headerAlign: "center",
+            align: "right",
+            columnLabel: "效率（%）",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: false,
+            columnWidth: 160
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 6015,
+            serialNumber: '6015TableSite',
+            tableId: "6015Table",
+            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: 6015,
+            serialNumber: '6015TableShiftNo',
+            tableId: "6015Table",
+            tableName: "生产订单不良表",
+            columnProp: "shiftNo",
+            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: 6015,
+            serialNumber: '6015TableCalTotalEstTime',
+            tableId: "6015Table",
+            tableName: "生产订单不良表",
+            columnProp: "calTotalEstTime",
+            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: 6015,
+            serialNumber: '6015TableCalTotalActTime',
+            tableId: "6015Table",
+            tableName: "生产订单不良表",
+            columnProp: "calTotalActTime",
+            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: 6015,
+            serialNumber: '6015TableCalOtherActTime',
+            tableId: "6015Table",
+            tableName: "生产订单不良表",
+            columnProp: "calOtherActTime",
+            headerAlign: "center",
+            align: "right",
+            columnLabel: "计时小时数",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: false,
+            columnWidth: 100
+          }
+        ],
+      }
+    },
+    mounted() {
+      this.$nextTick(() => {
+        this.height = window.innerHeight - 200;
+      })
+    },
+    methods: {
+      getData(){
+        searchMachineEfficiency(this.searchData).then(({data}) => {
+          this.dataList = data.rows;
+          this.sum1=0;
+          this.sum2=0;
+          this.sum3=0;
+          if(this.dataList.length==0){
+            this.sum1=0;
+            this.sum2=0;
+            this.sum3=0;
+          }else {
+            for (let i = 0; i < this.dataList.length; i++) {
+              this.sum1 =this.decimalUtil.add(this.sum1,this.dataList[i].calTotalEstTime);
+              this.sum2 =this.decimalUtil.add(this.sum2,this.dataList[i].calTotalActTime);
+              this.sum3 =this.decimalUtil.add(this.sum3,this.dataList[i].calOtherActTime);
+            }
+          }
+        })
+      },
+    },
+    created() {
+
+    }
+  }
+</script>
+
+<style >
+  .el-textarea__inner {
+    padding: 5px 5px;
+  }
+</style>
diff --git a/src/views/modules/shopOrder/reportFormSearch/searchResourceCapacity.vue b/src/views/modules/shopOrder/reportFormSearch/searchResourceCapacity.vue
new file mode 100644
index 0000000..0a179af
--- /dev/null
+++ b/src/views/modules/shopOrder/reportFormSearch/searchResourceCapacity.vue
@@ -0,0 +1,310 @@
+<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.workCenterNo" style="width: 130px"></el-input>
+      </el-form-item>
+      <el-form-item :label="'加工中心编码：'">
+        <el-input v-model="searchData.resourceID" 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-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"></el-input>
+      <span>负荷</span>
+      <el-input v-model="sum2" style="width: 130px"></el-input>
+    </el-form>
+  </div>
+</template>
+
+<script>
+
+  import {
+    searchResourceCapacity
+  } from "@/api/shopOrder/reportFormSearch.js"
+
+  export default {
+    //查询-机台产能负荷
+    name: "searchResourceCapacity",
+    data() {
+      return {
+        height: 200,
+        modelFlag:false,
+        modelInputFlag:true,
+        selectList:[],
+        sum1:0,
+        sum2:0,
+        searchData: {
+          site:'',
+          workCenterNo:'',
+          date1:new Date(),
+          date2:'',
+          resourceID:'',
+          user:this.$store.state.user.name
+        },
+        dataList:[],
+        dataListLoading: false,
+        buttons:{
+          search:'查询',
+        },
+        columnList: [
+          {
+            userId: this.$store.state.user.name,
+            functionId: 6018,
+            serialNumber: '6018TableResourceID',
+            tableId: "6018Table",
+            tableName: "查询加工中心产能负荷表",
+            columnProp: "resourceID",
+            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: 6018,
+            serialNumber: '6018TableResourceDesc',
+            tableId: "6018Table",
+            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: 6018,
+            serialNumber: '6018TableScheduleDate',
+            tableId: "6018Table",
+            tableName: "查询加工中心产能负荷表",
+            columnProp: "scheduleDate",
+            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: 6018,
+            serialNumber: '6018TableTimeCapacity',
+            tableId: "6018Table",
+            tableName: "查询加工中心产能负荷表",
+            columnProp: "timeCapacity",
+            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: 6018,
+            serialNumber: '6018TableWorkCenterNo',
+            tableId: "6018Table",
+            tableName: "查询加工中心产能负荷表",
+            columnProp: "workCenterNo",
+            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: 6018,
+            serialNumber: '6018TableSite',
+            tableId: "6018Table",
+            tableName: "查询加工中心产能负荷表",
+            columnProp: "site",
+            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: 6018,
+            serialNumber: '6018TableTimeLoading',
+            tableId: "6018Table",
+            tableName: "查询加工中心产能负荷表",
+            columnProp: "timeLoading",
+            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: 6018,
+            serialNumber: '6018TableWorkCenterDesc',
+            tableId: "6018Table",
+            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: 6018,
+            serialNumber: '6018TableSeqNo1',
+            tableId: "6018Table",
+            tableName: "查询加工中心产能负荷表",
+            columnProp: "seqNo1",
+            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: 6018,
+            serialNumber: '6018TableSeqNo2',
+            tableId: "6018Table",
+            tableName: "查询加工中心产能负荷表",
+            columnProp: "seqNo2",
+            headerAlign: "center",
+            align: "right",
+            columnLabel: "累计负荷",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: false,
+            columnWidth: 80
+          }
+        ],
+      }
+    },
+    mounted() {
+      this.$nextTick(() => {
+        this.height = window.innerHeight - 200;
+      })
+    },
+    methods: {
+      getData(){
+        searchResourceCapacity(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.sum1 =this.decimalUtil.add(this.sum1,this.dataList[i].timeCapacity);
+              this.sum2 =this.decimalUtil.add(this.sum2,this.dataList[i].timeLoading);
+            }
+          }
+        })
+      },
+    },
+    created() {
+
+    }
+  }
+</script>
+
+<style >
+  .el-textarea__inner {
+    padding: 5px 5px;
+  }
+</style>
diff --git a/src/views/modules/shopOrder/reportFormSearch/searchScheduleItemWaste.vue b/src/views/modules/shopOrder/reportFormSearch/searchScheduleItemWaste.vue
new file mode 100644
index 0000000..3737ebe
--- /dev/null
+++ b/src/views/modules/shopOrder/reportFormSearch/searchScheduleItemWaste.vue
@@ -0,0 +1,728 @@
+<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.compPartNo" 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-input v-model="searchData.seqNo" style="width: 130px"></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="searchData.workCenterNo" style="width: 130px"></el-input>
+      </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.orderNo" style="width: 130px"></el-input>
+      </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: 100px"></el-input>
+      <span>工序完成数量</span>
+      <el-input v-model="sum2" style="width: 100px"></el-input>
+      <span>材料需求数量</span>
+      <el-input v-model="sum3" style="width: 100px"></el-input>
+      <span>发料数量</span>
+      <el-input v-model="sum4" style="width: 100px"></el-input>
+      <span>浪费</span>
+      <el-input v-model="sum5" style="width: 100px"></el-input>
+      <span>浪费金额</span>
+      <el-input v-model="sum6" style="width: 100px"></el-input>
+    </el-form>
+  </div>
+</template>
+
+<script>
+
+  import {
+    //查询-派工单工序浪费
+    searchShopOrderItemWaste
+  } from "@/api/shopOrder/reportFormSearch.js"
+
+  export default {
+    //查询-生产订单工序浪费
+    name: "searchScheduleItemWaste",
+    data() {
+      return {
+        height: 200,
+        modelFlag:false,
+        modelInputFlag:true,
+        selectList:[],
+        sum1:0,
+        sum2:0,
+        sum3:0,
+        sum4:0,
+        sum5:0,
+        sum6:0,
+        searchData: {
+          site:'',
+          compPartNo:'',
+          seqNo:'',
+          workCenterNo:'',
+          partNo:'',
+          orderNo:'',
+          date1:new Date(),
+          date2:'',
+          user:this.$store.state.user.name,
+          searchType:'生产订单'
+        },
+        dataList:[],
+        dataListLoading: false,
+        buttons:{
+          search:'查询',
+        },
+        columnList: [
+          {
+            userId: this.$store.state.user.name,
+            functionId: 60142,
+            serialNumber: '60142TableSeqNo',
+            tableId: "60142Table",
+            tableName: "生产订单工序浪费表",
+            columnProp: "seqNo",
+            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: 60142,
+            serialNumber: '60142TableSeqCreatedate',
+            tableId: "60142Table",
+            tableName: "生产订单工序浪费表",
+            columnProp: "seqCreatedate",
+            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: 60142,
+            serialNumber: '60142TableSeqClosedate',
+            tableId: "60142Table",
+            tableName: "生产订单工序浪费表",
+            columnProp: "seqClosedate",
+            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: 60142,
+            serialNumber: '60142TableOrderNo',
+            tableId: "60142Table",
+            tableName: "生产订单工序浪费表",
+            columnProp: "orderNo",
+            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: 60142,
+            serialNumber: '60142TableSeqClosedate',
+            tableId: "60142Table",
+            tableName: "生产订单工序浪费表",
+            columnProp: "seqClosedate",
+            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: 60142,
+            serialNumber: '60142TableCreatedate',
+            tableId: "60142Table",
+            tableName: "生产订单工序浪费表",
+            columnProp: "createdate",
+            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: 60142,
+            serialNumber: '60142TableCompPartNo',
+            tableId: "60142Table",
+            tableName: "生产订单工序浪费表",
+            columnProp: "compPartNo",
+            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: 60142,
+            serialNumber: '60142TableCompPartDesc',
+            tableId: "60142Table",
+            tableName: "生产订单工序浪费表",
+            columnProp: "compPartNo",
+            headerAlign: "center",
+            align: "left",
+            columnLabel: "产品名称",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: false,
+            columnWidth: 250
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 60142,
+            serialNumber: '60142TableStatus',
+            tableId: "60142Table",
+            tableName: "生产订单工序浪费表",
+            columnProp: "status",
+            headerAlign: "center",
+            align: "left",
+            columnLabel: "SAP生产订单状态",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: false,
+            columnWidth: 100
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 60142,
+            serialNumber: '60142TableType',
+            tableId: "60142Table",
+            tableName: "生产订单工序浪费表",
+            columnProp: "type",
+            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: 60142,
+            serialNumber: '60142TableOrderPlannedQty',
+            tableId: "60142Table",
+            tableName: "生产订单工序浪费表",
+            columnProp: "orderPlannedQty",
+            headerAlign: "center",
+            align: "right",
+            columnLabel: "订单计划数量",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: false,
+            columnWidth: 120
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 60142,
+            serialNumber: '60142TableOrderCompQty',
+            tableId: "60142Table",
+            tableName: "生产订单工序浪费表",
+            columnProp: "orderCompQty",
+            headerAlign: "center",
+            align: "right",
+            columnLabel: "订单完成数量",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: false,
+            columnWidth: 120
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 60142,
+            serialNumber: '60142TableItemNo',
+            tableId: "60142Table",
+            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: 60142,
+            serialNumber: '60142TableOperationDesc',
+            tableId: "60142Table",
+            tableName: "生产订单工序浪费表",
+            columnProp: "operationDesc",
+            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: 60142,
+            serialNumber: '60142TableWorkCenterNo',
+            tableId: "60142Table",
+            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: 60142,
+            serialNumber: '60142TableCompPartNo',
+            tableId: "60142Table",
+            tableName: "生产订单工序浪费表",
+            columnProp: "compPartNo",
+            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: 60142,
+            serialNumber: '60142TableCompPartDesc',
+            tableId: "60142Table",
+            tableName: "生产订单工序浪费表",
+            columnProp: "compPartDesc",
+            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: 60142,
+            serialNumber: '60142TableKeyRMFlag',
+            tableId: "60142Table",
+            tableName: "生产订单工序浪费表",
+            columnProp: "keyRMFlag",
+            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: 60142,
+            serialNumber: '60142TableQPA',
+            tableId: "60142Table",
+            tableName: "生产订单工序浪费表",
+            columnProp: "qPA",
+            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: 60142,
+            serialNumber: '60142TableOrderPlannedQty',
+            tableId: "60142Table",
+            tableName: "生产订单工序浪费表",
+            columnProp: "orderPlannedQty",
+            headerAlign: "orderPlannedQty",
+            align: "right",
+            columnLabel: "工序计划数量",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: false,
+            columnWidth: 100
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 60142,
+            serialNumber: '60142TableOpCompQty',
+            tableId: "60142Table",
+            tableName: "生产订单工序浪费表",
+            columnProp: "opCompQty",
+            headerAlign: "orderPlannedQty",
+            align: "right",
+            columnLabel: "工序完成数量",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: false,
+            columnWidth: 100
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 60142,
+            serialNumber: '60142TableQtyRequired',
+            tableId: "60142Table",
+            tableName: "生产订单工序浪费表",
+            columnProp: "qtyRequired",
+            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: 60142,
+            serialNumber: '60142TableQtyIssued',
+            tableId: "60142Table",
+            tableName: "生产订单工序浪费表",
+            columnProp: "qtyIssued",
+            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: 60142,
+            serialNumber: '60142TableWaste',
+            tableId: "60142Table",
+            tableName: "生产订单工序浪费表",
+            columnProp: "waste",
+            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: 60142,
+            serialNumber: '60142TableWasterate',
+            tableId: "60142Table",
+            tableName: "生产订单工序浪费表",
+            columnProp: "wasterate",
+            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: 60142,
+            serialNumber: '60142TableUnitCost',
+            tableId: "60142Table",
+            tableName: "生产订单工序浪费表",
+            columnProp: "unitCost",
+            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: 60142,
+            serialNumber: '60142TableUnitCostConverted',
+            tableId: "60142Table",
+            tableName: "生产订单工序浪费表",
+            columnProp: "unitCostConverted",
+            headerAlign: "center",
+            align: "right",
+            columnLabel: "折算后单位成本",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: false,
+            columnWidth: 120
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 60142,
+            serialNumber: '60142TableWasteValue',
+            tableId: "60142Table",
+            tableName: "生产订单工序浪费表",
+            columnProp: "wasteValue",
+            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: 60142,
+            serialNumber: '60142TableSAPBOMItemNo',
+            tableId: "60142Table",
+            tableName: "生产订单工序浪费表",
+            columnProp: "sAPBOMItemNo",
+            headerAlign: "center",
+            align: "right",
+            columnLabel: "SAPBOM序号",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: false,
+            columnWidth: 80
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 60142,
+            serialNumber: '60142TableSite',
+            tableId: "60142Table",
+            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: 60142,
+            serialNumber: '60142TableExceptionReason',
+            tableId: "60142Table",
+            tableName: "生产订单工序浪费表",
+            columnProp: "exceptionReason",
+            headerAlign: "center",
+            align: "left",
+            columnLabel: "异常原因",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: false,
+            columnWidth: 800
+          }
+        ],
+      }
+    },
+    mounted() {
+      this.$nextTick(() => {
+        this.height = window.innerHeight - 250;
+      })
+    },
+    methods: {
+      getData(){
+        searchShopOrderItemWaste(this.searchData).then(({data}) => {
+          this.dataList = data.rows;
+          this.sum1=0;
+          this.sum2=0;
+          this.sum3=0;
+          this.sum4=0;
+          this.sum5=0;
+          this.sum6=0;
+          if(this.dataList.length==0){
+            this.sum1=0;
+            this.sum2=0;
+            this.sum3=0;
+            this.sum4=0;
+            this.sum5=0;
+            this.sum6=0;
+          }else {
+            for (let i = 0; i < this.dataList.length; i++) {
+              this.sum1 =this.decimalUtil.add(this.sum1,this.dataList[i].orderPlannedQty);
+              this.sum2 =this.decimalUtil.add(this.sum2,this.dataList[i].opCompQty);
+              this.sum3 =this.decimalUtil.add(this.sum3,this.dataList[i].qtyRequired);
+              this.sum4 =this.decimalUtil.add(this.sum4,this.dataList[i].qtyIssued);
+              this.sum5 =this.decimalUtil.add(this.sum5,this.dataList[i].waste);
+              this.sum6 =this.decimalUtil.add(this.sum6,this.dataList[i].wasteValue);
+            }
+          }
+        })
+      },
+    },
+    created() {
+
+    }
+  }
+</script>
+
+<style >
+  .el-textarea__inner {
+    padding: 5px 5px;
+  }
+</style>
diff --git a/src/views/modules/shopOrder/reportFormSearch/searchShopOrderAbnormalRecord.vue b/src/views/modules/shopOrder/reportFormSearch/searchShopOrderAbnormalRecord.vue
new file mode 100644
index 0000000..51510b7
--- /dev/null
+++ b/src/views/modules/shopOrder/reportFormSearch/searchShopOrderAbnormalRecord.vue
@@ -0,0 +1,307 @@
+<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.orderNo" style="width: 130px"></el-input>
+      </el-form-item>
+      <el-form-item :label="'派工单单号：'">
+        <el-input v-model="searchData.seqNo"  style="width: 130px"></el-input>
+      </el-form-item>
+      <el-form-item :label="'卷号：'">
+        <el-input v-model="searchData.rollNo" 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-select filterable v-model="searchData.actionType" style="width: 130px">
+          <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-item :label="'工厂编码：'">
+          <el-input v-model="searchData.site" style="width: 130px"></el-input>
+        </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>
+  </div>
+</template>
+
+<script>
+
+  import {
+
+    searchShopOrderAbnormalRecord
+  } from "@/api/shopOrder/reportFormSearch.js"
+
+  export default {
+    //查询-生产订单生产异常记录
+    name: "searchShopOrderAbnormalRecord",
+    data() {
+      return {
+        height: 200,
+        modelFlag:false,
+        modelInputFlag:true,
+        selectList:[],
+        searchData: {
+          orderNo:'',
+          seqNo:'',
+          rollNo:'',
+          actionType:'',
+          site:'',
+          date1:new Date(),
+          date2:'',
+          user:this.$store.state.user.name,
+          sumType:'生产订单'
+        },
+        dataList:[],
+        dataListLoading: false,
+        buttons:{
+          search:'查询',
+        },
+        columnList: [
+          {
+            userId: this.$store.state.user.name,
+            functionId: 6020,
+            serialNumber: '6020TableSite',
+            tableId: "6020Table",
+            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: 6020,
+            serialNumber: '6020TableOrderNo',
+            tableId: "6020Table",
+            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: 6020,
+            serialNumber: '6020TableItemNo',
+            tableId: "6020Table",
+            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: 6020,
+            serialNumber: '6020TableSeqNo',
+            tableId: "6020Table",
+            tableName: "查询生产订单生产异常记录表",
+            columnProp: "seqNo",
+            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: 6020,
+            serialNumber: '6020TableRollNo',
+            tableId: "6020Table",
+            tableName: "查询生产订单生产异常记录表",
+            columnProp: "rollNo",
+            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: 6020,
+            serialNumber: '6020TableActionType',
+            tableId: "6020Table",
+            tableName: "查询生产订单生产异常记录表",
+            columnProp: "actionType",
+            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: 6020,
+            serialNumber: '6020TableReason',
+            tableId: "6020Table",
+            tableName: "查询生产订单生产异常记录表",
+            columnProp: "reason",
+            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: 6020,
+            serialNumber: '6020TableCreatedDate',
+            tableId: "6020Table",
+            tableName: "查询生产订单生产异常记录表",
+            columnProp: "createdDate",
+            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: 6020,
+            serialNumber: '6020TableCreatedBy',
+            tableId: "6020Table",
+            tableName: "查询生产订单生产异常记录表",
+            columnProp: "createdBy",
+            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: 6020,
+            serialNumber: '6020TableOtherInfo',
+            tableId: "6020Table",
+            tableName: "查询生产订单生产异常记录表",
+            columnProp: "otherInfo",
+            headerAlign: "center",
+            align: "left",
+            columnLabel: "其他信息",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: false,
+            columnWidth: 200
+          }
+        ],
+      }
+    },
+    mounted() {
+      this.$nextTick(() => {
+        this.height = window.innerHeight - 250;
+      })
+    },
+    methods: {
+      getData(){
+        searchShopOrderAbnormalRecord(this.searchData).then(({data}) => {
+          this.dataList = data.rows;
+        })
+      },
+    },
+    created() {
+
+    }
+  }
+</script>
+
+<style >
+  .el-textarea__inner {
+    padding: 5px 5px;
+  }
+</style>
diff --git a/src/views/modules/shopOrder/reportFormSearch/searchShopOrderEfficiency.vue b/src/views/modules/shopOrder/reportFormSearch/searchShopOrderEfficiency.vue
new file mode 100644
index 0000000..b135967
--- /dev/null
+++ b/src/views/modules/shopOrder/reportFormSearch/searchShopOrderEfficiency.vue
@@ -0,0 +1,732 @@
+<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.workCenterNo" style="width: 130px"></el-input>
+      </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.sResourceid" style="width: 130px"></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="searchData.site" style="width: 130px"></el-input>
+      </el-form-item>
+      <el-form-item :label="'派工单单号：'">
+        <el-input v-model="searchData.seqNo" style="width: 130px"></el-input>
+      </el-form-item>
+      <el-form-item :label="'生产订单号：'">
+        <el-input v-model="searchData.orderNo" style="width: 130px"></el-input>
+      </el-form-item>
+      <el-form-item :label="'操作员姓名：'">
+        <el-input v-model="searchData.operatorDesc" style="width: 130px"></el-input>
+      </el-form-item>
+      <el-form-item :label="'汇总类型：'">
+        <el-select filterable v-model="searchData.sumType" style="width: 130px">
+          <el-option label="生产订单" value="生产订单"></el-option>
+          <el-option label="生产派工单" value="生产派工单"></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>
+  </div>
+</template>
+
+<script>
+
+  import {
+
+    searchShopOrderEfficiency
+  } from "@/api/shopOrder/reportFormSearch.js"
+
+  export default {
+    //查询-生产订单效率
+    name: "searchShopOrderEfficiency",
+    data() {
+      return {
+        height: 200,
+        modelFlag:false,
+        modelInputFlag:true,
+        selectList:[],
+        searchData: {
+          workCenterNo:'',
+          partNo:'',
+          sResourceid:'',
+          site:'',
+          seqNo:'',
+          orderNo:'',
+          operatorDesc:'',
+          date1:new Date(),
+          date2:'',
+          user:this.$store.state.user.name,
+          sumType:'生产订单'
+        },
+        dataList:[],
+        dataListLoading: false,
+        buttons:{
+          search:'查询',
+        },
+        columnList: [
+          {
+            userId: this.$store.state.user.name,
+            functionId: 6016,
+            serialNumber: '6016TableOrderNo',
+            tableId: "6016Table",
+            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: 6016,
+            serialNumber: '6016TableSostatus',
+            tableId: "6016Table",
+            tableName: "生产订单效率表",
+            columnProp: "sostatus",
+            headerAlign: "center",
+            align: "left",
+            columnLabel: "SAP订单状态",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: false,
+            columnWidth: 100
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 6016,
+            serialNumber: '6016TableCloseDate',
+            tableId: "6016Table",
+            tableName: "生产订单效率表",
+            columnProp: "closeDate",
+            headerAlign: "center",
+            align: "left",
+            columnLabel: "SAP清单时间",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: false,
+            columnWidth: 120
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 6016,
+            serialNumber: '6016TablePlannedQty',
+            tableId: "6016Table",
+            tableName: "生产订单效率表",
+            columnProp: "plannedQty",
+            headerAlign: "center",
+            align: "right",
+            columnLabel: "订单需求数量",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: false,
+            columnWidth: 120
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 6016,
+            serialNumber: '6016TableCmpltQty',
+            tableId: "6016Table",
+            tableName: "生产订单效率表",
+            columnProp: "cmpltQty",
+            headerAlign: "center",
+            align: "right",
+            columnLabel: "订单完成数量",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: false,
+            columnWidth: 120
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 6016,
+            serialNumber: '6016TableSeqNo',
+            tableId: "6016Table",
+            tableName: "生产订单效率表",
+            columnProp: "seqNo",
+            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: 6016,
+            serialNumber: '6016TableSeqCloseDate',
+            tableId: "6016Table",
+            tableName: "生产订单效率表",
+            columnProp: "seqCloseDate",
+            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: 6016,
+            serialNumber: '6016TablePartNo',
+            tableId: "6016Table",
+            tableName: "生产订单效率表",
+            columnProp: "partNo",
+            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: 6016,
+            serialNumber: '6016TablePartDesc',
+            tableId: "6016Table",
+            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: 6016,
+            serialNumber: '6016TableItemNo',
+            tableId: "6016Table",
+            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: 6016,
+            serialNumber: '6016TableOperationDesc',
+            tableId: "6016Table",
+            tableName: "生产订单效率表",
+            columnProp: "operationDesc",
+            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: 6016,
+            serialNumber: '6016TableWorkCenterNo',
+            tableId: "6016Table",
+            tableName: "生产订单效率表",
+            columnProp: "workCenterNo",
+            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: 6016,
+            serialNumber: '6016TableWorkCenterDesc',
+            tableId: "6016Table",
+            tableName: "生产订单效率表",
+            columnProp: "workCenterDesc",
+            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: 6016,
+            serialNumber: '6016TableOperatorID',
+            tableId: "6016Table",
+            tableName: "生产订单效率表",
+            columnProp: "operatorID",
+            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: 6016,
+            serialNumber: '6016TableOperatorDesc',
+            tableId: "6016Table",
+            tableName: "生产订单效率表",
+            columnProp: "operatorDesc",
+            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: 6016,
+            serialNumber: '6016TableSResourceid',
+            tableId: "6016Table",
+            tableName: "生产订单效率表",
+            columnProp: "sResourceid",
+            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: 6016,
+            serialNumber: '6016TableApproveQty',
+            tableId: "6016Table",
+            tableName: "生产订单效率表",
+            columnProp: "approveQty",
+            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: 6016,
+            serialNumber: '6016TableReportQty',
+            tableId: "6016Table",
+            tableName: "生产订单效率表",
+            columnProp: "reportQty",
+            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: 6016,
+            serialNumber: '6016TableSetupTimeRequired',
+            tableId: "6016Table",
+            tableName: "生产订单效率表",
+            columnProp: "setupTimeRequired",
+            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: 6016,
+            serialNumber: '6016TableReportedSetupTime',
+            tableId: "6016Table",
+            tableName: "生产订单效率表",
+            columnProp: "reportedSetupTime",
+            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: 6016,
+            serialNumber: '6016TableGapSetuptime',
+            tableId: "6016Table",
+            tableName: "生产订单效率表",
+            columnProp: "gapSetuptime",
+            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: 6016,
+            serialNumber: '6016TableActEfficiencySetuptime',
+            tableId: "6016Table",
+            tableName: "生产订单效率表",
+            columnProp: "actEfficiencySetuptime",
+            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: 6016,
+            serialNumber: '6016TableManTimeRequired',
+            tableId: "6016Table",
+            tableName: "生产订单效率表",
+            columnProp: "manTimeRequired",
+            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: 6016,
+            serialNumber: '6016TableReportedManfTime',
+            tableId: "6016Table",
+            tableName: "生产订单效率表",
+            columnProp: "reportedManfTime",
+            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: 6016,
+            serialNumber: '6016TableGapManftime',
+            tableId: "6016Table",
+            tableName: "生产订单效率表",
+            columnProp: "gapManftime",
+            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: 6016,
+            serialNumber: '6016TableActEfficiencyManftime',
+            tableId: "6016Table",
+            tableName: "生产订单效率表",
+            columnProp: "actEfficiencyManftime",
+            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: 6016,
+            serialNumber: '6016TableTotalTimeRequired',
+            tableId: "6016Table",
+            tableName: "生产订单效率表",
+            columnProp: "totalTimeRequired",
+            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: 6016,
+            serialNumber: '6016TableReportedTotalTime',
+            tableId: "6016Table",
+            tableName: "生产订单效率表",
+            columnProp: "reportedTotalTime",
+            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: 6016,
+            serialNumber: '6016TableGapTotalTime',
+            tableId: "6016Table",
+            tableName: "生产订单效率表",
+            columnProp: "gapTotalTime",
+            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: 6016,
+            serialNumber: '6016TableActEfficiencyTotaltime',
+            tableId: "6016Table",
+            tableName: "生产订单效率表",
+            columnProp: "actEfficiencyTotaltime",
+            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: 6016,
+            serialNumber: '6016TableQtyRequired',
+            tableId: "6016Table",
+            tableName: "生产订单效率表",
+            columnProp: "qtyRequired",
+            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: 6016,
+            serialNumber: '6016TableSite',
+            tableId: "6016Table",
+            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: 6016,
+            serialNumber: '6016TableEfficiency',
+            tableId: "6016Table",
+            tableName: "生产订单效率表",
+            columnProp: "efficiency",
+            headerAlign: "center",
+            align: "right",
+            columnLabel: "派工单标准效率",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: false,
+            columnWidth: 100
+          }
+        ],
+      }
+    },
+    mounted() {
+      this.$nextTick(() => {
+        this.height = window.innerHeight - 250;
+      })
+    },
+    methods: {
+      getData(){
+        searchShopOrderEfficiency(this.searchData).then(({data}) => {
+          this.dataList = data.rows;
+        })
+      },
+    },
+    created() {
+
+    }
+  }
+</script>
+
+<style >
+  .el-textarea__inner {
+    padding: 5px 5px;
+  }
+</style>
diff --git a/src/views/modules/shopOrder/reportFormSearch/searchShopOrderItemWaste.vue b/src/views/modules/shopOrder/reportFormSearch/searchShopOrderItemWaste.vue
new file mode 100644
index 0000000..001bd1a
--- /dev/null
+++ b/src/views/modules/shopOrder/reportFormSearch/searchShopOrderItemWaste.vue
@@ -0,0 +1,674 @@
+<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.compPartNo" 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-input v-model="searchData.seqNo" style="width: 130px"></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="searchData.workCenterNo" style="width: 130px"></el-input>
+      </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.orderNo" style="width: 130px"></el-input>
+      </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: 100px"></el-input>
+      <span>工序完成数量</span>
+      <el-input v-model="sum2" style="width: 100px"></el-input>
+      <span>材料需求数量</span>
+      <el-input v-model="sum3" style="width: 100px"></el-input>
+      <span>发料数量</span>
+      <el-input v-model="sum4" style="width: 100px"></el-input>
+      <span>浪费</span>
+      <el-input v-model="sum5" style="width: 100px"></el-input>
+      <span>浪费金额</span>
+      <el-input v-model="sum6" style="width: 100px"></el-input>
+    </el-form>
+  </div>
+</template>
+
+<script>
+
+  import {
+    //查询-生产订单工序浪费
+    searchShopOrderItemWaste
+  } from "@/api/shopOrder/reportFormSearch.js"
+
+  export default {
+    //查询-生产订单工序浪费
+    name: "searchShopOrderItemWaste",
+    data() {
+      return {
+        height: 200,
+        modelFlag:false,
+        modelInputFlag:true,
+        selectList:[],
+        sum1:0,
+        sum2:0,
+        sum3:0,
+        sum4:0,
+        sum5:0,
+        sum6:0,
+        searchData: {
+          site:'',
+          compPartNo:'',
+          seqNo:'',
+          workCenterNo:'',
+          partNo:'',
+          orderNo:'',
+          date1:new Date(),
+          date2:'',
+          user:this.$store.state.user.name,
+          searchType:'派工单'
+        },
+        dataList:[],
+        dataListLoading: false,
+        buttons:{
+          search:'查询',
+        },
+        columnList: [
+          {
+            userId: this.$store.state.user.name,
+            functionId: 6014,
+            serialNumber: '6014TableOrderNo',
+            tableId: "6014Table",
+            tableName: "生产订单工序浪费表",
+            columnProp: "orderNo",
+            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: 6014,
+            serialNumber: '6014TableSeqClosedate',
+            tableId: "6014Table",
+            tableName: "生产订单工序浪费表",
+            columnProp: "seqClosedate",
+            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: 6014,
+            serialNumber: '6014TableCreatedate',
+            tableId: "6014Table",
+            tableName: "生产订单工序浪费表",
+            columnProp: "createdate",
+            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: 6014,
+            serialNumber: '6014TableCompPartNo',
+            tableId: "6014Table",
+            tableName: "生产订单工序浪费表",
+            columnProp: "compPartNo",
+            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: 6014,
+            serialNumber: '6014TableCompPartDesc',
+            tableId: "6014Table",
+            tableName: "生产订单工序浪费表",
+            columnProp: "compPartNo",
+            headerAlign: "center",
+            align: "left",
+            columnLabel: "产品名称",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: false,
+            columnWidth: 250
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 6014,
+            serialNumber: '6014TableStatus',
+            tableId: "6014Table",
+            tableName: "生产订单工序浪费表",
+            columnProp: "status",
+            headerAlign: "center",
+            align: "left",
+            columnLabel: "SAP生产订单状态",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: false,
+            columnWidth: 100
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 6014,
+            serialNumber: '6014TableType',
+            tableId: "6014Table",
+            tableName: "生产订单工序浪费表",
+            columnProp: "type",
+            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: 6014,
+            serialNumber: '6014TableOrderPlannedQty',
+            tableId: "6014Table",
+            tableName: "生产订单工序浪费表",
+            columnProp: "orderPlannedQty",
+            headerAlign: "center",
+            align: "right",
+            columnLabel: "订单计划数量",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: false,
+            columnWidth: 120
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 6014,
+            serialNumber: '6014TableOrderCompQty',
+            tableId: "6014Table",
+            tableName: "生产订单工序浪费表",
+            columnProp: "orderCompQty",
+            headerAlign: "center",
+            align: "right",
+            columnLabel: "订单完成数量",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: false,
+            columnWidth: 120
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 6014,
+            serialNumber: '6014TableItemNo',
+            tableId: "6014Table",
+            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: 6014,
+            serialNumber: '6014TableOperationDesc',
+            tableId: "6014Table",
+            tableName: "生产订单工序浪费表",
+            columnProp: "operationDesc",
+            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: 6014,
+            serialNumber: '6014TableWorkCenterNo',
+            tableId: "6014Table",
+            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: 6014,
+            serialNumber: '6014TableCompPartNo',
+            tableId: "6014Table",
+            tableName: "生产订单工序浪费表",
+            columnProp: "compPartNo",
+            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: 6014,
+            serialNumber: '6014TableCompPartDesc',
+            tableId: "6014Table",
+            tableName: "生产订单工序浪费表",
+            columnProp: "compPartDesc",
+            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: 6014,
+            serialNumber: '6014TableKeyRMFlag',
+            tableId: "6014Table",
+            tableName: "生产订单工序浪费表",
+            columnProp: "keyRMFlag",
+            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: 6014,
+            serialNumber: '6014TableQPA',
+            tableId: "6014Table",
+            tableName: "生产订单工序浪费表",
+            columnProp: "qPA",
+            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: 6014,
+            serialNumber: '6014TableOrderPlannedQty',
+            tableId: "6014Table",
+            tableName: "生产订单工序浪费表",
+            columnProp: "orderPlannedQty",
+            headerAlign: "orderPlannedQty",
+            align: "right",
+            columnLabel: "工序计划数量",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: false,
+            columnWidth: 100
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 6014,
+            serialNumber: '6014TableOpCompQty',
+            tableId: "6014Table",
+            tableName: "生产订单工序浪费表",
+            columnProp: "opCompQty",
+            headerAlign: "orderPlannedQty",
+            align: "right",
+            columnLabel: "工序完成数量",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: false,
+            columnWidth: 100
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 6014,
+            serialNumber: '6014TableQtyRequired',
+            tableId: "6014Table",
+            tableName: "生产订单工序浪费表",
+            columnProp: "qtyRequired",
+            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: 6014,
+            serialNumber: '6014TableQtyIssued',
+            tableId: "6014Table",
+            tableName: "生产订单工序浪费表",
+            columnProp: "qtyIssued",
+            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: 6014,
+            serialNumber: '6014TableWaste',
+            tableId: "6014Table",
+            tableName: "生产订单工序浪费表",
+            columnProp: "waste",
+            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: 6014,
+            serialNumber: '6014TableWasterate',
+            tableId: "6014Table",
+            tableName: "生产订单工序浪费表",
+            columnProp: "wasterate",
+            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: 6014,
+            serialNumber: '6014TableUnitCost',
+            tableId: "6014Table",
+            tableName: "生产订单工序浪费表",
+            columnProp: "unitCost",
+            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: 6014,
+            serialNumber: '6014TableUnitCostConverted',
+            tableId: "6014Table",
+            tableName: "生产订单工序浪费表",
+            columnProp: "unitCostConverted",
+            headerAlign: "center",
+            align: "right",
+            columnLabel: "折算后单位成本",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: false,
+            columnWidth: 120
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 6014,
+            serialNumber: '6014TableWasteValue',
+            tableId: "6014Table",
+            tableName: "生产订单工序浪费表",
+            columnProp: "wasteValue",
+            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: 6014,
+            serialNumber: '6014TableSAPBOMItemNo',
+            tableId: "6014Table",
+            tableName: "生产订单工序浪费表",
+            columnProp: "sAPBOMItemNo",
+            headerAlign: "center",
+            align: "right",
+            columnLabel: "SAPBOM序号",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: false,
+            columnWidth: 80
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 6014,
+            serialNumber: '6014TableSite',
+            tableId: "6014Table",
+            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: 6014,
+            serialNumber: '6014TableExceptionReason',
+            tableId: "6014Table",
+            tableName: "生产订单工序浪费表",
+            columnProp: "exceptionReason",
+            headerAlign: "center",
+            align: "left",
+            columnLabel: "异常原因",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: false,
+            columnWidth: 800
+          }
+        ],
+      }
+    },
+    mounted() {
+      this.$nextTick(() => {
+        this.height = window.innerHeight - 250;
+      })
+    },
+    methods: {
+      getData(){
+        searchShopOrderItemWaste(this.searchData).then(({data}) => {
+          this.dataList = data.rows;
+          this.sum1=0;
+          this.sum2=0;
+          this.sum3=0;
+          this.sum4=0;
+          this.sum5=0;
+          this.sum6=0;
+          if(this.dataList.length==0){
+            this.sum1=0;
+            this.sum2=0;
+            this.sum3=0;
+            this.sum4=0;
+            this.sum5=0;
+            this.sum6=0;
+          }else {
+            for (let i = 0; i < this.dataList.length; i++) {
+              this.sum1 =this.decimalUtil.add(this.sum1,this.dataList[i].orderPlannedQty);
+              this.sum2 =this.decimalUtil.add(this.sum2,this.dataList[i].opCompQty);
+              this.sum3 =this.decimalUtil.add(this.sum3,this.dataList[i].qtyRequired);
+              this.sum4 =this.decimalUtil.add(this.sum4,this.dataList[i].qtyIssued);
+              this.sum5 =this.decimalUtil.add(this.sum5,this.dataList[i].waste);
+              this.sum6 =this.decimalUtil.add(this.sum6,this.dataList[i].wasteValue);
+            }
+          }
+        })
+      },
+    },
+    created() {
+
+    }
+  }
+</script>
+
+<style >
+  .el-textarea__inner {
+    padding: 5px 5px;
+  }
+</style>
diff --git a/src/views/modules/shopOrder/reportFormSearch/searchShopOrderScript.vue b/src/views/modules/shopOrder/reportFormSearch/searchShopOrderScript.vue
new file mode 100644
index 0000000..c3b1031
--- /dev/null
+++ b/src/views/modules/shopOrder/reportFormSearch/searchShopOrderScript.vue
@@ -0,0 +1,452 @@
+<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.reportedby" style="width: 130px"></el-input>
+      </el-form-item>
+      <el-form-item :label="'不良代码：'">
+        <el-input v-model="searchData.defectcode" 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>
+    <el-form :inline="true" label-position="top" label-width="100px" style="margin-top: -5px;">
+      <el-form-item :label="'加工中心编码：'">
+        <el-input v-model="searchData.workCenterNo" style="width: 130px"></el-input>
+      </el-form-item>
+      <el-form-item :label="'机台编号：'">
+        <el-input v-model="searchData.sResourceID" style="width: 130px"></el-input>
+      </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.orderno" style="width: 130px"></el-input>
+      </el-form-item>
+      <el-form-item :label="'派工单单号：'">
+        <el-input v-model="searchData.seqno" style="width: 130px"></el-input>
+      </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="sum" style="width: 130px"></el-input>
+    </el-form>
+  </div>
+</template>
+
+<script>
+
+  import {
+    searchShopOrderScript
+  } from "@/api/shopOrder/reportFormSearch.js"
+
+  export default {
+    //查询-生产订单不良
+    name: "searchShopOrderScript",
+    data() {
+      return {
+        height: 200,
+        modelFlag:false,
+        modelInputFlag:true,
+        selectList:[],
+        sum:0,
+        searchData: {
+          site:'',
+          reportedby:'',
+          defectcode:'',
+          workCenterNo:'',
+          sResourceID:'',
+          partno:'',
+          orderno:'',
+          seqno:'',
+          date1:new Date(),
+          date2:'',
+          user:this.$store.state.user.name
+        },
+        dataList:[],
+        dataListLoading: false,
+        buttons:{
+          search:'查询',
+        },
+        columnList: [
+          {
+            userId: this.$store.state.user.name,
+            functionId: 6013,
+            serialNumber: '6013TableOrderno',
+            tableId: "6013Table",
+            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: 6013,
+            serialNumber: '6013TablePartno',
+            tableId: "6013Table",
+            tableName: "产品编码",
+            columnProp: "partno",
+            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: 6013,
+            serialNumber: '6013TablePartdesc',
+            tableId: "6013Table",
+            tableName: "产品名称",
+            columnProp: "site",
+            headerAlign: "partdesc",
+            align: "left",
+            columnLabel: "产品名称",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: false,
+            columnWidth: 200
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 6013,
+            serialNumber: '6013TableSeqno',
+            tableId: "6013Table",
+            tableName: "生产订单不良表",
+            columnProp: "seqno",
+            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: 6013,
+            serialNumber: '6013TableQtyRequired',
+            tableId: "6013Table",
+            tableName: "生产订单不良表",
+            columnProp: "qtyRequired",
+            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: 6013,
+            serialNumber: '6013TableItemno',
+            tableId: "6013Table",
+            tableName: "生产订单不良表",
+            columnProp: "itemno",
+            headerAlign: "center",
+            align: "left",
+            columnLabel: "工序号",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: false,
+            columnWidth: 70
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 6013,
+            serialNumber: '6013TableOperdesc',
+            tableId: "6013Table",
+            tableName: "生产订单不良表",
+            columnProp: "operdesc",
+            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: 6013,
+            serialNumber: '6013TableSResourceID',
+            tableId: "6013Table",
+            tableName: "生产订单不良表",
+            columnProp: "sResourceID",
+            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: 6013,
+            serialNumber: '6013TableWorkCenterNo',
+            tableId: "6013Table",
+            tableName: "生产订单不良表",
+            columnProp: "workCenterNo",
+            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: 6013,
+            serialNumber: '6013TableWorkCenterDesc',
+            tableId: "6013Table",
+            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: 6013,
+            serialNumber: '6013TableRollno',
+            tableId: "6013Table",
+            tableName: "生产订单不良表",
+            columnProp: "rollno",
+            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: 6013,
+            serialNumber: '6013TableDefectcode',
+            tableId: "6013Table",
+            tableName: "生产订单不良表",
+            columnProp: "defectcode",
+            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: 6013,
+            serialNumber: '6013TableDefectdesc',
+            tableId: "6013Table",
+            tableName: "生产订单不良表",
+            columnProp: "defectdesc",
+            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: 6013,
+            serialNumber: '6013TableDefectqty',
+            tableId: "6013Table",
+            tableName: "生产订单不良表",
+            columnProp: "defectqty",
+            headerAlign: "center",
+            align: "right",
+            columnLabel: "不良数量",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: false,
+            columnWidth: 120
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 6013,
+            serialNumber: '6013TableReportedby',
+            tableId: "6013Table",
+            tableName: "生产订单不良表",
+            columnProp: "reportedby",
+            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: 6013,
+            serialNumber: '6013TableReportDate',
+            tableId: "6013Table",
+            tableName: "生产订单不良表",
+            columnProp: "reportDate",
+            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: 6013,
+            serialNumber: '6013TableSite',
+            tableId: "6013Table",
+            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 - 250;
+      })
+    },
+    methods: {
+      getData(){
+        searchShopOrderScript(this.searchData).then(({data}) => {
+          this.dataList = data.rows;
+          this.sum=0;
+          if(this.dataList.length==0){
+            this.sum=0;
+          }else {
+            for (let i = 0; i < this.dataList.length; i++) {
+              this.sum =this.decimalUtil.add(this.sum,this.dataList[i].defectqty);
+            }
+          }
+        })
+      },
+    },
+    created() {
+
+    }
+  }
+</script>
+
+<style >
+  .el-textarea__inner {
+    padding: 5px 5px;
+  }
+</style>
diff --git a/src/views/modules/shopOrder/reportFormSearch/searchShopOrderStatusCheck.vue b/src/views/modules/shopOrder/reportFormSearch/searchShopOrderStatusCheck.vue
new file mode 100644
index 0000000..1bba83d
--- /dev/null
+++ b/src/views/modules/shopOrder/reportFormSearch/searchShopOrderStatusCheck.vue
@@ -0,0 +1,431 @@
+<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.partno" style="width: 130px"></el-input>
+      </el-form-item>
+      <el-form-item :label="'生产订单号：'">
+        <el-input v-model="searchData.orderno" style="width: 130px"></el-input>
+      </el-form-item>
+      <el-form-item :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.status" 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-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>
+  </div>
+</template>
+
+<script>
+
+  import {
+
+    searchShopOrderStatusCheck
+  } from "@/api/shopOrder/reportFormSearch.js"
+
+  export default {
+    //查询-生产订单状态检查
+    name: "searchShopOrderStatusCheck",
+    data() {
+      return {
+        height: 200,
+        modelFlag:false,
+        modelInputFlag:true,
+        selectList:[],
+        searchData: {
+          partno:'',
+          orderno:'',
+          site:'',
+          status:'',
+          date1:new Date(),
+          date2:'',
+          user:this.$store.state.user.name,
+          sumType:'生产订单'
+        },
+        dataList:[],
+        dataListLoading: false,
+        buttons:{
+          search:'查询',
+        },
+        columnList: [
+          {
+            userId: this.$store.state.user.name,
+            functionId: 6019,
+            serialNumber: '6019TableOrderno',
+            tableId: "6019Table",
+            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: 6019,
+            serialNumber: '6019TableSite',
+            tableId: "6019Table",
+            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: 6019,
+            serialNumber: '6019TableEnterDate',
+            tableId: "6019Table",
+            tableName: "查询生产订单状态检查表",
+            columnProp: "enterDate",
+            headerAlign: "center",
+            align: "left",
+            columnLabel: "录入日期",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: false,
+            columnWidth: 130
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 6019,
+            serialNumber: '6019TablePartno',
+            tableId: "6019Table",
+            tableName: "查询生产订单状态检查表",
+            columnProp: "partno",
+            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: 6019,
+            serialNumber: '6019TablePartdesc',
+            tableId: "6019Table",
+            tableName: "查询生产订单状态检查表",
+            columnProp: "partdesc",
+            headerAlign: "center",
+            align: "left",
+            columnLabel: "产成品名称",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: false,
+            columnWidth: 300
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 6019,
+            serialNumber: '6019TableLotsize',
+            tableId: "6019Table",
+            tableName: "查询生产订单状态检查表",
+            columnProp: "lotsize",
+            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: 6019,
+            serialNumber: '6019TableStatus',
+            tableId: "6019Table",
+            tableName: "查询生产订单状态检查表",
+            columnProp: "status",
+            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: 6019,
+            serialNumber: '6019TableSAPStatus',
+            tableId: "6019Table",
+            tableName: "查询生产订单状态检查表",
+            columnProp: "sAPStatus",
+            headerAlign: "center",
+            align: "left",
+            columnLabel: "SAP订单状态",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: false,
+            columnWidth: 100
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 6019,
+            serialNumber: '6019TableSAPCloseFlag',
+            tableId: "6019Table",
+            tableName: "查询生产订单状态检查表",
+            columnProp: "sAPCloseFlag",
+            headerAlign: "center",
+            align: "left",
+            columnLabel: "SAP是否清账",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: false,
+            columnWidth: 100
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 6019,
+            serialNumber: '6019TableSOpenFlag',
+            tableId: "6019Table",
+            tableName: "查询生产订单状态检查表",
+            columnProp: "sOpenFlag",
+            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: 6019,
+            serialNumber: '6019TableSUnTransFlag',
+            tableId: "6019Table",
+            tableName: "查询生产订单状态检查表",
+            columnProp: "sUnTransFlag",
+            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: 6019,
+            serialNumber: '6019TableSWIPRollFlag',
+            tableId: "6019Table",
+            tableName: "查询生产订单状态检查表",
+            columnProp: "sWIPRollFlag",
+            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: 6019,
+            serialNumber: '6019TableSUnRecRollFlag',
+            tableId: "6019Table",
+            tableName: "查询生产订单状态检查表",
+            columnProp: "sUnRecRollFlag",
+            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: 6019,
+            serialNumber: '6019TableCanCloseFlag',
+            tableId: "6019Table",
+            tableName: "查询生产订单状态检查表",
+            columnProp: "canCloseFlag",
+            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: 6019,
+            serialNumber: '6019TableActIssueCost',
+            tableId: "6019Table",
+            tableName: "查询生产订单状态检查表",
+            columnProp: "actIssueCost",
+            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: 6019,
+            serialNumber: '6019TableActReceiveCost',
+            tableId: "6019Table",
+            tableName: "查询生产订单状态检查表",
+            columnProp: "actReceiveCost",
+            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: 6019,
+            serialNumber: '6019TableVariance',
+            tableId: "6019Table",
+            tableName: "查询生产订单状态检查表",
+            columnProp: "variance",
+            headerAlign: "center",
+            align: "left",
+            columnLabel: "差异",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: false,
+            columnWidth: 100
+          }
+        ],
+      }
+    },
+    mounted() {
+      this.$nextTick(() => {
+        this.height = window.innerHeight - 190;
+      })
+    },
+    methods: {
+      getData(){
+        searchShopOrderStatusCheck(this.searchData).then(({data}) => {
+          this.dataList = data.rows;
+        })
+      },
+    },
+    created() {
+
+    }
+  }
+</script>
+
+<style >
+  .el-textarea__inner {
+    padding: 5px 5px;
+  }
+</style>
diff --git a/src/views/modules/shopOrder/reportFormSearch/searchWorkCenterCapacity.vue b/src/views/modules/shopOrder/reportFormSearch/searchWorkCenterCapacity.vue
new file mode 100644
index 0000000..f9af61d
--- /dev/null
+++ b/src/views/modules/shopOrder/reportFormSearch/searchWorkCenterCapacity.vue
@@ -0,0 +1,270 @@
+<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.workCenterNo" 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-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"></el-input>
+      <span>负荷</span>
+      <el-input v-model="sum2" style="width: 130px"></el-input>
+    </el-form>
+  </div>
+</template>
+
+<script>
+
+  import {
+    searchWorkCenterCapacity
+  } from "@/api/shopOrder/reportFormSearch.js"
+
+  export default {
+    //查询-加工中心产能负荷
+    name: "searchWorkCenterCapacity",
+    data() {
+      return {
+        height: 200,
+        modelFlag:false,
+        modelInputFlag:true,
+        selectList:[],
+        sum1:0,
+        sum2:0,
+        searchData: {
+          site:'',
+          workCenterNo:'',
+          date1:new Date(),
+          date2:'',
+          user:this.$store.state.user.name
+        },
+        dataList:[],
+        dataListLoading: false,
+        buttons:{
+          search:'查询',
+        },
+        columnList: [
+          {
+            userId: this.$store.state.user.name,
+            functionId: 6017,
+            serialNumber: '6017TableWorkCenterNo',
+            tableId: "6017Table",
+            tableName: "查询加工中心产能负荷表",
+            columnProp: "workCenterNo",
+            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: 6017,
+            serialNumber: '6017TableWorkCenterDesc',
+            tableId: "6017Table",
+            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: 6017,
+            serialNumber: '6017TableScheduleDate',
+            tableId: "6017Table",
+            tableName: "查询加工中心产能负荷表",
+            columnProp: "scheduleDate",
+            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: 6017,
+            serialNumber: '6017TableTimeCapacity',
+            tableId: "6017Table",
+            tableName: "查询加工中心产能负荷表",
+            columnProp: "timeCapacity",
+            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: 6017,
+            serialNumber: '6017TableTimeLoading',
+            tableId: "6017Table",
+            tableName: "查询加工中心产能负荷表",
+            columnProp: "timeLoading",
+            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: 6017,
+            serialNumber: '6017TableSite',
+            tableId: "6017Table",
+            tableName: "查询加工中心产能负荷表",
+            columnProp: "site",
+            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: 6017,
+            serialNumber: '6017TableSeqNo1',
+            tableId: "6017Table",
+            tableName: "查询加工中心产能负荷表",
+            columnProp: "seqNo1",
+            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: 6017,
+            serialNumber: '6017TableSeqNo2',
+            tableId: "6017Table",
+            tableName: "查询加工中心产能负荷表",
+            columnProp: "seqNo2",
+            headerAlign: "center",
+            align: "right",
+            columnLabel: "累计负荷",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: false,
+            columnWidth: 100
+          }
+        ],
+      }
+    },
+    mounted() {
+      this.$nextTick(() => {
+        this.height = window.innerHeight - 200;
+      })
+    },
+    methods: {
+      getData(){
+        searchWorkCenterCapacity(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.sum1 =this.decimalUtil.add(this.sum1,this.dataList[i].timeCapacity);
+              this.sum2 =this.decimalUtil.add(this.sum2,this.dataList[i].timeLoading);
+            }
+          }
+        })
+      },
+    },
+    created() {
+
+    }
+  }
+</script>
+
+<style >
+  .el-textarea__inner {
+    padding: 5px 5px;
+  }
+</style>
diff --git a/src/views/modules/sys/menu.vue b/src/views/modules/sys/menu.vue
index 363c75a..2ce13d8 100644
--- a/src/views/modules/sys/menu.vue
+++ b/src/views/modules/sys/menu.vue
@@ -110,7 +110,7 @@
     },
     mounted() {
       this.$nextTick(()=>{
-        this.height = window.innerHeight - 220;
+        this.height = window.innerHeight ;
       })
     },
     methods: {