diff --git a/src/views/production/planInfo/index.vue b/src/views/production/planInfo/index.vue
index 6c8f13d..1fcc138 100644
--- a/src/views/production/planInfo/index.vue
+++ b/src/views/production/planInfo/index.vue
@@ -1,10 +1,10 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px">
-      <el-form-item label="计划编号" prop="orderCode">
+      <el-form-item label="SAP计划编号" prop="orderCode">
         <el-input
           v-model="queryParams.orderCode"
-          placeholder="请输入计划编号"
+          placeholder="请输入SAP计划编号"
           clearable
           @keyup.enter.native="handleQuery"
         />
@@ -17,6 +17,14 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
+      <el-form-item label="物料编号" prop="materialCode">
+        <el-input
+          v-model="queryParams.materialCode"
+          placeholder="请输入物料名称"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
       <el-form-item label="物料名称" prop="materialName">
         <el-input
           v-model="queryParams.materialName"
@@ -73,21 +81,21 @@
           :disabled="single"
           @click="handleUpdate"
           v-hasPermi="['production:planInfo:edit']"
-        >修改
-        </el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="danger"
-          plain
-          icon="el-icon-delete"
-          size="mini"
-          :disabled="multiple"
-          @click="handleDelete"
-          v-hasPermi="['production:planInfo:remove']"
-        >删除
+        >修改计划
         </el-button>
       </el-col>
+<!--      <el-col :span="1.5">-->
+<!--        <el-button-->
+<!--          type="danger"-->
+<!--          plain-->
+<!--          icon="el-icon-delete"-->
+<!--          size="mini"-->
+<!--          :disabled="multiple"-->
+<!--          @click="handleDelete"-->
+<!--          v-hasPermi="['production:planInfo:remove']"-->
+<!--        >删除-->
+<!--        </el-button>-->
+<!--      </el-col>-->
       <el-col :span="1.5">
         <el-button
           type="warning"
@@ -117,6 +125,8 @@
       <el-table-column label="计划工位名称" align="center" prop="stationName" width="100" v-if="columns[10].visible"/>
       <el-table-column label="计划数量" align="center" prop="planAmount" v-if="columns[11].visible"/>
       <el-table-column label="完成数量" align="center" prop="completeAmount" v-if="columns[12].visible"/>
+      <el-table-column label="计划开始日期" align="center" prop="planBeginTime" width="100" v-if="columns[20].visible"/>
+      <el-table-column label="计划完成日期" align="center" prop="planEndTime" width="100" v-if="columns[21].visible"/>
       <el-table-column label="实际开始时间" align="center" prop="beginTime" width="100" v-if="columns[13].visible">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.beginTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
