From 142eac0ef7640add5362eed3afb595596793f24d Mon Sep 17 00:00:00 2001
From: nidapeng <jp@doumee.com>
Date: 星期三, 20 三月 2024 11:38:43 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
h5/pages/visitorApplication/visitorApplication.vue | 7 +++++--
admin/src/components/business/OperaMemberCardWindow.vue | 13 +++++++------
admin/src/views/business/empower.vue | 2 +-
3 files changed, 13 insertions(+), 9 deletions(-)
diff --git a/admin/src/components/business/OperaMemberCardWindow.vue b/admin/src/components/business/OperaMemberCardWindow.vue
index 67bf678..00f1cfe 100644
--- a/admin/src/components/business/OperaMemberCardWindow.vue
+++ b/admin/src/components/business/OperaMemberCardWindow.vue
@@ -17,7 +17,7 @@
<el-option
v-for="item in member"
:key="item.id"
- :label="item.name + ' - ' + item.companyName"
+ :label="item.name"
:value="item.id">
</el-option>
</el-select>
@@ -81,11 +81,12 @@
open (title, target) {
this.title = title
this.visible = true
- if (target.isType === 1) {
- this.getMember()
- this.form.memberId = target.memberId
- console.log(this.form.memberId)
- return
+ if (target && target.isType) {
+ if (target.isType === 1) {
+ this.getMember()
+ this.form.memberId = target.memberId
+ return
+ }
}
// 鏂板缓
if (target == null) {
diff --git a/admin/src/views/business/empower.vue b/admin/src/views/business/empower.vue
index 00d6987..f9ccaed 100644
--- a/admin/src/views/business/empower.vue
+++ b/admin/src/views/business/empower.vue
@@ -70,7 +70,7 @@
</div>
</template>
</el-table-column>
- <el-table-column prop="sendDate" label="鍒涘缓鏃堕棿" min-width="150px"></el-table-column>
+ <el-table-column prop="createDate" label="鍒涘缓鏃堕棿" min-width="150px"></el-table-column>
<el-table-column label="鏄惁鍒犻櫎" min-width="100px">
<template slot-scope="{row}">
<span style="color: green;" v-if="row.isdeleted === 0">鍚�</span>
diff --git a/h5/pages/visitorApplication/visitorApplication.vue b/h5/pages/visitorApplication/visitorApplication.vue
index bdf5b0a..ecc0b4f 100644
--- a/h5/pages/visitorApplication/visitorApplication.vue
+++ b/h5/pages/visitorApplication/visitorApplication.vue
@@ -107,8 +107,8 @@
<u-datetime-picker
v-if="form1.starttime"
:show="show5"
- :minDate="new Date(form1.starttime).getTime()"
- :maxDate="new Date(maxTime).getTime()"
+ :minDate="formatTimeStamp(form1.starttime)"
+ :maxDate="formatTimeStamp(maxTime)"
mode="datetime"
@cancel="show5 = false"
@confirm="setoutDate"
@@ -619,6 +619,9 @@
this.form1.endtime = uni.$u.timeFormat(e.value, 'yyyy-mm-dd hh:MM');
this.show5 = false
},
+ formatTimeStamp(date) {
+ return Date.parse(new Date(`${date}`)) || Date.parse(new Date(`${date.replace(/-/g,'/')}`))
+ },
// 鏌ヨ鐢ㄦ埛
getUser() {
if (this.verify === '0') {
--
Gitblit v1.9.3