Merge remote-tracking branch 'origin/master'

jiangping

2025-01-08 ee4c78feff3e03dec51c4a2bd13c6c36aed9b1dd

 admin/src/views/operation/danger/record.vue

@@ -3,13 +3,16 @@
    <!-- 搜索表单 -->
    <el-form ref="searchForm" slot="search-form" :model="searchForm" label-width="100px" inline>
      <el-form-item label="提报人" prop="memberName">
        <el-input v-model="searchForm.memberName" placeholder="请输入姓名/手机号" @keypress.enter.native="search"></el-input>
        <el-input v-model="searchForm.memberName" placeholder="请输入姓名" @keypress.enter.native="search"></el-input>
      </el-form-item>
      <el-form-item label="提报人组织" prop="companyName">
        <el-input v-model="searchForm.companyName" placeholder="请输入" @keypress.enter.native="search"></el-input>
        <el-input v-model="searchForm.companyName" placeholder="请输入" clearable @keypress.enter.native="search"></el-input>
      </el-form-item>
      <el-form-item label="责任部门" prop="dutyCompanyName">
        <el-input v-model="searchForm.dutyCompanyName" placeholder="请输入责任部门" clearable @keypress.enter.native="search"></el-input>
      </el-form-item>
      <el-form-item label="隐患区域" prop="areaId">
        <el-select v-model="searchForm.areaId" placeholder="请选择隐患区域" @keypress.enter.native="search">
        <el-select v-model="searchForm.areaId" placeholder="请选择隐患区域" clearable  @change="search">
          <el-option
              v-for="item in areaList"
              :key="item.id"
@@ -19,13 +22,20 @@
        </el-select>
      </el-form-item>
      <el-form-item label="隐患类型" prop="cateId">
        <el-select v-model="searchForm.cateId" placeholder="请选择隐患类型" @keypress.enter.native="search">
        <el-select v-model="searchForm.cateId" placeholder="请选择隐患类型" clearable @change="search">
          <el-option
              v-for="item in cateList"
              :key="item.id"
              :label="item.name"
              :value="item.id">
          </el-option>
        </el-select>
      </el-form-item>
      <el-form-item label="状态" prop="status">
        <el-select v-model="searchForm.status"  @change="search" clearable placeholder="状态">
          <el-option label="待处理" value="0"></el-option>
          <el-option label="已处理" value="1"></el-option>
          <el-option label="已退回" value="2"></el-option>
        </el-select>
      </el-form-item>
      <el-form-item label="提报时间" prop="startTime">
@@ -36,6 +46,7 @@
            type="datetimerange"
            format="yyyy-MM-dd HH:mm:ss"
            value-format="yyyy-MM-dd HH:mm:ss"
            :default-time="['00:00:00', '23:59:59']"
            range-separator="至"
            start-placeholder="开始日期"
            end-placeholder="结束日期">
@@ -53,8 +64,9 @@
    </el-form>
    <!-- 表格和分页 -->
    <template v-slot:table-wrap>
      <ul class="toolbar" v-permissions="['business:empower:create', 'business:empower:delete']">
        <!--<li><el-button type="primary" v-permissions="['business:empower:exportExcel']" @click="exportExcel">导出</el-button></li> -->
      <ul class="toolbar" v-permissions="['business:hiddendanger:create', 'business:hiddendanger:exportExcel']">
        <li><el-button type="primary" icon="el-icon-plus" v-permissions="['business:hiddendanger:create']" @click="handleEdit">新建</el-button></li>
        <li><el-button type="primary" v-permissions="['business:hiddendanger:exportExcel']" @click="handleEx">导出</el-button></li>
      </ul>
      <el-table
          v-loading="isWorking.search"
@@ -63,6 +75,7 @@
          @selection-change="handleSelectionChange"
      >
        <el-table-column type="selection" width="55"></el-table-column>
        <el-table-column prop="dutyCompanyName" label="责任部门" min-width="150px"></el-table-column>
        <el-table-column prop="areaName" label="隐患区域" min-width="150px"></el-table-column>
        <el-table-column prop="categoryName" label="隐患类型" min-width="150px"></el-table-column>
        <el-table-column prop="memberName" label="提报人" min-width="80px"></el-table-column>
@@ -72,7 +85,7 @@
          <template slot-scope="{row}">
            <span class="status-blue"  v-if="row.status === 0">待处理</span>
            <span class="status-green"   v-if="row.status === 1">已处理</span>
            <span class="status-red"   v-if="row.status === 2">已撤销</span>
            <span class="status-red"   v-if="row.status === 2">已退回</span>
          </template>
        </el-table-column>
        <el-table-column prop="editDate" label="操作时间" min-width="150px"></el-table-column>
@@ -94,6 +107,8 @@
      </pagination>
    </template>
    <OperaHiddenDangerWindow ref="OperaHiddenDangerWindow" @success="handlePageChange"/>
    <!-- 新建 -->
    <HiddenDangerParam @close="isShowEdit = false" @success="search"  v-if="isShowEdit" ref="HiddenDangerParamRef" />
  </TableLayout>
</template>

@@ -102,22 +117,27 @@
import TableLayout from '@/layouts/TableLayout'
import Pagination from '@/components/common/Pagination'
import OperaHiddenDangerWindow from '@/components/business/OperaHiddenDangerWindow'
import HiddenDangerParam from '@/components/operation/HiddenDangerParam.vue'
import { timeForMat } from '@/utils/util'
import { allList } from '@/api/business/hiddenDangerParam'
import { allList, exportExcel } from '@/api/business/hiddenDangerParam'
export default {
  name: 'Empower',
  extends: BaseTable,
  components: { TableLayout, Pagination ,OperaHiddenDangerWindow},
  components: { TableLayout, Pagination ,OperaHiddenDangerWindow, HiddenDangerParam},
  data () {
    return {
      isShowEdit: false,
      // 搜索
      searchForm: {
        memberName: '',
        companyName: '',
        queryStartTime: '',
        companyName: '',
        queryEndTime: '',
        areaId: null,
        cateId: null
        cateId: null,
        status: null,
        radio: 0
      },
      cateList: [],
      areaList: [],
@@ -136,6 +156,29 @@
    this.loadParams()
  },
  methods: {
    handleEx () {
      this.$dialog.exportConfirm('确认导出吗？')
        .then(() => {
          this.exLoading = true
          exportExcel({
            model: this.searchForm
          })
            .then(response => {
              this.download(response)
            })
            .catch(e => {
            })
            .finally(() => {
              this.exLoading = false
            })
        })
    },
    handleEdit () {
      this.isShowEdit = true
      this.$nextTick(() => {
        this.$refs.HiddenDangerParamRef.isShowModal = true
      })
    },
    changeRadio (e) {
      this.searchForm.radio = e
      if (e === '0') {