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 |  102 +++++++++++++++++++++++++++++++++++++++++++-------
 1 files changed, 87 insertions(+), 15 deletions(-)

diff --git a/admin/src/views/business/visitorSources.vue b/admin/src/views/business/visitorSources.vue
index b0675bd..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"
@@ -29,10 +38,13 @@
                 </el-switch>
             </el-form-item>
             <el-form-item label="璁垮绛旈涓婚:" prop="theme">
-                <el-input style="width: 50%;" v-model="form.theme" placeholder="璇疯緭鍏ョ瓟棰樻爣棰�" v-trim/>
+                <el-input style="width: 50%;" type="textarea" v-model="form.theme" placeholder="璇疯緭鍏ョ瓟棰樻爣棰�" v-trim/>
             </el-form-item>
             <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="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>
@@ -43,6 +55,31 @@
 
 <script>
 import { getVisitConfigDTO, updateVisitConfig } from '@/api/system/common'
+import {
+  // necessary extensions
+  Doc,
+  Text,
+  Paragraph,
+  Heading,
+  Bold,
+  Underline,
+  Italic,
+  Strike,
+  ListItem,
+  BulletList,
+  OrderedList,
+  Image,
+  Blockquote,
+  TextAlign,
+  Indent,
+  Table,
+  TableHeader,
+  TableCell,
+  TableRow,
+  TextColor,
+  HorizontalRule
+} from 'element-tiptap'
+import { upload } from '@/api/system/common'
 export default {
   name: 'visitorSources',
 
@@ -54,9 +91,43 @@
         reservationWay: 0,
         healthCard: 0,
         isAnswer: 0,
+        doorsVisitRequired: '',
         theme: '',
-        description: ''
-      }
+        description: '',
+        visitNotice: ''
+      },
+      extensions: [
+        new Doc(),
+        new Text(),
+        new Paragraph(),
+        new Heading({ level: 5 }),
+        new Bold({ bubble: true }),
+        new Underline({ bubble: true, menubar: false }),
+        new Italic(),
+        new Strike(),
+        new ListItem(),
+        new BulletList(),
+        new OrderedList(),
+        new Image({
+          uploadRequest (file) {
+            const fd = new FormData()
+            fd.append('folder', 'visit/')
+            fd.append('file', file)
+            return upload(fd).then(res => {
+              return res.url
+            })
+          }
+        }),
+        new Blockquote(),
+        new TextAlign(),
+        new Indent(),
+        new Table(),
+        new TableHeader(),
+        new TableCell(),
+        new TableRow(),
+        new HorizontalRule(),
+        new TextColor()
+      ]
     }
   },
 
@@ -68,24 +139,26 @@
     getData () {
       getVisitConfigDTO({})
         .then(res => {
-          this.form.checkVisit = res.visitConfigParam.checkVisit
+          this.form.checkVisit = res.checkVisit
           this.form.description = res.description
-          this.form.healthCard = res.visitConfigParam.healthCard
-          this.form.isAnswer = res.visitConfigParam.isAnswer
-          this.form.reservationWay = res.visitConfigParam.reservationWay
+          this.form.healthCard = res.healthCard
+          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 () {
       updateVisitConfig({
-        visitConfigParam: {
-          isAnswer: this.form.isAnswer,
-          healthCard: this.form.healthCard,
-          checkVisit: this.form.checkVisit,
-          reservationWay: this.form.reservationWay
-        },
+        isAnswer: this.form.isAnswer,
+        healthCard: this.form.healthCard,
+        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()
@@ -98,7 +171,6 @@
 <style lang="scss" scoped>
     .box {
         width: 100%;
-        height: 100%;
         padding: 30px;
         box-sizing: border-box;
         background: #ffffff;

--
Gitblit v1.9.3