Merge branch 'feature/jq' into 'develop'

Feature/jq

See merge request !169

src/router/index.js

@@ -68,6 +68,12 @@ const serviceSchedule = (r) =>
     () => r(require('@/views/IM/diagnosis-admin/serviceSchedule.vue')),
     'serviceSchedule'
   );
+  const addEditSchedule = (r) =>
+  require.ensure(
+    [],
+    () => r(require('@/views/IM/diagnosis-admin/addEditSchedule.vue')),
+    'addEditSchedule'
+  );
 const administrators = (r) =>
   require.ensure(
     [],
@@ -134,6 +140,10 @@ const routerConfig = [
         path: '/serviceSchedule',
         component: serviceSchedule,
       },
+      {
+        path: '/addEditSchedule',
+        component: addEditSchedule,
+      },
       {
         path: '/administrators',
         component: administrators,

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

+<template>
+  <div class="newScheduling">
+    <div class="header">
+      <el-breadcrumb separator="/">
+        <el-breadcrumb-item>首页</el-breadcrumb-item>
+        <el-breadcrumb-item class="breadcrumb-serviceSchedule">
+          服务排班表
+        </el-breadcrumb-item>
+        <el-breadcrumb-item>新增排班</el-breadcrumb-item>
+      </el-breadcrumb>
+    </div>
+    <div class="serviceSchedule-container">
+      <div class="serviceSchedule-containerInfo">
+        <NewScheduling />
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+  import NewScheduling from '../diagnosis-admin/modal/newScheduling.vue';
+  export default {
+    components: {
+      NewScheduling,
+    },  
+    data() {
+      return {
+        name: 111,
+      };
+    },
+  };
+</script>
+
+<style lang="scss" scoped>
+    .newScheduling {
+    height: calc(100% - 76px);
+    .header {
+      padding: 30px;
+      width: 100%;
+      .el-breadcrumb {
+        .breadcrumb-serviceSchedule {
+          /deep/ .breadcrumb-back {
+            font-weight: 400 !important;
+            color: #606266;
+            cursor: text;
+            cursor: pointer;
+          }
+        }
+      }
+    }
+    .serviceSchedule-container {
+    //   height: 100%;
+      width: 100%;
+      padding: 0 14px;
+      .serviceSchedule-containerInfo {
+        border-radius: 8px;
+        height: 100%;
+        display: flex;
+        align-items: center;
+        //padding: 21px 18px 20px 18px;
+      }
+    }
+  }
+</style>
\ No newline at end of file

src/views/IM/diagnosis-admin/modal/newScheduling.vue

@@ -199,8 +199,11 @@
       },
     },
     mounted() {
+      console.log(this.$route.query.doctorId, 'doctorId');
+      console.log(this.$route.query.type, 'type');
+      console.log(this.$route.query.id, 'id');
       this.scrollerHeight = this.$refs.agment.clientHeight + 'px';
-      // console.log(this.$refs.agment.clientHeight, 'this.$refs.agment.offsetHeight;');
+      this.schedulingType = this.$route.query.type;
       this.init();
     },
     methods: {

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

@@ -131,7 +131,7 @@
         </div>
       </div>
     </div>
-    <div
+    <!-- <div
       v-else
       class="newScheduling"
     >
@@ -157,7 +157,13 @@
           />
         </div>
       </div>
-    </div>
+    </div> -->
+    <a
+      ref="target"
+      class="target"
+      href=""
+      target="_blank"
+    />
   </div>
 </template>
 
@@ -171,10 +177,10 @@
     getLevel,
   } from '@/api/serviceSchedule';
   import TableServiceSchedule from '@/components/list/table-serviceSchedule';
-  import NewScheduling from '../diagnosis-admin/modal/newScheduling.vue';
+  // import NewScheduling from '../diagnosis-admin/modal/newScheduling.vue';
   export default {
     components: {
-      NewScheduling,
+      // NewScheduling,
       TableServiceSchedule,
     },
     data() {
@@ -231,8 +237,8 @@
         tableData: [],
         loading: false,
         newCreateList: [],
-        schedulingTypeValue: {},
-        schedulingType: '',
+        // schedulingTypeValue: {},
+        // schedulingType: '',
       };
     },
     watch: {},
@@ -378,16 +384,20 @@
         this.search();
       },
       addSchedule(value, val) {
-        this.ScheduleListShow = false;
-        this.schedulingTypeValue = value;
-        this.schedulingType = val;
-      },
-      goBack(flag) {
-        this.ScheduleListShow = true;
-        if (flag) {
-          this.search();
-        }
+        // this.ScheduleListShow = false;
+        // this.schedulingType = val;
+        const target = this.$refs.target;
+        const { origin } = window.location;
+        const u = `${origin}/consultation/pica-admin-consultation/addEditSchedule?type=${val}&doctorId=${value.doctorId}&id=${value.id}`;
+        target.setAttribute('href', u);
+        target.click();
       },
+      // goBack(flag) {
+      //   this.ScheduleListShow = true;
+      //   if (flag) {
+      //     this.search();
+      //   }
+      // },
     },
   };
 </script>