Merge branch 'feature/jq_1' into 'develop'

Feature/jq 1

See merge request !184

package.json

@@ -28,7 +28,7 @@
     "axios": "^0.19.2",
     "clipboard": "^2.0.6",
     "core-js": "^3.6.5",
-    "dayjs": "^1.8.30",
+    "dayjs": "^1.10.7",
     "dsbridge": "^3.1.4",
     "element-ui": "^2.6.1",
     "js-cookie": "^3.0.1",

src/api/diagnosis.js

@@ -265,3 +265,18 @@ export const opAck = async (data) => {
     method: 'post',
   });
 };
+export const acceptsCeiling = async (data) => {
+  return request({
+    url: '/diagnose/admin/diagnose/accepts/ceiling',
+    params: data,
+    method: 'get',
+  });
+};
+
+export const getLeisureTime = async (data) => {
+  return request({
+    url: '/diagnose/doctor/work/getLeisureTime',
+    data: data,
+    method: 'post',
+  });
+};

src/api/serviceSchedule.js

@@ -65,3 +65,16 @@ export const previewWork = async (data) => {
     data: data,
   });
 };
+export const setPlatformUpper = async (data) => {
+  return request({
+    url: `/diagnose/doctor/work/setPlatformUpper/${data.num}`,
+    data: data,
+    method: 'post',
+  });
+};
+export const getPlatformUpper = async () => {
+  return request({
+    url: '/diagnose/doctor/work/getPlatformUpper',
+    method: 'post',
+  });
+};

src/components/list/table-serviceSchedule.vue

@@ -9,7 +9,10 @@
     >
       <template slot="empty">
         <div class="nothing-data">
-          <img src="../../assets/image/nothingData.png" alt="" >
+          <img
+            src="../../assets/image/nothingData.png"
+            alt=""
+          >
           <span class="nothing-data-title">暂未找到符合条件的医生</span>
         </div>
       </template>
@@ -88,6 +91,13 @@
         align="center"
         sortable
       />
+      <el-table-column
+        prop="createdId"
+        label="修改人ID"
+        width="170"
+        align="center"
+        sortable
+      />
       <el-table-column
         prop="mobilePhone"
         label="联系电话"

src/views/IM/diagnosis-admin/diagnosis-list-new.vue

@@ -441,6 +441,7 @@
         :diagnose-type="diagnoseType"
         :doctor-id="doctorId"
         :range-time-data="rangeTimeData"
+        :doctor-info="doctorInfo"
         @search="search"
         @changeStartTime="changeStartTime"
       />
@@ -621,6 +622,7 @@
         },
         timer: null,
         fromType: 0, // 1或不传为为预约单列表  2为运营预约单列表  3为分诊台 4为接诊台
