diff --git a/src/api/eam/eam.js b/src/api/eam/eam.js
index 23f604f..63592b0 100644
--- a/src/api/eam/eam.js
+++ b/src/api/eam/eam.js
@@ -154,3 +154,6 @@ export const deleteObjectItem= data => createAPI(`/pms/eam/deleteObjectItem`,'po
 export const searchObjectItemAvailable= data => createAPI(`/pms/eam/searchObjectItemAvailable`,'post',data)
 export const saveObjectItemAvailable= data => createAPI(`/pms/eam/saveObjectItemAvailable`,'post',data)
 export const deleteObjectItemAvailable= data => createAPI(`/pms/eam/deleteObjectItemAvailable`,'post',data)
+
+//---------------故障反馈-------------------
+export const eamFeedBackSearch= data => createAPI(`/pms/eam/eamFeedBackSearch`,'post',data)
diff --git a/src/views/modules/eam/eamFeedBack.vue b/src/views/modules/eam/eamFeedBack.vue
new file mode 100644
index 0000000..6b140e0
--- /dev/null
+++ b/src/views/modules/eam/eamFeedBack.vue
@@ -0,0 +1,518 @@
+<template>
+  <div class="mod-config">
+    <el-form :inline="true"  label-position="top" :model="searchData" @keyup.enter.native="getDataList()">
+      <el-form-item :label="'反馈单编码'">
+        <el-input v-model="searchData.feedBackID"  style="width: 120px"></el-input>
+      </el-form-item>
+      <el-form-item :label="'设备编码'">
+        <el-input v-model="searchData.objectID"  style="width: 120px"></el-input>
+      </el-form-item>
+      <el-form-item :label="'计划执行人员编码'">
+        <el-input v-model="searchData.planOperator"  style="width: 120px"></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-select>
+      </el-form-item>
+      <el-form-item :label="'反馈日期：'">
+        <el-date-picker
+          style="width: 120px"
+          v-model="searchData.startDate"
+          type="date"
+          value-format="yyyy-MM-dd"
+          placeholder="选择日期">
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item style="margin-top: 23px;">
+        <laber style="margin-left: -9px;font-size: 19px">&#10142</laber>
+      </el-form-item>
+      <el-form-item  :label="' '">
+        <el-date-picker
+          style="width: 120px"
+          v-model="searchData.endDate"
+          type="date"
+          value-format="yyyy-MM-dd"
+          placeholder="选择日期">
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item  :label="' '">
+        <el-button @click="getDataList()">查询</el-button>
+
+<!--        <el-button  type="primary" @click="addModal()">新增</el-button>-->
+      </el-form-item>
+    </el-form>
+    <el-table
+      :height="height"
+      :data="dataList"
+      border
+      v-loading="dataListLoading"
+      @selection-change="selectionChangeHandle"
+      style="width: 100%;">
+      <el-table-column
+        type="selection"
+        header-align="center"
+        align="center"
+        :selectable="selectFlag"
+        width="50">
+      </el-table-column>
+      <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==''?false:item.fixed"
+        :min-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-column
+        fixed="right"
+        header-align="center"
+        align="center"
+        width="100"
+        label="操作">
+        <template slot-scope="scope">
+          <a type="text" size="small" v-if="scope.row.status=='未开工'" @click="cancelOrder(scope.row)">取消工单</a>
+        </template>
+      </el-table-column>
+    </el-table>
+    <el-pagination
+      @size-change="sizeChangeHandle"
+      @current-change="currentChangeHandle"
+      :current-page="pageIndex"
+      :page-sizes="[20, 100, 500, 1000]"
+      :page-size="pageSize"
+      :total="totalPage"
+      layout="total, sizes, prev, pager, next, jumper">
+    </el-pagination>
+
+
+    <Chooselist ref="baseList"  @getBaseData="getBaseData"></Chooselist>
+
+  </div>
+</template>
+
+<script>
+  import {
+    eamFeedBackSearch,
+    cancelOrder,
+
+  } from "@/api/eam/eam.js"
+  import Chooselist from '@/views/modules/common/Chooselist_eam'
+  export default {
+    components: {
+      Chooselist
+    },
+    watch: {
+      searchData: {
+        deep: true,
+        handler: function (newV, oldV) {
+          this.searchData.groupID = this.searchData.groupID.toUpperCase()
+        }
+      },
+
+      modalData: {
+        deep: true,
+        handler: function (newV, oldV) {
+          this.modalData.groupID = this.modalData.groupID.toUpperCase()
+        }
+      }
+    },
+    data () {
+      return {
+        tagNo:'',
+        searchData: {
+          site: this.$store.state.user.site,
+          feedBackID: '',
+          objectID: '',
+          planOperator: '',
+          functionType: 'C',
+          status: '',
+          startDate:'',
+          endDate:'',
+          page: 1,
+          limit: 10,
+        },
+        height: 200,
+        pageIndex: 1,
+        pageSize: 100,
+        totalPage: 0,
+
+        dataList: [],
+        dataListLoading: false,
+        dataListSelections: [],
+        modalFlag:false,
+        modalDisableFlag:false,
+        modalData:{
+          flag:'',
+          site: this.$store.state.user.site,
+          groupID:'',
+          groupDesc:'',
+          active:'',
+        },
+        departmentList:[],
+        // 展示列集
+        columnList: [
+          {
+            userId: this.$store.state.user.name,
+            functionId: 101020,
+            serialNumber: '101020TableSite',
+            tableId: "101020Table",
+            tableName: "common",
+            columnProp: 'site',
+            headerAlign: "center",
+            align: "left",
+            columnLabel: '工厂编码',
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 80,
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 101020,
+            serialNumber: '101020TableFeedBackID',
+            tableId: "101020Table",
+            tableName: "common",
+            columnProp: 'feedBackID',
+            headerAlign: "center",
+            align: "left",
+            columnLabel: '反馈单号',
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 120,
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 101020,
+            serialNumber: '101020TableFeedBackDesc',
+            tableId: "101020Table",
+            tableName: "common",
+            columnProp: 'feedBackDesc',
+            headerAlign: "center",
+            align: "left",
+            columnLabel: '反馈描述',
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 180,
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 101020,
+            serialNumber: '101020TableDefectID',
+            tableId: "101020Table",
+            tableName: "common",
+            columnProp: 'defectID',
+            headerAlign: "center",
+            align: "left",
+            columnLabel: '故障代码',
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 100,
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 101020,
+            serialNumber: '101020TableDefectDesc',
+            tableId: "101020Table",
+            tableName: "common",
+            columnProp: 'defectDesc',
+            headerAlign: "center",
+            align: "left",
+            columnLabel: '故障原因',
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 120,
+          },
+
+          {
+            userId: this.$store.state.user.name,
+            functionId: 101020,
+            serialNumber: '101020TableObjectID',
+            tableId: "101020Table",
+            tableName: "common",
+            columnProp: 'objectID',
+            headerAlign: "center",
+            align: "left",
+            columnLabel: '设备编码',
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 80,
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 101020,
+            serialNumber: '101020TableObjectDesc',
+            tableId: "101020Table",
+            tableName: "common",
+            columnProp: 'objectDesc',
+            headerAlign: "center",
+            align: "left",
+            columnLabel: '设备名称',
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 80,
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 101020,
+            serialNumber: '101020TableStatus',
+            tableId: "101020Table",
+            tableName: "common",
+            columnProp: 'status',
+            headerAlign: "center",
+            align: "left",
+            columnLabel: '状态',
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 80,
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 101020,
+            serialNumber: '101020TablePlanOperatorName',
+            tableId: "101020Table",
+            tableName: "common",
+            columnProp: 'planOperatorName',
+            headerAlign: "center",
+            align: "left",
+            columnLabel: '计划机修人员',
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 100,
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 101020,
+            serialNumber: '101020TableActualOperatorName',
+            tableId: "101020Table",
+            tableName: "common",
+            columnProp: 'actualOperatorName',
+            headerAlign: "center",
+            align: "left",
+            columnLabel: '实际机修人员',
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 100,
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 101020,
+            serialNumber: '101020TableActualDefectDate',
+            tableId: "101020Table",
+            tableName: "common",
+            columnProp: 'defectDate',
+            headerAlign: "center",
+            align: "left",
+            columnLabel: '故障发现日期',
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 130,
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 101020,
+            serialNumber: '101020TableActualCreatedDate',
+            tableId: "101020Table",
+            tableName: "common",
+            columnProp: 'createdDate',
+            headerAlign: "center",
+            align: "left",
+            columnLabel: '反馈时间',
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 160,
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 101020,
+            serialNumber: '101020TableActualCreatedBy',
+            tableId: "101020Table",
+            tableName: "common",
+            columnProp: 'createdBy',
+            headerAlign: "center",
+            align: "left",
+            columnLabel: '反馈账号',
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 100,
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 101020,
+            serialNumber: '101020TableActualRemark',
+            tableId: "101020Table",
+            tableName: "common",
+            columnProp: 'remark',
+            headerAlign: "center",
+            align: "left",
+            columnLabel: '备注',
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 150,
+          },
+        ],
+
+      }
+    },
+    mounted () {
+      this.$nextTick(() => {
+        this.height = window.innerHeight - 210
+      })
+    },
+    created () {
+      this.getDataList()
+    },
+    methods: {
+      // 获取基础数据列表S
+      getBaseList (val,type) {
+        this.tagNo = val
+        this.$nextTick(() => {
+          let strVal = ''
+
+          if (val === 201) {
+            strVal = this.planOperator
+            this.$refs.baseList.init(val, strVal)
+          }
+        })
+      },
+      /* 列表方法的回调 */
+      getBaseData (val) {
+        if (this.tagNo === 201) {
+          this.planOperator = val.AdminID
+          this.planOperatorName = val.AdminName
+        }
+
+      },
+      // 获取数据列表
+      getDataList () {
+        this.searchData.limit = this.pageSize
+        this.searchData.page = this.pageIndex
+        eamFeedBackSearch(this.searchData).then(({data}) => {
+          if (data.code == 0) {
+            this.dataList = data.page.list
+            this.pageIndex = data.page.currPage
+            this.pageSize = data.page.pageSize
+            this.totalPage = data.page.totalCount
+          }
+          this.dataListLoading = false
+        })
+      },
+
+      // 每页数
+      sizeChangeHandle (val) {
+        this.pageSize = val
+        this.pageIndex = 1
+        this.getDataList()
+      },
+      // 当前页
+      currentChangeHandle (val) {
+        this.pageIndex = val
+        this.getDataList()
+      },
+      // 多选
+      selectionChangeHandle (val) {
+        this.dataListSelections = val
+      },
+      cancelOrder(row){
+        this.$confirm(`是否取消选定工单?`, '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+
+        }).then(() => {
+          cancelOrder(row).then(({data}) => {
+            if (data && data.code === 0) {
+              this.getDataList()
+              this.$message({
+                message: '操作成功',
+                type: 'success',
+                duration: 1500,
+                onClose: () => {
+                }
+              })
+            } else {
+              this.$alert(data.msg, '错误', {
+                confirmButtonText: '确定'
+              })
+            }
+          })
+        }).catch(() => {
+        })
+      },
+      selectFlag(row,index){
+        if(row.status!='未开工'){
+          return false;
+        }else {
+          return true;
+        }
+      },
+
+    }
+  }
+</script>
diff --git a/src/views/modules/eam/eamWorkOrderForMaintenance.vue b/src/views/modules/eam/eamWorkOrderForMaintenance.vue
index 8690f77..670a97b 100644
--- a/src/views/modules/eam/eamWorkOrderForMaintenance.vue
+++ b/src/views/modules/eam/eamWorkOrderForMaintenance.vue
@@ -86,6 +86,7 @@
         label="操作">
         <template slot-scope="scope">
           <a type="text" size="small" v-if="scope.row.status=='未开工'" @click="cancelOrder(scope.row)">取消工单</a>
