代码初始化

jiangping

2025-04-08 dfa179b30b76044bc576e68e72b6cf725bddbd2e

代码初始化

 admin/src/components/business/OperaWorkorderDetailSheWindow.vue

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,203 @@
<template>
  <GlobalWindow
    :title="title"
    :visible.sync="visible"
    :confirm-working="isWorking"
    @confirm="confirm"
  >
    <el-form :model="form" ref="form" :rules="rules">
      <el-form-item label="创建人编码" prop="creator">
        <el-input v-model="form.creator" placeholder="请输入创建人编码" v-trim/>
      </el-form-item>
      <el-form-item label="创建时间" prop="createDate">
        <el-date-picker v-model="form.createDate" value-format="yyyy-MM-dd" placeholder="请输入创建时间"></el-date-picker>
      </el-form-item>
      <el-form-item label="更新人编码" prop="editor">
        <el-input v-model="form.editor" placeholder="请输入更新人编码" v-trim/>
      </el-form-item>
      <el-form-item label="更新时间" prop="editDate">
        <el-date-picker v-model="form.editDate" value-format="yyyy-MM-dd" placeholder="请输入更新时间"></el-date-picker>
      </el-form-item>
      <el-form-item label="是否删除0否 1是" prop="isdeleted">
        <el-input v-model="form.isdeleted" placeholder="请输入是否删除0否 1是" v-trim/>
      </el-form-item>
      <el-form-item label="所属分类编（关联category)" prop="categoryId">
        <el-input v-model="form.categoryId" placeholder="请输入所属分类编（关联category)" v-trim/>
      </el-form-item>
      <el-form-item label="备注" prop="remark">
        <el-input v-model="form.remark" placeholder="请输入备注" v-trim/>
      </el-form-item>
      <el-form-item label="状态 0待确认/待初审 1待分配/待终审 2待处理  3 å·²æ’¤å›ž 4已处理" prop="status">
        <el-input v-model="form.status" placeholder="请输入状态 0待确认/待初审 1待分配/待终审 2待处理  3 å·²æ’¤å›ž 4已处理" v-trim/>
      </el-form-item>
      <el-form-item label="排序码" prop="sortnum">
        <el-input v-model="form.sortnum" placeholder="请输入排序码" v-trim/>
      </el-form-item>
      <el-form-item label="类型 0位置责任人 1班长 2物业主管 3工程师 4SHE负责人 5SHE工单邮箱抄送人" prop="type">
        <el-input v-model="form.type" placeholder="请输入类型 0位置责任人 1班长 2物业主管 3工程师 4SHE负责人 5SHE工单邮箱抄送人" v-trim/>
      </el-form-item>
      <el-form-item label="上报人员编码（关联member)" prop="memberId">
        <el-input v-model="form.memberId" placeholder="请输入上报人员编码（关联member)" v-trim/>
      </el-form-item>
      <el-form-item label="部门编码" prop="companyId">
        <el-input v-model="form.companyId" placeholder="请输入部门编码" v-trim/>
      </el-form-item>
      <el-form-item label="上报时间" prop="submitDate">
        <el-input v-model="form.submitDate" placeholder="请输入上报时间" v-trim/>
      </el-form-item>
      <el-form-item label="SHE涉及人员类型 0本人 1同事 2供应商" prop="memberType">
        <el-input v-model="form.memberType" placeholder="请输入SHE涉及人员类型 0本人 1同事 2供应商" v-trim/>
      </el-form-item>
      <el-form-item label="SHE涉及人员企业编码集合" prop="memberQwids">
        <el-input v-model="form.memberQwids" placeholder="请输入SHE涉及人员企业编码集合" v-trim/>
      </el-form-item>
      <el-form-item label="SHE涉及人员供应商集合" prop="memberNames">
        <el-input v-model="form.memberNames" placeholder="请输入SHE涉及人员供应商集合" v-trim/>
      </el-form-item>
      <el-form-item label="发生地点/位置编码（关联category）" prop="localtionId">
        <el-input v-model="form.localtionId" placeholder="请输入发生地点/位置编码（关联category）" v-trim/>
      </el-form-item>
      <el-form-item label="是否外部就医 0否 1是" prop="outJiuyi">
        <el-input v-model="form.outJiuyi" placeholder="请输入是否外部就医 0否 1是" v-trim/>
      </el-form-item>
      <el-form-item label="是否医务室 0否 1是" prop="isYiwushi">
        <el-input v-model="form.isYiwushi" placeholder="请输入是否医务室 0否 1是" v-trim/>
      </el-form-item>
      <el-form-item label="是否受伤 0否 1是" prop="isHurted">
        <el-input v-model="form.isHurted" placeholder="请输入是否受伤 0否 1是" v-trim/>
      </el-form-item>
      <el-form-item label="是否和工作相关" prop="workRelated">
        <el-input v-model="form.workRelated" placeholder="请输入是否和工作相关" v-trim/>
      </el-form-item>
      <el-form-item label="事件说明" prop="eventInfo">
        <el-input v-model="form.eventInfo" placeholder="请输入事件说明" v-trim/>
      </el-form-item>
      <el-form-item label="邮件通知人员编码集合" prop="emialMemberIds">
        <el-input v-model="form.emialMemberIds" placeholder="请输入邮件通知人员编码集合" v-trim/>
      </el-form-item>
      <el-form-item label="企业微信通知人员编码集合" prop="qwnoticeMemberIds">
        <el-input v-model="form.qwnoticeMemberIds" placeholder="请输入企业微信通知人员编码集合" v-trim/>
      </el-form-item>
      <el-form-item label="发现时间" prop="happenTime">
        <el-input v-model="form.happenTime" placeholder="请输入发现时间" v-trim/>
      </el-form-item>
      <el-form-item label="风险类型(关联category）" prop="typeId">
        <el-date-picker v-model="form.typeId" value-format="yyyy-MM-dd" placeholder="请输入风险类型(关联category）"></el-date-picker>
      </el-form-item>
      <el-form-item label="风险描述" prop="riskInfo">
        <el-input v-model="form.riskInfo" placeholder="请输入风险描述" v-trim/>
      </el-form-item>
      <el-form-item label="当前物业主管编码（关联member）" prop="managerId">
        <el-input v-model="form.managerId" placeholder="请输入当前物业主管编码（关联member）" v-trim/>
      </el-form-item>
      <el-form-item label="当前处理人员编码（关联member)" prop="dealerId">
        <el-input v-model="form.dealerId" placeholder="请输入当前处理人员编码（关联member)" v-trim/>
      </el-form-item>
      <el-form-item label="分配时间" prop="dispatchTime">
        <el-date-picker v-model="form.dispatchTime" value-format="yyyy-MM-dd" placeholder="请输入分配时间"></el-date-picker>
      </el-form-item>
      <el-form-item label="分配备注" prop="dispatchInfo">
        <el-input v-model="form.dispatchInfo" placeholder="请输入分配备注" v-trim/>
      </el-form-item>
      <el-form-item label="处理时间" prop="dealTime">
        <el-date-picker v-model="form.dealTime" value-format="yyyy-MM-dd" placeholder="请输入处理时间"></el-date-picker>
      </el-form-item>
      <el-form-item label="处理备注" prop="dealInfo">
        <el-input v-model="form.dealInfo" placeholder="请输入处理备注" v-trim/>
      </el-form-item>
      <el-form-item label="DCA问题编码" prop="problemId">
        <el-input v-model="form.problemId" placeholder="请输入DCA问题编码" v-trim/>
      </el-form-item>
      <el-form-item label="DCA问题数量" prop="problemNum">
        <el-input v-model="form.problemNum" placeholder="请输入DCA问题数量" v-trim/>
      </el-form-item>
      <el-form-item label="位置地点路径名称" prop="locationName">
        <el-input v-model="form.locationName" placeholder="请输入位置地点路径名称" v-trim/>
      </el-form-item>
      <el-form-item label="工单号" prop="code">
        <el-input v-model="form.code" placeholder="请输入工单号" v-trim/>
      </el-form-item>
    </el-form>
  </GlobalWindow>
