From e29143bcea863a5aac369b2fa570c5bbb5b98e8b Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 28 二月 2024 15:26:14 +0800
Subject: [PATCH] 整理
---
admin/src/views/business/internalCompany.vue | 7 ++++---
server/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitsServiceImpl.java | 6 +++++-
admin/src/views/business/internalMember.vue | 38 +++++++++++++++++++++++++++-----------
3 files changed, 36 insertions(+), 15 deletions(-)
diff --git a/admin/src/views/business/internalCompany.vue b/admin/src/views/business/internalCompany.vue
index f4dc54c..7c8222f 100644
--- a/admin/src/views/business/internalCompany.vue
+++ b/admin/src/views/business/internalCompany.vue
@@ -18,7 +18,7 @@
<template v-slot:table-wrap>
<ul class="toolbar" v-permissions="['business:company:create', 'business:company:sync']">
<li><el-button type="primary" v-permissions="['business:company:create']" @click="$refs.OperaInternalCompanyWindow.open('鏂板缓浼佷笟')">鏂板缓</el-button></li>
- <li><el-button type="primary" v-permissions="['business:company:sync']" @click="synchronous()">鍚屾</el-button></li>
+ <li><el-button type="primary" v-permissions="['business:company:sync']" :loading="loading" @click="synchronous()">鍚屾</el-button></li>
</ul>
<el-table
v-loading="isWorking.search"
@@ -62,6 +62,7 @@
data () {
return {
// 鎼滅储
+ loading:false,
searchForm: {
type: 1
},
@@ -98,7 +99,7 @@
async synchronous () {
this.$dialog.actionConfirm('鎿嶄綔纭鎻愰啋', '鎮ㄧ‘璁ゅ悓姝ュ叏閮ㄤ俊鎭悧锛�')
.then(() => {
- this.isWorking.delete = true
+ this.loading = true
companySync({})
.then(res => {
this.$tip.apiSuccess(res || '鍚屾鎴愬姛')
@@ -108,7 +109,7 @@
this.$tip.apiFailed(e)
})
.finally(() => {
- this.isWorking.delete = false
+ this.loading = false
})
})
.catch(() => {})
diff --git a/admin/src/views/business/internalMember.vue b/admin/src/views/business/internalMember.vue
index 73143de..fb45d0e 100644
--- a/admin/src/views/business/internalMember.vue
+++ b/admin/src/views/business/internalMember.vue
@@ -24,6 +24,13 @@
<el-option label="鎷夐粦/鍐荤粨" value="2"></el-option>
</el-select>
</el-form-item>
+ <el-form-item label="" prop="hkStatus">
+ <el-select v-model="searchForm.hkStatus" @keypress.enter.native="search" placeholder="娴峰悍鍚屾鐘舵��">
+ <el-option label="寰呭悓姝�" value="0"></el-option>
+ <el-option label="鍚屾鎴愬姛" value="1"></el-option>
+ <el-option label="鍚屾澶辫触" value="2"></el-option>
+ </el-select>
+ </el-form-item>
<section>
<el-button type="primary" @click="search">鎼滅储</el-button>
<el-button @click="reset">閲嶇疆</el-button>
@@ -37,9 +44,9 @@
</template>
<!-- 琛ㄦ牸鍜屽垎椤� -->
<template v-slot:table-wrap>
- <ul class="toolbar" v-permissions="['business:member:delete']">
+ <ul class="toolbar" v-permissions="['business:member:delete','business:member:sync']">
<li><el-button type="primary">闂ㄧ鎺堟潈</el-button></li>
- <li><el-button type="primary" v-permissions="['business:member:sync']" @click="synchronous()">鍚屾</el-button></li>
+ <li><el-button type="primary" v-permissions="['business:member:sync']" :loading="loading" @click="synchronous()">鍚屾</el-button></li>
<li><el-button @click="deleteByIdInBatch" icon="el-icon-delete" v-permissions="['business:member:delete']">鍒犻櫎</el-button></li>
</ul>
<el-table
@@ -53,23 +60,30 @@
<el-table-column prop="phone" label="鎵嬫満鍙�" min-width="100px"></el-table-column>
<el-table-column label="鎬у埆" min-width="100px">
<template slot-scope="{row}">
- <span v-if="row.sex === 1">鐢�</span>
- <span v-if="row.sex === 2">濂�</span>
+ <span v-if="row.sex == 1">鐢�</span>
+ <span v-if="row.sex == 2">濂�</span>
</template>
</el-table-column>
<el-table-column prop="companyName" label="鎵�灞為儴闂�" min-width="100px"></el-table-column>
<el-table-column prop="status" label="鐘舵��" min-width="100px">
<template slot-scope="{row}">
- <span v-if="row.status === 0">姝ｅ父</span>
- <span v-if="row.status === 1">绂佺敤</span>
- <span v-if="row.status === 2">鎷夐粦/鍐荤粨</span>
+ <span v-if="row.status == 0" style="color: green">姝ｅ父</span>
+ <span v-if="row.status == 1" style="color: red">绂佺敤</span>
+ <span v-if="row.status == 2" style="color: red">鎷夐粦/鍐荤粨</span>
</template>
</el-table-column>
<el-table-column prop="code" label="宸ュ彿" min-width="100px"></el-table-column>
<el-table-column label="鍙嫓璁�" min-width="100px">
<template slot-scope="{row}">
- <span v-if="row.canVisit === '0'">鍚�</span>
- <span v-if="row.canVisit === '1'">鏄�</span>
+ <span v-if="row.canVisit != 1">鍚�</span>
+ <span v-if="row.canVisit == 1">鏄�</span>
+ </template>
+ </el-table-column>
+ <el-table-column label="娴峰悍鍚屾鐘舵��" min-width="100px">
+ <template slot-scope="{row}">
+ <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>
</template>
</el-table-column>
<el-table-column label="闂ㄧ瑙掕壊" min-width="100px">
@@ -135,6 +149,7 @@
searchForm: {
name: '',
status: '',
+ hkStatus: '',
canVisit: '',
keyword: '',
type: 2,
@@ -142,6 +157,7 @@
companyId: '',
hasFace: ''
},
+ loading:false,
companyTree: []
}
},
@@ -169,7 +185,7 @@
async synchronous () {
this.$dialog.actionConfirm('鎿嶄綔纭鎻愰啋', '鎮ㄧ‘璁ゅ悓姝ュ叏閮ㄤ俊鎭悧锛�')
.then(() => {
- this.isWorking.delete = true
+ this.loading = true
memberSync({})
.then(res => {
this.$tip.apiSuccess(res || '鍚屾鎴愬姛')
@@ -179,7 +195,7 @@
this.$tip.apiFailed(e)
})
.finally(() => {
- this.isWorking.delete = false
+ this.loading = false
})
})
.catch(() => {})
diff --git a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitsServiceImpl.java b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitsServiceImpl.java
index f36aaa1..35ab1c9 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitsServiceImpl.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitsServiceImpl.java
@@ -16,6 +16,7 @@
import com.doumee.core.haikang.model.HKTools;
import com.doumee.core.haikang.model.param.BaseResponse;
import com.doumee.core.haikang.model.param.request.VisitAppointmentCancelRequest;
+import com.doumee.core.haikang.model.param.request.VisitAppointmentOutRequest;
import com.doumee.core.haikang.model.param.request.VisitAppointmentRequest;
import com.doumee.core.haikang.model.param.respose.VisitAppointmentResponse;
import com.doumee.core.haikang.service.HKService;
@@ -1152,9 +1153,12 @@
if(!visits.getStatus().equals(Constants.VisitStatus.signin)){
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"璁垮璁板綍鐘舵�侀敊璇紝璇峰埛鏂伴噸璇�");
}
+ VisitAppointmentOutRequest request = new VisitAppointmentOutRequest();
+ request.setOrderId(visits.getHkId());
+ //璋冪敤娴峰悍寮哄埗绛剧
+ BaseResponse response = HKService.outVisitAppiontment(request);
visitsMapper.update(null,new UpdateWrapper<Visits>().lambda().set(Visits::getStatus,Constants.VisitStatus.signout)
.eq(Visits::getId,visitId));
-
}
}
--
Gitblit v1.9.3