+        doctorInfo: {},
       };
     },
     watch: {
@@ -1106,11 +1108,13 @@
       },
       // 设为待确认时间
       waitMatchTime(row) {
+        // debugger;
         console.log(row, 'row');
+        this.doctorInfo = row;
         this.rangeTimeData = row.assistantBeginTime;
         this.diagnoseFlag = true;
         this.diagnosisDoctorVisible = true;
-
+        // this.acceptsCeilings(row.doctorId);
         this.diagnoseLogId = row.diagnoseLogId;
         this.diagnoseType = row.diagnoseType;
         if (row.doctorId == 0) {

src/views/IM/diagnosis-admin/modal/index.scss

@@ -6,21 +6,53 @@
   border-radius: 6px;
   flex: 3.8;
 }
-.w2{
- /deep/.fc-prev-button{
-  background:#f4f4f5;
-  cursor: not-allowed;
-  border:1px solid #d9d9d9;
- }
-}
-.w3{
-/deep/.fc-next-button{
-   background:#f4f4f5;
-   border:1px solid #d9d9d9;
-   cursor: not-allowed;
- }
-}
-/deep/.fc-timegrid-event-harness{
+.setMaxNum {
+  display: flex;
+  justify-content: space-around;
+}
+.input-value {
+  width: 100px;
+  /deep/.el-input-number__decrease {
+    width: 20px;
+  }
+  /deep/.el-input-number__increase {
+    width: 20px;
+  }
+  /deep/.el-input__inner {
+    padding: 0;
+  }
+}
+.list-item {
+  width: 86px;
+  height: 25px;
+  background: #ffffff;
+  border-radius: 16px;
+  border: 1px solid rgba(0, 0, 0, 0.15);
+  text-align: center;
+}
+.list-item-noth {
+  width: 86px;
+  height: 25px;
+  background: red;
+  border-radius: 16px;
+  border: 1px solid rgba(0, 0, 0, 0.15);
+  text-align: center;
+}
+.w2 {
+  /deep/.fc-prev-button {
+    background: #f4f4f5;
+    cursor: not-allowed;
+    border: 1px solid #d9d9d9;
+  }
+}
+.w3 {
+  /deep/.fc-next-button {
+    background: #f4f4f5;
+    border: 1px solid #d9d9d9;
+    cursor: not-allowed;
+  }
+}
+/deep/.fc-timegrid-event-harness {
   // position: absolute !important;
   left: 0 !important;
 }
@@ -62,6 +94,10 @@
   overflow: hidden;
   border-radius: 8px;
 }
+.agment-left-copy {
+  margin-top: 34px;
+  text-align: center;
+}
 .agment-head {
   border-radius: 5px;
   display: flex;
@@ -91,19 +127,19 @@
   color: #02120f;
   margin-top: 19px;
 }
-.agment-head-none{
+.agment-head-none {
   background: #fff;
   pointer-events: none;
 }
 .agment-head-priority {
   padding-top: 20px;
   display: flex;
-  justify-content:center;
+  justify-content: center;
   align-items: center;
   .item {
     width: 42px;
     height: 32px;
-    margin-right:10px;
+    margin-right: 10px;
     border: 1px solid #d9d9d9;
     border-radius: 8px;
     text-align: center;
@@ -121,12 +157,19 @@
   display: flex;
   justify-content: center;
 }
-.reset-submit{
+.copy-submit {
+  background: #fff;
+  border: 1px solid #0d9078;
+  font-family: PingFangSC-Regular, PingFang SC;
+  font-weight: 400;
+  color: #0d9078;
+}
+.reset-submit {
   background: #fff;
-  border: 1px solid #0D9078;
+  border: 1px solid #0d9078;
   font-family: PingFangSC-Regular, PingFang SC;
   font-weight: 400;
-  color: #0D9078;
+  color: #0d9078;
 }
 /deep/.fc-timegrid-event {
   border-radius: 1px !important;
@@ -144,15 +187,15 @@
 }
 /deep/.fc-header-toolbar {
   position: absolute;
-  right:1%;
+  right: 1%;
   top: 25px;
   width: 20%;
 }
 /deep/.fc-toolbar-title {
   font-size: 6px;
 }
-/deep/.fc-toolbar-chunk{
-  display:flex;
+/deep/.fc-toolbar-chunk {
+  display: flex;
 }
 /deep/.fc-button-primary {
   background: #fff;
@@ -162,20 +205,20 @@
   padding: 6px 16px;
   flex-shrink: 0;
 }
-@media screen and (min-width: 1000px) and (max-width: 1300px){ 
+@media screen and (min-width: 1000px) and (max-width: 1300px) {
   /deep/.fc-header-toolbar {
     right: 6%;
   }
   .ag-left1 {
-    width:12% !important;
+    width: 12% !important;
     right: 18% !important;
-    border:1px solid red !important;
+    border: 1px solid red !important;
   }
   .ag-left2 {
-    width:12% !important;
-    right: 1% !important; 
+    width: 12% !important;
+    right: 1% !important;
   }
-} 
+}
 /deep/.fc-myCustomButton-button {
   padding: 6px 24px;
 }
@@ -190,4 +233,3 @@
   word-wrap: break-word;
   white-space: normal;
 }
-

yarn.lock

@@ -4663,7 +4663,7 @@ dateformat@^2.0.0:
   resolved "http://192.168.110.93:4873/dateformat/-/dateformat-2.2.0.tgz#4065e2013cf9fb916ddfd82efb506ad4c6769062"
   integrity sha1-QGXiATz5+5Ft39gu+1Bq1MZ2kGI=
 
-dayjs@^1.8.30, dayjs@^1.8.31:
+dayjs@^1.10.7, dayjs@^1.8.31:
   version "1.10.7"
   resolved "http://192.168.110.93:4873/dayjs/-/dayjs-1.10.7.tgz#2cf5f91add28116748440866a0a1d26f3a6ce468"
   integrity sha1-LPX5Gt0oEWdIRAhmoKHSbzps5Gg=