Merge branch 'develop' of...

Merge branch 'develop' of 192.168.110.53:com.pica.cloud.education.frontend/pica-admin-consultation into feature/dxp

src/api/serviceSchedule.js

+import request from 'mn-template/plugins/http';
+export const getFirstLevelLable = async () => {
+  return request({
+    url: '/contents/admin/label/getFirstLevelLable/1',
+    method: 'get',
+  });
+};
+export const childLabelList = async (data) => {
+  return request({
+    url: '/contents/admin/label/childLabelList',
+    params: data,
+    method: 'get',
+  });
+};
+export const workQuery = async(data) => {
+  return request({
+      url: '/diagnose/doctor/work/workQuery',
+      data: data,
+      method: 'post',
+  });
+};
+export const switchOpen = async(data) => {
+  return request({
+      url: '/diagnose/doctor/work/switchOpen',
+      data: data,
+      method: 'post',
+  });
+};
+export const workInStep = async() => {
+  return request({
+      url: '/diagnose/doctor/work/inStep',
+      method: 'post',
+  });
+};
+export const getLevel = async() => {
+  return request({
+      url: '/diagnose/doctor/work/getLevel',
+      method: 'post',
+  });
+};
\ No newline at end of file

src/components/common/diagnosis-doctor.vue

@@ -394,6 +394,13 @@
     created() {
       // this.startTimeValue = this.rangeTimeData;
       console.log('``````', this.rangeTimeData);
+      // if (this.rangeTimeData) {
+      //   this.timeRange = Number(20);
+      //   this.endTimeValue = dayjs(this.rangeTimeData)
+      //     .add(this.timeRange, 'minute')
+      //     .format('YYYY-MM-DD HH:mm:ss');
+      // }
+      console.log('``````', this.rangeTimeData, this.endTimeValue);
       vm = this;
       this.getDoctorList();
     },
@@ -470,8 +477,8 @@
         this.doctorId = '';
         this.formData.outsideDoctor = '';
         // this.startTimeValue = this.rangeTimeData;
