Merge remote-tracking branch 'origin/master'

renkang

2025-01-03 ccf28d1fed1aa2e5437dbe64b5133ba1cbde6ec7

 admin/src/views/Inspection/plan.vue

@@ -2,62 +2,68 @@
  <TableLayout :permissions="['business:ywpatrolscheme:query']">
    <!-- 搜索表单 -->
    <el-form ref="searchForm" slot="search-form" :model="searchForm" label-width="100px" inline>

      <el-form-item label="标题" prop="title">
        <el-input v-model="searchForm.title" placeholder="请输入标题" @keypress.enter.native="search"></el-input>
      <el-form-item label="开始日期" prop="selDate">
        <el-date-picker type="daterange" v-model="searchForm.selDate"  @change="changeSelDate" clearable value-format="yyyy-MM-dd"
        />
      </el-form-item>
      <el-form-item label="开始日期" prop="startDate">
        <el-date-picker v-model="searchForm.startDate" value-format="yyyy-MM-dd" placeholder="请输入开始日期"
          @change="search" />
      <el-form-item label="结束日期" prop="selDateSec">
        <el-date-picker type="daterange" v-model="searchForm.selDateSec"  @change="changeSelDateSec" clearable value-format="yyyy-MM-dd"
         />
      </el-form-item>
      <el-form-item label="结束日期" prop="endDate">
        <el-date-picker v-model="searchForm.endDate" value-format="yyyy-MM-dd" placeholder="请输入结束日期" @change="search" />
      <el-form-item label="计划名称" prop="title">
        <el-input v-model="searchForm.title" placeholder="请输入计划名称" @keypress.enter.native="search"></el-input>
      </el-form-item>

      <section>
        <el-button type="primary" @click="search">搜索</el-button>
        <el-button type="primary" :loading="isWorking.export" v-permissions="['business:ywpatrolscheme:exportExcel']"
          @click="exportExcel">导出</el-button>
        <el-button @click="reset">重置</el-button>
      </section>
    </el-form>
    <!-- 表格和分页 -->
    <template v-slot:table-wrap>
      <ul class="toolbar" v-permissions="['business:ywpatrolscheme:create', 'business:ywpatrolscheme:delete']">
        <li><el-button type="primary" @click="$refs.operaYwPatrolSchemeWindow.open('新建巡检计划')" icon="el-icon-plus"
        <li><el-button type="primary" @click="editClick()" icon="el-icon-plus"
            v-permissions="['business:ywpatrolscheme:create']">新建</el-button></li>
        <li><el-button @click="deleteByIdInBatch" icon="el-icon-delete"
            v-permissions="['business:ywpatrolscheme:delete']">删除</el-button></li>
        <el-button type="primary" plain :loading="isWorking.export"
          v-permissions="['business:ywpatrolscheme:exportExcel']" @click="exportExcel">导出</el-button>
        <!-- <li><el-button @click="deleteByIdInBatch" icon="el-icon-delete"
            v-permissions="['business:ywpatrolscheme:delete']">删除</el-button></li> -->
      </ul>
      <el-table 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="title" label="计划名称" min-width="100px"></el-table-column>
        <el-table-column prop="lineId" label="计划编号" min-width="100px"></el-table-column>
        <el-table-column prop="dealDate" label="负责人员" min-width="100px"></el-table-column>
        <el-table-column prop="code" label="计划编号" min-width="100px"></el-table-column>
        <el-table-column prop="userName" label="负责人员" min-width="100px"></el-table-column>

        <el-table-column prop="startDate" label="计划日期" min-width="100px">
        <el-table-column prop="startDate" label="计划日期" min-width="150px">
          <template v-slot="scope">
            <span>{{ scope.row.startDate }} - {{ scope.row.endDate }}</span>
          </template>
        </el-table-column>
        <el-table-column prop="startDate" label="执行时间" min-width="100px">
        <el-table-column prop="startDate" label="执行时间" min-width="130px">
          <template v-slot="scope">
            <span>{{ scope.row.startTime }} - {{ scope.row.endTime }}</span>
          </template>
        </el-table-column>
        <el-table-column prop="" label="创建人" min-width="100px"></el-table-column>
        <el-table-column prop="" label="执行结果" min-width="100px"></el-table-column>
        <el-table-column prop="createUserName" label="创建人" min-width="100px"></el-table-column>
        <el-table-column prop="" label="执行结果" min-width="100px">
          <template v-slot="scope">
            <span v-if="scope.row.schemeStatus == 0">待开始</span>
            <span v-if="scope.row.schemeStatus == 1">进行中</span>
            <span v-if="scope.row.schemeStatus == 2">已结束</span>
          </template>
        </el-table-column>
        <el-table-column label="状态" min-width="100px">
          <template v-slot="scope">
            <el-switch v-model="scope.row.status" @change="changeStatus" active-value="0" inactive-value="1">
            <el-switch v-model="scope.row.status" @change="e => changeStatus(scope.row)" :active-value="0"
              :inactive-value="1">
            </el-switch>
          </template>
        </el-table-column>
        <el-table-column v-if="containPermissions(['business:ywpatrolscheme:update', 'business:ywpatrolscheme:delete'])"
          label="操作" min-width="120" fixed="right">
          <template slot-scope="{row}">
            <el-button type="text" @click="$refs.operaYwPatrolSchemeWindow.open('编辑巡检计划', row)" icon="el-icon-edit"
            <el-button type="text" @click="editClick(row)" icon="el-icon-edit"
              v-permissions="['business:ywpatrolscheme:update']">编辑</el-button>
            <el-button type="text" @click="deleteById(row)" icon="el-icon-delete"
              v-permissions="['business:ywpatrolscheme:delete']">删除</el-button>
