Merge branch 'feature/jq' into 'release'

Feature/jq

See merge request com.pica.cloud.education.frontend/pica-admin-consultation!239

src/api/diagnosis.js

@@ -302,3 +302,11 @@ export const departmentAll = async () => {
     method: 'get',
   });
 };
+//
+export const updateDepartmentId = async (data) => {
+  return request({
+    url: '/diagnose/admin/diagnose/diagnoseId/fresh/departmentId',
+    data: data,
+    method: 'post',
+  });
+};

src/components/common/diagnosis-time.vue

@@ -24,11 +24,11 @@
       </div>
       <div class="doctor-info">
         <div class="name-floor">
-          <span class="name-info-detail">{{ userName }}</span>
           <span class="doctor-info-name">基层医生</span>
-          <p class="info-phone">
+          <span class="name-info-detail">{{ userName }}</span>
+          <span class="info-phone">
             {{ userNamePhone }}
-          </p>
+          </span>
         </div>
         <div class="daignose-info">
           <span>分诊科室：{{ triageDepartment }}</span>
@@ -276,15 +276,17 @@
       border-radius: 8px;
       height: 68px;
       display: flex;
+      padding: 20px 30px 20px 0;
       .name-floor {
         width: 50%;
         padding: 10px 26px;
+        display: flex;
+        align-items: center;
         .name-info-detail {
           font-size: 18px;
           font-family: PingFangSC-Regular, PingFang SC;
           font-weight: 400;
           color: #02120f;
-          margin-bottom: 8px;
           margin-right: 5px;
         }
         .doctor-info-name {
@@ -292,7 +294,9 @@
           font-family: PingFangSC-Regular, PingFang SC;
           font-weight: 400;
           color: #666666;
-          margin-bottom: 8px;
+          border-radius: 9px;
+          border: 1px solid #D9D9D9;
+          margin-right: 8px;
         }
         .info-phone {
           font-size: 18px;
@@ -306,7 +310,10 @@
         font-family: PingFangSC-Regular, PingFang SC;
         font-weight: 400;
         color: #666666;
-        padding-top: 40px;
+        display: flex;
+        align-items: center;
+        width: 50%;
+        justify-content: flex-end;
       }
     }
     .work-info-Num {

src/components/common/updateDepartId.vue

+<template>
+  <div class="update-departId">
+    <el-dialog
+      :title="title"
+      :visible.sync="diaUpdateDeIdVisible"
+      @close="cancel"
+    >
+      <div class="update-shownamephone">
+        <div class="update-namephone">
+          <div class="update-name">
+            <span class="doctor-name">基层医生</span>
+            <span class="namephone-show">{{ userName }}</span>
+            <span class="namephone-show">{{ userNamePhone }}</span>
+          </div>
+          <div class="depart-show">
+            原分诊科室：{{ triageDepartment }}
+          </div>
+        </div>
+        <div class="deparment-show">
+          <p class="update-dename">
+            修改新分诊科室
+          </p>
+          <el-cascader
+            ref="cascader"
+            v-model="triageDepartmentId"
+            filterable
+            clearable
+            class="serviceSchedule-cascader"
+            :options="allTilst"
+            placeholder="选择科室"
+            :show-all-levels="false"
+            @change="changeDepartment"
+          >
+            <template slot-scope="{ data }">
+              <span :style="{ fontSize: '15px', color: '#606266' }">{{
+                data.label
+              }}</span>
+              <span
+                :style="{
+                  fontSize: '10px',
+                  color: '#606266',
+                  marginLeft: '10px',
+                  opacity: '0.7',
+                }"
+              >{{ data.text }}</span>
+            </template>
+          </el-cascader>
+        </div>
+        <div class="work-info-botton">
+          <span
+            slot="footer"
+            class="dialog-footer"
+            style="text-align: center"
+          >
+            <el-button
+              class="contest"
+              type="primary"
+              :disabled="isClick"
+              @click="confirm"
+            >确定</el-button>
+            <el-button
+              class="cancel-submit"
+              @click="cancel"
+            >取 消</el-button>
+          </span>
+        </div>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+  import { updateDepartmentId, departmentAll } from '@/api/diagnosis';
+  let vm = null;
+  export default {
+    props: {
+      diaUpdateDeIdVisible: {
+        type: Boolean,
+        default: false,
+      },
+      diagnoseLogId: {
+        type: Number,
+        default: 0,
+      },
+      triageDepartment: {
+        type: String,
+        default: '',
+      },
+      userName: {
+        type: String,
+        default: '',
+      },
+      userNamePhone: {
+        type: String,
+        default: '',
+      },
+    },
+    data() {
+      return {
+        show: false,
+        title: '',
+        confirmTxt: '确定',
+        cancleTxt: '',
+        triageDepartmentId: '',
+        newTriageDepartment: '',
+        allTilst: [],
+        allList: {},
+      };
+    },
+    created() {
+      vm = this;
+      this.departmentAll();
+    },
+    methods: {
+      departmentAll() {
+        departmentAll().then((res) => {
+          if (res.code == '000000') {
+            this.allList = res.data || {};
+            this.showListALL();
+          }
+        });
+      },
+      showListALL() {
+        const arr = [];
+        const { departmentMapList, parentDepartmentList } = this.allList;
+        parentDepartmentList.map((item) => {
+          const obj = {
+            label: item.departmentName,
+            value: item.departmentId,
+            children: [],
+          };
+          departmentMapList.map((info) => {
+            if (info.parentDepartmentId === obj.value) {
+              const children = [];
+              info.diagnoseDepartmentRespList.map((detail) => {
+                const secondObj = {
+                  label: detail.departmentName,
+                  value: detail.departmentId,
+                  text: '',
+                };
+                let secondChildren = '';
+                (detail.departmentDeseaseRespList || []).map((res) => {
+                  secondChildren += res.deseaseName + '  ';
+                });
+                secondObj.text = secondChildren ? `（${secondChildren}）` : '';
+                children.push(secondObj);
+              });
+              obj.children = children;
+            }
+          });
+          arr.push(obj);
+        });
+
+        console.log(arr);
+        this.allTilst = arr;
+      },
+      confirm() {
+        if (this.newTriageDepartment == '') {
+          this.$message({
+            message: '请选择修改科室',
+            type: 'warning',
+            duration: 1000,
+          });
+          return false;
+        }
+        const params = {
+          diagnoseLogId: this.diagnoseLogId,
+          triageDepartmentId: this.triageDepartmentId,
+          triageDepartment: this.newTriageDepartment,
+        };
+        vm.isClick = true;
+        updateDepartmentId(params)
+          .then((res) => {
+            vm.isClick = false;
+            if (res.code == '000000') {
+              vm.cancel();
+              vm.$emit('search');
+            } else {
+              vm.$message.error(res.message);
+            }
+          })
+          .catch(function () {
+            vm.isClick = false;
+          // vm.$message.error(err.message);
+          });
+      },
+      cancel() {
+        this.$emit('update:diaUpdateDeIdVisible', false);
+      },
+      // 获取选择的值
+      changeDepartment() {
+        const checkedNodes = this.$refs['cascader'].getCheckedNodes();
+        console.log(checkedNodes);
+        if (checkedNodes.length > 0) {
+          this.triageDepartmentId = checkedNodes[0].value;
+          this.newTriageDepartment = checkedNodes[0].label;
+        } else {
+          this.triageDepartmentId = '';
+          this.newTriageDepartment = '';
+        }
+      },
+    },
+  };
+</script>
+
+<style lang="scss" scoped>
+.update-departId {
+  .update-shownamephone {
+    padding: 20px 30px;
+    .update-namephone {
+      padding: 20px 30px;
+      background: rgba(240, 242, 245, 0.6);
+      border-radius: 8px;
+      display: flex;
+      width: 100%;
+      .update-name {
+        width: 50%;
+        display: flex;
+        justify-content: flex-start;
+        align-items: center;
+        .doctor-name {
+          padding: 2px 3px;
+          border-radius: 10px;
+          border: 1px solid #d9d9d9;
+          margin-right: 8px;
+        }
+        .namephone-show {
+          font-size: 18px;
+          font-family: PingFangSC-Regular, PingFang SC;
+          font-weight: 400;
+          color: #02120f;
+          margin-right: 8px;
+        }
+      }
+      .depart-show {
+        width: 50%;
+        display: flex;
+        justify-content: flex-end;
+      }
+    }
+    .deparment-show {
+      margin-top: 28px;
+      .update-dename {
+        font-size: 14px;
+        font-family: PingFangSC-Regular, PingFang SC;
+        font-weight: 400;
+        color: #02120f;
+        margin-bottom: 9px;
+      }
+      /deep/.serviceSchedule-cascader {
+        .el-input {
+          .el-input__inner {
+            width: 180px;
+            height: 32px;
+            background: #ffffff;
+            border-radius: 16px;
+            border: 1px solid rgba(0, 0, 0, 0.15);
+          }
+          .el-input__suffix {
+            display: flex;
+            align-items: center;
+          }
+        }
+        input::-webkit-input-placeholder {
+          color: #89888b;
+        }
+      }
+    }
+    .work-info-botton {
+      padding: 35px 0;
+      .dialog-footer {
+        .contest {
+          width: 180px;
+          height: 40px;
+          background: #0d9078;
+          border-radius: 20px;
+        }
+        .cancel-submit {
+          width: 180px;
+          height: 40px;
+          border-radius: 20px;
+          border: 1px solid #0d9078;
+          font-size: 14px;
+          font-family: PingFangSC-Regular, PingFang SC;
+          font-weight: 400;
+          color: #0d9078;
+        }
+      }
+    }
+  }
+}
+</style>