</template>

<script>
import BaseOpera from '@/components/base/BaseOpera'
import GlobalWindow from '@/components/common/GlobalWindow'
export default {
  name: 'OperaWorkorderWindow',
  extends: BaseOpera,
  components: { GlobalWindow },
  data () {
    return {
      // è¡¨å•æ•°æ®
      form: {
        id: null,
        creator: '',
        createDate: '',
        editor: '',
        editDate: '',
        isdeleted: '',
        categoryId: '',
        remark: '',
        status: '',
        sortnum: '',
        type: '',
        memberId: '',
        companyId: '',
        submitDate: '',
        memberType: '',
        memberQwids: '',
        memberNames: '',
        localtionId: '',
        outJiuyi: '',
        isYiwushi: '',
        isHurted: '',
        workRelated: '',
        eventInfo: '',
        emialMemberIds: '',
        qwnoticeMemberIds: '',
        happenTime: '',
        typeId: '',
        riskInfo: '',
        managerId: '',
        dealerId: '',
        dispatchTime: '',
        dispatchInfo: '',
        dealTime: '',
        dealInfo: '',
        problemId: '',
        problemNum: '',
        locationName: '',
        code: ''
      },
      // éªŒè¯è§„则
      rules: {
      }
    }
  },
  created () {
    this.config({
      api: '/business/workorder',
      'field.id': 'id'
    })
  },
  methods:{
    /**
     * æ‰“开窗口
     *
     * @param title çª—口标题
     * @param target è¡Œå¯¹è±¡ï¼ˆä»…编辑需该参数）
     */
    open (title, target) {
      this.title = title
      this.visible = true
      this.$nextTick(() => {
        for (const key in this.form) {
          this.form[key] = target[key]
        }
      })
    }
  }
}
</script>

 admin/src/layouts/AppLayout.vue

@@ -58,13 +58,14 @@
    display: flex;
    flex-direction: column;
    overflow: hidden;
    overflow-y: hidden !important;
    & > header {
      height: $header-height;
      flex-shrink: 0;
    }
    & > main {
      height: 100%;
      overflow-y: auto;
    /*  overflow-y: auto;*/
    }
  }
}

 admin/src/layouts/TableLayout.vue

@@ -1,14 +1,15 @@
<template>
  <div class="table-layout">
  <div class="table-layout" >
    <!-- å¤´éƒ¨ -->
    <div v-if="withBreadcrumb" class="table-header">
      <el-breadcrumb separator="/">
        <el-breadcrumb-item v-for="path in paths" :key="path">{{path}}</el-breadcrumb-item>
      </el-breadcrumb>
    </div>
    <!--    <div v-if="withBreadcrumb" class="table-header">
          <el-breadcrumb separator="/">
            <el-breadcrumb-item v-for="path in paths" :key="path">{{path}}</el-breadcrumb-item>
          </el-breadcrumb>
        </div>-->
    <!-- <div style="height:10px;"></div> -->
    <Profile :roles="roles" :permissions="permissions">
      <!-- æœç´¢è¡¨å•éƒ¨åˆ† -->
      <div class="table-search-form">
      <div class="table-search-form" ref="tableSearchForm">
        <div class="form-wrap">
          <slot name="search-form"></slot>
        </div>
@@ -49,19 +50,39 @@
    paths () {
      return this.$route.meta.paths
    }
  },
  mounted() {

  }
}
</script>