@@ -77,6 +83,8 @@
import TableLayout from '@/layouts/TableLayout'
import Pagination from '@/components/common/Pagination'
import OperaYwPatrolSchemeWindow from './components/OperaYwPatrolSchemeWindow'
import { updateStatusById } from '@/api/Inspection/ywPatrolScheme'
import { Message } from 'element-ui'
export default {
  name: 'YwPatrolScheme',
  extends: BaseTable,
@@ -85,28 +93,9 @@
    return {
      // 搜索
      searchForm: {
        id: '',
        creator: '',
        createDate: '',
        editor: '',
        editDate: '',
        isdeleted: '',
        title: '',
        remark: '',
        status: '',
        sortnum: '',
        lineId: '',
        userIds: '',
        dealUserId: '',
        dealDate: '',
        dealInfo: '',
        circleType: '',
        circleDays: '',
        startDate: '',
        endDate: '',
        startTime: '',
        endTime: '',
        processStatus: ''
        selDate:[],
        selDateSec:[]
      }
    }
  },
@@ -120,14 +109,47 @@
    this.search()
  },
  methods: {
    changeStatus(e) {
      console.log(e)
      updateStatusById(e).then(res => {
        this.search()
        Message.success('状态修改成功')
      }, () => {
        this.search()
      })
    },

    reset() {
      this.searchForm = {}
      this.search()
    },
    editClick(row) {
      if (row && row.id) {
        this.$refs.operaYwPatrolSchemeWindow.open('编辑巡检计划')
        this.$refs.operaYwPatrolSchemeWindow.getDetail(row.id)
      } else {
        this.$refs.operaYwPatrolSchemeWindow.open('新建巡检计划')
      }
      this.$refs.operaYwPatrolSchemeWindow.initData()
      

    },
    changeSelDate(e) {
      if (e && e.length > 0) {
        this.$set(this.searchForm, 'startDate', e[0] )
        this.$set(this.searchForm, 'endDate', e[1]  )
      } else {
        this.$set(this.searchForm, 'startDate', '')
        this.$set(this.searchForm, 'endDate', '')
      }
    },
    changeSelDateSec(e) {
      if (e && e.length > 0) {
        this.$set(this.searchForm, 'startDateSec', e[0] )
        this.$set(this.searchForm, 'endDateSec', e[1]  )
      } else {
        this.$set(this.searchForm, 'startDateSec', '')
        this.$set(this.searchForm, 'endDateSec', '')
      }
    },
  }
}