+          <a type="text" size="small" v-if="scope.row.status=='已完工'" @click="reportModal(scope.row)">维保项目</a>
         </template>
       </el-table-column>
     </el-table>
@@ -99,6 +100,66 @@
       layout="total, sizes, prev, pager, next, jumper">
     </el-pagination>
 
+    <el-dialog title="执行结果" :close-on-click-modal="false" v-drag :visible.sync="detailModelFlag" width="830px">
+      <el-form :inline="true"  label-position="top"  >
+        <el-form-item :label="'工厂编码'">
+          <el-input v-model="saveData.site"  disabled style="width: 120px"></el-input>
+        </el-form-item>
+        <el-form-item :label="'工单号'">
+          <el-input v-model="saveData.orderNo"  disabled style="width: 120px"></el-input>
+        </el-form-item>
+        <el-form-item :label="'计划执行人员'">
+          <el-input v-model="saveData.planOperatorName"  disabled style="width: 120px"></el-input>
+        </el-form-item>
+      </el-form>
+      <el-form :inline="true"  label-position="top" >
+        <el-form-item :label="'工作时间'">
+          <el-input v-model="saveData.workTime" type="number" disabled style="width: 120px"></el-input>
+        </el-form-item>
+        <el-form-item :label="'执行结果备注'">
+          <el-input v-model="saveData.remark" disabled  style="width: 600px"></el-input>
+        </el-form-item>
+      </el-form>
+      <div class="rq ">
+        <el-table
+          :height="200"
+          :data="detailList"
+          border
+          v-loading="dataListLoading"
+          style="width: 100%;">
+          <el-table-column
+            v-for="(item,index) in columnDetailList" :key="index"
+            :sortable="item.columnSortable"
+            :prop="item.columnProp"
+            :header-align="item.headerAlign"
+            :show-overflow-tooltip="item.showOverflowTooltip"
+            :align="item.align"
+            :fixed="item.fixed==''?false:item.fixed"
+            :min-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-column
+            prop=""
+            header-align="center"
+            align="left"
+            min-width="80"
+            label="是否完成">
+            <template slot-scope="scope">
+              {{scope.row.finishFlag=='Y'?"是":"否"}}
+            </template>
+          </el-table-column>
+        </el-table>
+      </div>
+      <el-footer style="height:40px;margin-top: 20px;text-align:center">
+        <el-button type="primary" @click="detailModelFlag = false">关闭</el-button>
+      </el-footer>
+    </el-dialog>
+
     <el-dialog title="批量修改计划人员" :close-on-click-modal="false" v-drag :visible.sync="changeModelFlag" width="300px">
       <el-form :inline="true"  label-position="top"  >
         <el-form-item style="margin-left: 10px" >