<style lang="scss">
@import "@/assets/style/variables.scss";
/*.el-container .el-main[data-v-5b01577c] {
  width: 100%;
  height: calc(100vh - 68px);
  padding: 0;
  position: relative;
  display: flex
;
  flex-direction: column;
  overflow-y: scroll;
  overflow-x: hidden;
  scrollbar-width: none;
  -ms-overflow-style: none;
}*/
.table-layout {
  height: 100%;
  height: calc(100%-10px);
  display: flex;
  flex-direction: column;
  margin-top: 10px;
  .not-allow-wrap {
    padding-top: 0;
  }
}
.danger-column{
  color: red;
}
// å¤´éƒ¨
.table-header {
@@ -87,13 +108,11 @@
  display: flex;
  flex-wrap: wrap;
  padding: 0 16px;
  margin-bottom: 10px;
  .form-wrap {
    padding: 16px 16px 0 16px;
    width: 100%;
    background: #fff;
    .el-form-item__content {
      min-width: 192px;
    }
    &:empty {
      padding: 0;
    }
@@ -106,10 +125,9 @@
}
// åˆ—表和分页
.table-content {
  margin-top: 10px;
  padding: 0 16px;
  .table-wrap {
    padding: 16px 16px 0 16px;
    padding: 16px 16px 60px 16px;
    background: #fff;
    // å·¥å…·æ 
    .toolbar {
@@ -122,24 +140,17 @@
    }
    // è¡¨æ ¼
    .el-table {
      //min-height: 300px;
      overflow: auto;
      th {
        .cell {
          color: #666;
        }
      }
      td {
        .cell {
          min-height: 32px;
          line-height: 20px;
          display: flex;
          align-items: center;
        }
      }
      // å¤é€‰æ¡†åˆ—
      .el-table-column--selection {
        .cell {
          text-align: center !important;
          justify-content: center;
        }
      }
      // å¤šå€¼å­—段
@@ -164,8 +175,17 @@
    }
    // åˆ†é¡µ
    .table-pagination {
      padding: 16px 0;
      margin-left: 0px;
      padding: 16px 0px;
      text-align: left;
      display: block;
      z-index: 100;
      width: -webkit-fill-available;
      /* width: 80%; */
      position: fixed;
      bottom: 0px;
      background-color: white;
      margin-right: 50px;
    }
  }
}

 admin/src/layouts/TableLayout1.vue

@@ -1,34 +1,34 @@
<template>
    <div class="table-layout">
        <!-- å¤´éƒ¨ -->
<!--        <div v-if="withBreadcrumb" class="table-header">
            <el-breadcrumb separator="/">
                <el-breadcrumb-item v-for="path in paths" :key="path">{{path}}</el-breadcrumb-item>
            </el-breadcrumb>
        </div>-->
        <Profile :roles="roles" :permissions="permissions">
            <div style="width: 100%; height: 100%; padding: 0 16px; box-sizing: border-box; display: flex; align-items: center; justify-content: space-between;">
                <div style="width: 240px; height: 100%; flex-shrink: 0; background: #ffffff;">
                    <slot name="menu"></slot>
                </div>
                <div style="width: calc(100% - 250px); height: 100%">
                    <!-- æœç´¢è¡¨å•éƒ¨åˆ† -->
                    <div class="table-search-form" style="padding: 0 !important;">
                        <div class="form-wrap">
                            <slot name="search-form"></slot>
                        </div>
                    </div>
                    <slot name="space"></slot>
                    <!-- åˆ—表和分页部分 -->
                    <div class="table-content" style="padding: 0 !important;">
                        <div class="table-wrap">
                            <slot name="table-wrap"></slot>
                        </div>
                    </div>
                </div>
  <div class="table-layout">
    <!-- å¤´éƒ¨ -->
    <!--        <div v-if="withBreadcrumb" class="table-header">
                <el-breadcrumb separator="/">
                    <el-breadcrumb-item v-for="path in paths" :key="path">{{path}}</el-breadcrumb-item>
                </el-breadcrumb>
            </div>-->
    <Profile :roles="roles" :permissions="permissions">
      <div style="width: 100%; height: 100%; padding: 0 16px; box-sizing: border-box; display: flex; align-items: center; justify-content: space-between;">
        <div style="width: 240px; height: 100%; flex-shrink: 0; background: #ffffff;">
          <slot name="menu"></slot>
        </div>
        <div style="width: calc(100% - 250px); height: 100%">
          <!-- æœç´¢è¡¨å•éƒ¨åˆ† -->
          <div class="table-search-form" style="padding: 0 !important;">
            <div class="form-wrap">
              <slot name="search-form"></slot>
            </div>
        </Profile>
    </div>
          </div>
          <slot name="space"></slot>
          <!-- åˆ—表和分页部分 -->
          <div class="table-content" style="padding: 0 !important;">
            <div class="table-wrap">
              <slot name="table-wrap"></slot>
            </div>
          </div>
        </div>
      </div>
    </Profile>
  </div>
</template>

<script>
@@ -60,116 +60,116 @@
</script>

<style lang="scss">
    @import "@/assets/style/variables.scss";
    .table-layout {
        height: 100%;
        display: flex;
        flex-direction: column;
        .not-allow-wrap {
            padding-top: 0;
        }
@import "@/assets/style/variables.scss";
.table-layout {
  height: 100%;
  display: flex;
  flex-direction: column;
  .not-allow-wrap {
    padding-top: 20;
  }
}
// å¤´éƒ¨
.table-header {
  overflow: hidden;
  padding: 12px 16px;
  flex-shrink: 0;
  // é¡µé¢è·¯å¾„
  .el-breadcrumb {
    .el-breadcrumb__item {
      .el-breadcrumb__inner {
        color: #ABB2BE;
        font-size: 12px;
      }
      &:last-of-type .el-breadcrumb__inner {
        color: #606263;
        font-size: 14px;
      }
    }
    // å¤´éƒ¨
    .table-header {
        overflow: hidden;
        padding: 12px 16px;
        flex-shrink: 0;
        // é¡µé¢è·¯å¾„
        .el-breadcrumb {
            .el-breadcrumb__item {
                .el-breadcrumb__inner {
                    color: #ABB2BE;
                    font-size: 12px;
                }
                &:last-of-type .el-breadcrumb__inner {
                    color: #606263;
                    font-size: 14px;
                }
            }
        }
  }
}
// æœç´¢
.table-search-form {
  display: flex;
  flex-wrap: wrap;
  /*padding: 0 16px;*/
  /*box-sizing: border-box;*/
  .form-wrap {
    padding: 16px 16px 0 16px;
    width: 100%;
    background: #fff;
    &:empty {
      padding: 0;
    }
    // æœç´¢
    .table-search-form {
        display: flex;
        flex-wrap: wrap;
        /*padding: 0 16px;*/
        /*box-sizing: border-box;*/
        .form-wrap {
            padding: 16px 16px 0 16px;
            width: 100%;
            background: #fff;
            &:empty {
                padding: 0;
            }
  }
  section {
    display: inline-block;
    margin-left: 16px;
    margin-bottom: 18px;
  }
}
// åˆ—表和分页
.table-content {
  /*padding: 0 16px;*/
  .table-wrap {
    padding: 16px 16px 60px 16px;
    background: #fff;
    // å·¥å…·æ 
    .toolbar {
      border-bottom: 1px solid #eee;
      padding-bottom: 10px;
      li {
        display: inline-block;
        margin-right: 6px;
      }
    }
    // è¡¨æ ¼
    .el-table {
      th {
        .cell {
          color: #666;
        }
        section {
      }
      // å¤é€‰æ¡†åˆ—
      .el-table-column--selection {
        .cell {
          text-align: center !important;
        }
      }
      // å¤šå€¼å­—段
      .table-column-strings {
        ul {
          li {
            display: inline-block;
            margin-left: 16px;
            margin-bottom: 18px;
            background: #eee;
            border-radius: 3px;
            padding: 0 3px;
            margin-right: 3px;
            margin-bottom: 3px;
          }
        }
      }
      // æ ‘视觉调整
      [class*=el-table__row--level] .el-table__expand-icon {
        position: relative;
        left: -6px;
        margin-right: 0;
      }
    }
    // åˆ—表和分页
    .table-content {
        /*padding: 0 16px;*/
        .table-wrap {
            padding: 16px 16px 60px 16px;
            background: #fff;
            // å·¥å…·æ 
            .toolbar {
                border-bottom: 1px solid #eee;
                padding-bottom: 10px;
                li {
                    display: inline-block;
                    margin-right: 6px;
                }
            }
            // è¡¨æ ¼
            .el-table {
                th {
                    .cell {
                        color: #666;
                    }
                }
                // å¤é€‰æ¡†åˆ—
                .el-table-column--selection {
                    .cell {
                        text-align: center !important;
                    }
                }
                // å¤šå€¼å­—段
                .table-column-strings {
                    ul {
                        li {
                            display: inline-block;
                            background: #eee;
                            border-radius: 3px;
                            padding: 0 3px;
                            margin-right: 3px;
                            margin-bottom: 3px;
                        }
                    }
                }
                // æ ‘视觉调整
                [class*=el-table__row--level] .el-table__expand-icon {
                    position: relative;
                    left: -6px;
                    margin-right: 0;
                }
            }
            // åˆ†é¡µ
            .table-pagination {
              margin-left: 0px;
              padding: 16px 0px ;
              text-align: left;
              display: block;
              z-index: 100;
              width: -webkit-fill-available;
              /* width: 80%; */
               position: fixed;
              bottom: 0px;
              background-color: white;
              margin-right: 50px;
            }
        }
    // åˆ†é¡µ
    .table-pagination {
      margin-left: 0px;
      padding: 16px 0px ;
      text-align: left;
      display: block;
      z-index: 100;
      width: -webkit-fill-available;
      /* width: 80%; */
      position: fixed;
      bottom: 0px;
      background-color: white;
      margin-right: 50px;
    }
  }
}
</style>

 admin/src/views/business/categoryDbhLocaltion.vue

@@ -17,7 +17,7 @@
      <div
        style="width: 100%; height: 50px; background: rgba(242, 242, 242, 1); line-height: 50px; text-align: center; font-size: 14px;">
        è·Œç»Šæ»‘风险发生地点</div>
      <div style="width: 100%; height: calc(100vh - 170px); overflow-y: scroll;">
      <div style="width: 100%; height: calc(100vh - 130px); overflow-y: scroll;">
        <Tree :list="treeList" :alllist="treeList"  :defaultProps="{ name: 'name', status: 'fsStatus', children: 'childList', id: 'id' }"
          @callback="callback" />
      </div>
@@ -30,7 +30,7 @@
                       v-permissions="['business:category:create']">新建</el-button></li>
        <li><el-button type="danger" @click="deleteByIdInBatch(true,getfindTreePage)" icon="el-icon-delete" v-permissions="['business:category:delete']">批量删除</el-button></li>
      </ul>
      <el-table   v-loading="isWorking.search" :data="tableData.list" stripe @selection-change="handleSelectionChange">
      <el-table :height="tableHeightNew"  v-loading="isWorking.search" :data="tableData.list" stripe @selection-change="handleSelectionChange">
        <el-table-column type="selection" width="55"></el-table-column>
        <el-table-column prop="name" label="名称" min-width="100px"></el-table-column>
        <el-table-column prop="parentName" label="父级" min-width="150px"></el-table-column>

 admin/src/views/business/categoryDbhType.vue

@@ -17,7 +17,7 @@
      <div
        style="width: 100%; height: 50px; background: rgba(242, 242, 242, 1); line-height: 50px; text-align: center; font-size: 14px;">
        è·Œç»Šæ»‘风险类型</div>
      <div style="width: 100%; height: calc(100vh - 170px); overflow-y: scroll;">
      <div style="width: 100%; height: calc(100vh - 130px); overflow-y: scroll;">
        <Tree :list="treeList" :alllist="treeList"  :defaultProps="{ name: 'name', status: 'fsStatus', children: 'childList', id: 'id' }"
          @callback="callback" />
      </div>
@@ -30,7 +30,7 @@
                       v-permissions="['business:category:create']">新建</el-button></li>
        <li><el-button type="danger" @click="deleteByIdInBatch(true,getfindTreePage)" icon="el-icon-delete" v-permissions="['business:category:delete']">批量删除</el-button></li>
      </ul>
      <el-table   v-loading="isWorking.search" :data="tableData.list" stripe @selection-change="handleSelectionChange">
      <el-table  :height="tableHeightNew" v-loading="isWorking.search" :data="tableData.list" stripe @selection-change="handleSelectionChange">
        <el-table-column type="selection" width="55"></el-table-column>
        <el-table-column prop="name" label="名称" min-width="100px"></el-table-column>
        <el-table-column prop="parentName" label="父级" min-width="150px"></el-table-column>

 admin/src/views/business/categoryDcaLocaltion.vue

@@ -17,7 +17,7 @@
      <div
        style="width: 100%; height: 50px; background: rgba(242, 242, 242, 1); line-height: 50px; text-align: center; font-size: 14px;">
        DCA事件位置</div>
      <div style="width: 100%; height: calc(100vh - 170px); overflow-y: scroll;">
      <div style="width: 100%; height: calc(100vh - 130px); overflow-y: scroll;">
        <Tree :list="treeList" :alllist="treeList"  :defaultProps="{ name: 'name', status: 'fsStatus', children: 'childList', id: 'id' }"
          @callback="callback" />
      </div>
@@ -30,7 +30,7 @@
                       v-permissions="['business:category:create']">新建</el-button></li>
        <li><el-button type="danger" @click="deleteByIdInBatch(true,getfindTreePage)" icon="el-icon-delete" v-permissions="['business:category:delete']">批量删除</el-button></li>
      </ul>
      <el-table   v-loading="isWorking.search" :data="tableData.list" stripe @selection-change="handleSelectionChange">
      <el-table  :height="tableHeightNew" v-loading="isWorking.search" :data="tableData.list" stripe @selection-change="handleSelectionChange">
        <el-table-column type="selection" width="55"></el-table-column>
        <el-table-column prop="name" label="名称" min-width="100px"></el-table-column>
        <el-table-column prop="parentName" label="父级" min-width="150px"></el-table-column>

 admin/src/views/business/categoryDcaProblem.vue

@@ -17,7 +17,7 @@
      <div
        style="width: 100%; height: 50px; background: rgba(242, 242, 242, 1); line-height: 50px; text-align: center; font-size: 14px;">
        DCA主题</div>
      <div style="width: 100%; height: calc(100vh - 170px); overflow-y: scroll;">
      <div style="width: 100%; height: calc(100vh - 130px); overflow-y: scroll;">
        <Tree :list="treeList" :alllist="treeList"  :defaultProps="{ name: 'name', status: 'fsStatus', children: 'childList', id: 'id' }"
          @callback="callback" />
      </div>
@@ -30,7 +30,7 @@
                       v-permissions="['business:category:create']">新建</el-button></li>
        <li><el-button type="danger" @click="deleteByIdInBatch(true,getfindTreePage)" icon="el-icon-delete" v-permissions="['business:category:delete']">批量删除</el-button></li>
      </ul>
      <el-table   v-loading="isWorking.search" :data="tableData.list" stripe @selection-change="handleSelectionChange">
      <el-table  :height="tableHeightNew" v-loading="isWorking.search" :data="tableData.list" stripe @selection-change="handleSelectionChange">
        <el-table-column type="selection" width="55"></el-table-column>
        <el-table-column prop="name" label="名称" min-width="100px"></el-table-column>
        <el-table-column prop="parentName" label="所属父级" min-width="150px"></el-table-column>

 admin/src/views/business/categorySheLocaltion.vue

@@ -17,7 +17,7 @@
      <div
        style="width: 100%; height: 50px; background: rgba(242, 242, 242, 1); line-height: 50px; text-align: center; font-size: 14px;">
        SHE事件发生地点</div>
      <div style="width: 100%; height: calc(100vh - 170px); overflow-y: scroll;">
      <div style="width: 100%; height: calc(100vh - 130px); overflow-y: scroll;">
        <Tree :list="treeList" :alllist="treeList"  :defaultProps="{ name: 'name', status: 'fsStatus', children: 'childList', id: 'id' }"
          @callback="callback" />
      </div>
@@ -30,7 +30,7 @@
                       v-permissions="['business:category:create']">新建</el-button></li>
        <li><el-button type="danger" @click="deleteByIdInBatch(true,getfindTreePage)" icon="el-icon-delete" v-permissions="['business:category:delete']">批量删除</el-button></li>
      </ul>
      <el-table   v-loading="isWorking.search" :data="tableData.list" stripe @selection-change="handleSelectionChange">
      <el-table  :height="tableHeightNew" v-loading="isWorking.search" :data="tableData.list" stripe @selection-change="handleSelectionChange">
        <el-table-column type="selection" width="55"></el-table-column>
        <el-table-column prop="name" label="名称" min-width="100px"></el-table-column>
        <el-table-column prop="parentName" label="父级" min-width="150px"></el-table-column>

 admin/src/views/business/categorySheType.vue

@@ -17,7 +17,7 @@
      <div
        style="width: 100%; height: 50px; background: rgba(242, 242, 242, 1); line-height: 50px; text-align: center; font-size: 14px;">
        ä¼¤å®³ç±»åž‹</div>
      <div style="width: 100%; height: calc(100vh - 170px); overflow-y: scroll;">
      <div style="width: 100%; height: calc(100vh - 130px); overflow-y: scroll;">
        <Tree :list="treeList" :alllist="treeList"  :defaultProps="{ name: 'name', status: 'fsStatus', children: 'childList', id: 'id' }"
          @callback="callback" />
      </div>
@@ -30,7 +30,7 @@
                       v-permissions="['business:category:create']">新建</el-button></li>
        <li><el-button type="danger" @click="deleteByIdInBatch(true,getfindTreePage)" icon="el-icon-delete" v-permissions="['business:category:delete']">批量删除</el-button></li>
      </ul>
      <el-table   v-loading="isWorking.search" :data="tableData.list" stripe @selection-change="handleSelectionChange">
      <el-table  :height="tableHeightNew" v-loading="isWorking.search" :data="tableData.list" stripe @selection-change="handleSelectionChange">
        <el-table-column type="selection" width="55"></el-table-column>
        <el-table-column prop="name" label="名称" min-width="100px"></el-table-column>
        <el-table-column prop="parentName" label="父级" min-width="150px"></el-table-column>

 admin/src/views/business/company.vue

@@ -4,7 +4,7 @@
      <ul class="toolbar" v-permissions="['business:company:create', 'business:company:sync']">
        <li><el-button type="primary" v-permissions="['business:company:create']" :loading="loading"  @click="synchronous()">全量同步企业微信组织</el-button></li>
      </ul>
      <el-table  v-loading="isWorking.search" :data="list" stripe
      <el-table :height="tableHeightNew" v-loading="isWorking.search" :data="list" stripe
                :tree-props="{ children: 'childList', hasChildren: 'hasChildren' }" row-key="id"
                @selection-change="handleSelectionChange" default-expand-all>
        <el-table-column type="selection" width="55"></el-table-column>

 admin/src/views/business/companyMember.vue

@@ -16,8 +16,8 @@
      <div
        style="width: 100%; height: 50px; background: rgba(242, 242, 242, 1); line-height: 50px; text-align: center; font-size: 14px;">
        ä¼ä¸šç»„织</div>
      <div style="width: 100%; height: calc(100vh - 170px); overflow-y: scroll;">
        <Tree :list="companyTree" :defaultProps="{ name: 'name', status: 'fsStatus', children: 'childList', id: 'id' }"
      <div style="width: 100%; height: calc(100vh - 130px); overflow-y: scroll;">
        <Tree :list="companyTree" :alllist="companyTree" :defaultProps="{ name: 'name', status: 'fsStatus', children: 'childList', id: 'id' }"
          @callback="callback" />
      </div>
    </template>
@@ -30,7 +30,7 @@
            @change="search">是否包含下级组织</el-checkbox>
        </li>
      </ul>
      <el-table   v-loading="isWorking.search" :data="tableData.list" stripe @selection-change="handleSelectionChange">
      <el-table :height="tableHeightNew"  v-loading="isWorking.search" :data="tableData.list" stripe @selection-change="handleSelectionChange">
        <el-table-column type="selection" width="55"></el-table-column>
        <el-table-column fixed="left" prop="name" label="姓名" min-width="80px">
          <template slot-scope="{row}">

 admin/src/views/business/managersDca.vue

@@ -19,6 +19,7 @@
        <li><el-button @click="deleteByIdInBatch" icon="el-icon-delete" v-permissions="['business:managers:delete']">删除</el-button></li>
      </ul>
      <el-table
          :height="tableHeightNew"
        v-loading="isWorking.search"
        :data="tableData.list"
        stripe

 admin/src/views/business/managersDcaAuth.vue

@@ -19,6 +19,7 @@
        <li><el-button @click="deleteByIdInBatch" icon="el-icon-delete" v-permissions="['business:managers:delete']">删除</el-button></li>
      </ul>
      <el-table
          :height="tableHeightNew"
        v-loading="isWorking.search"
        :data="tableData.list"
        stripe

 admin/src/views/business/managersShe.vue

@@ -19,6 +19,7 @@
        <li><el-button @click="deleteByIdInBatch" icon="el-icon-delete" v-permissions="['business:managers:delete']">删除</el-button></li>
      </ul>
      <el-table
          :height="tableHeightNew"
        v-loading="isWorking.search"
        :data="tableData.list"
        stripe

 admin/src/views/business/managersSheNotice.vue

@@ -19,6 +19,7 @@
        <li><el-button @click="deleteByIdInBatch" icon="el-icon-delete" v-permissions="['business:managers:delete']">删除</el-button></li>
      </ul>
      <el-table
          :height="tableHeightNew"
        v-loading="isWorking.search"
        :data="tableData.list"
        stripe

 admin/src/views/business/workorderShe.vue

@@ -1,31 +1,18 @@
<template>
  <TableLayout :permissions="['business:workorder:query']">
    <!-- æœç´¢è¡¨å• -->
    <SearchFormCollapse slot="search-form">
    <div slot="search-form">
      <el-form ref="searchForm" :model="searchForm" label-width="100px" inline>
        <el-form-item label="所属分类编（关联category)" prop="categoryId">
          <el-input v-model="searchForm.categoryId" placeholder="请输入所属分类编（关联category)" @keypress.enter.native="search"></el-input>
        <el-form-item label="伤害类型" prop="typeId">
          <el-cascader  v-model="searchForm.categoryList" :options="categorys" @change="handleChangeCategory" :show-all-levels="false"
                        clearable filterable :props="categoryprops"  >
            <template slot-scope="{ node, data }">
              <span>{{ data.name }}</span> <!-- è‡ªå®šä¹‰æ˜¾ç¤ºå†…容 -->
            </template>
          </el-cascader>
        </el-form-item>
        <el-form-item label="上报人员编码（关联member)" prop="memberId">
          <el-input v-model="searchForm.memberId" placeholder="请输入上报人员编码（关联member)" @keypress.enter.native="search"></el-input>
        </el-form-item>
        <el-form-item label="部门编码" prop="companyId">
          <el-input v-model="searchForm.companyId" placeholder="请输入部门编码" @keypress.enter.native="search"></el-input>
        </el-form-item>
        <el-form-item label="SHE涉及人员类型 0本人 1同事 2供应商" prop="memberType">
          <el-input v-model="searchForm.memberType" placeholder="请输入SHE涉及人员类型 0本人 1同事 2供应商" @keypress.enter.native="search"></el-input>
        </el-form-item>
        <el-form-item label="SHE涉及人员供应商集合" prop="memberNames">
          <el-input v-model="searchForm.memberNames" placeholder="请输入SHE涉及人员供应商集合" @keypress.enter.native="search"></el-input>
        </el-form-item>
        <el-form-item label="发生地点/位置编码（关联category）" prop="localtionId">
          <el-input v-model="searchForm.localtionId" placeholder="请输入发生地点/位置编码（关联category）" @keypress.enter.native="search"></el-input>
        </el-form-item>
        <el-form-item label="风险类型(关联category）" prop="typeId">
          <el-date-picker v-model="searchForm.typeId" value-format="yyyy-MM-dd" placeholder="请输入风险类型(关联category）" @change="search"/>
        </el-form-item>
        <el-form-item label="位置地点路径名称" prop="locationName">
          <el-input v-model="searchForm.locationName" placeholder="请输入位置地点路径名称" @keypress.enter.native="search"></el-input>
        <el-form-item label="上报人员" prop="memberName">
          <el-input v-model="searchForm.memberName" placeholder="人员姓名或手机号" @keypress.enter.native="search"></el-input>
        </el-form-item>
        <el-form-item label="工单号" prop="code">
          <el-input v-model="searchForm.code" placeholder="请输入工单号" @keypress.enter.native="search"></el-input>
@@ -35,58 +22,69 @@
          <el-button @click="reset">重置</el-button>
        </section>
      </el-form>
    </SearchFormCollapse>
    </div>
    <!-- è¡¨æ ¼å’Œåˆ†é¡µ -->
    <template v-slot:table-wrap>
      <ul class="toolbar" v-permissions="['business:workorder:create', 'business:workorder:delete']">
        <li><el-button type="primary" @click="$refs.operaWorkorderWindow.open('新建工单信息表')" icon="el-icon-plus" v-permissions="['business:workorder:create']">新建</el-button></li>
        <li><el-button @click="deleteByIdInBatch" icon="el-icon-delete" v-permissions="['business:workorder:delete']">删除</el-button></li>
      <ul class="toolbar" v-permissions="['business:workorder:exportExcel']">
        <li> <el-button type="primary" :loading="isWorking.export" @click="exportExcel">导出</el-button></li>
      </ul>
      <el-table
        :height="tableHeightNew"
        v-loading="isWorking.search"
        :data="tableData.list"
        stripe
        @selection-change="handleSelectionChange"
      >
        <el-table-column type="selection" width="55"></el-table-column>
        <el-table-column prop="id" label="主键" min-width="100px"></el-table-column>
        <el-table-column prop="creator" label="创建人编码" min-width="100px"></el-table-column>
        <el-table-column prop="createDate" label="创建时间" min-width="100px"></el-table-column>
        <el-table-column prop="editor" label="更新人编码" min-width="100px"></el-table-column>
        <el-table-column prop="editDate" label="更新时间" min-width="100px"></el-table-column>
        <el-table-column prop="isdeleted" label="是否删除0否 1是" min-width="100px"></el-table-column>
        <el-table-column prop="categoryId" label="所属分类编（关联category)" min-width="100px"></el-table-column>
        <el-table-column prop="remark" label="备注" min-width="100px"></el-table-column>
        <el-table-column prop="status" label="状态 0待确认/待初审 1待分配/待终审 2待处理  3 å·²æ’¤å›ž 4已处理" min-width="100px"></el-table-column>
        <el-table-column prop="sortnum" label="排序码" min-width="100px"></el-table-column>
        <el-table-column prop="type" label="类型 0位置责任人 1班长 2物业主管 3工程师 4SHE负责人 5SHE工单邮箱抄送人" min-width="100px"></el-table-column>
        <el-table-column prop="memberId" label="上报人员编码（关联member)" min-width="100px"></el-table-column>
        <el-table-column prop="companyId" label="部门编码" min-width="100px"></el-table-column>
        <el-table-column prop="code"  label="工单号" min-width="100px" fixed>
          <template slot-scope="{row}">
            <span style="color: #2E68EC;cursor: pointer" @click="$refs.operaWorkorderWindow.open('SHE事件工单详情', row)" >{{ row.code || '-'}}</span>
          </template>
        </el-table-column>
        <el-table-column prop="typeName" label="伤害类型" min-width="100px"></el-table-column>
        <el-table-column prop="submitDate" label="上报时间" min-width="100px"></el-table-column>
        <el-table-column prop="memberType" label="SHE涉及人员类型 0本人 1同事 2供应商" min-width="100px"></el-table-column>
        <el-table-column prop="memberQwids" label="SHE涉及人员企业编码集合" min-width="100px"></el-table-column>
        <el-table-column prop="memberNames" label="SHE涉及人员供应商集合" min-width="100px"></el-table-column>
        <el-table-column prop="localtionId" label="发生地点/位置编码（关联category）" min-width="100px"></el-table-column>
        <el-table-column prop="outJiuyi" label="是否外部就医 0否 1是" min-width="100px"></el-table-column>
        <el-table-column prop="isYiwushi" label="是否医务室 0否 1是" min-width="100px"></el-table-column>
        <el-table-column prop="isHurted" label="是否受伤 0否 1是" min-width="100px"></el-table-column>
        <el-table-column prop="workRelated" label="是否和工作相关" min-width="100px"></el-table-column>
        <el-table-column prop="status" label="状态" min-width="100px">
          <template slot-scope="{row}">
            <span v-if="row.status ==0">待处理</span>
            <span v-else-if="row.status ==4">已处理</span>
            <span v-else-if="row.status ==3">已关闭</span>
            <span v-else>处理中</span>
          </template>
        </el-table-column>
        <el-table-column prop="memberName" label="上报人员" min-width="100px">
          <template slot-scope="{row}">
            <span >{{row.memberName}} - {{row.memberPhone||''}}</span>
          </template>
        </el-table-column>
        <el-table-column prop="companyName" label="所在部门" min-width="100px"></el-table-column>
        <el-table-column prop="memberType" label="涉及人员" min-width="100px">
          <template slot-scope="{row}">
            <span v-if="row.memberType == 2">供应商-{{row.memberNames}}</span>
            <span v-else-if="row.memberType == 1">同事-{{row.memberNames}}</span>
            <span v-else>本人</span>
          </template>
        </el-table-column>
        <el-table-column prop="localtionName" label="发生地点" min-width="100px"></el-table-column>
          <el-table-column prop="outJiuyi" label="就医情况" min-width="100px">
            <template slot-scope="{row}">
              <span v-if="row.outJiuyi == 1">外部就医-
                  <span v-if="row.isYiwushi == 1">医务室-
                     <span v-if="row.isHurted == 1">受伤</span>
                     <span v-else>未受伤</span>
                  </span>
                   <span v-else>非医务室</span>
              </span>
              <span v-else>非外部就医</span>
            </template>
          </el-table-column>
          <el-table-column prop="workRelated" label="和工作相关" min-width="100px">
            <template slot-scope="{row}">
              <span v-if="row.workRelated == 1">是</span>
              <span v-else>否</span>
            </template>
          </el-table-column>
        <el-table-column prop="eventInfo" label="事件说明" min-width="100px"></el-table-column>
        <el-table-column prop="emialMemberIds" label="邮件通知人员编码集合" min-width="100px"></el-table-column>
        <el-table-column prop="qwnoticeMemberIds" label="企业微信通知人员编码集合" min-width="100px"></el-table-column>
        <el-table-column prop="happenTime" label="发现时间" min-width="100px"></el-table-column>
        <el-table-column prop="typeId" label="风险类型(关联category）" min-width="100px"></el-table-column>
        <el-table-column prop="riskInfo" label="风险描述" min-width="100px"></el-table-column>
        <el-table-column prop="managerId" label="当前物业主管编码（关联member）" min-width="100px"></el-table-column>
        <el-table-column prop="dealerId" label="当前处理人员编码（关联member)" min-width="100px"></el-table-column>
        <el-table-column prop="dispatchTime" label="分配时间" min-width="100px"></el-table-column>
        <el-table-column prop="dispatchInfo" label="分配备注" min-width="100px"></el-table-column>
        <el-table-column prop="dealTime" label="处理时间" min-width="100px"></el-table-column>
        <el-table-column prop="dealInfo" label="处理备注" min-width="100px"></el-table-column>
        <el-table-column prop="problemId" label="DCA问题编码" min-width="100px"></el-table-column>
        <el-table-column prop="problemNum" label="DCA问题数量" min-width="100px"></el-table-column>
        <el-table-column prop="locationName" label="位置地点路径名称" min-width="100px"></el-table-column>
        <el-table-column prop="code" label="工单号" min-width="100px"></el-table-column>
        <el-table-column prop="remark" label="备注" min-width="100px"></el-table-column>
        <el-table-column prop="createDate" label="创建时间" min-width="100px"></el-table-column>
        <el-table-column
          v-if="containPermissions(['business:workorder:update', 'business:workorder:delete'])"
          label="操作"
@@ -94,8 +92,8 @@
          fixed="right"
        >
          <template slot-scope="{row}">
            <el-button type="text" @click="$refs.operaWorkorderWindow.open('编辑工单信息表', row)" icon="el-icon-edit" v-permissions="['business:workorder:update']">编辑</el-button>
            <el-button type="text" @click="deleteById(row)" icon="el-icon-delete" v-permissions="['business:workorder:delete']">删除</el-button>
            <el-button type="text" @click="$refs.operaWorkorderWindow.open('SHE事件工单详情', row)" icon="el-icon-edit" >查看详情</el-button>
          <!--<el-button type="text" @click="deleteById(row)" icon="el-icon-delete" v-permissions="['business:workorder:delete']">删除</el-button>-->
          </template>
        </el-table-column>
      </el-table>
@@ -107,63 +105,39 @@
      </pagination>
    </template>
    <!-- æ–°å»º/修改 -->
    <OperaWorkorderWindow ref="operaWorkorderWindow" @success="handlePageChange"/>
    <OperaWorkorderDetailSheWindow ref="operaWorkorderWindow" @success="handlePageChange"/>
  </TableLayout>
</template>

<script>
import BaseTable from '@/components/base/BaseTable'
import TableLayout from '@/layouts/TableLayout'
import SearchFormCollapse from '@/components/common/SearchFormCollapse'
import Pagination from '@/components/common/Pagination'
import OperaWorkorderWindow from '@/components/business/OperaWorkorderWindow'
import OperaWorkorderDetailSheWindow from '@/components/business/OperaWorkorderDetailSheWindow'
import { treeList } from '@/api/business/category'
export default {
  name: 'Workorder',
  extends: BaseTable,
  components: { SearchFormCollapse, TableLayout, Pagination, OperaWorkorderWindow },
  components: {TableLayout, Pagination, OperaWorkorderDetailSheWindow },
  data () {
    return {
      // æœç´¢
      searchForm: {
        id: '',
        creator: '',
        createDate: '',
        editor: '',
        editDate: '',
        isdeleted: '',
        categoryId: '',
        remark: '',
        status: '',
        sortnum: '',
        type: '',
        memberId: '',
        companyId: '',
        submitDate: '',
        memberType: '',
        memberQwids: '',
        memberNames: '',
        type: '0',
        memberName: '',
        memberCompanyId: '',
        localtionId: '',
        outJiuyi: '',
        isYiwushi: '',
        isHurted: '',
        workRelated: '',
        eventInfo: '',
        emialMemberIds: '',
        qwnoticeMemberIds: '',
        happenTime: '',
        typeId: '',
        riskInfo: '',
        managerId: '',
        dealerId: '',
        dispatchTime: '',
        dispatchInfo: '',
        dealTime: '',
        dealInfo: '',
        problemId: '',
        problemNum: '',
        locationName: '',
        code: ''
      }
        code: '',
        categoryList: []
      },
      categoryprops: {
        label: 'name',
        value: 'id',
        checkStrictly: true,
        lazyLoad: this.lazyLoad
      },
      categorys: []
    }
  },
  created () {
@@ -173,7 +147,42 @@
      'field.id': 'id',
      'field.main': 'id'
    })
    this.loadCategorys()
    this.search()
  },
  methods: {
    handleChangeCategory (value) {
      if (this.searchForm.categoryList && this.searchForm.categoryList.length >= 1) {
        this.searchForm.typeId = this.searchForm.categoryList[this.searchForm.categoryList.length - 1]
      }
    },
    loadCategorys () {
      treeList({ type: 0 })
        .then(res => {
          if (res && res.length > 0) {
            res[0].fsStatus = 1
            this.categorys = this.getCategoryTree(res)
          }
        })
    },
    getCategoryTree (tree) {
      if (tree == null) {
        return []
      }
      return tree.map(item => {
        const newItem = { ...item }
        if (newItem) {
          newItem.children = newItem.childList
        }
        if (item.children && item.children.length === 0) {
          this.$delete(newItem, 'children')
        } else {
          newItem.children = this.getCategoryTree(newItem.children)
        }
        // newItem.disabled = false
        return newItem
      })
    }
  }
}
</script>

 admin/src/views/system/dict.vue

@@ -20,6 +20,7 @@
        <li><el-button @click="deleteByIdInBatch" icon="el-icon-delete" v-permissions="['system:dict:delete']">删除</el-button></li>
      </ul>
      <el-table
          :height="tableHeightNew"
        v-loading="isWorking.search"
        :data="tableData.list"
        :default-sort = "{prop: 'createTime', order: 'descending'}"

 admin/src/views/system/job-log.vue

@@ -50,6 +50,7 @@
        <li><el-button @click="deleteByIdInBatch" icon="el-icon-delete" v-permissions="['system:job:log:delete']">删除</el-button></li>
      </ul>
      <el-table
          :height="tableHeightNew"
        v-loading="isWorking.search"
        :data="tableData.list"
        stripe

 admin/src/views/system/login-log.vue

@@ -37,6 +37,7 @@
    <!-- è¡¨æ ¼å’Œåˆ†é¡µ -->
    <template v-slot:table-wrap>
      <el-table
          :height="tableHeightNew"
        v-loading="isWorking.search"
        :data="tableData.list"
        stripe

 admin/src/views/system/menu.vue

@@ -9,6 +9,7 @@
        <li><el-button @click="sort('bottom')" :loading="isWorking.sort" icon="el-icon-sort-down" v-permissions="['system:menu:sort']">下移</el-button></li>
      </ul>
      <el-table
          :height="tableHeightNew"
        ref="table"
        v-loading="isWorking.search"
        :data="tableData.list"

 admin/src/views/system/permission.vue

@@ -9,6 +9,7 @@
            <li><el-button @click="deleteByIdInBatch" icon="el-icon-delete" v-permissions="['system:permission:delete']">删除</el-button></li>
          </ul>
          <el-table
              :height="tableHeightNew"
            :data="module.children"
            :ref="'module' + module.id"
            row-key="id"

 admin/src/views/system/role.vue

@@ -20,6 +20,7 @@
        <li v-permissions="['system:role:delete']"><el-button @click="deleteByIdInBatch" icon="el-icon-delete">删除</el-button></li>
      </ul>
      <el-table
          :height="tableHeightNew"
        v-loading="isWorking.search"
        :data="tableData.list"
        :default-sort = "{prop: 'createTime', order: 'descending'}"

 admin/src/views/system/trace-log.vue

@@ -50,6 +50,7 @@
    <!-- è¡¨æ ¼å’Œåˆ†é¡µ -->
    <template v-slot:table-wrap>
      <el-table
          :height="tableHeightNew"
        v-loading="isWorking.search"
        :data="tableData.list"
        stripe

 admin/src/views/system/user.vue

@@ -23,6 +23,7 @@
        <li v-permissions="['system:user:delete']"><el-button icon="el-icon-delete" @click="deleteByIdInBatch">删除</el-button></li>
      </ul>
      <el-table
          :height="tableHeightNew"
        v-loading="isWorking.search"
        :data="tableData.list"
        :default-sort = "{prop: 'createTime', order: 'descending'}"

 server/src/main/java/com/doumee/dao/business/model/Workorder.java

@@ -79,7 +79,7 @@

    @ApiModelProperty(value = "上报时间", example = "1")
    @ExcelExportColumn(name="上报时间")
    private Integer submitDate;
    private Date submitDate;

    @ApiModelProperty(value = "SHE涉及人员类型 0本人 1同事 2供应商", example = "1")
    @ExcelExportColumn(name="SHE涉及人员类型 0本人 1同事 2供应商")
@@ -131,8 +131,7 @@

    @ApiModelProperty(value = "风险类型(关联category）")
    @ExcelExportColumn(name="风险类型(关联category）")

    private Date typeId;
    private Integer typeId;

    @ApiModelProperty(value = "风险描述", example = "1")
    @ExcelExportColumn(name="风险描述")
@@ -202,6 +201,9 @@
    @ApiModelProperty("附件信息")
    @TableField(exist = false)
    private List<Multifile> multifileList;
    @ApiModelProperty("操作历史集合")
    @TableField(exist = false)
    private List<WorkorderLog> logList;

    @ApiModelProperty("提报人员名称")
    @TableField(exist = false)
@@ -215,26 +217,21 @@
    @TableField(exist = false)
    private String hurtTypeName;

    @ApiModelProperty("发生地点名称")
    @TableField(exist = false)
    private String locationTypeName;

    @ApiModelProperty("风险类型名称")
    @TableField(exist = false)
    private String typeName;

    @ApiModelProperty("DCA问题名称")
    @TableField(exist = false)
    private String problemName;
    @ApiModelProperty("用户")
    @TableField(exist = false)
    private String memberPhone;

    @ApiModelProperty("同事名称 å¤šä¸ª,分割")
    @TableField(exist = false)
    private String colleague;


    @ApiModelProperty(value = "上报人手机号")
    @TableField(exist = false)
    private String memberPhone;


}

 server/src/main/java/com/doumee/service/business/impl/WorkorderServiceImpl.java

@@ -162,16 +162,12 @@
        Workorder workorder = workorderMapper.selectJoinOne(Workorder.class,
                new MPJLambdaWrapper<Workorder>()
                        .selectAll(Workorder.class)
                        .selectAs(Member::getPhone,Workorder::getMemberPhone)
                        .selectAs(Member::getName,Workorder::getMemberName)
                        .selectAs(Company::getNamePath,Workorder::getCompanyName)
                        .select(" c1.name ",Workorder::getHurtTypeName)
                        .select(" c2.name ",Workorder::getLocationTypeName)
                        .selectAs(Workorder::getCompanyName,Workorder::getCompanyName)
                        .select(" c3.name ",Workorder::getTypeName)
                        .select(" c4.name ",Workorder::getProblemName)
                        .leftJoin(Member.class,Member::getId,Workorder::getMemberId)
                        .leftJoin(Company.class,Company::getId,Member::getCompanyId)
                        .leftJoin(" category c1 on  t.CATEGORY_ID = c1.id   ") //受伤类别
                        .leftJoin(" category c2 on  t.LOCALTION_ID = c2.id   ") //发生地点
                        .leftJoin(" category c3 on  t.TYPE_ID = c3.id   ") //风险类型
                        .leftJoin(" category c4 on  t.PROBLEM_ID = c4.id   ") //DCA问题编码
                        .eq(Workorder::getId,id)
@@ -197,14 +193,8 @@
                workorder.setMultifileList(multifileList);
            }
        }


        return workorder;
    }





    @Override
    public void deleteById(Integer id) {
@@ -260,9 +250,19 @@
    @Override
    public PageData<Workorder> findPage(PageWrap<Workorder> pageWrap) {
        IPage<Workorder> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
        QueryWrapper<Workorder> queryWrapper = new QueryWrapper<>();
        Utils.MP.blankToNull(pageWrap.getModel());
        queryWrapper.lambda()
        MPJLambdaWrapper<Workorder> queryWrapper = new MPJLambdaWrapper<>();
        pageWrap.getModel().setIsdeleted(Constants.ZERO);
        queryWrapper
                .selectAll(Workorder.class)
                .selectAs(Member::getName,Workorder::getMemberName)
                .selectAs(Member::getCompanyName,Workorder::getCompanyName)
                .selectAs(Member::getPhone,Workorder::getMemberPhone)
                .select(" c3.name ",Workorder::getTypeName)
                .select(" c4.name ",Workorder::getProblemName)
                .leftJoin(Member.class,Member::getId,Workorder::getMemberId)
                .leftJoin(" category c3 on  t.TYPE_ID = c3.id   ") //风险类型
                .leftJoin(" category c4 on  t.PROBLEM_ID = c4.id   ") //DCA问题编码
                .eq(pageWrap.getModel().getId() != null, Workorder::getId, pageWrap.getModel().getId())
                .eq(pageWrap.getModel().getCreator() != null, Workorder::getCreator, pageWrap.getModel().getCreator())
                .ge(pageWrap.getModel().getCreateDate() != null, Workorder::getCreateDate, Utils.Date.getStart(pageWrap.getModel().getCreateDate()))
@@ -281,7 +281,7 @@
                .eq(pageWrap.getModel().getSubmitDate() != null, Workorder::getSubmitDate, pageWrap.getModel().getSubmitDate())
                .eq(pageWrap.getModel().getMemberType() != null, Workorder::getMemberType, pageWrap.getModel().getMemberType())
                .eq(pageWrap.getModel().getMemberQwids() != null, Workorder::getMemberQwids, pageWrap.getModel().getMemberQwids())
                .eq(pageWrap.getModel().getMemberNames() != null, Workorder::getMemberNames, pageWrap.getModel().getMemberNames())
                .like(pageWrap.getModel().getMemberNames() != null, Workorder::getMemberNames, pageWrap.getModel().getMemberNames())
                .eq(pageWrap.getModel().getLocaltionId() != null, Workorder::getLocaltionId, pageWrap.getModel().getLocaltionId())
                .eq(pageWrap.getModel().getOutJiuyi() != null, Workorder::getOutJiuyi, pageWrap.getModel().getOutJiuyi())
                .eq(pageWrap.getModel().getIsYiwushi() != null, Workorder::getIsYiwushi, pageWrap.getModel().getIsYiwushi())
@@ -291,8 +291,7 @@
                .eq(pageWrap.getModel().getEmialMemberIds() != null, Workorder::getEmialMemberIds, pageWrap.getModel().getEmialMemberIds())
                .eq(pageWrap.getModel().getQwnoticeMemberIds() != null, Workorder::getQwnoticeMemberIds, pageWrap.getModel().getQwnoticeMemberIds())
                .eq(pageWrap.getModel().getHappenTime() != null, Workorder::getHappenTime, pageWrap.getModel().getHappenTime())
                .ge(pageWrap.getModel().getTypeId() != null, Workorder::getTypeId, Utils.Date.getStart(pageWrap.getModel().getTypeId()))
                .le(pageWrap.getModel().getTypeId() != null, Workorder::getTypeId, Utils.Date.getEnd(pageWrap.getModel().getTypeId()))
                .eq(pageWrap.getModel().getTypeId() != null, Workorder::getTypeId, pageWrap.getModel().getTypeId())
                .eq(pageWrap.getModel().getRiskInfo() != null, Workorder::getRiskInfo, pageWrap.getModel().getRiskInfo())
                .eq(pageWrap.getModel().getManagerId() != null, Workorder::getManagerId, pageWrap.getModel().getManagerId())
                .eq(pageWrap.getModel().getDealerId() != null, Workorder::getDealerId, pageWrap.getModel().getDealerId())
@@ -310,16 +309,9 @@
                .eq(pageWrap.getModel().getDcaYesNum() != null, Workorder::getDcaYesNum, pageWrap.getModel().getDcaYesNum())
                .eq(pageWrap.getModel().getDcaNoNum() != null, Workorder::getDcaNoNum, pageWrap.getModel().getDcaNoNum())
                .eq(pageWrap.getModel().getDcaRecordId() != null, Workorder::getDcaRecordId, pageWrap.getModel().getDcaRecordId())
                .eq(pageWrap.getModel().getDcaCsIds() != null, Workorder::getDcaCsIds, pageWrap.getModel().getDcaCsIds())
        ;
        for(PageWrap.SortData sortData: pageWrap.getSorts()) {
            if (sortData.getDirection().equalsIgnoreCase(PageWrap.DESC)) {
                queryWrapper.orderByDesc(sortData.getProperty());
            } else {
                queryWrapper.orderByAsc(sortData.getProperty());
            }
        }
        return PageData.from(workorderMapper.selectPage(page, queryWrapper));
                .eq(pageWrap.getModel().getDcaCsIds() != null, Workorder::getDcaCsIds, pageWrap.getModel().getDcaCsIds()) ;
                queryWrapper.orderByDesc(Workorder::getCreateDate);
        return PageData.from(workorderMapper.selectJoinPage(page,Workorder.class, queryWrapper));
    }

    @Override