Merge branch 'feature/jq_1' into 'develop'

设置不可点击

See merge request !195

src/components/common/diagnosis-doctor.vue

@@ -381,6 +381,9 @@
     },
     methods: {
       getChooseTimeValue(value, index) {
+        if (value.isFull == 0) {
+          return;
+        }
         this.chooseTimeIndex = index;
         this.startTime = value.startDate;
         this.endTime = value.endDate;
@@ -554,8 +557,8 @@
       startTimeConfirm(isCancle) {
         console.log('isCancle-', isCancle);
         if (isCancle == 'cancel') {
-          this.endTimeValue = '';
-          this.timeRange = '';
+          this.startTime = '';
+          this.endTime = '';
         }
         if (isCancle == 'submit') {
           if (String(this.startTimeValue).trim() === '' || !this.startTimeValue) {

src/components/common/diagnosis-time.vue

@@ -192,12 +192,11 @@
         this.getLeisureTime(this.chooseTime);
       },
       getChooseTimeValue(value, index) {
-        console.log(value, index);
-        this.startDate = value.startDate;
-        this.endDate = value.endDate;
-        if (value.isFull == 2) {
+        if (value.isFull == 0) {
           return;
         }
+        this.startDate = value.startDate;
+        this.endDate = value.endDate;
         this.chooseTimeIndex = index;
       },
       confirm() {
@@ -231,6 +230,8 @@
           });
       },
       cancel() {
+        this.startTime = '';
+        this.endTime = '';
         this.rangeTime = '';
         this.model.assistantRemark = '';
         this.$emit('update:diagnosisTimeVisible', false);