From 2ed5d099efee3a64bbe6925acfbf5faccb87ff03 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期二, 11 六月 2024 11:18:38 +0800
Subject: [PATCH] 更改头部
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/CarUseBookServiceImpl.java | 2 +-
admin/src/views/task/index.vue | 16 ++++++++--------
admin/src/components/business/OperaHiddenDangerWindow.vue | 3 +++
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/HiddenDangerServiceImpl.java | 2 +-
4 files changed, 13 insertions(+), 10 deletions(-)
diff --git a/admin/src/components/business/OperaHiddenDangerWindow.vue b/admin/src/components/business/OperaHiddenDangerWindow.vue
index 8281999..d2895a6 100644
--- a/admin/src/components/business/OperaHiddenDangerWindow.vue
+++ b/admin/src/components/business/OperaHiddenDangerWindow.vue
@@ -407,6 +407,7 @@
this.$tip.apiSuccess('澶勭悊鎴愬姛')
this.getDetail()
this.getLogList()
+ this.$emit('success')
this.isShowProblem = false
})
.catch(e => {
@@ -436,6 +437,7 @@
this.$tip.apiSuccess('閫�鍥炴垚鍔�')
this.getDetail()
this.getLogList()
+ this.$emit('success')
this.isBackProblem = false
})
.catch(e => {
@@ -488,6 +490,7 @@
this.$tip.apiSuccess('杞氦鎴愬姛')
this.getDetail()
this.getLogList()
+ this.$emit('success')
this.isShowTransfer = false
})
.catch(e => {
diff --git a/admin/src/views/task/index.vue b/admin/src/views/task/index.vue
index fd6b9ad..8900d6a 100644
--- a/admin/src/views/task/index.vue
+++ b/admin/src/views/task/index.vue
@@ -72,7 +72,7 @@
row-key="id"
default-expand-all
>
- <el-table-column prop="name" label="浠诲姟绫诲瀷" min-width="100">
+<!-- <el-table-column prop="name" label="浠诲姟绫诲瀷" min-width="100">
<template v-slot="scope">
<span
v-if="
@@ -82,12 +82,12 @@
>{{ cateList[scope.row.objType].name }}</span
>
</template>
- </el-table-column>
- <el-table-column label="鎻愪氦浜�" min-width="80">
- <template v-slot="scope">
- <span v-if="scope.row.title">{{
- scope.row.title.split(" - ")[1]
- }}</span>
+ </el-table-column>-->
+ <el-table-column label="澶勭悊浜嬮」" min-width="200">
+ <template slot-scope="{ row }"> {{ row.title}}
+<!-- <span v-if="row.title">{{
+ row.title.split("-")[1]
+ }}</span>-->
</template>
</el-table-column>
<el-table-column prop="createDate" label="鎻愪氦鏃堕棿" min-width="100">
@@ -194,7 +194,6 @@
}
},
created () {
- this.getHeadData()
this.getList()
},
methods: {
@@ -229,6 +228,7 @@
}
},
getList (page) {
+ this.getHeadData()
console.log(this.filters)
const { filters, pagination } = this
if (filters.selDate && filters.selDate.length > 0) {
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/CarUseBookServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/CarUseBookServiceImpl.java
index ece9591..25eeca6 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/CarUseBookServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/CarUseBookServiceImpl.java
@@ -182,7 +182,7 @@
.last("limit 1" );
CarUseBook model = carUseBookMapper.selectJoinOne(CarUseBook.class,queryWrapper);
ApproveDataVO approveDataVO = approveService.arrangeApprovedData(id,
- model.getType().equals(Constants.ZERO)?3:4,
+ Constants.equalsInteger(model.getType(),Constants.ZERO)?3:4,
memberId);
List<Approve> approveList = approveDataVO.getApproveList();
if(Constants.equalsInteger(model.getStatus(),Constants.FOUR)){
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/HiddenDangerServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/HiddenDangerServiceImpl.java
index c263aac..10ea27c 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/HiddenDangerServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/HiddenDangerServiceImpl.java
@@ -443,7 +443,7 @@
isTrue = true;
}
}
- if(isTrue){
+ if(!isTrue){
throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"瀵逛笉璧凤紝璇锋寜瑕佹眰濉啓澶勭悊鏁版嵁");
}
}
--
Gitblit v1.9.3