From a4f69bbbed818a42b60ec47e59de2688c0478531 Mon Sep 17 00:00:00 2001
From: zhen <1173776308@qq.com>
Date: Thu, 11 Jul 2024 16:47:21 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E6=93=8D=E4=BD=9C=E7=A5=A8=EF=BC=88?=
 =?UTF-8?q?=E5=BC=A0=E5=90=8C=E6=9C=95=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/smart/operationitem.js            |  68 +++
 src/api/smart/operationticket.js          |  50 ++
 src/views/smart/operationticket.vue       | 621 +++++++++++++++++++
 src/views/smart/operationticketDetail.vue | 697 ++++++++++++++++++++++
 4 files changed, 1436 insertions(+)
 create mode 100644 src/api/smart/operationitem.js
 create mode 100644 src/api/smart/operationticket.js
 create mode 100644 src/views/smart/operationticket.vue
 create mode 100644 src/views/smart/operationticketDetail.vue

diff --git a/src/api/smart/operationitem.js b/src/api/smart/operationitem.js
new file mode 100644
index 0000000..ae78538
--- /dev/null
+++ b/src/api/smart/operationitem.js
@@ -0,0 +1,68 @@
+import request from '@/router/axios';
+
+export const getList = (current, size, params) => {
+  return request({
+    url: '/api/smart/operationitem/list',
+    method: 'get',
+    params: {
+      ...params,
+      current,
+      size,
+    }
+  })
+}
+
+export const getDetail = (id) => {
+  return request({
+    url: '/api/smart/operationitem/detail',
+    method: 'get',
+    params: {
+      id
+    }
+  })
+}
+
+export const getItemDetail = (id) => {
+  return request({
+    url: '/api/smart/operationitem/detail',
+    method: 'get',
+    params: {
+      id,
+    }
+  })
+}
+
+export const item_remove = (ids) => {
+  return request({
+    url: '/api/smart/operationitem/remove',
+    method: 'post',
+    params: {
+      ids,
+    }
+  })
+}
+
+export const item_add = (row) => {
+  return request({
+    url: '/api/smart/operationitem/submit',
+    method: 'post',
+    data: row
+  })
+}
+
+export const item_update = (row) => {
+  return request({
+    url: '/api/smart/operationitem/submit',
+    method: 'post',
+    data: row
+  })
+}
+export const item_getListByItemId = (operationTicketNo) => {
+  return request({
+    url: '/api/smart/operationitem/getList',
+    method: 'get',
+    params: {
+      operationTicketNo: operationTicketNo
+    }
+  })
+}
diff --git a/src/api/smart/operationticket.js b/src/api/smart/operationticket.js
new file mode 100644
index 0000000..198a6da
--- /dev/null
+++ b/src/api/smart/operationticket.js
@@ -0,0 +1,50 @@
+import request from '@/router/axios';
+
+export const getList = (current, size, params) => {
+  return request({
+    url: '/api/smart/operationticket/page',
+    method: 'get',
+    params: {
+      ...params,
+      current,
+      size,
+    }
+  })
+}
+
+export const getDetail = (id) => {
+  return request({
+    url: '/api/smart/operationticket/detail',
+    method: 'get',
+    params: {
+      id
+    }
+  })
+}
+
+export const remove = (ids) => {
+  return request({
+    url: '/api/smart/operationticket/remove',
+    method: 'post',
+    params: {
+      ids,
+    }
+  })
+}
+
+export const add = (row) => {
+  return request({
+    url: '/api/smart/operationticket/submit',
+    method: 'post',
+    data: row
+  })
+}
+
+export const update = (row) => {
+  return request({
+    url: '/api/smart/operationticket/submit',
+    method: 'post',
+    data: row
+  })
+}
+
diff --git a/src/views/smart/operationticket.vue b/src/views/smart/operationticket.vue
new file mode 100644
index 0000000..ab3b13a
--- /dev/null
+++ b/src/views/smart/operationticket.vue
@@ -0,0 +1,621 @@
+<template>
+  <basic-container>
+    <avue-crud :option="option"
+               :table-loading="loading"
+               :data="data"
+               :page="page"
+               :permission="permissionList"
+               :before-open="beforeOpen"
+               :search.sync="search"
+               :header-cell-class-name="headerClass"
+               v-model="form"
+               ref="crud"
+               @row-update="rowUpdate"
+               @row-save="rowSave"
+               @row-del="rowDel"
+               @search-change="searchChange"
+               @search-reset="searchReset"
+               @selection-change="selectionChange"
+               @current-change="currentChange"
+               @size-change="sizeChange"
+               @on-load="onLoad">
+      <template slot="menuLeft">
+        <el-button type="danger"
+                   size="small"
+                   icon="el-icon-delete"
+                   plain
+                   v-if="permission.operationticket_delete"
+                   @click="handleDelete">批量删除
+        </el-button>
+      </template>
+      <template slot="menuRight">
+        <el-button type="primary"
+                   size="small"
+                   plain
+                   @click="handleDetailAdd">新增
+        </el-button>
+        <el-button type="primary"
+                   size="small"
+                   plain
+                   @click="handleReject">批量驳回
+        </el-button>
+        <el-button type="primary"
+                   size="small"
+                   plain
+                   @click="handleAuditing">批量审核
+        </el-button>
+
+        <el-button type="primary"
+                   size="small"
+                   plain
+                   @click="handleExport()">导出
+        </el-button>
+      </template>
+      <template #menu="{row,index,size}">
+        <el-button @click="handleDetailSearch(row,index)" type="text">查看</el-button>
+        <el-button @click="handleDetailcls(row,index)" type="text">关票</el-button>
+        <el-button @click="rowDel(row)" type="text">删除</el-button>
+      </template>
+    </avue-crud>
+  </basic-container>
+</template>
+
+<script>
+  import {getList, getDetail, add, update, remove} from "@/api/smart/operationticket";
+  import {mapGetters} from "vuex";
+  import {auditing, reject} from "@/api/leger/equipmentledger";
+  import expUtil from "@/util/exportUtil";
+  import {getToken} from "@/util/auth";
+
+  export default {
+    data() {
+      return {
+        form: {},
+        query: {},
+        loading: true,
+        page: {
+          pageSize: 10,
+          currentPage: 1,
+          total: 0
+        },
+        selectionList: [],
+        option: {
+          height: 'auto',
+          calcHeight: 210,
+          searchShow: true,
+          searchMenuSpan: 6,
+          tip: false,
+          border: true,
+          index: true,
+          indexLabel: "序号",
+          viewBtn: true,
+          selection: true,
+          column: [
+            {
+              label: "主键",
+              prop: "id",
+              hide: true,
+              rules: [{
+                required: true,
+                message: "请输入主键",
+                trigger: "blur"
+              }]
+            },
+            {
+              label: "KKS编码",
+              prop: "kksEncoding",
+              hide: true,
+              rules: [{
+                required: true,
+                message: "请输入KKS编码",
+                trigger: "blur"
+              }]
+            },
+            {
+              label: "KSS描述",
+              hide: true,
+              prop: "kksDescription",
+              rules: [{
+                required: true,
+                message: "请输入KSS描述",
+                trigger: "blur"
+              }]
+            },
+            {
+              label: "场站",
+              prop: "station",
+              type: "select",
+              search: true,
+              hide: true,
+              dicUrl: "/api/daf-system/dict/dictionary?code=station",
+              props: {
+                label: "dictValue",
+                value: "dictKey"
+              },
+              rules: [{
+                required: true,
+                message: "请输入场站",
+                trigger: "blur"
+              }]
+            },
+            {
+              label: "操作票编号",
+              search: true,
+              prop: "operationTicketNo",
+              rules: [{
+                required: true,
+                message: "请输入操作票编号",
+                trigger: "blur"
+              }]
+            },
+            {
+              label: "操作票类型",
+              search: true,
+              prop: "operationTicketType",
+              rules: [{
+                required: true,
+                message: "请输入操作票类型",
+                trigger: "blur"
+              }]
+            },
+            {
+              label: "工作班组",
+              prop: "workTeam",
+              rules: [{
+                required: true,
+                message: "请输入工作班组",
+                trigger: "blur"
+              }]
+            },
+            {
+              label: "工作负责人",
+              prop: "workLeader",
+              search: true,
+              rules: [{
+                required: true,
+                message: "请输入工作负责人",
+                trigger: "blur"
+              }]
+            },
+            {
+              label: "监护人",
+              prop: "guardian",
+              rules: [{
+                required: true,
+                message: "请输入监护人",
+                trigger: "blur"
+              }]
+            },
+            {
+              label: "发令人",
+              prop: "givingOrdersUser",
+              rules: [{
+                required: true,
+                message: "请输入发令人",
+                trigger: "blur"
+              }]
+            },
+            {
+              label: "作业风险等级",
+              prop: "jobRiskLevel",
+              search: true,
+              rules: [{
+                required: true,
+                message: "请输入作业风险等级",
+                trigger: "blur"
+              }]
+            },
+            {
+              label: "控制等级",
+              prop: "controlLevel",
+              search: true,
+              rules: [{
+                required: true,
+                message: "请输入控制等级",
+                trigger: "blur"
+              }]
+            },
+            {
+              label: "计划开始时间",
+              prop: "plannedStartTime",
+              search: true,
+              rules: [{
+                required: true,
+                message: "请输入计划开始时间",
+                trigger: "blur"
+              }]
+            },
+            {
+              label: "计划结束时间",
+              prop: "plannedEndTime",
+              rules: [{
+                required: true,
+                message: "请输入计划结束时间",
+                trigger: "blur"
+              }]
+            },
+            {
+              label: "签发时间",
+              prop: "workIssuanceTime",
+              rules: [{
+                required: true,
+                message: "请输入签发时间",
+                trigger: "blur"
+              }]
+            },
+            {
+              label: "操作项目数",
+              prop: "operationItemsCount",
+            },
+            {
+              label: "人员资格",
+              prop: "personnelQualification",
+              hide: true,
+              rules: [{
+                required: true,
+                message: "请输入人员资格",
+                trigger: "blur"
+              }]
+            },
+            {
+              label: "人员状态",
+              prop: "personnelState",
+              hide: true,
+              rules: [{
+                required: true,
+                message: "请输入人员状态",
+                trigger: "blur"
+              }]
+            },
+            {
+              label: "人员防护",
+              prop: "personnelPritection",
+              hide: true,
+              rules: [{
+                required: true,
+                message: "请输入人员防护",
+                trigger: "blur"
+              }]
+            },
+            {
+              label: "安全距离",
+              prop: "safeDistance",
+              hide: true,
+              rules: [{
+                required: true,
+                message: "请输入安全距离",
+                trigger: "blur"
+              }]
+            },
+            {
+              label: "走错间隔",
+              prop: "wrongInterval",
+              hide: true,
+              rules: [{
+                required: true,
+                message: "请输入走错间隔",
+                trigger: "blur"
+              }]
+            },
+            {
+              label: "安全措施落实",
+              prop: "securityMeasuresImplement",
+              hide: true,
+              rules: [{
+                required: true,
+                message: "请输入安全措施落实",
+                trigger: "blur"
+              }]
+            },
+            {
+              label: "开展过程检查",
+              prop: "conductProcessInspections",
+              hide: true,
+              rules: [{
+                required: true,
+                message: "请输入开展过程检查",
+                trigger: "blur"
+              }]
+            },
+            {
+              label: "安全培训落实",
+              prop: "securityTrainingImplement",
+              hide: true,
+              rules: [{
+                required: true,
+                message: "请输入安全培训落实",
+                trigger: "blur"
+              }]
+            },
+            {
+              label: "其他",
+              prop: "other",
+              hide: true,
+              rules: [{
+                required: true,
+                message: "请输入其他",
+                trigger: "blur"
+              }]
+            },
+            {
+              label: "安全技术措施交底",
+              prop: "securityMeasuresDisclosure",
+              hide: true,
+              rules: [{
+                required: true,
+                message: "请输入安全技术措施交底",
+                trigger: "blur"
+              }]
+            },
+            {
+              label: "作业后风险管控情况评价",
+              prop: "riskControlEvaluation",
+              hide: true,
+              rules: [{
+                required: true,
+                message: "请输入作业后风险管控情况评价",
+                trigger: "blur"
+              }]
+            },
+            {
+              label: "状态",
+              prop: "sts",
+              search: true,
+              rules: [{
+                required: true,
+                message: "请输入系统状态",
+                trigger: "blur"
+              }]
+            },
+            {
+              label: "是否合格",
+              prop: "isQuakified",
+              hide: true,
+              rules: [{
+                required: true,
+                message: "请输入是否合格",
+                trigger: "blur"
+              }]
+            },
+            {
+              label: "审核状态",
+              prop: "reviewStatus",
+              hide: true,
+              rules: [{
+                required: true,
+                message: "请输入审核状态",
+                trigger: "blur"
+              }]
+            },
+          ]
+        },
+        data: []
+      };
+    },
+    computed: {
+      ...mapGetters(["permission"]),
+      permissionList() {
+          // this.option.column = this.option.column.filter(v => {
+          //     return this.permission['operationticket_col_' + v.prop]
+          // })
+        return {
+          // addBtn: this.validData(this.permission.operationticket_add, false),
+          // viewBtn: this.validData(this.permission.operationticket_view, false),
+          // delBtn: this.validData(this.permission.operationticket_delete, false),
+          // editBtn: this.validData(this.permission.operationticket_edit, false)
+          addBtn: false,
+          viewBtn: false,
+          delBtn: false,
+          editBtn: false
+        };
+      },
+      ids() {
+        let ids = [];
+        this.selectionList.forEach(ele => {
+          ids.push(ele.id);
+        });
+        return ids.join(",");
+      }
+    },
+    methods: {
+      rowSave(row, done, loading) {
+        add(row).then(() => {
+          done();
+          this.onLoad(this.page);
+          this.$message({
+            type: "success",
+            message: "操作成功!"
+          });
+        }, error => {
+          window.console.log(error);
+          loading();
+        });
+      },
+      rowUpdate(row, index, done, loading) {
+        update(row).then(() => {
+          done();
+          this.onLoad(this.page);
+          this.$message({
+            type: "success",
+            message: "操作成功!"
+          });
+        }, error => {
+          window.console.log(error);
+          loading();
+        });
+      },
+      rowDel(row) {
+        this.$confirm("确定将选择数据删除?", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        })
+          .then(() => {
+            return remove(row.id);
+          })
+          .then(() => {
+            this.onLoad(this.page);
+            this.$message({
+              type: "success",
+              message: "操作成功!"
+            });
+          });
+      },
+      handleDelete() {
+        if (this.selectionList.length === 0) {
+          this.$message.warning("请选择至少一条数据");
+          return;
+        }
+        this.$confirm("确定将选择数据删除?", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        })
+          .then(() => {
+            return remove(this.ids);
+          })
+          .then(() => {
+            this.onLoad(this.page);
+            this.$message({
+              type: "success",
+              message: "操作成功!"
+            });
+            this.$refs.crud.toggleSelection();
+          });
+      },
+      beforeOpen(done, type) {
+        if (["edit", "view"].includes(type)) {
+          getDetail(this.form.id).then(res => {
+            this.form = res.data.data;
+          });
+        }
+        done();
+      },
+      searchReset() {
+        this.query = {};
+        this.onLoad(this.page);
+      },
+      searchChange(params, done) {
+        this.query = params;
+        this.page.currentPage = 1;
+        this.onLoad(this.page, params);
+        done();
+      },
+      selectionChange(list) {
+        this.selectionList = list;
+      },
+      selectionClear() {
+        this.selectionList = [];
+        this.$refs.crud.toggleSelection();
+      },
+      currentChange(currentPage){
+        this.page.currentPage = currentPage;
+      },
+      sizeChange(pageSize){
+        this.page.pageSize = pageSize;
+      },
+      onLoad(page, params = {}) {
+        this.loading = true;
+        getList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
+          const data = res.data.data;
+          this.page.total = data.total;
+          this.data = data.records;
+          this.loading = false;
+          this.selectionClear();
+        });
+      },
+      headerClass() {
+        return 'header-class'
+      },
+      handleDetailAdd() {
+        this.$router.push({
+          path: "/smart/operationticketDetail",
+          query: {
+            frameMode:"add"
+          },
+        });
+      },
+      handleDetailcls(row) {
+        debugger
+        this.$router.push({
+          path: "/smart/operationticketDetail",
+          query: {
+            frameMode:"search",
+            id: row.id
+          },
+        });
+      },
+      handleDetailSearch(row) {
+        debugger
+        this.$router.push({
+          path: "/smart/operationticketDetail",
+          query: {
+            frameMode:"search",
+            id: row.id,
+            operationTicketNo:row.operationTicketNo
+          },
+        });
+      },
+      handleAuditing() {
+        if (this.selectionList.length === 0) {
+          this.$message.warning("请选择至少一条数据");
+          return;
+        }
+        this.$confirm("是否将选择数据审核?", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        })
+          .then(() => {
+            return auditing(this.ids);
+          })
+          .then(() => {
+            this.onLoad(this.page);
+            this.$message({
+              type: "success",
+              message: "操作成功!"
+            });
+            this.$refs.crud.toggleSelection();
+          });
+      },
+      handleReject() {
+        if (this.selectionList.length === 0) {
+          this.$message.warning("请选择至少一条数据");
+          return;
+        }
+        this.$confirm("是否将选择数据审核?", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        })
+          .then(() => {
+            return reject(this.ids);
+          })
+          .then(() => {
+            this.onLoad(this.page);
+            this.$message({
+              type: "success",
+              message: "操作成功!"
+            });
+            this.$refs.crud.toggleSelection();
+          });
+      },
+      handleExport() {
+        this.$confirm("是否导出数据?", "提示", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(() => {
+          expUtil.excelExport(`/api/equipmentledger/export?daf-auth=${getToken()}`, this.search, ['station', 'userStatus']);
+        });
+      },
+    }
+  };
+</script>
+
+<style>
+.header-class{
+  background-color: #3366cc !important;
+  color: #FFFFFF !important;
+}
+</style>
diff --git a/src/views/smart/operationticketDetail.vue b/src/views/smart/operationticketDetail.vue
new file mode 100644
index 0000000..c64bee3
--- /dev/null
+++ b/src/views/smart/operationticketDetail.vue
@@ -0,0 +1,697 @@
+<template>
+  <basic-container>
+    <avue-tabs :option="option"
+               @change="handleChange"></avue-tabs>
+    <span v-if="type.prop==='information'">
+        <avue-form :option="tab1_option"
+                   v-model="tab1_form"
+                   ref="tab1_form"
+                   :class="frame_class">
+        </avue-form>
+      </span>
+    <span v-else-if="type.prop==='operationItem'">
+        <!--        选项卡内容3  https://avuejs.com/crud/crud-fun.html-->
+        <avue-crud :option="optionDoc"
+                   :table-loading="loading"
+                   :data="item_data"
+                   :permission="permissionList"
+                   :header-cell-class-name="headerClass"
+                   v-model="item_form"
+                   ref="crud2"
+                   @row-update="item_rowUpdate"
+                   @row-save="item_rowSave"
+                   @row-del="item_rowDel">
+          </avue-crud>
+      </span>
+    <div class="container">
+       <span >
+          <el-button type="primary"
+                     size="large"
+                     @click="handleFormSubmit"
+                     v-if="addUpdateShowButton">
+                     确定</el-button>
+          <el-button type="text"
+                     size="large"
+                     @click="back"
+                     v-if="addUpdateShowButton">
+                     取消</el-button>
+          <el-button type="primary"
+                     size="small"
+                     @click="auditing"
+                     v-if="shouldShowButton">
+                     审核</el-button>
+          <el-button type="primary"
+                     size="small"
+                     @click="reject"
+                     v-if="shouldShowButton">
+                     驳回</el-button>
+          <el-button type="primary"
+                     size="small"
+                     @click="seachToUpdate"
+                     v-if="shouldShowButton">
+                      修改</el-button>
+          <el-button type="primary"
+                     size="small"
+                     @click="del"
+                     v-if="shouldShowButton">
+                     删除</el-button>
+       </span>
+    </div>
+  </basic-container>
+  <!--   https://avuejs.com/form/form-rules.html#%E5%A4%96%E7%BD%AE%E9%AA%8C%E8%AF%81-->
+</template>
+<script>
+import {getList, getDetail, add, update, remove} from "@/api/smart/operationticket";
+import {
+  item_add,
+  item_update,
+  item_remove,
+  item_getListByItemId,
+  getItemDetail,
+} from "@/api/smart/operationitem";
+import {mapGetters} from "vuex";
+import website from "@/config/website";
+import {readonly} from "vue";
+import {getToken} from "@/util/auth";
+export default {
+  name: "operationticketDetail",
+  data () {
+    return {
+      frame_class: '',
+      type: {},
+      shouldShowButton:{},
+      addUpdateShowButton:{},
+      readonlyForm:{},
+      item_form:{},
+      option: {
+        column: [{
+          label: '基本信息',
+          prop: 'information',
+        }
+        ]
+      },
+
+      tab1_form: {},
+      tab1_option: {
+        submitBtn: false,
+        emptyBtn: false,
+        group:[
+          {
+            column: [
+              {
+                label: "KKS编码",
+                prop: "kksEncoding",
+                rules: [{
+                  required: true,
+                  message: "请输入KKS编码",
+                  trigger: "blur",
+                }],
+                span: 8,
+                maxlength: 20,
+              },
+              {
+                label: "KKS描述",
+                prop: "kksDescription",
+                rules: [{
+                  required: true,
+                  message: "请输入KKS描述",
+                  trigger: "blur"
+                }],
+                span: 8,
+                maxlength: 20,
+              },
+              {
+                label: "场站",
+                prop: "station",
+                rules: [{
+                  required: true,
+                  message: "请输入场站",
+                  trigger: "blur"
+                }],
+                type: "select",
+                dicUrl: "/api/daf-system/dict/dictionary?code=station",
+                props: {
+                  label: "dictValue",
+                  value: "dictKey"
+                },
+                span: 8,
+                maxlength: 20,
+              },
+
+              {
+                label: "操作票编号",
+                prop: "operationTicketNo",
+                rules: [{
+                  required: true,
+                  message: "请输入操作票编号",
+                  trigger: "blur",
+                }],
+                span: 8,
+                maxlength: 20,
+              },
+              {
+                label: "操作票类型",
+                prop: "operationTicketType",
+                rules: [{
+                  required: true,
+                  message: "请输入操作票类型",
+                  trigger: "blur"
+                }],
+                span: 8,
+                maxlength: 20,
+              },
+              {
+                label: "作业风险等级",
+                prop: "jobRiskLevel",
+                rules: [{
+                  required: true,
+                  message: "请输入作业风险等级",
+                  trigger: "blur"
+                }],
+                span: 8,
+                maxlength: 20,
+              },
+              {
+                label: "工作班组",
+                prop: "workTeam",
+                rules: [{
+                  required: true,
+                  message: "请输入工作班组",
+                  trigger: "blur"
+                }],
+                span: 8,
+                maxlength: 20,
+              },
+              {
+                label: "工作负责人",
+                prop: "workLeader",
+                rules: [{
+                  required: true,
+                  message: "请输入工作负责人",
+                  trigger: "blur"
+                }],
+                span:8,
+                row:true,
+                maxlength: 20,
+              },
+
+              {
+                label: "发令人",
+                prop: "givingOrdersUser",
+                rules: [{
+                  required: true,
+                  message: "请输入发令人",
+                  trigger: "blur"
+                }],
+                span: 8,
+                maxlength: 20,
+              },
+              {
+                label: "监护人",
+                prop: "guardian",
+                rules: [{
+                  required: true,
+                  message: "请输入监护人",
+                  trigger: "blur"
+                }],
+                span: 8,
+                maxlength: 20,
+              },
+              {
+                label: "控制等级",
+                prop: "controlLevel",
+                rules: [{
+                  required: true,
+                  message: "请输入控制等级",
+                  trigger: "blur"
+                }],
+                span: 8,
+                maxlength: 20,
+              },
+              {
+                label: "计划开始时间",
+                prop: "plannedStartTime",
+                rules: [{
+                  required: true,
+                }],
+                type: "date",
+                format: 'yyyy/MM/dd',
+                valueFormat: "yyyyMMdd",
+                span: 8,
+                maxlength: 20,
+              },
+              {
+                label: "计划结束时间",
+                prop: "plannedEndTime",
+                rules: [{
+                  required: true,
+                }],
+                type: "date",
+                format: 'yyyy/MM/dd',
+                valueFormat: "yyyyMMdd",
+                span: 8,
+                maxlength: 20,
+              },
+              {
+                label: "工作签发时间",
+                prop: "workIssuanceTime",
+                rules: [{
+                  required: true,
+                }],
+                type: "date",
+                format: 'yyyy/MM/dd',
+                valueFormat: "yyyyMMdd",
+                span: 8,
+                maxlength: 20,
+              },
+              {
+                label: "安全措施交底",
+                prop: "securityMeasuresDisclosure",
+                type: "textarea",
+                span: 8,
+                row:true,
+                maxlength: 1000,
+              },
+            ]
+          },
+          {
+            label: '作业前风险辨识',
+            column: [
+              {
+                label: "人员资格",
+                prop: "personnelQualification",
+                span: 8,
+                maxlength: 20,
+              },
+              {
+                label: "人员状态",
+                prop: "personnelState",
+                span: 8,
+                maxlength: 20,
+              },
+              {
+                label: "人员防护",
+                prop: "personnelPritection",
+                span: 8,
+                maxlength: 20,
+              },
+              {
+                label: "安全距离",
+                prop: "safeDistance",
+                span: 8,
+                maxlength: 20,
+              },
+              {
+                label: "走错间隔",
+                prop: "wrongInterval",
+                span: 8,
+                maxlength: 20,
+              },
+              {
+                label: "安全措施落实",
+                prop: "securityMeasuresImplement",
+                span: 8,
+                maxlength: 20,
+              },
+              {
+                label: "开展过程检查",
+                prop: "conductProcessInspections",
+                span: 8,
+                maxlength: 20,
+              },
+              {
+                label: "安全培训落实",
+                prop: "securityTrainingImplement",
+                span: 8,
+                maxlength: 20,
+              },
+              {
+                label: "其他",
+                prop: "other",
+                span: 8,
+                maxlength: 20,
+              },
+
+
+            ]
+
+          },
+          ]
+      },
+      tab3_page: {
+        pageSize: 20,
+        pagerCount: 5
+      },
+      item_data: [],
+      optionDoc: {
+        align: 'center',
+        menuAlign: 'center',
+        height: 'auto',
+        calcHeight: 210,
+        searchShow: true,
+        searchMenuSpan: 6,
+        tip: false,
+        border: true,
+        indexLabel: "序号",
+        index: true,
+        column: [
+          {
+            label: "操作票编号",
+            prop: "operationTicketNo",
+            span: 20,
+            rules: [{
+              required: true,
+              message: "请输入操作票编号",
+              trigger: "blur"
+            }]
+          },
+          {
+            label: "操作项目编号",
+            prop: "operationItemNo",
+            span: 20,
+            rules: [{
+              required: true,
+              message: "请输入操作项目编号",
+              trigger: "blur"
+            }]
+          },
+          {
+            label: "项目名称",
+            prop: "itmeName",
+            span: 20,
+            rules: [{
+              required: true,
+              message: "请输入项目名称",
+              trigger: "blur"
+            }]
+          },
+          {
+            label: "危害因素",
+            prop: "securityMeasures",
+            span: 20,
+            rules: [{
+              required: true,
+              message: "请输入危害因素",
+              trigger: "blur"
+            }]
+          },
+          {
+            label: "风险等级",
+            prop: "riskLevel",
+            span: 20,
+            rules: [{
+              required: true,
+              message: "请输入风险等级",
+              trigger: "blur"
+            }]
+          },
+          {
+            label: "其他",
+            prop: "other",
+            span: 20,
+            type:"textarea",
+            rules: [{
+              required: true,
+              message: "请输入其他",
+              trigger: "blur"
+            }]
+          },
+        ]
+      }
+    }
+  },
+  computed: {
+    ...mapGetters(["permission"]),
+    permissionList() {
+      return {
+        addBtn:  true,
+        viewBtn: false,
+        delBtn: true,
+        editBtn: true
+      };
+    },
+  },
+  created () {
+    this.type = this.option.column[0];
+    this.option.column.push({ label: '操作项目', prop: 'operationItem' });
+    if(this.$route.query.frameMode == "add"){
+      this.readonlyForm=false;
+      this.shouldShowButton=false;
+      this.addUpdateShowButton=true;
+      this.frame_class = null;
+    }else{
+      this.readonlyForm=false;
+      this.shouldShowButton=false;
+      this.addUpdateShowButton=true;
+      this.frame_class = 'frame_class1';
+      this.SearchDetail();
+    }
+  },
+  methods: {
+    handleFormSubmit() {
+      const form = this.$refs.tab1_form;
+      form.validate((valid) => {
+        if (valid) {
+          this.Submit();
+        } else {
+          this.$message({
+            type: "warning",
+            message: "请输入必要信息!"
+          });
+        }
+      });
+    },
+    // 处理表单提交
+    Submit() {
+      if(this.$route.query.frameMode=="add"){
+        this.$confirm("是否新增所填数据?", "提示", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(() => {
+          this.tab1_form.checkStatus="1"
+          add(this.tab1_form).then(()=>{
+            this.$router.push({
+              path: "/smart/operationticket",
+              query: {
+              },
+            });
+            this.$message({
+              type: "success",
+              message: "操作成功!"
+            });
+          }).catch((error) => {
+            this.$message({
+              type: "error",
+              message: "操作失败!"
+            });
+          });
+        });
+      }else {
+        this.$confirm("是否修改所填数据?", "提示", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(() => {
+          update(this.tab1_form).then(() => {
+            this.$router.push({
+              path: "/smart/operationticket",
+              query: {},
+            });
+            this.$message({
+              type: "success",
+              message: "操作成功!"
+            });
+          }).catch((error) => {
+            this.$message({
+              type: "error",
+              message: "操作失败!"
+            });
+          });
+        });
+      }
+    },
+    back() {
+      if(this.$route.query.frameMode=="add") {
+        this.$router.push({path: "/smart/operationticket"});
+      }else{
+        this.updateToSearch();
+        this.SearchDetail();
+      }
+    },
+    seachToUpdate () {
+      this.shouldShowButton=false;
+      this.addUpdateShowButton=true;
+      this.readonlyForm=false;
+      this.frame_class = null;
+    },
+    updateToSearch () {
+      this.readonlyForm=true;
+      this.shouldShowButton=true;
+      this.addUpdateShowButton=false;
+      this.frame_class = 'frame_class1';
+    },
+    handleChange (column) {
+      this.type = column
+      if (column.prop == 'operationItem') {
+        this.item_onLoad();
+      }
+    },
+
+    // 操作项目 新增按钮处理
+    item_rowSave (form, done, loading) {
+      loading();
+      form.eqLedgerId = this.$route.query.id;
+      item_add(form).then(() => {
+        done(form);
+        this.item_onLoad(this.page);
+        this.$message({
+          type: "success",
+          message: "操作成功!"
+        });
+      }, error => {
+        window.console.log(error);
+        loading();
+      });
+    },
+    // 文档清册 编辑按钮处理
+    item_rowUpdate (form, index, done, loading) {
+      console.log(form)
+      item_update(form).then(() => {
+        done(form);
+        this.$message({
+          type: "success",
+          message: "操作成功!"
+        });
+      }, error => {
+        window.console.log(error);
+        loading();
+      });
+
+    },
+    // 文档清册 删除按钮处理
+    item_rowDel (form, index,done) {
+      this.$confirm("确定将选择数据删除?", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      })
+        .then(() => {
+          return item_remove(form.id);
+        })
+        .then(() => {
+          this.item_onLoad(this.page);
+          this.$message({
+            type: "success",
+            message: "操作成功!"
+          });
+        });
+    },
+    SearchDetail() {
+      getDetail(this.$route.query.id).then(res => {
+        console.log(res);
+        this.tab1_form = res.data.data;
+      });
+      getItemDetail(this.$route.query.id,this.tab1_form.operationTicketNo).then(res => {
+        console.log(res);
+        this.item_data = res.data.data;
+      });
+    },
+    auditing() {
+      this.$confirm("是否将数据审核?", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      }).then(() => {
+        this.tab1_form.checkStatus="2"
+        this.submitRejectOrauditing();
+      });
+    },
+    reject() {
+      this.$confirm("是否将数据审核?", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      }).then(() => {
+        this.tab1_form.checkStatus="3"
+        this.submitRejectOrauditing();
+      });
+    },
+    submitRejectOrauditing() {
+      update(this.tab1_form).then(() => {
+        this.$router.push({
+          path: "/smart/operationticket",
+          query: {},
+        });
+        this.$message({
+          type: "success",
+          message: "操作成功!"
+        });
+      }).catch((error) => {
+        this.$message({
+          type: "error",
+          message: "操作失败!"
+        });
+      });
+    },
+    del() {
+      this.$confirm("是否将选择数据审核?", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      }).then(() => {
+        remove(this.tab1_form.id).then(() => {
+          this.$router.push({
+            path: "/smart/operationticket",
+            query: {},
+          });
+          this.$message({
+            type: "success",
+            message: "操作成功!"
+          });
+        }).catch((error) => {
+          this.$message({
+            type: "error",
+            message: "操作失败!"
+          });
+        });
+      })
+    },
+    headerClass(){
+      return 'head-style'
+    },
+    item_onLoad(row, params = {}) {
+      this.loading = true;
+      item_getListByItemId(this.$route.query.operationTicketNo).then(res => {
+        this.item_data = res.data.data;
+        this.loading = false;
+      });
+    },
+    handleDownload(row) {
+      window.open(`/api/system/file/download?daf-auth=${getToken()}&fileName=${row.accessoryName}`);
+    },
+  }
+}
+</script>
+<style>
+.head-style{
+  background-color: #1e9fff !important;
+  color: #FFFFFF !important;
+}
+.frame_class1 input.el-input__inner {
+  border: none;
+  box-shadow: none;
+  outline: none;
+  pointer-events: none;
+}
+.frame_class1 .el-input__icon {
+  display: none;
+}
+.frame_class1 .el-input--prefix .el-input__inner {
+  padding-left: 15px;
+}
+.container {
+  display: flex;
+  justify-content: flex-end; /* 将子元素推到容器的末端 */
+}
+</style>

