历史遗留bug

src/components/common/diagnosis-doctor.vue

@@ -135,122 +135,6 @@
         </div>
       </div>
     </el-dialog>
-    <el-dialog
-      title="问诊开始时间"
-      :visible.sync="diagnosisStartTimeDialog"
-    >
-      <div class="startTime-wrap">
-        <div class="line-wrap">
-          <div>
-            <span>问诊开始时间:</span>
-            <div class="date-wrap">
-              <el-date-picker
-                v-model="startTimeValue"
-                popper-class="scale-datepicker"
-                size="large"
-                type="datetime"
-                placeholder="选择日期时间"
-                @change="startTimeChange"
-              />
-            </div>
-          </div>
-          <div class="mt20">
-            <span>问诊结束时间:</span>
-            <div class="date-wrap">
-              &nbsp;{{ dayFormatWithoutSecond(endTimeValue) }}
-            </div>
-          </div>
-        </div>
-        <div class="time-wrap">
-          <span>问诊时长:</span>
-          <div class="time-range">
-            <el-radio-group
-              v-model="timeRange"
-              @change="timeRangeChange"
-            >
-              <div>
-                <el-radio
-                  border
-                  size="large"
-                  :label="10"
-                >
-                  10分钟
-                </el-radio>
-              </div>
-              <div class="mt20">
-                <el-radio
-                  border
-                  size="medium"
-                  :label="15"
-                >
-                  15分钟
-                </el-radio>
-              </div>
-              <div class="mt20">
-                <el-radio
-                  border
-                  size="medium"
-                  :label="20"
-                >
-                  20分钟
-                </el-radio>
-              </div>
-              <div class="mt20">
-                <el-radio
-                  border
-                  size="medium"
-                  :label="30"
-                >
-                  30分钟
-                </el-radio>
-              </div>
-              <div class="mt20">
-                <el-radio
-                  border
-                  size="medium"
-                  :label="1234"
-                >
-                  自定义时间
-                </el-radio>
-              </div>
-            </el-radio-group>
-            <div v-show="timeRange == 1234">
-              <el-input-number
-                v-model="selfTimeRange"
-                class="selfTime-input"
-                type="number"
-                controls-position="right"
-                :min="0"
-                :step="1"
-                :precision="0"
-              />
-              <el-button
-                type="primary"
-                size="small"
-                @click="selfTimeRangeChange"
-              >
-                确定
-              </el-button>
-            </div>
-          </div>
-        </div>
-      </div>
-      <div
-        class="startTime-footer"
-        style="text-align: center"
-      >
-        <el-button @click="startTimeConfirm('cancel')">
-          取 消
-        </el-button>
-        <el-button
-          type="primary"
-          :disabled="isClick"
-          @click="startTimeConfirm('submit')"
-        >
-          确定
-        </el-button>
-      </div>
-    </el-dialog>
   </div>
 </template>
 
@@ -367,23 +251,14 @@
       },
     },
     created() {
-      // this.startTimeValue = this.rangeTimeData;
-      console.log('``````', this.formData);
-      // 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();
+      if (!(this.doctorList || []).some(item => { item.doctorId == this.formData.receptionId;})) {
+        this.refreshData();
+      }
     },
     methods: {
       getChooseTimeValue(value, index) {
-        // if (value.isFull == 0) {
-        //   return;
-        // }
         this.chooseTimeIndex = index;
         this.startTime = value.startDate;
         this.endTime = value.endDate;

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

@@ -33,10 +33,10 @@
               </div>
               <div>
                 <el-form-item
-                  label="分诊科室11"
+                  label="分诊科室"
                   class="t-b"
                 >
-                  <el-select
+                  <!-- <el-select
                     v-model="searchParam.triageDepartmentId"
                     placeholder="请选择科室"
                     style="width: 220px"
@@ -48,7 +48,32 @@
                       :label="item.name"
                       :value="item.id"
                     />
-                  </el-select>
+                  </el-select> -->
+                  <el-cascader
+                    ref="cascader"
+                    v-model="searchParam.triageDepartmentId"
+                    filterable
+                    clearable
+                    :options="allTilst"
+                    placeholder="选择科室"
+                    :show-all-levels="false"
+                    :style="{width:'110%'}"
+                    @change="changeDepart"
+                  >
+                    <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>
                 </el-form-item>
               </div>
               <div>
@@ -508,6 +533,7 @@
     getDepartments,
     diagnoseExport,
     diagnoseList,
+    departmentAll
   } from '@/api/diagnosis';
 
   import MatchComponent from '@/components/common/match';
@@ -632,6 +658,8 @@
         userNamePhone: '',
         triageDepartment: '',
         departmentId: '',
+        allTilst: [],
+        allList: {}
       };
     },
     watch: {
@@ -649,16 +677,65 @@
     },
     created() {
       vm = this;
-      this.getDep();
+      // this.getDep();
     },
     mounted() {
       this.setTableHeight();
       this.getOutboundNote();
+      this.departmentAll();
     },
     destroyed() {
       clearInterval(this.timer);
     },
     methods: {
+      departmentAll() {
+        departmentAll().then((res) => {
+          if (res.code == '000000') {
+            console.log(res, 'res111');
+            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}）`;
+                children.push(secondObj);
+              });
+              obj.children = children;
+            }
+          });
+          arr.push(obj);
+        });
+
+        console.log(arr);
+        this.allTilst = arr;
+      },      
+      changeDepart() {
+        const checkedNodes = this.$refs['cascader'].getCheckedNodes();
+        this.searchParam.triageDepartmentId = checkedNodes[0].value;
+        console.log(this.searchParam.triageDepartmentId, 'this.searchParam.triageDepartmentId');
+      },
       changeStartTime(time) {
         this.rangeTimeData = time
           ? time.time