Merge branch 'feature/dxp' into 'develop'

Feature/dxp

See merge request !161

src/api/serviceSchedule.js

@@ -12,29 +12,43 @@ export const childLabelList = async (data) => {
     method: 'get',
   });
 };
-export const workQuery = async(data) => {
+export const workQuery = async (data) => {
   return request({
-      url: '/diagnose/doctor/work/workQuery',
-      data: data,
-      method: 'post',
+    url: '/diagnose/doctor/work/workQuery',
+    data: data,
+    method: 'post',
   });
 };
-export const switchOpen = async(data) => {
+export const switchOpen = async (data) => {
   return request({
-      url: '/diagnose/doctor/work/switchOpen',
-      data: data,
-      method: 'post',
+    url: '/diagnose/doctor/work/switchOpen',
+    data: data,
+    method: 'post',
   });
 };
-export const workInStep = async() => {
+export const workInStep = async () => {
   return request({
-      url: '/diagnose/doctor/work/inStep',
-      method: 'post',
+    url: '/diagnose/doctor/work/inStep',
+    method: 'post',
   });
 };
-export const getLevel = async() => {
+export const getLevel = async () => {
   return request({
-      url: '/diagnose/doctor/work/getLevel',
-      method: 'post',
+    url: '/diagnose/doctor/work/getLevel',
+    method: 'post',
   });
-};
+};
\ No newline at end of file
+export const dutyRosterQuery = async (data) => {
+  return request({
+    url: '/diagnose/doctor/work/dutyRosterQuery',
+    data: data,
+    method: 'post',
+  });
+};
+export const saveDutyRoster = async (data) => {
+  return request({
+    url: '/diagnose/doctor/work/saveDutyRoster',
+    data: data,
+    method: 'post',
+  });
+};

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

@@ -14,6 +14,29 @@
   background: #fff;
   border-radius: 6px;
 }
+.ag-left-change {
+  // position: relative;
+  // border:1px solid #ccc;
+  // height:40px;
+  // width:100%;
+  // display:flex;
+  // z-index:1;
+  div {
+    width: 130px;
+    height: 40px;
+    //border: 1px solid #ccc;
+  }
+  .ag-left1 {
+    position: absolute;
+    right: 140px;
+    top: 20px;
+  }
+  .ag-left2 {
+    position: absolute;
+    right: 20px;
+    top: 20px;
+  }
+}
 .agment-left-con {
   margin-top: 70px;
   background: #f0f2f5;
@@ -104,10 +127,21 @@
   background: #fff;
   color: #02120f;
   border-color: #d9d9d9;
-  border-radius: 8px;
-  padding: 1.3px 5px;
+  border-radius: 20px;
+  padding: 6px 16px;
+}
+/deep/.fc-myCustomButton-button {
+  padding: 6px 24px;
 }
 /deep/.fc-button-primary:hover {
   background: #fff;
   color: #02120f;
+  border: 1px solid #0d9078;
+}
+/deep/.fc-event-time {
+  padding: 5px;
+  font-size: 18px;
+  color: #0d9078;
+  word-wrap: break-word;
+  white-space: normal;
 }

src/views/IM/diagnosis-admin/serviceSchedule.vue

@@ -150,8 +150,10 @@
       <div class="serviceSchedule-container">
         <div class="serviceSchedule-containerInfo">
           <NewScheduling
+            :create-list="newCreateList"
             :scheduling-type-value="schedulingTypeValue"
             :scheduling-type="schedulingType"
+            @goBack="goBack"
           />
         </div>
       </div>