From 96a95eda485546ba8ddae189b66c411362067c2f Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期二, 02 十二月 2025 10:04:33 +0800
Subject: [PATCH] 最新版本541200007
---
admin/src/views/business/jkCabinetLogJiujing.vue | 138 ++++++++++++++++++++++++++++++++++++++++++++++
admin/src/components/business/OperaCarUseBookWindow.vue | 4
admin/src/views/business/jkCabinetLog.vue | 1
admin/.env.development | 4
admin/src/views/operation/serviceCar/apprRecord.vue | 4
5 files changed, 145 insertions(+), 6 deletions(-)
diff --git a/admin/.env.development b/admin/.env.development
index 78e33f9..f12a4db 100644
--- a/admin/.env.development
+++ b/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'
diff --git a/admin/src/components/business/OperaCarUseBookWindow.vue b/admin/src/components/business/OperaCarUseBookWindow.vue
index 7c45a80..84fa81a 100644
--- a/admin/src/components/business/OperaCarUseBookWindow.vue
+++ b/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"
diff --git a/admin/src/views/business/jkCabinetLog.vue b/admin/src/views/business/jkCabinetLog.vue
index eee0af5..2cf58b5 100644
--- a/admin/src/views/business/jkCabinetLog.vue
+++ b/admin/src/views/business/jkCabinetLog.vue
@@ -105,6 +105,7 @@
startDate: '',
cabinetId: '',
authType: '',
+ bizType: 1,
memberName: '',
status: ''
},
diff --git a/admin/src/views/business/jkCabinetLogJiujing.vue b/admin/src/views/business/jkCabinetLogJiujing.vue
new file mode 100644
index 0000000..1d42aba
--- /dev/null
+++ b/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>
diff --git a/admin/src/views/operation/serviceCar/apprRecord.vue b/admin/src/views/operation/serviceCar/apprRecord.vue
index 43ef13b..8dfeda0 100644
--- a/admin/src/views/operation/serviceCar/apprRecord.vue
+++ b/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>
--
Gitblit v1.9.3