@@ -125,6 +186,7 @@
     eamWorkOrderSearch,
     cancelOrder,
     changeOrderOperator,
+    eamWorkOrderReportSearch,
   } from "@/api/eam/eam.js"
   import Chooselist from '@/views/modules/common/Chooselist_eam'
   export default {
@@ -438,6 +500,145 @@
         changeModelFlag:false,
         planOperator:'',
         planOperatorName:'',
+        //执行结果
+        detailList:[],
+        detailModelFlag:false,
+        saveData:{
+          site:'',
+          orderNo:'',
+          planOperatorName:'',
+          workTime:'',
+          remark:'',
+        },
+        columnDetailList: [
+          {
+            userId: this.$store.state.user.name,
+            functionId: 101020,
+            serialNumber: '101020Table2EamPropertiesItemID',
+            tableId: "101020Table2",
+            tableName: "维保项目表",
+            columnProp: 'itemNo',
+            headerAlign: "center",
+            align: "left",
+            columnLabel: '维保项目编码',
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 90,
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 101020,
+            serialNumber: '101020Table2EamPropertiesItemDesc',
+            tableId: "101020Table2",
+            tableName: "维保项目表",
+            columnProp: 'itemDesc',
+            headerAlign: "center",
+            align: "left",
+            columnLabel: '维保项目名称',
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 90,
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 101020,
+            serialNumber: '101020Table2EamPropertiesItemRemark',
+            tableId: "101020Table2",
+            tableName: "维保项目表",
+            columnProp: 'itemRemark',
+            headerAlign: "center",
+            align: "left",
+            columnLabel: '维保方法说明',
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 120,
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 101020,
+            serialNumber: '101020Table2ValueType',
+            tableId: "101020Table2",
+            tableName: "维保项目表",
+            columnProp: 'valueType',
+            headerAlign: "center",
+            align: "left",
+            columnLabel: '检测值类型',
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 70,
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 101020,
+            serialNumber: '101020Table2DefaultValue',
+            tableId: "101020Table2",
+            tableName: "维保项目表",
+            columnProp: 'defaultValue',
+            headerAlign: "center",
+            align: "left",
+            columnLabel: '参照值',
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 70,
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 101020,
+            serialNumber: '101020Table2MaxValue',
+            tableId: "101020Table2",
+            tableName: "维保项目表",
+            columnProp: 'maxValue',
+            headerAlign: "center",
+            align: "left",
+            columnLabel: '最大值',
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 70,
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 101020,
+            serialNumber: '101020Table2MinValue',
+            tableId: "101020Table2",
+            tableName: "维保项目表",
+            columnProp: 'minValue',
+            headerAlign: "center",
+            align: "left",
+            columnLabel: '最小值',
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 70,
+          },
+        ],
+
       }
     },
     mounted () {
@@ -566,7 +767,28 @@
           }
         })
       },
