ll
liukangdong
2025-03-10 2bc4a739db642494accbf5be1fa55793f4652f44
ll
已修改13个文件
475 ■■■■■ 文件已修改
admin/src/views/business/blackmailPersonnel.vue 130 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
admin/src/views/business/carEvent.vue 16 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
admin/src/views/business/deletePersonnel.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
admin/src/views/business/freezePersonnel.vue 109 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
admin/src/views/business/platformBroadcastLog.vue 10 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
admin/src/views/business/platformEvent.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
admin/src/views/meeting/bookings.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
admin/src/views/operation/serviceCar/apprRecord.vue 167 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
admin/src/views/platform/platform.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
admin/src/views/platform/platformReason.vue 13 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
h5/pages/staff/vehicle/apply.vue 18 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
h5/pages/staff/vehicle/shinei.vue 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
h5/pages/staff/vehicle/shiwai.vue 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
admin/src/views/business/blackmailPersonnel.vue
@@ -1,14 +1,14 @@
<template>
    <TableLayout :permissions="['business:member:query']">
        <!-- 搜索表单 -->
        <el-form ref="searchForm" slot="search-form" :model="searchForm" label-width="100px" inline>
            <el-form-item label="姓名/手机号" prop="name">
                <el-input v-model="searchForm.name" 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-form-item>
            <el-form-item label="操作人员" prop="createrId">
  <TableLayout :permissions="['business:member:query']">
    <!-- 搜索表单 -->
    <el-form ref="searchForm" slot="search-form" :model="searchForm" label-width="100px" inline>
      <el-form-item label="姓名/手机号" prop="name">
        <el-input v-model="searchForm.name" 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-form-item>
      <!-- <el-form-item label="操作人员" prop="createrId">
                <el-select v-model="searchForm.createrId" placeholder="请选择">
                    <el-option
                        v-for="item in user"
@@ -17,62 +17,50 @@
                        :value="item.id">
                    </el-option>
                </el-select>
            </el-form-item>