@@ -144,25 +154,25 @@
           <span>{{ parseTime(scope.row.updatedTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width" fixed="right">
-        <template slot-scope="scope">
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-edit"
-            @click="handleUpdate(scope.row)"
-            v-hasPermi="['production:planInfo:edit']"
-          >修改计划
-          </el-button>
-          <!--          <el-button-->
-          <!--            size="mini"-->
-          <!--            type="text"-->
-          <!--            icon="el-icon-delete"-->
-          <!--            @click="handleDelete(scope.row)"-->
-          <!--            v-hasPermi="['production:planInfo:remove']"-->
-          <!--          >删除</el-button>-->
-        </template>
-      </el-table-column>
+<!--      <el-table-column label="操作" align="center" class-name="small-padding fixed-width" fixed="right">-->
+<!--        <template slot-scope="scope">-->
+<!--          <el-button-->
+<!--            size="mini"-->
+<!--            type="text"-->
+<!--            icon="el-icon-edit"-->
+<!--            @click="handleUpdate(scope.row)"-->
+<!--            v-hasPermi="['production:planInfo:edit']"-->
+<!--          >修改计划-->
+<!--          </el-button>-->
+<!--          &lt;!&ndash;          <el-button&ndash;&gt;-->
+<!--          &lt;!&ndash;            size="mini"&ndash;&gt;-->
+<!--          &lt;!&ndash;            type="text"&ndash;&gt;-->
+<!--          &lt;!&ndash;            icon="el-icon-delete"&ndash;&gt;-->
+<!--          &lt;!&ndash;            @click="handleDelete(scope.row)"&ndash;&gt;-->
+<!--          &lt;!&ndash;            v-hasPermi="['production:planInfo:remove']"&ndash;&gt;-->
+<!--          &lt;!&ndash;          >删除</el-button>&ndash;&gt;-->
+<!--        </template>-->
+<!--      </el-table-column>-->
     </el-table>
 
     <pagination
@@ -216,10 +226,10 @@
           </el-select>
         </el-form-item>
         <el-form-item label="计划数量" prop="planAmount">
-          <el-input v-model="form.planAmount" placeholder="请输入计划数量"/>
+          <el-input v-model="form.planAmount" placeholder="请输入计划数量" :disabled="true"/>
         </el-form-item>
         <el-form-item label="完成数量" prop="completeAmount">
-          <el-input v-model="form.completeAmount" placeholder="请输入完成数量"/>
+          <el-input v-model="form.completeAmount" placeholder="请输入完成数量" :disabled="true"/>
         </el-form-item>
         <el-form-item label="实际开始时间" prop="beginTime">
           <el-date-picker clearable
@@ -317,20 +327,25 @@ export default {
         { key: 9, label: `计划工位编号`, visible: false },
         { key: 10, label: `计划工位名称`, visible: true },
         { key: 11, label: `计划数量`, visible: true },
-        { key: 12, label: `完成数量`, visible: false },
+        { key: 12, label: `完成数量`, visible: true },
         { key: 13, label: `实际开始时间`, visible: true },
         { key: 14, label: `实际结束时间`, visible: true },
         { key: 15, label: `是否标识`, visible: false },
         { key: 16, label: `创建人`, visible: false },
         { key: 17, label: `创建时间`, visible: false },
         { key: 18, label: `更新人`, visible: false },
-        { key: 19, label: `更新时间`, visible: false }
+        { key: 19, label: `更新时间`, visible: false },
+        { key: 20, label: `计划开始日期`, visible: true },
+        { key: 21, label: `计划完成日期`, visible: true },
       ],
       // 产线工位选项
       productLineList: []
     }
   },
   created() {
+    if (this.$route.query.orderCode != null){
+      this.queryParams.orderCode = this.$route.query.orderCode;
+    }
     this.getList()
     findProductLineList().then(response => {
       this.productLineList = response.data
diff --git a/src/views/report/productionExecutionReport/index.vue b/src/views/report/productionExecutionReport/index.vue
index 5bdaca8..99f1645 100644
--- a/src/views/report/productionExecutionReport/index.vue
+++ b/src/views/report/productionExecutionReport/index.vue
@@ -2,26 +2,26 @@
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px">
       <el-form-item label="产线" prop="PRODUCT_LINE_NAME">
-        <el-select v-model="queryParams.WORK_CENTER_CODE" placeholder="请选择产线">
+        <el-select v-model="queryParams.productLineCode" placeholder="请选择产线" clearable>
           <el-option
             v-for="item in productLineList"
-            :key="item.workCenterCode"
-            :label="item.workCenterName"
-            :value="item.workCenterCode"
+            :key="item.productLineCode"
+            :label="item.productLineName"
+            :value="item.productLineCode"
           ></el-option>
         </el-select>
       </el-form-item>
-      <el-form-item label="产品编码" prop="MATERIAL_CODE">
+      <el-form-item label="产品编号" prop="PRODUCT_CODE">
         <el-input
-          v-model="queryParams.MATERIAL_CODE"
-          placeholder="请输入产品编码"
+          v-model="queryParams.PRODUCT_CODE"
+          placeholder="请输入产品编号"
           clearable
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="产品名称" prop="MATERIAL_NAME">
+      <el-form-item label="产品名称" prop="PRODUCT_NAME">
         <el-input
-          v-model="queryParams.MATERIAL_NAME"
+          v-model="queryParams.PRODUCT_NAME"
           placeholder="请输入产品名称"
           clearable
           @keyup.enter.native="handleQuery"
@@ -36,7 +36,7 @@
         />
       </el-form-item>
       <el-form-item label="工位">
-        <el-select v-model="queryParams.stationCode" placeholder="请选择工位">
+        <el-select v-model="queryParams.stationCode" placeholder="请选择工位" clearable>
           <el-option
             v-for="item in findStationList"
             :key="item.productLineCode"
@@ -49,7 +49,7 @@
         <el-date-picker
           v-model="daterangeBeginTime"
           style="width: 340px"
-          value-format="yyyy-MM-dd"
+          value-format="yyyy-MM-dd HH:mm:ss"
           type="datetimerange"
           range-separator="-"
           start-placeholder="开始时间"
@@ -79,17 +79,14 @@
     <el-table v-loading="loading" :data="reportList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center"/>
       <el-table-column label="主键标识" align="center" prop="objId" v-if="columns[0].visible"/>
-      <el-table-column label="工位" align="center" prop="PRODUCT_STATION" v-if="columns[1].visible"/>
-      <el-table-column label="订单编号" align="center" prop="ORDER_CODE" v-if="columns[2].visible"/>
-      <el-table-column label="物料编码" align="center" prop="MATERIAL_CODE" v-if="columns[3].visible">
-        <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.BEGIN_DATE, '{y}-{m}-{d}') }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="物料名称" align="center" prop="MATERIAL_NAME" v-if="columns[4].visible"/>
-      <el-table-column label="产品编码" align="center" prop="PRODUCT_CODE" v-if="columns[5].visible"/>
-      <el-table-column label="产品型号" align="center" prop="PRODUCT_NAME" v-if="columns[6].visible"/>
-      <el-table-column label="数量" align="center" prop="COMPLETE_AMOUNT" v-if="columns[7].visible"/>
+      <el-table-column label="产线" align="center" prop="PRODUCT_LINE_NAME" v-if="columns[1].visible"/>
+      <el-table-column label="工位" align="center" prop="STATION_NAME" v-if="columns[2].visible"/>
+      <el-table-column label="订单编号" align="center" prop="ORDER_CODE" v-if="columns[3].visible"/>
+      <el-table-column label="物料编号" align="center" prop="MATERIAL_CODE" v-if="columns[4].visible"/>
+      <el-table-column label="物料名称" align="center" prop="MATERIAL_NAME" v-if="columns[5].visible"/>
+      <el-table-column label="产品编号" align="center" prop="PRODUCT_CODE" v-if="columns[6].visible"/>
+      <el-table-column label="产品名称" align="center" prop="PRODUCT_NAME" v-if="columns[7].visible"/>
+      <el-table-column label="数量" align="center" prop="COMP_AMOUNT" v-if="columns[8].visible"/>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
@@ -97,18 +94,18 @@
             type="text"
             icon="el-icon-search"
             @click="handleOrderDetails(scope.row)"
-            v-hasPermi="['report:pointDnb:edit']"
-          >查看订单明细</el-button>
+          >查看工单明细
+          </el-button>
         </template>
       </el-table-column>
     </el-table>
-    <!--    <pagination-->
-    <!--      v-show="total>0"-->
-    <!--      :total="total"-->
-    <!--      :page.sync="queryParams.pageNum"-->
-    <!--      :limit.sync="queryParams.pageSize"-->
-    <!--      @pagination="getList"-->
-    <!--    />-->
+    <pagination
+      v-show="total>0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
 
   </div>
 </template>
@@ -119,7 +116,6 @@ import {
 } from '@/api/report/reportAPI'
 import { findProductLineList } from '@//api/base/productLine'
 import { parseTime } from '@//utils/ruoyi'
-import { getPointDnb } from '@//api/report/pointDnb'
 
 export default {
   name: 'ReportInfo',
@@ -148,15 +144,17 @@ export default {
       daterangeBeginTime: [],
       // 查询参数
       queryParams: {
-        // pageNum: 1,
-        // pageSize: 10,
+        pageNum: 1,
+        pageSize: 10,
         beginBeginTime: null,
         endBeginTime: null,
-        WORK_CENTER_CODE: null,
-        PRODUCT_LINE_NAME: null,
+        productLineCode: 'CX_02',
+        stationCode: null,
         ORDER_CODE: null,
         MATERIAL_CODE: null,
         MATERIAL_NAME: null,
+        PRODUCT_CODE: null,
+        PRODUCT_NAME: null,
         BEGIN_DATE: null
       },
       // 表单参数
@@ -165,13 +163,15 @@ export default {
       rules: {},
       columns: [
         { key: 0, label: `主键标识`, visible: false },
-        { key: 1, label: `工位`, visible: true },
-        { key: 2, label: `订单编号`, visible: true },
-        { key: 3, label: `物料编码`, visible: true },
-        { key: 4, label: `物料名称`, visible: true },
-        { key: 5, label: `产品编码`, visible: true },
-        { key: 6, label: `产品型号`, visible: true },
-        { key: 7, label: `数量`, visible: true },
+        { key: 1, label: `产线`, visible: true },
+        { key: 2, label: `工位`, visible: true },
+        { key: 3, label: `订单编号`, visible: true },
+        { key: 4, label: `物料编号`, visible: true },
+        { key: 5, label: `物料名称`, visible: true },
+        { key: 6, label: `产品编号`, visible: true },
+        { key: 7, label: `产品名称`, visible: true },
+        { key: 8, label: `数量`, visible: true },
+        { key: 9, label: `数量`, visible: true }
       ],
       // 产线选项
       productLineList: [],
@@ -179,16 +179,23 @@ export default {
       findStationList: []
     }
   },
+  watch: {
+    'queryParams.productLineCode': function(newVal, oldVal) {
+      // 执行方法，可以在这里调用你的方法
+      this.getStationList()
+    }
+  },
   created() {
     findProductLineList({ productLineType: 1 }).then(response => {
       this.productLineList = response.data
+    }).then(() => {
+      return findProductLineList({ productLineType: 2, parentId: this.queryParams.productLineCode })
+    }).then(response => {
+      this.findStationList = response.data
     })
-    findProductLineList({productLineType: 2}).then(response => {
-      this.findStationList = response.data;
-    });
     const nowDate = parseTime(new Date(), '{y}-{m}-{d}')
-    this.daterangeBeginTime[0] = nowDate
-    this.daterangeBeginTime[1] = nowDate
+    this.daterangeBeginTime[0] = nowDate + ' 00:00:00'
+    this.daterangeBeginTime[1] = nowDate + ' 23:59:59'
     this.getList()
   },
   methods: {
@@ -203,8 +210,8 @@ export default {
         this.queryParams.endBeginTime = null
       }
       productionExecutionReportList(this.queryParams).then(response => {
-        this.reportList = response.data
-        // this.total = response.total;
+        this.reportList = response.rows
+        this.total = response.total
         this.loading = false
       })
     },
@@ -217,11 +224,12 @@ export default {
     reset() {
       this.daterangeBeginTime = []
       this.form = {
-        WORK_CENTER_CODE: null,
-        PRODUCT_LINE_NAME: null,
+        stationCode: null,
         ORDER_CODE: null,
         MATERIAL_CODE: null,
         MATERIAL_NAME: null,
+        PRODUCT_CODE: null,
+        PRODUCT_NAME: null,
         BEGIN_DATE: null
       }
       this.resetForm('form')
@@ -238,7 +246,14 @@ export default {
     },
     /** 查看明细 */
     handleOrderDetails(row) {
-      this.$tab.openPage("SAP订单信息","/order/orderInfo" , {ORDER_CODE: row.ORDER_CODE});
+      this.$tab.openPage('生产计划', '/product/planInfo', { orderCode: row.ORDER_CODE })
+    },
+    /** 获取工位方法 */
+    getStationList() {
+      findProductLineList({ productLineType: 2, parentId: this.queryParams.productLineCode })
+        .then(response => {
+          this.findStationList = response.data
+        })
     },
 
     // 多选框选中数据