+      reportModal(row){
+        let indata={
+          site:row.site,
+          itemNo:row.itemNo,
+          planID:row.planID,
+          orderNo:row.orderNo,
+          itemType:row.functionType,
+        }
+        eamWorkOrderReportSearch(indata).then(({data}) => {
+          this.detailList=data.rows
+        })
 
+        this.saveData={
+          site:row.site,
+          orderNo:row.orderNo,
+          planID:row.planID,
+          planOperatorName:row.planOperatorName,
+          workTime:row.workTime,
+          remark:row.remark,
+        },
+          this.detailModelFlag=true;
+      },
 
     }
   }
diff --git a/src/views/modules/eam/eamWorkPlanForCheck.vue b/src/views/modules/eam/eamWorkPlanForCheck.vue
index fb66bbc..8ae8213 100644
--- a/src/views/modules/eam/eamWorkPlanForCheck.vue
+++ b/src/views/modules/eam/eamWorkPlanForCheck.vue
@@ -84,7 +84,7 @@
         <template slot-scope="scope">
           <a type="text" size="small" v-if="scope.row.status=='已计划'" @click="createOrder(scope.row)">下达</a>
           <a type="text" size="small" v-if="scope.row.status=='进行中'" @click="planOrder(scope.row)">计划</a>
-          <a type="text" size="small" v-if="scope.row.status!='已结束'||scope.row.status!='已取消'" @click="cancelPlan(scope.row)">取消</a>
+          <a type="text" size="small" v-if="scope.row.status!='已结束'&&scope.row.status!='已取消'" @click="cancelPlan(scope.row)">取消</a>
           <a type="text" size="small" v-if="scope.row.status=='已计划'" @click="updateModal(scope.row)">修改</a>
           <a type="text" size="small" v-if="scope.row.status!='进行中'" @click="deletePlan(scope.row)">删除</a>
           <a type="text" size="small" @click="itemModal(scope.row)">点检项目</a>