-        this.endTimeValue = '';
-        this.timeRange = '';
+        // this.endTimeValue = '';
+        // this.timeRange = Number(20);
         this.$emit('update:diagnosisDoctorVisible', false);
       },
       opendialog() {
@@ -526,6 +533,15 @@
       },
       openDiagnosisStartTimeDialog() {
         this.startTimeValue = this.rangeTimeData;
+        if (!this.startTimeValue) {
+          this.timeRange = '';
+          this.endTimeValue = '';
+        }else{
+          this.timeRange = Number(20);
+          this.endTimeValue = dayjs(this.rangeTimeData)
+            .add(this.timeRange, 'minute')
+            .format('YYYY-MM-DD HH:mm:ss');
+        }
         this.diagnosisStartTimeDialog = true;
       },
       startTimeConfirm(isCancle) {
@@ -534,6 +550,15 @@
           // this.startTimeValue = '';
           this.endTimeValue = '';
           this.timeRange = '';
+        //   if (!this.startTimeValue) {
+        //   this.timeRange = '';
+        //   this.endTimeValue = '';
+        // }else{
+        //   this.timeRange = Number(20);
+        //   this.endTimeValue = dayjs(this.rangeTimeData)
+        //     .add(this.timeRange, 'minute')
+        //     .format('YYYY-MM-DD HH:mm:ss');
+        // }
         }
         if (isCancle == 'submit') {
           if (String(this.startTimeValue).trim() === '' || !this.startTimeValue) {

src/components/list/table-serviceSchedule.vue

+<template>
+  <div class="table-serviceSchedule">
+    <el-table
+      v-loading="loading"
+      class="search-table"
+      style="width: 100%"
+      :data="tableData"
+      @sort-change="sortfunc"
+    >
+      <el-table-column
+        prop="doctorId"
+        label="医生ID"
+        width="170"
+        align="center"
+      />
+      <el-table-column
+        prop="doctorName"
+        label="医生姓名"
+        width="170"
+        align="center"
+      />
+      <el-table-column
+        prop="serviceOpen"
+        label="服务开通"
+        width="150"
+        align="center"
+        column-key="serviceOpen"
+        :filter-multiple="false"
+        :filters="serviceOpenList"
+        :filter-method="getServiceOpen"
+      >
+        <template slot-scope="scope">
+          <span style="margin-left: 10px">{{ scope.row.serviceOpen ==='1' ? '开通': '未开通' }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column
+        prop="hospital"
+        label="所属机构"
+        width="200"
+        align="center"
+        show-overflow-tooltip
+      />
+      <el-table-column
+        prop="departmentName"
+        label="科室"
+        width="170"
+        align="center"
+      />
+      <el-table-column
+        prop="level"
+        label="匹配优先级"
+        align="center"
+        width="150"
+        column-key="level"
+        :filter-multiple="false"
+        :filters="createList"
+        :filter-method="getLevel"
+      />
+      <el-table-column
+        prop="workStatus"
+        label="排班状态"
+        width="170"
+        align="center"
+        column-key="workStatus"
+        :filter-multiple="false"
+        :filters="workStatusList"
+        :filter-method="getWorkStatus"
+      >
+        <template slot-scope="scope">
+          <span style="margin-left: 10px">{{ scope.row.workStatus ==='2' ? '未排班': '已排班' }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column
+        prop="modifiedTime"
+        label="修改时间"
+        width="170"
+        align="center"
+        sortable
+      />
+      <el-table-column
+        prop="mobilePhone"
+        label="联系电话"
+        width="170"
+        align="center"
+      />
+      <el-table-column
+        property="delivery"
+        align="center"
+        label="接单开关"
+      >
+        <template slot-scope="scope">
+          <el-switch
+            v-model="scope.row.delivery"
+            active-color="#0D9078"
+            @change="changeSwitch(scope.$index,scope.row)"
+          />
+        </template>
+      </el-table-column>
+      <el-table-column
+        label="操作"
+        fixed="right"
+        align="center"
+        min-width="200"
+      >
+        <template slot-scope="scope">
+          <div
+            class="scope-work"
+            style="display:flex"
+          >
+            <div
+              v-if=" scope.row.workStatus === '2'"
+              class="download-btn"
+              @click="addSchedule(scope.row,1)"
+            >
+              新增排班
+            </div>
+            <div
+              v-else
+              class="download-btn"
+              @click="addSchedule(scope.row,2)"
+            >
+              编辑排班
+            </div>
+            <div
+              class="download-btn"
+              @click="addSchedule(scope.row,2)"
+            >
+              查看
+            </div>
+          </div>
+        </template>
+      </el-table-column>
+    </el-table>
+    <!-- 分页 -->
+    <div class="pagination">
+      <el-pagination
+        background
+        :current-page="pageNo"
+        :page-sizes="[15, 30, 50, 100, 150, 200]"
+        :page-size="pageSize"
+        layout="total, sizes, prev, pager, next, jumper"
+        :total="totalRows"
+        @size-change="handleSizeChange"
+        @current-change="handleCurrentChange"
+      />
+    </div>
+  </div>
+</template>
+
+<script>
+  export default {
+    components: {
+      // NewScheduling,
+    },
+    props: {
+      tableData: {
+        type: Array,
+        default() {
+          return [];
+        },
+      },
+      createList: {
+        type: Array,
+        default() {
+          return [];
+        },
+      },
+      pageNo: {
+        type: Number,
+        default: 1,
+      },
+      pageSize: {
+        type: Number,
+        default: 20,
+      },
+      totalRows: {
+        type: Number,
+        default: 0,
+      },
+      loading: {
+        type: Boolean,
+        default: false,
+      },
+    },
+    data() {
+      return {
+        workStatusList:[
+          {
+            text: '已排班',
+            value: '已排班' 
+          }, 
+          { 
+            text: '未排班', 
+            value: '未排班' 
+          }
+        ],
+        serviceOpenList:[
+          { 
+            value: 1, 
+            text: '开通'
+          },
+          { 
+            value: 2, 
+            text: '未开通'
+          },
+        ],
+      };
+    },
+    mounted() {},
+    methods:{
+      changeSwitch(value, val) {
+        console.log(value, val, '123');
+        this.$emit('changeSwitch', value, val);
+      },
+      // handleFilterChange(value) {
+      //   console.log(value, 'handleFilterChange');
+      // },
+      getServiceOpen(value, row) {
+        return row.serviceOpen === String(value);
+      },
+      getLevel(value, row) {
+        return row.level === String(value);
+      },
+      getWorkStatus(value, row) {
+        console.log(value, row);
+        let newValue = '';
+        if (value === '未排班') {
+          newValue = '2';
+        }else{
+          newValue = '1';
+        }
+        return row.workStatus === String(newValue);
+      },
+      showworkStatus() {
+        console.log(11111);
+        this.isworkStatus = !this.isworkStatus;
+        console.log(this.isworkStatus);
+      },
+      addSchedule(value, val) {
+        console.log(value, val, '123212321');
+        this.$emit('addSchedule', value, val);
+      },
+      // 分页
+      handleSizeChange(value) {
+        this.$emit('handleSizeChange', value);
+      },
+      handleCurrentChange(value) {
+        this.$emit('handleCurrentChange', value);
+      },
+      sortfunc(data) {
+        this.$emit('sortfunc', data);
+      },
+    }
+  };
+</script>
+
+<style lang="scss" scoped>
+    .table-serviceSchedule{
+        .el-table {
+          border-radius: 8px;
+    // 深度选择器
+    /deep/ .highlight{
+      color: #0D9078 !important;
+    }
+    .scope-work{
+      display: flex;
+      justify-content: center;
+      .download-btn{
+      color: #0D9078;
+      cursor: pointer;
+      margin-right: 10px;
+    }
+    }
+  }
+}
+</style>
\ No newline at end of file

src/router/index.js

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

src/utils/GeneralData/serviceSchedule-table.js

+//  serviceSchedule-table
+export const SERVICESCHEDUle_TABLE = [
+  {
+    prop: 'doctorId',
+    label: '医生ID',
+    showtooltip: false,
+  },
+  {
+    prop: 'doctorName',
+    label: '医生姓名',
+    showtooltip: false,
+  },
+  {
+    prop: 'hospital',
+    label: '所属机构',
+    showtooltip: false,
+  },
+  {
+    prop: 'departmentName',
+    label: '科室',
+    showtooltip: false,
+  },
+  {
+    prop: 'level',
+    label: '匹配优先级',
+    showtooltip: false,
+  },
+  {
+    prop: 'workStatus',
+    label: '排班状态',
+    showtooltip: false,
+  },
+  {
+    prop: 'modifiedTime',
+    label: '修改时间',
+    showtooltip: false,
+  },
+  {
+    prop: 'mobilePhone',
+    label: '联系电话',
+    showtooltip: false,
+  }
+  // {
+  //   prop: 'switchStatus',
+  //   label: '接单开关',
+  //   showtooltip: false,
+  // },
+];

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

@@ -626,10 +626,10 @@
     },
     methods: {
       changeStartTime(time) {
-        console.log(time, '1233212321`');
         this.rangeTimeData = time
-          ? new Date(time.time).format('yyyy-MM-dd hh:mm:ss')
+          ? time.time ? new Date(time.time).format('yyyy-MM-dd hh:mm:ss') : ''
           : '';
+        console.log(this.rangeTimeData, 'this.rangeTimeData');
       },
       getTableData(val) {
         this.saveTableData = val || [];

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

+<template>
+  <div>新增排班</div>
+</template>
+
+<script>
+  export default {};
+</script>
+
+<style></style>