Merge branch 'feature/jq' into 'develop'

Feature/jq

See merge request !247

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" :label="item.department + ' ' + item.checkDoctorIdListByDepartment.length + '/' +item.allNum" :name="item.departmentId">
         <el-checkbox 
           v-model="item.checkAll"
@@ -18,7 +18,7 @@
             :label="itemChild.doctorId" 
             :disabled="itemChild.disabled"
           >
-            {{ itemChild.doctorName + ' '  }}{{ ' ' +itemChild.doctorId}}
+            {{ itemChild.doctorName + ' ' }}{{ ' ' +itemChild.doctorId}}
           </el-checkbox>
         </el-checkbox-group>
       </el-tab-pane>
@@ -58,9 +58,6 @@
     },
 
     methods: {
-      handleClick(value) {
-        console.log(value, 'value');    
-      },
       handleCheckAllChange(value, item) {
         let itemNameList = [];
         if (value) {
@@ -93,5 +90,19 @@
   };
 </script>
 
-<style lang="scss" scoped>
+<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 ;
+  }
+}
+
 </style>

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

@@ -20,7 +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 }}
@@ -35,7 +34,7 @@
         </el-button>
         <el-button
           type="primary"
-          @click="sumbitmatch"
+          @click="sumbitmatchCancel"
         >
           确定
         </el-button>
@@ -77,13 +76,15 @@
     sumbitMatch
   } from '@/api/operation';
   import { doctorListRest } from '@/api/workbench';
+  import _ from 'lodash';
   export default {
     data() {
       return {
         checklist: [],
         adminList: [],
         showIsReset:false,
-        operateId:''
+        operateId:'',
+        oldCheckList:[],
       };
     },
     mounted() {
@@ -127,6 +128,7 @@
           .then((res) => {
             if (res.code == '000000') {
               this.checklist = res.data;
+              this.oldCheckList = this.checklist;
             }
           })
           .catch(() => {
@@ -143,16 +145,23 @@
       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();
           }
-        });
-      },
+        }); 
+      }
     },
   };
 </script>

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

@@ -154,7 +154,7 @@
         currentCalListNew: [
           {
             id: 3,
-            name: '全部订单',
+            name: '医生认领',
           },
           {
             id: 1,
@@ -294,7 +294,6 @@
     },
     watch: {},
     created() {
-      console.log('currentDiagList---------------------', this.currentDiagList);
       this.operatId = this.$route.query.id;
       this.tabPositionValue = this.$route.query.type || '3';
     },
@@ -327,10 +326,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') {
@@ -347,14 +344,14 @@
         this.showIsReset = false;
       },
       confirmResert() {
-        const userInfo = storejs.get('initSocketInfo');
-        const {userId} = userInfo;
-        const param = {
-          uid:this.operatId ? this.operatId : userId
-        };
-        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();
           }
         });
@@ -377,30 +374,38 @@
       },  
       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: `医生ID为${totallistShow}已被其他运营分配`,
+                type: 'warning'
+              });
+            }else{
+              this.$message({
+                message: '保存成功',
+                type: 'success',
+              });
+            }
             this.doctorDeparList();
           }
         });
       },
 
       initCard() {
-        console.log(this.isShowCardData);
         const parms = {
           bizType: this.tabPositionValue, // 1,异常的列表 2,不需要处理的列表
-          userId: this.userInfo.userId || this.operateUserId, //   userId
+          userId: this.operatId || this.userInfo.userId, //   userId
           condition: this.orderOrName || '',
         };
-        // this.currentDiagList = this.mockData;
         conditionNewList(parms)
           .then((res) => {
             if (res.code === '000000') {
@@ -420,14 +425,12 @@
           });
       },
       handleData(data) {
-        console.log(data, 'data');
         this.currentDiagList = [];
         data.forEach((item, index) => {
           item.diagnoseLogId = '--' + Math.random() * 10;
           item['definitionRandom'] = Math.random() * 10;
           this.$set(this.currentDiagList, index, item);
         });
-        console.log('this.currentDiagList', this.currentDiagList);
         this.isShowCardData = true;
       // this.$nextTick(() => {
       // });
@@ -435,12 +438,8 @@
       getSerachValue(value) {
         this.orderOrName = value;
       },
-      handleCheckedCitiesChange(value) {
-        console.log(value, 'value11');
-      },
       getSearchValue() {
         if (!this.orderOrName) {
-          console.log(789, this.departmentId);
           return this.$message({
             message: '医生名字或订单号不能为空',
             type: 'warning',
@@ -451,7 +450,6 @@
         }
       },
       tabChange(val) {
-        console.log(val, 'val1111====');
         this.tabPositionValue = val;
         if (val != 3) {
           this.initCard();