From ccf69ee82f77a2e67a565cec02f95e64324a283f Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 15 五月 2024 09:16:48 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
admin/src/views/business/visitorSources.vue | 26 ++++++++++++++++++++------
1 files changed, 20 insertions(+), 6 deletions(-)
diff --git a/admin/src/views/business/visitorSources.vue b/admin/src/views/business/visitorSources.vue
index 6c8e4e1..f7aaf88 100644
--- a/admin/src/views/business/visitorSources.vue
+++ b/admin/src/views/business/visitorSources.vue
@@ -19,6 +19,15 @@
<el-radio :label="1">鏄�</el-radio>
</el-radio-group>
</el-form-item>
+ <el-form-item label="鍏佽鑷�夐棬绂佺粍:" prop="doorsVisitRequired">
+ <el-switch
+ v-model="form.doorsVisitRequired"
+ active-color="#13ce66"
+ inactive-color="#ff4949"
+ :active-value="1"
+ :inactive-value="0">
+ </el-switch>
+ </el-form-item>
<el-form-item label="璁垮鏄惁绛旈:" prop="isAnswer">
<el-switch
v-model="form.isAnswer"
@@ -34,8 +43,8 @@
<el-form-item label="璁垮绛旈璇存槑:" prop="description">
<el-input style="width: 50%;" type="textarea" v-model="form.description" placeholder="璇疯緭鍏�" v-trim/>
</el-form-item>
- <el-form-item label="鍏ュ巶椤荤煡:" prop="description">
- <el-tiptap style="width: 50%;" v-model="form.description" :extensions="extensions" />
+ <el-form-item label="鍏ュ巶椤荤煡:" prop="visitNotice">
+ <el-tiptap style="width: 50%;" v-model="form.visitNotice" :extensions="extensions" />
</el-form-item>
<el-form-item>
<el-button type="primary" @click="submit">淇濆瓨閰嶇疆椤�</el-button>
@@ -82,8 +91,10 @@
reservationWay: 0,
healthCard: 0,
isAnswer: 0,
+ doorsVisitRequired: '',
theme: '',
- description: ''
+ description: '',
+ visitNotice: ''
},
extensions: [
new Doc(),
@@ -100,7 +111,7 @@
new Image({
uploadRequest (file) {
const fd = new FormData()
- fd.append('folder', 'visit')
+ fd.append('folder', 'visit/')
fd.append('file', file)
return upload(fd).then(res => {
return res.url
@@ -134,6 +145,8 @@
this.form.isAnswer = res.isAnswer
this.form.reservationWay = res.reservationWay
this.form.theme = res.theme
+ this.form.doorsVisitRequired = res.doorsVisitRequired
+ this.form.visitNotice = res.visitNotice
})
},
submit () {
@@ -143,7 +156,9 @@
checkVisit: this.form.checkVisit,
reservationWay: this.form.reservationWay,
description: this.form.description,
- theme: this.form.theme
+ theme: this.form.theme,
+ visitNotice: this.form.visitNotice,
+ doorsVisitRequired: this.form.doorsVisitRequired
}).then(res => {
this.$message.success('淇濆瓨鎴愬姛')
this.getData()
@@ -156,7 +171,6 @@
<style lang="scss" scoped>
.box {
width: 100%;
- height: 100%;
padding: 30px;
box-sizing: border-box;
background: #ffffff;
--
Gitblit v1.9.3