Merge branch 'feature/jq_1' into 'develop'

Feature/jq 1

See merge request com.pica.cloud.education.frontend/pica-admin-consultation!190

src/components/common/diagnosis-doctor.vue

@@ -26,7 +26,8 @@
             v-model="chooseTime"
             type="date"
             :clearable="false"
-            placeholder="选择日期"
+            :disabled="formData.receptionName == ''"
+            placeholder="日期-请先选择医生"
             @change="getNowDate"
           />
         </div>
@@ -380,7 +381,6 @@
     },
     methods: {
       getChooseTimeValue(value, index) {
-        console.log(value, index);
         this.chooseTimeIndex = index;
         this.startTime = value.startDate;
         this.endTime = value.endDate;

src/components/common/diagnosis-time.vue

@@ -136,6 +136,8 @@
           assistantRemark: '',
         },
         rangeTime: '',
+        startDate:'',
+        endDate:'',
         chooseTime: dayjs(new Date()).format('YYYY-MM-DD'),
         timeChoosetList: [],
         chooseTimeIndex: 1000,
@@ -151,13 +153,6 @@
       };
     },
     watch: {
-    // diagnosisTimeVisible(val, b) {
-    //   if (val != b ) {
-    //     this.getLeisureTime();
-    //     console.log(this.departmentId, 'bizTypebizTypebizType');
-    //   }
-    //   // 操作
-    // }
     },
     created() {
       vm = this;
@@ -198,18 +193,29 @@
         this.getLeisureTime(this.chooseTime);
       },
       getChooseTimeValue(value, index) {
+        console.log(value, index);
+        this.startDate = value.startDate;
+        this.endDate = value.endDate;
         if (value.isFull == 2) {
           return;
         }
         this.chooseTimeIndex = index;
       },
       confirm() {
+        if (this.startDate == '') {
+          this.$message({
+            message: '请选择排班时间',
+            type: 'warning',
+            duration: 1000,
+          });
+          return false;
+        }
         vm.isClick = true;
         const req = {
           id: this.diagnoseLogId,
           bizType: this.bizType,
-          assistantBeginTime: this.rangeTime[0],
-          assistantEndTime: this.rangeTime[1],
+          assistantBeginTime: this.startDate,
+          assistantEndTime: this.endDate,
           assistantRemark: this.model.assistantRemark,
         };
         updateDiagnosis(req)