src/components/list/table-set-component.vue

@@ -118,6 +118,15 @@
           >
             设为待匹配医生
           </el-button>
+          <el-button
+            v-if="showBtn(scope.row, 22, 21)"
+            type="primary"
+            size="small"
+            class="btn"
+            @click="updateDepartId(scope.row)"
+          >
+            修改科室
+          </el-button>
           <el-button
             v-if="showBtn(scope.row, 3, 4, 5, 6, 21, 22, 23, 24, 25, 26)"
             type="primary"
@@ -356,6 +365,10 @@
       waitMatchDot(row) {
         this.$emit('waitMatchDot', row);
       },
+      // 修改科室
+      updateDepartId(row) {
+        this.$emit('updateDepartId', row);
+      },
       // 发送消息
       sendMessage(row) {
         this.$emit('sendMessage', row);

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

@@ -402,6 +402,7 @@
             @cancelRefund="cancelRefund"
             @witeGo="witeGo"
             @waitMatchDot="waitMatchDot"
+            @updateDepartId="updateDepartId"
             @applyCancel="applyCancel"
             @sendMessage="sendMessage"
             @joinDiagnose="joinDiagnose"
@@ -486,6 +487,16 @@
         :department-id="departmentId"
         @search="search"
       />
+      <!-- 修改科室 -->
+      <updateDeparId
+        v-if="diaUpdateDeIdVisible"
+        :dia-update-de-id-visible.sync="diaUpdateDeIdVisible"
+        :user-name="userName"
+        :user-name-phone="userNamePhone"
+        :diagnose-log-id="diagnoseLogId"
+        :triage-department="triageDepartment"
+        @search="search"
+      />
       <rematching-doctor
         :rematching-options="rematchingOptions"
         :rematching-visible.sync="rematchingVisible"
@@ -547,6 +558,7 @@
   import RematchingDoctor from '../../../components/common/rematching-doctor';
   import TableSetComponent from '@/components/list/table-set-component';
   import applyCancelComponent from '../../../components/common/applyCancel';
+  import updateDeparId from '../../../components/common/updateDepartId';
   export default {
     components: {
       TableSetComponent,
@@ -561,6 +573,7 @@
       DiagnosisTime,
       RematchingDoctor,
       applyCancelComponent,
+      updateDeparId,
     },
     data() {
       return {
@@ -624,6 +637,7 @@
         followupVisible: false,
         doctorVisible: false,
         diagnosisVisible: false,
+        diaUpdateDeIdVisible: false,
         coordinatingVisible: false,
         diagnosisDoctorVisible: false,
         diagnoseFlag: false,
@@ -690,7 +704,6 @@
       departmentAll() {
         departmentAll().then((res) => {
           if (res.code == '000000') {
-            console.log(res, 'res111');
             this.allList = res.data || {};
             this.showListALL();
           }
@@ -727,7 +740,6 @@
           arr.push(obj);
         });
 
-        console.log(arr);
         this.allTilst = arr;
       },
       changeDepart() {
@@ -737,10 +749,6 @@
         } else {
           this.searchParam.triageDepartmentId = '';
         }
-        console.log(
-          this.searchParam.triageDepartmentId,
-          'this.searchParam.triageDepartmentId'
-        );
       },
       changeStartTime(time) {
         this.rangeTimeData = time
@@ -748,7 +756,6 @@
             ? new Date(time.time).format('yyyy-MM-dd hh:mm:ss')
             : ''
           : '';
-        console.log(this.rangeTimeData, 'this.rangeTimeData');
       },
       getTableData(val) {
         this.saveTableData = val || [];
@@ -1118,11 +1125,9 @@
       applyCancel(row) {
         this.diagnoseLogId = row.diagnoseLogId;
         this.dialogFormVisible = true;
-        console.log(row);
       },
       // 设为待匹配医生
       waitMatchDot(row) {
-        console.log(row, 'doctorData111');
         this.doctorData = row;
         this.diagnoseLogId = row.diagnoseLogId;
         this.userName = row.userName;
@@ -1133,6 +1138,15 @@
         this.bizType = 5;
       // }
       },
+      // 修改科室
+      updateDepartId(row) {
+        console.log(row);
+        this.diagnoseLogId = row.diagnoseLogId;
+        this.userName = row.userName;
+        this.userNamePhone = row.userMobile;
+        this.triageDepartment = row.triageDepartment;
+        this.diaUpdateDeIdVisible = true;
+      },
       // 发送消息
       sendMessage(row) {
         this.$router.push({
@@ -1199,7 +1213,6 @@
       },
       // 设为待确认时间
       waitMatchTime(row) {
-        console.log(row, 'row');
         this.doctorInfo = row;
         this.rangeTimeData = row.assistantBeginTime;
         this.diagnoseFlag = true;

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

@@ -124,6 +124,12 @@
   .show-work-set {
     margin-top: 100px;
   }
+  .maxNum-first-show{
+    margin-top: 20px;
+    .show-sep-num{
+      color: red;
+    }
+  }
   .agment-left-con {
     padding: 15px;
     text-align: center;