修改日历显示、增加出诊设置

src/components/GroupFormBtns.vue

@@ -2,8 +2,8 @@
 
 <template>
     <div class="btns-wrap flex">
-        <GuipButton type="ignore" @click="cancelClick">取消</GuipButton>
+        <GuipButton type="ignore" @click="cancelClick">{{cancelText || '取消'}}</GuipButton>
-        <GuipButton type="primary" @click="confirmClick">保存</GuipButton>
+        <GuipButton type="primary" @click="confirmClick">{{confirmText ||'保存'}}</GuipButton>
     </div>
 </template>
 <script>
@@ -11,7 +11,7 @@ import GuipButton from '@/components/GuipButton.vue';
 
 export default {
     name: '',
-    props: [''],
+    props: ['cancelText','confirmText'],
     components: {
         GuipButton
     },

src/views/DoctorInformation.vue

@@ -18,22 +18,16 @@
                             <div class="qqCode-wrap right">
                                 <div class="avator-wrapper flex">
                                     <img v-if="doctorAvatorUrl" :src="doctorAvatorUrl" alt="" class="uploadImg">
-                                    <hover-button  :button-text="doctorAvatorUrl?'重新上传':'开始上传'" :default-icon="require('../assets/upLoad_grey.svg')"
+                                    <hover-button :button-text="doctorAvatorUrl ? '重新上传' : '开始上传'"
+                                        :default-icon="require('../assets/upLoad_grey.svg')"
                                         :hover-icon="require('../assets/upLoad_active.svg')"
                                         default-text-color="#23242B" hover-text-color="#006AFF">
                                     </hover-button>
 
                                     <div class="info-upload-wrapper" @click="clearDocotorAvatorFiles">
-                                        <el-upload
+                                        <el-upload :on-change="handleAvatarChange" action="#" list-type="picture-card"
-                                            :on-change="handleAvatarChange"
+                                            :multiple="false" :http-request="setDoctorBaseInfoUpload" :limit="Number(1)"
-                                            action="#"
+                                            ref="avatorUpload" :auto-upload="false">
-                                            list-type="picture-card"
-                                            :multiple="false"
-                                            :http-request="setDoctorBaseInfoUpload"
-                                            :limit="Number(1)"
-                                            ref="avatorUpload"
-                                            :auto-upload="false"
-                                        >
                                             <i slot="default" class="el-icon-plus"></i>
                                         </el-upload>
                                     </div>
@@ -46,8 +40,8 @@
 
                         </el-form-item>
 
-                        <GuipInput ref="GuipInput" column="column" :required="true" label="医生姓名"
+                        <GuipInput ref="GuipInput" column="column" :required="true" label="医生姓名" v-model="siteForm.name"
-                            v-model="siteForm.name" prop="name" placeholder="请输入" />
+                            prop="name" placeholder="请输入" />
                     </div>
                     <div class="flex-line"></div>
                     <div class="flex-right">
@@ -62,6 +56,27 @@
 
         </div>
         <div class="siteMessage flex-common" id="siteMessage2">
+            <p class="littleTitle mb32">出诊设置</p>
+            <el-form :model="siteForm" :rules="siteFormrules3" ref="siteForm3">
+                <div class="flex-wrap">
+                    <div class="flex-left">
+                        <p class="coincideTip mb12">您有多个出诊医院时，允许不同医院排班时段重合吗？</p>
+                        <div class="flex">
+                            <div class="coincideWrap">
+                                <el-radio v-model="siteForm.is_allow_coincide" :label="1">允许时段重合</el-radio>
+                                <p>适用于：可由助理代为坐诊</p>
+                            </div>
+                            <div class="coincideWrap">
+                                <el-radio v-model="siteForm.is_allow_coincide" :label="0">禁止时段重合</el-radio>
+                                <p>适用于：可由助理代为坐诊</p>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </el-form>
+            <GroupFormBtns @cancel="cancelClick" @confirm="submitCoincideSet" />
+        </div>
+        <div class="siteMessage flex-common" id="siteMessage2">
             <p class="littleTitle mb32">初诊审批</p>
             <el-form :model="siteForm" :rules="siteFormrules2" ref="siteForm2">
                 <div class="flex-wrap">
@@ -80,27 +95,24 @@
                                 <div class="avator-wrapper">
                                     <div class="flex" style="position: relative;">
                                         <img v-if="approverWechatUrl" :src="approverWechatUrl" class="uploadImg">
-                                        <hover-button :button-text="(approverWechatUrl ? '重新上传':'微信二维码')" :default-icon="require('../assets/upLoad_grey.svg')"
+                                        <hover-button :button-text="(approverWechatUrl ? '重新上传' : '微信二维码')"
+                                            :default-icon="require('../assets/upLoad_grey.svg')"
                                             :hover-icon="require('../assets/upLoad_active.svg')"
                                             default-text-color="#23242B" hover-text-color="#006AFF" />
 
-                                        <div class="info-upload-wrapper" @click="clearApproverWechatFiles" style="width: 177px;left: 0;display: flex;justify-content: flex-start;overflow: hidden;">
+                                        <div class="info-upload-wrapper" @click="clearApproverWechatFiles"
-                                            <el-upload
+                                            style="width: 177px;left: 0;display: flex;justify-content: flex-start;overflow: hidden;">
-                                                :on-change="handleApproverWechatChange"
+                                            <el-upload :on-change="handleApproverWechatChange" action="#"
-                                                action="#"
+                                                list-type="picture-card" :multiple="false"
-                                                list-type="picture-card"
+                                                :http-request="setApproverWechatUpload" :limit="Number(1)"
-                                                :multiple="false"
+                                                ref="approverWechatUpload" :auto-upload="false">
-                                                :http-request="setApproverWechatUpload"
-                                                :limit="Number(1)"
-                                                ref="approverWechatUpload"
-                                                :auto-upload="false"
-                                            >
                                                 <i slot="default" class="el-icon-plus"></i>
                                             </el-upload>
                                         </div>
                                     </div>
 
-                                    <div slot="tip" class="el-upload__tip desc" style="margin-top:8px;">批人微信二维码，大小2M以内</div>
+                                    <div slot="tip" class="el-upload__tip desc" style="margin-top:8px;">批人微信二维码，大小2M以内
+                                    </div>
                                 </div>
                             </div>
                         </GuipFormItem>
@@ -121,8 +133,8 @@
                     </div>
                     <div class="flex-line"></div>
                     <div class="flex-right">
-                        <GuipInput ref="GuipInput" column="column"  label="个人标签"
+                        <GuipInput ref="GuipInput" column="column" label="个人标签" v-model="siteForm.label" prop="name"
-                            v-model="siteForm.label" prop="name" placeholder="请输入" />
+                            placeholder="请输入" />
                     </div>
                 </div>
             </el-form>
@@ -179,6 +191,7 @@ export default {
                 approver_phone: '',
                 approver_wechat: '',
                 first_visit_audit: '',
+                is_allow_coincide:''//是否允许重合
             },
             oldForm: {},
             siteFormrules2: {
@@ -186,6 +199,11 @@ export default {
                     { required: true, message: '请选择初诊审批设置', trigger: 'change' }
                 ]
             },
+            siteFormrules3: {
+                coincide: [
+                    { required: true, message: '请选择出诊设置', trigger: 'change' }
+                ]
+            },
             siteFormrules: {
                 name: [
                     { required: true, message: '请输入姓名', trigger: 'blur' }
@@ -362,6 +380,30 @@ export default {
 
             this.$refs.approverWechatUpload.submit();
         },
+        // 出诊设置
+        submitCoincideSet() {
+            if (!this.doctorId) {
+                this.$message.error('请先设置医生基础信息')
+                return;
+            }
+            // 接口待定
+            // this.$http('POST', '/api/admin/set_doctor_approver', {
+            //     is_allow_coincide:this.siteForm.is_allow_coincide
+            // }).then(response => {
+            //     if (response.code != 0) {
+            //         this.$message.error(response.msg)
+            //         return;
+            //     }
+
+            //     this.$message.success(response.msg)
+            //     if (this.doctorId) return;
+              
+            // }).catch(error => {
+            //     console.error(error, 'error')
+            //     this.$message.error('设置失败')
+            // })
+            
+        },
         handleApproverWechatChange(file, fileList) {
             console.log(file, fileList)
             this.approverWechatFile = file
@@ -382,7 +424,29 @@ export default {
 }
 </script>
 <style lang="scss" scoped>
+.coincideWrap{
+    margin-right: 24px;
+    text-align: left;
+    p{
+        font-family: Microsoft YaHei UI;
+        font-size: 12px;
+        font-weight: normal;
+        line-height: 24px;
+        letter-spacing: 0.08em;
+        color: #8A9099;
+        padding-left: 22px;
+    }
+}
+.coincideTip{
+    font-family: Microsoft YaHei UI;
+    font-size: 14px;
+    font-weight: normal;
+    line-height: normal;
+    letter-spacing: 0.08em;
+    color: #1E2226;
+    text-align: left;
     
+}
 .info-upload-wrapper ::v-deep .el-upload-list.el-upload-list--picture-card {
     display: none;
 }
@@ -397,6 +461,7 @@ export default {
     width: 150px;
     margin-right: 20px;
 }
+
 .special-form-item ::v-deep .el-form-item__label {
     margin-bottom: 12px;
 }
@@ -421,8 +486,10 @@ export default {
     display: flex;
     width: 100%;
     justify-content: flex-start;
+
     .avator-wrapper {
         position: relative;
+
         .info-upload-wrapper {
             position: absolute;
             display: flex;