diff --git a/src/pages/maintain/execution/all.vue b/src/pages/maintain/execution/all.vue
index 8ad4d5a..9f1cbe5 100644
--- a/src/pages/maintain/execution/all.vue
+++ b/src/pages/maintain/execution/all.vue
@@ -1,448 +1,448 @@
-<template>
-  <!-- 保养执行列表页 -->
-  <div class="knowledge-box">
-    <div class="sys-operate">
-      <el-button type="primary" v-has="'upkeep:execution:add'" @click="add()">新增</el-button>
-      <el-button type="primary" v-has="'upkeep:execution:remove'" @click="remove()"
-        :disabled="btnDelDisabled">删除</el-button>
-      <!-- <el-button type="primary" @click="execution()" :disabled="btnOtherDisabled">保养执行</el-button>
-      <el-button type="primary" @click="complete()" :disabled="btnOtherDisabled">验收评价</el-button>
-      <el-button type="primary" @click="dialogRebutVisible = true" :disabled="btnDelDisabled">关闭任务</el-button>-->
-    </div>
-    <div class="sys-search">
-      <el-form inline class="form_item_search_out">
-        <div class="form_item_input_out">
-          <el-form-item label="设备名称" style="width:22%" class="form_item-inline">
-            <el-input v-model="search_data.deviceName" placeholder="请填写设备名称"></el-input>
-          </el-form-item>
-          <el-form-item label="计划时间" style="width:34%" class="form_item-inline">
-            <el-date-picker v-model="planTime" type="daterange" clearable range-separator="-" start-placeholder="开始日期"
-              end-placeholder="结束日期"></el-date-picker>
-          </el-form-item>
-          <el-form-item label="保养状态" style="width:22%" class="form_item-inline">
-            <el-select v-model="search_data.resultId" clearable placeholder="请选择">
-              <el-option v-for="item in statusList" :key="item.id" :label="item.name" :value="item.id"></el-option>
-            </el-select>
-          </el-form-item>
-          <el-form-item label="负责人" style="width:22%" class="form_item-inline">
-            <!-- <el-select v-model="search_data.engineer_id" filterable clearable placeholder="请选择">
-            <el-option
-              v-for="item in getUserList"
-              :key="item.id"
-              :label="item.name"
-              :value="item.id"
-            ></el-option>
-          </el-select> -->
-            <btn-input :valueText.sync="search_data.engineer_name" :valueId.sync="search_data.engineer_id"
-              :chooseVisible.sync="chooseUserVisible"></btn-input>
-          </el-form-item>
-        </div>
-        <div class="form_item_btn_out">
-          <el-form-item>
-            <el-button type="primary" @click="search()">查询</el-button>
-          </el-form-item>
-        </div>
-      </el-form>
-    </div>
-    <div class="sys-table">
-      <el-table border @sort-change="sortChange" v-loading="pictLoading" @row-click="clickRow" ref="tb"
-        :summary-method="getSummaries" show-summary :data="tableData" @selection-change="handleSelectionChange"
-        :header-cell-style="{
-          fontWeight: 'normal',
-          textAlign: 'center',
-          backgroundColor: '#eceff4',
-          color: '#222'
-        }">
-        <el-table-column type="selection" width="55" align="center"></el-table-column>
-        <el-table-column prop="work_orderNo" width="160" align="center" label="保养单号" show-overflow-tooltip>
-          <template slot-scope="scope">
-            <el-link type="primary" @click="viewDetail(scope.row)">{{
-              scope.row.work_orderNo
-            }}</el-link>
-          </template>
-        </el-table-column>
-        <el-table-column prop="planName" align="center" label="保养名称" show-overflow-tooltip></el-table-column>
-        <el-table-column prop="device_serialno" align="center" label="设备编号" show-overflow-tooltip></el-table-column>
-        <el-table-column prop="deviceName" label="设备名称" show-overflow-tooltip></el-table-column>
-        <el-table-column prop="deviceModelas" align="center" label="规格型号" width="50"
-          show-overflow-tooltip></el-table-column>
-        <el-table-column prop="dept_name" align="center" label="保养部门" show-overflow-tooltip></el-table-column>
-        <el-table-column prop="username" align="center" label="保养负责人" show-overflow-tooltip></el-table-column>
-        <el-table-column sortable="custom" prop="start_time" align="center" label="计划开始时间" width="124"
-          show-overflow-tooltip></el-table-column>
-        <el-table-column sortable="custom" prop="end_time" align="center" label="计划结束时间" width="124"
-          show-overflow-tooltip></el-table-column>
-        <el-table-column prop="man_hour" align="center" label="保养工时（小时）" width="60"
-          show-overflow-tooltip></el-table-column>
-        <el-table-column prop="manhourCost" align="center" label="保养工时费（元）" width="60"
-          show-overflow-tooltip></el-table-column>
-        <el-table-column prop="cost" align="center" label="保养材料费（元）" width="60" show-overflow-tooltip></el-table-column>
-        <el-table-column prop="totalCost" align="center" label="保养费（元）" width="60"
-          show-overflow-tooltip></el-table-column>
-        <el-table-column prop="result_name" align="center" label="保养状态" show-overflow-tooltip></el-table-column>
-        <el-table-column sortable="custom" prop="recordResultId" align="center" label="验收结果" width="124">
-          <template slot-scope="scope">
-            <span>{{ scope.row.record_result }}</span>
-          </template>
-        </el-table-column>
-      </el-table>
-    </div>
-    <div class="sys-pagination">
-      <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange"
-        :current-page="search_data.pageno" :page-sizes="pageSizes" :page-size="search_data.pagesize"
-        layout="total, sizes, prev, pager, next, jumper" :total="total"></el-pagination>
-    </div>
-
-    <el-dialog center title="关闭任务" :visible.sync="dialogRebutVisible" width="500px">
-      <el-form label-width="60px">
-        <el-form-item label="原因">
-          <el-input type="textarea" :autosize="{ minRows: 4 }" placeholder="请输入关闭原因" v-model="reason"></el-input>
-        </el-form-item>
-      </el-form>
-      <span slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="dialogRebutVisible = false">{{
-          config.cancelText
-        }}</el-button>
-        <el-button type="primary" @click="close()">确定</el-button>
-      </span>
-    </el-dialog>
-
-    <!-- 选择负责人-->
-    <dialogChooseSingleUser :visible.sync="chooseUserVisible" @change="getUser"></dialogChooseSingleUser>
-  </div>
-</template>
-
-<script>
-import { formatDateTime } from "@/utils/tools.js";
-import btnInput from "@/components/btnInput.vue";
-import dialogChooseSingleUser from "@/components/System/dialogChooseSingleUser";
-import config from "@/utils/config.js";
-export default {
-  name: "upkeep_execution_all",
-  components: {
-    btnInput,
-    dialogChooseSingleUser
-  },
-  data() {
-    return {
-      total: 0, //总条数
-      pageSizes: [10, 20, 50], //每页展示多少条
-      search_data: {
-        pageno: 1,
-        pagesize: 10
-      },
-
-      planTime: "",
-
-      statusList: [], //计划状态
-      getUserList: [], //用户
-
-      btnDelDisabled: true,
-      btnOtherDisabled: true,
-      chooseUserVisible: false,
-      rowIds: [],
-      tableData: [],
-      dialogVisible: false,
-      pictLoading: false,
-      totalCost: 0,
-      totalManHour: 0,
-      totalUpkeepCost: 0,
-      totalManhourCost: 0,
-      dialogRebutVisible: false,
-      reason: "",
-      config: config
-    };
-  },
-  created() {
-    var _this = this;
-    document.onkeydown = e => {
-      if (e.key === "Enter") {
-        _this.search();
-      }
-    };
-  },
-  mounted() {
-    this.getList();
-    this.initData();
-  },
-  methods: {
-    /**
-     * 获取选择的负责人
-     */
-    getUser(val) {
-      if (val) {
-        this.$set(this.search_data, "engineer_name", val.name);
-        this.$set(this.search_data, "engineer_id", val.id);
-      } else {
-        this.$set(this.search_data, "engineer_name", "");
-        this.$set(this.search_data, "engineer_id", "");
-      }
-    },
-    sortChange({ column, prop, order }) {
-      let j = { column, prop, order };
-      let order_ = j.order == "ascending" ? "asc" : "desc";
-      this.$set(this.search_data, "sort", j.prop);
-      this.$set(this.search_data, "order", order_);
-      this.getList();
-    },
-    clickRow(row) {
-      this.$refs.tb.toggleRowSelection(row);
-    },
-    initData() {
-      Promise.all([
-        this.$api.commonAPI.getUsers(),
-        this.$api.dictAPI.getDictsByType("task_status")
-      ])
-        .then(([r1, r2]) => {
-          if (r1.code === 0) {
-            this.getUserList = r1.datas;
-          }
-          if (r2.code === 0) {
-            this.statusList = r2.datas;
-            this.statusList.push({
-              id: 999,
-              name: "超时未处理"
-            });
-          }
-        })
-        .catch(error => {
-          console.log(error);
-        });
-    },
-    /**
-     * 获取列表
-     */
-    getList() {
-      if (this.planTime) {
-        this.search_data.start_time = formatDateTime(this.planTime[0]);
-        this.search_data.end_time = formatDateTime(this.planTime[1]);
-      } else {
-        this.search_data.start_time = "";
-        this.search_data.end_time = "";
-      }
-      this.pictLoading = true;
-      this.$api.upkeepPlanAPI
-        .addValidRecords(this.search_data)
-        .then(res => {
-          this.pictLoading = false;
-          if (res.data) {
-            this.total = res.data.totalRows;
-            this.tableData = res.data.datas ? res.data.datas : [];
-            this.totalCost = res.data.totalCost;
-            this.totalManHour = res.data.totalManHour;
-            this.totalManhourCost = res.data.totalManhourCost;
-          } else {
-            this.total = 0;
-            this.tableData = [];
-          }
-        })
-        .catch(r => {
-          console.log(r);
-        });
-    },
-    /**
-     * 计算合计
-     */
-    getSummaries(param) {
-      const { columns, data } = param;
-      const sums = [];
-      sums[1] = "总计";
-      sums[10] = this.totalManHour;
-      sums[11] = this.totalManhourCost;
-      sums[12] = this.totalCost;
-      sums[13] = this.totalUpkeepCost;
-      return sums;
-    },
-    /**
-     * 查询
-     */
-    search() {
-      this.search_data.pageno = 1;
-      this.getList();
-    },
-    // 上下分页
-    handleCurrentChange(val) {
-      this.search_data.pageno = val;
-      this.getList();
-    },
-    // 每页显示多少条
-    handleSizeChange(val) {
-      this.search_data.pagesize = val;
-      this.getList();
-    },
-    /**
-     * 新增
-     */
-    add() {
-      this.$router.push({
-        path: "/upkeep/execution_add",
-        query: {
-          t: Date.now()
-        }
-      });
-    },
-    /**
-     * 关闭任务
-     */
-    close() {
-      let ids = [];
-      this.rowIds.forEach(item => {
-        ids.push(item.id);
-      });
-      // const ids = this.rowIds.map(item => item.id).toString();
-      let params = { recordIds: ids, closureReason: this.reason };
-      this.$confirm("确认关闭选中的保养单吗?", "提示", {
-        type: "warning"
-      }).then(() => {
-        this.$api.upkeepPlanAPI
-          .closeRecordOfPase(params)
-          .then(res => {
-            if (res.code === 0) {
-              this.$message({
-                message: res.msg,
-                type: "success"
-              });
-              this.getList();
-              this.dialogRebutVisible = false;
-            } else {
-              this.$message({
-                message: res.msg ? res.msg : "关闭巡检任务失败，请重试",
-                type: "error"
-              });
-            }
-          })
-          .catch(error => {
-            this.$message({
-              message: "关闭巡检任务失败，请重试",
-              type: "error"
-            });
-          });
-      });
-    },
-    /**
-     * 保养执行
-     */
-    execution() {
-      let item = this.rowIds[0];
-      if (item.result === 58) {
-        this.$alert("保养已完成验收，无法再次执行该保养！", "提示", {
-          type: "warning"
-        });
-        return;
-      }
-      let id = item.plan_id;
-      this.$router.push({
-        path: "/upkeep/execution_handle",
-        query: { planid: item.plan_id, id: item.id, t: Date.now() }
-      });
-    },
-    /**
-     * 查看明细
-     */
-    viewDetail(r) {
-      if (r.result === 146) {
-        this.$router.push({
-          path: "/upkeep/execution_add",
-          query: { id: r.id, t: Date.now() }
-        });
-      } else {
-        this.$router.push({
-          path: "/upkeep/execution_detail",
-          query: { id: r.id, t: Date.now() }
-        });
-      }
-    },
-    /**
-     *查看明细
-     */
-    openDetails(r) {
-      this.$router.push({
-        path: "/upkeep/detail",
-        query: { id: r.id, t: Date.now() }
-      });
-    },
-
-    /**
-     * 完成验收
-     */
-    complete() {
-      let item = this.rowIds[0];
-      if (item.result === 58) {
-        this.$alert("保养已完成验收，无法再次验收该保养！", "提示", {
-          type: "warning"
-        });
-        return;
-      }
-      let id = item.id;
-      this.$router.push({
-        path: "/upkeep/execution_check",
-        query: { id: id, t: Date.now() }
-      });
-    },
-    /**
-     * 删除
-     */
-    remove() {
-      let ids = [];
-      this.rowIds.forEach(item => {
-        ids.push(item.id);
-      });
-      // const ids = this.rowIds.map(item => item.id).toString();
-      let params = { recordId: ids };
-      this.$confirm("确认删除选中的保养记录吗?", "提示", {
-        type: "warning"
-      }).then(() => {
-        this.$api.upkeepPlanAPI
-          .deletLargeRecord(params)
-          .then(res => {
-            if (res.code === 0) {
-              this.$message({
-                message: res.msg,
-                type: "success"
-              });
-              this.getList();
-            } else {
-              this.$message({
-                message: res.msg ? res.msg : "删除失败，请重试",
-                type: "error"
-              });
-            }
-          })
-          .catch(error => {
-            this.$message({
-              message: "删除失败，请重试",
-              type: "error"
-            });
-          });
-      });
-    },
-    /**
-     * 处理选中
-     */
-    handleSelectionChange(val) {
-      this.rowIds = val;
-      this.setBtn(val);
-    },
-    /**
-     * 控件操作按钮状态
-     */
-    setBtn(val) {
-      let isFlag = true;
-      let isDelFlag = true;
-      if (val.length > 0) {
-        isDelFlag = false;
-        if (val.length == 1) {
-          isFlag = false;
-        }
-      } else {
-        isFlag = true;
-        isDelFlag = true;
-      }
-      this.btnDelDisabled = isDelFlag;
-      this.btnOtherDisabled = isFlag;
-    }
-  }
-};
-</script>
-
-<style scoped></style>
+<template>
+  <!-- 保养执行列表页 -->
+  <div class="knowledge-box">
+    <div class="sys-operate">
+      <el-button type="primary" v-has="'upkeep:execution:add'" @click="add()">新增</el-button>
+      <el-button type="primary" v-has="'upkeep:execution:remove'" @click="remove()"
+        :disabled="btnDelDisabled">删除</el-button>
+      <!-- <el-button type="primary" @click="execution()" :disabled="btnOtherDisabled">保养执行</el-button>
+      <el-button type="primary" @click="complete()" :disabled="btnOtherDisabled">验收评价</el-button>
+      <el-button type="primary" @click="dialogRebutVisible = true" :disabled="btnDelDisabled">关闭任务</el-button>-->
+    </div>
+    <div class="sys-search">
+      <el-form inline class="form_item_search_out">
+        <div class="form_item_input_out">
+          <el-form-item label="设备名称" style="width:22%" class="form_item-inline">
+            <el-input v-model="search_data.deviceName" placeholder="请填写设备名称"></el-input>
+          </el-form-item>
+          <el-form-item label="计划时间" style="width:34%" class="form_item-inline">
+            <el-date-picker v-model="planTime" type="daterange" clearable range-separator="-" start-placeholder="开始日期"
+              end-placeholder="结束日期"></el-date-picker>
+          </el-form-item>
+          <el-form-item label="保养状态" style="width:22%" class="form_item-inline">
+            <el-select v-model="search_data.resultId" clearable placeholder="请选择">
+              <el-option v-for="item in statusList" :key="item.id" :label="item.name" :value="item.id"></el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item label="负责人" style="width:22%" class="form_item-inline">
+            <!-- <el-select v-model="search_data.engineer_id" filterable clearable placeholder="请选择">
+            <el-option
+              v-for="item in getUserList"
+              :key="item.id"
+              :label="item.name"
+              :value="item.id"
+            ></el-option>
+          </el-select> -->
+            <btn-input :valueText.sync="search_data.engineer_name" :valueId.sync="search_data.engineer_id"
+              :chooseVisible.sync="chooseUserVisible"></btn-input>
+          </el-form-item>
+        </div>
+        <div class="form_item_btn_out">
+          <el-form-item>
+            <el-button type="primary" @click="search()">查询</el-button>
+          </el-form-item>
+        </div>
+      </el-form>
+    </div>
+    <div class="sys-table">
+      <el-table border @sort-change="sortChange" v-loading="pictLoading" @row-click="clickRow" ref="tb"
+        :summary-method="getSummaries" show-summary :data="tableData" @selection-change="handleSelectionChange"
+        :header-cell-style="{
+          fontWeight: 'normal',
+          textAlign: 'center',
+          backgroundColor: '#eceff4',
+          color: '#222'
+        }">
+        <el-table-column type="selection" width="55" align="center"></el-table-column>
+        <el-table-column prop="work_orderNo" width="160" align="center" label="保养单号" show-overflow-tooltip>
+          <template slot-scope="scope">
+            <el-link type="primary" @click="viewDetail(scope.row)">{{
+              scope.row.work_orderNo
+            }}</el-link>
+          </template>
+        </el-table-column>
+        <el-table-column prop="planName" align="center" label="保养名称" show-overflow-tooltip></el-table-column>
+        <el-table-column prop="device_serialno" align="center" label="设备编号" show-overflow-tooltip></el-table-column>
+        <el-table-column prop="deviceName" label="设备名称" show-overflow-tooltip></el-table-column>
+        <el-table-column prop="deviceModelas" align="center" label="规格型号" width="50"
+          show-overflow-tooltip></el-table-column>
+        <el-table-column prop="dept_name" align="center" label="保养部门" show-overflow-tooltip></el-table-column>
+        <el-table-column prop="username" align="center" label="保养负责人" show-overflow-tooltip></el-table-column>
+        <el-table-column sortable="custom" prop="start_time" align="center" label="计划开始时间" width="124"
+          show-overflow-tooltip></el-table-column>
+        <el-table-column sortable="custom" prop="end_time" align="center" label="计划结束时间" width="124"
+          show-overflow-tooltip></el-table-column>
+        <!-- <el-table-column prop="man_hour" align="center" label="保养工时（小时）" width="60"
+          show-overflow-tooltip></el-table-column>
+        <el-table-column prop="manhourCost" align="center" label="保养工时费（元）" width="60"
+          show-overflow-tooltip></el-table-column>
+        <el-table-column prop="cost" align="center" label="保养材料费（元）" width="60" show-overflow-tooltip></el-table-column>
+        <el-table-column prop="totalCost" align="center" label="保养费（元）" width="60"
+          show-overflow-tooltip></el-table-column> -->
+        <el-table-column prop="result_name" align="center" label="保养状态" show-overflow-tooltip></el-table-column>
+        <el-table-column sortable="custom" prop="recordResultId" align="center" label="验收结果" width="124">
+          <template slot-scope="scope">
+            <span>{{ scope.row.record_result }}</span>
+          </template>
+        </el-table-column>
+      </el-table>
+    </div>
+    <div class="sys-pagination">
+      <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange"
+        :current-page="search_data.pageno" :page-sizes="pageSizes" :page-size="search_data.pagesize"
+        layout="total, sizes, prev, pager, next, jumper" :total="total"></el-pagination>
+    </div>
+
+    <el-dialog center title="关闭任务" :visible.sync="dialogRebutVisible" width="500px">
+      <el-form label-width="60px">
+        <el-form-item label="原因">
+          <el-input type="textarea" :autosize="{ minRows: 4 }" placeholder="请输入关闭原因" v-model="reason"></el-input>
+        </el-form-item>
+      </el-form>
+      <span slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="dialogRebutVisible = false">{{
+          config.cancelText
+        }}</el-button>
+        <el-button type="primary" @click="close()">确定</el-button>
+      </span>
+    </el-dialog>
+
+    <!-- 选择负责人-->
+    <dialogChooseSingleUser :visible.sync="chooseUserVisible" @change="getUser"></dialogChooseSingleUser>
+  </div>
+</template>
+
+<script>
+import { formatDateTime } from "@/utils/tools.js";
+import btnInput from "@/components/btnInput.vue";
+import dialogChooseSingleUser from "@/components/System/dialogChooseSingleUser";
+import config from "@/utils/config.js";
+export default {
+  name: "upkeep_execution_all",
+  components: {
+    btnInput,
+    dialogChooseSingleUser
+  },
+  data() {
+    return {
+      total: 0, //总条数
+      pageSizes: [10, 20, 50], //每页展示多少条
+      search_data: {
+        pageno: 1,
+        pagesize: 10
+      },
+
+      planTime: "",
+
+      statusList: [], //计划状态
+      getUserList: [], //用户
+
+      btnDelDisabled: true,
+      btnOtherDisabled: true,
+      chooseUserVisible: false,
+      rowIds: [],
+      tableData: [],
+      dialogVisible: false,
+      pictLoading: false,
+      totalCost: 0,
+      totalManHour: 0,
+      totalUpkeepCost: 0,
+      totalManhourCost: 0,
+      dialogRebutVisible: false,
+      reason: "",
+      config: config
+    };
+  },
+  created() {
+    var _this = this;
+    document.onkeydown = e => {
+      if (e.key === "Enter") {
+        _this.search();
+      }
+    };
+  },
+  mounted() {
+    this.getList();
+    this.initData();
+  },
+  methods: {
+    /**
+     * 获取选择的负责人
+     */
+    getUser(val) {
+      if (val) {
+        this.$set(this.search_data, "engineer_name", val.name);
+        this.$set(this.search_data, "engineer_id", val.id);
+      } else {
+        this.$set(this.search_data, "engineer_name", "");
+        this.$set(this.search_data, "engineer_id", "");
+      }
+    },
+    sortChange({ column, prop, order }) {
+      let j = { column, prop, order };
+      let order_ = j.order == "ascending" ? "asc" : "desc";
+      this.$set(this.search_data, "sort", j.prop);
+      this.$set(this.search_data, "order", order_);
+      this.getList();
+    },
+    clickRow(row) {
+      this.$refs.tb.toggleRowSelection(row);
+    },
+    initData() {
+      Promise.all([
+        this.$api.commonAPI.getUsers(),
+        this.$api.dictAPI.getDictsByType("task_status")
+      ])
+        .then(([r1, r2]) => {
+          if (r1.code === 0) {
+            this.getUserList = r1.datas;
+          }
+          if (r2.code === 0) {
+            this.statusList = r2.datas;
+            this.statusList.push({
+              id: 999,
+              name: "超时未处理"
+            });
+          }
+        })
+        .catch(error => {
+          console.log(error);
+        });
+    },
+    /**
+     * 获取列表
+     */
+    getList() {
+      if (this.planTime) {
+        this.search_data.start_time = formatDateTime(this.planTime[0]);
+        this.search_data.end_time = formatDateTime(this.planTime[1]);
+      } else {
+        this.search_data.start_time = "";
+        this.search_data.end_time = "";
+      }
+      this.pictLoading = true;
+      this.$api.upkeepPlanAPI
+        .addValidRecords(this.search_data)
+        .then(res => {
+          this.pictLoading = false;
+          if (res.data) {
+            this.total = res.data.totalRows;
+            this.tableData = res.data.datas ? res.data.datas : [];
+            this.totalCost = res.data.totalCost;
+            this.totalManHour = res.data.totalManHour;
+            this.totalManhourCost = res.data.totalManhourCost;
+          } else {
+            this.total = 0;
+            this.tableData = [];
+          }
+        })
+        .catch(r => {
+          console.log(r);
+        });
+    },
+    /**
+     * 计算合计
+     */
+    getSummaries(param) {
+      const { columns, data } = param;
+      const sums = [];
+      sums[1] = "总计";
+      sums[10] = this.totalManHour;
+      sums[11] = this.totalManhourCost;
+      sums[12] = this.totalCost;
+      sums[13] = this.totalUpkeepCost;
+      return sums;
+    },
+    /**
+     * 查询
+     */
+    search() {
+      this.search_data.pageno = 1;
+      this.getList();
+    },
+    // 上下分页
+    handleCurrentChange(val) {
+      this.search_data.pageno = val;
+      this.getList();
+    },
+    // 每页显示多少条
+    handleSizeChange(val) {
+      this.search_data.pagesize = val;
+      this.getList();
+    },
+    /**
+     * 新增
+     */
+    add() {
+      this.$router.push({
+        path: "/upkeep/execution_add",
+        query: {
+          t: Date.now()
+        }
+      });
+    },
+    /**
+     * 关闭任务
+     */
+    close() {
+      let ids = [];
+      this.rowIds.forEach(item => {
+        ids.push(item.id);
+      });
+      // const ids = this.rowIds.map(item => item.id).toString();
+      let params = { recordIds: ids, closureReason: this.reason };
+      this.$confirm("确认关闭选中的保养单吗?", "提示", {
+        type: "warning"
+      }).then(() => {
+        this.$api.upkeepPlanAPI
+          .closeRecordOfPase(params)
+          .then(res => {
+            if (res.code === 0) {
+              this.$message({
+                message: res.msg,
+                type: "success"
+              });
+              this.getList();
+              this.dialogRebutVisible = false;
+            } else {
+              this.$message({
+                message: res.msg ? res.msg : "关闭巡检任务失败，请重试",
+                type: "error"
+              });
+            }
+          })
+          .catch(error => {
+            this.$message({
+              message: "关闭巡检任务失败，请重试",
+              type: "error"
+            });
+          });
+      });
+    },
+    /**
+     * 保养执行
+     */
+    execution() {
+      let item = this.rowIds[0];
+      if (item.result === 58) {
+        this.$alert("保养已完成验收，无法再次执行该保养！", "提示", {
+          type: "warning"
+        });
+        return;
+      }
+      let id = item.plan_id;
+      this.$router.push({
+        path: "/upkeep/execution_handle",
+        query: { planid: item.plan_id, id: item.id, t: Date.now() }
+      });
+    },
+    /**
+     * 查看明细
+     */
+    viewDetail(r) {
+      if (r.result === 146) {
+        this.$router.push({
+          path: "/upkeep/execution_add",
+          query: { id: r.id, t: Date.now() }
+        });
+      } else {
+        this.$router.push({
+          path: "/upkeep/execution_detail",
+          query: { id: r.id, t: Date.now() }
+        });
+      }
+    },
+    /**
+     *查看明细
+     */
+    openDetails(r) {
+      this.$router.push({
+        path: "/upkeep/detail",
+        query: { id: r.id, t: Date.now() }
+      });
+    },
+
+    /**
+     * 完成验收
+     */
+    complete() {
+      let item = this.rowIds[0];
+      if (item.result === 58) {
+        this.$alert("保养已完成验收，无法再次验收该保养！", "提示", {
+          type: "warning"
+        });
+        return;
+      }
+      let id = item.id;
+      this.$router.push({
+        path: "/upkeep/execution_check",
+        query: { id: id, t: Date.now() }
+      });
+    },
+    /**
+     * 删除
+     */
+    remove() {
+      let ids = [];
+      this.rowIds.forEach(item => {
+        ids.push(item.id);
+      });
+      // const ids = this.rowIds.map(item => item.id).toString();
+      let params = { recordId: ids };
+      this.$confirm("确认删除选中的保养记录吗?", "提示", {
+        type: "warning"
+      }).then(() => {
+        this.$api.upkeepPlanAPI
+          .deletLargeRecord(params)
+          .then(res => {
+            if (res.code === 0) {
+              this.$message({
+                message: res.msg,
+                type: "success"
+              });
+              this.getList();
+            } else {
+              this.$message({
+                message: res.msg ? res.msg : "删除失败，请重试",
+                type: "error"
+              });
+            }
+          })
+          .catch(error => {
+            this.$message({
+              message: "删除失败，请重试",
+              type: "error"
+            });
+          });
+      });
+    },
+    /**
+     * 处理选中
+     */
+    handleSelectionChange(val) {
+      this.rowIds = val;
+      this.setBtn(val);
+    },
+    /**
+     * 控件操作按钮状态
+     */
+    setBtn(val) {
+      let isFlag = true;
+      let isDelFlag = true;
+      if (val.length > 0) {
+        isDelFlag = false;
+        if (val.length == 1) {
+          isFlag = false;
+        }
+      } else {
+        isFlag = true;
+        isDelFlag = true;
+      }
+      this.btnDelDisabled = isDelFlag;
+      this.btnOtherDisabled = isFlag;
+    }
+  }
+};
+</script>
+
+<style scoped></style>
diff --git a/src/pages/maintain/execution/unaccept.vue b/src/pages/maintain/execution/unaccept.vue
index e48ca4d..87efe36 100644
--- a/src/pages/maintain/execution/unaccept.vue
+++ b/src/pages/maintain/execution/unaccept.vue
@@ -1,363 +1,363 @@
-<template>
-  <!-- 保养执行列表页 -->
-  <div class="knowledge-box">
-    <div class="sys-operate">
-      <!-- <el-button type="primary" @click="add()">增加</el-button>
-      <el-button type="primary" @click="remove()" :disabled="btnDelDisabled">删除</el-button>
-      <el-button type="primary" @click="execution()" :disabled="btnOtherDisabled">保养执行</el-button> -->
-      <el-button type="primary" v-has="'upkeep:execution:complete'" @click="complete()"
-        :disabled="btnOtherDisabled">验收评价</el-button>
-    </div>
-    <div class="sys-search">
-      <el-form inline class="form_item_search_out">
-        <div class="form_item_input_out">
-          <el-form-item label="设备名称" class="form_item-inline" style="width:33%">
-            <el-input v-model="search_data.deviceName" placeholder="请填写设备名称"></el-input>
-          </el-form-item>
-          <el-form-item label="计划时间" class="form_item-inline" style="width:34%">
-            <el-date-picker v-model="planTime" type="daterange" clearable range-separator="-" start-placeholder="开始日期"
-              end-placeholder="结束日期"></el-date-picker>
-          </el-form-item>
-          <!-- <el-form-item label="保养状态">
-          <el-select v-model="search_data.resultId" clearable placeholder="请选择">
-            <el-option
-              v-for="item in statusList"
-              :key="item.id"
-              :label="item.name"
-              :value="item.id"
-            ></el-option>
-          </el-select>
-        </el-form-item> -->
-          <!-- <el-form-item label="负责人">
-          <el-select v-model="search_data.engineer_id" filterable clearable placeholder="请选择">
-            <el-option
-              v-for="item in getUserList"
-             :key="item.id"
-              :label="item.name"
-              :value="item.id"
-            ></el-option>
-          </el-select>
-        </el-form-item> -->
-        </div>
-        <div class="form_item_btn_out">
-          <el-form-item>
-            <el-button type="primary" @click="search()">查询</el-button>
-          </el-form-item>
-        </div>
-      </el-form>
-    </div>
-    <div class="sys-table">
-      <el-table border @sort-change="sortChange" v-loading="pictLoading" @row-click="clickRow" ref="tb"
-        :summary-method="getSummaries" show-summary :data="tableData" @selection-change="handleSelectionChange"
-        :header-cell-style="{
-          fontWeight: 'normal',
-          textAlign: 'center',
-          backgroundColor: '#eceff4',
-          color: '#222'
-        }">
-        <el-table-column type="selection" width="55" align="center"></el-table-column>
-        <el-table-column prop="work_orderNo" width="160" align="center" label="保养单号" show-overflow-tooltip>
-          <template slot-scope="scope">
-            <el-link type="primary" @click="viewDetail(scope.row)">{{
-              scope.row.work_orderNo
-            }}</el-link>
-          </template>
-        </el-table-column>
-        <el-table-column prop="planName" align="center" label="保养名称" show-overflow-tooltip></el-table-column>
-        <el-table-column prop="device_serialno" align="center" label="设备编号" show-overflow-tooltip></el-table-column>
-        <el-table-column prop="deviceName" label="设备名称" show-overflow-tooltip></el-table-column>
-        <el-table-column prop="deviceModelas" align="center" width="50" label="规格型号"
-          show-overflow-tooltip></el-table-column>
-        <el-table-column prop="dept_name" align="center" label="保养部门" show-overflow-tooltip></el-table-column>
-        <el-table-column prop="username" align="center" label="保养负责人" show-overflow-tooltip></el-table-column>
-        <el-table-column sortable="custom" prop="start_time" align="center" label="计划开始时间" width="124"
-          show-overflow-tooltip></el-table-column>
-        <el-table-column sortable="custom" prop="end_time" align="center" label="计划结束时间" width="124"
-          show-overflow-tooltip></el-table-column>
-        <el-table-column prop="man_hour" align="center" label="保养工时（小时）" width="60"
-          show-overflow-tooltip></el-table-column>
-        <el-table-column prop="manhourCost" align="center" label="保养工时费（元）" width="60"
-          show-overflow-tooltip></el-table-column>
-        <el-table-column prop="cost" align="center" label="保养材料费（元）" width="60" show-overflow-tooltip></el-table-column>
-        <el-table-column prop="totalCost" align="center" label="保养费（元）" width="60"
-          show-overflow-tooltip></el-table-column>
-        <el-table-column prop="result_name" align="center" label="保养状态" show-overflow-tooltip></el-table-column>
-        <el-table-column sortable="custom" prop="recordResultId" align="center" label="验收结果" width="124">
-          <template slot-scope="scope">
-            <span>{{ scope.row.record_result }}</span>
-          </template>
-        </el-table-column>
-      </el-table>
-    </div>
-    <div class="sys-pagination">
-      <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange"
-        :current-page="search_data.pageno" :page-sizes="pageSizes" :page-size="search_data.pagesize"
-        layout="total, sizes, prev, pager, next, jumper" :total="total"></el-pagination>
-    </div>
-  </div>
-</template>
-
-<script>
-import { formatDateTime } from "@/utils/tools.js";
-export default {
-  name: "upkeep_execution_unaccept",
-  data() {
-    return {
-      total: 0, //总条数
-      pageSizes: [10, 20, 50], //每页展示多少条
-      search_data: {
-        pageno: 1,
-        pagesize: 10,
-        singleStatus: 57
-      },
-
-      planTime: "",
-
-      statusList: [], //计划状态
-      getUserList: [], //用户
-
-      btnDelDisabled: true,
-      btnOtherDisabled: true,
-      rowIds: [],
-      tableData: [],
-      dialogVisible: false,
-      pictLoading: false,
-      totalCost: 0,
-      totalManHour: 0,
-      totalUpkeepCost: 0,
-      totalManhourCost: 0
-    };
-  },
-  created() {
-    var _this = this;
-    document.onkeydown = e => {
-      if (e.key === "Enter") {
-        _this.search();
-      }
-    };
-  },
-  mounted() {
-    this.getList();
-    this.initData();
-  },
-  methods: {
-    sortChange({ column, prop, order }) {
-      let j = { column, prop, order };
-      let order_ = j.order == "ascending" ? "asc" : "desc";
-      this.$set(this.search_data, "sort", j.prop);
-      this.$set(this.search_data, "order", order_);
-      this.getList();
-    },
-    clickRow(row) {
-      this.$refs.tb.toggleRowSelection(row);
-    },
-    initData() {
-      Promise.all([
-        this.$api.commonAPI.getUsers(),
-        this.$api.dictAPI.getDictsByType("task_status")
-      ])
-        .then(([r1, r2]) => {
-          if (r1.code === 0) {
-            this.getUserList = r1.datas;
-          }
-          if (r2.code === 0) {
-            this.statusList = r2.datas;
-          }
-        })
-        .catch(error => {
-          console.log(error);
-        });
-    },
-    /**
-     * 获取列表
-     */
-    getList() {
-      if (this.planTime) {
-        this.search_data.start_time = formatDateTime(this.planTime[0]);
-        this.search_data.end_time = formatDateTime(this.planTime[1]);
-      } else {
-        this.search_data.start_time = "";
-        this.search_data.end_time = "";
-      }
-      this.pictLoading = true;
-      this.$api.upkeepPlanAPI
-        .addValidRecords(this.search_data)
-        .then(res => {
-          this.pictLoading = false;
-          if (res.data) {
-            this.total = res.data.totalRows;
-            this.tableData = res.data.datas ? res.data.datas : [];
-            this.totalCost = res.data.totalCost;
-            this.totalManHour = res.data.totalManHour;
-            this.totalManhourCost = res.data.totalManhourCost;
-          } else {
-            this.total = 0;
-            this.tableData = [];
-          }
-        })
-        .catch(r => {
-          console.log(r);
-        });
-    },
-    /**
-     * 计算合计
-     */
-    getSummaries(param) {
-      const { columns, data } = param;
-      const sums = [];
-      sums[1] = "总计";
-      sums[10] = this.totalManHour;
-      sums[11] = this.totalManhourCost;
-      sums[12] = this.totalCost;
-      sums[13] = this.totalUpkeepCost;
-      return sums;
-    },
-    /**
-     * 查询
-     */
-    search() {
-      this.search_data.pageno = 1;
-      this.getList();
-    },
-    // 上下分页
-    handleCurrentChange(val) {
-      this.search_data.pageno = val;
-      this.getList();
-    },
-    // 每页显示多少条
-    handleSizeChange(val) {
-      this.search_data.pagesize = val;
-      this.getList();
-    },
-    /**
-     * 新增
-     */
-    add() {
-      this.$router.push({
-        path: "/upkeep/execution_add",
-        query: {
-          t: Date.now()
-        }
-      });
-    },
-    /**
-     * 保养执行
-     */
-    execution() {
-      let item = this.rowIds[0];
-      if (item.result === 58) {
-        this.$alert("保养已完成验收，您无法再次执行该保养！", "提示", {
-          type: "warning"
-        });
-        return;
-      }
-      let id = item.plan_id;
-      this.$router.push({
-        path: "/upkeep/execution_add",
-        query: { planid: item.plan_id, id: item.id, t: Date.now() }
-      });
-    },
-    /**
-     * 查看明细
-     */
-    viewDetail(r) {
-      this.$router.push({
-        path: "/upkeep/execution_detail",
-        query: { id: r.id, t: Date.now() }
-      });
-    },
-    /**
-     *查看明细
-     */
-    openDetails(r) {
-      this.$router.push({
-        path: "/upkeep/detail",
-        query: { id: r.id, t: Date.now() }
-      });
-    },
-
-    /**
-     * 完成验收
-     */
-    complete() {
-      let item = this.rowIds[0];
-      if (item.result === 58) {
-        this.$alert("保养已完成验收，您无法再次验收该保养！", "提示", {
-          type: "warning"
-        });
-        return;
-      }
-      let id = item.id;
-      this.$router.push({
-        path: "/upkeep/execution_check",
-        query: { id: id, t: Date.now() }
-      });
-    },
-    /**
-     * 删除
-     */
-    remove() {
-      let ids = [];
-      this.rowIds.forEach(item => {
-        ids.push(item.id);
-      });
-      // const ids = this.rowIds.map(item => item.id).toString();
-      let params = { ids: ids };
-      this.$confirm("确认删除选中的保养记录吗?", "提示", {
-        type: "warning"
-      }).then(() => {
-        this.$api.upkeepPlanAPI
-          .batchRemove(params)
-          .then(res => {
-            console.log(res);
-            if (res.code === 0) {
-              this.$message({
-                message: res.msg,
-                type: "success"
-              });
-              this.getList();
-            } else {
-              this.$message({
-                message: res.msg ? res.msg : "删除失败，请重试",
-                type: "error"
-              });
-            }
-          })
-          .catch(error => {
-            this.$message({
-              message: "删除失败，请重试",
-              type: "error"
-            });
-          });
-      });
-    },
-    /**
-     * 处理选中
-     */
-    handleSelectionChange(val) {
-      this.rowIds = val;
-      this.setBtn(val);
-    },
-    /**
-     * 控件操作按钮状态
-     */
-    setBtn(val) {
-      let isFlag = true;
-      let isDelFlag = true;
-      if (val.length > 0) {
-        isDelFlag = false;
-        if (val.length == 1) {
-          isFlag = false;
-        }
-      } else {
-        isFlag = true;
-        isDelFlag = true;
-      }
-      this.btnDelDisabled = isDelFlag;
-      this.btnOtherDisabled = isFlag;
-    }
-  }
-};
-</script>
-
-<style scoped></style>
+<template>
+  <!-- 保养执行列表页 -->
+  <div class="knowledge-box">
+    <div class="sys-operate">
+      <!-- <el-button type="primary" @click="add()">增加</el-button>
+      <el-button type="primary" @click="remove()" :disabled="btnDelDisabled">删除</el-button>
+      <el-button type="primary" @click="execution()" :disabled="btnOtherDisabled">保养执行</el-button> -->
+      <el-button type="primary" v-has="'upkeep:execution:complete'" @click="complete()"
+        :disabled="btnOtherDisabled">验收评价</el-button>
+    </div>
+    <div class="sys-search">
+      <el-form inline class="form_item_search_out">
+        <div class="form_item_input_out">
+          <el-form-item label="设备名称" class="form_item-inline" style="width:33%">
+            <el-input v-model="search_data.deviceName" placeholder="请填写设备名称"></el-input>
+          </el-form-item>
+          <el-form-item label="计划时间" class="form_item-inline" style="width:34%">
+            <el-date-picker v-model="planTime" type="daterange" clearable range-separator="-" start-placeholder="开始日期"
+              end-placeholder="结束日期"></el-date-picker>
+          </el-form-item>
+          <!-- <el-form-item label="保养状态">
+          <el-select v-model="search_data.resultId" clearable placeholder="请选择">
+            <el-option
+              v-for="item in statusList"
+              :key="item.id"
+              :label="item.name"
+              :value="item.id"
+            ></el-option>
+          </el-select>
+        </el-form-item> -->
+          <!-- <el-form-item label="负责人">
+          <el-select v-model="search_data.engineer_id" filterable clearable placeholder="请选择">
+            <el-option
+              v-for="item in getUserList"
+             :key="item.id"
+              :label="item.name"
+              :value="item.id"
+            ></el-option>
+          </el-select>
+        </el-form-item> -->
+        </div>
+        <div class="form_item_btn_out">
+          <el-form-item>
+            <el-button type="primary" @click="search()">查询</el-button>
+          </el-form-item>
+        </div>
+      </el-form>
+    </div>
+    <div class="sys-table">
+      <el-table border @sort-change="sortChange" v-loading="pictLoading" @row-click="clickRow" ref="tb"
+        :summary-method="getSummaries" show-summary :data="tableData" @selection-change="handleSelectionChange"
+        :header-cell-style="{
+          fontWeight: 'normal',
+          textAlign: 'center',
+          backgroundColor: '#eceff4',
+          color: '#222'
+        }">
+        <el-table-column type="selection" width="55" align="center"></el-table-column>
+        <el-table-column prop="work_orderNo" width="160" align="center" label="保养单号" show-overflow-tooltip>
+          <template slot-scope="scope">
+            <el-link type="primary" @click="viewDetail(scope.row)">{{
+              scope.row.work_orderNo
+            }}</el-link>
+          </template>
+        </el-table-column>
+        <el-table-column prop="planName" align="center" label="保养名称" show-overflow-tooltip></el-table-column>
+        <el-table-column prop="device_serialno" align="center" label="设备编号" show-overflow-tooltip></el-table-column>
+        <el-table-column prop="deviceName" label="设备名称" show-overflow-tooltip></el-table-column>
+        <el-table-column prop="deviceModelas" align="center" width="50" label="规格型号"
+          show-overflow-tooltip></el-table-column>
+        <el-table-column prop="dept_name" align="center" label="保养部门" show-overflow-tooltip></el-table-column>
+        <el-table-column prop="username" align="center" label="保养负责人" show-overflow-tooltip></el-table-column>
+        <el-table-column sortable="custom" prop="start_time" align="center" label="计划开始时间" width="124"
+          show-overflow-tooltip></el-table-column>
+        <el-table-column sortable="custom" prop="end_time" align="center" label="计划结束时间" width="124"
+          show-overflow-tooltip></el-table-column>
+        <!-- <el-table-column prop="man_hour" align="center" label="保养工时（小时）" width="60"
+          show-overflow-tooltip></el-table-column>
+        <el-table-column prop="manhourCost" align="center" label="保养工时费（元）" width="60"
+          show-overflow-tooltip></el-table-column>
+        <el-table-column prop="cost" align="center" label="保养材料费（元）" width="60" show-overflow-tooltip></el-table-column>
+        <el-table-column prop="totalCost" align="center" label="保养费（元）" width="60"
+          show-overflow-tooltip></el-table-column> -->
+        <el-table-column prop="result_name" align="center" label="保养状态" show-overflow-tooltip></el-table-column>
+        <el-table-column sortable="custom" prop="recordResultId" align="center" label="验收结果" width="124">
+          <template slot-scope="scope">
+            <span>{{ scope.row.record_result }}</span>
+          </template>
+        </el-table-column>
+      </el-table>
+    </div>
+    <div class="sys-pagination">
+      <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange"
+        :current-page="search_data.pageno" :page-sizes="pageSizes" :page-size="search_data.pagesize"
+        layout="total, sizes, prev, pager, next, jumper" :total="total"></el-pagination>
+    </div>
+  </div>
+</template>
+
+<script>
+import { formatDateTime } from "@/utils/tools.js";
+export default {
+  name: "upkeep_execution_unaccept",
+  data() {
+    return {
+      total: 0, //总条数
+      pageSizes: [10, 20, 50], //每页展示多少条
+      search_data: {
+        pageno: 1,
+        pagesize: 10,
+        singleStatus: 57
+      },
+
+      planTime: "",
+
+      statusList: [], //计划状态
+      getUserList: [], //用户
+
+      btnDelDisabled: true,
+      btnOtherDisabled: true,
+      rowIds: [],
+      tableData: [],
+      dialogVisible: false,
+      pictLoading: false,
+      totalCost: 0,
+      totalManHour: 0,
+      totalUpkeepCost: 0,
+      totalManhourCost: 0
+    };
+  },
+  created() {
+    var _this = this;
+    document.onkeydown = e => {
+      if (e.key === "Enter") {
+        _this.search();
+      }
+    };
+  },
+  mounted() {
+    this.getList();
+    this.initData();
+  },
+  methods: {
+    sortChange({ column, prop, order }) {
+      let j = { column, prop, order };
+      let order_ = j.order == "ascending" ? "asc" : "desc";
+      this.$set(this.search_data, "sort", j.prop);
+      this.$set(this.search_data, "order", order_);
+      this.getList();
+    },
+    clickRow(row) {
+      this.$refs.tb.toggleRowSelection(row);
+    },
+    initData() {
+      Promise.all([
+        this.$api.commonAPI.getUsers(),
+        this.$api.dictAPI.getDictsByType("task_status")
+      ])
+        .then(([r1, r2]) => {
+          if (r1.code === 0) {
+            this.getUserList = r1.datas;
+          }
+          if (r2.code === 0) {
+            this.statusList = r2.datas;
+          }
+        })
+        .catch(error => {
+          console.log(error);
+        });
+    },
+    /**
+     * 获取列表
+     */
+    getList() {
+      if (this.planTime) {
+        this.search_data.start_time = formatDateTime(this.planTime[0]);
+        this.search_data.end_time = formatDateTime(this.planTime[1]);
+      } else {
+        this.search_data.start_time = "";
+        this.search_data.end_time = "";
+      }
+      this.pictLoading = true;
+      this.$api.upkeepPlanAPI
+        .addValidRecords(this.search_data)
+        .then(res => {
+          this.pictLoading = false;
+          if (res.data) {
+            this.total = res.data.totalRows;
+            this.tableData = res.data.datas ? res.data.datas : [];
+            this.totalCost = res.data.totalCost;
+            this.totalManHour = res.data.totalManHour;
+            this.totalManhourCost = res.data.totalManhourCost;
+          } else {
+            this.total = 0;
+            this.tableData = [];
+          }
+        })
+        .catch(r => {
+          console.log(r);
+        });
+    },
+    /**
+     * 计算合计
+     */
+    getSummaries(param) {
+      const { columns, data } = param;
+      const sums = [];
+      sums[1] = "总计";
+      sums[10] = this.totalManHour;
+      sums[11] = this.totalManhourCost;
+      sums[12] = this.totalCost;
+      sums[13] = this.totalUpkeepCost;
+      return sums;
+    },
+    /**
+     * 查询
+     */
+    search() {
+      this.search_data.pageno = 1;
+      this.getList();
+    },
+    // 上下分页
+    handleCurrentChange(val) {
+      this.search_data.pageno = val;
+      this.getList();
+    },
+    // 每页显示多少条
+    handleSizeChange(val) {
+      this.search_data.pagesize = val;
+      this.getList();
+    },
+    /**
+     * 新增
+     */
+    add() {
+      this.$router.push({
+        path: "/upkeep/execution_add",
+        query: {
+          t: Date.now()
+        }
+      });
+    },
+    /**
+     * 保养执行
+     */
+    execution() {
+      let item = this.rowIds[0];
+      if (item.result === 58) {
+        this.$alert("保养已完成验收，您无法再次执行该保养！", "提示", {
+          type: "warning"
+        });
+        return;
+      }
+      let id = item.plan_id;
+      this.$router.push({
+        path: "/upkeep/execution_add",
+        query: { planid: item.plan_id, id: item.id, t: Date.now() }
+      });
+    },
+    /**
+     * 查看明细
+     */
+    viewDetail(r) {
+      this.$router.push({
+        path: "/upkeep/execution_detail",
+        query: { id: r.id, t: Date.now() }
+      });
+    },
+    /**
+     *查看明细
+     */
+    openDetails(r) {
+      this.$router.push({
+        path: "/upkeep/detail",
+        query: { id: r.id, t: Date.now() }
+      });
+    },
+
+    /**
+     * 完成验收
+     */
+    complete() {
+      let item = this.rowIds[0];
+      if (item.result === 58) {
+        this.$alert("保养已完成验收，您无法再次验收该保养！", "提示", {
+          type: "warning"
+        });
+        return;
+      }
+      let id = item.id;
+      this.$router.push({
+        path: "/upkeep/execution_check",
+        query: { id: id, t: Date.now() }
+      });
+    },
+    /**
+     * 删除
+     */
+    remove() {
+      let ids = [];
+      this.rowIds.forEach(item => {
+        ids.push(item.id);
+      });
+      // const ids = this.rowIds.map(item => item.id).toString();
+      let params = { ids: ids };
+      this.$confirm("确认删除选中的保养记录吗?", "提示", {
+        type: "warning"
+      }).then(() => {
+        this.$api.upkeepPlanAPI
+          .batchRemove(params)
+          .then(res => {
+            console.log(res);
+            if (res.code === 0) {
+              this.$message({
+                message: res.msg,
+                type: "success"
+              });
+              this.getList();
+            } else {
+              this.$message({
+                message: res.msg ? res.msg : "删除失败，请重试",
+                type: "error"
+              });
+            }
+          })
+          .catch(error => {
+            this.$message({
+              message: "删除失败，请重试",
+              type: "error"
+            });
+          });
+      });
+    },
+    /**
+     * 处理选中
+     */
+    handleSelectionChange(val) {
+      this.rowIds = val;
+      this.setBtn(val);
+    },
+    /**
+     * 控件操作按钮状态
+     */
+    setBtn(val) {
+      let isFlag = true;
+      let isDelFlag = true;
+      if (val.length > 0) {
+        isDelFlag = false;
+        if (val.length == 1) {
+          isFlag = false;
+        }
+      } else {
+        isFlag = true;
+        isDelFlag = true;
+      }
+      this.btnDelDisabled = isDelFlag;
+      this.btnOtherDisabled = isFlag;
+    }
+  }
+};
+</script>
+
+<style scoped></style>
diff --git a/src/pages/maintain/execution/unhandle.vue b/src/pages/maintain/execution/unhandle.vue
index b0a5f9c..cbbd474 100644
--- a/src/pages/maintain/execution/unhandle.vue
+++ b/src/pages/maintain/execution/unhandle.vue
@@ -1,413 +1,413 @@
-<template>
-  <!-- 保养执行列表页 -->
-  <div class="knowledge-box">
-    <div class="sys-operate">
-      <!-- <el-button type="primary" @click="add()">增加</el-button>
-      <el-button type="primary" @click="remove()" :disabled="btnDelDisabled">删除</el-button>-->
-      <el-button type="primary" v-has="'upkeep:execution:execution'" @click="execution()"
-        :disabled="btnOtherDisabled">保养执行</el-button>
-      <el-button type="primary" v-has="'upkeep:execution:close'" @click="dialogRebutVisible = true"
-        :disabled="btnDelDisabled">关闭任务</el-button>
-      <!-- <el-button type="primary" @click="complete()" :disabled="btnOtherDisabled">验收评价</el-button> -->
-    </div>
-    <div class="sys-search">
-      <el-form inline class="form_item_search_out">
-        <div class="form_item_input_out">
-          <el-form-item label="设备名称" class="form_item-inline" style="width:33%">
-            <el-input v-model="search_data.deviceName" placeholder="请填写设备名称"></el-input>
-          </el-form-item>
-          <el-form-item label="计划时间" class="form_item-inline" style="width:34%">
-            <el-date-picker v-model="planTime" type="daterange" clearable range-separator="-" start-placeholder="开始日期"
-              end-placeholder="结束日期"></el-date-picker>
-          </el-form-item>
-          <!-- <el-form-item label="保养状态">
-          <el-select v-model="search_data.resultId" clearable placeholder="请选择">
-            <el-option
-              v-for="item in statusList"
-              :key="item.id"
-              :label="item.name"
-              :value="item.id"
-            ></el-option>
-          </el-select>
-        </el-form-item> -->
-          <!-- <el-form-item label="负责人">
-          <el-select v-model="search_data.engineer_id" filterable clearable placeholder="请选择">
-            <el-option
-              v-for="item in getUserList"
-              :key="item.id"
-              :label="item.name"
-              :value="item.id"
-            ></el-option>
-          </el-select>
-        </el-form-item> -->
-        </div>
-        <div class="form_item_btn_out">
-          <el-form-item>
-            <el-button type="primary" @click="search()">查询</el-button>
-          </el-form-item>
-        </div>
-      </el-form>
-    </div>
-    <div class="sys-table">
-      <el-table border fit @sort-change="sortChange" :default-sort="{ prop: 'end_time', order: 'ascending' }"
-        v-loading="pictLoading" @row-click="clickRow" ref="tb" :summary-method="getSummaries" show-summary
-        :data="tableData" @selection-change="handleSelectionChange" :header-cell-style="{
-          fontWeight: 'normal',
-          textAlign: 'center',
-          backgroundColor: '#eceff4',
-          color: '#222'
-        }">
-        <el-table-column type="selection" width="55" align="center"></el-table-column>
-        <el-table-column prop="work_orderNo" width="160" align="center" label="保养单号" show-overflow-tooltip>
-          <template slot-scope="scope">
-            <el-link type="primary" @click="viewDetail(scope.row)">{{
-              scope.row.work_orderNo
-            }}</el-link>
-          </template>
-        </el-table-column>
-        <el-table-column prop="planName" align="center" label="保养名称" show-overflow-tooltip></el-table-column>
-        <el-table-column prop="device_serialno" align="center" label="设备编号" show-overflow-tooltip></el-table-column>
-        <el-table-column prop="deviceName" label="设备名称" show-overflow-tooltip></el-table-column>
-        <el-table-column prop="deviceModelas" align="center" width="50" label="规格型号"
-          show-overflow-tooltip></el-table-column>
-        <el-table-column prop="dept_name" align="center" label="保养部门" show-overflow-tooltip></el-table-column>
-        <el-table-column prop="username" align="center" label="保养负责人" show-overflow-tooltip></el-table-column>
-        <el-table-column sortable="custom" prop="start_time" align="center" label="计划开始时间" width="124"
-          show-overflow-tooltip></el-table-column>
-        <el-table-column sortable="custom" prop="end_time" align="center" label="计划结束时间" width="124"
-          show-overflow-tooltip></el-table-column>
-        <el-table-column prop="man_hour" align="center" label="保养工时（小时）" width="60"
-          show-overflow-tooltip></el-table-column>
-        <el-table-column prop="manhourCost" align="center" label="保养工时费（元）" width="60"
-          show-overflow-tooltip></el-table-column>
-        <el-table-column prop="cost" align="center" label="保养材料费（元）" width="60" show-overflow-tooltip></el-table-column>
-        <el-table-column prop="totalCost" align="center" label="保养费（元）" width="60"
-          show-overflow-tooltip></el-table-column>
-        <el-table-column prop="result_name" align="center" label="保养状态" show-overflow-tooltip></el-table-column>
-        <el-table-column sortable="custom" prop="recordResultId" align="center" label="验收结果" width="124">
-          <template slot-scope="scope">
-            <span>{{ scope.row.record_result }}</span>
-          </template>
-        </el-table-column>
-      </el-table>
-    </div>
-    <div class="sys-pagination">
-      <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange"
-        :current-page="search_data.pageno" :page-sizes="pageSizes" :page-size="search_data.pagesize"
-        layout="total, sizes, prev, pager, next, jumper" :total="total"></el-pagination>
-    </div>
-
-    <el-dialog title="关闭任务" :visible.sync="dialogRebutVisible" width="500px">
-      <el-form label-width="60px">
-        <el-form-item label="原因">
-          <el-input type="textarea" :autosize="{ minRows: 4 }" placeholder="请输入关闭原因" v-model="reason"></el-input>
-        </el-form-item>
-      </el-form>
-      <span slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="dialogRebutVisible = false">{{
-          config.cancelText
-        }}</el-button>
-        <el-button type="primary" @click="close()">确定</el-button>
-      </span>
-    </el-dialog>
-  </div>
-</template>
-
-<script>
-import { formatDateTime } from "@/utils/tools.js";
-import config from "@/utils/config.js";
-export default {
-  name: "upkeep_execution_unhandle",
-  data() {
-    return {
-      total: 0, //总条数
-      pageSizes: [10, 20, 50], //每页展示多少条
-      search_data: {
-        pageno: 1,
-        pagesize: 10,
-        singleStatus: 56,
-        sort: "end_time",
-        order: "asc"
-      },
-
-      planTime: "",
-
-      statusList: [], //计划状态
-      getUserList: [], //用户
-
-      btnDelDisabled: true,
-      btnOtherDisabled: true,
-      rowIds: [],
-      tableData: [],
-      dialogVisible: false,
-      pictLoading: false,
-      totalCost: 0,
-      totalManHour: 0,
-      totalUpkeepCost: 0,
-      totalManhourCost: 0,
-      dialogRebutVisible: false,
-      reason: "",
-      config: config
-    };
-  },
-  created() {
-    var _this = this;
-    document.onkeydown = e => {
-      if (e.key === "Enter") {
-        _this.search();
-      }
-    };
-  },
-  mounted() {
-    this.getList();
-    this.initData();
-  },
-  methods: {
-    sortChange({ column, prop, order }) {
-      let j = { column, prop, order };
-      let order_ = j.order == "ascending" ? "asc" : "desc";
-      this.$set(this.search_data, "sort", j.prop);
-      this.$set(this.search_data, "order", order_);
-      this.getList();
-    },
-    clickRow(row) {
-      this.$refs.tb.toggleRowSelection(row);
-    },
-    initData() {
-      Promise.all([
-        this.$api.commonAPI.getUsers(),
-        this.$api.dictAPI.getDictsByType("task_status")
-      ])
-        .then(([r1, r2]) => {
-          if (r1.code === 0) {
-            this.getUserList = r1.datas;
-          }
-          if (r2.code === 0) {
-            this.statusList = r2.datas;
-          }
-        })
-        .catch(error => {
-          console.log(error);
-        });
-    },
-    /**
-     * 获取列表
-     */
-    getList() {
-      if (this.planTime) {
-        this.search_data.start_time = formatDateTime(this.planTime[0]);
-        this.search_data.end_time = formatDateTime(this.planTime[1]);
-      } else {
-        this.search_data.start_time = "";
-        this.search_data.end_time = "";
-      }
-      this.pictLoading = true;
-      this.$api.upkeepPlanAPI
-        .addValidRecords(this.search_data)
-        .then(res => {
-          this.pictLoading = false;
-          if (res.data) {
-            this.total = res.data.totalRows;
-            this.tableData = res.data.datas ? res.data.datas : [];
-            this.totalCost = res.data.totalCost;
-            this.totalManhourCost = res.data.totalManhourCost;
-            this.totalManHour = res.data.totalManHour;
-          } else {
-            this.total = 0;
-            this.tableData = [];
-          }
-        })
-        .catch(r => {
-          console.log(r);
-        });
-    },
-    /**
-     * 计算合计
-     */
-    getSummaries(param) {
-      const { columns, data } = param;
-      const sums = [];
-      sums[1] = "总计";
-      sums[10] = this.totalManHour;
-      sums[11] = this.totalManhourCost;
-      sums[12] = this.totalCost;
-      sums[13] = this.totalUpkeepCost;
-      return sums;
-    },
-    /**
-     * 查询
-     */
-    search() {
-      this.search_data.pageno = 1;
-      this.getList();
-    },
-    // 上下分页
-    handleCurrentChange(val) {
-      this.search_data.pageno = val;
-      this.getList();
-    },
-    // 每页显示多少条
-    handleSizeChange(val) {
-      this.search_data.pagesize = val;
-      this.getList();
-    },
-    /**
-     * 新增
-     */
-    add() {
-      this.$router.push({
-        path: "/upkeep/execution_add",
-        query: {
-          t: Date.now()
-        }
-      });
-    },
-    /**
-     * 关闭任务
-     */
-    close() {
-      let ids = [];
-      this.rowIds.forEach(item => {
-        ids.push(item.id);
-      });
-      // const ids = this.rowIds.map(item => item.id).toString();
-      let params = { recordIds: ids, closureReason: this.reason };
-      this.$confirm("确认关闭选中的保养单吗?", "提示", {
-        type: "warning"
-      }).then(() => {
-        this.$api.upkeepPlanAPI
-          .closeRecordOfPase(params)
-          .then(res => {
-            if (res.code === 0) {
-              this.$message({
-                message: res.msg,
-                type: "success"
-              });
-              this.getList();
-              this.dialogRebutVisible = false;
-            } else {
-              this.$message({
-                message: res.msg ? res.msg : "关闭巡检任务失败，请重试",
-                type: "error"
-              });
-            }
-          })
-          .catch(error => {
-            this.$message({
-              message: "关闭巡检任务失败，请重试",
-              type: "error"
-            });
-          });
-      });
-    },
-    /**
-     * 保养执行
-     */
-    execution() {
-      let item = this.rowIds[0];
-      if (item.result === 58) {
-        this.$alert("保养已完成验收，您无法再次执行该保养！", "提示", {
-          type: "warning"
-        });
-        return;
-      }
-      let id = item.plan_id;
-      this.$router.push({
-        path: "/upkeep/execution_handle",
-        query: { planid: item.plan_id, id: item.id, t: Date.now() }
-      });
-    },
-    /**
-     * 查看明细
-     */
-    viewDetail(r) {
-      this.$router.push({
-        path: "/upkeep/execution_detail",
-        query: { id: r.id, t: Date.now() }
-      });
-    },
-
-    /**
-     * 完成验收
-     */
-    complete() {
-      let item = this.rowIds[0];
-      if (item.result === 58) {
-        this.$alert("保养已完成验收，您无法再次验收该保养！", "提示", {
-          type: "warning"
-        });
-        return;
-      }
-      let id = item.id;
-      this.$router.push({
-        path: "/upkeep/execution_check",
-        query: { id: id, t: Date.now() }
-      });
-    },
-    /**
-     * 删除
-     */
-    remove() {
-      let ids = [];
-      this.rowIds.forEach(item => {
-        ids.push(item.id);
-      });
-      // const ids = this.rowIds.map(item => item.id).toString();
-      let params = { ids: ids };
-      this.$confirm("确认删除选中的保养记录吗?", "提示", {
-        type: "warning"
-      }).then(() => {
-        this.$api.upkeepPlanAPI
-          .batchRemove(params)
-          .then(res => {
-            if (res.code === 0) {
-              this.$message({
-                message: res.msg,
-                type: "success"
-              });
-              this.getList();
-            } else {
-              this.$message({
-                message: res.msg ? res.msg : "删除失败，请重试",
-                type: "error"
-              });
-            }
-          })
-          .catch(error => {
-            this.$message({
-              message: "删除失败，请重试",
-              type: "error"
-            });
-          });
-      });
-    },
-    /**
-     * 处理选中
-     */
-    handleSelectionChange(val) {
-      this.rowIds = val;
-      this.setBtn(val);
-    },
-    /**
-     * 控件操作按钮状态
-     */
-    setBtn(val) {
-      let isFlag = true;
-      let isDelFlag = true;
-      if (val.length > 0) {
-        isDelFlag = false;
-        if (val.length == 1) {
-          isFlag = false;
-        }
-      } else {
-        isFlag = true;
-        isDelFlag = true;
-      }
-      this.btnDelDisabled = isDelFlag;
-      this.btnOtherDisabled = isFlag;
-    }
-  }
-};
-</script>
-
-<style scoped></style>
+<template>
+  <!-- 保养执行列表页 -->
+  <div class="knowledge-box">
+    <div class="sys-operate">
+      <!-- <el-button type="primary" @click="add()">增加</el-button>
+      <el-button type="primary" @click="remove()" :disabled="btnDelDisabled">删除</el-button>-->
+      <el-button type="primary" v-has="'upkeep:execution:execution'" @click="execution()"
+        :disabled="btnOtherDisabled">保养执行</el-button>
+      <el-button type="primary" v-has="'upkeep:execution:close'" @click="dialogRebutVisible = true"
+        :disabled="btnDelDisabled">关闭任务</el-button>
+      <!-- <el-button type="primary" @click="complete()" :disabled="btnOtherDisabled">验收评价</el-button> -->
+    </div>
+    <div class="sys-search">
+      <el-form inline class="form_item_search_out">
+        <div class="form_item_input_out">
+          <el-form-item label="设备名称" class="form_item-inline" style="width:33%">
+            <el-input v-model="search_data.deviceName" placeholder="请填写设备名称"></el-input>
+          </el-form-item>
+          <el-form-item label="计划时间" class="form_item-inline" style="width:34%">
+            <el-date-picker v-model="planTime" type="daterange" clearable range-separator="-" start-placeholder="开始日期"
+              end-placeholder="结束日期"></el-date-picker>
+          </el-form-item>
+          <!-- <el-form-item label="保养状态">
+          <el-select v-model="search_data.resultId" clearable placeholder="请选择">
+            <el-option
+              v-for="item in statusList"
+              :key="item.id"
+              :label="item.name"
+              :value="item.id"
+            ></el-option>
+          </el-select>
+        </el-form-item> -->
+          <!-- <el-form-item label="负责人">
+          <el-select v-model="search_data.engineer_id" filterable clearable placeholder="请选择">
+            <el-option
+              v-for="item in getUserList"
+              :key="item.id"
+              :label="item.name"
+              :value="item.id"
+            ></el-option>
+          </el-select>
+        </el-form-item> -->
+        </div>
+        <div class="form_item_btn_out">
+          <el-form-item>
+            <el-button type="primary" @click="search()">查询</el-button>
+          </el-form-item>
+        </div>
+      </el-form>
+    </div>
+    <div class="sys-table">
+      <el-table border fit @sort-change="sortChange" :default-sort="{ prop: 'end_time', order: 'ascending' }"
+        v-loading="pictLoading" @row-click="clickRow" ref="tb" :summary-method="getSummaries" show-summary
+        :data="tableData" @selection-change="handleSelectionChange" :header-cell-style="{
+          fontWeight: 'normal',
+          textAlign: 'center',
+          backgroundColor: '#eceff4',
+          color: '#222'
+        }">
+        <el-table-column type="selection" width="55" align="center"></el-table-column>
+        <el-table-column prop="work_orderNo" width="160" align="center" label="保养单号" show-overflow-tooltip>
+          <template slot-scope="scope">
+            <el-link type="primary" @click="viewDetail(scope.row)">{{
+              scope.row.work_orderNo
+            }}</el-link>
+          </template>
+        </el-table-column>
+        <el-table-column prop="planName" align="center" label="保养名称" show-overflow-tooltip></el-table-column>
+        <el-table-column prop="device_serialno" align="center" label="设备编号" show-overflow-tooltip></el-table-column>
+        <el-table-column prop="deviceName" label="设备名称" show-overflow-tooltip></el-table-column>
+        <el-table-column prop="deviceModelas" align="center" width="50" label="规格型号"
+          show-overflow-tooltip></el-table-column>
+        <el-table-column prop="dept_name" align="center" label="保养部门" show-overflow-tooltip></el-table-column>
+        <el-table-column prop="username" align="center" label="保养负责人" show-overflow-tooltip></el-table-column>
+        <el-table-column sortable="custom" prop="start_time" align="center" label="计划开始时间" width="124"
+          show-overflow-tooltip></el-table-column>
+        <el-table-column sortable="custom" prop="end_time" align="center" label="计划结束时间" width="124"
+          show-overflow-tooltip></el-table-column>
+        <!-- <el-table-column prop="man_hour" align="center" label="保养工时（小时）" width="60"
+          show-overflow-tooltip></el-table-column>
+        <el-table-column prop="manhourCost" align="center" label="保养工时费（元）" width="60"
+          show-overflow-tooltip></el-table-column>
+        <el-table-column prop="cost" align="center" label="保养材料费（元）" width="60" show-overflow-tooltip></el-table-column>
+        <el-table-column prop="totalCost" align="center" label="保养费（元）" width="60"
+          show-overflow-tooltip></el-table-column> -->
+        <el-table-column prop="result_name" align="center" label="保养状态" show-overflow-tooltip></el-table-column>
+        <el-table-column sortable="custom" prop="recordResultId" align="center" label="验收结果" width="124">
+          <template slot-scope="scope">
+            <span>{{ scope.row.record_result }}</span>
+          </template>
+        </el-table-column>
+      </el-table>
+    </div>
+    <div class="sys-pagination">
+      <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange"
+        :current-page="search_data.pageno" :page-sizes="pageSizes" :page-size="search_data.pagesize"
+        layout="total, sizes, prev, pager, next, jumper" :total="total"></el-pagination>
+    </div>
+
+    <el-dialog title="关闭任务" :visible.sync="dialogRebutVisible" width="500px">
+      <el-form label-width="60px">
+        <el-form-item label="原因">
+          <el-input type="textarea" :autosize="{ minRows: 4 }" placeholder="请输入关闭原因" v-model="reason"></el-input>
+        </el-form-item>
+      </el-form>
+      <span slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="dialogRebutVisible = false">{{
+          config.cancelText
+        }}</el-button>
+        <el-button type="primary" @click="close()">确定</el-button>
+      </span>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { formatDateTime } from "@/utils/tools.js";
+import config from "@/utils/config.js";
+export default {
+  name: "upkeep_execution_unhandle",
+  data() {
+    return {
+      total: 0, //总条数
+      pageSizes: [10, 20, 50], //每页展示多少条
+      search_data: {
+        pageno: 1,
+        pagesize: 10,
+        singleStatus: 56,
+        sort: "end_time",
+        order: "asc"
+      },
+
+      planTime: "",
+
+      statusList: [], //计划状态
+      getUserList: [], //用户
+
+      btnDelDisabled: true,
+      btnOtherDisabled: true,
+      rowIds: [],
+      tableData: [],
+      dialogVisible: false,
+      pictLoading: false,
+      totalCost: 0,
+      totalManHour: 0,
+      totalUpkeepCost: 0,
+      totalManhourCost: 0,
+      dialogRebutVisible: false,
+      reason: "",
+      config: config
+    };
+  },
+  created() {
+    var _this = this;
+    document.onkeydown = e => {
+      if (e.key === "Enter") {
+        _this.search();
+      }
+    };
+  },
+  mounted() {
+    this.getList();
+    this.initData();
+  },
+  methods: {
+    sortChange({ column, prop, order }) {
+      let j = { column, prop, order };
+      let order_ = j.order == "ascending" ? "asc" : "desc";
+      this.$set(this.search_data, "sort", j.prop);
+      this.$set(this.search_data, "order", order_);
+      this.getList();
+    },
+    clickRow(row) {
+      this.$refs.tb.toggleRowSelection(row);
+    },
+    initData() {
+      Promise.all([
+        this.$api.commonAPI.getUsers(),
+        this.$api.dictAPI.getDictsByType("task_status")
+      ])
+        .then(([r1, r2]) => {
+          if (r1.code === 0) {
+            this.getUserList = r1.datas;
+          }
+          if (r2.code === 0) {
+            this.statusList = r2.datas;
+          }
+        })
+        .catch(error => {
+          console.log(error);
+        });
+    },
+    /**
+     * 获取列表
+     */
+    getList() {
+      if (this.planTime) {
+        this.search_data.start_time = formatDateTime(this.planTime[0]);
+        this.search_data.end_time = formatDateTime(this.planTime[1]);
+      } else {
+        this.search_data.start_time = "";
+        this.search_data.end_time = "";
+      }
+      this.pictLoading = true;
+      this.$api.upkeepPlanAPI
+        .addValidRecords(this.search_data)
+        .then(res => {
+          this.pictLoading = false;
+          if (res.data) {
+            this.total = res.data.totalRows;
+            this.tableData = res.data.datas ? res.data.datas : [];
+            this.totalCost = res.data.totalCost;
+            this.totalManhourCost = res.data.totalManhourCost;
+            this.totalManHour = res.data.totalManHour;
+          } else {
+            this.total = 0;
+            this.tableData = [];
+          }
+        })
+        .catch(r => {
+          console.log(r);
+        });
+    },
+    /**
+     * 计算合计
+     */
+    getSummaries(param) {
+      const { columns, data } = param;
+      const sums = [];
+      sums[1] = "总计";
+      sums[10] = this.totalManHour;
+      sums[11] = this.totalManhourCost;
+      sums[12] = this.totalCost;
+      sums[13] = this.totalUpkeepCost;
+      return sums;
+    },
+    /**
+     * 查询
+     */
+    search() {
+      this.search_data.pageno = 1;
+      this.getList();
+    },
+    // 上下分页
+    handleCurrentChange(val) {
+      this.search_data.pageno = val;
+      this.getList();
+    },
+    // 每页显示多少条
+    handleSizeChange(val) {
+      this.search_data.pagesize = val;
+      this.getList();
+    },
+    /**
+     * 新增
+     */
+    add() {
+      this.$router.push({
+        path: "/upkeep/execution_add",
+        query: {
+          t: Date.now()
+        }
+      });
+    },
+    /**
+     * 关闭任务
+     */
+    close() {
+      let ids = [];
+      this.rowIds.forEach(item => {
+        ids.push(item.id);
+      });
+      // const ids = this.rowIds.map(item => item.id).toString();
+      let params = { recordIds: ids, closureReason: this.reason };
+      this.$confirm("确认关闭选中的保养单吗?", "提示", {
+        type: "warning"
+      }).then(() => {
+        this.$api.upkeepPlanAPI
+          .closeRecordOfPase(params)
+          .then(res => {
+            if (res.code === 0) {
+              this.$message({
+                message: res.msg,
+                type: "success"
+              });
+              this.getList();
+              this.dialogRebutVisible = false;
+            } else {
+              this.$message({
+                message: res.msg ? res.msg : "关闭巡检任务失败，请重试",
+                type: "error"
+              });
+            }
+          })
+          .catch(error => {
+            this.$message({
+              message: "关闭巡检任务失败，请重试",
+              type: "error"
+            });
+          });
+      });
+    },
+    /**
+     * 保养执行
+     */
+    execution() {
+      let item = this.rowIds[0];
+      if (item.result === 58) {
+        this.$alert("保养已完成验收，您无法再次执行该保养！", "提示", {
+          type: "warning"
+        });
+        return;
+      }
+      let id = item.plan_id;
+      this.$router.push({
+        path: "/upkeep/execution_handle",
+        query: { planid: item.plan_id, id: item.id, t: Date.now() }
+      });
+    },
+    /**
+     * 查看明细
+     */
+    viewDetail(r) {
+      this.$router.push({
+        path: "/upkeep/execution_detail",
+        query: { id: r.id, t: Date.now() }
+      });
+    },
+
+    /**
+     * 完成验收
+     */
+    complete() {
+      let item = this.rowIds[0];
+      if (item.result === 58) {
+        this.$alert("保养已完成验收，您无法再次验收该保养！", "提示", {
+          type: "warning"
+        });
+        return;
+      }
+      let id = item.id;
+      this.$router.push({
+        path: "/upkeep/execution_check",
+        query: { id: id, t: Date.now() }
+      });
+    },
+    /**
+     * 删除
+     */
+    remove() {
+      let ids = [];
+      this.rowIds.forEach(item => {
+        ids.push(item.id);
+      });
+      // const ids = this.rowIds.map(item => item.id).toString();
+      let params = { ids: ids };
+      this.$confirm("确认删除选中的保养记录吗?", "提示", {
+        type: "warning"
+      }).then(() => {
+        this.$api.upkeepPlanAPI
+          .batchRemove(params)
+          .then(res => {
+            if (res.code === 0) {
+              this.$message({
+                message: res.msg,
+                type: "success"
+              });
+              this.getList();
+            } else {
+              this.$message({
+                message: res.msg ? res.msg : "删除失败，请重试",
+                type: "error"
+              });
+            }
+          })
+          .catch(error => {
+            this.$message({
+              message: "删除失败，请重试",
+              type: "error"
+            });
+          });
+      });
+    },
+    /**
+     * 处理选中
+     */
+    handleSelectionChange(val) {
+      this.rowIds = val;
+      this.setBtn(val);
+    },
+    /**
+     * 控件操作按钮状态
+     */
+    setBtn(val) {
+      let isFlag = true;
+      let isDelFlag = true;
+      if (val.length > 0) {
+        isDelFlag = false;
+        if (val.length == 1) {
+          isFlag = false;
+        }
+      } else {
+        isFlag = true;
+        isDelFlag = true;
+      }
+      this.btnDelDisabled = isDelFlag;
+      this.btnOtherDisabled = isFlag;
+    }
+  }
+};
+</script>
+
+<style scoped></style>
diff --git a/src/pages/maintain/plan/index.vue b/src/pages/maintain/plan/index.vue
index 2823345..7fa9173 100644
--- a/src/pages/maintain/plan/index.vue
+++ b/src/pages/maintain/plan/index.vue
@@ -181,11 +181,11 @@
         <!-- <el-table-column prop="" align="center" label="保养项目" show-overflow-tooltip></el-table-column>
         <el-table-column prop align="center" label="保养方法" show-overflow-tooltip></el-table-column>-->
         <!-- <el-table-column prop="realityEndTime" align="center" width="114" label="实际结束时间" show-overflow-tooltip></el-table-column> -->