From da9f152be5575c6442f0f3210d07947bb1f5895e Mon Sep 17 00:00:00 2001
From: yangzhicheng <dayu123@qq.com>
Date: Thu, 11 Jul 2024 17:21:40 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E5=A4=B1=E6=95=88=E6=8C=89=E9=92=AE=20=20?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E9=A1=B9=E7=9B=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/inspection/inspectionroute.js         |  3 +-
 src/views/inspection/inspectionroute.vue      | 50 ++++++++++++++++++-
 .../inspection/inspectionrouteDetail.vue      | 12 +++--
 3 files changed, 59 insertions(+), 6 deletions(-)

diff --git a/src/api/inspection/inspectionroute.js b/src/api/inspection/inspectionroute.js
index b0b4868..03ab1db 100644
--- a/src/api/inspection/inspectionroute.js
+++ b/src/api/inspection/inspectionroute.js
@@ -58,12 +58,13 @@ export const takeEffect = (ids) => {
   })
 }
 
-export const lapse = (ids) => {
+export const lapse = (ids, reason) => {
   return request({
     url: '/api/inspection/inspectionRoute/lapse',
     method: 'post',
     params: {
       ids,
+      reason,
     }
   })
 }
diff --git a/src/views/inspection/inspectionroute.vue b/src/views/inspection/inspectionroute.vue
index 167e62a..01b2474 100644
--- a/src/views/inspection/inspectionroute.vue
+++ b/src/views/inspection/inspectionroute.vue
@@ -56,6 +56,22 @@
         <el-button v-if="permission.inspectionroute_delete" @click="rowDel(row)" type="text">删除</el-button>
       </template>
     </avue-crud>
+    <el-dialog title="失效"
+               append-to-body
+               :visible.sync="cancelBox"
+               width="555px">
+      <avue-form :option="cancelOption" v-model="cancelForm" ref="cancelForm">
+      </avue-form>
+      <div class="container">
+         <span>
+            <el-button type="primary"
+                       size="small"
+                       plain
+                       @click="handleDetailCancel">失效
+            </el-button>
+         </span>
+      </div>
+    </el-dialog>
   </basic-container>
 </template>
 
@@ -72,6 +88,7 @@
         search:{},
         query: {},
         loading: true,
+        cancelBox: false,
         page: {
           pageSize: 10,
           currentPage: 1,
@@ -136,6 +153,25 @@
             },
           ]
         },