<!--            <el-form-item label="人员类型" prop="type">-->
<!--                <el-select v-model="searchForm.type" placeholder="请选择">-->
<!--                    <el-option label="访客" value="1"></el-option>-->
<!--                    <el-option label="劳务" value="0"></el-option>-->
<!--                </el-select>-->
<!--            </el-form-item>-->
            <section>
                <el-button type="primary" @click="search">搜索</el-button>
                <el-button @click="reset">重置</el-button>
            </section>
        </el-form>
        <!-- 表格和分页 -->
        <template v-slot:table-wrap>
            <ul class="toolbar" v-permissions="['business:member:create', 'business:member:delete']">
                <li><el-button type="primary" v-permissions="['business:member:create']" @click="thaws">移出</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="name" label="姓名" min-width="80px"></el-table-column>
                <el-table-column prop="phone" label="手机号" min-width="100px"></el-table-column>
                <el-table-column prop="idcardDecode" show-overflow-tooltip label="身份证号码" min-width="140px"></el-table-column>
                <el-table-column label="人员类型" min-width="100px">
                    <template slot-scope="{row}">
                        <span v-if="row.type === 0">劳务访客</span>
                        <span v-if="row.type === 1">普通访客</span>
                        <span v-if="row.type === 2">内部人员</span>
                    </template>
                </el-table-column>
                <el-table-column prop="visitCompanyName" label="组织" show-overflow-tooltip min-width="200px"></el-table-column>
                <el-table-column prop="optRemark" label="操作信息" show-overflow-tooltip min-width="200px"></el-table-column>
                <el-table-column
                    v-if="containPermissions(['business:member:update', 'business:member:delete'])"
                    label="操作"
                    min-width="120"
                    fixed="right"
                >
                    <template slot-scope="{row}">
                        <el-button type="text" icon="el-icon-edit" v-permissions="['business:member:update']" @click="thaw(row.id)">移出</el-button>
                    </template>
                </el-table-column>
            </el-table>
            <pagination
                @size-change="handleSizeChange"
                @current-change="handlePageChange"
                :pagination="tableData.pagination"
            >
            </pagination>
        </template>
    </TableLayout>
            </el-form-item> -->
      <!--            <el-form-item label="人员类型" prop="type">-->
      <!--                <el-select v-model="searchForm.type" placeholder="请选择">-->
      <!--                    <el-option label="访客" value="1"></el-option>-->
      <!--                    <el-option label="劳务" value="0"></el-option>-->
      <!--                </el-select>-->
      <!--            </el-form-item>-->
      <!-- <section> -->
      <el-button type="primary" @click="search">搜索</el-button>
      <el-button @click="reset">重置</el-button>
      <!-- </section> -->
    </el-form>
    <!-- 表格和分页 -->
    <template v-slot:table-wrap>
      <ul class="toolbar" v-permissions="['business:member:create', 'business:member:delete']">
        <li><el-button type="primary" v-permissions="['business:member:create']" @click="thaws">移出</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="name" label="姓名" min-width="80px"></el-table-column>
        <el-table-column prop="phone" label="手机号" min-width="100px"></el-table-column>
        <el-table-column prop="idcardDecode" show-overflow-tooltip label="身份证号码" min-width="140px"></el-table-column>
        <el-table-column label="人员类型" min-width="100px">
          <template slot-scope="{row}">
            <span v-if="row.type === 0">劳务访客</span>
            <span v-if="row.type === 1">普通访客</span>
            <span v-if="row.type === 2">内部人员</span>
          </template>
        </el-table-column>
        <el-table-column prop="visitCompanyName" label="组织" show-overflow-tooltip min-width="200px"></el-table-column>
        <el-table-column prop="optRemark" label="操作信息" show-overflow-tooltip min-width="200px"></el-table-column>
        <el-table-column v-if="containPermissions(['business:member:update', 'business:member:delete'])" label="操作"
          min-width="120" fixed="right">
          <template slot-scope="{row}">
            <el-button type="text" icon="el-icon-edit" v-permissions="['business:member:update']"
              @click="thaw(row.id)">移出</el-button>
          </template>
        </el-table-column>
      </el-table>
      <pagination @size-change="handleSizeChange" @current-change="handlePageChange" :pagination="tableData.pagination">
      </pagination>
    </template>
  </TableLayout>