@@ -140,7 +140,7 @@
             v-model="modalData.planEndDate"
             type="date"
             value-format="yyyy-MM-dd"
-            placeholder="可选">
+            placeholder="必选">
           </el-date-picker>
         </el-form-item>
       </el-form>
diff --git a/src/views/modules/eam/eamWorkPlanForMaintenance.vue b/src/views/modules/eam/eamWorkPlanForMaintenance.vue
index 93a85e9..38c6f03 100644
--- a/src/views/modules/eam/eamWorkPlanForMaintenance.vue
+++ b/src/views/modules/eam/eamWorkPlanForMaintenance.vue
@@ -140,7 +140,7 @@
           v-model="modalData.planEndDate"
           type="date"
           value-format="yyyy-MM-dd"
-          placeholder="可选">
+          placeholder="必选">
         </el-date-picker>
       </el-form-item>
     </el-form>
diff --git a/src/views/modules/reportWorkOrder/reportCheckOrder.vue b/src/views/modules/reportWorkOrder/reportCheckOrder.vue
index 2b46918..10b0af7 100644
--- a/src/views/modules/reportWorkOrder/reportCheckOrder.vue
+++ b/src/views/modules/reportWorkOrder/reportCheckOrder.vue
@@ -619,7 +619,7 @@
         },
         this.detailModelFlag=true;
       },
