From 8b00bff78ba86989df613fcc7b09e7f64e135a52 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期四, 29 二月 2024 11:43:00 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
admin/src/views/index.vue | 2
admin/src/components/common/Tree.vue | 16 +++--
admin/src/views/business/internalCompany.vue | 1
h5/pages/appointmentDetails/appointmentDetails.vue | 27 ++++++---
server/dmvisit_admin/src/main/java/com/doumee/api/business/MemberCardController.java | 1
admin/src/views/business/empower.vue | 50 +++++++++-------
admin/src/views/business/strandedPersonnel.vue | 5 +
admin/src/views/business/userAction.vue | 2
admin/src/utils/util.js | 3
server/dmvisit_admin/src/main/java/com/doumee/api/business/MemberController.java | 9 +++
server/dmvisit_service/src/main/java/com/doumee/service/business/impl/erp/ErpSyncServiceImpl.java | 5 +
h5/pages/userinfo/userinfo.vue | 2
12 files changed, 80 insertions(+), 43 deletions(-)
diff --git a/admin/src/components/common/Tree.vue b/admin/src/components/common/Tree.vue
index d162b27..6a6275a 100644
--- a/admin/src/components/common/Tree.vue
+++ b/admin/src/components/common/Tree.vue
@@ -18,11 +18,12 @@
<div class="tree">
<div v-for="(item, index) in list" :key="index" @click.stop="clickIten(item)">
<div class="tree_item">
- <i class="el-icon-caret-bottom" :class="{ 'activeColor': item.status }" v-show="item.status === 1 && item.childList.length > 0"></i>
- <i class="el-icon-caret-right color" v-show="item.childList.length > 0 && item.status === 0"></i>
- <div class="tree_item_label long-title-style" :title="item.name" :class="{ 'activeColor': item.status === 1 && item.childList.length === 0 }">{{ item.name }}</div>
+ <i class="el-icon-caret-bottom" :class="{ 'activeColor': item.fsStatus === 1 }" v-show="item.fsStatus === 1 && item.childList.length > 0"></i>
+ <i class="el-icon-caret-right color" v-show="item.childList.length > 0 && (item.fsStatus === 0 || !item.fsStatus)"></i>
+ <div class="tree_item_label long-title-style" :title="item.name" :class="{ 'activeColor': item.fsDate === 1 && item.childList.length === 0 }">{{ item.name }}</div>
</div>
- <div class="tree_childern" v-show="item.status === 1">
+<!-- v-show="item.status === 1"-->
+ <div class="tree_childern" v-show="item.fsStatus === 1">
<tree
:list="item.childList"
:defaultProps="defaultProps"
@@ -68,7 +69,10 @@
// 鐐瑰嚮褰撳墠椤�
clickIten (item) {
this.recursion(this.list)
- item.status === 0 ? item.status = 1 : item.status = 0
+ item.fsDate === 0 || !item.fsDate ? item.fsDate = 1 : item.fsDate = 0
+ if (item.childList.length > 0) {
+ item.fsStatus === 0 || !item.fsStatus ? item.fsStatus = 1 : item.fsStatus = 0
+ }
// item[this.defaultProps.status] = !item[this.defaultProps.status]
// this.list.forEach(subItem => {
// if ((subItem[this.defaultProps.id] !== item[this.defaultProps.id] && subItem[this.defaultProps.status]) || (this.list.length === 1 && subItem[this.defaultProps.status] === false)) {
@@ -98,7 +102,7 @@
// }
// })
children.forEach(item => {
- item.status = 0
+ item.fsDate = 0
if (item.childList.length > 0) {
this.recursion(item.childList)
}
diff --git a/admin/src/utils/util.js b/admin/src/utils/util.js
index 26071e0..14233fd 100644
--- a/admin/src/utils/util.js
+++ b/admin/src/utils/util.js
@@ -24,7 +24,8 @@
const time1 = new Date()
const time2 = new Date()
if (count === 1) {
- time1.setTime(time1.getTime() - (24 * 60 * 60 * 1000))
+ // time1.setTime(time1.getTime() - (24 * 60 * 60 * 1000))
+ time1.setTime(time1.getTime())
} else {
time1.setTime(time1.getTime())
}
diff --git a/admin/src/views/business/empower.vue b/admin/src/views/business/empower.vue
index e65ceac..dea958a 100644
--- a/admin/src/views/business/empower.vue
+++ b/admin/src/views/business/empower.vue
@@ -8,10 +8,12 @@
<el-form-item label="涓嬪彂鐘舵��" prop="sendStatus">
<el-select v-model="searchForm.sendStatus" placeholder="璇烽�夋嫨" @keypress.enter.native="search">
<el-option label="寰呬笅鍙�" value="0"></el-option>
- <el-option label="宸蹭笅鍙�" value="1"></el-option>
+ <el-option label="浠诲姟鎵ц" value="1"></el-option>
<el-option label="涓嬪彂鎴愬姛" value="2"></el-option>
<el-option label="宸插彇娑�" value="3"></el-option>
<el-option label="涓嬪彂澶辫触" value="4"></el-option>
+ <el-option label="浠诲姟涓嬭浇宸茬粨鏉�" value="5"></el-option>
+ <el-option label="涓嶇鍚堜笅鍙戞潯浠�" value="6"></el-option>
</el-select>
</el-form-item>
<el-form-item label="鍏徃" prop="companyId">
@@ -58,23 +60,27 @@
@selection-change="handleSelectionChange"
>
<el-table-column type="selection" width="55"></el-table-column>
- <el-table-column prop="name" label="濮撳悕" min-width="100px"></el-table-column>
- <el-table-column prop="phone" label="鎵嬫満鍙�" min-width="100px"></el-table-column>
- <el-table-column prop="phone" label="韬唤璇佸彿鐮�" min-width="100px"></el-table-column>
- <el-table-column prop="phone" label="鎵�灞炲叕鍙�" min-width="100px"></el-table-column>
- <el-table-column label="闂ㄧ鏈夋晥鏈�" min-width="100px">
+ <el-table-column prop="memberName" label="濮撳悕" min-width="80px"></el-table-column>
+ <el-table-column prop="memberPhone" label="鎵嬫満鍙�" min-width="120px"></el-table-column>
+ <el-table-column prop="memberidCard" label="韬唤璇佸彿鐮�" min-width="130px"></el-table-column>
+ <el-table-column prop="companyName" label="鎵�灞炲叕鍙�" min-width="150px"></el-table-column>
+ <el-table-column label="闂ㄧ鏈夋晥鏈�" min-width="170px">
<template slot-scope="{row}">
- <span>璧凤細{{row.startTime}}</span>
+ <span>璧凤細{{row.startTime}}</span><br />
<span>姝細{{row.endTime}}</span>
</template>
</el-table-column>
- <el-table-column prop="sendDate" label="瀵煎叆鏃堕棿" min-width="100px"></el-table-column>
- <el-table-column prop="sendUserId" label="鎿嶄綔浜哄憳" min-width="100px"></el-table-column>
+ <el-table-column prop="sendDate" label="瀵煎叆鏃堕棿" min-width="150px"></el-table-column>
+<!-- <el-table-column prop="createrName" label="鎿嶄綔浜哄憳" min-width="100px"></el-table-column>-->
<el-table-column label="涓嬪彂鐘舵��" min-width="100px">
<template slot-scope="{row}">
<span v-if="row.sendStatus === 0">寰呬笅鍙�</span>
- <span v-if="row.sendStatus === 1">宸蹭笅鍙�</span>
- <span v-if="row.sendStatus === 2">宸插彇娑�</span>
+ <span v-if="row.sendStatus === 1">浠诲姟鎵ц</span>
+ <span v-if="row.sendStatus === 2">涓嬪彂鎴愬姛</span>
+ <span v-if="row.sendStatus === 3">宸插彇娑�</span>
+ <span v-if="row.sendStatus === 4">涓嬪彂澶辫触</span>
+ <span v-if="row.sendStatus === 5">浠诲姟涓嬭浇宸茬粨鏉�</span>
+ <span v-if="row.sendStatus === 6">涓嶇鍚堜笅鍙戞潯浠�</span>
</template>
</el-table-column>
<el-table-column prop="sendType" label="涓嬪彂绫诲瀷" min-width="100px">
@@ -83,8 +89,8 @@
<span v-if="row.sendType === 1">瀹氭椂</span>
</template>
</el-table-column>
- <el-table-column prop="sendDate" label="涓嬪彂鏃堕棿" min-width="100px"></el-table-column>
- <el-table-column prop="sendInfo" label="涓嬪彂澶辫触鍘熷洜" min-width="100px"></el-table-column>
+ <el-table-column prop="sendDate" label="涓嬪彂鏃堕棿" min-width="150px"></el-table-column>
+ <el-table-column prop="sendInfo" label="涓嬪彂澶辫触鍘熷洜" min-width="150px"></el-table-column>
</el-table>
<pagination
@size-change="handleSizeChange"
@@ -131,17 +137,17 @@
methods: {
changeRadio (e) {
if (e === '0') {
- this.searchForm.startTime = timeForMat(1)[0]
- this.searchForm.endTime = timeForMat(1)[1]
- this.time = timeForMat(1)
+ this.searchForm.startTime = timeForMat(0)[0]
+ this.searchForm.endTime = timeForMat(0)[1]
+ this.time = timeForMat(0)
} else if (e === '1') {
- this.searchForm.startTime = timeForMat(7)[0]
- this.searchForm.endTime = timeForMat(7)[1]
- this.time = timeForMat(7)
+ this.searchForm.startTime = timeForMat(6)[0]
+ this.searchForm.endTime = timeForMat(6)[1]
+ this.time = timeForMat(6)
} else if (e === '2') {
- this.searchForm.startTime = timeForMat(30)[0]
- this.searchForm.endTime = timeForMat(30)[1]
- this.time = timeForMat(30)
+ this.searchForm.startTime = timeForMat(29)[0]
+ this.searchForm.endTime = timeForMat(29)[1]
+ this.time = timeForMat(29)
}
this.search()
},
diff --git a/admin/src/views/business/internalCompany.vue b/admin/src/views/business/internalCompany.vue
index 7c8222f..bd93eb6 100644
--- a/admin/src/views/business/internalCompany.vue
+++ b/admin/src/views/business/internalCompany.vue
@@ -26,6 +26,7 @@
stripe
:tree-props="{children: 'childList'}"
row-key="id"
+ :expand-row-keys="[list && list.length > 0 ? list[0].id.toString() : '']"
@selection-change="handleSelectionChange"
>
<!-- <el-table-column type="selection" width="55"></el-table-column>-->
diff --git a/admin/src/views/business/strandedPersonnel.vue b/admin/src/views/business/strandedPersonnel.vue
index 4ba97d3..1142b04 100644
--- a/admin/src/views/business/strandedPersonnel.vue
+++ b/admin/src/views/business/strandedPersonnel.vue
@@ -45,7 +45,8 @@
<el-table-column prop="outDate" label="鎺堟潈鍒版湡鏃堕棿" min-width="100px"></el-table-column>
<el-table-column label="瓒呮椂鏃堕暱" min-width="100px">
<template slot-scope="{row}">
- <span>{{row.timeOut.toString().replace('-', '')}}</span>
+ <span v-if="row.outStatus === 1">{{row.timeOut.toString().replace('-', '')}}鍒嗛挓</span>
+ <span v-else>-</span>
</template>
</el-table-column>
<el-table-column label="鐘舵��" min-width="100px">
@@ -62,7 +63,7 @@
fixed="right"
>
<template slot-scope="{row}">
- <el-button type="text" icon="el-icon-edit" v-permissions="['business:member:update']" @click="departure(scope.row.id)">绂诲巶</el-button>
+ <el-button type="text" icon="el-icon-edit" v-permissions="['business:member:update']" @click="departure(row.id)">绂诲巶</el-button>
</template>
</el-table-column>
</el-table>
diff --git a/admin/src/views/business/userAction.vue b/admin/src/views/business/userAction.vue
index a23c5a9..acdbbdd 100644
--- a/admin/src/views/business/userAction.vue
+++ b/admin/src/views/business/userAction.vue
@@ -89,7 +89,7 @@
<span v-else-if="row.beforeStatus === 7">鍙栨秷楂樼骇瀹℃壒浜�</span>
<span v-else-if="row.beforeStatus === 8">鎵嬪姩绂诲満</span>
<span v-else-if="row.beforeStatus === 9">鍒犻櫎</span>
- <span v-else>-</span>
+ <span v-else>姝ｅ父</span>
</template>
</el-table-column>
<el-table-column label="鎿嶄綔">
diff --git a/admin/src/views/index.vue b/admin/src/views/index.vue
index 81d1978..2d28484 100644
--- a/admin/src/views/index.vue
+++ b/admin/src/views/index.vue
@@ -88,7 +88,7 @@
label="澶勭悊"
width="80">
<template slot-scope="scope">
- <el-button type="text" @click="departure(scope.row.id)">绂诲満</el-button>
+ <el-button type="text" @click="departure(scope.row.id)" v-if="scope.row.outStatus === 1">绂诲巶</el-button>
</template>
</el-table-column>
</el-table>
diff --git a/h5/pages/appointmentDetails/appointmentDetails.vue b/h5/pages/appointmentDetails/appointmentDetails.vue
index a3bc209..d27642b 100644
--- a/h5/pages/appointmentDetails/appointmentDetails.vue
+++ b/h5/pages/appointmentDetails/appointmentDetails.vue
@@ -1,17 +1,19 @@
<template>
<view class="box">
<view class="box_head">
- <canvas class="box_head_qrcode" canvas-id="img"></canvas>
- <text class="box_head_a" v-if="info.status === 0">璁垮棰勭害寰呭鏍�</text>
- <text class="box_head_a" style="color: ;" v-if="info.status === 2">璁垮棰勭害瀹℃牳閫氳繃</text>
- <text class="box_head_a" v-if="info.status === 3">璁垮棰勭害瀹℃牳涓嶉�氳繃</text>
- <text class="box_head_b" v-if="info.status === 0">鎮ㄧ殑棰勭害鍗曞凡鎻愪氦瀹℃牳锛岃绛夊緟琚浜哄鏍�</text>
- <text class="box_head_b" v-if="info.status === 2">鎮ㄧ殑鏉ヨ鐢宠宸插鏍搁�氳繃锛岃鍦ㄩ棬鍗杩涜鐧�</text>
- <text class="box_head_b" v-if="info.status === 3">鎮ㄧ殑鏉ヨ鐢宠宸茶椹冲洖锛屽師鍥犳槸锛氳繖鏄師鍥�</text>
+ <canvas class="box_head_qrcode" canvas-id="img" v-if="[2,5,7,8,9].includes(info.status)"></canvas>
+ <image class="box_head_logo" src="../../static/logo@2x.png" mode="widthFix" v-else></image>
+ <text class="box_head_a" v-if="[0, 1].includes(info.status)">璁垮棰勭害寰呭鏍�</text>
+ <text class="box_head_a" style="color: #03AF76;" v-if="info.status === 2">璁垮棰勭害瀹℃牳閫氳繃</text>
+ <text class="box_head_a" style="color: #ED4545;" v-if="info.status === 3">璁垮棰勭害瀹℃牳涓嶉�氳繃</text>
+ <text class="box_head_b" v-if="[0, 1].includes(info.status)">鎮ㄧ殑棰勭害鍗曞凡鎻愪氦瀹℃牳锛岃绛夊緟琚浜哄鏍�</text>
+ <text class="box_head_b" v-if="info.status === 2">鎮ㄧ殑鏉ヨ鐢宠宸插鏍搁�氳繃锛岃鍦ㄩ棬鍗杩涜鐧昏鍏ュ満
+濡傞亣鐗规畩鎯呭喌锛屽彲鑱旂郴琚浜烘垨瀹変繚浜哄憳</text>
+ <text class="box_head_b" v-if="info.status === 3">鎮ㄧ殑鏉ヨ鐢宠宸茶椹冲洖锛屽鏈夌枒闂紝鍙仈绯昏璁夸汉</text>
</view>
<view class="box_list">
<view class="box_list_label">鎷滆淇℃伅</view>
- <view class="box_list_tips">璇锋敞鎰忔煡鐪嬪嚭鍏ラ棬绂佷笅鍙戞儏鍐碉紝濡傝嫢涓嬪彂澶辫触闇�閲嶆柊鐢宠</view>
+ <view class="box_list_tips" v-if="info.status === 2">璇锋敞鎰忔煡鐪嬪嚭鍏ラ棬绂佷笅鍙戞儏鍐碉紝濡傝嫢涓嬪彂澶辫触闇�閲嶆柊鐢宠</view>
<view class="box_list_item">
<view class="box_list_item_label">琚浜哄憳锛�</view>
<view class="box_list_item_val">{{info.visitUserName}}</view>
@@ -72,7 +74,9 @@
if (res.code === 200) {
this.info = res.data
if (res.data.qrcode) {
- wxcode.qrcode('img', res.data.qrcode, 320, 320)
+ this.$nextTick(() => {
+ wxcode.qrcode('img', res.data.qrcode, 320, 320)
+ })
}
}
})
@@ -126,6 +130,10 @@
width: 320rpx;
height: 320rpx;
}
+ .box_head_logo {
+ width: 220rpx;
+ height: 220rpx;
+ }
.box_head_a {
font-size: 36rpx;
font-weight: 600;
@@ -137,6 +145,7 @@
font-weight: 400;
color: #666666;
margin-top: 24rpx;
+ text-align: center;
}
}
.box_list {
diff --git a/h5/pages/userinfo/userinfo.vue b/h5/pages/userinfo/userinfo.vue
index 0c56d64..73fc279 100644
--- a/h5/pages/userinfo/userinfo.vue
+++ b/h5/pages/userinfo/userinfo.vue
@@ -198,7 +198,7 @@
formData: {
folderCode: 'MEMBER_IMG'
},
- success: (uploadFileRes) => {
+ success: (uploadFileRes) => {
let res = JSON.parse(uploadFileRes.data)
if (type === 'faceImg') {
this.visitorData.faceImg = res.data.halfPath
diff --git a/server/dmvisit_admin/src/main/java/com/doumee/api/business/MemberCardController.java b/server/dmvisit_admin/src/main/java/com/doumee/api/business/MemberCardController.java
index fd3e382..b075d7d 100644
--- a/server/dmvisit_admin/src/main/java/com/doumee/api/business/MemberCardController.java
+++ b/server/dmvisit_admin/src/main/java/com/doumee/api/business/MemberCardController.java
@@ -120,4 +120,5 @@
return ApiResponse.success(memberCardService.findList(card));
}
+
}
diff --git a/server/dmvisit_admin/src/main/java/com/doumee/api/business/MemberController.java b/server/dmvisit_admin/src/main/java/com/doumee/api/business/MemberController.java
index 0929320..9311b3f 100644
--- a/server/dmvisit_admin/src/main/java/com/doumee/api/business/MemberController.java
+++ b/server/dmvisit_admin/src/main/java/com/doumee/api/business/MemberController.java
@@ -236,4 +236,13 @@
return ApiResponse.success("鍚屾鎴愬姛");
}
+
+
+ @ApiOperation("娴嬭瘯浜哄憳鍐荤粨")
+ @PostMapping("/testFreeFz")
+ public ApiResponse testFreeFz() {
+ memberService.memberFreeze();
+ return ApiResponse.success(null);
+ }
+
}
diff --git a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/erp/ErpSyncServiceImpl.java b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/erp/ErpSyncServiceImpl.java
index abe363f..126cbfd 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/erp/ErpSyncServiceImpl.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/erp/ErpSyncServiceImpl.java
@@ -1070,6 +1070,11 @@
@Override
public void approveApply(ApproveNoticeRequest param){
try{
+ if(!Objects.isNull(param)
+ ){
+
+ }
+
if(Objects.isNull(param)
||Objects.isNull(param.getId())
||Objects.isNull(param.getStatus())){
--
Gitblit v1.9.3