+        cancelForm: {},
+        cancelOption: {
+          height: 'auto',
+          calcHeight: 210,
+          emptyBtn:false,
+          submitBtn:false,
+          tip: false,
+          border: true,
+          index: false,
+          selection: true,
+          column: [
+            {
+              label: "取消原因",
+              type: "textarea",
+              prop: "cancelReason",
+              span: 24
+            },
+          ]
+        },
         data: []
       };
     },
@@ -197,6 +233,8 @@
             return remove(row.id);
           })
           .then(() => {
+            const cancelReason = this.findObject(this.cancelOption.column, "cancelReason");
+            cancelReason.value = ' ';
             this.onLoad(this.page);
             this.$message({
               type: "success",
@@ -271,21 +309,25 @@
           this.$message.warning("请选择至少一条数据");
           return;
         }
+        this.cancelBox = true;
+      },
+      handleDetailCancel() {
         this.$confirm("是否将选择数据改为失效状态?", {
           confirmButtonText: "确定",
           cancelButtonText: "取消",
           type: "warning"
         })
           .then(() => {
-            return lapse(this.ids);
+            return lapse(this.ids, this.cancelForm.cancelReason);
           })
           .then(() => {
+            this.cancelBox = false;
             this.onLoad(this.page);
             this.$message({
               type: "success",
               message: "操作成功!"
             });
-            this.$refs.crud.toggleSelection();
+            this.$refs.crud.toggleSelection()
           });
       },
       handleExport() {
@@ -350,4 +392,8 @@
   background-color: #3366cc !important;
   color: #FFFFFF !important;
 }
+.container {
+  display: flex;
+  justify-content: flex-end; /* 将子元素推到容器的末端 */
+}
 </style>
diff --git a/src/views/inspection/inspectionrouteDetail.vue b/src/views/inspection/inspectionrouteDetail.vue
index 7c560f8..c211d70 100644
--- a/src/views/inspection/inspectionrouteDetail.vue
+++ b/src/views/inspection/inspectionrouteDetail.vue
@@ -39,6 +39,7 @@
             {
               label: "路线编号",
               prop: "routeNo",
+              display: true,
               span: 8,
             },
             {
@@ -106,6 +107,7 @@
             {
               label: "取消原因",
               prop: "cancelReason",
+              span: 8,
             },
           ]
         },
@@ -132,9 +134,13 @@
         this.addUpdateShowButton = false;
         this.frame_class = 'frame_class';
       }else{
-        const column = this.findObject(this.option.column, "routeNo");
-        column.value = ' ';
-        column.disabled = true;
+        const routeNo = this.findObject(this.option.column, "routeNo");
+        routeNo.value = ' ';
+        routeNo.disabled = true;
+        const iStatus = this.findObject(this.option.column, "istatus");
+        iStatus.display = false;
+        const cancelReason = this.findObject(this.option.column, "cancelReason");
+        cancelReason.display = false;
         this.readonlyForm = false;
         this.addUpdateShowButton = true;
         this.frame_class = null;