-        <el-table-column
+        <!-- <el-table-column
           prop="man_hour"
           align="center"
           label="保养工时（小时）"
-        ></el-table-column>
+        ></el-table-column> -->
         <el-table-column
           prop="userName"
           align="center"
diff --git a/src/pages/maintain/project/index.vue b/src/pages/maintain/project/index.vue
index f7b3247..9197de7 100644
--- a/src/pages/maintain/project/index.vue
+++ b/src/pages/maintain/project/index.vue
@@ -1,581 +1,581 @@
-<template>
-  <!-- 保养项目列表页 -->
-  <div class="sys-box knowledge-box">
-    <div class="sys-operate">
-      <el-button
-        type="primary"
-        v-has="'upkeep:project:add'"
-        @click="addProject()"
-        >新增</el-button
-      >
-      <el-button
-        type="primary"
-        v-has="'upkeep:project:remove'"
-        @click="remove()"
-        :disabled="btnDelDisabled"
-        >删除</el-button
-      >
-      <el-upload
-        style="display:inline-block"
-        ref="upload"
-        :show-file-list="false"
-        :action="uploadUrl"
-        :on-success="uploadSuccess"
-        :before-remove="
-          () => {
-            return false;
-          }
-        "
-        :auto-upload="auto_upload"
-        :on-change="onChange"
-        v-loading.lock="fullscreenLoading"
-        accept=".xls,.xlsx,"
-      >
-        <el-button v-has="'equipment:upload'" type="primary">导入</el-button>
-      </el-upload>
-      <el-button
-        v-has="'equipment:download'"
-        type="primary"
-        @click="upLoadExcel"
-        >下载模板</el-button
-      >
-      <!-- <el-button type="primary" @click="remove()" :disabled="btnDelDisabled">删除</el-button> -->
-      <!-- <el-button type="primary" @click="execution()" :disabled="btnOtherDisabled">保养执行</el-button> -->
-    </div>
-    <div class="sys-search">
-      <el-form inline class="form_item_search_out">
-        <div class="form_item_input_out">
-          <!-- <el-form-item label="设备类型" style='width:33.3%' class="form_item-inline">
-            <el-select v-model="search_data.device_tepy" clearable filterable placeholder="请选择设备类型">
-              <el-option
-                v-for="item in deviceType"
-                :key="item.id"
-                :label="item.name"
-                :value="item.id"
-              ></el-option>
-            </el-select>
-          </el-form-item> -->
-          <el-form-item
-            label="保养项目"
-            style="width:33.3%"
-            class="form_item-inline"
-          >
-            <el-input
-              v-model="search_data.name"
-              placeholder="保养项目"
-            ></el-input>
-          </el-form-item>
-          <el-form-item
-            label="保养方法"
-            style="width:33.3%"
-            class="form_item-inline"
-          >
-            <el-input
-              v-model="search_data.function"
-              placeholder="保养方法"
-            ></el-input>
-          </el-form-item>
-          <el-form-item
-            label="保养模板"
-            style="width:33.3%"
-            class="form_item-inline"
-          >
-            <el-input
-              v-model="search_data.bymb"
-              placeholder="保养模板"
-            ></el-input>
-          </el-form-item>
-        </div>
-        <div class="form_item_btn_out">
-          <el-form-item>
-            <el-button type="primary" @click="search()">查询</el-button>
-          </el-form-item>
-        </div>
-      </el-form>
-    </div>
-    <div class="sys-table">
-      <el-table
-        border
-        v-loading="pictLoading"
-        @row-click="clickRow"
-        ref="tb"
-        :data="tableData"
-        @selection-change="handleSelectionChange"
-        :header-cell-style="{
-          fontWeight: 'normal',
-          textAlign: 'center',
-          backgroundColor: '#eceff4',
-          color: '#222'
-        }"
-      >
-        <el-table-column
-          type="selection"
-          width="55"
-          align="center"
-        ></el-table-column>
-        <el-table-column
-          prop="code"
-          align="center"
-          width="200"
-          label="项目编号"
-          show-overflow-tooltip
-        >
-          <template slot-scope="scope">
-            <el-link type="primary" @click="viewDetail(scope.row)">{{
-              scope.row.code
-            }}</el-link>
-          </template>
-        </el-table-column>
-        <el-table-column
-          prop="name"
-          label="保养项目"
-          align="center"
-        ></el-table-column>
-        <el-table-column
-          prop="function"
-          show-overflow-tooltip
-          label="保养方法"
-          align="center"
-        ></el-table-column>
-        <el-table-column
-          prop="bymb"
-          label="保养模板"
-          align="center"
-        ></el-table-column>
-      </el-table>
-    </div>
-    <div class="sys-pagination">
-      <el-pagination
-        @size-change="handleSizeChange"
-        @current-change="handleCurrentChange"
-        :current-page="search_data.pageno"
-        :page-sizes="pageSizes"
-        :page-size="search_data.pagesize"
-        layout="total, sizes, prev, pager, next, jumper"
-        :total="total"
-      ></el-pagination>
-    </div>
-
-    <el-dialog
-      center
-      title="添加保养项目"
-      :visible.sync="addVisible"
-      width="600px"
-    >
-      <!-- <div class="sys-form"> -->
-      <el-form label-width="90px" :model="form" ref="form" :rules="ruleForm">
-        <el-form-item label="项目编号">
-          <el-input placeholder="请填写项目编号" v-model="form.code"></el-input>
-        </el-form-item>
-        <!-- <el-form-item label="设备类型" prop="deviceTepy" style="width:100%">
-          <el-select
-            style="width:100%"
-            @change="$forceUpdate()"
-            v-model="form.deviceTepy"
-            placeholder="请选择"
-          >
-            <el-option
-              v-for="item in deviceType"
-              :key="item.id"
-              :label="item.name"
-              :value="item.id"
-            ></el-option>
-          </el-select>
-        </el-form-item> -->
-        <el-form-item label="保养模板" prop="bymb">
-          <el-input placeholder="请填写保养模板" v-model="form.bymb"></el-input>
-        </el-form-item>
-        <el-form-item label="保养项目" prop="name">
-          <el-input placeholder="请填写保养项目" v-model="form.name"></el-input>
-        </el-form-item>
-        <el-form-item label="保养方法" prop="function">
-          <el-input
-            placeholder="请填写保养方法"
-            :autosize="{ minRows: 4 }"
-            v-model="form.function"
-            type="textarea"
-          ></el-input>
-        </el-form-item>
-      </el-form>
-      <!-- </div> -->
-      <span slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="save('form')" :disabled="isDisabled"
-          >保存</el-button
-        >
-        <el-button type="primary" @click="addVisible = false">{{
-          config.cancelText
-        }}</el-button>
-      </span>
-    </el-dialog>
-  </div>
-</template>
-
-<script>
-import { formatDateTime } from "@/utils/tools.js";
-import config from "@/utils/config.js";
-import base from "@/api/base.js"; // 导入接口域名列表
-export default {
-  name: "upkeep_project",
-  data() {
-    return {
-      total: 0, //总条数
-      pageSizes: [10, 20, 50], //每页展示多少条
-      search_data: {
-        pageno: 1,
-        pagesize: 10
-      },
-
-      statusList: [], //计划状态
-      getUserList: [], //用户
-
-      btnDelDisabled: true,
-      btnOtherDisabled: true,
-      rowIds: [],
-      tableData: [],
-      dialogVisible: false,
-      pictLoading: false,
-      addVisible: false,
-      isDisabled: false,
-      ruleForm: {
-        // deviceTepy: [
-        //   { required: true, message: "请选择设备类型", trigger: "change" }
-        // ],
-        name: [{ required: true, message: "请填写保养项目", trigger: "blur" }],
-        function: [
-          { required: true, message: "请填写保养方法", trigger: "blur" }
-        ]
-      },
-      form: {
-        code: "",
-        name: "",
-        function: ""
-      },
-      uploadUrl: base.uploadUrl,
-      uploadAttachment: [],
-      fullscreenLoading: false,
-      auto_upload: false,
-      deviceType: [],
-      config: config
-    };
-  },
-  created() {
-    var _this = this;
-    document.onkeydown = e => {
-      if (e.key === "Enter") {
-        _this.search();
-      }
-    };
-  },
-  mounted() {
-    //let user = JSON.parse(sessionStorage.getItem("userInfo"));
-    //console.log(user);
-    //this.search_data.engineerId = user.userId;
-    this.getList();
-    this.initData();
-  },
-  methods: {
-    clickRow(row) {
-      this.$refs.tb.toggleRowSelection(row);
-    },
-    initData() {
-      this.$api.dictAPI.getDictsByType("device_type").then(res => {
-        //设备类别
-        if (res.code === 0) {
-          this.deviceType = res.datas;
-        }
-      });
-      // Promise.all([
-      //   this.$api.commonAPI.getUsers(),
-      //   this.$api.dictAPI.getDictsByType("plan_status")
-      // ])
-      //   .then(([r1, r2]) => {
-      //     if (r1.code === 0) {
-      //       this.getUserList = r1.datas;
-      //     }
-      //     if (r2.code === 0) {
-      //       this.statusList = r2.datas;
-      //     }
-      //   })
-      //   .catch(error => {
-      //     console.log(error);
-      //   });
-    },
-    /**
-     * 获取列表
-     */
-    getList() {
-      this.pictLoading = true;
-      this.$api.upkeepPlanAPI
-        .findProjects(this.search_data)
-        .then(res => {
-          this.pictLoading = false;
-          if (res.data) {
-            this.total = res.data.totalRows;
-            this.tableData = res.data.datas ? res.data.datas : [];
-          } else {
-            this.total = 0;
-            this.tableData = [];
-          }
-        })
-        .catch(r => {
-          console.log(r);
-        });
-    },
-    /**
-     * 查询
-     */
-    search() {
-      this.search_data.pageno = 1;
-      this.getList();
-    },
-    // 上下分页
-    handleCurrentChange(val) {
-      this.search_data.pageno = val;
-      this.getList();
-    },
-    // 每页显示多少条
-    handleSizeChange(val) {
-      this.search_data.pagesize = val;
-      this.getList();
-    },
-    addProject() {
-      this.form = {};
-      this.addVisible = true;
-      this.resetFields();
-    },
-
-    save(form) {
-      this.$refs[form].validate(valid => {
-        if (valid) {
-          if (this.isDisabled) {
-            return;
-          }
-          this.isDisabled = true;
-          this.$api.upkeepPlanAPI.addProjects(this.form).then(res => {
-            this.isDisabled = false;
-            if (res.code === 0) {
-              this.$message({
-                message: res.msg,
-                type: "success"
-              });
-              this.addVisible = false;
-              this.getList();
-            } else {
-              this.$message({
-                message: res.msg,
-                type: "error"
-              });
-              this.getList();
-            }
-          });
-        } else {
-          return false;
-        }
-      });
-    },
-
-    /**
-     * 删除
-     */
-    remove() {
-      let ids = [];
-      this.rowIds.forEach(item => {
-        ids.push(item.id);
-      });
-      let params = { ids: ids };
-      this.$confirm("确认删除选中的保养项目吗?", "提示", {
-        type: "warning"
-      }).then(() => {
-        this.$api.upkeepPlanAPI
-          .removeProject(params)
-          .then(res => {
-            if (res.code === 0) {
-              this.$message({
-                message: res.msg,
-                type: "success"
-              });
-              this.getList();
-            } else {
-              this.$message({
-                message: res.msg ? res.msg : "删除失败，请重试",
-                type: "error"
-              });
-            }
-          })
-          .catch(error => {
-            this.$message({
-              message: "删除失败，请重试",
-              type: "error"
-            });
-            this.getList();
-          });
-      });
-    },
-
-    resetFields() {
-      if (this.$refs["form"]) {
-        this.$refs["form"].resetFields();
-      }
-    },
-    /**查看明细 */
-    viewDetail(r) {
-      this.form = r;
-      console.log(r);
-      // this.$set(this.form,'deviceTepy',r.device_tepy)
-      this.addVisible = true;
-      this.resetFields();
-    },
-
-    // /**
-    //  * 删除
-    //  */
-    // remove() {
-    //   let ids = [];
-    //   this.rowIds.forEach(item => {
-    //     ids.push(item.id);
-    //   });
-    //   this.$confirm("确认删除选中的保养记录吗?", "提示", {
-    //     type: "warning"
-    //   }).then(() => {
-    //     this.$api.upkeepPlanAPI
-    //       .deletLargeUpPlan(ids)
-    //       .then(res => {
-    //         if (res.code === 0) {
-    //           this.$message({
-    //             message: res.msg,
-    //             type: "success"
-    //           });
-    //           this.getList();
-    //         } else {
-    //           this.$message({
-    //             message: res.msg ? res.msg :"删除失败，请重试" ,
-    //             type: "error"
-    //           });
-    //         }
-    //       })
-    //       .catch(error => {
-    //         this.$message({
-    //           message: "删除失败，请重试",
-    //           type: "error"
-    //         });
-    //       });
-    //   });
-    // },
-    /**
-     * 处理选中
-     */
-    handleSelectionChange(val) {
-      this.rowIds = val;
-      this.setBtn(val);
-    },
-    /**
-     * 控件操作按钮状态
-     */
-    setBtn(val) {
-      let isFlag = true;
-      let isDelFlag = true;
-      if (val.length > 0) {
-        isDelFlag = false;
-        if (val.length == 1) {
-          isFlag = false;
-        }
-      } else {
-        isFlag = true;
-        isDelFlag = true;
-      }
-      this.btnDelDisabled = isDelFlag;
-      this.btnOtherDisabled = isFlag;
-    },
-    // 下载模板
-    upLoadExcel() {
-      let excel = {
-        filePath: "/gyhl-file/template/upkeep-project-template.xlsx",
-        fileName: "upkeep-project-template.xlsx"
-      };
-      this.$api.netWorkingAPI.downExcel(excel).then(res => {});
-    },
-    //压缩并上传图片
-    httpRequest(upload, name, file) {
-      //file是需要压缩图片时，原图片
-      let _this = this;
-      var tempFormData = new FormData();
-      tempFormData.append("file", upload, name); //上传blob对象
-      this.$api.upkeepPlanAPI.importExcel(tempFormData).then(res => {
-        _this.fullscreenLoading = false;
-        if (res.code == 0) {
-          //上传成功
-          _this.$message({
-            message: "上传成功",
-            type: "success",
-            duration: 2000
-          });
-          this.getList();
-          // upload.filePath=res.filePath;
-          // if (file) {
-          //   file.filePath = res.filePath;
-          // } else {
-          //   upload.filePath = res.filePath;
-          // }
-          // _this.uploadAttachment.push({
-          //   filePath: res.filePath,
-          //   fileName: res.fileName
-          // });
-        } else {
-          //上传失败
-          _this.fullscreenLoading = false;
-          _this.$message.error(res.msg);
-          _this.$refs.upload.uploadFiles.splice(
-            _this.$refs.upload.uploadFiles.length - 1,
-            1
-          );
-        }
-      });
-    },
-
-    uploadSuccess(res, file) {
-      if (res.msg === "操作成功") {
-        this.uploadAttachment.push({
-          filePath: res.filePath,
-          fileName: res.fileName
-        });
-      }
-    },
-    onChange(file, fileList) {
-      if (file.size > 100 * 1000000) {
-        this.$message.error("上传文件不能超过100M!");
-        this.$refs.upload.fileList = this.$refs.upload.fileList;
-        this.$refs.upload.uploadFiles.splice(
-          this.$refs.upload.uploadFiles.length - 1,
-          1
-        );
-
-        return false;
-      }
-      file = file.raw;
-      if (!/image\/\w+/.test(file.type)) {
-        //非图片
-        this.fullscreenLoading = true;
-        this.httpRequest(file, file.name);
-      } else {
-        this.fullscreenLoading = true;
-        let _this = this;
-        imageConversion.compressAccurately(file, 400).then(res => {
-          if (res.size) {
-            //压缩成功
-            _this.httpRequest(res, file.name, file);
-          } else {
-            _this.$message.error("压缩图片失败");
-            _this.fullscreenLoading = false;
-            _this.$refs.upload.uploadFiles.splice(
-              _this.$refs.upload.uploadFiles.length - 1,
-              1
-            );
-          }
-        });
-      }
-    }
-  }
-};
-</script>
-
-<style scoped></style>
+<template>
+  <!-- 保养项目列表页 -->
+  <div class="sys-box knowledge-box">
+    <div class="sys-operate">
+      <el-button
+        type="primary"
+        v-has="'upkeep:project:add'"
+        @click="addProject()"
+        >新增</el-button
+      >
+      <el-button
+        type="primary"
+        v-has="'upkeep:project:remove'"
+        @click="remove()"
+        :disabled="btnDelDisabled"
+        >删除</el-button
+      >
+      <el-upload
+        style="display:inline-block"
+        ref="upload"
+        :show-file-list="false"
+        :action="uploadUrl"
+        :on-success="uploadSuccess"
+        :before-remove="
+          () => {
+            return false;
+          }
+        "
+        :auto-upload="auto_upload"
+        :on-change="onChange"
+        v-loading.lock="fullscreenLoading"
+        accept=".xls,.xlsx,"
+      >
+        <el-button v-has="'equipment:upload'" type="primary">导入</el-button>
+      </el-upload>
+      <el-button
+        v-has="'equipment:download'"
+        type="primary"
+        @click="upLoadExcel"
+        >下载模板</el-button
+      >
+      <!-- <el-button type="primary" @click="remove()" :disabled="btnDelDisabled">删除</el-button> -->
+      <!-- <el-button type="primary" @click="execution()" :disabled="btnOtherDisabled">保养执行</el-button> -->
+    </div>
+    <div class="sys-search">
+      <el-form inline class="form_item_search_out">
+        <div class="form_item_input_out">
+          <!-- <el-form-item label="设备类型" style='width:33.3%' class="form_item-inline">
+            <el-select v-model="search_data.device_tepy" clearable filterable placeholder="请选择设备类型">
+              <el-option
+                v-for="item in deviceType"
+                :key="item.id"
+                :label="item.name"
+                :value="item.id"
+              ></el-option>
+            </el-select>
+          </el-form-item> -->
+          <el-form-item
+            label="保养项目"
+            style="width:33.3%"
+            class="form_item-inline"
+          >
+            <el-input
+              v-model="search_data.name"
+              placeholder="保养项目"
+            ></el-input>
+          </el-form-item>
+          <el-form-item
+            label="保养方法"
+            style="width:33.3%"
+            class="form_item-inline"
+          >
+            <el-input
+              v-model="search_data.function"
+              placeholder="保养方法"
+            ></el-input>
+          </el-form-item>
+          <!-- <el-form-item
+            label="保养模板"
+            style="width:33.3%"
+            class="form_item-inline"
+          >
+            <el-input
+              v-model="search_data.bymb"
+              placeholder="保养模板"
+            ></el-input>
+          </el-form-item> -->
+        </div>
+        <div class="form_item_btn_out">
+          <el-form-item>
+            <el-button type="primary" @click="search()">查询</el-button>
+          </el-form-item>
+        </div>
+      </el-form>
+    </div>
+    <div class="sys-table">
+      <el-table
+        border
+        v-loading="pictLoading"
+        @row-click="clickRow"
+        ref="tb"
+        :data="tableData"
+        @selection-change="handleSelectionChange"
+        :header-cell-style="{
+          fontWeight: 'normal',
+          textAlign: 'center',
+          backgroundColor: '#eceff4',
+          color: '#222'
+        }"
+      >
+        <el-table-column
+          type="selection"
+          width="55"
+          align="center"
+        ></el-table-column>
+        <el-table-column
+          prop="code"
+          align="center"
+          width="200"
+          label="项目编号"
+          show-overflow-tooltip
+        >
+          <template slot-scope="scope">
+            <el-link type="primary" @click="viewDetail(scope.row)">{{
+              scope.row.code
+            }}</el-link>
+          </template>
+        </el-table-column>
+        <el-table-column
+          prop="name"
+          label="保养项目"
+          align="center"
+        ></el-table-column>
+        <el-table-column
+          prop="function"
+          show-overflow-tooltip
+          label="保养方法"
+          align="center"
+        ></el-table-column>
+        <!-- <el-table-column
+          prop="bymb"
+          label="保养模板"
+          align="center"
+        ></el-table-column> -->
+      </el-table>
+    </div>
+    <div class="sys-pagination">
+      <el-pagination
+        @size-change="handleSizeChange"
+        @current-change="handleCurrentChange"
+        :current-page="search_data.pageno"
+        :page-sizes="pageSizes"
+        :page-size="search_data.pagesize"
+        layout="total, sizes, prev, pager, next, jumper"
+        :total="total"
+      ></el-pagination>
+    </div>
+
+    <el-dialog
+      center
+      title="添加保养项目"
+      :visible.sync="addVisible"
+      width="600px"
+    >
+      <!-- <div class="sys-form"> -->
+      <el-form label-width="90px" :model="form" ref="form" :rules="ruleForm">
+        <el-form-item label="项目编号">
+          <el-input placeholder="请填写项目编号" v-model="form.code"></el-input>
+        </el-form-item>
+        <!-- <el-form-item label="设备类型" prop="deviceTepy" style="width:100%">
+          <el-select
+            style="width:100%"
+            @change="$forceUpdate()"
+            v-model="form.deviceTepy"
+            placeholder="请选择"
+          >
+            <el-option
+              v-for="item in deviceType"
+              :key="item.id"
+              :label="item.name"
+              :value="item.id"
+            ></el-option>
+          </el-select>
+        </el-form-item> -->
+        <!-- <el-form-item label="保养模板" prop="bymb">
+          <el-input placeholder="请填写保养模板" v-model="form.bymb"></el-input>
+        </el-form-item> -->
+        <el-form-item label="保养项目" prop="name">
+          <el-input placeholder="请填写保养项目" v-model="form.name"></el-input>
+        </el-form-item>
+        <el-form-item label="保养方法" prop="function">
+          <el-input
+            placeholder="请填写保养方法"
+            :autosize="{ minRows: 4 }"
+            v-model="form.function"
+            type="textarea"
+          ></el-input>
+        </el-form-item>
+      </el-form>
+      <!-- </div> -->
+      <span slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="save('form')" :disabled="isDisabled"
+          >保存</el-button
+        >
+        <el-button type="primary" @click="addVisible = false">{{
+          config.cancelText
+        }}</el-button>
+      </span>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { formatDateTime } from "@/utils/tools.js";
+import config from "@/utils/config.js";
+import base from "@/api/base.js"; // 导入接口域名列表
+export default {
+  name: "upkeep_project",
+  data() {
+    return {
+      total: 0, //总条数
+      pageSizes: [10, 20, 50], //每页展示多少条
+      search_data: {
+        pageno: 1,
+        pagesize: 10
+      },
+
+      statusList: [], //计划状态
+      getUserList: [], //用户
+
+      btnDelDisabled: true,
+      btnOtherDisabled: true,
+      rowIds: [],
+      tableData: [],
+      dialogVisible: false,
+      pictLoading: false,
+      addVisible: false,
+      isDisabled: false,
+      ruleForm: {
+        // deviceTepy: [
+        //   { required: true, message: "请选择设备类型", trigger: "change" }
+        // ],
+        name: [{ required: true, message: "请填写保养项目", trigger: "blur" }],
+        function: [
+          { required: true, message: "请填写保养方法", trigger: "blur" }
+        ]
+      },
+      form: {
+        code: "",
+        name: "",
+        function: ""
+      },
+      uploadUrl: base.uploadUrl,
+      uploadAttachment: [],
+      fullscreenLoading: false,
+      auto_upload: false,
+      deviceType: [],
+      config: config
+    };
+  },
+  created() {
+    var _this = this;
+    document.onkeydown = e => {
+      if (e.key === "Enter") {
+        _this.search();
+      }
+    };
+  },
+  mounted() {
+    //let user = JSON.parse(sessionStorage.getItem("userInfo"));
+    //console.log(user);
+    //this.search_data.engineerId = user.userId;
+    this.getList();
+    this.initData();
+  },
+  methods: {
+    clickRow(row) {
+      this.$refs.tb.toggleRowSelection(row);
+    },
+    initData() {
+      this.$api.dictAPI.getDictsByType("device_type").then(res => {
+        //设备类别
+        if (res.code === 0) {
+          this.deviceType = res.datas;
+        }
+      });
+      // Promise.all([
+      //   this.$api.commonAPI.getUsers(),
+      //   this.$api.dictAPI.getDictsByType("plan_status")
+      // ])
+      //   .then(([r1, r2]) => {
+      //     if (r1.code === 0) {
+      //       this.getUserList = r1.datas;
+      //     }
+      //     if (r2.code === 0) {
+      //       this.statusList = r2.datas;
+      //     }
+      //   })
+      //   .catch(error => {
+      //     console.log(error);
+      //   });
+    },
+    /**
+     * 获取列表
+     */
+    getList() {
+      this.pictLoading = true;
+      this.$api.upkeepPlanAPI
+        .findProjects(this.search_data)
+        .then(res => {
+          this.pictLoading = false;
+          if (res.data) {
+            this.total = res.data.totalRows;
+            this.tableData = res.data.datas ? res.data.datas : [];
+          } else {
+            this.total = 0;
+            this.tableData = [];
+          }
+        })
+        .catch(r => {
+          console.log(r);
+        });
+    },
+    /**
+     * 查询
+     */
+    search() {
+      this.search_data.pageno = 1;
+      this.getList();
+    },
+    // 上下分页
+    handleCurrentChange(val) {
+      this.search_data.pageno = val;
+      this.getList();
+    },
+    // 每页显示多少条
+    handleSizeChange(val) {
+      this.search_data.pagesize = val;
+      this.getList();
+    },
+    addProject() {
+      this.form = {};
+      this.addVisible = true;
+      this.resetFields();
+    },
+
+    save(form) {
+      this.$refs[form].validate(valid => {
+        if (valid) {
+          if (this.isDisabled) {
+            return;
+          }
+          this.isDisabled = true;
+          this.$api.upkeepPlanAPI.addProjects(this.form).then(res => {
+            this.isDisabled = false;
+            if (res.code === 0) {
+              this.$message({
+                message: res.msg,
+                type: "success"
+              });
+              this.addVisible = false;
+              this.getList();
+            } else {
+              this.$message({
+                message: res.msg,
+                type: "error"
+              });
+              this.getList();
+            }
+          });
+        } else {
+          return false;
+        }
+      });
+    },
+
+    /**
+     * 删除
+     */
+    remove() {
+      let ids = [];
+      this.rowIds.forEach(item => {
+        ids.push(item.id);
+      });
+      let params = { ids: ids };
+      this.$confirm("确认删除选中的保养项目吗?", "提示", {
+        type: "warning"
+      }).then(() => {
+        this.$api.upkeepPlanAPI
+          .removeProject(params)
+          .then(res => {
+            if (res.code === 0) {
+              this.$message({
+                message: res.msg,
+                type: "success"
+              });
+              this.getList();
+            } else {
+              this.$message({
+                message: res.msg ? res.msg : "删除失败，请重试",
+                type: "error"
+              });
+            }
+          })
+          .catch(error => {
+            this.$message({
+              message: "删除失败，请重试",
+              type: "error"
+            });
+            this.getList();
+          });
+      });
+    },
+
+    resetFields() {
+      if (this.$refs["form"]) {
+        this.$refs["form"].resetFields();
+      }
+    },
+    /**查看明细 */
+    viewDetail(r) {
+      this.form = r;
+      console.log(r);
+      // this.$set(this.form,'deviceTepy',r.device_tepy)
+      this.addVisible = true;
+      this.resetFields();
+    },
+
+    // /**
+    //  * 删除
+    //  */
+    // remove() {
+    //   let ids = [];
+    //   this.rowIds.forEach(item => {
+    //     ids.push(item.id);
+    //   });
+    //   this.$confirm("确认删除选中的保养记录吗?", "提示", {
+    //     type: "warning"
+    //   }).then(() => {
+    //     this.$api.upkeepPlanAPI
+    //       .deletLargeUpPlan(ids)
+    //       .then(res => {
+    //         if (res.code === 0) {
+    //           this.$message({
+    //             message: res.msg,
+    //             type: "success"
+    //           });
+    //           this.getList();
+    //         } else {
+    //           this.$message({
+    //             message: res.msg ? res.msg :"删除失败，请重试" ,
+    //             type: "error"
+    //           });
+    //         }
+    //       })
+    //       .catch(error => {
+    //         this.$message({
+    //           message: "删除失败，请重试",
+    //           type: "error"
+    //         });
+    //       });
+    //   });
+    // },
+    /**
+     * 处理选中
+     */
+    handleSelectionChange(val) {
+      this.rowIds = val;
+      this.setBtn(val);
+    },
+    /**
+     * 控件操作按钮状态
+     */
+    setBtn(val) {
+      let isFlag = true;
+      let isDelFlag = true;
+      if (val.length > 0) {
+        isDelFlag = false;
+        if (val.length == 1) {
+          isFlag = false;
+        }
+      } else {
+        isFlag = true;
+        isDelFlag = true;
+      }
+      this.btnDelDisabled = isDelFlag;
+      this.btnOtherDisabled = isFlag;
+    },
+    // 下载模板
+    upLoadExcel() {
+      let excel = {
+        filePath: "/gyhl-file/template/upkeep-project-template.xlsx",
+        fileName: "upkeep-project-template.xlsx"
+      };
+      this.$api.netWorkingAPI.downExcel(excel).then(res => {});
+    },
+    //压缩并上传图片
+    httpRequest(upload, name, file) {
+      //file是需要压缩图片时，原图片
+      let _this = this;
+      var tempFormData = new FormData();
+      tempFormData.append("file", upload, name); //上传blob对象
+      this.$api.upkeepPlanAPI.importExcel(tempFormData).then(res => {
+        _this.fullscreenLoading = false;
+        if (res.code == 0) {
+          //上传成功
+          _this.$message({
+            message: "上传成功",
+            type: "success",
+            duration: 2000
+          });
+          this.getList();
+          // upload.filePath=res.filePath;
+          // if (file) {
+          //   file.filePath = res.filePath;
+          // } else {
+          //   upload.filePath = res.filePath;
+          // }
+          // _this.uploadAttachment.push({
+          //   filePath: res.filePath,
+          //   fileName: res.fileName
+          // });
+        } else {
+          //上传失败
+          _this.fullscreenLoading = false;
+          _this.$message.error(res.msg);
+          _this.$refs.upload.uploadFiles.splice(
+            _this.$refs.upload.uploadFiles.length - 1,
+            1
+          );
+        }
+      });
+    },
+
+    uploadSuccess(res, file) {
+      if (res.msg === "操作成功") {
+        this.uploadAttachment.push({
+          filePath: res.filePath,
+          fileName: res.fileName
+        });
+      }
+    },
+    onChange(file, fileList) {
+      if (file.size > 100 * 1000000) {
+        this.$message.error("上传文件不能超过100M!");
+        this.$refs.upload.fileList = this.$refs.upload.fileList;
+        this.$refs.upload.uploadFiles.splice(
+          this.$refs.upload.uploadFiles.length - 1,
+          1
+        );
+
+        return false;
+      }
+      file = file.raw;
+      if (!/image\/\w+/.test(file.type)) {
+        //非图片
+        this.fullscreenLoading = true;
+        this.httpRequest(file, file.name);
+      } else {
+        this.fullscreenLoading = true;
+        let _this = this;
+        imageConversion.compressAccurately(file, 400).then(res => {
+          if (res.size) {
+            //压缩成功
+            _this.httpRequest(res, file.name, file);
+          } else {
+            _this.$message.error("压缩图片失败");
+            _this.fullscreenLoading = false;
+            _this.$refs.upload.uploadFiles.splice(
+              _this.$refs.upload.uploadFiles.length - 1,
+              1
+            );
+          }
+        });
+      }
+    }
+  }
+};
+</script>
+
+<style scoped></style>