Merge branch 'chronic-dev' of http://gitlab.yiboshi.com/nightkis1995/frontend-h5 into chronic-dev

src/doctor/components/template/temDetail.vue

@@ -9,15 +9,15 @@
             </div>
 
             <div class='grow overflow-y-auto pl-4 pr-4 pt-3 pb-3'>
-                {{fileType}}
+<!--                {{fileType}}-->
                 <div>
                     <div class='flex flex-col '>
                         <!-- 文本 -->
-                        <div class='card' v-if='contentList?.length' @click='selectFiletype(1)'>
+                        <div class='card' v-if='contentList?.length' @click.stop='selectFiletype(1)'>
                             <div class='flex justify-between items-center'>
                             <div class='font-semibold mb-1'>文本</div>
-                            <van-checkbox-group v-model="fileType" shape="square"  icon-size="16px">
-                                <van-checkbox :name="1"></van-checkbox>
+                            <van-checkbox-group v-model="fileType" shape="square"  icon-size="16px" >
+                                <van-checkbox :name="1" @click.stop='()=> {}'></van-checkbox>
                             </van-checkbox-group>
                             </div>
                             <div class='conten-bg'>
@@ -37,7 +37,7 @@
                         <div class='flex justify-between items-center'>
                             <div class='font-semibold mb-1'>视频</div>
                             <van-checkbox-group v-model="fileType" shape="square"  icon-size="16px">
-                                <van-checkbox :name="3"></van-checkbox>
+                                <van-checkbox :name="3" @click.stop='()=> {}'></van-checkbox>
                             </van-checkbox-group>
                         </div>
                         <div class='conten-bg'>
@@ -51,7 +51,7 @@
                         <div class='flex justify-between items-center'>
                             <div class='font-semibold mb-1'>音频</div>
                             <van-checkbox-group v-model="fileType" shape="square"  icon-size="16px">
-                                <van-checkbox :name="2"></van-checkbox>
+                                <van-checkbox :name="2" @click.stop='()=> {}'></van-checkbox>
                             </van-checkbox-group>
                         </div>
                         <div class='conten-bg'>

src/doctor/followUp/generalFU/detail/Detail.vue

@@ -249,7 +249,6 @@ import { getTemplateDetail } from '@/api/doctor/workbench'
 export default {
     name: 'CurrencyFUDetail.vue',
     components: { ImagePreview, Mp4, Mp3 },
-    inject: ['showNav'],
     data() {
         return {
             activeCollapse: [],

src/doctor/followUp/generalFU/form/CommonBottom.vue

 <template>
     <div>
         <van-form ref='form'>
-            <div class='label-title' v-if='showPush'>请选择推送渠道</div>
+            <div class='no-req-label' v-if='showPush'>请选择推送渠道</div>
             <van-field
                 v-model='form.isSmsIsWxStr'
                 style='padding: 0px'
@@ -114,7 +114,7 @@ export default {
                 isSmsIsWx: []
             },
             rules: {
-                isSmsIsWxStr: [{ required: true, message: '请选择' }],
+                isSmsIsWxStr: [{ required: false, message: '请选择' }],
                 visitUnitName: [{ required: true, message: '请选择' }],
                 visitOfficeName: [{ required: true, message: '请选择' }],
                 visitDoctorName: [{ required: true, message: '请选择' }],

src/doctor/followUp/generalFU/form/GeneralFUForm.vue

@@ -626,8 +626,17 @@ export default {
                 this.$refs.form.validate().then(async () => {
                     let time = dayjs(this.form.screenTime).format('YYYY-MM-DD HH:00:00')
                     let content = `${this.modeEnumList?.urgeResidentShow ? `${this.firstForm?.residentsRecord?.residentName}先生/女士，` : `您好，`}请您于${time}到${this.authInfo.unitName}进行专病高危筛查/慢病复查，祝早日恢复健康！`
+                    const {publicizeType, ...others} = this.form
+                    let publicizeTypeInfo = ''
+                    if (publicizeType && publicizeType instanceof Array) {
+                        publicizeTypeInfo = publicizeType.join()
+                    }
+                    if (publicizeType && typeof publicizeType === "string") {
+                        publicizeTypeInfo = publicizeType
+                    }
                     let res = {
-                        ...this.form,
+                        ...others,
+                        publicizeType: publicizeTypeInfo,
                         urgentInsContent: content
                     }
                     //健康指导