</template>
<script>
@@ -85,7 +73,7 @@
  name: 'blackmailPersonnel',
  extends: BaseTable,
  components: { TableLayout, Pagination },
  data () {
  data() {
    return {
      // 搜索
      searchForm: {
@@ -97,7 +85,7 @@
      user: []
    }
  },
  created () {
  created() {
    this.config({
      module: '人员信息表',
      api: '/business/block',
@@ -108,7 +96,7 @@
    this.getUser()
  },
  methods: {
    thaws () {
    thaws() {
      if (this.tableData.selectedRows.length === 0) return this.$message.warning('至少选择一项内容')
      const ids = this.tableData.selectedRows.map(item => {
        return item.id
@@ -119,7 +107,7 @@
          this.search()
        })
    },
    thaw (ids) {
    thaw(ids) {
      this.$confirm('确定移出此用户吗?', '提示', {
        confirmButtonText: '确定',
        cancelButtonText: '取消',
@@ -134,7 +122,7 @@
      })
    },
    getUser () {
    getUser() {
      findAllList({})
        .then(res => {
          this.user = res.map(item => {
admin/src/views/business/carEvent.vue
@@ -80,7 +80,7 @@
            <span v-if="row.inoutType === 1">离园</span>
          </template>
        </el-table-column>
<!--        <el-table-column label="车牌抓拍图" min-width="100px">
        <!--        <el-table-column label="车牌抓拍图" min-width="100px">
          <template slot-scope="{ row }">
            <div v-if="row.platePicUrl != null">
              <el-image style="width: 80px; height: 80px" :src="row.platePicUrl" :preview-src-list="[row.platePicUrl]">
@@ -128,7 +128,7 @@
        companyName: '',
        startTime: '',
        endTime: '',
        radio: '0'
        radio: ''
      },
      time: []
    }
@@ -151,8 +151,16 @@
  methods: {
    reset() {
      this.$refs.searchForm.resetFields()
      this.searchForm.radio = ''
      // this.changeRadio('0')
      this.searchForm = {
        eventType: '',
        keyWords: '',
        plateNos: '',
        memberType: '',
        companyName: '',
        startTime: '',
        endTime: '',
        radio: ''
      }
      this.time = []
      this.search()
    },
admin/src/views/business/deletePersonnel.vue
@@ -8,7 +8,7 @@
            <el-form-item label="组织名称" prop="companyName">
                <el-input v-model="searchForm.companyName" placeholder="请输入组织名称" @keypress.enter.native="search"></el-input>
            </el-form-item>
          <el-form-item label="下发状态" prop="sendStatus">
          <el-form-item label="下发状态" prop="hkStatus">
            <el-select v-model="searchForm.hkStatus" placeholder="请选择" clearable @change="search">
              <el-option label="待下发" value="0"></el-option>
              <el-option label="已同步" value="1"></el-option>
admin/src/views/business/freezePersonnel.vue
@@ -1,14 +1,14 @@
<template>
    <TableLayout :permissions="['business:member:query']">
        <!-- 搜索表单 -->
        <el-form ref="searchForm" slot="search-form" :model="searchForm" label-width="100px" inline>
            <el-form-item label="姓名" prop="name">
                <el-input v-model="searchForm.name" 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>
            </el-form-item>
            <el-form-item label="部门" prop="companyId">
  <TableLayout :permissions="['business:member:query']">
    <!-- 搜索表单 -->
    <el-form ref="searchForm" slot="search-form" :model="searchForm" label-width="100px" inline>
      <el-form-item label="姓名" prop="name">
        <el-input v-model="searchForm.name" 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>
      </el-form-item>
      <!-- <el-form-item label="部门" prop="companyId">
                <el-cascader
                    :options="options"
                    v-model="searchForm.companyId"
@@ -17,50 +17,39 @@
                    @keypress.enter.native="search"
                    :props="{ checkStrictly: true, value: 'id', label: 'name', children: 'companyDTOList' }"
                    ></el-cascader>
            </el-form-item>
            <section>
                <el-button type="primary" @click="search">搜索</el-button>
                <el-button @click="reset">重置</el-button>
            </section>
        </el-form>
        <!-- 表格和分页 -->
        <template v-slot:table-wrap>
            <ul class="toolbar" v-permissions="['business:member:create', 'business:member:delete']">
                <li><el-button type="primary" v-permissions="['business:member:create']" @click="thaws()">解冻</el-button></li>
                <li><el-button type="primary" :loading="isWorking.export" v-permissions="['business:member:exportExcel']" @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="name" label="姓名" min-width="100px"></el-table-column>
                <el-table-column prop="companyName" show-overflow-tooltip label="部门" min-width="100px"></el-table-column>
                <el-table-column prop="code" label="工号" min-width="100px"></el-table-column>
                <el-table-column prop="visitsLastDate" label="最后一次门禁时间" min-width="100px"></el-table-column>
                <el-table-column prop="optRemark" label="冻结信息" min-width="100px"></el-table-column>
                <el-table-column
                    v-if="containPermissions(['business:member:update', 'business:member:delete'])"
                    label="操作"
                    min-width="120"
                    fixed="right"
                >
                    <template slot-scope="{row}">
                        <el-button type="text" @click="thaw(row.id)" icon="el-icon-edit" v-permissions="['business:member:update']">解冻</el-button>
                    </template>
                </el-table-column>
            </el-table>
            <pagination
                @size-change="handleSizeChange"
                @current-change="handlePageChange"
                :pagination="tableData.pagination"
            >
            </pagination>
        </template>
    </TableLayout>
            </el-form-item> -->
      <!-- <section> -->
        <el-button type="primary" @click="search">搜索</el-button>
        <el-button @click="reset">重置</el-button>
      <!-- </section> -->
    </el-form>
    <!-- 表格和分页 -->
    <template v-slot:table-wrap>
      <ul class="toolbar" v-permissions="['business:member:create', 'business:member:delete']">
        <li><el-button type="primary" v-permissions="['business:member:create']" @click="thaws()">解冻</el-button></li>
        <li><el-button type="primary" :loading="isWorking.export" v-permissions="['business:member:exportExcel']"
            @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="name" label="姓名" min-width="100px"></el-table-column>
        <el-table-column prop="companyName" show-overflow-tooltip label="部门" min-width="100px"></el-table-column>
        <el-table-column prop="code" label="工号" min-width="100px"></el-table-column>
        <el-table-column prop="visitsLastDate" label="最后一次门禁时间" min-width="100px"></el-table-column>
        <el-table-column prop="optRemark" label="冻结信息" min-width="100px"></el-table-column>
        <el-table-column v-if="containPermissions(['business:member:update', 'business:member:delete'])" label="操作"
          min-width="120" fixed="right">
          <template slot-scope="{row}">
            <el-button type="text" @click="thaw(row.id)" icon="el-icon-edit"
              v-permissions="['business:member:update']">解冻</el-button>
          </template>
        </el-table-column>
      </el-table>
      <pagination @size-change="handleSizeChange" @current-change="handlePageChange" :pagination="tableData.pagination">
      </pagination>
    </template>
  </TableLayout>
</template>
<script>
@@ -73,7 +62,7 @@
  name: 'freezePersonnel',
  extends: BaseTable,
  components: { TableLayout, Pagination },
  data () {
  data() {
    return {
      // 搜索
      searchForm: {
@@ -85,7 +74,7 @@
      options: []
    }
  },
  created () {
  created() {
    this.config({
      module: '冻结人员',
      api: '/business/block',
@@ -96,7 +85,7 @@
    this.getfindCompanyTreePage()
  },
  methods: {
    thaws () {
    thaws() {
      if (this.tableData.selectedRows.length === 0) return this.$message.warning('至少选择一项内容')
      const ids = this.tableData.selectedRows.map(item => {
        // return { id: item.id }
@@ -104,7 +93,7 @@
      })
      this.thaw(ids.join(','))
    },
    thaw (ids) {
    thaw(ids) {
      this.$confirm('确定解冻此用户吗?', '提示', {
        confirmButtonText: '确定',
        cancelButtonText: '取消',
@@ -119,11 +108,11 @@
      })
    },
    changeCompanyId (e) {
    changeCompanyId(e) {
      this.searchForm.companyId = e[e.length - 1]
    },
    // 获取组织树
    getfindCompanyTreePage () {
    getfindCompanyTreePage() {
      findCompanyTreePage(1)
        .then(res => {
          this.options = res
admin/src/views/business/platformBroadcastLog.vue
@@ -123,7 +123,7 @@
        this.searchForm.endTime = timeForMat(6)[1]
        this.time = timeForMat(6)
      } else if (e === '2') {
        this.searchForm.startDate= timeForMat(29)[0]
        this.searchForm.startDate = timeForMat(29)[0]
        this.searchForm.endTime = timeForMat(29)[1]
        this.time = timeForMat(29)
      }
@@ -138,6 +138,14 @@
    reset() {
      this.$refs.searchForm.resetFields()
      this.time = []
      this.searchForm = {
        name: '',
        info: '',
        deviceType: '',
        hkStatus: '',
        startDate: '',
        endDate: '',
      }
      this.searchForm.radio = ''
      // this.changeRadio('0')
      this.search()
admin/src/views/business/platformEvent.vue
@@ -12,7 +12,7 @@
        <el-form-item label="" prop="plateNo">
          <el-input v-model="searchForm.plateNo" placeholder="请输入车牌号" @keypress.enter.native="search"></el-input>
        </el-form-item>
        <el-form-item label="" prop="eventType">
        <el-form-item label="" prop="motionStatus">
          <el-select v-model="searchForm.motionStatus" placeholder="请选择进出类型">
            <el-option label="离开" value="leave"></el-option>
            <el-option label="进入" value="enter"></el-option>
admin/src/views/meeting/bookings.vue
@@ -26,7 +26,7 @@
      <el-form-item label="预约人" prop="realName">
        <el-input v-model="searchForm.realName" placeholder="请输入预约人" @keypress.enter.native="search"></el-input>
      </el-form-item>
      <el-form-item label="会议状态" prop="status">
      <el-form-item label="会议状态" prop="meetingStatus">
        <el-select v-model="searchForm.meetingStatus" filterable clearable placeholder="请选择状态">
          <el-option v-for="item in status" :key="item.id" :value="item.id" :label="item.name" />
        </el-select>
admin/src/views/operation/serviceCar/apprRecord.vue
@@ -52,70 +52,36 @@
    </div>
    <!-- 表格和分页 -->
    <template v-slot:table-wrap>
      <ul
        class="toolbar"
        v-permissions="[
          'business:carusebook:create',
          'business:carusebook:exportExcel',
        ]"
      >
      <ul class="toolbar" v-permissions="[
        'business:carusebook:create',
        'business:carusebook:exportExcel',
      ]">
        <li>
          <el-button
            type="primary"
            @click="handleEdit"
            icon="el-icon-plus"
            v-permissions="['business:carusebook:create']"
            >新建</el-button
          >
          <el-button type="primary" @click="handleEdit" icon="el-icon-plus"
            v-permissions="['business:carusebook:create']">新建</el-button>
        </li>
        <li>
          <el-button
            type="primary"
            @click="handleEx"
            v-permissions="['business:carusebook:exportExcel']"
            >导出</el-button
          >
          <el-button type="primary" @click="handleEx" v-permissions="['business:carusebook: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="carCode"
            label="车牌号"
            min-width="100px"
        ></el-table-column>
        <el-table-column
          prop="memberName"
          label="提报人"
          min-width="80px"
        ></el-table-column>
        <el-table-column
            prop="memberNames"
            label="乘车人"
            min-width="180px"
        ></el-table-column>
        <el-table-column
          prop="companyName"
          label="所属组织"
          min-width="150px"
        ></el-table-column>
        <el-table-column prop="carCode" label="车牌号" min-width="100px"></el-table-column>
        <el-table-column prop="memberName" label="提报人" min-width="80px"></el-table-column>
        <el-table-column prop="memberNames" label="乘车人" min-width="180px"></el-table-column>
        <el-table-column prop="companyName" label="所属组织" min-width="150px"></el-table-column>
        <el-table-column label="用车时间" min-width="170px">
          <template slot-scope="{ row }">
            <span v-if="row.startTime">起:{{ row.startTime.slice(0,16) }}</span
            ><br />
            <span v-if="row.endTime">止:{{ row.endTime.slice(0,16) }}</span>
            <span v-if="row.startTime">起:{{ row.startTime.slice(0, 16) }}</span><br />
            <span v-if="row.endTime">止:{{ row.endTime.slice(0, 16) }}</span>
          </template>
        </el-table-column>
        <el-table-column
          prop="planUseDate"
          label="出发时间"
          min-width="150px"
        >
        <template slot-scope="{ row }">
          <span v-if="row.planUseDate">{{ row.planUseDate.slice(0,16) }}</span>
        </template>
      </el-table-column>
        <el-table-column prop="planUseDate" label="出发时间" min-width="150px">
          <template slot-scope="{ row }">
            <span v-if="row.planUseDate">{{ row.planUseDate.slice(0, 16) }}</span>
          </template>
        </el-table-column>
        <el-table-column label="目的地" min-width="200px">
          <template slot-scope="{ row }">
            <span class="status-green" v-if="row.type === 0">【市内】</span>
@@ -133,59 +99,29 @@
          </template>
        </el-table-column>
        <el-table-column
          prop="createDate"
          label="申请时间"
          min-width="150px"
        ></el-table-column>
        <el-table-column
          prop="editDate"
          label="操作时间"
          min-width="150px"
        ></el-table-column>
        <el-table-column
          label="操作"
          min-width="180"
          align="center"
          fixed="right"
        >
        <el-table-column prop="createDate" label="申请时间" min-width="150px"></el-table-column>
        <el-table-column prop="editDate" label="操作时间" min-width="150px"></el-table-column>
        <el-table-column label="操作" min-width="180" align="center" fixed="right">
          <template slot-scope="{ row }">
            <el-button
              type="text"
              icon="el-icon-edit"
              @click="$refs.OperaDetailsWindow.open('公务车申请详情', row)"
              >查看详情</el-button
            >
            <el-button type="text" icon="el-icon-edit"
              @click="$refs.OperaDetailsWindow.open('公务车申请详情', row)">查看详情</el-button>
            <!-- <el-button v-if="(row.status === 1 || row.status === 2) && new Date().getTime() < new Date(row.startTime).getTime()" type="text" icon="el-icon-delete" @click="rowRevokeClick(row)" >撤销</el-button> -->
            <el-button style="color: red" v-if="row.hasRole ==1"  type="text"  icon="el-icon-delete"   @click="rowRevokeClick(row)" >撤销</el-button>
            <el-button style="color: red" v-if="row.hasRole == 1" type="text" icon="el-icon-delete"
              @click="rowRevokeClick(row)">撤销</el-button>
            <!-- <el-button style="color: red"   v-if="(row.status === 0 && row.creator == userInfo.id)||((row.status === 0 || row.status === 1 ) || ( row.status === 2 && new Date().getTime() < new Date(row.startTime).getTime() ))"  type="text"  icon="el-icon-delete"   @click="rowRevokeClick(row)" >撤销</el-button>-->
            <el-button  style="color: red" type="text"  icon="el-icon-delete"   v-permissions="['business:carusebook:delete']"  @click="deleteById(row)" >删除</el-button>
            <el-button style="color: red" type="text" icon="el-icon-delete"
              v-permissions="['business:carusebook:delete']" @click="deleteById(row)">删除</el-button>
          </template>
        </el-table-column>
      </el-table>
      <pagination
        @size-change="handleSizeChange"
        @current-change="handlePageChange"
        :pagination="tableData.pagination"
      >
      <pagination @size-change="handleSizeChange" @current-change="handlePageChange" :pagination="tableData.pagination">
      </pagination>
    </template>
    <!--  -->
    <el-dialog title="用车撤销" :visible.sync="isShowBack" width="520px">
      <el-form
        :model="backParam"
        :rules="rules"
        ref="backForm"
        label-width="100px"
        class="demo-ruleForm"
      >
      <el-form :model="backParam" :rules="rules" ref="backForm" label-width="100px" class="demo-ruleForm">
        <el-form-item label="说明" prop="info">
          <el-input
            type="textarea"
            :rows="4"
            v-model="backParam.info"
            placeholder="请输入撤销说明"
          ></el-input>
          <el-input type="textarea" :rows="4" v-model="backParam.info" placeholder="请输入撤销说明"></el-input>
        </el-form-item>
      </el-form>
      <span slot="footer" class="dialog-footer">
@@ -193,10 +129,7 @@
        <el-button type="primary" @click="backSubmit">确定</el-button>
      </span>
    </el-dialog>
    <OperaCarUseBookWindow
      ref="OperaDetailsWindow"
      @success="handlePageChange"
    />
    <OperaCarUseBookWindow ref="OperaDetailsWindow" @success="handlePageChange" />
    <OperaCarUseBookParamWindow ref="OperaParamWindow" @success="search" />
  </TableLayout>
</template>
@@ -214,15 +147,15 @@
  name: 'Empower',
  extends: BaseTable,
  components: { TableLayout, Pagination, OperaCarUseBookWindow, OperaCarUseBookParamWindow },
  data () {
  data() {
    return {
      // userInfo: this.$store.state.userInfo,
      // 搜索
      searchForm: {
        memberName: '',
        companyName: '',
        startTime: '',
        endTime: '',
        queryStartTime: '',
        queryEndTime: '',
        type: null,
        status: null,
        radio: 0
@@ -238,7 +171,7 @@
      }
    }
  },
  created () {
  created() {
    this.config({
      module: '用车申请管理',
      api: '/business/carUseBook',
@@ -246,11 +179,11 @@
      'field.main': 'id'
    })
    // this.search()
    this.changeRadio(0)
    this.changeRadio('0')
    this.loadParams()
  },
  methods: {
    rowRevokeClick (row) {
    rowRevokeClick(row) {
      this.isShowBack = true
      this.backParam = {}
      this.$set(this.backParam, 'id', row.id)
@@ -258,14 +191,14 @@
        this.$refs.backForm.clearValidate()
      })
    },
    backSubmit () {
    backSubmit() {
      revokeById({ ...this.backParam }).then(res => {
        this.$tip.success('撤销成功')
        this.isShowBack = false
        this.search()
      })
    },
    handleEx () {
    handleEx() {
      this.$dialog.exportConfirm('确认导出吗?')
        .then(() => {
          this.exLoading = true
@@ -302,10 +235,10 @@
      }
      this.search()
    },
    handleEdit () {
    handleEdit() {
      this.$refs.OperaParamWindow.open()
    },
    loadParams () {
    loadParams() {
      allList({
      })
        .then(res => {
@@ -326,7 +259,7 @@
        .finally(() => {
        })
    },
    seleTime (e) {
    seleTime(e) {
      this.searchForm.queryStartTime = null
      this.searchForm.queryEndTime = null
      if (e != null && e.length >= 2) {
@@ -336,11 +269,19 @@
      this.searchForm.radio = null
      this.search()
    },
    reset () {
    reset() {
      this.$refs.searchForm.resetFields()
      this.searchForm.radio = 0
      this.changeRadio(0)
      // this.search()
      this.searchForm = {
        memberName: '',
        companyName: '',
        queryStartTime: '',
        queryEndTime: '',
        type: null,
        status: null,
        radio: ''
      }
      // this.changeRadio(0)
      this.search()
    }
  }
}
admin/src/views/platform/platform.vue
@@ -8,7 +8,7 @@
            <el-input v-model="searchForm.name" clearable placeholder="请输入月台名称"
              @keypress.enter.native="search"></el-input>
          </el-form-item>
          <el-form-item label="">
          <el-form-item label="" prop="groupId">
            <el-select v-model="searchForm.groupId" placeholder="请选择月台分组" @change="search" clearable>
              <el-option v-for="item in groupList" :key="item.id" :label="item.name" :value="item.id">
              </el-option>
admin/src/views/platform/platformReason.vue
@@ -7,16 +7,16 @@
          <el-input v-model="searchForm.reason" clearable placeholder="请输入入园原因"
            @keypress.enter.native="search"></el-input>
        </el-form-item>
        <el-form-item label="">
        <el-form-item label="" prop="groupId">
          <el-select v-model="searchForm.groupId" placeholder="请选择月台分组" @change="search" clearable>
            <el-option v-for="item in groupList" :key="item.id" :label="item.name" :value="item.id">
            </el-option>
          </el-select>
        </el-form-item>
        <section>
          <el-button type="primary" @click="search">搜索</el-button>
          <el-button @click="reset">重置</el-button>
        </section>
        <!-- <section> -->
        <el-button type="primary" @click="search">搜索</el-button>
        <el-button @click="reset">重置</el-button>
        <!-- </section> -->
      </el-form>
    </SearchFormCollapse>
    <!-- 表格和分页 -->
@@ -27,7 +27,8 @@
        <li><el-button @click="deleteByIdInBatch" icon="el-icon-delete"
            v-permissions="['business:platformreason:delete']">删除</el-button></li>
      </ul>
      <el-table :height="tableHeightNew"  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="reason" label="入园原因" fixed min-width="100px"></el-table-column>
        <el-table-column prop="groupName" label="对应作业月台组" fixed min-width="150px"></el-table-column>
h5/pages/staff/vehicle/apply.vue
@@ -7,7 +7,7 @@
          <text>*</text>
          <text>预计用车时段</text>
        </view>
        <view class="value" @click="$goBack()">
        <view class="value" @click="goBack">
          <text class="mr6" :style="{ color: param.startTime ? '#000000' : '#999999' }">
            <text v-if="param.startTime">
              {{ param.startTime.slice(5, 16) }}至{{
@@ -24,7 +24,7 @@
          <text>*</text>
          <text>申请车辆</text>
        </view>
        <view class="value" @click="$goBack()">
        <view class="value" @click="goBack">
          <input type="text" disabled placeholder="请输入申请车辆" v-model="param.carCode"
            placeholder-style="color: #999999;" />
        </view>
@@ -130,9 +130,14 @@
      this.$set(this.param, 'memberNames', res.map(i => i.realname).join(','))
    })
  },
    destroyed() {
        console.log('页面销毁');
        // uni.setStorageSync('vehicleAppForm', {})
    },
  onLoad(option) {
    console.log(option)
    this.param = { ...this.param, ...option }
        const param = uni.getStorageSync('vehicleAppForm') || {}
    this.param = { ...param, ...option }
        console.log(this.param);
    this.minDate = new Date().getTime()
    this.param.planUseDate = dayjs(this.param.startTime).format('YYYY-MM-DD HH:mm')
  },
@@ -160,6 +165,7 @@
        ...param,
      }).then(res => {
        if (res.code === 200) {
                    uni.setStorageSync('vehicleAppForm', {})
          setTimeout(() => {
            uni.showToast({
              title: '提交成功',
@@ -180,6 +186,10 @@
      }
      this.$jump('/pages/staff/vehicle/applePeo')
    },
        goBack() {
            uni.setStorageSync('vehicleAppForm', this.param)
            this.$goBack()
        },
    confirmDate(e) {
      this.param.planUseDate = dayjs(e.value).format('YYYY-MM-DD HH:mm')
      this.isShowDatetime = false
h5/pages/staff/vehicle/shinei.vue
@@ -129,7 +129,8 @@
        },
        onLoad() {
            this.minDate = new Date().getTime() - (6 * 24 * 60 * 60 * 1000)
            this.initData()
            this.initData();
            uni.setStorageSync('vehicleAppForm', {})
        },
        methods: {
            formatter(type, value) {
h5/pages/staff/vehicle/shiwai.vue
@@ -144,6 +144,7 @@
    // this.minDate = new Date(dayjs().format('YYYY-MM-DD HH:mm') + ':00').getTime()
    this.minDate = new Date().getTime() - (6 * 24 * 60 * 60 * 1000)
    this.initData()
        uni.setStorageSync('vehicleAppForm', {})
  },
  methods: {
        formatter(type, value) {