yeye

src/api/administrators.js

 import request from 'mn-template/plugins/http';
 
-export const getMatchList = async() => {
-    return request({
-        url: '/diagnose/match/list',
-        method: 'get',
-    });
-};
\ No newline at end of file
+export const getMatchList = async () => {
+  return request({
+    url: '/diagnose/match/list',
+    method: 'get',
+  });
+};
+export const getCountByDay = async (data) => {
+  return request({
+    url: `/im/team/callOp/countByDay?startTimestamp=${data.startTimestamp}&endTimestamp=${data.endTimestamp}`,
+    method: 'get',
+  });
+};
+export const lateCountByDay = async (data) => {
+  return request({
+    url: `/diagnose/superiorDoctor/lateCountByDay?startTimestamp=${data.startTimestamp}&endTimestamp=${data.endTimestamp}`,
+    method: 'get',
+  });
+};

src/api/workbench.js

@@ -10,8 +10,9 @@ export const doctorListAnd = async (data) => {
 
 export const doctorListRest = async (data) => {
   return request({
-    url: `diagnose/admin/diagnose/reset/operate/doctorList/${data.uid}`,
-    method: 'get',
+    url: 'diagnose/admin/diagnose/reset/operate/doctorList',
+    method: 'post',
+    data: data,
   });
 };
 export const conditionUpdate = async (data) => {

src/components/common/department-doctor.vue

 <template>
   <div class="depart-doctor">
-    <el-tabs
-      v-model="activeMoutendName"
-      @tab-click="handleClick"
-    >
+    <el-tabs v-model="activeMoutendName">
       <el-tab-pane
         v-for="item in departDoctorList"
         :key="item.departmentId"
@@ -76,9 +73,6 @@
     mounted() {},
 
     methods: {
-      handleClick(value) {
-        console.log(value, 'value');
-      },
       handleCheckAllChange(value, item) {
         let itemNameList = [];
         if (value) {
@@ -117,4 +111,43 @@
   };
 </script>
 
-<style lang="scss" scoped></style>
+<style lang="scss">
+.depart-doctor {
+  .el-checkbox__input.is-disabled .el-checkbox__inner {
+    border-color: #d9d9d9 !important;
+    background: #fff !important;
+  }
+  .el-checkbox.is-disabled .el-checkbox__label {
+    color: #d9d9d9 !important;
+  }
+  .el-radio__input.is-checked + .el-radio__label,
+  .el-tabs__item.is-active {
+    color: #0d9078 !important;
+    font-size: 16px !important ;
+  }
+  .is-active {
+    border: none;
+    position: relative;
+    &::after {
+      content: '';
+      position: absolute;
+      bottom: 0;
+      left: 50%;
+      right: 0;
+      height: 2px;
+      background: #0d9078;
+      width: 50px;
+      transform: translateX(-50%);
+    }
+  }
+  .el-tabs__item.is-top:nth-child(2) {
+    padding-left: 22px !important;
+  }
+  .el-tabs__item.is-top:last-child {
+    padding-right: 22px !important;
+  }
+  .el-tab-pane {
+    padding: 10px 20px;
+  }
+}
+</style>

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

@@ -24,6 +24,8 @@
                   type="date"
                   value-format="yyyy-MM-dd"
                   placeholder="选择日期"
+                  :picker-options="pickerOptions"
+                  @change="getWorkbenchTime"
                 />
               </el-col>
             </el-row>
@@ -33,9 +35,9 @@
           <div class="right">
             <span class="totalNumShow">累计汇总数</span>
             <span class="callDoctorShow">呼叫医助次数</span>
-            <span class="callDoctorNum">389</span>
+            <span class="callDoctorNum">{{ callDoctorNum }}</span>
             <span class="laterDoctorShow">接诊医生迟到人数</span>
-            <span class="laterDoctorNum">167</span>
+            <span class="laterDoctorNum">{{ doctorLaterNum }}</span>
           </div>
         </el-col>
       </el-row>
@@ -75,7 +77,11 @@
 
 <script>
   import consultationlist from '@/components/common/consultation';
-  import { getMatchList } from '@/api/administrators';
+  import {
+    getMatchList,
+    getCountByDay,
+    lateCountByDay,
+  } from '@/api/administrators';
 
   export default {
     components: {
@@ -88,11 +94,20 @@
       return {
         workbenchAdminDate: d,
         operatorslist: [],
+        pickerOptions: {
+          disabledDate: (time) => {
+            return time.getTime() > new Date().getTime(); // 减去一天的时间代表可以选择同一天;
+          },
+        },
+        callDoctorNum: '',
+        doctorLaterNum: '',
       };
     },
     watch: {},
     created() {
       this.init();
+      this.getCountByDay();
+      this.lateCountByDay();
     },
     methods: {
       init() {
@@ -102,6 +117,35 @@
           }
         });
       },
+      getWorkbenchTime(value) {
+        this.workbenchAdminDate = value;
+        this.getCountByDay();
+        this.lateCountByDay();
+      },
+      getCountByDay() {
+        const params = {
+          startTimestamp: new Date(this.workbenchAdminDate).getTime(),
+          endTimestamp:
+            new Date(this.workbenchAdminDate).getTime() + 86400 * 1000,
+        };
+        getCountByDay(params).then((res) => {
+          if (res.code == '000000') {
+            this.callDoctorNum = res.data;
+          }
+        });
+      },
+      lateCountByDay() {
+        const params = {
+          startTimestamp: new Date(this.workbenchAdminDate).getTime(),
+          endTimestamp:
+            new Date(this.workbenchAdminDate).getTime() + 86400 * 1000,
+        };
+        lateCountByDay(params).then((res) => {
+          if (res.code == '000000') {
+            this.doctorLaterNum = res.data;
+          }
+        });
+      },
     },
   };
 </script>

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

@@ -20,11 +20,6 @@
               v-for="(item, index) in adminList"
               :key="index"
               class="checkbox-item"
-              @change="
-                (val) => {
-                  setResert(val, item);
-                }
-              "
             >
               <el-checkbox :label="item.id">
                 {{ item.name }}
@@ -39,7 +34,7 @@
         </el-button>
         <el-button
           type="primary"
-          @click="sumbitmatch"
+          @click="sumbitmatchCancel"
         >
           确定
         </el-button>
@@ -80,6 +75,7 @@
 <script>
   import { setDiagnoseMatch, operatorQuery, sumbitMatch } from '@/api/operation';
   import { doctorListRest } from '@/api/workbench';
+  import _ from 'lodash';
   export default {
     data() {
       return {
@@ -87,6 +83,7 @@
         adminList: [],
         showIsReset: false,
         operateId: '',
+        oldCheckList: [],
       };
     },
     mounted() {
@@ -118,6 +115,7 @@
           .then((res) => {
             if (res.code == '000000') {
               this.$message.success('保存成功');
+              this.getCheckList();
             }
           })
           .catch(() => {
@@ -130,6 +128,7 @@
           .then((res) => {
             if (res.code == '000000') {
               this.checklist = res.data;
+              this.oldCheckList = this.checklist;
             }
           })
           .catch(() => {
@@ -146,13 +145,20 @@
       cancelResert() {
         this.showIsReset = false;
       },
+      sumbitmatchCancel() {
+        this.cancelList = _.difference(this.oldCheckList, this.checklist);
+        if (this.cancelList.length > 0) {
+          this.showIsReset = true;
+        } else {
+          this.sumbitmatch();
+        }
+      },
       confirmResert() {
-        const param = {
-          uid: this.operateId,
-        };
-        doctorListRest(param).then((res) => {
+        const uidList = this.cancelList || [];
+        doctorListRest(uidList).then((res) => {
           if (res.code == '000000') {
             this.showIsReset = false;
+            this.sumbitmatch();
           }
         });
       },

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

@@ -168,7 +168,7 @@
         currentCalListNew: [
           {
             id: 3,
-            name: '全部订单',
+            name: '医生认领',
           },
           {
             id: 1,
@@ -351,7 +351,6 @@
     },
     watch: {},
     created() {
-      console.log('currentDiagList---------------------', this.currentDiagList);
       this.operatId = this.$route.query.id;
       this.tabPositionValue = this.$route.query.type || '3';
     },
@@ -374,10 +373,8 @@
     },
     methods: {
       doctorDeparList() {
-        const userInfo = storejs.get('initSocketInfo');
-        const { userId } = userInfo;
         const param = {
-          uid: userId,
+          uid: this.operatId || this.userInfo.userId,
         };
         doctorDeparList(param).then((res) => {
           if (res.code == '000000') {
@@ -396,12 +393,18 @@
         this.showIsReset = false;
       },
       confirmResert() {
-        const param = {
-          uid: this.operatId ? this.operatId : this.localUserId,
-        };
-        doctorListRest(param).then((res) => {
+        const uidList = this.operatId
+          ? [this.operatId]
+          : [] || this.userInfo.userId
+            ? [this.userInfo.userId]
+            : [];
+        doctorListRest(uidList).then((res) => {
           if (res.code == '000000') {
             this.showIsReset = false;
+            this.$message({
+              message: '重置成功',
+              type: 'success',
+            });
             this.doctorDeparList();
           }
         });
@@ -436,17 +439,27 @@
       },
       confirmDoctorList() {
         const userInfo = storejs.get('initSocketInfo');
-        const { userId, userName } = userInfo;
-        console.log(userId, userName, 'userInfo');
+        const { userName } = userInfo;
         const params = {
           cancelDoctorIdList: this.cancelCheckList || [],
           insertDoctorIdList: this.newCheckList || [],
-          operateUserId: userId,
+          operateUserId: this.operatId || this.userInfo.userId,
           operateUserName: userName,
         };
         doctorListAnd(params).then((res) => {
           if (res.code == '000000') {
-            console.log(res);
+            if (res.data.length > 0) {
+              const totallistShow = res.data.join(',');
+              this.$message({
+                message: `医生为${totallistShow}已被其他运营分配`,
+                type: 'warning',
+              });
+            } else {
+              this.$message({
+                message: '保存成功',
+                type: 'success',
+              });
+            }
             this.doctorDeparList();
           }
         });
@@ -454,7 +467,8 @@
       initCard() {
         const parms = {
           bizType: this.tabPositionValue, // 1,异常的列表 2,不需要处理的列表
-          userId: this.operatId || this.localUserId, //   userId
+          userId: this.operatId || this.userInfo.userId, //   userId
+          condition: this.orderOrName || '',
         };
         conditionNewList(parms)
           .then((res) => {
@@ -491,15 +505,11 @@
           }
           this.$set(this.midCardData, index, item);
         });
-        console.log('this.currentDiagList', this.currentDiagList);
         this.isShowCardData = true;
       },
       getSerachValue(value) {
         this.orderOrName = value.trim();
       },
-      handleCheckedCitiesChange(value) {
-        console.log(value, 'value11');
-      },
       getSearchValue() {
         if (!this.orderOrName) {
           return this.$message({
@@ -539,7 +549,6 @@
         this.isShowCardData = true;
       },
       tabChange(val) {
-        console.log(val, 'val1111====');
         this.tabPositionValue = val;
         if (val != 3) {
           this.initCard();
@@ -713,7 +722,6 @@
       padding: 20px 10px;
       width: 100%;
       .grid-c {
-        display: grid;
         grid-row-gap: 20px;
         grid-column-gap: 20px;
         padding: 25px 30px;