Merge branch 'feature/jq_1' into 'develop'

Feature/jq 1

See merge request !207

src/components/common/diagnosis-doctor.vue

@@ -27,7 +27,7 @@
             type="date"
             :clearable="false"
             :disabled="formData.receptionName == ''"
-            placeholder="日期-请先选择医生"
+            placeholder="请选择日期"
             @change="getNowDate"
           />
         </div>
@@ -497,6 +497,8 @@
           this.formData.doctorMobile = selected.doctorMobile;
           this.formData.doctorDepartmentId = selected.doctorDepartmentId;
           this.acceptsCeilings(this.formData.receptionId);
+          const nowDate = dayjs(new Date()).format('YYYY-MM-DD');
+          this.getNowDate(nowDate);
         // debugger;
         // this.formData.serviceFee       = this.priceFilter(selected.serviceFee)
         }
@@ -629,7 +631,7 @@
 
 <style lang="scss">
 .set-width {
-  width: 300px;
+  min-width: 230px;
 }
 .grey-bg {
   padding: 0px 15px;
@@ -672,15 +674,15 @@
   width: 130px;
 }
 .open-diagnosis-doctor {
-  padding: 10px 40px 40px 40px;
+  padding: 10px 20px 40px 30px;
   .choose-diagnosis-doctor {
     .el-select {
       margin-right: 30px;
       padding-bottom: 20px;
       .el-input {
-        width: 300px;
+        // width: 300px;
         .el-input__inner {
-          width: 300px;
+          // width: 300px;
           height: 32px;
           background: #ffffff;
           border-radius: 16px;
@@ -694,7 +696,7 @@
     }
     .el-date-editor {
       .el-input__inner {
-        width: 180px;
+        max-width: 150px;
         height: 32px;
         background: #ffffff;
         border-radius: 16px;
@@ -862,15 +864,15 @@
   }
   .work-info-botton {
     .contest {
-      width: 200px;
+      min-width: 100px;
       border-radius: 18px;
     }
     .refresh {
-      width: 200px;
+      min-width: 150px;
       border-radius: 18px;
     }
     .el-button--default {
-      width: 150px;
+      min-width: 150px;
       border-radius: 18px;
     }
   }