-      saveCheckReport(){
+      async saveCheckReport(){
         if(this.saveData.workTime==''||this.saveData.workTime==null){
           this.$alert('请输入工作时间！', '错误', {
             confirmButtonText: '确定'
@@ -642,21 +642,35 @@
 
           if(this.detailList[i].valueTypeDb=='N'&&this.detailList[i].numberValue!=''&&this.detailList[i].numberValue!=null){
             if(this.detailList[i].minValue!=""&&this.detailList[i].minValue!=null&&this.detailList[i].minValue>this.detailList[i].numberValue){
-              this.$alert(this.detailList[i].itemDesc+'实测值小于最小值！', '错误', {
-                confirmButtonText: '确定'
+              await  this.$confirm(this.detailList[i].itemDesc+'实测值小于最小值！是否继续', '提示', {
+                confirmButtonText: '确定',
+                cancelButtonText: '取消',
+                type: 'warning'
+              }).then(() => {
+
+              }).then(() =>{
+                return false
               })
-              return false
             }
             if(this.detailList[i].minValue!=""&&this.detailList[i].minValue!=null&&this.detailList[i].maxValue<this.detailList[i].numberValue){
-              this.$alert(this.detailList[i].itemDesc+'实测值大于最大值！', '错误', {
-                confirmButtonText: '确定'
+              // this.$alert(this.detailList[i].itemDesc+'实测值大于最大值！', '错误', {
+              //   confirmButtonText: '确定'
+              // })
+              // return false
+              await this.$confirm(this.detailList[i].itemDesc+'实测值大于最大值！是否继续', '提示', {
+                confirmButtonText: '确定',
+                cancelButtonText: '取消',
+                type: 'warning'
+              }).then(() => {
+
+              }).then(() =>{
+                return false
               })
-              return false
             }
           }
         }
         this.saveData.itemList=JSON.parse(JSON.stringify(this.detailList))
-        saveCheckOrderReport(this.saveData).then(({data}) => {
+        await saveCheckOrderReport(this.saveData).then(({data}) => {
           if (data && data.code == '0') {
             this.getDataList()
             this.detailModelFlag=false
diff --git a/src/views/modules/reportWorkOrder/reportMaintenanceOrder.vue b/src/views/modules/reportWorkOrder/reportMaintenanceOrder.vue
index 5a64984..180969f 100644
--- a/src/views/modules/reportWorkOrder/reportMaintenanceOrder.vue
+++ b/src/views/modules/reportWorkOrder/reportMaintenanceOrder.vue
@@ -104,32 +104,13 @@
                                                style="width: 100px; height: 80px"/></span>
           </template>
         </el-table-column>
-<!--        <el-table-column-->
-<!--          prop=""-->
-<!--          header-align="center"-->
-<!--          align="right"-->
-<!--          min-width="80"-->
-<!--          label="实测值">-->
-<!--          <template slot-scope="scope">-->
-<!--            <el-input v-if="scope.row.valueTypeDb=='T'&&scope.row.valueChooseFlag=='N'" v-model="scope.row.textValue"  style="height: 11px;padding: 0px " filterable-->
-<!--                      allow-create>;width:98%"></el-input>-->
-<!--            <el-input v-if="scope.row.valueTypeDb=='N'&&scope.row.valueChooseFlag=='N'" v-model="scope.row.numberValue" type="number" style="height: 11px;padding: 0px " filterable-->
-<!--                      allow-create>;width:98%"></el-input>-->
-<!--            <el-select v-if="scope.row.valueTypeDb=='T'&&scope.row.valueChooseFlag=='Y'" v-model="scope.row.textValue" placeholder="请选择" style="height: 11px;padding: 0px " filterable-->
-<!--                       allow-create>-->
-<!--              <el-option v-for="item in scope.row.availableList " :key="index" :label="item.availableValue"-->
-<!--                         :value="item.availableValue">-->
-<!--              </el-option>-->
-<!--            </el-select>-->
-
-<!--            <el-select v-if="scope.row.valueTypeDb=='N'&&scope.row.valueChooseFlag=='Y'" v-model="scope.row.numberValue" placeholder="请选择" style="height: 11px;padding: 0px " filterable-->
-<!--                       allow-create>-->
-<!--              <el-option v-for="item in scope.row.availableList " :key="index" :label="item.availableValue"-->
-<!--                         :value="item.availableValue">-->
-<!--              </el-option>-->
-<!--            </el-select>-->
-<!--          </template>-->
-<!--        </el-table-column>-->
+        <el-table-column
+          type="selection"
+          header-align="center"
+          prop="checked"
+          align="center"
+          width="50">
+        </el-table-column>
       </el-table>
       </div>
       <el-footer style="height:40px;margin-top: 20px;text-align:center">
@@ -655,7 +636,8 @@
         //     }
         //   }
         // }
-        // this.saveData.itemList=JSON.parse(JSON.stringify(this.detailList))
+        this.saveData.itemList=JSON.parse(JSON.stringify(this.detailList))
+
         saveCheckOrderReport(this.saveData).then(({data}) => {
           if (data && data.code == '0') {
             this.getDataList()