fix: 后台预约单列表问题优化

src/components/common/diagnosis-doctor.vue

@@ -77,7 +77,7 @@
           <span>未选定医生</span>
         </div>
         <div class="work-info-Num">
-          <div v-if="diagnoseType != 4">
+          <div v-if="diagnoseType != 4 && diagnoseChannel != 3">
             <span
               class="work-info-Num-span"
             >可选排班时间（预约已满需要沟通确定时间）</span>
@@ -194,6 +194,10 @@
           return {};
         },
       },
+      diagnoseChannel: {
+        type: Number,
+        default: 0,
+      },
     },
     data() {
       return {
@@ -218,7 +222,7 @@
           receptionBeginTime: '',
           receptionEndTime: '',
           bizType: '',
-          diagnoseChannel: 1,
+          diagnoseChannel: !this.diagnoseChannel ? 1 : this.diagnoseChannel,
           doctorDepartmentId: '',
         },
         doctorList: [],
@@ -326,7 +330,6 @@
         });
       },
       confirm() {
-        console.log(this.startTime, 'starrrr');
         if (this.formData.receptionName == '') {
           this.$message({
             message: '请先选择接诊医生',
@@ -335,7 +338,7 @@
           });
           return false;
         }
-        if (this.startTime == '' && this.diagnoseType != 4) {
+        if (this.startTime == '' && this.diagnoseType != 4 && this.diagnoseChannel != 3) {
           this.$message({
             message: '请选择排班时间',
             type: 'warning',
@@ -409,7 +412,6 @@
       doctorChanged(value) {
         const selected = this.doctorList.find((item) => item.doctorId === value);
         if (selected) {
-          console.log(selected, 'selected');
           this.formData.receptionId = value;
           this.formData.receptionName = selected.doctorName;
           this.formData.doctorTitle = selected.doctorTitle;

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

@@ -150,7 +150,7 @@
             修改科室
           </el-button>
           <el-button
-            v-if="showBtn(scope.row, 3, 4, 5, 6, 21, 22, 23, 24, 25, 26)"
+            v-if="showBtn(scope.row, 4, 5, 6, 21, 22, 23, 24, 25, 26)"
             type="primary"
             size="small"
             class="btn"

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

@@ -758,7 +758,7 @@
           <el-input
             v-model="formData.diagnoseAdvice"
             type="textarea"
-            placeholder="请输入诊断建议（更新后原建议将被删除）"
+            placeholder="请填写您对患者病情的诊断描述和建议"
             :disabled="editorType == 2"
             maxlength="1000"
             show-word-limit
@@ -774,7 +774,7 @@
           <el-input
             v-model="formData.tcmAdvice"
             type="textarea"
-            placeholder="请输入中药建议（更新后原建议将被删除）"
+            placeholder="请输入建议使用的中药名称及用量、频次等"
             :disabled="editorType == 2"
             maxlength="1000"
             show-word-limit
@@ -790,7 +790,7 @@
           <el-input
             v-model="formData.westernAdvice"
             type="textarea"
-            placeholder="请输入西药建议（更新后原建议将被删除）"
+            placeholder="请输入建议使用的西药名称及用量、频次等"
             :disabled="editorType == 2"
             maxlength="1000"
             show-word-limit
@@ -806,7 +806,7 @@
           <el-input
             v-model="formData.inspectionAdvice"
             type="textarea"
-            placeholder="请输入检查建议（更新后原建议将被删除）"
+            placeholder="建议患者进一步作何检查）"
             :disabled="editorType == 2"
             maxlength="1000"
             show-word-limit
@@ -822,7 +822,7 @@
           <el-input
             v-model="formData.lifeAdvice"
             type="textarea"
-            placeholder="请输入生活建议（更新后原建议将被删除）"
+            placeholder="生活作息、饮食、日常运动等方面的建议）"
             :disabled="editorType == 2"
             maxlength="1000"
             show-word-limit

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

@@ -540,6 +540,7 @@
         :diagnosis-doctor-visible.sync="diagnosisDoctorVisible"
         :diagnose-log-id="diagnoseLogId"
         :diagnose-type="diagnoseType"
+        :diagnose-channel="diagnoseChannel"
         :only-change-time="onlyChangeTime"
         :doctor-id="doctorId"
         :range-time-data="rangeTimeData"
@@ -765,6 +766,7 @@ export default {
       dialogFormVisible: false,
       bizType: 0,
       diagnoseType: 0,
+      diagnoseChannel: 0,
       consultRoad: '',
       doctorId: 0,
       operateUserID: '',
@@ -1129,6 +1131,18 @@ export default {
         data.order == 'descending'
       ) {
         this.searchParam.sort = 4;
+      } else if(data.prop == 'assistantTime') {
+        if (data.order == 'ascending') {
+          this.searchParam.sort = 5;
+        } else {
+          this.searchParam.sort = 6;
+        }
+      } else if (data.prop == 'receptionTime') {
+        if (data.order == 'ascending') {
+          this.searchParam.sort = 7;
+        } else {
+          this.searchParam.sort = 8;
+        }
       } else {
         this.searchParam.sort = null;
       }
@@ -1406,6 +1420,7 @@ export default {
       this.diagnoseLogId = row.diagnoseLogId;
       this.diagnoseType = row.diagnoseType;
       this.consultRoad = row.consultRoad;
+      this.diagnoseChannel = row.diagnoseChannel;
       if (row.doctorId == 0) {
         this.doctorId = '';
       } else {
@@ -1423,6 +1438,7 @@ export default {
         '上级医生日程改变，提前取消',
         '操作失误，重新匹配医生',
         '助诊医生爽约',
+        '科室不对'
       ];
       // this.rematchingOptions=
       // this.options=