change date

src/components/IM/chat.vue

@@ -970,7 +970,9 @@ export default {
     },
 
     closeChat() {
-      window.rtc.leave();
+      if(window.rtc){
+        window.rtc.leave();
+      }
       this.clearSession();
       this.$store.commit("updateShowChat", false);
       this.$store.commit("updateCurrentChat", {});

src/components/IM/diagnosis-live.vue

@@ -172,8 +172,6 @@ export default {
       }else{
         this.rtc.muteLocalAudio();
       }
-      this.isMuted = !this.isMuted;
-
     },
     // 主动呼叫
     drivingCall(data) {
@@ -354,11 +352,13 @@ export default {
     },
     // 关闭mc
     muteLocalAudio() {
+      this.isMuted = true;
       this.rtc.muteLocalAudio();
     },
     // 打开mc
     unmuteLocalAudio() {
       this.rtc.unmuteLocalAudio();
+      this.isMuted = false;
     },
     // 显示文案
     showText(status) {

src/components/common/diagnosis-doctor.vue

@@ -62,11 +62,19 @@
             <div @click="openDiagnosisStartTimeDialog" class="set-width grey-bg" style="width: 100%;">
               <i class="el-icon-alarm-clock"></i>
               <span v-if="startTimeValue === ''">接诊开始时间</span>
-              <span v-else>{{dayFormat(startTimeValue)}}--{{endTimeValue}}</span>
+              <span v-else>{{dayFormatWithoutSecond(startTimeValue)}} -- {{dayFormatWithoutSecond(endTimeValue)}}</span>
 
             </div>
           </el-col>
         </el-form-item>
+        <el-form-item class="required-label" prop="diagnoseChannel" label="问诊方式">
+          <el-col :span="15">
+            <el-radio-group v-model="formData.diagnoseChannel" size="small" style="line-height: 45px;width: 135%;">
+              <el-radio :label="1">APP问诊（系统发起问诊）</el-radio>
+              <el-radio :label="2">线下问诊（APP不会自动发起问诊）</el-radio>
+            </el-radio-group>
+          </el-col>
+        </el-form-item>
 
       </el-form>
       <!--            </el-row>-->
@@ -81,23 +89,43 @@
       @open="openDiagnosisStartTimeDialog"
     >
       <div class="startTime-wrap">
-        <div class="date-wrap">
-          <el-date-picker
-            popper-class="scale-datepicker"
-            size="large"
-            v-model="startTimeValue"
-            type="datetime"
-            placeholder="选择日期时间">
-          </el-date-picker>
+        <div class="line-wrap">
+          <div>
+            <span>问诊开始时间:</span>
+            <div class="date-wrap">
+              <el-date-picker
+                popper-class="scale-datepicker"
+                size="large"
+                @change="startTimeChange"
+                v-model="startTimeValue"
+                type="datetime"
+                placeholder="选择日期时间">
+              </el-date-picker>
+            </div>
+          </div>
+          <div class="mt20">
+            <span>问诊结束时间:</span>
+            <div class="date-wrap">
+              &nbsp;{{dayFormatWithoutSecond(endTimeValue)}}
+            </div>
+          </div>
         </div>
         <div class="time-wrap">
           <span>问诊时长:</span>
           <div class="time-range">
-            <el-radio-group v-model="timeRange">
-              <el-radio border size="large" :label="10">10分钟</el-radio>
-              <el-radio border size="medium" :label="15">15分钟</el-radio>
-              <el-radio border size="medium" :label="20">20分钟</el-radio>
-              <el-radio border size="medium" :label="30">30分钟</el-radio>
+            <el-radio-group v-model="timeRange" @change="timeRangeChange">
+              <div>
+                <el-radio border size="large" :label="10">10分钟</el-radio>
+              </div>
+              <div class="mt20">
+                <el-radio border size="medium" :label="15">15分钟</el-radio>
+              </div>
+              <div class="mt20">
+                <el-radio border size="medium" :label="20">20分钟</el-radio>
+              </div>
+              <div class="mt20">
+                <el-radio border size="medium" :label="30">30分钟</el-radio>
+              </div>
             </el-radio-group>
           </div>
         </div>
@@ -152,6 +180,8 @@ export default {
         innerFlag:1,
         receptionBeginTime:"",
         receptionEndTime:'',
+        bizType:'',
+        diagnoseChannel:''
       },
       doctorList:[],
       rangeTime:'',
@@ -162,6 +192,9 @@ export default {
         outsideDoctor: [
           {required: true, message: "请输入外部医生姓名", trigger: 'blur'}
         ],
+        diagnoseChannel: [
+          {required: true, message: "请选择问诊方式", trigger: 'change'}
+        ],
       },
       pickerOptions1: {
         disabledDate: time => {
@@ -211,8 +244,11 @@ export default {
               receptionId:this.formData.receptionId,
               receptionName:this.formData.receptionName,
               outsideDoctor:this.formData.outsideDoctor,
-              receptionBeginTime:this.rangeTime[0],
-              receptionEndTime:this.rangeTime[1],
+              // receptionBeginTime:this.rangeTime[0],
+              // receptionEndTime:this.rangeTime[1],
+              receptionBeginTime: this.dayFormat(this.startTimeValue),
+              receptionEndTime:this.endTimeValue,
+              diagnoseChannel: this.formData.diagnoseChannel
             }
           }
           else {
@@ -227,6 +263,7 @@ export default {
               // receptionEndTime:this.rangeTime[1],
               receptionBeginTime: this.dayFormat(this.startTimeValue),
               receptionEndTime:this.endTimeValue,
+              diagnoseChannel: this.formData.diagnoseChannel
             }
           }
           vm.isClick = true
@@ -312,6 +349,23 @@ export default {
     },
     dayFormat (v){
       return dayjs(v).format('YYYY-MM-DD HH:mm:ss');
+    },
+    dayFormatWithoutSecond (v){
+      if(!v){
+        return  '';
+      }
+      return dayjs(v).format('YYYY-MM-DD HH:mm');
+    },
+    timeRangeChange (v) {
+      console.log('---v', v);
+      if(this.startTimeValue && v){
+        this.endTimeValue = dayjs(this.startTimeValue).add(v, 'minute').format('YYYY-MM-DD HH:mm:ss');
+      }
+    },
+    startTimeChange (v) {
+      if(this.timeRange && v){
+        this.endTimeValue = dayjs(v).add(this.timeRange, 'minute').format('YYYY-MM-DD HH:mm:ss');
+      }
     }
   }
 }
@@ -339,11 +393,17 @@ export default {
   justify-content: space-around;
   .time-wrap{
     display: flex;
-    align-items: baseline;
+    align-items: end;
     .time-range{
       margin-left: 10px;
+      .mt20{
+        margin-top: 20px;
+      }
     }
   }
+  .date-wrap{
+    display: inline-block;
+  }
 }
 .startTime-footer{
   margin-top: 100px;