Merge remote-tracking branch 'origin/master'

jiangping

2024-06-28 43942a545271345ce26e40d82bb97138c5ea7611

 admin/src/views/operation/serviceCar/apprRecord.vue

@@ -51,8 +51,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:carusebook:create','business:carusebook:exportExcel']">
        <li><el-button type="primary" @click="handleEdit" icon="el-icon-plus" v-permissions="['business:carusebook:create']">新建</el-button></li>
        <li><el-button type="danger" @click="deleteByIdInBatch" icon="el-icon-delete" v-permissions="['business:carusebook:exportExcel']">导出</el-button></li>
      </ul>
      <el-table
          v-loading="isWorking.search"
@@ -109,6 +110,7 @@
      </pagination>
    </template>
    <OperaCarUseBookWindow ref="OperaDetailsWindow" @success="handlePageChange"/>
    <OperaCarUseBookParamWindow ref="OperaParamWindow" @success="search"/>
  </TableLayout>
</template>

@@ -117,12 +119,13 @@
import TableLayout from '@/layouts/TableLayout'
import Pagination from '@/components/common/Pagination'
import OperaCarUseBookWindow from '@/components/business/OperaCarUseBookWindow'
import OperaCarUseBookParamWindow from '@/components/operation/OperCarUseBookParamWindow.vue'
import { timeForMat } from '@/utils/util'
import { allList } from '@/api/business/hiddenDangerParam'
export default {
  name: 'Empower',
  extends: BaseTable,
  components: { TableLayout, Pagination ,OperaCarUseBookWindow},
  components: { TableLayout, Pagination, OperaCarUseBookWindow, OperaCarUseBookParamWindow },
  data () {
    return {
      // 搜索
@@ -169,26 +172,29 @@
      }
      this.search()
    },
    handleEdit () {
      this.$refs.OperaParamWindow.open()
    },
    loadParams () {
      allList({
      })
          .then(res => {
            if (res != null && res.length) {
              res.forEach(item => {
                if (item && item.type != null && item.type === 0) {
                  this.areaList.push(item)
                }
                if (item && item.type != null && item.type === 1) {
                  this.cateList.push(item)
                }
              })
            }
          })
          .catch(e => {
            // this.$tip.apiFailed(e)
          })
          .finally(() => {
          })
        .then(res => {
          if (res != null && res.length) {
            res.forEach(item => {
              if (item && item.type != null && item.type === 0) {
                this.areaList.push(item)
              }
              if (item && item.type != null && item.type === 1) {
                this.cateList.push(item)
              }
            })
          }
        })
        .catch(e => {
          // this.$tip.apiFailed(e)
        })
        .finally(() => {
        })
    },
    seleTime (e) {
      this.searchForm.queryStartTime = e[0]