最新版本541200007

doum

5 小时以前 96a95eda485546ba8ddae189b66c411362067c2f

最新版本541200007

 admin/.env.development

@@ -3,9 +3,9 @@

# VUE_APP_API_URL  = 'https://atwl.ahzyssl.com/zhyq_interface'

VUE_APP_API_URL  = 'http://192.168.1.45:10010'
# VUE_APP_API_URL  = 'http://192.168.1.45:10010'

# VUE_APP_API_URL  = 'http://192.168.0.7/system_gateway'
VUE_APP_API_URL  = 'http://192.168.0.7/system_gateway'

# VUE_APP_API_URL  = 'http://127.0.0.1:10010'


 admin/src/components/business/OperaCarUseBookWindow.vue

@@ -121,10 +121,10 @@
    <!--  -->
    <template v-slot:footer>
      <el-button @click="agreeOpen" type="primary"
        v-if="model.approveDateVO != null && model.approveDateVO.canBeApproved != null && model.approveDateVO.canBeApproved == 1  && 1==2"
        v-if="model.approveDateVO != null && model.approveDateVO.canBeApproved != null && model.approveDateVO.canBeApproved == 1   "
        class="status-red">同意</el-button>
      <el-button @click="jectOpen" type="danger"
        v-if="model.approveDateVO != null && model.approveDateVO.canBeApproved != null && model.approveDateVO.canBeApproved == 1  && 1==2">拒绝</el-button>
        v-if="model.approveDateVO != null && model.approveDateVO.canBeApproved != null && model.approveDateVO.canBeApproved == 1  ">拒绝</el-button>
      <el-button @click="visible = false">返回</el-button>
    </template>
    <el-dialog append-to-body title="同意申请" style="text-align: center" class="dialogCl" :visible.sync="isShowProblem"

 admin/src/views/business/jkCabinetLog.vue

@@ -105,6 +105,7 @@
        startDate: '',
        cabinetId: '',
        authType: '',
        bizType: 1,
        memberName: '',
        status: ''
      },

 admin/src/views/business/jkCabinetLogJiujing.vue

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,138 @@
<template>
  <TableLayout :permissions="['business:jkcabinetlog:query']">
    <!-- æœç´¢è¡¨å• -->
    <el-form ref="searchForm" slot="search-form" :model="searchForm" label-width="100px" inline>
      <el-form-item label="检测时间" prop="date">
        <el-date-picker
          v-model="date"
          @change="setDate"
          type="daterange"
          range-separator="至"
          start-placeholder="开始日期"
          end-placeholder="结束日期"
          format="yyyy å¹´ MM æœˆ dd æ—¥"
          value-format="yyyy-MM-dd">
        </el-date-picker>
      </el-form-item>
      <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="cabinetId">
        <el-select v-model="searchForm.cabinetId" placeholder="请选择" @change="search">
          <el-option
            v-for="item in keysAll"
            :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" placeholder="请选择" @change="search">
          <el-option label="全部" value=""></el-option>
          <el-option label="未通过" :value="0"></el-option>
          <el-option label="通过" :value="1"></el-option>
        </el-select>
      </el-form-item>
      <section>
        <el-button type="primary" @click="search">搜索</el-button>
        <el-button type="primary" :loading="isWorking.export" v-permissions="['business:jkcabinetlog:exportExcel']" @click="exportExcel">导出</el-button>
        <el-button @click="reset">重置</el-button>
      </section>
    </el-form>
    <!-- è¡¨æ ¼å’Œåˆ†é¡µ -->
    <template v-slot:table-wrap>
      <el-table
        :height="tableHeightNew"
        v-loading="isWorking.search"
        :data="tableData.list"
        stripe
      >
        <el-table-column prop="createDate" label="检测时间" min-width="100px"></el-table-column>
        <el-table-column prop="memberName" label="检测人" min-width="100px"></el-table-column>
        <el-table-column prop="cabinetName" label="所属钥匙柜" min-width="100px"></el-table-column>
        <el-table-column prop="keyInfo" label="检测内容" min-width="200px"></el-table-column>
        <el-table-column label="状态" min-width="100px">
          <template slot-scope="{row}">
            <el-link :underline="false" v-if="row.status === 1">通过</el-link>
            <el-link type="danger" :underline="false" v-if="row.status ===0">未通过</el-link>
          </template>
        </el-table-column>
      </el-table>
      <pagination
        @size-change="handleSizeChange"
        @current-change="handlePageChange"
        :pagination="tableData.pagination"
      >
      </pagination>
    </template>
    <!-- æ–°å»º/修改 -->
    <OperaJkCabinetLogWindow ref="operaJkCabinetLogWindow" @success="handlePageChange"/>
  </TableLayout>
</template>

<script>
import BaseTable from '@/components/base/BaseTable'
import TableLayout from '@/layouts/TableLayout'
import Pagination from '@/components/common/Pagination'
import OperaJkCabinetLogWindow from '@/components/business/OperaJkCabinetLogWindow'
import { list } from '@/api/business/jkCabinet'
export default {
  name: 'JkCabinetLog',
  extends: BaseTable,
  components: { TableLayout, Pagination, OperaJkCabinetLogWindow },
  data () {
    return {
      // æœç´¢
      searchForm: {
        endDate: '',
        startDate: '',
        cabinetId: '',
        authType: '',
        bizType: 2,
        memberName: '',
        status: ''
      },
      date: [],
      keysAll: []
    }
  },
  created () {
    this.config({
      module: '钥匙柜开关门记录',
      api: '/business/jkCabinetLog',
      'field.id': 'id',
      'field.main': 'id'
    })
    this.search()
    this.getkeysAll()
  },
  methods: {
    setDate(e) {
      if (e && e.length > 1) {
        this.searchForm.startDate = e[0]
        this.searchForm.endDate = e[1]
      } else {
        this.searchForm.startDate = ''
        this.searchForm.endDate = ''
      }
      this.search()
    },
    // æœç´¢æ¡†é‡ç½®
    reset () {
      this.$refs.searchForm.resetFields()
      this.date = []
      this.searchForm.startDate = ''
      this.searchForm.endDate = ''
      this.search()
    },
    getkeysAll() {
      list({})
        .then(res => {
          console.log(res)
          this.keysAll = res
        })
    }
  }
}
</script>

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

@@ -106,10 +106,10 @@
            <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 && 1==2" type="text" icon="el-icon-delete"
            <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-if=" 1==2"
            <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>