Merge branch 'feature/zl' into feature/zp

src/api/diagnosis.js

@@ -16,7 +16,7 @@ export const getDoctorList = async (data) => {
 };
 export const getDoctorListNew = async (data) => {
   return request({
-    url: '/diagnose/doctorService/doctorListMew',
+    url: '/diagnose/doctorService/doctorListNew',
     params: data,
     method: 'get',
   });

src/components/common/diagnosis-doctor.vue

@@ -75,44 +75,49 @@
           <span>未选定医生</span>
         </div>
         <div class="work-info-Num">
-          <span
-            class="work-info-Num-span"
-          >可选排班时间（预约已满需要沟通确定时间）</span>
-          <div
-            v-if="timeChoosetList.length > 0"
-            class="time-list-show"
-          >
+          <div v-if="diagnoseType != 4">
+            <span
+              class="work-info-Num-span"
+            >可选排班时间（预约已满需要沟通确定时间）</span>
             <div
-              v-for="(itemChild, indexChild) in timeChoosetList"
-              :key="indexChild"
-              class="home_grid_item"
+              v-if="timeChoosetList.length > 0"
+              class="time-list-show"
             >
               <div
-                class="grid_text"
-                :class="chooseTimeIndex == indexChild && 'choose-time-choose'"
-                @click="getChooseTimeValue(itemChild, indexChild)"
+                v-for="(itemChild, indexChild) in timeChoosetList"
+                :key="indexChild"
+                class="home_grid_item"
               >
-                <span
-                  :class="
-                    itemChild.isFull == 1 ? 'show-meet-time' : 'no-meet-time'
-                  "
-                >{{ itemChild.time }}</span>
-                <p
-                  :class="
-                    itemChild.isFull == 1 ? 'can-meet-time' : 'canot-meet-time'
-                  "
+                <div
+                  class="grid_text"
+                  :class="chooseTimeIndex == indexChild && 'choose-time-choose'"
+                  @click="getChooseTimeValue(itemChild, indexChild)"
                 >
-                  {{ itemChild.isFull == 1 ? '可约' : '已满' }}
-                </p>
+                  <span
+                    :class="
+                      itemChild.isFull == 1 ? 'show-meet-time' : 'no-meet-time'
+                    "
+                  >{{ itemChild.time }}</span>
+                  <p
+                    :class="
+                      itemChild.isFull == 1
+                        ? 'can-meet-time'
+                        : 'canot-meet-time'
+                    "
+                  >
+                    {{ itemChild.isFull == 1 ? '可约' : '已满' }}
+                  </p>
+                </div>
               </div>
             </div>
+            <div
+              v-else
+              class="time-list-showNo"
+            >
+              <span> 无可选时间 </span>
+            </div>
           </div>
-          <div
-            v-else
-            class="time-list-showNo"
-          >
-            <span> 无可选时间 </span>
-          </div>
+
           <div class="work-info-botton">
             <span
               slot="footer"
@@ -314,7 +319,7 @@
           });
           return false;
         }
-        if (this.startTime == '') {
+        if (this.startTime == '' && this.diagnoseType != 4) {
           this.$message({
             message: '请选择排班时间',
             type: 'warning',
@@ -328,8 +333,8 @@
           innerFlag: this.formData.innerFlag,
           receptionId: this.formData.receptionId,
           receptionName: this.formData.receptionName,
-          receptionBeginTime: this.startTime,
-          receptionEndTime: this.endTime,
+          receptionBeginTime: this.startTime || '',
+          receptionEndTime: this.endTime || '',
           diagnoseChannel: this.formData.diagnoseChannel,
         };
         manualQueue(req)

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

@@ -183,7 +183,7 @@
             修改指定医生
           </el-button>
           <el-button
-            v-if="scope.row.diagnoseType !== 4 && showBtn(scope.row, 3, 25, 26)"
+            v-if="showBtn(scope.row, 3, 25, 26)"
             type="primary"
             size="small"
             class="btn"

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

@@ -1271,7 +1271,7 @@
         this.patientMobilePhone = row.patientMobilePhone;
 
         this.bizType = 5;
-        if (this.diagnoseType === '4') {
+        if (this.diagnoseType == '4') {
           this.$confirm('是否重新匹配医生', '提示', {
             confirmButtonText: '是',
             cancelButtonText: '否',