From 7161f1002609e1d9db0a18fe0f6833c23c391c65 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 25 九月 2024 17:44:35 +0800
Subject: [PATCH] 最新版本
---
admin/src/views/vehicle/visitPark.vue | 55 ++-------------------------
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/wms/WmsServiceImpl.java | 2
admin/src/api/business/visitPark.js | 39 +++++++++++++++++++
server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/BaseRequst.java | 1
4 files changed, 45 insertions(+), 52 deletions(-)
diff --git a/admin/src/api/business/visitPark.js b/admin/src/api/business/visitPark.js
new file mode 100644
index 0000000..c01b2f5
--- /dev/null
+++ b/admin/src/api/business/visitPark.js
@@ -0,0 +1,39 @@
+import request from '../../utils/request'
+
+// 鏌ヨ
+export function fetchList (data) {
+ return request.post('/visitsAdmin/cloudService/business/visitPark/page', data, {
+ trim: true
+ })
+}
+
+// 鍒涘缓
+export function create (data) {
+ return request.post('/visitsAdmin/cloudService/business/visitPark/create', data)
+}
+export function batchAuth (data) {
+ return request.post('/visitsAdmin/cloudService/business/visitPark/batchAuth', data)
+}
+
+// 淇敼
+export function updateById (data) {
+ return request.post('/visitsAdmin/cloudService/business/visitPark/updateById', data)
+}
+// 淇敼
+export function reUpdate (data) {
+ return request.post('/visitsAdmin/cloudService/business/visitPark/reUpdate', data)
+}
+
+// 鍒犻櫎
+export function deleteById (id) {
+ return request.get(`/visitsAdmin/cloudService/business/visitPark/delete/${id}`)
+}
+
+// 鎵归噺鍒犻櫎
+export function deleteByIdInBatch (ids) {
+ return request.get('/visitsAdmin/cloudService/business/visitPark/delete/batch', {
+ params: {
+ ids
+ }
+ })
+}
diff --git a/admin/src/views/vehicle/visitPark.vue b/admin/src/views/vehicle/visitPark.vue
index a9104e7..680b58c 100644
--- a/admin/src/views/vehicle/visitPark.vue
+++ b/admin/src/views/vehicle/visitPark.vue
@@ -1,18 +1,9 @@
<template>
- <TableLayout :permissions="['business:member:query']">
+ <TableLayout :permissions="['business:visitpark:query']">
<!-- 鎼滅储琛ㄥ崟 -->
<el-form ref="searchForm" slot="search-form" :model="searchForm" label-width="100px" inline>
<el-form-item title="杞︾墝鍙�" prop="carCode">
<el-input v-model="searchForm.carCode" placeholder="杞︾墝鍙�" @keypress.enter.native="search"></el-input>
- </el-form-item>
- <el-form-item title="杞︿富濮撳悕/鎵嬫満鍙�" prop="memberName">
- <el-input v-model="searchForm.memberName" placeholder="鍛樺伐濮撳悕/鎵嬫満鍙�" @keypress.enter.native="search"></el-input>
- </el-form-item>
- <el-form-item title="杞︿富缁勭粐" prop="companyName">
- <el-input v-model="searchForm.companyName" placeholder="杞︿富缁勭粐鍚嶇О" @keypress.enter.native="search"></el-input>
- </el-form-item>
- <el-form-item title="鍋滆溅搴撳悕绉�" prop="parksName">
- <el-input v-model="searchForm.parksName" placeholder="鍋滆溅搴撳悕绉�" @keypress.enter.native="search"></el-input>
</el-form-item>
<section>
<el-button type="primary" @click="search">鎼滅储</el-button>
@@ -21,10 +12,7 @@
</el-form>
<!-- 琛ㄦ牸鍜屽垎椤� -->
<template v-slot:table-wrap>
- <ul class="toolbar" v-permissions="['business:member:create', 'business:member:delete']">
-<!--
- <li><el-button @click="deleteByIdInBatch" icon="el-icon-delete" v-permissions="['business:cars:delete']">鍒犻櫎</el-button></li>
--->
+ <ul class="toolbar" v-permissions="['business:visitpark:create', 'business:visitpark:delete']">
</ul>
<el-table
v-loading="isWorking.search"
@@ -49,41 +37,18 @@
<div v-if="row.isdeleted==1" style="color: red">宸插垹闄�</div>
<div v-else style="color: green">
<span v-if="row.hkStatus==0" style="color: #435EBE">寰呬笅鍙�</span>
- <span v-if="row.hkStatus==1" style="color: green">涓嬪彂鎴愬姛</span>
- <span v-if="row.hkStatus==2" style="color: red">涓嬪彂澶辫触</span>
+ <span v-if="row.hkStatus==1" style="color: green">棰勭害鎴愬姛</span>
+ <span v-if="row.hkStatus==2" style="color: red">棰勭害澶辫触</span>
+ <span v-if="row.hkStatus==2" style="color: red">宸插彇娑�</span>
</div>
</template>
</el-table-column>
- <el-table-column label="鐢ㄦ埛绫诲瀷" min-width="100px">
- <template slot-scope="{row}">
- <span v-if="row.memberType === 0">鍔冲姟璁垮</span>
- <span v-if="row.memberType === 1">鏅�氳瀹�</span>
- <span v-if="row.memberType === 2">鍐呴儴浜哄憳</span>
- </template>
- </el-table-column>
- <el-table-column prop="memberName" label="濮撳悕" min-width="100px"></el-table-column>
- <el-table-column prop="memberPhone" label="鎵嬫満鍙�" min-width="100px"></el-table-column>
- <el-table-column prop="companyName" label="缁勭粐" min-width="100px"></el-table-column>
<el-table-column prop="remark" label="澶囨敞" min-width="100px">
<template slot-scope="{row}">
<span v-if="row.isdeleted !=2">{{row.remark}}</span>
</template>
</el-table-column>
<el-table-column prop="createDate" label="鍒涘缓鏃堕棿" min-width="140px"></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="$refs.operaCarsWindow.open('缂栬緫杞﹁締淇℃伅琛�', row)" icon="el-icon-edit" v-permissions="['business:member:update']">缂栬緫</el-button>–>-->
-<!-- <el-button type="text" @click="deleteById(row)" v-if="row.isdeleted !=1" icon="el-icon-delete" v-permissions="['business:parkbook:delete']">鍒犻櫎</el-button>-->
-<!--<!–-->
-<!-- <el-button type="text" @click="reUpdate(row)" v-if="row.isdeleted !=1 && row.hkStatus ==0" icon="el-icon-edit" v-permissions="['business:parkbook:update']">绔嬪埢涓嬪彂</el-button>-->
-<!--–>-->
-<!-- </template>-->
-<!-- </el-table-column>-->
</el-table>
<pagination
@size-change="handleSizeChange"
@@ -103,9 +68,6 @@
import Pagination from '@/components/common/Pagination'
import OperaCarsWindow from '@/components/business/OperaCarsWindow'
import { validity } from '@/utils/util'
-import { sync } from '@/api/business/cars'
-import { batchLoss } from '@/api/business/memberCard'
-import {reUpdate} from "@/api/business/parkBook";
export default {
name: 'parkBook',
extends: BaseTable,
@@ -133,13 +95,6 @@
methods: {
validity (startTime, endTime) {
return validity(startTime, endTime)
- },
- reUpdate (row) {
- reUpdate({ id: row.id })
- .then(res => {
- this.$message.success('鎿嶄綔鎴愬姛')
- this.search()
- })
}
}
}
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/BaseRequst.java b/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/BaseRequst.java
index 5a0877b..8b44f92 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/BaseRequst.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/BaseRequst.java
@@ -2,7 +2,6 @@
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
-import org.springframework.beans.factory.annotation.Autowired;
@Data
public class BaseRequst<T> {
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/wms/WmsServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/wms/WmsServiceImpl.java
index 4e15f11..2ed745c 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/wms/WmsServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/wms/WmsServiceImpl.java
@@ -317,7 +317,7 @@
}
PlatformGroup group = platformGroupMapper.selectOne(new QueryWrapper<PlatformGroup>().lambda()
.eq(PlatformGroup::getIsdeleted,Constants.ZERO)
- .eq(PlatformGroup::getType,type==0?Constants.ONE:Constants.ZERO)
+ .eq(PlatformGroup::getType,type==0?Constants.ZERO:Constants.ONE)
.last("limit 1") );//鏌ヨ鍗歌揣鏈堝彴缁勭紪鐮�
job.setPlatformGroupId(group!=null?group.getId():null);
Member driver = memberMapper.selectJoinOne(Member.class,new MPJLambdaWrapper<Member>()
--
Gitblit v1.9.3